From 6ff49d3b24e21be8cc1dcb7cd659c4705de4346c Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Wed, 19 Jun 2024 22:30:33 -0500
Subject: [PATCH 01/18] Constrain video grids to 5 max columns at larger
 viewports

---
 src/renderer/components/ft-auto-grid/ft-auto-grid.css | 11 +++++++++--
 src/renderer/components/ft-auto-grid/ft-auto-grid.vue |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.css b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
index ed10d515183ea..24106e6744206 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.css
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
@@ -1,11 +1,18 @@
-.grid {
+.autoGrid {
   display: grid;
   grid-gap: 8px;
   grid-template-columns: repeat(auto-fill, minmax(262px, 1fr));
   justify-content: space-evenly;
 }
 
-.list {
+.autoList {
   display: grid;
   grid-gap: 4px;
 }
+
+/* Cap grid column width at 5 for larger viewports */
+@media (width >= 1280px) {
+  .autoGrid {
+    grid-template-columns: repeat(5, minmax(262px, 1fr));
+  }
+}
diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.vue b/src/renderer/components/ft-auto-grid/ft-auto-grid.vue
index f39ab3d680a58..2f32fbf2dd08e 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.vue
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.vue
@@ -1,8 +1,8 @@
 <template>
   <div
     :class="{
-      grid: grid,
-      list: !grid
+      autoGrid: grid,
+      autoList: !grid
     }"
   >
     <slot />

From 7c07d47fb637b0cc42003d3d73fcdfb64378d160 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Wed, 19 Jun 2024 22:30:55 -0500
Subject: [PATCH 02/18] Institute full-width layout for ft-cards

---
 src/renderer/App.css                                       | 2 +-
 .../ft-profile-channel-list/ft-profile-channel-list.css    | 7 -------
 .../components/ft-profile-edit/ft-profile-edit.css         | 7 -------
 .../ft-profile-filter-channels-list.css                    | 7 -------
 .../components/password-dialog/password-dialog.css         | 1 -
 .../subscriptions-tab-ui/subscriptions-tab-ui.css          | 7 -------
 src/renderer/views/About/About.css                         | 7 -------
 src/renderer/views/Channel/Channel.css                     | 1 -
 src/renderer/views/Hashtag/Hashtag.css                     | 7 -------
 src/renderer/views/History/History.css                     | 7 -------
 src/renderer/views/Playlist/Playlist.scss                  | 2 --
 src/renderer/views/Popular/Popular.css                     | 7 -------
 src/renderer/views/ProfileSettings/ProfileSettings.css     | 7 -------
 src/renderer/views/Search/Search.css                       | 7 -------
 .../views/SubscribedChannels/SubscribedChannels.css        | 5 -----
 src/renderer/views/Subscriptions/Subscriptions.css         | 7 -------
 src/renderer/views/Trending/Trending.css                   | 7 -------
 src/renderer/views/UserPlaylists/UserPlaylists.css         | 7 -------
 18 files changed, 1 insertion(+), 101 deletions(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index 28607f039e3ff..8a942d2e957e7 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -13,7 +13,7 @@
 .routerView {
   flex: 1 1 0%;
   margin-block: 18px;
-  margin-inline: 10px;
+  margin-inline: 5px;
 }
 
 .banner {
diff --git a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.css b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.css
index 52b828b61ad56..4527b278fc606 100644
--- a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.css
+++ b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.css
@@ -3,13 +3,6 @@ h2, .selectedCount {
 }
 
 .card {
-  inline-size: 85%;
   margin-block: 0 15px;
   margin-inline: auto;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/components/ft-profile-edit/ft-profile-edit.css b/src/renderer/components/ft-profile-edit/ft-profile-edit.css
index 31d54c310ff0f..5fcf95812ee0a 100644
--- a/src/renderer/components/ft-profile-edit/ft-profile-edit.css
+++ b/src/renderer/components/ft-profile-edit/ft-profile-edit.css
@@ -77,13 +77,6 @@ h3 {
 }
 
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.css b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.css
index 35ee6d14029ab..27f879836538e 100644
--- a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.css
+++ b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.css
@@ -7,13 +7,6 @@ h2 {
 }
 
 .card {
-  inline-size: 85%;
   margin-block: 0 15px;
   margin-inline: auto;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/components/password-dialog/password-dialog.css b/src/renderer/components/password-dialog/password-dialog.css
index cf547ceed9048..05e6d66ceda2a 100644
--- a/src/renderer/components/password-dialog/password-dialog.css
+++ b/src/renderer/components/password-dialog/password-dialog.css
@@ -1,5 +1,4 @@
 .card {
-  inline-size: 85%;
   margin: auto;
   box-sizing: border-box;
 }
diff --git a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.css b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.css
index a902565bb94b5..a93ab9893f834 100644
--- a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.css
+++ b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.css
@@ -1,5 +1,4 @@
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
@@ -7,9 +6,3 @@
 .message {
   color: var(--tertiary-text-color);
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/About/About.css b/src/renderer/views/About/About.css
index 38c5e66ce287d..bd9c5da185d22 100644
--- a/src/renderer/views/About/About.css
+++ b/src/renderer/views/About/About.css
@@ -1,7 +1,6 @@
 .card {
   margin-block: 0 60px;
   margin-inline: auto;
-  inline-size: 85%;
 }
 
 .brand {
@@ -61,9 +60,3 @@
     grid-template-columns: 1fr;
   }
 }
-
-@media only screen and (width <=680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/Channel/Channel.css b/src/renderer/views/Channel/Channel.css
index 8fb4900f78a7b..9c56c6207026a 100644
--- a/src/renderer/views/Channel/Channel.css
+++ b/src/renderer/views/Channel/Channel.css
@@ -1,6 +1,5 @@
 .card {
   position: relative;
-  inline-size: 85%;
   margin-block: 0 20px;
   margin-inline: auto;
   box-sizing: border-box;
diff --git a/src/renderer/views/Hashtag/Hashtag.css b/src/renderer/views/Hashtag/Hashtag.css
index a2d9314e834cc..8cddd79654330 100644
--- a/src/renderer/views/Hashtag/Hashtag.css
+++ b/src/renderer/views/Hashtag/Hashtag.css
@@ -16,11 +16,4 @@
 .card {
   margin-block: 0 20px;
   margin-inline: auto;
-  inline-size: 85%;
-}
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
 }
diff --git a/src/renderer/views/History/History.css b/src/renderer/views/History/History.css
index a902565bb94b5..a93ab9893f834 100644
--- a/src/renderer/views/History/History.css
+++ b/src/renderer/views/History/History.css
@@ -1,5 +1,4 @@
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
@@ -7,9 +6,3 @@
 .message {
   color: var(--tertiary-text-color);
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index 1e0ce41dc574c..4fe7a87297351 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -46,7 +46,6 @@
       margin-inline: auto;
       padding-inline: 16px;
       box-sizing: content-box;
-      inline-size: 85%;
       background-color: var(--card-bg-color);
       box-shadow: 0 2px 1px 0 var(--primary-shadow-color);
 
@@ -60,7 +59,6 @@
     }
 
     .playlistItemsCard {
-      inline-size: 85%;
       margin-block: 0 60px;
       margin-inline: auto;
     }
diff --git a/src/renderer/views/Popular/Popular.css b/src/renderer/views/Popular/Popular.css
index b6f8ffc9db440..47966ea7ac2ba 100644
--- a/src/renderer/views/Popular/Popular.css
+++ b/src/renderer/views/Popular/Popular.css
@@ -1,11 +1,4 @@
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/ProfileSettings/ProfileSettings.css b/src/renderer/views/ProfileSettings/ProfileSettings.css
index f7d8a4ebc9a47..852df0641326b 100644
--- a/src/renderer/views/ProfileSettings/ProfileSettings.css
+++ b/src/renderer/views/ProfileSettings/ProfileSettings.css
@@ -24,13 +24,6 @@ h2 {
 }
 
 .card {
-  inline-size: 85%;
   margin-block: 0 15px;
   margin-inline: auto;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/Search/Search.css b/src/renderer/views/Search/Search.css
index 1ef3d4d136f53..b23b4972d8fa6 100644
--- a/src/renderer/views/Search/Search.css
+++ b/src/renderer/views/Search/Search.css
@@ -14,13 +14,6 @@
 }
 
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.css b/src/renderer/views/SubscribedChannels/SubscribedChannels.css
index 0c8c0f51ae041..ce6af1ad082ce 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.css
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.css
@@ -1,5 +1,4 @@
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
@@ -67,10 +66,6 @@
 }
 
 @media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-
   .channels {
     gap: 1.5rem;
   }
diff --git a/src/renderer/views/Subscriptions/Subscriptions.css b/src/renderer/views/Subscriptions/Subscriptions.css
index 3446217754239..e1cbc8b5763ba 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.css
+++ b/src/renderer/views/Subscriptions/Subscriptions.css
@@ -1,5 +1,4 @@
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
@@ -33,9 +32,3 @@
 .tab:hover {
   font-weight: bold;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/Trending/Trending.css b/src/renderer/views/Trending/Trending.css
index 2a0371e88a7fb..59e6387b80040 100644
--- a/src/renderer/views/Trending/Trending.css
+++ b/src/renderer/views/Trending/Trending.css
@@ -1,5 +1,4 @@
 .card {
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
@@ -31,9 +30,3 @@
 .tab:hover {
   font-weight: bold;
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.css b/src/renderer/views/UserPlaylists/UserPlaylists.css
index bdecb1640e17f..56118aac5d54c 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.css
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.css
@@ -1,6 +1,5 @@
 .card {
   position: relative;
-  inline-size: 85%;
   margin-block: 0 60px;
   margin-inline: auto;
 }
@@ -55,9 +54,3 @@
 .message {
   color: var(--tertiary-text-color);
 }
-
-@media only screen and (width <= 680px) {
-  .card {
-    inline-size: 90%;
-  }
-}

From 7d23aac5910f31c514ee1821a8988a377e655666 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Thu, 20 Jun 2024 00:02:19 -0500
Subject: [PATCH 03/18] Fix long title edge cases for playlist grid and list
 views

---
 .../components/ft-auto-grid/ft-auto-grid.css  |  2 +-
 .../playlist-info/playlist-info.scss          | 37 ++++++++++++++++---
 src/renderer/views/Playlist/Playlist.scss     |  9 +++--
 src/renderer/views/Playlist/Playlist.vue      |  4 +-
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.css b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
index 24106e6744206..4db337624cc76 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.css
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
@@ -11,7 +11,7 @@
 }
 
 /* Cap grid column width at 5 for larger viewports */
-@media (width >= 1280px) {
+@media (width >= 1475px) {
   .autoGrid {
     grid-template-columns: repeat(5, minmax(262px, 1fr));
   }
diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
index a429360c0c355..71965ee54af5d 100644
--- a/src/renderer/components/playlist-info/playlist-info.scss
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -41,6 +41,17 @@
   }
 }
 
+.playlistTitle, .playlistDescription {
+  inline-size: 100%;
+  margin-block: 8px;
+  max-inline-size: 70vw;
+
+  @media only screen and (width >= 910px) {
+    /* Approximate max size before untruncated title starts breaking list view desktop interface */
+    max-inline-size: 28vw;
+  }
+}
+
 .playlistChannel {
   align-items: center;
   color: inherit;
@@ -96,13 +107,10 @@
   }
 
   .playlistTitle, .playlistDescription {
-    overflow-x: hidden;
     text-align: center;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    max-inline-size: 750px;
-    inline-size: 100%;
-    margin-block: 8px;
+
+    /* Approximate max size before untruncated title could break grid view interface */
+    max-inline-size: 50vw;
   }
 
   .descriptionInput {
@@ -126,6 +134,23 @@
   }
 }
 
+/* Only show full untruncated playlist description and title on smaller viewport sizes */
+@media only screen and (width > 680px) {
+  .playlistTitle, .top-bar .playlistDescription {
+    overflow-x: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+}
+
+@media only screen and (width <= 680px) {
+  .playlistTitle, .playlistDescription {
+    max-inline-size: 100%;
+  }
+}
+
+
+
 @media only screen and (width <= 1250px) {
   :deep(.sharePlaylistIcon .iconDropdown) {
     inset-inline: auto auto;
diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index 4fe7a87297351..df799c48ab6e8 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -45,7 +45,8 @@
       padding-block: 0;
       margin-inline: auto;
       padding-inline: 16px;
-      box-sizing: content-box;
+      box-sizing: border-box;
+      inline-size: 100%;
       background-color: var(--card-bg-color);
       box-shadow: 0 2px 1px 0 var(--primary-shadow-color);
 
@@ -61,6 +62,8 @@
     .playlistItemsCard {
       margin-block: 0 60px;
       margin-inline: auto;
+      inline-size: 100%;
+      box-sizing: border-box;
     }
   }
 
@@ -68,7 +71,7 @@
     .playlistInfoContainer {
       background-color: var(--card-bg-color);
       block-size: calc(100vh - 132px);
-      inline-size: 30%;
+      min-inline-size: 30%;
       inset-block-start: 96px;
       margin-inline-end: 1em;
       position: sticky;
@@ -131,7 +134,7 @@
   margin-block: auto;
 }
 
-@media only screen and (width <= 850px) {
+@media only screen and (width <= 910px) {
   .routerView {
     flex-direction: column;
 
diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
index c7e6efb8b30af..68a734065b748 100644
--- a/src/renderer/views/Playlist/Playlist.vue
+++ b/src/renderer/views/Playlist/Playlist.vue
@@ -7,7 +7,7 @@
       v-if="isLoading"
       :fullscreen="true"
     />
-    <div
+    <ft-card
       v-if="!isLoading"
       class="playlistInfoContainer"
       :class="{
@@ -41,7 +41,7 @@
         @prompt-open="promptOpen = true"
         @prompt-close="promptOpen = false"
       />
-    </div>
+    </ft-card>
 
     <ft-card
       v-if="!isLoading"

From 74bf21094bd2c6d33430c81350aaed6b36083630 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Thu, 20 Jun 2024 09:49:31 -0500
Subject: [PATCH 04/18] Switch to 6 columns after 2000px, and set max card
 width to 2800px

---
 src/renderer/components/ft-auto-grid/ft-auto-grid.css | 6 ++++++
 src/renderer/components/ft-card/ft-card.css           | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.css b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
index 4db337624cc76..59f60d59e5a45 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.css
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
@@ -16,3 +16,9 @@
     grid-template-columns: repeat(5, minmax(262px, 1fr));
   }
 }
+
+@media (width >= 2000px) {
+  .autoGrid {
+    grid-template-columns: repeat(6, minmax(262px, 1fr));
+  }
+}
diff --git a/src/renderer/components/ft-card/ft-card.css b/src/renderer/components/ft-card/ft-card.css
index 250d9a851753b..24952969fb230 100644
--- a/src/renderer/components/ft-card/ft-card.css
+++ b/src/renderer/components/ft-card/ft-card.css
@@ -4,4 +4,5 @@
   padding-block: 3px 16px;
   padding-inline: 16px;
   box-shadow: 0 1px 2px rgb(0 0 0 / 10%);
+  max-inline-size: 2800px;
 }

From 3cc6d817e4c7646f0cbc37843cc1ac60f42b0bc4 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Thu, 20 Jun 2024 12:40:35 -0500
Subject: [PATCH 05/18] Adjust breakpoint to prevent breakage when side nav is
 expanded

---
 src/renderer/components/ft-auto-grid/ft-auto-grid.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.css b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
index 59f60d59e5a45..d871312225492 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.css
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
@@ -11,7 +11,7 @@
 }
 
 /* Cap grid column width at 5 for larger viewports */
-@media (width >= 1475px) {
+@media (width >= 1605px) {
   .autoGrid {
     grid-template-columns: repeat(5, minmax(262px, 1fr));
   }

From 0845aec2793dd538a1d9cb767352c57d412cb356 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Thu, 20 Jun 2024 19:03:54 -0500
Subject: [PATCH 06/18] Update banner width

---
 src/renderer/App.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index 8a942d2e957e7..6b2ef2245779b 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -17,7 +17,6 @@
 }
 
 .banner {
-  inline-size: 85%;
   margin-block: 40px 0;
   margin-inline: auto;
 }

From 83e79e1451644888f1bf0ce5183cd7a2c609fa3b Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Thu, 20 Jun 2024 22:42:10 -0500
Subject: [PATCH 07/18] Adjust list styling to have fixed width for large
 viewport widths

---
 src/renderer/components/ft-auto-grid/ft-auto-grid.css | 6 ++++++
 src/renderer/scss-partials/_ft-list-item.scss         | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.css b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
index d871312225492..d6acdeff4399d 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.css
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.css
@@ -10,6 +10,12 @@
   grid-gap: 4px;
 }
 
+@media (width >= 1514px) {
+  .autoList {
+    justify-content: center;
+  }
+}
+
 /* Cap grid column width at 5 for larger viewports */
 @media (width >= 1605px) {
   .autoGrid {
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
index c6f6a5d7af513..5e3085116ea4b 100644
--- a/src/renderer/scss-partials/_ft-list-item.scss
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -311,6 +311,10 @@ $watched-transition-duration: 0.5s;
     .info .description {
       margin-inline-end: 10px;
     }
+
+    @media only screen and (width >= 1514px) {
+      max-inline-size: 1250px;
+    }
   }
 
   &.grid {

From 22adb571bbb06f420cd89acee3fac5e2da8aaa04 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Thu, 20 Jun 2024 12:08:42 -0500
Subject: [PATCH 08/18] Add catch-all size limit on ft-card that fixes commment
 overflow issue

---
 src/renderer/components/ft-card/ft-card.css | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/ft-card/ft-card.css b/src/renderer/components/ft-card/ft-card.css
index 24952969fb230..0f347faf59c5f 100644
--- a/src/renderer/components/ft-card/ft-card.css
+++ b/src/renderer/components/ft-card/ft-card.css
@@ -4,5 +4,21 @@
   padding-block: 3px 16px;
   padding-inline: 16px;
   box-shadow: 0 1px 2px rgb(0 0 0 / 10%);
-  max-inline-size: 2800px;
+  max-inline-size: min(calc(100vw + -132px), 2800px);
 }
+
+@media only screen and (width > 680px) {
+  .isSideNavOpen .ft-card {
+    max-inline-size: min(calc(100vw + -262px), 2800px);
+  }
+
+  .hideLabelsSideBar .ft-card {
+    max-inline-size: min(calc(100vw + -122px), 2800px);
+  }
+}
+
+ @media only screen and (width <= 680px) {
+  .ft-card {
+    max-inline-size: calc(100vw - 64px);
+  }
+ }

From 72ca2f850075380771b8757e52eabba38852c2cd Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Thu, 20 Jun 2024 23:13:46 -0500
Subject: [PATCH 09/18] Fix playlist list view when side nav is open

---
 .../playlist-info/playlist-info.scss          | 15 +++++-
 src/renderer/views/Playlist/Playlist.scss     | 48 ++++++++++++-------
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
index 71965ee54af5d..fc475508e7af4 100644
--- a/src/renderer/components/playlist-info/playlist-info.scss
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -41,7 +41,16 @@
   }
 }
 
-.playlistTitle, .playlistDescription {
+.isSideNavOpen {
+  .playlistTitle, .playlistDescription {
+    @media only screen and (width >= 1162px) {
+      /* Approximate max size before untruncated title starts breaking list view desktop interface with side nav open */
+      max-inline-size: 28vw;
+    }
+  }
+}
+
+.app:not(.isSideNavOpen) .playlistTitle, .app:not(.isSideNavOpen) .playlistDescription {
   inline-size: 100%;
   margin-block: 8px;
   max-inline-size: 70vw;
@@ -102,10 +111,14 @@
     text-align: center;
   }
 
+
+
+  /* stylelint-disable-next-line no-descending-specificity */
   .playlistTitle {
     margin-block-start: 0.2em;
   }
 
+  /* stylelint-disable-next-line no-descending-specificity */
   .playlistTitle, .playlistDescription {
     text-align: center;
 
diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index df799c48ab6e8..934453309be8c 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -1,5 +1,27 @@
 @use '../../scss-partials/utils';
 
+@mixin single-column-list-view {
+  .routerView {
+    flex-direction: column;
+
+    &.list {
+      .playlistInfoContainer {
+        box-sizing: border-box;
+        position: relative;
+        inset-block-start: 0;
+        block-size: auto;
+        inline-size: 100%;
+        margin-inline: 0;
+      }
+
+      .playlistItemsCard {
+        box-sizing: border-box;
+        inline-size: 100%;
+      }
+    }
+  }
+}
+
 .playlistItemsCard {
   display: flex;
   flex-direction: column;
@@ -73,6 +95,7 @@
       block-size: calc(100vh - 132px);
       min-inline-size: 30%;
       inset-block-start: 96px;
+      margin-block: 0;
       margin-inline-end: 1em;
       position: sticky;
 
@@ -134,27 +157,16 @@
   margin-block: auto;
 }
 
-@media only screen and (width <= 910px) {
-  .routerView {
-    flex-direction: column;
-
-    &.list {
-      .playlistInfoContainer {
-        box-sizing: border-box;
-        position: relative;
-        inset-block-start: 0;
-        block-size: auto;
-        inline-size: 100%;
-      }
-
-      .playlistItemsCard {
-        box-sizing: border-box;
-        inline-size: 100%;
-      }
-    }
+.isSideNavOpen {
+  @media only screen and (width <= 1162px) {
+    @include single-column-list-view;
   }
 }
 
+@media only screen and (width <= 910px) {
+  @include single-column-list-view;
+}
+
 .message {
   color: var(--tertiary-text-color);
 }

From 914acf350b1b67a7f472b3b0064c802469be8f58 Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Fri, 21 Jun 2024 10:06:37 -0500
Subject: [PATCH 10/18] Align banner with ft-card width using identical styling
 rules

---
 src/renderer/App.css | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index 6b2ef2245779b..f76e754cde029 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -52,6 +52,18 @@
   opacity: 0;
 }
 
+/* align banner with ft-card width using identical styling rules */
+@media only screen and (width > 680px) {
+  .isSideNavOpen .banner {
+    max-inline-size: min(calc(100vw + -262px), 2800px);
+  }
+
+  .hideLabelsSideBar .banner {
+    max-inline-size: min(calc(100vw + -122px), 2800px);
+  }
+}
+
+
 @media only screen and (width <= 680px) {
   .routerView {
     margin-block: 68px;
@@ -59,7 +71,7 @@
   }
 
   .banner {
-    inline-size: 90%;
+    max-inline-size: calc(100vw - 64px);
     margin-block: 60px 0;
   }
 

From cdbd94afebbfc8a00d4324ed1ca0b8fade30ae6f Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Fri, 18 Oct 2024 16:58:07 +0000
Subject: [PATCH 11/18] Fix playlist view on mobile

---
 src/renderer/views/Playlist/Playlist.scss | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index ccd72bc2af45f..6446be346a0c3 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -90,6 +90,16 @@
   }
 
   &.list {
+    @media only screen and (width <= 680px) {
+      .playlistInfoContainer {
+        max-inline-size: 100vw;
+      }
+
+      .playlistItemsCard {
+        max-inline-size: 100vw;
+      }
+    }
+
     .playlistInfoContainer {
       background-color: var(--card-bg-color);
       block-size: calc(100vh - 132px);
@@ -171,3 +181,13 @@
 .message {
   color: var(--tertiary-text-color);
 }
+
+@media only screen and (width <= 680px) {
+  .playlistPage {
+    margin-top: 0 !important;
+    margin-inline: 0 !important;
+
+    // this is a hack, the proper way would be to set `margin-inline: 0px;` on .routerView, but I don't know how to do that without affecting other pages
+    margin-left: -8px !important;
+  }
+}
\ No newline at end of file

From 16d1e500f2853f7827193d5cf65d2c2aa405dbc7 Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Fri, 18 Oct 2024 18:08:14 +0000
Subject: [PATCH 12/18] Remove the margin-top change

It caused issues on some resolutions. This will need to be investigated at some point but I don't want to deal with that right now
---
 src/renderer/views/Playlist/Playlist.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index 6446be346a0c3..17a43f8ac511b 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -184,7 +184,6 @@
 
 @media only screen and (width <= 680px) {
   .playlistPage {
-    margin-top: 0 !important;
     margin-inline: 0 !important;
 
     // this is a hack, the proper way would be to set `margin-inline: 0px;` on .routerView, but I don't know how to do that without affecting other pages

From 16954e591eb03d62dd46a7ccbbca1b0b75c74ce1 Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Fri, 18 Oct 2024 18:10:23 +0000
Subject: [PATCH 13/18] Partial fix for playlist title and description overflow

This change means that text-ellipsis no longer works, but it looks like that might have been a mistake. Because when it worked correctly, there was no way for the user to read the full playlist title when it was too long. Now the title and description text will wrap properly and not be cut off. Unfortunately this pushes the search bar to the bottom and causes it to be partially cut off, so that has to be fixed
---
 src/renderer/components/playlist-info/playlist-info.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
index e55d071576388..ea1420e0b121d 100644
--- a/src/renderer/components/playlist-info/playlist-info.scss
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -27,6 +27,7 @@
 
 .playlistTitle {
   margin-block-end: 0.1em;
+  word-break: break-word;
 }
 
 .playlistDescription {
@@ -34,6 +35,7 @@
   overflow-y: auto;
   white-space: break-spaces;
   margin-inline: auto;
+  word-break: break-word;
 
   @media only screen and (width <= 500px) {
     max-block-size: 10vh;
@@ -153,7 +155,6 @@
   .playlistTitle,
   .top-bar .playlistDescription {
     overflow-x: hidden;
-    white-space: nowrap;
     text-overflow: ellipsis;
   }
 }

From 6bcdc872173b50d74f326cc41d8c2ab40205ac98 Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Fri, 18 Oct 2024 18:57:39 +0000
Subject: [PATCH 14/18] Fix playlist overflow in list view

- playlist title and description now have vertical scrollbars when they are too long, this means that they can always be fully read by the user instead of being cut off
- the left panel also has a vertical scrollbar when its content doesn't fit
- since this can push the search bar and the buttons to the bottom, they are now sticky
- the left panel always has 30% width while in 2 column mode
- playlist buttons will now wrap instead of being cut off on small resolutions in list view
- in grid view the top bar is no longer sticky since it would obscure too much of the screen with longer titles and descriptions
---
 .../playlist-info/playlist-info.scss          | 27 +++++++------------
 src/renderer/views/Playlist/Playlist.scss     |  4 +--
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
index ea1420e0b121d..faaa97d70e8f0 100644
--- a/src/renderer/components/playlist-info/playlist-info.scss
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -28,6 +28,8 @@
 .playlistTitle {
   margin-block-end: 0.1em;
   word-break: break-word;
+  max-block-size: 20vh;
+  overflow-y: scroll;
 }
 
 .playlistDescription {
@@ -36,10 +38,6 @@
   white-space: break-spaces;
   margin-inline: auto;
   word-break: break-word;
-
-  @media only screen and (width <= 500px) {
-    max-block-size: 10vh;
-  }
 }
 
 .isSideNavOpen {
@@ -77,13 +75,17 @@
   column-gap: 8px;
   display: grid;
   grid-template-columns: auto minmax(min-content, 1fr);
+  position: sticky;
+  bottom: -20px;
+  background-color: var(--card-bg-color);
+  padding-block: 5px;
 }
 
 .playlistOptions {
-  display: grid;
-  grid-auto-flow: column;
-  column-gap: 8px;
-  justify-content: flex-end;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: center;
 }
 
 .searchInputsRow {
@@ -150,15 +152,6 @@
   }
 }
 
-/* Only show full untruncated playlist description and title on smaller viewport sizes */
-@media only screen and (width > 680px) {
-  .playlistTitle,
-  .top-bar .playlistDescription {
-    overflow-x: hidden;
-    text-overflow: ellipsis;
-  }
-}
-
 @media only screen and (width <= 680px) {
   .playlistTitle,
   .playlistDescription {
diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index 17a43f8ac511b..efec7bd3117d6 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -31,6 +31,7 @@
 
 .playlistInfoContainer {
   box-sizing: border-box;
+  overflow-y: scroll;
 
   /* This is needed to make prompt always above video entries. Value being too high would block search suggestions */
   z-index: 1;
@@ -61,7 +62,6 @@
     }
 
     .playlistInfoContainer {
-      position: sticky;
       margin-block: -35px 16px;
       inset-block-start: calc(var(--top-bar-push-down-adjustment-default) + var(--top-bar-push-down-adjustment-edit-mode) + var(--top-bar-push-down-adjustment-no-description) + var(--top-bar-push-down-adjustment-one-or-fewer));
       padding-block: 0;
@@ -103,7 +103,7 @@
     .playlistInfoContainer {
       background-color: var(--card-bg-color);
       block-size: calc(100vh - 132px);
-      min-inline-size: 30%;
+      inline-size: 30%;
       inset-block-start: 96px;
       margin-block: 0;
       margin-inline-end: 1em;

From a1db7e6bf520e90381c36f92abcddb5567c070f3 Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Fri, 18 Oct 2024 23:26:29 +0000
Subject: [PATCH 15/18] Fix right panel not fully expanding in list mode

---
 .../components/playlist-info/playlist-info.scss  |  2 +-
 src/renderer/views/Playlist/Playlist.scss        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
index faaa97d70e8f0..0b502f5b71264 100644
--- a/src/renderer/components/playlist-info/playlist-info.scss
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -76,7 +76,7 @@
   display: grid;
   grid-template-columns: auto minmax(min-content, 1fr);
   position: sticky;
-  bottom: -20px;
+  inset-block-end: -20px;
   background-color: var(--card-bg-color);
   padding-block: 5px;
 }
diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index efec7bd3117d6..014d570ec5465 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -10,13 +10,13 @@
         position: relative;
         inset-block-start: 0;
         block-size: auto;
-        inline-size: 100%;
+        min-inline-size: 100%;
         margin-inline: 0;
       }
 
       .playlistItemsCard {
         box-sizing: border-box;
-        inline-size: 100%;
+        min-inline-size: 100%;
       }
     }
   }
@@ -103,6 +103,7 @@
     .playlistInfoContainer {
       background-color: var(--card-bg-color);
       block-size: calc(100vh - 132px);
+      min-inline-size: 30%;
       inline-size: 30%;
       inset-block-start: 96px;
       margin-block: 0;
@@ -111,11 +112,12 @@
 
       .playlistInfo {
         padding: 10px;
+        padding-inline-end: 0;
       }
     }
 
     .playlistItemsCard {
-      inline-size: 60%;
+      inline-size: 100%;
       padding: 10px;
     }
   }
@@ -184,9 +186,7 @@
 
 @media only screen and (width <= 680px) {
   .playlistPage {
-    margin-inline: 0 !important;
-
-    // this is a hack, the proper way would be to set `margin-inline: 0px;` on .routerView, but I don't know how to do that without affecting other pages
-    margin-left: -8px !important;
+    // this is a hack, the proper way would be to set `margin-inline: 0;` on .routerView, but I don't know how to do that without affecting other pages
+    margin-inline: -8px !important;
   }
-}
\ No newline at end of file
+}

From bfde2673b6b358826c84e58c4d32234419c542ee Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Fri, 20 Dec 2024 19:04:34 +0000
Subject: [PATCH 16/18] Merge development branch

---
 .babelrc                                      |    2 +-
 .eslintignore                                 |    3 -
 .eslintrc.js                                  |  127 -
 .github/ISSUE_TEMPLATE/config.yml             |    4 +-
 .github/ISSUE_TEMPLATE/feature_request.yaml   |    2 +-
 .github/dependabot.yml                        |    2 +
 .github/workflows/build.yml                   |   55 +-
 .github/workflows/codeql.yml                  |    5 +-
 .github/workflows/conflicts.yml               |    1 -
 .github/workflows/flatpak.yml                 |    8 +-
 .github/workflows/linter.yml                  |    2 +-
 .github/workflows/no-response.yml             |   48 +-
 .github/workflows/release.yml                 |  137 +-
 .github/workflows/remove-outdated-labels.yml  |  122 +-
 .github/workflows/stale.yml                   |    6 +-
 .prettierrc                                   |    7 -
 README.md                                     |   25 +-
 _icons/iconGruvboxDarkSmall.svg               |    1 +
 _icons/iconGruvboxLightSmall.svg              |    1 +
 _icons/textGruvboxDarkSmall.svg               |    1 +
 _icons/textGruvboxLightSmall.svg              |    1 +
 _scripts/ProcessLocalesPlugin.js              |    9 +-
 _scripts/build.js                             |    2 +-
 _scripts/dev-runner.js                        |    2 +-
 _scripts/ebuilder.config.js                   |   24 +-
 _scripts/eslint-rules/plugin.mjs              |   11 +
 .../prefer-use-i18n-polyfill-rule.mjs         |   62 +
 _scripts/getRegions.mjs                       |    7 +-
 _scripts/getShakaLocales.js                   |    4 +-
 _scripts/injectAllowedPaths.mjs               |   12 +-
 _scripts/mime-db-shrinking-loader.js          |    1 -
 _scripts/patchShaka.mjs                       |    5 +-
 _scripts/webpack.main.config.js               |   16 +-
 _scripts/webpack.renderer.config.js           |   24 +-
 _scripts/webpack.web.config.js                |   23 +-
 eslint.config.mjs                             |  247 +
 package.json                                  |   80 +-
 src/constants.js                              |   46 +
 src/datastores/handlers/base.js               |   27 +-
 src/datastores/handlers/electron.js           |   12 +-
 src/datastores/handlers/web.js                |   43 +-
 src/main/index.js                             |   90 +-
 src/renderer/App.js                           |   38 +-
 .../ChannelDetails/ChannelDetails.vue         |   26 +-
 .../components/ChannelHome/ChannelHome.css    |   35 +
 .../components/ChannelHome/ChannelHome.vue    |   77 +
 .../CommentSection.css}                       |    0
 .../CommentSection/CommentSection.vue         |  795 +++
 .../ExperimentalSettings.css}                 |    0
 .../ExperimentalSettings.vue                  |   78 +
 .../FtAgeRestricted.css}                      |    0
 .../FtAgeRestricted/FtAgeRestricted.vue       |   38 +
 .../FtCommunityPoll.css}                      |    0
 .../FtCommunityPoll.vue}                      |   35 +-
 .../FtCommunityPost.scss}                     |    0
 .../FtCommunityPost/FtCommunityPost.vue       |  347 ++
 .../FtElementList/FtElementList.vue           |    2 +
 .../FtListChannel.scss}                       |    0
 .../FtListChannel/FtListChannel.vue           |  191 +
 .../FtListHashtag.scss}                       |    0
 .../FtListHashtag.vue}                        |   51 +-
 .../FtListLazyWrapper/FtListLazyWrapper.vue   |   11 +-
 .../FtLogoFull.css}                           |    0
 .../FtLogoFull.vue}                           |    3 +-
 .../FtProgressBar.css}                        |    3 +-
 .../FtProgressBar/FtProgressBar.vue           |   18 +
 .../FtSearchFilters.css}                      |    0
 .../FtSearchFilters/FtSearchFilters.vue       |  294 ++
 .../FtSettingsMenu/FtSettingsMenu.css         |  125 +
 .../FtSettingsMenu/FtSettingsMenu.vue         |   51 +
 .../FtSettingsSection.scss}                   |   31 +-
 .../FtSettingsSection/FtSettingsSection.vue   |   23 +
 .../FtSponsorBlockCategory.css}               |    0
 .../FtSponsorBlockCategory.vue                |  175 +
 .../components/FtTimestampCatcher.vue         |   48 +
 .../components/ParentalControlSettings.vue    |   72 +
 .../PasswordDialog.css}                       |    0
 .../PasswordDialog/PasswordDialog.vue         |   45 +
 .../PasswordSettings.css}                     |    0
 .../PasswordSettings/PasswordSettings.vue     |   67 +
 .../side-nav.css => SideNav/SideNav.css}      |    0
 .../side-nav.vue => SideNav/SideNav.vue}      |  154 +-
 .../SideNavMoreOptions.css}                   |    0
 .../SideNavMoreOptions.vue}                   |   52 +-
 src/renderer/components/ThemeSettings.vue     |  309 ++
 .../WatchVideoChapters/WatchVideoChapters.vue |    8 +-
 .../WatchVideoDescription.css                 |   48 +-
 .../WatchVideoDescription.vue                 |   71 +-
 .../WatchVideoRecommendations.vue             |    1 +
 .../components/data-settings/data-settings.js |  440 +-
 .../distraction-settings.js                   |   20 +-
 .../distraction-settings.vue                  |   10 +
 .../download-settings/download-settings.js    |    2 +-
 .../experimental-settings.js                  |   51 -
 .../experimental-settings.vue                 |   30 -
 .../external-player-settings.js               |   12 +-
 .../external-player-settings.vue              |   15 +-
 .../ft-age-restricted/ft-age-restricted.js    |   29 -
 .../ft-age-restricted/ft-age-restricted.vue   |   13 -
 .../ft-checkbox-list/ft-checkbox-list.vue     |    1 -
 .../ft-community-poll/ft-community-poll.js    |   28 -
 .../ft-community-post/ft-community-post.js    |  170 -
 .../ft-community-post/ft-community-post.vue   |  163 -
 .../ft-icon-button/ft-icon-button.js          |   62 +-
 .../ft-icon-button/ft-icon-button.scss        |   47 +-
 .../ft-icon-button/ft-icon-button.vue         |   34 +-
 .../ft-input-tags/ft-input-tags.css           |    7 +
 .../components/ft-input-tags/ft-input-tags.js |   17 +-
 .../ft-input-tags/ft-input-tags.vue           |   19 +-
 src/renderer/components/ft-input/ft-input.js  |    4 -
 src/renderer/components/ft-input/ft-input.vue |    2 -
 .../ft-list-channel/ft-list-channel.js        |  100 -
 .../ft-list-channel/ft-list-channel.vue       |   74 -
 .../ft-list-hashtag/ft-list-hashtag.js        |   44 -
 .../ft-list-playlist/ft-list-playlist.js      |    3 +-
 .../components/ft-list-video/ft-list-video.js |   55 +-
 .../ft-list-video/ft-list-video.scss          |   27 +
 .../ft-list-video/ft-list-video.vue           |   78 +-
 .../ft-playlist-selector.js                   |    3 +-
 .../ft-progress-bar/ft-progress-bar.js        |   10 -
 .../ft-progress-bar/ft-progress-bar.vue       |    9 -
 .../ft-radio-button/ft-radio-button.vue       |    1 -
 .../ft-refresh-widget/ft-refresh-widget.js    |   10 +
 .../ft-refresh-widget/ft-refresh-widget.vue   |    2 +-
 .../ft-search-filters/ft-search-filters.js    |  221 -
 .../ft-search-filters/ft-search-filters.vue   |   74 -
 .../ft-settings-section.js                    |   16 -
 .../ft-settings-section.vue                   |   17 -
 .../ft-shaka-video-player.css                 |   73 +
 .../ft-shaka-video-player.js                  |  287 +-
 .../ft-shaka-video-player.vue                 |    4 +-
 .../player-components/AudioTrackSelection.js  |    2 +-
 .../player-components/FullWindowButton.js     |   12 +-
 .../LegacyQualitySelection.js                 |   11 +-
 .../player-components/ScreenshotButton.js     |   10 +-
 .../player-components/StatsButton.js          |   13 +-
 .../player-components/TheatreModeButton.js    |   11 +-
 .../ft-share-button/ft-share-button.css       |   76 +
 .../ft-share-button/ft-share-button.js        |    2 +-
 .../ft-share-button/ft-share-button.scss      |  117 -
 .../ft-share-button/ft-share-button.vue       |    2 +-
 .../ft-sponsor-block-category.js              |  163 -
 .../ft-sponsor-block-category.vue             |   34 -
 .../ft-timestamp-catcher.js                   |   38 -
 .../ft-timestamp-catcher.vue                  |    8 -
 .../general-settings/general-settings.js      |    7 +-
 .../general-settings/general-settings.vue     |    7 +
 .../parental-control-settings.js              |   30 -
 .../parental-control-settings.vue             |   32 -
 .../password-dialog/password-dialog.js        |   27 -
 .../password-dialog/password-dialog.vue       |   19 -
 .../password-settings/password-settings.js    |   42 -
 .../password-settings/password-settings.vue   |   37 -
 .../player-settings/player-settings.js        |   13 +-
 .../player-settings/player-settings.vue       |   29 +-
 .../components/playlist-info/playlist-info.js |   44 +-
 .../playlist-info/playlist-info.vue           |    7 +
 .../privacy-settings/privacy-settings.js      |    2 +-
 .../proxy-settings/proxy-settings.css         |   12 +
 .../proxy-settings/proxy-settings.js          |    2 +-
 .../proxy-settings/proxy-settings.vue         |   13 +-
 .../side-nav-more-options.js                  |   32 -
 src/renderer/components/side-nav/side-nav.js  |   85 -
 .../sponsor-block-settings.js                 |    4 +-
 .../subscription-settings.css                 |    4 +
 .../subscription-settings.js                  |   10 +-
 .../subscription-settings.vue                 |   28 +-
 .../subscriptions-community.js                |   13 +-
 .../subscriptions-live/subscriptions-live.js  |   22 +-
 .../subscriptions-shorts.js                   |    6 +-
 .../subscriptions-tab-ui.js                   |    8 +-
 .../subscriptions-videos.js                   |   19 +-
 .../theme-settings/theme-settings.js          |  184 -
 .../theme-settings/theme-settings.vue         |   94 -
 src/renderer/components/top-nav/top-nav.js    |   98 +-
 src/renderer/components/top-nav/top-nav.scss  |   43 +-
 src/renderer/components/top-nav/top-nav.vue   |   32 +-
 .../watch-video-comments.js                   |  459 --
 .../watch-video-comments.vue                  |  305 --
 .../watch-video-info/watch-video-info.js      |    4 +
 .../watch-video-info/watch-video-info.scss    |   11 +
 .../watch-video-info/watch-video-info.vue     |    6 +
 .../watch-video-live-chat.css                 |    1 +
 .../watch-video-playlist.js                   |    3 +-
 src/renderer/composables/colors.js            |   64 +
 src/renderer/composables/use-i18n-polyfill.js |   95 +
 src/renderer/helpers/accessibility.js         |    4 +
 src/renderer/helpers/api/invidious.js         |  557 +-
 src/renderer/helpers/api/local.js             |  460 +-
 src/renderer/helpers/channels.js              |   20 +-
 src/renderer/helpers/colors.js                |   63 +-
 src/renderer/helpers/player/utils.js          |   23 +-
 src/renderer/helpers/playlists.js             |   25 +-
 src/renderer/helpers/strings.js               |    5 +-
 src/renderer/helpers/subscriptions.js         |   17 +-
 src/renderer/helpers/utils.js                 |  485 +-
 src/renderer/main.js                          |   43 +-
 src/renderer/router/index.js                  |    2 +-
 src/renderer/scss-partials/_ft-list-item.scss |   10 +-
 src/renderer/store/modules/playlists.js       |    6 +-
 src/renderer/store/modules/settings.js        |   23 +-
 .../store/modules/subscription-cache.js       |   29 +-
 src/renderer/store/modules/utils.js           |   31 +-
 src/renderer/themes.css                       |  943 ++--
 src/renderer/views/About/About.css            |    2 +-
 src/renderer/views/About/About.js             |   84 -
 src/renderer/views/About/About.vue            |   88 +-
 src/renderer/views/Channel/Channel.js         |  394 +-
 src/renderer/views/Channel/Channel.vue        |   14 +-
 src/renderer/views/Hashtag/Hashtag.js         |  173 -
 src/renderer/views/Hashtag/Hashtag.vue        |  193 +-
 src/renderer/views/History/History.js         |   87 +-
 src/renderer/views/History/History.vue        |    5 +-
 src/renderer/views/Playlist/Playlist.js       |   93 +-
 src/renderer/views/Playlist/Playlist.vue      |    2 +-
 src/renderer/views/Popular/Popular.js         |  108 -
 src/renderer/views/Popular/Popular.vue        |   84 +-
 src/renderer/views/Post.vue                   |  104 +
 src/renderer/views/Post/Post.js               |   62 -
 src/renderer/views/Post/Post.vue              |   31 -
 src/renderer/views/Search/Search.js           |   83 +-
 src/renderer/views/Settings/Settings.css      |   76 +-
 src/renderer/views/Settings/Settings.js       |  225 +-
 src/renderer/views/Settings/Settings.vue      |   69 +-
 .../SubscribedChannels/SubscribedChannels.js  |  172 -
 .../SubscribedChannels/SubscribedChannels.vue |  217 +-
 .../views/Subscriptions/Subscriptions.js      |    6 +-
 src/renderer/views/Trending/Trending.css      |    6 +-
 src/renderer/views/Trending/Trending.js       |  211 -
 src/renderer/views/Trending/Trending.vue      |  295 +-
 .../views/UserPlaylists/UserPlaylists.js      |   79 +-
 .../views/UserPlaylists/UserPlaylists.vue     |    5 +-
 src/renderer/views/Watch/Watch.js             |  258 +-
 src/renderer/views/Watch/Watch.vue            |    8 +-
 static/external-player-map.json               |    2 +-
 static/geolocations/be.json                   |    1 +
 static/geolocations/fa.json                   |    2 +-
 static/geolocations/pt-PT.json                |    2 +-
 static/geolocations/zh-TW.json                |    2 +-
 static/locales/activeLocales.json             |    1 +
 static/locales/af.yaml                        |  954 ++--
 static/locales/ar.yaml                        |  227 +-
 static/locales/az.yaml                        |   20 +-
 static/locales/be.yaml                        | 1061 ++--
 static/locales/bg.yaml                        |  246 +-
 static/locales/bn.yaml                        |    8 -
 static/locales/br.yaml                        | 1239 +++++
 static/locales/bs.yaml                        |    3 -
 static/locales/ca.yaml                        |   51 -
 static/locales/ckb.yaml                       |   96 +-
 static/locales/cs.yaml                        |  242 +-
 static/locales/cy.yaml                        |  885 ++--
 static/locales/da.yaml                        |  172 +-
 static/locales/de-DE.yaml                     |  297 +-
 static/locales/el.yaml                        |  118 +-
 static/locales/en-GB.yaml                     |  217 +-
 static/locales/en-US.yaml                     |  151 +-
 static/locales/eo.yaml                        |    1 -
 static/locales/es-AR.yaml                     |   18 -
 static/locales/es-MX.yaml                     |  127 +-
 static/locales/es.yaml                        |  237 +-
 static/locales/et.yaml                        |  185 +-
 static/locales/eu.yaml                        |  185 +-
 static/locales/fa.yaml                        |  431 +-
 static/locales/fi.yaml                        |  119 +-
 static/locales/fil.yaml                       |    2 -
 static/locales/fr-FR.yaml                     |  271 +-
 static/locales/gl.yaml                        |  108 +-
 static/locales/he.yaml                        |  239 +-
 static/locales/hi.yaml                        |   10 -
 static/locales/hr.yaml                        |  300 +-
 static/locales/hu.yaml                        |  289 +-
 static/locales/id.yaml                        |  112 +-
 static/locales/is.yaml                        |  224 +-
 static/locales/it.yaml                        |  293 +-
 static/locales/ja.yaml                        |  220 +-
 static/locales/ka.yaml                        |    9 -
 static/locales/ko.yaml                        |   54 -
 static/locales/ku.yaml                        |    8 -
 static/locales/la.yaml                        |    6 -
 static/locales/lt.yaml                        |   59 +-
 static/locales/lv.yaml                        |  394 +-
 static/locales/nb-NO.yaml                     |  361 +-
 static/locales/ne.yaml                        |    3 -
 static/locales/nl.yaml                        |  122 +-
 static/locales/nn.yaml                        |   76 +-
 static/locales/pl.yaml                        |  256 +-
 static/locales/pt-BR.yaml                     |  247 +-
 static/locales/pt-PT.yaml                     |   71 +-
 static/locales/pt.yaml                        |  230 +-
 static/locales/ro.yaml                        |   67 +-
 static/locales/ru.yaml                        |  246 +-
 static/locales/si.yaml                        |    1 -
 static/locales/sk.yaml                        |  107 -
 static/locales/sl.yaml                        |  106 -
 static/locales/sm.yaml                        |  116 +-
 static/locales/sr.yaml                        |  195 +-
 static/locales/sv.yaml                        |  122 +-
 static/locales/ta.yaml                        | 1047 ++++
 static/locales/tok.yaml                       |   51 +-
 static/locales/tr.yaml                        |  248 +-
 static/locales/uk.yaml                        |  445 +-
 static/locales/ur.yaml                        |  157 +-
 static/locales/vi.yaml                        |  367 +-
 static/locales/vls.yaml                       |   43 -
 static/locales/zh-CN.yaml                     |  209 +-
 static/locales/zh-TW.yaml                     |  236 +-
 yarn.lock                                     | 4568 ++++++++++-------
 308 files changed, 20006 insertions(+), 14934 deletions(-)
 delete mode 100644 .eslintignore
 delete mode 100644 .eslintrc.js
 delete mode 100644 .prettierrc
 create mode 100644 _icons/iconGruvboxDarkSmall.svg
 create mode 100644 _icons/iconGruvboxLightSmall.svg
 create mode 100644 _icons/textGruvboxDarkSmall.svg
 create mode 100644 _icons/textGruvboxLightSmall.svg
 create mode 100644 _scripts/eslint-rules/plugin.mjs
 create mode 100644 _scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs
 create mode 100644 eslint.config.mjs
 create mode 100644 src/renderer/components/ChannelHome/ChannelHome.css
 create mode 100644 src/renderer/components/ChannelHome/ChannelHome.vue
 rename src/renderer/components/{watch-video-comments/watch-video-comments.css => CommentSection/CommentSection.css} (100%)
 create mode 100644 src/renderer/components/CommentSection/CommentSection.vue
 rename src/renderer/components/{experimental-settings/experimental-settings.css => ExperimentalSettings/ExperimentalSettings.css} (100%)
 create mode 100644 src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue
 rename src/renderer/components/{ft-age-restricted/ft-age-restricted.css => FtAgeRestricted/FtAgeRestricted.css} (100%)
 create mode 100644 src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue
 rename src/renderer/components/{ft-community-poll/ft-community-poll.css => FtCommunityPoll/FtCommunityPoll.css} (100%)
 rename src/renderer/components/{ft-community-poll/ft-community-poll.vue => FtCommunityPoll/FtCommunityPoll.vue} (62%)
 rename src/renderer/components/{ft-community-post/ft-community-post.scss => FtCommunityPost/FtCommunityPost.scss} (100%)
 create mode 100644 src/renderer/components/FtCommunityPost/FtCommunityPost.vue
 rename src/renderer/components/{ft-list-channel/ft-list-channel.scss => FtListChannel/FtListChannel.scss} (100%)
 create mode 100644 src/renderer/components/FtListChannel/FtListChannel.vue
 rename src/renderer/components/{ft-list-hashtag/ft-list-hashtag.scss => FtListHashtag/FtListHashtag.scss} (100%)
 rename src/renderer/components/{ft-list-hashtag/ft-list-hashtag.vue => FtListHashtag/FtListHashtag.vue} (50%)
 rename src/renderer/components/{ft-logo-full/ft-logo-full.css => FtLogoFull/FtLogoFull.css} (100%)
 rename src/renderer/components/{ft-logo-full/ft-logo-full.vue => FtLogoFull/FtLogoFull.vue} (99%)
 rename src/renderer/components/{ft-progress-bar/ft-progress-bar.css => FtProgressBar/FtProgressBar.css} (75%)
 create mode 100644 src/renderer/components/FtProgressBar/FtProgressBar.vue
 rename src/renderer/components/{ft-search-filters/ft-search-filters.css => FtSearchFilters/FtSearchFilters.css} (100%)
 create mode 100644 src/renderer/components/FtSearchFilters/FtSearchFilters.vue
 create mode 100644 src/renderer/components/FtSettingsMenu/FtSettingsMenu.css
 create mode 100644 src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue
 rename src/renderer/components/{ft-settings-section/ft-settings-section.scss => FtSettingsSection/FtSettingsSection.scss} (89%)
 create mode 100644 src/renderer/components/FtSettingsSection/FtSettingsSection.vue
 rename src/renderer/components/{ft-sponsor-block-category/ft-sponsor-block-category.css => FtSponsorBlockCategory/FtSponsorBlockCategory.css} (100%)
 create mode 100644 src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue
 create mode 100644 src/renderer/components/FtTimestampCatcher.vue
 create mode 100644 src/renderer/components/ParentalControlSettings.vue
 rename src/renderer/components/{password-dialog/password-dialog.css => PasswordDialog/PasswordDialog.css} (100%)
 create mode 100644 src/renderer/components/PasswordDialog/PasswordDialog.vue
 rename src/renderer/components/{password-settings/password-settings.css => PasswordSettings/PasswordSettings.css} (100%)
 create mode 100644 src/renderer/components/PasswordSettings/PasswordSettings.vue
 rename src/renderer/components/{side-nav/side-nav.css => SideNav/SideNav.css} (100%)
 rename src/renderer/components/{side-nav/side-nav.vue => SideNav/SideNav.vue} (58%)
 rename src/renderer/components/{side-nav-more-options/side-nav-more-options.css => SideNavMoreOptions/SideNavMoreOptions.css} (100%)
 rename src/renderer/components/{side-nav-more-options/side-nav-more-options.vue => SideNavMoreOptions/SideNavMoreOptions.vue} (79%)
 create mode 100644 src/renderer/components/ThemeSettings.vue
 delete mode 100644 src/renderer/components/experimental-settings/experimental-settings.js
 delete mode 100644 src/renderer/components/experimental-settings/experimental-settings.vue
 delete mode 100644 src/renderer/components/ft-age-restricted/ft-age-restricted.js
 delete mode 100644 src/renderer/components/ft-age-restricted/ft-age-restricted.vue
 delete mode 100644 src/renderer/components/ft-community-poll/ft-community-poll.js
 delete mode 100644 src/renderer/components/ft-community-post/ft-community-post.js
 delete mode 100644 src/renderer/components/ft-community-post/ft-community-post.vue
 delete mode 100644 src/renderer/components/ft-list-channel/ft-list-channel.js
 delete mode 100644 src/renderer/components/ft-list-channel/ft-list-channel.vue
 delete mode 100644 src/renderer/components/ft-list-hashtag/ft-list-hashtag.js
 delete mode 100644 src/renderer/components/ft-progress-bar/ft-progress-bar.js
 delete mode 100644 src/renderer/components/ft-progress-bar/ft-progress-bar.vue
 delete mode 100644 src/renderer/components/ft-search-filters/ft-search-filters.js
 delete mode 100644 src/renderer/components/ft-search-filters/ft-search-filters.vue
 delete mode 100644 src/renderer/components/ft-settings-section/ft-settings-section.js
 delete mode 100644 src/renderer/components/ft-settings-section/ft-settings-section.vue
 create mode 100644 src/renderer/components/ft-share-button/ft-share-button.css
 delete mode 100644 src/renderer/components/ft-share-button/ft-share-button.scss
 delete mode 100644 src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
 delete mode 100644 src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
 delete mode 100644 src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
 delete mode 100644 src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue
 delete mode 100644 src/renderer/components/parental-control-settings/parental-control-settings.js
 delete mode 100644 src/renderer/components/parental-control-settings/parental-control-settings.vue
 delete mode 100644 src/renderer/components/password-dialog/password-dialog.js
 delete mode 100644 src/renderer/components/password-dialog/password-dialog.vue
 delete mode 100644 src/renderer/components/password-settings/password-settings.js
 delete mode 100644 src/renderer/components/password-settings/password-settings.vue
 delete mode 100644 src/renderer/components/side-nav-more-options/side-nav-more-options.js
 delete mode 100644 src/renderer/components/side-nav/side-nav.js
 create mode 100644 src/renderer/components/subscription-settings/subscription-settings.css
 delete mode 100644 src/renderer/components/theme-settings/theme-settings.js
 delete mode 100644 src/renderer/components/theme-settings/theme-settings.vue
 delete mode 100644 src/renderer/components/watch-video-comments/watch-video-comments.js
 delete mode 100644 src/renderer/components/watch-video-comments/watch-video-comments.vue
 create mode 100644 src/renderer/composables/colors.js
 create mode 100644 src/renderer/composables/use-i18n-polyfill.js
 delete mode 100644 src/renderer/views/About/About.js
 delete mode 100644 src/renderer/views/Hashtag/Hashtag.js
 delete mode 100644 src/renderer/views/Popular/Popular.js
 create mode 100644 src/renderer/views/Post.vue
 delete mode 100644 src/renderer/views/Post/Post.js
 delete mode 100644 src/renderer/views/Post/Post.vue
 delete mode 100644 src/renderer/views/SubscribedChannels/SubscribedChannels.js
 delete mode 100644 src/renderer/views/Trending/Trending.js
 create mode 100644 static/geolocations/be.json
 create mode 100644 static/locales/br.yaml
 create mode 100644 static/locales/ta.yaml

diff --git a/.babelrc b/.babelrc
index c13cff889347b..5b381b9ea33a8 100644
--- a/.babelrc
+++ b/.babelrc
@@ -4,7 +4,7 @@
       "@babel/env",
       {
         "targets": {
-          "chrome": "122",
+          "chrome": "130",
           "node": "20.9.0"
         }
       }
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 0cc5b81014008..0000000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-node_modules
-_scripts
-dist
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index a0c8c79b28a3a..0000000000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,127 +0,0 @@
-const path = require('path')
-const { readFileSync } = require('fs')
-
-const activeLocales = JSON.parse(readFileSync(path.join(__dirname, './static/locales/activeLocales.json')))
-
-module.exports = {
-  // https://eslint.org/docs/user-guide/configuring#using-configuration-files-1
-  root: true,
-
-  // https://eslint.org/docs/user-guide/configuring#specifying-environments
-  env: {
-    browser: true,
-    node: true
-  },
-
-  // https://eslint.org/docs/user-guide/configuring#specifying-parser
-  parser: 'vue-eslint-parser',
-
-  // https://eslint.vuejs.org/user-guide/#faq
-  parserOptions: {
-    parser: '@babel/eslint-parser',
-    ecmaVersion: 2022,
-    sourceType: 'module'
-  },
-
-  overrides: [
-    {
-      files: ['*.json'],
-      parser: 'jsonc-eslint-parser',
-      extends: ['plugin:jsonc/base'],
-      rules: {
-        'no-tabs': 'off',
-        'comma-spacing': 'off'
-      }
-    },
-    {
-      files: ['*.yaml', '*.yml'],
-      parser: 'yaml-eslint-parser',
-      extends: ['plugin:yml/recommended'],
-      rules: {
-        'yml/no-irregular-whitespace': 'off'
-      }
-    }
-  ],
-
-  // https://eslint.org/docs/user-guide/configuring#extending-configuration-files
-  // order matters: from least important to most important in terms of overriding
-  // Prettier + Vue: https://medium.com/@gogl.alex/how-to-properly-set-up-eslint-with-prettier-for-vue-or-nuxt-in-vscode-e42532099a9c
-  extends: [
-    'prettier',
-    'eslint:recommended',
-    'plugin:vue/recommended',
-    'standard',
-    'plugin:jsonc/recommended-with-json',
-    'plugin:vuejs-accessibility/recommended',
-    'plugin:@intlify/vue-i18n/recommended'
-  ],
-
-  // https://eslint.org/docs/user-guide/configuring#configuring-plugins
-  plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn', '@intlify/vue-i18n'],
-
-  rules: {
-    'space-before-function-paren': 'off',
-    'comma-dangle': ['error', 'only-multiline'],
-    'vue/no-v-html': 'off',
-    'no-console': ['error', { allow: ['warn', 'error'] }],
-    'no-unused-vars': 'warn',
-    'no-undef': 'warn',
-    'object-shorthand': 'off',
-    'vue/no-template-key': 'warn',
-    'vue/no-useless-template-attributes': 'off',
-    'vue/multi-word-component-names': 'off',
-    'vuejs-accessibility/no-onchange': 'off',
-    'vuejs-accessibility/label-has-for': ['error', {
-      required: {
-        some: ['nesting', 'id']
-      }
-    }],
-    'vuejs-accessibility/no-static-element-interactions': 'off',
-    'n/no-callback-literal': 'warn',
-    'n/no-path-concat': 'warn',
-    'unicorn/better-regex': 'error',
-    'unicorn/no-array-push-push': 'error',
-    'unicorn/prefer-keyboard-event-key': 'error',
-    'unicorn/prefer-regexp-test': 'error',
-    'unicorn/prefer-string-replace-all': 'error',
-    '@intlify/vue-i18n/no-dynamic-keys': 'error',
-    // TODO: enable at a later date. currently disabled to prevent massive conflicts for initial PR
-    // '@intlify/vue-i18n/no-unused-keys': [
-    //   'error',
-    //   {
-    //     extensions: ['.js', '.vue', 'yaml']
-    //   }
-    // ],
-    '@intlify/vue-i18n/no-duplicate-keys-in-locale': 'error',
-    '@intlify/vue-i18n/no-raw-text': [
-      'error',
-      {
-        attributes: {
-          '/.+/': [
-            'title',
-            'aria-label',
-            'aria-placeholder',
-            'aria-roledescription',
-            'aria-valuetext',
-            'tooltip',
-            'message'
-          ],
-          input: ['placeholder', 'value'],
-          img: ['alt']
-        },
-        ignoreText: ['-', '•', '/', 'YouTube', 'Invidious', 'FreeTube']
-      }
-    ],
-    // Only applicable when we upgrade to Vue 3 and vue-i18n 9+
-    '@intlify/vue-i18n/no-deprecated-tc': 'off',
-
-    'vue/require-explicit-emits': 'error',
-    'vue/no-unused-emit-declarations': 'error',
-  },
-  settings: {
-    'vue-i18n': {
-      localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
-      messageSyntaxVersion: '^8.0.0'
-    }
-  }
-}
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 65a5c0f0ce04e..9819ec7de35f8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discussions
-    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
+    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
     about: View discussions or start one yourself
   - name: Questions
-    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
+    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
     about: Ask and answer questions
   - name: Matrix Community
     url: https://matrix.to/#/+freetube:matrix.org
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 6b83338919247..0bbf74c851074 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -34,7 +34,7 @@ body:
   - type: textarea
     attributes:
       label: Alternatives Considered
-      description: A clear and concise description of any alternative solutions or features you've considered. 
+      description: A clear and concise description of any alternative solutions or features you've considered.
     validations:
       required: true
   - type: dropdown
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cb49b32397ef2..248241a93065d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,8 +17,10 @@ updates:
         patterns:
           - "eslint"
           - "eslint-*"
+          - "@eslint/*"
           - "yaml-eslint-parser"
           - "vue-eslint-parser"
+          - "neostandard"
       stylelint:
         patterns:
           - "stylelint"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f726d5aaff36a..5d34902f607ac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,9 +20,7 @@ jobs:
           - win-x64
           - win-arm64
           - osx-x64
-          # `osx-arm64` disabled due to "macOS gatekeeper"
-          # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
-          # - osx-arm64
+          - osx-arm64
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -36,8 +34,8 @@ jobs:
         - runtime: osx-x64
           os: macOS-latest
 
-#        - runtime: osx-arm64
-#          os: macOS-latest
+        - runtime: osx-arm64
+          os: macOS-latest
 
         - runtime: win-x64
           os: windows-latest
@@ -86,10 +84,9 @@ jobs:
       with:
         version: ${{ steps.versionNumber.outputs.result }}
 
-
     - name: Install libarchive-tools
       if: startsWith(matrix.os, 'ubuntu')
-      run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
+      run: sudo apt update; sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
 
     - name: Build x64 with Node.js ${{ matrix.node-version}}
       if: contains(matrix.runtime, 'x64')
@@ -103,6 +100,19 @@ jobs:
       if: contains(matrix.runtime, 'arm64')
       run: yarn run build:arm64
 
+    - name: Convert X64 AppImage to static runtime
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
+      run: |
+        sudo apt install desktop-file-utils
+        cd build
+        appimage="FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage"
+        wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O ./appimagetool.AppImage
+        chmod +x ./"$appimage" ./appimagetool.AppImage
+        ./"$appimage" --appimage-extract && rm -f ./"$appimage"
+        ./appimagetool.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
+          -n ./squashfs-root ./"$appimage"
+        rm -rf ./squashfs-root ./appimagetool.AppImage
+
     - name: Upload Linux .zip x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -301,12 +311,12 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
 
-#    - name: Upload Mac arm64 .dmg Artifact
-#      uses: actions/upload-artifact@v4
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      with:
-#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
-#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
+    - name: Upload Mac arm64 .dmg Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
 
     - name: Upload Mac x64 .zip Artifact
       uses: actions/upload-artifact@v4
@@ -322,9 +332,16 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
 
-#    - name: Upload Mac arm64 .zip Artifact
-#      uses: actions/upload-artifact@v4
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      with:
-#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
-#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
+    - name: Upload Mac arm64 .zip Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
+
+    - name: Upload Mac arm64 .7z Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.7z
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 521082d630464..9e9ce6803c6dd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -37,11 +37,10 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -50,7 +49,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
index b65794cbb1647..3cb403dc42ed9 100644
--- a/.github/workflows/conflicts.yml
+++ b/.github/workflows/conflicts.yml
@@ -20,4 +20,3 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
-
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index abee92197ac42..217f4c926cc43 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -77,22 +77,22 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      uses: mikefarah/yq@v4.44.3
+      uses: mikefarah/yq@v4.44.6
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
-      uses: mikefarah/yq@v4.44.3
+      uses: mikefarah/yq@v4.44.6
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
     - name: Update ARM File Location in yml File
-      uses: mikefarah/yq@v4.44.3
+      uses: mikefarah/yq@v4.44.6
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
-      uses: mikefarah/yq@v4.44.3
+      uses: mikefarah/yq@v4.44.6
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 962a5f55de4c6..e0ec42ea8ed80 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -6,7 +6,7 @@ name: Linter
 # events but only for the master branch
 on:
   pull_request:
-    branches: [ master, development ]
+    branches: [ master, development, '**-RC' ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
index a0a8bf8fc13a8..b430c13ed588d 100644
--- a/.github/workflows/no-response.yml
+++ b/.github/workflows/no-response.yml
@@ -1,24 +1,24 @@
-name: No Response
-
-# Both `issue_comment` and `scheduled` event types are required for this Action
-# to work properly.
-on:
-  issue_comment:
-    types: [created]
-  schedule:
-    # Run daily at midnight.
-    - cron: '0 0 * * *'
-
-jobs:
-  noResponse:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/no-response@v0.5.0
-        with:
-          token: ${{ github.token }}
-          closeComment: >
-            This issue has been automatically closed because there has been no response to our request for more information from the original author. 
-            With only the information that is currently in the issue, we don't have enough information to take action. 
-            Please reach out if you have or find the answers we need so that we can investigate further.
-          daysUntilClose: 14
-          responseRequiredLabel: "U: Waiting for Response from Author"
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action
+# to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Run daily at midnight.
+    - cron: '0 0 * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          closeComment: >
+            This issue has been automatically closed because there has been no response to our request for more information from the original author.
+            With only the information that is currently in the issue, we don't have enough information to take action.
+            Please reach out if you have or find the answers we need so that we can investigate further.
+          daysUntilClose: 7
+          responseRequiredLabel: "U: Waiting for Response from Author"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eee0f8a462700..9ec4bdab83db0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,9 +20,7 @@ jobs:
           - win-x64
           - win-arm64
           - osx-x64
-          # `osx-arm64` disabled due to "macOS gatekeeper"
-          # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
-          # - osx-arm64
+          - osx-arm64
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -36,8 +34,8 @@ jobs:
         - runtime: osx-x64
           os: macOS-latest
 
-#        - runtime: osx-arm64
-#          os: macOS-latest
+        - runtime: osx-arm64
+          os: macOS-latest
 
         - runtime: win-x64
           os: windows-latest
@@ -73,6 +71,19 @@ jobs:
       if: contains(matrix.runtime, 'arm64')
       run: yarn run build:arm64
 
+    - name: Convert X64 AppImage to static runtime
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
+      run: |
+        sudo apt install desktop-file-utils
+        cd build
+        appimage="FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage"
+        wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O ./appimagetool.AppImage
+        chmod +x ./"$appimage" ./appimagetool.AppImage
+        ./"$appimage" --appimage-extract && rm -f ./"$appimage"
+        ./appimagetool.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
+          -n ./squashfs-root ./"$appimage"
+        rm -rf ./squashfs-root ./appimagetool.AppImage
+
     - name: Upload AppImage x64 Release
       uses: actions/upload-release-asset@v1
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -84,6 +95,28 @@ jobs:
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}.AppImage
         asset_content_type: application/vnd.appimage
 
+    - name: Upload AppImage ARMv7l Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
+        asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
+        asset_content_type: application/vnd.appimage
+
+    - name: Upload AppImage ARM64 Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
+        asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
+        asset_content_type: application/vnd.appimage
+
     - name: Upload Linux .zip x64 Release
       uses: actions/upload-release-asset@v1
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -306,16 +339,16 @@ jobs:
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.dmg
         asset_content_type: application/x-apple-diskimage
 
-#    - name: Upload Mac arm64 .dmg Release
-#      uses: actions/upload-release-asset@v1
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-#        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
-#        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
-#        asset_content_type: application/x-apple-diskimage
+    - name: Upload Mac arm64 .dmg Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
+        asset_content_type: application/x-apple-diskimage
 
     - name: Upload Mac x64 .zip Release
       uses: actions/upload-release-asset@v1
@@ -339,14 +372,68 @@ jobs:
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.7z
         asset_content_type: application/x-7z-compressed
 
-#    - name: Upload Mac arm64 .zip Release
-#      uses: actions/upload-release-asset@v1
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-#        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
-#        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
-#        asset_content_type: application/x-apple-diskimage
+    - name: Upload Mac arm64 .zip Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
+        asset_content_type: application/x-apple-diskimage
+
+    - name: Upload Mac arm64 .7z Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.7z
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.7z
+        asset_content_type: application/x-7z-compressed
+
+    - name: Upload Alpine .apk x64 Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-amd64.apk
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.apk
+        asset_content_type: application/octet-stream
+
+    - name: Upload Alpine .apk ARMv7l Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-armv7l.apk
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.apk
+        asset_content_type: application/octet-stream
+
+    - name: Upload Alpine .apk ARM64 Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-arm64.apk
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.apk
+        asset_content_type: application/octet-stream
 
+    - name: Upload Pacman .pacman x64 Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-amd64.pacman
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.pacman
+        asset_content_type: application/x-zstd-compressed-tar
diff --git a/.github/workflows/remove-outdated-labels.yml b/.github/workflows/remove-outdated-labels.yml
index 8ea7ee1d48d40..1341ad028821b 100644
--- a/.github/workflows/remove-outdated-labels.yml
+++ b/.github/workflows/remove-outdated-labels.yml
@@ -1,61 +1,61 @@
-name: Remove outdated labels
-on:
-  pull_request_target:
-    types:
-      - closed
-      - converted_to_draft
-      - ready_for_review
-jobs:
-  remove-merged-pr-labels:
-    name: Remove merged pull request labels
-    if: github.event.pull_request.merged
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            PR: WIP
-            PR: changes requested
-            PR: merge conflicts / rebase needed
-            PR/Issue: dependent
-            PR: stale
-
-  remove-closed-pr-labels:
-    name: Remove closed pull request labels
-    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            PR: WIP
-            PR: changes requested
-            PR: merge conflicts / rebase needed
-            PR/Issue: dependent
-            PR: stale
-
-  remove-draft-pr-labels:
-    name: Remove labels from draft pull requests
-    if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            
-  remove-ready-pr-labels:
-    name: Remove labels when draft pr is marked ready for review
-    if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: WIP
+name: Remove outdated labels
+on:
+  pull_request_target:
+    types:
+      - closed
+      - converted_to_draft
+      - ready_for_review
+jobs:
+  remove-merged-pr-labels:
+    name: Remove merged pull request labels
+    if: github.event.pull_request.merged
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent
+            PR: stale
+
+  remove-closed-pr-labels:
+    name: Remove closed pull request labels
+    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent
+            PR: stale
+
+  remove-draft-pr-labels:
+    name: Remove labels from draft pull requests
+    if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+
+  remove-ready-pr-labels:
+    name: Remove labels when draft pr is marked ready for review
+    if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: WIP
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 6945419318d9a..354408edee5ef 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -14,14 +14,14 @@ jobs:
       - uses: actions/stale@v9
         with:
           stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
-          stale-pr-message: 'This PR is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          stale-pr-message: 'This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
           close-pr-message: 'This PR was closed because it has been stalled for 14 days with no activity.'
           days-before-issue-stale: 28
-          days-before-pr-stale: 28
+          days-before-pr-stale: 14
           days-before-issue-close: 7
           days-before-pr-close: 14
           stale-issue-label: 'U: stale'
           stale-pr-label: 'PR: stale'
           exempt-pr-labels: 'PR: WIP'
-          exempt-issue-labels: 'enhancement'
+          exempt-issue-labels: 'enhancement, U: reproduced'
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index b96994ddd09ab..0000000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "semi": false,
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": false,
-    "useTabs": false
-}
diff --git a/README.md b/README.md
index 5a42b6c49d877..839d78b3fba4f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 FreeTube is an open source desktop YouTube player built with privacy in mind.
 Use YouTube without advertisements and prevent Google from tracking you with their cookies and JavaScript.
-Available for Windows (10 and later), Mac (macOS 10.15 and later) & Linux thanks to Electron.
+Available for Windows (10 and later), Mac (macOS 11 and later) & Linux thanks to Electron.
 
 <p align="center"><a href="https://github.com/FreeTubeApp/FreeTube/releases">Download FreeTube</a></p>
 <p align="center">
@@ -59,20 +59,25 @@ longer track you using cookies or JavaScript. Your subscriptions and history are
 * Option to show only family friendly content
 * Show/hide functionality or elements within the app using the distraction free settings
 * View channel community posts
-* View most age restricted videos
 
-### Browser Extension
-FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. 
+### Browser Extensions
+The following extensions open YouTube links directly in FreeTube:
 
-> [!IMPORTANT]  
-> You must enable the option within the advanced settings of the extension for it to work.
+- [LibRedirect](https://libredirect.github.io/)
+- [RedirectTube](https://github.com/MStankiewiczOfficial/RedirectTube)
+
+LibRedirect automatically redirect YouTube links to FreeTube.
+> [!IMPORTANT]
+> To ensure proper functionality, select FreeTube as Frontend in the Services settings of the extension.
+
+RedirectTube, doesn’t automatically open YouTube links in FreeTube. Instead, it adds buttons to the toolbar and context menu, which you can click to open videos in FreeTube manually.
 
-* Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).
+- Download LibRedirect from [Mozilla Add-ons](https://addons.mozilla.org/firefox/addon/libredirect/) (for Firefox based-browsers) or [developer's website](https://libredirect.github.io/download_chromium.html) (for Chrome and Chromium-based browsers).
 
-* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://libredirect.github.io/download_chromium.html).
+- Download RedirectTube from [Mozilla Add-ons](https://addons.mozilla.org/firefox/addon/redirecttube/) (for Firefox based-browsers).
 
 > [!NOTE]
-> This extension does not work on Linux portable builds!
+> These extensions do not work on Linux portable builds!
 >
 > If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository.
 
@@ -80,7 +85,7 @@ FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/
 ### Official Downloads
 
 > [!CAUTION]
-> FreeTube is only supported on Windows 10 and later, macOS 10.15 and above, and various Linux distributions. Installing it on unsupported systems may result in unexpected issues.
+> FreeTube is only supported on Windows 10 and later, macOS 11 and above, and various Linux distributions. Installing it on unsupported systems may result in unexpected issues.
 
 * [GitHub Releases](https://github.com/FreeTubeApp/FreeTube/releases)
 
diff --git a/_icons/iconGruvboxDarkSmall.svg b/_icons/iconGruvboxDarkSmall.svg
new file mode 100644
index 0000000000000..e6dd6ad1595cf
--- /dev/null
+++ b/_icons/iconGruvboxDarkSmall.svg
@@ -0,0 +1 @@
+<svg width="25" height="25" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M4.903 0C5.84 0 6.6.76 6.6 1.697V25H4.27A4.268 4.268 0 0 1 0 20.73V1.697C0 .76.76 0 1.697 0h3.206zM25 0v2.022A4.577 4.577 0 0 1 20.422 6.6H9.38A1.68 1.68 0 0 1 7.7 4.92V1.68C7.7.752 8.452 0 9.38 0H25zm-7.064 12.223a.645.645 0 0 1 0 1.154l-9.273 4.596a.668.668 0 0 1-.963-.597V8.224a.667.667 0 0 1 .963-.597l9.273 4.596z" style="fill-opacity:1;fill:#282828"/></svg>
\ No newline at end of file
diff --git a/_icons/iconGruvboxLightSmall.svg b/_icons/iconGruvboxLightSmall.svg
new file mode 100644
index 0000000000000..a08e5c34f9830
--- /dev/null
+++ b/_icons/iconGruvboxLightSmall.svg
@@ -0,0 +1 @@
+<svg width="25" height="25" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M4.903 0C5.84 0 6.6.76 6.6 1.697V25H4.27A4.268 4.268 0 0 1 0 20.73V1.697C0 .76.76 0 1.697 0h3.206zM25 0v2.022A4.577 4.577 0 0 1 20.422 6.6H9.38A1.68 1.68 0 0 1 7.7 4.92V1.68C7.7.752 8.452 0 9.38 0H25zm-7.064 12.223a.645.645 0 0 1 0 1.154l-9.273 4.596a.668.668 0 0 1-.963-.597V8.224a.667.667 0 0 1 .963-.597l9.273 4.596z" style="fill-opacity:1;fill:#ebdbb2"/></svg>
\ No newline at end of file
diff --git a/_icons/textGruvboxDarkSmall.svg b/_icons/textGruvboxDarkSmall.svg
new file mode 100644
index 0000000000000..00e3080e7268f
--- /dev/null
+++ b/_icons/textGruvboxDarkSmall.svg
@@ -0,0 +1 @@
+<svg width="100" height="49" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M3.029 33.471c-.452 0-.815-.141-1.088-.422-.272-.282-.409-.65-.409-1.104V18.21c0-.454.129-.806.386-1.057.257-.25.612-.376 1.064-.376h8.204c.951 0 1.426.407 1.426 1.221 0 .799-.475 1.198-1.426 1.198H4.501v4.508h6.218c.95 0 1.425.407 1.425 1.221 0 .798-.475 1.197-1.425 1.197H4.501v5.823c0 .454-.132.822-.397 1.104-.265.281-.624.422-1.075.422zm16.403-11.857c.367-.031.656.055.868.258.211.204.317.509.317.916 0 .423-.092.736-.275.939-.183.204-.515.337-.994.399l-.635.071c-.832.094-1.441.407-1.829.939-.388.532-.582 1.197-.582 1.996v4.93c0 .454-.127.803-.381 1.045-.253.243-.571.364-.951.364-.381 0-.695-.121-.941-.364-.247-.242-.37-.591-.37-1.045v-9.086c0-.438.123-.775.37-1.01.246-.234.553-.352.92-.352.366 0 .662.114.888.34.226.228.338.552.338.975v.939c.268-.689.667-1.221 1.195-1.597a3.419 3.419 0 0 1 1.766-.633l.296-.024zm12.444 8.57c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716 8.06 8.06 0 0 1-2.004.27c-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.244-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.097 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.795 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.457-.493-1.092-.74-1.907-.74zm17.487 6.551c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716c-.7.18-1.369.27-2.004.27-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.245-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.098 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.794 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.456-.493-1.092-.74-1.907-.74zm13.402 9.838c-.521 0-1.186-.164-1.506-.494-.32-.329-.48-.768-.48-1.316V19.763h-3.374c-1.102 0-1.652-.501-1.652-1.504 0-.988.55-1.482 1.652-1.482h10.719c1.102 0 1.653.494 1.653 1.482 0 1.003-.551 1.504-1.653 1.504h-3.374v11.898c0 .548-.156.987-.468 1.316-.313.33-.981.494-1.517.494zM69.693 21.69c.545 0 .978.148 1.297.446.32.297.479.704.479 1.221v8.616c0 .486-.167.877-.502 1.175-.335.297-.768.446-1.297.446-.499 0-.896-.141-1.192-.423-.297-.282-.445-.658-.445-1.127v-.235a3.63 3.63 0 0 1-1.414 1.362c-.584.313-1.242.469-1.975.469-1.449 0-2.528-.403-3.237-1.209-.709-.806-1.064-2.023-1.064-3.651v-5.423c0-.517.16-.924.479-1.221.32-.298.752-.446 1.298-.446.545 0 .974.148 1.285.446.312.297.468.704.468 1.221v5.494c0 .688.144 1.197.432 1.526.288.329.729.493 1.321.493.685 0 1.243-.235 1.671-.704.429-.47.643-1.088.643-1.855v-4.954c0-.517.156-.924.467-1.221.312-.298.741-.446 1.286-.446zm11.736-.047c1.017 0 1.915.242 2.694.727.779.486 1.387 1.178 1.824 2.079.437.899.655 1.944.655 3.134s-.218 2.242-.655 3.158c-.437.915-1.049 1.628-1.836 2.137-.787.508-1.681.762-2.682.762-.811 0-1.542-.168-2.194-.504a3.633 3.633 0 0 1-1.502-1.397v.187c0 .501-.159.904-.477 1.21-.317.305-.747.458-1.287.458-.54 0-.974-.153-1.299-.458-.326-.306-.489-.709-.489-1.21V18.402c0-.485.171-.876.512-1.173.342-.298.791-.447 1.347-.447.525 0 .946.141 1.264.423.318.282.477.657.477 1.127v5.142a3.534 3.534 0 0 1 1.49-1.35c.644-.321 1.363-.481 2.158-.481zm-1.049 9.298c.842 0 1.494-.294 1.955-.881.461-.587.691-1.412.691-2.477 0-1.049-.23-1.851-.691-2.407-.461-.555-1.113-.833-1.955-.833-.843 0-1.494.286-1.955.857-.461.571-.692 1.381-.692 2.43 0 1.064.231 1.882.692 2.454.461.571 1.112.857 1.955.857zm18.404-.916c.337 0 .612.125.823.375.211.251.317.572.317.963 0 .266-.084.513-.254.74a2.005 2.005 0 0 1-.709.575 9.445 9.445 0 0 1-2.002.692c-.76.181-1.461.27-2.103.27-1.351 0-2.53-.242-3.535-.727-1.005-.486-1.778-1.178-2.318-2.078-.541-.9-.811-1.961-.811-3.182 0-1.174.262-2.214.786-3.122a5.526 5.526 0 0 1 2.179-2.125c.929-.509 1.984-.763 3.167-.763 1.132 0 2.124.231 2.977.692a4.895 4.895 0 0 1 1.989 1.973c.473.853.71 1.85.71 2.993 0 .345-.089.607-.266.787-.177.18-.427.27-.748.27h-7.095c.119.923.423 1.593.913 2.007.49.415 1.191.622 2.103.622.49 0 .929-.054 1.317-.164.389-.11.82-.258 1.293-.446.236-.094.464-.176.684-.247.219-.07.414-.105.583-.105zm-4.359-5.941c-.726 0-1.309.216-1.748.646-.439.431-.701 1.053-.786 1.867h4.891c-.051-.83-.275-1.456-.672-1.878-.397-.423-.958-.635-1.685-.635z" style="fill-rule:nonzero;fill-opacity:1;fill:#282828"/></svg>
\ No newline at end of file
diff --git a/_icons/textGruvboxLightSmall.svg b/_icons/textGruvboxLightSmall.svg
new file mode 100644
index 0000000000000..434c116ddd900
--- /dev/null
+++ b/_icons/textGruvboxLightSmall.svg
@@ -0,0 +1 @@
+<svg width="100" height="49" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M3.029 33.471c-.452 0-.815-.141-1.088-.422-.272-.282-.409-.65-.409-1.104V18.21c0-.454.129-.806.386-1.057.257-.25.612-.376 1.064-.376h8.204c.951 0 1.426.407 1.426 1.221 0 .799-.475 1.198-1.426 1.198H4.501v4.508h6.218c.95 0 1.425.407 1.425 1.221 0 .798-.475 1.197-1.425 1.197H4.501v5.823c0 .454-.132.822-.397 1.104-.265.281-.624.422-1.075.422zm16.403-11.857c.367-.031.656.055.868.258.211.204.317.509.317.916 0 .423-.092.736-.275.939-.183.204-.515.337-.994.399l-.635.071c-.832.094-1.441.407-1.829.939-.388.532-.582 1.197-.582 1.996v4.93c0 .454-.127.803-.381 1.045-.253.243-.571.364-.951.364-.381 0-.695-.121-.941-.364-.247-.242-.37-.591-.37-1.045v-9.086c0-.438.123-.775.37-1.01.246-.234.553-.352.92-.352.366 0 .662.114.888.34.226.228.338.552.338.975v.939c.268-.689.667-1.221 1.195-1.597a3.419 3.419 0 0 1 1.766-.633l.296-.024zm12.444 8.57c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716 8.06 8.06 0 0 1-2.004.27c-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.244-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.097 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.795 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.457-.493-1.092-.74-1.907-.74zm17.487 6.551c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716c-.7.18-1.369.27-2.004.27-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.245-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.098 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.794 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.456-.493-1.092-.74-1.907-.74zm13.402 9.838c-.521 0-1.186-.164-1.506-.494-.32-.329-.48-.768-.48-1.316V19.763h-3.374c-1.102 0-1.652-.501-1.652-1.504 0-.988.55-1.482 1.652-1.482h10.719c1.102 0 1.653.494 1.653 1.482 0 1.003-.551 1.504-1.653 1.504h-3.374v11.898c0 .548-.156.987-.468 1.316-.313.33-.981.494-1.517.494zM69.693 21.69c.545 0 .978.148 1.297.446.32.297.479.704.479 1.221v8.616c0 .486-.167.877-.502 1.175-.335.297-.768.446-1.297.446-.499 0-.896-.141-1.192-.423-.297-.282-.445-.658-.445-1.127v-.235a3.63 3.63 0 0 1-1.414 1.362c-.584.313-1.242.469-1.975.469-1.449 0-2.528-.403-3.237-1.209-.709-.806-1.064-2.023-1.064-3.651v-5.423c0-.517.16-.924.479-1.221.32-.298.752-.446 1.298-.446.545 0 .974.148 1.285.446.312.297.468.704.468 1.221v5.494c0 .688.144 1.197.432 1.526.288.329.729.493 1.321.493.685 0 1.243-.235 1.671-.704.429-.47.643-1.088.643-1.855v-4.954c0-.517.156-.924.467-1.221.312-.298.741-.446 1.286-.446zm11.736-.047c1.017 0 1.915.242 2.694.727.779.486 1.387 1.178 1.824 2.079.437.899.655 1.944.655 3.134s-.218 2.242-.655 3.158c-.437.915-1.049 1.628-1.836 2.137-.787.508-1.681.762-2.682.762-.811 0-1.542-.168-2.194-.504a3.633 3.633 0 0 1-1.502-1.397v.187c0 .501-.159.904-.477 1.21-.317.305-.747.458-1.287.458-.54 0-.974-.153-1.299-.458-.326-.306-.489-.709-.489-1.21V18.402c0-.485.171-.876.512-1.173.342-.298.791-.447 1.347-.447.525 0 .946.141 1.264.423.318.282.477.657.477 1.127v5.142a3.534 3.534 0 0 1 1.49-1.35c.644-.321 1.363-.481 2.158-.481zm-1.049 9.298c.842 0 1.494-.294 1.955-.881.461-.587.691-1.412.691-2.477 0-1.049-.23-1.851-.691-2.407-.461-.555-1.113-.833-1.955-.833-.843 0-1.494.286-1.955.857-.461.571-.692 1.381-.692 2.43 0 1.064.231 1.882.692 2.454.461.571 1.112.857 1.955.857zm18.404-.916c.337 0 .612.125.823.375.211.251.317.572.317.963 0 .266-.084.513-.254.74a2.005 2.005 0 0 1-.709.575 9.445 9.445 0 0 1-2.002.692c-.76.181-1.461.27-2.103.27-1.351 0-2.53-.242-3.535-.727-1.005-.486-1.778-1.178-2.318-2.078-.541-.9-.811-1.961-.811-3.182 0-1.174.262-2.214.786-3.122a5.526 5.526 0 0 1 2.179-2.125c.929-.509 1.984-.763 3.167-.763 1.132 0 2.124.231 2.977.692a4.895 4.895 0 0 1 1.989 1.973c.473.853.71 1.85.71 2.993 0 .345-.089.607-.266.787-.177.18-.427.27-.748.27h-7.095c.119.923.423 1.593.913 2.007.49.415 1.191.622 2.103.622.49 0 .929-.054 1.317-.164.389-.11.82-.258 1.293-.446.236-.094.464-.176.684-.247.219-.07.414-.105.583-.105zm-4.359-5.941c-.726 0-1.309.216-1.748.646-.439.431-.701 1.053-.786 1.867h4.891c-.051-.83-.275-1.456-.672-1.878-.397-.423-.958-.635-1.685-.635z" style="fill-rule:nonzero;fill-opacity:1;fill:#ebdbb2"/></svg>
\ No newline at end of file
diff --git a/_scripts/ProcessLocalesPlugin.js b/_scripts/ProcessLocalesPlugin.js
index 51ff870c698f3..d08bb3734f833 100644
--- a/_scripts/ProcessLocalesPlugin.js
+++ b/_scripts/ProcessLocalesPlugin.js
@@ -26,11 +26,11 @@ class ProcessLocalesPlugin {
     }
     this.outputDir = options.outputDir
 
-    /** @type {Map<str, any>} */
+    /** @type {Map<string, any>} */
     this.locales = new Map()
     this.localeNames = []
 
-    /** @type {Map<str, any>} */
+    /** @type {Map<string, any>} */
     this.cache = new Map()
 
     this.filePaths = []
@@ -45,7 +45,7 @@ class ProcessLocalesPlugin {
 
   /** @param {import('webpack').Compiler} compiler  */
   apply(compiler) {
-    const { CachedSource, RawSource } = compiler.webpack.sources;
+    const { CachedSource, RawSource } = compiler.webpack.sources
     const { Compilation, DefinePlugin } = compiler.webpack
 
     new DefinePlugin({
@@ -59,7 +59,6 @@ class ProcessLocalesPlugin {
         name: PLUGIN_NAME,
         stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
       }, async (_assets) => {
-
         // While running in the webpack dev server, this hook gets called for every incremental build.
         // For incremental builds we can return the already processed versions, which saves time
         // and makes webpack treat them as cached
@@ -72,6 +71,7 @@ class ProcessLocalesPlugin {
         }
 
         for (let [locale, data] of this.locales) {
+          // eslint-disable-next-line no-async-promise-executor
           promises.push(new Promise(async (resolve) => {
             if (IS_DEV_SERVER && compiler.fileTimestamps) {
               const filePath = join(this.inputDir, `${locale}.yaml`)
@@ -131,6 +131,7 @@ class ProcessLocalesPlugin {
     })
 
     compiler.hooks.afterCompile.tap(PLUGIN_NAME, (compilation) => {
+      // eslint-disable-next-line no-extra-boolean-cast
       if (!!compiler.watching) {
         // watch locale files for changes
         compilation.fileDependencies.addAll(this.filePaths)
diff --git a/_scripts/build.js b/_scripts/build.js
index bee33667fbeae..de43f6f7e681b 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -16,7 +16,7 @@ if (platform === 'darwin') {
     arch = Arch.arm64
   }
 
-  targets = Platform.MAC.createTarget(['DMG','zip', '7z'], arch)
+  targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
 } else if (platform === 'win32') {
   let arch = Arch.x64
 
diff --git a/_scripts/dev-runner.js b/_scripts/dev-runner.js
index 6b083cb6cc9ed..fa5d16db56c0d 100644
--- a/_scripts/dev-runner.js
+++ b/_scripts/dev-runner.js
@@ -88,7 +88,7 @@ async function restartElectron() {
  */
 function setupNotifyLocaleUpdate(compiler, devServer) {
   const notifyLocaleChange = (updatedLocales) => {
-    devServer.sendMessage(devServer.webSocketServer.clients, "freetube-locale-update", updatedLocales)
+    devServer.sendMessage(devServer.webSocketServer.clients, 'freetube-locale-update', updatedLocales)
   }
 
   compiler.options.plugins
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
index 5b79d96185685..51e2afaf7b9c2 100644
--- a/_scripts/ebuilder.config.js
+++ b/_scripts/ebuilder.config.js
@@ -11,9 +11,9 @@ const config = {
   },
   protocols: [
     {
-      name: "FreeTube",
+      name: 'FreeTube',
       schemes: [
-        "freetube"
+        'freetube'
       ]
     }
   ],
@@ -52,19 +52,19 @@ const config = {
   // https://github.com/jordansissel/fpm/issues/1503
   // https://github.com/jgraph/drawio-desktop/issues/259
   rpm: {
-    fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
+    fpm: ['--rpm-rpmbuild-define=_build_id_links none']
   },
   deb: {
     depends: [
-      "libgtk-3-0",
-      "libnotify4",
-      "libnss3",
-      "libxss1",
-      "libxtst6",
-      "xdg-utils",
-      "libatspi2.0-0",
-      "libuuid1",
-      "libsecret-1-0"
+      'libgtk-3-0',
+      'libnotify4',
+      'libnss3',
+      'libxss1',
+      'libxtst6',
+      'xdg-utils',
+      'libatspi2.0-0',
+      'libuuid1',
+      'libsecret-1-0'
     ]
   },
   mac: {
diff --git a/_scripts/eslint-rules/plugin.mjs b/_scripts/eslint-rules/plugin.mjs
new file mode 100644
index 0000000000000..451cd50836ac7
--- /dev/null
+++ b/_scripts/eslint-rules/plugin.mjs
@@ -0,0 +1,11 @@
+import preferUseI18nPolyfillRule from './prefer-use-i18n-polyfill-rule.mjs'
+
+export default {
+  meta: {
+    name: 'eslint-plugin-freetube',
+    version: '1.0'
+  },
+  rules: {
+    'prefer-use-i18n-polyfill': preferUseI18nPolyfillRule
+  }
+}
diff --git a/_scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs b/_scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs
new file mode 100644
index 0000000000000..1d27f74f0f9d1
--- /dev/null
+++ b/_scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs
@@ -0,0 +1,62 @@
+import { dirname, relative, resolve } from 'path'
+
+const polyfillPath = resolve(import.meta.dirname, '../../src/renderer/composables/use-i18n-polyfill')
+
+function getRelativePolyfillPath(filePath) {
+  const relativePath = relative(dirname(filePath), polyfillPath).replaceAll('\\', '/')
+
+  if (relativePath[0] !== '.') {
+    return `./${relativePath}`
+  }
+
+  return relativePath
+}
+
+/** @type {import('eslint').Rule.RuleModule} */
+export default {
+  meta: {
+    type: 'problem',
+    fixable: 'code'
+  },
+  create(context) {
+    return {
+      'ImportDeclaration[source.value="vue-i18n"]'(node) {
+        const specifierIndex = node.specifiers.findIndex(specifier => specifier.type === 'ImportSpecifier' && specifier.imported.name === 'useI18n')
+
+        if (specifierIndex !== -1) {
+          context.report({
+            node: node.specifiers.length === 1 ? node : node.specifiers[specifierIndex],
+            message: "Please use FreeTube's useI18n polyfill, as vue-i18n's useI18n composable does not work when the vue-i18n is in legacy mode, which is needed for components using the Options API.",
+            fix: context.physicalFilename === '<text>'
+              ? undefined
+              : (fixer) => {
+                  const relativePath = getRelativePolyfillPath(context.physicalFilename)
+
+                  // If the import only imports `useI18n`, we can just update the source/from text
+                  // Else we need to create a new import for `useI18n` and remove useI18n from the original one
+                  if (node.specifiers.length === 1) {
+                    return fixer.replaceText(node.source, `'${relativePath}'`)
+                  } else {
+                    const specifier = node.specifiers[specifierIndex]
+
+                    let specifierText = 'useI18n'
+
+                    if (specifier.imported.name !== specifier.local.name) {
+                      specifierText += ` as ${specifier.local.name}`
+                    }
+
+                    return [
+                      fixer.removeRange([
+                        specifierIndex === 0 ? specifier.start : node.specifiers[specifierIndex - 1].end,
+                        specifierIndex === node.specifiers.length - 1 ? specifier.end : node.specifiers[specifierIndex + 1].start
+                      ]),
+                      fixer.insertTextAfter(node, `\nimport { ${specifierText} } from '${relativePath}'`)
+                    ]
+                  }
+                }
+          })
+        }
+      }
+    }
+  }
+}
diff --git a/_scripts/getRegions.mjs b/_scripts/getRegions.mjs
index 842bd7cb16efa..5b36a05fbcd81 100644
--- a/_scripts/getRegions.mjs
+++ b/_scripts/getRegions.mjs
@@ -12,11 +12,9 @@
  */
 
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs'
-import { dirname } from 'path'
-import { fileURLToPath } from 'url'
 import { Innertube, Misc } from 'youtubei.js'
 
-const STATIC_DIRECTORY = `${dirname(fileURLToPath(import.meta.url))}/../static`
+const STATIC_DIRECTORY = `${import.meta.dirname}/../static`
 
 const activeLanguagesPath = `${STATIC_DIRECTORY}/locales/activeLocales.json`
 /** @type {string[]} */
@@ -46,6 +44,7 @@ for (const language of youTubeLanguages) {
       youTube: language,
       freeTube: language
     })
+  // eslint-disable-next-line @stylistic/brace-style
   }
   // special cases
   else if (language === 'de') {
@@ -120,8 +119,6 @@ for (const { youTube, freeTube } of languagesToScrape) {
   processGeolocations(freeTube, youTube, response)
 }
 
-
-
 async function scrapeLanguage(youTubeLanguageCode) {
   const session = await Innertube.create({
     retrieve_player: false,
diff --git a/_scripts/getShakaLocales.js b/_scripts/getShakaLocales.js
index 5beb42407840d..644a13a8ef6a1 100644
--- a/_scripts/getShakaLocales.js
+++ b/_scripts/getShakaLocales.js
@@ -3,7 +3,7 @@ const { readFileSync, readdirSync } = require('fs')
 function getPreloadedLocales() {
   const localesFile = readFileSync(`${__dirname}/../node_modules/shaka-player/dist/locales.js`, 'utf-8')
 
-  const localesLine = localesFile.match(/^\/\/ LOCALES: ([\w, -]+)$/m)
+  const localesLine = localesFile.match(/^\/\/ LOCALES: ([\w ,-]+)$/m)
 
   if (!localesLine) {
     throw new Error("Failed to parse shaka-player's preloaded locales")
@@ -32,7 +32,7 @@ function getMappings(shakaLocales, freeTubeLocales) {
    * @type {[string, string][]}
    * Using this structure as it gets passed to `new Map()` in the player component
    * The first element is the FreeTube locale, the second one is the shaka-player one
-   **/
+   */
   const mappings = []
 
   for (const locale of freeTubeLocales) {
diff --git a/_scripts/injectAllowedPaths.mjs b/_scripts/injectAllowedPaths.mjs
index bf1eae9962410..2310bf49839b1 100644
--- a/_scripts/injectAllowedPaths.mjs
+++ b/_scripts/injectAllowedPaths.mjs
@@ -6,12 +6,9 @@
  * to ensure that it cannot access other files on the disk, without the users permission (e.g. file picker).
  */
 import { closeSync, ftruncateSync, openSync, readFileSync, readdirSync, writeSync } from 'fs'
-import { dirname, join, relative, resolve } from 'path'
-import { fileURLToPath } from 'url'
+import { join, relative, resolve } from 'path'
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-const distDirectory = resolve(__dirname, '..', 'dist')
+const distDirectory = resolve(import.meta.dirname, '..', 'dist')
 const webDirectory = join(distDirectory, 'web')
 
 const paths = readdirSync(distDirectory, {
@@ -25,14 +22,13 @@ const paths = readdirSync(distDirectory, {
       dirent.name !== 'main.js' &&
       dirent.name !== 'main.js.LICENSE.txt' &&
       // filter out any web build files, in case the dist directory contains a web build
-      !dirent.path.startsWith(webDirectory);
+      !dirent.parentPath.startsWith(webDirectory)
   })
   .map(dirent => {
-    const joined = join(dirent.path, dirent.name)
+    const joined = join(dirent.parentPath, dirent.name)
     return '/' + relative(distDirectory, joined).replaceAll('\\', '/')
   })
 
-
 let fileHandle
 try {
   fileHandle = openSync(join(distDirectory, 'main.js'), 'r+')
diff --git a/_scripts/mime-db-shrinking-loader.js b/_scripts/mime-db-shrinking-loader.js
index 547858c648edc..c3aba020875a8 100644
--- a/_scripts/mime-db-shrinking-loader.js
+++ b/_scripts/mime-db-shrinking-loader.js
@@ -14,7 +14,6 @@ module.exports = function (source) {
     if (mimeType.startsWith('image/') && original[mimeType].extensions &&
       (!mimeType.startsWith('image/x-') || mimeType === 'image/x-icon' || mimeType === 'image/x-ms-bmp') &&
       (!mimeType.startsWith('image/vnd.') || mimeType === 'image/vnd.microsoft.icon')) {
-
       // Only the extensions field is needed, see: https://github.com/kevva/ext-list/blob/v2.2.2/index.js
       reduced[mimeType] = {
         extensions: original[mimeType].extensions
diff --git a/_scripts/patchShaka.mjs b/_scripts/patchShaka.mjs
index b497a0e89cf5c..c5582880d4c60 100644
--- a/_scripts/patchShaka.mjs
+++ b/_scripts/patchShaka.mjs
@@ -63,7 +63,7 @@ async function removeRobotoFont() {
     let cssContents = readFileSync(cssFileHandle, 'utf-8')
 
     const beforeReplacement = cssContents.length
-    cssContents = cssContents.replace(/@font-face\{font-family:Roboto;[^}]+\}/, '')
+    cssContents = cssContents.replace(/@font-face{font-family:Roboto;[^}]+}/, '')
 
     if (cssContents.length !== beforeReplacement) {
       ftruncateSync(cssFileHandle)
@@ -99,8 +99,7 @@ async function replaceAndDownloadMaterialIconsFont() {
 
       let newFontCSS = text.match(/(@font-face\s*{[^}]+})/)[1].replaceAll('\n', '')
 
-
-      const urlMatch = newFontCSS.match(/https:\/\/fonts\.gstatic\.com\/s\/materialiconsround\/(?<version>[^\/]+)\/[^.]+\.(?<extension>[\w]+)/)
+      const urlMatch = newFontCSS.match(/https:\/\/fonts\.gstatic\.com\/s\/materialiconsround\/(?<version>[^/]+)\/[^.]+\.(?<extension>\w+)/)
 
       const url = urlMatch[0]
       const { version, extension } = urlMatch.groups
diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
index 1bb102105840c..d0c9effe02219 100644
--- a/_scripts/webpack.main.config.js
+++ b/_scripts/webpack.main.config.js
@@ -54,15 +54,15 @@ const config = {
 if (!isDevMode) {
   config.plugins.push(
     new CopyWebpackPlugin({
-        patterns: [
-          {
-            from: path.join(__dirname, '../static'),
-            to: path.join(__dirname, '../dist/static'),
-            globOptions: {
-              dot: true,
-              ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/manifest.json', '**/dashFiles/**', '**/storyboards/**'],
-            },
+      patterns: [
+        {
+          from: path.join(__dirname, '../static'),
+          to: path.join(__dirname, '../dist/static'),
+          globOptions: {
+            dot: true,
+            ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/manifest.json', '**/dashFiles/**', '**/storyboards/**'],
           },
+        },
       ]
     })
   )
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index c1b813816b867..11f1cf828711c 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -153,18 +153,20 @@ const config = {
         },
         // Don't need to copy them in dev mode,
         // as we configure WebpackDevServer to serve them
-        ...(isDevMode ? [] : [
-          {
-            from: path.join(__dirname, '../node_modules/shaka-player/ui/locales', `{${SHAKA_LOCALES_TO_BE_BUNDLED.join(',')}}.json`).replaceAll('\\', '/'),
-            to: path.join(__dirname, '../dist/static/shaka-player-locales'),
-            context: path.join(__dirname, '../node_modules/shaka-player/ui/locales'),
-            transform: {
-              transformer: (input) => {
-                return JSON.stringify(JSON.parse(input.toString('utf-8')))
+        ...(isDevMode
+          ? []
+          : [
+              {
+                from: path.join(__dirname, '../node_modules/shaka-player/ui/locales', `{${SHAKA_LOCALES_TO_BE_BUNDLED.join(',')}}.json`).replaceAll('\\', '/'),
+                to: path.join(__dirname, '../dist/static/shaka-player-locales'),
+                context: path.join(__dirname, '../node_modules/shaka-player/ui/locales'),
+                transform: {
+                  transformer: (input) => {
+                    return JSON.stringify(JSON.parse(input.toString('utf-8')))
+                  }
+                }
               }
-            }
-          }
-        ])
+            ])
       ]
     })
   ],
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 75f2ccd846c8b..0df7ff510f550 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -184,18 +184,18 @@ config.plugins.push(
     'process.env.SHAKA_LOCALES_PREBUNDLED': JSON.stringify(SHAKA_LOCALES_PREBUNDLED)
   }),
   new CopyWebpackPlugin({
-      patterns: [
-        {
-          from: path.join(__dirname, '../static/pwabuilder-sw.js'),
-          to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
+    patterns: [
+      {
+        from: path.join(__dirname, '../static/pwabuilder-sw.js'),
+        to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
+      },
+      {
+        from: path.join(__dirname, '../static'),
+        to: path.join(__dirname, '../dist/web/static'),
+        globOptions: {
+          dot: true,
+          ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
         },
-        {
-          from: path.join(__dirname, '../static'),
-          to: path.join(__dirname, '../dist/web/static'),
-          globOptions: {
-            dot: true,
-            ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
-          },
       },
       {
         from: path.join(__dirname, '../node_modules/shaka-player/ui/locales', `{${SHAKA_LOCALES_TO_BE_BUNDLED.join(',')}}.json`).replaceAll('\\', '/'),
@@ -206,5 +206,4 @@ config.plugins.push(
   })
 )
 
-
 module.exports = config
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000000000..aac8173ccf395
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,247 @@
+import eslintPluginVue from 'eslint-plugin-vue'
+import vuejsAccessibility from 'eslint-plugin-vuejs-accessibility'
+import eslintPluginUnicorn from 'eslint-plugin-unicorn'
+import intlifyVueI18N from '@intlify/eslint-plugin-vue-i18n'
+import globals from 'globals'
+import vueEslintParser from 'vue-eslint-parser'
+import js from '@eslint/js'
+import jsoncEslintParser from 'jsonc-eslint-parser'
+import eslintPluginJsonc from 'eslint-plugin-jsonc'
+import eslintPluginYml from 'eslint-plugin-yml'
+import yamlEslintParser from 'yaml-eslint-parser'
+// Faster than importing the default import,
+// because the default import imports a lot of other dependencies
+// for the `resolveIgnoresFromGitignore` function that we don't use
+import { neostandard } from 'neostandard/lib/main.js'
+import jsdoc from 'eslint-plugin-jsdoc'
+import freetube from './_scripts/eslint-rules/plugin.mjs'
+
+import activeLocales from './static/locales/activeLocales.json' with { type: 'json' }
+
+export default [
+  {
+    ignores: [
+      'build/',
+      'dist/',
+      'eslint.config.mjs',
+      // The JSON files inside this directory are auto-generated, so they don't follow the code style rules
+      'static/geolocations/'
+    ]
+  },
+  ...neostandard({
+    noJsx: true,
+    ts: false,
+  }),
+  js.configs.recommended,
+  ...eslintPluginVue.configs['flat/vue2-recommended'],
+  ...vuejsAccessibility.configs["flat/recommended"],
+  ...intlifyVueI18N.configs['flat/recommended'],
+  {
+    files: [
+      '**/*.{js,vue}',
+    ],
+    ignores: [
+      '_scripts/',
+    ],
+    plugins: {
+      unicorn: eslintPluginUnicorn,
+      jsdoc,
+      freetube,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      },
+
+      parser: vueEslintParser,
+      ecmaVersion: 2022,
+      sourceType: 'module',
+    },
+
+    settings: {
+      'vue-i18n': {
+        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
+        messageSyntaxVersion: '^8.0.0',
+      },
+    },
+
+    rules: {
+      '@stylistic/space-before-function-paren': 'off',
+      '@stylistic/comma-dangle': ['error', 'only-multiline'],
+      'vue/no-v-html': 'off',
+
+      'no-console': ['error', {
+        allow: ['warn', 'error'],
+      }],
+
+      'no-unused-vars': 'warn',
+      'no-undef': 'warn',
+      'object-shorthand': 'off',
+      'vue/no-template-key': 'warn',
+      'vue/multi-word-component-names': 'off',
+
+      'vuejs-accessibility/label-has-for': ['error', {
+        required: {
+          some: ['nesting', 'id'],
+        },
+      }],
+
+      'vuejs-accessibility/no-static-element-interactions': 'off',
+      'n/no-callback-literal': 'warn',
+      'n/no-path-concat': 'warn',
+      'unicorn/better-regex': 'error',
+      'unicorn/no-array-push-push': 'error',
+      'unicorn/prefer-keyboard-event-key': 'error',
+      'unicorn/prefer-regexp-test': 'error',
+      'unicorn/prefer-string-replace-all': 'error',
+      '@intlify/vue-i18n/no-dynamic-keys': 'error',
+      '@intlify/vue-i18n/no-duplicate-keys-in-locale': 'error',
+
+      '@intlify/vue-i18n/no-raw-text': ['error', {
+        attributes: {
+          '/.+/': [
+            'title',
+            'aria-label',
+            'aria-placeholder',
+            'aria-roledescription',
+            'aria-valuetext',
+            'tooltip',
+            'message',
+          ],
+
+          input: ['placeholder', 'value'],
+          img: ['alt'],
+        },
+
+        ignoreText: ['-', '•', '/', 'YouTube', 'Invidious', 'FreeTube'],
+      }],
+
+      '@intlify/vue-i18n/no-deprecated-tc': 'off',
+      'vue/require-explicit-emits': 'error',
+      'vue/no-unused-emit-declarations': 'error',
+
+      'jsdoc/check-alignment': 'error',
+      'jsdoc/check-property-names': 'error',
+      'jsdoc/check-param-names': 'error',
+      'jsdoc/check-syntax': 'error',
+      'jsdoc/check-template-names': 'error',
+      'jsdoc/check-types': 'error',
+      'jsdoc/no-bad-blocks': 'error',
+      'jsdoc/no-multi-asterisks': 'error',
+
+      'freetube/prefer-use-i18n-polyfill': 'error',
+    },
+  },
+
+  ...eslintPluginJsonc.configs['flat/base'],
+  {
+    files: ['**/*.json'],
+    ignores: [
+      '_scripts/',
+    ],
+
+    languageOptions: {
+      parser: jsoncEslintParser,
+    },
+
+    rules: {
+      '@stylistic/no-tabs': 'off',
+      '@stylistic/comma-spacing': 'off',
+      '@stylistic/eol-last': 'off',
+      'no-irregular-whitespace': 'off',
+    },
+
+    settings: {
+      'vue-i18n': {
+        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
+        messageSyntaxVersion: '^8.0.0',
+      },
+    },
+  },
+
+  ...eslintPluginYml.configs['flat/recommended'],
+  {
+    files: ['**/*.{yml,yaml}'],
+    ignores: [
+      '.github/',
+      '_scripts/'
+    ],
+
+    languageOptions: {
+      parser: yamlEslintParser,
+    },
+
+    rules: {
+      'yml/no-irregular-whitespace': 'off',
+      '@stylistic/spaced-comment': 'off',
+    },
+
+    settings: {
+      'vue-i18n': {
+        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
+        messageSyntaxVersion: '^8.0.0',
+      },
+    },
+  },
+  {
+    files: ['.github/**/*.{yml,yaml}'],
+
+    languageOptions: {
+      parser: yamlEslintParser,
+    },
+
+    rules: {
+      'yml/no-empty-mapping-value': 'off',
+      'yml/no-irregular-whitespace': 'off',
+    },
+
+    settings: {
+      'vue-i18n': {
+        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
+        messageSyntaxVersion: '^8.0.0',
+      },
+    },
+  },
+  {
+    files: ['_scripts/*.js'],
+    languageOptions: {
+      globals: globals.node,
+      ecmaVersion: 'latest',
+      sourceType: 'commonjs'
+    },
+
+    plugins: {
+      unicorn: eslintPluginUnicorn,
+    },
+
+    rules: {
+      '@stylistic/space-before-function-paren': 'off',
+      '@stylistic/comma-dangle': ['error', 'only-multiline'],
+      'no-console': 'off',
+      'n/no-path-concat': 'off',
+      'unicorn/better-regex': 'error',
+    }
+  },
+  {
+    files: ['_scripts/**/*.mjs'],
+    languageOptions: {
+      globals: globals.node,
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+    },
+
+    plugins: {
+      unicorn: eslintPluginUnicorn,
+    },
+
+    rules: {
+      'no-console': 'off',
+      '@stylistic/space-before-function-paren': 'off',
+      '@stylistic/comma-dangle': ['error', 'only-multiline'],
+      'n/no-path-concat': 'off',
+      'unicorn/better-regex': 'error',
+    }
+  }
+]
diff --git a/package.json b/package.json
index f097ac7068db3..ad4f7970f7ab8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.21.3",
+  "version": "0.22.1",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,
@@ -37,12 +37,12 @@
     "lint-all": "run-p lint lint-json",
     "lint": "run-p eslint-lint lint-style",
     "lint-fix": "run-p eslint-lint-fix lint-style-fix",
-    "eslint-lint": "eslint --ext .js,.vue ./",
-    "eslint-lint-fix": "eslint --fix --ext .js,.vue ./",
-    "lint-json": "eslint --ext .json ./",
+    "eslint-lint": "eslint --config eslint.config.mjs \"src/**/*.js\" \"src/renderer/**/*.vue\" \"static/*.js\" \"_scripts/*.js\" \"_scripts/**/*.mjs\"",
+    "eslint-lint-fix": "eslint --config eslint.config.mjs --fix \"src/**/*.js\" \"src/renderer/**/*.vue\" \"static/*.js\" \"_scripts/*.js\" \"_scripts/**/*.mjs\"",
+    "lint-json": "eslint --config eslint.config.mjs \"static/**/*.json\"",
     "lint-style": "stylelint \"**/*.{css,scss}\"",
     "lint-style-fix": "stylelint --fix \"**/*.{css,scss}\"",
-    "lint-yml": "eslint --ext .yml,.yaml ./",
+    "lint-yml": "eslint --config eslint.config.mjs \"**/*.yml\" \"**/*.yaml\"",
     "pack": "run-p pack:main pack:renderer && node _scripts/injectAllowedPaths.mjs",
     "pack:main": "webpack --mode=production --node-env=production --config _scripts/webpack.main.config.js",
     "pack:renderer": "webpack --mode=production --node-env=production --config _scripts/webpack.renderer.config.js",
@@ -54,66 +54,62 @@
     "ci": "yarn install --silent --frozen-lockfile"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.6.0",
-    "@fortawesome/free-brands-svg-icons": "^6.6.0",
-    "@fortawesome/free-regular-svg-icons": "^6.6.0",
-    "@fortawesome/free-solid-svg-icons": "^6.6.0",
+    "@fortawesome/fontawesome-svg-core": "^6.7.1",
+    "@fortawesome/free-brands-svg-icons": "^6.7.1",
+    "@fortawesome/free-regular-svg-icons": "^6.7.1",
+    "@fortawesome/free-solid-svg-icons": "^6.7.1",
     "@fortawesome/vue-fontawesome": "^2.0.10",
     "@seald-io/nedb": "^4.0.4",
     "autolinker": "^4.0.0",
     "electron-context-menu": "^4.0.4",
     "lodash.debounce": "^4.0.8",
-    "marked": "^14.1.2",
+    "marked": "^15.0.4",
     "path-browserify": "^1.0.1",
     "portal-vue": "^2.1.7",
     "process": "^0.11.10",
-    "shaka-player": "^4.11.7",
-    "swiper": "^11.1.14",
+    "shaka-player": "^4.12.5",
+    "swiper": "^11.1.15",
     "vue": "^2.7.16",
     "vue-i18n": "^8.28.2",
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^10.5.0"
+    "youtubei.js": "^12.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/eslint-parser": "^7.25.1",
-    "@babel/plugin-transform-class-properties": "^7.25.4",
-    "@babel/preset-env": "^7.25.4",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-class-properties": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
     "@double-great/stylelint-a11y": "^3.0.2",
-    "@intlify/eslint-plugin-vue-i18n": "^3.0.0",
+    "@eslint/js": "^9.17.0",
+    "@intlify/eslint-plugin-vue-i18n": "^3.2.0",
     "babel-loader": "^9.2.1",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "electron": "^32.1.2",
-    "electron-builder": "^24.13.3",
-    "eslint": "^8.57.1",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-jsonc": "^2.16.0",
-    "eslint-plugin-n": "^17.10.3",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-promise": "^7.1.0",
-    "eslint-plugin-unicorn": "^55.0.0",
-    "eslint-plugin-vue": "^9.28.0",
+    "electron": "^33.2.1",
+    "electron-builder": "^25.1.8",
+    "eslint": "^9.17.0",
+    "eslint-plugin-jsdoc": "^50.6.1",
+    "eslint-plugin-jsonc": "^2.18.2",
+    "eslint-plugin-unicorn": "^56.0.1",
+    "eslint-plugin-vue": "^9.32.0",
     "eslint-plugin-vuejs-accessibility": "^2.4.1",
-    "eslint-plugin-yml": "^1.14.0",
-    "html-webpack-plugin": "^5.6.0",
+    "eslint-plugin-yml": "^1.16.0",
+    "globals": "^15.13.0",
+    "html-webpack-plugin": "^5.6.3",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^5.0.0",
-    "lefthook": "^1.7.17",
-    "mini-css-extract-plugin": "^2.9.1",
-    "npm-run-all2": "^6.2.3",
-    "postcss": "^8.4.47",
+    "lefthook": "^1.9.2",
+    "mini-css-extract-plugin": "^2.9.2",
+    "neostandard": "^0.12.0",
+    "npm-run-all2": "^7.0.1",
+    "postcss": "^8.4.49",
     "postcss-scss": "^4.0.9",
-    "prettier": "^2.8.8",
     "rimraf": "^6.0.1",
-    "sass": "^1.79.4",
-    "sass-loader": "^16.0.2",
-    "stylelint": "^16.9.0",
+    "sass": "^1.83.0",
+    "sass-loader": "^16.0.4",
+    "stylelint": "^16.12.0",
     "stylelint-config-sass-guidelines": "^12.1.0",
     "stylelint-config-standard": "^36.0.1",
     "stylelint-high-performance-animation": "^1.10.0",
@@ -122,9 +118,9 @@
     "vue-devtools": "^5.1.4",
     "vue-eslint-parser": "^9.4.3",
     "vue-loader": "^15.10.0",
-    "webpack": "^5.95.0",
+    "webpack": "^5.97.1",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.1.0",
+    "webpack-dev-server": "^5.2.0",
     "yaml-eslint-parser": "^1.2.3"
   }
 }
diff --git a/src/constants.js b/src/constants.js
index f45e30fb8211d..97be9daf6fe9f 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -5,6 +5,7 @@ const IpcChannels = {
   OPEN_EXTERNAL_LINK: 'open-external-link',
   GET_SYSTEM_LOCALE: 'get-system-locale',
   GET_PICTURES_PATH: 'get-pictures-path',
+  GET_NAVIGATION_HISTORY: 'get-navigation-history',
   SHOW_OPEN_DIALOG: 'show-open-dialog',
   SHOW_SAVE_DIALOG: 'show-save-dialog',
   STOP_POWER_SAVE_BLOCKER: 'stop-power-save-blocker',
@@ -113,6 +114,50 @@ const SyncEvents = {
   },
 }
 
+// note: the multi-key shortcut values are currently just for display use in action titles
+const KeyboardShortcuts = {
+  APP: {
+    GENERAL: {
+      HISTORY_BACKWARD: 'alt+arrowleft',
+      HISTORY_FORWARD: 'alt+arrowright',
+      NEW_WINDOW: 'ctrl+N',
+      NAVIGATE_TO_SETTINGS: 'ctrl+,',
+      NAVIGATE_TO_HISTORY: 'ctrl+H',
+      NAVIGATE_TO_HISTORY_MAC: 'cmd+Y',
+    },
+    SITUATIONAL: {
+      REFRESH: 'r'
+    },
+  },
+  VIDEO_PLAYER: {
+    GENERAL: {
+      CAPTIONS: 'c',
+      THEATRE_MODE: 't',
+      FULLSCREEN: 'f',
+      FULLWINDOW: 's',
+      PICTURE_IN_PICTURE: 'i',
+      MUTE: 'm',
+      VOLUME_UP: 'arrowup',
+      VOLUME_DOWN: 'arrowdown',
+      STATS: 'd',
+      TAKE_SCREENSHOT: 'u',
+    },
+    PLAYBACK: {
+      PLAY: 'k',
+      LARGE_REWIND: 'j',
+      LARGE_FAST_FORWARD: 'l',
+      SMALL_REWIND: 'arrowleft',
+      SMALL_FAST_FORWARD: 'arrowright',
+      DECREASE_VIDEO_SPEED: 'o',
+      INCREASE_VIDEO_SPEED: 'p',
+      LAST_FRAME: ',',
+      NEXT_FRAME: '.',
+      LAST_CHAPTER: 'ctrl+arrowleft',
+      NEXT_CHAPTER: 'ctrl+arrowright',
+    }
+  },
+}
+
 // Utils
 const MAIN_PROFILE_ID = 'allChannels'
 
@@ -132,6 +177,7 @@ export {
   IpcChannels,
   DBActions,
   SyncEvents,
+  KeyboardShortcuts,
   MAIN_PROFILE_ID,
   MOBILE_WIDTH_THRESHOLD,
   PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD,
diff --git a/src/datastores/handlers/base.js b/src/datastores/handlers/base.js
index 614b21cd290e6..a0f620925b6a9 100644
--- a/src/datastores/handlers/base.js
+++ b/src/datastores/handlers/base.js
@@ -10,6 +10,21 @@ class Settings {
       await this.upsert('currentLocale', currentLocale.value.replace('_', '-'))
     }
 
+    // In FreeTube 0.22.0 and earlier the external player arguments were displayed in a text box,
+    // with the user manually entering `;` to separate the different arguments.
+    // This is a one time migration that converts the old string to a JSON array
+    const externalPlayerCustomArgs = await db.settings.findOneAsync({ _id: 'externalPlayerCustomArgs' })
+
+    if (externalPlayerCustomArgs && !externalPlayerCustomArgs.value.startsWith('[')) {
+      let newValue = '[]'
+
+      if (externalPlayerCustomArgs.value.length > 0) {
+        newValue = JSON.stringify(externalPlayerCustomArgs.value.split(';'))
+      }
+
+      await this.upsert('externalPlayerCustomArgs', newValue)
+    }
+
     return db.settings.findAsync({ _id: { $ne: 'bounds' } })
   }
 
@@ -168,7 +183,7 @@ class Playlists {
     return db.playlists.removeAsync({ _id, protected: { $ne: true } })
   }
 
-  static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
+  static deleteVideoIdByPlaylistId(_id, videoId, playlistItemId) {
     if (playlistItemId != null) {
       return db.playlists.updateAsync(
         { _id },
@@ -216,7 +231,7 @@ class SubscriptionCache {
     return db.subscriptionCache.findAsync({})
   }
 
-  static updateVideosByChannelId({ channelId, entries, timestamp }) {
+  static updateVideosByChannelId(channelId, entries, timestamp) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { videos: entries, videosTimestamp: timestamp } },
@@ -224,7 +239,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateLiveStreamsByChannelId({ channelId, entries, timestamp }) {
+  static updateLiveStreamsByChannelId(channelId, entries, timestamp) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { liveStreams: entries, liveStreamsTimestamp: timestamp } },
@@ -232,7 +247,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsByChannelId({ channelId, entries, timestamp }) {
+  static updateShortsByChannelId(channelId, entries, timestamp) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { shorts: entries, shortsTimestamp: timestamp } },
@@ -240,7 +255,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsWithChannelPageShortsByChannelId({ channelId, entries }) {
+  static updateShortsWithChannelPageShortsByChannelId(channelId, entries) {
     return db.subscriptionCache.findOneAsync({ _id: channelId }, { shorts: 1 }).then((doc) => {
       if (doc == null) { return }
 
@@ -273,7 +288,7 @@ class SubscriptionCache {
     })
   }
 
-  static updateCommunityPostsByChannelId({ channelId, entries, timestamp }) {
+  static updateCommunityPostsByChannelId(channelId, entries, timestamp) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { communityPosts: entries, communityPostsTimestamp: timestamp } },
diff --git a/src/datastores/handlers/electron.js b/src/datastores/handlers/electron.js
index 889c91d4f060c..b18706ec8ee5d 100644
--- a/src/datastores/handlers/electron.js
+++ b/src/datastores/handlers/electron.js
@@ -173,7 +173,7 @@ class Playlists {
     )
   }
 
-  static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
+  static deleteVideoIdByPlaylistId(_id, videoId, playlistItemId) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
       {
@@ -226,7 +226,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateVideosByChannelId({ channelId, entries, timestamp }) {
+  static updateVideosByChannelId(channelId, entries, timestamp) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -236,7 +236,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateLiveStreamsByChannelId({ channelId, entries, timestamp }) {
+  static updateLiveStreamsByChannelId(channelId, entries, timestamp) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -246,7 +246,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsByChannelId({ channelId, entries, timestamp }) {
+  static updateShortsByChannelId(channelId, entries, timestamp) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -256,7 +256,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsWithChannelPageShortsByChannelId({ channelId, entries }) {
+  static updateShortsWithChannelPageShortsByChannelId(channelId, entries) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -266,7 +266,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateCommunityPostsByChannelId({ channelId, entries, timestamp }) {
+  static updateCommunityPostsByChannelId(channelId, entries, timestamp) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
diff --git a/src/datastores/handlers/web.js b/src/datastores/handlers/web.js
index d68e24f042615..8491ca3d66872 100644
--- a/src/datastores/handlers/web.js
+++ b/src/datastores/handlers/web.js
@@ -101,8 +101,8 @@ class Playlists {
     return baseHandlers.playlists.delete(_id)
   }
 
-  static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
-    return baseHandlers.playlists.deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId })
+  static deleteVideoIdByPlaylistId(_id, videoId, playlistItemId) {
+    return baseHandlers.playlists.deleteVideoIdByPlaylistId(_id, videoId, playlistItemId)
   }
 
   static deleteVideoIdsByPlaylistId(_id, videoIds) {
@@ -127,43 +127,24 @@ class SubscriptionCache {
     return baseHandlers.subscriptionCache.find()
   }
 
-  static updateVideosByChannelId({ channelId, entries, timestamp }) {
-    return baseHandlers.subscriptionCache.updateVideosByChannelId({
-      channelId,
-      entries,
-      timestamp,
-    })
+  static updateVideosByChannelId(channelId, entries, timestamp) {
+    return baseHandlers.subscriptionCache.updateVideosByChannelId(channelId, entries, timestamp)
   }
 
-  static updateLiveStreamsByChannelId({ channelId, entries, timestamp }) {
-    return baseHandlers.subscriptionCache.updateLiveStreamsByChannelId({
-      channelId,
-      entries,
-      timestamp,
-    })
+  static updateLiveStreamsByChannelId(channelId, entries, timestamp) {
+    return baseHandlers.subscriptionCache.updateLiveStreamsByChannelId(channelId, entries, timestamp)
   }
 
-  static updateShortsByChannelId({ channelId, entries, timestamp }) {
-    return baseHandlers.subscriptionCache.updateShortsByChannelId({
-      channelId,
-      entries,
-      timestamp,
-    })
+  static updateShortsByChannelId(channelId, entries, timestamp) {
+    return baseHandlers.subscriptionCache.updateShortsByChannelId(channelId, entries, timestamp)
   }
 
-  static updateShortsWithChannelPageShortsByChannelId({ channelId, entries }) {
-    return baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId({
-      channelId,
-      entries,
-    })
+  static updateShortsWithChannelPageShortsByChannelId(channelId, entries) {
+    return baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId(channelId, entries)
   }
 
-  static updateCommunityPostsByChannelId({ channelId, entries, timestamp }) {
-    return baseHandlers.subscriptionCache.updateCommunityPostsByChannelId({
-      channelId,
-      entries,
-      timestamp,
-    })
+  static updateCommunityPostsByChannelId(channelId, entries, timestamp) {
+    return baseHandlers.subscriptionCache.updateCommunityPostsByChannelId(channelId, entries, timestamp)
   }
 
   static deleteMultipleChannels(channelIds) {
diff --git a/src/main/index.js b/src/main/index.js
index 92ce4f9ae01cc..806a99f0feef8 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -254,13 +254,16 @@ function runApp() {
 
     app.on('second-instance', (_, commandLine, __) => {
       // Someone tried to run a second instance, we should focus our window
-      if (mainWindow && typeof commandLine !== 'undefined') {
-        if (mainWindow.isMinimized()) mainWindow.restore()
-        mainWindow.focus()
-
+      if (typeof commandLine !== 'undefined') {
         const url = getLinkUrl(commandLine)
-        if (url) {
-          mainWindow.webContents.send(IpcChannels.OPEN_URL, url)
+        if (mainWindow && mainWindow.webContents) {
+          if (mainWindow.isMinimized()) mainWindow.restore()
+          mainWindow.focus()
+
+          if (url) mainWindow.webContents.send(IpcChannels.OPEN_URL, url)
+        } else {
+          if (url) startupUrl = url
+          createWindow()
         }
       }
     })
@@ -455,7 +458,7 @@ function runApp() {
           requestHeaders.Authorization = invidiousAuthorization.authorization
         }
       }
-      // eslint-disable-next-line n/no-callback-literal
+
       callback({ requestHeaders })
     })
 
@@ -466,7 +469,7 @@ function runApp() {
       if (responseHeaders) {
         delete responseHeaders['set-cookie']
       }
-      // eslint-disable-next-line n/no-callback-literal
+
       callback({ responseHeaders })
     })
 
@@ -639,6 +642,8 @@ function runApp() {
         return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
       }
 
+      // Determine window color to be shown (shown most prominently during initial app load)
+      // Uses the --bg-color for each corresponding theme
       switch (setting.value) {
         case 'dark':
           return '#212121'
@@ -660,6 +665,10 @@ function runApp() {
           return '#002B36'
         case 'solarized-light':
           return '#fdf6e3'
+        case 'gruvbox-dark':
+          return '#282828'
+        case 'gruvbox-light':
+          return '#fbf1c7'
         case 'system':
         default:
           return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
@@ -688,7 +697,9 @@ function runApp() {
         webSecurity: false,
         backgroundThrottling: false,
         contextIsolation: false
-      }
+      },
+      minWidth: 340,
+      minHeight: 380
     }
 
     const newWindow = new BrowserWindow(
@@ -755,7 +766,6 @@ function runApp() {
     // If called multiple times
     // Duplicate menu items will be added
     if (replaceMainWindow) {
-      // eslint-disable-next-line
       setMenu()
     }
 
@@ -822,10 +832,11 @@ function runApp() {
     })
   }
 
-  ipcMain.once(IpcChannels.APP_READY, () => {
+  ipcMain.on(IpcChannels.APP_READY, () => {
     if (startupUrl) {
-      mainWindow.webContents.send(IpcChannels.OPEN_URL, startupUrl)
+      mainWindow.webContents.send(IpcChannels.OPEN_URL, startupUrl, { isLaunchLink: true })
     }
+    startupUrl = null
   })
 
   function relaunch() {
@@ -885,6 +896,43 @@ function runApp() {
     session.defaultSession.closeAllConnections()
   })
 
+  // #region navigation history
+
+  const NAV_HISTORY_DISPLAY_LIMIT = 15
+  // Math.trunc but with a bitwise OR so that it can be calcuated at build time and the number inlined
+  const HALF_OF_NAV_HISTORY_DISPLAY_LIMIT = (NAV_HISTORY_DISPLAY_LIMIT / 2) | 0
+
+  ipcMain.handle(IpcChannels.GET_NAVIGATION_HISTORY, ({ sender }) => {
+    const activeIndex = sender.navigationHistory.getActiveIndex()
+    const length = sender.navigationHistory.length()
+
+    let end
+
+    if (activeIndex < HALF_OF_NAV_HISTORY_DISPLAY_LIMIT) {
+      end = Math.min(length - 1, NAV_HISTORY_DISPLAY_LIMIT - 1)
+    } else if (length - activeIndex < HALF_OF_NAV_HISTORY_DISPLAY_LIMIT + 1) {
+      end = length - 1
+    } else {
+      end = activeIndex + HALF_OF_NAV_HISTORY_DISPLAY_LIMIT
+    }
+
+    const dropdownOptions = []
+
+    for (let index = end; index >= Math.max(0, end + 1 - NAV_HISTORY_DISPLAY_LIMIT); --index) {
+      const routeLabel = sender.navigationHistory.getEntryAtIndex(index)?.title
+
+      dropdownOptions.push({
+        label: routeLabel,
+        value: index - activeIndex,
+        active: index === activeIndex
+      })
+    }
+
+    return dropdownOptions
+  })
+
+  // #endregion navigation history
+
   ipcMain.handle(IpcChannels.OPEN_EXTERNAL_LINK, (_, url) => {
     if (typeof url === 'string') {
       let parsedURL
@@ -1267,11 +1315,7 @@ function runApp() {
           return null
 
         case DBActions.PLAYLISTS.DELETE_VIDEO_ID:
-          await baseHandlers.playlists.deleteVideoIdByPlaylistId({
-            _id: data._id,
-            videoId: data.videoId,
-            playlistItemId: data.playlistItemId,
-          })
+          await baseHandlers.playlists.deleteVideoIdByPlaylistId(data._id, data.videoId, data.playlistItemId)
           syncOtherWindows(
             IpcChannels.SYNC_PLAYLISTS,
             event,
@@ -1324,7 +1368,7 @@ function runApp() {
           return await baseHandlers.subscriptionCache.find()
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_VIDEOS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateVideosByChannelId(data)
+          await baseHandlers.subscriptionCache.updateVideosByChannelId(data.channelId, data.entries, data.timestamp)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1333,7 +1377,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_LIVE_STREAMS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateLiveStreamsByChannelId(data)
+          await baseHandlers.subscriptionCache.updateLiveStreamsByChannelId(data.channelId, data.entries, data.timestamp)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1342,7 +1386,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_SHORTS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateShortsByChannelId(data)
+          await baseHandlers.subscriptionCache.updateShortsByChannelId(data.channelId, data.entries, data.timestamp)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1351,7 +1395,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_SHORTS_WITH_CHANNEL_PAGE_SHORTS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId(data)
+          await baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId(data.channelId, data.entries)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1360,7 +1404,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_COMMUNITY_POSTS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateCommunityPostsByChannelId(data)
+          await baseHandlers.subscriptionCache.updateCommunityPostsByChannelId(data.channelId, data.entries, data.timestamp)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1415,6 +1459,7 @@ function runApp() {
   app.on('window-all-closed', () => {
     // Clean up resources (datastores' compaction + Electron cache and storage data clearing)
     cleanUpResources().finally(() => {
+      mainWindow = null
       if (process.platform !== 'darwin') {
         app.quit()
       }
@@ -1484,6 +1529,7 @@ function runApp() {
       mainWindow.webContents.send(IpcChannels.OPEN_URL, baseUrl(url))
     } else {
       startupUrl = baseUrl(url)
+      if (app.isReady()) createWindow()
     }
   })
 
diff --git a/src/renderer/App.js b/src/renderer/App.js
index 6f29f4e2a7c42..aac7cbd983015 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -1,16 +1,16 @@
 import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import FtFlexBox from './components/ft-flex-box/ft-flex-box.vue'
 import TopNav from './components/top-nav/top-nav.vue'
-import SideNav from './components/side-nav/side-nav.vue'
+import SideNav from './components/SideNav/SideNav.vue'
 import FtNotificationBanner from './components/ft-notification-banner/ft-notification-banner.vue'
 import FtPrompt from './components/ft-prompt/ft-prompt.vue'
 import FtButton from './components/ft-button/ft-button.vue'
 import FtToast from './components/ft-toast/ft-toast.vue'
-import FtProgressBar from './components/ft-progress-bar/ft-progress-bar.vue'
+import FtProgressBar from './components/FtProgressBar/FtProgressBar.vue'
 import FtPlaylistAddVideoPrompt from './components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue'
 import FtCreatePlaylistPrompt from './components/ft-create-playlist-prompt/ft-create-playlist-prompt.vue'
-import FtSearchFilters from './components/ft-search-filters/ft-search-filters.vue'
+import FtSearchFilters from './components/FtSearchFilters/FtSearchFilters.vue'
 import { marked } from 'marked'
 import { IpcChannels } from '../constants'
 import packageDetails from '../../package.json'
@@ -82,7 +82,7 @@ export default defineComponent({
     },
     windowTitle: function () {
       const routePath = this.$route.path
-      if (!routePath.startsWith('/channel/') && !routePath.startsWith('/watch/') && !routePath.startsWith('/hashtag/') && !routePath.startsWith('/playlist/')) {
+      if (!routePath.startsWith('/channel/') && !routePath.startsWith('/watch/') && !routePath.startsWith('/hashtag/') && !routePath.startsWith('/playlist/') && !routePath.startsWith('/search/')) {
         let title = translateWindowTitle(this.$route.meta.title)
         if (!title) {
           title = packageDetails.productName
@@ -97,6 +97,7 @@ export default defineComponent({
     externalPlayer: function () {
       return this.$store.getters.getExternalPlayer
     },
+
     defaultInvidiousInstance: function () {
       return this.$store.getters.getDefaultInvidiousInstance
     },
@@ -142,6 +143,14 @@ export default defineComponent({
 
     externalLinkHandling: function () {
       return this.$store.getters.getExternalLinkHandling
+    },
+
+    appTitle: function () {
+      return this.$store.getters.getAppTitle
+    },
+
+    openDeepLinksInNewWindow: function () {
+      return this.$store.getters.getOpenDeepLinksInNewWindow
     }
   },
   watch: {
@@ -154,10 +163,11 @@ export default defineComponent({
     secColor: 'checkThemeSettings',
 
     locale: 'setLocale',
+
+    appTitle: 'setDocumentTitle'
   },
   created () {
     this.checkThemeSettings()
-    this.setWindowTitle()
     this.setLocale()
   },
   mounted: function () {
@@ -203,10 +213,16 @@ export default defineComponent({
         if (this.$router.currentRoute.path === '/') {
           this.$router.replace({ path: this.landingPage })
         }
+
+        this.setWindowTitle()
       })
     })
   },
   methods: {
+    setDocumentTitle: function(value) {
+      document.title = value
+      this.$nextTick(() => this.$refs.topNav?.setActiveNavigationHistoryEntryTitle(value))
+    },
     checkThemeSettings: function () {
       const theme = {
         baseTheme: this.baseTheme || 'dark',
@@ -512,9 +528,9 @@ export default defineComponent({
     },
 
     enableOpenUrl: function () {
-      ipcRenderer.on(IpcChannels.OPEN_URL, (event, url) => {
+      ipcRenderer.on(IpcChannels.OPEN_URL, (event, url, { isLaunchLink = false } = { }) => {
         if (url) {
-          this.handleYoutubeLink(url)
+          this.handleYoutubeLink(url, { doCreateNewWindow: this.openDeepLinksInNewWindow && !isLaunchLink })
         }
       })
 
@@ -535,7 +551,7 @@ export default defineComponent({
 
     setWindowTitle: function() {
       if (this.windowTitle !== null) {
-        document.title = this.windowTitle
+        this.setAppTitle(this.windowTitle)
       }
     },
 
@@ -565,6 +581,10 @@ export default defineComponent({
       'updateSecColor',
       'showOutlines',
       'hideOutlines',
+    ]),
+
+    ...mapMutations([
+      'setAppTitle'
     ])
   }
 })
diff --git a/src/renderer/components/ChannelDetails/ChannelDetails.vue b/src/renderer/components/ChannelDetails/ChannelDetails.vue
index 296457569d381..49d6fef6c887e 100644
--- a/src/renderer/components/ChannelDetails/ChannelDetails.vue
+++ b/src/renderer/components/ChannelDetails/ChannelDetails.vue
@@ -74,6 +74,22 @@
           role="tablist"
           :aria-label="$t('Channel.Channel Tabs')"
         >
+          <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
+          <div
+            v-if="visibleTabs.includes('home')"
+            id="homeTab"
+            class="tab"
+            :class="{ selectedTab: currentTab === 'home' }"
+            role="tab"
+            :aria-selected="String(currentTab === 'home')"
+            aria-controls="homePanel"
+            :tabindex="(currentTab === 'home' || currentTab === 'search') ? 0 : -1"
+            @click="changeTab('home')"
+            @keydown.left.right="focusTab('home', $event)"
+            @keydown.enter.space.prevent="changeTab('home')"
+          >
+            {{ $t("Channel.Home.Home").toUpperCase() }}
+          </div>
           <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
           <div
             v-if="visibleTabs.includes('videos')"
@@ -207,6 +223,7 @@
           v-if="showSearchBar"
           ref="searchBar"
           :placeholder="$t('Channel.Search Channel')"
+          :value="query"
           :show-clear-text-button="true"
           class="channelSearch"
           :maxlength="255"
@@ -275,19 +292,26 @@ const props = defineProps({
   currentTab: {
     type: String,
     default: 'videos'
-  }
+  },
+  query: {
+    type: String,
+    default: ''
+  },
 })
 
 const emit = defineEmits(['change-tab', 'search', 'subscribed'])
 
+/** @type {import('vue').ComputedRef<boolean>} */
 const hideChannelSubscriptions = computed(() => {
   return store.getters.getHideChannelSubscriptions
 })
 
+/** @type {import('vue').ComputedRef<boolean>} */
 const hideSharingActions = computed(() => {
   return store.getters.getHideSharingActions
 })
 
+/** @type {import('vue').ComputedRef<boolean>} */
 const hideUnsubscribeButton = computed(() => {
   return store.getters.getHideUnsubscribeButton
 })
diff --git a/src/renderer/components/ChannelHome/ChannelHome.css b/src/renderer/components/ChannelHome/ChannelHome.css
new file mode 100644
index 0000000000000..8c7bb1eb40b0b
--- /dev/null
+++ b/src/renderer/components/ChannelHome/ChannelHome.css
@@ -0,0 +1,35 @@
+.shelfTitle {
+  font-size: 24px;
+  cursor: pointer;
+}
+
+.shelfTitle::marker {
+  font-size: 20px;
+  color: var(--accent-color);
+}
+
+.shelfUnderline {
+  border-color: var(--primary-color);
+}
+
+.playAllSpan {
+  font-size: 18px;
+  margin-inline-start: 10px;
+}
+
+.playAllLink {
+  font-style: italic;
+  padding-block: 5px;
+  padding-inline: 7px;
+  border-radius: 10px;
+  text-decoration: none;
+}
+
+.playAllLink:hover {
+  background-color: var(--bg-color);
+}
+
+.shelfSubtitle {
+  font-style: italic;
+  color: var(--tertiary-text-color);
+}
diff --git a/src/renderer/components/ChannelHome/ChannelHome.vue b/src/renderer/components/ChannelHome/ChannelHome.vue
new file mode 100644
index 0000000000000..2e23da23cddc8
--- /dev/null
+++ b/src/renderer/components/ChannelHome/ChannelHome.vue
@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <div
+      v-for="(shelf, index) in filteredShelves"
+      :key="index"
+    >
+      <details
+        open
+      >
+        <summary
+          class="shelfTitle"
+        >
+          {{ shelf.title }}
+          <span
+            v-if="shelf.playlistId"
+            class="playAllSpan"
+          >
+            <router-link
+              class="playAllLink"
+              :to="{
+                path: `/playlist/${shelf.playlistId}`
+              }"
+            >
+              <FontAwesomeIcon
+                class="thumbnail"
+                :icon="['fas', 'list']"
+              />
+              {{ $t('Channel.Home.View Playlist') }}
+            </router-link>
+          </span>
+          <hr class="shelfUnderline">
+        </summary>
+        <p
+          v-if="shelf.subtitle"
+          class="shelfSubtitle"
+        >
+          {{ shelf.subtitle }}
+        </p>
+        <FtElementList
+          :data="shelf.content"
+          :use-channels-hidden-preference="false"
+          :display="shelf.isCommunity ? 'list' : ''"
+        />
+      </details>
+    </div>
+  </div>
+</template>
+
+<script setup>
+
+import { computed } from 'vue'
+import FtElementList from '../FtElementList/FtElementList.vue'
+import store from '../../store/index'
+
+const props = defineProps({
+  shelves: {
+    type: Array,
+    default: () => []
+  }
+})
+
+/** @type {import('vue').ComputedRef<bool>} */
+const hideFeaturedChannels = computed(() => {
+  return store.getters.getHideFeaturedChannels
+})
+
+const filteredShelves = computed(() => {
+  let shelves = props.shelves
+  if (hideFeaturedChannels.value) {
+    shelves = shelves.filter(shelf => shelf.content[0].type !== 'channel')
+  }
+
+  return shelves.filter(shelf => shelf.content.length > 0)
+})
+</script>
+
+<style scoped src="./ChannelHome.css" />
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.css b/src/renderer/components/CommentSection/CommentSection.css
similarity index 100%
rename from src/renderer/components/watch-video-comments/watch-video-comments.css
rename to src/renderer/components/CommentSection/CommentSection.css
diff --git a/src/renderer/components/CommentSection/CommentSection.vue b/src/renderer/components/CommentSection/CommentSection.vue
new file mode 100644
index 0000000000000..2810ae0993b55
--- /dev/null
+++ b/src/renderer/components/CommentSection/CommentSection.vue
@@ -0,0 +1,795 @@
+<template>
+  <FtCard
+    class="card"
+  >
+    <h3
+      v-if="commentData.length > 0 && !isLoading && showComments"
+      class="commentsTitle"
+    >
+      {{ $t("Comments.Comments") }}
+      <span
+        class="hideComments"
+        role="button"
+        tabindex="0"
+        @click="showComments = false"
+        @keydown.space.prevent="showComments = false"
+        @keydown.enter.prevent="showComments = false"
+      >
+        {{ $t("Comments.Hide Comments") }}
+      </span>
+    </h3>
+    <h4
+      v-if="canPerformInitialCommentLoading"
+      class="getCommentsTitle"
+      role="button"
+      tabindex="0"
+      @click="getCommentData"
+      @keydown.space.prevent="getCommentData"
+      @keydown.enter.prevent="getCommentData"
+    >
+      {{ $t("Comments.Click to View Comments") }}
+    </h4>
+    <h4
+      v-if="commentData.length > 0 && !isLoading && !showComments"
+      class="getCommentsTitle"
+      role="button"
+      tabindex="0"
+      @click="showComments = true"
+      @keydown.space.prevent="showComments = true"
+      @keydown.enter.prevent="showComments = true"
+    >
+      {{ $t("Comments.Click to View Comments") }}
+    </h4>
+    <FtSelect
+      v-if="commentData.length > 0 && !isLoading && showComments && showSortBy"
+      class="commentSort"
+      :placeholder="$t('Comments.Sort by')"
+      :value="currentSortValue"
+      :select-names="sortNames"
+      :select-values="sortValues"
+      :icon="['fas', 'arrow-down-short-wide']"
+      @change="handleSortChange"
+    />
+    <div
+      v-if="commentData.length > 0 && showComments"
+    >
+      <div
+        v-for="(comment, index) in commentData"
+        :id="'comment' + index"
+        :key="comment.id"
+        class="comment"
+      >
+        <router-link
+          :to="`/channel/${comment.authorLink}`"
+          tabindex="-1"
+        >
+          <!-- Hide comment photo only if it isn't the video uploader -->
+          <div
+            v-if="hideCommentPhotos && !comment.isOwner"
+            class="commentThumbnailHidden"
+          >
+            {{ comment.author.substring(1, 2) }}
+          </div>
+          <img
+            v-else
+            :src="comment.authorThumb"
+            alt=""
+            class="commentThumbnail"
+          >
+        </router-link>
+        <p
+          v-if="comment.isPinned"
+          class="commentPinned"
+        >
+          <FontAwesomeIcon
+            :icon="['fas', 'thumbtack']"
+          />
+          {{ $t("Comments.Pinned by") }} {{ channelName }}
+        </p>
+        <p
+          class="commentAuthorWrapper"
+        >
+          <router-link
+            class="commentAuthor"
+            :class="{
+              commentOwner: comment.isOwner
+            }"
+            :to="`/channel/${comment.authorLink}`"
+          >
+            {{ comment.author }}
+          </router-link>
+          <img
+            v-if="comment.isMember"
+            :src="comment.memberIconUrl"
+            :title="$t('Comments.Member')"
+            :aria-label="$t('Comments.Member')"
+            class="commentMemberIcon"
+            alt=""
+          >
+          <img
+            v-if="isSubscribedToChannel(comment.authorId)"
+            :title="$t('Comments.Subscribed')"
+            :aria-label="$t('Comments.Subscribed')"
+            class="commentSubscribedIcon"
+            alt=""
+          >
+          <span class="commentDate">
+            {{ comment.time }}
+          </span>
+        </p>
+        <FtTimestampCatcher
+          class="commentText"
+          :input-html="comment.text"
+          @timestamp-event="onTimestamp"
+        />
+        <p class="commentLikeCount">
+          <template
+            v-if="!hideCommentLikes"
+          >
+            <FontAwesomeIcon
+              :icon="['fas', 'thumbs-up']"
+            />
+            {{ comment.likes }}
+          </template>
+          <span
+            v-if="comment.isHearted"
+            class="commentHeartBadge"
+          >
+            <img
+              :src="channelThumbnail"
+              :title="$t('Comments.Hearted')"
+              :aria-label="$t('Comments.Hearted')"
+              class="commentHeartBadgeImg"
+              alt=""
+            >
+            <FontAwesomeIcon
+              :icon="['fas', 'heart']"
+              class="commentHeartBadgeWhite"
+            />
+            <FontAwesomeIcon
+              :icon="['fas', 'heart']"
+              class="commentHeartBadgeRed"
+            />
+          </span>
+          <span
+            v-if="comment.numReplies > 0"
+            class="commentMoreReplies"
+            role="button"
+            tabindex="0"
+            @click="toggleCommentReplies(index)"
+            @keydown.space.prevent="toggleCommentReplies(index)"
+            @keydown.enter.prevent="toggleCommentReplies(index)"
+          >
+            <span v-if="!comment.showReplies">{{ $t("Comments.View") }}</span>
+            <span v-else>{{ $t("Comments.Hide") }}</span>
+            {{ comment.numReplies }}
+            <span v-if="comment.numReplies === 1">{{ $t("Comments.Reply").toLowerCase() }}</span>
+            <span v-else>{{ $t("Comments.Replies").toLowerCase() }}</span>
+            <span v-if="comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.From {channelName}", { channelName }) }}</span>
+            <span v-if="comment.numReplies > 1 && comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.And others") }}</span>
+          </span>
+        </p>
+        <div
+          v-if="comment.showReplies"
+          class="commentReplies"
+        >
+          <div
+            v-for="(reply, replyIndex) in comment.replies"
+            :id="'comment' + index + '-' + replyIndex"
+            :key="replyIndex"
+            class="comment"
+          >
+            <router-link
+              :to="`/channel/${reply.authorLink}`"
+              tabindex="-1"
+            >
+              <!-- Hide comment photo only if it isn't the video uploader -->
+              <div
+                v-if="hideCommentPhotos && !reply.isOwner"
+                class="commentThumbnailHidden"
+              >
+                {{ reply.author.substring(1, 2) }}
+              </div>
+              <img
+                v-else
+                :src="reply.authorThumb"
+                alt=""
+                class="commentThumbnail"
+              >
+            </router-link>
+            <p class="commentAuthorWrapper">
+              <router-link
+                class="commentAuthor"
+                :class="{
+                  commentOwner: reply.isOwner
+                }"
+                :to="`/channel/${reply.authorLink}`"
+              >
+                {{ reply.author }}
+              </router-link>
+              <img
+                v-if="reply.isMember"
+                :src="reply.memberIconUrl"
+                class="commentMemberIcon"
+                alt=""
+              >
+              <img
+                v-if="isSubscribedToChannel(reply.authorId)"
+                :title="$t('Comments.Subscribed')"
+                :aria-label="$t('Comments.Subscribed')"
+                class="commentSubscribedIcon"
+                alt=""
+              >
+              <span class="commentDate">
+                {{ reply.time }}
+              </span>
+            </p>
+            <FtTimestampCatcher
+              class="commentText"
+              :input-html="reply.text"
+              @timestamp-event="onTimestamp"
+            />
+            <p class="commentLikeCount">
+              <template
+                v-if="!hideCommentLikes"
+              >
+                <FontAwesomeIcon
+                  v-if="!hideCommentLikes"
+                  :icon="['fas', 'thumbs-up']"
+                />
+                {{ reply.likes }}
+              </template>
+            </p>
+            <p
+              v-if="reply.numReplies > 0"
+              class="commentMoreReplies"
+            >
+              {{ $t('Comments.View {replyCount} replies', { replyCount: reply.numReplies }) }}
+            </p>
+          </div>
+          <div
+            v-if="comment.hasReplyToken"
+            class="showMoreReplies"
+            role="button"
+            tabindex="0"
+            @click="getCommentReplies(index)"
+            @keydown.space.prevent="getCommentReplies(index)"
+            @keydown.enter.prevent="getCommentReplies(index)"
+          >
+            <span>{{ $t("Comments.Show More Replies") }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      v-else-if="showComments && !isLoading"
+    >
+      <h3
+        v-if="isPostComments"
+        class="noCommentMsg"
+      >
+        {{ $t("Comments.There are no comments available for this post") }}
+      </h3>
+      <h3
+        v-else
+        class="noCommentMsg"
+      >
+        {{ $t("Comments.There are no comments available for this video") }}
+      </h3>
+    </div>
+    <h4
+      v-if="canPerformMoreCommentLoading"
+      class="getMoreComments"
+      role="button"
+      tabindex="0"
+      @click="getMoreComments"
+      @keydown.space.prevent="getMoreComments"
+      @keydown.enter.prevent="getMoreComments"
+    >
+      {{ $t("Comments.Load More Comments") }}
+    </h4>
+    <FtLoader
+      v-if="isLoading"
+    />
+    <div
+      v-observe-visibility="observeVisibilityOptions"
+    >
+      <!--
+        Dummy element to be observed by Intersection Observer
+      -->
+    </div>
+  </FtCard>
+</template>
+
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { computed, ref, shallowRef } from 'vue'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+
+import FtCard from '../ft-card/ft-card.vue'
+import FtLoader from '../ft-loader/ft-loader.vue'
+import FtSelect from '../ft-select/ft-select.vue'
+import FtTimestampCatcher from '../FtTimestampCatcher.vue'
+
+import store from '../../store/index'
+
+import { copyToClipboard, showToast } from '../../helpers/utils'
+import { getLocalComments, parseLocalComment } from '../../helpers/api/local'
+import {
+  getInvidiousCommunityPostCommentReplies,
+  getInvidiousCommunityPostComments,
+  invidiousGetCommentReplies,
+  invidiousGetComments
+} from '../../helpers/api/invidious'
+
+const { t } = useI18n()
+
+const props = defineProps({
+  id: {
+    type: String,
+    required: true
+  },
+  channelName: {
+    type: String,
+    required: true
+  },
+  channelThumbnail: {
+    type: String,
+    required: true
+  },
+  videoPlayerReady: {
+    type: Boolean,
+    required: true
+  },
+  isPostComments: {
+    type: Boolean,
+    default: false,
+  },
+  postAuthorId: {
+    type: String,
+    default: null
+  },
+  showSortBy: {
+    type: Boolean,
+    default: true,
+  }
+})
+
+const isLoading = ref(false)
+const showComments = ref(false)
+const nextPageToken = shallowRef(null)
+
+// Has to be ref not shallowRef, as the replies are stored in a property on the comments
+// we need to react to new replies and showReplies being toggled
+const commentData = ref([])
+
+/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
+const backendPreference = computed(() => {
+  return store.getters.getBackendPreference
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const backendFallback = computed(() => {
+  return store.getters.getBackendFallback
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideCommentLikes = computed(() => {
+  return store.getters.getHideCommentLikes
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideCommentPhotos = computed(() => {
+  return store.getters.getHideCommentPhotos
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const generalAutoLoadMorePaginatedItemsEnabled = computed(() => {
+  return store.getters.getGeneralAutoLoadMorePaginatedItemsEnabled
+})
+
+const canPerformInitialCommentLoading = computed(() => {
+  return commentData.value.length === 0 && !isLoading.value && !showComments.value
+})
+
+const canPerformMoreCommentLoading = computed(() => {
+  return commentData.value.length > 0 && !isLoading.value && showComments.value && !!nextPageToken.value
+})
+
+const observeVisibilityOptions = computed(() => {
+  if (!generalAutoLoadMorePaginatedItemsEnabled.value) {
+    return false
+  }
+  if (!props.videoPlayerReady && !props.isPostComments) { return false }
+
+  return {
+    /**
+     * @param {boolean} isVisible
+     */
+    callback: (isVisible) => {
+      // This is also fired when **hidden**
+      // No point doing anything if not visible
+      if (!isVisible) { return }
+      // It's possible the comments are being loaded/already loaded
+      if (canPerformInitialCommentLoading.value) {
+        getCommentData()
+      } else if (canPerformMoreCommentLoading.value) {
+        getMoreComments()
+      }
+    },
+    intersection: {
+      // Only when it intersects with N% above bottom
+      rootMargin: '0% 0% 0% 0%',
+    },
+    // Callback responsible for loading multiple comment pages
+    once: false,
+  }
+})
+
+const sortNames = computed(() => [
+  t('Comments.Top comments'),
+  t('Comments.Newest first')
+])
+
+const sortValues = [
+  'top',
+  'newest'
+]
+
+const sortNewest = ref(false)
+
+const currentSortValue = computed(() => sortNewest.value ? 'newest' : 'top')
+
+function handleSortChange() {
+  sortNewest.value = !sortNewest.value
+  commentData.value = []
+  nextPageToken.value = null
+  getCommentData()
+}
+
+const emit = defineEmits(['timestamp-event'])
+
+/**
+ * @param {number} timestamp
+ */
+function onTimestamp(timestamp) {
+  emit('timestamp-event', timestamp)
+}
+
+/** @type {import('vue').ComputedRef<Set<string>>} */
+const subscribedChannelIds = computed(() => {
+  return store.getters.getActiveProfile.subscriptions.reduce((set, channel) => {
+    return set.add(channel.id)
+  }, new Set())
+})
+
+/**
+ * @param {string} channelId
+ */
+function isSubscribedToChannel(channelId) {
+  return subscribedChannelIds.value.has(channelId)
+}
+
+function getCommentData() {
+  isLoading.value = true
+
+  if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious' || props.isPostComments) {
+    if (!props.isPostComments) {
+      getCommentDataInvidious()
+    } else {
+      getPostCommentsInvidious()
+    }
+  } else {
+    getCommentDataLocal()
+  }
+}
+
+function getMoreComments() {
+  if (commentData.value.length === 0 || nextPageToken.value == null) {
+    showToast(t('Comments.There are no more comments for this video'))
+  } else {
+    if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious' || props.isPostComments) {
+      if (!props.isPostComments) {
+        getCommentDataInvidious()
+      } else {
+        getPostCommentsInvidious()
+      }
+    } else {
+      getCommentDataLocal(true)
+    }
+  }
+}
+
+/**
+ * @param {number} index
+ */
+function toggleCommentReplies(index) {
+  if (commentData.value[index].showReplies || commentData.value[index].replies.length > 0) {
+    commentData.value[index].showReplies = !commentData.value[index].showReplies
+  } else {
+    getCommentReplies(index)
+  }
+}
+
+/**
+ * @param {number} index
+ */
+function getCommentReplies(index) {
+  if (!process.env.SUPPORTS_LOCAL_API || commentData.value[index].dataType === 'invidious' || props.isPostComments) {
+    if (!props.isPostComments) {
+      getCommentRepliesInvidious(index)
+    } else {
+      getPostCommentRepliesInvidious(index)
+    }
+  } else {
+    getCommentRepliesLocal(index)
+  }
+}
+
+/** @type {Map<string, (import('youtubei.js').YTNodes.CommentThread | string)>} */
+const replyTokens = new Map()
+
+/**
+ * @param {boolean | undefined} more
+ */
+async function getCommentDataLocal(more = false) {
+  try {
+    /** @type {import('youtubei.js').YT.Comments} */
+    let comments
+    if (more) {
+      comments = await nextPageToken.value.getContinuation()
+    } else {
+      comments = await getLocalComments(props.id, sortNewest.value)
+    }
+
+    const parsedComments = comments.contents
+      .map(commentThread => {
+        // Use destructuring to create a new object without the replyToken
+        const { replyToken, ...comment } = parseLocalComment(commentThread.comment, commentThread)
+
+        if (comment.hasReplyToken) {
+          replyTokens.set(comment.id, replyToken)
+        } else {
+          replyTokens.delete(comment.id)
+        }
+
+        return comment
+      })
+
+    if (more) {
+      commentData.value = commentData.value.concat(parsedComments)
+    } else {
+      commentData.value = parsedComments
+    }
+
+    nextPageToken.value = comments.has_continuation ? comments : null
+    isLoading.value = false
+    showComments.value = true
+  } catch (err) {
+    // region No comment detection
+    // No comment related info when video info requested earlier in parent component
+    if (err.message.includes('Comments page did not have any content')) {
+      // For videos without any comment (comment disabled?)
+      // e.g. https://youtu.be/8NBSwDEf8a8
+      commentData.value = []
+      nextPageToken.value = null
+      isLoading.value = false
+      showComments.value = true
+      return
+    }
+    // endregion No comment detection
+
+    console.error(err)
+    const errorMessage = t('Local API Error (Click to copy)')
+    showToast(`${errorMessage}: ${err}`, 10000, () => {
+      copyToClipboard(err)
+    })
+    if (backendFallback.value && backendPreference.value === 'local') {
+      showToast(t('Falling back to Invidious API'))
+      getCommentDataInvidious()
+    } else {
+      isLoading.value = false
+    }
+  }
+}
+
+/**
+ * @param {number} index
+ */
+async function getCommentRepliesLocal(index) {
+  showToast(t('Comments.Getting comment replies, please wait'))
+
+  try {
+    const comment = commentData.value[index]
+    /** @type {import('youtubei.js').YTNodes.CommentThread} */
+    const commentThread = replyTokens.get(comment.id)
+
+    if (commentThread == null) {
+      replyTokens.delete(comment.id)
+      comment.hasReplyToken = false
+      return
+    }
+
+    if (comment.replies.length > 0) {
+      await commentThread.getContinuation()
+      comment.replies = comment.replies.concat(commentThread.replies.map(reply => parseLocalComment(reply)))
+    } else {
+      await commentThread.getReplies()
+      comment.replies = commentThread.replies.map(reply => parseLocalComment(reply))
+    }
+
+    if (commentThread.has_continuation) {
+      replyTokens.set(comment.id, commentThread)
+      comment.hasReplyToken = true
+    } else {
+      replyTokens.delete(comment.id)
+      comment.hasReplyToken = false
+    }
+
+    comment.showReplies = true
+  } catch (err) {
+    console.error(err)
+    const errorMessage = t('Local API Error (Click to copy)')
+    showToast(`${errorMessage}: ${err}`, 10000, () => {
+      copyToClipboard(err)
+    })
+    if (backendFallback.value && backendPreference.value === 'local') {
+      showToast(t('Falling back to Invidious API'))
+      getCommentDataInvidious()
+    } else {
+      isLoading.value = false
+    }
+  }
+}
+
+async function getCommentDataInvidious() {
+  try {
+    let { response, commentData: comments } = await invidiousGetComments({
+      id: props.id,
+      nextPageToken: nextPageToken.value,
+      sortNewest: sortNewest.value
+    })
+
+    comments = comments.map(({ replyToken, ...comment }) => {
+      if (comment.hasReplyToken) {
+        replyTokens.set(comment.id, replyToken)
+      } else {
+        replyTokens.delete(comment.id)
+      }
+
+      return comment
+    })
+
+    commentData.value = commentData.value.concat(comments)
+    nextPageToken.value = response.continuation
+    isLoading.value = false
+    showComments.value = true
+  } catch (err) {
+    // region No comment detection
+    // No comment related info when video info requested earlier in parent component
+    if (err.message.includes('Comments not found')) {
+      // For videos without any comment (comment disabled?)
+      // e.g. https://youtu.be/8NBSwDEf8a8
+      commentData.value = []
+      nextPageToken.value = null
+      isLoading.value = false
+      showComments.value = true
+      return
+    }
+    // endregion No comment detection
+
+    console.error(err)
+    const errorMessage = t('Invidious API Error (Click to copy)')
+    showToast(`${errorMessage}: ${err}`, 10000, () => {
+      copyToClipboard(err)
+    })
+
+    if (process.env.SUPPORTS_LOCAL_API && backendFallback.value && backendPreference.value === 'invidious') {
+      showToast(t('Falling back to Local API'))
+      getCommentDataLocal()
+    } else {
+      isLoading.value = false
+    }
+  }
+}
+
+/**
+ * @param {number} index
+ */
+async function getCommentRepliesInvidious(index) {
+  showToast(t('Comments.Getting comment replies, please wait'))
+
+  const comment = commentData.value[index]
+  const replyToken = replyTokens.get(comment.id)
+
+  try {
+    const { commentData, continuation } = await invidiousGetCommentReplies({ id: props.id, replyToken })
+
+    comment.replies = comment.replies.concat(commentData)
+    comment.showReplies = true
+
+    if (continuation) {
+      replyTokens.set(comment.id, continuation)
+      comment.hasReplyToken = true
+    } else {
+      replyTokens.delete(comment.id)
+      comment.hasReplyToken = false
+    }
+
+    isLoading.value = false
+  } catch (error) {
+    console.error(error)
+    const errorMessage = t('Invidious API Error (Click to copy)')
+    showToast(`${errorMessage}: ${error}`, 10000, () => {
+      copyToClipboard(error)
+    })
+    isLoading.value = false
+  }
+}
+
+function getPostCommentsInvidious() {
+  const fetchComments = nextPageToken.value == null
+    ? getInvidiousCommunityPostComments({ postId: props.id, authorId: props.postAuthorId })
+    : getInvidiousCommunityPostCommentReplies({ postId: props.id, replyToken: nextPageToken.value, authorId: props.postAuthorId })
+
+  fetchComments.then(({ response, commentData: comments, continuation }) => {
+    comments = comments.map(({ replyToken, ...comment }) => {
+      if (comment.hasReplyToken) {
+        replyTokens.set(comment.id, replyToken)
+      } else {
+        replyTokens.delete(comment.id)
+      }
+
+      return comment
+    })
+
+    commentData.value = commentData.value.concat(comments)
+    nextPageToken.value = response?.continuation ?? continuation
+    isLoading.value = false
+    showComments.value = true
+  }).catch((err) => {
+    console.error(err)
+    const errorMessage = t('Invidious API Error (Click to copy)')
+    showToast(`${errorMessage}: ${err}`, 10000, () => {
+      copyToClipboard(err)
+    })
+    isLoading.value = false
+  })
+}
+
+async function getPostCommentRepliesInvidious(index) {
+  showToast(t('Comments.Getting comment replies, please wait'))
+
+  const comment = commentData.value[index]
+  const replyToken = replyTokens.get(comment.id)
+
+  try {
+    const { commentData: comments, continuation } = await getInvidiousCommunityPostCommentReplies({
+      postId: props.id,
+      replyToken: replyToken,
+      authorId: props.postAuthorId
+    })
+    comment.replies = comment.replies.concat(comments)
+    comment.showReplies = true
+
+    if (continuation) {
+      replyTokens.set(comment.id, continuation)
+      comment.hasReplyToken = true
+    } else {
+      replyTokens.delete(comment.id)
+      comment.hasReplyToken = false
+    }
+
+    isLoading.value = false
+  } catch (error) {
+    console.error(error)
+    const errorMessage = t('Invidious API Error (Click to copy)')
+    showToast(`${errorMessage}: ${error}`, 10000, () => {
+      copyToClipboard(error)
+    })
+    isLoading.value = false
+  }
+}
+</script>
+
+<style scoped src="./CommentSection.css" />
diff --git a/src/renderer/components/experimental-settings/experimental-settings.css b/src/renderer/components/ExperimentalSettings/ExperimentalSettings.css
similarity index 100%
rename from src/renderer/components/experimental-settings/experimental-settings.css
rename to src/renderer/components/ExperimentalSettings/ExperimentalSettings.css
diff --git a/src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue b/src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue
new file mode 100644
index 0000000000000..bec628ef17322
--- /dev/null
+++ b/src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue
@@ -0,0 +1,78 @@
+<template>
+  <FtSettingsSection
+    :title="$t('Settings.Experimental Settings.Experimental Settings')"
+  >
+    <p class="experimental-warning">
+      {{ $t('Settings.Experimental Settings.Warning') }}
+    </p>
+    <FtFlexBox>
+      <FtToggleSwitch
+        tooltip-position="top"
+        :label="$t('Settings.Experimental Settings.Replace HTTP Cache')"
+        compact
+        :default-value="replaceHttpCache"
+        :disabled="replaceHttpCacheLoading"
+        :tooltip="$t('Tooltips.Experimental Settings.Replace HTTP Cache')"
+        @change="handleRestartPrompt"
+      />
+    </FtFlexBox>
+    <FtPrompt
+      v-if="showRestartPrompt"
+      :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
+      :option-names="[$t('Yes, Restart'), $t('Cancel')]"
+      :option-values="['restart', 'cancel']"
+      @click="handleReplaceHttpCache"
+    />
+  </FtSettingsSection>
+</template>
+
+<script setup>
+import { onMounted, ref } from 'vue'
+
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+import FtPrompt from '../ft-prompt/ft-prompt.vue'
+
+import { IpcChannels } from '../../../constants'
+
+const replaceHttpCacheLoading = ref(true)
+const replaceHttpCache = ref(false)
+const showRestartPrompt = ref(false)
+
+onMounted(async () => {
+  if (process.env.IS_ELECTRON) {
+    const { ipcRenderer } = require('electron')
+    replaceHttpCache.value = await ipcRenderer.invoke(IpcChannels.GET_REPLACE_HTTP_CACHE)
+  }
+
+  replaceHttpCacheLoading.value = false
+})
+
+/**
+ * @param {boolean} value
+ */
+function handleRestartPrompt(value) {
+  replaceHttpCache.value = value
+  showRestartPrompt.value = true
+}
+
+/**
+ * @param {'restart' | 'cancel' | null} value
+ */
+function handleReplaceHttpCache(value) {
+  showRestartPrompt.value = false
+
+  if (value === null || value === 'cancel') {
+    replaceHttpCache.value = !replaceHttpCache.value
+    return
+  }
+
+  if (process.env.IS_ELECTRON) {
+    const { ipcRenderer } = require('electron')
+    ipcRenderer.send(IpcChannels.TOGGLE_REPLACE_HTTP_CACHE)
+  }
+}
+</script>
+
+<style scoped src="./ExperimentalSettings.css" />
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.css b/src/renderer/components/FtAgeRestricted/FtAgeRestricted.css
similarity index 100%
rename from src/renderer/components/ft-age-restricted/ft-age-restricted.css
rename to src/renderer/components/FtAgeRestricted/FtAgeRestricted.css
diff --git a/src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue b/src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue
new file mode 100644
index 0000000000000..be4d0d47ad5f0
--- /dev/null
+++ b/src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue
@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <h2 class="message">
+      {{ restrictedMessage }}
+    </h2>
+    <div class="frown">
+      {{ emoji }}
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+
+import { randomArrayItem } from '../../helpers/utils'
+
+const { t } = useI18n()
+
+const props = defineProps({
+  isChannel: {
+    type: Boolean,
+    default: false,
+  }
+})
+
+const emoji = randomArrayItem(['😵', '😦', '🙁', '☹️', '😦', '🤫', '😕'])
+
+const restrictedMessage = computed(() => {
+  if (props.isChannel) {
+    return t('Age Restricted.This channel is age restricted')
+  }
+
+  return t('Age Restricted.This video is age restricted')
+})
+</script>
+
+<style scoped src="./FtAgeRestricted.css" />
diff --git a/src/renderer/components/ft-community-poll/ft-community-poll.css b/src/renderer/components/FtCommunityPoll/FtCommunityPoll.css
similarity index 100%
rename from src/renderer/components/ft-community-poll/ft-community-poll.css
rename to src/renderer/components/FtCommunityPoll/FtCommunityPoll.css
diff --git a/src/renderer/components/ft-community-poll/ft-community-poll.vue b/src/renderer/components/FtCommunityPoll/FtCommunityPoll.vue
similarity index 62%
rename from src/renderer/components/ft-community-poll/ft-community-poll.vue
rename to src/renderer/components/FtCommunityPoll/FtCommunityPoll.vue
index 0f3151a8fa56c..186ae0048d8c3 100644
--- a/src/renderer/components/ft-community-poll/ft-community-poll.vue
+++ b/src/renderer/components/FtCommunityPoll/FtCommunityPoll.vue
@@ -52,17 +52,44 @@
         v-if="!revealAnswer"
         class="option-text"
       >
-        <font-awesome-icon :icon="['fas', 'eye']" /> {{ $t('Channel.Community.Reveal Answers') }}
+        <FontAwesomeIcon :icon="['fas', 'eye']" /> {{ $t('Channel.Community.Reveal Answers') }}
       </div>
       <div
         v-else
         class="option-text"
       >
-        <font-awesome-icon :icon="['fas', 'eye-slash']" /> {{ $t('Channel.Community.Hide Answers') }}
+        <FontAwesomeIcon :icon="['fas', 'eye-slash']" /> {{ $t('Channel.Community.Hide Answers') }}
       </div>
     </div>
   </div>
 </template>
 
-<script src="./ft-community-poll.js" />
-<style scoped src="./ft-community-poll.css" />
+<script setup>
+import { computed, ref } from 'vue'
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+
+import { formatNumber } from '../../helpers/utils'
+
+const props = defineProps({
+  data: {
+    type: Object,
+    required: true
+  }
+})
+
+const formattedVotes = computed(() => {
+  return formatNumber(props.data.totalVotes)
+})
+
+const revealAnswer = ref(false)
+
+/**
+ * Use smallest as it's resized to 125px anyways and they're usually all larger than that
+ * @param {{ height: number, width: number, url: string }[]} images
+ */
+function findSmallestPollImage(images) {
+  return images.reduce((prev, img) => (img.height < prev.height) ? img : prev, images[0]).url
+}
+</script>
+
+<style scoped src="./FtCommunityPoll.css" />
diff --git a/src/renderer/components/ft-community-post/ft-community-post.scss b/src/renderer/components/FtCommunityPost/FtCommunityPost.scss
similarity index 100%
rename from src/renderer/components/ft-community-post/ft-community-post.scss
rename to src/renderer/components/FtCommunityPost/FtCommunityPost.scss
diff --git a/src/renderer/components/FtCommunityPost/FtCommunityPost.vue b/src/renderer/components/FtCommunityPost/FtCommunityPost.vue
new file mode 100644
index 0000000000000..c3292e2fb91f8
--- /dev/null
+++ b/src/renderer/components/FtCommunityPost/FtCommunityPost.vue
@@ -0,0 +1,347 @@
+<template>
+  <div
+    class="ft-list-post ft-list-item outside"
+    :appearance="appearance"
+    :class="{ list: listType === 'list', grid: listType === 'grid' }"
+  >
+    <div
+      class="author-div"
+    >
+      <template
+        v-if="authorThumbnails.length > 0"
+      >
+        <router-link
+          v-if="authorId"
+          :to="`/channel/${authorId}`"
+          tabindex="-1"
+          aria-hidden="true"
+        >
+          <img
+            :src="getBestQualityImage(authorThumbnails)"
+            class="communityThumbnail"
+            alt=""
+          >
+        </router-link>
+        <img
+          v-else
+          :src="getBestQualityImage(authorThumbnails)"
+          class="communityThumbnail"
+          alt=""
+        >
+      </template>
+      <p
+        class="authorName"
+      >
+        <router-link
+          v-if="authorId"
+          :to="`/channel/${authorId}`"
+          class="authorNameLink"
+        >
+          {{ author }}
+        </router-link>
+        <template
+          v-else
+        >
+          {{ author }}
+        </template>
+      </p>
+      <p
+        class="publishedText"
+      >
+        {{ publishedText }}
+      </p>
+    </div>
+    <p
+      class="postText"
+      v-html="postText"
+    />
+    <swiper-container
+      v-if="postType === 'multiImage' && postContent.content.length > 0"
+      ref="swiperContainerRef"
+      init="false"
+      class="sliderContainer"
+    >
+      <swiper-slide
+        v-for="(img, index) in postContent.content"
+        :key="index"
+        lazy="true"
+      >
+        <img
+          :src="getBestQualityImage(img)"
+          class="communityImage"
+          alt=""
+          loading="lazy"
+        >
+      </swiper-slide>
+    </swiper-container>
+    <div
+      v-if="postType === 'image' && postContent.content.length > 0"
+    >
+      <img
+        :src="getBestQualityImage(postContent.content)"
+        class="communityImage"
+        alt=""
+      >
+    </div>
+    <div
+      v-if="postType === 'video'"
+    >
+      <FtListVideo
+        v-if="!hideVideo"
+        :data="data.postContent.content"
+        appearance=""
+      />
+      <p
+        v-else
+        class="hiddenVideo"
+      >
+        {{ '[' + $t('Channel.Community.Video hidden by FreeTube') + ']' }}
+      </p>
+    </div>
+    <div
+      v-if="postType === 'poll' || postType === 'quiz'"
+    >
+      <FtCommunityPoll :data="postContent" />
+    </div>
+    <div
+      v-if="postType === 'playlist'"
+      class="playlistWrapper"
+    >
+      <FtListPlaylist
+        :data="postContent.content"
+        :appearance="appearance"
+      />
+    </div>
+    <div
+      class="bottomSection"
+    >
+      <span
+        class="likeCount"
+        :title="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
+        :aria-label="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
+      >
+        <FontAwesomeIcon
+          class="thumbs-up-icon"
+          :icon="['fas', 'thumbs-up']"
+          aria-hidden="true"
+        /> {{ formattedVoteCount }}</span>
+      <router-link
+        v-if="isInvidiousAllowed && !singlePost"
+        :to="{
+          path: `/post/${postId}`,
+          query: authorId ? { authorId } : undefined
+        }"
+        class="commentsLink"
+        :aria-label="$t('Channel.Community.View Full Post')"
+      >
+        <span
+          class="commentCount"
+          :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+          :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+        >
+          <FontAwesomeIcon
+            class="comment-count-icon"
+            :icon="['fas', 'comment']"
+            aria-hidden="true"
+          /> {{ formattedCommentCount }}</span>
+      </router-link>
+      <span
+        v-else-if="commentCount != null"
+        class="commentCount"
+        :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+        :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+      >
+        <FontAwesomeIcon
+          class="comment-count-icon"
+          :icon="['fas', 'comment']"
+        /> {{ commentCount }}</span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import autolinker from 'autolinker'
+import { A11y, Navigation, Pagination } from 'swiper/modules'
+import { computed, onMounted, ref } from 'vue'
+
+import FtListVideo from '../ft-list-video/ft-list-video.vue'
+import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
+import FtCommunityPoll from '../FtCommunityPoll/FtCommunityPoll.vue'
+
+import store from '../../store/index'
+
+import {
+  createWebURL,
+  deepCopy,
+  formatNumber,
+  getRelativeTimeFromDate,
+} from '../../helpers/utils'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
+
+const props = defineProps({
+  data: {
+    type: Object,
+    required: true
+  },
+  appearance: {
+    type: String,
+    required: true
+  },
+  hideForbiddenTitles: {
+    type: Boolean,
+    default: true
+  },
+  singlePost: {
+    type: Boolean,
+    default: false
+  },
+})
+
+/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
+const listType = computed(() => {
+  return store.getters.getListType
+})
+
+/** @type {import('vue').ComputedRef<string[]>} */
+const forbiddenTitles = computed(() => {
+  if (!props.hideForbiddenTitles) { return [] }
+  return JSON.parse(store.getters.getForbiddenTitles)
+})
+
+const hideVideo = computed(() => {
+  return forbiddenTitles.value.some((text) => props.data.postContent.content.title?.toLowerCase().includes(text.toLowerCase()))
+})
+
+/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
+const backendPreference = computed(() => {
+  return store.getters.getBackendPreference
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const backendFallback = computed(() => {
+  return store.getters.getBackendFallback
+})
+
+const isInvidiousAllowed = computed(() => {
+  return backendPreference.value === 'invidious' || backendFallback.value
+})
+
+let postType = ''
+let postText = ''
+let postId = ''
+/** @type {string[]?} */
+let authorThumbnails = null
+let postContent = ''
+let author = ''
+let authorId = ''
+let voteCount = 0
+/** @type {number?} */
+let commentCount = null
+
+parseCommunityData()
+
+const formattedCommentCount = computed(() => {
+  if (commentCount != null) {
+    return formatNumber(commentCount)
+  }
+
+  return ''
+})
+
+const formattedVoteCount = computed(() => {
+  return formatNumber(voteCount)
+})
+
+const publishedText = computed(() => {
+  if (props.data.publishedTime) {
+    return getRelativeTimeFromDate(props.data.publishedTime)
+  }
+
+  return ''
+})
+
+function parseCommunityData() {
+  if ('backstagePostThreadRenderer' in props.data) {
+    postText = 'Shared post'
+    postType = 'text'
+
+    authorThumbnails = ['', 'https://yt3.ggpht.com/ytc/AAUvwnjm-0qglHJkAHqLFsCQQO97G7cCNDuDLldsrn25Lg=s88-c-k-c0x00ffffff-no-rj']
+
+    if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious') {
+      authorThumbnails.forEach(thumbnail => {
+        thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
+      })
+    }
+
+    return
+  }
+
+  postText = autolinker.link(props.data.postText)
+  postContent = props.data.postContent
+  postId = props.data.postId
+  voteCount = props.data.voteCount
+  commentCount = props.data.commentCount
+  postType = props.data.postContent?.type ?? 'text'
+  author = props.data.author
+  authorId = props.data.authorId
+
+  authorThumbnails = deepCopy(props.data.authorThumbnails)
+
+  if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious') {
+    authorThumbnails.forEach(thumbnail => {
+      thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
+    })
+  } else {
+    authorThumbnails.forEach(thumbnail => {
+      if (thumbnail.url.startsWith('//')) {
+        thumbnail.url = 'https:' + thumbnail.url
+      }
+    })
+  }
+}
+
+/**
+ * @param {{ width: number, height: number, url: string }[]} imageArray
+ */
+function getBestQualityImage(imageArray) {
+  const imageArrayCopy = Array.from(imageArray)
+  imageArrayCopy.sort((a, b) => {
+    return Number.parseInt(b.width) - Number.parseInt(a.width)
+  })
+
+  // Remove cropping directives when applicable
+  return imageArrayCopy[0]?.url?.replace(/-c-fcrop64=[^-]+/i, '') ?? ''
+}
+
+const swiperContainerRef = ref(null)
+
+if (postType === 'multiImage' && postContent.content.length > 0) {
+  onMounted(() => {
+    /** @type {import('swiper/element').SwiperContainer} */
+    const swiperOptions = {
+      modules: [A11y, Navigation, Pagination],
+
+      injectStylesUrls: [
+        // This file is created with the copy webpack plugin in the web and renderer webpack configs.
+        // If you add more modules, please remember to add their CSS files to the list in webpack config files.
+        createWebURL(`/swiper-${process.env.SWIPER_VERSION}.css`)
+      ],
+
+      a11y: true,
+      navigation: true,
+      pagination: {
+        enabled: true,
+        clickable: true
+      },
+      slidesPerView: 1
+    }
+
+    Object.assign(swiperContainerRef.value, swiperOptions)
+
+    swiperContainerRef.value.initialize()
+  })
+}
+</script>
+
+<style scoped src="./FtCommunityPost.scss" lang="scss" />
diff --git a/src/renderer/components/FtElementList/FtElementList.vue b/src/renderer/components/FtElementList/FtElementList.vue
index e6f8f3feed11a..13204b53a51e9 100644
--- a/src/renderer/components/FtElementList/FtElementList.vue
+++ b/src/renderer/components/FtElementList/FtElementList.vue
@@ -104,10 +104,12 @@ const props = defineProps({
 
 const emit = defineEmits(['move-video-down', 'move-video-up', 'remove-from-playlist'])
 
+/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
 const listType = computed(() => {
   return store.getters.getListType
 })
 
+/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
 const displayValue = computed(() => {
   return props.display === '' ? listType.value : props.display
 })
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.scss b/src/renderer/components/FtListChannel/FtListChannel.scss
similarity index 100%
rename from src/renderer/components/ft-list-channel/ft-list-channel.scss
rename to src/renderer/components/FtListChannel/FtListChannel.scss
diff --git a/src/renderer/components/FtListChannel/FtListChannel.vue b/src/renderer/components/FtListChannel/FtListChannel.vue
new file mode 100644
index 0000000000000..1c0594cf9a146
--- /dev/null
+++ b/src/renderer/components/FtListChannel/FtListChannel.vue
@@ -0,0 +1,191 @@
+<template>
+  <div
+    class="ft-list-channel ft-list-item"
+    :class="{
+      list: listType === 'list',
+      grid: listType === 'grid',
+      [appearance]: true
+    }"
+  >
+    <div class="channelThumbnail">
+      <router-link
+        :to="`/channel/${id}`"
+        class="channelThumbnailLink"
+        tabindex="-1"
+        aria-hidden="true"
+      >
+        <img
+          :src="thumbnail"
+          :class="!isGame ? 'channelImage' : 'gameImage'"
+          alt=""
+        >
+      </router-link>
+    </div>
+    <div class="infoAndSubscribe">
+      <div class="info">
+        <router-link
+          class="title"
+          :to="`/channel/${id}`"
+        >
+          <h3 class="h3Title">
+            {{ name }}
+          </h3>
+        </router-link>
+        <div class="infoLine">
+          <router-link
+            v-if="handle !== null"
+            class="handle"
+            :to="`/channel/${id}`"
+          >
+            {{ handle }}
+          </router-link>
+          <span
+            v-if="subscriberCount !== null && !hideChannelSubscriptions"
+            class="subscriberCount"
+          >
+            <template v-if="handle !== null"> • </template>
+            {{ $tc('Global.Counts.Subscriber Count', subscriberCount, {count: formattedSubscriberCount}) }}
+          </span>
+          <span
+            v-if="handle == null && videoCount != null"
+            class="videoCount"
+          >
+            <template v-if="subscriberCount !== null && !hideChannelSubscriptions"> • </template>
+            {{ $tc('Global.Counts.Video Count', videoCount, {count: formattedVideoCount}) }}
+          </span>
+        </div>
+        <p
+          v-if="listType !== 'grid'"
+          class="description"
+          v-html="description"
+        />
+      </div>
+      <FtSubscribeButton
+        v-if="!hideUnsubscribeButton"
+        class="channelSubscribeButton"
+        :channel-id="id"
+        :channel-name="name"
+        :channel-thumbnail="thumbnail"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+import FtSubscribeButton from '../ft-subscribe-button/ft-subscribe-button.vue'
+
+import store from '../../store/index'
+
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
+import { formatNumber } from '../../helpers/utils'
+
+const props = defineProps({
+  data: {
+    type: Object,
+    required: true
+  },
+  appearance: {
+    type: String,
+    required: true
+  }
+})
+
+/** @type {import('vue').ComputedRef<string>} */
+const currentInvidiousInstanceUrl = computed(() => {
+  return store.getters.getCurrentInvidiousInstanceUrl
+})
+
+/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
+const listType = computed(() => {
+  return store.getters.getListType
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideChannelSubscriptions = computed(() => {
+  return store.getters.getHideChannelSubscriptions
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideUnsubscribeButton = computed(() => {
+  return store.getters.getHideUnsubscribeButton
+})
+
+let id = ''
+let thumbnail = ''
+let name = ''
+/** @type {number?} */
+let subscriberCount = null
+/** @type {number?} */
+let videoCount = null
+/** @type {string?} */
+let handle = null
+let description = ''
+let isGame = null
+
+if (process.env.SUPPORTS_LOCAL_API && props.data.dataSource === 'local') {
+  parseLocalData()
+} else {
+  parseInvidiousData()
+}
+
+const formattedSubscriberCount = computed(() => {
+  if (subscriberCount != null) {
+    return formatNumber(subscriberCount)
+  }
+
+  return ''
+})
+
+const formattedVideoCount = computed(() => {
+  if (videoCount != null) {
+    return formatNumber(videoCount)
+  }
+
+  return ''
+})
+
+function parseLocalData() {
+  thumbnail = props.data.thumbnail
+  name = props.data.name
+  id = props.data.id
+
+  if (props.data.subscribers != null) {
+    subscriberCount = props.data.subscribers
+  }
+
+  if (props.data.videoCount != null) {
+    videoCount = props.data.videos
+  }
+
+  if (props.data.handle) {
+    handle = props.data.handle
+  }
+
+  description = props.data.descriptionShort
+  isGame = props.data.isGame
+}
+
+function parseInvidiousData() {
+  // Can be prefixed with `https://` or `//` (protocol relative)
+  /** @type {string} */
+  const thumbnailUrl = props.data.authorThumbnails[2].url
+
+  thumbnail = youtubeImageUrlToInvidious(thumbnailUrl, currentInvidiousInstanceUrl.value)
+
+  name = props.data.author
+  id = props.data.authorId
+  subscriberCount = props.data.subCount
+
+  if (props.data.channelHandle != null) {
+    handle = props.data.channelHandle
+  } else {
+    videoCount = props.data.videoCount
+  }
+
+  description = props.data.description
+}
+</script>
+
+<style scoped lang="scss" src="./FtListChannel.scss" />
diff --git a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.scss b/src/renderer/components/FtListHashtag/FtListHashtag.scss
similarity index 100%
rename from src/renderer/components/ft-list-hashtag/ft-list-hashtag.scss
rename to src/renderer/components/FtListHashtag/FtListHashtag.scss
diff --git a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue b/src/renderer/components/FtListHashtag/FtListHashtag.vue
similarity index 50%
rename from src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue
rename to src/renderer/components/FtListHashtag/FtListHashtag.vue
index 5db6fe4ab20e0..21ad3a36573f7 100644
--- a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue
+++ b/src/renderer/components/FtListHashtag/FtListHashtag.vue
@@ -14,7 +14,7 @@
         aria-hidden="true"
         :to="url"
       >
-        <font-awesome-icon
+        <FontAwesomeIcon
           class="hashtagImage"
           :icon="['fas', 'hashtag']"
         />
@@ -34,19 +34,60 @@
           v-if="channelCount"
           class="channelCount"
         >
-          {{ $tc('Global.Counts.Channel Count', channelCount, {count: parsedChannelCount}) }}
+          {{ $tc('Global.Counts.Channel Count', channelCount, {count: formattedChannelCount}) }}
         </span>
         <span
           v-if="videoCount"
           class="videoCount"
         >
           <template v-if="channelCount"> • </template>
-          {{ $tc('Global.Counts.Video Count', videoCount, {count: parsedVideosCount}) }}
+          {{ $tc('Global.Counts.Video Count', videoCount, {count: formattedVideosCount}) }}
         </span>
       </div>
     </div>
   </div>
 </template>
 
-<script src="./ft-list-hashtag.js" />
-<style scoped lang="scss" src="./ft-list-hashtag.scss" />
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { computed } from 'vue'
+
+import store from '../../store/index'
+
+import { formatNumber } from '../../helpers/utils'
+
+const props = defineProps({
+  data: {
+    type: Object,
+    required: true
+  },
+  appearance: {
+    type: String,
+    required: true
+  }
+})
+
+/** @type {import('vue').ComputedRef<'list'| 'grid'>} */
+const listType = computed(() => {
+  return store.getters.getListType
+})
+
+/** @type {string} */
+const title = props.data.title
+/** @type {number} */
+const channelCount = props.data.channelCount
+/** @type {number} */
+const videoCount = props.data.videoCount
+/** @type {string} */
+const url = `/hashtag/${encodeURIComponent(title.substring(1))}`
+
+const formattedChannelCount = computed(() => {
+  return formatNumber(channelCount)
+})
+
+const formattedVideosCount = computed(() => {
+  return formatNumber(videoCount)
+})
+</script>
+
+<style scoped lang="scss" src="./FtListHashtag.scss" />
diff --git a/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue b/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue
index abaf49d6de3f7..786054dfbea6e 100644
--- a/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue
+++ b/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue
@@ -60,10 +60,10 @@
 import { computed, ref } from 'vue'
 
 import FtListVideo from '../ft-list-video/ft-list-video.vue'
-import FtListChannel from '../ft-list-channel/ft-list-channel.vue'
+import FtListChannel from '../FtListChannel/FtListChannel.vue'
 import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
-import FtCommunityPost from '../ft-community-post/ft-community-post.vue'
-import FtListHashtag from '../ft-list-hashtag/ft-list-hashtag.vue'
+import FtCommunityPost from '../FtCommunityPost/FtCommunityPost.vue'
+import FtListHashtag from '../FtListHashtag/FtListHashtag.vue'
 
 import store from '../../store/index'
 
@@ -141,18 +141,22 @@ const props = defineProps({
 
 const emit = defineEmits(['move-video-down', 'move-video-up', 'remove-from-playlist'])
 
+/** @type {import('vue').ComputedRef<'video' | 'shortVideo' | 'channel' | 'playlist' | 'community'>} */
 const finalDataType = computed(() => {
   return props.data.type ?? props.dataType
 })
 
+/** @type {import('vue').ComputedRef<boolean>} */
 const hideLiveStreams = computed(() => {
   return store.getters.getHideLiveStreams
 })
 
+/** @type {import('vue').ComputedRef<boolean>} */
 const hideUpcomingPremieres = computed(() => {
   return store.getters.getHideUpcomingPremieres
 })
 
+/** @type {import('vue').ComputedRef<{name : string, preferredName: string, icon: string}[]>} */
 const channelsHidden = computed(() => {
   // Some component users like channel view will have this disabled
   if (!props.useChannelsHiddenPreference) { return [] }
@@ -166,6 +170,7 @@ const channelsHidden = computed(() => {
   })
 })
 
+/** @type {string[]} */
 const forbiddenTitles = computed(() => {
   if (!props.hideForbiddenTitles) { return [] }
   return JSON.parse(store.getters.getForbiddenTitles)
diff --git a/src/renderer/components/ft-logo-full/ft-logo-full.css b/src/renderer/components/FtLogoFull/FtLogoFull.css
similarity index 100%
rename from src/renderer/components/ft-logo-full/ft-logo-full.css
rename to src/renderer/components/FtLogoFull/FtLogoFull.css
diff --git a/src/renderer/components/ft-logo-full/ft-logo-full.vue b/src/renderer/components/FtLogoFull/FtLogoFull.vue
similarity index 99%
rename from src/renderer/components/ft-logo-full/ft-logo-full.vue
rename to src/renderer/components/FtLogoFull/FtLogoFull.vue
index d73063727f3ef..1450d4aceb946 100644
--- a/src/renderer/components/ft-logo-full/ft-logo-full.vue
+++ b/src/renderer/components/FtLogoFull/FtLogoFull.vue
@@ -1,6 +1,5 @@
 <template>
   <svg
-    class="ft-logo-full"
     viewBox="0 0 640 200"
     version="1.1"
     xmlns="http://www.w3.org/2000/svg"
@@ -63,4 +62,4 @@
   </svg>
 </template>
 
-<style scoped src="./ft-logo-full.css" />
+<style scoped src="./FtLogoFull.css" />
diff --git a/src/renderer/components/ft-progress-bar/ft-progress-bar.css b/src/renderer/components/FtProgressBar/FtProgressBar.css
similarity index 75%
rename from src/renderer/components/ft-progress-bar/ft-progress-bar.css
rename to src/renderer/components/FtProgressBar/FtProgressBar.css
index c7ebd6f3ca871..94d45d244cb73 100644
--- a/src/renderer/components/ft-progress-bar/ft-progress-bar.css
+++ b/src/renderer/components/FtProgressBar/FtProgressBar.css
@@ -4,6 +4,5 @@
   inset-block-end: 0;
   inset-inline-start: 0;
   background-color: var(--primary-color);
-  z-index: 1;
-  transition: inline-size 0.5s;
+  z-index: 4;
 }
diff --git a/src/renderer/components/FtProgressBar/FtProgressBar.vue b/src/renderer/components/FtProgressBar/FtProgressBar.vue
new file mode 100644
index 0000000000000..36aed9f58989c
--- /dev/null
+++ b/src/renderer/components/FtProgressBar/FtProgressBar.vue
@@ -0,0 +1,18 @@
+<template>
+  <div
+    class="progressBar"
+    :style="{ inlineSize: progressBarPercentage + '%' }"
+  />
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+import store from '../../store/index'
+
+const progressBarPercentage = computed(() => {
+  return store.getters.getProgressBarPercentage
+})
+</script>
+
+<style scoped src="./FtProgressBar.css" />
diff --git a/src/renderer/components/ft-search-filters/ft-search-filters.css b/src/renderer/components/FtSearchFilters/FtSearchFilters.css
similarity index 100%
rename from src/renderer/components/ft-search-filters/ft-search-filters.css
rename to src/renderer/components/FtSearchFilters/FtSearchFilters.css
diff --git a/src/renderer/components/FtSearchFilters/FtSearchFilters.vue b/src/renderer/components/FtSearchFilters/FtSearchFilters.vue
new file mode 100644
index 0000000000000..5c6c207ce30d1
--- /dev/null
+++ b/src/renderer/components/FtSearchFilters/FtSearchFilters.vue
@@ -0,0 +1,294 @@
+<template>
+  <FtPrompt
+    theme="slim"
+    :label="title"
+    @click="hideSearchFilters"
+  >
+    <div>
+      <h2
+        class="center"
+        name="title"
+      >
+        {{ title }}
+      </h2>
+      <FtFlexBox class="radioFlexBox">
+        <FtRadioButton
+          ref="sortByRadio"
+          :title="$t('Search Filters.Sort By.Sort By')"
+          :labels="sortByLabels"
+          :values="SORT_BY_VALUES"
+          :initial-value-index="searchSortByStartIndex"
+          class="searchRadio"
+          @change="updateSortBy"
+        />
+        <FtRadioButton
+          ref="timeRadio"
+          :title="$t('Search Filters.Time.Time')"
+          :labels="timeLabels"
+          :values="TIME_VALUES"
+          :initial-value-index="searchTimeStartIndex"
+          class="searchRadio"
+          @change="updateTime"
+        />
+        <FtRadioButton
+          ref="typeRadio"
+          :title="$t('Search Filters.Type.Type')"
+          :labels="typeLabels"
+          :values="TYPE_VALUES"
+          :initial-value-index="searchTypeStartIndex"
+          class="searchRadio"
+          @change="updateType"
+        />
+        <FtRadioButton
+          ref="durationRadio"
+          :title="$t('Search Filters.Duration.Duration')"
+          :labels="durationLabels"
+          :values="DURATION_VALUES"
+          :initial-value-index="searchDurationStartIndex"
+          class="searchRadio"
+          @change="updateDuration"
+        />
+        <FtCheckboxList
+          ref="featuresCheck"
+          :title="$t('Search Filters.Features.Features')"
+          :labels="featureLabels"
+          :values="FEATURE_VALUES"
+          :initial-values="searchDefaultFeatures"
+          class="searchRadio"
+          @change="updateFeatures"
+        />
+      </FtFlexBox>
+      <div class="searchFilterCloseButtonContainer">
+        <FtButton
+          :label="$t('Close')"
+          background-color="var(--primary-color)"
+          text-color="var(--text-with-main-color)"
+          @click="hideSearchFilters"
+        />
+      </div>
+    </div>
+  </FtPrompt>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtRadioButton from '../ft-radio-button/ft-radio-button.vue'
+import FtPrompt from '../ft-prompt/ft-prompt.vue'
+import FtButton from '../ft-button/ft-button.vue'
+import FtCheckboxList from '../ft-checkbox-list/ft-checkbox-list.vue'
+
+import store from '../../store/index'
+
+const { t } = useI18n()
+
+const SORT_BY_VALUES = [
+  'relevance',
+  'rating',
+  'upload_date',
+  'view_count'
+]
+
+const TIME_VALUES = [
+  '',
+  'hour',
+  'today',
+  'week',
+  'month',
+  'year'
+]
+
+const TYPE_VALUES = [
+  'all',
+  'video',
+  'channel',
+  'playlist',
+  'movie'
+]
+
+const DURATION_VALUES = [
+  '',
+  'short',
+  'medium',
+  'long'
+]
+
+const FEATURE_VALUES = [
+  'hd',
+  'subtitles',
+  'creative_commons',
+  '3d',
+  'live',
+  '4k',
+  '360',
+  'location',
+  'hdr',
+  'vr180'
+]
+
+const NOT_ALLOWED_FOR_MOVIES_FEATURES = [
+  'live',
+  'subtitles',
+  '3d',
+  'creative_commons'
+]
+
+const title = computed(() => t('Search Filters.Search Filters'))
+
+const sortByLabels = computed(() => [
+  t('Search Filters.Sort By.Most Relevant'),
+  t('Search Filters.Sort By.Rating'),
+  t('Search Filters.Sort By.Upload Date'),
+  t('Search Filters.Sort By.View Count')
+])
+
+const timeLabels = computed(() => [
+  t('Search Filters.Time.Any Time'),
+  t('Search Filters.Time.Last Hour'),
+  t('Search Filters.Time.Today'),
+  t('Search Filters.Time.This Week'),
+  t('Search Filters.Time.This Month'),
+  t('Search Filters.Time.This Year')
+])
+
+const typeLabels = computed(() => [
+  t('Search Filters.Type.All Types'),
+  t('Search Filters.Type.Videos'),
+  t('Search Filters.Type.Channels'),
+  t('Playlists'),
+  t('Search Filters.Type.Movies')
+])
+
+const durationLabels = computed(() => [
+  t('Search Filters.Duration.All Durations'),
+  t('Search Filters.Duration.Short (< 4 minutes)'),
+  t('Search Filters.Duration.Medium (4 - 20 minutes)'),
+  t('Search Filters.Duration.Long (> 20 minutes)')
+])
+
+const featureLabels = computed(() => [
+  t('Search Filters.Features.HD'),
+  t('Search Filters.Features.Subtitles'),
+  t('Search Filters.Features.Creative Commons'),
+  t('Search Filters.Features.3D'),
+  t('Search Filters.Features.Live'),
+  t('Search Filters.Features.4K'),
+  t('Search Filters.Features.360 Video'),
+  t('Search Filters.Features.Location'),
+  t('Search Filters.Features.HDR'),
+  t('Search Filters.Features.VR180')
+])
+
+const sortByRadio = ref(null)
+const timeRadio = ref(null)
+const typeRadio = ref(null)
+const durationRadio = ref(null)
+const featuresCheck = ref(null)
+
+const searchFilterValueChanged = computed(() => {
+  if (sortByRadio.value == null || timeRadio.value == null || typeRadio.value == null || durationRadio.value == null || featuresCheck.value == null) {
+    return false
+  }
+
+  return sortByRadio.value.selectedValue !== SORT_BY_VALUES[0] ||
+    timeRadio.value.selectedValue !== TIME_VALUES[0] ||
+    typeRadio.value.selectedValue !== TYPE_VALUES[0] ||
+    durationRadio.value.selectedValue !== DURATION_VALUES[0] ||
+    featuresCheck.value.selectedValues.length > 0
+})
+
+const searchSettings = computed(() => store.getters.getSearchSettings)
+
+const searchSortByStartIndex = SORT_BY_VALUES.indexOf(searchSettings.value.sortBy)
+const searchTimeStartIndex = TIME_VALUES.indexOf(searchSettings.value.time)
+const searchTypeStartIndex = TYPE_VALUES.indexOf(searchSettings.value.type)
+const searchDurationStartIndex = DURATION_VALUES.indexOf(searchSettings.value.duration)
+const searchDefaultFeatures = [...searchSettings.value.features]
+
+function hideSearchFilters() {
+  store.dispatch('hideSearchFilters')
+}
+
+/**
+ * @param {'all' | 'video' | 'channel' | 'playlist' | 'movie'} type
+ */
+function isVideoOrMovieOrAll(type) {
+  return type === 'video' | type === 'movie' || type === 'all'
+}
+
+/**
+ * @param {'relevance' | 'rating' | 'upload_date' | 'view_count'} value
+ */
+function updateSortBy(value) {
+  store.commit('setSearchSortBy', value)
+  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
+}
+
+/**
+ * @param {'' | 'hour' | 'today' | 'week' | 'month' | 'year'} value
+ */
+function updateTime(value) {
+  if (!isVideoOrMovieOrAll(searchSettings.value.type)) {
+    typeRadio.value.updateSelectedValue('all')
+    store.commit('setSearchType', 'all')
+  }
+
+  store.commit('setSearchTime', value)
+  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
+}
+
+/**
+ * @param {('hd' | 'subtitles' | 'creative_commons' | '3d' | 'live' | '4k' | '360' | 'location' | 'hdr' | 'vr180')[]} values
+ */
+function updateFeatures(values) {
+  if (!isVideoOrMovieOrAll(searchSettings.value.type) || NOT_ALLOWED_FOR_MOVIES_FEATURES.some(item => values.includes(item))) {
+    typeRadio.value.updateSelectedValue('all')
+    store.commit('setSearchType', 'all')
+  }
+
+  store.commit('setSearchFeatures', values)
+  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
+}
+
+/**
+ * @param {'all' | 'video' | 'channel' | 'playlist' | 'movie'} value
+ */
+function updateType(value) {
+  if (value === 'channel' || value === 'playlist') {
+    timeRadio.value.updateSelectedValue('')
+    durationRadio.value.updateSelectedValue('')
+    sortByRadio.value.updateSelectedValue(SORT_BY_VALUES[0])
+    featuresCheck.value.setSelectedValues([])
+
+    store.commit('setSearchTime', '')
+    store.commit('setSearchDuration', '')
+    store.commit('setSearchFeatures', [])
+    store.commit('setSearchSortBy', SORT_BY_VALUES[0])
+  } else if (value === 'movie') {
+    const filteredFeatures = searchSettings.value.features.filter(e => !NOT_ALLOWED_FOR_MOVIES_FEATURES.includes(e))
+
+    featuresCheck.value.setSelectedValues([...filteredFeatures])
+    store.commit('setSearchFeatures', filteredFeatures)
+  }
+
+  store.commit('setSearchType', value)
+  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
+}
+
+/**
+ * @param {'' | 'short' | 'medium' | 'long'} value
+ */
+function updateDuration(value) {
+  if (value !== '' && !isVideoOrMovieOrAll(searchSettings.value.type)) {
+    typeRadio.value.updateSelectedValue('all')
+    updateType('all')
+  }
+
+  store.commit('setSearchDuration', value)
+  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
+}
+</script>
+
+<style scoped src="./FtSearchFilters.css" />
diff --git a/src/renderer/components/FtSettingsMenu/FtSettingsMenu.css b/src/renderer/components/FtSettingsMenu/FtSettingsMenu.css
new file mode 100644
index 0000000000000..b6d613a3e0729
--- /dev/null
+++ b/src/renderer/components/FtSettingsMenu/FtSettingsMenu.css
@@ -0,0 +1,125 @@
+.settingsMenu {
+  /* top nav + margin */
+  inset-block-start: 96px;
+  position: sticky;
+  display: flex;
+  flex-direction: column;
+  padding-inline-start: 0;
+  block-size: calc(85vh - 96px);
+  max-block-size: 600px;
+}
+
+.header {
+  inline-size: fit-content;
+  margin-block: 0 10px;
+}
+
+.title {
+  text-decoration: none;
+  color: var(--tertiary-text-color);
+  inline-size: 220px;
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+}
+
+/* prevent hover styling from showing on title click for mobile */
+@media (hover: hover) {
+  .title:hover {
+    color: var(--primary-text-color);
+  }
+}
+
+.titleContent {
+  inline-size: fit-content;
+  max-inline-size: 100%;
+}
+
+
+.iconAndTitleText {
+  overflow-x: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+
+  /* needed to have underline poke out */
+  margin-inline-start: 3px;
+}
+
+.titleUnderline {
+  /* have underline poke out */
+  inline-size: calc(100% + 6px);
+
+  /* prevent "active" border from visibly pushing the content up */
+  border-block-end: 4px solid transparent;
+}
+
+@media only screen and (width >= 1015px) {
+  .settingsMenu {
+    margin-block: 0;
+    font-size: 16px;
+  }
+
+  .header {
+    margin-block-start: 10px;
+    font-size: 26px;
+  }
+
+  .titleIcon {
+    inline-size: 16px;
+    block-size: 16px;
+  }
+
+  .title.active {
+    color: var(--primary-text-color);
+    font-weight: 600;
+  }
+
+  .title.active .titleUnderline {
+    border-block-end: 4px solid var(--primary-color);
+  }
+}
+
+/* overall mobile breakpoint; large text */
+@media only screen and (width <= 1015px) {
+  .settingsMenu {
+    inline-size: fit-content;
+    margin-inline: auto;
+    position: relative;
+    inset-block-start: 0;
+    font-size: 30px;
+    max-block-size: 1100px;
+  }
+
+  .titleIcon {
+    inline-size: 30px;
+    block-size: 30px;
+    margin-inline-end: 10px;
+  }
+
+  .title {
+    inline-size: fit-content;
+    max-inline-size: 90vw;
+  }
+
+  .header {
+    font-size: 32px;
+  }
+}
+
+/* small height or width mobile breakpoint; intermediary text */
+@media only screen and (width <= 1015px) and (height <= 830px),
+  only screen and (width <= 500px) {
+  .settingsMenu {
+    font-size: 25px;
+  }
+
+  .titleIcon {
+    inline-size: 25px;
+    block-size: 25px;
+    margin-inline-end: 5px;
+  }
+
+  .header {
+    font-size: 25px;
+  }
+}
diff --git a/src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue b/src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue
new file mode 100644
index 0000000000000..2965d3388c356
--- /dev/null
+++ b/src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue
@@ -0,0 +1,51 @@
+<template>
+  <menu
+    class="settingsMenu"
+  >
+    <h2 class="header">
+      {{ $t('Settings.Settings') }}
+    </h2>
+    <a
+      v-for="settingsSection in settingsSections"
+      :id="settingsSection.type"
+      :key="settingsSection.type"
+      class="title"
+      href="javascript:;"
+      @click.stop="goToSettingsSection(settingsSection.type)"
+      @keydown.enter.stop="goToSettingsSection(settingsSection.type)"
+    >
+      <div class="titleContent">
+        <div class="iconAndTitleText">
+          <FontAwesomeIcon
+            :icon="['fas', settingsSection.icon]"
+            class="titleIcon"
+          />
+          {{ settingsSection.title }}
+        </div>
+        <div class="titleUnderline" />
+      </div>
+    </a>
+  </menu>
+</template>
+
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+
+defineProps({
+  settingsSections: {
+    type: Array,
+    required: true
+  }
+})
+
+const emit = defineEmits(['navigate-to-section'])
+
+/**
+ * @param {string} sectionType
+ */
+function goToSettingsSection(sectionType) {
+  emit('navigate-to-section', sectionType)
+}
+</script>
+
+<style scoped src="./FtSettingsMenu.css" />
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.scss b/src/renderer/components/FtSettingsSection/FtSettingsSection.scss
similarity index 89%
rename from src/renderer/components/ft-settings-section/ft-settings-section.scss
rename to src/renderer/components/FtSettingsSection/FtSettingsSection.scss
index cdf50ffd3296e..50764ae348911 100644
--- a/src/renderer/components/ft-settings-section/ft-settings-section.scss
+++ b/src/renderer/components/FtSettingsSection/FtSettingsSection.scss
@@ -1,16 +1,20 @@
 .settingsSection {
-  background-color: var(--card-bg-color);
   margin-block: 0;
-  margin-inline: auto;
-  inline-size: 85%;
 
   @media only screen and (width <= 800px) {
     inline-size: 100%;
   }
+}
 
-  &[open] {
-    padding-block-end: 15px;
-  }
+.sectionHeader {
+  cursor: pointer;
+  display: block;
+  padding: 1px;
+}
+
+.sectionBody {
+  background-color: var(--card-bg-color);
+  padding-block: 10px;
 
   > div {
     box-sizing: border-box;
@@ -26,22 +30,9 @@
   }
 }
 
-.sectionLine {
-  border: 0;
-  border-block-start: 2px solid var(--primary-color);
-  margin-block-start: -1px;
-  inline-size: 100%;
-}
-
-.sectionHeader {
-  cursor: pointer;
-  display: block;
-  padding: 1px;
-}
-
 .sectionTitle {
   user-select: none;
-  margin-inline-start: 2%;
+  margin-inline-start: 20px;
   margin-block: 0.5em;
 }
 
diff --git a/src/renderer/components/FtSettingsSection/FtSettingsSection.vue b/src/renderer/components/FtSettingsSection/FtSettingsSection.vue
new file mode 100644
index 0000000000000..28120f65cd5c3
--- /dev/null
+++ b/src/renderer/components/FtSettingsSection/FtSettingsSection.vue
@@ -0,0 +1,23 @@
+<template>
+  <div
+    class="settingsSection"
+  >
+    <div class="sectionBody">
+      <h3 class="sectionTitle">
+        {{ title }}
+      </h3>
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    required: true
+  }
+})
+</script>
+
+<style scoped src="./FtSettingsSection.scss" lang="scss" />
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.css b/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.css
similarity index 100%
rename from src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.css
rename to src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.css
diff --git a/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue b/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue
new file mode 100644
index 0000000000000..0ee493c3547c7
--- /dev/null
+++ b/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="sponsorBlockCategory">
+    <div
+      :id="sanitizedId"
+      class="sponsorTitle"
+    >
+      {{ translatedCategoryName }}
+    </div>
+    <FtSelect
+      :sanitized-id="sanitizedId + 'categoryColor'"
+      :describe-by-id="sanitizedId"
+      :placeholder="$t('Settings.SponsorBlock Settings.Category Color')"
+      :value="sponsorBlockValues.color"
+      :select-names="colorNames"
+      :select-values="COLOR_VALUES"
+      :icon="['fas', 'palette']"
+      :class="'sec' + sponsorBlockValues.color"
+      icon-color="var(--accent-color)"
+      @change="updateColor"
+    />
+    <FtSelect
+      :sanitized-id="sanitizedId + 'skipOption'"
+      :describe-by-id="sanitizedId"
+      :placeholder="$t('Settings.SponsorBlock Settings.Skip Options.Skip Option')"
+      :value="sponsorBlockValues.skip"
+      :select-names="skipNames"
+      :select-values="SKIP_VALUES"
+      :icon="['fas', 'forward']"
+      @change="updateSkipOption"
+    />
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+
+import FtSelect from '../ft-select/ft-select.vue'
+
+import store from '../../store/index'
+
+import { colors } from '../../helpers/colors'
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
+import { useColorTranslations } from '../../composables/colors'
+
+const props = defineProps({
+  categoryName: {
+    type: String,
+    required: true
+  }
+})
+
+const { t } = useI18n()
+
+const SKIP_VALUES = [
+  'autoSkip',
+  // 'promptToSkip',
+  'showInSeekBar',
+  'doNothing'
+]
+
+const skipNames = computed(() => [
+  t('Settings.SponsorBlock Settings.Skip Options.Auto Skip'),
+  // t('Settings.SponsorBlock Settings.Skip Options.Prompt To Skip'),
+  t('Settings.SponsorBlock Settings.Skip Options.Show In Seek Bar'),
+  t('Settings.SponsorBlock Settings.Skip Options.Do Nothing')
+])
+
+const COLOR_VALUES = colors.map(color => color.name)
+const colorNames = useColorTranslations()
+
+// TODO: Replace with `useId()` in Vue 3
+const sanitizedId = sanitizeForHtmlId(props.categoryName)
+
+/** @type {import('vue').ComputedRef<{ color: string, skip: string }>} */
+const sponsorBlockValues = computed(() => {
+  switch (props.categoryName) {
+    case 'sponsor':
+      return store.getters.getSponsorBlockSponsor
+    case 'self-promotion':
+      return store.getters.getSponsorBlockSelfPromo
+    case 'interaction':
+      return store.getters.getSponsorBlockInteraction
+    case 'intro':
+      return store.getters.getSponsorBlockIntro
+    case 'outro':
+      return store.getters.getSponsorBlockOutro
+    case 'recap':
+      return store.getters.getSponsorBlockRecap
+    case 'music offtopic':
+      return store.getters.getSponsorBlockMusicOffTopic
+    case 'filler':
+      return store.getters.getSponsorBlockFiller
+    default:
+      return ''
+  }
+})
+
+const translatedCategoryName = computed(() => {
+  switch (props.categoryName) {
+    case 'sponsor':
+      return t('Video.Sponsor Block category.sponsor')
+    case 'self-promotion':
+      return t('Video.Sponsor Block category.self-promotion')
+    case 'interaction':
+      return t('Video.Sponsor Block category.interaction')
+    case 'intro':
+      return t('Video.Sponsor Block category.intro')
+    case 'outro':
+      return t('Video.Sponsor Block category.outro')
+    case 'recap':
+      return t('Video.Sponsor Block category.recap')
+    case 'music offtopic':
+      return t('Video.Sponsor Block category.music offtopic')
+    case 'filler':
+      return t('Video.Sponsor Block category.filler')
+    default:
+      return ''
+  }
+})
+
+/**
+ * @param {string} color
+ */
+function updateColor(color) {
+  updateSponsorCategory({
+    color,
+    skip: sponsorBlockValues.value.skip
+  })
+}
+
+/**
+ * @param {string} skipOption
+ */
+function updateSkipOption(skipOption) {
+  updateSponsorCategory({
+    color: sponsorBlockValues.value.color,
+    skip: skipOption
+  })
+}
+
+/**
+ * @param {{ color: string, skip: string }} payload
+ */
+function updateSponsorCategory(payload) {
+  switch (props.categoryName) {
+    case 'sponsor':
+      store.dispatch('updateSponsorBlockSponsor', payload)
+      break
+    case 'self-promotion':
+      store.dispatch('updateSponsorBlockSelfPromo', payload)
+      break
+    case 'interaction':
+      store.dispatch('updateSponsorBlockInteraction', payload)
+      break
+    case 'intro':
+      store.dispatch('updateSponsorBlockIntro', payload)
+      break
+    case 'outro':
+      store.dispatch('updateSponsorBlockOutro', payload)
+      break
+    case 'recap':
+      store.dispatch('updateSponsorBlockRecap', payload)
+      break
+    case 'music offtopic':
+      store.dispatch('updateSponsorBlockMusicOffTopic', payload)
+      break
+    case 'filler':
+      store.dispatch('updateSponsorBlockFiller', payload)
+      break
+  }
+}
+</script>
+
+<style scoped src="./FtSponsorBlockCategory.css" />
diff --git a/src/renderer/components/FtTimestampCatcher.vue b/src/renderer/components/FtTimestampCatcher.vue
new file mode 100644
index 0000000000000..84bbf96e71eb1
--- /dev/null
+++ b/src/renderer/components/FtTimestampCatcher.vue
@@ -0,0 +1,48 @@
+<template>
+  <p
+    @timestamp-clicked="catchTimestampClick"
+    v-html="displayText"
+  />
+</template>
+
+<script setup>
+import { useRouter } from 'vue-router/composables'
+
+const props = defineProps({
+  inputHtml: {
+    type: String,
+    default: ''
+  }
+})
+
+const router = useRouter()
+const videoId = router.currentRoute.params.id
+
+/** @type {string} */
+const displayText = props.inputHtml.replaceAll(/(?:(\d+):)?(\d+):(\d+)/g, (timestamp, hours, minutes, seconds) => {
+  let time = 60 * Number(minutes) + Number(seconds)
+
+  if (hours) {
+    time += 3600 * Number(hours)
+  }
+
+  const url = router.resolve({
+    path: `/watch/${videoId}`,
+    query: {
+      timestamp: time
+    }
+  }).href
+
+  // Adding the URL lets the user open the video in a new window at this timestamp
+  return `<a href="${url}" onclick="event.preventDefault();this.dispatchEvent(new CustomEvent('timestamp-clicked',{bubbles:true,detail:${time}}));window.scrollTo(0,0)">${timestamp}</a>`
+})
+
+const emit = defineEmits(['timestamp-event'])
+
+/**
+ * @param {CustomEvent} event
+ */
+function catchTimestampClick(event) {
+  emit('timestamp-event', event.detail)
+}
+</script>
diff --git a/src/renderer/components/ParentalControlSettings.vue b/src/renderer/components/ParentalControlSettings.vue
new file mode 100644
index 0000000000000..433b3e4927d08
--- /dev/null
+++ b/src/renderer/components/ParentalControlSettings.vue
@@ -0,0 +1,72 @@
+<template>
+  <FtSettingsSection
+    :title="$t('Settings.Parental Control Settings.Parental Control Settings')"
+  >
+    <div class="switchColumnGrid">
+      <div class="switchColumn">
+        <FtToggleSwitch
+          :label="$t('Settings.Parental Control Settings.Hide Unsubscribe Button')"
+          compact
+          :default-value="hideUnsubscribeButton"
+          @change="updateHideUnsubscribeButton"
+        />
+        <FtToggleSwitch
+          :label="$t('Settings.Parental Control Settings.Show Family Friendly Only')"
+          compact
+          :default-value="showFamilyFriendlyOnly"
+          @change="updateShowFamilyFriendlyOnly"
+        />
+      </div>
+      <div class="switchColumn">
+        <FtToggleSwitch
+          :label="$t('Settings.Parental Control Settings.Hide Search Bar')"
+          compact
+          :default-value="hideSearchBar"
+          @change="updateHideSearchBar"
+        />
+      </div>
+    </div>
+  </FtSettingsSection>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+import FtSettingsSection from './FtSettingsSection/FtSettingsSection.vue'
+import FtToggleSwitch from './ft-toggle-switch/ft-toggle-switch.vue'
+
+import store from '../store/index'
+
+const hideSearchBar = computed(() => {
+  return store.getters.getHideSearchBar
+})
+
+const hideUnsubscribeButton = computed(() => {
+  return store.getters.getHideUnsubscribeButton
+})
+
+const showFamilyFriendlyOnly = computed(() => {
+  return store.getters.getShowFamilyFriendlyOnly
+})
+
+/**
+ * @param {boolean} value
+ */
+function updateHideSearchBar(value) {
+  store.dispatch('updateHideSearchBar', value)
+}
+
+/**
+ * @param {boolean} value
+ */
+function updateHideUnsubscribeButton(value) {
+  store.dispatch('updateHideUnsubscribeButton', value)
+}
+
+/**
+ * @param {boolean} value
+ */
+function updateShowFamilyFriendlyOnly(value) {
+  store.dispatch('updateShowFamilyFriendlyOnly', value)
+}
+</script>
diff --git a/src/renderer/components/password-dialog/password-dialog.css b/src/renderer/components/PasswordDialog/PasswordDialog.css
similarity index 100%
rename from src/renderer/components/password-dialog/password-dialog.css
rename to src/renderer/components/PasswordDialog/PasswordDialog.css
diff --git a/src/renderer/components/PasswordDialog/PasswordDialog.vue b/src/renderer/components/PasswordDialog/PasswordDialog.vue
new file mode 100644
index 0000000000000..c7e7fcbbf9093
--- /dev/null
+++ b/src/renderer/components/PasswordDialog/PasswordDialog.vue
@@ -0,0 +1,45 @@
+<template>
+  <FtCard
+    class="card"
+  >
+    <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
+
+    <FtInput
+      ref="password"
+      :placeholder="$t('Settings.Password Dialog.Password')"
+      :show-action-button="false"
+      input-type="password"
+      class="passwordInput"
+      @input="handlePasswordInput"
+    />
+  </FtCard>
+</template>
+
+<script setup>
+import { computed, onMounted, ref } from 'vue'
+
+import FtCard from '../ft-card/ft-card.vue'
+import FtInput from '../ft-input/ft-input.vue'
+
+import store from '../../store/index'
+
+const emit = defineEmits(['unlocked'])
+
+const password = ref(null)
+
+onMounted(() => {
+  password.value.focus()
+})
+
+const settingsPassword = computed(() => {
+  return store.getters.getSettingsPassword
+})
+
+function handlePasswordInput(input) {
+  if (input === settingsPassword.value) {
+    emit('unlocked')
+  }
+}
+</script>
+
+<style scoped src="./PasswordDialog.css" />
diff --git a/src/renderer/components/password-settings/password-settings.css b/src/renderer/components/PasswordSettings/PasswordSettings.css
similarity index 100%
rename from src/renderer/components/password-settings/password-settings.css
rename to src/renderer/components/PasswordSettings/PasswordSettings.css
diff --git a/src/renderer/components/PasswordSettings/PasswordSettings.vue b/src/renderer/components/PasswordSettings/PasswordSettings.vue
new file mode 100644
index 0000000000000..a385c25b64919
--- /dev/null
+++ b/src/renderer/components/PasswordSettings/PasswordSettings.vue
@@ -0,0 +1,67 @@
+<template>
+  <FtSettingsSection
+    :title="$t('Settings.Password Settings.Password Settings')"
+  >
+    <FtFlexBox
+      v-if="hasStoredPassword"
+      class="settingsFlexStart460px"
+    >
+      <FtButton
+        :label="$t('Settings.Password Settings.Remove Password')"
+        @click="handleRemovePassword"
+      />
+    </FtFlexBox>
+    <FtFlexBox
+      v-else
+      class="settingsFlexStart460px"
+    >
+      <FtInput
+        :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
+        :show-action-button="false"
+        show-label
+        input-type="password"
+        :value="password"
+        @input="e => password = e"
+        @keydown.enter.native="handleSetPassword"
+      />
+      <FtButton
+        class="centerButton"
+        :label="$t('Settings.Password Settings.Set Password')"
+        @click="handleSetPassword"
+      />
+    </FtFlexBox>
+  </FtSettingsSection>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtInput from '../ft-input/ft-input.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtButton from '../ft-button/ft-button.vue'
+
+import store from '../../store/index'
+
+const settingsPassword = computed(() => {
+  return store.getters.getSettingsPassword
+})
+
+const hasStoredPassword = computed(() => {
+  return settingsPassword.value !== ''
+})
+
+const password = ref('')
+
+function handleSetPassword() {
+  store.dispatch('updateSettingsPassword', password.value)
+  password.value = ''
+}
+
+function handleRemovePassword() {
+  store.dispatch('updateSettingsPassword', '')
+  password.value = ''
+}
+</script>
+
+<style scoped src="./PasswordSettings.css" />
diff --git a/src/renderer/components/side-nav/side-nav.css b/src/renderer/components/SideNav/SideNav.css
similarity index 100%
rename from src/renderer/components/side-nav/side-nav.css
rename to src/renderer/components/SideNav/SideNav.css
diff --git a/src/renderer/components/side-nav/side-nav.vue b/src/renderer/components/SideNav/SideNav.vue
similarity index 58%
rename from src/renderer/components/side-nav/side-nav.vue
rename to src/renderer/components/SideNav/SideNav.vue
index ebfb8d44169eb..47530d3da2aa3 100644
--- a/src/renderer/components/side-nav/side-nav.vue
+++ b/src/renderer/components/SideNav/SideNav.vue
@@ -1,5 +1,5 @@
 <template>
-  <ft-flex-box
+  <FtFlexBox
     ref="sideNav"
     class="sideNav"
     :class="[{closed: !isOpen}, applyHiddenLabels]"
@@ -18,7 +18,7 @@
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'rss']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -41,7 +41,7 @@
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'user-check']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -65,7 +65,7 @@
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'fire']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -89,7 +89,7 @@
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'users']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -113,7 +113,7 @@
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'bookmark']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -127,17 +127,17 @@
           {{ $t("Playlists") }}
         </p>
       </router-link>
-      <side-nav-more-options />
+      <SideNavMoreOptions />
       <router-link
         class="navOption mobileShow"
         role="button"
         to="/history"
-        :title="$t('History.History')"
+        :title="historyTitle"
       >
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'history']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -156,12 +156,12 @@
         class="navOption mobileShow"
         role="button"
         to="/settings"
-        :title="$t('Settings.Settings')"
+        :title="settingsTitle"
       >
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'sliders-h']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -184,7 +184,7 @@
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'info-circle']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -222,7 +222,7 @@
               :src="channel.thumbnail"
               :alt="isOpen ? '' : channel.name"
             >
-            <font-awesome-icon
+            <FontAwesomeIcon
               v-else
               class="channelThumbnail noThumbnail"
               :icon="['fas', 'circle-user']"
@@ -237,8 +237,130 @@
         </router-link>
       </div>
     </div>
-  </ft-flex-box>
+  </FtFlexBox>
 </template>
 
-<script src="./side-nav.js" />
-<style scoped src="./side-nav.css" />
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { computed } from 'vue'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import SideNavMoreOptions from '../SideNavMoreOptions/SideNavMoreOptions.vue'
+
+import store from '../../store/index'
+
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
+import { deepCopy, localizeAndAddKeyboardShortcutToActionTitle } from '../../helpers/utils'
+import { KeyboardShortcuts } from '../../../constants'
+
+const { locale, t } = useI18n()
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const isOpen = computed(() => {
+  return store.getters.getIsSideNavOpen
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const backendFallback = computed(() => {
+  return store.getters.getBackendFallback
+})
+
+/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
+const backendPreference = computed(() => {
+  return store.getters.getBackendPreference
+})
+
+/** @type {import('vue').ComputedRef<string>} */
+const currentInvidiousInstanceUrl = computed(() => {
+  return store.getters.getCurrentInvidiousInstanceUrl
+})
+
+/** @type {import('vue').ComputedRef<object>} */
+const activeProfile = computed(() => {
+  return store.getters.getActiveProfile
+})
+
+const activeSubscriptions = computed(() => {
+  /** @type {any[]} */
+  const subscriptions = deepCopy(activeProfile.value.subscriptions)
+
+  subscriptions.forEach(channel => {
+    // Change thumbnail size to 35x35, as that's the size we display it
+    // so we don't need to download a bigger image (the default is 176x176)
+    channel.thumbnail = channel.thumbnail?.replace(/=s\d+/, '=s35')
+  })
+
+  const locale_ = locale.value
+  subscriptions.sort((a, b) => {
+    return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), locale_)
+  })
+
+  if (backendPreference.value === 'invidious') {
+    const instanceUrl = currentInvidiousInstanceUrl.value
+
+    subscriptions.forEach((channel) => {
+      channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, instanceUrl)
+    })
+  }
+
+  return subscriptions
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hidePopularVideos = computed(() => {
+  return store.getters.getHidePopularVideos
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hidePlaylists = computed(() => {
+  return store.getters.getHidePlaylists
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideTrendingVideos = computed(() => {
+  return store.getters.getHideTrendingVideos
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideActiveSubscriptions = computed(() => {
+  return store.getters.getHideActiveSubscriptions
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideText = computed(() => {
+  return !isOpen.value && store.getters.getHideLabelsSideBar
+})
+
+const applyNavIconExpand = computed(() => {
+  return {
+    navIconExpand: hideText.value
+  }
+})
+
+const applyHiddenLabels = computed(() => {
+  return {
+    hiddenLabels: hideText.value
+  }
+})
+
+const historyTitle = computed(() => {
+  const shortcut = process.platform === 'darwin'
+    ? KeyboardShortcuts.APP.GENERAL.NAVIGATE_TO_HISTORY_MAC
+    : KeyboardShortcuts.APP.GENERAL.NAVIGATE_TO_HISTORY
+
+  return localizeAndAddKeyboardShortcutToActionTitle(
+    t('History.History'),
+    shortcut
+  )
+})
+
+const settingsTitle = computed(() => {
+  return localizeAndAddKeyboardShortcutToActionTitle(
+    t('Settings.Settings'),
+    KeyboardShortcuts.APP.GENERAL.NAVIGATE_TO_SETTINGS
+  )
+})
+</script>
+
+<style scoped src="./SideNav.css" />
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.css b/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css
similarity index 100%
rename from src/renderer/components/side-nav-more-options/side-nav-more-options.css
rename to src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue b/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
similarity index 79%
rename from src/renderer/components/side-nav-more-options/side-nav-more-options.vue
rename to src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
index 127082d686fe4..6fd3b27f043b5 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
+++ b/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
@@ -10,7 +10,7 @@
       @keydown.space.prevent="openMoreOptions = !openMoreOptions"
       @keydown.enter.prevent="openMoreOptions = !openMoreOptions"
     >
-      <font-awesome-icon
+      <FontAwesomeIcon
         :icon="['fas', 'ellipsis-h']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -36,7 +36,7 @@
         <div
           class="thumbnailContainer"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             :icon="['fas', 'user-check']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -58,7 +58,7 @@
         :aria-label="hideLabelsSideBar ? $t('Trending.Trending') : null"
         to="/trending"
       >
-        <font-awesome-icon
+        <FontAwesomeIcon
           :icon="['fas', 'fire']"
           class="navIcon"
           :class="applyNavIconExpand"
@@ -72,13 +72,13 @@
         </p>
       </router-link>
       <router-link
-        v-if="!hidePopularVideos && (backendFallback || backendPreference === 'invidious')"
+        v-if="popularVisible"
         class="navOption"
         :title="$t('Most Popular')"
         :aria-label="hideLabelsSideBar ? $t('Most Popular') : null"
         to="/popular"
       >
-        <font-awesome-icon
+        <FontAwesomeIcon
           :icon="['fas', 'users']"
           class="navIcon"
           :class="applyNavIconExpand"
@@ -97,7 +97,7 @@
         :aria-label="hideLabelsSideBar ? $t('About.About') : null"
         to="/about"
       >
-        <font-awesome-icon
+        <FontAwesomeIcon
           :icon="['fas', 'info-circle']"
           class="navIcon"
           :class="applyNavIconExpand"
@@ -117,7 +117,7 @@
       :aria-label="hideLabelsSideBar ? $t('History.History'): null"
       to="/history"
     >
-      <font-awesome-icon
+      <FontAwesomeIcon
         :icon="['fas', 'history']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -136,7 +136,7 @@
       :aria-label="hideLabelsSideBar ? $t('Settings.Settings') : null"
       to="/settings"
     >
-      <font-awesome-icon
+      <FontAwesomeIcon
         :icon="['fas', 'sliders-h']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -154,7 +154,7 @@
       to="/about"
       :aria-label="hideLabelsSideBar ? $t('About.About') : null"
     >
-      <font-awesome-icon
+      <FontAwesomeIcon
         :icon="['fas', 'info-circle']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -169,5 +169,35 @@
   </div>
 </template>
 
-<script src="./side-nav-more-options.js" />
-<style scoped src="./side-nav-more-options.css" />
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { computed, ref } from 'vue'
+
+import store from '../../store/index'
+
+const openMoreOptions = ref(false)
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideTrendingVideos = computed(() => {
+  return store.getters.getHideTrendingVideos
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideLabelsSideBar = computed(() => {
+  return store.getters.getHideLabelsSideBar
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const popularVisible = computed(() => {
+  return !store.getters.getHidePopularVideos &&
+    (store.getters.getBackendFallback || store.getters.getBackendPreference === 'invidious')
+})
+
+const applyNavIconExpand = computed(() => {
+  return {
+    navIconExpand: hideLabelsSideBar.value
+  }
+})
+</script>
+
+<style scoped src="./SideNavMoreOptions.css" />
diff --git a/src/renderer/components/ThemeSettings.vue b/src/renderer/components/ThemeSettings.vue
new file mode 100644
index 0000000000000..9815a2b0a4f23
--- /dev/null
+++ b/src/renderer/components/ThemeSettings.vue
@@ -0,0 +1,309 @@
+<template>
+  <FtSettingsSection
+    :title="$t('Settings.Theme Settings.Theme Settings')"
+  >
+    <div class="switchColumnGrid">
+      <div class="switchColumn">
+        <FtToggleSwitch
+          :label="$t('Settings.Theme Settings.Match Top Bar with Main Color')"
+          compact
+          :default-value="barColor"
+          @change="updateBarColor"
+        />
+        <FtToggleSwitch
+          :label="$t('Settings.Theme Settings.Expand Side Bar by Default')"
+          compact
+          :default-value="expandSideBar"
+          @change="handleExpandSideBar"
+        />
+        <FtToggleSwitch
+          v-if="usingElectron"
+          :label="$t('Settings.Theme Settings.Disable Smooth Scrolling')"
+          compact
+          :default-value="disableSmoothScrollingToggleValue"
+          @change="handleRestartPrompt"
+        />
+      </div>
+      <div class="switchColumn">
+        <FtToggleSwitch
+          :label="$t('Settings.Theme Settings.Hide Side Bar Labels')"
+          compact
+          :default-value="hideLabelsSideBar"
+          @change="updateHideLabelsSideBar"
+        />
+        <FtToggleSwitch
+          :label="$t('Settings.Theme Settings.Hide FreeTube Header Logo')"
+          compact
+          :default-value="hideHeaderLogo"
+          @change="updateHideHeaderLogo"
+        />
+      </div>
+    </div>
+    <FtFlexBox>
+      <FtSlider
+        :label="$t('Settings.Theme Settings.UI Scale')"
+        :default-value="uiScale"
+        :min-value="50"
+        :max-value="300"
+        :step="5"
+        value-extension="%"
+        @change="updateUiScale(parseInt($event))"
+      />
+    </FtFlexBox>
+    <br>
+    <FtFlexBox>
+      <FtSelect
+        :placeholder="$t('Settings.Theme Settings.Base Theme.Base Theme')"
+        :value="baseTheme"
+        :select-names="baseThemeNames"
+        :select-values="BASE_THEME_VALUES"
+        :icon="['fas', 'palette']"
+        @change="updateBaseTheme"
+      />
+      <FtSelect
+        :placeholder="$t('Settings.Theme Settings.Main Color Theme.Main Color Theme')"
+        :value="mainColor"
+        :select-names="colorNames"
+        :select-values="COLOR_VALUES"
+        :disabled="!areColorThemesEnabled"
+        :icon="['fas', 'palette']"
+        icon-color="var(--primary-color)"
+        @change="updateMainColor"
+      />
+      <FtSelect
+        :placeholder="$t('Settings.Theme Settings.Secondary Color Theme')"
+        :value="secColor"
+        :select-names="colorNames"
+        :select-values="COLOR_VALUES"
+        :disabled="!areColorThemesEnabled"
+        :icon="['fas', 'palette']"
+        icon-color="var(--accent-color)"
+        @change="updateSecColor"
+      />
+    </FtFlexBox>
+    <FtPrompt
+      v-if="showRestartPrompt"
+      :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
+      :option-names="restartPromptNames"
+      :option-values="RESTART_PROMPT_VALUES"
+      @click="handleSmoothScrolling"
+    />
+  </FtSettingsSection>
+</template>
+
+<script setup>
+import { computed, ref } from 'vue'
+import { useI18n } from '../composables/use-i18n-polyfill'
+
+import FtSettingsSection from './FtSettingsSection/FtSettingsSection.vue'
+import FtSelect from './ft-select/ft-select.vue'
+import FtToggleSwitch from './ft-toggle-switch/ft-toggle-switch.vue'
+import FtSlider from './ft-slider/ft-slider.vue'
+import FtFlexBox from './ft-flex-box/ft-flex-box.vue'
+import FtPrompt from './ft-prompt/ft-prompt.vue'
+
+import store from '../store/index'
+
+import { colors } from '../helpers/colors'
+import { IpcChannels } from '../../constants'
+import { useColorTranslations } from '../composables/colors'
+
+const { t } = useI18n()
+
+// Themes are devided into 3 groups.
+// The first group contains the default themes.
+// The second group are themes that don't have specific primary and secondary colors.
+// The third group are themes that do have specific primary and secondary colors available.
+
+const BASE_THEME_VALUES = [
+  // First group
+  'system',
+  'light',
+  'dark',
+  'black',
+  // Second group
+  'nordic',
+  'hotPink',
+  'pastelPink',
+  // Third group
+  'catppuccinMocha',
+  'dracula',
+  'gruvboxDark',
+  'gruvboxLight',
+  'solarizedDark',
+  'solarizedLight'
+]
+
+const baseThemeNames = computed(() => [
+  // First group
+  t('Settings.Theme Settings.Base Theme.System Default'),
+  t('Settings.Theme Settings.Base Theme.Light'),
+  t('Settings.Theme Settings.Base Theme.Dark'),
+  t('Settings.Theme Settings.Base Theme.Black'),
+  // Second group
+  t('Settings.Theme Settings.Base Theme.Nordic'),
+  t('Settings.Theme Settings.Base Theme.Hot Pink'),
+  t('Settings.Theme Settings.Base Theme.Pastel Pink'),
+  // Third group
+  t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'),
+  t('Settings.Theme Settings.Base Theme.Dracula'),
+  t('Settings.Theme Settings.Base Theme.Gruvbox Dark'),
+  t('Settings.Theme Settings.Base Theme.Gruvbox Light'),
+  t('Settings.Theme Settings.Base Theme.Solarized Dark'),
+  t('Settings.Theme Settings.Base Theme.Solarized Light')
+])
+
+const COLOR_VALUES = colors.map(color => color.name)
+const colorNames = useColorTranslations()
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const barColor = computed(() => {
+  return store.getters.getBarColor
+})
+
+/**
+ * @param {boolean} value
+ */
+function updateBarColor(value) {
+  store.dispatch('updateBarColor', value)
+}
+
+/** @type {import('vue').ComputedRef<string>} */
+const baseTheme = computed(() => {
+  return store.getters.getBaseTheme
+})
+
+/**
+ * @param {string} value
+ */
+function updateBaseTheme(value) {
+  store.dispatch('updateBaseTheme', value)
+}
+
+const areColorThemesEnabled = computed(() => baseTheme.value !== 'hotPink')
+
+/** @type {import('vue').ComputedRef<string>} */
+const mainColor = computed(() => {
+  return store.getters.getMainColor
+})
+
+/**
+ * @param {string} value
+ */
+function updateMainColor(value) {
+  store.dispatch('updateMainColor', value)
+}
+
+/** @type {import('vue').ComputedRef<string>} */
+const secColor = computed(() => {
+  return store.getters.getSecColor
+})
+
+/**
+ * @param {string} value
+ */
+function updateSecColor(value) {
+  store.dispatch('updateSecColor', value)
+}
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const expandSideBar = computed(() => {
+  return store.getters.getexpandSideBar
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const isSideNavOpen = computed(() => {
+  return store.getters.getIsSideNavOpen
+})
+
+/**
+ * @param {boolean} value
+ */
+function handleExpandSideBar(value) {
+  if (isSideNavOpen.value !== value) {
+    store.commit('toggleSideNav')
+  }
+
+  store.dispatch('updateExpandSideBar', value)
+}
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideLabelsSideBar = computed(() => {
+  return store.getters.getHideLabelsSideBar
+})
+
+/**
+ * @param {boolean} value
+ */
+function updateHideLabelsSideBar(value) {
+  store.dispatch('updateHideLabelsSideBar', value)
+}
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideHeaderLogo = computed(() => {
+  return store.getters.getHideHeaderLogo
+})
+
+/**
+ * @param {boolean} value
+ */
+function updateHideHeaderLogo(value) {
+  store.dispatch('updateHideHeaderLogo', value)
+}
+
+/** @type {import('vue').ComputedRef<number>} */
+const uiScale = computed(() => store.getters.getUiScale)
+
+/**
+ * @param {number} value
+ */
+function updateUiScale(value) {
+  store.dispatch('updateUiScale', value)
+}
+
+/** @type {boolean} */
+const usingElectron = process.env.IS_ELECTRON
+
+const RESTART_PROMPT_VALUES = [
+  'restart',
+  'cancel'
+]
+
+const restartPromptNames = computed(() => [
+  t('Yes, Restart'),
+  t('Cancel')
+])
+
+/** @type {import('vue').Ref<boolean>} */
+const disableSmoothScrollingToggleValue = ref(store.getters.getDisableSmoothScrolling)
+const showRestartPrompt = ref(false)
+
+/**
+ * @param {boolean} value
+ */
+function handleRestartPrompt(value) {
+  disableSmoothScrollingToggleValue.value = value
+  showRestartPrompt.value = true
+}
+
+/**
+ * @param {'restart' | 'cancel' | null} value
+ */
+function handleSmoothScrolling(value) {
+  showRestartPrompt.value = false
+
+  if (value === null || value === 'cancel') {
+    disableSmoothScrollingToggleValue.value = !disableSmoothScrollingToggleValue.value
+    return
+  }
+
+  if (process.env.IS_ELECTRON) {
+    store.dispatch('updateDisableSmoothScrolling',
+      disableSmoothScrollingToggleValue.value
+    ).then(() => {
+      const { ipcRenderer } = require('electron')
+      ipcRenderer.send(IpcChannels.RELAUNCH_REQUEST)
+    })
+  }
+}
+</script>
diff --git a/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue b/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue
index ac27a48059e7d..9e3ad355cf1ac 100644
--- a/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue
+++ b/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue
@@ -12,7 +12,7 @@
       @keydown.space.stop.prevent="toggleShowChapters"
       @keydown.enter.stop.prevent="toggleShowChapters"
     >
-      {{ $t("Chapters.Chapters") }}
+      {{ kind === 'keyMoments' ? $t('Chapters.Key Moments') : $t("Chapters.Chapters") }}
 
       <span class="currentChapter">
         • {{ currentTitle }}
@@ -82,6 +82,10 @@ const props = defineProps({
   currentChapterIndex: {
     type: Number,
     required: true
+  },
+  kind: {
+    type: String,
+    default: 'chapters'
   }
 })
 
@@ -106,10 +110,12 @@ const currentChapter = computed(() => {
   return props.chapters[currentIndex.value]
 })
 
+/** @type {import('vue').ComputedRef<string>} */
 const currentTitle = computed(() => {
   return currentChapter.value.title
 })
 
+/** @type {import('vue').ComputedRef<boolean>} */
 const compact = computed(() => {
   return !props.chapters[0].thumbnail
 })
diff --git a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css
index c7b2a437e55d8..ae0da75e3b2db 100644
--- a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css
+++ b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css
@@ -1,6 +1,9 @@
 .videoDescription {
+  position: relative;
+  display: flex;
+  flex-direction: column-reverse;
   overflow-y: auto;
-  max-block-size: 300px;
+  max-block-size: 20lh;
 }
 
 .description {
@@ -9,3 +12,46 @@
   white-space: pre-wrap;
   overflow-wrap: anywhere;
 }
+
+.descriptionStatus {
+  margin: 0;
+  text-decoration: underline;
+  cursor: pointer;
+  color: var(--title-color);
+}
+
+.videoDescription.short .descriptionStatus {
+  position: absolute;
+  inset-block-end: calc(1lh + 12px);
+  padding-block: 2px;
+  inset-inline-end: 16px;
+  padding-inline-start: 40px;
+  background: linear-gradient(270deg, var(--card-bg-color) 75%, transparent 100%);
+  text-decoration: none;
+}
+
+.videoDescription:not(.short) .descriptionStatus {
+  position: relative;
+  order: 0;
+  margin-block-start: 1em;
+}
+
+.videoDescription.short .description {
+  max-block-size: 4lh;
+  overflow: hidden;
+}
+
+.videoDescription:not(.short) .description {
+  order: 1;
+}
+
+.videoDescription .overlay {
+  position: absolute;
+  cursor: pointer;
+  inset: 0;
+  transition: background-color 200ms ease;
+}
+
+.videoDescription .overlay:hover {
+  background-color: var(--accent-color-opacity1);
+}
diff --git a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
index 37a12ea6eafca..a2534db231c5e 100644
--- a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
+++ b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
@@ -1,9 +1,40 @@
 <template>
   <FtCard
     v-if="shownDescription.length > 0"
-    class="videoDescription"
+    :class="{ videoDescription: true, short: !showFullDescription }"
   >
+    <template v-if="showControls">
+      <span
+        v-if="showFullDescription"
+        class="descriptionStatus"
+        role="button"
+        tabindex="0"
+        @click="collapseDescription"
+        @keydown.space.prevent="collapseDescription"
+        @keydown.enter.prevent="collapseDescription"
+      >
+        {{ $t("Description.Collapse Description") }}
+      </span>
+      <span
+        v-else
+        class="descriptionStatus"
+        role="button"
+        tabindex="0"
+        @keydown.space.prevent="expandDescription"
+        @keydown.enter.prevent="expandDescription"
+      >
+        {{ $t("Description.Expand Description") }}
+      </span>
+      <div
+        v-if="!showFullDescription"
+        class="overlay"
+        @click="expandDescription"
+        @keydown.space.prevent="expandDescription"
+        @keydown.enter.prevent="expandDescription"
+      />
+    </template>
     <FtTimestampCatcher
+      ref="descriptionContainer"
       class="description"
       :input-html="shownDescription"
       @timestamp-event="onTimestamp"
@@ -14,8 +45,9 @@
 <script setup>
 import autolinker from 'autolinker'
 
+import { onMounted, ref } from 'vue'
 import FtCard from '../ft-card/ft-card.vue'
-import FtTimestampCatcher from '../ft-timestamp-catcher/ft-timestamp-catcher.vue'
+import FtTimestampCatcher from '../FtTimestampCatcher.vue'
 
 const props = defineProps({
   description: {
@@ -31,6 +63,9 @@ const props = defineProps({
 const emit = defineEmits(['timestamp-event'])
 
 let shownDescription = ''
+const descriptionContainer = ref()
+const showFullDescription = ref(false)
+const showControls = ref(false)
 
 if (props.descriptionHtml !== '') {
   const parsed = parseDescriptionHtml(props.descriptionHtml)
@@ -58,8 +93,40 @@ function onTimestamp(timestamp) {
   emit('timestamp-event', timestamp)
 }
 
+/**
+ * Enables user to view entire contents of description
+ */
+function expandDescription() {
+  showFullDescription.value = true
+}
+
+/**
+ * Enables user to collapse contents of description
+ */
+function collapseDescription() {
+  showFullDescription.value = false
+}
+
+/**
+ * Returns true when description content does not overflow description container
+ * Useful for hiding description expansion/contraction controls
+ */
+function isShortDescription() {
+  const descriptionElem = descriptionContainer.value?.$el
+  return descriptionElem?.clientHeight >= descriptionElem?.scrollHeight
+}
+
+onMounted(() => {
+  // To verify whether or not the description is too short for displaying
+  // description controls, we need to check the description's dimensions.
+  // The only way to make this work is to check on mount.
+  showFullDescription.value = isShortDescription()
+  showControls.value = !showFullDescription.value
+})
+
 /**
  * @param {string} descriptionText
+ * @returns {string}
  */
 function parseDescriptionHtml(descriptionText) {
   return descriptionText
diff --git a/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue b/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue
index 103422236a555..44e5ffe3c4e1f 100644
--- a/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue
+++ b/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue
@@ -46,6 +46,7 @@ defineProps({
   }
 })
 
+/** @type {import('vue').ComputedRef<boolean>} */
 const playNextVideo = computed(() => {
   return store.getters.getPlayNextVideo
 })
diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index 7c950732ebb5e..e479793ca255a 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import { mapActions, mapMutations } from 'vuex'
 import FtButton from '../ft-button/ft-button.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
@@ -12,13 +12,14 @@ import {
   deepCopy,
   escapeHTML,
   getTodayDateStrLocalTimezone,
-  readFileFromDialog,
-  showOpenDialog,
-  showSaveDialog,
+  readFileWithPicker,
   showToast,
-  writeFileFromDialog,
+  writeFileWithPicker,
 } from '../../helpers/utils'
 
+const IMPORT_DIRECTORY_ID = 'data-settings-import'
+const START_IN_DIRECTORY = 'downloads'
+
 export default defineComponent({
   name: 'DataSettings',
   components: {
@@ -81,44 +82,45 @@ export default defineComponent({
     },
 
     importSubscriptions: async function () {
-      const options = {
-        properties: ['openFile'],
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Subscription File'),
-            extensions: ['db', 'csv', 'json', 'opml', 'xml']
-          }
-        ]
-      }
-
-      const response = await showOpenDialog(options)
-      if (response.canceled || response.filePaths?.length === 0) {
-        return
-      }
-      let textDecode
+      let response
       try {
-        textDecode = await readFileFromDialog(response)
+        response = await readFileWithPicker(
+          this.$t('Settings.Data Settings.Subscription File'),
+          {
+            'application/x-freetube-db': '.db',
+            'text/csv': '.csv',
+            'application/json': '.json',
+            'application/xml': ['.xml', '.opml']
+          },
+          IMPORT_DIRECTORY_ID,
+          START_IN_DIRECTORY
+        )
       } catch (err) {
         const message = this.$t('Settings.Data Settings.Unable to read file')
         showToast(`${message}: ${err}`)
         return
       }
-      response.filePaths.forEach(filePath => {
-        if (filePath.endsWith('.csv')) {
-          this.importCsvYouTubeSubscriptions(textDecode)
-        } else if (filePath.endsWith('.db')) {
-          this.importFreeTubeSubscriptions(textDecode)
-        } else if (filePath.endsWith('.opml') || filePath.endsWith('.xml')) {
-          this.importOpmlYouTubeSubscriptions(textDecode)
-        } else if (filePath.endsWith('.json')) {
-          textDecode = JSON.parse(textDecode)
-          if (textDecode.subscriptions) {
-            this.importNewPipeSubscriptions(textDecode)
-          } else {
-            this.importYouTubeSubscriptions(textDecode)
-          }
+
+      if (response === null) {
+        return
+      }
+
+      const { filename, content } = response
+
+      if (filename.endsWith('.csv')) {
+        this.importCsvYouTubeSubscriptions(content)
+      } else if (filename.endsWith('.db')) {
+        this.importFreeTubeSubscriptions(content)
+      } else if (filename.endsWith('.opml') || filename.endsWith('.xml')) {
+        this.importOpmlYouTubeSubscriptions(content)
+      } else if (filename.endsWith('.json')) {
+        const jsonContent = JSON.parse(content)
+        if (jsonContent.subscriptions) {
+          this.importNewPipeSubscriptions(jsonContent)
+        } else {
+          this.importYouTubeSubscriptions(jsonContent)
         }
-      })
+      }
     },
 
     importFreeTubeSubscriptions: function (textDecode) {
@@ -220,7 +222,7 @@ export default defineComponent({
         return [...yt.matchAll(splitCSVRegex)].map(s => {
           let newVal = s[1]
           if (newVal.startsWith('"')) {
-            newVal = newVal.substring(1, newVal.length - 2).replaceAll('""', '"')
+            newVal = newVal.substring(1, newVal.length - 1).replaceAll('""', '"')
           }
           return newVal
         })
@@ -432,33 +434,20 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-subscriptions-' + dateStr + '.db'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Subscription File'),
-            extensions: ['db']
-          }
-        ]
-      }
-
-      await this.promptAndWriteToFile(options, subscriptionsDb, this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        subscriptionsDb,
+        this.$t('Settings.Data Settings.Subscription File'),
+        'application/x-freetube-db',
+        '.db',
+        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
+      )
     },
 
     exportYouTubeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'youtube-subscriptions-' + dateStr + '.json'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Subscription File'),
-            extensions: ['json']
-          }
-        ]
-      }
-
       const subscriptionsObject = this.profileList[0].subscriptions.map((channel) => {
         const object = {
           contentDetails: {
@@ -495,23 +484,20 @@ export default defineComponent({
         return object
       })
 
-      await this.promptAndWriteToFile(options, JSON.stringify(subscriptionsObject), this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        JSON.stringify(subscriptionsObject),
+        this.$t('Settings.Data Settings.Subscription File'),
+        'application/json',
+        '.json',
+        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
+      )
     },
 
     exportOpmlYouTubeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'youtube-subscriptions-' + dateStr + '.opml'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Subscription File'),
-            extensions: ['opml']
-          }
-        ]
-      }
-
       let opmlData = '<opml version="1.1"><body><outline text="YouTube Subscriptions" title="YouTube Subscriptions">'
 
       this.profileList[0].subscriptions.forEach((channel) => {
@@ -523,22 +509,20 @@ export default defineComponent({
 
       opmlData += '</outline></body></opml>'
 
-      await this.promptAndWriteToFile(options, opmlData, this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        opmlData,
+        this.$t('Settings.Data Settings.Subscription File'),
+        'application/xml',
+        '.opml',
+        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
+      )
     },
 
     exportCsvYouTubeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'youtube-subscriptions-' + dateStr + '.csv'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Subscription File'),
-            extensions: ['csv']
-          }
-        ]
-      }
       let exportText = 'Channel ID,Channel URL,Channel title\n'
       this.profileList[0].subscriptions.forEach((channel) => {
         const channelUrl = `https://www.youtube.com/channel/${channel.id}`
@@ -549,23 +533,20 @@ export default defineComponent({
       })
       exportText += '\n'
 
-      await this.promptAndWriteToFile(options, exportText, this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        exportText,
+        this.$t('Settings.Data Settings.Subscription File'),
+        'text/csv',
+        '.csv',
+        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
+      )
     },
 
     exportNewPipeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'newpipe-subscriptions-' + dateStr + '.json'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Subscription File'),
-            extensions: ['json']
-          }
-        ]
-      }
-
       const newPipeObject = {
         app_version: '0.19.8',
         app_version_int: 953,
@@ -583,40 +564,45 @@ export default defineComponent({
         newPipeObject.subscriptions.push(subscription)
       })
 
-      await this.promptAndWriteToFile(options, JSON.stringify(newPipeObject), this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        JSON.stringify(newPipeObject),
+        this.$t('Settings.Data Settings.Subscription File'),
+        'application/json',
+        '.json',
+        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
+      )
     },
 
     importHistory: async function () {
-      const options = {
-        properties: ['openFile'],
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.History File'),
-            extensions: ['db', 'json']
-          }
-        ]
-      }
-
-      const response = await showOpenDialog(options)
-      if (response.canceled || response.filePaths?.length === 0) {
-        return
-      }
-      let textDecode
+      let response
       try {
-        textDecode = await readFileFromDialog(response)
+        response = await readFileWithPicker(
+          this.$t('Settings.Data Settings.History File'),
+          {
+            'application/x-freetube-db': '.db',
+            'application/json': '.json'
+          },
+          IMPORT_DIRECTORY_ID,
+          START_IN_DIRECTORY
+        )
       } catch (err) {
         const message = this.$t('Settings.Data Settings.Unable to read file')
         showToast(`${message}: ${err}`)
         return
       }
 
-      response.filePaths.forEach(filePath => {
-        if (filePath.endsWith('.db')) {
-          this.importFreeTubeHistory(textDecode.split('\n'))
-        } else if (filePath.endsWith('.json')) {
-          this.importYouTubeHistory(JSON.parse(textDecode))
-        }
-      })
+      if (response === null) {
+        return
+      }
+
+      const { filename, content } = response
+
+      if (filename.endsWith('.db')) {
+        this.importFreeTubeHistory(content.split('\n'))
+      } else if (filename.endsWith('.json')) {
+        this.importYouTubeHistory(JSON.parse(content))
+      }
     },
 
     async importFreeTubeHistory(textDecode) {
@@ -777,42 +763,39 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-history-' + dateStr + '.db'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Playlist File'),
-            extensions: ['db']
-          }
-        ]
-      }
-
-      await this.promptAndWriteToFile(options, historyDb, this.$t('Settings.Data Settings.All watched history has been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        historyDb,
+        this.$t('Settings.Data Settings.History File'),
+        'application/x-freetube-db',
+        '.db',
+        this.$t('Settings.Data Settings.All watched history has been successfully exported')
+      )
     },
 
     importPlaylists: async function () {
-      const options = {
-        properties: ['openFile'],
-        filters: [
-          {
-            name: this.$t('Settings.Data Settings.Playlist File'),
-            extensions: ['db']
-          }
-        ]
-      }
-
-      const response = await showOpenDialog(options)
-      if (response.canceled || response.filePaths?.length === 0) {
-        return
-      }
-      let data
+      let response
       try {
-        data = await readFileFromDialog(response)
+        response = await readFileWithPicker(
+          this.$t('Settings.Data Settings.Playlist File'),
+          {
+            'application/x-freetube-db': '.db'
+          },
+          IMPORT_DIRECTORY_ID,
+          START_IN_DIRECTORY
+        )
       } catch (err) {
         const message = this.$t('Settings.Data Settings.Unable to read file')
         showToast(`${message}: ${err}`)
         return
       }
+
+      if (response === null) {
+        return
+      }
+
+      let data = response.content
+
       let playlists = null
 
       // for the sake of backwards compatibility,
@@ -837,12 +820,12 @@ export default defineComponent({
       ]
 
       const optionalKeys = [
+        '_id',
         'description',
         'createdAt',
       ]
 
       const ignoredKeys = [
-        '_id',
         'title',
         'type',
         'protected',
@@ -875,6 +858,7 @@ export default defineComponent({
         // to the app, so we'll only grab the data we need here.
 
         const playlistObject = {}
+        const videoIdToBeAddedSet = new Set()
 
         Object.keys(playlistData).forEach((key) => {
           if ([requiredKeys, optionalKeys, ignoredKeys].every((ks) => !ks.includes(key))) {
@@ -888,6 +872,7 @@ export default defineComponent({
 
               if (videoObjectHasAllRequiredKeys) {
                 videoArray.push(video)
+                videoIdToBeAddedSet.add(video.videoId)
               }
             })
 
@@ -901,48 +886,71 @@ export default defineComponent({
         const playlistObjectKeys = Object.keys(playlistObject)
         const playlistObjectHasAllRequiredKeys = requiredKeys.every((k) => playlistObjectKeys.includes(k))
 
-        if (playlistObjectHasAllRequiredKeys) {
-          const existingPlaylist = this.allPlaylists.find((playlist) => {
-            return playlist.playlistName === playlistObject.playlistName
-          })
+        if (!playlistObjectHasAllRequiredKeys) {
+          const message = this.$t('Settings.Data Settings.Playlist insufficient data', { playlist: playlistData.playlistName })
+          showToast(message)
+          return
+        }
 
-          if (existingPlaylist !== undefined) {
-            playlistObject.videos.forEach((video) => {
-              let videoExists = false
-              if (video.playlistItemId != null) {
-                // Find by `playlistItemId` if present
-                videoExists = existingPlaylist.videos.some((x) => {
-                  // Allow duplicate (by videoId) videos to be added
-                  return x.videoId === video.videoId && x.playlistItemId === video.playlistItemId
-                })
-              } else {
-                // Older playlist exports have no `playlistItemId` but have `timeAdded`
-                // Which might be duplicate for copied playlists with duplicate `videoId`
-                videoExists = existingPlaylist.videos.some((x) => {
-                  // Allow duplicate (by videoId) videos to be added
-                  return x.videoId === video.videoId && x.timeAdded === video.timeAdded
-                })
-              }
+        const existingPlaylist = this.allPlaylists.find((playlist) => {
+          if (playlistObject._id != null && playlist._id === playlistObject._id) {
+            return true
+          }
 
-              if (!videoExists) {
-                // Keep original `timeAdded` value
-                const payload = {
-                  _id: existingPlaylist._id,
-                  videoData: video,
-                }
+          return playlist.playlistName === playlistObject.playlistName
+        })
 
-                this.addVideo(payload)
-              }
-            })
-            // Update playlist's `lastUpdatedAt`
-            this.updatePlaylist({ _id: existingPlaylist._id })
+        if (existingPlaylist === undefined) {
+          this.addPlaylist(playlistObject)
+          return
+        }
+
+        const duplicateVideoPresentInToBeAdded = playlistObject.videos.length > videoIdToBeAddedSet.size
+        const existingVideoIdSet = existingPlaylist.videos.reduce((video) => videoIdToBeAddedSet.add(video.videoId), new Set())
+        const duplicateVideoPresentInExistingPlaylist = existingPlaylist.videos.length > existingVideoIdSet.size
+        const shouldAddDuplicateVideos = duplicateVideoPresentInToBeAdded || duplicateVideoPresentInExistingPlaylist
+
+        playlistObject.videos.forEach((video) => {
+          let videoExists = false
+          if (shouldAddDuplicateVideos) {
+            if (video.playlistItemId != null) {
+              // Find by `playlistItemId` if present
+              videoExists = existingPlaylist.videos.some((x) => {
+                // Allow duplicate (by videoId) videos to be added
+                return x.videoId === video.videoId && x.playlistItemId === video.playlistItemId
+              })
+            } else {
+              // Older playlist exports have no `playlistItemId` but have `timeAdded`
+              // Which might be duplicate for copied playlists with duplicate `videoId`
+              videoExists = existingPlaylist.videos.some((x) => {
+                // Allow duplicate (by videoId) videos to be added
+                return x.videoId === video.videoId && x.timeAdded === video.timeAdded
+              })
+            }
           } else {
-            this.addPlaylist(playlistObject)
+            videoExists = existingPlaylist.videos.some((x) => {
+              // Disallow duplicate (by videoId) videos to be added
+              return x.videoId === video.videoId
+            })
           }
-        } else {
-          const message = this.$t('Settings.Data Settings.Playlist insufficient data', { playlist: playlistData.playlistName })
-          showToast(message)
-        }
+
+          if (!videoExists) {
+            // Keep original `timeAdded` value
+            const payload = {
+              _id: existingPlaylist._id,
+              videoData: video,
+            }
+
+            this.addVideo(payload)
+          }
+        })
+        // Update playlist's `lastUpdatedAt` & other attributes
+        this.updatePlaylist({
+          _id: existingPlaylist._id,
+          // Only these attributes would be updated (besides videos)
+          playlistName: playlistObject.playlistName,
+          description: playlistObject.description,
+        })
       })
 
       showToast(this.$t('Settings.Data Settings.All playlists has been successfully imported'))
@@ -952,21 +960,18 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-playlists-' + dateStr + '.db'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: 'Database File',
-            extensions: ['db']
-          }
-        ]
-      }
-
       const playlistsDb = this.allPlaylists.map(playlist => {
         return JSON.stringify(playlist)
       }).join('\n') + '\n'// a trailing line is expected
 
-      await this.promptAndWriteToFile(options, playlistsDb, this.$t('Settings.Data Settings.All playlists has been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        playlistsDb,
+        this.$t('Settings.Data Settings.Playlist File'),
+        'application/x-freetube-db',
+        '.db',
+        this.$t('Settings.Data Settings.All playlists has been successfully exported')
+      )
     },
 
     exportPlaylistsForOlderVersionsSometimes: function () {
@@ -981,16 +986,6 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-playlists-as-single-favorites-playlist-' + dateStr + '.db'
 
-      const options = {
-        defaultPath: exportFileName,
-        filters: [
-          {
-            name: 'Database File',
-            extensions: ['db']
-          }
-        ]
-      }
-
       const favoritesPlaylistData = {
         playlistName: 'Favorites',
         protected: true,
@@ -1015,7 +1010,14 @@ export default defineComponent({
         })
       })
 
-      await this.promptAndWriteToFile(options, JSON.stringify([favoritesPlaylistData]), this.$t('Settings.Data Settings.All playlists has been successfully exported'))
+      await this.promptAndWriteToFile(
+        exportFileName,
+        JSON.stringify([favoritesPlaylistData]),
+        this.$t('Settings.Data Settings.Playlist File'),
+        'application/x-freetube-db',
+        '.db',
+        this.$t('Settings.Data Settings.All playlists has been successfully exported')
+      )
     },
 
     convertOldFreeTubeFormatToNew(oldData) {
@@ -1049,22 +1051,32 @@ export default defineComponent({
       return convertedData
     },
 
-    promptAndWriteToFile: async function (saveOptions, content, successMessage) {
-      const response = await showSaveDialog(saveOptions)
-      if (response.canceled || response.filePath === '') {
-        // User canceled the save dialog
-        return
-      }
-
+    promptAndWriteToFile: async function (
+      fileName,
+      content,
+      fileTypeDescription,
+      mimeType,
+      fileExtension,
+      successMessage
+    ) {
       try {
-        await writeFileFromDialog(response, content)
-      } catch (writeErr) {
+        const response = await writeFileWithPicker(
+          fileName,
+          content,
+          fileTypeDescription,
+          mimeType,
+          fileExtension,
+          'data-settings-export',
+          START_IN_DIRECTORY
+        )
+
+        if (response) {
+          showToast(successMessage)
+        }
+      } catch (error) {
         const message = this.$t('Settings.Data Settings.Unable to write file')
-        showToast(`${message}: ${writeErr}`)
-        return
+        showToast(`${message}: ${error}`)
       }
-
-      showToast(successMessage)
     },
 
     isChannelSubscribed(channelId, subscriptions) {
diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index cdb0f4f0159b6..c0e8ca8a03c5b 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/src/renderer/components/distraction-settings/distraction-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtInputTags from '../../components/ft-input-tags/ft-input-tags.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
@@ -96,6 +96,9 @@ export default defineComponent({
     hideChannelCommunity: function () {
       return this.$store.getters.getHideChannelCommunity
     },
+    hideChannelHome: function () {
+      return this.$store.getters.getHideChannelHome
+    },
     hideSubscriptionsVideos: function () {
       return this.$store.getters.getHideSubscriptionsVideos
     },
@@ -111,6 +114,12 @@ export default defineComponent({
     showDistractionFreeTitles: function () {
       return this.$store.getters.getShowDistractionFreeTitles
     },
+    showAddedChannelsHidden: function () {
+      return this.$store.getters.getShowAddedChannelsHidden
+    },
+    showAddedForbiddenTitles: function () {
+      return this.$store.getters.getShowAddedForbiddenTitles
+    },
     channelsHidden: function () {
       return JSON.parse(this.$store.getters.getChannelsHidden).map((ch) => {
         // Legacy support
@@ -157,6 +166,12 @@ export default defineComponent({
     handleChannelsExists: function () {
       showToast(this.$t('Settings.Distraction Free Settings.Hide Channels Already Exists'))
     },
+    handleAddedChannelsHidden: function () {
+      this.updateShowAddedChannelsHidden(!this.showAddedChannelsHidden)
+    },
+    handleAddedForbiddenTitles: function () {
+      this.updateShowAddedForbiddenTitles(!this.showAddedForbiddenTitles)
+    },
     validateChannelId: function (text) {
       return checkYoutubeChannelId(text)
     },
@@ -218,12 +233,15 @@ export default defineComponent({
       'updateHideChannelShorts',
       'updateHideChannelPlaylists',
       'updateHideChannelCommunity',
+      'updateHideChannelHome',
       'updateHideChannelPodcasts',
       'updateHideChannelReleases',
       'updateHideSubscriptionsVideos',
       'updateHideSubscriptionsShorts',
       'updateHideSubscriptionsLive',
       'updateHideSubscriptionsCommunity',
+      'updateShowAddedChannelsHidden',
+      'updateShowAddedForbiddenTitles',
     ])
   }
 })
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 40fc7a6e7e494..84321ed152e5e 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -81,6 +81,12 @@
     </h4>
     <div class="switchColumnGrid">
       <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Hide Channel Home')"
+          :compact="true"
+          :default-value="hideChannelHome"
+          @change="updateHideChannelHome"
+        />
         <ft-toggle-switch
           :label="$t('Settings.Distraction Free Settings.Hide Channel Shorts')"
           :compact="true"
@@ -240,10 +246,12 @@
         :validate-tag-name="validateChannelId"
         :find-tag-info="findChannelTagInfo"
         :are-channel-tags="true"
+        :show-tags="showAddedChannelsHidden"
         @invalid-name="handleInvalidChannel"
         @error-find-tag-info="handleChannelAPIError"
         @change="handleChannelsHidden"
         @already-exists="handleChannelsExists"
+        @toggle-show-tags="handleAddedChannelsHidden"
       />
     </ft-flex-box>
     <ft-flex-box>
@@ -251,10 +259,12 @@
         :label="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
         :tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text Placeholder')"
         :show-action-button="true"
+        :show-tags="showAddedForbiddenTitles"
         :tag-list="forbiddenTitles"
         :min-input-length="3"
         :tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
         @change="handleForbiddenTitles"
+        @toggle-show-tags="handleAddedForbiddenTitles"
       />
     </ft-flex-box>
   </ft-settings-section>
diff --git a/src/renderer/components/download-settings/download-settings.js b/src/renderer/components/download-settings/download-settings.js
index a0ad9efa067da..9755d672e3450 100644
--- a/src/renderer/components/download-settings/download-settings.js
+++ b/src/renderer/components/download-settings/download-settings.js
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtSelect from '../ft-select/ft-select.vue'
diff --git a/src/renderer/components/experimental-settings/experimental-settings.js b/src/renderer/components/experimental-settings/experimental-settings.js
deleted file mode 100644
index 652c94f752b18..0000000000000
--- a/src/renderer/components/experimental-settings/experimental-settings.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { defineComponent } from 'vue'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
-import FtPrompt from '../ft-prompt/ft-prompt.vue'
-import { IpcChannels } from '../../../constants'
-
-export default defineComponent({
-  name: 'ExperimentalSettings',
-  components: {
-    'ft-settings-section': FtSettingsSection,
-    'ft-flex-box': FtFlexBox,
-    'ft-toggle-switch': FtToggleSwitch,
-    'ft-prompt': FtPrompt
-  },
-  data: function () {
-    return {
-      replaceHttpCacheLoading: true,
-      replaceHttpCache: false,
-      showRestartPrompt: false
-    }
-  },
-  mounted: async function () {
-    if (process.env.IS_ELECTRON) {
-      const { ipcRenderer } = require('electron')
-      this.replaceHttpCache = await ipcRenderer.invoke(IpcChannels.GET_REPLACE_HTTP_CACHE)
-    }
-
-    this.replaceHttpCacheLoading = false
-  },
-  methods: {
-    handleRestartPrompt: function (value) {
-      this.replaceHttpCache = value
-      this.showRestartPrompt = true
-    },
-
-    handleReplaceHttpCache: function (value) {
-      this.showRestartPrompt = false
-
-      if (value === null || value === 'cancel') {
-        this.replaceHttpCache = !this.replaceHttpCache
-        return
-      }
-
-      if (process.env.IS_ELECTRON) {
-        const { ipcRenderer } = require('electron')
-        ipcRenderer.send(IpcChannels.TOGGLE_REPLACE_HTTP_CACHE)
-      }
-    }
-  }
-})
diff --git a/src/renderer/components/experimental-settings/experimental-settings.vue b/src/renderer/components/experimental-settings/experimental-settings.vue
deleted file mode 100644
index 1f0d61f64ebbe..0000000000000
--- a/src/renderer/components/experimental-settings/experimental-settings.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-  <ft-settings-section
-    :title="$t('Settings.Experimental Settings.Experimental Settings')"
-  >
-    <p class="experimental-warning">
-      {{ $t('Settings.Experimental Settings.Warning') }}
-    </p>
-    <ft-flex-box>
-      <ft-toggle-switch
-        tooltip-position="top"
-        :label="$t('Settings.Experimental Settings.Replace HTTP Cache')"
-        :compact="true"
-        :default-value="replaceHttpCache"
-        :disabled="replaceHttpCacheLoading"
-        :tooltip="$t('Tooltips.Experimental Settings.Replace HTTP Cache')"
-        @change="handleRestartPrompt"
-      />
-    </ft-flex-box>
-    <ft-prompt
-      v-if="showRestartPrompt"
-      :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
-      :option-names="[$t('Yes, Restart'), $t('Cancel')]"
-      :option-values="['restart', 'cancel']"
-      @click="handleReplaceHttpCache"
-    />
-  </ft-settings-section>
-</template>
-
-<script src="./experimental-settings.js" />
-<style scoped src="./experimental-settings.css" />
diff --git a/src/renderer/components/external-player-settings/external-player-settings.js b/src/renderer/components/external-player-settings/external-player-settings.js
index 8805556d4ab4b..4722596b4003e 100644
--- a/src/renderer/components/external-player-settings/external-player-settings.js
+++ b/src/renderer/components/external-player-settings/external-player-settings.js
@@ -1,10 +1,11 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtSelect from '../ft-select/ft-select.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtInputTags from '../ft-input-tags/ft-input-tags.vue'
 
 export default defineComponent({
   name: 'ExternalPlayerSettings',
@@ -13,7 +14,8 @@ export default defineComponent({
     'ft-select': FtSelect,
     'ft-input': FtInput,
     'ft-toggle-switch': FtToggleSwitch,
-    'ft-flex-box': FtFlexBox
+    'ft-flex-box': FtFlexBox,
+    'ft-input-tags': FtInputTags
   },
   computed: {
     externalPlayerNames: function () {
@@ -44,7 +46,7 @@ export default defineComponent({
       return this.$store.getters.getExternalPlayerIgnoreDefaultArgs
     },
     externalPlayerCustomArgs: function () {
-      return this.$store.getters.getExternalPlayerCustomArgs
+      return JSON.parse(this.$store.getters.getExternalPlayerCustomArgs)
     },
     externalPlayerCustomArgsTooltip: function () {
       const tooltip = this.$t('Tooltips.External Player Settings.Custom External Player Arguments')
@@ -60,6 +62,10 @@ export default defineComponent({
     }
   },
   methods: {
+    handleExternalPlayerCustomArgs(value) {
+      this.updateExternalPlayerCustomArgs(JSON.stringify(value))
+    },
+
     ...mapActions([
       'updateExternalPlayer',
       'updateExternalPlayerExecutable',
diff --git a/src/renderer/components/external-player-settings/external-player-settings.vue b/src/renderer/components/external-player-settings/external-player-settings.vue
index 5f86b8befe6ed..39f14ca6a7597 100644
--- a/src/renderer/components/external-player-settings/external-player-settings.vue
+++ b/src/renderer/components/external-player-settings/external-player-settings.vue
@@ -43,13 +43,16 @@
         :tooltip="$t('Tooltips.External Player Settings.Custom External Player Executable')"
         @input="updateExternalPlayerExecutable"
       />
-      <ft-input
-        :placeholder="$t('Settings.External Player Settings.Custom External Player Arguments')"
-        :show-action-button="false"
-        :show-label="true"
-        :value="externalPlayerCustomArgs"
+    </ft-flex-box>
+    <ft-flex-box
+      v-if="externalPlayer !== ''"
+    >
+      <ft-input-tags
+        :label="$t('Settings.External Player Settings.Custom External Player Arguments')"
+        :tag-name-placeholder="$t('Settings.External Player Settings.Custom External Player Arguments')"
+        :tag-list="externalPlayerCustomArgs"
         :tooltip="externalPlayerCustomArgsTooltip"
-        @input="updateExternalPlayerCustomArgs"
+        @change="handleExternalPlayerCustomArgs"
       />
     </ft-flex-box>
   </ft-settings-section>
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.js b/src/renderer/components/ft-age-restricted/ft-age-restricted.js
deleted file mode 100644
index 571c1b7112e44..0000000000000
--- a/src/renderer/components/ft-age-restricted/ft-age-restricted.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { defineComponent } from 'vue'
-import { randomArrayItem } from '../../helpers/utils'
-
-export default defineComponent({
-  name: 'FtAgeRestricted',
-  props: {
-    isChannel: {
-      type: Boolean,
-      default: false,
-    },
-    isVideo: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  computed: {
-    emoji: function () {
-      return randomArrayItem(['😵', '😦', '🙁', '☹️', '😦', '🤫', '😕'])
-    },
-
-    restrictedMessage: function () {
-      if (this.isChannel) {
-        return this.$t('Age Restricted.This channel is age restricted')
-      }
-
-      return this.$t('Age Restricted.This video is age restricted')
-    }
-  }
-})
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.vue b/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
deleted file mode 100644
index ff53178df9b82..0000000000000
--- a/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div>
-    <h2 class="message">
-      {{ restrictedMessage }}
-    </h2>
-    <div class="frown">
-      {{ emoji }}
-    </div>
-  </div>
-</template>
-
-<script src="./ft-age-restricted.js" />
-<style scoped src="./ft-age-restricted.css" />
diff --git a/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue b/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue
index 313bd91a73160..f020b35b64119 100644
--- a/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue
+++ b/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue
@@ -6,7 +6,6 @@
     <!--  eslint-disable vue/no-template-key -->
     <template
       v-for="(label, index) in labels"
-      class="checkboxContainer"
     >
       <input
         :id="values[index] + id"
diff --git a/src/renderer/components/ft-community-poll/ft-community-poll.js b/src/renderer/components/ft-community-poll/ft-community-poll.js
deleted file mode 100644
index fb44894cd9eb5..0000000000000
--- a/src/renderer/components/ft-community-poll/ft-community-poll.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { defineComponent } from 'vue'
-import { formatNumber } from '../../helpers/utils'
-
-export default defineComponent({
-  name: 'FtCommunityPoll',
-  props: {
-    data: {
-      type: Object,
-      required: true
-    }
-  },
-  data: function () {
-    return {
-      revealAnswer: false
-    }
-  },
-  computed: {
-    formattedVotes: function () {
-      return formatNumber(this.data.totalVotes)
-    },
-  },
-  methods: {
-    // Use smallest as it's resized to 125px anyways and they're usually all larger than that
-    findSmallestPollImage: function (images) {
-      return images.reduce((prev, img) => (img.height < prev.height) ? img : prev, images[0]).url
-    }
-  }
-})
diff --git a/src/renderer/components/ft-community-post/ft-community-post.js b/src/renderer/components/ft-community-post/ft-community-post.js
deleted file mode 100644
index 617d1c889873f..0000000000000
--- a/src/renderer/components/ft-community-post/ft-community-post.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import { defineComponent } from 'vue'
-import FtListVideo from '../ft-list-video/ft-list-video.vue'
-import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
-import FtCommunityPoll from '../ft-community-poll/ft-community-poll.vue'
-
-import autolinker from 'autolinker'
-
-import { A11y, Navigation, Pagination } from 'swiper/modules'
-
-import {
-  createWebURL,
-  deepCopy,
-  formatNumber,
-  getRelativeTimeFromDate,
-  toLocalePublicationString,
-} from '../../helpers/utils'
-import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-
-export default defineComponent({
-  name: 'FtCommunityPost',
-  components: {
-    'ft-list-playlist': FtListPlaylist,
-    'ft-list-video': FtListVideo,
-    'ft-community-poll': FtCommunityPoll
-  },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    appearance: {
-      type: String,
-      required: true
-    },
-    hideForbiddenTitles: {
-      type: Boolean,
-      default: true
-    },
-    singlePost: {
-      type: Boolean,
-      default: false
-    },
-  },
-  data: function () {
-    return {
-      postText: '',
-      postId: '',
-      authorThumbnails: null,
-      publishedText: '',
-      voteCount: 0,
-      formattedVoteCount: '',
-      postContent: '',
-      commentCount: null,
-      formattedCommentCount: '',
-      author: '',
-      authorId: '',
-    }
-  },
-  computed: {
-    listType: function () {
-      return this.$store.getters.getListType
-    },
-
-    forbiddenTitles() {
-      if (!this.hideForbiddenTitles) { return [] }
-      return JSON.parse(this.$store.getters.getForbiddenTitles)
-    },
-
-    hideVideo() {
-      return this.forbiddenTitles.some((text) => this.data.postContent.content.title?.toLowerCase().includes(text.toLowerCase()))
-    },
-
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-    backendFallback: function () {
-      return this.$store.getters.getBackendFallback
-    },
-    isInvidiousAllowed: function() {
-      return this.backendPreference === 'invidious' || this.backendFallback
-    }
-  },
-  created: function () {
-    this.parseCommunityData()
-  },
-  mounted: function () {
-    if (this.type === 'multiImage' && this.postContent.content.length > 0) {
-      const swiperContainer = this.$refs.swiperContainer
-
-      /** @type {import('swiper/element').SwiperContainer} */
-      const swiperOptions = {
-        modules: [A11y, Navigation, Pagination],
-
-        injectStylesUrls: [
-          // This file is created with the copy webpack plugin in the web and renderer webpack configs.
-          // If you add more modules, please remember to add their CSS files to the list in webpack config files.
-          createWebURL(`/swiper-${process.env.SWIPER_VERSION}.css`)
-        ],
-
-        a11y: true,
-        navigation: true,
-        pagination: {
-          enabled: true,
-          clickable: true
-        },
-        slidesPerView: 1
-      }
-
-      Object.assign(swiperContainer, swiperOptions)
-
-      swiperContainer.initialize()
-    }
-  },
-  methods: {
-    parseCommunityData: function () {
-      if ('backstagePostThreadRenderer' in this.data) {
-        this.postText = 'Shared post'
-        this.type = 'text'
-        let authorThumbnails = ['', 'https://yt3.ggpht.com/ytc/AAUvwnjm-0qglHJkAHqLFsCQQO97G7cCNDuDLldsrn25Lg=s88-c-k-c0x00ffffff-no-rj']
-        if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
-          authorThumbnails = authorThumbnails.map(thumbnail => {
-            thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
-            return thumbnail
-          })
-        }
-        this.authorThumbnails = authorThumbnails
-        return
-      }
-      this.postText = autolinker.link(this.data.postText)
-      const authorThumbnails = deepCopy(this.data.authorThumbnails)
-      if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
-        authorThumbnails.forEach(thumbnail => {
-          thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
-        })
-      } else {
-        authorThumbnails.forEach(thumbnail => {
-          if (thumbnail.url.startsWith('//')) {
-            thumbnail.url = 'https:' + thumbnail.url
-          }
-        })
-      }
-      this.authorThumbnails = authorThumbnails
-      this.postContent = this.data.postContent
-      this.postId = this.data.postId
-      this.publishedText = toLocalePublicationString({
-        publishText: getRelativeTimeFromDate(this.data.publishedTime),
-        isLive: this.isLive,
-        isUpcoming: this.isUpcoming,
-        isRSS: this.data.isRSS
-      })
-      this.voteCount = this.data.voteCount
-      this.formattedVoteCount = formatNumber(this.voteCount)
-      this.commentCount = this.data.commentCount
-      this.formattedCommentCount = formatNumber(this.commentCount)
-      this.type = (this.data.postContent !== null && this.data.postContent !== undefined) ? this.data.postContent.type : 'text'
-      this.author = this.data.author
-      this.authorId = this.data.authorId
-    },
-
-    getBestQualityImage(imageArray) {
-      const imageArrayCopy = Array.from(imageArray)
-      imageArrayCopy.sort((a, b) => {
-        return Number.parseInt(b.width) - Number.parseInt(a.width)
-      })
-
-      // Remove cropping directives when applicable
-      return imageArrayCopy.at(0)?.url?.replace(/-c-fcrop64=.*/i, '') ?? ''
-    }
-  }
-})
diff --git a/src/renderer/components/ft-community-post/ft-community-post.vue b/src/renderer/components/ft-community-post/ft-community-post.vue
deleted file mode 100644
index b7f864efde2da..0000000000000
--- a/src/renderer/components/ft-community-post/ft-community-post.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <div
-    class="ft-list-post ft-list-item outside"
-    :appearance="appearance"
-    :class="{ list: listType === 'list', grid: listType === 'grid' }"
-  >
-    <div
-      class="author-div"
-    >
-      <template
-        v-if="authorThumbnails.length > 0"
-      >
-        <router-link
-          v-if="authorId"
-          :to="`/channel/${authorId}`"
-          tabindex="-1"
-          aria-hidden="true"
-        >
-          <img
-            :src="getBestQualityImage(authorThumbnails)"
-            class="communityThumbnail"
-            alt=""
-          >
-        </router-link>
-        <img
-          v-else
-          :src="getBestQualityImage(authorThumbnails)"
-          class="communityThumbnail"
-          alt=""
-        >
-      </template>
-      <p
-        class="authorName"
-      >
-        <router-link
-          v-if="authorId"
-          :to="`/channel/${authorId}`"
-          class="authorNameLink"
-        >
-          {{ author }}
-        </router-link>
-        <template
-          v-else
-        >
-          {{ author }}
-        </template>
-      </p>
-      <p
-        class="publishedText"
-      >
-        {{ publishedText }}
-      </p>
-    </div>
-    <p
-      class="postText"
-      v-html="postText"
-    />
-    <swiper-container
-      v-if="type === 'multiImage' && postContent.content.length > 0"
-      ref="swiperContainer"
-      init="false"
-      class="sliderContainer"
-    >
-      <swiper-slide
-        v-for="(img, index) in postContent.content"
-        :key="index"
-        lazy="true"
-      >
-        <img
-          :src="getBestQualityImage(img)"
-          class="communityImage"
-          alt=""
-          loading="lazy"
-        >
-      </swiper-slide>
-    </swiper-container>
-    <div
-      v-if="type === 'image' && postContent.content.length > 0"
-    >
-      <img
-        :src="getBestQualityImage(postContent.content)"
-        class="communityImage"
-        alt=""
-      >
-    </div>
-    <div
-      v-if="type === 'video'"
-    >
-      <ft-list-video
-        v-if="!hideVideo"
-        :data="data.postContent.content"
-        appearance=""
-      />
-      <p
-        v-else
-        class="hiddenVideo"
-      >
-        {{ '[' + $t('Channel.Community.Video hidden by FreeTube') + ']' }}
-      </p>
-    </div>
-    <div
-      v-if="type === 'poll' || type === 'quiz'"
-    >
-      <ft-community-poll :data="postContent" />
-    </div>
-    <div
-      v-if="type === 'playlist'"
-      class="playlistWrapper"
-    >
-      <ft-list-playlist
-        :data="postContent.content"
-        :appearance="appearance"
-      />
-    </div>
-    <div
-      class="bottomSection"
-    >
-      <span
-        class="likeCount"
-        :title="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
-        :aria-label="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
-      >
-        <font-awesome-icon
-          class="thumbs-up-icon"
-          :icon="['fas', 'thumbs-up']"
-          aria-hidden="true"
-        /> {{ formattedVoteCount }}</span>
-      <router-link
-        v-if="isInvidiousAllowed && !singlePost"
-        :to="{
-          path: `/post/${postId}`,
-          query: authorId ? { authorId } : undefined
-        }"
-        class="commentsLink"
-        :aria-label="$t('Channel.Community.View Full Post')"
-      >
-        <span
-          class="commentCount"
-          :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-          :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-        >
-          <font-awesome-icon
-            class="comment-count-icon"
-            :icon="['fas', 'comment']"
-            aria-hidden="true"
-          /> {{ formattedCommentCount }}</span>
-      </router-link>
-      <span
-        v-else-if="commentCount != null"
-        class="commentCount"
-        :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-        :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-      >
-        <font-awesome-icon
-          class="comment-count-icon"
-          :icon="['fas', 'comment']"
-        /> {{ commentCount }}</span>
-    </div>
-  </div>
-</template>
-
-<script src="./ft-community-post.js" />
-<style scoped src="./ft-community-post.scss" lang="scss" />
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.js b/src/renderer/components/ft-icon-button/ft-icon-button.js
index 6c12092874425..89defc78efe93 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.js
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.js
@@ -2,6 +2,8 @@ import { defineComponent, nextTick } from 'vue'
 import FtPrompt from '../ft-prompt/ft-prompt.vue'
 import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
+const LONG_CLICK_BOUNDARY_MS = 500
+
 export default defineComponent({
   name: 'FtIconButton',
   components: {
@@ -55,21 +57,27 @@ export default defineComponent({
     dropdownOptions: {
       // Array of objects with these properties
       // - type: ('labelValue'|'divider', default to 'labelValue' for less typing)
-      // - label: String (if type == 'labelValue')
-      // - value: String (if type == 'labelValue')
+      // - label: String (if type === 'labelValue')
+      // - value: String (if type === 'labelValue')
+      // - (OPTIONAL) active: Number (if type === 'labelValue')
       type: Array,
       default: () => { return [] }
     },
     dropdownModalOnMobile: {
       type: Boolean,
       default: false
+    },
+    openOnRightOrLongClick: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ['click', 'disabled-click'],
   data: function () {
     return {
       dropdownShown: false,
-      mouseDownOnIcon: false,
+      blockLeftClick: false,
+      longPressTimer: null,
       useModal: false
     }
   },
@@ -91,14 +99,24 @@ export default defineComponent({
       this.dropdownShown = false
     },
 
-    handleIconClick: function () {
+    handleIconClick: function (e, isRightOrLongClick = false) {
       if (this.disabled) {
         this.$emit('disabled-click')
         return
       }
-      if (this.forceDropdown || (this.dropdownOptions.length > 0)) {
-        this.dropdownShown = !this.dropdownShown
 
+      if (this.blockLeftClick) {
+        return
+      }
+
+      if (this.longPressTimer != null) {
+        clearTimeout(this.longPressTimer)
+        this.longPressTimer = null
+      }
+
+      if ((!this.openOnRightOrLongClick || (this.openOnRightOrLongClick && isRightOrLongClick)) &&
+       (this.forceDropdown || this.dropdownOptions.length > 0)) {
+        this.dropdownShown = !this.dropdownShown
         if (this.dropdownShown && !this.useModal) {
           // wait until the dropdown is visible
           // then focus it so we can hide it automatically when it loses focus
@@ -111,24 +129,38 @@ export default defineComponent({
       }
     },
 
-    handleIconMouseDown: function () {
-      if (this.disabled) { return }
-      if (this.dropdownShown) {
-        this.mouseDownOnIcon = true
+    handleIconPointerDown: function (event) {
+      if (!this.openOnRightOrLongClick) { return }
+      if (event.button === 2) { // right button click
+        this.handleIconClick(null, true)
+      } else if (event.button === 0) { // left button click
+        this.longPressTimer = setTimeout(() => {
+          this.handleIconClick(null, true)
+
+          // prevent a long press that ends on the icon button from firing the handleIconClick handler
+          window.addEventListener('pointerup', this.preventButtonClickAfterLongPress, { once: true })
+          window.addEventListener('pointercancel', () => {
+            window.removeEventListener('pointerup', this.preventButtonClickAfterLongPress)
+          }, { once: true })
+        }, LONG_CLICK_BOUNDARY_MS)
       }
     },
 
+    // prevent the handleIconClick handler from firing for an instant
+    preventButtonClickAfterLongPress: function () {
+      this.blockLeftClick = true
+      setTimeout(() => { this.blockLeftClick = false }, 0)
+    },
+
     handleDropdownFocusOut: function () {
-      if (this.mouseDownOnIcon) {
-        this.mouseDownOnIcon = false
-      } else if (!this.$refs.dropdown.matches(':focus-within')) {
+      if (this.dropdownShown && !this.$refs.ftIconButton.matches(':focus-within')) {
         this.dropdownShown = false
       }
     },
 
     handleDropdownEscape: function () {
-      this.$refs.iconButton.focus()
-      // handleDropdownFocusOut will hide the dropdown for us
+      this.dropdownShown = false
+      this.$refs.ftIconButton.firstElementChild.focus()
     },
 
     handleDropdownClick: function ({ url, index }) {
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.scss b/src/renderer/components/ft-icon-button/ft-icon-button.scss
index c01f70573b490..e1fc416dfbb21 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.scss
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.scss
@@ -4,6 +4,7 @@
   flex-flow: row wrap;
   justify-content: space-evenly;
   position: relative;
+  line-height: normal;
   user-select: none;
 }
 
@@ -24,12 +25,13 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible {
+      &:focus-visible,
+      &.pressed {
         background-color: var(--side-nav-hover-color);
         color: var(--side-nav-hover-text-color);
       }
 
-      &:active {
+      &.active {
         background-color: var(--side-nav-active-color);
         color: var(--side-nav-active-text-color);
       }
@@ -38,12 +40,13 @@
 
   &.base-no-default:not(.disabled) {
     &:hover,
-    &:focus-visible {
+    &:focus-visible,
+    &.pressed {
       background-color: var(--side-nav-hover-color);
       color: var(--side-nav-hover-text-color);
     }
 
-    &:active {
+    &.active {
       background-color: var(--side-nav-active-color);
       color: var(--side-nav-active-text-color);
     }
@@ -55,11 +58,12 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible {
+      &:focus-visible,
+      &.pressed {
         background-color: var(--primary-color-hover);
       }
 
-      &:active {
+      &.active {
         background-color: var(--primary-color-active);
       }
     }
@@ -72,11 +76,12 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible {
+      &:focus-visible,
+      &.pressed {
         background-color: var(--accent-color-hover);
       }
 
-      &:active {
+      &.active {
         background-color: var(--accent-color-active);
       }
     }
@@ -88,11 +93,12 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible {
+      &:focus-visible,
+      &.pressed {
         background-color: var(--destructive-hover-color);
       }
 
-      &:active {
+      &.active {
         background-color: var(--destructive-active-color);
       }
     }
@@ -150,6 +156,17 @@
     padding: 0;
   }
 
+  :has(.active) {
+    .checkmarkColumn {
+      min-inline-size: 12px;
+    }
+
+    .listItem {
+      display: flex;
+      gap: 6px;
+    }
+  }
+
   .listItem {
     cursor: pointer;
     margin: 0;
@@ -159,12 +176,20 @@
     white-space: nowrap;
 
     &:hover,
-    &:focus-visible {
+    &:focus-visible,
+    &.pressed,
+    &.active {
       background-color: var(--side-nav-hover-color);
       color: var(--side-nav-hover-text-color);
       transition: background 0.2s ease-in;
     }
 
+    &.active {
+      font-weight: 600;
+      display: flex;
+      gap: 6px;
+    }
+
     &:active {
       background-color: var(--side-nav-active-color);
       color: var(--side-nav-active-text-color);
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.vue b/src/renderer/components/ft-icon-button/ft-icon-button.vue
index 4c6af4f0e3d4d..f31aa5afdd099 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.vue
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.vue
@@ -1,13 +1,17 @@
 <template>
-  <div class="ftIconButton">
+  <div
+    ref="ftIconButton"
+    class="ftIconButton"
+    @focusout="handleDropdownFocusOut"
+  >
     <font-awesome-icon
-      ref="iconButton"
       class="iconButton"
       :title="title"
       :icon="icon"
       :class="{
         [theme]: true,
         shadow: useShadow,
+        pressed: openOnRightOrLongClick && dropdownShown,
         disabled
       }"
       :style="{
@@ -18,8 +22,9 @@
       role="button"
       :aria-disabled="disabled"
       :aria-expanded="dropdownShown"
+      @pointerdown="handleIconPointerDown"
+      @contextmenu.prevent=""
       @click="handleIconClick"
-      @mousedown="handleIconMouseDown"
       @keydown.enter.prevent="handleIconClick"
       @keydown.space.prevent="handleIconClick"
     />
@@ -43,9 +48,13 @@
               :id="sanitizeForHtmlId(title + '-' + index)"
               :key="index"
               role="option"
-              aria-selected="false"
+              :aria-selected="option.active"
               tabindex="-1"
-              :class="option.type === 'divider' ? 'listItemDivider' : 'listItem'"
+              :class="{
+                listItemDivider: option.type === 'divider',
+                listItem: option.type !== 'divider',
+                active: option.active
+              }"
               @click="handleDropdownClick({url: option.value, index: index})"
               @keydown.enter="handleDropdownClick({url: option.value, index: index})"
               @keydown.space="handleDropdownClick({url: option.value, index: index})"
@@ -67,7 +76,6 @@
           bottom: dropdownPositionY === 'bottom',
           top: dropdownPositionY === 'top'
         }"
-        @focusout="handleDropdownFocusOut"
         @keydown.esc.stop="handleDropdownEscape"
       >
         <slot>
@@ -81,13 +89,23 @@
               :id="sanitizeForHtmlId(title + '-' + index)"
               :key="index"
               :role="option.type === 'divider' ? 'separator' : 'option'"
-              aria-selected="false"
+              :aria-selected="option.active"
               :tabindex="option.type === 'divider' ? '-1' : '0'"
-              :class="option.type === 'divider' ? 'listItemDivider' : 'listItem'"
+              :class="{
+                listItemDivider: option.type === 'divider',
+                listItem: option.type !== 'divider',
+                active: option.active
+              }"
               @click="handleDropdownClick({url: option.value, index: index}, $event)"
               @keydown.enter="handleDropdownClick({url: option.value, index: index}, $event)"
               @keydown.space="handleDropdownClick({url: option.value, index: index}, $event)"
             >
+              <div class="checkmarkColumn">
+                <font-awesome-icon
+                  v-if="option.active"
+                  :icon="['fas', 'check']"
+                />
+              </div>
               {{ option.type === 'divider' ? '' : option.label }}
             </li>
           </ul>
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.css b/src/renderer/components/ft-input-tags/ft-input-tags.css
index 6d8a667689a33..9a26873ceb021 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.css
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.css
@@ -38,6 +38,13 @@
   user-select: text;
 }
 
+.checkbox-container {
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  accent-color: var(--accent-color);
+}
+
 .tag-icon {
   border-radius: 50%;
   vertical-align: middle;
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.js b/src/renderer/components/ft-input-tags/ft-input-tags.js
index 281b3517171e8..2f3225ac81499 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.js
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.js
@@ -1,6 +1,7 @@
 import { defineComponent } from 'vue'
 import FtInput from '../ft-input/ft-input.vue'
 import { showToast } from '../../helpers/utils'
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
 export default defineComponent({
   name: 'FtInputTags',
@@ -36,6 +37,10 @@ export default defineComponent({
       type: Boolean,
       default: true
     },
+    showTags: {
+      type: Boolean,
+      default: true
+    },
     tagList: {
       type: Array,
       default: () => { return [] }
@@ -53,7 +58,12 @@ export default defineComponent({
       default: (_) => ({ preferredName: '', icon: '' }),
     }
   },
-  emits: ['already-exists', 'change', 'error-find-tag-info', 'invalid-name'],
+  emits: ['already-exists', 'change', 'error-find-tag-info', 'invalid-name', 'toggle-show-tags'],
+  computed: {
+    sanitizedId: function() {
+      return sanitizeForHtmlId(`checkbox-${this.label}`)
+    },
+  },
   methods: {
     updateTags: async function (text, _e) {
       if (this.areChannelTags) {
@@ -126,6 +136,9 @@ export default defineComponent({
         const newList = this.tagList.filter((tmpTag) => tmpTag.name !== tag.name)
         this.$emit('change', newList)
       }
-    }
+    },
+    toggleShowTags: function () {
+      this.$emit('toggle-show-tags')
+    },
   }
 })
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.vue b/src/renderer/components/ft-input-tags/ft-input-tags.vue
index 4c387589e189f..d27eecf18e640 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.vue
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.vue
@@ -21,7 +21,24 @@
       :force-action-button-icon-name="['fas', 'arrow-right']"
       @click="updateTags"
     />
-    <div class="ft-tag-box">
+    <div
+      v-if="tagList.length >= 1"
+      class="checkbox-container"
+    >
+      <input
+        :id="sanitizedId"
+        type="checkbox"
+        :checked="showTags"
+        @change="toggleShowTags"
+      >
+      <label :for="sanitizedId">
+        {{ $t('Settings.Distraction Free Settings.Show Added Items') }}
+      </label>
+    </div>
+    <div
+      v-if="showTags"
+      class="ft-tag-box"
+    >
       <ul>
         <li
           v-for="tag in tagList"
diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 4df5666757fc7..7a3aa07150fe7 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -100,10 +100,6 @@ export default defineComponent({
       return this.isSearch && this.barColor
     },
 
-    idDataList: function () {
-      return `${this.id}_datalist`
-    },
-
     inputDataPresent: function () {
       return this.inputData.length > 0
     },
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index cdc0dee0fb833..ea5f5c80d56a0 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -43,7 +43,6 @@
         :id="id"
         ref="input"
         :value="inputDataDisplayed"
-        :list="idDataList"
         class="ft-input"
         :maxlength="maxlength"
         :type="inputType"
@@ -70,7 +69,6 @@
     <div class="options">
       <ul
         v-if="inputData !== '' && visibleDataList.length > 0 && searchState.showOptions"
-        :id="idDataList"
         class="list"
         @mouseenter="searchState.isPointerInList = true"
         @mouseleave="searchState.isPointerInList = false"
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.js b/src/renderer/components/ft-list-channel/ft-list-channel.js
deleted file mode 100644
index 709c34cf149c4..0000000000000
--- a/src/renderer/components/ft-list-channel/ft-list-channel.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import { defineComponent } from 'vue'
-import FtSubscribeButton from '../../components/ft-subscribe-button/ft-subscribe-button.vue'
-import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-import { formatNumber } from '../../helpers/utils'
-import { parseLocalSubscriberCount } from '../../helpers/api/local'
-
-export default defineComponent({
-  name: 'FtListChannel',
-  components: {
-    'ft-subscribe-button': FtSubscribeButton
-  },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    appearance: {
-      type: String,
-      required: true
-    }
-  },
-  data: function () {
-    return {
-      id: '',
-      thumbnail: '',
-      channelName: '',
-      subscriberCount: 0,
-      videoCount: 0,
-      formattedSubscriberCount: '',
-      formattedVideoCount: '',
-      handle: null,
-      description: ''
-    }
-  },
-  computed: {
-    currentInvidiousInstanceUrl: function () {
-      return this.$store.getters.getCurrentInvidiousInstanceUrl
-    },
-    listType: function () {
-      return this.$store.getters.getListType
-    },
-    hideChannelSubscriptions: function () {
-      return this.$store.getters.getHideChannelSubscriptions
-    }
-  },
-  created: function () {
-    if (this.data.dataSource === 'local') {
-      this.parseLocalData()
-    } else {
-      this.parseInvidiousData()
-    }
-  },
-  methods: {
-    parseLocalData: function () {
-      this.thumbnail = this.data.thumbnail
-
-      if (!this.thumbnail.includes('https:')) {
-        this.thumbnail = `https:${this.thumbnail}`
-      }
-
-      this.channelName = this.data.name
-      this.id = this.data.id
-      if (this.data.subscribers != null) {
-        this.subscriberCount = parseLocalSubscriberCount(this.data.subscribers.replace(/ subscriber(s)?/, ''))
-        this.formattedSubscriberCount = formatNumber(this.subscriberCount)
-      } else {
-        this.subscriberCount = null
-      }
-
-      this.videoCount = this.data.videos ?? 0
-      this.formattedVideoCount = formatNumber(this.videoCount)
-
-      if (this.data.handle) {
-        this.handle = this.data.handle
-      }
-
-      this.description = this.data.descriptionShort
-    },
-
-    parseInvidiousData: function () {
-      // Can be prefixed with `https://` or `//` (protocol relative)
-      const thumbnailUrl = this.data.authorThumbnails[2].url
-
-      this.thumbnail = youtubeImageUrlToInvidious(thumbnailUrl, this.currentInvidiousInstanceUrl)
-
-      this.channelName = this.data.author
-      this.id = this.data.authorId
-      this.subscriberCount = this.data.subCount
-      this.formattedSubscriberCount = formatNumber(this.data.subCount)
-      this.handle = this.data.channelHandle
-      if (this.handle != null) {
-        this.videoCount = null
-      } else {
-        this.videoCount = this.data.videoCount
-        this.formattedVideoCount = formatNumber(this.data.videoCount)
-      }
-      this.description = this.data.description
-    }
-  }
-})
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.vue b/src/renderer/components/ft-list-channel/ft-list-channel.vue
deleted file mode 100644
index e73eaf6289dfc..0000000000000
--- a/src/renderer/components/ft-list-channel/ft-list-channel.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <div
-    class="ft-list-channel ft-list-item"
-    :class="{
-      list: listType === 'list',
-      grid: listType === 'grid',
-      [appearance]: true
-    }"
-  >
-    <div class="channelThumbnail">
-      <router-link
-        :to="`/channel/${id}`"
-        class="channelThumbnailLink"
-        tabindex="-1"
-        aria-hidden="true"
-      >
-        <img
-          :src="thumbnail"
-          class="channelImage"
-          alt=""
-        >
-      </router-link>
-    </div>
-    <div class="infoAndSubscribe">
-      <div class="info">
-        <router-link
-          class="title"
-          :to="`/channel/${id}`"
-        >
-          <h3 class="h3Title">
-            {{ channelName }}
-          </h3>
-        </router-link>
-        <div class="infoLine">
-          <router-link
-            v-if="handle !== null"
-            class="handle"
-            :to="`/channel/${id}`"
-          >
-            {{ handle }}
-          </router-link>
-          <span
-            v-if="subscriberCount !== null && !hideChannelSubscriptions"
-            class="subscriberCount"
-          >
-            <template v-if="handle !== null"> • </template>
-            {{ $tc('Global.Counts.Subscriber Count', subscriberCount, {count: formattedSubscriberCount}) }}
-          </span>
-          <span
-            v-if="handle == null && videoCount != null"
-            class="videoCount"
-          >
-            <template v-if="subscriberCount !== null && !hideChannelSubscriptions"> • </template>
-            {{ $tc('Global.Counts.Video Count', videoCount, {count: formattedVideoCount}) }}
-          </span>
-        </div>
-        <p
-          v-if="listType !== 'grid'"
-          class="description"
-          v-html="description"
-        />
-      </div>
-      <ft-subscribe-button
-        class="channelSubscribeButton"
-        :channel-id="id"
-        :channel-name="channelName"
-        :channel-thumbnail="thumbnail"
-      />
-    </div>
-  </div>
-</template>
-
-<script src="./ft-list-channel.js" />
-<style scoped lang="scss" src="./ft-list-channel.scss" />
diff --git a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js
deleted file mode 100644
index a8890f62751d0..0000000000000
--- a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { defineComponent } from 'vue'
-import { formatNumber } from '../../helpers/utils'
-
-export default defineComponent({
-  name: 'FtListHashtag',
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    appearance: {
-      type: String,
-      required: true
-    }
-  },
-  data: function () {
-    return {
-      title: '',
-      url: '',
-      channelCount: 0,
-      parsedChannelCount: '',
-      videoCount: 0,
-      parsedVideosCount: ''
-    }
-  },
-  computed: {
-    listType: function () {
-      return this.$store.getters.getListType
-    }
-  },
-  created: function () {
-    this.parseData()
-  },
-  methods: {
-    parseData: function () {
-      this.title = this.data.title
-      this.channelCount = this.data.channelCount
-      this.parsedChannelCount = formatNumber(this.channelCount)
-      this.videoCount = this.data.videoCount
-      this.parsedVideosCount = formatNumber(this.videoCount)
-      this.url = `/hashtag/${encodeURIComponent(this.data.title.substring(1))}`
-    }
-  }
-})
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.js b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
index 98747cef34c23..e36d6e63ff993 100644
--- a/src/renderer/components/ft-list-playlist/ft-list-playlist.js
+++ b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
@@ -2,6 +2,7 @@ import { defineComponent } from 'vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import { mapActions } from 'vuex'
 import { showToast } from '../../helpers/utils'
+import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'FtListPlaylist',
@@ -28,7 +29,7 @@ export default defineComponent({
       playlistId: '',
       channelId: '',
       title: 'Pop Music Playlist - Timeless Pop Songs (Updated Weekly 2020)',
-      thumbnail: require('../../assets/img/thumbnail_placeholder.svg'),
+      thumbnail: thumbnailPlaceholder,
       channelName: '#RedMusic: Just Hits',
       videoCount: 200,
     }
diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index cffc195fa16b3..599595a839cbc 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -13,6 +13,7 @@ import {
 } from '../../helpers/utils'
 import { deArrowData, deArrowThumbnail } from '../../helpers/sponsorblock'
 import debounce from 'lodash.debounce'
+import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'FtListVideo',
@@ -101,12 +102,20 @@ export default defineComponent({
       published: undefined,
       isLive: false,
       is4k: false,
+      is8k: false,
+      isNew: false,
+      isVr180: false,
+      isVr360: false,
+      is3D: false,
       hasCaptions: false,
       isUpcoming: false,
       isPremium: false,
       hideViews: false,
       addToPlaylistPromptCloseCallback: null,
       debounceGetDeArrowThumbnail: null,
+      deArrowTogglePinned: false,
+      showDeArrowTitle: false,
+      showDeArrowThumbnail: false,
     }
   },
   computed: {
@@ -329,10 +338,10 @@ export default defineComponent({
 
     thumbnail: function () {
       if (this.thumbnailPreference === 'hidden') {
-        return require('../../assets/img/thumbnail_placeholder.svg')
+        return thumbnailPlaceholder
       }
 
-      if (this.useDeArrowThumbnails && this.deArrowCache?.thumbnail != null) {
+      if (this.showDeArrowThumbnail && this.deArrowCache?.thumbnail != null) {
         return this.deArrowCache.thumbnail
       }
 
@@ -389,7 +398,7 @@ export default defineComponent({
 
     displayTitle: function () {
       let title
-      if (this.useDeArrowTitles && this.deArrowCache?.title) {
+      if (this.showDeArrowTitle && this.deArrowCache?.title) {
         title = this.deArrowCache.title
       } else {
         title = this.title
@@ -491,10 +500,20 @@ export default defineComponent({
     useDeArrowTitles: function () {
       return this.$store.getters.getUseDeArrowTitles
     },
-
     useDeArrowThumbnails: function () {
       return this.$store.getters.getUseDeArrowThumbnails
     },
+    deArrowChangedContent: function () {
+      return (this.useDeArrowThumbnails && this.deArrowCache?.thumbnail) ||
+        (this.useDeArrowTitles && this.deArrowCache?.title &&
+          this.data.title.localeCompare(this.deArrowCache.title, undefined, { sensitivity: 'accent' }) !== 0)
+    },
+
+    deArrowToggleTitle: function() {
+      return this.deArrowTogglePinned
+        ? this.$t('Video.DeArrow.Show Modified Details')
+        : this.$t('Video.DeArrow.Show Original Details')
+    },
 
     deArrowCache: function () {
       return this.$store.getters.getDeArrowCache[this.id]
@@ -512,11 +531,14 @@ export default defineComponent({
   created: function () {
     this.parseVideoData()
 
-    if ((this.useDeArrowTitles || this.useDeArrowThumbnails) && !this.deArrowCache) {
+    this.showDeArrowTitle = this.useDeArrowTitles
+    this.showDeArrowThumbnail = this.useDeArrowThumbnails
+
+    if ((this.showDeArrowTitle || this.showDeArrowThumbnail) && !this.deArrowCache) {
       this.fetchDeArrowData()
     }
 
-    if (this.useDeArrowThumbnails && this.deArrowCache && this.deArrowCache.thumbnail == null) {
+    if (this.showDeArrowThumbnail && this.deArrowCache && this.deArrowCache.thumbnail == null) {
       if (this.debounceGetDeArrowThumbnail == null) {
         this.debounceGetDeArrowThumbnail = debounce(this.fetchDeArrowThumbnail, 1000)
       }
@@ -554,7 +576,7 @@ export default defineComponent({
       this.$store.commit('addVideoToDeArrowCache', cacheData)
 
       // fetch dearrow thumbnails if enabled
-      if (this.useDeArrowThumbnails && this.deArrowCache?.thumbnail === null) {
+      if (this.showDeArrowThumbnail && this.deArrowCache?.thumbnail === null) {
         if (this.debounceGetDeArrowThumbnail == null) {
           this.debounceGetDeArrowThumbnail = debounce(this.fetchDeArrowThumbnail, 1000)
         }
@@ -562,6 +584,20 @@ export default defineComponent({
         this.debounceGetDeArrowThumbnail()
       }
     },
+    toggleDeArrow() {
+      if (!this.deArrowChangedContent) {
+        return
+      }
+
+      this.deArrowTogglePinned = !this.deArrowTogglePinned
+
+      if (this.useDeArrowTitles) {
+        this.showDeArrowTitle = !this.showDeArrowTitle
+      }
+      if (this.useDeArrowThumbnails) {
+        this.showDeArrowThumbnail = !this.showDeArrowThumbnail
+      }
+    },
 
     handleExternalPlayer: function () {
       this.$emit('pause-player')
@@ -662,6 +698,11 @@ export default defineComponent({
       this.isLive = this.data.liveNow || this.data.lengthSeconds === 'undefined'
       this.isUpcoming = this.data.isUpcoming || this.data.premiere
       this.is4k = this.data.is4k
+      this.is8k = this.data.is8k
+      this.isNew = this.data.isNew
+      this.isVr180 = this.data.isVr180
+      this.isVr360 = this.data.isVr360
+      this.is3D = this.data.is3d
       this.hasCaptions = this.data.hasCaptions
       this.isPremium = this.data.premium || false
       this.viewCount = this.data.viewCount
diff --git a/src/renderer/components/ft-list-video/ft-list-video.scss b/src/renderer/components/ft-list-video/ft-list-video.scss
index b8856f1151021..eb3c52df7a9c9 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.scss
+++ b/src/renderer/components/ft-list-video/ft-list-video.scss
@@ -27,3 +27,30 @@
 .videoTagLine .videoTag:first-child {
   margin-inline-start: 0;
 }
+
+.deArrowToggleButton {
+  border-radius: 50%;
+  cursor: pointer;
+  block-size: 1em;
+  inline-size: 1em;
+  padding: 10px;
+  font-size: 16px;
+  transition: background 0.15s ease-out;
+  color: var(--primary-color);
+
+  &:not(.disabled) {
+    &:hover,
+    &:focus-visible {
+      background-color: var(--side-nav-hover-color);
+    }
+
+    &:active {
+      background-color: var(--side-nav-active-color);
+    }
+
+    &.alwaysVisible {
+      opacity: 1;
+      filter: grayscale(1);
+    }
+  }
+}
diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue
index 8504b3683d92b..e53bbf3a5a4f3 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.vue
+++ b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -146,9 +146,17 @@
         > • {{ $tc('Global.Counts.Watching Count', viewCount, {count: parsedViewCount}) }}</span>
       </div>
       <div
-        v-if="is4k || hasCaptions"
+        v-if="is4k || hasCaptions || is8k || isNew || isVr180 || isVr360 || is3D"
         class="videoTagLine"
       >
+        <div
+          v-if="isNew"
+          class="videoTag"
+          :aria-label="$t('Search Listing.Label.New')"
+          role="img"
+        >
+          {{ $t('Search Listing.Label.New') }}
+        </div>
         <div
           v-if="is4k"
           class="videoTag"
@@ -157,6 +165,38 @@
         >
           {{ $t('Search Listing.Label.4K') }}
         </div>
+        <div
+          v-if="is8k"
+          class="videoTag"
+          :aria-label="$t('Search Listing.Label.8K')"
+          role="img"
+        >
+          {{ $t('Search Listing.Label.8K') }}
+        </div>
+        <div
+          v-if="isVr180"
+          class="videoTag"
+          :aria-label="$t('Search Listing.Label.VR180')"
+          role="img"
+        >
+          {{ $t('Search Listing.Label.VR180') }}
+        </div>
+        <div
+          v-if="isVr360"
+          class="videoTag"
+          :aria-label="$t('Search Listing.Label.360 Video')"
+          role="img"
+        >
+          {{ $t('Search Listing.Label.360 Video') }}
+        </div>
+        <div
+          v-if="is3D"
+          class="videoTag"
+          :aria-label="$t('Search Listing.Label.3D')"
+          role="img"
+        >
+          {{ $t('Search Listing.Label.3D') }}
+        </div>
         <div
           v-if="hasCaptions"
           class="videoTag"
@@ -166,17 +206,31 @@
           {{ $t('Search Listing.Label.Subtitles') }}
         </div>
       </div>
-      <ft-icon-button
-        class="optionsButton"
-        :icon="['fas', 'ellipsis-v']"
-        :title="$t('Video.More Options')"
-        theme="base-no-default"
-        :size="16"
-        :use-shadow="false"
-        dropdown-position-x="left"
-        :dropdown-options="dropdownOptions"
-        @click="handleOptionsClick"
-      />
+      <div class="buttonStack">
+        <ft-icon-button
+          class="optionsButton"
+          :icon="['fas', 'ellipsis-v']"
+          :title="$t('Video.More Options')"
+          theme="base-no-default"
+          :size="16"
+          :use-shadow="false"
+          dropdown-position-x="left"
+          :dropdown-options="dropdownOptions"
+          @click="handleOptionsClick"
+        />
+        <font-awesome-icon
+          v-if="deArrowChangedContent || deArrowTogglePinned"
+          :title="deArrowToggleTitle"
+          :icon="['far', 'dot-circle']"
+          class="optionsButton deArrowToggleButton"
+          :class="{ alwaysVisible: deArrowTogglePinned }"
+          tabindex="0"
+          role="button"
+          @click="toggleDeArrow"
+          @keydown.enter.prevent="toggleDeArrow"
+          @keydown.space.prevent="toggleDeArrow"
+        />
+      </div>
       <p
         v-if="description && effectiveListTypeIsList && appearance === 'result'"
         class="description"
diff --git a/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js b/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js
index 825ddc1119abb..fe276181a88c5 100644
--- a/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js
+++ b/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js
@@ -1,6 +1,7 @@
 import { defineComponent } from 'vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import { mapActions } from 'vuex'
+import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'FtPlaylistSelector',
@@ -37,7 +38,7 @@ export default defineComponent({
   data: function () {
     return {
       title: '',
-      thumbnail: require('../../assets/img/thumbnail_placeholder.svg'),
+      thumbnail: thumbnailPlaceholder,
       videoCount: 0,
 
       videoPresenceCountInPlaylistTextShouldBeVisible: false,
diff --git a/src/renderer/components/ft-progress-bar/ft-progress-bar.js b/src/renderer/components/ft-progress-bar/ft-progress-bar.js
deleted file mode 100644
index 14b91aa2cbcb6..0000000000000
--- a/src/renderer/components/ft-progress-bar/ft-progress-bar.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'FtProgressBar',
-  computed: {
-    progressBarPercentage: function () {
-      return this.$store.getters.getProgressBarPercentage
-    }
-  }
-})
diff --git a/src/renderer/components/ft-progress-bar/ft-progress-bar.vue b/src/renderer/components/ft-progress-bar/ft-progress-bar.vue
deleted file mode 100644
index 28d835b2f3652..0000000000000
--- a/src/renderer/components/ft-progress-bar/ft-progress-bar.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <div
-    class="progressBar"
-    :style="{ inlineSize: progressBarPercentage + '%' }"
-  />
-</template>
-
-<script src="./ft-progress-bar.js" />
-<style scoped src="./ft-progress-bar.css" />
diff --git a/src/renderer/components/ft-radio-button/ft-radio-button.vue b/src/renderer/components/ft-radio-button/ft-radio-button.vue
index e7974f9f94e11..46fcc3b1e7d5b 100644
--- a/src/renderer/components/ft-radio-button/ft-radio-button.vue
+++ b/src/renderer/components/ft-radio-button/ft-radio-button.vue
@@ -6,7 +6,6 @@
     <!--  eslint-disable vue/no-template-key -->
     <template
       v-for="(label, index) in labels"
-      class="radioButtonContainer"
     >
       <input
         :id="values[index] + id"
diff --git a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js
index f73e7585ab3e2..c0c6ccb6700bd 100644
--- a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js
+++ b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js
@@ -1,6 +1,8 @@
 import { defineComponent } from 'vue'
 
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
+import { KeyboardShortcuts } from '../../../constants'
+import { addKeyboardShortcutToActionTitle } from '../../helpers/utils'
 
 export default defineComponent({
   name: 'FtRefreshWidget',
@@ -22,6 +24,14 @@ export default defineComponent({
     }
   },
   emits: ['click'],
+  computed: {
+    refreshFeedButtonTitle: function() {
+      return addKeyboardShortcutToActionTitle(
+        this.$t('Feed.Refresh Feed', { subscriptionName: this.title }),
+        KeyboardShortcuts.APP.SITUATIONAL.REFRESH
+      )
+    }
+  },
   methods: {
     click: function() {
       this.$emit('click')
diff --git a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue
index 8224711566915..18dadae7709cb 100644
--- a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue
+++ b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue
@@ -12,7 +12,7 @@
       :disabled="disableRefresh"
       :icon="['fas', 'sync']"
       class="refreshButton"
-      :title="$t('Feed.Refresh Feed', { subscriptionName: title })"
+      :title="refreshFeedButtonTitle"
       :size="12"
       theme="primary"
       @click="click"
diff --git a/src/renderer/components/ft-search-filters/ft-search-filters.js b/src/renderer/components/ft-search-filters/ft-search-filters.js
deleted file mode 100644
index cd869d750085a..0000000000000
--- a/src/renderer/components/ft-search-filters/ft-search-filters.js
+++ /dev/null
@@ -1,221 +0,0 @@
-import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtRadioButton from '../ft-radio-button/ft-radio-button.vue'
-import FtPrompt from '../ft-prompt/ft-prompt.vue'
-import FtButton from '../ft-button/ft-button.vue'
-import FtCheckboxList from '../ft-checkbox-list/ft-checkbox-list.vue'
-
-export default defineComponent({
-  name: 'FtSearchFilters',
-  components: {
-    'ft-flex-box': FtFlexBox,
-    'ft-radio-button': FtRadioButton,
-    'ft-prompt': FtPrompt,
-    'ft-button': FtButton,
-    'ft-checkbox-list': FtCheckboxList
-  },
-  data: function () {
-    return {
-      searchSortByStartIndex: 0,
-      searchTimeStartIndex: 0,
-      searchTypeStartIndex: 0,
-      searchDurationStartIndex: 0,
-      searchDefaultFeatures: [],
-      sortByValues: [
-        'relevance',
-        'rating',
-        'upload_date',
-        'view_count'
-      ],
-      timeValues: [
-        '',
-        'hour',
-        'today',
-        'week',
-        'month',
-        'year'
-      ],
-      typeValues: [
-        'all',
-        'video',
-        'channel',
-        'playlist',
-        'movie'
-      ],
-      durationValues: [
-        '',
-        'short',
-        'medium',
-        'long'
-      ],
-      featureValues: [
-        'hd',
-        'subtitles',
-        'creative_commons',
-        '3d',
-        'live',
-        '4k',
-        '360',
-        'location',
-        'hdr',
-        'vr180'
-      ],
-      notAllowedForMoviesFeatures: [
-        'live',
-        'subtitles',
-        '3d',
-        'creative_commons'
-      ]
-    }
-  },
-  computed: {
-    title: function () {
-      return this.$t('Search Filters.Search Filters')
-    },
-
-    searchSettings: function () {
-      return this.$store.getters.getSearchSettings
-    },
-
-    searchFilterValueChanged: function() {
-      return [
-        this.$refs.sortByRadio.selectedValue !== this.sortByValues[0],
-        this.$refs.timeRadio.selectedValue !== this.timeValues[0],
-        this.$refs.typeRadio.selectedValue !== this.typeValues[0],
-        this.$refs.durationRadio.selectedValue !== this.durationValues[0],
-        this.$refs.featuresCheck.selectedValues.length !== 0
-      ].some((bool) => bool === true)
-    },
-
-    sortByLabels: function () {
-      return [
-        this.$t('Search Filters.Sort By.Most Relevant'),
-        this.$t('Search Filters.Sort By.Rating'),
-        this.$t('Search Filters.Sort By.Upload Date'),
-        this.$t('Search Filters.Sort By.View Count')
-      ]
-    },
-
-    timeLabels: function () {
-      return [
-        this.$t('Search Filters.Time.Any Time'),
-        this.$t('Search Filters.Time.Last Hour'),
-        this.$t('Search Filters.Time.Today'),
-        this.$t('Search Filters.Time.This Week'),
-        this.$t('Search Filters.Time.This Month'),
-        this.$t('Search Filters.Time.This Year')
-      ]
-    },
-
-    typeLabels: function () {
-      return [
-        this.$t('Search Filters.Type.All Types'),
-        this.$t('Search Filters.Type.Videos'),
-        this.$t('Search Filters.Type.Channels'),
-        this.$t('Playlists'),
-        this.$t('Search Filters.Type.Movies')
-      ]
-    },
-
-    durationLabels: function () {
-      return [
-        this.$t('Search Filters.Duration.All Durations'),
-        this.$t('Search Filters.Duration.Short (< 4 minutes)'),
-        this.$t('Search Filters.Duration.Medium (4 - 20 minutes)'),
-        this.$t('Search Filters.Duration.Long (> 20 minutes)')
-      ]
-    },
-
-    featureLabels: function() {
-      return [
-        this.$t('Search Filters.Features.HD'),
-        this.$t('Search Filters.Features.Subtitles'),
-        this.$t('Search Filters.Features.Creative Commons'),
-        this.$t('Search Filters.Features.3D'),
-        this.$t('Search Filters.Features.Live'),
-        this.$t('Search Filters.Features.4K'),
-        this.$t('Search Filters.Features.360 Video'),
-        this.$t('Search Filters.Features.Location'),
-        this.$t('Search Filters.Features.HDR'),
-        this.$t('Search Filters.Features.VR180')
-      ]
-    },
-  },
-  created: function () {
-    this.searchSortByStartIndex = this.sortByValues.indexOf(this.searchSettings.sortBy)
-    this.searchTimeStartIndex = this.timeValues.indexOf(this.searchSettings.time)
-    this.searchTypeStartIndex = this.typeValues.indexOf(this.searchSettings.type)
-    this.searchDurationStartIndex = this.durationValues.indexOf(this.searchSettings.duration)
-    this.searchDefaultFeatures = [...this.searchSettings.features]
-  },
-  methods: {
-    isVideoOrMovieOrAll(type) {
-      return type === 'video' || type === 'movie' || type === 'all'
-    },
-
-    updateSortBy: function (value) {
-      this.$store.commit('setSearchSortBy', value)
-      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
-    },
-
-    updateTime: function (value) {
-      if (!this.isVideoOrMovieOrAll(this.searchSettings.type)) {
-        const typeRadio = this.$refs.typeRadio
-        typeRadio.updateSelectedValue('all')
-        this.$store.commit('setSearchType', 'all')
-      }
-      this.$store.commit('setSearchTime', value)
-      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
-    },
-
-    updateFeatures: function(value) {
-      if (!this.isVideoOrMovieOrAll(this.searchSettings.type) || this.notAllowedForMoviesFeatures.some(item => value.includes(item))) {
-        const typeRadio = this.$refs.typeRadio
-        typeRadio.updateSelectedValue('all')
-        this.$store.commit('setSearchType', 'all')
-      }
-
-      this.$store.commit('setSearchFeatures', value)
-      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
-    },
-
-    updateType: function (value) {
-      if (value === 'channel' || value === 'playlist') {
-        const timeRadio = this.$refs.timeRadio
-        const durationRadio = this.$refs.durationRadio
-        const sortByRadio = this.$refs.sortByRadio
-        const featuresCheck = this.$refs.featuresCheck
-        timeRadio.updateSelectedValue('')
-        durationRadio.updateSelectedValue('')
-        sortByRadio.updateSelectedValue(this.sortByValues[0])
-        featuresCheck.setSelectedValues([])
-        this.$store.commit('setSearchTime', '')
-        this.$store.commit('setSearchDuration', '')
-        this.$store.commit('setSearchFeatures', [])
-        this.$store.commit('setSearchSortBy', this.sortByValues[0])
-      } else if (value === 'movie') {
-        const featuresCheck = this.$refs.featuresCheck
-        const filteredFeatures = this.searchSettings.features.filter(e => !this.notAllowedForMoviesFeatures.includes(e))
-        featuresCheck.setSelectedValues([...filteredFeatures])
-        this.$store.commit('setSearchFeatures', filteredFeatures)
-      }
-      this.$store.commit('setSearchType', value)
-      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
-    },
-
-    updateDuration: function (value) {
-      if (value !== '' && !this.isVideoOrMovieOrAll(this.searchSettings.type)) {
-        const typeRadio = this.$refs.typeRadio
-        typeRadio.updateSelectedValue('all')
-        this.updateType('all')
-      }
-      this.$store.commit('setSearchDuration', value)
-      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
-    },
-
-    ...mapActions([
-      'hideSearchFilters'
-    ])
-  }
-})
diff --git a/src/renderer/components/ft-search-filters/ft-search-filters.vue b/src/renderer/components/ft-search-filters/ft-search-filters.vue
deleted file mode 100644
index ebe67a1742107..0000000000000
--- a/src/renderer/components/ft-search-filters/ft-search-filters.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <ft-prompt
-    theme="slim"
-    :label="title"
-    @click="hideSearchFilters"
-  >
-    <div>
-      <h2
-        class="center"
-        name="title"
-      >
-        {{ title }}
-      </h2>
-      <ft-flex-box class="radioFlexBox">
-        <ft-radio-button
-          ref="sortByRadio"
-          :title="$t('Search Filters.Sort By.Sort By')"
-          :labels="sortByLabels"
-          :values="sortByValues"
-          :initial-value-index="searchSortByStartIndex"
-          class="searchRadio"
-          @change="updateSortBy"
-        />
-        <ft-radio-button
-          ref="timeRadio"
-          :title="$t('Search Filters.Time.Time')"
-          :labels="timeLabels"
-          :values="timeValues"
-          :initial-value-index="searchTimeStartIndex"
-          class="searchRadio"
-          @change="updateTime"
-        />
-        <ft-radio-button
-          ref="typeRadio"
-          :title="$t('Search Filters.Type.Type')"
-          :labels="typeLabels"
-          :values="typeValues"
-          :initial-value-index="searchTypeStartIndex"
-          class="searchRadio"
-          @change="updateType"
-        />
-        <ft-radio-button
-          ref="durationRadio"
-          :title="$t('Search Filters.Duration.Duration')"
-          :labels="durationLabels"
-          :values="durationValues"
-          :initial-value-index="searchDurationStartIndex"
-          class="searchRadio"
-          @change="updateDuration"
-        />
-        <ft-checkbox-list
-          ref="featuresCheck"
-          :title="$t('Search Filters.Features.Features')"
-          :labels="featureLabels"
-          :values="featureValues"
-          :initial-values="searchDefaultFeatures"
-          class="searchRadio"
-          @change="updateFeatures"
-        />
-      </ft-flex-box>
-      <div class="searchFilterCloseButtonContainer">
-        <ft-button
-          :label="$t('Close')"
-          background-color="var(--primary-color)"
-          text-color="var(--text-with-main-color)"
-          @click="hideSearchFilters"
-        />
-      </div>
-    </div>
-  </ft-prompt>
-</template>
-
-<script src="./ft-search-filters.js" />
-<style scoped src="./ft-search-filters.css" />
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.js b/src/renderer/components/ft-settings-section/ft-settings-section.js
deleted file mode 100644
index b161a08066996..0000000000000
--- a/src/renderer/components/ft-settings-section/ft-settings-section.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'FtSettingsSection',
-  props: {
-    title: {
-      type: String,
-      required: true
-    },
-  },
-  computed: {
-    allSettingsSectionsExpandedByDefault: function () {
-      return this.$store.getters.getAllSettingsSectionsExpandedByDefault
-    }
-  }
-})
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.vue b/src/renderer/components/ft-settings-section/ft-settings-section.vue
deleted file mode 100644
index 5bcae70f1a1d7..0000000000000
--- a/src/renderer/components/ft-settings-section/ft-settings-section.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <details
-    :open="allSettingsSectionsExpandedByDefault"
-    class="settingsSection"
-  >
-    <summary class="sectionHeader">
-      <h3 class="sectionTitle">
-        {{ title }}
-      </h3>
-    </summary>
-    <hr class="sectionLine">
-    <slot />
-  </details>
-</template>
-
-<script src="./ft-settings-section.js" />
-<style scoped src="./ft-settings-section.scss" lang="scss" />
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css
index f6afe74816f02..7fc603f68c940 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css
@@ -8,6 +8,13 @@
     so we want to make it black as it defaults to transparent
    */
   background-color: #000;
+
+  /*
+    Fixes the seek bar thumbnails causing a horizontal scroll bar
+    to appear after exiting full screen and full window.
+    But also vertically in case context menu overflows.
+  */
+  overflow: hidden;
 }
 
 .player {
@@ -37,6 +44,35 @@
   flex-direction: column-reverse;
 }
 
+/*
+  Apply the active FreeTube base theme to shaka-player's menus.
+  Usually we go for classes and not element names,
+  however as we need to override shaka-player's CSS
+  we need to use the same selectors that they do.
+*/
+
+:deep(.shaka-overflow-menu),
+:deep(.shaka-settings-menu) {
+  background: var(--card-bg-color) !important;
+}
+
+:deep(.shaka-overflow-menu button),
+:deep(.shaka-settings-menu button) {
+  color: var(--primary-text-color) !important;
+}
+
+:deep(.shaka-overflow-menu button:hover),
+:deep(.shaka-settings-menu button:hover) {
+  background: var(--side-nav-hover-color) !important;
+  color: var(--side-nav-hover-text-color) !important;
+}
+
+:deep(.shaka-overflow-menu-only .shaka-current-selection-span) {
+  color: var(--tertiary-text-color) !important;
+}
+
+/* End of theming code */
+
 .sixteenByNine {
   aspect-ratio: 16 / 9;
 }
@@ -165,6 +201,10 @@
   opacity: 1;
 }
 
+:deep(.shaka-controls-container > .shaka-play-button-container > .shaka-play-button) {
+  padding: min(calc(15% / 2), 55px);
+}
+
 .ftVideoPlayer:fullscreen :deep(.theatre-button),
 .ftVideoPlayer:fullscreen :deep(.full-window-button),
 .fullWindow :deep(.theatre-button) {
@@ -203,6 +243,32 @@
   }
 }
 
+@media only screen and (width >= 1000px) {
+  :deep(.shaka-bottom-controls) {
+    /* remove some bottom padding since the seek bar is above */
+    padding-bottom: 0;
+
+    /* make seekbar take full width on non-mobile devices */
+    width: 100%;
+  }
+
+  /* increase height of captions area since we remove the padding-bottom below the seekbar */
+  :deep(.shaka-controls-container[shown='true']~.shaka-text-container) {
+    bottom: 12.5%;
+  }
+
+  :deep(.shaka-controls-button-panel>button) {
+    height: 40px;
+    line-height: 0.5;
+  }
+
+  :deep(.shaka-tooltips-on button:active::after),
+  :deep(.shaka-tooltips-on button:focus-visible::after),
+  :deep(.shaka-tooltips-on button:hover::after) {
+    margin-bottom: 8px;
+  }
+}
+
 @media only screen and (width <=1350px) {
   :deep(.theatre-button) {
     display: none;
@@ -216,4 +282,11 @@
   }
 }
 
+@media (prefers-reduced-transparency:no-preference) {
+  /* add transparency to big play button */
+  :deep(.shaka-controls-container[shown='true'] > .shaka-play-button-container > .shaka-play-button) {
+    opacity: 0.75 !important;
+  }
+}
+
 /* stylelint-enable liberty/use-logical-spec */
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
index e0afeb6c37627..bf53f9182a2a9 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
@@ -3,11 +3,10 @@ import path from 'path'
 
 import { computed, defineComponent, onBeforeUnmount, onMounted, reactive, ref, shallowRef, watch } from 'vue'
 import shaka from 'shaka-player'
+import { useI18n } from '../../composables/use-i18n-polyfill'
 
 import store from '../../store/index'
-import i18n from '../../i18n/index'
-
-import { IpcChannels } from '../../../constants'
+import { IpcChannels, KeyboardShortcuts } from '../../../constants'
 import { AudioTrackSelection } from './player-components/AudioTrackSelection'
 import { FullWindowButton } from './player-components/FullWindowButton'
 import { LegacyQualitySelection } from './player-components/LegacyQualitySelection'
@@ -18,12 +17,12 @@ import {
   findMostSimilarAudioBandwidth,
   getSponsorBlockSegments,
   logShakaError,
-  qualityLabelToDimension,
   repairInvidiousManifest,
   sortCaptions,
   translateSponsorBlockCategory
 } from '../../helpers/player/utils'
 import {
+  addKeyboardShortcutToActionTitle,
   getPicturesPath,
   showSaveDialog,
   showToast
@@ -41,6 +40,23 @@ const RequestType = shaka.net.NetworkingEngine.RequestType
 const AdvancedRequestType = shaka.net.NetworkingEngine.AdvancedRequestType
 const TrackLabelFormat = shaka.ui.Overlay.TrackLabelFormat
 
+/*
+  Mapping of Shaka localization keys for control labels to FreeTube shortcuts.
+  See: https://github.com/shaka-project/shaka-player/blob/main/ui/locales/en.json
+*/
+const shakaControlKeysToShortcuts = {
+  MUTE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE,
+  UNMUTE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE,
+  PLAY: KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.PLAY,
+  PAUSE: KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.PLAY,
+  PICTURE_IN_PICTURE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE,
+  ENTER_PICTURE_IN_PICTURE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE,
+  EXIT_PICTURE_IN_PICTURE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE,
+  CAPTIONS: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.CAPTIONS,
+  FULL_SCREEN: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN,
+  EXIT_FULL_SCREEN: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN
+}
+
 /** @type {Map<string, string>} */
 const LOCALE_MAPPINGS = new Map(process.env.SHAKA_LOCALE_MAPPINGS)
 
@@ -106,7 +122,7 @@ export default defineComponent({
     vrProjection: {
       type: String,
       default: null
-    }
+    },
   },
   emits: [
     'error',
@@ -116,6 +132,8 @@ export default defineComponent({
     'toggle-theatre-mode'
   ],
   setup: function (props, { emit, expose }) {
+    const { locale, t } = useI18n()
+
     /** @type {shaka.Player|null} */
     let player = null
 
@@ -227,6 +245,12 @@ export default defineComponent({
       return store.getters.getDefaultSkipInterval
     })
 
+    watch(defaultSkipInterval, (newValue) => {
+      ui.configure({
+        tapSeekDistance: newValue
+      })
+    })
+
     /** @type {import('vue').ComputedRef<number | 'auto'>} */
     const defaultQuality = computed(() => {
       const value = store.getters.getDefaultQuality
@@ -356,7 +380,7 @@ export default defineComponent({
        *     color: string,
        *     skip: 'autoSkip' | 'promptToSkip' | 'showInSeekBar' | 'doNothing'
        *   }
-       * }} */
+        }} */
       const categoryData = {}
 
       sponsorCategories.forEach(x => {
@@ -538,7 +562,7 @@ export default defineComponent({
      * @param {'dash'|'audio'|'legacy'} format
      * @param {boolean} useAutoQuality
      * @returns {shaka.extern.PlayerConfiguration}
-     **/
+     */
     function getPlayerConfig(format, useAutoQuality = false) {
       return {
         // YouTube uses these values and they seem to work well in FreeTube too,
@@ -556,7 +580,6 @@ export default defineComponent({
           dash: {
             manifestPreprocessorTXml: manifestPreprocessorTXml
           },
-          availabilityWindowOverride: seekingIsPossible.value ? NaN : 0
         },
         abr: {
           enabled: useAutoQuality,
@@ -566,9 +589,11 @@ export default defineComponent({
         },
         autoShowText: shaka.config.AutoShowText.NEVER,
 
-        // Only use variants that are predicted to play smoothly
+        // Prioritise variants that are predicted to play:
+        // - `smooth`: without dropping frames
+        // - `powerEfficient` the spec is quite vague but in Chromium it should prioritise hardware decoding when available
         // https://developer.mozilla.org/en-US/docs/Web/API/MediaCapabilities/decodingInfo
-        preferredDecodingAttributes: format === 'dash' ? ['smooth'] : [],
+        preferredDecodingAttributes: format === 'dash' ? ['smooth', 'powerEfficient'] : [],
 
         // Electron doesn't like YouTube's vp9 VR video streams and throws:
         // "CHUNK_DEMUXER_ERROR_APPEND_FAILED: Projection element is incomplete; ProjectionPoseYaw required."
@@ -820,6 +845,7 @@ export default defineComponent({
           addBigPlayButton: displayVideoPlayButton.value,
           enableFullscreenOnRotation: enterFullscreenOnDisplayRotate.value,
           playbackRates: playbackRates.value,
+          tapSeekDistance: defaultSkipInterval.value,
 
           // we have our own ones (shaka-player's ones are quite limited)
           enableKeyboardPlaybackControls: false,
@@ -968,7 +994,7 @@ export default defineComponent({
      * @param {string} locale
      */
     async function setLocale(locale) {
-      // For most of FreeTube's locales their is an equivalent one in shaka-player,
+      // For most of FreeTube's locales, there is an equivalent one in shaka-player,
       // however if there isn't one we should fall back to US English.
       // At the time of writing "et", "eu", "gl", "is" don't have any translations
       const shakaLocale = LOCALE_MAPPINGS.get(locale) ?? 'en'
@@ -989,10 +1015,31 @@ export default defineComponent({
 
       localization.changeLocale([shakaLocale])
 
+      // Add the keyboard shortcut to the label for the default Shaka controls
+
+      const shakaControlKeysToShortcutLocalizations = new Map()
+      Object.entries(shakaControlKeysToShortcuts).forEach(([shakaControlKey, shortcut]) => {
+        const originalLocalization = localization.resolve(shakaControlKey)
+        if (originalLocalization === '') {
+          // e.g., A Shaka localization key in shakaControlKeysToShortcuts has fallen out of date and need to be updated
+          console.error('Mising Shaka localization key "%s"', shakaControlKey)
+          return
+        }
+
+        const localizationWithShortcut = addKeyboardShortcutToActionTitle(
+          originalLocalization,
+          shortcut
+        )
+
+        shakaControlKeysToShortcutLocalizations.set(shakaControlKey, localizationWithShortcut)
+      })
+
+      localization.insert(shakaLocale, shakaControlKeysToShortcutLocalizations)
+
       events.dispatchEvent(new CustomEvent('localeChanged'))
     }
 
-    watch(() => i18n.locale, setLocale)
+    watch(locale, setLocale)
 
     // #endregion player locales
 
@@ -1139,7 +1186,8 @@ export default defineComponent({
           if (url.hostname.endsWith('.youtube.com') && url.pathname === '/api/timedtext' &&
             url.searchParams.get('caps') === 'asr' && url.searchParams.get('kind') === 'asr' && url.searchParams.get('fmt') === 'vtt') {
             const stringBody = new TextDecoder().decode(response.data)
-            const cleaned = stringBody.replaceAll(/ align:start position:0%$/gm, '')
+            // position:0% for LTR text and position:100% for RTL text
+            const cleaned = stringBody.replaceAll(/ align:start position:(?:10)?0%$/gm, '')
 
             response.data = new TextEncoder().encode(cleaned).buffer
           }
@@ -1251,33 +1299,30 @@ export default defineComponent({
     }
 
     /**
-     * @param {'dash'|'audio'|null} previousFormat
      * @param {number|null} playbackPosition
+     * @param {number|undefined} previousQuality
      */
-    async function setLegacyQuality(previousFormat = null, playbackPosition = null) {
+    async function setLegacyQuality(playbackPosition = null, previousQuality = undefined) {
+      if (typeof previousQuality === 'undefined') {
+        if (defaultQuality.value === 'auto') {
+          previousQuality = Infinity
+        } else {
+          previousQuality = defaultQuality.value
+        }
+      }
+
       /** @type {object[]} */
       const legacyFormats = props.legacyFormats
 
-      // TODO: switch to using height and width when Invidious starts returning them, instead of parsing the quality label
-
-      let previousQuality
-      if (previousFormat === 'dash') {
-        const previousTrack = player.getVariantTracks().find(track => track.active)
-
-        previousQuality = previousTrack.height > previousTrack.width ? previousTrack.width : previousTrack.height
-      } else if (defaultQuality.value === 'auto') {
-        previousQuality = Infinity
-      } else {
-        previousQuality = defaultQuality.value
-      }
+      const isPortrait = legacyFormats[0].height > legacyFormats[0].width
 
       let matches = legacyFormats.filter(variant => {
-        return previousQuality === qualityLabelToDimension(variant.qualityLabel)
+        return previousQuality === isPortrait ? variant.width : variant.height
       })
 
       if (matches.length === 0) {
         matches = legacyFormats.filter(variant => {
-          return previousQuality > qualityLabelToDimension(variant.qualityLabel)
+          return previousQuality > isPortrait ? variant.width : variant.height
         })
 
         if (matches.length > 0) {
@@ -1407,26 +1452,8 @@ export default defineComponent({
 
       stats.bitrate = (bitrate / 1000).toFixed(2)
 
-      if (typeof width === 'undefined' || typeof height === 'undefined') {
-        // Invidious doesn't provide any height or width information for their legacy formats, so lets read it from the video instead
-        // they have a size property but it's hard-coded, so it reports false information for shorts for example
-        const video_ = video.value
-
-        if (hasLoaded.value) {
-          stats.resolution.width = video_.videoWidth
-          stats.resolution.height = video_.videoHeight
-        } else {
-          video_.addEventListener('loadeddata', () => {
-            stats.resolution.width = video_.videoWidth
-            stats.resolution.height = video_.videoHeight
-          }, {
-            once: true
-          })
-        }
-      } else {
-        stats.resolution.width = width
-        stats.resolution.height = height
-      }
+      stats.resolution.width = width
+      stats.resolution.height = height
     }
 
     function updateStats() {
@@ -1508,7 +1535,8 @@ export default defineComponent({
 
       const format = screenshotFormat.value
       const mimeType = `image/${format === 'jpg' ? 'jpeg' : format}`
-      const imageQuality = format === 'jpg' ? screenshotQuality.value / 100 : 1
+      // imageQuality is ignored for pngs, so it is still okay to pass the quality value
+      const imageQuality = screenshotQuality.value / 100
 
       let filename
       try {
@@ -1519,7 +1547,7 @@ export default defineComponent({
         })
       } catch (err) {
         console.error(`Parse failed: ${err.message}`)
-        showToast(i18n.t('Screenshot Error', { error: err.message }))
+        showToast(t('Screenshot Error', { error: err.message }))
         canvas.remove()
         return
       }
@@ -1584,7 +1612,7 @@ export default defineComponent({
             await fs.mkdir(dirPath, { recursive: true })
           } catch (err) {
             console.error(err)
-            showToast(i18n.t('Screenshot Error', { error: err }))
+            showToast(t('Screenshot Error', { error: err }))
             canvas.remove()
             return
           }
@@ -1598,11 +1626,11 @@ export default defineComponent({
 
           fs.writeFile(filePath, arr)
             .then(() => {
-              showToast(i18n.t('Screenshot Success', { filePath }))
+              showToast(t('Screenshot Success', { filePath }))
             })
             .catch((err) => {
               console.error(err)
-              showToast(i18n.t('Screenshot Error', { error: err }))
+              showToast(t('Screenshot Error', { error: err }))
             })
         })
       }, mimeType, imageQuality)
@@ -1819,7 +1847,7 @@ export default defineComponent({
       const seekRange = player.seekRange()
 
       // Seeking not possible e.g. with HLS
-      if (seekRange.start === seekRange.end) {
+      if (seekRange.start === seekRange.end || !seekingIsPossible.value) {
         return false
       }
 
@@ -1889,7 +1917,7 @@ export default defineComponent({
 
     /**
      * @param {WheelEvent} event
-     * */
+     */
     function mouseScrollVolume(event) {
       if (!event.ctrlKey && !event.metaKey) {
         event.preventDefault()
@@ -1979,53 +2007,47 @@ export default defineComponent({
 
       const video_ = video.value
 
-      switch (event.key) {
+      switch (event.key.toLowerCase()) {
         case ' ':
-        case 'Spacebar': // older browsers might return spacebar instead of a space character
-        case 'K':
-        case 'k':
+        case 'spacebar': // older browsers might return spacebar instead of a space character
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.PLAY:
           // Toggle Play/Pause
           event.preventDefault()
           video_.paused ? video_.play() : video_.pause()
           break
-        case 'J':
-        case 'j':
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.LARGE_REWIND:
           // Rewind by 2x the time-skip interval (in seconds)
           event.preventDefault()
           seekBySeconds(-defaultSkipInterval.value * video_.playbackRate * 2)
           break
-        case 'L':
-        case 'l':
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.LARGE_FAST_FORWARD:
           // Fast-Forward by 2x the time-skip interval (in seconds)
           event.preventDefault()
           seekBySeconds(defaultSkipInterval.value * video_.playbackRate * 2)
           break
-        case 'O':
-        case 'o':
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.DECREASE_VIDEO_SPEED:
           // Decrease playback rate by user configured interval
           event.preventDefault()
           changePlayBackRate(-videoPlaybackRateInterval.value)
           break
-        case 'P':
-        case 'p':
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.INCREASE_VIDEO_SPEED:
           // Increase playback rate by user configured interval
           event.preventDefault()
           changePlayBackRate(videoPlaybackRateInterval.value)
           break
-        case 'F':
-        case 'f':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN:
           // Toggle full screen
           event.preventDefault()
           ui.getControls().toggleFullScreen()
           break
-        case 'M':
-        case 'm':
-          // Toggle mute
-          event.preventDefault()
-          video_.muted = !video_.muted
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE:
+          // Toggle mute only if metakey is not pressed
+          if (!event.metaKey) {
+            event.preventDefault()
+            video_.muted = !video_.muted
+          }
           break
-        case 'C':
-        case 'c':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.CAPTIONS:
           // Toggle caption/subtitles
           if (player.getTextTracks().length > 0) {
             event.preventDefault()
@@ -2034,17 +2056,17 @@ export default defineComponent({
             player.setTextTrackVisibility(!currentlyVisible)
           }
           break
-        case 'ArrowUp':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.VOLUME_UP:
           // Increase volume
           event.preventDefault()
           changeVolume(0.05)
           break
-        case 'ArrowDown':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.VOLUME_DOWN:
           // Decrease Volume
           event.preventDefault()
           changeVolume(-0.05)
           break
-        case 'ArrowLeft':
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.SMALL_REWIND:
           event.preventDefault()
           if (canChapterJump(event, 'previous')) {
             // Jump to the previous chapter
@@ -2054,7 +2076,7 @@ export default defineComponent({
             seekBySeconds(-defaultSkipInterval.value * video_.playbackRate)
           }
           break
-        case 'ArrowRight':
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.SMALL_FAST_FORWARD:
           event.preventDefault()
           if (canChapterJump(event, 'next')) {
             // Jump to the next chapter
@@ -2064,8 +2086,7 @@ export default defineComponent({
             seekBySeconds(defaultSkipInterval.value * video_.playbackRate)
           }
           break
-        case 'I':
-        case 'i':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE:
           // Toggle picture in picture
           if (props.format !== 'audio') {
             const controls = ui.getControls()
@@ -2098,18 +2119,20 @@ export default defineComponent({
           }
           break
         }
-        case ',':
-          event.preventDefault()
-          // Return to previous frame
-          frameByFrame(-1)
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.LAST_FRAME:
+          // `⌘+,` is for settings in MacOS
+          if (!event.metaKey) {
+            event.preventDefault()
+            // Return to previous frame
+            frameByFrame(-1)
+          }
           break
-        case '.':
+        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.NEXT_FRAME:
           event.preventDefault()
           // Advance to next frame
           frameByFrame(1)
           break
-        case 'D':
-        case 'd':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.STATS:
           // Toggle stats display
           event.preventDefault()
 
@@ -2117,7 +2140,7 @@ export default defineComponent({
             detail: !showStats.value
           }))
           break
-        case 'Escape':
+        case 'escape':
           // Exit full window
           if (fullWindowEnabled.value) {
             event.preventDefault()
@@ -2127,16 +2150,14 @@ export default defineComponent({
             }))
           }
           break
-        case 'S':
-        case 's':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLWINDOW:
           // Toggle full window mode
           event.preventDefault()
           events.dispatchEvent(new CustomEvent('setFullWindow', {
             detail: !fullWindowEnabled.value
           }))
           break
-        case 'T':
-        case 't':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.THEATRE_MODE:
           // Toggle theatre mode
           if (props.theatrePossible) {
             event.preventDefault()
@@ -2146,8 +2167,7 @@ export default defineComponent({
             }))
           }
           break
-        case 'U':
-        case 'u':
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.TAKE_SCREENSHOT:
           if (process.env.IS_ELECTRON && enableScreenshot.value && props.format !== 'audio') {
             event.preventDefault()
             // Take screenshot
@@ -2159,17 +2179,28 @@ export default defineComponent({
 
     // #endregion keyboard shortcuts
 
+    let ignoreErrors = false
+
     /**
      * @param {shaka.util.Error} error
      * @param {string} context
-     * @param {object=} details
+     * @param {object?} details
      */
     function handleError(error, context, details) {
+      // These two errors are just wrappers around another error, so use the original error instead
+      // As they can be nested (e.g. multiple googlevideo redirects because the Invidious server was far away from the user) we should pick the inner most one
+      while (error.code === shaka.util.Error.Code.REQUEST_FILTER_ERROR || error.code === shaka.util.Error.Code.RESPONSE_FILTER_ERROR) {
+        error = error.data[0]
+      }
+
       logShakaError(error, context, props.videoId, details)
 
       // text related errors aren't serious (captions and seek bar thumbnails), so we should just log them
       // TODO: consider only emitting when the severity is crititcal?
-      if (error.category !== shaka.util.Error.Category.TEXT) {
+      if (!ignoreErrors && error.category !== shaka.util.Error.Category.TEXT) {
+        // don't react to multiple consecutive errors, otherwise we don't give the format fallback from the previous error a chance to work
+        ignoreErrors = true
+
         emit('error', error)
 
         stopPowerSaveBlocker()
@@ -2331,7 +2362,7 @@ export default defineComponent({
         player.getNetworkingEngine().registerResponseFilter(responseFilter)
       }
 
-      await setLocale(i18n.locale)
+      await setLocale(locale.value)
 
       // check if the component is already getting destroyed
       // which is possible because this function runs asynchronously
@@ -2383,19 +2414,8 @@ export default defineComponent({
       } else {
         // force the player aspect ratio to 16:9 to avoid overflowing the layout, when the video is too tall
 
-        // Invidious doesn't provide any height or width information for their legacy formats, so lets read it from the video instead
-        // they have a size property but it's hard-coded, so it reports false information for shorts for example
-
         const firstFormat = props.legacyFormats[0]
-        if (typeof firstFormat.width === 'undefined' || typeof firstFormat.height === 'undefined') {
-          videoElement.addEventListener('loadeddata', () => {
-            forceAspectRatio.value = videoElement.videoWidth / videoElement.videoHeight < 1.5
-          }, {
-            once: true
-          })
-        } else {
-          forceAspectRatio.value = firstFormat.width / firstFormat.height < 1.5
-        }
+        forceAspectRatio.value = firstFormat.width / firstFormat.height < 1.5
       }
 
       if (useSponsorBlock.value && sponsorSkips.value.seekBar.length > 0) {
@@ -2404,6 +2424,10 @@ export default defineComponent({
 
       window.addEventListener('beforeunload', stopPowerSaveBlocker)
 
+      // shaka-player doesn't start with the cursor hidden, so hide it here for instances in which the
+      // cursor is in the video player area when the video first loads
+      container.value.classList.add('no-cursor')
+
       await performFirstLoad()
     })
 
@@ -2433,7 +2457,7 @@ export default defineComponent({
           handleError(error, 'loading dash/audio manifest and setting default quality in mounted')
         }
       } else {
-        await setLegacyQuality(null, props.startTime)
+        await setLegacyQuality(props.startTime)
       }
     }
 
@@ -2461,7 +2485,8 @@ export default defineComponent({
                 const response = await fetch(caption.url)
                 let text = await response.text()
 
-                text = text.replaceAll(/ align:start position:0%$/gm, '')
+                // position:0% for LTR text and position:100% for RTL text
+                text = text.replaceAll(/ align:start position:(?:10)?0%$/gm, '')
 
                 const url = `data:${caption.mimeType};charset=utf-8,${encodeURIComponent(text)}`
 
@@ -2551,9 +2576,17 @@ export default defineComponent({
        * @param {'dash'|'audio'|'legacy'} oldFormat
        */
       async (newFormat, oldFormat) => {
+        ignoreErrors = true
+
         // format switch happened before the player loaded, probably because of an error
         // as there are no previous player settings to restore, we should treat it like this was the original format
         if (!hasLoaded.value) {
+          try {
+            await player.unload()
+          } catch { }
+
+          ignoreErrors = false
+
           player.configure(getPlayerConfig(newFormat, defaultQuality.value === 'auto'))
 
           await performFirstLoad()
@@ -2593,7 +2626,7 @@ export default defineComponent({
             const legacyFormat = activeLegacyFormat.value
 
             if (!useAutoQuality) {
-              dimension = qualityLabelToDimension(legacyFormat.qualityLabel)
+              dimension = legacyFormat.height > legacyFormat.width ? legacyFormat.width : legacyFormat.height
             }
           } else if (oldFormat !== 'legacy') {
             const track = player.getVariantTracks().find(track => track.active)
@@ -2616,6 +2649,12 @@ export default defineComponent({
             }
           }
 
+          try {
+            await player.unload()
+          } catch { }
+
+          ignoreErrors = false
+
           player.configure(getPlayerConfig(newFormat, useAutoQuality))
 
           try {
@@ -2653,7 +2692,21 @@ export default defineComponent({
           }
           activeLegacyFormat.value = null
         } else {
-          await setLegacyQuality(oldFormat, playbackPosition)
+          let previousQuality
+
+          if (oldFormat === 'dash') {
+            const previousTrack = player.getVariantTracks().find(track => track.active)
+
+            previousQuality = previousTrack.height > previousTrack.width ? previousTrack.width : previousTrack.height
+          }
+
+          try {
+            await player.unload()
+          } catch { }
+
+          ignoreErrors = false
+
+          await setLegacyQuality(playbackPosition, previousQuality)
         }
 
         if (wasPaused) {
@@ -2721,6 +2774,8 @@ export default defineComponent({
      * To workaround that we destroy the player first and wait for it to finish before we unmount this component.
      */
     async function destroyPlayer() {
+      ignoreErrors = true
+
       if (ui) {
         // destroying the ui also destroys the player
         await ui.destroy()
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue
index 4b9519c772718..6b2762e4e69c4 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue
@@ -1,10 +1,10 @@
 <template>
   <div
     ref="container"
-    class="ftVideoPlayer"
+    class="ftVideoPlayer shaka-video-container"
     :class="{
       fullWindow: fullWindowEnabled,
-      sixteenByNine: forceAspectRatio
+      sixteenByNine: forceAspectRatio && !fullWindowEnabled
     }"
   >
     <!-- eslint-disable-next-line vuejs-accessibility/media-has-caption -->
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js b/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js
index 66cb393db3107..6a1ea8435dc76 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js
@@ -42,7 +42,7 @@ export class AudioTrackSelection extends shaka.ui.SettingsMenu {
 
   /**
    * @private
-   * @param {shaka.extern.TrackList=} tracks
+   * @param {shaka.extern.TrackList?} tracks
    */
   updateAudioTracks_(tracks) {
     if (!tracks) {
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js b/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
index 2f0db723e3faf..008c515b37468 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
@@ -1,6 +1,8 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
+import { KeyboardShortcuts } from '../../../../constants'
+import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class FullWindowButton extends shaka.ui.Element {
   /**
@@ -67,12 +69,14 @@ export class FullWindowButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
-    this.nameSpan_.textContent = i18n.t('Video.Player.Full Window')
-
     this.icon_.textContent = this.fullWindowEnabled_ ? 'close_fullscreen' : 'open_in_full'
-
     this.currentState_.textContent = this.localization.resolve(this.fullWindowEnabled_ ? 'ON' : 'OFF')
 
-    this.button_.ariaLabel = this.fullWindowEnabled_ ? i18n.t('Video.Player.Exit Full Window') : i18n.t('Video.Player.Full Window')
+    const baseAriaLabel = this.fullWindowEnabled_ ? i18n.t('Video.Player.Exit Full Window') : i18n.t('Video.Player.Full Window')
+    const newLabel = addKeyboardShortcutToActionTitle(
+      baseAriaLabel,
+      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLWINDOW
+    )
+    this.nameSpan_.textContent = this.button_.ariaLabel = newLabel
   }
 }
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
index 980dfe16fa4b0..a11e5a19ed35c 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
@@ -22,15 +22,8 @@ export class LegacyQualitySelection extends shaka.ui.SettingsMenu {
 
     const sortedLegacyFormats = [...legacyFormats]
 
-    // Invidious doesn't return the height or width for the legacy formats, so we have to use the bitrate instead
-    if (typeof legacyFormats[0].width === 'undefined' || typeof legacyFormats[0].height === 'undefined') {
-      sortedLegacyFormats.sort((a, b) => {
-        return b.bitrate - a.bitrate
-      })
-    } else {
-      const isPortrait = legacyFormats[0].height > legacyFormats[0].width
-      sortedLegacyFormats.sort((a, b) => isPortrait ? b.width - a.width : b.height - a.height)
-    }
+    const isPortrait = legacyFormats[0].height > legacyFormats[0].width
+    sortedLegacyFormats.sort((a, b) => isPortrait ? b.width - a.width : b.height - a.height)
 
     /** @private */
     this.legacyFormats_ = sortedLegacyFormats
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js b/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
index f9b187cef056e..9398c1573b317 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
@@ -1,6 +1,8 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
+import { KeyboardShortcuts } from '../../../../constants'
+import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class ScreenshotButton extends shaka.ui.Element {
   /**
@@ -49,8 +51,10 @@ export class ScreenshotButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
-    this.nameSpan_.textContent = i18n.t('Video.Player.Take Screenshot')
-
-    this.button_.ariaLabel = i18n.t('Video.Player.Take Screenshot')
+    const label = addKeyboardShortcutToActionTitle(
+      i18n.t('Video.Player.Take Screenshot'),
+      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.TAKE_SCREENSHOT
+    )
+    this.nameSpan_.textContent = this.button_.ariaLabel = label
   }
 }
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js b/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js
index b6f6e8eb7a560..5f6dccc818e3e 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js
@@ -1,6 +1,8 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
+import { KeyboardShortcuts } from '../../../../constants'
+import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class StatsButton extends shaka.ui.Element {
   /**
@@ -65,12 +67,15 @@ export class StatsButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
-    this.nameSpan_.textContent = i18n.t('Video.Player.Stats.Stats')
-
     this.icon_.textContent = this.showStats_ ? 'insert_chart' : 'insert_chart_outlined'
 
-    this.currentState_.textContent = this.localization.resolve(this.showStats_ ? 'ON' : 'OFF')
+    const baseLabel = this.showStats_ ? i18n.t('Video.Player.Hide Stats') : i18n.t('Video.Player.Show Stats')
+    const label = addKeyboardShortcutToActionTitle(
+      baseLabel,
+      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.STATS
+    )
 
-    this.button_.ariaLabel = this.showStats_ ? i18n.t('Video.Player.Hide Stats') : i18n.t('Video.Player.Show Stats')
+    this.currentState_.textContent = label
+    this.button_.ariaLabel = label
   }
 }
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js b/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
index 043e75b4e9d62..b7e1c0299e6f3 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
@@ -1,6 +1,8 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
+import { KeyboardShortcuts } from '../../../../constants'
+import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class TheatreModeButton extends shaka.ui.Element {
   /**
@@ -67,12 +69,15 @@ export class TheatreModeButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
-    this.nameSpan_.textContent = i18n.t('Video.Player.Theatre Mode')
-
     this.icon_.textContent = this.theatreModeEnabled_ ? 'monitor' : 'tv'
 
     this.currentState_.textContent = this.localization.resolve(this.theatreModeEnabled_ ? 'ON' : 'OFF')
 
-    this.button_.ariaLabel = this.theatreModeEnabled_ ? i18n.t('Video.Player.Exit Theatre Mode') : i18n.t('Video.Player.Theatre Mode')
+    const baseAriaLabel = this.theatreModeEnabled_ ? i18n.t('Video.Player.Exit Theatre Mode') : i18n.t('Video.Player.Theatre Mode')
+
+    this.nameSpan_.textContent = this.button_.ariaLabel = addKeyboardShortcutToActionTitle(
+      baseAriaLabel,
+      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.THEATRE_MODE
+    )
   }
 }
diff --git a/src/renderer/components/ft-share-button/ft-share-button.css b/src/renderer/components/ft-share-button/ft-share-button.css
new file mode 100644
index 0000000000000..e755f74c15c7b
--- /dev/null
+++ b/src/renderer/components/ft-share-button/ft-share-button.css
@@ -0,0 +1,76 @@
+.shareLinks {
+  display: grid;
+  grid-auto-flow: column;
+  grid-template-rows: auto auto;
+  padding: 12px;
+  inline-size: max-content;
+}
+
+.header {
+  color: var(--primary-text-color);
+  font-size: 18px;
+  font-weight: bold;
+  margin-block: 4px 8px;
+  margin-inline: 0;
+  display: flex;
+  justify-content: center;
+}
+
+.buttons {
+  display: flex;
+  flex-direction: column;
+  max-inline-size: min-content;
+  min-inline-size: 150px;
+}
+
+.action {
+  padding: 6px;
+  white-space: initial;
+}
+
+.divider {
+  background: var(--tertiary-text-color);
+  grid-row: span 3;
+  margin-block: 0;
+  margin-inline: 12px;
+  inline-size: 1px;
+}
+
+.youtubeLogo {
+  block-size: 18px;
+  inline-size: auto;
+}
+
+.invidious {
+  letter-spacing: -0.4px;
+}
+
+.invidiousLogo {
+  background-size: cover;
+  display: inline-block;
+  block-size: 20px;
+  margin-inline-end: 2px;
+  inline-size: 20px;
+}
+
+@media only screen and (width <= 450px) {
+  .shareLinks {
+    grid-auto-flow: row;
+    margin-inline: auto;
+    justify-items: center;
+    max-inline-size: max-content;
+  }
+
+  .header.invidious {
+    margin-block-start: 20px;
+  }
+
+  .buttons {
+    max-inline-size: min-content;
+    min-inline-size: 180px;
+  }
+
+  .divider {
+    display: none;
+  }
+}
diff --git a/src/renderer/components/ft-share-button/ft-share-button.js b/src/renderer/components/ft-share-button/ft-share-button.js
index 6d9eb6f73f149..9130a6355620e 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.js
+++ b/src/renderer/components/ft-share-button/ft-share-button.js
@@ -19,7 +19,7 @@ export default defineComponent({
        * Allows to render the dropdown conditionally
        * 'Channel' will exclude embed links
        * 'Video' (default) keeps the original behaviour
-       **/
+       */
       type: String,
       default: 'Video'
     },
diff --git a/src/renderer/components/ft-share-button/ft-share-button.scss b/src/renderer/components/ft-share-button/ft-share-button.scss
deleted file mode 100644
index dc3515db90ba6..0000000000000
--- a/src/renderer/components/ft-share-button/ft-share-button.scss
+++ /dev/null
@@ -1,117 +0,0 @@
-/* stylelint-disable no-descending-specificity */
-.shareLinks {
-  display: grid;
-  grid-auto-flow: column;
-  grid-template-rows: auto auto;
-  padding: 12px;
-  inline-size: max-content;
-
-  .header {
-    color: var(--primary-text-color);
-    font-size: 18px;
-    font-weight: bold;
-    margin-block: 4px 8px;
-    margin-inline: 0;
-    display: flex;
-    justify-content: center;
-  }
-
-  .buttons {
-    display: flex;
-    flex-direction: column;
-    max-inline-size: min-content;
-    min-inline-size: 150px;
-
-    .action {
-      padding: 6px;
-      white-space: initial;
-    }
-  }
-
-  .divider {
-    background: var(--tertiary-text-color);
-    grid-row: span 3;
-    margin-block: 0;
-    margin-inline: 12px;
-    inline-size: 1px;
-  }
-
-  .youtubeLogo {
-    block-size: 18px;
-    inline-size: auto;
-
-    @at-root {
-      .dark &,
-      .system[data-system-theme*='dark'] & {
-        filter: brightness(0.868);
-      }
-
-      .black &,
-      .solarizedDark & {
-        filter: brightness(0.933);
-      }
-
-      /* no changes for the dracula theme */
-
-      .pastelPink &,
-      .light &,
-      .solarizedLight &,
-      .system[data-system-theme*='light'] & {
-        filter: invert(0.87);
-      }
-    }
-  }
-
-  .invidious {
-    letter-spacing: -0.4px;
-
-    .invidiousLogo {
-      background-size: cover;
-      display: inline-block;
-      block-size: 20px;
-      margin-inline-end: 2px;
-      inline-size: 20px;
-
-      @at-root {
-        .dark &,
-        .black &,
-        .dracula &,
-        .CatppuccinMocha &,
-        .hotPink &,
-        .solarizedDark &,
-        .system[data-system-theme*='dark'] & {
-          background-image: url('../../assets/img/invidious-logo-dark.svg');
-        }
-
-        .pastelPink &,
-        .light &,
-        .solarizedLight &,
-        .system[data-system-theme*='light'] & {
-          background-image: url('../../assets/img/invidious-logo-light.svg');
-        }
-      }
-    }
-  }
-}
-
-@media only screen and (width <= 450px) {
-  .shareLinks {
-    grid-auto-flow: row;
-    margin-inline: auto;
-    justify-items: center;
-    max-inline-size: max-content;
-
-    .header.invidious {
-      margin-block-start: 20px;
-    }
-
-    .buttons {
-      max-inline-size: min-content;
-      min-inline-size: 180px;
-    }
-
-    .divider {
-      display: none;
-    }
-  }
-}
diff --git a/src/renderer/components/ft-share-button/ft-share-button.vue b/src/renderer/components/ft-share-button/ft-share-button.vue
index b72380c90ce1c..f44ac34262a65 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.vue
+++ b/src/renderer/components/ft-share-button/ft-share-button.vue
@@ -121,4 +121,4 @@
 </template>
 
 <script src="./ft-share-button.js" />
-<style scoped lang="scss" src="./ft-share-button.scss" />
+<style scoped src="./ft-share-button.css" />
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
deleted file mode 100644
index 479752c148116..0000000000000
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
-import { colors, getColorTranslations } from '../../helpers/colors'
-import FtSelect from '../ft-select/ft-select.vue'
-import { sanitizeForHtmlId } from '../../helpers/accessibility'
-
-export default defineComponent({
-  name: 'FtSponsorBlockCategory',
-  components: {
-    'ft-select': FtSelect
-  },
-  props: {
-    categoryName: {
-      type: String,
-      required: true
-    }
-  },
-  data: function () {
-    return {
-      skipValues: [
-        'autoSkip',
-        // 'promptToSkip',
-        'showInSeekBar',
-        'doNothing'
-      ]
-    }
-  },
-  computed: {
-    colorValues: function () {
-      return colors.map(color => color.name)
-    },
-
-    colorNames: function () {
-      return getColorTranslations()
-    },
-
-    sponsorBlockValues: function() {
-      let sponsorVal = ''
-      switch (this.categoryName.toLowerCase()) {
-        case 'sponsor':
-          sponsorVal = this.$store.getters.getSponsorBlockSponsor
-          break
-        case 'self-promotion':
-          sponsorVal = this.$store.getters.getSponsorBlockSelfPromo
-          break
-        case 'interaction':
-          sponsorVal = this.$store.getters.getSponsorBlockInteraction
-          break
-        case 'intro':
-          sponsorVal = this.$store.getters.getSponsorBlockIntro
-          break
-        case 'outro':
-          sponsorVal = this.$store.getters.getSponsorBlockOutro
-          break
-        case 'recap':
-          sponsorVal = this.$store.getters.getSponsorBlockRecap
-          break
-        case 'music offtopic':
-          sponsorVal = this.$store.getters.getSponsorBlockMusicOffTopic
-          break
-        case 'filler':
-          sponsorVal = this.$store.getters.getSponsorBlockFiller
-          break
-      }
-      return sponsorVal
-    },
-
-    sanitizedId: function() {
-      return sanitizeForHtmlId(this.categoryName)
-    },
-
-    skipNames: function() {
-      return [
-        this.$t('Settings.SponsorBlock Settings.Skip Options.Auto Skip'),
-        // this.$t('Settings.SponsorBlock Settings.Skip Options.Prompt To Skip'),
-        this.$t('Settings.SponsorBlock Settings.Skip Options.Show In Seek Bar'),
-        this.$t('Settings.SponsorBlock Settings.Skip Options.Do Nothing')
-      ]
-    },
-
-    translatedCategoryName: function() {
-      switch (this.categoryName.toLowerCase()) {
-        case 'sponsor':
-          return this.$t('Video.Sponsor Block category.sponsor')
-        case 'self-promotion':
-          return this.$t('Video.Sponsor Block category.self-promotion')
-        case 'interaction':
-          return this.$t('Video.Sponsor Block category.interaction')
-        case 'intro':
-          return this.$t('Video.Sponsor Block category.intro')
-        case 'outro':
-          return this.$t('Video.Sponsor Block category.outro')
-        case 'recap':
-          return this.$t('Video.Sponsor Block category.recap')
-        case 'music offtopic':
-          return this.$t('Video.Sponsor Block category.music offtopic')
-        case 'filler':
-          return this.$t('Video.Sponsor Block category.filler')
-        default:
-          return ''
-      }
-    }
-  },
-
-  methods: {
-    updateColor: function (color) {
-      const payload = {
-        color: color,
-        skip: this.sponsorBlockValues.skip
-      }
-      this.updateSponsorCategory(payload)
-    },
-
-    updateSkipOption: function (skipOption) {
-      const payload = {
-        color: this.sponsorBlockValues.color,
-        skip: skipOption
-      }
-
-      this.updateSponsorCategory(payload)
-    },
-
-    updateSponsorCategory: function (payload) {
-      switch (this.categoryName.toLowerCase()) {
-        case 'sponsor':
-          this.updateSponsorBlockSponsor(payload)
-          break
-        case 'self-promotion':
-          this.updateSponsorBlockSelfPromo(payload)
-          break
-        case 'interaction':
-          this.updateSponsorBlockInteraction(payload)
-          break
-        case 'intro':
-          this.updateSponsorBlockIntro(payload)
-          break
-        case 'outro':
-          this.updateSponsorBlockOutro(payload)
-          break
-        case 'recap':
-          this.updateSponsorBlockRecap(payload)
-          break
-        case 'music offtopic':
-          this.updateSponsorBlockMusicOffTopic(payload)
-          break
-        case 'filler':
-          this.updateSponsorBlockFiller(payload)
-          break
-      }
-    },
-
-    ...mapActions([
-      'updateSponsorBlockSponsor',
-      'updateSponsorBlockSelfPromo',
-      'updateSponsorBlockInteraction',
-      'updateSponsorBlockIntro',
-      'updateSponsorBlockOutro',
-      'updateSponsorBlockRecap',
-      'updateSponsorBlockMusicOffTopic',
-      'updateSponsorBlockFiller'
-    ])
-  }
-})
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
deleted file mode 100644
index 28c073a8c5d0a..0000000000000
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div class="sponsorBlockCategory">
-    <div
-      :id="sanitizedId"
-      class="sponsorTitle"
-    >
-      {{ translatedCategoryName }}
-    </div>
-    <ft-select
-      :sanitized-id="sanitizedId + 'categoryColor'"
-      :describe-by-id="sanitizedId"
-      :placeholder="$t('Settings.SponsorBlock Settings.Category Color')"
-      :value="sponsorBlockValues.color"
-      :select-names="colorNames"
-      :select-values="colorValues"
-      :icon="['fas', 'palette']"
-      :class="'sec' + sponsorBlockValues.color"
-      icon-color="var(--accent-color)"
-      @change="updateColor"
-    />
-    <ft-select
-      :sanitized-id="sanitizedId + 'skipOption'"
-      :describe-by-id="sanitizedId"
-      :placeholder="$t('Settings.SponsorBlock Settings.Skip Options.Skip Option')"
-      :value="sponsorBlockValues.skip"
-      :select-names="skipNames"
-      :select-values="skipValues"
-      :icon="['fas', 'forward']"
-      @change="updateSkipOption"
-    />
-  </div>
-</template>
-<script src="./ft-sponsor-block-category.js" />
-<style scoped src="./ft-sponsor-block-category.css" />
diff --git a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
deleted file mode 100644
index fb60e08a229ab..0000000000000
--- a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'FtTimestampCatcher',
-  props: {
-    inputHtml: {
-      type: String,
-      default: ''
-    }
-  },
-  emits: ['timestamp-event'],
-  methods: {
-    catchTimestampClick: function (event) {
-      this.$emit('timestamp-event', event.detail)
-    },
-    detectTimestamps: function (input) {
-      const videoId = this.$route.params.id
-
-      return input.replaceAll(/(?:(\d+):)?(\d+):(\d+)/g, (timestamp, hours, minutes, seconds) => {
-        let time = 60 * Number(minutes) + Number(seconds)
-
-        if (hours) {
-          time += 3600 * Number(hours)
-        }
-
-        const url = this.$router.resolve({
-          path: `/watch/${videoId}`,
-          query: {
-            timestamp: time
-          }
-        }).href
-
-        // Adding the URL lets the user open the video in a new window at this timestamp
-        return `<a href="${url}" onclick="event.preventDefault();this.dispatchEvent(new CustomEvent('timestamp-clicked',{bubbles:true,detail:${time}}));window.scrollTo(0,0)">${timestamp}</a>`
-      })
-    }
-  }
-})
diff --git a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue
deleted file mode 100644
index 831dc3936239c..0000000000000
--- a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-  <p
-    @timestamp-clicked="catchTimestampClick"
-    v-html="detectTimestamps(inputHtml)"
-  />
-</template>
-
-<script src="./ft-timestamp-catcher.js" />
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
index b7d0f60bd7b10..c8e089f3967ac 100644
--- a/src/renderer/components/general-settings/general-settings.js
+++ b/src/renderer/components/general-settings/general-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions, mapMutations } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtSelect from '../ft-select/ft-select.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
@@ -200,6 +200,10 @@ export default defineComponent({
         this.$t('Settings.General Settings.External Link Handling.Ask Before Opening Link'),
         this.$t('Settings.General Settings.External Link Handling.No Action')
       ]
+    },
+
+    openDeepLinksInNewWindow: function () {
+      return this.$store.getters.getOpenDeepLinksInNewWindow
     }
   },
   created: function () {
@@ -269,6 +273,7 @@ export default defineComponent({
       'updateCurrentLocale',
       'updateExternalLinkHandling',
       'updateGeneralAutoLoadMorePaginatedItemsEnabled',
+      'updateOpenDeepLinksInNewWindow',
     ])
   }
 })
diff --git a/src/renderer/components/general-settings/general-settings.vue b/src/renderer/components/general-settings/general-settings.vue
index 2a77422f45959..a2e1d76003326 100644
--- a/src/renderer/components/general-settings/general-settings.vue
+++ b/src/renderer/components/general-settings/general-settings.vue
@@ -38,6 +38,13 @@
           :compact="true"
           @change="updateEnableSearchSuggestions"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.General Settings.Open Deep Links In New Window')"
+          :default-value="openDeepLinksInNewWindow"
+          :compact="true"
+          :tooltip="$t('Tooltips.General Settings.Open Deep Links In New Window')"
+          @change="updateOpenDeepLinksInNewWindow"
+        />
       </div>
     </div>
     <div class="switchGrid">
diff --git a/src/renderer/components/parental-control-settings/parental-control-settings.js b/src/renderer/components/parental-control-settings/parental-control-settings.js
deleted file mode 100644
index fd064ae635dae..0000000000000
--- a/src/renderer/components/parental-control-settings/parental-control-settings.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
-import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
-
-export default defineComponent({
-  name: 'ParentalControlSettings',
-  components: {
-    'ft-settings-section': FtSettingsSection,
-    'ft-toggle-switch': FtToggleSwitch
-  },
-  computed: {
-    hideSearchBar: function () {
-      return this.$store.getters.getHideSearchBar
-    },
-    hideUnsubscribeButton: function() {
-      return this.$store.getters.getHideUnsubscribeButton
-    },
-    showFamilyFriendlyOnly: function() {
-      return this.$store.getters.getShowFamilyFriendlyOnly
-    }
-  },
-  methods: {
-    ...mapActions([
-      'updateHideSearchBar',
-      'updateHideUnsubscribeButton',
-      'updateShowFamilyFriendlyOnly'
-    ])
-  }
-})
diff --git a/src/renderer/components/parental-control-settings/parental-control-settings.vue b/src/renderer/components/parental-control-settings/parental-control-settings.vue
deleted file mode 100644
index 2d5485c48e982..0000000000000
--- a/src/renderer/components/parental-control-settings/parental-control-settings.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <ft-settings-section
-    :title="$t('Settings.Parental Control Settings.Parental Control Settings')"
-  >
-    <div class="switchColumnGrid">
-      <div class="switchColumn">
-        <ft-toggle-switch
-          :label="$t('Settings.Parental Control Settings.Hide Unsubscribe Button')"
-          :compact="true"
-          :default-value="hideUnsubscribeButton"
-          @change="updateHideUnsubscribeButton"
-        />
-        <ft-toggle-switch
-          :label="$t('Settings.Parental Control Settings.Show Family Friendly Only')"
-          :compact="true"
-          :default-value="showFamilyFriendlyOnly"
-          @change="updateShowFamilyFriendlyOnly"
-        />
-      </div>
-      <div class="switchColumn">
-        <ft-toggle-switch
-          :label="$t('Settings.Parental Control Settings.Hide Search Bar')"
-          :compact="true"
-          :default-value="hideSearchBar"
-          @change="updateHideSearchBar"
-        />
-      </div>
-    </div>
-  </ft-settings-section>
-</template>
-
-<script src="./parental-control-settings.js" />
diff --git a/src/renderer/components/password-dialog/password-dialog.js b/src/renderer/components/password-dialog/password-dialog.js
deleted file mode 100644
index ed4b5e99cafe3..0000000000000
--- a/src/renderer/components/password-dialog/password-dialog.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { defineComponent } from 'vue'
-import FtCard from '../ft-card/ft-card.vue'
-import FtInput from '../ft-input/ft-input.vue'
-
-export default defineComponent({
-  name: 'PasswordDialog',
-  components: {
-    'ft-input': FtInput,
-    'ft-card': FtCard
-  },
-  emits: ['unlocked'],
-  computed: {
-    settingsPassword: function () {
-      return this.$store.getters.getSettingsPassword
-    }
-  },
-  mounted: function () {
-    this.$refs.password.focus()
-  },
-  methods: {
-    handlePasswordInput: function (input) {
-      if (input === this.settingsPassword) {
-        this.$emit('unlocked')
-      }
-    }
-  }
-})
diff --git a/src/renderer/components/password-dialog/password-dialog.vue b/src/renderer/components/password-dialog/password-dialog.vue
deleted file mode 100644
index 89858f2106e8a..0000000000000
--- a/src/renderer/components/password-dialog/password-dialog.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-  <ft-card
-    class="card"
-  >
-    <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
-
-    <ft-input
-      ref="password"
-      :placeholder="$t('Settings.Password Dialog.Password')"
-      :show-action-button="false"
-      input-type="password"
-      class="passwordInput"
-      @input="handlePasswordInput"
-    />
-  </ft-card>
-</template>
-
-<script src="./password-dialog.js" />
-<style scoped src="./password-dialog.css" />
diff --git a/src/renderer/components/password-settings/password-settings.js b/src/renderer/components/password-settings/password-settings.js
deleted file mode 100644
index 079bbbf480378..0000000000000
--- a/src/renderer/components/password-settings/password-settings.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
-import FtInput from '../ft-input/ft-input.vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtButton from '../ft-button/ft-button.vue'
-
-export default defineComponent({
-  name: 'PasswordSettings',
-  components: {
-    'ft-settings-section': FtSettingsSection,
-    'ft-input': FtInput,
-    'ft-flex-box': FtFlexBox,
-    'ft-button': FtButton,
-  },
-  data: function() {
-    return {
-      password: '',
-    }
-  },
-  computed: {
-    settingsPassword: function() {
-      return this.$store.getters.getSettingsPassword
-    },
-    hasStoredPassword: function() {
-      return this.settingsPassword !== ''
-    }
-  },
-  methods: {
-    handleSetPassword: function () {
-      this.updateSettingsPassword(this.password)
-      this.password = ''
-    },
-    handleRemovePassword: function () {
-      this.updateSettingsPassword('')
-      this.password = ''
-    },
-    ...mapActions([
-      'updateSettingsPassword'
-    ])
-  }
-})
diff --git a/src/renderer/components/password-settings/password-settings.vue b/src/renderer/components/password-settings/password-settings.vue
deleted file mode 100644
index 42c1745faef61..0000000000000
--- a/src/renderer/components/password-settings/password-settings.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <ft-settings-section
-    :title="$t('Settings.Password Settings.Password Settings')"
-  >
-    <ft-flex-box
-      v-if="hasStoredPassword"
-      class="settingsFlexStart460px"
-    >
-      <ft-button
-        :label="$t('Settings.Password Settings.Remove Password')"
-        @click="handleRemovePassword"
-      />
-    </ft-flex-box>
-    <ft-flex-box
-      v-else
-      class="settingsFlexStart460px"
-    >
-      <ft-input
-        :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
-        :show-action-button="false"
-        :show-label="true"
-        input-type="password"
-        :value="password"
-        @input="e => password = e"
-        @keydown.enter.native="handleSetPassword"
-      />
-      <ft-button
-        class="centerButton"
-        :label="$t('Settings.Password Settings.Set Password')"
-        @click="handleSetPassword"
-      />
-    </ft-flex-box>
-  </ft-settings-section>
-</template>
-
-<script src="./password-settings.js" />
-<style scoped src="./password-settings.css" />
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
index 4705f5ec3a612..a2afa7e5dbad9 100644
--- a/src/renderer/components/player-settings/player-settings.js
+++ b/src/renderer/components/player-settings/player-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtSelect from '../ft-select/ft-select.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtSlider from '../ft-slider/ft-slider.vue'
@@ -51,11 +51,13 @@ export default defineComponent({
       ],
       screenshotFormatNames: [
         'PNG',
-        'JPEG'
+        'JPEG',
+        'WebP'
       ],
       screenshotFormatValues: [
         'png',
-        'jpg'
+        'jpg',
+        'webp'
       ],
       screenshotFolderPlaceholder: '',
       screenshotFilenameExample: '',
@@ -95,6 +97,10 @@ export default defineComponent({
       return this.backendPreference !== 'invidious' && !this.backendFallback
     },
 
+    defaultAutoplayInterruptionIntervalHours: function () {
+      return parseInt(this.$store.getters.getDefaultAutoplayInterruptionIntervalHours)
+    },
+
     defaultSkipInterval: function () {
       return parseInt(this.$store.getters.getDefaultSkipInterval)
     },
@@ -286,6 +292,7 @@ export default defineComponent({
     ...mapActions([
       'updateAutoplayVideos',
       'updateAutoplayPlaylists',
+      'updateDefaultAutoplayInterruptionIntervalHours',
       'updatePlayNextVideo',
       'updateEnableSubtitlesByDefault',
       'updateProxyVideos',
diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
index 0c736a398c539..77677a0591ab3 100644
--- a/src/renderer/components/player-settings/player-settings.vue
+++ b/src/renderer/components/player-settings/player-settings.vue
@@ -82,15 +82,6 @@
       </div>
     </div>
     <ft-flex-box>
-      <ft-slider
-        :label="$t('Settings.Player Settings.Fast-Forward / Rewind Interval')"
-        :default-value="defaultSkipInterval"
-        :min-value="1"
-        :max-value="70"
-        :step="1"
-        value-extension="s"
-        @change="updateDefaultSkipInterval"
-      />
       <ft-slider
         :label="$t('Settings.Player Settings.Next Video Interval')"
         :default-value="defaultInterval"
@@ -100,6 +91,24 @@
         value-extension="s"
         @change="updateDefaultInterval"
       />
+      <ft-slider
+        :label="$t('Settings.Player Settings.Autoplay Interruption Timer')"
+        :default-value="defaultAutoplayInterruptionIntervalHours"
+        :min-value="1"
+        :max-value="12"
+        :step="1"
+        value-extension="h"
+        @change="updateDefaultAutoplayInterruptionIntervalHours"
+      />
+      <ft-slider
+        :label="$t('Settings.Player Settings.Fast-Forward / Rewind Interval')"
+        :default-value="defaultSkipInterval"
+        :min-value="1"
+        :max-value="70"
+        :step="1"
+        value-extension="s"
+        @change="updateDefaultSkipInterval"
+      />
       <ft-slider
         :label="$t('Settings.Player Settings.Default Volume')"
         :default-value="defaultVolume"
@@ -182,7 +191,7 @@
           :max-value="100"
           :step="1"
           value-extension="%"
-          :disabled="screenshotFormat !== 'jpg'"
+          :disabled="screenshotFormat === 'png'"
           @change="updateScreenshotQuality"
         />
       </ft-flex-box>
diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index 6f9ff99bcfd99..51348d3e9256e 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -10,8 +10,11 @@ import {
   ctrlFHandler,
   formatNumber,
   showToast,
+  getTodayDateStrLocalTimezone,
+  writeFileWithPicker,
 } from '../../helpers/utils'
 import debounce from 'lodash.debounce'
+import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'PlaylistInfo',
@@ -199,7 +202,7 @@ export default defineComponent({
 
     thumbnail: function () {
       if (this.thumbnailPreference === 'hidden' || !this.firstVideoIdExists) {
-        return require('../../assets/img/thumbnail_placeholder.svg')
+        return thumbnailPlaceholder
       }
 
       let baseUrl = 'https://i.ytimg.com'
@@ -262,6 +265,15 @@ export default defineComponent({
       return this.selectedUserPlaylist.videos.length - this.userPlaylistUniqueVideoIds.size
     },
 
+    exportPlaylistButtonVisible: function() {
+      // Most UI should be invisible in edit mode
+      if (this.editMode) { return false }
+      // Only online playlists can be shared
+      if (!this.isUserPlaylist) { return false }
+
+      return this.videoCount > 0
+    },
+
     deletePlaylistButtonVisible: function() {
       if (!this.isUserPlaylist) { return false }
       // Cannot delete during edit
@@ -275,7 +287,6 @@ export default defineComponent({
       // Only online playlists can be shared
       if (this.isUserPlaylist) { return false }
 
-      // Cannot delete protected playlist
       return !this.hideSharingActions
     },
 
@@ -412,6 +423,35 @@ export default defineComponent({
       showToast(this.playlistDeletionDisabledLabel)
     },
 
+    handlePlaylistExport: async function () {
+      const dateStr = getTodayDateStrLocalTimezone()
+      const title = this.selectedUserPlaylist.playlistName.replaceAll(' ', '_').replaceAll(/["%*/:<>?\\|]/g, '_')
+      const exportFileName = 'freetube-playlist-' + title + '-' + dateStr + '.db'
+
+      const data = JSON.stringify(this.selectedUserPlaylist) + '\n'
+
+      // See data-settings.js `promptAndWriteToFile`
+
+      try {
+        const response = await writeFileWithPicker(
+          exportFileName,
+          data,
+          this.$t('Settings.Data Settings.Playlist File'),
+          'application/x-freetube-db',
+          '.db',
+          'single-playlist-export',
+          'downloads'
+        )
+
+        if (response) {
+          showToast(this.$t('User Playlists.The playlist has been successfully exported'))
+        }
+      } catch (error) {
+        const message = this.$t('Settings.Data Settings.Unable to write file')
+        showToast(`${message}: ${error}`)
+      }
+    },
+
     exitEditMode: function () {
       this.editMode = false
 
diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue
index 4c8c0cfcf9959..3b594f1606ee8 100644
--- a/src/renderer/components/playlist-info/playlist-info.vue
+++ b/src/renderer/components/playlist-info/playlist-info.vue
@@ -169,6 +169,13 @@
             theme="secondary"
             @click="toggleCopyVideosPrompt"
           />
+          <ft-icon-button
+            v-if="exportPlaylistButtonVisible"
+            :title="$t('User Playlists.Export Playlist')"
+            :icon="['fas', 'file-arrow-down']"
+            theme="secondary"
+            @click="handlePlaylistExport"
+          />
           <ft-icon-button
             v-if="!editMode && userPlaylistDuplicateItemCount > 0"
             :title="$t('User Playlists.Remove Duplicate Videos')"
diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js
index 98b9a266ced9d..f9855341ef80d 100644
--- a/src/renderer/components/privacy-settings/privacy-settings.js
+++ b/src/renderer/components/privacy-settings/privacy-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtButton from '../ft-button/ft-button.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
diff --git a/src/renderer/components/proxy-settings/proxy-settings.css b/src/renderer/components/proxy-settings/proxy-settings.css
index 4798186b5b717..813faefc36de0 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.css
+++ b/src/renderer/components/proxy-settings/proxy-settings.css
@@ -1,3 +1,15 @@
 .protocol-dropdown {
   margin-block-end: 1rem;
 }
+
+.proxy-warning {
+  padding-block: 12px;
+  padding-inline: 4%;
+  background-color: var(--accent-color);
+  color: var(--text-with-accent-color);
+  font-weight: bold;
+}
+
+.warning-icon {
+  font-size: large;
+}
diff --git a/src/renderer/components/proxy-settings/proxy-settings.js b/src/renderer/components/proxy-settings/proxy-settings.js
index 901ca21d88bf0..dcd560f92a454 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.js
+++ b/src/renderer/components/proxy-settings/proxy-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtButton from '../ft-button/ft-button.vue'
 import FtSelect from '../ft-select/ft-select.vue'
diff --git a/src/renderer/components/proxy-settings/proxy-settings.vue b/src/renderer/components/proxy-settings/proxy-settings.vue
index 3245e0f3c5f14..4916e106826b6 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.vue
+++ b/src/renderer/components/proxy-settings/proxy-settings.vue
@@ -3,6 +3,17 @@
     :title="$t('Settings.Proxy Settings.Proxy Settings')"
   >
     <ft-flex-box class="settingsFlexStart500px">
+      <p
+        v-if="useProxy"
+        class="proxy-warning"
+      >
+        <font-awesome-icon
+          :icon="['fas', 'circle-exclamation']"
+          class="warning-icon"
+          fixed-width
+        />
+        {{ $t('Settings.Proxy Settings.Proxy Warning') }}
+      </p>
       <ft-toggle-switch
         :label="$t('Settings.Proxy Settings.Enable Tor / Proxy')"
         :default-value="useProxy"
@@ -19,7 +30,7 @@
           :select-names="protocolNames"
           :select-values="protocolValues"
           class="protocol-dropdown"
-          :icon="['fas', 'microchip']"
+          :icon="['fas', 'network-wired']"
           @change="handleUpdateProxyProtocol"
         />
       </ft-flex-box>
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.js b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
deleted file mode 100644
index 83bae2a4de7ff..0000000000000
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'SideNav',
-  data: function () {
-    return {
-      openMoreOptions: false
-    }
-  },
-  computed: {
-    backendFallback: function () {
-      return this.$store.getters.getBackendFallback
-    },
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-    hidePopularVideos: function () {
-      return this.$store.getters.getHidePopularVideos
-    },
-    hideTrendingVideos: function () {
-      return this.$store.getters.getHideTrendingVideos
-    },
-    hideLabelsSideBar: function () {
-      return this.$store.getters.getHideLabelsSideBar
-    },
-    applyNavIconExpand: function() {
-      return {
-        navIconExpand: this.hideLabelsSideBar
-      }
-    }
-  }
-})
diff --git a/src/renderer/components/side-nav/side-nav.js b/src/renderer/components/side-nav/side-nav.js
deleted file mode 100644
index 45db9ef8e5ca5..0000000000000
--- a/src/renderer/components/side-nav/side-nav.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { defineComponent } from 'vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import SideNavMoreOptions from '../side-nav-more-options/side-nav-more-options.vue'
-import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-import { deepCopy } from '../../helpers/utils'
-
-export default defineComponent({
-  name: 'SideNav',
-  components: {
-    'ft-flex-box': FtFlexBox,
-    'side-nav-more-options': SideNavMoreOptions
-  },
-  computed: {
-    isOpen: function () {
-      return this.$store.getters.getIsSideNavOpen
-    },
-    backendFallback: function () {
-      return this.$store.getters.getBackendFallback
-    },
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-    currentInvidiousInstanceUrl: function () {
-      return this.$store.getters.getCurrentInvidiousInstanceUrl
-    },
-    profileList: function () {
-      return this.$store.getters.getProfileList
-    },
-    activeProfile: function () {
-      return this.$store.getters.getActiveProfile
-    },
-    locale: function () {
-      return this.$i18n.locale
-    },
-    activeSubscriptions: function () {
-      const subscriptions = deepCopy(this.activeProfile.subscriptions)
-
-      subscriptions.forEach(channel => {
-        // Change thumbnail size to 35x35, as that's the size we display it
-        // so we don't need to download a bigger image (the default is 176x176)
-        channel.thumbnail = channel.thumbnail?.replace(/=s\d+/, '=s35')
-      })
-
-      subscriptions.sort((a, b) => {
-        return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), this.locale)
-      })
-
-      if (this.backendPreference === 'invidious') {
-        subscriptions.forEach((channel) => {
-          channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, this.currentInvidiousInstanceUrl)
-        })
-      }
-
-      return subscriptions
-    },
-    hidePopularVideos: function () {
-      return this.$store.getters.getHidePopularVideos
-    },
-    hidePlaylists: function () {
-      return this.$store.getters.getHidePlaylists
-    },
-    hideTrendingVideos: function () {
-      return this.$store.getters.getHideTrendingVideos
-    },
-    hideActiveSubscriptions: function () {
-      return this.$store.getters.getHideActiveSubscriptions
-    },
-    hideLabelsSideBar: function () {
-      return this.$store.getters.getHideLabelsSideBar
-    },
-    hideText: function () {
-      return !this.isOpen && this.hideLabelsSideBar
-    },
-    applyNavIconExpand: function() {
-      return {
-        navIconExpand: this.hideText
-      }
-    },
-    applyHiddenLabels: function() {
-      return {
-        hiddenLabels: this.hideText
-      }
-    }
-  }
-})
diff --git a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
index ca1fb50d31fb6..2917131b72551 100644
--- a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
+++ b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
@@ -1,10 +1,10 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtSponsorBlockCategory from '../ft-sponsor-block-category/ft-sponsor-block-category.vue'
+import FtSponsorBlockCategory from '../FtSponsorBlockCategory/FtSponsorBlockCategory.vue'
 
 export default defineComponent({
   name: 'SponsorBlockSettings',
diff --git a/src/renderer/components/subscription-settings/subscription-settings.css b/src/renderer/components/subscription-settings/subscription-settings.css
new file mode 100644
index 0000000000000..a4ffb52b032a4
--- /dev/null
+++ b/src/renderer/components/subscription-settings/subscription-settings.css
@@ -0,0 +1,4 @@
+.onlyShowLatestFromChannelNumber {
+  inline-size: calc(100% - 44px);
+  padding-inline-start: 44px;
+}
diff --git a/src/renderer/components/subscription-settings/subscription-settings.js b/src/renderer/components/subscription-settings/subscription-settings.js
index 231658a1f0126..9d455bbf6b2ce 100644
--- a/src/renderer/components/subscription-settings/subscription-settings.js
+++ b/src/renderer/components/subscription-settings/subscription-settings.js
@@ -1,13 +1,15 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+import FtSlider from '../ft-slider/ft-slider.vue'
 
 export default defineComponent({
   name: 'SubscriptionSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
-    'ft-toggle-switch': FtToggleSwitch
+    'ft-toggle-switch': FtToggleSwitch,
+    'ft-slider': FtSlider,
   },
   computed: {
     hideWatchedSubs: function () {
@@ -16,6 +18,9 @@ export default defineComponent({
     onlyShowLatestFromChannel: function () {
       return this.$store.getters.getOnlyShowLatestFromChannel
     },
+    onlyShowLatestFromChannelNumber: function () {
+      return this.$store.getters.getOnlyShowLatestFromChannelNumber
+    },
     useRssFeeds: function () {
       return this.$store.getters.getUseRssFeeds
     },
@@ -32,6 +37,7 @@ export default defineComponent({
       'updateUseRssFeeds',
       'updateFetchSubscriptionsAutomatically',
       'updateOnlyShowLatestFromChannel',
+      'updateOnlyShowLatestFromChannelNumber',
       'updateUnsubscriptionPopupStatus'
     ])
   }
diff --git a/src/renderer/components/subscription-settings/subscription-settings.vue b/src/renderer/components/subscription-settings/subscription-settings.vue
index 9ae067ef5da55..906fc1aa4b9e9 100644
--- a/src/renderer/components/subscription-settings/subscription-settings.vue
+++ b/src/renderer/components/subscription-settings/subscription-settings.vue
@@ -18,6 +18,12 @@
           :compact="true"
           @change="updateUseRssFeeds"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Subscription Settings.Confirm Before Unsubscribing')"
+          :default-value="unsubscriptionPopupStatus"
+          :compact="true"
+          @change="updateUnsubscriptionPopupStatus"
+        />
       </div>
       <div class="switchColumn">
         <ft-toggle-switch
@@ -27,22 +33,26 @@
           @change="updateHideWatchedSubs"
         />
         <ft-toggle-switch
-          :label="$t('Settings.Subscription Settings.Only Show Latest Video for Each Channel')"
+          :label="$t('Settings.Subscription Settings.Limit the number of videos displayed for each channel')"
           :default-value="onlyShowLatestFromChannel"
           :compact="true"
           @change="updateOnlyShowLatestFromChannel"
         />
-      </div>
-      <div class="switchColumn">
-        <ft-toggle-switch
-          :label="$t('Settings.Subscription Settings.Confirm Before Unsubscribing')"
-          :default-value="unsubscriptionPopupStatus"
-          :compact="true"
-          @change="updateUnsubscriptionPopupStatus"
-        />
+        <div class="onlyShowLatestFromChannelNumber">
+          <ft-slider
+            :label="$t('Settings.Subscription Settings.To')"
+            :default-value="onlyShowLatestFromChannelNumber"
+            :disabled="!onlyShowLatestFromChannel"
+            :min-value="1"
+            :max-value="30"
+            :step="1"
+            @change="updateOnlyShowLatestFromChannelNumber"
+          />
+        </div>
       </div>
     </div>
   </ft-settings-section>
 </template>
 
 <script src="./subscription-settings.js" />
+<style src="./subscription-settings.css" scoped />
diff --git a/src/renderer/components/subscriptions-community/subscriptions-community.js b/src/renderer/components/subscriptions-community/subscriptions-community.js
index 79408b65f89d6..c4f044bf153b0 100644
--- a/src/renderer/components/subscriptions-community/subscriptions-community.js
+++ b/src/renderer/components/subscriptions-community/subscriptions-community.js
@@ -14,6 +14,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       postList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -97,7 +98,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadPostsFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadPostsFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -115,6 +118,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadPostsForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForCommunityPostsFirstAutoFetchRun')
     },
@@ -231,9 +235,7 @@ export default defineComponent({
           this.errorChannels.push(channel)
           return []
         }
-        entries.forEach(post => {
-          post.authorId = channel.id
-        })
+
         return entries
       } catch (err) {
         console.error(err)
@@ -252,9 +254,6 @@ export default defineComponent({
     getChannelPostsInvidious: function (channel) {
       return new Promise((resolve, reject) => {
         invidiousGetCommunityPosts(channel.id).then(result => {
-          result.posts.forEach(post => {
-            post.authorId = channel.id
-          })
           resolve(result.posts)
         }).catch((err) => {
           console.error(err)
diff --git a/src/renderer/components/subscriptions-live/subscriptions-live.js b/src/renderer/components/subscriptions-live/subscriptions-live.js
index b8d182621fbdc..1a83a39785122 100644
--- a/src/renderer/components/subscriptions-live/subscriptions-live.js
+++ b/src/renderer/components/subscriptions-live/subscriptions-live.js
@@ -4,12 +4,11 @@ import SubscriptionsTabUI from '../subscriptions-tab-ui/subscriptions-tab-ui.vue
 
 import {
   getChannelPlaylistId,
-  setPublishedTimestampsInvidious,
   copyToClipboard,
   getRelativeTimeFromDate,
   showToast
 } from '../../helpers/utils'
-import { invidiousAPICall, invidiousFetch } from '../../helpers/api/invidious'
+import { getInvidiousChannelLive, invidiousFetch } from '../../helpers/api/invidious'
 import { getLocalChannelLiveStreams } from '../../helpers/api/local'
 import { parseYouTubeRSSFeed, updateVideoListAfterProcessing } from '../../helpers/subscriptions'
 
@@ -21,6 +20,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -107,7 +107,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadVideosFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadVideosFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -125,6 +127,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForLiveStreamsFirstAutoFetchRun')
     },
@@ -334,17 +337,8 @@ export default defineComponent({
 
     getChannelLiveInvidious: function (channel, failedAttempts = 0) {
       return new Promise((resolve, reject) => {
-        const subscriptionsPayload = {
-          resource: 'channels',
-          id: channel.id,
-          subResource: 'streams',
-          params: {}
-        }
-
-        invidiousAPICall(subscriptionsPayload).then((result) => {
-          const videos = result.videos.filter(e => e.type === 'video')
-
-          setPublishedTimestampsInvidious(videos)
+        getInvidiousChannelLive(channel.id).then((result) => {
+          const videos = result.videos
 
           let name
 
diff --git a/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js b/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js
index a3e24e4aae133..635284e73b79a 100644
--- a/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js
+++ b/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js
@@ -19,6 +19,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -101,7 +102,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadVideosFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadVideosFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -119,6 +122,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForShortsFirstAutoFetchRun')
     },
diff --git a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js
index 489d928f383e0..e6d9fb8cf7a70 100644
--- a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js
+++ b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js
@@ -7,6 +7,7 @@ import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtElementList from '../FtElementList/FtElementList.vue'
 import FtChannelBubble from '../ft-channel-bubble/ft-channel-bubble.vue'
 import FtAutoLoadNextPageWrapper from '../ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
+import { KeyboardShortcuts } from '../../../constants'
 
 export default defineComponent({
   name: 'SubscriptionsTabUI',
@@ -113,10 +114,9 @@ export default defineComponent({
       // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
       if (event.repeat) { return }
 
-      switch (event.key) {
-        case 'r':
-        case 'R':
-        case 'F5':
+      switch (event.key.toLowerCase()) {
+        case 'f5':
+        case KeyboardShortcuts.APP.SITUATIONAL.REFRESH:
           if (!this.isLoading && this.activeSubscriptionList.length > 0) {
             this.$emit('refresh')
           }
diff --git a/src/renderer/components/subscriptions-videos/subscriptions-videos.js b/src/renderer/components/subscriptions-videos/subscriptions-videos.js
index e05e2422277ad..87050f1b88148 100644
--- a/src/renderer/components/subscriptions-videos/subscriptions-videos.js
+++ b/src/renderer/components/subscriptions-videos/subscriptions-videos.js
@@ -3,13 +3,12 @@ import { mapActions, mapMutations } from 'vuex'
 import SubscriptionsTabUI from '../subscriptions-tab-ui/subscriptions-tab-ui.vue'
 
 import {
-  setPublishedTimestampsInvidious,
   copyToClipboard,
   getRelativeTimeFromDate,
   showToast,
   getChannelPlaylistId
 } from '../../helpers/utils'
-import { invidiousAPICall, invidiousFetch } from '../../helpers/api/invidious'
+import { getInvidiousChannelVideos, invidiousFetch } from '../../helpers/api/invidious'
 import { getLocalChannelVideos } from '../../helpers/api/local'
 import { parseYouTubeRSSFeed, updateVideoListAfterProcessing } from '../../helpers/subscriptions'
 
@@ -21,6 +20,7 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
+      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -111,7 +111,9 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      this.loadVideosFromCacheSometimes()
+      if (!this.alreadyLoadedRemotely) {
+        this.loadVideosFromCacheSometimes()
+      }
     },
   },
   mounted: async function () {
@@ -129,6 +131,7 @@ export default defineComponent({
         return
       }
 
+      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForVideosFirstAutoFetchRun')
     },
@@ -338,15 +341,7 @@ export default defineComponent({
 
     getChannelVideosInvidiousScraper: function (channel, failedAttempts = 0) {
       return new Promise((resolve, reject) => {
-        const subscriptionsPayload = {
-          resource: 'channels/latest',
-          id: channel.id,
-          params: {}
-        }
-
-        invidiousAPICall(subscriptionsPayload).then((result) => {
-          setPublishedTimestampsInvidious(result.videos)
-
+        getInvidiousChannelVideos(channel.id).then((result) => {
           let name
 
           if (result.videos.length > 0) {
diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js
deleted file mode 100644
index fc018ab45bcb4..0000000000000
--- a/src/renderer/components/theme-settings/theme-settings.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
-import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
-import FtSelect from '../ft-select/ft-select.vue'
-import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
-import FtSlider from '../ft-slider/ft-slider.vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtPrompt from '../ft-prompt/ft-prompt.vue'
-import { colors, getColorTranslations } from '../../helpers/colors'
-import { IpcChannels } from '../../../constants'
-
-export default defineComponent({
-  name: 'ThemeSettings',
-  components: {
-    'ft-settings-section': FtSettingsSection,
-    'ft-select': FtSelect,
-    'ft-toggle-switch': FtToggleSwitch,
-    'ft-slider': FtSlider,
-    'ft-flex-box': FtFlexBox,
-    'ft-prompt': FtPrompt
-  },
-  data: function () {
-    return {
-      usingElectron: process.env.IS_ELECTRON,
-      minUiScale: 50,
-      maxUiScale: 300,
-      uiScaleStep: 5,
-      disableSmoothScrollingToggleValue: false,
-      showRestartPrompt: false,
-      restartPromptValues: [
-        'restart',
-        'cancel'
-      ],
-      /* Themes are devided into 3 groups. The first group contains the default themes. The second group are themes that don't have specific primary and secondary colors. The third group are themes that do have specific primary and secondary colors available. */
-      baseThemeValues: [
-        // First group
-        'system',
-        'light',
-        'dark',
-        'black',
-        // Second group
-        'nordic',
-        'hotPink',
-        'pastelPink',
-        // Third group
-        'catppuccinMocha',
-        'dracula',
-        'solarizedDark',
-        'solarizedLight'
-      ]
-    }
-  },
-  computed: {
-    barColor: function () {
-      return this.$store.getters.getBarColor
-    },
-
-    baseTheme: function () {
-      return this.$store.getters.getBaseTheme
-    },
-
-    mainColor: function () {
-      return this.$store.getters.getMainColor
-    },
-
-    secColor: function () {
-      return this.$store.getters.getSecColor
-    },
-
-    isSideNavOpen: function () {
-      return this.$store.getters.getIsSideNavOpen
-    },
-
-    uiScale: function () {
-      return this.$store.getters.getUiScale
-    },
-
-    disableSmoothScrolling: function () {
-      return this.$store.getters.getDisableSmoothScrolling
-    },
-
-    expandSideBar: function () {
-      return this.$store.getters.getExpandSideBar
-    },
-
-    hideLabelsSideBar: function () {
-      return this.$store.getters.getHideLabelsSideBar
-    },
-
-    hideHeaderLogo: function () {
-      return this.$store.getters.getHideHeaderLogo
-    },
-
-    restartPromptMessage: function () {
-      return this.$t('Settings["The app needs to restart for changes to take effect. Restart and apply change?"]')
-    },
-
-    restartPromptNames: function () {
-      return [
-        this.$t('Yes, Restart'),
-        this.$t('Cancel')
-      ]
-    },
-
-    /* Themes are devided into 3 groups. The first group contains the default themes. The second group are themes that don't have specific primary and secondary colors. The third group are themes that do have specific primary and secondary colors available. */
-    baseThemeNames: function () {
-      return [
-        // First group
-        this.$t('Settings.Theme Settings.Base Theme.System Default'),
-        this.$t('Settings.Theme Settings.Base Theme.Light'),
-        this.$t('Settings.Theme Settings.Base Theme.Dark'),
-        this.$t('Settings.Theme Settings.Base Theme.Black'),
-        // Second group
-        this.$t('Settings.Theme Settings.Base Theme.Nordic'),
-        this.$t('Settings.Theme Settings.Base Theme.Hot Pink'),
-        this.$t('Settings.Theme Settings.Base Theme.Pastel Pink'),
-        // Third group
-        this.$t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'),
-        this.$t('Settings.Theme Settings.Base Theme.Dracula'),
-        this.$t('Settings.Theme Settings.Base Theme.Solarized Dark'),
-        this.$t('Settings.Theme Settings.Base Theme.Solarized Light')
-      ]
-    },
-
-    colorValues: function () {
-      return colors.map(color => color.name)
-    },
-
-    colorNames: function () {
-      return getColorTranslations()
-    },
-
-    areColorThemesEnabled: function() {
-      return this.baseTheme !== 'hotPink'
-    }
-  },
-  created: function () {
-    this.disableSmoothScrollingToggleValue = this.disableSmoothScrolling
-  },
-  methods: {
-    handleExpandSideBar: function (value) {
-      if (this.isSideNavOpen !== value) {
-        this.$store.commit('toggleSideNav')
-      }
-
-      this.updateExpandSideBar(value)
-    },
-
-    handleRestartPrompt: function (value) {
-      this.disableSmoothScrollingToggleValue = value
-      this.showRestartPrompt = true
-    },
-
-    handleSmoothScrolling: function (value) {
-      this.showRestartPrompt = false
-
-      if (value === null || value === 'cancel') {
-        this.disableSmoothScrollingToggleValue = !this.disableSmoothScrollingToggleValue
-        return
-      }
-
-      if (process.env.IS_ELECTRON) {
-        this.updateDisableSmoothScrolling(
-          this.disableSmoothScrollingToggleValue
-        ).then(() => {
-          const { ipcRenderer } = require('electron')
-          ipcRenderer.send(IpcChannels.RELAUNCH_REQUEST)
-        })
-      }
-    },
-
-    ...mapActions([
-      'updateBarColor',
-      'updateBaseTheme',
-      'updateMainColor',
-      'updateSecColor',
-      'updateExpandSideBar',
-      'updateUiScale',
-      'updateDisableSmoothScrolling',
-      'updateHideLabelsSideBar',
-      'updateHideHeaderLogo'
-    ])
-  }
-})
diff --git a/src/renderer/components/theme-settings/theme-settings.vue b/src/renderer/components/theme-settings/theme-settings.vue
deleted file mode 100644
index 1d0b1e3d6b4d9..0000000000000
--- a/src/renderer/components/theme-settings/theme-settings.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <ft-settings-section
-    :title="$t('Settings.Theme Settings.Theme Settings')"
-  >
-    <div class="switchColumnGrid">
-      <div class="switchColumn">
-        <ft-toggle-switch
-          :label="$t('Settings.Theme Settings.Match Top Bar with Main Color')"
-          :compact="true"
-          :default-value="barColor"
-          @change="updateBarColor"
-        />
-        <ft-toggle-switch
-          :label="$t('Settings.Theme Settings.Expand Side Bar by Default')"
-          :compact="true"
-          :default-value="expandSideBar"
-          @change="handleExpandSideBar"
-        />
-        <ft-toggle-switch
-          v-if="usingElectron"
-          :label="$t('Settings.Theme Settings.Disable Smooth Scrolling')"
-          :compact="true"
-          :default-value="disableSmoothScrollingToggleValue"
-          @change="handleRestartPrompt"
-        />
-      </div>
-      <div class="switchColumn">
-        <ft-toggle-switch
-          :label="$t('Settings.Theme Settings.Hide Side Bar Labels')"
-          :compact="true"
-          :default-value="hideLabelsSideBar"
-          @change="updateHideLabelsSideBar"
-        />
-        <ft-toggle-switch
-          :label="$t('Settings.Theme Settings.Hide FreeTube Header Logo')"
-          :compact="true"
-          :default-value="hideHeaderLogo"
-          @change="updateHideHeaderLogo"
-        />
-      </div>
-    </div>
-    <ft-flex-box>
-      <ft-slider
-        :label="$t('Settings.Theme Settings.UI Scale')"
-        :default-value="uiScale"
-        :min-value="minUiScale"
-        :max-value="maxUiScale"
-        :step="uiScaleStep"
-        value-extension="%"
-        @change="updateUiScale(parseInt($event))"
-      />
-    </ft-flex-box>
-    <br>
-    <ft-flex-box>
-      <ft-select
-        :placeholder="$t('Settings.Theme Settings.Base Theme.Base Theme')"
-        :value="baseTheme"
-        :select-names="baseThemeNames"
-        :select-values="baseThemeValues"
-        :icon="['fas', 'palette']"
-        @change="updateBaseTheme"
-      />
-      <ft-select
-        :placeholder="$t('Settings.Theme Settings.Main Color Theme.Main Color Theme')"
-        :value="mainColor"
-        :select-names="colorNames"
-        :select-values="colorValues"
-        :disabled="!areColorThemesEnabled"
-        :icon="['fas', 'palette']"
-        icon-color="var(--primary-color)"
-        @change="updateMainColor"
-      />
-      <ft-select
-        :placeholder="$t('Settings.Theme Settings.Secondary Color Theme')"
-        :value="secColor"
-        :select-names="colorNames"
-        :select-values="colorValues"
-        :disabled="!areColorThemesEnabled"
-        :icon="['fas', 'palette']"
-        icon-color="var(--accent-color)"
-        @change="updateSecColor"
-      />
-    </ft-flex-box>
-    <ft-prompt
-      v-if="showRestartPrompt"
-      :label="restartPromptMessage"
-      :option-names="restartPromptNames"
-      :option-values="restartPromptValues"
-      @click="handleSmoothScrolling"
-    />
-  </ft-settings-section>
-</template>
-
-<script src="./theme-settings.js" />
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index f5aef0c0b669e..f86c1dd2fa5fa 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -2,17 +2,19 @@ import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtInput from '../ft-input/ft-input.vue'
 import FtProfileSelector from '../ft-profile-selector/ft-profile-selector.vue'
+import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import debounce from 'lodash.debounce'
 
-import { IpcChannels, MOBILE_WIDTH_THRESHOLD } from '../../../constants'
-import { openInternalPath } from '../../helpers/utils'
+import { IpcChannels, KeyboardShortcuts, MOBILE_WIDTH_THRESHOLD } from '../../../constants'
+import { localizeAndAddKeyboardShortcutToActionTitle, openInternalPath } from '../../helpers/utils'
 import { translateWindowTitle } from '../../helpers/strings'
 import { clearLocalSearchSuggestionsSession, getLocalSearchSuggestions } from '../../helpers/api/local'
-import { invidiousAPICall } from '../../helpers/api/invidious'
+import { getInvidiousSearchSuggestions } from '../../helpers/api/invidious'
 
 export default defineComponent({
   name: 'TopNav',
   components: {
+    FtIconButton,
     FtInput,
     FtProfileSelector
   },
@@ -31,6 +33,10 @@ export default defineComponent({
       showSearchContainer: true,
       isArrowBackwardDisabled,
       isArrowForwardDisabled,
+      navigationHistoryDropdownActiveEntry: null,
+      navigationHistoryDropdownOptions: [],
+      isLoadingNavigationHistory: false,
+      pendingNavigationHistoryLabel: null,
       searchSuggestionsDataList: [],
       lastSuggestionQuery: ''
     }
@@ -86,25 +92,43 @@ export default defineComponent({
       return this.$store.getters.getSearchFilterValueChanged
     },
 
+    navigationHistoryAddendum: function () {
+      if (this.navigationHistoryDropdownOptions.length === 0) {
+        return ''
+      }
+
+      return '\n' + this.$t('Right-click or hold to see history')
+    },
+
     forwardText: function () {
-      return this.$t('Forward')
+      return localizeAndAddKeyboardShortcutToActionTitle(
+        this.$t('Forward'),
+        KeyboardShortcuts.APP.GENERAL.HISTORY_FORWARD
+      ) + this.navigationHistoryAddendum
     },
 
     backwardText: function () {
-      return this.$t('Back')
+      return localizeAndAddKeyboardShortcutToActionTitle(
+        this.$t('Back'),
+        KeyboardShortcuts.APP.GENERAL.HISTORY_BACKWARD
+      ) + this.navigationHistoryAddendum
     },
 
     newWindowText: function () {
-      return this.$t('Open New Window')
+      return localizeAndAddKeyboardShortcutToActionTitle(
+        this.$t('Open New Window'),
+        KeyboardShortcuts.APP.GENERAL.NEW_WINDOW
+      )
     }
   },
   watch: {
     $route: function () {
+      this.setNavigationHistoryDropdownOptions()
       if ('navigation' in window) {
         this.isArrowForwardDisabled = !window.navigation.canGoForward
         this.isArrowBackwardDisabled = !window.navigation.canGoBack
       }
-    }
+    },
   },
   mounted: function () {
     let previousWidth = window.innerWidth
@@ -301,15 +325,7 @@ export default defineComponent({
         return
       }
 
-      const searchPayload = {
-        resource: 'search/suggestions',
-        id: '',
-        params: {
-          q: query
-        }
-      }
-
-      invidiousAPICall(searchPayload).then((results) => {
+      getInvidiousSearchSuggestions(query).then((results) => {
         this.searchSuggestionsDataList = results.suggestions
       }).catch((err) => {
         console.error(err)
@@ -326,12 +342,46 @@ export default defineComponent({
       this.showSearchContainer = !this.showSearchContainer
     },
 
-    historyBack: function () {
-      this.$router.back()
+    setNavigationHistoryDropdownOptions: async function() {
+      if (process.env.IS_ELECTRON) {
+        this.isLoadingNavigationHistory = true
+        const { ipcRenderer } = require('electron')
+
+        const dropdownOptions = await ipcRenderer.invoke(IpcChannels.GET_NAVIGATION_HISTORY)
+
+        const activeEntry = dropdownOptions.find(option => option.active)
+
+        if (this.pendingNavigationHistoryLabel) {
+          activeEntry.label = this.pendingNavigationHistoryLabel
+        }
+
+        this.navigationHistoryDropdownOptions = dropdownOptions
+        this.navigationHistoryDropdownActiveEntry = activeEntry
+        this.isLoadingNavigationHistory = false
+      }
+    },
+
+    goToOffset: function (offset) {
+      // no point navigating to the current route
+      if (offset !== 0) {
+        this.$router.go(offset)
+      }
+    },
+
+    historyBack: function (offset) {
+      if (offset != null) {
+        this.goToOffset(offset)
+      } else {
+        this.$router.back()
+      }
     },
 
-    historyForward: function () {
-      this.$router.forward()
+    historyForward: function (offset) {
+      if (offset != null) {
+        this.goToOffset(offset)
+      } else {
+        this.$router.forward()
+      }
     },
 
     toggleSideNav: function () {
@@ -352,6 +402,14 @@ export default defineComponent({
     updateSearchInputText: function (text) {
       this.$refs.searchInput.updateInputData(text)
     },
+    setActiveNavigationHistoryEntryTitle(value) {
+      if (this.isLoadingNavigationHistory) {
+        this.pendingNavigationHistoryLabel = value
+      } else if (this.navigationHistoryDropdownActiveEntry) {
+        this.navigationHistoryDropdownActiveEntry.label = value
+      }
+    },
+
     ...mapActions([
       'getYoutubeUrlInfo',
       'showSearchFilters'
diff --git a/src/renderer/components/top-nav/top-nav.scss b/src/renderer/components/top-nav/top-nav.scss
index c5917b0a70705..cc346df5d73cf 100644
--- a/src/renderer/components/top-nav/top-nav.scss
+++ b/src/renderer/components/top-nav/top-nav.scss
@@ -45,7 +45,17 @@
   }
 }
 
-.navIcon {
+.arrowDisabled :deep(.iconButton) {
+  filter: grayscale(1);
+  background-color: inherit;
+  opacity: 0.4;
+  pointer-events: auto;
+  cursor: default;
+  user-select: none;
+}
+
+.navIcon,
+:deep(.ftIconButton:not(.arrowDisabled) .iconButton) {
   border-radius: 50%;
   color: var(--primary-text-color);
   cursor: pointer;
@@ -55,39 +65,34 @@
   transition: background 0.2s ease-out;
   inline-size: 1em;
 
-  @include top-nav-is-colored {
-    color: var(--text-with-main-color);
-  }
-
-  &.arrowBackwardDisabled,
-  &.arrowForwardDisabled {
-    color: #808080;
-    opacity: 0.5;
-    pointer-events: none;
-    user-select: none;
-  }
-
   &:hover {
     background-color: var(--side-nav-hover-color);
     color: var(--side-nav-hover-text-color);
     transition: background 0.2s ease-in;
 
-    @include top-nav-is-colored {
-      background-color: var(--primary-color-hover);
-    }
   }
 
   &:active {
     background-color: var(--tertiary-text-color);
     color: var(--side-nav-active-text-color);
     transition: background 0.2s ease-in;
+  }
+}
 
-    @include top-nav-is-colored {
-      background-color: var(--primary-color-active);
-    }
+.topNavBarColor .navIcon,
+.topNavBarColor :deep(.ftIconButton:not(.arrowDisabled) .iconButton) {
+  color: var(--text-with-main-color);
+
+  &:hover {
+    background-color: var(--primary-color-hover);
+  }
+
+  &:active {
+    background-color: var(--primary-color-active);
   }
 }
 
+
 .navFilterIcon {
   $effect-distance: 20px;
 
diff --git a/src/renderer/components/top-nav/top-nav.vue b/src/renderer/components/top-nav/top-nav.vue
index ca023d47795b1..d156e02968541 100644
--- a/src/renderer/components/top-nav/top-nav.vue
+++ b/src/renderer/components/top-nav/top-nav.vue
@@ -13,24 +13,32 @@
         @click="toggleSideNav"
         @keydown.enter.prevent="toggleSideNav"
       />
-      <font-awesome-icon
-        :aria-disabled="isArrowBackwardDisabled"
-        class="navIcon"
-        :class="{ arrowBackwardDisabled: isArrowBackwardDisabled}"
+      <ft-icon-button
+        class="navIconButton"
+        :disabled="isArrowBackwardDisabled"
+        :class="{ arrowDisabled: isArrowBackwardDisabled }"
         :icon="['fas', 'arrow-left']"
-        role="button"
-        tabindex="0"
+        :theme="null"
+        :size="20"
+        :use-shadow="false"
+        dropdown-position-x="right"
+        :dropdown-options="navigationHistoryDropdownOptions"
+        :open-on-right-or-long-click="true"
         :title="backwardText"
         @click="historyBack"
         @keydown.enter.prevent="historyBack"
       />
-      <font-awesome-icon
-        :aria-disabled="isArrowForwardDisabled"
-        class="navIcon"
-        :class="{ arrowForwardDisabled: isArrowForwardDisabled}"
+      <ft-icon-button
+        class="navIconButton"
+        :disabled="isArrowForwardDisabled"
+        :class="{ arrowDisabled: isArrowForwardDisabled }"
         :icon="['fas', 'arrow-right']"
-        role="button"
-        tabindex="0"
+        :theme="null"
+        :size="20"
+        :use-shadow="false"
+        dropdown-position-x="right"
+        :dropdown-options="navigationHistoryDropdownOptions"
+        :open-on-right-or-long-click="true"
         :title="forwardText"
         @click="historyForward"
         @keydown.enter.prevent="historyForward"
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
deleted file mode 100644
index c7d5a8f6639cf..0000000000000
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ /dev/null
@@ -1,459 +0,0 @@
-import { defineComponent } from 'vue'
-import FtCard from '../ft-card/ft-card.vue'
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import FtSelect from '../../components/ft-select/ft-select.vue'
-import FtTimestampCatcher from '../../components/ft-timestamp-catcher/ft-timestamp-catcher.vue'
-import { copyToClipboard, showToast } from '../../helpers/utils'
-import { getInvidiousCommunityPostCommentReplies, getInvidiousCommunityPostComments, invidiousGetCommentReplies, invidiousGetComments } from '../../helpers/api/invidious'
-import { getLocalComments, parseLocalComment } from '../../helpers/api/local'
-
-export default defineComponent({
-  name: 'WatchVideoComments',
-  components: {
-    'ft-card': FtCard,
-    'ft-loader': FtLoader,
-    'ft-select': FtSelect,
-    'ft-timestamp-catcher': FtTimestampCatcher
-  },
-  props: {
-    id: {
-      type: String,
-      required: true
-    },
-    channelName: {
-      type: String,
-      required: true
-    },
-    channelThumbnail: {
-      type: String,
-      required: true
-    },
-    videoPlayerReady: {
-      type: Boolean,
-      required: true
-    },
-    forceState: {
-      type: String,
-      default: null,
-    },
-    isPostComments: {
-      type: Boolean,
-      default: false,
-    },
-    postAuthorId: {
-      type: String,
-      default: null
-    },
-    showSortBy: {
-      type: Boolean,
-      default: true,
-    }
-  },
-  emits: ['timestamp-event'],
-  setup: function () {
-    // As we don't need or even want reactivity here,
-    // we can use a Map.
-    const replyTokens = new Map()
-
-    return {
-      replyTokens
-    }
-  },
-  data: function () {
-    return {
-      isLoading: false,
-      showComments: false,
-      nextPageToken: null,
-      commentData: [],
-      sortNewest: false,
-    }
-  },
-  computed: {
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-
-    backendFallback: function () {
-      return this.$store.getters.getBackendFallback
-    },
-
-    hideCommentLikes: function () {
-      return this.$store.getters.getHideCommentLikes
-    },
-
-    hideCommentPhotos: function () {
-      return this.$store.getters.getHideCommentPhotos
-    },
-
-    sortNames: function () {
-      return [
-        this.$t('Comments.Top comments'),
-        this.$t('Comments.Newest first')
-      ]
-    },
-
-    sortValues: function () {
-      return [
-        'top',
-        'newest'
-      ]
-    },
-
-    currentSortValue: function () {
-      return (this.sortNewest) ? 'newest' : 'top'
-    },
-
-    generalAutoLoadMorePaginatedItemsEnabled() {
-      return this.$store.getters.getGeneralAutoLoadMorePaginatedItemsEnabled
-    },
-    observeVisibilityOptions: function () {
-      if (!this.generalAutoLoadMorePaginatedItemsEnabled) {
-        return false
-      }
-      if (!this.videoPlayerReady && !this.isPostComments) { return false }
-
-      return {
-        callback: (isVisible, _entry) => {
-          // This is also fired when **hidden**
-          // No point doing anything if not visible
-          if (!isVisible) { return }
-          // It's possible the comments are being loaded/already loaded
-          if (this.canPerformInitialCommentLoading) {
-            this.getCommentData()
-          } else if (this.canPerformMoreCommentLoading) {
-            this.getMoreComments()
-          }
-        },
-        intersection: {
-          // Only when it intersects with N% above bottom
-          rootMargin: '0% 0% 0% 0%',
-        },
-        // Callback responsible for loading multiple comment pages
-        once: false,
-      }
-    },
-
-    canPerformInitialCommentLoading: function () {
-      return this.commentData.length === 0 && !this.isLoading && !this.showComments
-    },
-
-    canPerformMoreCommentLoading: function () {
-      return this.commentData.length > 0 && !this.isLoading && this.showComments && this.nextPageToken
-    },
-
-    subscriptions: function() {
-      return this.$store.getters.getActiveProfile.subscriptions
-    }
-  },
-  created: function () {
-    // region No comment detection
-    // For videos without any comment (comment disabled?)
-    // e.g. https://youtu.be/8NBSwDEf8a8
-    //
-    // `comments_entry_point_header` is null probably when comment disabled
-    if (this.forceState === 'noComment') {
-      this.commentData = []
-      this.nextPageToken = null
-      this.isLoading = false
-      this.showComments = true
-    }
-    // endregion No comment detection
-  },
-  methods: {
-    onTimestamp: function (timestamp) {
-      this.$emit('timestamp-event', timestamp)
-    },
-
-    handleSortChange: function () {
-      this.sortNewest = !this.sortNewest
-      this.commentData = []
-      // nextPageToken is reset to ensure first page is get
-      this.nextPageToken = null
-      this.getCommentData()
-    },
-
-    getCommentData: function () {
-      this.isLoading = true
-      if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious' || this.isPostComments) {
-        if (!this.isPostComments) {
-          this.getCommentDataInvidious()
-        } else {
-          this.getPostCommentsInvidious()
-        }
-      } else {
-        this.getCommentDataLocal()
-      }
-    },
-
-    getMoreComments: function () {
-      if (this.commentData.length === 0 || this.nextPageToken === null || typeof this.nextPageToken === 'undefined') {
-        showToast(this.$t('Comments.There are no more comments for this video'))
-      } else {
-        if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious' || this.isPostComments) {
-          if (!this.isPostComments) {
-            this.getCommentDataInvidious()
-          } else {
-            this.getPostCommentsInvidious()
-          }
-        } else {
-          this.getCommentDataLocal(true)
-        }
-      }
-    },
-
-    toggleCommentReplies: function (index) {
-      if (this.commentData[index].showReplies || this.commentData[index].replies.length > 0) {
-        this.commentData[index].showReplies = !this.commentData[index].showReplies
-      } else {
-        this.getCommentReplies(index)
-      }
-    },
-
-    getCommentReplies: function (index) {
-      if (!process.env.SUPPORTS_LOCAL_API || this.commentData[index].dataType === 'invidious' || this.isPostComments) {
-        if (!this.isPostComments) {
-          this.getCommentRepliesInvidious(index)
-        } else {
-          this.getPostCommentRepliesInvidious(index)
-        }
-      } else {
-        this.getCommentRepliesLocal(index)
-      }
-    },
-
-    getCommentDataLocal: async function (more) {
-      try {
-        /** @type {import('youtubei.js').YT.Comments} */
-        let comments
-        if (more) {
-          comments = await this.nextPageToken.getContinuation()
-        } else {
-          comments = await getLocalComments(this.id, this.sortNewest)
-        }
-
-        const parsedComments = comments.contents
-          .map(commentThread => {
-            // Use destructuring to create a new object without the replyToken
-            const { replyToken, ...comment } = parseLocalComment(commentThread.comment, commentThread)
-
-            if (comment.hasReplyToken) {
-              this.replyTokens.set(comment.id, replyToken)
-            } else {
-              this.replyTokens.delete(comment.id)
-            }
-
-            return comment
-          })
-
-        if (more) {
-          this.commentData = this.commentData.concat(parsedComments)
-        } else {
-          this.commentData = parsedComments
-        }
-
-        this.nextPageToken = comments.has_continuation ? comments : null
-        this.isLoading = false
-        this.showComments = true
-      } catch (err) {
-        console.error(err)
-        const errorMessage = this.$t('Local API Error (Click to copy)')
-        showToast(`${errorMessage}: ${err}`, 10000, () => {
-          copyToClipboard(err)
-        })
-        if (this.backendFallback && this.backendPreference === 'local') {
-          showToast(this.$t('Falling back to Invidious API'))
-          this.getCommentDataInvidious()
-        } else {
-          this.isLoading = false
-        }
-      }
-    },
-
-    getCommentRepliesLocal: async function (index) {
-      showToast(this.$t('Comments.Getting comment replies, please wait'))
-
-      try {
-        const comment = this.commentData[index]
-        /** @type {import('youtubei.js').YTNodes.CommentThread} */
-        const commentThread = this.replyTokens.get(comment.id)
-
-        if (commentThread == null) {
-          this.replyTokens.delete(comment.id)
-          comment.hasReplyToken = false
-          return
-        }
-
-        if (comment.replies.length > 0) {
-          await commentThread.getContinuation()
-          comment.replies = comment.replies.concat(commentThread.replies.map(reply => parseLocalComment(reply)))
-        } else {
-          await commentThread.getReplies()
-          comment.replies = commentThread.replies.map(reply => parseLocalComment(reply))
-        }
-
-        if (commentThread.has_continuation) {
-          this.replyTokens.set(comment.id, commentThread)
-          comment.hasReplyToken = true
-        } else {
-          this.replyTokens.delete(comment.id)
-          comment.hasReplyToken = false
-        }
-
-        comment.showReplies = true
-      } catch (err) {
-        console.error(err)
-        const errorMessage = this.$t('Local API Error (Click to copy)')
-        showToast(`${errorMessage}: ${err}`, 10000, () => {
-          copyToClipboard(err)
-        })
-        if (this.backendFallback && this.backendPreference === 'local') {
-          showToast(this.$t('Falling back to Invidious API'))
-          this.getCommentDataInvidious()
-        } else {
-          this.isLoading = false
-        }
-      }
-    },
-
-    getCommentDataInvidious: function () {
-      invidiousGetComments({
-        id: this.id,
-        nextPageToken: this.nextPageToken,
-        sortNewest: this.sortNewest
-      }).then(({ response, commentData }) => {
-        commentData = commentData.map(({ replyToken, ...comment }) => {
-          if (comment.hasReplyToken) {
-            this.replyTokens.set(comment.id, replyToken)
-          } else {
-            this.replyTokens.delete(comment.id)
-          }
-
-          return comment
-        })
-
-        this.commentData = this.commentData.concat(commentData)
-        this.nextPageToken = response.continuation
-        this.isLoading = false
-        this.showComments = true
-      }).catch((err) => {
-        // region No comment detection
-        // No comment related info when video info requested earlier in parent component
-        if (err.message.includes('Comments not found')) {
-          // For videos without any comment (comment disabled?)
-          // e.g. https://youtu.be/8NBSwDEf8a8
-          this.commentData = []
-          this.nextPageToken = null
-          this.isLoading = false
-          this.showComments = true
-          return
-        }
-        // endregion No comment detection
-
-        console.error(err)
-        const errorMessage = this.$t('Invidious API Error (Click to copy)')
-        showToast(`${errorMessage}: ${err}`, 10000, () => {
-          copyToClipboard(err)
-        })
-        if (process.env.SUPPORTS_LOCAL_API && this.backendFallback && this.backendPreference === 'invidious') {
-          showToast(this.$t('Falling back to Local API'))
-          this.getCommentDataLocal()
-        } else {
-          this.isLoading = false
-        }
-      })
-    },
-
-    getCommentRepliesInvidious: function (index) {
-      showToast(this.$t('Comments.Getting comment replies, please wait'))
-
-      const comment = this.commentData[index]
-      const replyToken = this.replyTokens.get(comment.id)
-
-      invidiousGetCommentReplies({ id: this.id, replyToken: replyToken })
-        .then(({ commentData, continuation }) => {
-          comment.replies = comment.replies.concat(commentData)
-          comment.showReplies = true
-
-          if (continuation) {
-            this.replyTokens.set(comment.id, continuation)
-            comment.hasReplyToken = true
-          } else {
-            this.replyTokens.delete(comment.id)
-            comment.hasReplyToken = false
-          }
-
-          this.isLoading = false
-        }).catch((error) => {
-          console.error(error)
-          const errorMessage = this.$t('Invidious API Error (Click to copy)')
-          showToast(`${errorMessage}: ${error}`, 10000, () => {
-            copyToClipboard(error)
-          })
-          this.isLoading = false
-        })
-    },
-
-    getPostCommentsInvidious: function() {
-      const nextPageToken = this.nextPageToken
-
-      const fetchComments = nextPageToken == null
-        ? getInvidiousCommunityPostComments({ postId: this.id, authorId: this.postAuthorId })
-        : getInvidiousCommunityPostCommentReplies({ postId: this.id, replyToken: this.nextPageToken, authorId: this.postAuthorId })
-
-      fetchComments.then(({ response, commentData, continuation }) => {
-        commentData = commentData.map(({ replyToken, ...comment }) => {
-          if (comment.hasReplyToken) {
-            this.replyTokens.set(comment.id, replyToken)
-          } else {
-            this.replyTokens.delete(comment.id)
-          }
-
-          return comment
-        })
-
-        this.commentData = this.commentData.concat(commentData)
-        this.nextPageToken = response?.continuation ?? continuation
-        this.isLoading = false
-        this.showComments = true
-      }).catch((err) => {
-        console.error(err)
-        const errorMessage = this.$t('Invidious API Error (Click to copy)')
-        showToast(`${errorMessage}: ${err}`, 10000, () => {
-          copyToClipboard(err)
-        })
-        this.isLoading = false
-      })
-    },
-
-    getPostCommentRepliesInvidious: function(index) {
-      showToast(this.$t('Comments.Getting comment replies, please wait'))
-
-      const comment = this.commentData[index]
-      const replyToken = this.replyTokens.get(comment.id)
-      const id = this.id
-
-      getInvidiousCommunityPostCommentReplies({ postId: id, replyToken: replyToken, authorId: this.postAuthorId })
-        .then(({ commentData, continuation }) => {
-          comment.replies = comment.replies.concat(commentData)
-          comment.showReplies = true
-
-          if (continuation) {
-            this.replyTokens.set(comment.id, continuation)
-            comment.hasReplyToken = true
-          } else {
-            this.replyTokens.delete(comment.id)
-            comment.hasReplyToken = false
-          }
-
-          this.isLoading = false
-        }).catch((error) => {
-          console.error(error)
-          const errorMessage = this.$t('Invidious API Error (Click to copy)')
-          showToast(`${errorMessage}: ${error}`, 10000, () => {
-            copyToClipboard(error)
-          })
-          this.isLoading = false
-        })
-    }
-  }
-})
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
deleted file mode 100644
index d39df77213606..0000000000000
--- a/src/renderer/components/watch-video-comments/watch-video-comments.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-<template>
-  <ft-card
-    class="card"
-  >
-    <h3
-      v-if="commentData.length > 0 && !isLoading && showComments"
-      class="commentsTitle"
-    >
-      {{ $t("Comments.Comments") }}
-      <span
-        class="hideComments"
-        role="button"
-        tabindex="0"
-        @click="showComments = false"
-        @keydown.space.prevent="showComments = false"
-        @keydown.enter.prevent="showComments = false"
-      >
-        {{ $t("Comments.Hide Comments") }}
-      </span>
-    </h3>
-    <h4
-      v-if="canPerformInitialCommentLoading"
-      class="getCommentsTitle"
-      role="button"
-      tabindex="0"
-      @click="getCommentData"
-      @keydown.space.prevent="getCommentData"
-      @keydown.enter.prevent="getCommentData"
-    >
-      {{ $t("Comments.Click to View Comments") }}
-    </h4>
-    <h4
-      v-if="commentData.length > 0 && !isLoading && !showComments"
-      class="getCommentsTitle"
-      role="button"
-      tabindex="0"
-      @click="showComments = true"
-      @keydown.space.prevent="showComments = true"
-      @keydown.enter.prevent="showComments = true"
-    >
-      {{ $t("Comments.Click to View Comments") }}
-    </h4>
-    <ft-select
-      v-if="commentData.length > 0 && !isLoading && showComments && showSortBy"
-      class="commentSort"
-      :placeholder="$t('Comments.Sort by')"
-      :value="currentSortValue"
-      :select-names="sortNames"
-      :select-values="sortValues"
-      :icon="['fas', 'arrow-down-short-wide']"
-      @change="handleSortChange"
-    />
-    <div
-      v-if="commentData.length > 0 && showComments"
-    >
-      <div
-        v-for="(comment, index) in commentData"
-        :id="'comment' + index"
-        :key="index"
-        class="comment"
-      >
-        <router-link
-          :to="`/channel/${comment.authorLink}`"
-          tabindex="-1"
-        >
-          <!-- Hide comment photo only if it isn't the video uploader -->
-          <div
-            v-if="hideCommentPhotos && !comment.isOwner"
-            class="commentThumbnailHidden"
-          >
-            {{ comment.author.substring(1, 2) }}
-          </div>
-          <img
-            v-else
-            :src="comment.authorThumb"
-            alt=""
-            class="commentThumbnail"
-          >
-        </router-link>
-        <p
-          v-if="comment.isPinned"
-          class="commentPinned"
-        >
-          <font-awesome-icon
-            :icon="['fas', 'thumbtack']"
-          />
-          {{ $t("Comments.Pinned by") }} {{ channelName }}
-        </p>
-        <p
-          class="commentAuthorWrapper"
-        >
-          <router-link
-            class="commentAuthor"
-            :class="{
-              commentOwner: comment.isOwner
-            }"
-            :to="`/channel/${comment.authorLink}`"
-          >
-            {{ comment.author }}
-          </router-link>
-          <img
-            v-if="comment.isMember"
-            :src="comment.memberIconUrl"
-            :title="$t('Comments.Member')"
-            :aria-label="$t('Comments.Member')"
-            class="commentMemberIcon"
-            alt=""
-          >
-          <img
-            v-if="subscriptions.find((channel) => channel.id === comment.authorId)"
-            :title="$t('Comments.Subscribed')"
-            :aria-label="$t('Comments.Subscribed')"
-            class="commentSubscribedIcon"
-            alt=""
-          >
-          <span class="commentDate">
-            {{ comment.time }}
-          </span>
-        </p>
-        <ft-timestamp-catcher
-          class="commentText"
-          :input-html="comment.text"
-          @timestamp-event="onTimestamp"
-        />
-        <p class="commentLikeCount">
-          <template
-            v-if="!hideCommentLikes"
-          >
-            <font-awesome-icon
-              :icon="['fas', 'thumbs-up']"
-            />
-            {{ comment.likes }}
-          </template>
-          <span
-            v-if="comment.isHearted"
-            class="commentHeartBadge"
-          >
-            <img
-              :src="channelThumbnail"
-              :title="$t('Comments.Hearted')"
-              :aria-label="$t('Comments.Hearted')"
-              class="commentHeartBadgeImg"
-              alt=""
-            >
-            <font-awesome-icon
-              :icon="['fas', 'heart']"
-              class="commentHeartBadgeWhite"
-            />
-            <font-awesome-icon
-              :icon="['fas', 'heart']"
-              class="commentHeartBadgeRed"
-            />
-          </span>
-          <span
-            v-if="comment.numReplies > 0"
-            class="commentMoreReplies"
-            role="button"
-            tabindex="0"
-            @click="toggleCommentReplies(index)"
-            @keydown.space.prevent="toggleCommentReplies(index)"
-            @keydown.enter.prevent="toggleCommentReplies(index)"
-          >
-            <span v-if="!comment.showReplies">{{ $t("Comments.View") }}</span>
-            <span v-else>{{ $t("Comments.Hide") }}</span>
-            {{ comment.numReplies }}
-            <span v-if="comment.numReplies === 1">{{ $t("Comments.Reply").toLowerCase() }}</span>
-            <span v-else>{{ $t("Comments.Replies").toLowerCase() }}</span>
-            <span v-if="comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.From {channelName}", { channelName }) }}</span>
-            <span v-if="comment.numReplies > 1 && comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.And others") }}</span>
-          </span>
-        </p>
-        <div
-          v-if="comment.showReplies"
-          class="commentReplies"
-        >
-          <div
-            v-for="(reply, replyIndex) in comment.replies"
-            :id="'comment' + index + '-' + replyIndex"
-            :key="replyIndex"
-            class="comment"
-          >
-            <router-link
-              :to="`/channel/${reply.authorLink}`"
-              tabindex="-1"
-            >
-              <!-- Hide comment photo only if it isn't the video uploader -->
-              <div
-                v-if="hideCommentPhotos && !reply.isOwner"
-                class="commentThumbnailHidden"
-              >
-                {{ reply.author.substring(1, 2) }}
-              </div>
-              <img
-                v-else
-                :src="reply.authorThumb"
-                alt=""
-                class="commentThumbnail"
-              >
-            </router-link>
-            <p class="commentAuthorWrapper">
-              <router-link
-                class="commentAuthor"
-                :class="{
-                  commentOwner: reply.isOwner
-                }"
-                :to="`/channel/${reply.authorLink}`"
-              >
-                {{ reply.author }}
-              </router-link>
-              <img
-                v-if="reply.isMember"
-                :src="reply.memberIconUrl"
-                class="commentMemberIcon"
-                alt=""
-              >
-              <img
-                v-if="subscriptions.find((channel) => channel.id === reply.authorId)"
-                :title="$t('Comments.Subscribed')"
-                :aria-label="$t('Comments.Subscribed')"
-                class="commentSubscribedIcon"
-                alt=""
-              >
-              <span class="commentDate">
-                {{ reply.time }}
-              </span>
-            </p>
-            <ft-timestamp-catcher
-              class="commentText"
-              :input-html="reply.text"
-              @timestamp-event="onTimestamp"
-            />
-            <p class="commentLikeCount">
-              <template
-                v-if="!hideCommentLikes"
-              >
-                <font-awesome-icon
-                  v-if="!hideCommentLikes"
-                  :icon="['fas', 'thumbs-up']"
-                />
-                {{ reply.likes }}
-              </template>
-            </p>
-            <p
-              v-if="reply.numReplies > 0"
-              class="commentMoreReplies"
-            >
-              {{ $t('Comments.View {replyCount} replies', { replyCount: reply.numReplies }) }}
-            </p>
-          </div>
-          <div
-            v-if="comment.hasReplyToken"
-            class="showMoreReplies"
-            role="button"
-            tabindex="0"
-            @click="getCommentReplies(index)"
-            @keydown.space.prevent="getCommentReplies(index)"
-            @keydown.enter.prevent="getCommentReplies(index)"
-          >
-            <span>{{ $t("Comments.Show More Replies") }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      v-else-if="showComments && !isLoading"
-    >
-      <h3
-        v-if="isPostComments"
-        class="noCommentMsg"
-      >
-        {{ $t("Comments.There are no comments available for this post") }}
-      </h3>
-      <h3
-        v-else
-        class="noCommentMsg"
-      >
-        {{ $t("Comments.There are no comments available for this video") }}
-      </h3>
-    </div>
-    <h4
-      v-if="canPerformMoreCommentLoading"
-      class="getMoreComments"
-      role="button"
-      tabindex="0"
-      @click="getMoreComments"
-      @keydown.space.prevent="getMoreComments"
-      @keydown.enter.prevent="getMoreComments"
-    >
-      {{ $t("Comments.Load More Comments") }}
-    </h4>
-    <ft-loader
-      v-if="isLoading"
-    />
-    <div
-      v-observe-visibility="observeVisibilityOptions"
-    >
-      <!--
-        Dummy element to be observed by Intersection Observer
-      -->
-    </div>
-  </ft-card>
-</template>
-
-<script src="./watch-video-comments.js" />
-<style scoped src="./watch-video-comments.css" />
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index ef5cf85c6f7d0..1076ef9be94dd 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -106,6 +106,10 @@ export default defineComponent({
     inUserPlaylist: {
       type: Boolean,
       required: true
+    },
+    isUnlisted: {
+      type: Boolean,
+      required: false
     }
   },
   emits: ['change-format', 'pause-player', 'set-info-area-sticky', 'scroll-to-info-area'],
diff --git a/src/renderer/components/watch-video-info/watch-video-info.scss b/src/renderer/components/watch-video-info/watch-video-info.scss
index 00a79fba8d7b7..a35aa7aa2934d 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.scss
+++ b/src/renderer/components/watch-video-info/watch-video-info.scss
@@ -22,6 +22,17 @@
   gap: 10px;
 }
 
+.unlistedBadge {
+  background-color: var(--secondary-card-bg-color);
+  border-radius: 5px;
+  display: inline;
+  padding-inline: 5px;
+  padding-block: 2px;
+  white-space: nowrap;
+  font-size: 13px;
+  font-weight: 500;
+}
+
 .videoButtons {
   .profileRow {
     display: flex;
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index c49c3a1f65446..165f9c33e59d1 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -6,6 +6,12 @@
       >
         {{ title }}
       </h1>
+      <div
+        v-if="isUnlisted"
+        class="unlistedBadge"
+      >
+        {{ $t('Video.Unlisted') }}
+      </div>
     </div>
     <div class="videoMetrics">
       <div class="datePublishedAndViewCount">
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
index 307ed79a68bee..3cf66a8ddf110 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
@@ -34,6 +34,7 @@
   color: var(--tertiary-text-color);
   padding: 0;
   margin: 0;
+  word-break: break-word;
 }
 
 :deep(.liveChatEmoji) {
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index bfe449b6eb0ec..e0d424bad8b62 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -3,7 +3,7 @@ import { mapMutations } from 'vuex'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtListVideoNumbered from '../ft-list-video-numbered/ft-list-video-numbered.vue'
-import { copyToClipboard, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
+import { copyToClipboard, showToast } from '../../helpers/utils'
 import {
   getLocalPlaylist,
   parseLocalPlaylistVideo,
@@ -471,7 +471,6 @@ export default defineComponent({
         this.channelName = result.author
         this.channelId = result.authorId
 
-        setPublishedTimestampsInvidious(result.videos)
         this.playlistItems = this.playlistItems.concat(result.videos)
 
         this.isLoading = false
diff --git a/src/renderer/composables/colors.js b/src/renderer/composables/colors.js
new file mode 100644
index 0000000000000..aad2b43511b9c
--- /dev/null
+++ b/src/renderer/composables/colors.js
@@ -0,0 +1,64 @@
+import { computed } from 'vue'
+import { useI18n } from './use-i18n-polyfill'
+
+export function useColorTranslations() {
+  const { t } = useI18n()
+
+  return computed(() => [
+    t('Settings.Theme Settings.Main Color Theme.Red'),
+    t('Settings.Theme Settings.Main Color Theme.Pink'),
+    t('Settings.Theme Settings.Main Color Theme.Purple'),
+    t('Settings.Theme Settings.Main Color Theme.Deep Purple'),
+    t('Settings.Theme Settings.Main Color Theme.Indigo'),
+    t('Settings.Theme Settings.Main Color Theme.Blue'),
+    t('Settings.Theme Settings.Main Color Theme.Light Blue'),
+    t('Settings.Theme Settings.Main Color Theme.Cyan'),
+    t('Settings.Theme Settings.Main Color Theme.Teal'),
+    t('Settings.Theme Settings.Main Color Theme.Green'),
+    t('Settings.Theme Settings.Main Color Theme.Light Green'),
+    t('Settings.Theme Settings.Main Color Theme.Lime'),
+    t('Settings.Theme Settings.Main Color Theme.Yellow'),
+    t('Settings.Theme Settings.Main Color Theme.Amber'),
+    t('Settings.Theme Settings.Main Color Theme.Orange'),
+    t('Settings.Theme Settings.Main Color Theme.Deep Orange'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Rosewater'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Flamingo'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Pink'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Mauve'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Red'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Maroon'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Peach'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Yellow'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Green'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Teal'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sky'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sapphire'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Blue'),
+    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Lavender'),
+    t('Settings.Theme Settings.Main Color Theme.Dracula Cyan'),
+    t('Settings.Theme Settings.Main Color Theme.Dracula Green'),
+    t('Settings.Theme Settings.Main Color Theme.Dracula Orange'),
+    t('Settings.Theme Settings.Main Color Theme.Dracula Pink'),
+    t('Settings.Theme Settings.Main Color Theme.Dracula Purple'),
+    t('Settings.Theme Settings.Main Color Theme.Dracula Red'),
+    t('Settings.Theme Settings.Main Color Theme.Dracula Yellow'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Green'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Yellow'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Blue'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Purple'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Aqua'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Orange'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Red'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Blue'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Purple'),
+    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Orange'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Yellow'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Orange'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Red'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Magenta'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Violet'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Blue'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Cyan'),
+    t('Settings.Theme Settings.Main Color Theme.Solarized Green'),
+  ])
+}
diff --git a/src/renderer/composables/use-i18n-polyfill.js b/src/renderer/composables/use-i18n-polyfill.js
new file mode 100644
index 0000000000000..a8b7fa871dc82
--- /dev/null
+++ b/src/renderer/composables/use-i18n-polyfill.js
@@ -0,0 +1,95 @@
+/* eslint-disable @intlify/vue-i18n/no-dynamic-keys */
+import { computed } from 'vue'
+
+import i18n from '../i18n/index'
+
+/**
+ * Polyfill for vue-i18n's useI18n composable, as it is not available in Vue 2
+ * and doesn't work when vue-i18n 9+ (used for Vue 3) is set to `legacy: true`,
+ * which is needed for Options API components.
+ *
+ * Yes, vue-i18n 9 has an `allowComposition` option,
+ * but it comes with limitations that this polyfill doesn't have and was removed in vue-i18n 10.
+ *
+ * @see https://vue-i18n.intlify.dev/guide/migration/vue3#limitations
+ * @see https://vue-i18n.intlify.dev/guide/migration/breaking10.html#drop-allowcomposition-option
+ */
+export function useI18n() {
+  const locale = computed({
+    get() {
+      return i18n.locale
+    },
+    set(locale) {
+      i18n.locale = locale
+    }
+  })
+
+  return {
+    locale,
+    t
+  }
+}
+
+/**
+ * @overload
+ * @param {string} key
+ * @returns {string}
+ */
+
+/**
+ * @overload
+ * @param {string} key
+ * @param {number} plural
+ * @returns {string}
+ */
+
+/**
+ * @overload
+ * @param {string} key
+ * @param {unknown[]} list
+ * @returns {string}
+ */
+
+/**
+ * @overload
+ * @param {string} key
+ * @param {unknown[]} list
+ * @param {number} plural
+ * @returns {string}
+ */
+
+/**
+ * @overload
+ * @param {string} key
+ * @param {Record<string, unknown>} named
+ * @returns {string}
+ */
+
+/**
+ * @overload
+ * @param {string} key
+ * @param {Record<string, unknown>} named
+ * @param {number} plural
+ * @returns {string}
+ */
+
+/**
+ * @param {string} key
+ * @param {number | unknown[] | Record<string, unknown> | undefined} arg1
+ * @param {number | undefined} arg2
+ * @returns {string}
+ */
+function t(key, arg1, arg2) {
+  // Remove these lines in the Vue 3 migration and pass all args to the `.t()` call
+  if (typeof arg1 === 'number') {
+    return i18n.tc(key, arg1)
+  } else if (typeof arg2 === 'number') {
+    return i18n.tc(key, arg2, arg1)
+  }
+
+  if (arg1 != null) {
+    return i18n.t(key, arg1)
+  }
+
+  return i18n.t(key)
+}
diff --git a/src/renderer/helpers/accessibility.js b/src/renderer/helpers/accessibility.js
index 880bf0ac45373..48f06552b7938 100644
--- a/src/renderer/helpers/accessibility.js
+++ b/src/renderer/helpers/accessibility.js
@@ -1,3 +1,7 @@
+/**
+ * @param {string} attribute
+ * @returns {string}
+ */
 export function sanitizeForHtmlId(attribute) {
   return attribute.replaceAll(/\s+/g, '')
 }
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index ee15c722431c6..e1ec96761cf9d 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -1,17 +1,30 @@
 import store from '../../store/index'
 import {
   calculatePublishedDate,
+  getRelativeTimeFromDate,
   stripHTML,
-  toLocalePublicationString,
 } from '../utils'
 import { isNullOrEmpty } from '../strings'
 import autolinker from 'autolinker'
 import { FormatUtils, Misc, Player } from 'youtubei.js'
 
+/** @typedef {{url: string, width: number, height: number}} InvidiousImageObject */
+/** @typedef {{quality: string, url: string, width: number, height: number}} InvidiousThumbnailObject */
+/** @typedef {{type: 'video', title: string, videoId: string, author: string, authorId: string, authorUrl: string, authorVerified: boolean, videoThumbnails: InvidiousThumbnailObject[], description: string?, descriptionHtml: string?, viewCount: number, viewCountText: string, lengthSeconds: number, published: number, publishedText: string, premiereTimestamp: number, liveNow: boolean, premium: boolean, isUpcoming: boolean, hasCaptions: boolean, is3d: boolean, is4k: boolean, is8k: boolean, isNew: boolean, isVr180: boolean, isVr360: boolean}} InvidiousVideoType */
+/** @typedef {{type: 'channel', author: string, authorId: string, authorUrl: string, authorVerified: boolean, authorThumbnails: InvidiousThumbnailObject[], autoGenerated: boolean, subCount: number, videoCount: number, description: string, descriptionHtml: string}} InvidiousChannelObject */
+/** @typedef {{type: 'playlist', title: string, playlistId: string, playlistThumbnail: string, author: string, authorId: string, authorUrl: string, authorVerified: boolean, videoCount: number, videos: {title: string, videoId: string, lengthSeconds: number, videoThumbnails: InvidiousThumbnailObject[]}[]}} InvidiousPlaylistObject */
+/** @typedef {{type: 'hashtag', title: string, url: string, channelCount: number, videoCount: number}} InvidiousHashtagObject */
+
+/**
+ * @returns {string}
+ */
 function getCurrentInstanceUrl() {
   return store.getters.getCurrentInvidiousInstanceUrl
 }
 
+/**
+ * @param {string} uri
+ */
 export function getProxyUrl(uri) {
   const currentInstance = getCurrentInstanceUrl()
 
@@ -24,6 +37,9 @@ export function getProxyUrl(uri) {
   return url.toString().replace(origin, currentInstance)
 }
 
+/**
+ * @param {string | URL} url
+ */
 export function invidiousFetch(url) {
   const authorization = store.getters.getCurrentInvidiousInstanceAuthorization
 
@@ -38,7 +54,7 @@ export function invidiousFetch(url) {
   }
 }
 
-export function invidiousAPICall({ resource, id = '', params = {}, doLogError = true, subResource = '' }) {
+function invidiousAPICall({ resource, id = '', params = {}, doLogError = true, subResource = '' }) {
   return new Promise((resolve, reject) => {
     const requestUrl = getCurrentInstanceUrl() + '/api/v1/' + resource + '/' + id + (!isNullOrEmpty(subResource) ? `/${subResource}` : '') + '?' + new URLSearchParams(params).toString()
     invidiousFetch(requestUrl)
@@ -78,6 +94,7 @@ async function resolveUrl(url) {
  * Gets the channel ID for a channel URL
  * used to get the ID for channel usernames and handles
  * @param {string} url
+ * @returns {Promise<string?>} channel ID
  */
 export async function invidiousGetChannelId(url) {
   try {
@@ -93,6 +110,28 @@ export async function invidiousGetChannelId(url) {
   }
 }
 
+/**
+ * @param {string} channelId
+ * @returns {Promise<{
+ *  author: string,
+ *  authorId: string,
+ *  authorUrl: string,
+ *  authorVerified: boolean,
+ *  authorBanners: InvidiousImageObject[],
+ *  authorThumbnails: InvidiousImageObject[],
+ *  subCount: number,
+ *  totalViews: number,
+ *  joined: number,
+ *  autoGenerated: boolean,
+ *  isFamilyFriendly: boolean,
+ *  description: string,
+ *  descriptionHtml: string,
+ *  allowedRegions: string[],
+ *  tabs: ('home' | 'videos' | 'shorts' | 'streams' | 'podcasts' | 'releases' | 'playlists' | 'community')[],
+ *  latestVideos: InvidiousVideoType[],
+ *  relatedChannels: InvidiousChannelObject[]
+ * }>}
+ */
 export async function invidiousGetChannelInfo(channelId) {
   return await invidiousAPICall({
     resource: 'channels',
@@ -100,19 +139,277 @@ export async function invidiousGetChannelInfo(channelId) {
   })
 }
 
-export async function invidiousGetPlaylistInfo(playlistId) {
+/**
+ * @param {string} tab
+ * @param {string} channelId
+ * @param {string | undefined | null} continuation
+ * @param {string | undefined} sortBy
+ */
+async function getInvidiousChannelTab(tab, channelId, continuation, sortBy) {
+  const params = {}
+
+  if (continuation) {
+    params.continuation = continuation
+  }
+
+  if (sortBy) {
+    params.sort_by = sortBy
+  }
+
   return await invidiousAPICall({
+    resource: 'channels',
+    id: channelId,
+    subResource: tab,
+    params
+  })
+}
+
+/**
+ * @param {string} channelId
+ * @param {string | undefined} sortBy
+ * @param {string | undefined | null} continuation
+ */
+export async function getInvidiousChannelVideos(channelId, sortBy, continuation) {
+  /** @type {{continuation: string?, videos: InvidiousVideoType[]}}  */
+  const response = await getInvidiousChannelTab('videos', channelId, continuation, sortBy)
+
+  setMultiplePublishedTimestamps(response.videos)
+
+  return response
+}
+
+/**
+ * @param {string} channelId
+ * @param {string | undefined} sortBy
+ * @param {string | undefined | null} continuation
+ */
+export async function getInvidiousChannelShorts(channelId, sortBy, continuation) {
+  /** @type {{continuation: string?, videos: InvidiousVideoType[]}}  */
+  const response = await getInvidiousChannelTab('shorts', channelId, continuation, sortBy)
+
+  // workaround for Invidious sending incorrect information
+  // https://github.com/iv-org/invidious/issues/3801
+  response.videos.forEach(video => {
+    video.isUpcoming = false
+    delete video.published
+    delete video.premiereTimestamp
+  })
+
+  return response
+}
+
+/**
+ * @param {string} channelId
+ * @param {string | undefined} sortBy
+ * @param {string | undefined | null} continuation
+ */
+export async function getInvidiousChannelLive(channelId, sortBy, continuation) {
+  /** @type {{continuation: string?, videos: InvidiousVideoType[]}}  */
+  const response = await getInvidiousChannelTab('streams', channelId, continuation, sortBy)
+
+  setMultiplePublishedTimestamps(response.videos)
+
+  return response
+}
+
+/**
+ * @param {string} channelId
+ * @param {string | undefined} sortBy
+ * @param {string | undefined | null} continuation
+ */
+export async function getInvidiousChannelPlaylists(channelId, sortBy, continuation) {
+  /** @type {{continuation: string?, playlists: InvidiousPlaylistObject[]}} */
+  return await getInvidiousChannelTab('playlists', channelId, continuation, sortBy)
+}
+
+/**
+ * @param {string} channelId
+ * @param {string | undefined | null} continuation
+ */
+export async function getInvidiousChannelReleases(channelId, continuation) {
+  /** @type {{continuation: string?, playlists: InvidiousPlaylistObject[]}} */
+  return await getInvidiousChannelTab('releases', channelId, continuation)
+}
+
+/**
+ * @param {string} channelId
+ * @param {string | undefined | null} continuation
+ */
+export async function getInvidiousChannelPodcasts(channelId, continuation) {
+  /** @type {{continuation: string?, playlists: InvidiousPlaylistObject[]}} */
+  return await getInvidiousChannelTab('podcasts', channelId, continuation)
+}
+
+/**
+ * @param {string} channelId
+ * @param {string} query
+ * @param {number} page
+ */
+export async function searchInvidiousChannel(channelId, query, page) {
+  /** @type {(InvidiousVideoType | InvidiousPlaylistObject)[]} */
+  const response = await invidiousAPICall({
+    resource: 'channels',
+    id: channelId,
+    subResource: 'search',
+    params: {
+      q: query,
+      page
+    }
+  })
+
+  response.forEach((item) => {
+    if (item.type === 'video') {
+      setPublishedTimestamp(item)
+    }
+  })
+
+  return response
+}
+
+/**
+ * @param {string} playlistId
+ * @returns {{
+ *  title: string,
+ *  playlistId: string,
+ *  author: string,
+ *  authorId: string,
+ *  authorThumbnails: InvidiousImageObject[],
+ *  description: string,
+ *  descriptionHtml: string,
+ *  videoCount: number,
+ *  viewCount: number,
+ *  updated: number,
+ *  videos: {
+ *    title: string,
+ *    videoId: string,
+ *    author: string,
+ *    authorId: string,
+ *    authorUrl: string,
+ *    videoThumbnails: InvidiousThumbnailObject[],
+ *    index: number,
+ *    lengthSeconds: number
+ *  }[]
+ * }}
+ */
+export async function invidiousGetPlaylistInfo(playlistId) {
+  const playlist = await invidiousAPICall({
     resource: 'playlists',
     id: playlistId,
   })
+
+  setMultiplePublishedTimestamps(playlist.videos)
+
+  return playlist
 }
 
+/**
+ * @param {string} videoId
+ * @returns {Promise<{
+ *  error: string,
+ *  type: 'video' | 'published',
+ *  title: string,
+ *  videoId: string,
+ *  videoThumbnails: InvidiousThumbnailObject[],
+ *  storyboards: {
+ *    url: string,
+ *    templateUrl: string,
+ *    width: number,
+ *    height: number,
+ *    count: number,
+ *    interval: number,
+ *    storyboardWidth: number,
+ *    storyboardHeight: number,
+ *    storyboardCount: number
+ *  }[],
+ *  description: string,
+ *  descriptionHtml: string,
+ *  published: number,
+ *  publishedText: string,
+ *  keywords: string[],
+ *  viewCount: number,
+ *  likeCount: number,
+ *  dislikeCount: number,
+ *  paid: boolean,
+ *  premium: boolean,
+ *  isFamilyFriendly: boolean,
+ *  allowedRegions: string[],
+ *  genre: string,
+ *  genreUrl: string,
+ *  author: string,
+ *  authorId: string
+ *  authorUrl: string,
+ *  authorThumbnails: InvidiousImageObject[],
+ *  subCountText: string,
+ *  lengthSeconds: number,
+ *  allowRatings: boolean,
+ *  rating: number,
+ *  isListed: boolean,
+ *  liveNow: boolean,
+ *  isPostLiveDvr: boolean,
+ *  isUpcoming: boolean,
+ *  dashUrl: string,
+ *  premiereTimestamp: number?,
+ *  hlsUrl: string?,
+ *  adaptiveFormats: {
+ *    index: string,
+ *    bitrate: string,
+ *    init: string,
+ *    url: string,
+ *    itag: string,
+ *    type; string,
+ *    clen: string,
+ *    lmt: string,
+ *    projectionType: string,
+ *    container: string,
+ *    encoding: string,
+ *    qualityLabel: string?,
+ *    fps: number?,
+ *    size: string?,
+ *    resolution: string?,
+ *    targetDurationSec: int?,
+ *    maxDvrDurationSec: int?,
+ *    audioQuality: string?,
+ *    audioSampleRate: string?,
+ *    audioChannels: string?,
+ *    colorInfo: string?,
+ *    captionTrack: string?
+ *  }[],
+ *  formatStreams: {
+ *    url: string,
+ *    itag: string,
+ *    type: string,
+ *    quality: string,
+ *    bitrate: string?,
+ *    fps: int?,
+ *    container: string,
+ *    encoding: string,
+ *    qualityLabel: string,
+ *    resolution: string,
+ *    size: string
+ *  }[],
+ *  captions: {
+ *    label: string,
+ *    language_code: string,
+ *    url: string
+ *  }[],
+ *  musicTracks: {
+ *    song: string,
+ *    artist: string,
+ *    album: string,
+ *    license: string
+ *  }[]?,
+ *  recommendedVideos: InvidiousVideoType[]
+ * }>}
+ */
 export async function invidiousGetVideoInformation(videoId) {
   return await invidiousAPICall({
     resource: 'videos',
     id: videoId,
   })
 }
+
+/** @typedef {{commentCount: number, videoId: string, continuation: string?, comments: {author: string, authorThumbnails: InvidiousImageObject[], authorId: string, authorUrl: string, isEdited: boolean, isPinned: boolean, content: string, contentHtml: string, published: number, publishedText: string, likeCount: number, commentId: string, authorIsChannelOwner: boolean, creatorHeart: { creatorThumbnail: string, creatorName: string}?, isSponsor: boolean, sponsorIconUrl: string, replies: {replyCount: number, continuation: string}}[]}} InvidiousCommentResponse */
+
 export async function invidiousGetComments({ id, nextPageToken = '', sortNewest = true }) {
   const payload = {
     resource: 'comments',
@@ -122,6 +419,8 @@ export async function invidiousGetComments({ id, nextPageToken = '', sortNewest
       sort_by: sortNewest ? 'new' : 'top'
     }
   }
+
+  /** @type {InvidiousCommentResponse} */
   const response = await invidiousAPICall(payload)
 
   const commentData = parseInvidiousCommentData(response)
@@ -142,6 +441,135 @@ export async function invidiousGetCommentReplies({ id, replyToken }) {
   return { commentData: parseInvidiousCommentData(response), continuation: response.continuation ?? null }
 }
 
+/**
+ * @param {string} query
+ * @returns {Promise<{ query: string, suggestions: string[]}>}
+ */
+export async function getInvidiousSearchSuggestions(query) {
+  return await invidiousAPICall({
+    resource: 'search/suggestions',
+    id: '',
+    params: {
+      q: query
+    }
+  })
+}
+
+/**
+ * @returns {Promise<{
+ *  type: 'shortVideo',
+ *  title: string,
+ *  videoId: string,
+ *  videoThumbnails: InvidiousThumbnailObject[],
+ *  lengthSeconds: number,
+ *  viewCount: number,
+ *  author: string,
+ *  authorId: string,
+ *  authorUrl: string,
+ *  published: number,
+ *  publishedText: string
+ * }[]>}
+ */
+export async function getInvidiousPopularFeed() {
+  const response = await invidiousAPICall({
+    resource: 'popular',
+    id: '',
+    params: {}
+  })
+
+  const items = response.filter((item) => {
+    return item.type === 'video' || item.type === 'shortVideo' || item.type === 'channel' || item.type === 'playlist'
+  })
+
+  items.forEach((item) => {
+    if (item.type === 'video' || item.type === 'shortVideo') {
+      setPublishedTimestamp(item)
+    }
+  })
+
+  return items
+}
+
+/**
+ * @param {'default' | 'music' | 'gaming' | 'movies'} tab
+ * @param {string} region
+ * @returns {Promise<InvidiousVideoType[] | null>}
+ */
+export async function getInvidiousTrending(tab, region) {
+  const params = {
+    resource: 'trending',
+    id: '',
+    params: {
+      region
+    }
+  }
+
+  if (tab !== 'default') {
+    params.params.type = tab.charAt(0).toUpperCase() + tab.substring(1)
+  }
+
+  const response = await invidiousAPICall(params)
+
+  if (!response) {
+    return null
+  }
+
+  const items = response.filter((item) => {
+    return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
+  })
+
+  items.forEach((item) => {
+    if (item.type === 'video') {
+      setPublishedTimestamp(item)
+    }
+  })
+
+  return items
+}
+
+/**
+ * @param {string} query
+ * @param {number} page
+ * @param {any} searchSettings
+ */
+export async function getInvidiousSearchResults(query, page, searchSettings) {
+  /** @type {Promise<(InvidiousChannelObject | InvidiousPlaylistObject | InvidiousVideoType | InvidiousHashtagObject)[] | null>} */
+  let results = await invidiousAPICall({
+    resource: 'search',
+    id: '',
+    params: {
+      q: query,
+      page,
+      sort_by: searchSettings.sortBy,
+      date: searchSettings.time,
+      duration: searchSettings.duration,
+      type: searchSettings.type,
+      features: searchSettings.features.join(',')
+    }
+  })
+
+  if (!results) {
+    return null
+  }
+
+  results = results.filter((item) => {
+    return item.type === 'video' || item.type === 'channel' || item.type === 'playlist' || item.type === 'hashtag'
+  })
+
+  results.forEach((item) => {
+    if (item.type === 'video') {
+      setPublishedTimestamp(item)
+    }
+  })
+
+  return results
+}
+
+/**
+ * @param {string} url
+ * @param {string?} currentInstance
+ * @returns {string?}
+ */
 export function youtubeImageUrlToInvidious(url, currentInstance = null) {
   if (url == null) {
     return null
@@ -160,32 +588,40 @@ export function youtubeImageUrlToInvidious(url, currentInstance = null) {
     .replace(/https:\/\/i\d*\.ytimg\.com/, newUrl)
 }
 
+/**
+ * @param {string} url
+ * @param {string?} currentInstance
+ * @returns {string}
+ */
 export function invidiousImageUrlToInvidious(url, currentInstance = null) {
   return url.replaceAll(/(\/ggpht\/)/g, `${currentInstance}/ggpht/`)
 }
 
+/**
+ * @param {InvidiousCommentResponse} response
+ */
 function parseInvidiousCommentData(response) {
   return response.comments.map((comment) => {
-    comment.id = comment.commentId
-    comment.showReplies = false
-    comment.authorLink = comment.authorId
-    comment.authorThumb = youtubeImageUrlToInvidious(comment.authorThumbnails.at(-1).url)
-    comment.likes = comment.likeCount
-    comment.text = autolinker.link(stripHTML(invidiousImageUrlToInvidious(comment.contentHtml, getCurrentInstanceUrl())))
-    comment.dataType = 'invidious'
-    comment.isOwner = comment.authorIsChannelOwner
-    comment.numReplies = comment.replies?.replyCount ?? 0
-    comment.hasReplyToken = !!comment.replies?.continuation
-    comment.replyToken = comment.replies?.continuation ?? ''
-    comment.isHearted = comment.creatorHeart !== undefined
-    comment.isMember = comment.isSponsor
-    comment.memberIconUrl = youtubeImageUrlToInvidious(comment.sponsorIconUrl)
-    comment.replies = []
-    comment.time = toLocalePublicationString({
-      publishText: comment.publishedText
-    })
-
-    return comment
+    return {
+      id: comment.commentId,
+      showReplies: false,
+      authorLink: comment.authorId,
+      authorThumb: youtubeImageUrlToInvidious(comment.authorThumbnails.at(-1).url),
+      author: comment.author,
+      likes: comment.likeCount,
+      text: autolinker.link(stripHTML(invidiousImageUrlToInvidious(comment.contentHtml, getCurrentInstanceUrl()))),
+      dataType: 'invidious',
+      isOwner: comment.authorIsChannelOwner,
+      isPinned: comment.isPinned,
+      numReplies: comment.replies?.replyCount ?? 0,
+      hasReplyToken: !!comment.replies?.continuation,
+      replyToken: comment.replies?.continuation ?? '',
+      isHearted: comment.creatorHeart !== undefined,
+      isMember: comment.isSponsor,
+      memberIconUrl: youtubeImageUrlToInvidious(comment.sponsorIconUrl),
+      replies: [],
+      time: getRelativeTimeFromDate(comment.published * 1000, false)
+    }
   })
 }
 
@@ -274,6 +710,7 @@ function parseInvidiousCommunityData(data) {
     voteCount: data.likeCount,
     postContent: parseInvidiousCommunityAttachments(data.attachment),
     commentCount: data?.replyCount ?? 0, // https://github.com/iv-org/invidious/pull/3635/
+    authorId: data.authorId,
     author: data.author,
     type: 'community'
   }
@@ -373,30 +810,21 @@ function parseInvidiousCommunityAttachments(data) {
 }
 
 /**
- * Invidious doesn't include the correct height or width for all formats in their API response and are also missing the fps and qualityLabel for the AV1 formats.
- * When the local API is supported we generate our own manifest with the local API manifest generator, based on the Invidious API response and the height, width and fps extracted from Invidious' DASH manifest.
- * As Invidious only includes h264 and AV1 in their DASH manifest, we have to always filter out the VP9 formats, due to missing information.
- * @param {any[]} formats
+ * @param {string} hashtag
+ * @param {number} page
  */
-export function filterInvidiousFormats(formats) {
-  return formats.filter(format => {
-    const mimeType = format.type
-
-    return mimeType.startsWith('audio/') ||
-      mimeType.startsWith('video/mp4; codecs="avc') ||
-      mimeType.startsWith('video/mp4; codecs="av01')
-  })
-}
-
-export async function getHashtagInvidious(hashtag, page) {
-  const payload = {
+export async function getHashtagInvidious(hashtag, page = 1) {
+  /** @type {{results: InvidiousVideoType[]}} */
+  const response = await invidiousAPICall({
     resource: 'hashtag',
     id: hashtag,
     params: {
       page
     }
-  }
-  const response = await invidiousAPICall(payload)
+  })
+
+  setMultiplePublishedTimestamps(response.results)
+
   return response.results
 }
 
@@ -473,18 +901,9 @@ export function convertInvidiousToLocalFormat(format) {
 
 /**
  * @param {any} format
- * @param {boolean} trustApiResponse
  */
-export function mapInvidiousLegacyFormat(format, trustApiResponse) {
-  let width
-  let height
-
-  if (trustApiResponse) {
-    const [stringWidth, stringHeight] = format.size.split('x')
-
-    width = parseInt(stringWidth)
-    height = parseInt(stringHeight)
-  }
+export function mapInvidiousLegacyFormat(format) {
+  const [stringWidth, stringHeight] = format.size.split('x')
 
   return {
     itag: format.itag,
@@ -492,8 +911,38 @@ export function mapInvidiousLegacyFormat(format, trustApiResponse) {
     fps: format.fps,
     bitrate: parseInt(format.bitrate),
     mimeType: format.type,
-    height,
-    width,
+    height: parseInt(stringHeight),
+    width: parseInt(stringWidth),
     url: format.url
   }
 }
+
+/**
+ * @param {{
+ *  liveNow: boolean,
+ *  isUpcoming: boolean,
+ *  premiereTimestamp: number,
+ *  published: number
+ * }[]} videos
+ */
+function setMultiplePublishedTimestamps(videos) {
+  videos.forEach(setPublishedTimestamp)
+}
+
+/**
+ * @param {{
+ *  liveNow: boolean,
+ *  isUpcoming: boolean,
+ *  premiereTimestamp: number,
+ *  published: number
+ * }} video
+ */
+function setPublishedTimestamp(video) {
+  if (video.liveNow) {
+    video.published = new Date().getTime()
+  } else if (video.isUpcoming) {
+    video.published = video.premiereTimestamp * 1000
+  } else if (typeof video.published === 'number') {
+    video.published *= 1000
+  }
+}
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index cc982b6fb48a4..d5ad4aeb1bf76 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,4 +1,4 @@
-import { ClientType, Endpoints, Innertube, Misc, Parser, UniversalCache, Utils, YT } from 'youtubei.js'
+import { ClientType, Innertube, Misc, Parser, UniversalCache, Utils, YT, YTNodes } from 'youtubei.js'
 import Autolinker from 'autolinker'
 import { SEARCH_CHAR_LIMIT } from '../../../constants'
 
@@ -9,8 +9,8 @@ import {
   escapeHTML,
   extractNumberFromString,
   getChannelPlaylistId,
+  getRelativeTimeFromDate,
   randomArrayItem,
-  toLocalePublicationString
 } from '../utils'
 
 const TRACKING_PARAM_NAMES = [
@@ -178,7 +178,7 @@ export async function untilEndOfLocalPlayList(playlist, callback, options = { ru
 /**
  * @param {string} location
  * @param {'default'|'music'|'gaming'|'movies'} tab
- * @param {import('youtubei.js').Mixins.TabbedFeed|null} instance
+ * @param {import('youtubei.js').Mixins.TabbedFeed<import('youtubei.js').IBrowseResponse> | null} instance
  */
 export async function getLocalTrending(location, tab, instance) {
   if (instance === null) {
@@ -253,54 +253,44 @@ export async function getLocalVideoInfo(id) {
     id = trailerScreen.video_id
   }
 
-  // try to bypass the age restriction
-  if (info.playability_status.status === 'LOGIN_REQUIRED' || (hasTrailer && trailerIsAgeRestricted)) {
-    const tvInnertube = await createInnertube({ withPlayer: true, clientType: ClientType.TV_EMBEDDED, generateSessionLocally: false })
-
-    const tvInfo = await tvInnertube.getBasicInfo(id, 'TV_EMBEDDED')
-
-    if (tvInfo.streaming_data) {
-      decipherFormats(tvInfo.streaming_data.adaptive_formats, tvInnertube.actions.session.player)
-      decipherFormats(tvInfo.streaming_data.formats, tvInnertube.actions.session.player)
-    }
-
-    info.playability_status = tvInfo.playability_status
-    info.streaming_data = tvInfo.streaming_data
-    info.basic_info.start_timestamp = tvInfo.basic_info.start_timestamp
-    info.basic_info.duration = tvInfo.basic_info.duration
-    info.captions = tvInfo.captions
-    info.storyboards = tvInfo.storyboards
-  } else {
-    const iosInnertube = await createInnertube({ clientType: ClientType.IOS })
-
-    const iosInfo = await iosInnertube.getBasicInfo(id, 'iOS')
+  if ((info.playability_status.status === 'UNPLAYABLE' && (!hasTrailer || trailerIsAgeRestricted)) ||
+    info.playability_status.status === 'LOGIN_REQUIRED') {
+    return info
+  }
 
-    if (hasTrailer) {
-      info.playability_status = iosInfo.playability_status
-      info.streaming_data = iosInfo.streaming_data
-      info.basic_info.start_timestamp = iosInfo.basic_info.start_timestamp
-      info.basic_info.duration = iosInfo.basic_info.duration
-      info.captions = iosInfo.captions
-      info.storyboards = iosInfo.storyboards
-    } else if (iosInfo.streaming_data) {
-      info.streaming_data.adaptive_formats = iosInfo.streaming_data.adaptive_formats
-      info.streaming_data.hls_manifest_url = iosInfo.streaming_data.hls_manifest_url
+  const iosInnertube = await createInnertube({ clientType: ClientType.IOS })
 
-      // Use the legacy formats from the original web response as the iOS client doesn't have any legacy formats
+  const iosInfo = await iosInnertube.getBasicInfo(id, 'iOS')
 
-      for (const format of info.streaming_data.adaptive_formats) {
-        format.freeTubeUrl = format.url
-      }
+  if (hasTrailer) {
+    info.playability_status = iosInfo.playability_status
+    info.streaming_data = iosInfo.streaming_data
+    info.basic_info.start_timestamp = iosInfo.basic_info.start_timestamp
+    info.basic_info.duration = iosInfo.basic_info.duration
+    info.captions = iosInfo.captions
+    info.storyboards = iosInfo.storyboards
+  } else if (iosInfo.streaming_data) {
+    info.streaming_data.adaptive_formats = iosInfo.streaming_data.adaptive_formats
+    info.streaming_data.hls_manifest_url = iosInfo.streaming_data.hls_manifest_url
+
+    // Use the legacy formats from the original web response as the iOS client doesn't have any legacy formats
+
+    for (const format of info.streaming_data.adaptive_formats) {
+      format.freeTubeUrl = format.url
     }
+  }
 
-    if (info.streaming_data) {
-      decipherFormats(info.streaming_data.formats, webInnertube.actions.session.player)
-    }
+  if (info.streaming_data) {
+    decipherFormats(info.streaming_data.formats, webInnertube.actions.session.player)
   }
 
   return info
 }
 
+/**
+ * @param {string} id
+ * @param {boolean | undefined} sortByNewest
+ */
 export async function getLocalComments(id, sortByNewest = false) {
   const innertube = await createInnertube()
   return innertube.getComments(id, sortByNewest ? 'NEWEST_FIRST' : 'TOP_COMMENTS')
@@ -379,12 +369,12 @@ export async function getLocalChannelVideos(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
-      browse_id: id,
+    const response = await innertube.actions.execute('/browse', {
+      browseId: id,
       params: 'EgZ2aWRlb3PyBgQKAjoA'
       // protobuf for the videos tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    }))
+    })
 
     const videosTab = new YT.Channel(null, response)
     const { id: channelId = id, name, thumbnailUrl } = parseLocalChannelHeader(videosTab, true)
@@ -436,12 +426,12 @@ export async function getLocalChannelLiveStreams(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
-      browse_id: id,
+    const response = await innertube.actions.execute('/browse', {
+      browseId: id,
       params: 'EgdzdHJlYW1z8gYECgJ6AA%3D%3D'
       // protobuf for the live tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    }))
+    })
 
     let liveStreamsTab = new YT.Channel(innertube.actions, response)
     const { id: channelId = id, name, thumbnailUrl } = parseLocalChannelHeader(liveStreamsTab, true)
@@ -484,12 +474,12 @@ export async function getLocalChannelCommunity(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
-      browse_id: id,
+    const response = await innertube.actions.execute('/browse', {
+      browseId: id,
       params: 'Egljb21tdW5pdHnyBgQKAkoA'
       // protobuf for the community tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    }))
+    })
 
     const communityTab = new YT.Channel(null, response)
 
@@ -564,15 +554,15 @@ export async function getLocalArtistTopicChannelReleasesContinuation(channel, co
  * @param {boolean} onlyIdNameThumbnail
  */
 export function parseLocalChannelHeader(channel, onlyIdNameThumbnail = false) {
-  /** @type {string=} */
+  /** @type {string?} */
   let id
   /** @type {string} */
   let name
-  /** @type {string=} */
+  /** @type {string?} */
   let thumbnailUrl
-  /** @type {string=} */
+  /** @type {string?} */
   let bannerUrl
-  /** @type {string=} */
+  /** @type {string?} */
   let subscriberText
   /** @type {string[]} */
   const tags = []
@@ -668,6 +658,8 @@ export function parseLocalChannelHeader(channel, onlyIdNameThumbnail = false) {
           const image = header.content.image
           thumbnailUrl = image.avatar?.image[0].url
         }
+      } else if (header.content.animated_image) {
+        thumbnailUrl = header.content.animated_image.image[0].url
       }
 
       if (!thumbnailUrl && channel.metadata.thumbnail) {
@@ -740,66 +732,78 @@ export function parseLocalChannelVideos(videos, channelId, channelName) {
   return parsedVideos
 }
 
+export function parseShort(short, channelId, channelName) {
+  if (short.type === 'ReelItem') {
+    /** @type {import('youtubei.js').YTNodes.ReelItem} */
+    const reelItem = short
+
+    return {
+      type: 'video',
+      videoId: reelItem.id,
+      title: reelItem.title.text,
+      author: channelName,
+      authorId: channelId,
+      viewCount: reelItem.views.isEmpty() ? null : parseLocalSubscriberCount(reelItem.views.text),
+      lengthSeconds: ''
+    }
+  } else {
+    /** @type {import('youtubei.js').YTNodes.ShortsLockupView} */
+    const shortsLockupView = short
+
+    return {
+      type: 'video',
+      videoId: shortsLockupView.on_tap_endpoint.payload.videoId,
+      title: shortsLockupView.overlay_metadata.primary_text.text,
+      author: channelName,
+      authorId: channelId,
+      viewCount: shortsLockupView.overlay_metadata.secondary_text ? parseLocalSubscriberCount(shortsLockupView.overlay_metadata.secondary_text.text) : null,
+      lengthSeconds: ''
+    }
+  }
+}
+
 /**
  * @param {(import('youtubei.js').YTNodes.ReelItem | import('youtubei.js').YTNodes.ShortsLockupView)[]} shorts
  * @param {string} channelId
  * @param {string} channelName
  */
 export function parseLocalChannelShorts(shorts, channelId, channelName) {
-  return shorts.map(short => {
-    if (short.type === 'ReelItem') {
-      /** @type {import('youtubei.js').YTNodes.ReelItem} */
-      const reelItem = short
-
-      return {
-        type: 'video',
-        videoId: reelItem.id,
-        title: reelItem.title.text,
-        author: channelName,
-        authorId: channelId,
-        viewCount: reelItem.views.isEmpty() ? null : parseLocalSubscriberCount(reelItem.views.text),
-        lengthSeconds: ''
-      }
-    } else {
-      /** @type {import('youtubei.js').YTNodes.ShortsLockupView} */
-      const shortsLockupView = short
-
-      return {
-        type: 'video',
-        videoId: shortsLockupView.on_tap_endpoint.payload.videoId,
-        title: shortsLockupView.overlay_metadata.primary_text.text,
-        author: channelName,
-        authorId: channelId,
-        viewCount: shortsLockupView.overlay_metadata.secondary_text ? parseLocalSubscriberCount(shortsLockupView.overlay_metadata.secondary_text.text) : null,
-        lengthSeconds: ''
-      }
-    }
-  })
+  return shorts.map(short => parseShort(short, channelId, channelName))
 }
 
 /**
  * @param {import('youtubei.js').YTNodes.Playlist|import('youtubei.js').YTNodes.GridPlaylist|import('youtubei.js').YTNodes.LockupView} playlist
  * @param {string} channelId
- * @param {string} chanelName
+ * @param {string} channelName
  */
 export function parseLocalListPlaylist(playlist, channelId = undefined, channelName = undefined) {
   if (playlist.type === 'LockupView') {
-    /** @type {import('youtubei.js').YTNodes.LockupView} */
-    const lockupView = playlist
+    return parseLockupView(playlist, channelId, channelName)
+  } else if (playlist.type === 'CompactStation') {
+    /** @type {import('youtubei.js').YTNodes.CompactStation} */
+    const compactStation = playlist
 
-    /** @type {import('youtubei.js').YTNodes.ThumbnailOverlayBadgeView} */
-    const thumbnailOverlayBadgeView = lockupView.content_image.primary_thumbnail.overlays
-      .find(overlay => overlay.type === 'ThumbnailOverlayBadgeView')
+    return {
+      type: 'playlist',
+      dataSource: 'local',
+      title: compactStation.title.text,
+      thumbnail: compactStation.thumbnail[1].url,
+      playlistId: compactStation.endpoint.payload.playlistId,
+      videoCount: extractNumberFromString(compactStation.video_count.text)
+    }
+  } else if (playlist.type === 'GridPlaylist') {
+    /** @type {import('youtubei.js').YTNodes.GridPlaylist} */
+    const gridPlaylist = playlist
 
     return {
       type: 'playlist',
       dataSource: 'local',
-      title: lockupView.metadata.title.text,
-      thumbnail: lockupView.content_image.primary_thumbnail.image[0].url,
-      channelName,
-      channelId,
-      playlistId: lockupView.content_id,
-      videoCount: extractNumberFromString(thumbnailOverlayBadgeView.badges[0].text)
+      title: gridPlaylist.title.text,
+      thumbnail: gridPlaylist.thumbnails.at(0).url,
+      playlistId: gridPlaylist.id,
+      channelName: gridPlaylist.author?.name,
+      channelId: gridPlaylist.author?.id,
+      videoCount: extractNumberFromString(gridPlaylist.video_count.text)
     }
   } else {
     let internalChannelName
@@ -841,24 +845,6 @@ export function parseLocalListPlaylist(playlist, channelId = undefined, channelN
   }
 }
 
-/**
- * @param {import('youtubei.js').YTNodes.CompactStation} compactStation
- * @param {string} channelId
- * @param {string} channelName
- */
-export function parseLocalCompactStation(compactStation, channelId, channelName) {
-  return {
-    type: 'playlist',
-    dataSource: 'local',
-    title: compactStation.title.text,
-    thumbnail: compactStation.thumbnail[1].url,
-    channelName,
-    channelId,
-    playlistId: compactStation.endpoint.payload.playlistId,
-    videoCount: extractNumberFromString(compactStation.video_count.text)
-  }
-}
-
 /**
  * @param {YT.Search} response
  */
@@ -872,9 +858,10 @@ function handleSearchResponse(response) {
 
   const results = response.results
     .filter((item) => {
-      return item.type === 'Video' || item.type === 'Channel' || item.type === 'Playlist' || item.type === 'HashtagTile' || item.type === 'Movie'
+      return item.type === 'Video' || item.type === 'Channel' || item.type === 'Playlist' || item.type === 'HashtagTile' || item.type === 'Movie' || item.type === 'LockupView'
     })
     .map((item) => parseListItem(item))
+    .filter((item) => item)
 
   return {
     results,
@@ -883,6 +870,65 @@ function handleSearchResponse(response) {
   }
 }
 
+/**
+ * @param {import('youtubei.js').YT.Channel} homeTab
+ */
+export function parseChannelHomeTab(homeTab) {
+  /**
+   * @type {import('youtubei.js').YTNodes.ItemSection | import('youtubei.js').YTNodes.RichSection}
+   */
+  let section
+  const shelves = []
+  for (section of homeTab.current_tab.content.contents) {
+    if (section.type === 'ItemSection') {
+      /**
+       * @type {import('youtubei.js').YTNodes.ItemSection}
+       */
+      const itemSection = section
+      if (itemSection.contents.at(0).type === 'Shelf') {
+        /** @type {import('youtubei.js').YTNodes.Shelf} */
+        const shelf = itemSection.contents.at(0)
+        shelves.push({
+          title: shelf.title.text,
+          content: shelf.content.items.map(parseListItem).filter(_ => _),
+          playlistId: shelf.play_all_button?.endpoint.payload.playlistId,
+          subtitle: shelf.subtitle?.text
+        })
+      } else if (itemSection.contents.at(0).type === 'ReelShelf') {
+        /** @type {import('youtubei.js').YTNodes.ReelShelf} */
+        const shelf = itemSection.contents.at(0)
+        shelves.push({
+          title: shelf.title.text,
+          content: shelf.items.map(parseListItem).filter(_ => _)
+        })
+      } else if (itemSection.contents.at(0).type === 'HorizontalCardList') {
+        /** @type {import('youtubei.js').YTNodes.HorizontalCardList} */
+        const shelf = itemSection.contents.at(0)
+        shelves.push({
+          title: shelf.header.title.text,
+          content: shelf.cards.map(parseListItem).filter(_ => _),
+          subtitle: shelf.header.subtitle.text
+        })
+      }
+    } else if (section.type === 'RichSection') {
+      if (section.content.type === 'RichShelf') {
+        /** @type {import('youtubei.js').YTNodes.RichShelf} */
+        const shelf = section.content
+        shelves.push({
+          title: shelf.title?.text,
+          content: shelf.contents.map(e => parseListItem(e.content)),
+          subtitle: shelf.subtitle?.text,
+          playlistId: shelf.endpoint?.metadata.url.includes('/playlist') ? shelf.endpoint?.metadata.url.replace('/playlist?list=', '') : null
+        })
+      }
+    }
+  }
+
+  shelves.forEach(e => {
+    e['isCommunity'] = e.content.at(0)?.type === 'community'
+  })
+  return shelves
+}
 /**
  * @param {import('youtubei.js').YTNodes.PlaylistVideo|import('youtubei.js').YTNodes.ReelItem|import('youtubei.js').YTNodes.ShortsLockupView} video
  */
@@ -1022,8 +1068,48 @@ export function parseLocalListVideo(item) {
       lengthSeconds: isNaN(movie.duration.seconds) ? '' : movie.duration.seconds,
       liveNow: false,
       isUpcoming: false,
-      is4k: movie.is_4k,
-      hasCaptions: movie.has_captions
+    }
+  } else if (item.type === 'GridVideo') {
+    /** @type {import('youtubei.js').YTNodes.GridVideo} */
+    const video = item
+
+    let publishedText
+
+    if (video.published != null && !video.published.isEmpty()) {
+      publishedText = video.published.text
+    }
+
+    const published = calculatePublishedDate(
+      publishedText,
+      video.is_live,
+      video.is_upcoming || video.is_premiere,
+      video.upcoming
+    )
+
+    return {
+      type: 'video',
+      videoId: video.id,
+      title: video.title.text,
+      author: video.author?.name,
+      authorId: video.author?.id,
+      viewCount: video.views.text == null ? null : extractNumberFromString(video.views.text),
+      published,
+      lengthSeconds: Utils.timeToSeconds(video.duration.text),
+      isUpcoming: video.is_upcoming,
+      premiereDate: video.upcoming
+    }
+  } else if (item.type === 'GridMovie') {
+    /** @type {import('youtubei.js').YTNodes.GridMovie} */
+    const movie = item
+    return {
+      type: 'video',
+      videoId: movie.id,
+      title: movie.title.text,
+      author: movie.author.name,
+      authorId: movie.author.id !== 'N/A' ? movie.author.id : null,
+      lengthSeconds: isNaN(movie.duration.seconds) ? '' : movie.duration.seconds,
+      isUpcoming: movie.is_upcoming,
+      premiereDate: movie.upcoming
     }
   } else {
     /** @type {import('youtubei.js').YTNodes.Video} */
@@ -1049,18 +1135,68 @@ export function parseLocalListVideo(item) {
       author: video.author.name,
       authorId: video.author.id,
       description: video.description,
-      viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),
+      viewCount: video.view_count?.text == null ? (video.short_view_count.text == null ? null : parseLocalSubscriberCount(video.short_view_count.text)) : extractNumberFromString(video.view_count.text),
       published,
       lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
       liveNow: video.is_live,
       isUpcoming: video.is_upcoming || video.is_premiere,
       premiereDate: video.upcoming,
       is4k: video.is_4k,
+      is8k: video.badges.some(badge => badge.label === '8K'),
+      isNew: video.badges.some(badge => badge.label === 'New'),
+      isVr180: video.badges.some(badge => badge.label === 'VR180'),
+      isVr360: video.badges.some(badge => badge.label === '360°'),
+      is3d: video.badges.some(badge => badge.label === '3D'),
       hasCaptions: video.has_captions
     }
   }
 }
 
+/**
+ * @param {import('youtubei.js').YTNodes.LockupView} lockupView
+ * @param {string | undefined} channelId
+ * @param {string | undefined} channelName
+ */
+function parseLockupView(lockupView, channelId = undefined, channelName = undefined) {
+  switch (lockupView.content_type) {
+    case 'ALBUM':
+    case 'PLAYLIST':
+    case 'PODCAST': {
+      const thumbnailOverlayBadgeView = lockupView.content_image.primary_thumbnail.overlays
+        .find(overlay => overlay.is(YTNodes.ThumbnailOverlayBadgeView))
+
+      const playlistId = lockupView.content_id
+
+      // Filter out mixes without playlist pages (we don't support watch page-only mixes)
+      // https://wiki.archiveteam.org/index.php/YouTube/Technical_details#Playlists
+      if (playlistId.startsWith('RD') && !playlistId.startsWith('RDCL')) {
+        return null
+      }
+
+      const maybeChannelText = lockupView.metadata?.metadata?.metadata_rows?.[0]?.metadata_parts?.[0]?.text
+
+      if (maybeChannelText && maybeChannelText.endpoint?.metadata.page_type === 'WEB_PAGE_TYPE_CHANNEL') {
+        channelName = maybeChannelText.text
+        channelId = maybeChannelText.endpoint.payload.browseId
+      }
+
+      return {
+        type: 'playlist',
+        dataSource: 'local',
+        playlistId,
+        title: lockupView.metadata.title.text,
+        thumbnail: lockupView.content_image.primary_thumbnail.image[0].url,
+        channelName,
+        channelId,
+        videoCount: extractNumberFromString(thumbnailOverlayBadgeView.badges[0].text)
+      }
+    }
+    default:
+      console.warn(`Unknown lockup content type: ${lockupView.content_type}`, lockupView)
+      return null
+  }
+}
+
 /**
  * @param {import('youtubei.js').Helpers.YTNode} item
  */
@@ -1068,7 +1204,45 @@ function parseListItem(item) {
   switch (item.type) {
     case 'Movie':
     case 'Video':
+    case 'GridVideo':
+    case 'GridMovie':
+    case 'VideoCard':
       return parseLocalListVideo(item)
+    case 'GameCard': {
+      /** @type {import('youtubei.js').YTNodes.GameCard} */
+      const channel = item
+      /** @type {import('youtubei.js').YTNodes.GameDetails} */
+      const game = channel.game
+      return {
+        type: 'channel',
+        dataSource: 'local',
+        thumbnail: game.box_art.at(0).url.replace(/^\/\//, 'https://'),
+        name: game.title.text,
+        id: game.endpoint.payload.browseId,
+        isGame: true
+      }
+    }
+    case 'GridChannel': {
+      /** @type {import('youtubei.js').YTNodes.GridChannel} */
+      const channel = item
+      let subscribers = null
+      let videos = null
+
+      subscribers = parseLocalSubscriberCount(channel.subscribers.text)
+      videos = extractNumberFromString(channel.video_count.text)
+
+      return {
+        type: 'channel',
+        dataSource: 'local',
+        thumbnail: channel.author.best_thumbnail?.url.replace(/^\/\//, 'https://'),
+        name: channel.author.name,
+        id: channel.author.id,
+        subscribers,
+        videos,
+        handle: null,
+        descriptionShort: channel.description_snippet?.text
+      }
+    }
     case 'Channel': {
       /** @type {import('youtubei.js').YTNodes.Channel} */
       const channel = item
@@ -1084,20 +1258,20 @@ function parseListItem(item) {
         handle = channel.subscriber_count.text
 
         if (!channel.video_count.isEmpty()) {
-          subscribers = channel.video_count.text
+          subscribers = parseLocalSubscriberCount(channel.video_count.text)
         }
       } else {
         videos = extractNumberFromString(channel.video_count.text)
 
         if (!channel.subscriber_count.isEmpty()) {
-          subscribers = channel.subscriber_count.text
+          subscribers = parseLocalSubscriberCount(channel.subscriber_count.text)
         }
       }
 
       return {
         type: 'channel',
         dataSource: 'local',
-        thumbnail: channel.author.best_thumbnail?.url,
+        thumbnail: channel.author.best_thumbnail?.url.replace(/^\/\//, 'https://'),
         name: channel.author.name,
         id: channel.author.id,
         subscribers,
@@ -1117,9 +1291,20 @@ function parseListItem(item) {
         channelCount: hashtag.hashtag_channel_count.isEmpty() ? null : parseLocalSubscriberCount(hashtag.hashtag_channel_count.text)
       }
     }
+    case 'ReelItem':
+    case 'ShortsLockupView': {
+      return parseShort(item)
+    }
+    case 'CompactStation':
+    case 'GridPlaylist':
     case 'Playlist': {
       return parseLocalListPlaylist(item)
     }
+    case 'Post': {
+      return parseLocalCommunityPost(item)
+    }
+    case 'LockupView':
+      return parseLockupView(item)
   }
 }
 
@@ -1322,7 +1507,7 @@ export function mapLocalLegacyFormat(format) {
 }
 
 /**
- * @param {import('youtubei.js').YTNodes.Comment|import('youtubei.js').YTNodes.CommentView} comment
+ * @param {import('youtubei.js').YTNodes.CommentView} comment
  * @param {import('youtubei.js').YTNodes.CommentThread} commentThread
  */
 export function parseLocalComment(comment, commentThread = undefined) {
@@ -1336,7 +1521,7 @@ export function parseLocalComment(comment, commentThread = undefined) {
     hasReplyToken = true
   }
 
-  const parsed = {
+  return {
     id: comment.comment_id,
     dataType: 'local',
     authorLink: comment.author.id,
@@ -1353,33 +1538,11 @@ export function parseLocalComment(comment, commentThread = undefined) {
     replyToken,
     showReplies: false,
     replies: [],
-
-    // default values for the properties set below
-    memberIconUrl: '',
-    time: '',
-    likes: 0,
-    numReplies: 0
+    memberIconUrl: comment.is_member ? comment.member_badge.url : '',
+    time: getRelativeTimeFromDate(calculatePublishedDate(comment.published_time.replace('(edited)', '').trim()), false),
+    likes: comment.like_count,
+    numReplies: parseLocalSubscriberCount(comment.reply_count)
   }
-
-  if (comment.type === 'Comment') {
-    /** @type {import('youtubei.js').YTNodes.Comment} */
-    const comment_ = comment
-
-    parsed.memberIconUrl = comment_.is_member ? comment_.sponsor_comment_badge.custom_badge[0].url : ''
-    parsed.time = toLocalePublicationString({ publishText: comment_.published.text.replace('(edited)', '').trim() })
-    parsed.likes = comment_.vote_count
-    parsed.numReplies = comment_.reply_count
-  } else {
-    /** @type {import('youtubei.js').YTNodes.CommentView} */
-    const commentView = comment
-
-    parsed.memberIconUrl = commentView.is_member ? commentView.member_badge.url : ''
-    parsed.time = toLocalePublicationString({ publishText: commentView.published_time.replace('(edited)', '').trim() })
-    parsed.likes = commentView.like_count
-    parsed.numReplies = parseLocalSubscriberCount(commentView.reply_count)
-  }
-
-  return parsed
 }
 
 /**
@@ -1489,6 +1652,7 @@ function parseLocalCommunityPost(post) {
     voteCount: post.vote_count ? parseLocalSubscriberCount(post.vote_count.text) : 0,
     postContent: parseLocalAttachment(post.attachment),
     commentCount: replyCount,
+    authorId: post.author.id,
     author: post.author.name,
     type: 'community'
   }
diff --git a/src/renderer/helpers/channels.js b/src/renderer/helpers/channels.js
index 3161e5f8dcec8..39c32089336f6 100644
--- a/src/renderer/helpers/channels.js
+++ b/src/renderer/helpers/channels.js
@@ -4,11 +4,11 @@ import { getLocalChannel, parseLocalChannelHeader } from './api/local'
 /**
  * @param {string} id
  * @param {{
-*   preference: string,
-*   fallback: boolean,
-*   invalid: boolean,
-* }} backendOptions
-*/
+ *   preference: string,
+ *   fallback: boolean,
+ *   invalid: boolean,
+ * }} backendOptions
+ */
 async function findChannelById(id, backendOptions) {
   try {
     if (!process.env.SUPPORTS_LOCAL_API || backendOptions.preference === 'invidious') {
@@ -37,11 +37,11 @@ async function findChannelById(id, backendOptions) {
 /**
  * @param {string} id
  * @param {{
-*   preference: string,
-*   fallback: boolean,
-* }} backendOptions
-* @returns {Promise<{icon: string, iconHref: string, preferredName: string} | { invalidId: boolean }>}
-*/
+ *   preference: string,
+ *   fallback: boolean,
+ * }} backendOptions
+ * @returns {Promise<{icon: string, iconHref: string, preferredName: string} | { invalidId: boolean }>}
+ */
 export async function findChannelTagInfo(id, backendOptions) {
   if (!checkYoutubeChannelId(id)) return { invalidId: true }
   try {
diff --git a/src/renderer/helpers/colors.js b/src/renderer/helpers/colors.js
index cd1e1d4aebc1f..c98bc7856de7d 100644
--- a/src/renderer/helpers/colors.js
+++ b/src/renderer/helpers/colors.js
@@ -1,6 +1,7 @@
-import i18n from '../i18n/index'
 import { randomArrayItem } from './utils'
 
+// When adding new colors here,
+// remember to update the name translations in `src/renderer/composables/colors.js`
 export const colors = [
   { name: 'Red', value: '#d50000' },
   { name: 'Pink', value: '#C51162' },
@@ -39,6 +40,16 @@ export const colors = [
   { name: 'DraculaPurple', value: '#BD93F9' },
   { name: 'DraculaRed', value: '#FF5555' },
   { name: 'DraculaYellow', value: '#F1FA8C' },
+  { name: 'GruvboxDarkGreen', value: '#b8bb26' },
+  { name: 'GruvboxDarkYellow', value: '#fabd2f' },
+  { name: 'GruvboxDarkBlue', value: '#83a593' },
+  { name: 'GruvboxDarkPurple', value: '#d3869b' },
+  { name: 'GruvboxDarkAqua', value: '#8ec07c' },
+  { name: 'GruvboxDarkOrange', value: '#fe8019' },
+  { name: 'GruvboxLightRed', value: '#9d0006' },
+  { name: 'GruvboxLightBlue', value: '#076678' },
+  { name: 'GruvboxLightPurple', value: '#8f3f71' },
+  { name: 'GruvboxLightOrange', value: '#af3a03' },
   { name: 'SolarizedYellow', value: '#b58900' },
   { name: 'SolarizedOrange', value: '#cb4b16' },
   { name: 'SolarizedRed', value: '#dc322f' },
@@ -49,56 +60,6 @@ export const colors = [
   { name: 'SolarizedGreen', value: '#859900' },
 ]
 
-export function getColorTranslations() {
-  return [
-    i18n.t('Settings.Theme Settings.Main Color Theme.Red'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Pink'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Purple'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Deep Purple'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Indigo'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Blue'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Light Blue'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Cyan'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Teal'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Green'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Light Green'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Lime'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Yellow'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Amber'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Orange'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Deep Orange'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Rosewater'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Flamingo'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Pink'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Mauve'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Red'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Maroon'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Peach'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Yellow'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Green'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Teal'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sky'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sapphire'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Blue'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Lavender'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Cyan'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Green'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Orange'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Pink'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Purple'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Red'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Yellow'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Yellow'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Orange'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Red'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Magenta'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Violet'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Blue'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Cyan'),
-    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Green'),
-  ]
-}
-
 export function getRandomColorClass() {
   return 'main' + getRandomColor().name
 }
diff --git a/src/renderer/helpers/player/utils.js b/src/renderer/helpers/player/utils.js
index 939423d16dc98..0c68dcae097e0 100644
--- a/src/renderer/helpers/player/utils.js
+++ b/src/renderer/helpers/player/utils.js
@@ -9,7 +9,7 @@ import { sponsorBlockSkipSegments } from '../sponsorblock'
  * @param {shaka.util.Error} error
  * @param {string} context
  * @param {string} videoId
- * @param {object=} details
+ * @param {object?} details
  */
 export function logShakaError(error, context, videoId, details) {
   const { Severity, Category, Code } = shaka.util.Error
@@ -119,14 +119,6 @@ export function translateSponsorBlockCategory(category) {
   }
 }
 
-/**
- * @param {string} qualityLabel
- * @returns {number}
- */
-export function qualityLabelToDimension(qualityLabel) {
-  return parseInt(qualityLabel.split('p')[0])
-}
-
 /**
  * Moves the captions that are the most similar to the display language to the top
  * and sorts the remaining ones alphabetically.
@@ -197,13 +189,13 @@ export function sortCaptions(captions) {
  * This function cleans it up, so that we can use it.
  *
  * Here is a list of things this function does:
- * * Removes bogus roles and labels
- * * Extracts the languages from the audio URLs if available and adds it to the adapation sets
- * * Adds roles and labels when possible to add support for multiple audio tracks
+ * - Removes bogus roles and labels
+ * - Extracts the languages from the audio URLs if available and adds it to the adapation sets
+ * - Adds roles and labels when possible to add support for multiple audio tracks
  *
  * Things this function does not do:
- * * Separate DRC (Stable Volume) from their original counterparts
- * * Tag HDR video streams (Invidious puts all video streams in the same adaptation set,
+ * - Separate DRC (Stable Volume) from their original counterparts
+ * - Tag HDR video streams (Invidious puts all video streams in the same adaptation set,
  * to tag HDR and SDR streams we would have to separate them out into multiple adaptation sets)
  * @param {shaka.extern.xml.Node[]} periods
  */
@@ -222,7 +214,7 @@ export function repairInvidiousManifest(periods) {
   }
 
   // match YouTube's local API response with English
-  const languageNames = new Intl.DisplayNames('en-US', { type: 'language' })
+  const languageNames = new Intl.DisplayNames('en-US', { type: 'language', languageDisplay: 'standard' })
 
   for (const audioAdaptationSet of audioAdaptationSets) {
     // Invidious adds a label to every audio stream with it's bitrate
@@ -281,6 +273,7 @@ export function repairInvidiousManifest(periods) {
                   labelParts.push('original')
                   break
                 case 'dubbed':
+                case 'dubbed-auto':
                   role = 'dub'
                   break
                 case 'descriptive':
diff --git a/src/renderer/helpers/playlists.js b/src/renderer/helpers/playlists.js
index 5f53972f4b43d..6d8e2ed565bd4 100644
--- a/src/renderer/helpers/playlists.js
+++ b/src/renderer/helpers/playlists.js
@@ -5,6 +5,8 @@ export const SORT_BY_VALUES = {
   AuthorDescending: 'author_descending',
   VideoTitleAscending: 'video_title_ascending',
   VideoTitleDescending: 'video_title_descending',
+  VideoDurationAscending: 'video_duration_ascending',
+  VideoDurationDescending: 'video_duration_descending',
   Custom: 'custom'
 }
 
@@ -19,7 +21,9 @@ export function getSortedPlaylistItems(playlistItems, sortOrder, locale, reverse
     sortOrder === SORT_BY_VALUES.VideoTitleAscending ||
     sortOrder === SORT_BY_VALUES.VideoTitleDescending ||
     sortOrder === SORT_BY_VALUES.AuthorAscending ||
-    sortOrder === SORT_BY_VALUES.AuthorDescending
+    sortOrder === SORT_BY_VALUES.AuthorDescending ||
+    sortOrder === SORT_BY_VALUES.VideoDurationAscending ||
+    sortOrder === SORT_BY_VALUES.VideoDurationDescending
   ) {
     collator = new Intl.Collator([locale, 'en'])
   }
@@ -31,6 +35,19 @@ export function getSortedPlaylistItems(playlistItems, sortOrder, locale, reverse
   })
 }
 
+export function videoDurationPresent(video) {
+  if (typeof video.lengthSeconds !== 'number') { return false }
+
+  return !(isNaN(video.lengthSeconds) || video.lengthSeconds === 0)
+}
+
+export function videoDurationWithFallback(video) {
+  if (videoDurationPresent(video)) { return video.lengthSeconds }
+
+  // Fallback
+  return 0
+}
+
 function compareTwoPlaylistItems(a, b, sortOrder, collator) {
   switch (sortOrder) {
     case SORT_BY_VALUES.DateAddedNewest:
@@ -45,6 +62,12 @@ function compareTwoPlaylistItems(a, b, sortOrder, collator) {
       return collator.compare(a.author, b.author)
     case SORT_BY_VALUES.AuthorDescending:
       return collator.compare(b.author, a.author)
+    case SORT_BY_VALUES.VideoDurationAscending: {
+      return videoDurationWithFallback(a) - videoDurationWithFallback(b)
+    }
+    case SORT_BY_VALUES.VideoDurationDescending: {
+      return videoDurationWithFallback(b) - videoDurationWithFallback(a)
+    }
     default:
       console.error(`Unknown sortOrder: ${sortOrder}`)
       return 0
diff --git a/src/renderer/helpers/strings.js b/src/renderer/helpers/strings.js
index 6c9e79465b8e0..29f9f9b41ac47 100644
--- a/src/renderer/helpers/strings.js
+++ b/src/renderer/helpers/strings.js
@@ -26,6 +26,9 @@ export function isKeyboardEventKeyPrintableChar(eventKey) {
   return false
 }
 
+/**
+ * @param {string} title
+ */
 export function translateWindowTitle(title) {
   switch (title) {
     case 'Subscriptions':
@@ -46,8 +49,6 @@ export function translateWindowTitle(title) {
       return i18n.t('About.About')
     case 'Profile Settings':
       return i18n.t('Profile.Profile Settings')
-    case 'Search Results':
-      return i18n.t('Search Filters.Search Results')
     case 'Playlist':
       return i18n.t('Playlist.Playlist')
     default:
diff --git a/src/renderer/helpers/subscriptions.js b/src/renderer/helpers/subscriptions.js
index f41205244d3aa..50e422d643ab6 100644
--- a/src/renderer/helpers/subscriptions.js
+++ b/src/renderer/helpers/subscriptions.js
@@ -42,13 +42,22 @@ export function updateVideoListAfterProcessing(videos) {
   // ordered last to show first eligible video from channel
   // if the first one incidentally failed one of the above checks
   if (store.getters.getOnlyShowLatestFromChannel) {
-    const authors = new Set()
+    const authors = new Map()
     videoList = videoList.filter((video) => {
       if (!video.authorId) {
         return true
-      } else if (!authors.has(video.authorId)) {
-        authors.add(video.authorId)
+      }
+
+      if (!authors.has(video.authorId)) {
+        authors.set(video.authorId, 1)
         return true
+      } else {
+        const currentVideos = authors.get(video.authorId)
+
+        if (currentVideos < store.getters.getOnlyShowLatestFromChannelNumber) {
+          authors.set(video.authorId, currentVideos + 1)
+          return true
+        }
       }
 
       return false
@@ -65,7 +74,7 @@ export function updateVideoListAfterProcessing(videos) {
 /**
  * @param {string} rssString
  * @param {string} channelId
-*/
+ */
 export async function parseYouTubeRSSFeed(rssString, channelId) {
   // doesn't need to be asynchronous, but doing it allows us to do the relatively slow DOM querying in parallel
   try {
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 79c8369302484..0739a6e0122c3 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -1,5 +1,3 @@
-import fs from 'fs/promises'
-
 import { IpcChannels } from '../../constants'
 import FtToastEvents from '../components/ft-toast/ft-toast-events'
 import i18n from '../i18n/index'
@@ -12,6 +10,10 @@ export const CHANNEL_HANDLE_REGEX = /^@[\w.-]{3,30}$/
 
 const PUBLISHED_TEXT_REGEX = /(\d+)\s?([a-z]+)/i
 
+/**
+ * @param {string} sortPreference
+ * @returns {string[]}
+ */
 export function getIconForSortPreference(sortPreference) {
   switch (sortPreference) {
     case 'name_descending':
@@ -97,101 +99,10 @@ export function calculatePublishedDate(publishedText, isLive = false, isUpcoming
 }
 
 /**
- * @param {{
- *  liveNow: boolean,
- *  isUpcoming: boolean,
- *  premiereTimestamp: number,
- *  published: number
- * }[]} videos
+ * @param {import('youtubei.js/dist/src/parser/classes/PlayerStoryboardSpec').StoryboardData} storyboard
+ * @param {number} videoLengthSeconds
+ * @returns {string}
  */
-export function setPublishedTimestampsInvidious(videos) {
-  videos.forEach(video => {
-    if (video.liveNow) {
-      video.published = new Date().getTime()
-    } else if (video.isUpcoming) {
-      video.published = video.premiereTimestamp * 1000
-    } else if (typeof video.published === 'number') {
-      video.published *= 1000
-    }
-  })
-}
-
-export function toLocalePublicationString ({ publishText, isLive = false, isUpcoming = false, isRSS = false }) {
-  if (isLive) {
-    return i18n.tc('Global.Counts.Watching Count', 0, { count: 0 })
-  } else if (isUpcoming || publishText === null) {
-    // the check for null is currently just an inferring of knowledge, because there is no other possibility left
-    return `${i18n.t('Video.Published.Upcoming')}: ${publishText}`
-  } else if (isRSS) {
-    return publishText
-  }
-
-  const match = publishText.match(PUBLISHED_TEXT_REGEX)
-  const singular = (match[1] === '1')
-  let unit = ''
-  switch (match[2].substring(0, 2)) {
-    case 'se':
-    case 's':
-      if (singular) {
-        unit = i18n.t('Video.Published.Second')
-      } else {
-        unit = i18n.t('Video.Published.Seconds')
-      }
-      break
-    case 'mi':
-    case 'm':
-      if (singular) {
-        unit = i18n.t('Video.Published.Minute')
-      } else {
-        unit = i18n.t('Video.Published.Minutes')
-      }
-      break
-    case 'ho':
-    case 'h':
-      if (singular) {
-        unit = i18n.t('Video.Published.Hour')
-      } else {
-        unit = i18n.t('Video.Published.Hours')
-      }
-      break
-    case 'da':
-    case 'd':
-      if (singular) {
-        unit = i18n.t('Video.Published.Day')
-      } else {
-        unit = i18n.t('Video.Published.Days')
-      }
-      break
-    case 'we':
-    case 'w':
-      if (singular) {
-        unit = i18n.t('Video.Published.Week')
-      } else {
-        unit = i18n.t('Video.Published.Weeks')
-      }
-      break
-    case 'mo':
-      if (singular) {
-        unit = i18n.t('Video.Published.Month')
-      } else {
-        unit = i18n.t('Video.Published.Months')
-      }
-      break
-    case 'ye':
-    case 'y':
-      if (singular) {
-        unit = i18n.t('Video.Published.Year')
-      } else {
-        unit = i18n.t('Video.Published.Years')
-      }
-      break
-    default:
-      return publishText
-  }
-
-  return i18n.t('Video.Publicationtemplate', { number: match[1], unit })
-}
-
 export function buildVTTFileLocally(storyboard, videoLengthSeconds) {
   let vttString = 'WEBVTT\n\n'
   // how many images are in one image
@@ -249,6 +160,11 @@ export function buildVTTFileLocally(storyboard, videoLengthSeconds) {
   return vttString
 }
 
+/**
+ * @param {string} message
+ * @param {number} time
+ * @param {Function} action
+ */
 export function showToast(message, time = null, action = null) {
   FtToastEvents.dispatchEvent(new CustomEvent('toast-open', {
     detail: {
@@ -260,13 +176,14 @@ export function showToast(message, time = null, action = null) {
 }
 
 /**
-   * This writes to the clipboard. If an error occurs during the copy,
-   * a toast with the error is shown. If the copy is successful and
-   * there is a success message, a toast with that message is shown.
-   * @param {string} content the content to be copied to the clipboard
-   * @param {null|string} messageOnSuccess the message to be displayed as a toast when the copy succeeds (optional)
-   * @param {null|string} messageOnError the message to be displayed as a toast when the copy fails (optional)
-   */
+ * This writes to the clipboard. If an error occurs during the copy,
+ * a toast with the error is shown. If the copy is successful and
+ * there is a success message, a toast with that message is shown.
+ * @param {string} content the content to be copied to the clipboard
+ * @param {object} [options] - Optional settings for the copy operation.
+ * @param {null|string} options.messageOnSuccess the message to be displayed as a toast when the copy succeeds (optional)
+ * @param {null|string} options.messageOnError the message to be displayed as a toast when the copy fails (optional)
+ */
 export async function copyToClipboard(content, { messageOnSuccess = null, messageOnError = null } = {}) {
   if (navigator.clipboard !== undefined && window.isSecureContext) {
     try {
@@ -333,69 +250,173 @@ export function openInternalPath({ path, query = {}, doCreateNewWindow, searchQu
   }
 }
 
-export async function showOpenDialog (options) {
-  if (process.env.IS_ELECTRON) {
-    const { ipcRenderer } = require('electron')
-    return await ipcRenderer.invoke(IpcChannels.SHOW_OPEN_DIALOG, options)
+/**
+ * @param {string} fileTypeDescription
+ * @param {{[key: string]: string | string[]}} acceptedTypes
+ * @param {string} [rememberDirectoryId]
+ * @param {'desktop' | 'documents' | 'downloads' | 'music' | 'pictures' | 'videos'} [startInDirectory]
+ * @returns {Promise<{ content: string, filename: string } | null>}
+ */
+export async function readFileWithPicker(
+  fileTypeDescription,
+  acceptedTypes,
+  rememberDirectoryId,
+  startInDirectory
+) {
+  let file
+
+  // Only supported in Electron and desktop Chromium browsers
+  // https://developer.mozilla.org/en-US/docs/Web/API/Window/showOpenFilePicker#browser_compatibility
+  // As we know it is supported in Electron, adding the build flag means we can skip the runtime check in Electron
+  // and allow terser to remove the unused else block
+  if (process.env.IS_ELECTRON || 'showOpenFilePicker' in window) {
+    try {
+      /** @type {FileSystemFileHandle[]} */
+      const [handle] = await window.showOpenFilePicker({
+        excludeAcceptAllOption: true,
+        multiple: false,
+        id: rememberDirectoryId,
+        startIn: startInDirectory,
+        types: [{
+          description: fileTypeDescription,
+          accept: acceptedTypes
+        }],
+      })
+
+      file = await handle.getFile()
+    } catch (error) {
+      // user pressed cancel in the file picker
+      if (error.name === 'AbortError') {
+        return null
+      }
+
+      throw error
+    }
   } else {
-    return await new Promise((resolve) => {
+    /** @type {File|null} */
+    const fallbackFile = await new Promise((resolve) => {
+      const joinedExtensions = Object.values(acceptedTypes)
+        .flat()
+        .join(',')
+
       const fileInput = document.createElement('input')
       fileInput.setAttribute('type', 'file')
-      if (options?.filters[0]?.extensions !== undefined) {
-        // this will map the given extensions from the options to the accept attribute of the input
-        fileInput.setAttribute('accept', options.filters[0].extensions.map((extension) => { return `.${extension}` }).join(', '))
-      }
+      fileInput.setAttribute('accept', joinedExtensions)
       fileInput.onchange = () => {
-        const files = Array.from(fileInput.files)
-        resolve({ canceled: false, files, filePaths: files.map(({ name }) => { return name }) })
-        delete fileInput.onchange
+        resolve(fileInput.files[0])
+        fileInput.onchange = null
       }
+
       const listenForEnd = () => {
-        window.removeEventListener('focus', listenForEnd)
         // 1 second timeout on the response from the file picker to prevent awaiting forever
         setTimeout(() => {
           if (fileInput.files.length === 0 && typeof fileInput.onchange === 'function') {
             // if there are no files and the onchange has not been triggered, the file-picker was canceled
-            resolve({ canceled: true })
-            delete fileInput.onchange
+            resolve(null)
+            fileInput.onchange = null
           }
         }, 1000)
       }
-      window.addEventListener('focus', listenForEnd)
+      window.addEventListener('focus', listenForEnd, { once: true })
       fileInput.click()
     })
+
+    if (fallbackFile === null) {
+      return null
+    }
+
+    file = fallbackFile
+  }
+
+  return {
+    content: await file.text(),
+    filename: file.name
   }
 }
 
 /**
- * @param {object} response the response from `showOpenDialog`
- * @param {number} index which file to read (defaults to the first in the response)
- * @returns the text contents of the selected file
+ * @param {string} fileName
+ * @param {string | Blob} content
+ * @param {string} fileTypeDescription
+ * @param {string} mimeType
+ * @param {string} fileExtension
+ * @param {string} [rememberDirectoryId]
+ * @param {'desktop' | 'documents' | 'downloads' | 'music' | 'pictures' | 'videos'} [startInDirectory]
+ * @returns {Promise<boolean>}
  */
-export function readFileFromDialog(response, index = 0) {
-  return new Promise((resolve, reject) => {
-    if (process.env.IS_ELECTRON) {
-      // if this is Electron, use fs
-      fs.readFile(response.filePaths[index])
-        .then(data => {
-          resolve(new TextDecoder('utf-8').decode(data))
-        })
-        .catch(reject)
-    } else {
-      // if this is web, use FileReader
-      try {
-        const reader = new FileReader()
-        reader.onload = function (file) {
-          resolve(file.currentTarget.result)
-        }
-        reader.readAsText(response.files[index])
-      } catch (exception) {
-        reject(exception)
+export async function writeFileWithPicker(
+  fileName,
+  content,
+  fileTypeDescription,
+  mimeType,
+  fileExtension,
+  rememberDirectoryId,
+  startInDirectory
+) {
+  // Only supported in Electron and desktop Chromium browsers
+  // https://developer.mozilla.org/en-US/docs/Web/API/Window/showOpenFilePicker#browser_compatibility
+  // As we know it is supported in Electron, adding the build flag means we can skip the runtime check in Electron
+  // and allow terser to remove the unused else block
+  if (process.env.IS_ELECTRON || 'showSaveFilePicker' in window) {
+    let writableFileStream
+
+    try {
+      /** @type {FileSystemFileHandle} */
+      const handle = await window.showSaveFilePicker({
+        suggestedName: fileName,
+        excludeAcceptAllOption: true,
+        multiple: false,
+        id: rememberDirectoryId,
+        startIn: startInDirectory,
+        types: [{
+          description: fileTypeDescription,
+          accept: {
+            [mimeType]: [fileExtension]
+          }
+        }],
+      })
+
+      writableFileStream = await handle.createWritable()
+      await writableFileStream.write(content)
+    } catch (error) {
+      // user pressed cancel in the file picker
+      if (error.name === 'AbortError') {
+        return false
+      }
+
+      throw error
+    } finally {
+      if (writableFileStream) {
+        await writableFileStream.close()
       }
     }
-  })
+
+    return true
+  } else {
+    if (typeof content === 'string') {
+      content = new Blob([content], { type: mimeType })
+    }
+
+    const url = URL.createObjectURL(content)
+
+    const downloadLink = document.createElement('a')
+    downloadLink.setAttribute('download', encodeURIComponent(fileName))
+    downloadLink.setAttribute('href', url)
+    downloadLink.click()
+
+    // Small timeout to give the browser time to react to the click on the link
+    setTimeout(() => {
+      URL.revokeObjectURL(url)
+    }, 1000)
+
+    return true
+  }
 }
 
+/**
+ * @param {{defaultPath: string, filters: {name: string, extensions: string[]}[]}} options
+ * @returns { Promise<import('electron').SaveDialogReturnValue> | {canceled: boolean?, filePath: string } | { canceled: boolean?, handle?: Promise<FileSystemFileHandle> }}
+ */
 export async function showSaveDialog (options) {
   if (process.env.IS_ELECTRON) {
     const { ipcRenderer } = require('electron')
@@ -422,34 +443,6 @@ export async function showSaveDialog (options) {
   }
 }
 
-/**
-* Write to a file picked out from the `showSaveDialog` picker
-* @param {object} response the response from `showSaveDialog`
-* @param {string} content the content to be written to the file selected by the dialog
-*/
-export async function writeFileFromDialog (response, content) {
-  if (process.env.IS_ELECTRON) {
-    const { filePath } = response
-    return await fs.writeFile(filePath, content)
-  } else {
-    if ('showOpenFilePicker' in window) {
-      const { handle } = response
-      const writableStream = await handle.createWritable()
-      await writableStream.write(content)
-      await writableStream.close()
-    } else {
-      // If the native filesystem api is not available,
-      const { filePath } = response
-      const filename = filePath.split('/').at(-1)
-      const a = document.createElement('a')
-      const url = URL.createObjectURL(new Blob([content], { type: 'application/octet-stream' }))
-      a.setAttribute('href', url)
-      a.setAttribute('download', encodeURI(filename))
-      a.click()
-    }
-  }
-}
-
 /**
  * This creates an absolute web url from a given path.
  * It will assume all given paths are relative to the current window location.
@@ -475,7 +468,11 @@ export function createWebURL(path) {
   return `${origin}${windowPath}/${path}`
 }
 
-// strip html tags but keep <br>, <b>, </b> <s>, </s>, <i>, </i>
+/**
+ * strip html tags but keep <br>, <b>, </b> <s>, </s>, <i>, </i>
+ * @param {string} value
+ * @returns {string}
+ */
 export function stripHTML(value) {
   return value.replaceAll(/(<(?!br|\/?[abis]|img>)([^>]+)>)/gi, '')
 }
@@ -522,6 +519,11 @@ export function formatDurationAsTimestamp(lengthSeconds) {
   return timestamp
 }
 
+/**
+ * @param {{sortBy? : string, time?: string, duration?: string, features: string[]}?} filtersA
+ * @param {{sortBy? : string, time?: string, duration?: string, features: string[]}?} filtersB
+ * @returns {boolean}
+ */
 export function searchFiltersMatch(filtersA, filtersB) {
   return filtersA?.sortBy === filtersB?.sortBy &&
     filtersA?.time === filtersB?.time &&
@@ -530,6 +532,10 @@ export function searchFiltersMatch(filtersA, filtersB) {
     filtersA?.features?.length === filtersB?.features?.length && filtersA?.features?.every((val, index) => val === filtersB?.features[index])
 }
 
+/**
+ * @param {string} filenameOriginal
+ * @returns {string}
+ */
 export function replaceFilenameForbiddenChars(filenameOriginal) {
   let filenameNew = filenameOriginal
   let forbiddenChars = {}
@@ -563,6 +569,9 @@ export function replaceFilenameForbiddenChars(filenameOriginal) {
   return filenameNew
 }
 
+/**
+ * @returns {Promise<string>}
+ */
 export async function getSystemLocale() {
   let locale
   if (process.env.IS_ELECTRON) {
@@ -611,7 +620,26 @@ export function getVideoParamsFromUrl(url) {
 
   function extractParams(videoId) {
     paramsObject.videoId = videoId
-    paramsObject.timestamp = urlObject.searchParams.get('t')
+    let timestamp = urlObject.searchParams.get('t')
+    if (timestamp && (timestamp.includes('h') || timestamp.includes('m') || timestamp.includes('s'))) {
+      const { seconds, minutes, hours } = timestamp.match(/(?:(?<hours>(\d+))h)?(?:(?<minutes>(\d+))m)?(?:(?<seconds>(\d+))s)?/).groups
+      let time = 0
+
+      if (seconds) {
+        time += Number(seconds)
+      }
+
+      if (minutes) {
+        time += 60 * Number(minutes)
+      }
+
+      if (hours) {
+        time += 3600 * Number(hours)
+      }
+
+      timestamp = time
+    }
+    paramsObject.timestamp = timestamp
   }
 
   const extractors = [
@@ -696,6 +724,11 @@ export function toDistractionFreeTitle(title, minUpperCase = 3) {
     .replace(reg, x => capitalizedWord(x.toLowerCase()))
 }
 
+/**
+ * @param {number} number
+ * @param {Intl.NumberFormatOptions?} options
+ * @returns {string}
+ */
 export function formatNumber(number, options = undefined) {
   return Intl.NumberFormat([i18n.locale, 'en'], options).format(number)
 }
@@ -711,6 +744,13 @@ export function getTodayDateStrLocalTimezone() {
   return timeNowStr.split('T')[0]
 }
 
+/**
+ *
+ * @param {number} date
+ * @param {boolean} hideSeconds
+ * @param {boolean} useThirtyDayMonths
+ * @returns {string}
+ */
 export function getRelativeTimeFromDate(date, hideSeconds = false, useThirtyDayMonths = true) {
   if (!date) {
     return ''
@@ -781,8 +821,9 @@ export function escapeHTML(untrusted) {
 
 /**
  * Performs a deep copy of a javascript object
- * @param {Object} obj
- * @returns {Object}
+ * @template T
+ * @param {T} obj
+ * @returns {T}
  */
 export function deepCopy(obj) {
   return JSON.parse(JSON.stringify(obj))
@@ -792,7 +833,8 @@ export function deepCopy(obj) {
  * Check if the `name` of the error is `TimeoutError` to know if the error was caused by a timeout or something else.
  * @param {number} timeoutMs
  * @param {RequestInfo|URL} input
- * @param {RequestInit=} init
+ * @param {RequestInit?} init
+ * @returns {Promise<Response>}
  */
 export async function fetchWithTimeout(timeoutMs, input, init) {
   const timeoutSignal = AbortSignal.timeout(timeoutMs)
@@ -820,6 +862,10 @@ export async function fetchWithTimeout(timeoutMs, input, init) {
   }
 }
 
+/**
+ * @param {KeyboardEvent} event
+ * @param {HTMLInputElement} inputElement
+ */
 export function ctrlFHandler(event, inputElement) {
   switch (event.key) {
     case 'F':
@@ -860,11 +906,13 @@ export function base64EncodeUtf8(text) {
  * @param {string} channelId
  * @param {'all'} type
  * @returns {string}
-*
+ *
  * @param {string} channelId
  * @param {'all' | 'videos' | 'live' | 'shorts'} type
- * @param {'newest' | 'popular'} sortBy
+ * @param {('newest' | 'popular')?} [sortBy]
+ * @returns {string}
  */
+
 export function getChannelPlaylistId(channelId, type, sortBy) {
   switch (type) {
     case 'videos':
@@ -875,9 +923,9 @@ export function getChannelPlaylistId(channelId, type, sortBy) {
       }
     case 'live':
       if (sortBy === 'popular') {
-        return channelId.replace(/^UC/, 'UULV')
-      } else {
         return channelId.replace(/^UC/, 'UUPV')
+      } else {
+        return channelId.replace(/^UC/, 'UULV')
       }
     case 'shorts':
       if (sortBy === 'popular') {
@@ -889,3 +937,82 @@ export function getChannelPlaylistId(channelId, type, sortBy) {
       return channelId.replace(/^UC/, 'UU')
   }
 }
+
+function getIndividualLocalizedShortcut(shortcut) {
+  switch (shortcut) {
+    case 'alt':
+      return i18n.t('Keys.alt')
+    case 'ctrl':
+      return i18n.t('Keys.ctrl')
+    case 'arrowleft':
+      return i18n.t('Keys.arrowleft')
+    case 'arrowright':
+      return i18n.t('Keys.arrowright')
+    case 'arrowup':
+      return i18n.t('Keys.arrowup')
+    case 'arrowdown':
+      return i18n.t('Keys.arrowdown')
+    default:
+      return shortcut
+  }
+}
+
+function getMacIconForShortcut(shortcut) {
+  switch (shortcut) {
+    case 'option':
+    case 'alt':
+      return '⌥'
+    case 'cmd':
+    case 'ctrl':
+      return '⌘'
+    case 'arrowleft':
+      return '←'
+    case 'arrowright':
+      return '→'
+    case 'arrowup':
+      return '↑'
+    case 'arrowdown':
+      return '↓'
+    default:
+      return shortcut
+  }
+}
+
+/**
+ * @param {string} shortcut
+ * @returns {string} the localized and recombined shortcut
+ */
+function getLocalizedShortcut(shortcut) {
+  const shortcuts = shortcut.split('+')
+
+  if (process.platform === 'darwin') {
+    const shortcutsAsIcons = shortcuts.map(shortCut => getMacIconForShortcut(shortCut))
+    return shortcutsAsIcons.join('')
+  } else {
+    const localizedShortcuts = shortcuts.map((shortcut) => getIndividualLocalizedShortcut(shortcut))
+    const shortcutJoinOperator = i18n.t('shortcutJoinOperator')
+    return localizedShortcuts.join(shortcutJoinOperator)
+  }
+}
+
+/**
+ * @param {string} actionTitle
+ * @param {string} shortcut
+ * @returns {string} the localized action title with keyboard shortcut
+ */
+export function addKeyboardShortcutToActionTitle(actionTitle, shortcut) {
+  return i18n.t('KeyboardShortcutTemplate', {
+    label: actionTitle,
+    shortcut
+  })
+}
+
+/**
+ * @param {string} localizedActionTitle
+ * @param {string} unlocalizedShortcut
+ * @returns {string} the localized action title with keyboard shortcut
+ */
+export function localizeAndAddKeyboardShortcutToActionTitle(localizedActionTitle, unlocalizedShortcut) {
+  const localizedShortcut = getLocalizedShortcut(unlocalizedShortcut)
+  return addKeyboardShortcutToActionTitle(localizedActionTitle, localizedShortcut)
+}
diff --git a/src/renderer/main.js b/src/renderer/main.js
index cfd35f888fa46..7d7d1708c87a4 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -15,6 +15,7 @@ import { ObserveVisibility } from 'vue-observe-visibility'
 // to avoid code conflict and duplicate entries
 import {
   faAngleDown,
+  faAngleLeft,
   faAngleUp,
   faArrowDown,
   faArrowDownShortWide,
@@ -23,15 +24,21 @@ import {
   faArrowRight,
   faArrowUp,
   faBars,
+  faBorderAll,
   faBookmark,
   faCheck,
   faChevronRight,
+  faCircleExclamation,
+  faCirclePlay,
   faCircleUser,
+  faClapperboard,
   faClock,
   faClone,
   faComment,
   faCommentDots,
   faCopy,
+  faDatabase,
+  faDisplay,
   faDownload,
   faEdit,
   faEllipsisH,
@@ -45,9 +52,12 @@ import {
   faFileDownload,
   faFileImage,
   faFileVideo,
+  faFilm,
   faFilter,
+  faFlask,
   faFire,
   faForward,
+  faGamepad,
   faGauge,
   faGlobe,
   faGrip,
@@ -56,12 +66,16 @@ import {
   faHistory,
   faImages,
   faInfoCircle,
+  faKey,
   faLanguage,
   faLink,
   faLinkSlash,
   faList,
   faLocationDot,
-  faMicrochip,
+  faLock,
+  faMoneyCheckDollar,
+  faMusic,
+  faNetworkWired,
   faNewspaper,
   faPalette,
   faPause,
@@ -77,6 +91,7 @@ import {
   faSearch,
   faServer,
   faShareAlt,
+  faShield,
   faSlash,
   faSlidersH,
   faSortAlphaDown,
@@ -92,12 +107,14 @@ import {
   faTimesCircle,
   faTrash,
   faUserCheck,
+  faUserLock,
   faUsers,
   faUsersSlash,
-  faWifi,
+  faWifi
 } from '@fortawesome/free-solid-svg-icons'
 import {
-  faBookmark as farBookmark
+  faBookmark as farBookmark,
+  faDotCircle as farDotCircle
 } from '@fortawesome/free-regular-svg-icons'
 import {
   faBitcoin,
@@ -116,6 +133,7 @@ Vue.config.productionTip = process.env.NODE_ENV === 'development'
 library.add(
   // solid icons
   faAngleDown,
+  faAngleLeft,
   faAngleUp,
   faArrowDown,
   faArrowDownShortWide,
@@ -124,15 +142,21 @@ library.add(
   faArrowRight,
   faArrowUp,
   faBars,
+  faBorderAll,
   faBookmark,
   faCheck,
   faChevronRight,
+  faCircleExclamation,
+  faCirclePlay,
   faCircleUser,
+  faClapperboard,
   faClock,
   faClone,
   faComment,
   faCommentDots,
   faCopy,
+  faDatabase,
+  faDisplay,
   faDownload,
   faEdit,
   faEllipsisH,
@@ -146,9 +170,12 @@ library.add(
   faFileDownload,
   faFileImage,
   faFileVideo,
+  faFilm,
   faFilter,
+  faFlask,
   faFire,
   faForward,
+  faGamepad,
   faGauge,
   faGlobe,
   faGrip,
@@ -157,19 +184,22 @@ library.add(
   faHistory,
   faImages,
   faInfoCircle,
+  faKey,
   faLanguage,
   faLink,
   faLinkSlash,
   faList,
   faLocationDot,
-  faMicrochip,
+  faLock,
+  faMoneyCheckDollar,
+  faMusic,
+  faNetworkWired,
   faNewspaper,
   faPalette,
   faPause,
   faPhotoFilm,
   faPlay,
   faPlus,
-  faPhotoFilm,
   faQuestionCircle,
   faRandom,
   faRetweet,
@@ -179,6 +209,7 @@ library.add(
   faSearch,
   faServer,
   faShareAlt,
+  faShield,
   faSlash,
   faSlidersH,
   faSortAlphaDown,
@@ -194,12 +225,14 @@ library.add(
   faTimesCircle,
   faTrash,
   faUserCheck,
+  faUserLock,
   faUsers,
   faUsersSlash,
   faWifi,
 
   // solid icons
   farBookmark,
+  farDotCircle,
 
   // brand icons
   faGithub,
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index f0a0a2ec4cb60..207f80b78904a 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -14,7 +14,7 @@ import Playlist from '../views/Playlist/Playlist.vue'
 import Channel from '../views/Channel/Channel.vue'
 import Watch from '../views/Watch/Watch.vue'
 import Hashtag from '../views/Hashtag/Hashtag.vue'
-import Post from '../views/Post/Post.vue'
+import Post from '../views/Post.vue'
 
 Vue.use(Router)
 
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
index 4f9935d71fdbb..95a368c5dc5ff 100644
--- a/src/renderer/scss-partials/_ft-list-item.scss
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -205,6 +205,10 @@ $watched-transition-duration: 0.5s;
         border-radius: 50%;
         block-size: 130px;
       }
+
+      .gameImage {
+        block-size: 130px;
+      }
     }
   }
 
@@ -216,7 +220,11 @@ $watched-transition-duration: 0.5s;
     grid-template:
       'title optionsExternalButton' auto
       'infoLine optionsExternalButton' auto
-      'description description' auto / 1fr auto;
+      'description optionsExternalButton' auto / 1fr auto;
+
+    .buttonStack {
+      grid-area: optionsExternalButton;
+    }
 
     .optionsButton {
       grid-area: optionsExternalButton;
diff --git a/src/renderer/store/modules/playlists.js b/src/renderer/store/modules/playlists.js
index 22df83be63659..82b06f2ad607a 100644
--- a/src/renderer/store/modules/playlists.js
+++ b/src/renderer/store/modules/playlists.js
@@ -210,7 +210,11 @@ const actions = {
         }
         // Undesired attributes, even with `null` values
         [
+          'authorUrl',
           'description',
+          'index',
+          'liveNow',
+          'videoThumbnails',
           'viewCount',
         ].forEach(attrName => {
           if (typeof videoData[attrName] !== 'undefined') {
@@ -404,7 +408,7 @@ const actions = {
   async removeVideo({ commit }, payload) {
     try {
       const { _id, videoId, playlistItemId } = payload
-      await DBPlaylistHandlers.deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId })
+      await DBPlaylistHandlers.deleteVideoIdByPlaylistId(_id, videoId, playlistItemId)
       commit('removeVideo', payload)
     } catch (errMessage) {
       console.error(errMessage)
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index 1c657507afa0f..e479bfed506b0 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -162,7 +162,6 @@ const defaultSideEffectsTriggerId = settingId =>
 /*****/
 
 const state = {
-  allSettingsSectionsExpandedByDefault: false,
   autoplayPlaylists: true,
   autoplayVideos: true,
   backendFallback: process.env.SUPPORTS_LOCAL_API,
@@ -173,6 +172,7 @@ const state = {
   baseTheme: 'system',
   mainColor: 'Red',
   secColor: 'Blue',
+  defaultAutoplayInterruptionIntervalHours: 3,
   defaultCaptionSettings: '{}',
   defaultInterval: 5,
   defaultPlayback: 1,
@@ -182,7 +182,7 @@ const state = {
   defaultTheatreMode: false,
   defaultVideoFormat: 'dash',
   disableSmoothScrolling: false,
-  displayVideoPlayButton: true,
+  displayVideoPlayButton: false,
   enableSearchSuggestions: true,
   enableSubtitlesByDefault: false,
   enterFullscreenOnDisplayRotate: false,
@@ -191,10 +191,11 @@ const state = {
   externalPlayerExecutable: '',
   externalPlayerIgnoreWarnings: false,
   externalPlayerIgnoreDefaultArgs: false,
-  externalPlayerCustomArgs: '',
+  externalPlayerCustomArgs: '[]',
   expandSideBar: false,
   hideActiveSubscriptions: false,
   hideChannelCommunity: false,
+  hideChannelHome: false,
   hideChannelPlaylists: false,
   hideChannelReleases: false,
   hideChannelPodcasts: false,
@@ -206,6 +207,8 @@ const state = {
   hideFeaturedChannels: false,
   channelsHidden: '[]',
   forbiddenTitles: '[]',
+  showAddedChannelsHidden: true,
+  showAddedForbiddenTitles: true,
   hideVideoDescription: false,
   hideLiveChat: false,
   hideLiveStreams: false,
@@ -233,6 +236,8 @@ const state = {
   listType: 'grid',
   maxVideoPlaybackRate: 3,
   onlyShowLatestFromChannel: false,
+  onlyShowLatestFromChannelNumber: 1,
+  openDeepLinksInNewWindow: false,
   playNextVideo: false,
   proxyHostname: '127.0.0.1',
   proxyPort: '9050',
@@ -310,9 +315,9 @@ const state = {
 
 const stateWithSideEffects = {
   currentLocale: {
-    defaultValue: 'en-US',
+    defaultValue: 'system',
     sideEffectsHandler: async function ({ dispatch }, value) {
-      const defaultLocale = 'en-US'
+      const fallbackLocale = 'en-US'
 
       let targetLocale = value
       if (value === 'system') {
@@ -343,20 +348,20 @@ const stateWithSideEffects = {
           targetLocale = targetLocaleOptions[0]
         } else {
           // Go back to default value if locale is unavailable
-          targetLocale = defaultLocale
+          targetLocale = fallbackLocale
           // Translating this string isn't necessary
           // because the user will always see it in the default locale
           // (in this case, English (US))
-          showToast(`Locale not found, defaulting to ${defaultLocale}`)
+          showToast(`Locale not found, defaulting to ${fallbackLocale}`)
         }
       }
 
       const loadPromises = []
 
-      if (targetLocale !== defaultLocale) {
+      if (targetLocale !== fallbackLocale) {
         // "en-US" is used as a fallback for missing strings in other locales
         loadPromises.push(
-          loadLocale(defaultLocale)
+          loadLocale(fallbackLocale)
         )
       }
 
diff --git a/src/renderer/store/modules/subscription-cache.js b/src/renderer/store/modules/subscription-cache.js
index d8ad6ff32cf04..1fb1c6370961b 100644
--- a/src/renderer/store/modules/subscription-cache.js
+++ b/src/renderer/store/modules/subscription-cache.js
@@ -88,11 +88,7 @@ const actions = {
 
   async updateSubscriptionVideosCacheByChannel({ commit }, { channelId, videos, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateVideosByChannelId({
-        channelId,
-        entries: videos,
-        timestamp,
-      })
+      await DBSubscriptionCacheHandlers.updateVideosByChannelId(channelId, videos, timestamp)
       commit('updateVideoCacheByChannel', { channelId, entries: videos, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
@@ -101,11 +97,7 @@ const actions = {
 
   async updateSubscriptionShortsCacheByChannel({ commit }, { channelId, videos, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateShortsByChannelId({
-        channelId,
-        entries: videos,
-        timestamp,
-      })
+      await DBSubscriptionCacheHandlers.updateShortsByChannelId(channelId, videos, timestamp)
       commit('updateShortsCacheByChannel', { channelId, entries: videos, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
@@ -114,10 +106,7 @@ const actions = {
 
   async updateSubscriptionShortsCacheWithChannelPageShorts({ commit }, { channelId, videos }) {
     try {
-      await DBSubscriptionCacheHandlers.updateShortsWithChannelPageShortsByChannelId({
-        channelId,
-        entries: videos,
-      })
+      await DBSubscriptionCacheHandlers.updateShortsWithChannelPageShortsByChannelId(channelId, videos)
       commit('updateShortsCacheWithChannelPageShorts', { channelId, entries: videos })
     } catch (errMessage) {
       console.error(errMessage)
@@ -126,11 +115,7 @@ const actions = {
 
   async updateSubscriptionLiveCacheByChannel({ commit }, { channelId, videos, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateLiveStreamsByChannelId({
-        channelId,
-        entries: videos,
-        timestamp,
-      })
+      await DBSubscriptionCacheHandlers.updateLiveStreamsByChannelId(channelId, videos, timestamp)
       commit('updateLiveCacheByChannel', { channelId, entries: videos, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
@@ -139,11 +124,7 @@ const actions = {
 
   async updateSubscriptionPostsCacheByChannel({ commit }, { channelId, posts, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateCommunityPostsByChannelId({
-        channelId,
-        entries: posts,
-        timestamp,
-      })
+      await DBSubscriptionCacheHandlers.updateCommunityPostsByChannelId(channelId, posts, timestamp)
       commit('updatePostsCacheByChannel', { channelId, entries: posts, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 53385c9c22a61..5313249eaea46 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -60,6 +60,7 @@ const state = {
     shorts: false,
     communityPosts: false,
   },
+  appTitle: ''
 }
 
 const getters = {
@@ -175,6 +176,9 @@ const getters = {
   getSubscriptionForCommunityPostsFirstAutoFetchRun (state) {
     return state.subscriptionFirstAutoFetchRunData.communityPosts === true
   },
+  getAppTitle (state) {
+    return state.appTitle
+  }
 }
 
 const actions = {
@@ -410,7 +414,7 @@ const actions = {
     commit('setRegionValues', regionValues)
   },
 
-  async getYoutubeUrlInfo({ state }, urlStr) {
+  async getYoutubeUrlInfo({ rootState, state }, urlStr) {
     // Returns
     // - urlType [String] `video`, `playlist`
     //
@@ -630,9 +634,12 @@ const actions = {
             }
             subPath = 'community'
             break
-          default:
+          case 'videos':
             subPath = 'videos'
             break
+          default:
+            subPath = rootState.settings.backendPreference === 'local' && !rootState.settings.hideChannelHome ? 'home' : 'videos'
+            break
         }
         return {
           urlType: 'channel',
@@ -689,20 +696,19 @@ const actions = {
     const customArgs = rootState.settings.externalPlayerCustomArgs
 
     if (ignoreDefaultArgs) {
-      if (typeof customArgs === 'string' && customArgs !== '') {
-        const custom = customArgs.split(';')
+      if (typeof customArgs === 'string' && customArgs !== '[]') {
+        const custom = JSON.parse(customArgs)
         args.push(...custom)
       }
       if (payload.videoId != null) args.push(`${cmdArgs.videoUrl}https://www.youtube.com/watch?v=${payload.videoId}`)
     } else {
       // Append custom user-defined arguments,
       // or use the default ones specified for the external player.
-      if (typeof customArgs === 'string' && customArgs !== '') {
-        const custom = customArgs.split(';')
+      if (typeof customArgs === 'string' && customArgs !== '[]') {
+        const custom = JSON.parse(customArgs)
         args.push(...custom)
-      } else if (typeof cmdArgs.defaultCustomArguments === 'string' && cmdArgs.defaultCustomArguments !== '') {
-        const defaultCustomArguments = cmdArgs.defaultCustomArguments.split(';')
-        args.push(...defaultCustomArguments)
+      } else if (Array.isArray(cmdArgs.defaultCustomArguments)) {
+        args.push(...cmdArgs.defaultCustomArguments)
       }
 
       if (payload.watchProgress > 0 && payload.watchProgress < payload.videoLength - 10) {
@@ -957,6 +963,11 @@ const mutations = {
     state.externalPlayerCmdArguments = value
   },
 
+  // Use this to set the app title / document.title
+  setAppTitle (state, value) {
+    state.appTitle = value
+  },
+
   setSubscriptionForVideosFirstAutoFetchRun (state) {
     state.subscriptionFirstAutoFetchRunData.videos = true
   },
@@ -968,7 +979,7 @@ const mutations = {
   },
   setSubscriptionForCommunityPostsFirstAutoFetchRun (state) {
     state.subscriptionFirstAutoFetchRunData.communityPosts = true
-  },
+  }
 }
 
 export default {
diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index b21cad820139e..a977cbc8510c5 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -1,17 +1,14 @@
-.system[data-system-theme*='light'],
-.light,
-.system[data-system-theme*='dark'],
-.dark,
-.black,
-.gray,
-.dracula,
-.catppuccinMocha,
-.pastelPink,
-.hotPink,
-.nordic,
-.solarizedDark,
-.solarizedLight {
+body {
+  margin: 0;
+  min-block-size: 100vh;
+  color: var(--primary-text-color);
+  background-color: var(--bg-color);
+
   --primary-input-color: rgb(0 0 0 / 50%);
+  --link-color: var(--accent-color);
+  --link-visited-color: var(--accent-color-visited);
+  --instance-menu-color: var(--search-bar-color);
+  --red-500: #f44336;
   --top-bar-push-down-adjustment-default: -35px;
 
   /* Value of 0 without 'px' does not work inside calc() */
@@ -20,73 +17,34 @@
   --top-bar-push-down-adjustment-edit-mode: 0px;
   --top-bar-push-down-adjustment-one-or-fewer: 0px;
   /* stylelint-enable length-zero-no-unit */
+
   --destructive-color: #f44336;
   --destructive-text-color: #000;
   --destructive-hover-color: #e53935;
   --destructive-active-color: #c62828;
-}
 
-.system[data-system-theme*='light'],
-.light,
-.system[data-system-theme*='dark'],
-.dark,
-.black,
-.dracula,
-.catppuccinMocha,
-.pastelPink,
-.hotPink,
-.nordic,
-.solarizedDark,
-.solarizedLight {
-  --link-color: var(--accent-color);
-  --link-visited-color: var(--accent-color-visited);
-  --instance-menu-color: var(--search-bar-color);
+  /* For the 'About' page, show the logo with the primary text color by default */
+  --logo-primary-color: var(--primary-text-color);
+  --logo-secondary-color: var(--primary-text-color);
+  --logo-tertiary-color: var(--primary-text-color);
 }
 
-.system[data-system-theme*='light'],
-.light,
-.system[data-system-theme*='dark'],
-.dark,
-.black,
-.gray,
-.dracula,
-.catppuccinMocha,
-.pastelPink,
-.nordic,
-.solarizedDark,
-.solarizedLight {
+
+/*************** RULE TWEAKS ***************/
+
+/* Default sidenav hover text color and primary input color not needed to be changed for most themes */
+body:not(.hotPink) {
   --primary-input-color: rgb(0 0 0 / 50%);
   --side-nav-hover-text-color: var(--primary-text-color);
 }
 
-.system[data-system-theme*='light'],
-.light,
-.system[data-system-theme*='dark'],
-.dark,
-.black,
-.gray,
-.dracula,
-.catppuccinMocha,
-.nordic,
-.solarizedDark,
-.solarizedLight {
+/* Default side nav active text color and scrollbar text color hover not needed to be changed for most themes */
+body:not(.hotPink, .pastelPink) {
   --side-nav-active-text-color: var(--primary-text-color);
   --scrollbar-text-color-hover: var(--primary-text-color);
-
-}
-
-.catppuccinMocha,
-.dracula,
-.hotPink,
-.nordic,
-.pastelPink,
-.solarizedDark,
-.solarizedLight {
-  --logo-primary-color: var(--primary-text-color);
-  --logo-secondary-color: var(--primary-text-color);
-  --logo-tertiary-color: var(--primary-text-color);
 }
 
+/* Themes that use the main FreeTube logo */
 .system[data-system-theme*='light'],
 .light,
 .system[data-system-theme*='dark'],
@@ -100,19 +58,80 @@
   --logo-tertiary-color: #000;
 }
 
+/* Given that the Hot Pink theme does not need link underlining due to meeting
+WCAG 2 Level AA (https://webaim.org/resources/linkcontrastchecker/?fcolor=FFFFFF&bcolor=DE1C85&lcolor=000000),
+it can be safely elided. This looks quite pleasant on this theme. */
+.hotPink a:not(:hover, :focus),
+.hotPink .navOption:hover,
+.hotPink .navOption:focus,
+.hotPink *:not(:hover, :focus) {
+  text-decoration: none;
+}
+
+.hotPink a:hover,
+.hotPink a:focus {
+  text-decoration: underline;
+}
+
+.hotPink .shaka-range-container {
+  --primary-color: #fff;
+}
+
+
+/*************** DARK THEME ADJUSTMENTS ***************/
+
+/* stylelint-disable no-descending-specificity */
+
+/* Dark theme Youtube and Invidious logo styling (in ft-share-button) */
 .system[data-system-theme*='dark'],
 .dark,
-.black,
-.gray,
 .dracula,
 .catppuccinMocha,
 .hotPink,
 .nordic,
 .solarizedDark,
-.solarizedLight {
+.gruvboxDark {
   --primary-shadow-color: rgb(0 0 0 / 75%);
+
+  .invidiousLogo {
+    background-image: url('./assets/img/invidious-logo-dark.svg');
+  }
+
+  .youtubeLogo {
+    filter: brightness(0.868);
+  }
 }
 
+.black .youtubeLogo {
+  filter: brightness(0.933);
+}
+
+.black .invidiousLogo {
+  background-image: url('./assets/img/invidious-logo-dark.svg');
+}
+
+
+/*************** LIGHT THEME ADJUSTMENTS ***************/
+
+/* Light theme Youtube and Invidious logo styling (in ft-share-button) */
+.invidiousLogo {
+  background-image: url('./assets/img/invidious-logo-light.svg');
+}
+
+.youtubeLogo {
+  filter: invert(0.87);
+}
+
+/* stylelint-enable no-descending-specificity */
+
+
+/*************** MAIN THEME DEFINITIONS ***************/
+
+/*
+  IMPLEMENTATION NOTE:
+  When adding a new base theme, add that --bg-color to src/main/index.js.
+*/
+
 .system[data-system-theme*='light'],
 .light {
   --primary-text-color: #212121;
@@ -181,66 +200,6 @@
   --search-bar-color: #212121;
 }
 
-.dracula {
-  --primary-text-color: #f8f8f2;
-  --secondary-text-color: #c6cee6;
-  --tertiary-text-color: #e5e8f3;
-  --title-color: #bd93f9;
-  --bg-color: #282a36;
-  --favorite-icon-color: #0f0;
-  --card-bg-color: #33353f;
-  --secondary-card-bg-color: #282a36;
-  --scrollbar-color: #44475a;
-  --scrollbar-color-hover: #3d4051;
-  --side-nav-color: #44475a;
-  --side-nav-hover-color: #57596b;
-  --side-nav-active-color: #3d4051;
-  --search-bar-color: #3e3f4a;
-  --logo-icon: url('../../_icons/iconDraculaLightSmall.svg');
-  --logo-text: url('../../_icons/textDraculaLightSmall.svg');
-}
-
-.catppuccinMocha {
-  --primary-text-color: #cdd6f4;
-  --secondary-text-color: #bac2de;
-  --tertiary-text-color: #a6adc8;
-  --title-color: var(--accent-color);
-  --bg-color: #1e1e2e;
-  --favorite-icon-color: #0f0;
-  --card-bg-color: #181825;
-  --secondary-card-bg-color: #1e1e2e;
-  --scrollbar-color: #313244;
-  --scrollbar-color-hover: #3d4051;
-  --side-nav-color: #181825;
-  --side-nav-hover-color: #11111b;
-  --side-nav-active-color: #11111b;
-  --search-bar-color: #313244;
-  --logo-icon: url('../../_icons/iconCatppuccinMochaLightSmall.svg');
-  --logo-text: url('../../_icons/textCatppuccinMochaLightSmall.svg');
-}
-
-.pastelPink {
-  --primary-text-color: #1f002b;
-  --secondary-text-color: #361836;
-  --tertiary-text-color: #5a285a;
-  --primary-shadow-color: rgb(255 240 240 / 50%);
-  --title-color: #185eb4;
-  --bg-color: #ffeadd;
-  --favorite-icon-color: #760278;
-  --card-bg-color: #ffd1dc;
-  --secondary-card-bg-color: #fff;
-  --scrollbar-color: #f5c8d3;
-  --scrollbar-color-hover: #760278;
-  --scrollbar-text-color-hover: var(--scrollbar-color);
-  --side-nav-color: #ffd1dc;
-  --side-nav-hover-color: #cef4f1;
-  --side-nav-active-color: #3124e7;
-  --side-nav-active-text-color: #ffff;
-  --search-bar-color: #fff0dd;
-  --logo-icon: url('../../_icons/iconBlackSmall.svg');
-  --logo-text: url('../../_icons/textBlackSmall.svg');
-}
-
 .nordic {
   --primary-text-color: #eee;
   --secondary-text-color: #ddd;
@@ -301,19 +260,64 @@
   --accent-color-opacity4: rgb(255 255 255 / 24%) !important;
 }
 
-/* Given that the Hot Pink theme does not need link underlining due to meeting
-WCAG 2 Level AA (https://webaim.org/resources/linkcontrastchecker/?fcolor=FFFFFF&bcolor=DE1C85&lcolor=000000),
-it can be safely elided. This looks quite pleasant on this theme. */
-.hotPink a:not(:hover, :focus),
-.hotPink .navOption:hover,
-.hotPink .navOption:focus,
-.hotPink *:not(:hover, :focus) {
-  text-decoration: none;
+.pastelPink {
+  --primary-text-color: #1f002b;
+  --secondary-text-color: #361836;
+  --tertiary-text-color: #5a285a;
+  --primary-shadow-color: rgb(255 240 240 / 50%);
+  --title-color: #185eb4;
+  --bg-color: #ffeadd;
+  --favorite-icon-color: #760278;
+  --card-bg-color: #ffd1dc;
+  --secondary-card-bg-color: #fff;
+  --scrollbar-color: #f5c8d3;
+  --scrollbar-color-hover: #760278;
+  --scrollbar-text-color-hover: var(--scrollbar-color);
+  --side-nav-color: #ffd1dc;
+  --side-nav-hover-color: #cef4f1;
+  --side-nav-active-color: #3124e7;
+  --side-nav-active-text-color: #ffff;
+  --search-bar-color: #fff0dd;
+  --logo-icon: url('../../_icons/iconBlackSmall.svg');
+  --logo-text: url('../../_icons/textBlackSmall.svg');
 }
 
-.hotPink a:hover,
-.hotPink a:focus {
-  text-decoration: underline;
+.catppuccinMocha {
+  --primary-text-color: #cdd6f4;
+  --secondary-text-color: #bac2de;
+  --tertiary-text-color: #a6adc8;
+  --title-color: var(--accent-color);
+  --bg-color: #1e1e2e;
+  --favorite-icon-color: #0f0;
+  --card-bg-color: #181825;
+  --secondary-card-bg-color: #1e1e2e;
+  --scrollbar-color: #313244;
+  --scrollbar-color-hover: #3d4051;
+  --side-nav-color: #181825;
+  --side-nav-hover-color: #11111b;
+  --side-nav-active-color: #11111b;
+  --search-bar-color: #313244;
+  --logo-icon: url('../../_icons/iconCatppuccinMochaLightSmall.svg');
+  --logo-text: url('../../_icons/textCatppuccinMochaLightSmall.svg');
+}
+
+.dracula {
+  --primary-text-color: #f8f8f2;
+  --secondary-text-color: #c6cee6;
+  --tertiary-text-color: #e5e8f3;
+  --title-color: #bd93f9;
+  --bg-color: #282a36;
+  --favorite-icon-color: #0f0;
+  --card-bg-color: #33353f;
+  --secondary-card-bg-color: #282a36;
+  --scrollbar-color: #44475a;
+  --scrollbar-color-hover: #3d4051;
+  --side-nav-color: #44475a;
+  --side-nav-hover-color: #57596b;
+  --side-nav-active-color: #3d4051;
+  --search-bar-color: #3e3f4a;
+  --logo-icon: url('../../_icons/iconDraculaLightSmall.svg');
+  --logo-text: url('../../_icons/textDraculaLightSmall.svg');
 }
 
 .solarizedDark {
@@ -354,6 +358,48 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --logo-text: url('../../_icons/textSolarizedDarkSmall.svg');
 }
 
+.gruvboxDark {
+  --primary-text-color: #ebdbb2;
+  --secondary-text-color: #d5c4a1;
+  --tertiary-text-color: #d5c4a1;
+  --title-color: #ebdbb2;
+  --bg-color: #282828;
+  --favorite-icon-color: #0f0;
+  --card-bg-color: #504945;
+  --secondary-card-bg-color: #3c3836;
+  --scrollbar-color: #665c54;
+  --scrollbar-color-hover: #282828;
+  --side-nav-color: #504945;
+  --side-nav-hover-color: #665c54;
+  --side-nav-active-color: #504945;
+  --search-bar-color: #1d2021;
+  --logo-icon: url('../../_icons/iconGruvboxLightSmall.svg');
+  --logo-text: url('../../_icons/textGruvboxLightSmall.svg');
+}
+
+.gruvboxLight {
+  --primary-shadow-color: rgb(255 241 199 / 100%);
+  --primary-text-color: #3c3836;
+  --secondary-text-color: #282828;
+  --tertiary-text-color: #282828;
+  --title-color: #3c3836;
+  --bg-color: #fbf1c7;
+  --favorite-icon-color: #0f0;
+  --card-bg-color: #ebdbb2;
+  --secondary-card-bg-color: #d5c4a1;
+  --scrollbar-color: #bdae93;
+  --scrollbar-color-hover: #fbf1c7;
+  --side-nav-color: #ebdbb2;
+  --side-nav-hover-color: #bdae93;
+  --side-nav-active-color: #ebdbb2;
+  --search-bar-color: #a89984;
+  --logo-icon: url('../../_icons/iconGruvboxDarkSmall.svg');
+  --logo-text: url('../../_icons/textGruvboxDarkSmall.svg');
+}
+
+
+/*************** PRIMARY THEME COLOR DEFINTIONS ***************/
+
 .mainRed,
 .mainPink,
 .mainPurple,
@@ -369,6 +415,7 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --logo-text-bar-color: url('../../_icons/textWhiteSmall.svg');
 }
 
+/* light primary theme colors */
 .mainLightGreen,
 .mainLime,
 .mainYellow,
@@ -476,64 +523,8 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --primary-color-active: #d84315;
 }
 
-.mainDraculaCyan,
-.mainDraculaGreen,
-.mainDraculaOrange,
-.mainDraculaRed,
-.mainDraculaYellow {
-  --text-with-main-color: #282a36;
-  --logo-icon-bar-color: url('../../_icons/iconDraculaDarkSmall.svg');
-  --logo-text-bar-color: url('../../_icons/textDraculaDarkSmall.svg');
-}
-
-.mainDraculaPink,
-.mainDraculaPurple {
-  --text-with-main-color: #f8f8f2;
-  --logo-icon-bar-color: url('../../_icons/iconDraculaLightSmall.svg');
-  --logo-text-bar-color: url('../../_icons/textDraculaLightSmall.svg');
-}
-
-.mainDraculaCyan {
-  --primary-color: #8be9fd;
-  --primary-color-hover: #97ebfd;
-  --primary-color-active: #7dd2e4;
-}
-
-.mainDraculaGreen {
-  --primary-color: #50fa7b;
-  --primary-color-hover: #62fb88;
-  --primary-color-active: #48e16f;
-}
-
-.mainDraculaOrange {
-  --primary-color: #ffb86c;
-  --primary-color-hover: #ffbf7b;
-  --primary-color-active: #e6a661;
-}
 
-.mainDraculaPink {
-  --primary-color: #ff79c6;
-  --primary-color-hover: #ff86cc;
-  --primary-color-active: #e66db2;
-}
-
-.mainDraculaPurple {
-  --primary-color: #bd93f9;
-  --primary-color-hover: #c49efa;
-  --primary-color-active: #aa84e0;
-}
-
-.mainDraculaRed {
-  --primary-color: #f55;
-  --primary-color-hover: #f66;
-  --primary-color-active: #e64d4d;
-}
-
-.mainDraculaYellow {
-  --primary-color: #f1fa8c;
-  --primary-color-hover: #f2fb98;
-  --primary-color-active: #d9e17e;
-}
+/* PRIMARY THEME COLORS CORRESPONDING TO BASE THEMES */
 
 .mainCatppuccinMochaRosewater,
 .mainCatppuccinMochaFlamingo,
@@ -602,40 +593,99 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --primary-color-active: #dec48d;
 }
 
-.mainCatppuccinMochaGreen {
-  --primary-color: #a6e3a1;
-  --primary-color-hover: #bfebbb;
-  --primary-color-active: #86c780;
+.mainCatppuccinMochaGreen {
+  --primary-color: #a6e3a1;
+  --primary-color-hover: #bfebbb;
+  --primary-color-active: #86c780;
+}
+
+.mainCatppuccinMochaTeal {
+  --primary-color: #94e2d5;
+  --primary-color-hover: #aceae0;
+  --primary-color-active: #6fc5b7;
+}
+
+.mainCatppuccinMochaSky {
+  --primary-color: #89dceb;
+  --primary-color-hover: #a3e4f0;
+  --primary-color-active: #68bcca;
+}
+
+.mainCatppuccinMochaSapphire {
+  --primary-color: #74c7ec;
+  --primary-color-hover: #93d1ed;
+  --primary-color-active: #59a9cf;
+}
+
+.mainCatppuccinMochaBlue {
+  --primary-color: #89b4fa;
+  --primary-color-hover: #a6c8ff;
+  --primary-color-active: #6593df;
+}
+
+.mainCatppuccinMochaLavender {
+  --primary-color: #b4befe;
+  --primary-color-hover: #c9d0ff;
+  --primary-color-active: #8d98e4;
+}
+
+.mainDraculaCyan,
+.mainDraculaGreen,
+.mainDraculaOrange,
+.mainDraculaRed,
+.mainDraculaYellow {
+  --text-with-main-color: #282a36;
+  --logo-icon-bar-color: url('../../_icons/iconDraculaDarkSmall.svg');
+  --logo-text-bar-color: url('../../_icons/textDraculaDarkSmall.svg');
+}
+
+.mainDraculaPink,
+.mainDraculaPurple {
+  --text-with-main-color: #f8f8f2;
+  --logo-icon-bar-color: url('../../_icons/iconDraculaLightSmall.svg');
+  --logo-text-bar-color: url('../../_icons/textDraculaLightSmall.svg');
+}
+
+.mainDraculaCyan {
+  --primary-color: #8be9fd;
+  --primary-color-hover: #97ebfd;
+  --primary-color-active: #7dd2e4;
+}
+
+.mainDraculaGreen {
+  --primary-color: #50fa7b;
+  --primary-color-hover: #62fb88;
+  --primary-color-active: #48e16f;
 }
 
-.mainCatppuccinMochaTeal {
-  --primary-color: #94e2d5;
-  --primary-color-hover: #aceae0;
-  --primary-color-active: #6fc5b7;
+.mainDraculaOrange {
+  --primary-color: #ffb86c;
+  --primary-color-hover: #ffbf7b;
+  --primary-color-active: #e6a661;
 }
 
-.mainCatppuccinMochaSky {
-  --primary-color: #89dceb;
-  --primary-color-hover: #a3e4f0;
-  --primary-color-active: #68bcca;
+.mainDraculaPink {
+  --primary-color: #ff79c6;
+  --primary-color-hover: #ff86cc;
+  --primary-color-active: #e66db2;
 }
 
-.mainCatppuccinMochaSapphire {
-  --primary-color: #74c7ec;
-  --primary-color-hover: #93d1ed;
-  --primary-color-active: #59a9cf;
+.mainDraculaPurple {
+  --primary-color: #bd93f9;
+  --primary-color-hover: #c49efa;
+  --primary-color-active: #aa84e0;
 }
 
-.mainCatppuccinMochaBlue {
-  --primary-color: #89b4fa;
-  --primary-color-hover: #a6c8ff;
-  --primary-color-active: #6593df;
+.mainDraculaRed {
+  --primary-color: #f55;
+  --primary-color-hover: #f66;
+  --primary-color-active: #e64d4d;
 }
 
-.mainCatppuccinMochaLavender {
-  --primary-color: #b4befe;
-  --primary-color-hover: #c9d0ff;
-  --primary-color-active: #8d98e4;
+.mainDraculaYellow {
+  --primary-color: #f1fa8c;
+  --primary-color-hover: #f2fb98;
+  --primary-color-active: #d9e17e;
 }
 
 .mainSolarizedYellow,
@@ -704,6 +754,96 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --primary-color-active: #c5d940;
 }
 
+.mainGruvboxDarkGreen {
+  --primary-color: #b8bb26;
+  --primary-color-hover: #d8db46;
+  --primary-color-active: #f8fb66;
+}
+
+.mainGruvboxDarkYellow {
+  --primary-color: #fabd2f;
+  --primary-color-hover: #fcd54f;
+  --primary-color-active: #fed76f;
+}
+
+.mainGruvboxDarkBlue {
+  --primary-color: #83a598;
+  --primary-color-hover: #a3c5b8;
+  --primary-color-active: #c3e2d8;
+}
+
+.mainGruvboxDarkPurple {
+  --primary-color: #d3869b;
+  --primary-color-hover: #f3a6b8;
+  --primary-color-active: #f3a6b8;
+}
+
+.mainGruvboxDarkAqua {
+  --primary-color: #8ec07c;
+  --primary-color-hover: #aec29c;
+  --primary-color-active: #cec59c;
+}
+
+.mainGruvboxDarkOrange {
+  --primary-color: #fe8019;
+  --primary-color-hover: #fe9a39;
+  --primary-color-active: #feb259;
+}
+
+.mainGruvboxLightRed {
+  --primary-color: #9d0006;
+  --primary-color-hover: #bd2026;
+  --primary-color-active: #dd4046;
+}
+
+.mainGruvboxLightBlue {
+  --primary-color: #076678;
+  --primary-color-hover: #276898;
+  --primary-color-active: #476ab8;
+}
+
+.mainGruvboxLightPurple {
+  --primary-color: #8f3f71;
+  --primary-color-hover: #af5f91;
+  --primary-color-active: #cf7fb1;
+}
+
+.mainGruvboxLightOrange {
+  --primary-color: #af3a03;
+  --primary-color-hover: #cf5a23;
+  --primary-color-active: #ef7a43;
+}
+
+.mainGruvboxLightOrange,
+.mainGruvboxLightRed,
+.mainGruvboxLightBlue,
+.mainGruvboxLightPurple {
+  --text-with-main-color: #fbf1c7;
+  --logo-icon-bar-color: url('../../_icons/iconGruvboxLightSmall.svg');
+  --logo-text-bar-color: url('../../_icons/textGruvboxLightSmall.svg');
+}
+
+
+.mainGruvboxDarkGreen,
+.mainGruvboxDarkYellow,
+.mainGruvboxDarkAqua,
+.mainGruvboxDarkOrange {
+  --text-with-main-color: #3c3836;
+  --logo-icon-bar-color: url('../../_icons/iconGruvboxDarkSmall.svg');
+  --logo-text-bar-color: url('../../_icons/textGruvboxDarkSmall.svg');
+}
+
+.mainGruvboxDarkBlue,
+.mainGruvboxDarkPurple {
+  --text-with-main-color: #1d2021;
+  --logo-icon-bar-color: url('../../_icons/iconGruvboxDarkSmall.svg');
+  --logo-text-bar-color: url('../../_icons/textGruvboxDarkSmall.svg');
+}
+
+
+/*************** SECONDARY THEME COLOR DEFINTIONS ***************/
+
+/* dark secondary theme colors */
 .secRed,
 .secPink,
 .secPurple,
@@ -717,6 +857,7 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --text-with-accent-color: #fff;
 }
 
+/* light secondary theme colors */
 .secLightGreen,
 .secLime,
 .secYellow,
@@ -918,88 +1059,8 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --accent-color-opacity4: rgb(255 87 34 / 24%);
 }
 
-.secDraculaCyan,
-.secDraculaGreen,
-.secDraculaOrange,
-.secDraculaRed,
-.secDraculaYellow {
-  --text-with-accent-color: #212121;
-}
-
-.secDraculaPink,
-.secDraculaPurple {
-  --text-with-accent-color: #f8f8f2;
-}
-
-.secDraculaCyan,
-.secDraculaGreen,
-.secDraculaOrange,
-.secDraculaPink,
-.secDraculaPurple,
-.secDraculaRed,
-.secDraculaYellow {
-  --accent-color-opacity1: rgb(98 114 164 / 4%);
-  --accent-color-opacity2: rgb(98 114 164 / 12%);
-  --accent-color-opacity3: rgb(98 114 164 / 16%);
-  --accent-color-opacity4: rgb(98 114 164 / 24%);
-}
-
-.secDraculaCyan {
-  --accent-color: #8be9fd;
-  --accent-color-hover: #97ebfd;
-  --accent-color-active: #7dd2e4;
-  --accent-color-light: #a2edfd;
-  --accent-color-visited: #6fbaca;
-
-}
-
-.secDraculaGreen {
-  --accent-color: #50fa7b;
-  --accent-color-hover: #62fb88;
-  --accent-color-active: #48e16f;
-  --accent-color-light: #73fb95;
-  --accent-color-visited: #40c862;
-}
-
-.secDraculaOrange {
-  --accent-color: #ffb86c;
-  --accent-color-hover: #ffbf7b;
-  --accent-color-active: #e6a661;
-  --accent-color-light: #ffc689;
-  --accent-color-visited: #cc9356;
-}
-
-.secDraculaPink {
-  --accent-color: #ff79c6;
-  --accent-color-hover: #ff86cc;
-  --accent-color-active: #e66db2;
-  --accent-color-light: #ff94d1;
-  --accent-color-visited: #cc619e;
-}
-
-.secDraculaPurple {
-  --accent-color: #bd93f9;
-  --accent-color-hover: #c49efa;
-  --accent-color-active: #aa84e0;
-  --accent-color-light: #caa9fa;
-  --accent-color-visited: #9776c7;
-}
-
-.secDraculaRed {
-  --accent-color: #f55;
-  --accent-color-hover: #f66;
-  --accent-color-active: #e64d4d;
-  --accent-color-light: #f77;
-  --accent-color-visited: #c44;
-}
 
-.secDraculaYellow {
-  --accent-color: #f1fa8c;
-  --accent-color-hover: #f2fb98;
-  --accent-color-active: #d9e17e;
-  --accent-color-light: #f4fba3;
-  --accent-color-visited: #c1c870;
-}
+/* SECONDARY THEME COLORS CORRESPONDING TO BASE THEMES */
 
 .secCatppuccinMochaRosewater,
 .secCatppuccinMochaFlamingo,
@@ -1186,6 +1247,89 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --accent-color-opacity4: rgb(180 190 254 / 24%);
 }
 
+.secDraculaCyan,
+.secDraculaGreen,
+.secDraculaOrange,
+.secDraculaRed,
+.secDraculaYellow {
+  --text-with-accent-color: #212121;
+}
+
+.secDraculaPink,
+.secDraculaPurple {
+  --text-with-accent-color: #f8f8f2;
+}
+
+.secDraculaCyan,
+.secDraculaGreen,
+.secDraculaOrange,
+.secDraculaPink,
+.secDraculaPurple,
+.secDraculaRed,
+.secDraculaYellow {
+  --accent-color-opacity1: rgb(98 114 164 / 4%);
+  --accent-color-opacity2: rgb(98 114 164 / 12%);
+  --accent-color-opacity3: rgb(98 114 164 / 16%);
+  --accent-color-opacity4: rgb(98 114 164 / 24%);
+}
+
+.secDraculaCyan {
+  --accent-color: #8be9fd;
+  --accent-color-hover: #97ebfd;
+  --accent-color-active: #7dd2e4;
+  --accent-color-light: #a2edfd;
+  --accent-color-visited: #6fbaca;
+
+}
+
+.secDraculaGreen {
+  --accent-color: #50fa7b;
+  --accent-color-hover: #62fb88;
+  --accent-color-active: #48e16f;
+  --accent-color-light: #73fb95;
+  --accent-color-visited: #40c862;
+}
+
+.secDraculaOrange {
+  --accent-color: #ffb86c;
+  --accent-color-hover: #ffbf7b;
+  --accent-color-active: #e6a661;
+  --accent-color-light: #ffc689;
+  --accent-color-visited: #cc9356;
+}
+
+.secDraculaPink {
+  --accent-color: #ff79c6;
+  --accent-color-hover: #ff86cc;
+  --accent-color-active: #e66db2;
+  --accent-color-light: #ff94d1;
+  --accent-color-visited: #cc619e;
+}
+
+.secDraculaPurple {
+  --accent-color: #bd93f9;
+  --accent-color-hover: #c49efa;
+  --accent-color-active: #aa84e0;
+  --accent-color-light: #caa9fa;
+  --accent-color-visited: #9776c7;
+}
+
+.secDraculaRed {
+  --accent-color: #f55;
+  --accent-color-hover: #f66;
+  --accent-color-active: #e64d4d;
+  --accent-color-light: #f77;
+  --accent-color-visited: #c44;
+}
+
+.secDraculaYellow {
+  --accent-color: #f1fa8c;
+  --accent-color-hover: #f2fb98;
+  --accent-color-active: #d9e17e;
+  --accent-color-light: #f4fba3;
+  --accent-color-visited: #c1c870;
+}
+
 .secSolarizedYellow,
 .secSolarizedOrange,
 .secSolarizedRed,
@@ -1304,42 +1448,176 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --accent-color-opacity4: rgb(101 119 0 / 24%);
 }
 
-/* region destructive color for red color themes
-  using :has(.app) to increase specificity */
-.mainRed:has(.app),
-.secRed:has(.app),
-.mainDraculaRed:has(.app),
-.secDraculaRed:has(.app),
-.mainSolarizedRed:has(.app),
-.secSolarizedRed:has(.app) {
+.secGruvboxDarkGreen {
+  --accent-color: #98971a;
+  --accent-color-hover: #b9b93a;
+  --accent-color-active: #d9d95a;
+  --accent-color-light: #b8bb26;
+  --accent-color-visited: #98971a;
+  --accent-color-opacity1: rgb(152 151 26 / 4%);
+  --accent-color-opacity2: rgb(152 151 26 / 12%);
+  --accent-color-opacity3: rgb(152 151 26 / 16%);
+  --accent-color-opacity4: rgb(152 151 26 / 24%);
+}
+
+.secGruvboxDarkYellow {
+  --accent-color: #d79921;
+  --accent-color-hover: #f0b839;
+  --accent-color-active: #f0b839;
+  --accent-color-light: #fabd2f;
+  --accent-color-visited: #d79921;
+  --accent-color-opacity1: rgb(215 153 33 / 4%);
+  --accent-color-opacity2: rgb(215 153 33 / 12%);
+  --accent-color-opacity3: rgb(215 153 33 / 16%);
+  --accent-color-opacity4: rgb(215 153 33 / 24%);
+}
+
+.secGruvboxDarkBlue {
+  --accent-color: #458588;
+  --accent-color-hover: #68948a;
+  --accent-color-active: #68948a;
+  --accent-color-light: #83a598;
+  --accent-color-visited: #458588;
+  --accent-color-opacity1: rgb(69 133 136 / 4%);
+  --accent-color-opacity2: rgb(69 133 136 / 12%);
+  --accent-color-opacity3: rgb(69 133 136 / 16%);
+  --accent-color-opacity4: rgb(69 133 136 / 24%);
+}
+
+.secGruvboxDarkPurple {
+  --accent-color: #b16286;
+  --accent-color-hover: #d3869b;
+  --accent-color-active: #d3869b;
+  --accent-color-light: #d3869b;
+  --accent-color-visited: #b16286;
+  --accent-color-opacity1: rgb(177 98 134 / 4%);
+  --accent-color-opacity2: rgb(177 98 134 / 12%);
+  --accent-color-opacity3: rgb(177 98 134 / 16%);
+  --accent-color-opacity4: rgb(177 98 134 / 24%);
+}
+
+.secGruvboxDarkAqua {
+  --accent-color: #689d6a;
+  --accent-color-hover: #8ec07c;
+  --accent-color-active: #8ec07c;
+  --accent-color-light: #8ec07c;
+  --accent-color-visited: #689d6a;
+  --accent-color-opacity1: rgb(104 157 106 / 4%);
+  --accent-color-opacity2: rgb(104 157 106 / 12%);
+  --accent-color-opacity3: rgb(104 157 106 / 16%);
+  --accent-color-opacity4: rgb(104 157 106 / 24%);
+}
+
+.secGruvboxDarkOrange {
+  --accent-color: #d65d0e;
+  --accent-color-hover: #f2804f;
+  --accent-color-active: #f2804f;
+  --accent-color-light: #fe8019;
+  --accent-color-visited: #d65d0e;
+  --accent-color-opacity1: rgb(214 93 14 / 4%);
+  --accent-color-opacity2: rgb(214 93 14 / 12%);
+  --accent-color-opacity3: rgb(214 93 14 / 16%);
+  --accent-color-opacity4: rgb(214 93 14 / 24%);
+}
+
+.secGruvboxLightRed {
+  --text-with-accent-color: #fbf1c7;
+  --accent-color: #cc241d;
+  --accent-color-hover: #d23c2a;
+  --accent-color-active: #a61f1f;
+  --accent-color-light: #fb4934;
+  --accent-color-visited: #a61f1f;
+  --accent-color-opacity1: rgb(204 36 29 / 4%);
+  --accent-color-opacity2: rgb(204 36 29 / 12%);
+  --accent-color-opacity3: rgb(204 36 29 / 16%);
+  --accent-color-opacity4: rgb(204 36 29 / 24%);
+}
+
+.secGruvboxLightBlue {
+  --accent-color: #458588;
+  --accent-color-hover: #68948a;
+  --accent-color-active: #68948a;
+  --accent-color-light: #83a598;
+  --accent-color-visited: #458588;
+  --accent-color-opacity1: rgb(69 133 136 / 4%);
+  --accent-color-opacity2: rgb(69 133 136 / 12%);
+  --accent-color-opacity3: rgb(69 133 136 / 16%);
+  --accent-color-opacity4: rgb(69 133 136 / 24%);
+}
+
+.secGruvboxLightPurple {
+  --accent-color: #b16286;
+  --accent-color-hover: #d3869b;
+  --accent-color-active: #d3869b;
+  --accent-color-light: #d3869b;
+  --accent-color-visited: #b16286;
+  --accent-color-opacity1: rgb(177 98 134 / 4%);
+  --accent-color-opacity2: rgb(177 98 134 / 12%);
+  --accent-color-opacity3: rgb(177 98 134 / 16%);
+  --accent-color-opacity4: rgb(177 98 134 / 24%);
+}
+
+.secGruvboxLightOrange {
+  --accent-color: #d65d0e;
+  --accent-color-hover: #f2804f;
+  --accent-color-active: #f2804f;
+  --accent-color-light: #fe8019;
+  --accent-color-visited: #d65d0e;
+  --accent-color-opacity1: rgb(214 93 14 / 4%);
+  --accent-color-opacity2: rgb(214 93 14 / 12%);
+  --accent-color-opacity3: rgb(214 93 14 / 16%);
+  --accent-color-opacity4: rgb(214 93 14 / 24%);
+}
+
+.secGruvboxLightOrange,
+.secGruvboxLightRed,
+.secGruvboxLightBlue,
+.secGruvboxLightPurple {
+  --text-with-accent-color: #fbf1c7;
+}
+
+.secGruvboxDarkGreen,
+.secGruvboxDarkYellow,
+.secGruvboxDarkAqua,
+.secGruvboxDarkOrange {
+  --text-with-accent-color: #3c3836;
+}
+
+.secGruvboxDarkBlue,
+.secGruvboxDarkPurple {
+  --text-with-accent-color: #1d2021;
+}
+
+
+/*************** DESTRUCTIVE THEME COLOR OVERRIDES ***************/
+
+/* stylelint-disable no-descending-specificity */
+
+/* destructive color in case of conflict with red color themes (sets new destructive color to purple)
+  NOTE: RED COLORS MUST CONTAIN 'Red' IN CLASSNAME.
+*/
+body[class*='Red'] * {
   --destructive-color: #9c27b0;
   --destructive-text-color: #fff;
   --destructive-hover-color: #8e24aa;
   --destructive-active-color: #6a1b9a;
 }
 
-/* Deal with theme conflict on destructive colors */
-.mainRed.secPurple,
-.mainRed.secDeepPurple,
-.mainRed.secDraculaPurple,
-.mainDraculaRed.secPurple,
-.mainDraculaRed.secDeepPurple,
-.mainDraculaRed.secDraculaPurple,
-.mainSolarizedRed.secPurple,
-.mainSolarizedRed.secDeepPurple,
-.mainSolarizedRed.secDraculaPurple,
-.mainPurple.secRed,
-.mainPurple.secDraculaRed,
-.mainDeepPurple.secRed,
-.mainDeepPurple.secDraculaRed,
-.mainDraculaPurple.secRed,
-.mainDraculaPurple.secDraculaRed {
+/* destructive color in case of conflict with red and purple color themes (sets new destructive color to yellow)
+  NOTE: PURPLE COLORS MUST CONTAIN 'Purple' IN CLASSNAME.
+*/
+body[class*='Red'][class*='Purple'] * {
   --destructive-color: #ff9800;
   --destructive-text-color: #fff;
   --destructive-hover-color: #fb8c00;
   --destructive-active-color: #ef6c00;
 }
 
+/* stylelint-enable no-descending-specificity */
+
+
+/*************** LEFT-TO-RIGHT AND RIGHT-TO-LEFT RULES ***************/
+
 body[dir='ltr'] {
   --ltr-or-rtl: ltr;
   --float-left-ltr-rtl-value: left;
@@ -1366,35 +1644,32 @@ html[lang='ur'] [data-prefix='fas'][data-icon='circle-question'] {
   transform: scale(-1, 1);
 }
 
-body {
-  margin: 0;
-  min-block-size: 100vh;
-  color: var(--primary-text-color);
-  background-color: var(--bg-color);
 
-  --red-500: #f44336;
-}
+/*************** MAIN APP STYLING RULES ***************/
 
 .app {
   color: var(--primary-text-color);
   background-color: var(--bg-color);
 }
 
+
+/* stylelint-disable no-descending-specificity */
+
 /* stylelint-disable-next-line a11y/no-outline-none */
 .hideOutlines *:focus {
   outline: none;
 }
 
-/* stylelint-disable-next-line no-descending-specificity */
 a:link {
   color: var(--link-color);
 }
 
-/* stylelint-disable-next-line no-descending-specificity */
 a:visited {
   color: var(--link-visited-color);
 }
 
+/* stylelint-enable no-descending-specificity */
+
 @media (prefers-reduced-motion) {
   * {
     transition: none !important;
diff --git a/src/renderer/views/About/About.css b/src/renderer/views/About/About.css
index bd9c5da185d22..c86b3a95a438d 100644
--- a/src/renderer/views/About/About.css
+++ b/src/renderer/views/About/About.css
@@ -7,7 +7,7 @@
   text-align: center;
 }
 
-.ft-logo-full {
+.logo {
   max-inline-size: 100%;
   inline-size: 500px;
 }
diff --git a/src/renderer/views/About/About.js b/src/renderer/views/About/About.js
deleted file mode 100644
index d47e65713089e..0000000000000
--- a/src/renderer/views/About/About.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { defineComponent } from 'vue'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import packageDetails from '../../../../package.json'
-import { ABOUT_BITCOIN_ADDRESS } from '../../../constants'
-import FtLogoFull from '../../components/ft-logo-full/ft-logo-full.vue'
-
-export default defineComponent({
-  name: 'About',
-  components: {
-    'ft-card': FtCard,
-    'ft-logo-full': FtLogoFull,
-  },
-  data: function () {
-    return {
-      versionNumber: `v${packageDetails.version}`
-    }
-  },
-  computed: {
-    chunks: function () {
-      return [
-        {
-          icon: ['fab', 'github'],
-          title: this.$t('About.Source code'),
-          content: `<a href="https://github.com/FreeTubeApp/FreeTube" lang="en">GitHub: FreeTubeApp/FreeTube</a><br>${this.$t('About.Licensed under the')} <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">${this.$t('About.AGPLv3')}</a>`
-        },
-        {
-          icon: ['fas', 'file-download'],
-          title: this.$t('About.Downloads / Changelog'),
-          content: `<a href="https://github.com/FreeTubeApp/FreeTube/releases">${this.$t('About.GitHub releases')}</a>`
-        },
-        {
-          icon: ['fas', 'question-circle'],
-          title: this.$t('About.Help'),
-          content: `<a href="https://docs.freetubeapp.io/">${this.$t('About.FreeTube Wiki')}</a> / <a href="https://docs.freetubeapp.io/faq/">${this.$t('About.FAQ')}</a> / <a href="https://github.com/FreeTubeApp/FreeTube/discussions/">${this.$t('About.Discussions')}</a>`
-        },
-        {
-          icon: ['fas', 'exclamation-circle'],
-          title: this.$t('About.Report a problem'),
-          content: `<a href="https://github.com/FreeTubeApp/FreeTube/issues">${this.$t('About.GitHub issues')}</a><br>${this.$t('About.Please check for duplicates before posting')}`
-        },
-        {
-          icon: ['fas', 'globe'],
-          title: this.$t('About.Website'),
-          content: '<a href="https://freetubeapp.io/">https://freetubeapp.io/</a>'
-        },
-        {
-          icon: ['fas', 'newspaper'],
-          title: this.$t('About.Blog'),
-          content: '<a href="https://blog.freetubeapp.io">https://blog.freetubeapp.io</a>'
-        },
-        {
-          icon: ['fas', 'envelope'],
-          title: this.$t('About.Email'),
-          content: '<a href="mailto:FreeTubeApp@protonmail.com">FreeTubeApp@protonmail.com</a>'
-        },
-        {
-          icon: ['fab', 'mastodon'],
-          title: this.$t('About.Mastodon'),
-          content: '<a href="https://fosstodon.org/@FreeTube">@FreeTube@fosstodon.org</a>'
-        },
-        {
-          icon: ['fas', 'comment-dots'],
-          title: this.$t('About.Chat on Matrix'),
-          content: `<a href="https://matrix.to/#/#freetube:matrix.org?via=matrix.org&via=privacytools.io&via=tchncs.de">#freetube:matrix.org</a><br>${this.$t('About.Please read the')} <a href="https://docs.freetubeapp.io/community/matrix/">${this.$t('About.room rules')}</a>`
-        },
-        {
-          icon: ['fas', 'language'],
-          title: this.$t('About.Translate'),
-          content: '<a href="https://hosted.weblate.org/engage/free-tube/">https://hosted.weblate.org/engage/free-tube/</a>'
-        },
-        {
-          icon: ['fas', 'users'],
-          title: this.$t('About.Credits'),
-          content: `${this.$t('About.FreeTube is made possible by')} <a href="https://docs.freetubeapp.io/credits/">${this.$t('About.these people and projects')}</a>`
-        },
-        {
-          icon: ['fab', 'bitcoin'],
-          title: `${this.$t('About.Donate')} - BTC`,
-          content: `<a href="bitcoin:${ABOUT_BITCOIN_ADDRESS}">${ABOUT_BITCOIN_ADDRESS}</a>`
-        }
-      ]
-    }
-  }
-})
diff --git a/src/renderer/views/About/About.vue b/src/renderer/views/About/About.vue
index 6aec14edadf3a..c56b167753be5 100644
--- a/src/renderer/views/About/About.vue
+++ b/src/renderer/views/About/About.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <ft-card class="card">
+    <FtCard class="card">
       <h1>
         {{ $t("About.About") }}
       </h1>
       <section class="brand">
-        <ft-logo-full />
+        <FtLogoFull class="logo" />
         <div class="version">
           {{ versionNumber }} {{ $t("About.Beta") }}
         </div>
@@ -16,7 +16,7 @@
           :key="chunk.title"
           class="chunk"
         >
-          <font-awesome-icon
+          <FontAwesomeIcon
             class="icon"
             :icon="chunk.icon"
           />
@@ -29,9 +29,87 @@
           />
         </figure>
       </section>
-    </ft-card>
+    </FtCard>
   </div>
 </template>
 
-<script src="./About.js" />
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { computed } from 'vue'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtLogoFull from '../../components/FtLogoFull/FtLogoFull.vue'
+
+import { ABOUT_BITCOIN_ADDRESS } from '../../../constants'
+import packageDetails from '../../../../package.json'
+
+const { t } = useI18n()
+
+const versionNumber = `v${packageDetails.version}`
+
+const chunks = computed(() => [
+  {
+    icon: ['fab', 'github'],
+    title: t('About.Source code'),
+    content: `<a href="https://github.com/FreeTubeApp/FreeTube" lang="en">GitHub: FreeTubeApp/FreeTube</a><br>${t('About.Licensed under the')} <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">${t('About.AGPLv3')}</a>`
+  },
+  {
+    icon: ['fas', 'file-download'],
+    title: t('About.Downloads / Changelog'),
+    content: `<a href="https://github.com/FreeTubeApp/FreeTube/releases">${t('About.GitHub releases')}</a>`
+  },
+  {
+    icon: ['fas', 'question-circle'],
+    title: t('About.Help'),
+    content: `<a href="https://docs.freetubeapp.io/">${t('About.FreeTube Wiki')}</a> / <a href="https://docs.freetubeapp.io/faq/">${t('About.FAQ')}</a> / <a href="https://github.com/FreeTubeApp/FreeTube/discussions/">${t('About.Discussions')}</a>`
+  },
+  {
+    icon: ['fas', 'exclamation-circle'],
+    title: t('About.Report a problem'),
+    content: `<a href="https://github.com/FreeTubeApp/FreeTube/issues">${t('About.GitHub issues')}</a><br>${t('About.Please check for duplicates before posting')}`
+  },
+  {
+    icon: ['fas', 'globe'],
+    title: t('About.Website'),
+    content: '<a href="https://freetubeapp.io/">https://freetubeapp.io/</a>'
+  },
+  {
+    icon: ['fas', 'newspaper'],
+    title: t('About.Blog'),
+    content: '<a href="https://blog.freetubeapp.io">https://blog.freetubeapp.io</a>'
+  },
+  {
+    icon: ['fas', 'envelope'],
+    title: t('About.Email'),
+    content: '<a href="mailto:FreeTubeApp@protonmail.com">FreeTubeApp@protonmail.com</a>'
+  },
+  {
+    icon: ['fab', 'mastodon'],
+    title: t('About.Mastodon'),
+    content: '<a href="https://fosstodon.org/@FreeTube">@FreeTube@fosstodon.org</a>'
+  },
+  {
+    icon: ['fas', 'comment-dots'],
+    title: t('About.Chat on Matrix'),
+    content: `<a href="https://matrix.to/#/#freetube:matrix.org?via=matrix.org&via=privacytools.io&via=tchncs.de">#freetube:matrix.org</a><br>${t('About.Please read the')} <a href="https://docs.freetubeapp.io/community/matrix/">${t('About.room rules')}</a>`
+  },
+  {
+    icon: ['fas', 'language'],
+    title: t('About.Translate'),
+    content: '<a href="https://hosted.weblate.org/engage/free-tube/">https://hosted.weblate.org/engage/free-tube/</a>'
+  },
+  {
+    icon: ['fas', 'users'],
+    title: t('About.Credits'),
+    content: `${t('About.FreeTube is made possible by')} <a href="https://docs.freetubeapp.io/credits/">${t('About.these people and projects')}</a>`
+  },
+  {
+    icon: ['fab', 'bitcoin'],
+    title: `${t('About.Donate')} - BTC`,
+    content: `<a href="bitcoin:${ABOUT_BITCOIN_ADDRESS}">${ABOUT_BITCOIN_ADDRESS}</a>`
+  }
+])
+</script>
+
 <style scoped src="./About.css" />
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index d384e55adebe0..8223de6907586 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -1,18 +1,18 @@
 import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtSelect from '../../components/ft-select/ft-select.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtAgeRestricted from '../../components/ft-age-restricted/ft-age-restricted.vue'
+import FtAgeRestricted from '../../components/FtAgeRestricted/FtAgeRestricted.vue'
 import ChannelAbout from '../../components/channel-about/channel-about.vue'
 import ChannelDetails from '../../components/ChannelDetails/ChannelDetails.vue'
 import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
+import ChannelHome from '../../components/ChannelHome/ChannelHome.vue'
 
 import autolinker from 'autolinker'
 import {
-  setPublishedTimestampsInvidious,
   copyToClipboard,
   extractNumberFromString,
   showToast,
@@ -22,10 +22,16 @@ import {
 import { isNullOrEmpty } from '../../helpers/strings'
 import packageDetails from '../../../../package.json'
 import {
-  invidiousAPICall,
+  getInvidiousChannelLive,
+  getInvidiousChannelPlaylists,
+  getInvidiousChannelPodcasts,
+  getInvidiousChannelReleases,
+  getInvidiousChannelShorts,
+  getInvidiousChannelVideos,
   invidiousGetChannelId,
   invidiousGetChannelInfo,
   invidiousGetCommunityPosts,
+  searchInvidiousChannel,
   youtubeImageUrlToInvidious
 } from '../../helpers/api/invidious'
 import {
@@ -36,14 +42,15 @@ import {
   parseLocalChannelShorts,
   parseLocalChannelVideos,
   parseLocalCommunityPosts,
-  parseLocalCompactStation,
   parseLocalListPlaylist,
   parseLocalListVideo,
   parseLocalSubscriberCount,
   getLocalArtistTopicChannelReleasesContinuation,
   getLocalPlaylist,
-  parseLocalPlaylistVideo
+  parseLocalPlaylistVideo,
+  parseChannelHomeTab
 } from '../../helpers/api/local'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 
 export default defineComponent({
   name: 'Channel',
@@ -56,12 +63,15 @@ export default defineComponent({
     'ft-age-restricted': FtAgeRestricted,
     'channel-about': ChannelAbout,
     'ft-auto-load-next-page-wrapper': FtAutoLoadNextPageWrapper,
-    ChannelDetails
+    ChannelDetails,
+    ChannelHome
   },
   data: function () {
     return {
+      skipRouteChangeWatcherOnce: false,
       isLoading: true,
       isElementListLoading: false,
+      isSearchTabLoading: false,
       currentTab: 'videos',
       id: '',
       /** @type {import('youtubei.js').YT.Channel|null} */
@@ -96,6 +106,7 @@ export default defineComponent({
       showPlaylistSortBy: true,
       lastSearchQuery: '',
       relatedChannels: [],
+      homeData: [],
       latestVideos: [],
       latestShorts: [],
       latestLive: [],
@@ -117,6 +128,7 @@ export default defineComponent({
 
       autoRefreshOnSortByChangeEnabled: false,
       supportedChannelTabs: [
+        'home',
         'videos',
         'shorts',
         'live',
@@ -170,10 +182,7 @@ export default defineComponent({
     },
 
     isSubscribedInAnyProfile: function () {
-      const profileList = this.$store.getters.getProfileList
-
-      // check the all channels profile
-      return profileList[0].subscriptions.some((channel) => channel.id === this.id)
+      return this.$store.getters.getSubscribedChannelIdSet.has(this.id)
     },
 
     videoLiveShortSelectValues: function () {
@@ -260,6 +269,10 @@ export default defineComponent({
       return this.$store.getters.getHideChannelCommunity
     },
 
+    hideChannelHome: function() {
+      return this.$store.getters.getHideChannelHome
+    },
+
     tabInfoValues: function () {
       const values = [...this.channelTabs]
 
@@ -289,6 +302,10 @@ export default defineComponent({
         indexToRemove.push(values.indexOf('releases'))
       }
 
+      if (this.hideChannelHome) {
+        indexToRemove.push(values.indexOf('home'))
+      }
+
       indexToRemove.forEach(index => {
         if (index !== -1) {
           values.splice(index, 1)
@@ -297,10 +314,22 @@ export default defineComponent({
 
       return values
     },
+
+    isCurrentTabLoading() {
+      if (this.currentTab === 'search') {
+        return this.isSearchTabLoading
+      }
+
+      return this.isElementListLoading
+    },
   },
   watch: {
     $route() {
       // react to route changes...
+      if (this.skipRouteChangeWatcherOnce) {
+        this.skipRouteChangeWatcherOnce = false
+        return
+      }
       this.isLoading = true
 
       if (this.$route.query.url) {
@@ -357,8 +386,9 @@ export default defineComponent({
 
       // Re-enable auto refresh on sort value change AFTER update done
       if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
-        this.getChannelInfoInvidious()
-        this.autoRefreshOnSortByChangeEnabled = true
+        this.getChannelInfoInvidious().finally(() => {
+          this.autoRefreshOnSortByChangeEnabled = true
+        })
       } else {
         this.getChannelLocal().finally(() => {
           this.autoRefreshOnSortByChangeEnabled = true
@@ -435,9 +465,9 @@ export default defineComponent({
       }
     }
   },
-  mounted: function () {
+  mounted: async function () {
     if (this.$route.query.url) {
-      this.resolveChannelUrl(this.$route.query.url, this.$route.params.currentTab)
+      await this.resolveChannelUrl(this.$route.query.url, this.$route.params.currentTab)
       return
     }
 
@@ -453,13 +483,19 @@ export default defineComponent({
 
     // Enable auto refresh on sort value change AFTER initial update done
     if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
-      this.getChannelInfoInvidious()
-      this.autoRefreshOnSortByChangeEnabled = true
+      await this.getChannelInfoInvidious().finally(() => {
+        this.autoRefreshOnSortByChangeEnabled = true
+      })
     } else {
-      this.getChannelLocal().finally(() => {
+      await this.getChannelLocal().finally(() => {
         this.autoRefreshOnSortByChangeEnabled = true
       })
     }
+
+    const oldQuery = this.$route.query.searchQueryText ?? ''
+    if (oldQuery !== null && oldQuery !== '') {
+      this.newSearch(oldQuery)
+    }
   },
   methods: {
     resolveChannelUrl: async function (url, tab = undefined) {
@@ -525,7 +561,7 @@ export default defineComponent({
           this.channelName = channelName
           this.thumbnailUrl = channelThumbnailUrl
 
-          document.title = `${channelName} - ${packageDetails.productName}`
+          this.setAppTitle(`${channelName} - ${packageDetails.productName}`)
 
           this.updateSubscriptionDetails({ channelThumbnailUrl, channelName, channelId: this.id })
 
@@ -569,7 +605,7 @@ export default defineComponent({
         }
         this.tags = tags
 
-        document.title = `${channelName} - ${packageDetails.productName}`
+        this.setAppTitle(`${channelName} - ${packageDetails.productName}`)
 
         if (subscriberText) {
           const subCount = parseLocalSubscriberCount(subscriberText)
@@ -585,45 +621,6 @@ export default defineComponent({
 
         this.updateSubscriptionDetails({ channelThumbnailUrl, channelName, channelId })
 
-        let relatedChannels = channel.channels.map(({ author }) => ({
-          name: author.name,
-          id: author.id,
-          thumbnailUrl: author.best_thumbnail.url
-        }))
-
-        if (channel.memo.has('GameDetails')) {
-          /** @type {import('youtubei.js').YTNodes.GameDetails[]} */
-          const games = channel.memo.get('GameDetails')
-
-          relatedChannels.push(...games.map(game => ({
-            id: game.endpoint.payload.browseId,
-            name: game.title.text,
-            thumbnailUrl: game.box_art[0].url
-          })))
-        }
-
-        if (relatedChannels.length > 0) {
-          /** @type {Set<string>} */
-          const knownChannelIds = new Set()
-
-          relatedChannels = relatedChannels.filter(channel => {
-            if (!knownChannelIds.has(channel.id)) {
-              knownChannelIds.add(channel.id)
-              return true
-            }
-
-            return false
-          })
-
-          relatedChannels.forEach(channel => {
-            if (channel.thumbnailUrl.startsWith('//')) {
-              channel.thumbnailUrl = `https:${channel.thumbnailUrl}`
-            }
-          })
-        }
-
-        this.relatedChannels = relatedChannels
-
         this.channelInstance = channel
 
         if (channel.has_about) {
@@ -637,6 +634,15 @@ export default defineComponent({
         }
         const tabs = ['about']
 
+        // we'll count it as home page if it's not video. This will help us support some special channels
+        if ((channel.has_home === 'home' || channel.tabs[0] !== 'Videos')) {
+          if (!this.hideChannelHome) {
+            tabs.push('home')
+          }
+          // we still parse the home page so we can set related channels
+          this.getChannelHomeLocal()
+        }
+
         if (channel.has_videos || this.isArtistTopicChannel) {
           tabs.push('videos')
           this.getChannelVideosLocal()
@@ -666,20 +672,6 @@ export default defineComponent({
           if (channel.has_playlists) {
             tabs.push('playlists')
             this.getChannelPlaylistsLocal()
-          } else if (channelId === 'UC-9-kyTW8ZkZNDHQJ6FgpwQ') {
-            // Special handling for "The Music Channel" (https://youtube.com/music)
-            tabs.push('playlists')
-            const playlists = channel.playlists.map(playlist => parseLocalListPlaylist(playlist))
-
-            const compactStations = channel.memo.get('CompactStation')
-            if (compactStations) {
-              for (const compactStation of compactStations) {
-                playlists.push(parseLocalCompactStation(compactStation, channelId, channelName))
-              }
-            }
-
-            this.showPlaylistSortBy = false
-            this.latestPlaylists = playlists
           }
         }
 
@@ -715,7 +707,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-        */
+         */
         const channel = this.channelInstance
         const about = await channel.getAbout()
 
@@ -764,6 +756,55 @@ export default defineComponent({
       }
     },
 
+    getChannelHomeLocal: function () {
+      this.isElementListLoading = true
+      const expectedId = this.id
+
+      try {
+        /**
+         * @type {import('youtubei.js').YT.Channel}
+         */
+        const channel = this.channelInstance
+        const homeTab = channel //  await channel.getHome()
+
+        if (expectedId !== this.id) {
+          return
+        }
+
+        const homeData = parseChannelHomeTab(homeTab)
+        if (!this.hideChannelHome) {
+          this.homeData = homeData
+        }
+
+        // parse related channels from home page data
+        const relatedChannels = []
+        /** @type {Set<string>} */
+        const knownChannelIds = new Set()
+
+        for (const shelf of homeData) {
+          for (const item of shelf.content) {
+            if (item.type === 'channel' && !knownChannelIds.has(item.id)) {
+              knownChannelIds.add(item)
+              relatedChannels.push({
+                name: item.name,
+                id: item.id,
+                thumbnailUrl: item.thumbnail
+              })
+            }
+          }
+        }
+        this.relatedChannels = relatedChannels
+
+        this.isElementListLoading = false
+      } catch (err) {
+        console.error(err)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
+        })
+      }
+    },
+
     getChannelVideosLocal: async function () {
       this.isElementListLoading = true
       const expectedId = this.id
@@ -787,7 +828,7 @@ export default defineComponent({
         } else {
           /**
            * @type {import('youtubei.js').YT.Channel}
-          */
+           */
           const channel = this.channelInstance
           let videosTab = await channel.getVideos()
 
@@ -937,7 +978,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-        */
+         */
         const channel = this.channelInstance
         let liveTab = await channel.getLiveStreams()
 
@@ -1013,7 +1054,7 @@ export default defineComponent({
       this.channelInstance = null
 
       const expectedId = this.id
-      invidiousGetChannelInfo(this.id).then((response) => {
+      return invidiousGetChannelInfo(this.id).then((response) => {
         if (expectedId !== this.id) {
           return
         }
@@ -1021,7 +1062,7 @@ export default defineComponent({
         const channelName = response.author
         const channelId = response.authorId
         this.channelName = channelName
-        document.title = `${this.channelName} - ${packageDetails.productName}`
+        this.setAppTitle(`${this.channelName} - ${packageDetails.productName}`)
         this.id = channelId
         this.isFamilyFriendly = response.isFamilyFriendly
         this.subCount = response.subCount
@@ -1060,7 +1101,7 @@ export default defineComponent({
         })
 
         this.channelTabs = this.supportedChannelTabs.filter(tab => {
-          return tabs.includes(tab)
+          return tabs.includes(tab) && tab !== 'home'
         })
 
         this.currentTab = this.currentOrFirstTab(this.$route.params.currentTab)
@@ -1111,32 +1152,18 @@ export default defineComponent({
     },
 
     channelInvidiousVideos: function (sortByChanged) {
-      const payload = {
-        resource: 'channels',
-        id: this.id,
-        subResource: 'videos',
-        params: {
-          sort_by: this.videoSortBy,
-        }
-      }
-
       if (sortByChanged) {
         this.videoContinuationData = null
       }
 
       let more = false
       if (this.videoContinuationData) {
-        payload.params.continuation = this.videoContinuationData
         more = true
-      }
-
-      if (!more) {
+      } else {
         this.isElementListLoading = true
       }
 
-      invidiousAPICall(payload).then((response) => {
-        setPublishedTimestampsInvidious(response.videos)
-
+      getInvidiousChannelVideos(this.id, this.videoSortBy, this.videoContinuationData).then((response) => {
         if (more) {
           this.latestVideos = this.latestVideos.concat(response.videos)
         } else {
@@ -1163,38 +1190,18 @@ export default defineComponent({
     },
 
     channelInvidiousShorts: function (sortByChanged) {
-      const payload = {
-        resource: 'channels',
-        id: this.id,
-        subResource: 'shorts',
-        params: {
-          sort_by: this.shortSortBy,
-        }
-      }
-
       if (sortByChanged) {
         this.shortContinuationData = null
       }
 
       let more = false
       if (this.shortContinuationData) {
-        payload.params.continuation = this.shortContinuationData
         more = true
-      }
-
-      if (!more) {
+      } else {
         this.isElementListLoading = true
       }
 
-      invidiousAPICall(payload).then((response) => {
-        // workaround for Invidious sending incorrect information
-        // https://github.com/iv-org/invidious/issues/3801
-        response.videos.forEach(video => {
-          video.isUpcoming = false
-          delete video.published
-          delete video.premiereTimestamp
-        })
-
+      getInvidiousChannelShorts(this.id, this.shortSortBy, this.shortContinuationData).then((response) => {
         if (more) {
           this.latestShorts.push(...response.videos)
         } else {
@@ -1223,32 +1230,18 @@ export default defineComponent({
     },
 
     channelInvidiousLive: function (sortByChanged) {
-      const payload = {
-        resource: 'channels',
-        id: this.id,
-        subResource: 'streams',
-        params: {
-          sort_by: this.liveSortBy,
-        }
-      }
-
       if (sortByChanged) {
         this.liveContinuationData = null
       }
 
       let more = false
       if (this.liveContinuationData) {
-        payload.params.continuation = this.liveContinuationData
         more = true
-      }
-
-      if (!more) {
+      } else {
         this.isElementListLoading = true
       }
 
-      invidiousAPICall(payload).then((response) => {
-        setPublishedTimestampsInvidious(response.videos)
-
+      getInvidiousChannelLive(this.id, this.liveSortBy, this.liveContinuationData).then((response) => {
         if (more) {
           this.latestLive.push(...response.videos)
         } else {
@@ -1353,16 +1346,8 @@ export default defineComponent({
 
     getPlaylistsInvidious: function () {
       this.isElementListLoading = true
-      const payload = {
-        resource: 'channels',
-        subResource: 'playlists',
-        id: this.id,
-        params: {
-          sort_by: this.playlistSortBy
-        }
-      }
 
-      invidiousAPICall(payload).then((response) => {
+      getInvidiousChannelPlaylists(this.id, this.playlistSortBy).then((response) => {
         this.playlistContinuationData = response.continuation || null
         this.latestPlaylists = response.playlists
         this.isElementListLoading = false
@@ -1390,20 +1375,7 @@ export default defineComponent({
         return
       }
 
-      const payload = {
-        resource: 'channels',
-        subResource: 'playlists',
-        id: this.id,
-        params: {
-          sort_by: this.playlistSortBy
-        }
-      }
-
-      if (this.playlistContinuationData) {
-        payload.params.continuation = this.playlistContinuationData
-      }
-
-      invidiousAPICall(payload).then((response) => {
+      getInvidiousChannelPlaylists(this.id, this.playlistSortBy, this.playlistContinuationData).then((response) => {
         this.playlistContinuationData = response.continuation || null
         this.latestPlaylists = this.latestPlaylists.concat(response.playlists)
         this.isElementListLoading = false
@@ -1429,7 +1401,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-        */
+         */
         const channel = this.channelInstance
 
         if (this.isArtistTopicChannel) {
@@ -1498,13 +1470,8 @@ export default defineComponent({
 
     channelInvidiousReleases: function() {
       this.isElementListLoading = true
-      const payload = {
-        resource: 'channels',
-        subResource: 'releases',
-        id: this.id,
-      }
 
-      invidiousAPICall(payload).then((response) => {
+      getInvidiousChannelReleases(this.id).then((response) => {
         this.releaseContinuationData = response.continuation || null
         this.latestReleases = response.playlists
         this.isElementListLoading = false
@@ -1528,17 +1495,11 @@ export default defineComponent({
 
     channelInvidiousReleasesMore: function () {
       if (this.releaseContinuationData === null) {
-        console.warn('There are no more podcasts available for this channel')
+        console.warn('There are no more releases available for this channel')
         return
       }
 
-      const payload = {
-        resource: 'channels',
-        subResource: 'releases',
-        id: this.id
-      }
-
-      invidiousAPICall(payload).then((response) => {
+      getInvidiousChannelReleases(this.id, this.releaseContinuationData).then((response) => {
         this.releaseContinuationData = response.continuation || null
         this.latestReleases = this.latestReleases.concat(response.playlists)
         this.isElementListLoading = false
@@ -1564,7 +1525,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-        */
+         */
         const channel = this.channelInstance
         const podcastTab = await channel.getPodcasts()
 
@@ -1611,13 +1572,8 @@ export default defineComponent({
 
     channelInvidiousPodcasts: function() {
       this.isElementListLoading = true
-      const payload = {
-        resource: 'channels',
-        subResource: 'podcasts',
-        id: this.id,
-      }
 
-      invidiousAPICall(payload).then((response) => {
+      getInvidiousChannelPodcasts(this.id).then((response) => {
         this.podcastContinuationData = response.continuation || null
         this.latestPodcasts = response.playlists
         this.isElementListLoading = false
@@ -1645,13 +1601,7 @@ export default defineComponent({
         return
       }
 
-      const payload = {
-        resource: 'channels',
-        subResource: 'podcasts',
-        id: this.id
-      }
-
-      invidiousAPICall(payload).then((response) => {
+      getInvidiousChannelPodcasts(this.id, this.podcastContinuationData).then((response) => {
         this.podcastContinuationData = response.continuation || null
         this.latestPodcasts = this.latestPodcasts.concat(response.playlists)
         this.isElementListLoading = false
@@ -1700,9 +1650,6 @@ export default defineComponent({
         this.communityContinuationData = communityTab.has_continuation ? communityTab : null
 
         if (this.latestCommunityPosts.length > 0) {
-          this.latestCommunityPosts.forEach(post => {
-            post.authorId = this.id
-          })
           this.updateSubscriptionPostsCacheByChannel({
             channelId: this.id,
             // create a copy so that we only cache the first page
@@ -1764,9 +1711,6 @@ export default defineComponent({
         this.communityContinuationData = continuation
 
         if (this.isSubscribedInAnyProfile && !more && this.latestCommunityPosts.length > 0) {
-          this.latestCommunityPosts.forEach(post => {
-            post.authorId = this.id
-          })
           this.updateSubscriptionPostsCacheByChannel({
             channelId: this.id,
             // create a copy so that we only cache the first page
@@ -1881,13 +1825,14 @@ export default defineComponent({
       const newTabNode = document.getElementById(`${tab}Tab`)
       this.currentTab = tab
       newTabNode?.focus()
-      this.showOutlines()
+      // Prevents outline shown in strange places
+      if (newTabNode != null) { this.showOutlines() }
     },
 
     newSearch: function (query) {
       this.lastSearchQuery = query
       this.searchContinuationData = null
-      this.isElementListLoading = true
+      this.isSearchTabLoading = true
       this.searchPage = 1
       this.searchResults = []
       this.changeTab('search')
@@ -1900,6 +1845,10 @@ export default defineComponent({
           break
       }
     },
+    newSearchWithStatePersist(query) {
+      this.saveStateInRouter(query)
+      this.newSearch(query)
+    },
 
     searchChannelLocal: async function () {
       const isNewSearch = this.searchContinuationData === null
@@ -1938,7 +1887,7 @@ export default defineComponent({
         }
 
         this.searchContinuationData = result.has_continuation ? result : null
-        this.isElementListLoading = false
+        this.isSearchTabLoading = false
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -1957,24 +1906,13 @@ export default defineComponent({
     },
 
     searchChannelInvidious: function () {
-      const payload = {
-        resource: 'channels',
-        id: this.id,
-        subResource: 'search',
-        params: {
-          q: this.lastSearchQuery,
-          page: this.searchPage
-        }
-      }
-
-      invidiousAPICall(payload).then((response) => {
-        setPublishedTimestampsInvidious(response.filter(item => item.type === 'video'))
+      searchInvidiousChannel(this.id, this.lastSearchQuery, this.searchPage).then((response) => {
         if (this.hideChannelPlaylists) {
           this.searchResults = this.searchResults.concat(response.filter(item => item.type !== 'playlist'))
         } else {
           this.searchResults = this.searchResults.concat(response)
         }
-        this.isElementListLoading = false
+        this.isSearchTabLoading = false
         this.searchPage++
       }).catch((err) => {
         console.error(err)
@@ -2012,15 +1950,47 @@ export default defineComponent({
         })
       }
 
-      this.latestCommunityPosts.forEach(post => {
-        post.authorId = this.id
-      })
       this.updateSubscriptionPostsCacheByChannel({
         channelId: this.id,
         posts: [...this.latestCommunityPosts]
       })
     },
 
+    async saveStateInRouter(query) {
+      this.skipRouteChangeWatcherOnce = true
+      if (query === '') {
+        try {
+          await this.$router.replace({ path: `/channel/${this.id}` })
+        } catch (failure) {
+          if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+            return
+          }
+
+          throw failure
+        }
+        return
+      }
+
+      try {
+        await this.$router.replace({
+          path: `/channel/${this.id}`,
+          params: {
+            currentTab: 'search',
+          },
+          query: {
+            searchQueryText: query,
+          },
+        })
+      } catch (failure) {
+        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+          return
+        }
+
+        throw failure
+      }
+      this.skipRouteChangeWatcherOnce = false
+    },
+
     getIconForSortPreference: (s) => getIconForSortPreference(s),
 
     ...mapActions([
@@ -2030,6 +2000,10 @@ export default defineComponent({
       'updateSubscriptionLiveCacheByChannel',
       'updateSubscriptionShortsCacheWithChannelPageShorts',
       'updateSubscriptionPostsCacheByChannel'
+    ]),
+
+    ...mapMutations([
+      'setAppTitle'
     ])
   }
 })
diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index dc2099bf77b44..d8507169525dc 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -17,9 +17,10 @@
       :is-subscribed="isSubscribed"
       :visible-tabs="tabInfoValues"
       :current-tab="currentTab"
+      :query="lastSearchQuery"
       class="card channelDetails"
       @change-tab="changeTab"
-      @search="newSearch"
+      @search="newSearchWithStatePersist"
       @subscribed="handleSubscription"
     />
     <ft-card
@@ -80,12 +81,19 @@
         />
       </div>
       <ft-loader
-        v-if="isElementListLoading"
+        v-if="isCurrentTabLoading"
       />
       <div
         v-if="currentTab !== 'about' && !isElementListLoading"
         class="elementList"
       >
+        <ChannelHome
+          v-show="currentTab === 'home'"
+          id="homePanel"
+          :shelves="homeData"
+          role="tabpanel"
+          aria-labelledby="homeTab"
+        />
         <ft-element-list
           v-show="currentTab === 'videos'"
           id="videoPanel"
@@ -200,7 +208,7 @@
           :use-channels-hidden-preference="false"
         />
         <ft-flex-box
-          v-if="currentTab === 'search' && searchResults.length === 0"
+          v-if="currentTab === 'search' && !isSearchTabLoading && searchResults.length === 0"
         >
           <p class="message">
             {{ $t("Channel.Your search results have returned 0 results") }}
diff --git a/src/renderer/views/Hashtag/Hashtag.js b/src/renderer/views/Hashtag/Hashtag.js
deleted file mode 100644
index 27e65e4a28986..0000000000000
--- a/src/renderer/views/Hashtag/Hashtag.js
+++ /dev/null
@@ -1,173 +0,0 @@
-import { defineComponent } from 'vue'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
-import packageDetails from '../../../../package.json'
-import { getHashtagLocal, parseLocalListVideo } from '../../helpers/api/local'
-import { copyToClipboard, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
-import { isNullOrEmpty } from '../../helpers/strings'
-import { getHashtagInvidious } from '../../helpers/api/invidious'
-
-export default defineComponent({
-  name: 'Hashtag',
-  components: {
-    'ft-card': FtCard,
-    'ft-element-list': FtElementList,
-    'ft-flex-box': FtFlexBox,
-    'ft-loader': FtLoader,
-    'ft-auto-load-next-page-wrapper': FtAutoLoadNextPageWrapper,
-  },
-  data: function() {
-    return {
-      hashtag: '',
-      hashtagContinuationData: null,
-      videos: [],
-      apiUsed: 'local',
-      pageNumber: 1,
-      isLoading: true
-    }
-  },
-  computed: {
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-
-    backendFallback: function () {
-      return this.$store.getters.getBackendFallback
-    },
-
-    showFetchMoreButton() {
-      return !isNullOrEmpty(this.hashtagContinuationData) || this.apiUsed === 'invidious'
-    },
-  },
-  watch: {
-    $route() {
-      this.resetData()
-      this.getHashtag()
-    }
-  },
-  mounted: function() {
-    this.resetData()
-    this.getHashtag()
-  },
-  methods: {
-    resetData: function() {
-      this.isLoading = true
-      this.hashtag = ''
-      this.hashtagContinuationData = null
-      this.videos = []
-      this.apiUsed = 'local'
-      this.pageNumber = 1
-    },
-
-    getHashtag: async function() {
-      const hashtag = decodeURIComponent(this.$route.params.hashtag)
-      if (this.backendFallback || this.backendPreference === 'local') {
-        await this.getLocalHashtag(hashtag)
-      } else {
-        await this.getInvidiousHashtag(hashtag)
-      }
-      document.title = `${this.hashtag} - ${packageDetails.productName}`
-    },
-
-    getInvidiousHashtag: async function(hashtag, page) {
-      try {
-        const videos = await getHashtagInvidious(hashtag, page)
-        setPublishedTimestampsInvidious(videos)
-        this.hashtag = '#' + hashtag
-        this.isLoading = false
-        this.apiUsed = 'invidious'
-        this.videos = this.videos.concat(videos)
-        this.pageNumber += 1
-      } catch (error) {
-        console.error(error)
-        const errorMessage = this.$t('Invidious API Error (Click to copy)')
-        showToast(`${errorMessage}: ${error}`, 10000, () => {
-          copyToClipboard(error)
-        })
-        if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
-          showToast(this.$t('Falling back to Local API'))
-          this.resetData()
-          this.getLocalHashtag(hashtag)
-        } else {
-          this.isLoading = false
-        }
-      }
-    },
-
-    getLocalHashtag: async function(hashtag) {
-      try {
-        const hashtagData = await getHashtagLocal(hashtag)
-
-        const header = hashtagData.header
-        if (header) {
-          switch (header.type) {
-            case 'HashtagHeader':
-              this.hashtag = header.hashtag.toString()
-              break
-            case 'PageHeader':
-              this.hashtag = header.content.title.text
-              break
-            default:
-              console.error(`Unknown hashtag header type: ${header.type}, falling back to query parameter.`)
-              this.hashtag = `#${hashtag}`
-          }
-        } else {
-          console.error(' Hashtag header missing, probably a layout change, falling back to query parameter.')
-          this.hashtag = `#${hashtag}`
-        }
-
-        this.videos = hashtagData.videos.map(parseLocalListVideo)
-        this.apiUsed = 'local'
-        this.hashtagContinuationData = hashtagData.has_continuation ? hashtagData : null
-        this.isLoading = false
-      } catch (error) {
-        console.error(error)
-        const errorMessage = this.$t('Local API Error (Click to copy)')
-        showToast(`${errorMessage}: ${error}`, 10000, () => {
-          copyToClipboard(error)
-        })
-        if (this.backendPreference === 'local' && this.backendFallback) {
-          showToast(this.$t('Falling back to Invidious API'))
-          this.resetData()
-          this.getInvidiousHashtag(hashtag)
-        } else {
-          this.isLoading = false
-        }
-      }
-    },
-
-    getLocalHashtagMore: async function() {
-      try {
-        const continuation = await this.hashtagContinuationData.getContinuation()
-        const newVideos = continuation.videos.map(parseLocalListVideo)
-        this.hashtagContinuationData = continuation.has_continuation ? continuation : null
-        this.videos = this.videos.concat(newVideos)
-      } catch (error) {
-        console.error(error)
-        const errorMessage = this.$t('Local API Error (Click to copy)')
-        showToast(`${errorMessage}: ${error}`, 10000, () => {
-          copyToClipboard(error)
-        })
-        if (this.backendPreference === 'local' && this.backendFallback) {
-          showToast(this.$t('Falling back to Invidious API'))
-          const hashtag = this.hashtag.substring(1)
-          this.resetData()
-          this.getLocalHashtag(hashtag)
-        } else {
-          this.isLoading = false
-        }
-      }
-    },
-
-    handleFetchMore: function() {
-      if (this.apiUsed === 'local') {
-        this.getLocalHashtagMore()
-      } else if (this.apiUsed === 'invidious') {
-        this.getInvidiousHashtag(this.hashtag.substring(1), this.pageNumber)
-      }
-    }
-  }
-})
diff --git a/src/renderer/views/Hashtag/Hashtag.vue b/src/renderer/views/Hashtag/Hashtag.vue
index 4376320cc5ae2..af275fe5a6c73 100644
--- a/src/renderer/views/Hashtag/Hashtag.vue
+++ b/src/renderer/views/Hashtag/Hashtag.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
-    <ft-loader
+    <FtLoader
       v-if="isLoading"
       :fullscreen="true"
     />
-    <ft-card
+    <FtCard
       v-else
       class="card"
     >
       <h2>{{ hashtag }}</h2>
-      <ft-element-list
+      <FtElementList
         v-if="videos.length > 0"
         :data="videos"
       />
-      <ft-flex-box
+      <FtFlexBox
         v-else
       >
         <p
@@ -21,9 +21,9 @@
         >
           {{ $t("Hashtag.This hashtag does not currently have any videos") }}
         </p>
-      </ft-flex-box>
+      </FtFlexBox>
 
-      <ft-auto-load-next-page-wrapper
+      <FtAutoLoadNextPageWrapper
         v-if="showFetchMoreButton"
         @load-next-page="handleFetchMore"
       >
@@ -35,11 +35,184 @@
           @keydown.space.prevent="handleFetchMore"
           @keydown.enter.prevent="handleFetchMore"
         >
-          <font-awesome-icon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
+          <FontAwesomeIcon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
         </div>
-      </ft-auto-load-next-page-wrapper>
-    </ft-card>
+      </FtAutoLoadNextPageWrapper>
+    </FtCard>
   </div>
 </template>
-<script src="./Hashtag.js" />
+<script setup>
+import { computed, onMounted, ref, shallowRef, watch } from 'vue'
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtElementList from '../../components/FtElementList/FtElementList.vue'
+import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
+import store from '../../store/index'
+import { useRoute } from 'vue-router/composables'
+import packageDetails from '../../../../package.json'
+import { getHashtagLocal, parseLocalListVideo } from '../../helpers/api/local'
+import { copyToClipboard, showToast } from '../../helpers/utils'
+import { isNullOrEmpty } from '../../helpers/strings'
+import { getHashtagInvidious } from '../../helpers/api/invidious'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+const { t } = useI18n()
+
+const route = useRoute()
+
+const hashtag = ref('')
+const hashtagContinuationData = shallowRef(null)
+const videos = shallowRef([])
+/** @type {import('vue').Ref<'local' | 'invidious'>} */
+const apiUsed = ref('local')
+const pageNumber = ref(1)
+const isLoading = ref(true)
+
+/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
+const backendPreference = computed(() => {
+  return store.getters.getBackendPreference
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const backendFallback = computed(() => {
+  return store.getters.getBackendFallback
+})
+
+const showFetchMoreButton = computed(() => {
+  return !isNullOrEmpty(hashtagContinuationData.value) || apiUsed.value === 'invidious'
+})
+
+onMounted(() => {
+  getHashtag()
+})
+
+watch(() => route.params.hashtag, () => {
+  resetData()
+  getHashtag()
+})
+
+function resetData() {
+  isLoading.value = true
+  hashtag.value = ''
+  hashtagContinuationData.value = null
+  videos.value = []
+  apiUsed.value = 'local'
+  pageNumber.value = 1
+}
+
+async function getHashtag() {
+  const hashtagInRoute = decodeURIComponent(route.params.hashtag)
+  if (process.env.SUPPORTS_LOCAL_API && backendPreference.value === 'local') {
+    await getLocalHashtag(hashtagInRoute)
+  } else {
+    await getInvidiousHashtag(hashtagInRoute)
+  }
+  store.commit('setAppTitle', `${hashtag.value} - ${packageDetails.productName}`)
+}
+
+/**
+ * @param {string} hashtagInRoute
+ * @param {number} page
+ */
+async function getInvidiousHashtag(hashtagInRoute, page) {
+  try {
+    const fetchedVideos = await getHashtagInvidious(hashtagInRoute, page)
+    hashtag.value = '#' + hashtagInRoute
+    isLoading.value = false
+    apiUsed.value = 'invidious'
+    videos.value = videos.value.concat(fetchedVideos)
+    pageNumber.value += 1
+  } catch (error) {
+    console.error(error)
+    const errorMessage = t('Invidious API Error (Click to copy)')
+    showToast(`${errorMessage}: ${error}`, 10000, () => {
+      copyToClipboard(error)
+    })
+    if (process.env.SUPPORTS_LOCAL_API && backendPreference.value === 'invidious' && backendFallback.value) {
+      showToast(t('Falling back to Local API'))
+      resetData()
+      getLocalHashtag(hashtag)
+    } else {
+      isLoading.value = false
+    }
+  }
+}
+
+/**
+ * @param {string} hashtagInRoute
+ */
+async function getLocalHashtag(hashtagInRoute) {
+  try {
+    const hashtagData = await getHashtagLocal(hashtagInRoute)
+
+    const header = hashtagData.header
+    if (header) {
+      switch (header.type) {
+        case 'HashtagHeader':
+          hashtag.value = header.hashtag.toString()
+          break
+        case 'PageHeader':
+          hashtag.value = header.content.title.text
+          break
+        default:
+          console.error(`Unknown hashtag header type: ${header.type}, falling back to query parameter.`)
+          hashtag.value = `#${hashtagInRoute}`
+      }
+    } else {
+      console.error(' Hashtag header missing, probably a layout change, falling back to query parameter.')
+      hashtag.value = `#${hashtagInRoute}`
+    }
+
+    videos.value = hashtagData.videos.map(parseLocalListVideo)
+    apiUsed.value = 'local'
+    hashtagContinuationData.value = hashtagData.has_continuation ? hashtagData : null
+    isLoading.value = false
+  } catch (error) {
+    console.error(error)
+    const errorMessage = t('Local API Error (Click to copy)')
+    showToast(`${errorMessage}: ${error}`, 10000, () => {
+      copyToClipboard(error)
+    })
+    if (backendPreference.value === 'local' && backendFallback.value) {
+      showToast(t('Falling back to Invidious API'))
+      resetData()
+      getInvidiousHashtag(hashtag)
+    } else {
+      isLoading.value = false
+    }
+  }
+}
+
+async function getLocalHashtagMore() {
+  try {
+    const continuation = await hashtagContinuationData.value.getContinuation()
+    const newVideos = continuation.videos.map(parseLocalListVideo)
+    hashtagContinuationData.value = continuation.has_continuation ? continuation : null
+    videos.value = videos.value.concat(newVideos)
+  } catch (error) {
+    console.error(error)
+    const errorMessage = t('Local API Error (Click to copy)')
+    showToast(`${errorMessage}: ${error}`, 10000, () => {
+      copyToClipboard(error)
+    })
+    if (backendPreference.value === 'local' && backendFallback.value) {
+      showToast(t('Falling back to Invidious API'))
+      const hashtagWithoutSymbol = hashtag.value.substring(1)
+      resetData()
+      getInvidiousHashtag(hashtagWithoutSymbol)
+    } else {
+      isLoading.value = false
+    }
+  }
+}
+
+function handleFetchMore() {
+  if (process.env.SUPPORTS_LOCAL_API && apiUsed.value === 'local') {
+    getLocalHashtagMore()
+  } else if (apiUsed.value === 'invidious') {
+    getInvidiousHashtag(hashtag.value.substring(1), pageNumber.value)
+  }
+}
+</script>
 <style scoped src="./Hashtag.css" />
diff --git a/src/renderer/views/History/History.js b/src/renderer/views/History/History.js
index 9432541a141de..1613eb1998f15 100644
--- a/src/renderer/views/History/History.js
+++ b/src/renderer/views/History/History.js
@@ -1,4 +1,5 @@
 import { defineComponent } from 'vue'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 import debounce from 'lodash.debounce'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
@@ -63,42 +64,68 @@ export default defineComponent({
     },
   },
   watch: {
-    query() {
-      this.searchDataLimit = 100
-      this.filterHistoryAsync()
-    },
     fullData() {
       this.filterHistory()
     },
     doCaseSensitiveSearch() {
       this.filterHistory()
+      this.saveStateInRouter()
     },
   },
-  mounted: function () {
+  created: function () {
     document.addEventListener('keydown', this.keyboardShortcutHandler)
-    const limit = sessionStorage.getItem('historyLimit')
 
-    if (limit !== null) {
-      this.dataLimit = limit
+    const oldDataLimit = sessionStorage.getItem('History/dataLimit')
+    if (oldDataLimit !== null) {
+      this.dataLimit = oldDataLimit
     }
 
-    this.activeData = this.fullData
-
-    this.showLoadMoreButton = this.activeData.length < this.historyCacheSorted.length
-
     this.filterHistoryDebounce = debounce(this.filterHistory, 500)
+
+    const oldQuery = this.$route.query.searchQueryText ?? ''
+    if (oldQuery !== null && oldQuery !== '') {
+      // `handleQueryChange` must be called after `filterHistoryDebounce` assigned
+      this.handleQueryChange(
+        oldQuery,
+        {
+          limit: this.$route.query.searchDataLimit,
+          doCaseSensitiveSearch: this.$route.query.doCaseSensitiveSearch === 'true',
+          filterNow: true,
+        },
+      )
+    } else {
+      // Only display unfiltered data when no query used last time
+      this.filterHistory()
+    }
   },
   beforeDestroy: function () {
     document.removeEventListener('keydown', this.keyboardShortcutHandler)
   },
   methods: {
+    handleQueryChange(query, { limit = null, doCaseSensitiveSearch = null, filterNow = false } = {}) {
+      this.query = query
+
+      const newLimit = limit ?? 100
+      this.searchDataLimit = newLimit
+      const newDoCaseSensitiveSearch = doCaseSensitiveSearch ?? this.doCaseSensitiveSearch
+      this.doCaseSensitiveSearch = newDoCaseSensitiveSearch
+
+      this.saveStateInRouter({
+        query: query,
+        searchDataLimit: newLimit,
+        doCaseSensitiveSearch: newDoCaseSensitiveSearch,
+      })
+
+      filterNow ? this.filterHistory() : this.filterHistoryAsync()
+    },
+
     increaseLimit: function () {
       if (this.query !== '') {
         this.searchDataLimit += 100
         this.filterHistory()
       } else {
         this.dataLimit += 100
-        sessionStorage.setItem('historyLimit', this.dataLimit)
+        sessionStorage.setItem('History/dataLimit', this.dataLimit)
       }
     },
     filterHistoryAsync: function() {
@@ -122,6 +149,40 @@ export default defineComponent({
       this.activeData = filteredQuery.length < this.searchDataLimit ? filteredQuery : filteredQuery.slice(0, this.searchDataLimit)
       this.showLoadMoreButton = this.activeData.length > this.searchDataLimit
     },
+
+    async saveStateInRouter({ query = this.query, searchDataLimit = this.searchDataLimit, doCaseSensitiveSearch = this.doCaseSensitiveSearch } = {}) {
+      if (query === '') {
+        try {
+          await this.$router.replace({ name: 'history' })
+        } catch (failure) {
+          if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+            return
+          }
+
+          throw failure
+        }
+        return
+      }
+
+      const routerQuery = {
+        searchQueryText: query,
+        searchDataLimit: searchDataLimit,
+      }
+      if (doCaseSensitiveSearch) { routerQuery.doCaseSensitiveSearch = 'true' }
+      try {
+        await this.$router.replace({
+          name: 'history',
+          query: routerQuery,
+        })
+      } catch (failure) {
+        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+          return
+        }
+
+        throw failure
+      }
+    },
+
     keyboardShortcutHandler: function (event) {
       ctrlFHandler(event, this.$refs.searchBar)
     },
diff --git a/src/renderer/views/History/History.vue b/src/renderer/views/History/History.vue
index 5167a0ff67d5c..27d2949165142 100644
--- a/src/renderer/views/History/History.vue
+++ b/src/renderer/views/History/History.vue
@@ -15,8 +15,9 @@
         :placeholder="$t('History.Search bar placeholder')"
         :show-clear-text-button="true"
         :show-action-button="false"
-        @input="(input) => query = input"
-        @clear="query = ''"
+        :value="query"
+        @input="(input) => handleQueryChange(input)"
+        @clear="() => handleQueryChange('')"
       />
       <div
         class="optionsRow"
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 8121a626f09b6..de97d22d1724e 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -18,13 +18,14 @@ import {
 import {
   extractNumberFromString,
   getIconForSortPreference,
-  setPublishedTimestampsInvidious,
   showToast,
+  deepCopy,
 } from '../../helpers/utils'
 import { invidiousGetPlaylistInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-import { getSortedPlaylistItems, SORT_BY_VALUES } from '../../helpers/playlists'
+import { getSortedPlaylistItems, videoDurationPresent, videoDurationWithFallback, SORT_BY_VALUES } from '../../helpers/playlists'
 import packageDetails from '../../../../package.json'
 import { MOBILE_WIDTH_THRESHOLD, PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD } from '../../../constants'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 
 export default defineComponent({
   name: 'Playlist',
@@ -74,6 +75,7 @@ export default defineComponent({
       getPlaylistInfoDebounce: function() {},
       playlistInEditMode: false,
       forceListView: false,
+      alreadyShownNotice: false,
 
       videoSearchQuery: '',
 
@@ -180,6 +182,13 @@ export default defineComponent({
       return this.sortOrder === SORT_BY_VALUES.Custom
     },
     sortedPlaylistItems: function () {
+      if (
+        this.sortOrder === SORT_BY_VALUES.VideoDurationAscending ||
+        this.sortOrder === SORT_BY_VALUES.VideoDurationDescending
+      ) {
+        const playlistItems = this.getPlaylistItemsWithDuration()
+        return getSortedPlaylistItems(playlistItems, this.sortOrder, this.currentLocale)
+      }
       return getSortedPlaylistItems(this.playlistItems, this.sortOrder, this.currentLocale)
     },
     visiblePlaylistItems: function () {
@@ -214,6 +223,10 @@ export default defineComponent({
             return this.$t('Playlist.Sort By.AuthorAscending')
           case SORT_BY_VALUES.AuthorDescending:
             return this.$t('Playlist.Sort By.AuthorDescending')
+          case SORT_BY_VALUES.VideoDurationAscending:
+            return this.$t('Playlist.Sort By.VideoDurationAscending')
+          case SORT_BY_VALUES.VideoDurationDescending:
+            return this.$t('Playlist.Sort By.VideoDurationDescending')
           default:
             console.error(`Unknown sort: ${k}`)
             return k
@@ -257,7 +270,7 @@ export default defineComponent({
     this.getPlaylistInfoDebounce = debounce(this.getPlaylistInfo, 100)
 
     if (this.isUserPlaylistRequested && this.searchQueryTextPresent) {
-      this.videoSearchQuery = this.searchQueryTextRequested
+      this.handleVideoSearchQueryChange(this.searchQueryTextRequested)
     }
   },
   mounted: function () {
@@ -299,10 +312,13 @@ export default defineComponent({
         if (result.info.author) {
           channelName = result.info.author.name
         } else {
-          const subtitle = result.info.subtitle.toString()
-
-          const index = subtitle.lastIndexOf('•')
-          channelName = subtitle.substring(0, index).trim()
+          const subtitle = result.info.subtitle?.toString()
+          if (subtitle) {
+            const index = subtitle.lastIndexOf('•')
+            channelName = subtitle.substring(0, index).trim()
+          } else {
+            channelName = ''
+          }
         }
 
         const playlistItems = result.items.map(parseLocalPlaylistVideo)
@@ -371,8 +387,6 @@ export default defineComponent({
         const dateString = new Date(result.updated * 1000)
         this.lastUpdated = dateString.toLocaleDateString(this.currentLocale, { year: 'numeric', month: 'short', day: 'numeric' })
 
-        setPublishedTimestampsInvidious(result.videos)
-
         this.playlistItems = result.videos
 
         this.updatePageTitle()
@@ -416,10 +430,40 @@ export default defineComponent({
 
       this.isLoading = false
     },
+
     showUserPlaylistNotFound() {
       showToast(this.$t('User Playlists.SinglePlaylistView.Toast.This playlist does not exist'))
     },
 
+    getPlaylistItemsWithDuration() {
+      const modifiedPlaylistItems = deepCopy(this.playlistItems)
+      let anyVideoMissingDuration = false
+      modifiedPlaylistItems.forEach(video => {
+        if (videoDurationPresent(video)) { return }
+
+        const videoHistory = this.$store.getters.getHistoryCacheById[video.videoId]
+        if (typeof videoHistory !== 'undefined') {
+          const fetchedLengthSeconds = videoDurationWithFallback(videoHistory)
+          video.lengthSeconds = fetchedLengthSeconds
+          // if the video duration is 0, it will be the fallback value, so mark it as missing a duration
+          if (fetchedLengthSeconds === 0) { anyVideoMissingDuration = true }
+        } else {
+          // Mark at least one video have no duration, show notice later
+          // Also assign fallback duration here
+          anyVideoMissingDuration = true
+          video.lengthSeconds = 0
+        }
+      })
+
+      // Show notice if not already shown before returning playlist items
+      if (anyVideoMissingDuration && !this.alreadyShownNotice) {
+        showToast(this.$t('User Playlists.SinglePlaylistView.Toast.This playlist has a video with a duration error'), 5000)
+        this.alreadyShownNotice = true
+      }
+
+      return modifiedPlaylistItems
+    },
+
     getNextPage: function () {
       switch (this.infoSource) {
         case 'local':
@@ -559,13 +603,41 @@ export default defineComponent({
         playlistTitle,
         channelName,
       ].filter(v => v).join(' | ')
-      document.title = `${titleText} - ${packageDetails.productName}`
+      this.setAppTitle(`${titleText} - ${packageDetails.productName}`)
     },
 
     handleResize: function () {
       this.forceListView = window.innerWidth <= MOBILE_WIDTH_THRESHOLD || window.innerHeight <= PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD
     },
 
+    handleVideoSearchQueryChange(val) {
+      this.videoSearchQuery = val
+
+      this.saveStateInRouter(val)
+    },
+
+    async saveStateInRouter(query) {
+      const routeQuery = {
+        playlistType: this.$route.query.playlistType,
+      }
+      if (query !== '') {
+        routeQuery.searchQueryText = query
+      }
+
+      try {
+        await this.$router.replace({
+          path: `/playlist/${this.playlistId}`,
+          query: routeQuery,
+        })
+      } catch (failure) {
+        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+          return
+        }
+
+        throw failure
+      }
+    },
+
     getIconForSortPreference: (s) => getIconForSortPreference(s),
 
     ...mapActions([
@@ -576,6 +648,7 @@ export default defineComponent({
     ]),
 
     ...mapMutations([
+      'setAppTitle',
       'setCachedPlaylist'
     ])
   }
diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
index 68a734065b748..d3639f266486e 100644
--- a/src/renderer/views/Playlist/Playlist.vue
+++ b/src/renderer/views/Playlist/Playlist.vue
@@ -37,7 +37,7 @@
         class="playlistInfo"
         @enter-edit-mode="playlistInEditMode = true"
         @exit-edit-mode="playlistInEditMode = false"
-        @search-video-query-change="(v) => videoSearchQuery = v"
+        @search-video-query-change="(v) => handleVideoSearchQueryChange(v)"
         @prompt-open="promptOpen = true"
         @prompt-close="promptOpen = false"
       />
diff --git a/src/renderer/views/Popular/Popular.js b/src/renderer/views/Popular/Popular.js
deleted file mode 100644
index 2a35f9d8cb68d..0000000000000
--- a/src/renderer/views/Popular/Popular.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import { defineComponent } from 'vue'
-import { mapMutations } from 'vuex'
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
-import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
-
-import { invidiousAPICall } from '../../helpers/api/invidious'
-import { copyToClipboard, getRelativeTimeFromDate, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
-
-export default defineComponent({
-  name: 'Popular',
-  components: {
-    'ft-loader': FtLoader,
-    'ft-card': FtCard,
-    'ft-element-list': FtElementList,
-    'ft-icon-button': FtIconButton,
-    'ft-refresh-widget': FtRefreshWidget,
-  },
-  data: function () {
-    return {
-      isLoading: false,
-      shownResults: []
-    }
-  },
-  computed: {
-    lastPopularRefreshTimestamp: function () {
-      return getRelativeTimeFromDate(this.$store.getters.getLastPopularRefreshTimestamp, true)
-    },
-    popularCache: function () {
-      return this.$store.getters.getPopularCache
-    }
-  },
-  mounted: function () {
-    document.addEventListener('keydown', this.keyboardShortcutHandler)
-
-    this.shownResults = this.popularCache || []
-    if (!this.shownResults || this.shownResults.length < 1) {
-      this.fetchPopularInfo()
-    }
-  },
-  beforeDestroy: function () {
-    document.removeEventListener('keydown', this.keyboardShortcutHandler)
-  },
-  methods: {
-    fetchPopularInfo: async function () {
-      const searchPayload = {
-        resource: 'popular',
-        id: '',
-        params: {}
-      }
-
-      this.isLoading = true
-      const result = await invidiousAPICall(searchPayload)
-        .catch((err) => {
-          const errorMessage = this.$t('Invidious API Error (Click to copy)')
-          showToast(`${errorMessage}: ${err}`, 10000, () => {
-            copyToClipboard(err)
-          })
-          return undefined
-        })
-
-      if (!result) {
-        this.isLoading = false
-        return
-      }
-
-      const items = result.filter((item) => {
-        return item.type === 'video' || item.type === 'shortVideo' || item.type === 'channel' || item.type === 'playlist'
-      })
-      setPublishedTimestampsInvidious(items.filter(item => item.type === 'video' || item.type === 'shortVideo'))
-      this.setLastPopularRefreshTimestamp(new Date())
-
-      this.shownResults = items
-
-      this.isLoading = false
-      this.$store.commit('setPopularCache', items)
-    },
-
-    /**
-     * This function `keyboardShortcutHandler` should always be at the bottom of this file
-     * @param {KeyboardEvent} event the keyboard event
-     */
-    keyboardShortcutHandler: function (event) {
-      if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
-        return
-      }
-      // Avoid handling events due to user holding a key (not released)
-      // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
-      if (event.repeat) { return }
-
-      switch (event.key) {
-        case 'r':
-        case 'R':
-        case 'F5':
-          if (!this.isLoading) {
-            this.fetchPopularInfo()
-          }
-          break
-      }
-    },
-
-    ...mapMutations([
-      'setLastPopularRefreshTimestamp'
-    ])
-  }
-})
diff --git a/src/renderer/views/Popular/Popular.vue b/src/renderer/views/Popular/Popular.vue
index c3f001f3415b8..491a5a99e7c86 100644
--- a/src/renderer/views/Popular/Popular.vue
+++ b/src/renderer/views/Popular/Popular.vue
@@ -22,5 +22,87 @@
   </div>
 </template>
 
-<script src="./Popular.js" />
+<script setup>
+
+import { computed, onBeforeUnmount, onMounted, ref, shallowRef } from 'vue'
+
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtElementList from '../../components/FtElementList/FtElementList.vue'
+import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
+import store from '../../store/index'
+
+import { getInvidiousPopularFeed } from '../../helpers/api/invidious'
+import { copyToClipboard, getRelativeTimeFromDate, showToast } from '../../helpers/utils'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+import { KeyboardShortcuts } from '../../../constants'
+
+const { t } = useI18n()
+
+const isLoading = ref(false)
+
+const lastPopularRefreshTimestamp = computed(() => {
+  return getRelativeTimeFromDate(store.getters.getLastPopularRefreshTimestamp, true)
+})
+
+/** @type {import('vue').ComputedRef<Array | null>} */
+const popularCache = computed(() => {
+  return store.getters.getPopularCache
+})
+
+const shownResults = shallowRef(popularCache.value || [])
+
+onMounted(() => {
+  document.addEventListener('keydown', keyboardShortcutHandler)
+
+  if (shownResults.value.length === 0) {
+    fetchPopularInfo()
+  }
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('keydown', keyboardShortcutHandler)
+})
+
+async function fetchPopularInfo() {
+  isLoading.value = true
+
+  try {
+    const items = await getInvidiousPopularFeed()
+
+    store.commit('setLastPopularRefreshTimestamp', new Date())
+    shownResults.value = items
+    isLoading.value = false
+    store.commit('setPopularCache', items)
+  } catch (err) {
+    isLoading.value = false
+    const errorMessage = t('Invidious API Error (Click to copy)')
+    showToast(`${errorMessage}: ${err}`, 10000, () => {
+      copyToClipboard(err)
+    })
+  }
+}
+
+/**
+ * @param {KeyboardEvent} event the keyboard event
+ */
+function keyboardShortcutHandler(event) {
+  if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
+    return
+  }
+  // Avoid handling events due to user holding a key (not released)
+  // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
+  if (event.repeat) { return }
+
+  switch (event.key.toLowerCase()) {
+    case 'f5':
+    case KeyboardShortcuts.APP.SITUATIONAL.REFRESH:
+      if (!isLoading.value) {
+        fetchPopularInfo()
+      }
+      break
+  }
+}
+
+</script>
 <style scoped src="./Popular.css" />
diff --git a/src/renderer/views/Post.vue b/src/renderer/views/Post.vue
new file mode 100644
index 0000000000000..1a53b4411809e
--- /dev/null
+++ b/src/renderer/views/Post.vue
@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <div v-if="!isInvidiousAllowed">
+      {{ $t('Channel.Community.Viewing Posts Only Supported By Invidious') }}
+    </div>
+    <FtLoader v-else-if="isLoading" />
+    <template
+      v-else
+    >
+      <FtCard>
+        <FtCommunityPost
+          :data="post"
+          :single-post="true"
+          appearance="result"
+        />
+      </FtCard>
+      <CommentSection
+        :id="post.postId"
+        :channel-name="post.author"
+        :post-author-id="authorId"
+        :video-player-ready="false"
+        :force-state="null"
+        :is-post-comments="true"
+        :channel-thumbnail="post.authorThumbnails[0].url"
+        :show-sort-by="false"
+      />
+    </template>
+  </div>
+</template>
+
+<script setup>
+import { computed, onMounted, ref, shallowRef, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router/composables'
+import packageDetails from '../../../package.json'
+
+import FtCard from '../components/ft-card/ft-card.vue'
+import FtCommunityPost from '../components/FtCommunityPost/FtCommunityPost.vue'
+import FtLoader from '../components/ft-loader/ft-loader.vue'
+import CommentSection from '../components/CommentSection/CommentSection.vue'
+
+import store from '../store/index'
+
+import { getInvidiousCommunityPost } from '../helpers/api/invidious'
+
+const router = useRouter()
+const route = useRoute()
+
+const id = ref('')
+const authorId = ref('')
+const post = shallowRef(null)
+const isLoading = ref(true)
+
+/** @type {import('vue').ComputedRef<'invidious' | 'local'>} */
+const backendPreference = computed(() => {
+  return store.getters.getBackendPreference
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const backendFallback = computed(() => {
+  return store.getters.getBackendFallback
+})
+
+const isInvidiousAllowed = computed(() => {
+  return backendPreference.value === 'invidious' || backendFallback.value
+})
+
+onMounted(async () => {
+  if (isInvidiousAllowed.value) {
+    id.value = route.params.id
+    authorId.value = route.query.authorId
+    await loadDataInvidiousAsync()
+  }
+})
+
+async function loadDataInvidiousAsync() {
+  post.value = await getInvidiousCommunityPost(id.value, authorId.value)
+  authorId.value = post.value.authorId
+
+  store.commit('setAppTitle', `${post.value.author} - ${packageDetails.productName}`)
+  isLoading.value = false
+
+  // If the authorId is missing from the URL we should add it,
+  // that way if the user comes back to this page by pressing the back button
+  // we don't have to resolve the authorId again
+  if (authorId.value !== route.query.authorId) {
+    router.replace({
+      path: `/post/${id.value}`,
+      query: {
+        authorId: authorId.value
+      }
+    })
+  }
+}
+
+watch(() => route.params.id, async () => {
+  // react to route changes...
+  isLoading.value = true
+  if (isInvidiousAllowed.value) {
+    id.value = route.params.id
+    authorId.value = route.query.authorId
+    await loadDataInvidiousAsync()
+  }
+})
+</script>
diff --git a/src/renderer/views/Post/Post.js b/src/renderer/views/Post/Post.js
deleted file mode 100644
index d13bb906bbf95..0000000000000
--- a/src/renderer/views/Post/Post.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { defineComponent } from 'vue'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtCommunityPost from '../../components/ft-community-post/ft-community-post.vue'
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import WatchVideoComments from '../../components/watch-video-comments/watch-video-comments.vue'
-
-import { getInvidiousCommunityPost } from '../../helpers/api/invidious'
-
-export default defineComponent({
-  name: 'Post',
-  components: {
-    FtCard,
-    FtCommunityPost,
-    FtLoader,
-    WatchVideoComments
-  },
-  data: function () {
-    return {
-      id: '',
-      authorId: '',
-      post: null,
-      comments: null,
-      isLoading: true,
-    }
-  },
-  computed: {
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-    backendFallback: function () {
-      return this.$store.getters.getBackendFallback
-    },
-    isInvidiousAllowed: function() {
-      return this.backendPreference === 'invidious' || this.backendFallback
-    }
-  },
-  watch: {
-    async $route() {
-      // react to route changes...
-      this.isLoading = true
-      if (this.isInvidiousAllowed) {
-        this.id = this.$route.params.id
-        this.authorId = this.$route.query.authorId
-        await this.loadDataInvidiousAsync()
-      }
-    }
-  },
-  mounted: async function () {
-    if (this.isInvidiousAllowed) {
-      this.id = this.$route.params.id
-      this.authorId = this.$route.query.authorId
-      await this.loadDataInvidiousAsync()
-    }
-  },
-  methods: {
-    loadDataInvidiousAsync: async function() {
-      this.post = await getInvidiousCommunityPost(this.id, this.authorId)
-      this.authorId = this.post.authorId
-      this.isLoading = false
-    }
-  }
-})
diff --git a/src/renderer/views/Post/Post.vue b/src/renderer/views/Post/Post.vue
deleted file mode 100644
index 22b316ebaeaa7..0000000000000
--- a/src/renderer/views/Post/Post.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div>
-    <div v-if="!isInvidiousAllowed">
-      {{ $t('Channel.Community.Viewing Posts Only Supported By Invidious') }}
-    </div>
-    <FtLoader v-else-if="isLoading" />
-    <template
-      v-else
-    >
-      <FtCard>
-        <FtCommunityPost
-          :data="post"
-          :single-post="true"
-          appearance="result"
-        />
-      </FtCard>
-      <WatchVideoComments
-        :id="post.postId"
-        :channel-name="post.author"
-        :post-author-id="authorId"
-        :video-player-ready="false"
-        :force-state="null"
-        :is-post-comments="true"
-        :channel-thumbnail="post.authorThumbnails[0].url"
-        :show-sort-by="false"
-      />
-    </template>
-  </div>
-</template>
-
-<script src="./Post.js" />
diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 0e06460b22a40..1ba41d14a3332 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -1,4 +1,5 @@
 import { defineComponent } from 'vue'
+import { mapMutations } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/FtElementList/FtElementList.vue'
@@ -6,11 +7,11 @@ import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-w
 import {
   copyToClipboard,
   searchFiltersMatch,
-  setPublishedTimestampsInvidious,
   showToast,
 } from '../../helpers/utils'
 import { getLocalSearchContinuation, getLocalSearchResults } from '../../helpers/api/local'
-import { invidiousAPICall } from '../../helpers/api/invidious'
+import { getInvidiousSearchResults } from '../../helpers/api/invidious'
+import packageDetails from '../../../../package.json'
 import { SEARCH_CHAR_LIMIT } from '../../../constants'
 
 export default defineComponent({
@@ -76,11 +77,13 @@ export default defineComponent({
 
       this.query = query
 
+      this.setAppTitle(`${this.query} - ${packageDetails.productName}`)
       this.checkSearchCache(payload)
     }
   },
   mounted: function () {
     this.query = this.$route.params.query
+    this.setAppTitle(`${this.query} - ${packageDetails.productName}`)
 
     let features = this.$route.query.features
     // if page gets refreshed and there's only one feature then it will be a string
@@ -157,6 +160,8 @@ export default defineComponent({
         }
 
         this.$store.commit('addToSessionSearchHistory', historyPayload)
+
+        this.updateSubscriptionDetails(results)
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -194,6 +199,8 @@ export default defineComponent({
         }
 
         this.$store.commit('addToSessionSearchHistory', historyPayload)
+
+        this.updateSubscriptionDetails(results)
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -217,37 +224,17 @@ export default defineComponent({
         this.isLoading = true
       }
 
-      const searchPayload = {
-        resource: 'search',
-        id: '',
-        params: {
-          q: payload.query,
-          page: this.searchPage,
-          sort_by: payload.searchSettings.sortBy,
-          date: payload.searchSettings.time,
-          duration: payload.searchSettings.duration,
-          type: payload.searchSettings.type,
-          features: payload.searchSettings.features.join(',')
-        }
-      }
-
-      invidiousAPICall(searchPayload).then((result) => {
-        if (!result) {
+      getInvidiousSearchResults(payload.query, this.searchPage, payload.searchSettings).then((results) => {
+        if (!results) {
           return
         }
 
         this.apiUsed = 'invidious'
 
-        const returnData = result.filter((item) => {
-          return item.type === 'video' || item.type === 'channel' || item.type === 'playlist' || item.type === 'hashtag'
-        })
-
-        setPublishedTimestampsInvidious(returnData.filter(item => item.type === 'video'))
-
         if (this.searchPage !== 1) {
-          this.shownResults = this.shownResults.concat(returnData)
+          this.shownResults = this.shownResults.concat(results)
         } else {
-          this.shownResults = returnData
+          this.shownResults = results
         }
 
         this.isLoading = false
@@ -263,6 +250,8 @@ export default defineComponent({
         }
 
         this.$store.commit('addToSessionSearchHistory', historyPayload)
+
+        this.updateSubscriptionDetails(results)
       }).catch((err) => {
         console.error(err)
         const errorMessage = this.$t('Invidious API Error (Click to copy)')
@@ -318,6 +307,46 @@ export default defineComponent({
 
       // This is kept in case there is some race condition
       this.isLoading = false
-    }
+    },
+
+    /**
+     * @param {any[]} results
+     */
+    updateSubscriptionDetails: function (results) {
+      /** @type {Set<string>} */
+      const subscribedChannelIds = this.$store.getters.getSubscribedChannelIdSet
+
+      const channels = []
+
+      for (const result of results) {
+        if (result.type !== 'channel' || !subscribedChannelIds.has(result.id ?? result.authorId)) {
+          continue
+        }
+
+        if (result.dataSource === 'local') {
+          channels.push({
+            channelId: result.id,
+            channelName: result.name,
+            channelThumbnailUrl: result.thumbnail.replace(/^\/\//, 'https://')
+          })
+        } else {
+          channels.push({
+            channelId: result.authorId,
+            channelName: result.author,
+            channelThumbnailUrl: result.authorThumbnails[0].url.replace(/^\/\//, 'https://')
+          })
+        }
+      }
+
+      if (channels.length === 1) {
+        this.$store.dispatch('updateSubscriptionDetails', channels[0])
+      } else if (channels.length > 1) {
+        this.$store.dispatch('batchUpdateSubscriptionDetails', channels)
+      }
+    },
+
+    ...mapMutations([
+      'setAppTitle',
+    ]),
   }
 })
diff --git a/src/renderer/views/Settings/Settings.css b/src/renderer/views/Settings/Settings.css
index a796ede907471..52eeea4b52a10 100644
--- a/src/renderer/views/Settings/Settings.css
+++ b/src/renderer/views/Settings/Settings.css
@@ -1,24 +1,74 @@
-hr {
-  inline-size: 85%;
-  margin-block: 0;
-  margin-inline: auto;
-  border: 0;
-  border-block-start: 2px solid var(--scrollbar-color-hover);
+.settingsPage {
+  display: flex;
+  gap: 20px;
 }
 
-@media only screen and (width <= 800px) {
-  hr {
-    inline-size: 100%;
-  }
+.settingsSections {
+  overflow-x: hidden;
+  max-inline-size: 90%;
 }
 
 .switchRow {
-  inline-size: 85%;
-  margin-inline: auto;
   display: flex;
+  margin-inline-end: auto;
 }
 
 .settingsToggle {
   padding-block: 0;
-  margin-block: 10px 5px;
+  margin-block: 0;
+}
+
+.section {
+  /* enables anchor link clicks to land with the section title in the top quarter of the page */
+  scroll-margin-top: 24vh;
+}
+
+@media only screen and (width >= 1015px) {
+  .section + .section {
+    padding-block-start: 20px;
+  }
+
+  .settingsSections:last-child {
+    /* Add enough blank space to have the last setting section be active on the FtSettingsMenu when scrolled to */
+    margin-block-end: calc(76vh - 150px);
+  }
+}
+
+@media only screen and (width <= 1200px) {
+  .settingsSections {
+    max-inline-size: 100%;
+  }
+}
+
+@media only screen and (width <= 1015px) {
+  /* Needed to overcome routerView styling for margin-block */
+  .settingsPage.settingsPage {
+    margin-block: 0;
+    flex-direction: column;
+    gap: 10px;
+  }
+
+  .switchRow,
+  .settingsSections {
+    margin-inline: auto;
+  }
+
+  .switchRow {
+    display: none;
+  }
+
+  .settingsSections {
+    overflow-y: hidden;
+    margin-block-end: 80px;
+  }
+
+  .hideOnMobile {
+    display: none;
+  }
+
+  .returnToMenuMobileIcon {
+    margin-block-start: 20px;
+    block-size: 30px;
+    font-size: 30px;
+  }
 }
diff --git a/src/renderer/views/Settings/Settings.js b/src/renderer/views/Settings/Settings.js
index 722e37bba22dc..5d3d4c92f5c8c 100644
--- a/src/renderer/views/Settings/Settings.js
+++ b/src/renderer/views/Settings/Settings.js
@@ -1,7 +1,7 @@
-import { defineComponent } from 'vue'
+import { defineComponent, nextTick } from 'vue'
 import { mapActions } from 'vuex'
 import GeneralSettings from '../../components/general-settings/general-settings.vue'
-import ThemeSettings from '../../components/theme-settings/theme-settings.vue'
+import ThemeSettings from '../../components/ThemeSettings.vue'
 import PlayerSettings from '../../components/player-settings/player-settings.vue'
 import ExternalPlayerSettings from '../../components/external-player-settings/external-player-settings.vue'
 import SubscriptionSettings from '../../components/subscription-settings/subscription-settings.vue'
@@ -11,11 +11,15 @@ import DataSettings from '../../components/data-settings/data-settings.vue'
 import DistractionSettings from '../../components/distraction-settings/distraction-settings.vue'
 import ProxySettings from '../../components/proxy-settings/proxy-settings.vue'
 import SponsorBlockSettings from '../../components/sponsor-block-settings/sponsor-block-settings.vue'
-import ParentControlSettings from '../../components/parental-control-settings/parental-control-settings.vue'
-import ExperimentalSettings from '../../components/experimental-settings/experimental-settings.vue'
-import PasswordSettings from '../../components/password-settings/password-settings.vue'
-import PasswordDialog from '../../components/password-dialog/password-dialog.vue'
+import ParentalControlSettings from '../../components/ParentalControlSettings.vue'
+import ExperimentalSettings from '../../components/ExperimentalSettings/ExperimentalSettings.vue'
+import PasswordSettings from '../../components/PasswordSettings/PasswordSettings.vue'
+import PasswordDialog from '../../components/PasswordDialog/PasswordDialog.vue'
 import FtToggleSwitch from '../../components/ft-toggle-switch/ft-toggle-switch.vue'
+import FtSettingsMenu from '../../components/FtSettingsMenu/FtSettingsMenu.vue'
+
+const ACTIVE_CLASS_NAME = 'active'
+const SETTINGS_MOBILE_WIDTH_THRESHOLD = 1015
 
 export default defineComponent({
   name: 'Settings',
@@ -28,11 +32,11 @@ export default defineComponent({
     'data-settings': DataSettings,
     'distraction-settings': DistractionSettings,
     'sponsor-block-settings': SponsorBlockSettings,
-    'parental-control-settings': ParentControlSettings,
+    'parental-control-settings': ParentalControlSettings,
     'password-settings': PasswordSettings,
     'password-dialog': PasswordDialog,
     'ft-toggle-switch': FtToggleSwitch,
-
+    'ft-settings-menu': FtSettingsMenu,
     ...(process.env.IS_ELECTRON
       ? {
           'proxy-settings': ProxySettings,
@@ -44,104 +48,120 @@ export default defineComponent({
   },
   data: function () {
     return {
-      unlocked: false,
-      settingsComponentsData: [
-        {
-          type: 'general-settings',
-          title: this.$t('Settings.General Settings.General Settings')
-        },
+      isInDesktopView: true,
+      settingsSectionTypeOpenInMobile: null,
+      unlocked: false
+    }
+  },
+  computed: {
+    locale: function() {
+      return this.$i18n.locale
+    },
+
+    settingsPassword: function () {
+      return this.$store.getters.getSettingsPassword
+    },
+
+    settingsSectionSortEnabled: function () {
+      return this.$store.getters.getSettingsSectionSortEnabled
+    },
+
+    settingsComponentsData: function () {
+      const settingsComponentsData = [
         {
           type: 'theme-settings',
-          title: this.$t('Settings.Theme Settings.Theme Settings')
+          title: this.$t('Settings.Theme Settings.Theme Settings'),
+          icon: 'display'
         },
         {
           type: 'player-settings',
-          title: this.$t('Settings.Player Settings.Player Settings')
+          title: this.$t('Settings.Player Settings.Player Settings'),
+          icon: 'circle-play'
         },
         ...(process.env.IS_ELECTRON
-          ? [
-              {
-                type: 'external-player-settings',
-                title: this.$t('Settings.External Player Settings.External Player Settings')
-              }
-            ]
+          ? [{
+              type: 'external-player-settings',
+              title: this.$t('Settings.External Player Settings.External Player Settings'),
+              icon: 'clapperboard'
+            }]
           : []),
         {
           type: 'subscription-settings',
-          title: this.$t('Settings.Subscription Settings.Subscription Settings')
+          title: this.$t('Settings.Subscription Settings.Subscription Settings'),
+          icon: 'play'
         },
         {
           type: 'distraction-settings',
-          title: this.$t('Settings.Distraction Free Settings.Distraction Free Settings')
+          title: this.$t('Settings.Distraction Free Settings.Distraction Free Settings'),
+          icon: 'eye-slash'
         },
         {
           type: 'privacy-settings',
-          title: this.$t('Settings.Privacy Settings.Privacy Settings')
+          title: this.$t('Settings.Privacy Settings.Privacy Settings'),
+          icon: 'lock'
         },
         {
           type: 'data-settings',
-          title: this.$t('Settings.Data Settings.Data Settings')
+          title: this.$t('Settings.Data Settings.Data Settings'),
+          icon: 'database'
         },
         ...(process.env.IS_ELECTRON
           ? [
               {
                 type: 'proxy-settings',
-                title: this.$t('Settings.Proxy Settings.Proxy Settings')
+                title: this.$t('Settings.Proxy Settings.Proxy Settings'),
+                icon: 'network-wired',
               },
               {
                 type: 'download-settings',
-                title: this.$t('Settings.Download Settings.Download Settings')
+                title: this.$t('Settings.Download Settings.Download Settings'),
+                icon: 'download',
               }
             ]
           : []),
         {
           type: 'parental-control-settings',
-          title: this.$t('Settings.Parental Control Settings.Parental Control Settings')
+          title: this.$t('Settings.Parental Control Settings.Parental Control Settings'),
+          icon: 'user-lock'
         },
         {
           type: 'sponsor-block-settings',
           title: this.$t('Settings.SponsorBlock Settings.SponsorBlock Settings'),
+          // TODO: replace with SponsorBlock icon
+          icon: 'shield'
         },
         ...(process.env.IS_ELECTRON
-          ? [
-              {
-                type: 'experimental-settings',
-                title: this.$t('Settings.Experimental Settings.Experimental Settings')
-              },
-            ]
+          ? [{
+              type: 'experimental-settings',
+              title: this.$t('Settings.Experimental Settings.Experimental Settings'),
+              icon: 'flask'
+            }]
           : []),
         {
           type: 'password-settings',
-          title: this.$t('Settings.Password Settings.Password Settings')
+          title: this.$t('Settings.Password Settings.Password Settings'),
+          icon: 'key'
         },
       ]
-    }
-  },
-  computed: {
-    locale: function() {
-      return this.$i18n.locale
-    },
-
-    settingsPassword: function () {
-      return this.$store.getters.getSettingsPassword
-    },
-
-    allSettingsSectionsExpandedByDefault: function () {
-      return this.$store.getters.getAllSettingsSectionsExpandedByDefault
-    },
-
-    settingsSectionSortEnabled: function () {
-      return this.$store.getters.getSettingsSectionSortEnabled
+      return settingsComponentsData
     },
 
     settingsSectionComponents: function () {
+      let settingsSections = this.settingsComponentsData
       if (this.settingsSectionSortEnabled) {
-        return this.settingsComponentsData.toSorted((a, b) =>
-          a.title.toLowerCase().localeCompare(b.title.toLowerCase(), this.locale)
-        )
+        settingsSections = settingsSections.toSorted((a, b) => {
+          return a.title.toLowerCase().localeCompare(b.title.toLowerCase(), this.locale)
+        })
+      }
+
+      // ensure General Settings is placed first regardless of sorting
+      const generalSettingsEntry = {
+        type: 'general-settings',
+        title: this.$t('Settings.General Settings.General Settings'),
+        icon: 'border-all'
       }
 
-      return this.settingsComponentsData
+      return [generalSettingsEntry, ...settingsSections]
     },
   },
   created: function () {
@@ -149,9 +169,98 @@ export default defineComponent({
       this.unlocked = true
     }
   },
+  mounted: function () {
+    if (this.unlocked) {
+      this.handleMounted()
+    }
+  },
+  beforeDestroy: function () {
+    document.removeEventListener('scroll', this.markScrolledToSectionAsActive)
+    window.removeEventListener('resize', this.handleResize)
+  },
   methods: {
+    handleMounted: function () {
+      this.handleResize()
+      window.addEventListener('resize', this.handleResize)
+      document.addEventListener('scroll', this.markScrolledToSectionAsActive)
+
+      // mark first section as active before any scrolling has taken place
+      if (this.settingsSectionComponents.length > 0) {
+        const firstSection = document.getElementById(this.settingsSectionComponents[0].type)
+        firstSection.classList.add(ACTIVE_CLASS_NAME)
+      }
+    },
+
+    handleUnlock: function () {
+      this.unlocked = true
+
+      nextTick(() => {
+        this.handleMounted()
+      })
+    },
+
+    navigateToSection: function(sectionType) {
+      if (this.isInDesktopView) {
+        nextTick(() => {
+          const sectionElement = this.$refs[sectionType][0].$el
+          sectionElement.scrollIntoView()
+
+          const sectionHeading = sectionElement.firstChild.firstChild
+          sectionHeading.tabIndex = 0
+          sectionHeading.focus()
+          sectionHeading.tabIndex = -1
+        })
+      } else {
+        this.settingsSectionTypeOpenInMobile = sectionType
+      }
+    },
+
+    returnToSettingsMenu: function () {
+      const openSection = this.settingsSectionTypeOpenInMobile
+      this.settingsSectionTypeOpenInMobile = null
+
+      // focus the corresponding Settings Menu title
+      nextTick(() => document.getElementById(openSection)?.focus())
+    },
+
+    /* Set the current section to be shown as active in the Settings Menu
+    * if it is the lowest section within the top quarter of the viewport (25vh) */
+    markScrolledToSectionAsActive: function() {
+      const scrollY = window.scrollY + innerHeight / 4
+      this.settingsSectionComponents.forEach((section) => {
+        const sectionElement = this.$refs[section.type][0].$el
+        const sectionHeight = sectionElement.offsetHeight
+        const sectionTop = sectionElement.offsetTop
+        const correspondingMenuLink = document.getElementById(section.type)
+
+        if (this.isInDesktopView && scrollY > sectionTop && scrollY <= sectionTop + sectionHeight) {
+          correspondingMenuLink.classList.add(ACTIVE_CLASS_NAME)
+        } else {
+          correspondingMenuLink.classList.remove(ACTIVE_CLASS_NAME)
+        }
+      })
+    },
+
+    handleResize: function () {
+      const wasNotInDesktopView = !this.isInDesktopView
+      this.isInDesktopView = window.innerWidth > SETTINGS_MOBILE_WIDTH_THRESHOLD
+
+      // navigate to section that was open in mobile or desktop view, if any
+      if (this.isInDesktopView && wasNotInDesktopView && this.settingsSectionTypeOpenInMobile != null) {
+        this.navigateToSection(this.settingsSectionTypeOpenInMobile)
+        this.settingsSectionTypeOpenInMobile = null
+      } else if (!this.isInDesktopView && !wasNotInDesktopView) {
+        const activeMenuLink = document.querySelector(`.settingsMenu .title.${ACTIVE_CLASS_NAME}`)
+        if (!activeMenuLink) {
+          return
+        }
+
+        const sectionType = activeMenuLink.id
+        this.navigateToSection(sectionType)
+      }
+    },
+
     ...mapActions([
-      'updateAllSettingsSectionsExpandedByDefault',
       'updateSettingsSectionSortEnabled'
     ])
   }
diff --git a/src/renderer/views/Settings/Settings.vue b/src/renderer/views/Settings/Settings.vue
index fd4931d038293..8829059645c00 100644
--- a/src/renderer/views/Settings/Settings.vue
+++ b/src/renderer/views/Settings/Settings.vue
@@ -1,38 +1,53 @@
 <template>
-  <div>
+  <div class="settingsPage">
     <template v-if="unlocked">
-      <div class="switchRow">
-        <ft-toggle-switch
-          class="settingsToggle"
-          :label="$t('Settings.Expand All Settings Sections')"
-          :default-value="allSettingsSectionsExpandedByDefault"
-          :compact="false"
-          @change="updateAllSettingsSectionsExpandedByDefault"
-        />
-        <ft-toggle-switch
-          class="settingsToggle"
-          :label="$t('Settings.Sort Settings Sections (A-Z)')"
-          :default-value="settingsSectionSortEnabled"
-          :compact="false"
-          @change="updateSettingsSectionSortEnabled"
+      <div v-show="settingsSectionTypeOpenInMobile != null">
+        <font-awesome-icon
+          :icon="['fas', 'angle-left']"
+          class="returnToMenuMobileIcon"
+          role="button"
+          :title="$t('Settings.Return to Settings Menu')"
+          tabindex="0"
+          @click="returnToSettingsMenu"
+          @keydown.space.enter="returnToSettingsMenu"
         />
       </div>
-      <template
-        v-for="(settingsComponent, i) in settingsSectionComponents"
+      <ft-settings-menu
+        v-show="isInDesktopView || settingsSectionTypeOpenInMobile == null"
+        :settings-sections="settingsSectionComponents"
+        @navigate-to-section="navigateToSection"
+      />
+      <div
+        v-show="isInDesktopView || settingsSectionTypeOpenInMobile != null"
+        class="settingsContent"
       >
-        <hr
-          v-if="i !== 0"
-          :key="settingsComponent.type + 'hr'"
-        >
-        <component
-          :is="settingsComponent.type"
-          :key="settingsComponent.type + 'component'"
-        />
-      </template>
+        <div class="switchRow">
+          <ft-toggle-switch
+            class="settingsToggle"
+            :label="$t('Settings.Sort Settings Sections (A-Z)')"
+            :default-value="settingsSectionSortEnabled"
+            :compact="false"
+            @change="updateSettingsSectionSortEnabled"
+          />
+        </div>
+        <div class="settingsSections">
+          <template
+            v-for="(settingsComponent) in settingsSectionComponents"
+          >
+            <component
+              :is="settingsComponent.type"
+              :ref="settingsComponent.type"
+              :key="settingsComponent.type"
+              :class="{ hideOnMobile: settingsSectionTypeOpenInMobile !== settingsComponent.type }"
+              class="section"
+            />
+          </template>
+        </div>
+      </div>
     </template>
     <password-dialog
       v-else
-      @unlocked="unlocked = true"
+      @unlocked="handleUnlock"
     />
   </div>
 </template>
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.js b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
deleted file mode 100644
index b4410831dd8cf..0000000000000
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
-import FtInput from '../../components/ft-input/ft-input.vue'
-import FtSubscribeButton from '../../components/ft-subscribe-button/ft-subscribe-button.vue'
-import { invidiousGetChannelInfo, youtubeImageUrlToInvidious, invidiousImageUrlToInvidious } from '../../helpers/api/invidious'
-import { getLocalChannel, parseLocalChannelHeader } from '../../helpers/api/local'
-import { ctrlFHandler } from '../../helpers/utils'
-
-export default defineComponent({
-  name: 'SubscribedChannels',
-  components: {
-    'ft-card': FtCard,
-    'ft-flex-box': FtFlexBox,
-    'ft-input': FtInput,
-    'ft-subscribe-button': FtSubscribeButton
-  },
-  data: function () {
-    return {
-      query: '',
-      subscribedChannels: [],
-      filteredChannels: [],
-      re: {
-        url: /(.+=\w)\d+(.+)/,
-        ivToYt: /^.+ggpht\/(.+)/
-      },
-      thumbnailSize: 176,
-      ytBaseURL: 'https://yt3.ggpht.com',
-      errorCount: 0,
-    }
-  },
-  computed: {
-    activeProfile: function () {
-      return this.$store.getters.getActiveProfile
-    },
-
-    activeProfileId: function () {
-      return this.activeProfile._id
-    },
-
-    activeSubscriptionList: function () {
-      return this.activeProfile.subscriptions
-    },
-
-    channelList: function () {
-      if (this.query !== '') {
-        return this.filteredChannels
-      } else {
-        return this.subscribedChannels
-      }
-    },
-
-    hideUnsubscribeButton: function() {
-      return this.$store.getters.getHideUnsubscribeButton
-    },
-
-    locale: function () {
-      return this.$i18n.locale
-    },
-
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-
-    currentInvidiousInstanceUrl: function () {
-      return this.$store.getters.getCurrentInvidiousInstanceUrl
-    }
-  },
-  watch: {
-    activeProfileId: function() {
-      this.query = ''
-      this.getSubscription()
-    },
-
-    activeSubscriptionList: function() {
-      this.getSubscription()
-      this.filterChannels()
-    }
-  },
-  mounted: function () {
-    document.addEventListener('keydown', this.keyboardShortcutHandler)
-    this.getSubscription()
-  },
-  beforeDestroy: function () {
-    document.removeEventListener('keydown', this.keyboardShortcutHandler)
-  },
-  methods: {
-    getSubscription: function () {
-      this.subscribedChannels = this.activeSubscriptionList.slice().sort((a, b) => {
-        return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), this.locale)
-      })
-    },
-
-    handleInput: function(input) {
-      this.query = input
-      this.filterChannels()
-    },
-
-    filterChannels: function () {
-      if (this.query === '') {
-        this.filteredChannels = []
-        return
-      }
-
-      const escapedQuery = this.query.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&')
-      const re = new RegExp(escapedQuery, 'i')
-      this.filteredChannels = this.subscribedChannels.filter(channel => {
-        return re.test(channel.name)
-      })
-    },
-
-    thumbnailURL: function(originalURL) {
-      if (originalURL == null) { return null }
-      let newURL = originalURL
-      // Sometimes relative protocol URLs are passed in
-      if (originalURL.startsWith('//')) {
-        newURL = `https:${originalURL}`
-      }
-      const hostname = new URL(newURL).hostname
-      if (hostname === 'yt3.ggpht.com' || hostname === 'yt3.googleusercontent.com') {
-        if (this.backendPreference === 'invidious') { // YT to IV
-          newURL = youtubeImageUrlToInvidious(newURL, this.currentInvidiousInstanceUrl)
-        }
-      } else {
-        if (this.backendPreference === 'local') { // IV to YT
-          newURL = newURL.replace(this.re.ivToYt, `${this.ytBaseURL}/$1`)
-        } else { // IV to IV
-          newURL = invidiousImageUrlToInvidious(newURL, this.currentInvidiousInstanceUrl)
-        }
-      }
-
-      return newURL.replace(this.re.url, `$1${this.thumbnailSize}$2`)
-    },
-
-    updateThumbnail: function(channel) {
-      this.errorCount += 1
-      if (this.backendPreference === 'local') {
-        // avoid too many concurrent requests
-        setTimeout(() => {
-          getLocalChannel(channel.id).then(response => {
-            if (!response.alert) {
-              this.updateSubscriptionDetails({
-                channelThumbnailUrl: this.thumbnailURL(parseLocalChannelHeader(response).thumbnailUrl),
-                channelName: channel.name,
-                channelId: channel.id
-              })
-            }
-          })
-        }, this.errorCount * 500)
-      } else {
-        setTimeout(() => {
-          invidiousGetChannelInfo(channel.id).then(response => {
-            this.updateSubscriptionDetails({
-              channelThumbnailUrl: this.thumbnailURL(response.authorThumbnails[0].url),
-              channelName: channel.name,
-              channelId: channel.id
-            })
-          })
-        }, this.errorCount * 500)
-      }
-    },
-
-    keyboardShortcutHandler: function (event) {
-      ctrlFHandler(event, this.$refs.searchBarChannels)
-    },
-
-    ...mapActions([
-      'updateSubscriptionDetails'
-    ])
-  }
-})
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
index 034c414091508..742eb469e86ab 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
@@ -6,12 +6,13 @@
         v-show="subscribedChannels.length > 0"
         ref="searchBarChannels"
         :placeholder="$t('Channels.Search bar placeholder')"
+        :value="query"
         :show-clear-text-button="true"
         :show-action-button="false"
         :spellcheck="false"
         :maxlength="255"
-        @input="handleInput"
-        @clear="query = ''"
+        @input="(input) => handleQueryChange(input)"
+        @clear="() => handleQueryChange('')"
       />
       <ft-flex-box
         v-if="activeSubscriptionList.length === 0"
@@ -73,5 +74,215 @@
   </div>
 </template>
 
-<script src="./SubscribedChannels.js" />
+<script setup>
+import { computed, onMounted, onBeforeUnmount, ref, watch } from 'vue'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router/composables'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
+import FtInput from '../../components/ft-input/ft-input.vue'
+import FtSubscribeButton from '../../components/ft-subscribe-button/ft-subscribe-button.vue'
+import { invidiousGetChannelInfo, youtubeImageUrlToInvidious, invidiousImageUrlToInvidious } from '../../helpers/api/invidious'
+import { getLocalChannel, parseLocalChannelHeader } from '../../helpers/api/local'
+import { ctrlFHandler } from '../../helpers/utils'
+import { useI18n } from '../../composables/use-i18n-polyfill.js'
+import store from '../../store/index'
+import debounce from 'lodash.debounce'
+
+const route = useRoute()
+const router = useRouter()
+const { locale } = useI18n()
+
+const re = {
+  url: /(.+=\w)\d+(.+)/,
+  ivToYt: /^.+ggpht\/(.+)/
+}
+const ytBaseURL = 'https://yt3.ggpht.com'
+const thumbnailSize = 176
+let errorCount = 0
+
+const query = ref('')
+const subscribedChannels = ref([])
+const filteredChannels = ref([])
+
+/** @type {import('vue').Ref<HTMLInputElement | null>} */
+const searchBarChannels = ref(null)
+
+/** @type {import('vue').ComputedRef<object>} */
+const activeProfile = computed(() => {
+  return store.getters.getActiveProfile
+})
+
+/** @type {import('vue').ComputedRef<string>} */
+const activeProfileId = computed(() => {
+  return activeProfile.value._id
+})
+
+/** @type {import('vue').ComputedRef<Array>} */
+const activeSubscriptionList = computed(() => {
+  return activeProfile.value.subscriptions
+})
+
+/** @type {import('vue').ComputedRef<Array>} */
+const channelList = computed(() => {
+  if (query.value !== '') {
+    return filteredChannels.value
+  } else {
+    return subscribedChannels.value
+  }
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideUnsubscribeButton = computed(() => {
+  return store.getters.getHideUnsubscribeButton
+})
+
+/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
+const backendPreference = computed(() => {
+  return store.getters.getBackendPreference
+})
+
+/** @type {import('vue').ComputedRef<string>} */
+const currentInvidiousInstanceUrl = computed(() => {
+  return store.getters.getCurrentInvidiousInstanceUrl
+})
+
+function getSubscription() {
+  subscribedChannels.value = activeSubscriptionList.value.slice().sort((a, b) => {
+    return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), locale.value)
+  })
+}
+
+function filterChannels() {
+  if (query.value === '') {
+    filteredChannels.value = []
+    return
+  }
+
+  const escapedQuery = query.value.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&')
+  const re = new RegExp(escapedQuery, 'i')
+  filteredChannels.value = subscribedChannels.value.filter(channel => {
+    return re.test(channel.name)
+  })
+}
+
+const filterChannelsDebounce = debounce(filterChannels, 500)
+
+function thumbnailURL(originalURL) {
+  if (originalURL == null) { return null }
+  let newURL = originalURL
+  // Sometimes relative protocol URLs are passed in
+  if (originalURL.startsWith('//')) {
+    newURL = `https:${originalURL}`
+  }
+  const hostname = new URL(newURL).hostname
+  if (hostname === 'yt3.ggpht.com' || hostname === 'yt3.googleusercontent.com') {
+    if (backendPreference.value === 'invidious') { // YT to IV
+      newURL = youtubeImageUrlToInvidious(newURL, currentInvidiousInstanceUrl.value)
+    }
+  } else {
+    if (backendPreference.value === 'local') { // IV to YT
+      newURL = newURL.replace(re.ivToYt, `${ytBaseURL}/$1`)
+    } else { // IV to IV
+      newURL = invidiousImageUrlToInvidious(newURL, currentInvidiousInstanceUrl.value)
+    }
+  }
+
+  return newURL.replace(re.url, `$1${thumbnailSize}$2`)
+}
+
+function updateThumbnail(channel) {
+  errorCount += 1
+  if (backendPreference.value === 'local') {
+    // avoid too many concurrent requests
+    setTimeout(() => {
+      getLocalChannel(channel.id).then(response => {
+        if (!response.alert) {
+          store.dispatch('updateSubscriptionDetails', {
+            channelThumbnailUrl: thumbnailURL(parseLocalChannelHeader(response).thumbnailUrl),
+            channelName: channel.name,
+            channelId: channel.id
+          })
+        }
+      })
+    }, errorCount * 500)
+  } else {
+    setTimeout(() => {
+      invidiousGetChannelInfo(channel.id).then(response => {
+        store.dispatch('updateSubscriptionDetails', {
+          channelThumbnailUrl: thumbnailURL(response.authorThumbnails[0].url),
+          channelName: channel.name,
+          channelId: channel.id
+        })
+      })
+    }, errorCount * 500)
+  }
+}
+
+function handleQueryChange(val, filterNow = false) {
+  query.value = val
+
+  saveStateInRouter(val)
+
+  filterNow ? filterChannels() : filterChannelsDebounce()
+}
+
+async function saveStateInRouter(query) {
+  if (query.value === '') {
+    await router.replace({ name: 'subscribedChannels' }).catch(failure => {
+      if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+        return
+      }
+
+      throw failure
+    })
+    return
+  }
+
+  await router.replace({
+    name: 'subscribedChannels',
+    query: { searchQueryText: query },
+  }).catch(failure => {
+    if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+      return
+    }
+
+    throw failure
+  })
+}
+
+function keyboardShortcutHandler(event) {
+  ctrlFHandler(event, searchBarChannels.value)
+}
+
+watch(activeProfileId, () => {
+  query.value = ''
+  getSubscription()
+})
+
+watch(activeSubscriptionList, () => {
+  getSubscription()
+  filterChannels()
+})
+
+// region created
+
+getSubscription()
+
+const oldQuery = route.query.searchQueryText ?? ''
+if (oldQuery !== null && oldQuery !== '') {
+  // `handleQueryChange` must be called after `filterHistoryDebounce` assigned
+  handleQueryChange(oldQuery, true)
+}
+
+// endregion created
+
+onMounted(() => {
+  document.addEventListener('keydown', keyboardShortcutHandler)
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('keydown', keyboardShortcutHandler)
+})
+</script>
 <style scoped src="./SubscribedChannels.css" />
diff --git a/src/renderer/views/Subscriptions/Subscriptions.js b/src/renderer/views/Subscriptions/Subscriptions.js
index c36ff32cda7a5..7cd6e5895f3cf 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.js
+++ b/src/renderer/views/Subscriptions/Subscriptions.js
@@ -96,7 +96,11 @@ export default defineComponent({
     } else {
       // Restore currentTab
       const lastCurrentTabId = sessionStorage.getItem('Subscriptions/currentTab')
-      if (lastCurrentTabId !== null) { this.changeTab(lastCurrentTabId) }
+      if (lastCurrentTabId !== null) {
+        this.changeTab(lastCurrentTabId)
+      } else if (!this.visibleTabs.includes(this.currentTab)) {
+        this.currentTab = this.visibleTabs[0]
+      }
     }
   },
   methods: {
diff --git a/src/renderer/views/Trending/Trending.css b/src/renderer/views/Trending/Trending.css
index 59e6387b80040..e9a00bd010f69 100644
--- a/src/renderer/views/Trending/Trending.css
+++ b/src/renderer/views/Trending/Trending.css
@@ -22,7 +22,7 @@
 .tab {
   text-align: center;
   padding: 15px;
-  font-size: 15px;
+  font-size: 1.1em;
   cursor: pointer;
   align-self: flex-end;
 }
@@ -30,3 +30,7 @@
 .tab:hover {
   font-weight: bold;
 }
+
+.trendingIcon {
+  color: var(--primary-color);
+}
diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
deleted file mode 100644
index 533f9cf8b56e5..0000000000000
--- a/src/renderer/views/Trending/Trending.js
+++ /dev/null
@@ -1,211 +0,0 @@
-import { defineComponent, nextTick } from 'vue'
-import { mapActions, mapMutations } from 'vuex'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
-import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
-import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
-
-import { copyToClipboard, getRelativeTimeFromDate, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
-import { getLocalTrending } from '../../helpers/api/local'
-import { invidiousAPICall } from '../../helpers/api/invidious'
-
-export default defineComponent({
-  name: 'Trending',
-  components: {
-    'ft-card': FtCard,
-    'ft-loader': FtLoader,
-    'ft-element-list': FtElementList,
-    'ft-icon-button': FtIconButton,
-    'ft-flex-box': FtFlexBox,
-    'ft-refresh-widget': FtRefreshWidget,
-  },
-  data: function () {
-    return {
-      isLoading: false,
-      shownResults: [],
-      currentTab: 'default',
-      trendingInstance: null
-    }
-  },
-  computed: {
-    backendPreference: function () {
-      return this.$store.getters.getBackendPreference
-    },
-    backendFallback: function () {
-      return this.$store.getters.getBackendFallback
-    },
-    lastTrendingRefreshTimestamp: function () {
-      return getRelativeTimeFromDate(this.$store.getters.getLastTrendingRefreshTimestamp, true)
-    },
-    region: function () {
-      return this.$store.getters.getRegion.toUpperCase()
-    },
-    trendingCache () {
-      return this.$store.getters.getTrendingCache
-    }
-  },
-  mounted: function () {
-    document.addEventListener('keydown', this.keyboardShortcutHandler)
-
-    if (this.trendingCache[this.currentTab] && this.trendingCache[this.currentTab].length > 0) {
-      this.getTrendingInfoCache()
-    } else {
-      this.getTrendingInfo()
-    }
-  },
-  beforeDestroy: function () {
-    document.removeEventListener('keydown', this.keyboardShortcutHandler)
-  },
-  methods: {
-    changeTab: function (tab) {
-      if (tab === this.currentTab) {
-        return
-      }
-
-      this.currentTab = tab
-      if (this.trendingCache[this.currentTab] && this.trendingCache[this.currentTab].length > 0) {
-        this.getTrendingInfoCache()
-      } else {
-        this.getTrendingInfo()
-      }
-    },
-
-    /**
-     * @param {KeyboardEvent} event
-     * @param {string} tab
-     */
-    focusTab: function (event, tab) {
-      if (!event.altKey) {
-        event.preventDefault()
-        this.$refs[tab].focus()
-        this.showOutlines()
-      }
-    },
-
-    getTrendingInfo: function (refresh = false) {
-      if (refresh) {
-        this.trendingInstance = null
-        this.$store.commit('clearTrendingCache')
-      }
-
-      if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
-        this.getTrendingInfoInvidious()
-      } else {
-        this.getTrendingInfoLocal()
-      }
-
-      this.setLastTrendingRefreshTimestamp(new Date())
-    },
-
-    getTrendingInfoLocal: async function () {
-      this.isLoading = true
-
-      try {
-        const { results, instance } = await getLocalTrending(this.region, this.currentTab, this.trendingInstance)
-
-        this.shownResults = results
-        this.isLoading = false
-        this.trendingInstance = instance
-
-        this.$store.commit('setTrendingCache', { value: results, page: this.currentTab })
-        nextTick(() => {
-          this.$refs[this.currentTab]?.focus()
-        })
-      } catch (err) {
-        console.error(err)
-        const errorMessage = this.$t('Local API Error (Click to copy)')
-        showToast(`${errorMessage}: ${err}`, 10000, () => {
-          copyToClipboard(err)
-        })
-        if (this.backendPreference === 'local' && this.backendFallback) {
-          showToast(this.$t('Falling back to Invidious API'))
-          this.getTrendingInfoInvidious()
-        } else {
-          this.isLoading = false
-        }
-      }
-    },
-
-    getTrendingInfoCache: function () {
-      this.shownResults = this.trendingCache[this.currentTab]
-    },
-    getTrendingInfoInvidious: function () {
-      this.isLoading = true
-
-      const trendingPayload = {
-        resource: 'trending',
-        id: '',
-        params: { region: this.region }
-      }
-
-      if (this.currentTab !== 'default') {
-        trendingPayload.params.type = this.currentTab.charAt(0).toUpperCase() + this.currentTab.slice(1)
-      }
-
-      invidiousAPICall(trendingPayload).then((result) => {
-        if (!result) {
-          return
-        }
-
-        const returnData = result.filter((item) => {
-          return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
-        })
-
-        setPublishedTimestampsInvidious(returnData.filter(item => item.type === 'video'))
-
-        this.shownResults = returnData
-        this.isLoading = false
-        this.$store.commit('setTrendingCache', { value: returnData, page: this.currentTab })
-        nextTick(() => {
-          this.$refs[this.currentTab]?.focus()
-        })
-      }).catch((err) => {
-        console.error(err)
-        const errorMessage = this.$t('Invidious API Error (Click to copy)')
-        showToast(`${errorMessage}: ${err}`, 10000, () => {
-          copyToClipboard(err)
-        })
-
-        if (process.env.SUPPORTS_LOCAL_API && (this.backendPreference === 'invidious' && this.backendFallback)) {
-          showToast(this.$t('Falling back to Local API'))
-          this.getTrendingInfoLocal()
-        } else {
-          this.isLoading = false
-        }
-      })
-    },
-
-    /**
-     * This function `keyboardShortcutHandler` should always be at the bottom of this file
-     * @param {KeyboardEvent} event the keyboard event
-     */
-    keyboardShortcutHandler: function (event) {
-      if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
-        return
-      }
-      // Avoid handling events due to user holding a key (not released)
-      // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
-      if (event.repeat) { return }
-
-      switch (event.key) {
-        case 'r':
-        case 'R':
-        case 'F5':
-          if (!this.isLoading) {
-            this.getTrendingInfo(true)
-          }
-          break
-      }
-    },
-
-    ...mapActions([
-      'showOutlines'
-    ]),
-
-    ...mapMutations([
-      'setLastTrendingRefreshTimestamp'
-    ])
-  }
-})
diff --git a/src/renderer/views/Trending/Trending.vue b/src/renderer/views/Trending/Trending.vue
index 5e03565500e18..f8f91c7ed52eb 100644
--- a/src/renderer/views/Trending/Trending.vue
+++ b/src/renderer/views/Trending/Trending.vue
@@ -1,22 +1,29 @@
 <template>
   <div>
-    <ft-loader
+    <FtLoader
       v-if="isLoading"
       :fullscreen="true"
     />
-    <ft-card
+    <FtCard
       v-else
       class="card"
     >
-      <h2>{{ $t("Trending.Trending") }}</h2>
-      <ft-flex-box
+      <h2>
+        <FontAwesomeIcon
+          :icon="['fas', 'fire']"
+          class="trendingIcon"
+          fixed-width
+        />
+        {{ $t("Trending.Trending") }}
+      </h2>
+      <FtFlexBox
         class="trendingInfoTabs"
         role="tablist"
         :aria-label="$t('Trending.Trending Tabs')"
       >
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="default"
+          ref="defaultTab"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'default')"
@@ -25,14 +32,19 @@
           :class="{ selectedTab: currentTab === 'default' }"
           @click="changeTab('default')"
           @keydown.space.enter.prevent="changeTab('default')"
-          @keydown.left="focusTab($event, 'movies')"
-          @keydown.right="focusTab($event, 'music')"
+          @keydown.left="focusTab('movies', $event)"
+          @keydown.right="focusTab('music', $event)"
         >
+          <FontAwesomeIcon
+            :icon="['fas', 'fire']"
+            class="trendingIcon"
+            fixed-width
+          />
           {{ $t("Trending.Default").toUpperCase() }}
         </div>
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="music"
+          ref="musicTab"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'music')"
@@ -41,14 +53,19 @@
           :class="{ selectedTab: currentTab === 'music' }"
           @click="changeTab('music')"
           @keydown.space.enter.prevent="changeTab('music')"
-          @keydown.left="focusTab($event, 'default')"
-          @keydown.right="focusTab($event, 'gaming')"
+          @keydown.left="focusTab('default', $event)"
+          @keydown.right="focusTab('gaming', $event)"
         >
+          <FontAwesomeIcon
+            :icon="['fas', 'music']"
+            class="trendingIcon"
+            fixed-width
+          />
           {{ $t("Trending.Music").toUpperCase() }}
         </div>
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="gaming"
+          ref="gamingTab"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'gaming')"
@@ -57,14 +74,19 @@
           :class="{ selectedTab: currentTab === 'gaming' }"
           @click="changeTab('gaming')"
           @keydown.space.enter.prevent="changeTab('gaming')"
-          @keydown.left="focusTab($event, 'music')"
-          @keydown.right="focusTab($event, 'movies')"
+          @keydown.left="focusTab('music', $event)"
+          @keydown.right="focusTab('movies', $event)"
         >
+          <FontAwesomeIcon
+            :icon="['fas', 'gamepad']"
+            class="trendingIcon"
+            fixed-width
+          />
           {{ $t("Trending.Gaming").toUpperCase() }}
         </div>
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="movies"
+          ref="moviesTab"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'movies')"
@@ -73,19 +95,24 @@
           :class="{ selectedTab: currentTab === 'movies' }"
           @click="changeTab('movies')"
           @keydown.space.enter.prevent="changeTab('movies')"
-          @keydown.left="focusTab($event, 'gaming')"
-          @keydown.right="focusTab($event, 'default')"
+          @keydown.left="focusTab('gaming', $event)"
+          @keydown.right="focusTab('default', $event)"
         >
+          <FontAwesomeIcon
+            :icon="['fas', 'film']"
+            class="trendingIcon"
+            fixed-width
+          />
           {{ $t("Trending.Movies").toUpperCase() }}
         </div>
-      </ft-flex-box>
-      <ft-element-list
+      </FtFlexBox>
+      <FtElementList
         id="trendingPanel"
         role="tabpanel"
         :data="shownResults"
       />
-    </ft-card>
-    <ft-refresh-widget
+    </FtCard>
+    <FtRefreshWidget
       :disable-refresh="isLoading"
       :last-refresh-timestamp="lastTrendingRefreshTimestamp"
       :title="$t('Trending.Trending')"
@@ -94,5 +121,231 @@
   </div>
 </template>
 
-<script src="./Trending.js" />
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, shallowRef } from 'vue'
+import { useI18n } from '../../composables/use-i18n-polyfill'
+
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import FtElementList from '../../components/FtElementList/FtElementList.vue'
+import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
+import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
+
+import store from '../../store/index'
+
+import { copyToClipboard, getRelativeTimeFromDate, showToast } from '../../helpers/utils'
+import { getLocalTrending } from '../../helpers/api/local'
+import { getInvidiousTrending } from '../../helpers/api/invidious'
+import { KeyboardShortcuts } from '../../../constants'
+
+const { t } = useI18n()
+
+/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
+const backendPreference = computed(() => {
+  return store.getters.getBackendPreference
+})
+
+/** @type {import('vue').ComputedRef<boolean>} */
+const backendFallback = computed(() => {
+  return store.getters.getBackendFallback
+})
+
+const lastTrendingRefreshTimestamp = computed(() => {
+  return getRelativeTimeFromDate(store.getters.getLastTrendingRefreshTimestamp, true)
+})
+
+/** @type {import('vue').ComputedRef<string>} */
+const region = computed(() => {
+  return store.getters.getRegion.toUpperCase()
+})
+
+/** @type {import('vue').ComputedRef<{ default: any[] | null, music: any[] | null, gaming: any[] | null, movies: any[] | null }>} */
+const trendingCache = computed(() => {
+  return store.getters.getTrendingCache
+})
+
+const isLoading = ref(false)
+const shownResults = shallowRef([])
+
+/** @type {import('vue').Ref<'default' | 'music' | 'gaming' | 'movies'>} */
+const currentTab = ref('default')
+
+const cacheEntry = trendingCache.value[currentTab.value]
+
+if (cacheEntry && cacheEntry.length > 0) {
+  shownResults.value = cacheEntry
+} else {
+  onMounted(() => {
+    getTrendingInfo()
+  })
+}
+
+/** @type {import('youtubei.js').Mixins.TabbedFeed<import('youtubei.js').IBrowseResponse> | null} */
+let trendingInstance = null
+
+function getTrendingInfo(refresh = false) {
+  if (refresh) {
+    if (process.env.SUPPORTS_LOCAL_API) {
+      trendingInstance = null
+    }
+
+    store.commit('clearTrendingCache')
+  }
+
+  if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious') {
+    getTrendingInfoInvidious()
+  } else {
+    getTrendingInfoLocal()
+  }
+
+  store.commit('setLastTrendingRefreshTimestamp', new Date())
+}
+
+async function getTrendingInfoLocal() {
+  isLoading.value = true
+
+  try {
+    const { results, instance } = await getLocalTrending(region.value, currentTab.value, trendingInstance)
+
+    shownResults.value = results
+    isLoading.value = false
+    trendingInstance = instance
+
+    store.commit('setTrendingCache', { value: results, page: currentTab.value })
+    nextTick(() => {
+      focusTab(currentTab.value)
+    })
+  } catch (error) {
+    console.error(error)
+    const errorMessage = t('Local API Error (Click to copy)')
+    showToast(`${errorMessage}: ${error}`, 10000, () => {
+      copyToClipboard(error)
+    })
+    if (backendPreference.value === 'local' && backendFallback.value) {
+      showToast(t('Falling back to Invidious API'))
+      getTrendingInfoInvidious()
+    } else {
+      isLoading.value = false
+    }
+  }
+}
+
+function getTrendingInfoInvidious() {
+  isLoading.value = true
+
+  getInvidiousTrending(currentTab.value, region.value).then((items) => {
+    if (!items) {
+      return
+    }
+
+    shownResults.value = items
+    isLoading.value = false
+    store.commit('setTrendingCache', { value: items, page: currentTab.value })
+    nextTick(() => {
+      focusTab(currentTab.value)
+    })
+  }).catch((err) => {
+    console.error(err)
+    const errorMessage = t('Invidious API Error (Click to copy)')
+    showToast(`${errorMessage}: ${err}`, 10000, () => {
+      copyToClipboard(err)
+    })
+
+    if (process.env.SUPPORTS_LOCAL_API && backendPreference.value === 'invidious' && backendFallback.value) {
+      showToast(t('Falling back to Local API'))
+      getTrendingInfoLocal()
+    } else {
+      isLoading.value = false
+    }
+  })
+}
+
+/** @type {import('vue').Ref<HTMLDivElement | null>} */
+const defaultTab = ref(null)
+/** @type {import('vue').Ref<HTMLDivElement | null>} */
+const musicTab = ref(null)
+/** @type {import('vue').Ref<HTMLDivElement | null>} */
+const gamingTab = ref(null)
+/** @type {import('vue').Ref<HTMLDivElement | null>} */
+const moviesTab = ref(null)
+
+/**
+ * @param {'default' | 'music' | 'gaming' | 'movies'} tab
+ * @param {KeyboardEvent | undefined} event
+ */
+function focusTab(tab, event = undefined) {
+  if (event) {
+    if (event.altKey) { return }
+
+    event.preventDefault()
+    store.dispatch('showOutlines')
+  }
+
+  switch (tab) {
+    case 'default':
+      defaultTab.value?.focus()
+      break
+    case 'music':
+      musicTab.value?.focus()
+      break
+    case 'gaming':
+      gamingTab.value?.focus()
+      break
+    case 'movies':
+      moviesTab.value?.focus()
+      break
+  }
+}
+
+/**
+ * @param {'default' | 'music' | 'gaming' | 'movies'} tab
+ */
+function changeTab(tab) {
+  if (tab === currentTab.value) {
+    return
+  }
+
+  currentTab.value = tab
+
+  const cacheEntry = trendingCache.value[currentTab.value]
+
+  if (cacheEntry && cacheEntry.length > 0) {
+    shownResults.value = cacheEntry
+  } else {
+    getTrendingInfo()
+  }
+}
+
+/**
+ * @param {KeyboardEvent} event the keyboard event
+ */
+function keyboardShortcutHandler(event) {
+  if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
+    return
+  }
+
+  // Avoid handling events due to user holding a key (not released)
+  // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
+  if (event.repeat) { return }
+
+  switch (event.key.toLowerCase()) {
+    case 'f5':
+    case KeyboardShortcuts.APP.SITUATIONAL.REFRESH:
+      if (!isLoading.value) {
+        getTrendingInfo(true)
+      }
+      break
+  }
+}
+
+onMounted(() => {
+  document.addEventListener('keydown', keyboardShortcutHandler)
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('keydown', keyboardShortcutHandler)
+})
+</script>
+
 <style scoped src="./Trending.css" />
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.js b/src/renderer/views/UserPlaylists/UserPlaylists.js
index 053d0b50421b2..25deadd856017 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.js
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.js
@@ -13,6 +13,7 @@ import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 import FtToggleSwitch from '../../components/ft-toggle-switch/ft-toggle-switch.vue'
 import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
 import { ctrlFHandler, getIconForSortPreference } from '../../helpers/utils'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 
 const SORT_BY_VALUES = {
   NameAscending: 'name_ascending',
@@ -174,6 +175,7 @@ export default defineComponent({
     doSearchPlaylistsWithMatchingVideos() {
       this.searchDataLimit = 100
       this.filterPlaylistAsync()
+      this.saveStateInRouter()
     },
     fullData() {
       this.activeData = this.fullData
@@ -183,9 +185,9 @@ export default defineComponent({
       sessionStorage.setItem('UserPlaylists/sortBy', this.sortBy)
     },
   },
-  mounted: function () {
+  created: function () {
     document.addEventListener('keydown', this.keyboardShortcutHandler)
-    const limit = sessionStorage.getItem('favoritesLimit')
+    const limit = sessionStorage.getItem('UserPlaylists/dataLimit')
     if (limit !== null) {
       this.dataLimit = limit
     }
@@ -195,23 +197,53 @@ export default defineComponent({
       this.sortBy = sortBy
     }
 
-    this.activeData = this.fullData
-
-    this.showLoadMoreButton = this.activeData.length < this.allPlaylists.length
-
     this.filterPlaylistDebounce = debounce(this.filterPlaylist, 500)
+
+    const oldQuery = this.$route.query.searchQueryText ?? ''
+    if (oldQuery !== null && oldQuery !== '') {
+      // `handleQueryChange` must be called after `filterHistoryDebounce` assigned
+      this.handleQueryChange(
+        oldQuery,
+        {
+          limit: this.$route.query.searchDataLimit,
+          doSearchPlaylistsWithMatchingVideos: this.$route.query.doSearchPlaylistsWithMatchingVideos === 'true',
+          filterNow: true,
+        },
+      )
+    } else {
+      // Only display unfiltered data when no query used last time
+      this.filterPlaylist()
+    }
   },
   beforeDestroy: function () {
     document.removeEventListener('keydown', this.keyboardShortcutHandler)
   },
   methods: {
+    handleQueryChange(query, { limit = null, doSearchPlaylistsWithMatchingVideos = null, filterNow = false } = {}) {
+      this.query = query
+
+      const newLimit = limit ?? 100
+      this.searchDataLimit = newLimit
+      const newDoSearchPlaylistsWithMatchingVideos = doSearchPlaylistsWithMatchingVideos ?? this.doSearchPlaylistsWithMatchingVideos
+      this.doSearchPlaylistsWithMatchingVideos = newDoSearchPlaylistsWithMatchingVideos
+
+      this.saveStateInRouter({
+        query: query,
+        searchDataLimit: newLimit,
+        doSearchPlaylistsWithMatchingVideos: newDoSearchPlaylistsWithMatchingVideos,
+      })
+
+      filterNow ? this.filterPlaylist() : this.filterPlaylistAsync()
+    },
+
     increaseLimit: function () {
       if (this.query !== '') {
         this.searchDataLimit += 100
+        this.saveStateInRouter()
         this.filterPlaylist()
       } else {
         this.dataLimit += 100
-        sessionStorage.setItem('favoritesLimit', this.dataLimit)
+        sessionStorage.setItem('UserPlaylists/dataLimit', this.dataLimit)
       }
     },
     filterPlaylistAsync: function() {
@@ -247,6 +279,39 @@ export default defineComponent({
       })
     },
 
+    async saveStateInRouter({ query = this.query, searchDataLimit = this.searchDataLimit, doSearchPlaylistsWithMatchingVideos = this.doSearchPlaylistsWithMatchingVideos } = {}) {
+      if (this.query === '') {
+        try {
+          await this.$router.replace({ name: 'userPlaylists' })
+        } catch (failure) {
+          if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+            return
+          }
+
+          throw failure
+        }
+        return
+      }
+
+      const routerQuery = {
+        searchQueryText: query,
+        searchDataLimit: searchDataLimit,
+      }
+      if (doSearchPlaylistsWithMatchingVideos) { routerQuery.doSearchPlaylistsWithMatchingVideos = 'true' }
+      try {
+        await this.$router.replace({
+          name: 'userPlaylists',
+          query: routerQuery,
+        })
+      } catch (failure) {
+        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+          return
+        }
+
+        throw failure
+      }
+    },
+
     keyboardShortcutHandler: function (event) {
       ctrlFHandler(event, this.$refs.searchBar)
     },
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.vue b/src/renderer/views/UserPlaylists/UserPlaylists.vue
index 5f455651d12c5..b5930b207375f 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.vue
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.vue
@@ -26,11 +26,12 @@
           <ft-input
             ref="searchBar"
             :placeholder="$t('User Playlists.Search bar placeholder')"
+            :value="query"
             :show-clear-text-button="true"
             :show-action-button="false"
             :maxlength="255"
-            @input="(input) => query = input"
-            @clear="query = ''"
+            @input="(input) => handleQueryChange(input)"
+            @clear="() => handleQueryChange('')"
           />
         </div>
         <div
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 944886d5e4256..91e7017ce42b0 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -1,20 +1,22 @@
 import { defineComponent } from 'vue'
-import { mapActions } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import shaka from 'shaka-player'
+import { Utils, YTNodes } from 'youtubei.js'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtShakaVideoPlayer from '../../components/ft-shaka-video-player/ft-shaka-video-player.vue'
 import WatchVideoInfo from '../../components/watch-video-info/watch-video-info.vue'
 import WatchVideoChapters from '../../components/WatchVideoChapters/WatchVideoChapters.vue'
 import WatchVideoDescription from '../../components/WatchVideoDescription/WatchVideoDescription.vue'
-import WatchVideoComments from '../../components/watch-video-comments/watch-video-comments.vue'
+import CommentSection from '../../components/CommentSection/CommentSection.vue'
 import WatchVideoLiveChat from '../../components/watch-video-live-chat/watch-video-live-chat.vue'
 import WatchVideoPlaylist from '../../components/watch-video-playlist/watch-video-playlist.vue'
 import WatchVideoRecommendations from '../../components/WatchVideoRecommendations/WatchVideoRecommendations.vue'
-import FtAgeRestricted from '../../components/ft-age-restricted/ft-age-restricted.vue'
+import FtAgeRestricted from '../../components/FtAgeRestricted/FtAgeRestricted.vue'
 import packageDetails from '../../../../package.json'
 import {
   buildVTTFileLocally,
   copyToClipboard,
+  extractNumberFromString,
   formatDurationAsTimestamp,
   formatNumber,
   showToast
@@ -28,10 +30,8 @@ import {
 } from '../../helpers/api/local'
 import {
   convertInvidiousToLocalFormat,
-  filterInvidiousFormats,
   generateInvidiousDashManifestLocally,
   getProxyUrl,
-  invidiousFetch,
   invidiousGetVideoInformation,
   mapInvidiousLegacyFormat,
   youtubeImageUrlToInvidious
@@ -48,7 +48,7 @@ export default defineComponent({
     'watch-video-info': WatchVideoInfo,
     'watch-video-chapters': WatchVideoChapters,
     'watch-video-description': WatchVideoDescription,
-    'watch-video-comments': WatchVideoComments,
+    CommentSection,
     'watch-video-live-chat': WatchVideoLiveChat,
     'watch-video-playlist': WatchVideoPlaylist,
     'watch-video-recommendations': WatchVideoRecommendations,
@@ -57,6 +57,8 @@ export default defineComponent({
   beforeRouteLeave: async function (to, from, next) {
     this.handleRouteChange()
     window.removeEventListener('beforeunload', this.handleWatchProgress)
+    document.removeEventListener('keydown', this.resetAutoplayInterruptionTimeout)
+    document.removeEventListener('click', this.resetAutoplayInterruptionTimeout)
 
     if (this.$refs.player) {
       await this.$refs.player.destroyPlayer()
@@ -76,6 +78,7 @@ export default defineComponent({
       isLiveContent: false,
       isUpcoming: false,
       isPostLiveDvr: false,
+      isUnlisted: false,
       upcomingTimestamp: null,
       upcomingTimeLeft: null,
       /** @type {'dash' | 'audio' | 'legacy'} */
@@ -91,6 +94,8 @@ export default defineComponent({
       videoLengthSeconds: 0,
       videoChapters: [],
       videoCurrentChapterIndex: 0,
+      /** @type {'chapters' | 'keyMoments'} */
+      videoChaptersKind: 'chapters',
       channelName: '',
       channelThumbnail: '',
       channelId: '',
@@ -116,7 +121,8 @@ export default defineComponent({
       playNextTimeout: null,
       playNextCountDownIntervalId: null,
       infoAreaSticky: true,
-      commentsEnabled: true,
+      blockVideoAutoplay: false,
+      autoplayInterruptionTimeout: null,
 
       onMountedRun: false,
 
@@ -158,6 +164,9 @@ export default defineComponent({
     proxyVideos: function () {
       return this.$store.getters.getProxyVideos
     },
+    defaultAutoplayInterruptionIntervalHours: function () {
+      return this.$store.getters.getDefaultAutoplayInterruptionIntervalHours
+    },
     defaultInterval: function () {
       return this.$store.getters.getDefaultInterval
     },
@@ -319,7 +328,13 @@ export default defineComponent({
         this.getVideoInformationLocal()
       }
 
+      document.removeEventListener('keydown', this.resetAutoplayInterruptionTimeout)
+      document.removeEventListener('click', this.resetAutoplayInterruptionTimeout)
+      document.addEventListener('keydown', this.resetAutoplayInterruptionTimeout)
+      document.addEventListener('click', this.resetAutoplayInterruptionTimeout)
+
       window.addEventListener('beforeunload', this.handleWatchProgress)
+      this.resetAutoplayInterruptionTimeout()
     },
 
     changeTimestamp: function (timestamp) {
@@ -356,22 +371,12 @@ export default defineComponent({
           return
         }
 
-        const playabilityStatus = result.playability_status
-
-        if (playabilityStatus.status === 'UNPLAYABLE') {
-          /**
-           * @type {import ('youtubei.js').YTNodes.PlayerErrorMessage}
-           */
-          const errorScreen = playabilityStatus.error_screen
-          throw new Error(`[${playabilityStatus.status}] ${errorScreen.reason.text}: ${errorScreen.subreason.text}`)
-        }
-
         // extract localised title first and fall back to the not localised one
         this.videoTitle = result.primary_info?.title.text ?? result.basic_info.title
-        this.videoViewCount = result.basic_info.view_count
+        this.videoViewCount = result.basic_info.view_count ?? extractNumberFromString(result.primary_info.view_count.text)
 
-        this.channelId = result.basic_info.channel_id
-        this.channelName = result.basic_info.author
+        this.channelId = result.basic_info.channel_id ?? result.secondary_info.owner?.author.id
+        this.channelName = result.basic_info.author ?? result.secondary_info.owner?.author.name
 
         if (result.secondary_info.owner?.author) {
           this.channelThumbnail = result.secondary_info.owner.author.best_thumbnail?.url ?? ''
@@ -387,8 +392,13 @@ export default defineComponent({
           channelId: this.channelId
         })
 
-        // `result.page[0].microformat.publish_date` example value: `2023-08-12T08:59:59-07:00`
-        this.videoPublished = new Date(result.page[0].microformat.publish_date).getTime()
+        if (result.page[0].microformat?.publish_date) {
+          // `result.page[0].microformat.publish_date` example value: `2023-08-12T08:59:59-07:00`
+          this.videoPublished = new Date(result.page[0].microformat.publish_date).getTime()
+        } else {
+          // text date Jan 1, 2000, not as accurate but better than nothing
+          this.videoPublished = new Date(result.primary_info.published).getTime()
+        }
 
         if (result.secondary_info?.description.runs) {
           try {
@@ -412,7 +422,7 @@ export default defineComponent({
             this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres3.jpg`
             break
           default:
-            this.thumbnail = result.basic_info.thumbnail[0].url
+            this.thumbnail = result.basic_info.thumbnail?.[0].url ?? `https://i.ytimg.com/vi/${this.videoId}/maxresdefault.jpg`
             break
         }
 
@@ -430,6 +440,7 @@ export default defineComponent({
         this.isUpcoming = !!result.basic_info.is_upcoming
         this.isLiveContent = !!result.basic_info.is_live_content
         this.isPostLiveDvr = !!result.basic_info.is_post_live_dvr
+        this.isUnlisted = !!result.basic_info.is_unlisted
 
         const subCount = !result.secondary_info.owner.subscriber_count.isEmpty() ? parseLocalSubscriberCount(result.secondary_info.owner.subscriber_count.text) : NaN
 
@@ -455,7 +466,26 @@ export default defineComponent({
               })
             }
           } else {
-            chapters = this.extractChaptersFromDescription(result.basic_info.short_description)
+            /** @type {import('youtubei.js').YTNodes.MacroMarkersList | null | undefined} */
+            const macroMarkersList = result.page[1]?.engagement_panels
+              ?.find(pannel => pannel.panel_identifier === 'engagement-panel-macro-markers-auto-chapters')?.content
+
+            if (macroMarkersList) {
+              for (const item of macroMarkersList.contents) {
+                if (item instanceof YTNodes.MacroMarkersListItem) {
+                  chapters.push({
+                    title: item.title.text,
+                    timestamp: item.time_description.text,
+                    startSeconds: Utils.timeToSeconds(item.time_description.text),
+                    endSeconds: 0,
+                    thumbnail: item.thumbnail[0]
+                  })
+                }
+              }
+              this.videoChaptersKind = 'keyMoments'
+            } else {
+              chapters = this.extractChaptersFromDescription(result.basic_info.short_description ?? result.secondary_info.description.text)
+            }
           }
 
           if (chapters.length > 0) {
@@ -471,23 +501,57 @@ export default defineComponent({
 
         this.videoChapters = chapters
 
-        if (!this.hideLiveChat && this.isLive && result.livechat) {
+        const playabilityStatus = result.playability_status
+
+        // The apostrophe is intentionally that one (char code 8217), because that is the one YouTube uses
+        const BOT_MESSAGE = 'Sign in to confirm you’re not a bot'
+
+        if (playabilityStatus.status === 'UNPLAYABLE' || playabilityStatus.status === 'LOGIN_REQUIRED') {
+          if (playabilityStatus.error_screen?.offer_id === 'sponsors_only_video') {
+            // Members-only videos can only be watched while logged into a Google account that is a paid channel member
+            // so there is no point trying any other backends as it will always fail
+            this.errorMessage = this.$t('Video.MembersOnly')
+            this.customErrorIcon = ['fas', 'money-check-dollar']
+            this.isLoading = false
+            this.updateTitle()
+            return
+          } else if (playabilityStatus.reason === 'Sign in to confirm your age' || (result.has_trailer && result.getTrailerInfo() === null)) {
+            // Age-restricted videos can only be watched while logged into a Google account that is age-verified
+            // so there is no point trying any other backends as it will always fail
+            this.errorMessage = this.$t('Video.AgeRestricted')
+            this.isLoading = false
+            this.updateTitle()
+            return
+          }
+
+          let errorText
+
+          if (playabilityStatus.reason === BOT_MESSAGE || playabilityStatus.reason === 'Please sign in') {
+            errorText = this.$t('Video.IP block')
+          } else {
+            errorText = `[${playabilityStatus.status}] ${playabilityStatus.reason}`
+
+            if (playabilityStatus.error_screen?.subreason) {
+              errorText += `: ${playabilityStatus.error_screen.subreason.text}`
+            }
+          }
+
+          if (this.backendFallback) {
+            throw new Error(errorText)
+          } else {
+            this.errorMessage = errorText
+            this.isLoading = false
+            this.updateTitle()
+            return
+          }
+        }
+
+        if (!this.hideLiveChat && (this.isLive || this.isUpcoming) && result.livechat) {
           this.liveChat = result.getLiveChat()
         } else {
           this.liveChat = null
         }
 
-        // region No comment detection
-        // For videos without any comment (comment disabled?)
-        // e.g. https://youtu.be/8NBSwDEf8a8
-        //
-        // `comments_entry_point_header` is null probably when comment disabled
-        // e.g. https://youtu.be/8NBSwDEf8a8
-        // However videos with comments enabled but have no comment
-        // are different (which is not detected here)
-        this.commentsEnabled = result.comments_entry_point_header != null
-        // endregion No comment detection
-
         if ((this.isLive || this.isPostLiveDvr) && !this.isUpcoming) {
           let useRemoteManifest = true
 
@@ -664,9 +728,8 @@ export default defineComponent({
               })
 
               downloadLinks.push(...captionLinks)
-
-              this.downloadLinks = downloadLinks
             }
+            this.downloadLinks = downloadLinks
           } else {
             // video might be region locked or something else. This leads to no formats being available
             showToast(
@@ -694,6 +757,7 @@ export default defineComponent({
           }
 
           if (result.storyboards?.type === 'PlayerStoryboardSpec') {
+            /** @type {import('youtubei.js/dist/src/parser/classes/PlayerStoryboardSpec').StoryboardData[]} */
             let source = result.storyboards.boards
             if (window.innerWidth < 500) {
               source = source.filter((board) => board.thumbnail_height <= 90)
@@ -702,7 +766,6 @@ export default defineComponent({
           }
         }
 
-        // this.errorMessage = 'Test error message'
         this.isLoading = false
         this.updateTitle()
       } catch (err) {
@@ -765,6 +828,7 @@ export default defineComponent({
           this.isLive = result.liveNow
           this.isFamilyFriendly = result.isFamilyFriendly
           this.isPostLiveDvr = !!result.isPostLiveDvr
+          this.isUnlisted = !result.isListed
 
           this.captions = result.captions.map(caption => {
             return {
@@ -820,6 +884,8 @@ export default defineComponent({
             // // https://github.com/iv-org/invidious/pull/4589
             // if (this.proxyVideos) {
 
+            this.streamingDataExpiryDate = this.extractExpiryDateFromStreamingUrl(result.adaptiveFormats[0].url)
+
             let hlsManifestUrl = result.hlsUrl
 
             if (this.proxyVideos) {
@@ -848,12 +914,9 @@ export default defineComponent({
           } else {
             this.videoLengthSeconds = result.lengthSeconds
 
-            // Detect if the Invidious server is running a new enough version of Invidious
-            // to include this pull request: https://github.com/iv-org/invidious/pull/4586
-            // which fixed the API returning incorrect height, width and fps information
-            const trustApiResponse = result.adaptiveFormats.some(stream => typeof stream.size === 'string')
+            this.streamingDataExpiryDate = this.extractExpiryDateFromStreamingUrl(result.adaptiveFormats[0].url)
 
-            this.legacyFormats = result.formatStreams.map(format => mapInvidiousLegacyFormat(format, trustApiResponse))
+            this.legacyFormats = result.formatStreams.map(mapInvidiousLegacyFormat)
 
             if (!process.env.SUPPORTS_LOCAL_API || this.proxyVideos) {
               this.legacyFormats.forEach(format => {
@@ -898,7 +961,7 @@ export default defineComponent({
               return object
             }))
 
-            this.manifestSrc = await this.createInvidiousDashManifest(result, trustApiResponse)
+            this.manifestSrc = await this.createInvidiousDashManifest(result)
             this.manifestMimeType = MANIFEST_TYPE_DASH
           }
 
@@ -922,6 +985,12 @@ export default defineComponent({
         })
     },
 
+    extractExpiryDateFromStreamingUrl: function (url) {
+      const expireString = new URL(url).searchParams.get('expire')
+
+      return new Date(parseInt(expireString) * 1000)
+    },
+
     /**
      * @param {string} description
      */
@@ -1177,6 +1246,18 @@ export default defineComponent({
         return
       }
 
+      if (this.blockVideoAutoplay) {
+        showToast(this.$t('Autoplay Interruption Timer',
+          this.defaultAutoplayInterruptionIntervalHours,
+          {
+            autoplayInterruptionIntervalHours: this.defaultAutoplayInterruptionIntervalHours
+          }),
+        3_600_000
+        )
+        this.resetAutoplayInterruptionTimeout()
+        return
+      }
+
       if (this.watchingPlaylist && this.getPlaylistPauseOnCurrent()) {
         this.disablePlaylistPauseOnCurrent()
         return
@@ -1246,6 +1327,7 @@ export default defineComponent({
       clearTimeout(this.playNextTimeout)
       clearInterval(this.playNextCountDownIntervalId)
       this.videoChapters = []
+      this.videoChaptersKind = 'chapters'
 
       this.handleWatchProgress()
     },
@@ -1341,25 +1423,14 @@ export default defineComponent({
       return `data:application/dash+xml;charset=UTF-8,${encodeURIComponent(xmlData)}`
     },
 
-    createInvidiousDashManifest: async function (result, trustApiResponse = false) {
+    createInvidiousDashManifest: async function (result) {
       let url = `${this.currentInvidiousInstanceUrl}/api/manifest/dash/id/${this.videoId}`
 
       // If we are in Electron,
       // we can use YouTube.js' DASH manifest generator to generate the manifest.
       // Using YouTube.js' gives us support for multiple audio tracks (currently not supported by Invidious)
       if (process.env.SUPPORTS_LOCAL_API) {
-        const adaptiveFormats = await this.getAdaptiveFormatsInvidious(result, trustApiResponse)
-
-        let parsedManifest
-
-        if (!trustApiResponse) {
-          // Invidious' API response doesn't include the height and width (and fps and qualityLabel for AV1) of video streams
-          // so we need to extract them from Invidious' manifest
-          const response = await invidiousFetch(url)
-          const originalText = await response.text()
-
-          parsedManifest = new DOMParser().parseFromString(originalText, 'application/xml')
-        }
+        const adaptiveFormats = await this.getAdaptiveFormatsInvidious(result)
 
         /** @type {import('youtubei.js').Misc.Format[]} */
         const formats = []
@@ -1370,25 +1441,12 @@ export default defineComponent({
         let hasMultipleAudioTracks = false
 
         for (const format of adaptiveFormats) {
-          if (!trustApiResponse && format.type.startsWith('video/')) {
-            const representation = parsedManifest.querySelector(`Representation[id="${format.itag}"][bandwidth="${format.bitrate}"]`)
-
-            format.height = parseInt(representation.getAttribute('height'))
-            format.width = parseInt(representation.getAttribute('width'))
-            format.fps = parseInt(representation.getAttribute('frameRate'))
-
-            // the quality label is missing for AV1 formats
-            if (!format.qualityLabel) {
-              format.qualityLabel = format.width > format.height ? `${format.height}p` : `${format.width}p`
-            }
-          }
-
           const localFormat = convertInvidiousToLocalFormat(format)
 
           if (localFormat.has_audio) {
             audioFormats.push(localFormat)
 
-            if (localFormat.is_dubbed || localFormat.is_descriptive || localFormat.is_secondary) {
+            if (localFormat.is_dubbed || localFormat.is_descriptive || localFormat.is_secondary || localFormat.is_auto_dubbed) {
               hasMultipleAudioTracks = true
             }
           }
@@ -1398,7 +1456,7 @@ export default defineComponent({
 
         if (hasMultipleAudioTracks) {
           // match YouTube's local API response with English
-          const languageNames = new Intl.DisplayNames('en-US', { type: 'language' })
+          const languageNames = new Intl.DisplayNames('en-US', { type: 'language', languageDisplay: 'standard' })
           for (const format of audioFormats) {
             this.generateAudioTrackFieldInvidious(format, languageNames)
           }
@@ -1436,6 +1494,9 @@ export default defineComponent({
       } else if (format.is_secondary) {
         type = ' secondary'
         idNumber = 6
+      } else if (format.is_auto_dubbed) {
+        type = ''
+        idNumber = 10
       } else {
         type = ' alternative'
         idNumber = -1
@@ -1450,7 +1511,7 @@ export default defineComponent({
       }
     },
 
-    getAdaptiveFormatsInvidious: async function (existingInfoResult = null, trustApiResponse = false) {
+    getAdaptiveFormatsInvidious: async function (existingInfoResult = null) {
       let result
       if (existingInfoResult) {
         result = existingInfoResult
@@ -1458,32 +1519,25 @@ export default defineComponent({
         result = await invidiousGetVideoInformation(this.videoId)
       }
 
-      if (trustApiResponse) {
-        result.adaptiveFormats.forEach((format) => {
-          format.bitrate = parseInt(format.bitrate)
+      result.adaptiveFormats.forEach((format) => {
+        format.bitrate = parseInt(format.bitrate)
 
-          // audio streams don't have a size property
-          if (typeof format.size === 'string') {
-            const [stringWidth, stringHeight] = format.size.split('x')
+        // audio streams don't have a size property
+        if (typeof format.size === 'string') {
+          const [stringWidth, stringHeight] = format.size.split('x')
 
-            format.width = parseInt(stringWidth)
-            format.height = parseInt(stringHeight)
-          }
-        })
+          format.width = parseInt(stringWidth)
+          format.height = parseInt(stringHeight)
+        }
+      })
 
-        return result.adaptiveFormats
-      } else {
-        return filterInvidiousFormats(result.adaptiveFormats)
-          .map((format) => {
-            format.bitrate = parseInt(format.bitrate)
-            if (typeof format.resolution === 'string') {
-              format.height = parseInt(format.resolution.replace('p', ''))
-            }
-            return format
-          })
-      }
+      return result.adaptiveFormats
     },
 
+    /**
+     * @param {import('youtubei.js/dist/src/parser/classes/PlayerStoryboardSpec').StoryboardData} storyboardInfo
+     * @returns {string}
+     */
     createLocalStoryboardUrls: function (storyboardInfo) {
       const results = buildVTTFileLocally(storyboardInfo, this.videoLengthSeconds)
 
@@ -1503,7 +1557,7 @@ export default defineComponent({
       // otherwise just fallback to the FreeTube display language and hope that YouTube will be able to handle it
       if (!translationLanguage) {
         translationName = this.$t('Locale Name')
-        translationCode = userLanguages.values().next()
+        translationCode = userLanguages.values().next().value
       } else {
         translationName = translationLanguage.language_name.text
         translationCode = translationLanguage.language_code
@@ -1594,7 +1648,7 @@ export default defineComponent({
     },
 
     updateTitle: function () {
-      document.title = `${this.videoTitle} - ${packageDetails.productName}`
+      this.setAppTitle(`${this.videoTitle} - ${packageDetails.productName}`)
     },
 
     isHiddenVideo: function (forbiddenTitles, channelsHidden, video) {
@@ -1610,12 +1664,22 @@ export default defineComponent({
       this.updatePlaylistLastPlayedAt({ _id: playlist._id })
     },
 
+    resetAutoplayInterruptionTimeout() {
+      clearTimeout(this.autoplayInterruptionTimeout)
+      this.autoplayInterruptionTimeout = setTimeout(() => { this.blockVideoAutoplay = true }, this.defaultAutoplayInterruptionIntervalHours * 3_600_000)
+      this.blockVideoAutoplay = false
+    },
+
     ...mapActions([
       'updateHistory',
       'updateWatchProgress',
       'updateLastViewedPlaylist',
       'updatePlaylistLastPlayedAt',
       'updateSubscriptionDetails',
+    ]),
+
+    ...mapMutations([
+      'setAppTitle'
     ])
   }
 })
diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
index e9c60192c8322..42e2fd3d55bbf 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -106,7 +106,6 @@
     <ft-age-restricted
       v-if="(!isLoading && !isFamilyFriendly && showFamilyFriendlyOnly)"
       class="ageRestricted"
-      :is-video="true"
     />
     <div
       v-if="(isFamilyFriendly || !showFamilyFriendlyOnly)"
@@ -117,6 +116,7 @@
       <watch-video-info
         v-if="!isLoading"
         :id="videoId"
+        :is-unlisted="isUnlisted"
         :title="videoTitle"
         :channel-id="channelId"
         :channel-name="channelName"
@@ -150,6 +150,7 @@
         v-if="!hideChapters && !isLoading && videoChapters.length > 0"
         :chapters="videoChapters"
         :current-chapter-index="videoCurrentChapterIndex"
+        :kind="videoChaptersKind"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
         @timestamp-event="changeTimestamp"
@@ -162,7 +163,7 @@
         :class="{ theatreWatchVideo: useTheatreMode }"
         @timestamp-event="changeTimestamp"
       />
-      <watch-video-comments
+      <CommentSection
         v-if="!isLoading && !isLive && !hideComments"
         :id="videoId"
         class="watchVideo"
@@ -170,7 +171,6 @@
         :channel-thumbnail="channelThumbnail"
         :channel-name="channelName"
         :video-player-ready="videoPlayerLoaded"
-        :force-state="commentsEnabled ? null : 'noComment'"
         @timestamp-event="changeTimestamp"
       />
     </div>
@@ -179,7 +179,7 @@
       class="sidebarArea"
     >
       <watch-video-live-chat
-        v-if="!isLoading && !hideLiveChat && isLive"
+        v-if="!isLoading && !hideLiveChat && (isLive || isUpcoming)"
         :live-chat="liveChat"
         :video-id="videoId"
         :channel-id="channelId"
diff --git a/static/external-player-map.json b/static/external-player-map.json
index 81a976ece2421..1941d315a73b9 100644
--- a/static/external-player-map.json
+++ b/static/external-player-map.json
@@ -43,7 +43,7 @@
         "value": "iina",
         "cmdArguments": {
             "defaultExecutable": "iina",
-            "defaultCustomArguments": "--no-stdin",
+            "defaultCustomArguments": ["--no-stdin"],
             "supportsYtdlProtocol": true,
             "videoUrl": "",
             "playlistUrl": "",
diff --git a/static/geolocations/be.json b/static/geolocations/be.json
new file mode 100644
index 0000000000000..2ef170a09cce5
--- /dev/null
+++ b/static/geolocations/be.json
@@ -0,0 +1 @@
+[{"name":"Аб’ядн. Арабскія Эміраты","code":"AE"},{"name":"Азербайджан","code":"AZ"},{"name":"Алжыр","code":"DZ"},{"name":"Аман","code":"OM"},{"name":"Аргенціна","code":"AR"},{"name":"Аўстралія","code":"AU"},{"name":"Аўстрыя","code":"AT"},{"name":"Балгарыя","code":"BG"},{"name":"Балівія","code":"BO"},{"name":"Бангладэш","code":"BD"},{"name":"Бахрэйн","code":"BH"},{"name":"Беларусь","code":"BY"},{"name":"Бельгія","code":"BE"},{"name":"Боснія і Герцагавіна","code":"BA"},{"name":"Бразілія","code":"BR"},{"name":"В’етнам","code":"VN"},{"name":"Венгрыя","code":"HU"},{"name":"Венесуэла","code":"VE"},{"name":"Вялікабрытанія","code":"GB"},{"name":"Гана","code":"GH"},{"name":"Гандурас","code":"HN"},{"name":"Ганконг","code":"HK"},{"name":"Гватэмала","code":"GT"},{"name":"Германія","code":"DE"},{"name":"Грузія","code":"GE"},{"name":"Грэцыя","code":"GR"},{"name":"Дамініканская Рэспубліка","code":"DO"},{"name":"Данія","code":"DK"},{"name":"Егіпет","code":"EG"},{"name":"Емен","code":"YE"},{"name":"Зімбабвэ","code":"ZW"},{"name":"Злучаныя Штаты Амерыкі","code":"US"},{"name":"Іарданія","code":"JO"},{"name":"Ізраіль","code":"IL"},{"name":"Інданезія","code":"ID"},{"name":"Індыя","code":"IN"},{"name":"Ірак","code":"IQ"},{"name":"Ірландыя","code":"IE"},{"name":"Ісландыя","code":"IS"},{"name":"Іспанія","code":"ES"},{"name":"Італія","code":"IT"},{"name":"Казахстан","code":"KZ"},{"name":"Калумбія","code":"CO"},{"name":"Камбоджа","code":"KH"},{"name":"Канада","code":"CA"},{"name":"Катар","code":"QA"},{"name":"Кенія","code":"KE"},{"name":"Кіпр","code":"CY"},{"name":"Коста-Рыка","code":"CR"},{"name":"Кувейт","code":"KW"},{"name":"Лаос","code":"LA"},{"name":"Латвія","code":"LV"},{"name":"Ліван","code":"LB"},{"name":"Лівія","code":"LY"},{"name":"Літва","code":"LT"},{"name":"Ліхтэнштэйн","code":"LI"},{"name":"Люксембург","code":"LU"},{"name":"Малайзія","code":"MY"},{"name":"Малдова","code":"MD"},{"name":"Мальта","code":"MT"},{"name":"Марока","code":"MA"},{"name":"Мексіка","code":"MX"},{"name":"Нарвегія","code":"NO"},{"name":"Непал","code":"NP"},{"name":"Нігерыя","code":"NG"},{"name":"Нідэрланды","code":"NL"},{"name":"Нікарагуа","code":"NI"},{"name":"Новая Зеландыя","code":"NZ"},{"name":"Пакістан","code":"PK"},{"name":"Панама","code":"PA"},{"name":"Папуа – Новая Гвінея","code":"PG"},{"name":"Парагвай","code":"PY"},{"name":"Партугалія","code":"PT"},{"name":"Паўднёвая Афрыка","code":"ZA"},{"name":"Паўднёвая Карэя","code":"KR"},{"name":"Паўночная Македонія","code":"MK"},{"name":"Перу","code":"PE"},{"name":"Польшча","code":"PL"},{"name":"Пуэрта-Рыка","code":"PR"},{"name":"Расія","code":"RU"},{"name":"Румынія","code":"RO"},{"name":"Саудаўская Аравія","code":"SA"},{"name":"Сенегал","code":"SN"},{"name":"Сербія","code":"RS"},{"name":"Сінгапур","code":"SG"},{"name":"Славакія","code":"SK"},{"name":"Славенія","code":"SI"},{"name":"Тайвань","code":"TW"},{"name":"Тайланд","code":"TH"},{"name":"Танзанія","code":"TZ"},{"name":"Туніс","code":"TN"},{"name":"Турцыя","code":"TR"},{"name":"Уганда","code":"UG"},{"name":"Украіна","code":"UA"},{"name":"Уругвай","code":"UY"},{"name":"Філіпіны","code":"PH"},{"name":"Фінляндыя","code":"FI"},{"name":"Францыя","code":"FR"},{"name":"Харватыя","code":"HR"},{"name":"Чарнагорыя","code":"ME"},{"name":"Чылі","code":"CL"},{"name":"Чэхія","code":"CZ"},{"name":"Швейцарыя","code":"CH"},{"name":"Швецыя","code":"SE"},{"name":"Шры-Ланка","code":"LK"},{"name":"Эквадор","code":"EC"},{"name":"Эль-Сальвадор","code":"SV"},{"name":"Эстонія","code":"EE"},{"name":"Ямайка","code":"JM"},{"name":"Японія","code":"JP"}]
\ No newline at end of file
diff --git a/static/geolocations/fa.json b/static/geolocations/fa.json
index bdf1994d95680..1318b2381cddd 100644
--- a/static/geolocations/fa.json
+++ b/static/geolocations/fa.json
@@ -1 +1 @@
-[{"name":"آذربایجان","code":"AZ"},{"name":"آرژانتین","code":"AR"},{"name":"آفریقای جنوبی","code":"ZA"},{"name":"آلمان","code":"DE"},{"name":"اتریش","code":"AT"},{"name":"اردن","code":"JO"},{"name":"اسپانیا","code":"ES"},{"name":"استرالیا","code":"AU"},{"name":"استونی","code":"EE"},{"name":"اسرائیل","code":"IL"},{"name":"اسلواکی","code":"SK"},{"name":"اسلوونی","code":"SI"},{"name":"اکراین","code":"UA"},{"name":"اکوادور","code":"EC"},{"name":"الجزایر","code":"DZ"},{"name":"السالوادور","code":"SV"},{"name":"امارات متحدهٔ عربی","code":"AE"},{"name":"اندونزی","code":"ID"},{"name":"انگلستان","code":"GB"},{"name":"اوروگوئه","code":"UY"},{"name":"اوگاندا","code":"UG"},{"name":"ایالات متحده","code":"US"},{"name":"ایتالیا","code":"IT"},{"name":"ایرلند","code":"IE"},{"name":"ایسلند","code":"IS"},{"name":"بحرین","code":"BH"},{"name":"برزیل","code":"BR"},{"name":"بلاروس","code":"BY"},{"name":"بلژیک","code":"BE"},{"name":"بلغارستان","code":"BG"},{"name":"بنگلادش","code":"BD"},{"name":"بوسنی و هرزگوین","code":"BA"},{"name":"بولیوی","code":"BO"},{"name":"پاپوآ گینه نو","code":"PG"},{"name":"پاراگوئه","code":"PY"},{"name":"پاکستان","code":"PK"},{"name":"پاناما","code":"PA"},{"name":"پرتغالی","code":"PT"},{"name":"پرو","code":"PE"},{"name":"پورتوریکو","code":"PR"},{"name":"تانزانیا","code":"TZ"},{"name":"تایلند","code":"TH"},{"name":"تایوان","code":"TW"},{"name":"ترکیه","code":"TR"},{"name":"تونس","code":"TN"},{"name":"جامائیکا","code":"JM"},{"name":"جمهوری چک","code":"CZ"},{"name":"جمهوری دومینیکن","code":"DO"},{"name":"دانمارک","code":"DK"},{"name":"روسیه","code":"RU"},{"name":"رومانی","code":"RO"},{"name":"زیمبابوه","code":"ZW"},{"name":"ژاپن","code":"JP"},{"name":"سری لانکا","code":"LK"},{"name":"سنگاپور","code":"SG"},{"name":"سنگال","code":"SN"},{"name":"سوئد","code":"SE"},{"name":"سوئیس","code":"CH"},{"name":"شیلی","code":"CL"},{"name":"صربستان","code":"RS"},{"name":"عراق","code":"IQ"},{"name":"عربستان سعودی","code":"SA"},{"name":"عمان","code":"OM"},{"name":"غنا","code":"GH"},{"name":"فرانسه","code":"FR"},{"name":"فنلاند","code":"FI"},{"name":"فیلیپین","code":"PH"},{"name":"قبرس","code":"CY"},{"name":"قزاقستان","code":"KZ"},{"name":"قطر","code":"QA"},{"name":"کاستاریکا","code":"CR"},{"name":"کانادا","code":"CA"},{"name":"کرواسی","code":"HR"},{"name":"کرهٔ جنوبی","code":"KR"},{"name":"کلمبیا","code":"CO"},{"name":"کمبوجیه","code":"KH"},{"name":"کنیا","code":"KE"},{"name":"کویت","code":"KW"},{"name":"گرجستان","code":"GE"},{"name":"گواتمالا","code":"GT"},{"name":"لائوس","code":"LA"},{"name":"لبنان","code":"LB"},{"name":"لتونی","code":"LV"},{"name":"لوکزامبورگ","code":"LU"},{"name":"لهستان","code":"PL"},{"name":"لیبی","code":"LY"},{"name":"لیتوانی","code":"LT"},{"name":"لیختن اشتاین","code":"LI"},{"name":"مالت","code":"MT"},{"name":"مالزی","code":"MY"},{"name":"مجارستان","code":"HU"},{"name":"مراکش","code":"MA"},{"name":"مصر","code":"EG"},{"name":"مقدونیه شمالی","code":"MK"},{"name":"مکزیک","code":"MX"},{"name":"مولداوی","code":"MD"},{"name":"مونته‌نگرو","code":"ME"},{"name":"نپال","code":"NP"},{"name":"نروژ","code":"NO"},{"name":"نیجریه","code":"NG"},{"name":"نیکاراگوئه","code":"NI"},{"name":"نیوزلند","code":"NZ"},{"name":"ونزوئلا","code":"VE"},{"name":"ویتنام","code":"VN"},{"name":"هلند","code":"NL"},{"name":"هند","code":"IN"},{"name":"هندوراس","code":"HN"},{"name":"هنگ کنگ","code":"HK"},{"name":"یمن","code":"YE"},{"name":"یونان","code":"GR"}]
\ No newline at end of file
+[{"name":"آذربایجان","code":"AZ"},{"name":"آرژانتین","code":"AR"},{"name":"آلمان","code":"DE"},{"name":"اتریش","code":"AT"},{"name":"اردن","code":"JO"},{"name":"اسپانیا","code":"ES"},{"name":"استرالیا","code":"AU"},{"name":"استونی","code":"EE"},{"name":"اسرائیل","code":"IL"},{"name":"اسلواکی","code":"SK"},{"name":"اسلوونی","code":"SI"},{"name":"افریقای جنوبی","code":"ZA"},{"name":"اکراین","code":"UA"},{"name":"اکوادور","code":"EC"},{"name":"الجزایر","code":"DZ"},{"name":"السالوادور","code":"SV"},{"name":"امارات متحدهٔ عربی","code":"AE"},{"name":"اندونزی","code":"ID"},{"name":"انگلستان","code":"GB"},{"name":"اوروگوئه","code":"UY"},{"name":"اوگاندا","code":"UG"},{"name":"ایالات متحده","code":"US"},{"name":"ایتالیا","code":"IT"},{"name":"ایرلند","code":"IE"},{"name":"ایسلند","code":"IS"},{"name":"بحرین","code":"BH"},{"name":"برزیل","code":"BR"},{"name":"بلاروس","code":"BY"},{"name":"بلژیک","code":"BE"},{"name":"بلغارستان","code":"BG"},{"name":"بنگلادش","code":"BD"},{"name":"بوسنی و هرزگوین","code":"BA"},{"name":"بولیوی","code":"BO"},{"name":"پاپوآ گینه نو","code":"PG"},{"name":"پاراگوئه","code":"PY"},{"name":"پاکستان","code":"PK"},{"name":"پاناما","code":"PA"},{"name":"پرتغالی","code":"PT"},{"name":"پرو","code":"PE"},{"name":"پورتوریکو","code":"PR"},{"name":"تانزانیا","code":"TZ"},{"name":"تایلند","code":"TH"},{"name":"تایوان","code":"TW"},{"name":"ترکیه","code":"TR"},{"name":"تونس","code":"TN"},{"name":"جامائیکا","code":"JM"},{"name":"جمهوری چک","code":"CZ"},{"name":"جمهوری دومینیکن","code":"DO"},{"name":"دانمارک","code":"DK"},{"name":"روسیه","code":"RU"},{"name":"رومانی","code":"RO"},{"name":"زیمبابوه","code":"ZW"},{"name":"ژاپن","code":"JP"},{"name":"سری لانکا","code":"LK"},{"name":"سنگاپور","code":"SG"},{"name":"سنگال","code":"SN"},{"name":"سوئد","code":"SE"},{"name":"سوئیس","code":"CH"},{"name":"شیلی","code":"CL"},{"name":"صربستان","code":"RS"},{"name":"عراق","code":"IQ"},{"name":"عربستان سعودی","code":"SA"},{"name":"عمان","code":"OM"},{"name":"غنا","code":"GH"},{"name":"فرانسه","code":"FR"},{"name":"فنلاند","code":"FI"},{"name":"فیلیپین","code":"PH"},{"name":"قبرس","code":"CY"},{"name":"قزاقستان","code":"KZ"},{"name":"قطر","code":"QA"},{"name":"کاستاریکا","code":"CR"},{"name":"کانادا","code":"CA"},{"name":"کرواسی","code":"HR"},{"name":"کرهٔ جنوبی","code":"KR"},{"name":"کلمبیا","code":"CO"},{"name":"کمبوجیه","code":"KH"},{"name":"کنیا","code":"KE"},{"name":"کویت","code":"KW"},{"name":"گرجستان","code":"GE"},{"name":"گواتمالا","code":"GT"},{"name":"لائوس","code":"LA"},{"name":"لبنان","code":"LB"},{"name":"لتونی","code":"LV"},{"name":"لوکزامبورگ","code":"LU"},{"name":"لهستان","code":"PL"},{"name":"لیبی","code":"LY"},{"name":"لیتوانی","code":"LT"},{"name":"لیختن اشتاین","code":"LI"},{"name":"مالت","code":"MT"},{"name":"مالزی","code":"MY"},{"name":"مجارستان","code":"HU"},{"name":"مراکش","code":"MA"},{"name":"مصر","code":"EG"},{"name":"مقدونیه شمالی","code":"MK"},{"name":"مکزیک","code":"MX"},{"name":"مولداوی","code":"MD"},{"name":"مونته‌نگرو","code":"ME"},{"name":"نپال","code":"NP"},{"name":"نروژ","code":"NO"},{"name":"نیجریه","code":"NG"},{"name":"نیکاراگوئه","code":"NI"},{"name":"نیوزلند","code":"NZ"},{"name":"ونزوئلا","code":"VE"},{"name":"ویتنام","code":"VN"},{"name":"هلند","code":"NL"},{"name":"هند","code":"IN"},{"name":"هندوراس","code":"HN"},{"name":"هنگ کنگ","code":"HK"},{"name":"یمن","code":"YE"},{"name":"یونان","code":"GR"}]
\ No newline at end of file
diff --git a/static/geolocations/pt-PT.json b/static/geolocations/pt-PT.json
index bbf84f1af9695..f1fcb9486180b 100644
--- a/static/geolocations/pt-PT.json
+++ b/static/geolocations/pt-PT.json
@@ -1 +1 @@
-[{"name":"África do Sul","code":"ZA"},{"name":"Alemanha","code":"DE"},{"name":"Arábia Saudita","code":"SA"},{"name":"Argélia","code":"DZ"},{"name":"Argentina","code":"AR"},{"name":"Austrália","code":"AU"},{"name":"Áustria","code":"AT"},{"name":"Azerbaijão","code":"AZ"},{"name":"Bangladeche","code":"BD"},{"name":"Barém","code":"BH"},{"name":"Bélgica","code":"BE"},{"name":"Bielorrússia","code":"BY"},{"name":"Bolívia","code":"BO"},{"name":"Bósnia-Herzegovina","code":"BA"},{"name":"Brasil","code":"BR"},{"name":"Bulgária","code":"BG"},{"name":"Camboja","code":"KH"},{"name":"Canadá","code":"CA"},{"name":"Catar","code":"QA"},{"name":"Cazaquistão","code":"KZ"},{"name":"Chéquia","code":"CZ"},{"name":"Chile","code":"CL"},{"name":"Chipre","code":"CY"},{"name":"Colômbia","code":"CO"},{"name":"Coreia do Sul","code":"KR"},{"name":"Costa Rica","code":"CR"},{"name":"Croácia","code":"HR"},{"name":"Dinamarca","code":"DK"},{"name":"Egito","code":"EG"},{"name":"El Salvador","code":"SV"},{"name":"Emirados Árabes Unidos","code":"AE"},{"name":"Equador","code":"EC"},{"name":"Eslováquia","code":"SK"},{"name":"Eslovénia","code":"SI"},{"name":"Espanha","code":"ES"},{"name":"Estados Unidos","code":"US"},{"name":"Estónia","code":"EE"},{"name":"Filipinas","code":"PH"},{"name":"Finlândia","code":"FI"},{"name":"França","code":"FR"},{"name":"Gana","code":"GH"},{"name":"Geórgia","code":"GE"},{"name":"Grécia","code":"GR"},{"name":"Guatemala","code":"GT"},{"name":"Holanda","code":"NL"},{"name":"Honduras","code":"HN"},{"name":"Hong Kong","code":"HK"},{"name":"Hungria","code":"HU"},{"name":"Iémen","code":"YE"},{"name":"Índia","code":"IN"},{"name":"Indonésia","code":"ID"},{"name":"Iraque","code":"IQ"},{"name":"Irlanda","code":"IE"},{"name":"Islândia","code":"IS"},{"name":"Israel","code":"IL"},{"name":"Itália","code":"IT"},{"name":"Jamaica","code":"JM"},{"name":"Japão","code":"JP"},{"name":"Jordânia","code":"JO"},{"name":"Kuwait","code":"KW"},{"name":"Laos","code":"LA"},{"name":"Letónia","code":"LV"},{"name":"Líbano","code":"LB"},{"name":"Líbia","code":"LY"},{"name":"Lienchtenstein","code":"LI"},{"name":"Lituânia","code":"LT"},{"name":"Luxemburgo","code":"LU"},{"name":"Macedónia do Norte","code":"MK"},{"name":"Malásia","code":"MY"},{"name":"Malta","code":"MT"},{"name":"Marrocos","code":"MA"},{"name":"México","code":"MX"},{"name":"Moldávia","code":"MD"},{"name":"Montenegro","code":"ME"},{"name":"Nepal","code":"NP"},{"name":"Nicarágua","code":"NI"},{"name":"Nigéria","code":"NG"},{"name":"Noruega","code":"NO"},{"name":"Nova Zelândia","code":"NZ"},{"name":"Omã","code":"OM"},{"name":"Panamá","code":"PA"},{"name":"Papuásia-Nova Guiné","code":"PG"},{"name":"Paquistão","code":"PK"},{"name":"Paraguai","code":"PY"},{"name":"Peru","code":"PE"},{"name":"Polónia","code":"PL"},{"name":"Porto Rico","code":"PR"},{"name":"Portugal","code":"PT"},{"name":"Quénia","code":"KE"},{"name":"Reino Unido","code":"GB"},{"name":"República Dominicana","code":"DO"},{"name":"Roménia","code":"RO"},{"name":"Rússia","code":"RU"},{"name":"Senegal","code":"SN"},{"name":"Sérvia","code":"RS"},{"name":"Singapura","code":"SG"},{"name":"Sri Lanka","code":"LK"},{"name":"Suécia","code":"SE"},{"name":"Suíça","code":"CH"},{"name":"Tailândia","code":"TH"},{"name":"Taiwan","code":"TW"},{"name":"Tanzânia","code":"TZ"},{"name":"Tunísia","code":"TN"},{"name":"Turquia","code":"TR"},{"name":"Ucrânia","code":"UA"},{"name":"Uganda","code":"UG"},{"name":"Uruguai","code":"UY"},{"name":"Venezuela","code":"VE"},{"name":"Vietname","code":"VN"},{"name":"Zimbabué","code":"ZW"}]
\ No newline at end of file
+[{"name":"África do Sul","code":"ZA"},{"name":"Alemanha","code":"DE"},{"name":"Arábia Saudita","code":"SA"},{"name":"Argélia","code":"DZ"},{"name":"Argentina","code":"AR"},{"name":"Austrália","code":"AU"},{"name":"Áustria","code":"AT"},{"name":"Azerbaijão","code":"AZ"},{"name":"Bangladexe","code":"BD"},{"name":"Barém","code":"BH"},{"name":"Bélgica","code":"BE"},{"name":"Bielorrússia","code":"BY"},{"name":"Bolívia","code":"BO"},{"name":"Bósnia-Herzegovina","code":"BA"},{"name":"Brasil","code":"BR"},{"name":"Bulgária","code":"BG"},{"name":"Camboja","code":"KH"},{"name":"Canadá","code":"CA"},{"name":"Catar","code":"QA"},{"name":"Cazaquistão","code":"KZ"},{"name":"Chéquia","code":"CZ"},{"name":"Chile","code":"CL"},{"name":"Chipre","code":"CY"},{"name":"Colômbia","code":"CO"},{"name":"Coreia do Sul","code":"KR"},{"name":"Costa Rica","code":"CR"},{"name":"Croácia","code":"HR"},{"name":"Dinamarca","code":"DK"},{"name":"Egito","code":"EG"},{"name":"El Salvador","code":"SV"},{"name":"Emirados Árabes Unidos","code":"AE"},{"name":"Equador","code":"EC"},{"name":"Eslováquia","code":"SK"},{"name":"Eslovénia","code":"SI"},{"name":"Espanha","code":"ES"},{"name":"Estados Unidos","code":"US"},{"name":"Estónia","code":"EE"},{"name":"Filipinas","code":"PH"},{"name":"Finlândia","code":"FI"},{"name":"França","code":"FR"},{"name":"Gana","code":"GH"},{"name":"Geórgia","code":"GE"},{"name":"Grécia","code":"GR"},{"name":"Guatemala","code":"GT"},{"name":"Holanda","code":"NL"},{"name":"Honduras","code":"HN"},{"name":"Hong Kong","code":"HK"},{"name":"Hungria","code":"HU"},{"name":"Iémen","code":"YE"},{"name":"Índia","code":"IN"},{"name":"Indonésia","code":"ID"},{"name":"Iraque","code":"IQ"},{"name":"Irlanda","code":"IE"},{"name":"Islândia","code":"IS"},{"name":"Israel","code":"IL"},{"name":"Itália","code":"IT"},{"name":"Jamaica","code":"JM"},{"name":"Japão","code":"JP"},{"name":"Jordânia","code":"JO"},{"name":"Kuwait","code":"KW"},{"name":"Laos","code":"LA"},{"name":"Letónia","code":"LV"},{"name":"Líbano","code":"LB"},{"name":"Líbia","code":"LY"},{"name":"Lienchtenstein","code":"LI"},{"name":"Lituânia","code":"LT"},{"name":"Luxemburgo","code":"LU"},{"name":"Macedónia do Norte","code":"MK"},{"name":"Malásia","code":"MY"},{"name":"Malta","code":"MT"},{"name":"Marrocos","code":"MA"},{"name":"México","code":"MX"},{"name":"Moldávia","code":"MD"},{"name":"Montenegro","code":"ME"},{"name":"Nepal","code":"NP"},{"name":"Nicarágua","code":"NI"},{"name":"Nigéria","code":"NG"},{"name":"Noruega","code":"NO"},{"name":"Nova Zelândia","code":"NZ"},{"name":"Omã","code":"OM"},{"name":"Panamá","code":"PA"},{"name":"Papuásia-Nova Guiné","code":"PG"},{"name":"Paquistão","code":"PK"},{"name":"Paraguai","code":"PY"},{"name":"Peru","code":"PE"},{"name":"Polónia","code":"PL"},{"name":"Porto Rico","code":"PR"},{"name":"Portugal","code":"PT"},{"name":"Quénia","code":"KE"},{"name":"Reino Unido","code":"GB"},{"name":"República Dominicana","code":"DO"},{"name":"Roménia","code":"RO"},{"name":"Rússia","code":"RU"},{"name":"Senegal","code":"SN"},{"name":"Sérvia","code":"RS"},{"name":"Singapura","code":"SG"},{"name":"Sri Lanka","code":"LK"},{"name":"Suécia","code":"SE"},{"name":"Suíça","code":"CH"},{"name":"Tailândia","code":"TH"},{"name":"Taiwan","code":"TW"},{"name":"Tanzânia","code":"TZ"},{"name":"Tunísia","code":"TN"},{"name":"Turquia","code":"TR"},{"name":"Ucrânia","code":"UA"},{"name":"Uganda","code":"UG"},{"name":"Uruguai","code":"UY"},{"name":"Venezuela","code":"VE"},{"name":"Vietname","code":"VN"},{"name":"Zimbabué","code":"ZW"}]
\ No newline at end of file
diff --git a/static/geolocations/zh-TW.json b/static/geolocations/zh-TW.json
index 72c4510db36c5..34c2d9b01f9ba 100644
--- a/static/geolocations/zh-TW.json
+++ b/static/geolocations/zh-TW.json
@@ -1 +1 @@
-[{"name":"土耳其","code":"TR"},{"name":"丹麥","code":"DK"},{"name":"厄瓜多","code":"EC"},{"name":"巴布亞紐幾內亞","code":"PG"},{"name":"巴西","code":"BR"},{"name":"巴拉圭","code":"PY"},{"name":"巴林","code":"BH"},{"name":"巴拿馬","code":"PA"},{"name":"巴基斯坦","code":"PK"},{"name":"日本","code":"JP"},{"name":"比利時","code":"BE"},{"name":"牙買加","code":"JM"},{"name":"以色列","code":"IL"},{"name":"加拿大","code":"CA"},{"name":"北馬其頓","code":"MK"},{"name":"卡達","code":"QA"},{"name":"台灣","code":"TW"},{"name":"尼加拉瓜","code":"NI"},{"name":"尼泊爾","code":"NP"},{"name":"瓜地馬拉","code":"GT"},{"name":"白俄羅斯","code":"BY"},{"name":"立陶宛","code":"LT"},{"name":"伊拉克","code":"IQ"},{"name":"冰島","code":"IS"},{"name":"列支敦士登","code":"LI"},{"name":"匈牙利","code":"HU"},{"name":"印尼","code":"ID"},{"name":"印度","code":"IN"},{"name":"多明尼加共和國","code":"DO"},{"name":"西班牙","code":"ES"},{"name":"克羅埃西亞","code":"HR"},{"name":"利比亞","code":"LY"},{"name":"宏都拉斯","code":"HN"},{"name":"希臘","code":"GR"},{"name":"沙烏地阿拉伯","code":"SA"},{"name":"辛巴威","code":"ZW"},{"name":"亞賽拜然","code":"AZ"},{"name":"坦尚尼亞","code":"TZ"},{"name":"奈及利亞","code":"NG"},{"name":"委內瑞拉","code":"VE"},{"name":"孟加拉","code":"BD"},{"name":"拉脫維亞","code":"LV"},{"name":"法國","code":"FR"},{"name":"波士尼亞-赫塞哥維納","code":"BA"},{"name":"波多黎克","code":"PR"},{"name":"波蘭","code":"PL"},{"name":"肯亞","code":"KE"},{"name":"芬蘭","code":"FI"},{"name":"阿拉伯聯合大公國","code":"AE"},{"name":"阿根廷","code":"AR"},{"name":"阿曼","code":"OM"},{"name":"阿爾及利亞","code":"DZ"},{"name":"俄羅斯","code":"RU"},{"name":"保加利亞","code":"BG"},{"name":"南非","code":"ZA"},{"name":"南韓","code":"KR"},{"name":"哈薩克","code":"KZ"},{"name":"柬埔寨","code":"KH"},{"name":"玻利維亞","code":"BO"},{"name":"科威特","code":"KW"},{"name":"突尼西亞","code":"TN"},{"name":"約旦","code":"JO"},{"name":"美國","code":"US"},{"name":"英國","code":"GB"},{"name":"迦納","code":"GH"},{"name":"香港","code":"HK"},{"name":"哥倫比亞","code":"CO"},{"name":"哥斯大黎加","code":"CR"},{"name":"埃及","code":"EG"},{"name":"挪威","code":"NO"},{"name":"泰國","code":"TH"},{"name":"烏干達","code":"UG"},{"name":"烏克蘭","code":"UA"},{"name":"烏拉圭","code":"UY"},{"name":"祕魯","code":"PE"},{"name":"紐西蘭","code":"NZ"},{"name":"馬來西亞","code":"MY"},{"name":"馬爾他","code":"MT"},{"name":"捷克","code":"CZ"},{"name":"荷蘭","code":"NL"},{"name":"喬治亞","code":"GE"},{"name":"斯里蘭卡","code":"LK"},{"name":"斯洛伐克","code":"SK"},{"name":"斯洛維尼亞","code":"SI"},{"name":"智利","code":"CL"},{"name":"菲律賓","code":"PH"},{"name":"越南","code":"VN"},{"name":"塞內加爾","code":"SN"},{"name":"塞爾維亞","code":"RS"},{"name":"奧地利","code":"AT"},{"name":"愛沙尼亞","code":"EE"},{"name":"愛爾蘭","code":"IE"},{"name":"新加坡","code":"SG"},{"name":"瑞士","code":"CH"},{"name":"瑞典","code":"SE"},{"name":"義大利","code":"IT"},{"name":"葉門","code":"YE"},{"name":"葡萄牙","code":"PT"},{"name":"蒙特內哥羅","code":"ME"},{"name":"寮國","code":"LA"},{"name":"德國","code":"DE"},{"name":"摩洛哥","code":"MA"},{"name":"摩爾多瓦","code":"MD"},{"name":"黎巴嫩","code":"LB"},{"name":"墨西哥","code":"MX"},{"name":"澳洲","code":"AU"},{"name":"盧森堡","code":"LU"},{"name":"賽普勒斯","code":"CY"},{"name":"薩爾瓦多","code":"SV"},{"name":"羅馬尼亞","code":"RO"}]
\ No newline at end of file
+[{"name":"土耳其","code":"TR"},{"name":"丹麥","code":"DK"},{"name":"厄瓜多","code":"EC"},{"name":"巴布亞紐幾內亞","code":"PG"},{"name":"巴西","code":"BR"},{"name":"巴拉圭","code":"PY"},{"name":"巴林","code":"BH"},{"name":"巴拿馬","code":"PA"},{"name":"巴基斯坦","code":"PK"},{"name":"日本","code":"JP"},{"name":"比利時","code":"BE"},{"name":"牙買加","code":"JM"},{"name":"以色列","code":"IL"},{"name":"加拿大","code":"CA"},{"name":"北馬其頓","code":"MK"},{"name":"卡達","code":"QA"},{"name":"台灣","code":"TW"},{"name":"尼加拉瓜","code":"NI"},{"name":"尼泊爾","code":"NP"},{"name":"瓜地馬拉","code":"GT"},{"name":"白俄羅斯","code":"BY"},{"name":"立陶宛","code":"LT"},{"name":"伊拉克","code":"IQ"},{"name":"冰島","code":"IS"},{"name":"列支敦士登","code":"LI"},{"name":"匈牙利","code":"HU"},{"name":"印尼","code":"ID"},{"name":"印度","code":"IN"},{"name":"多明尼加共和國","code":"DO"},{"name":"西班牙","code":"ES"},{"name":"克羅埃西亞","code":"HR"},{"name":"利比亞","code":"LY"},{"name":"宏都拉斯","code":"HN"},{"name":"希臘","code":"GR"},{"name":"沙烏地阿拉伯","code":"SA"},{"name":"辛巴威","code":"ZW"},{"name":"亞賽拜然","code":"AZ"},{"name":"坦尚尼亞","code":"TZ"},{"name":"奈及利亞","code":"NG"},{"name":"委內瑞拉","code":"VE"},{"name":"孟加拉","code":"BD"},{"name":"拉脫維亞","code":"LV"},{"name":"法國","code":"FR"},{"name":"波士尼亞-赫塞哥維納","code":"BA"},{"name":"波多黎克","code":"PR"},{"name":"波蘭","code":"PL"},{"name":"肯亞","code":"KE"},{"name":"芬蘭","code":"FI"},{"name":"阿拉伯聯合大公國","code":"AE"},{"name":"阿根廷","code":"AR"},{"name":"阿曼","code":"OM"},{"name":"阿爾及利亞","code":"DZ"},{"name":"俄羅斯","code":"RU"},{"name":"保加利亞","code":"BG"},{"name":"南非","code":"ZA"},{"name":"南韓","code":"KR"},{"name":"哈薩克","code":"KZ"},{"name":"柬埔寨","code":"KH"},{"name":"玻利維亞","code":"BO"},{"name":"科威特","code":"KW"},{"name":"突尼西亞","code":"TN"},{"name":"約旦","code":"JO"},{"name":"美國","code":"US"},{"name":"英國","code":"GB"},{"name":"迦納","code":"GH"},{"name":"香港","code":"HK"},{"name":"哥倫比亞","code":"CO"},{"name":"哥斯大黎加","code":"CR"},{"name":"埃及","code":"EG"},{"name":"挪威","code":"NO"},{"name":"泰國","code":"TH"},{"name":"烏干達","code":"UG"},{"name":"烏克蘭","code":"UA"},{"name":"烏拉圭","code":"UY"},{"name":"秘魯","code":"PE"},{"name":"紐西蘭","code":"NZ"},{"name":"馬來西亞","code":"MY"},{"name":"馬爾他","code":"MT"},{"name":"捷克","code":"CZ"},{"name":"荷蘭","code":"NL"},{"name":"喬治亞","code":"GE"},{"name":"斯里蘭卡","code":"LK"},{"name":"斯洛伐克","code":"SK"},{"name":"斯洛維尼亞","code":"SI"},{"name":"智利","code":"CL"},{"name":"菲律賓","code":"PH"},{"name":"越南","code":"VN"},{"name":"塞內加爾","code":"SN"},{"name":"塞爾維亞","code":"RS"},{"name":"奧地利","code":"AT"},{"name":"愛沙尼亞","code":"EE"},{"name":"愛爾蘭","code":"IE"},{"name":"新加坡","code":"SG"},{"name":"瑞士","code":"CH"},{"name":"瑞典","code":"SE"},{"name":"義大利","code":"IT"},{"name":"葉門","code":"YE"},{"name":"葡萄牙","code":"PT"},{"name":"蒙特內哥羅","code":"ME"},{"name":"寮國","code":"LA"},{"name":"德國","code":"DE"},{"name":"摩洛哥","code":"MA"},{"name":"摩爾多瓦","code":"MD"},{"name":"黎巴嫩","code":"LB"},{"name":"墨西哥","code":"MX"},{"name":"澳洲","code":"AU"},{"name":"盧森堡","code":"LU"},{"name":"賽普勒斯","code":"CY"},{"name":"薩爾瓦多","code":"SV"},{"name":"羅馬尼亞","code":"RO"}]
\ No newline at end of file
diff --git a/static/locales/activeLocales.json b/static/locales/activeLocales.json
index 0a0357af8031d..4e1768c3febb2 100644
--- a/static/locales/activeLocales.json
+++ b/static/locales/activeLocales.json
@@ -2,6 +2,7 @@
   "en-US",
   "en-GB",
   "ar",
+  "be",
   "bg",
   "ca",
   "cs",
diff --git a/static/locales/af.yaml b/static/locales/af.yaml
index 363ddb7dd0051..4eac48c2a7a28 100644
--- a/static/locales/af.yaml
+++ b/static/locales/af.yaml
@@ -1,15 +1,17 @@
 # Put the name of your locale in the same language
-Locale Name: ''
+Locale Name: 'Afrikaans'
 # Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >
+'This part of the app is not ready yet. Come back later when progress has been made.': >-
+  Hierdie gedeelte van die toep is nog nie gereed nie. Kom later terug wanneer vordering
+  gemaak is.
 
 # Webkit Menu Bar
-File: ''
-New Window: ''
-Preferences: ''
-Quit: ''
-Edit: ''
-Undo: ''
+File: 'Lêer'
+New Window: 'Nuwe venster'
+Preferences: 'Voorkeure'
+Quit: 'Sluit'
+Edit: 'Wysig'
+Undo: 'Ontdoen'
 Redo: ''
 Cut: ''
 Copy: ''
@@ -135,8 +137,6 @@ Channels:
   Search bar placeholder: ''
   Count: ''
   Empty: ''
-  Unsubscribe: ''
-  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
   Trending: ''
@@ -152,8 +152,6 @@ Feed:
 Playlists: ''
 User Playlists:
   Your Playlists: ''
-  Playlist Message: ''
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   You have no playlists. Click on the create new playlist button to create a new one.: ''
   Empty Search Message: ''
   Search bar placeholder: ''
@@ -261,7 +259,6 @@ History:
 Settings:
   # On Settings Page
   Settings: ''
-  Expand All Settings Sections: ''
   Sort Settings Sections (A-Z): ''
   The app needs to restart for changes to take effect. Restart and apply change?: ''
   General Settings:
@@ -454,9 +451,7 @@ Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
-    Manage Subscriptions: ''
     Fetch Automatically: ''
-    Only Show Latest Video for Each Channel: ''
     Confirm Before Unsubscribing: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -510,7 +505,6 @@ Settings:
     Subscription File: ''
     History File: ''
     Playlist File: ''
-    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: ''
     Export YouTube: ''
@@ -544,494 +538,590 @@ Settings:
     Proxy Settings: ''
     Enable Tor / Proxy: ''
     Proxy Protocol: ''
-    Proxy Host: ''
-    Proxy Port Number: ''
-    Clicking on Test Proxy will send a request to: ''
-    Test Proxy: ''
-    Your Info: ''
-    Ip: ''
-    Country: ''
-    Region: ''
-    City: ''
-    Error getting network information. Is your proxy configured properly?: ''
+    Proxy Host: 'Instaangasheer'
+    Proxy Port Number: 'Instaanpoortnommer'
+    Clicking on Test Proxy will send a request to: 'Deur op Toets instaanbediener
+      te klik word ’n versoek verstuur na'
+    Test Proxy: 'Toets instaanbediener'
+    Your Info: 'U inligting'
+    Ip: 'IP'
+    Country: 'Land'
+    Region: 'Streek'
+    City: 'Stad'
+    Error getting network information. Is your proxy configured properly?: 'Fout by
+      ophaal van netwerkinligting. Is u instaanbediener korrek opgestel?'
   SponsorBlock Settings:
-    SponsorBlock Settings: ''
-    Enable SponsorBlock: ''
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
-    Notify when sponsor segment is skipped: ''
-    UseDeArrowTitles: ''
-    UseDeArrowThumbnails: ''
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': ''
+    SponsorBlock Settings: 'SponsorBlock'
+    Enable SponsorBlock: 'Aktiveer SponsorBlock'
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'SponsorBlock API-bronadres
+      (verstek is https://sponsor.ajay.app)'
+    Notify when sponsor segment is skipped: 'Stel my in kennis wanneer geborgde segment
+      oorgeslaan is'
+    UseDeArrowTitles: 'Gebruik DeArrow-videotitels'
+    UseDeArrowThumbnails: 'Gebruik DeArrow vir duimnaels'
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': 'DeArrow-duinmaelgenereerder
+      API-bronadres (verstek is https://dearrow-thumb.ajay.app)'
     Skip Options:
-      Skip Option: ''
-      Auto Skip: ''
-      Show In Seek Bar: ''
-      Prompt To Skip: ''
-      Do Nothing: ''
-    Category Color: ''
+      Skip Option: 'Slaan opsie oor'
+      Auto Skip: 'Slaan outomaties oor'
+      Show In Seek Bar: 'Toon in soekbalk'
+      Prompt To Skip: 'Vra om oor te slaan'
+      Do Nothing: 'Doen niks'
+    Category Color: 'Kategoriekleur'
   Parental Control Settings:
-    Parental Control Settings: ''
-    Hide Unsubscribe Button: ''
-    Show Family Friendly Only: ''
-    Hide Search Bar: ''
+    Parental Control Settings: 'Ouerbeheer'
+    Hide Unsubscribe Button: 'Versteek uittekenknop'
+    Show Family Friendly Only: 'Toon slegs gesinsvriendelike inhoud'
+    Hide Search Bar: 'Versteek soekbalk'
   Download Settings:
-    Download Settings: ''
-    Ask Download Path: ''
-    Choose Path: ''
-    Download Behavior: ''
-    Download in app: ''
-    Open in web browser: ''
+    Download Settings: 'Laai af'
+    Ask Download Path: 'Vra vir aflaaipad'
+    Choose Path: 'Kies pad'
+    Download Behavior: 'Aflaaigedrag'
+    Download in app: 'Laai in toep af'
+    Open in web browser: 'Open in webblaaier'
   Experimental Settings:
-    Experimental Settings: ''
-    Warning: ''
-    Replace HTTP Cache: ''
+    Experimental Settings: 'Eksperimenteel'
+    Warning: 'Dit is eksperimentele instellings wat die toep kan laat uitbom indien
+      geaktiveer. Dit word aanbeveel om rugsteune te maak. Gebruik op eie risiko!'
+    Replace HTTP Cache: 'Vervang HTTP-kasgeheue'
   Password Dialog:
-    Password: ''
-    Enter Password To Unlock: ''
-    Password Incorrect: ''
-    Unlock: ''
+    Password: 'Wagwoord'
+    Enter Password To Unlock: 'Voer wagwoord in om instellings te ontgrendel'
+    Password Incorrect: 'Verkeerde wagwoord'
+    Unlock: 'Ontgrendel'
   Password Settings:
-    Password Settings: ''
-    Set Password To Prevent Access: ''
-    Set Password: ''
-    Remove Password: ''
+    Password Settings: 'Wagwoord'
+    Set Password To Prevent Access: 'Stel ’n wagwoord in om toegang tot instellings
+      te voorkom'
+    Set Password: 'Stel wagwoord in'
+    Remove Password: 'Verwyder wagwoord'
 About:
   #On About page
-  About: ''
-  Beta: ''
-  Source code: ''
-  Licensed under the: ''
-  AGPLv3: ''
-  Downloads / Changelog: ''
-  GitHub releases: ''
-  Help: ''
-  FreeTube Wiki: ''
-  FAQ: ''
-  Discussions: ''
-  Report a problem: ''
-  GitHub issues: ''
-  Please check for duplicates before posting: ''
-  Website: ''
-  Blog: ''
-  Email: ''
-  Mastodon: ''
-  Chat on Matrix: ''
-  Please read the: ''
-  room rules: ''
-  Translate: ''
-  Credits: ''
-  FreeTube is made possible by: ''
-  these people and projects: ''
-  Donate: ''
+  About: 'Oor'
+  Beta: 'Beta'
+  Source code: 'Bronkode'
+  Licensed under the: 'Gelisensieer onder die'
+  AGPLv3: 'AGPLv3'
+  Downloads / Changelog: 'Aflaaie / Veranderingslogboek'
+  GitHub releases: 'GitHub-vrystellings'
+  Help: 'Hulp'
+  FreeTube Wiki: 'FreeTube Wiki'
+  FAQ: 'Gereelde vrae'
+  Discussions: 'Besprekings'
+  Report a problem: 'Rapporteer ’n probleem'
+  GitHub issues: 'GitHub-probleme'
+  Please check for duplicates before posting: 'Gaan na vir duplikate voor u dit plaas'
+  Website: 'Webwerf'
+  Blog: 'Woernaal'
+  Email: 'E-pos'
+  Mastodon: 'Mastodon'
+  Chat on Matrix: 'Klets op Matrix'
+  Please read the: 'Lees asb. die'
+  room rules: 'kamerreëls'
+  Translate: 'Vertaal'
+  Credits: 'Danksegging'
+  FreeTube is made possible by: 'FreeTube is moontlik gemaak deur'
+  these people and projects: 'hierdie mense en projekte'
+  Donate: 'Skenk'
 
 Profile:
-  Profile Settings: ''
-  Toggle Profile List: ''
-  Profile Select: ''
-  Profile Filter: ''
-  All Channels: ''
-  Profile Manager: ''
-  Create New Profile: ''
-  Edit Profile: ''
-  Edit Profile Name: ''
-  Create Profile Name: ''
-  Profile Name: ''
-  Color Picker: ''
-  Custom Color: ''
-  Profile Preview: ''
-  Create Profile: ''
-  Update Profile: ''
-  Make Default Profile: ''
-  Delete Profile: ''
-  Are you sure you want to delete this profile?: ''
-  All subscriptions will also be deleted.: ''
-  Profile could not be found: ''
-  Your profile name cannot be empty: ''
-  Profile has been created: ''
-  Profile has been updated: ''
-  Your default profile has been set to {profile}: ''
-  Removed {profile} from your profiles: ''
-  Your default profile has been changed to your primary profile: ''
-  '{profile} is now the active profile': ''
-  Subscription List: ''
-  Other Channels: ''
-  '{number} selected': ''
-  Select All: ''
-  Select None: ''
-  Delete Selected: ''
-  Add Selected To Profile: ''
-  No channel(s) have been selected: ''
+  Profile Settings: 'Profiel'
+  Toggle Profile List: 'Tokkel profiellys'
+  Profile Select: 'Profielseleksie'
+  Profile Filter: 'Profielfilter'
+  All Channels: 'Alle kanale'
+  Profile Manager: 'Profielbestuurder'
+  Create New Profile: 'Skep nuwe profiel'
+  Edit Profile: 'Wysig profiel'
+  Edit Profile Name: 'Wysig profielnaam'
+  Create Profile Name: 'Skep profielnaam'
+  Profile Name: 'Profielnaam'
+  Color Picker: 'Kleurkieser'
+  Custom Color: 'Pasgemaakte kleur'
+  Profile Preview: 'Profielvoorskou'
+  Create Profile: 'Skep profiel'
+  Update Profile: 'Werk profiel by'
+  Make Default Profile: 'Maak verstekprofiel'
+  Delete Profile: 'Skrap profiel'
+  Are you sure you want to delete this profile?: 'Is u seker u wil hierdie profiel
+    skrap?'
+  All subscriptions will also be deleted.: 'Alle intekeninge sal ook geskrap word.'
+  Profile could not be found: 'Profiel kon nie gevind word nie'
+  Your profile name cannot be empty: 'U profielnaam kan nie leeg wees nie'
+  Profile has been created: 'Profiel is geskep'
+  Profile has been updated: 'Profiel is bygewerk'
+  Your default profile has been set to {profile}: 'U verstekprofiel is ingestel op
+    {profile}'
+  Removed {profile} from your profiles: 'Verwyder {profile} uit u profiele'
+  Your default profile has been changed to your primary profile: 'U verstekprofiel
+    is na u hoofprofiel verander'
+  '{profile} is now the active profile': '{profile} is nou die aktiewe profiel'
+  Subscription List: 'Intekenlys'
+  Other Channels: 'Ander kanale'
+  '{number} selected': '{number} gekies'
+  Select All: 'Kies alles'
+  Select None: 'Kies geen'
+  Delete Selected: 'Skrap gekose'
+  Add Selected To Profile: 'Voeg gekose toe tot profiel'
+  No channel(s) have been selected: 'Geen kanaal(e) is gekies nie'
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
-  : ''
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
-  Close Profile Dropdown: ''
-  Open Profile Dropdown: ''
+  : 'Dit is u primêre profiel.  Is u seker u wil die gekose kanale skrap?  Dieselfde
+    kanale sal geskrap word in enige ander profiel waarin dit voorkom.'
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Is
+    u seker u wil die gekose kanale skrap?  Dit sal nie die kanaal uit enige ander
+    profiel skrap nie.'
+  Close Profile Dropdown: 'Sluit profielkieslys'
+  Open Profile Dropdown: 'Open profielkieslys'
 #On Channel Page
 Channel:
-  Subscribe: ''
-  Unsubscribe: ''
-  Channel has been removed from your subscriptions: ''
-  Removed subscription from {count} other channel(s): ''
-  Added channel to your subscriptions: ''
-  Search Channel: ''
-  Your search results have returned 0 results: ''
-  Sort By: ''
-  This channel does not exist: ''
-  This channel does not allow searching: ''
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
-  Channel Tabs: ''
+  Subscribe: 'Teken in'
+  Unsubscribe: 'Teken uit'
+  Channel has been removed from your subscriptions: 'Kanaal is uit u intekeninge verwyder'
+  Removed subscription from {count} other channel(s): 'Intekening van {count} ander
+    kanaal(e) is verwyder'
+  Added channel to your subscriptions: 'Kanaal is tot u intekeninge toegevoeg'
+  Search Channel: 'Deursoek kanaal'
+  Your search results have returned 0 results: 'U soekaksie het 0 resultate gelewer'
+  Sort By: 'Sorteer volgens'
+  This channel does not exist: 'Hierdie kanaal bestaan nie'
+  This channel does not allow searching: 'Hierdie kanaal laat nie soektogte toe nie'
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Hierdie
+    kanaal is ouderdomsbeperk en kan nie tans in FreeTube bekyk word nie.'
+  Channel Tabs: 'Kanaaloortjies'
   Videos:
-    Videos: ''
-    This channel does not currently have any videos: ''
+    Videos: 'Video’s'
+    This channel does not currently have any videos: 'Hierdie kanaal het tans geen
+      video’s'
     Sort Types:
-      Newest: ''
-      Oldest: ''
-      Most Popular: ''
+      Newest: 'Nuutste'
+      Oldest: 'Oudste'
+      Most Popular: 'Gewildste'
   Shorts:
-    This channel does not currently have any shorts: ''
+    This channel does not currently have any shorts: 'Hierdie kanaal het tans geen
+      kortvideo’s nie'
   Live:
-    Live: ''
-    This channel does not currently have any live streams: ''
+    Live: 'Regstreeks'
+    This channel does not currently have any live streams: 'Hierdie kanaal het tans
+      geen rekstreekse stromings nie'
   Playlists:
-    Playlists: ''
-    This channel does not currently have any playlists: ''
+    Playlists: 'Afspeellyste'
+    This channel does not currently have any playlists: 'Hierdie kanaal het tans geen
+      afspeellyste nie'
     Sort Types:
-      Last Video Added: ''
-      Newest: ''
-      Oldest: ''
+      Last Video Added: 'Laaste toegevoegde video'
+      Newest: 'Nuutste'
+      Oldest: 'Oudste'
   Podcasts:
-    Podcasts: ''
-    This channel does not currently have any podcasts: ''
+    Podcasts: 'Podsendings'
+    This channel does not currently have any podcasts: 'Hierdie kanaal het tans geen
+      podsendings nie'
   Releases:
-    Releases: ''
-    This channel does not currently have any releases: ''
+    Releases: 'Vrystellings'
+    This channel does not currently have any releases: 'Hierdie kanaal het nie tans
+      enige vrystellings nie'
   About:
-    About: ''
-    Channel Description: ''
+    About: 'Oor'
+    Channel Description: 'Kanaalbeskrywing'
     Tags:
-      Tags: ''
-      Search for: ''
-    Details: ''
-    Joined: ''
-    Location: ''
-    Featured Channels: ''
+      Tags: 'Etikette'
+      Search for: 'Soek na ‘{tag}’'
+    Details: 'Details'
+    Joined: 'Lid sedert'
+    Location: 'Ligging'
+    Featured Channels: 'Uitgeligte kanale'
   Community:
-    This channel currently does not have any posts: ''
-    votes: ''
-    Reveal Answers: ''
-    Hide Answers: ''
-    Video hidden by FreeTube: ''
+    This channel currently does not have any posts: 'Hierdie kanaal het nie tans enige
+      plasings nie'
+    votes: '{votes} stemme'
+    Reveal Answers: 'Onthul antwoorde'
+    Hide Answers: 'Versteek antwoorde'
+    Video hidden by FreeTube: 'Video is deur FreeTube versteek'
+    View Full Post: Bekyk volle plasing
+    Viewing Posts Only Supported By Invidious: Bekyk van plasings word slegs vir Invidious
+      ondersteun. Gaan na ’n kanaal se gemeenskapsblad om inhoud te sien sonder Invidious.
+  Home:
+    Home: Tuis
+    View Playlist: Bekyk afspeellys
 Video:
-  More Options: ''
-  Mark As Watched: ''
-  Remove From History: ''
-  Video has been marked as watched: ''
-  Video has been removed from your history: ''
-  Save Video: ''
-  Video has been saved: ''
-  Video has been removed from your saved list: ''
-  Open in YouTube: ''
-  Copy YouTube Link: ''
-  Open YouTube Embedded Player: ''
-  Copy YouTube Embedded Player Link: ''
-  Open in Invidious: ''
-  Copy Invidious Link: ''
-  Open Channel in YouTube: ''
-  Copy YouTube Channel Link: ''
-  Open Channel in Invidious: ''
-  Copy Invidious Channel Link: ''
-  Hide Channel: ''
-  Unhide Channel: ''
-  Views: ''
-  Loop Playlist: ''
-  Shuffle Playlist: ''
-  Reverse Playlist: ''
-  Play Next Video: ''
-  Play Previous Video: ''
-  Pause on Current Video: ''
-  Watched: ''
-  Autoplay: ''
-  Starting soon, please refresh the page to check again: ''
+  More Options: 'Nog opsies'
+  Mark As Watched: 'Markeer as gekyk'
+  Remove From History: 'Verwyder uit geskiedenis'
+  Video has been marked as watched: 'Video is gemarkeer as gekyk'
+  Video has been removed from your history: 'Video is uit u geskiedenis verwyder'
+  Save Video: 'Bewaar video'
+  Video has been saved: 'Video is bewaar'
+  Video has been removed from your saved list: 'Video is verwyder uit u lys van bewaarde
+    video’s'
+  Open in YouTube: 'Open in YouTube'
+  Copy YouTube Link: 'Kopieer YouTube-skakel'
+  Open YouTube Embedded Player: 'Open YouTube- ingebedde skakel'
+  Copy YouTube Embedded Player Link: 'Kopieer YouTube-inbedspelerskakel'
+  Open in Invidious: 'Open in Invidious'
+  Copy Invidious Link: 'Kopieer Invidious-skakel'
+  Open Channel in YouTube: 'Open kanaal in YouTube'
+  Copy YouTube Channel Link: 'Kopieer YouTube-kanaalskakel'
+  Open Channel in Invidious: 'Open kanaal in Invidious'
+  Copy Invidious Channel Link: 'Kopieer Invidious-kanaalskakel'
+  Hide Channel: 'Versteek kanaal'
+  Unhide Channel: 'Toon kanaal'
+  Views: 'Kyke'
+  Loop Playlist: 'Herhaal afspeellys'
+  Shuffle Playlist: 'Skommel afspeellys'
+  Reverse Playlist: 'Keer afspeellys om'
+  Play Next Video: 'Speel volgende video af'
+  Play Previous Video: 'Speel vorige video af'
+  Pause on Current Video: 'Laat wag by huidige video'
+  Watched: 'Gekyk'
+  Autoplay: 'Outo-afspeel'
+  Starting soon, please refresh the page to check again: 'Begin binnekort, verfris
+    asb. die blad om weer na te gaan'
   # As in a Live Video
-  Premieres on: ''
-  Premieres: ''
-  Upcoming: ''
-  Live: ''
-  Live Now: ''
-  Live Chat: ''
-  Enable Live Chat: ''
-  Live Chat is currently not supported in this build.: ''
-  'Chat is disabled or the Live Stream has ended.': ''
-  Live chat is enabled. Chat messages will appear here once sent.: ''
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
-  Show Super Chat Comment: ''
-  Scroll to Bottom: ''
-  Download Video: ''
-  video only: ''
-  audio only: ''
+  Premieres on: 'Première op'
+  Premieres: 'Première'
+  Upcoming: 'Komend'
+  Live: 'Regstreeks'
+  Live Now: 'Nou regstreeks'
+  Live Chat: 'Regstreekse klets'
+  Enable Live Chat: 'Aktiveer regstreekse klets'
+  Live Chat is currently not supported in this build.: 'Regstreekse klets word nie
+    in hierdie bou gesteun nie.'
+  'Chat is disabled or the Live Stream has ended.': 'Klets is gedeaktiveer of die
+    regstreekse klets is beëindig.'
+  Live chat is enabled. Chat messages will appear here once sent.: 'Regstreekse klets
+    is geaktiveer.  Kletsboodskappe sal hier verskyn.'
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Regstreekse
+    klets word nie met die Invidious-API ondersteun nie.  ’n Direkte verbinding na
+    YouTube word vereis.'
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Regstreekse
+    klets is nie vir hierdie stroom beskikbaar nie. Die oplaaier het dit gedeaktiveer.'
+  Show Super Chat Comment: 'Toon superkletskommentaar'
+  Scroll to Bottom: 'Rol na onderent'
+  Download Video: 'Laai video af'
+  video only: 'slegs video'
+  audio only: 'slegs oudio'
   Published:
-    Jan: ''
-    Feb: ''
-    Mar: ''
-    Apr: ''
-    May: ''
-    Jun: ''
-    Jul: ''
-    Aug: ''
-    Sep: ''
-    Oct: ''
-    Nov: ''
-    Dec: ''
-    Second: ''
-    Seconds: ''
-    Minute: ''
-    Minutes: ''
-    Hour: ''
-    Hours: ''
-    Day: ''
-    Days: ''
-    Week: ''
-    Weeks: ''
-    Month: ''
-    Months: ''
-    Year: ''
-    Years: ''
-    Ago: ''
-    Upcoming: ''
-    In less than a minute: ''
-  Published on: ''
-  Streamed on: ''
-  Started streaming on: ''
-  Publicationtemplate: ''
+    In less than a minute: 'Oor minder as een minuut'
+  Published on: 'Gepubliseer op'
+  Streamed on: 'Gestroom op'
+  Started streaming on: 'Het begin met stroming op'
   Sponsor Block category:
-    sponsor: ''
-    intro: ''
-    outro: ''
-    self-promotion: ''
-    interaction: ''
-    music offtopic: ''
-    recap: ''
-    filler: ''
+    sponsor: 'Borg'
+    intro: 'Inleiding'
+    outro: 'Uitleiding'
+    self-promotion: 'Selfbevordering'
+    interaction: 'Interaksie'
+    music offtopic: 'Musiek ongepas'
+    recap: 'Opsomming'
+    filler: 'Vulsel'
   External Player:
-    OpenInTemplate: ''
-    video: ''
-    playlist: ''
-    OpeningTemplate: ''
-    UnsupportedActionTemplate: ''
+    OpenInTemplate: 'Open in {externalPlayer}'
+    video: 'video'
+    playlist: 'afspeellys'
+    OpeningTemplate: 'Open tans {videoOrPlaylist} in {externalPlayer}…'
+    UnsupportedActionTemplate: '{externalPlayer} ondersteun nie: {action}'
     Unsupported Actions:
-      starting video at offset: ''
-      setting a playback rate: ''
-      opening playlists: ''
-      opening specific video in a playlist (falling back to opening the video): ''
-      reversing playlists: ''
-      shuffling playlists: ''
-      looping playlists: ''
+      starting video at offset: 'begin video met verrekening'
+      setting a playback rate: 'stel afspeelsnelheid in'
+      opening playlists: 'open afspeellyste'
+      opening specific video in a playlist (falling back to opening the video): 'open
+        spesifieke video in ’n afspeellys (val terug tot die open van die video)'
+      reversing playlists: 'keer afspeellyste om'
+      shuffling playlists: 'skommel afspeellyste'
+      looping playlists: 'herhalende afspeellyste'
   Player:
-    TranslatedCaptionTemplate: ''
-    Audio Tracks: ''
-    Theatre Mode: ''
-    Exit Theatre Mode: ''
-    Full Window: ''
-    Exit Full Window: ''
-    Take Screenshot: ''
-    Show Stats: ''
-    Hide Stats: ''
+    TranslatedCaptionTemplate: '{language} (vertaal vanaf “{originalLanguage}”)'
+    Audio Tracks: 'Oudiosnitte'
+    Theatre Mode: 'Teatermodus'
+    Exit Theatre Mode: 'Verlaat teatermodus'
+    Full Window: 'Volle venster'
+    Exit Full Window: 'Verlaat volle venster'
+    Take Screenshot: 'Maak skermkiekie'
+    Show Stats: 'Toon statistiek'
+    Hide Stats: 'Versteek statistiek'
     Stats:
-      Stats: ''
-      Video ID: ''
-      Media Formats: ''
-      Resolution: ''
-      Player Dimensions: ''
-      Bitrate: ''
-      Volume: ''
-      Bandwidth: ''
-      Buffered: ''
-      Dropped Frames / Total Frames: ''
-      CodecAudio: ''
-      CodecsVideoAudio: ''
-      CodecsVideoAudioNoItags: ''
-    You appear to be offline: ''
-    Playback will resume automatically when your connection comes back: ''
-    Skipped segment: ''
+      Stats: 'Statistieke'
+      Video ID: 'Video ID: {videoId}'
+      Media Formats: 'Mediaformate: {formats}'
+      Resolution: 'Resolusie: {width}x{height}@{frameRate}'
+      Player Dimensions: 'Spelerdimensies: {width}x{height}'
+      Bitrate: 'Bistempo: {bitrate} kbps'
+      Volume: 'Volume: {volumePercentage}%'
+      Bandwidth: 'Bandwydte: {bandwidth} kbps'
+      Buffered: 'Gebuffer: {bufferedPercentage}%'
+      Dropped Frames / Total Frames: 'Verlore rame: {droppedFrames} / Totale rame:
+        {totalFrames}'
+      CodecAudio: 'Kodek: {audioCodec} ({audioItag})'
+      CodecsVideoAudio: 'Kodeks: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
+      CodecsVideoAudioNoItags: 'Kodeks: {videoCodec} / {audioCodec}'
+    You appear to be offline: 'U blyk vanlyn te wees.'
+    Playback will resume automatically when your connection comes back: 'Afspeel sal
+      outomaties hervat wanneer u verbinding terug kom.'
+    Skipped segment: 'Segment {segmentCategory} oorgeslaan'
 #& Videos
+  Unlisted: Ongelys
+  IP block: YouTube het u IP-adres versper en u kan nie video’s kyk nie. Verander
+    u VPN of instaanbediener.
+  MembersOnly: Videos slegs vir lede kan nie met FreeTube gekyk word nie omdat dit
+    ’n Google-aantekening en betaalde lidmaatskap op die oplaaier se kanaal vereis.
+  AgeRestricted: Video’s met ’n ouderdomsperk kan nie met FreeTube gekyk word nie
+    omdat dit ’n Google-aantekening en ouderdomvebestigde YouTube-rekening vereis.
+  DeArrow:
+    Show Original Details: Toon oorspronklike details
+    Show Modified Details: Toon gewysigde details
 Videos:
   #& Sort By
   Sort By:
-    Newest: ''
-    Oldest: ''
+    Newest: 'Nuutste'
+    Oldest: 'Oudste'
     #& Most Popular
 #& Playlists
 Playlist:
   #& About
-  Playlist: ''
-  View Full Playlist: ''
-  Videos: ''
-  View: ''
-  Views: ''
-  Last Updated On: ''
+  Playlist: 'Afspeellys'
+  View Full Playlist: 'Bekyk volledige afspeellys'
+  Last Updated On: 'Laas bygewerk op'
   Sort By:
-    Sort By: ''
-    DateAddedNewest: ''
-    DateAddedOldest: ''
-    AuthorAscending: ''
-    AuthorDescending: ''
-    VideoTitleAscending: ''
-    VideoTitleDescending: ''
-    Custom: ''
+    Sort By: 'Sorteer volgens'
+    DateAddedNewest: 'Laaste toegevoeg boaan'
+    DateAddedOldest: 'Eerste toegevoeg boaan'
+    AuthorAscending: 'Outeur (A-Z)'
+    AuthorDescending: 'Outeur (Z-A)'
+    VideoTitleAscending: 'Titel (A-Z)'
+    VideoTitleDescending: 'Titel (Z-A)'
+    Custom: 'Pasgemaak'
 
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: ''
+    VideoDurationAscending: Duur (korste eerste)
+    VideoDurationDescending: Duur (langste eerste)
 Change Format:
-  Change Media Formats: ''
-  Use Dash Formats: ''
-  Use Legacy Formats: ''
-  Use Audio Formats: ''
-  Dash formats are not available for this video: ''
-  Audio formats are not available for this video: ''
-  Legacy formats are not available for this video: ''
+  Change Media Formats: 'Verander mediaformate'
+  Use Dash Formats: 'Gebruik DASH-formate'
+  Use Legacy Formats: 'Gebruik legaatformate'
+  Use Audio Formats: 'Gebruik oudioformate'
+  Dash formats are not available for this video: 'DASH-formate is nie beskikbaar vir
+    hierdie video nie'
+  Audio formats are not available for this video: 'Oudioformate is nie beskikbaar
+    vir hierdie video nie'
+  Legacy formats are not available for this video: 'Legaatformate is nie beskikbaar
+    vir hierdie video nie'
 Share:
-  Share Video: ''
-  Share Channel: ''
-  Share Playlist: ''
-  Include Timestamp: ''
-  Copy Link: ''
-  Open Link: ''
-  Copy Embed: ''
-  Open Embed: ''
+  Share Video: 'Deel video'
+  Share Channel: 'Deel kanaal'
+  Share Playlist: 'Deel afspeellys'
+  Include Timestamp: 'Sluit tydstempel in'
+  Copy Link: 'Kopieer skakel'
+  Open Link: 'Open skakel'
+  Copy Embed: 'Kopieer inbedskakel'
+  Open Embed: 'Open inbedskakel'
   # On Click
-  Invidious URL copied to clipboard: ''
-  Invidious Embed URL copied to clipboard: ''
-  Invidious Channel URL copied to clipboard: ''
-  YouTube URL copied to clipboard: ''
-  YouTube Embed URL copied to clipboard: ''
-  YouTube Channel URL copied to clipboard: ''
+  Invidious URL copied to clipboard: 'Invidious-URL is na knipbod gekopieer'
+  Invidious Embed URL copied to clipboard: 'Invidious-inbedskakel is na knipbord gekopieer'
+  Invidious Channel URL copied to clipboard: 'Invidious-kanaalskakel is na knipbord
+    gekopieer'
+  YouTube URL copied to clipboard: 'YouTube-skakel is na knipbord gekopieer'
+  YouTube Embed URL copied to clipboard: 'YouTube-inbedskakel is na knipbord gekopieer'
+  YouTube Channel URL copied to clipboard: 'YouTube-kanaalskakel is na knipbord gekopieer'
 Clipboard:
-  Copy failed: ''
-  Cannot access clipboard without a secure connection: ''
+  Copy failed: 'Kopiëring na knipbord het misluk'
+  Cannot access clipboard without a secure connection: 'Geen toegang tot knipbord
+    sonder ’n beveiligde verbinding'
 
 Chapters:
-  Chapters: ''
-  'Chapters list visible, current chapter: {chapterName}': ''
-  'Chapters list hidden, current chapter: {chapterName}': ''
+  Chapters: 'Hoofstukke'
+  'Chapters list visible, current chapter: {chapterName}': 'Hoofstukke lys sigbare,
+    huidige hoofstuk: {chapterName}'
+  'Chapters list hidden, current chapter: {chapterName}': 'Hoofstukke lys versteekte,
+    huidige hoofstuk: {chapterName}'
 
-Mini Player: ''
+  Key Moments: Sleuteloomblikke
+Mini Player: 'Mini-speler'
 Comments:
-  Comments: ''
-  Click to View Comments: ''
-  Getting comment replies, please wait: ''
-  There are no more comments for this video: ''
-  Show Comments: ''
-  Hide Comments: ''
-  Sort by: ''
-  Top comments: ''
-  Newest first: ''
-  View {replyCount} replies: ''
+  Comments: 'Kommentare'
+  Click to View Comments: 'Klik om kommentare te sien'
+  Getting comment replies, please wait: 'Kommentare word opgehaal, wag asb.'
+  There are no more comments for this video: 'Daar is geen verdere kommentare vir
+    hierdie video nie'
+  Show Comments: 'Toon kommentare'
+  Hide Comments: 'Versteek kommentare'
+  Sort by: 'Sorteer volgens'
+  Top comments: 'Topkommentare'
+  Newest first: 'Nuutste eerste'
+  View {replyCount} replies: 'Sien {replyCount} antwoorde'
   # Context: View 10 Replies, View 1 Reply, View 1 Reply from Owner, View 2 Replies from Owner and others
-  View: ''
-  Hide: ''
-  Replies: ''
-  Show More Replies: ''
-  Reply: ''
-  From {channelName}: ''
-  And others: ''
-  There are no comments available for this video: ''
-  Load More Comments: ''
-  No more comments available: ''
-  Pinned by: ''
-  Member: ''
-  Subscribed: ''
-  Hearted: ''
-Up Next: ''
+  View: 'Sien'
+  Hide: 'Versteek'
+  Replies: 'Antwoorde'
+  Show More Replies: 'Toon nog antwoorde'
+  Reply: 'Antwoord'
+  From {channelName}: 'van {channelName}'
+  And others: 'en ander'
+  There are no comments available for this video: 'Daar is geen reaksies beskikbaar
+    vir hierdie video nie'
+  Load More Comments: 'Laai nog kommentare'
+  No more comments available: 'Geen kommentare meer beskikbaar'
+  Pinned by: 'Vasgemaak deur'
+  Member: 'Lid'
+  Subscribed: 'Ingeteken'
+  Hearted: 'Met hart'
+  There are no comments available for this post: Daar is geen kommentare beskikbaar
+    vir hierdie plasing nie
+Up Next: 'Volgende'
 
 #Tooltips
 Tooltips:
   General Settings:
-    Preferred API Backend: ''
-    Fallback to Non-Preferred Backend on Failure: ''
-    Thumbnail Preference: ''
-    Invidious Instance: ''
-    Region for Trending: ''
+    Preferred API Backend: 'Kies die agterpunt wat FreeTube gebruik om data te versamel.
+      Die lokale API is ’n ingeboude uithaler. Die Invidious API moet met ’n Invidious-bediener
+      gekoppel word.'
+    Fallback to Non-Preferred Backend on Failure: 'Wanneer u voorkeur-API probleme
+      gee sal FreeTube outomaties terugval op die alternatiewe nie-voorkeur-API wanneer
+      hierdie instelling geaktiveer is.'
+    Thumbnail Preference: 'Alle duimnaels in FreeTube sal vervang word met ’n beeld
+      uit die video i.p.v. die verstek duimnael.'
+    Invidious Instance: 'Die Invidious-instansie waarmee FreeTube sal verbind om API-oproepe
+      te maak.'
+    Region for Trending: 'Met streek van neigings kan u kies welke land se gewilde
+      videos aan u vertoon moet word.'
     External Link Handling: |
+      Kies die verstek gedrag vir wanneer ’n skakel geklik word wat nie in FreeTube geopen kan word nie.
+      FreeTube sal die geklikte skakel by verstek in u verstek blaaier open.
+    Open Deep Links In New Window: Bronadresse wat aan FreeTube gegee word, soos wat
+      deur blaaieruitbreidings of bevellynargumente gestuur word, word in ’n nuwe
+      venster geopen.
   Player Settings:
-    Proxy Videos Through Invidious: ''
-    Default Video Format: ''
-    Scroll Playback Rate Over Video Player: ''
-    Skip by Scrolling Over Video Player: ''
+    Proxy Videos Through Invidious: 'FreeTube sal verbind met Invidious en die video’s
+      van daar aflaai eerder as om ’n direkte verbinding met YouTube te maak.'
+    Default Video Format: 'Kies die formate wat gebruik word wanneer ’n video afspeel.
+      DASH-formate kan hoër kwaliteit afspeel. Legaat formate word beperk tot ’n maks
+      van 720p maar gebruik minder bandwydte. Oudio formate is slegs oudio strome.'
+    Scroll Playback Rate Over Video Player: 'Terwyl die muis oor die video is, druk
+      en hou die Control-toets (Command-toets op Mac) en rol met die muis om die afspeelsnelheid
+      te beheer. Druk en hou die Control-toets (Command-toets op Mac) en klik met
+      die linker muisknop om vinnig terug te keer na die verstek afspeelsnelheid (1x
+      tensy aangepas in die instellings).'
+    Skip by Scrolling Over Video Player: 'Gebruik die rolwiel om deur die video te
+      spoel, soos by MPV.'
   External Player Settings:
-    External Player: ''
-    Custom External Player Executable: ''
-    Ignore Warnings: ''
-    Ignore Default Arguments: ''
-    Custom External Player Arguments: ''
-    DefaultCustomArgumentsTemplate: ""
+    External Player: 'Deur die kies van ’n eksterne videospeler sal daar ’n ikoone
+      op die video se duimnael verskyn waarmee dit (of afspeellys indien ondersteun)
+      in die gekose eksterne videospeler geopen kan word. Let op: Invidious-instellings
+      beïnvloed nie eksterne videospelers nie.'
+    Custom External Player Executable: 'FreeTube neem by verstek aan dat die gekose
+      eksterne videospeler d.m.v. die PATH-omgewingsveranderlike gevind kan word.
+      Indien nodig kan ’n pasgemaakte pad hier ingevoer word.'
+    Ignore Warnings: 'Onderdruk waarskuwings wanneer die huidige eksterne videospeler
+      nie die huidige aksie ondersteun nie (bv. afspeellyste omkeer, ens.).'
+    Ignore Default Arguments: 'Moet geen verstek argumente na die eksterne videospeler
+      stuur buiten die video-URL nie (bv. afspeelsnelheid, afspeellys-URL, ens.).
+      Pasgemaakte argumente word steeds deurgestuur.'
+    Custom External Player Arguments: 'Enige pasgemaakte bevellynrgumente, wat u aan
+      die eksterne videospeler vir deurgee.'
+    DefaultCustomArgumentsTemplate: "(verstek: ‘{defaultCustomArguments}’)"
   Distraction Free Settings:
-    Hide Channels: ''
-    Hide Subscriptions Live: ''
-    Hide Videos and Playlists Containing Text: ''
+    Hide Channels: 'Voer ’n kanaal-ID in om alle video’s, afspeellyste en die kanaal
+      self te versteek sodat dit nie in soek, tendense, gewildste, en aanbeveel weergegee
+      word nie. Die ingevoerde kanaal-ID moet volledig ooreenstem en is hooflettergevoelig.'
+    Hide Subscriptions Live: 'Hierdie instelling woord oorheers deur die toepwye “{appWideSetting}”-instelling
+      in die “{subsection}” gedeelte van “{settingsSection}”'
+    Hide Videos and Playlists Containing Text: 'Voer ’n woord, woordfragment of woordgroep
+      in (nie hooflettergevoelig) om alle video’s en afspeellyste waarvan die oorspronklike
+      titel dit bevat, regoor FreeTube te versteek, met uitsondering van net geskiedenis,
+      u afspeellyste en video’s in afspeellyste.'
   Subscription Settings:
-    Fetch Feeds from RSS: ''
-    Fetch Automatically: ''
+    Fetch Feeds from RSS: 'Wanneer geaktiveer, sal FreeTube RSS i.p.v. sy verstek
+      metode gebruik om u intekenvoer op te haal. RSS is vinniger en voorkom IP-versperring,
+      maar bied nie sekere inligting soos videoduud, status of gemeenskapsplasings
+      nie'
+    Fetch Automatically: 'Wanneer geaktiveer, sal FreeTube u intekenvoer outomaties
+      ophaal wanneer ’n nuwe venster geopen word en u van profiel wissel.'
   Experimental Settings:
-    Replace HTTP Cache: ''
+    Replace HTTP Cache: 'Deaktiveer die skyfgebaseerde HTTP-kas van Electron en aktiveer
+      ’n aangepaste afbeeldingskas in die geheue in. Sal lei tot ’n verhoogde RAM-gebruik.'
   SponsorBlock Settings:
-    UseDeArrowTitles: ''
-    UseDeArrowThumbnails: ''
+    UseDeArrowTitles: 'Vervang videotitels met gebruiker ingediende titels vanaf DeArrow.'
+    UseDeArrowThumbnails: 'Vervang videoduimnaels met duimnaels vanaf DeArrow.'
 
 # Toast Messages
-Local API Error (Click to copy): ''
-Invidious API Error (Click to copy): ''
-Falling back to Invidious API: ''
-Falling back to Local API: ''
-This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Subscriptions have not yet been implemented: ''
-Unknown YouTube url type, cannot be opened in app: ''
-Hashtags have not yet been implemented, try again later: ''
-Loop is now disabled: ''
-Loop is now enabled: ''
-Shuffle is now disabled: ''
-Shuffle is now enabled: ''
-The playlist has been reversed: ''
-Playing Next Video: ''
-Playing Previous Video: ''
-Playlist will not pause when current video is finished: ''
-Playlist will pause when current video is finished: ''
-Playing Next Video Interval: ''
-Canceled next video autoplay: ''
+Local API Error (Click to copy): 'Lokale API-fout (Klik om te kopieer)'
+Invidious API Error (Click to copy): 'Invidious API-fout (Klik om te kopieer)'
+Falling back to Invidious API: 'Val terug op Invidious API'
+Falling back to Local API: 'Val terug op lokale API'
+This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Hierdie
+  video is onbeskikbaar vanweë ontbrekende formate. Dit kan gebeur weens video-onbeskikbaarheid
+  in u land.'
+Unknown YouTube url type, cannot be opened in app: 'Onbekende YouTube-URL; die URL
+  kan nie in die toep geopen word nie'
+Loop is now disabled: 'Herhaling is nou gedeaktiveer'
+Loop is now enabled: 'Herhaling is nou geaktiveer'
+Shuffle is now disabled: 'Skommel is nou gedeaktiveer'
+Shuffle is now enabled: 'Skommel is nou geaktiveer'
+The playlist has been reversed: 'Die afspeellys speel van agter af'
+Playing Next Video: 'Speel volgende video af'
+Playing Previous Video: 'Speel vorige video af'
+Playlist will not pause when current video is finished: 'Afspeellys sal nie wag wanneer
+  huidige video klaar is nie'
+Playlist will pause when current video is finished: 'Afspeellys sal wag wanneer huidige
+  video klaar is'
+Playing Next Video Interval: 'Volgende video word afgespeel. Klik om te kanselleer.
+  | Volgende video word oor {nextVideoInterval} sekond afgespeel. Klik om te kanselleer.
+  | Volgende video word oor {nextVideoInterval} sekondes afgespeel. Klik om te kanselleer.'
+Canceled next video autoplay: 'Outomatiese afspeel is gekanselleer'
 
-Default Invidious instance has been set to {instance}: ''
-Default Invidious instance has been cleared: ''
-'The playlist has ended. Enable loop to continue playing': ''
+Default Invidious instance has been set to {instance}: 'Verstek Invidious-instansie
+  is ingestel op {instance}'
+Default Invidious instance has been cleared: 'Verstek Invidious-instansie is gewis'
+'The playlist has ended. Enable loop to continue playing': 'Die afspeellys is klaar.  Aktiveer
+  lusafspeel in te bly afspeel'
 Age Restricted:
-  This channel is age restricted: ''
-  This video is age restricted: ''
-External link opening has been disabled in the general settings: ''
-'Blocked opening potentially unsafe URL': ''
-Downloading has completed: ''
-Starting download: ''
-Downloading failed: ''
-Screenshot Success: ''
-Screenshot Error: ''
-Channel Hidden: ''
-Channel Unhidden: ''
-Trimmed input must be at least N characters long: ''
-Tag already exists: ''
+  This channel is age restricted: 'Hierdie kanaal het ’n ouderdomsperk'
+  This video is age restricted: 'Hierdie video het ’n ouderdomsperk'
+External link opening has been disabled in the general settings: 'Die open van eksterne
+  skakels is gedeaktiveer in die algemene instellings'
+'Blocked opening potentially unsafe URL': 'Open van potensiële onveilige URL is versper:
+  “{url}”.'
+Downloading has completed: '“{videoTitle}” is afgelaai'
+Starting download: 'Begin aflaai van “{videoTitle}”'
+Downloading failed: 'Daar was ’n probleem by die aflaai van “{videoTitle}”'
+Screenshot Success: 'Skermkiekie bewaar as “{filePath}”'
+Screenshot Error: 'Skermkiekie het misluk. {error}'
+Channel Hidden: '{channel} tot kanaalfilter toegevoeg'
+Channel Unhidden: '{channel} verwyder uit kanaalfilter'
+Trimmed input must be at least N characters long: 'Bygesnyde invoer moet ten minste
+  1 karakter lank wees | Bygesnyde invoer moet ten minste {lentgh} karakters lank
+  wees'
+Tag already exists: 'Etiket “{tagName}” bestaan reeds'
 
 Hashtag:
-  Hashtag: ''
-  This hashtag does not currently have any videos: ''
-Moments Ago: ''
-Yes: ''
-No: ''
-Ok: ''
-Yes, Delete: ''
-Yes, Restart: ''
-Yes, Open Link: ''
-Cancel: ''
+  Hashtag: 'Hutsmerk'
+  This hashtag does not currently have any videos: 'Hierdie hutsmerk het tans geen
+    video’s'
+Moments Ago: 'oomblikke gelede'
+Yes: 'Ja'
+No: 'Nee'
+Ok: 'Goed'
+Yes, Delete: 'Ja, skrap'
+Yes, Restart: 'Ja, herbegin'
+Yes, Open Link: 'Ja, open skakel'
+Cancel: 'Kanselleer'
 # symbol used to indicate that an item is correct
-checkmark: ''
+checkmark: '✓'
 # French is the only language that should change this (they have a space before the colon)
-Display Label: ''
+Display Label: '{label}: {value}'
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Keys:
+  arrowright: Regspyltjie
+  arrowup: Oppyltjie
+  alt: Alt
+  arrowdown: Afpyltjie
+  ctrl: Ctrl
+  arrowleft: Linkspyltjie
+Description:
+  Collapse Description: Toon minder
+  Expand Description: …nog
+Autoplay Interruption Timer: Outo-afspeel is gekanselleer weens {autoplayInterruptionIntervalHours}
+  uur van onaktiwiteit
diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index 8bfed56ff13e1..6ecad4ae9071a 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -43,6 +43,8 @@ Global:
     Subscriber Count: 1 مشترك | {count} مشتركين
     View Count: 1 مشاهدة | {count} مشاهدات
     Watching Count: 1 مشاهد | {count} مشاهدون
+    Like Count: إعجاب واحد |{count} إعجاب
+    Comment Count: تعليق واحد | {count} تعليقًا
   Input Tags:
     Length Requirement: يجب أن يبلغ طول العلامة {number} حرفًا على الأقل
 Search / Go to URL: 'ابحث / اذهب إلى رابط'
@@ -99,7 +101,8 @@ Subscriptions:
   Subscriptions: 'الاشتراكات'
   Latest Subscriptions: 'أحدث الاشتراكات'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'قائمة
-    اشتراكاتك فارغة حالياً. ابدأ بإضافة الاشتراكات لتراهم هنا.'
+    اشتراكك فارغة حاليًا. إذا كنت ترغب في استيراد اشتراكاتك، فيمكنك الانتقال إلى إعدادات
+    البيانات وتحديد استيراد الاشتراكات أو يمكنك البحث عن قناة والاشتراك فيها.'
   'Getting Subscriptions. Please wait.': 'جاري تحميل الاشتراكات. يرجى الانتظار.'
   Refresh Subscriptions: 'تحديث الاشتراكات'
   Load More Videos: حمّل المزيد من الفيديوهات
@@ -125,11 +128,6 @@ Most Popular: 'الأكثر شعبية'
 Playlists: 'قوائم التشغيل'
 User Playlists:
   Your Playlists: 'قوائم التشغيل الخاصة بك'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ليس
-    لديك أي فيديو محتفظ عليه. إضغط على زر "إحفظ" في زاوية الفيديو لكي يحفظ هنا
-  Playlist Message: هذه الصفحة لا تظهر قائمات التشغيل بشكل كامل, وإنما تظهر فيديوات
-    إحتفضت عليها أو فضّلتها. عندما يكمل العمل بالكامل على هذه الصفحة, سترى كل فيديواتك
-    هنا تنتقل إلى قائمة تشغيل تسمى "المفضلة".
   Search bar placeholder: بحث عن قوائم التشغيل
   Empty Search Message: لا توجد مقاطع فيديو في قائمة التشغيل هذه تتطابق مع بحثك
   This playlist currently has no videos.: لا تحتوي قائمة التشغيل هذه حاليًا على مقاطع
@@ -183,11 +181,12 @@ User Playlists:
         انقر هنا للتراجع
       Reverted to use {oldPlaylistName} for quick bookmark: تمت العودة لاستخدام {oldPlaylistName}
         للإشارة المرجعية السريعة
-      Quick bookmark disabled: تم تعطيل الإشارة المرجعية السريعة
       This playlist is already being used for quick bookmark.: يتم استخدام قائمة التشغيل
         هذه بالفعل لوضع إشارة مرجعية سريعة.
       Playlist {playlistName} is the new quick bookmark playlist.: قائمة التشغيل {playlistName}
         هي قائمة تشغيل الإشارات المرجعية السريعة الجديدة.
+      This playlist has a video with a duration error: تحتوي قائمة التشغيل هذه على
+        مقطع فيديو واحد على الأقل ليس له مدة، وسيتم فرزه كما لو كانت مدته صفرًا.
     Search for Videos: ‬البحث عن مقاطع الفيديو
   AddVideoPrompt:
     Select a playlist to add your N videos to: حدد قائمة تشغيل لإضافة الفيديو الخاص
@@ -219,9 +218,6 @@ User Playlists:
     New Playlist Name: اسم قائمة تشغيل جديد
     Create: انشئ
   Remove Watched Videos: إزالة مقاطع الفيديو التي تمت مشاهدتها
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: هل
-    أنت متأكد أنك تريد إزالة جميع مقاطع الفيديو التي تمت مشاهدتها من قائمة التشغيل
-    هذه؟ هذا لا يمكن التراجع عنها.
   You have no playlists. Click on the create new playlist button to create a new one.: ليس
     لديك قوائم تشغيل. انقر على زر إنشاء قائمة تشغيل جديدة لإنشاء قائمة تشغيل جديدة.
   Are you sure you want to delete this playlist? This cannot be undone: هل أنت متأكد
@@ -230,7 +226,6 @@ User Playlists:
   Remove from Favorites: إزالة من {playlistName}
   Enable Quick Bookmark With This Playlist: تمكين الإشارة المرجعية السريعة مع قائمة
     التشغيل هذه
-  Disable Quick Bookmark: تعطيل الإشارة المرجعية السريعة
   Playlists with Matching Videos: قوائم التشغيل مع مقاطع الفيديو المطابقة
   Quick Bookmark Enabled: تم تمكين الإشارة المرجعية السريعة
   Cannot delete the quick bookmark target playlist.: لا يمكن حذف قائمة التشغيل المستهدفة
@@ -244,6 +239,8 @@ User Playlists:
     أنت متأكد أنك تريد إزالة مقطع فيديو مكرر واحد من قائمة التشغيل هذه؟ هذا لا يمكن
     التراجع عنها. | هل أنت متأكد أنك تريد إزالة {playlistItemCount} من مقاطع الفيديو
     المكررة من قائمة التشغيل هذه؟ هذا لا يمكن التراجع عنها.
+  Export Playlist: تصدير قائمة التشغيل هذه
+  The playlist has been successfully exported: تم تصدير قائمة التشغيل بنجاح
 History:
   # On History Page
   History: 'السجلّ'
@@ -256,7 +253,7 @@ Settings:
   # On Settings Page
   Settings: 'الإعدادات'
   General Settings:
-    General Settings: 'الإعدادات العامة'
+    General Settings: 'العامة'
     Fallback to Non-Preferred Backend on Failure: 'الرجوع إلى الواجهة الخلفية الغير
       مفضلة عند الفشل'
     Enable Search Suggestions: 'تفعيل الإقتراحات عند البحث'
@@ -278,8 +275,6 @@ Settings:
       End: 'نهاية'
       Hidden: مخفي
       Blur: الضبابية
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'حالة Invidious
-      (الافتراضية هي https://invidious.snopyta.org)'
     Region for Trending: 'المنطقة للأكثر شيوعاً'
         #! List countries
     Check for Latest Blog Posts: تحقق من أحدث منشورات المدونة
@@ -303,7 +298,7 @@ Settings:
       Label: تحميل تلقائي للصفحة التالية
       Tooltip: قم بتحميل الصفحات والتعليقات الإضافية تلقائيًا.
   Theme Settings:
-    Theme Settings: 'إعدادات السِمة'
+    Theme Settings: 'السِمة'
     Match Top Bar with Main Color: 'طابق الشريط العلوي مع اللون الأساسي'
     Base Theme:
       Base Theme: 'السِمة الأساسية'
@@ -373,7 +368,7 @@ Settings:
     Hide Side Bar Labels: إخفاء تسميات الشريط الجانبي
     Hide FreeTube Header Logo: إخفاء شعار رأس FreeTube
   Player Settings:
-    Player Settings: 'إعدادات المشغل'
+    Player Settings: 'المشغل'
     Play Next Video: 'شغل الفيديو التالي'
     Turn on Subtitles by Default: 'شغّل الترجمات بشكل افتراضي'
     Autoplay Videos: 'شغًل الفيديوهات تلقائياً'
@@ -425,7 +420,7 @@ Settings:
     Enter Fullscreen on Display Rotate: وضع ملء الشاشة عند تدوير الشاشة
     Skip by Scrolling Over Video Player: تخطي بالتمرير فوق مشغل الفيديو
   Privacy Settings:
-    Privacy Settings: 'إعدادات الخصوصية'
+    Privacy Settings: 'الخصوصية'
     Remember History: 'تذّكر سجلّ المشاهدة'
     Save Watched Progress: 'حفظ نسبة المشاهدة'
     Clear Search Cache: 'مسح ذاكرة التخزين المؤقت للبحث'
@@ -447,47 +442,11 @@ Settings:
     Are you sure you want to remove all your playlists?: هل أنت متأكد أنك تريد إزالة
       جميع قوائم التشغيل الخاصة بك؟
   Subscription Settings:
-    Subscription Settings: 'إعدادات الاشتراك'
+    Subscription Settings: 'الاشتراك'
     Hide Videos on Watch: 'أخفِ الفيديوهات عند مشاهدتها'
     Fetch Feeds from RSS: 'جلب المحتوى عن طريق RSS'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'صيغة تصدير الاشتراكات'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'إدارة الاشتراكات'
-    Import Subscriptions: 'استيراد الاشتراكات'
-    Export Subscriptions: 'تصدير الاشتراكات'
-    How do I import my subscriptions?: 'كيف استورد اشتراكاتي؟'
     Fetch Automatically: جلب الخلاصة تلقائيا
-    Only Show Latest Video for Each Channel: عرض أحدث فيديو فقط لكل قناة
     Confirm Before Unsubscribing: تجنب إلغاء الاشتراك عن طريق الخطأ
-  Advanced Settings:
-    Advanced Settings: 'الإعدادات المتقدمة'
-    Enable Debug Mode (Prints data to the console): 'تمكين وضع التنقيح (يطبع البيانات
-      على الكونسول)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'عنوان البروكسي ( مثال :
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'يؤدي
-      النقر فوق زر"اختبار Proxy" إلى إرسال طلب إلى https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'استخدم Tor / Proxy لطلبات ال API'
-    TEST PROXY: 'اختبار Proxy'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'اطّلع على الحالات العامة'
-    Clear History:
-      Clear History: 'محو السجلّ'
-      # On Click
-      Are you sure you want to delete your history?: 'هل أنت متأكد أنك تريد حذف السجلّ
-        الخاص بك؟'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'محو الاشتراكات'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'هل أنت متأكد أنك تريد إزالة
-        كافة الاشتراكات؟'
-      #& Yes
-      #& No
 
   Data Settings:
     How do I import my subscriptions?: كيف استورد اشتراكاتي؟
@@ -514,14 +473,10 @@ Settings:
     Export YouTube: تصدير Youtube
     Export FreeTube: تصدير FreeTube
     Export Subscriptions: تصدير الاشتراكات
-    Import NewPipe: استيراد NewPipe
-    Import YouTube: استيراد YouTube
-    Import FreeTube: استيراد FreeTube
     Import Subscriptions: استيراد الاشتراكات
     Select Export Type: حدّد نوع التصدير
     Select Import Type: حدّد نوع الاستيراد
-    Data Settings: إعدادات البيانات
-    Check for Legacy Subscriptions: تحقق من وجود اشتراكات بالصيغة القديمة
+    Data Settings: البيانات
     Manage Subscriptions: إدارة الإشتراكات
     All playlists has been successfully imported: تم استيراد جميع قوائم التشغيل بنجاح
     Playlist insufficient data: 'بيانات غير كافية لقائمة التشغيل "{playlist}" ، تخطي
@@ -549,7 +504,7 @@ Settings:
     Hide Channel Subscribers: اخف عدد اشتراكات القناة
     Hide Video Views: اخف عدد مشاهدات الفيديو
     Hide Video Likes And Dislikes: إخفاء الإعجاب وعدم الإعجاب للفيديو
-    Distraction Free Settings: إعدادات عدم الإزعاج
+    Distraction Free Settings: عدم الإزعاج
     Hide Active Subscriptions: اخفي الإشتراكات الناشطة
     Hide Playlists: إخفاء قوائم التشغيل
     Hide Video Description: إخفاء وصف الفيديو
@@ -578,7 +533,6 @@ Settings:
     Hide Subscriptions Shorts: إخفاء الاشتراكات الفيدوهات القصيرة
     Hide Subscriptions Videos: إخفاء مقاطع فيديو الاشتراكات
     Hide Profile Pictures in Comments: إخفاء صور الملف الشخصي في التعليقات
-    Blur Thumbnails: اخفاء الصور المصغرة
     Hide Subscriptions Community: إخفاء مجتمع الاشتراكات
     Hide Channels Invalid: معرف القناة المقدم غير صالح
     Hide Channels Disabled Message: تم حظر بعض القنوات باستخدام المعرّف ولم تتم معالجتها.
@@ -602,17 +556,21 @@ Settings:
     Proxy Host: خادوم البروكسي
     Proxy Protocol: بروتوكول البروكسي
     Enable Tor / Proxy: تفعيل تور / البروكسي
-    Proxy Settings: خيارات البروكسي
+    Proxy Settings: البروكسي
     Error getting network information. Is your proxy configured properly?: هنالك خطأ
       في جلب معلومات الشبكة. هل ضبطت إعدادات وكيلك بصورة صحيحة؟
     Clicking on Test Proxy will send a request to: النقر على اختبار البروكسي سيؤدي
       إلى إرسال طلب إلى
+    Proxy Warning: لا يحتوي FreeTube على وكيل مدمج ولكن يمكنه الاتصال بوكيل خارجي،
+      مثل وكيل يعمل على جهازك مثل Tor أو وكيل خارجي مثل وكيل SOCKS5 الذي توفره بعض
+      شبكات VPN. إذا تم التمكين، فتأكد من تكوين الوكيل/الاختصاص الخاص بك بشكل صحيح،
+      وإلا فلن يتمكن FreeTube من جلب أي بيانات.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: تنبيه عندما يتم تخطي شريحة الراعي
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       عنوان (الافتراضي هو https://sponsor.ajay.app)
     Enable SponsorBlock: تفعيل حجب الرعاة
-    SponsorBlock Settings: إعدادات حظر الرعاة
+    SponsorBlock Settings: حظر الرعاة
     Category Color: لون الفئة
     Skip Options:
       Auto Skip: تخطي تلقائي
@@ -629,13 +587,13 @@ Settings:
     Custom External Player Arguments: وسيطات المشغل الخارجي المخصصة
     Custom External Player Executable: مشغل خارجي مخصص قابل للتنفيذ
     Ignore Unsupported Action Warnings: تجاهل تحذيرات الإجراءات غير المدعومة
-    External Player Settings: إعدادات المشغل الخارجي
+    External Player Settings: المشغل الخارجي
     Players:
       None:
         Name: لاشيء
     Ignore Default Arguments: تجاهل الحجج الافتراضية
   Download Settings:
-    Download Settings: إعدادات التنزيل
+    Download Settings: التنزيل
     Choose Path: اختر المسار
     Ask Download Path: اطلب مسار التنزيل
     Download Behavior: سلوك التحميل
@@ -643,57 +601,30 @@ Settings:
     Download in app: تحميل في التطبيق
   Parental Control Settings:
     Hide Search Bar: إخفاء شريط البحث
-    Parental Control Settings: إعدادات الرقابة الأبوية
+    Parental Control Settings: الرقابة الأبوية
     Hide Unsubscribe Button: إخفاء زر إلغاء الاشتراك
     Show Family Friendly Only: عرض مناسب للعائلة فقط
   Experimental Settings:
     Replace HTTP Cache: استبدال ذاكرة التخزين المؤقت HTTP
-    Experimental Settings: الإعدادات التجريبية
+    Experimental Settings: الاختبارية
     Warning: هذه الإعدادات تجريبية ، فهي تسبب أعطال أثناء تمكينها. يوصى بشدة بعمل
       نسخ احتياطية. استخدمها على مسؤوليتك الخاصة!
   Password Settings:
     Set Password To Prevent Access: تعيين كلمة مرور لمنع الوصول إلى الإعدادات
     Remove Password: إزالة كلمة المرور
-    Password Settings: إعدادات كلمة المرور
+    Password Settings: كلمة المرور
     Set Password: ضبط كلمة السر
   Password Dialog:
     Password Incorrect: كلمة المرور غير صحيحة
     Password: كلمة السر
     Enter Password To Unlock: أدخل كلمة المرور لإلغاء قفل الإعدادات
     Unlock: الغاء القفل
-  Expand All Settings Sections: توسيع كافة أقسام الإعدادات
   Sort Settings Sections (A-Z): أقسام إعدادات الفرز (من الألف إلى الياء)
+  Return to Settings Menu: العودة إلى قائمة الإعدادات
 About:
   #On About page
   About: 'حول'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'هذا
-    البرنامج متروك الحقوق مرخّص بحرية AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    وجدت خطأ؟ تريد اقتراح ميزة؟ تريد المساعدة؟ تحقق من صفحة GitHub الخاصة بنا. طلبات
-    الإضافة مرحب بها.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'شكراً
-    جزيلاً للأشخاص والمشاريع التي جعلت FreeTube ممكنًا!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'هل
-    تريد الدردشة؟ انضم إلى سيرفرنا على Element / Matrix. يرجى التحقق من القواعد قبل
-    الانضمام.'
-
-  'Looking for help? Check out our Wiki page.': 'هل تبحث عن المساعدة؟ اطّلع على صفحة
-    الويكي الخاصة بنا.'
-
-  Check out our Firefox extension!: 'تفقّد إضافتنا على فايرفوكس!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'إذا
-    كنت تستمتع باستخدام FreeTube، ففكر في التبرع عبر Liberapay أو من خلال عنوان Bitcoin
-    الخاص بنا.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'آخر أخبار FreeTube'
-
   Donate: التبرع
   Translate: ساعدنا في ترجمة Freetube
   Chat on Matrix: الدردشة على ماتريكس
@@ -704,7 +635,6 @@ About:
   Report a problem: الإبلاغ عن مشكلة
   FAQ: الأسئلة المتداولة
   Help: المساعدة
-  View License: اعرض الرخصة
   Source code: الشفرة المصدرية
   Beta: تجريبي
   these people and projects: هؤلاء الناس والمشاريع
@@ -717,7 +647,6 @@ About:
   FreeTube Wiki: ويكي Freetube
   GitHub releases: إصدارات GitHub
   Downloads / Changelog: التحميلات\التغييرات
-  Licensed under the AGPLv3: مرخّص تحت رخصة أفيرو جيبيإل النسخة الثالثة
   Discussions: المناقشات
   Licensed under the: مرخص تحت
   AGPLv3: رخصة أفيرو العمومية الإصدار ٣
@@ -764,7 +693,7 @@ Profile:
   Other Channels: قنوات أُخرى
   Subscription List: قائمة الاشتراكات
   Profile Filter: مرشح الملف الشخصي
-  Profile Settings: إعدادات الملف الشخصي
+  Profile Settings: الملف الشخصي
   Toggle Profile List: تبديل قائمة الملف الشخصي
   Open Profile Dropdown: فتح القائمة المنسدلة للملف الشخصي
   Close Profile Dropdown: إغلاق القائمة المنسدلة للملف الشخصي
@@ -819,6 +748,9 @@ Channel:
     votes: '{votes} أصوات'
     Reveal Answers: كشف الإجابات
     Video hidden by FreeTube: تم إخفاء الفيديو بواسطة FreeTube
+    Viewing Posts Only Supported By Invidious: عرض المنشورات مدعوم فقط من قبل Invidious.
+      توجه إلى علامة التبويب مجتمع القناة لعرض المحتوى هناك دون Invidious.
+    View Full Post: عرض المنشور كاملا
   Live:
     Live: مباشر
     This channel does not currently have any live streams: لا يوجد حاليا أي بث مباشر
@@ -861,38 +793,8 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'المحادثة
     المباشرة غير مدعومة حالياً مع Invidious API. يلزم الاتصال المباشر بيوتيوب.'
   Published:
-    Jan: 'يناير'
-    Feb: 'فبراير'
-    Mar: 'مارس'
-    Apr: 'أبريل'
-    May: 'مايو'
-    Jun: 'يونيو'
-    Jul: 'يوليو'
-    Aug: 'أغسطس'
-    Sep: 'سبتمبر'
-    Oct: 'أكتوبر'
-    Nov: 'نوفمبر'
-    Dec: 'ديسمبر'
-    Second: 'ثانية'
-    Seconds: 'ثواني'
-    Minute: 'دقيقة'
-    Minutes: 'دقائق'
-    Hour: 'ساعة'
-    Hours: 'ساعات'
-    Day: 'يوم'
-    Days: 'أيام'
-    Week: 'أسبوع'
-    Weeks: 'أسابيع'
-    Month: 'شهر'
-    Months: 'شهور'
-    Year: 'سنة'
-    Years: 'سنوات'
-    Ago: 'منذ'
-    Upcoming: 'يبدأ العرض'
-    Less than a minute: أقل من دقيقة
     In less than a minute: في أقل من دقيقة
   Published on: 'نُشر في'
-  Publicationtemplate: 'قبل {number} {unit}'
 #& Videos
   Autoplay: تشغيل تلقائي
   Play Previous Video: شغل الفيديو السابق
@@ -950,6 +852,43 @@ Video:
   Unhide Channel: عرض القناة
   Hide Channel: إخفاء القناة
   More Options: المزيد من الخيارات
+  Player:
+    TranslatedCaptionTemplate: '{language} (مترجمة من "{originalLanguage}")'
+    Stats:
+      Volume: 'الحجم: {volumePercentage}%'
+      CodecAudio: 'برنامج الترميز: {audioCodec} ({audioItag})'
+      Media Formats: 'تنسيقات الوسائط: {formats}'
+      Player Dimensions: 'أبعاد المشغل: {width}×{height}'
+      Bitrate: 'معدل البت: {bitrate} كيلوبت في الثانية'
+      CodecsVideoAudioNoItags: 'برامج الترميز: {videoCodec} / {audioCodec}'
+      Buffered: 'المخزن المؤقت: {bufferedPercentage}%'
+      Dropped Frames / Total Frames: 'الإطارات المسقطة: {droppedFrames} / إجمالي الإطارات:
+        {totalFrames}'
+      CodecsVideoAudio: 'برامج الترميز: {videoCodec} ({videoItag}) / {audioCodec}
+        ({audioItag})'
+      Stats: الاحصائيات
+      Video ID: 'معرف الفيديو: {videoId}'
+      Resolution: 'الدقة: {width}x{height}@{frameRate}'
+      Bandwidth: 'عرض النطاق الترددي: {bandwidth} كيلوبت في الثانية'
+    Skipped segment: تم تخطي شريحة {segmentCategory}
+    Theatre Mode: وضع المسرح
+    Exit Theatre Mode: الخروج من وضع المسرح
+    Show Stats: عرض الاحصائيات
+    You appear to be offline: يبدو أنك غير متصل بالإنترنت.
+    Playback will resume automatically when your connection comes back: سيتم استئناف
+      التشغيل تلقائيًا عندما يعود اتصالك.
+    Audio Tracks: المسارات الصوتية
+    Full Window: الشاشة كاملة
+    Exit Full Window: الخروج من وضع الشاشة الكاملة
+    Take Screenshot: اخذ لقطة الشاشة
+    Hide Stats: اخفاء الاحصائيات
+  IP block: حظر YouTube عنوان IP الخاص بك من مشاهدة مقاطع الفيديو. يرجى محاولة التبديل
+    إلى VPN أو وكيل مختلف.
+  Unlisted: غير مدرج
+  AgeRestricted: لا يمكن مشاهدة مقاطع الفيديو المقيدة حسب العمر مع FreeTube لأنها
+    تتطلب تسجيل الدخول إلى Google واستخدام حساب YouTube تم التحقق من عمره.
+  MembersOnly: لا يمكن مشاهدة مقاطع الفيديو الخاصة بالأعضاء فقط مع FreeTube لأنها
+    تتطلب تسجيل الدخول إلى Google والعضوية المدفوعة لقناة القائم بالتحميل.
 Videos:
   #& Sort By
   Sort By:
@@ -960,9 +899,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'عرض قائمة التشغيل بالكامل'
-  Videos: 'الفيديوهات'
-  View: 'عرض'
-  Views: 'مشاهدات'
   Last Updated On: 'تم إجراء التعديل الأخير في'
 
 # On Video Watch Page
@@ -978,7 +914,8 @@ Playlist:
     VideoTitleAscending: العنوان (A-Z)
     VideoTitleDescending: العنوان (Z-A)
     Custom: مُخصّص
-Toggle Theatre Mode: 'تمكين وضع المسرح'
+    VideoDurationDescending: المدة (الاطول أولاً)
+    VideoDurationAscending: المدة (الأقصر أولاً)
 Change Format:
   Change Media Formats: 'تغيير تنسيقات الفيديو'
   Use Dash Formats: 'استخدم تنسيقات DASH'
@@ -986,6 +923,8 @@ Change Format:
   Use Audio Formats: 'استخدم تنسيقات الصوت'
   Audio formats are not available for this video: تنسيقات الصوت غير متوفرة لهذا الفيديو
   Dash formats are not available for this video: تنسيقات DASH غير متوفرة لهذا الفيديو
+  Legacy formats are not available for this video: لا تتوفر التنسيقات القديمة لهذا
+    الفيديو
 Share:
   Share Video: 'شارك الفيديو'
   Share Playlist: 'مشاركة قائمة التشغيل'
@@ -1029,6 +968,7 @@ Comments:
   View {replyCount} replies: عرض {replyCount} ردود
   Hearted: القلب
   Subscribed: مشترك
+  There are no comments available for this post: لا توجد تعليقات متاحة لهذا المنشور
 Up Next: 'التالي'
 
 # Toast Messages
@@ -1036,7 +976,6 @@ Local API Error (Click to copy): 'خطأ API المحلي (انقر للنسخ)'
 Invidious API Error (Click to copy): 'خطأ Invidious API ( انقر للنسخ)'
 Falling back to Invidious API: 'التراجع إلى Invidious API'
 Falling back to Local API: 'التراجع إلى API المحلي'
-Subscriptions have not yet been implemented: 'لم يتم تنفيذ الاشتراكات بعد'
 Loop is now disabled: 'تم تعطيل التكرار'
 Loop is now enabled: 'تم تمكين التكرار'
 Shuffle is now disabled: 'تم تعطيل التبديل العشوائي'
@@ -1072,8 +1011,8 @@ Tooltips:
     Region for Trending: الانتشار المحلي (Trend) يسمح لك بأن تشاهد الفيديوهات الأكثر
       انتشارا حسب الدولة. ليست كل الدول المعروضة في هذه القائمة مدعومة من طرف يوتيوب.
   Player Settings:
-    Proxy Videos Through Invidious: سيتم الاتصال ب Invidious لتقديم مقاطع الفيديو
-      بدلاً من إجراء اتصال مباشر مع يوتيوب. يلغي تفضيل الواجهة البرمجية.
+    Proxy Videos Through Invidious: سيتم الاتصال بـ Invidious لعرض مقاطع الفيديو بدلاً
+      من إجراء اتصال مباشر بـ YouTube.
     Default Video Format: حدّد التنسيقات المستخدمة عند تشغيل الفيديو. تنسيق داش (التدفق
       الميكانيكي المتكيّف عبر بروتوكول نقل النص التشعبي) يمكنها أن تُشغِّل جودات أعلى.
       التنسيقات القديمة محدودة بجودة 720p كحدّ أقصى لكنها تستخدم عرضًا أقل للنطاق.
@@ -1085,9 +1024,9 @@ Tooltips:
       يتم تغييره في الإعدادات).
     Skip by Scrolling Over Video Player: استخدم عجلة التمرير لتخطي الفيديو بنمط MPV.
   Subscription Settings:
-    Fetch Feeds from RSS: عند تفعيلها، سوف يستخدم فريتيوب طريقة RSS بدلًا من طريقته
-      المعتادة لجلب صفحة اشتراكاتك. طريقة RSS أسرع وتتخطى حجب الآي بي IP، لكنها لا
-      تقدّم معلومات معينة مثل مدّة الفيديو أو حالة البث المباشر
+    Fetch Feeds from RSS: عند تمكينه، سيستخدم FreeTube RSS بدلاً من طريقته الافتراضية
+      للحصول على خلاصة اشتراكك. RSS أسرع ويمنع حظر IP، لكنه لا يوفر معلومات معينة
+      مثل مدة الفيديو أو الحالة المباشرة أو مشاركات المجتمع
     Fetch Automatically: عند التمكين ، سيقوم FreeTube تلقائيا بجلب خلاصة الاشتراك
       الخاصة بك عند فتح نافذة جديدة وعند تبديل ملف التعريف.
   External Player Settings:
@@ -1128,8 +1067,6 @@ This video is unavailable because of missing formats. This can happen due to cou
 More: المزيد
 Playing Next Video Interval: سيتم تشغيل الفيديو التالي على الفور.| إضغط للإلغاء.|
   سيبدأ الفيديو التالي في {nextVideoInterval} ثانية.| إضغط للإلغاء.
-Hashtags have not yet been implemented, try again later: لم يتم تنفيذ علامات التصنيف
-  بعد، حاول مرة أخرى لاحقا
 Unknown YouTube url type, cannot be opened in app: نوع URL غير معروف على YouTube،
   لا يمكن فتحه في التطبيق
 Open New Window: افتح نافذة جديدة
@@ -1150,12 +1087,10 @@ Screenshot Error: فشل أخذ لقطة للشاشة. {error}
 New Window: نافذة جديدة
 Channels:
   Count: تم العثور على قناة (قنوات) {number}.
-  Unsubscribed: 'تمت إزالة {channelName} من اشتراكاتك'
   Channels: القنوات
   Title: قائمة القنوات
   Search bar placeholder: البحث في القنوات
   Empty: قائمة قنواتك فارغة حاليا.
-  Unsubscribe: إلغاء الاشتراك
   Unsubscribe Prompt: 'هل أنت متأكد من أنك تريد إلغاء الاشتراك من "{channelName}"؟'
 Clipboard:
   Cannot access clipboard without a secure connection: لا يمكن الوصول إلى الحافظة
@@ -1167,6 +1102,7 @@ Chapters:
     الحالي: {chapterName}'
   'Chapters list visible, current chapter: {chapterName}': 'قائمة الفصول المرئية ،
     الفصل الحالي: {chapterName}'
+  Key Moments: ‌العناصر الرئيسية
 Preferences: التفضيلات
 Ok: موافق
 Hashtag:
@@ -1204,5 +1140,10 @@ Search Listing:
     4K: 4K
     Closed Captions: التعاليق مغلقة
     Subtitles: التسميات التوضيحية
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: جديد
+    3D: ثلاثي الابعاد
 'Blocked opening potentially unsafe URL': 'تم حظر فتح الرابط الذي يحتمل أن يكون غير
   آمن: "{url}".'
diff --git a/static/locales/az.yaml b/static/locales/az.yaml
index 86539cbbce30b..5fcddb2d28cad 100644
--- a/static/locales/az.yaml
+++ b/static/locales/az.yaml
@@ -97,7 +97,9 @@ Subscriptions:
     profilin çoxlu sayda abunəsi var. Sürət məhdudiyyətinin qarşısını almaq üçün RSS-i
     zorlanır'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Abunəlik
-    siyahınız hazırda boşdur. Abunəlikləri burada görmək üçün əlavə etməyə başlayın.'
+    siyahınız hazırda boşdur. Abunəliklərinizi idxal etmək istəyirsinizsə, Məlumat
+    Parametrlərinə gedib ''Abunəlikləri İdxal Et'' seçimini edə bilərsiniz və ya bir
+    kanal axtarıb abunə ola bilərsiniz.'
   'Getting Subscriptions. Please wait.': 'Abunəliklərin əldə edilməsi. Zəhmət olmasa,
     gözləyin.'
   Refresh Subscriptions: 'Abunəlikləri Yeniləyin'
@@ -123,12 +125,6 @@ Most Popular: 'Ən Tanınmış'
 Playlists: 'Pleylistlər'
 User Playlists:
   Your Playlists: 'Pleylistləriniz'
-  Playlist Message: 'Bu səhifə tam işləyən pleylistləri əks etdirmir. O, yalnız saxladığınız
-    və ya sevimli seçdiyiniz videoları sadalayır. İş bitəndə, hazırda buradakı bütün
-    videolar "Sevimlilər" pleylistinə köçürüləcək.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Saxladığınız
-    videolar yoxdur. Videonun burada qeyd edilməsi üçün video küncündəki "saxla" düyməsin
-    klikləyin'
   Empty Search Message: 'Bu pleylistdə axtarışınıza uyğun video yoxdur'
   Search bar placeholder: 'Pleylist Axtar'
   Playlists with Matching Videos: Uyğun videolar olan pleylistlər
@@ -335,7 +331,6 @@ Settings:
   Player Settings:
     Screenshot: {}
   SponsorBlock Settings: {}
-  Expand All Settings Sections: Bütün Tənzimlər Bölmələrin Genişlət
   Sort Settings Sections (A-Z): Tənzimləmələr Bölmələrin Çeşidlə (AZ)
 Channel:
   Videos: {}
@@ -352,6 +347,8 @@ Global:
     Video Count: 1 video | {count} video
     Watching Count: 1 baxır | {count} baxır
     Channel Count: 1 kanal | {count} kanal
+    Like Count: 1 bəyəni | {sayı} bəyənmələr
+    Comment Count: 1 şərh | {sayı} şərhlər
   Videos: Videolar
   Live: Canlı
   Input Tags:
@@ -363,10 +360,13 @@ Search Listing:
     Closed Captions: Titrlər Bağlandı
     4K: 4K
     Subtitles: Titrlər
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Yeni
+    3D: 3D
 Channels:
   Empty: Kanal siyahınız hazırda boşdur.
-  Unsubscribe: Abunə olma
-  Unsubscribed: '{channelName} abunəliyinizdən silindi'
   Unsubscribe Prompt: '"{channelName}" / abunəliyi ləğv etmək istədiyinizə əminsiniz?'
   Channels: Kanallar
   Count: '{number} kanal tapıldı.'
diff --git a/static/locales/be.yaml b/static/locales/be.yaml
index de0224d27cce1..78f5f1a8dc80f 100644
--- a/static/locales/be.yaml
+++ b/static/locales/be.yaml
@@ -42,7 +42,7 @@ Are you sure you want to open this link?: 'Вы ўпэўнены, што хоч
 # Anything shared among components / views should be put here
 Global:
   Videos: 'Відэа'
-  Shorts: 'Shorts'
+  Shorts: 'Кароткія відэа'
   Live: 'Ужывую'
   Community: 'Супольнасць'
   Counts:
@@ -55,6 +55,8 @@ Global:
 # Search Bar
     Like Count: 1 лайк | {count} лайкаў
     Comment Count: 1 каментарый | {count} каментарыяў
+  Input Tags:
+    Length Requirement: Даўжыня цэтліка павінна быць не менш за {number} сімвалаў
 Search / Go to URL: 'Пошук / Перайсці да URL'
 Search Bar:
   Clear Input: 'Ачысціць увод'
@@ -116,7 +118,9 @@ Subscriptions:
     гэтага профілю вялікая колькасць падпісак.  Прымусовае выкарыстанне RSS, каб пазбегнуць
     абмежавання хуткасці'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваш
-    спіс падпісак зараз пусты. Пачніце дадаваць падпіскі, каб убачыць іх тут.'
+    спіс падпісак зараз пусты. Калі вы хочаце імпартаваць свае падпіскі, вы можаце
+    перайсці ў Налады даных і выбраць Імпартаваць падпіскі або вы можаце знайсці каналы
+    і падпісацца на іх.'
   Disabled Automatic Fetching: 'Вы адключылі аўтаматычнае загрузку падпісак. Каб убачыць
     іх тут, абнавіце падпіскі.'
   Empty Channels: 'На каналах, на якія вы падпісаны, зараз няма відэа.'
@@ -135,8 +139,6 @@ Channels:
   Search bar placeholder: 'Пошук каналаў'
   Count: '{number} каналы(аў) знойдзена.'
   Empty: 'Ваш спіс каналаў зараз пусты.'
-  Unsubscribe: 'Адпісацца'
-  Unsubscribed: '{channelName} быў выдалены з вашых падпісак'
   Unsubscribe Prompt: 'Вы сапраўды хочаце адпісацца ад "{channelName}"?'
 Trending:
   Trending: 'У трэндзе'
@@ -149,12 +151,6 @@ Most Popular: 'Папулярныя'
 Playlists: 'Плэй-лісты'
 User Playlists:
   Your Playlists: 'Вашы плэй-лісты'
-  Playlist Message: 'Гэтая старонка не адлюстроўвае цалкам працоўныя плэй-лісты. Тут
-    пералічаны толькі відэа, якія вы захавалі або дадалі ў абранае. Калі праца будзе
-    завершана, усе відэа, якія знаходзяцца тут, будуць перанесены ў плэй-ліст «Выбранае».'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Вашы
-    захаваныя відэа пустыя. Націсніце на кнопку захавання ў куце відэа, каб яно з''явілася
-    тут'
   Empty Search Message: 'У гэтым плэй-лісце няма відэа, якія б адпавядалі вашаму пошуку'
   Search bar placeholder: 'Пошук плэй-лістоў'
   Create New Playlist: Стварыць новы плэй-ліст
@@ -223,6 +219,9 @@ User Playlists:
         гэтага відэа
       This playlist is already being used for quick bookmark.: Гэты плэй-ліст ужо
         выкарыстоўваецца для хуткай закладкі.
+      This playlist has a video with a duration error: Гэты плэй-ліст змяшчае прынамсі
+        адно відэа без працягласці. Яно будзе адсартаваны так, як быццам іх працягласць
+        роўная нулю.
     Search for Videos: Пошук відэа
   You have no playlists. Click on the create new playlist button to create a new one.: У
     вас няма плэй-лістоў. Націсніце на кнопку стварыць новы плэй-ліст, каб стварыць
@@ -278,7 +277,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: 'Праграму
     трэба перазапусціць, каб змены ўступілі ў сілу. Перазапусціць і прымяніць змены?'
   General Settings:
-    General Settings: 'Агульныя налады'
+    General Settings: 'Агульныя'
     Check for Updates: 'Праверыць наяўнасць абнаўленняў'
     Check for Latest Blog Posts: 'Праверыць апошнія паведамленні ў блогу'
     Fallback to Non-Preferred Backend on Failure: 'Вяртанне да непераважнага бэкэнда
@@ -289,7 +288,7 @@ Settings:
     System Default: 'Налада сістэмы'
     Preferred API Backend:
       Preferred API Backend: 'Пераважны бэкэнд API'
-      Local API: 'Мясцовы API'
+      Local API: 'Лакальны API'
       Invidious API: 'Invidious API'
     Video View Type:
       Video View Type: 'Тып прагляду відэа'
@@ -316,7 +315,7 @@ Settings:
     Region for Trending: 'Рэгіён для Трэндаў'
     #! List countries
     External Link Handling:
-      External Link Handling: 'Апрацоўка знешніх спасылак'
+      External Link Handling: 'Апрацоўка вонкавых спасылак'
       Open Link: 'Адкрыць спасылку'
       Ask Before Opening Link: 'Спытаць, перш чым адкрываць спасылку'
       No Action: 'Без дзеянняў'
@@ -324,7 +323,7 @@ Settings:
       Label: Аўтаматычная загрузка наступнай старонкі
       Tooltip: Аўтаматычна загружаць дадатковыя старонкі і каментарыі.
   Theme Settings:
-    Theme Settings: 'Налады тэмы'
+    Theme Settings: 'Тэма'
     Match Top Bar with Main Color: 'Выкарыстоўваць асноўны колер да верхняй панэлі'
     Expand Side Bar by Default: 'Разгарнуць бакавую панэль па змаўчанні'
     Disable Smooth Scrolling: 'Адключыць плыўную пракрутку'
@@ -342,8 +341,8 @@ Settings:
       Pastel Pink: 'Пастэльна-ружовая'
       Hot Pink: 'Ярка-ружовая'
       Nordic: Nordic
-      Solarized Dark: Solarized Dark
-      Solarized Light: Solarized Light
+      Solarized Dark: Solarized Цёмная
+      Solarized Light: Solarized Светлая
     Main Color Theme:
       Main Color Theme: 'Асноўны колер тэмы'
       Red: 'Чырвоны'
@@ -394,32 +393,34 @@ Settings:
     Secondary Color Theme: 'Другасны колер тэмы'
         #* Main Color Theme
   Player Settings:
-    Player Settings: 'Налады плэера'
+    Player Settings: 'Прайгравальнік'
     Play Next Video: 'Прайграваць наступнае відэа'
     Turn on Subtitles by Default: 'Уключыць субцітры па змаўчанні'
     Autoplay Videos: 'Аўтапрайграванне відэа'
     Proxy Videos Through Invidious: 'Глядзець відэа праз проксі Invidious'
     Autoplay Playlists: 'Аўтапрайграванне плэй-лістоў'
     Enable Theatre Mode by Default: 'Уключыць рэжым тэатра па змаўчанні'
-    Scroll Volume Over Video Player: ''
-    Scroll Playback Rate Over Video Player: ''
-    Skip by Scrolling Over Video Player: ''
-    Display Play Button In Video Player: ''
-    Enter Fullscreen on Display Rotate: ''
-    Next Video Interval: ''
-    Fast-Forward / Rewind Interval: ''
-    Default Volume: ''
-    Default Playback Rate: ''
-    Max Video Playback Rate: ''
-    Video Playback Rate Interval: ''
+    Scroll Volume Over Video Player: 'Прагортваць гучнасці па-над відэапрайгравальнікам'
+    Scroll Playback Rate Over Video Player: 'Прагортваць хуткасць прайгравання па-над
+      відэапрайгравальнікам'
+    Skip by Scrolling Over Video Player: 'Прапусціць, прагарнуўшы відэапрайгравальнік'
+    Display Play Button In Video Player: 'Адлюстроўваць кнопку прайгравання ў відэапрайгравальніку'
+    Enter Fullscreen on Display Rotate: 'Пераходзіць у поўнаэкранны рэжым пры павароце
+      дысплэя'
+    Next Video Interval: 'Інтэрвал да наступнага відэа'
+    Fast-Forward / Rewind Interval: 'Інтэрвал перамоткі наперад / назад'
+    Default Volume: 'Гучнасць па змаўчанні'
+    Default Playback Rate: 'Хуткасць прайгравання па змаўчанні'
+    Max Video Playback Rate: 'Максімальная хуткасць прайгравання відэа'
+    Video Playback Rate Interval: 'Інтэрвал хуткасці прайгравання відэа'
     Default Video Format:
-      Default Video Format: ''
-      Dash Formats: ''
-      Legacy Formats: ''
-      Audio Formats: ''
+      Default Video Format: 'Фармат відэа па змаўчанні'
+      Dash Formats: 'Фарматы DASH'
+      Legacy Formats: 'Састарэлыя фарматы'
+      Audio Formats: 'Аўдыё фарматы'
     Default Quality:
-      Default Quality: ''
-      Auto: ''
+      Default Quality: 'Якасць па змаўчанні'
+      Auto: 'Аўта'
       144p: '144p'
       240p: '240p'
       360p: '360p'
@@ -430,400 +431,484 @@ Settings:
       4k: '4k'
       8k: '8k'
     Screenshot:
-      Enable: ''
-      Format Label: ''
-      Quality Label: ''
-      Ask Path: ''
-      Folder Label: ''
-      Folder Button: ''
-      File Name Label: ''
-      File Name Tooltip: ''
+      Enable: 'Уключыць здымак экрана'
+      Format Label: 'Фармат здымка'
+      Quality Label: 'Якасць здымка'
+      Ask Path: 'Пытаць папку для захоўвання'
+      Folder Label: 'Папка для здымкаў'
+      Folder Button: 'Выбраць папку'
+      File Name Label: 'Шаблон назвы файла'
+      File Name Tooltip: 'Вы можаце выкарыстоўваць пераменныя ніжэй. %Y Год 4 лічбы.
+        %M Месяц 2 лічбы. %D Дні 2 лічбы. %H Гадзіны 2 лічбы. %N Хвіліны 2 лічбы.
+        %S Секунды 2 лічбы. %T Мілісекунды 3 лічбы. %s Секунды відэа. %t Мілісекунды
+        відэа 3 лічбы. %i Ідэнтыфікатар відэа. Вы таксама можаце выкарыстоўваць "\"
+        або "/" для стварэння падпапак.'
       Error:
-        Forbidden Characters: ''
-        Empty File Name: ''
+        Forbidden Characters: 'Забароненыя сімвалы'
+        Empty File Name: 'Пустая назва файла'
   External Player Settings:
-    External Player Settings: ''
-    External Player: ''
-    Ignore Unsupported Action Warnings: ''
-    Custom External Player Executable: ''
-    Custom External Player Arguments: ''
+    External Player Settings: 'Вонкавы прайгравальнік'
+    External Player: 'Вонкавы прайгравальнік'
+    Ignore Unsupported Action Warnings: 'Ігнараваць папярэджанні аб дзеяннях, якія
+      не падтрымліваюцца'
+    Custom External Player Executable: 'Шлях да ўласнага вонкавага прайгравальніка'
+    Custom External Player Arguments: 'Аргументы вонкавага прайгравальніка'
     Players:
       None:
-        Name: ''
+        Name: 'Ніякі'
+    Ignore Default Arguments: Ігнараваць аргументы па змаўчанні
   Privacy Settings:
-    Privacy Settings: ''
-    Remember History: ''
-    Save Watched Progress: ''
-    Save Watched Videos With Last Viewed Playlist: ''
-    Clear Search Cache: ''
-    Are you sure you want to clear out your search cache?: ''
-    Search cache has been cleared: ''
-    Remove Watch History: ''
-    Are you sure you want to remove your entire watch history?: ''
-    Watch history has been cleared: ''
-    Remove All Subscriptions / Profiles: ''
-    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
+    Privacy Settings: 'Прыватнасць'
+    Remember History: 'Памятаць гісторыю'
+    Save Watched Progress: 'Захоўваць прагрэс прагляду'
+    Save Watched Videos With Last Viewed Playlist: 'Захоўваць прагледжаныя відэа з
+      апошнім прагледжаным плэй-лістам'
+    Clear Search Cache: 'Ачысціць кэш пошуку'
+    Are you sure you want to clear out your search cache?: 'Вы ўпэўнены, што хочаце
+      ачысціць кэш пошуку?'
+    Search cache has been cleared: 'Кэш пошуку ачышчаны'
+    Remove Watch History: 'Выдаліць гісторыю праглядаў'
+    Are you sure you want to remove your entire watch history?: 'Вы ўпэўнены, што
+      хочаце выдаліць усю гісторыю праглядаў?'
+    Watch history has been cleared: 'Гісторыя праглядаў ачышчана'
+    Remove All Subscriptions / Profiles: 'Выдаліць усе падпіскі / профілі'
+    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'Вы
+      ўпэўнены, што хочаце выдаліць усе падпіскі і профілі?  Гэта нельга адмяніць.'
+    Are you sure you want to remove all your playlists?: Вы ўпэўнены, што хочаце выдаліць
+      усе свае плэй-лісты?
+    Remove All Playlists: Выдаліць усе плэй-лісты
+    All playlists have been removed: Усе плэй-лісты былі выдалены
   Subscription Settings:
-    Subscription Settings: ''
-    Hide Videos on Watch: ''
-    Fetch Feeds from RSS: ''
-    Manage Subscriptions: ''
-    Fetch Automatically: ''
+    Subscription Settings: 'Падпіскі'
+    Hide Videos on Watch: 'Хаваць відэа пасля прагляду'
+    Fetch Feeds from RSS: 'Атрымліваць стужкі з RSS'
+    Fetch Automatically: 'Аўтаматычна атрымліваць стужку'
+    Confirm Before Unsubscribing: Пацвердзіце перад тым як адпісацца
   Distraction Free Settings:
-    Distraction Free Settings: ''
+    Distraction Free Settings: 'Адцягненне ўвагі'
     Sections:
-      Side Bar: ''
-      Subscriptions Page: ''
-      Channel Page: ''
-      Watch Page: ''
-      General: ''
-    Blur Thumbnails: ''
-    Hide Video Views: ''
-    Hide Video Likes And Dislikes: ''
-    Hide Channel Subscribers: ''
-    Hide Comment Likes: ''
-    Hide Recommended Videos: ''
-    Hide Trending Videos: ''
-    Hide Popular Videos: ''
-    Hide Playlists: ''
-    Hide Live Chat: ''
-    Hide Active Subscriptions: ''
-    Hide Video Description: ''
-    Hide Comments: ''
-    Hide Profile Pictures in Comments: ''
-    Display Titles Without Excessive Capitalisation: ''
-    Hide Live Streams: ''
-    Hide Upcoming Premieres: ''
-    Hide Sharing Actions: ''
-    Hide Chapters: ''
-    Hide Channels: ''
-    Hide Channels Placeholder: ''
-    Hide Featured Channels: ''
-    Hide Channel Playlists: ''
-    Hide Channel Community: ''
-    Hide Channel Shorts: ''
-    Hide Channel Podcasts: ''
-    Hide Channel Releases: ''
-    Hide Subscriptions Videos: ''
-    Hide Subscriptions Shorts: ''
-    Hide Subscriptions Live: ''
-    Hide Subscriptions Community: ''
+      Side Bar: 'Бакавая панэль'
+      Subscriptions Page: 'Старонка падпісак'
+      Channel Page: 'Старонка каналу'
+      Watch Page: 'Старонка прагляду'
+      General: 'Агульныя'
+    Hide Video Views: 'Хаваць прагляды відэа'
+    Hide Video Likes And Dislikes: 'Хаваць лайкі і дызлайкі да відэа'
+    Hide Channel Subscribers: 'Хаваць падпісчыкаў каналу'
+    Hide Comment Likes: 'Хаваць лайкі да каментарыяў'
+    Hide Recommended Videos: 'Хаваць рэкамендаваныя відэа'
+    Hide Trending Videos: 'Схаваць трэндавыя відэа'
+    Hide Popular Videos: 'Хаваць папулярныя відэа'
+    Hide Playlists: 'Хаваць плэй-лісты'
+    Hide Live Chat: 'Хаваць жывы чат'
+    Hide Active Subscriptions: 'Хаваць актыўныя падпіскі'
+    Hide Video Description: 'Хаваць апісанне відэа'
+    Hide Comments: 'Хаваць каментарыі'
+    Hide Profile Pictures in Comments: 'Хаваць фатаграфіі профіляў у каментарыях'
+    Display Titles Without Excessive Capitalisation: 'Адлюстроўвайце загалоўкі без
+      празмерных вялікіх літар і знакаў прыпынку'
+    Hide Live Streams: 'Хаваць жывыя трансляцыі'
+    Hide Upcoming Premieres: 'Хаваць будучыя прэм''еры'
+    Hide Sharing Actions: 'Хаваць дзеянні абагульвання'
+    Hide Chapters: 'Хаваць раздзелы'
+    Hide Channels: 'Хаваць відэа з каналаў'
+    Hide Channels Placeholder: 'Ідэнтыфікатар канала'
+    Hide Featured Channels: 'Хаваць прапанаваныя каналы'
+    Hide Channel Playlists: 'Хаваць плэй-лісты канала'
+    Hide Channel Community: 'Хаваць супольнасць канала'
+    Hide Channel Shorts: 'Хаваць кароткія відэа канала'
+    Hide Channel Podcasts: 'Хаваць падкасты канала'
+    Hide Channel Releases: 'Хаваць выпускі канала'
+    Hide Subscriptions Videos: 'Хаваць відэа з падпісак'
+    Hide Subscriptions Shorts: 'Хаваць кароткія відэа з падпісак'
+    Hide Subscriptions Live: 'Хаваць жывыя трансляцыі з падпісак'
+    Hide Subscriptions Community: 'Хаваць супольнасць падпісак'
+    Hide Channels Already Exists: Ідэнтыфікатар канала ўжо існуе
+    Hide Videos and Playlists Containing Text: Хаваць відэа і плэй-лісты, якія змяшчаюць
+      тэкст
+    Hide Videos and Playlists Containing Text Placeholder: Слова, фрагмент слова або
+      фраза
+    Hide Channels Disabled Message: Некаторыя каналы былі заблакіраваны з дапамогай
+      ідэнтыфікатара і не былі апрацаваны. Функцыя заблакіравана, пакуль гэтыя ідэнтыфікатары
+      абнаўляюцца
+    Hide Channels Invalid: Памылковы ідэнтыфікатар канала
+    Hide Channels API Error: Памылка атрымання карыстальніка з указаным ідэнтыфікатарам.
+      Праверце яшчэ раз, ці правільны ідэнтыфікатар.
   Data Settings:
-    Data Settings: ''
-    Select Import Type: ''
-    Select Export Type: ''
-    Import Subscriptions: ''
-    Subscription File: ''
-    History File: ''
-    Playlist File: ''
-    Check for Legacy Subscriptions: ''
-    Export Subscriptions: ''
-    Export FreeTube: ''
-    Export YouTube: ''
-    Export NewPipe: ''
-    Import History: ''
-    Export History: ''
-    Import Playlists: ''
-    Export Playlists: ''
-    Profile object has insufficient data, skipping item: ''
-    All subscriptions and profiles have been successfully imported: ''
-    All subscriptions have been successfully imported: ''
-    Invalid subscriptions file: ''
+    Data Settings: 'Даныя'
+    Select Import Type: 'Выбраць тып імпарту'
+    Select Export Type: 'Выбраць тып экспарту'
+    Import Subscriptions: 'Імпарт падпісак'
+    Subscription File: 'Файл падпіскі'
+    History File: 'Файл гісторыі'
+    Playlist File: 'Файл плэй-лісту'
+    Export Subscriptions: 'Экспарт падпісак'
+    Export FreeTube: 'Экспарт FreeTube'
+    Export YouTube: 'Экспарт YouTube'
+    Export NewPipe: 'Экспарт NewPipe'
+    Import History: 'Імпарт гісторыі'
+    Export History: 'Экспарт гісторыі'
+    Import Playlists: 'Імпарт плэй-лістоў'
+    Export Playlists: 'Экспарт плэй-лістоў'
+    Profile object has insufficient data, skipping item: 'Аб''ект профілю мае недастаткова
+      даных, пропуск элемента'
+    All subscriptions and profiles have been successfully imported: 'Усе падпіскі
+      і профілі былі паспяхова імпартаваны'
+    All subscriptions have been successfully imported: 'Усе падпіскі былі паспяхова
+      імпартаваны'
+    Invalid subscriptions file: 'Няправільны файл падпісак'
     This might take a while, please wait: ''
-    Invalid history file: ''
-    Subscriptions have been successfully exported: ''
-    History object has insufficient data, skipping item: ''
-    All watched history has been successfully imported: ''
-    All watched history has been successfully exported: ''
-    Playlist insufficient data: ''
-    All playlists has been successfully imported: ''
-    All playlists has been successfully exported: ''
-    Unable to read file: ''
-    Unable to write file: ''
-    Unknown data key: ''
-    How do I import my subscriptions?: ''
-    Manage Subscriptions: ''
+    Invalid history file: 'Няправільны файл гісторыі'
+    Subscriptions have been successfully exported: 'Падпіскі былі паспяхова экспартаваныя'
+    History object has insufficient data, skipping item: 'Аб''ект гісторыі мае недастаткова
+      даных, пропуск элемента'
+    All watched history has been successfully imported: 'Уся гісторыя праглядаў была
+      паспяхова імпартавана'
+    All watched history has been successfully exported: 'Уся гісторыя праглядаў была
+      паспяхова экспартавана'
+    Playlist insufficient data: 'Недастаткова даных для плэй-ліста "{playlist}", пропуск
+      элемента'
+    All playlists has been successfully imported: 'Усе плэй-лісты былі паспяхова імпартаваны'
+    All playlists has been successfully exported: 'Усе плэй-лісты былі паспяхова экспартаваны'
+    Unable to read file: 'Немагчыма прачытаць файл'
+    Unable to write file: 'Немагчыма запісаць файл'
+    Unknown data key: 'Невядомы ключ даных'
+    How do I import my subscriptions?: 'Як мне імпартаваць свае падпіскі?'
+    Manage Subscriptions: 'Кіраванне падпіскамі'
+    Export Playlists For Older FreeTube Versions:
+      Label: Экспарт плэй-лістоў для старых версій FreeTube
+      Tooltip: "Гэты параметр экспартуе відэа з усіх плэй-лістоў у адзін плэй-ліст
+        пад назвай «Выбранае».\nЯк экспартаваць і імпартаваць відэа ў плэй-лісты для
+        старой версіі FreeTube:\n1. Экспартуйце свае плэй-лісты з уключанай опцыяй.\n
+        2. Выдаліце ўсе існуючыя плэй-лісты, выкарыстоўваючы опцыю «Выдаліць усе плэй-лісты»
+        ў раздзеле «Налады прыватнасці».\n3. Запусціце старую версію FreeTube і імпартуйце
+        экспартаваныя плэй-лісты.\""
   Proxy Settings:
-    Proxy Settings: ''
-    Enable Tor / Proxy: ''
-    Proxy Protocol: ''
-    Proxy Host: ''
-    Proxy Port Number: ''
-    Clicking on Test Proxy will send a request to: ''
-    Test Proxy: ''
-    Your Info: ''
-    Ip: ''
-    Country: ''
-    Region: ''
-    City: ''
-    Error getting network information. Is your proxy configured properly?: ''
+    Proxy Settings: 'Проксі'
+    Enable Tor / Proxy: 'Уключыць Tor / Проксі'
+    Proxy Protocol: 'Пратакол проксі'
+    Proxy Host: 'Адрас проксі'
+    Proxy Port Number: 'Нумар порта проксі'
+    Clicking on Test Proxy will send a request to: 'Пры націску на "Тэст проксі" будзе
+      адпраўлены запыт на'
+    Test Proxy: 'Тэст проксі'
+    Your Info: 'Ваша інфармацыя'
+    Ip: 'IP'
+    Country: 'Краіна'
+    Region: 'Рэгіён'
+    City: 'Горад'
+    Error getting network information. Is your proxy configured properly?: 'Памылка
+      атрымання інфармацыі аб сетцы. Ці правільна наладжаны ваш проксі?'
   SponsorBlock Settings:
-    SponsorBlock Settings: ''
-    Enable SponsorBlock: ''
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
-    Notify when sponsor segment is skipped: ''
-    UseDeArrowTitles: ''
+    SponsorBlock Settings: 'SponsorBlock'
+    Enable SponsorBlock: 'Уключыць SponsorBlock'
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'URL-адрас SponsorBlock
+      API (па змаўчанні https://sponsor.ajay.app)'
+    Notify when sponsor segment is skipped: 'Апавяшчаць, калі сегмент спонсара прапушчаны'
+    UseDeArrowTitles: 'Выкарыстоўваць загалоўкі відэа DeArrow'
     Skip Options:
-      Skip Option: ''
-      Auto Skip: ''
-      Show In Seek Bar: ''
-      Prompt To Skip: ''
-      Do Nothing: ''
-    Category Color: ''
+      Skip Option: 'Прапусціць варыянт'
+      Auto Skip: 'Аўтаматычны пропуск'
+      Show In Seek Bar: 'Паказваць на панэлі перамоткі'
+      Prompt To Skip: 'Прапаноўваць прапусціць'
+      Do Nothing: 'Нічога не рабіць'
+    Category Color: 'Колер катэгорыі'
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': URL-адрас
+      API генератара мініяцюр DeArrow (па змаўчанні https://dearrow-thumb.ajay.app)
+    UseDeArrowThumbnails: Выкарыстоўваць DeArrow для мініяцюр
   Parental Control Settings:
-    Parental Control Settings: ''
-    Hide Unsubscribe Button: ''
-    Show Family Friendly Only: ''
-    Hide Search Bar: ''
+    Parental Control Settings: 'Бацькоўскі кантроль'
+    Hide Unsubscribe Button: 'Хаваць кнопку адпіскі'
+    Show Family Friendly Only: 'Паказаць толькі для сямейнага прагляду'
+    Hide Search Bar: 'Хаваць панэль пошуку'
   Download Settings:
-    Download Settings: ''
-    Ask Download Path: ''
-    Choose Path: ''
-    Download Behavior: ''
-    Download in app: ''
-    Open in web browser: ''
+    Download Settings: 'Спампоўка'
+    Ask Download Path: 'Пытаць шлях спампоўкі'
+    Choose Path: 'Выберыце шлях'
+    Download Behavior: 'Паводзіны спампоўкі'
+    Download in app: 'Спампоўваць у праграме'
+    Open in web browser: 'Адкрываць у вэб-браўзеры'
   Experimental Settings:
-    Experimental Settings: ''
-    Warning: ''
-    Replace HTTP Cache: ''
+    Experimental Settings: 'Эксперыменты'
+    Warning: 'Гэтыя налады з''яўляюцца эксперыментальнымі, яны могуць выклікаць збоі,
+      пакуль уключаны. Настойліва рэкамендуецца рабіць рэзервовыя копіі. Выкарыстоўвайце
+      на свой страх і рызыку!'
+    Replace HTTP Cache: 'Замяніць кэш HTTP'
   Password Dialog:
-    Password: ''
-    Enter Password To Unlock: ''
-    Password Incorrect: ''
-    Unlock: ''
+    Password: 'Пароль'
+    Enter Password To Unlock: 'Каб разблакіраваць налады, увядзіце пароль'
+    Password Incorrect: 'Пароль няправільны'
+    Unlock: 'Разблакіраваць'
   Password Settings:
-    Password Settings: ''
-    Set Password To Prevent Access: ''
-    Set Password: ''
-    Remove Password: ''
+    Password Settings: 'Пароль'
+    Set Password To Prevent Access: 'Задайце пароль, каб забараніць доступ да налад'
+    Set Password: 'Задаць пароль'
+    Remove Password: 'Выдаліць пароль'
   Sort Settings Sections (A-Z): Сартаваць раздзелы налад (А-Я)
-  Expand All Settings Sections: Разгарнуць усе раздзелы налад
+  Return to Settings Menu: Вярнуцца ў меню налад
 About:
   #On About page
   About: 'Пра FreeTube'
-  Beta: ''
-  Source code: ''
-  Licensed under the AGPLv3: ''
-  View License: ''
-  Downloads / Changelog: ''
-  GitHub releases: ''
+  Beta: 'Бэта-версія'
+  Source code: 'Зыходны код'
+  Downloads / Changelog: 'Спампоўкі / Журнал змяненняў'
+  GitHub releases: 'Выпускі GitHub'
   Help: 'Даведка'
   FreeTube Wiki: 'FreeTube Вікі'
-  FAQ: ''
-  Discussions: ''
-  Report a problem: ''
-  GitHub issues: ''
-  Please check for duplicates before posting: ''
+  FAQ: 'Частыя пытанні'
+  Discussions: 'Абмеркаванні'
+  Report a problem: 'Паведаміць пра праблему'
+  GitHub issues: 'Праблемы на GitHub'
+  Please check for duplicates before posting: 'Перад публікацыяй праверце наяўнасць
+    дублікатаў'
   Website: 'Вэб-сайт'
   Blog: 'Блог'
   Email: 'Электронная пошта'
-  Mastodon: ''
-  Chat on Matrix: ''
-  Please read the: ''
-  room rules: ''
-  Translate: ''
-  Credits: ''
-  FreeTube is made possible by: ''
-  these people and projects: ''
-  Donate: ''
+  Mastodon: 'Mastodon'
+  Chat on Matrix: 'Чат у Matrix'
+  Please read the: 'Прачытайце'
+  room rules: 'правілы пакоя'
+  Translate: 'Перакласці'
+  Credits: 'Удзельнікі'
+  FreeTube is made possible by: 'FreeTube стаў магчымым дзякуючы'
+  these people and projects: 'гэтым людзям і праектам'
+  Donate: 'Ахвяраваць'
 
   AGPLv3: AGPLv3
+  Licensed under the: Пад ліцэнзіяй
 Profile:
-  Profile Settings: ''
-  Toggle Profile List: ''
-  Profile Select: ''
-  Profile Filter: ''
+  Profile Settings: 'Профіль'
+  Toggle Profile List: 'Пераключыць спіс профіляў'
+  Profile Select: 'Выбар профілю'
+  Profile Filter: 'Фільтр профілю'
   All Channels: 'Усе каналы'
-  Profile Manager: ''
-  Create New Profile: ''
-  Edit Profile: ''
-  Color Picker: ''
-  Custom Color: ''
-  Profile Preview: ''
-  Create Profile: ''
-  Update Profile: ''
-  Make Default Profile: ''
-  Delete Profile: ''
-  Are you sure you want to delete this profile?: ''
-  All subscriptions will also be deleted.: ''
-  Profile could not be found: ''
-  Your profile name cannot be empty: ''
-  Profile has been created: ''
-  Profile has been updated: ''
-  Your default profile has been set to {profile}: ''
-  Removed {profile} from your profiles: ''
-  Your default profile has been changed to your primary profile: ''
-  '{profile} is now the active profile': ''
-  Subscription List: ''
-  Other Channels: ''
-  '{number} selected': ''
-  Select All: ''
-  Select None: ''
-  Delete Selected: ''
-  Add Selected To Profile: ''
-  No channel(s) have been selected: ''
+  Profile Manager: 'Кіраванне профілямі'
+  Create New Profile: 'Стварыць новы профіль'
+  Edit Profile: 'Рэдагаваць профіль'
+  Color Picker: 'Выбар колеру'
+  Custom Color: 'Нестандартны колер'
+  Profile Preview: 'Папярэдні прагляд профілю'
+  Create Profile: 'Стварыць профіль'
+  Update Profile: 'Абнавіць профіль'
+  Make Default Profile: 'Зрабіць профілем па змаўчанні'
+  Delete Profile: 'Выдаліць профіль'
+  Are you sure you want to delete this profile?: 'Вы ўпэўнены, што хочаце выдаліць
+    гэты профіль?'
+  All subscriptions will also be deleted.: 'Усе падпіскі таксама будуць выдалены.'
+  Profile could not be found: 'Профіль не знойдзены'
+  Your profile name cannot be empty: 'Назва вашага профілю не можа быць пустой'
+  Profile has been created: 'Профіль створаны'
+  Profile has been updated: 'Профіль абноўлены'
+  Your default profile has been set to {profile}: 'Профілем па змаўчанню заданы {profile}'
+  Removed {profile} from your profiles: '{profile} выдалены з вашых профіляў'
+  Your default profile has been changed to your primary profile: 'Ваш профіль па змаўчанні
+    быў зменены на асноўны'
+  '{profile} is now the active profile': '{profile} цяпер актыўны профіль'
+  Subscription List: 'Спіс падпісак'
+  Other Channels: 'Іншыя каналы'
+  '{number} selected': '{number} выбрана'
+  Select All: 'Выбраць усе'
+  Select None: 'Ачысціць'
+  Delete Selected: 'Выдаліць выбранае'
+  Add Selected To Profile: 'Дадаць выбранае ў профіль'
+  No channel(s) have been selected: 'Канал(-ы) не выбраны'
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
-  : ''
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
+  : 'Гэта ваш асноўны профіль.  Вы ўпэўнены, што хочаце выдаліць выбраныя каналы?  Тыя
+    ж каналы будуць выдалены ў любым профілі, у якім яны знаходзяцца.'
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Вы
+    ўпэўнены, што хочаце выдаліць выбраныя каналы?  Канал не будзе выдалены з іншых
+    профіляў.'
 #On Channel Page
+  Edit Profile Name: Рэдагаваць назву профілю
+  Create Profile Name: Стварыце назву профілю
+  Profile Name: Назва профілю
+  Close Profile Dropdown: Зачыніць выпадное меню профілю
+  Open Profile Dropdown: Адкрыць выпадное меню профілю
 Channel:
-  Subscribe: ''
-  Unsubscribe: ''
-  Channel has been removed from your subscriptions: ''
-  Removed subscription from {count} other channel(s): ''
-  Added channel to your subscriptions: ''
-  Search Channel: ''
-  Your search results have returned 0 results: ''
-  Sort By: ''
-  This channel does not exist: ''
-  This channel does not allow searching: ''
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
-  Channel Tabs: ''
+  Subscribe: 'Падпісацца'
+  Unsubscribe: 'Адпісацца'
+  Channel has been removed from your subscriptions: 'Канал быў выдалены з вашых падпісак'
+  Removed subscription from {count} other channel(s): 'Выдалена падпіска з {count}
+    іншых каналаў'
+  Added channel to your subscriptions: 'Канал дададзены да вашых падпісак'
+  Search Channel: 'Шукаць на канале'
+  Your search results have returned 0 results: 'Пошук даў 0 вынікаў'
+  Sort By: 'Сартаваць'
+  This channel does not exist: 'Гэты канал не існуе'
+  This channel does not allow searching: 'Гэты канал не дазваляе шукаць'
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Гэты
+    канал абмежаваны па ўзросце, і зараз яго нельга праглядаць у FreeTube.'
+  Channel Tabs: 'Укладкі каналу'
   Videos:
-    Videos: ''
-    This channel does not currently have any videos: ''
+    Videos: 'Відэа'
+    This channel does not currently have any videos: 'Зараз на гэтым канале няма відэа'
     Sort Types:
-      Newest: ''
-      Oldest: ''
-      Most Popular: ''
+      Newest: 'Самае новае'
+      Oldest: 'Самае старое'
+      Most Popular: 'Самае папулярнае'
   Shorts:
-    This channel does not currently have any shorts: ''
+    This channel does not currently have any shorts: 'Зараз на гэтым канале няма кароткіх
+      відэа'
   Live:
-    Live: ''
-    This channel does not currently have any live streams: ''
+    Live: 'Ужывую'
+    This channel does not currently have any live streams: 'Зараз на гэтым канале
+      няма жывых трансляцый'
   Playlists:
-    Playlists: ''
-    This channel does not currently have any playlists: ''
+    Playlists: 'Плэй-лісты'
+    This channel does not currently have any playlists: 'Зараз на гэтым канале няма
+      плэй-лістоў'
     Sort Types:
-      Last Video Added: ''
-      Newest: ''
-      Oldest: ''
+      Last Video Added: 'Апошняе дададзенае відэа'
+      Newest: 'Самае новае'
+      Oldest: 'Самае старое'
   Podcasts:
-    Podcasts: ''
-    This channel does not currently have any podcasts: ''
+    Podcasts: 'Падкасты'
+    This channel does not currently have any podcasts: 'Зараз на гэтым канале няма
+      падкастаў'
   Releases:
-    Releases: ''
-    This channel does not currently have any releases: ''
+    Releases: 'Выпускі'
+    This channel does not currently have any releases: 'Зараз на гэтым канале няма
+      выпускаў'
   About:
-    About: ''
-    Channel Description: ''
+    About: 'Пра канал'
+    Channel Description: 'Апісанне канала'
     Tags:
-      Tags: ''
-      Search for: ''
-    Details: ''
-    Joined: ''
-    Location: ''
-    Featured Channels: ''
+      Tags: 'Цэтлікі'
+      Search for: 'Шукаць "{tag}"'
+    Details: 'Падрабязнасці'
+    Joined: 'Далучыўся'
+    Location: 'Месцазнаходжанне'
+    Featured Channels: 'Рэкамендаваныя каналы'
   Community:
-    This channel currently does not have any posts: ''
-    votes: ''
-    Reveal Answers: ''
-    Hide Answers: ''
+    This channel currently does not have any posts: 'Зараз на гэтым канале няма паведамленняў'
+    votes: '{votes} галасоў'
+    Reveal Answers: 'Адкрыць адказы'
+    Hide Answers: 'Схаваць адказы'
+    Video hidden by FreeTube: Відэа схавана FreeTube'ам
+    View Full Post: Глядзець поўны пост
+    Viewing Posts Only Supported By Invidious: Прагляд паведамленняў падтрымліваецца
+      толькі ў Invidious. Перайдзіце на ўкладку супольнасці канала, каб праглядзець
+      там змесціва без Invidious.
 Video:
-  Mark As Watched: ''
-  Remove From History: ''
-  Video has been marked as watched: ''
-  Video has been removed from your history: ''
-  Save Video: ''
-  Video has been saved: ''
-  Video has been removed from your saved list: ''
-  Open in YouTube: ''
-  Copy YouTube Link: ''
-  Open YouTube Embedded Player: ''
-  Copy YouTube Embedded Player Link: ''
-  Open in Invidious: ''
-  Copy Invidious Link: ''
-  Open Channel in YouTube: ''
-  Copy YouTube Channel Link: ''
-  Open Channel in Invidious: ''
-  Copy Invidious Channel Link: ''
-  Views: ''
-  Loop Playlist: ''
-  Shuffle Playlist: ''
-  Reverse Playlist: ''
-  Play Next Video: ''
-  Play Previous Video: ''
-  Pause on Current Video: ''
-  Watched: ''
-  Autoplay: ''
-  Starting soon, please refresh the page to check again: ''
+  Mark As Watched: 'Пазначыць як прагледжанае'
+  Remove From History: 'Выдаліць з гісторыі'
+  Video has been marked as watched: 'Відэа было пазначана як прагледжанае'
+  Video has been removed from your history: 'Відэа было выдалена з вашай гісторыі'
+  Save Video: 'Захаваць відэа'
+  Video has been saved: 'Відэа захавана'
+  Video has been removed from your saved list: 'Відэа было выдалена з вашага спісу
+    захаваных'
+  Open in YouTube: 'Адкрыць у YouTube'
+  Copy YouTube Link: 'Скапіяваць спасылку YouTube'
+  Open YouTube Embedded Player: 'Адкрыць убудаваны прайгравальнік YouTube'
+  Copy YouTube Embedded Player Link: 'Скапіяваць спасылку на ўбудаваны прайгравальнік
+    YouTube'
+  Open in Invidious: 'Адкрыць у Invidious'
+  Copy Invidious Link: 'Скапіяваць спасылку Invidious'
+  Open Channel in YouTube: 'Адкрыць канал у YouTube'
+  Copy YouTube Channel Link: 'Скапіяваць спасылку на канал YouTube'
+  Open Channel in Invidious: 'Адкрыць канал у Invidious'
+  Copy Invidious Channel Link: 'Скапіяваць спасылку на канал Invidious'
+  Views: 'Прагляды'
+  Loop Playlist: 'Зацыкліць плэй-ліст'
+  Shuffle Playlist: 'Перамяшаць плэй-ліст'
+  Reverse Playlist: 'Перавернуць плэй-ліст'
+  Play Next Video: 'Прайграць наступнае відэа'
+  Play Previous Video: 'Прайграць папярэдняе відэа'
+  Pause on Current Video: 'Прыпыніць на бягучым відэа'
+  Watched: 'Прагледжанае'
+  Autoplay: 'Аўтапрайграванне'
+  Starting soon, please refresh the page to check again: 'Хутка пачнецца, абнавіце
+    старонку, каб праверыць яшчэ раз'
   # As in a Live Video
-  Premieres on: ''
-  Premieres: ''
-  Upcoming: ''
-  Live: ''
-  Live Now: ''
-  Live Chat: ''
-  Enable Live Chat: ''
-  Live Chat is currently not supported in this build.: ''
-  'Chat is disabled or the Live Stream has ended.': ''
-  Live chat is enabled. Chat messages will appear here once sent.: ''
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
-  Show Super Chat Comment: ''
-  Scroll to Bottom: ''
-  Download Video: ''
-  video only: ''
-  audio only: ''
+  Premieres on: 'Прэм''еры на'
+  Premieres: 'Прэм''еры'
+  Upcoming: 'Хутка'
+  Live: 'Ужывую'
+  Live Now: 'Зараз у эфіры'
+  Live Chat: 'Жывы чат'
+  Enable Live Chat: 'Уключыць жывы чат'
+  Live Chat is currently not supported in this build.: 'Жывы чат зараз не падтрымліваецца
+    ў гэтай зборцы.'
+  'Chat is disabled or the Live Stream has ended.': 'Чат адключаны або жывая трансляцыя
+    скончылася.'
+  Live chat is enabled. Chat messages will appear here once sent.: 'Жывы чат уключаны.  Паведамленні
+    чата з''явяцца тут пасля адпраўкі.'
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Жывы
+    чат зараз не падтрымліваецца Invidious API.  Патрабуецца прамое падключэнне да
+    YouTube.'
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Жывы
+    чат недаступны для гэтай трансляцыі. Магчыма, ён быў адключаны запампавальнікам.'
+  Show Super Chat Comment: 'Паказаць каментарый Суперчата'
+  Scroll to Bottom: 'Пракруціць уніз'
+  Download Video: 'Спампаваць відэа'
+  video only: 'толькі відэа'
+  audio only: 'толькі аўдыё'
   Published:
-    Jan: ''
-    Feb: ''
-    Mar: ''
-    Apr: ''
-    May: ''
-    Jun: ''
-    Jul: ''
-    Aug: ''
-    Sep: ''
-    Oct: ''
-    Nov: ''
-    Dec: ''
-    Second: ''
-    Seconds: ''
-    Minute: ''
-    Minutes: ''
-    Hour: ''
-    Hours: ''
-    Day: ''
-    Days: ''
-    Week: ''
-    Weeks: ''
-    Month: ''
-    Months: ''
-    Year: ''
-    Years: ''
-    Ago: ''
-    Upcoming: ''
-    In less than a minute: ''
-  Published on: ''
-  Streamed on: ''
-  Started streaming on: ''
-  Publicationtemplate: ''
+    In less than a minute: 'Менш чым праз хвіліну'
+  Published on: 'Апублікавана'
+  Streamed on: 'Транслявалася'
+  Started streaming on: 'Трансляцыя пачалася'
   Sponsor Block category:
-    sponsor: ''
-    intro: ''
-    outro: ''
-    self-promotion: ''
-    interaction: ''
-    music offtopic: ''
-    recap: ''
-    filler: ''
+    sponsor: 'Спонсар'
+    intro: 'Увядзенне'
+    outro: 'Канцоўка'
+    self-promotion: 'Самарэклама'
+    interaction: 'Узаемадзеянне'
+    music offtopic: 'Музыка не па тэме'
+    recap: 'Падвядзенне вынікаў'
+    filler: 'Напаўняльнік'
   External Player:
-    OpenInTemplate: ''
-    video: ''
-    playlist: ''
-    OpeningTemplate: ''
-    UnsupportedActionTemplate: ''
+    OpenInTemplate: 'Адкрыць у {externalPlayer}'
+    video: 'відэа'
+    playlist: 'плэй-ліст'
+    OpeningTemplate: 'Адкрыццё {videoOrPlaylist} у {externalPlayer}...'
+    UnsupportedActionTemplate: '{externalPlayer} не падтрымлівае: {action}'
     Unsupported Actions:
-      starting video at offset: ''
-      setting a playback rate: ''
-      opening playlists: ''
-      opening specific video in a playlist (falling back to opening the video): ''
-      reversing playlists: ''
-      shuffling playlists: ''
-      looping playlists: ''
+      starting video at offset: 'пачатак відэа са зрушэннем'
+      setting a playback rate: 'налада хуткасці прайгравання'
+      opening playlists: 'адкрыццё плэй-лістоў'
+      opening specific video in a playlist (falling back to opening the video): 'адкрыццё
+        пэўнага відэа ў плэй-лісце (вяртанне да адкрыцця відэа)'
+      reversing playlists: 'пераварочванне плэй-ліста'
+      shuffling playlists: 'перамешванне плэй-лістоў'
+      looping playlists: 'зацыкліванне плэй-лістоў'
 #& Videos
+  Hide Channel: Схаваць канал
+  Unhide Channel: Паказаць канал
+  More Options: Іншыя параметры
+  IP block: YouTube заблакіраваў ваш IP-адрас для прагляду відэа. Паспрабуйце пераключыцца
+    на іншы VPN або проксі.
+  Player:
+    Audio Tracks: Гукавыя дарожкі
+    Full Window: Поўнаэкранны рэжым
+    Stats:
+      Stats: Статыстыка
+      Video ID: 'Ідэнтыфікатар відэа: {videoId}'
+      Media Formats: 'Фарматы медыя: {formats}'
+      Player Dimensions: 'Памеры прайгравальніка: {width}x{height}'
+      Bitrate: 'Бітрэйт: {bitrate} кбіт/с'
+      Buffered: 'Буферызавана: {bufferedPercentage}%'
+      Resolution: 'Раздзяляльнасць: {width}x{height}@{frameRate}'
+      Dropped Frames / Total Frames: 'Прапушчаныя кадры: {droppedFrames} / Усяго кадраў:
+        {totalFrames}'
+      CodecsVideoAudio: 'Кодэкі: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
+      CodecsVideoAudioNoItags: 'Кодэкі: {videoCodec} / {audioCodec}'
+      Volume: 'Гучнасць: {volumePercentage}%'
+      Bandwidth: 'Паласа прапускання: {bandwidth} кбіт/с'
+      CodecAudio: 'Кодэк: {audioCodec} ({audioItag})'
+    Skipped segment: Прапушчаны сегмент {segmentCategory}
+    TranslatedCaptionTemplate: '{language} (пераклад з "{originalLanguage}")'
+    Theatre Mode: Рэжым тэатра
+    Exit Full Window: Выйсці з поўнаэкраннага рэжыму
+    Hide Stats: Схаваць статыстыку
+    Take Screenshot: Зрабіць здымак
+    Show Stats: Паказаць статыстыку
+    Exit Theatre Mode: Выйдзіце з рэжыму тэатра
+    You appear to be offline: Здаецца, вы па-за сеткай.
+    Playback will resume automatically when your connection comes back: Прайграванне
+      ўзновіцца аўтаматычна, калі падключэнне адновіцца.
 Videos:
   #& Sort By
   Sort By:
@@ -835,9 +920,6 @@ Playlist:
   #& About
   Playlist: 'Плэй-ліст'
   View Full Playlist: 'Праглядзець увесь плэй-ліст'
-  Videos: 'Відэа'
-  View: ''
-  Views: 'Прагляды'
   Last Updated On: 'Апошняе абнаўленне'
 
 # On Video Watch Page
@@ -852,14 +934,19 @@ Playlist:
     DateAddedOldest: Старыя спачатку
     VideoTitleAscending: Назва (А-Я)
     VideoTitleDescending: Назва (Я-А)
-Toggle Theatre Mode: 'Пераключыць рэжым тэатра'
+    VideoDurationAscending: Працягласць (спачатку кароткія)
+    VideoDurationDescending: Працягласць (спачатку доўгія)
 Change Format:
-  Change Media Formats: ''
-  Use Dash Formats: ''
-  Use Legacy Formats: ''
-  Use Audio Formats: ''
-  Dash formats are not available for this video: ''
-  Audio formats are not available for this video: ''
+  Change Media Formats: 'Змяніць фарматы медыя'
+  Use Dash Formats: 'Выкарыстоўваць фарматы DASH'
+  Use Legacy Formats: 'Выкарыстоўваць старыя фарматы'
+  Use Audio Formats: 'Выкарыстоўваць аўдыяфарматы'
+  Dash formats are not available for this video: 'Фарматы DASH недаступныя для гэтага
+    відэа'
+  Audio formats are not available for this video: 'Аўдыяфарматы недаступныя для гэтага
+    відэа'
+  Legacy formats are not available for this video: Састарэлыя фарматы недаступныя
+    для гэтага відэа
 Share:
   Share Video: 'Падзяліцца відэа'
   Share Channel: 'Падзяліцца каналам'
@@ -867,23 +954,30 @@ Share:
   Include Timestamp: 'Дадаць метку часу'
   Copy Link: 'Скапіяваць спасылку'
   Open Link: 'Адкрыць спасылку'
-  Copy Embed: ''
-  Open Embed: ''
+  Copy Embed: 'Капіяваць для ўбудавання'
+  Open Embed: 'Адкрыць убудаванае'
   # On Click
-  Invidious URL copied to clipboard: ''
-  Invidious Embed URL copied to clipboard: ''
-  Invidious Channel URL copied to clipboard: ''
-  YouTube URL copied to clipboard: ''
-  YouTube Embed URL copied to clipboard: ''
-  YouTube Channel URL copied to clipboard: ''
+  Invidious URL copied to clipboard: 'URL-адрас Invidious скапіяваны ў буфер абмену'
+  Invidious Embed URL copied to clipboard: 'Invidious URL-адрас для ўбудавання скапіяваны
+    ў буфер абмену'
+  Invidious Channel URL copied to clipboard: 'URL-адрас канала Invidious скапіяваны
+    ў буфер абмену'
+  YouTube URL copied to clipboard: 'URL-адрас YouTube скапіяваны ў буфер абмену'
+  YouTube Embed URL copied to clipboard: 'URL-адрас YouTube для ўбудавання скапіяваны
+    ў буфер абмену'
+  YouTube Channel URL copied to clipboard: 'URL-адрас канала YouTube скапіяваны ў
+    буфер абмену'
 Clipboard:
-  Copy failed: ''
-  Cannot access clipboard without a secure connection: ''
+  Copy failed: 'Не атрымалася скапіяваць у буфер абмену'
+  Cannot access clipboard without a secure connection: 'Немагчыма атрымаць доступ
+    да буфера абмену без бяспечнага злучэння'
 
 Chapters:
   Chapters: 'Раздзелы'
-  'Chapters list visible, current chapter: {chapterName}': ''
-  'Chapters list hidden, current chapter: {chapterName}': ''
+  'Chapters list visible, current chapter: {chapterName}': 'Бачны спіс раздзелаў,
+    бягучы раздзел: {chapterName}'
+  'Chapters list hidden, current chapter: {chapterName}': 'Спіс раздзелаў схаваны,
+    бягучы раздзел: {chapterName}'
 
 Mini Player: 'Міні плэер'
 Comments:
@@ -911,75 +1005,127 @@ Comments:
   Pinned by: 'Замацавана'
   Member: 'Член'
   Subscribed: 'Падпісан'
-  Hearted: ''
+  Hearted: 'З сэрцам'
   There are no comments available for this post: Да гэтай публікацыі няма каментарыяў
 Up Next: 'Далей'
 
 #Tooltips
 Tooltips:
   General Settings:
-    Preferred API Backend: ''
-    Fallback to Non-Preferred Backend on Failure: ''
-    Thumbnail Preference: ''
-    Invidious Instance: ''
-    Region for Trending: ''
+    Preferred API Backend: 'Выберыце бэкэнд, які FreeTube выкарыстоўвае для атрымання
+      даных. Лакальны API - гэта ўбудаваны экстрактар. Для падключэння Invidious API
+      патрабуецца сервер Invidious.'
+    Fallback to Non-Preferred Backend on Failure: 'Калі ў вашым абраным API ўзнікае
+      праблема, FreeTube аўтаматычна паспрабуе выкарыстаць непрыярытэтны API у якасці
+      рэзервовага метаду, калі ён уключаны.'
+    Thumbnail Preference: 'Усе мініяцюры FreeTube будуць заменены кадрам відэа замест
+      мініяцюры па змаўчанні.'
+    Invidious Instance: 'Экземпляр Invidious, да якога FreeTube будзе падключацца
+      для выклікаў API.'
+    Region for Trending: 'Рэгіён трэндаў дазваляе вам выбраць папулярныя відэа краіны,
+      якія вы жадаеце паказваць.'
     External Link Handling: |
+      Выберыце паводзіны па змаўчанні, калі націскаецца спасылка, якую нельга адкрыць у FreeTube..
+      Па змаўчанні FreeTube адкрые націснутую спасылку ў браўзеры па змаўчанні.
   Player Settings:
-    Proxy Videos Through Invidious: ''
-    Default Video Format: ''
-    Scroll Playback Rate Over Video Player: ''
-    Skip by Scrolling Over Video Player: ''
+    Proxy Videos Through Invidious: 'Будзе падключацца да Invidious для прагляду відэа
+      замест прамога падключэння да YouTube.'
+    Default Video Format: 'Задайце фарматы, якія выкарыстоўваюцца пры прайграванні
+      відэа. Фарматы DASH могуць прайграваць больш высокія якасці. Састарэлыя фарматы
+      абмежаваныя максімумам 720p, але выкарыстоўваюць меншую паласу прапускання.
+      Аўдыяфарматы - гэта толькі аўдыяпатокі.'
+    Scroll Playback Rate Over Video Player: 'Калі курсор знаходзіцца над відэа, націсніце
+      і ўтрымлівайце клавішу Control (клавіша Command на Mac) і пракручвайце кола
+      мышы наперад або назад, каб кіраваць хуткасцю прайгравання. Націсніце і ўтрымлівайце
+      клавішу Control (клавіша Command на Mac) і пстрыкніце левай кнопкай мышы, каб
+      хутка вярнуцца да хуткасці прайгравання па змаўчанні (1x, калі яна не была зменена
+      ў наладах).'
+    Skip by Scrolling Over Video Player: 'Выкарыстоўвайце кола прагорткі, каб прапускаць
+      відэа ў стылі MPV.'
   External Player Settings:
-    External Player: ''
-    Custom External Player Executable: ''
-    Ignore Warnings: ''
-    Custom External Player Arguments: ''
-    DefaultCustomArgumentsTemplate: ""
+    External Player: 'Пры выбары вонкавага прайгравальніка на мініяцюры будзе адлюстроўвацца
+      значок для адкрыцця відэа (плэй-ліста, калі падтрымліваецца) у вонкавым прайгравальніку.
+      Увага, налады Invidious не ўплываюць на вонкавыя прайгравальнікі.'
+    Custom External Player Executable: 'Па змаўчанні FreeTube мяркуе, што абраны вонкавы
+      прайгравальнік можна знайсці праз пераменную асяроддзя PATH. Пры неабходнасці
+      тут можна задаць уласны шлях.'
+    Ignore Warnings: 'Адключыць папярэджанні, калі бягучы вонкавы прайгравальнік не
+      падтрымлівае бягучае дзеянне (напрыклад, пераварочванне плэй-ліста і г.д.).'
+    Custom External Player Arguments: 'Любыя карыстальніцкія аргументы каманднага
+      радка, якія вы хочаце перадаць вонкаваму прайгравальніку.'
+    DefaultCustomArgumentsTemplate: "(Па змаўчанні: '{defaultCustomArguments}')"
+    Ignore Default Arguments: Не адпраўляйце ніякіх аргументаў па змаўчанні на вонкавы
+      прайгравальнік, акрамя URL-адраса відэа (напрыклад, частата прайгравання, URL-адрас
+      плэй-ліста і г.д.). Карыстальніцкія аргументы ўсё роўна будуць перадавацца.
   Distraction Free Settings:
-    Hide Channels: ''
-    Hide Subscriptions Live: ''
+    Hide Channels: 'Увядзіце ідэнтыфікатар канала, каб схаваць усе відэа, плэй-лісты
+      і сам канал ад з''яўлення ў пошукавых, трэндавых, самых папулярных і рэкамендаваных.
+      Уведзены ідэнтыфікатар канала павінен цалкам супадаць і ўлічваць рэгістр.'
+    Hide Subscriptions Live: 'Гэта налада перавызначаецца наладай "{appWideSetting}"
+      для ўсёй праграмы ў раздзеле "{subsection}" у "{settingsSection}"'
+    Hide Videos and Playlists Containing Text: Увядзіце слова, фрагмент слова або
+      фразу (без уліку рэгістра), каб схаваць усе відэа і плэй-лісты, арыгінальныя
+      назвы якіх утрымліваюць гэта, ва ўсім FreeTube, за выключэннем толькі Гісторыі,
+      Вашых плэй-лістоў і відэа ў плэй-лістах.
   Subscription Settings:
-    Fetch Feeds from RSS: ''
-    Fetch Automatically: ''
+    Fetch Feeds from RSS: 'Пры ўключэнні FreeTube будзе выкарыстоўваць RSS замест
+      метаду па змаўчанні для атрымання вашай стужкі падпіскі. RSS працуе хутчэй і
+      прадухіляе блакіроўку IP-адрасоў, але не дае пэўнай інфармацыі, такой як працягласць
+      відэа, стан у прамым эфіры або паведамленняў у супольнасці'
+    Fetch Automatically: 'Калі ўключана, FreeTube будзе аўтаматычна атрымліваць стужку
+      вашай падпіскі пры адкрыцці новага акна і пры пераключэнні профілю.'
   Experimental Settings:
-    Replace HTTP Cache: ''
+    Replace HTTP Cache: 'Адключае HTTP кэш Electron''у на дыску і ўключае карыстальніцкі
+      кэш малюнкаў у памяці. Прывядзе да павелічэння выкарыстання аператыўнай памяці.'
   SponsorBlock Settings:
-    UseDeArrowTitles: ''
+    UseDeArrowTitles: 'Заменіце загалоўкі відэа на загалоўкі, прадстаўленыя карыстальнікамі
+      з DeArrow.'
 
 # Toast Messages
-Local API Error (Click to copy): ''
-Invidious API Error (Click to copy): ''
-Falling back to Invidious API: ''
-Falling back to Local API: ''
-This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Subscriptions have not yet been implemented: ''
-Unknown YouTube url type, cannot be opened in app: ''
-Hashtags have not yet been implemented, try again later: ''
-Loop is now disabled: ''
-Loop is now enabled: ''
-Shuffle is now disabled: ''
-Shuffle is now enabled: ''
-The playlist has been reversed: ''
-Playing Next Video: ''
-Playing Previous Video: ''
-Playlist will not pause when current video is finished: ''
-Playlist will pause when current video is finished: ''
-Playing Next Video Interval: ''
-Canceled next video autoplay: ''
+    UseDeArrowThumbnails: Заменіце мініяцюры відэа на мініяцюры ад DeArrow.
+Local API Error (Click to copy): 'Памылка лакальнага API (націсніце, каб скапіяваць)'
+Invidious API Error (Click to copy): 'Памылка API Invidious (Націсніце, каб скапіяваць)'
+Falling back to Invidious API: 'Вяртанне да Invidious API'
+Falling back to Local API: 'Вяртанне да лакальнага API'
+This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Гэта
+  відэа недаступнае з-за адсутнасці фарматаў. Гэта можа адбыцца з-за недаступнасці
+  краіны.'
+Unknown YouTube url type, cannot be opened in app: 'Невядомы тып URL-адраса YouTube,
+  немагчыма адкрыць у праграме'
+Loop is now disabled: 'Цыкл адключаны'
+Loop is now enabled: 'Цыкл уключаны'
+Shuffle is now disabled: 'Перамешванне выключана'
+Shuffle is now enabled: 'Перамешванне ўключана'
+The playlist has been reversed: 'Плэй-ліст перавернуты'
+Playing Next Video: 'Прайграванне наступнага відэа'
+Playing Previous Video: 'Прайграванне папярэдняга відэа'
+Playlist will not pause when current video is finished: 'Плэй-ліст не будзе прыпынены,
+  калі бягучае відэа будзе завершана'
+Playlist will pause when current video is finished: 'Плэй-ліст будзе прыпынены, калі
+  бягучае відэа будзе завершана'
+Playing Next Video Interval: 'Прайграванне наступнага відэа ў самыя кароткія тэрміны.
+  Націсніце, каб адмяніць. | Прайграванне наступнага відэа праз {nextVideoInterval}
+  секунды. Націсніце, каб адмяніць. | Прайграванне наступнага відэа праз {nextVideoInterval}
+  секунд. Націсніце, каб адмяніць.'
+Canceled next video autoplay: 'Аўтапрайграванне наступнага відэа адменена'
 
-Default Invidious instance has been set to {instance}: ''
-Default Invidious instance has been cleared: ''
-'The playlist has ended. Enable loop to continue playing': ''
-External link opening has been disabled in the general settings: ''
-Downloading has completed: ''
-Starting download: ''
-Downloading failed: ''
-Screenshot Success: ''
-Screenshot Error: ''
+Default Invidious instance has been set to {instance}: 'Экземпляр Invidious па змаўчанні
+  быў усталяваны ў {instance}'
+Default Invidious instance has been cleared: 'Экземпляр Invidious па змаўчанні быў
+  выдалены'
+'The playlist has ended. Enable loop to continue playing': 'Плэй-ліст скончыўся.  Каб
+  працягнуць прайграванне, уключыце цыкл'
+External link opening has been disabled in the general settings: 'Адкрыццё вонкавых
+  спасылак было адключана ў агульных наладах'
+Downloading has completed: 'Спампоўка "{videoTitle}" скончана'
+Starting download: 'Пачатак спампоўкі "{videoTitle}"'
+Downloading failed: 'Узнікла праблема спампоўкі "{videoTitle}"'
+Screenshot Success: 'Здымак захаваны як "{filePath}"'
+Screenshot Error: 'Здымак не ўдаўся. {error}'
 
 Hashtag:
-  Hashtag: ''
-  This hashtag does not currently have any videos: ''
+  Hashtag: 'Цэтлік'
+  This hashtag does not currently have any videos: 'Гэты цэтлік зараз не змяшчае відэа'
 Yes: 'Так'
 No: 'Не'
 Ok: 'Ок'
@@ -987,10 +1133,16 @@ Search Listing:
   Label:
     Subtitles: Субцітры
     4K: 4K
+    Closed Captions: Субцітры
+    360 Video: 360°
+    8K: 8K
+    VR180: VR180
+    New: Новае
+    3D: 3D
 Yes, Delete: Так, выдаліць
 Feed:
   Refresh Feed: Абнавіць {subscriptionName}
-  Feed Last Updated: 'Апошняе абнаўленне каналу {feedName}: {date}'
+  Feed Last Updated: 'Апошняе абнаўленне стужкі {feedName}: {date}'
 Display Label: '{label}: {value}'
 Cancel: Адмена
 checkmark: ✓
@@ -999,3 +1151,14 @@ Go to page: Перайсці да {page}
 Moments Ago: хвіліны таму
 Yes, Restart: Так, перазапусціць
 Yes, Open Link: Так, адкрыць спасылку
+Tag already exists: Цэтлік "{tagName}" ужо існуе
+Search character limit: Пошукавы запыт перавышае ліміт сімвалаў у {searchCharacterLimit}
+Trimmed input must be at least N characters long: Скарочаны ўвод павінен змяшчаць
+  не менш за 1 сімвал | Скарочаны ўвод павінен змяшчаць не менш за {length} сімвалаў
+Channel Hidden: '{channel} дададзены ў фільтр каналаў'
+Age Restricted:
+  This channel is age restricted: Гэты канал мае ўзроставыя абмежаванні
+  This video is age restricted: Гэты відэа мае ўзроставыя абмежаванні
+'Blocked opening potentially unsafe URL': 'Заблакіравана адкрыццё патэнцыйна небяспечнага
+  URL: "{url}".'
+Channel Unhidden: '{channel} выдалены з фільтра каналаў'
diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index a904b4df57b07..95fe4c5fa8081 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -43,6 +43,8 @@ Global:
     Subscriber Count: 1 абонат | {count} абоната
     View Count: 1 преглед | {count} прегледа
     Watching Count: 1 гледане | {count} гледания
+    Like Count: 1 харесване | {count} харесвания
+    Comment Count: 1 коментар | {count} коментара
   Input Tags:
     Length Requirement: Дължината на етикета трябва да бъде поне {number} знака
 Version {versionNumber} is now available!  Click for more details: 'Версия {versionNumber}
@@ -106,7 +108,9 @@ Subscriptions:
   Subscriptions: 'Абонаменти'
   Latest Subscriptions: 'Последни абонаменти'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Списъкът
-    с абонаменти е празен. Започнете да добавяте, за да ги видите тук.'
+    с абонаменти е празен. Ако искате да внесете абонаментите си, отидете в "Настройки
+    на данни" и изберете "Внасяне на абонаменти" или можете да потърсите канал и да
+    се абонирате за него.'
   'Getting Subscriptions. Please wait.': 'Получаване на абонаменти. Моля, изчакайте.'
   Refresh Subscriptions: 'Опресняване на абонаментите'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Този
@@ -134,20 +138,11 @@ Most Popular: 'Най-популярни'
 Playlists: 'Плейлисти'
 User Playlists:
   Your Playlists: 'Вашите плейлисти'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Няма
-    запазени видеа. За запазване щракнете в ъгъла на видеото
-  Playlist Message: Тази страница не отразява напълно работещи плейлисти. В него са
-    изброени само видеа, които сте запазили или избрали за предпочитани. Когато работата
-    приключи, всички видеа, които в момента са тук, ще бъдат преместени в плейлист
-    „Предпочитани“.
   Search bar placeholder: Търсене за плейлисти
   Empty Search Message: В този плейлист няма видеа, които да отговарят на търсенето
     ви
   This playlist currently has no videos.: В този плейлист в момента няма видеа.
   Add to Favorites: Добавяне към {playlistName}
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Сигурни
-    ли сте, че искате да премахнете всички гледани видеа от този плейлист? Това не
-    може да бъде отменено.
   Are you sure you want to delete this playlist? This cannot be undone: Сигурни ли
     сте, че искате да изтриете този плейлист? Това не може да бъде отменено.
   SinglePlaylistView:
@@ -161,7 +156,6 @@ User Playlists:
       This video cannot be moved up.: Това видео не може да бъде преместено нагоре.
       This video cannot be moved down.: Това видео не може да бъде преместено надолу.
       Video has been removed: Видеото е премахнато
-      Quick bookmark disabled: Бързите отметки са деактивирани
       There was a problem with removing this video: Имаше проблем с премахването на
         това видео
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Този
@@ -183,6 +177,9 @@ User Playlists:
         се използва за бързи отметки.
       Playlist {playlistName} is the new quick bookmark playlist.: Плейлиста {playlistName}
         е новият списък за бързи отметки.
+      This playlist has a video with a duration error: Този плейлист съдържа поне
+        едно видео, което няма продължителност, той ще бъде подреден така, сякаш продължителността
+        му е нула.
     Search for Videos: Търсене за видеа
   CreatePlaylistPrompt:
     Toast:
@@ -238,7 +235,6 @@ User Playlists:
   Copy Playlist: Копиране на плейлиста
   Remove Watched Videos: Премахване на гледаните видеа
   Enable Quick Bookmark With This Playlist: Активиране на бърза отметка с този плейлист
-  Disable Quick Bookmark: Деактивиране на бърза отметка
   Delete Playlist: Изтриване на плейлиста
   Remove from Favorites: Премахване от {playlistName}
   Move Video Down: Преместване надолу
@@ -255,6 +251,8 @@ User Playlists:
     ли сте, че искате да премахнете 1 гледано видео от този плейлист? Това не може
     да бъде отменено. | Сигурни ли сте, че искате да премахнете {playlistItemCount}
     гледани видеа от този плейлист? Това не може да бъде отменено.
+  Export Playlist: Изнасяне на плейлиста
+  The playlist has been successfully exported: Плейлистът е изнесен успешно
 History:
   # On History Page
   History: 'История'
@@ -267,7 +265,7 @@ Settings:
   # On Settings Page
   Settings: 'Настройки'
   General Settings:
-    General Settings: 'Общи настройки'
+    General Settings: 'Общи'
     Check for Updates: 'Проверка за актуализации'
     Check for Latest Blog Posts: 'Проверка за нови публикации в блога'
     Fallback to Non-Preferred Backend on Failure: 'При грешка, връщане към непредпочитан
@@ -291,8 +289,6 @@ Settings:
       End: 'Край на видео'
       Hidden: Скриване
       Blur: Размазано
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Излед на Invidious
-      (по подразбиране е https://invidious.snopyta.org)'
     Region for Trending: 'Регион за набиращи популярност'
         #! List countries
     View all Invidious instance information: Преглед на пълна информация за Invidious
@@ -314,8 +310,10 @@ Settings:
     Auto Load Next Page:
       Label: Автоматично зареждане на следващата страница
       Tooltip: Автоматично зареждане на допълнителни страници и коментари.
+    Open Deep Links In New Window: Отваряне в нов прозорец на URL адреси, преминаващи
+      през FreeTube
   Theme Settings:
-    Theme Settings: 'Настройки на изгледа на приложението'
+    Theme Settings: 'Тема'
     Match Top Bar with Main Color: 'Съвпадане на горната лента с основната цветова
       тема'
     Base Theme:
@@ -331,6 +329,8 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarized тъмна
       Solarized Light: Solarized светла
+      Gruvbox Dark: Gruvbox тъмна
+      Gruvbox Light: Gruvbox светла
     Main Color Theme:
       Main Color Theme: 'Основна цветова тема'
       Red: 'Червено'
@@ -378,6 +378,16 @@ Settings:
       Solarized Blue: Solarized Синьо
       Solarized Cyan: Solarized Синьозелено
       Solarized Green: Solarized Зелено
+      Gruvbox Dark Yellow: Gruvbox тъмножълто
+      Gruvbox Dark Blue: Gruvbox Тъмносиньо
+      Gruvbox Dark Purple: Gruvbox Тъмнолилаво
+      Gruvbox Dark Aqua: Gruvbox Тъмна вода
+      Gruvbox Light Blue: Gruvbox Светлосиньо
+      Gruvbox Light Purple: Gruvbox Светлолилаво
+      Gruvbox Light Orange: Gruvbox Светлооранжево
+      Gruvbox Dark Green: Gruvbox тъмнозелено
+      Gruvbox Dark Orange: Gruvbox Тъмнооранжево
+      Gruvbox Light Red: Gruvbox Светлочервено
     Secondary Color Theme: 'Вторична цветова тема'
         #* Main Color Theme
     UI Scale: Мащаб на интерфейса
@@ -386,7 +396,7 @@ Settings:
     Hide Side Bar Labels: Скриване етикетите на страничната лента
     Hide FreeTube Header Logo: Скриване логото на FreeTube
   Player Settings:
-    Player Settings: 'Настройки на плейъра'
+    Player Settings: 'Плейър'
     Play Next Video: 'Пускане на следващото видео'
     Turn on Subtitles by Default: 'Включване на субтитрите по подразбиране'
     Autoplay Videos: 'Автоматично пускане на видеата'
@@ -413,7 +423,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Интервал за следващо видео в плейлист
-    Next Video Interval: Интервал за следващо видео
+    Next Video Interval: Таймер за обратно броене при автоматично възпроизвеждане
     Display Play Button In Video Player: Показване на бутона за възпроизвеждане във
       видео плейъра
     Scroll Volume Over Video Player: Промяна на звука при превъртане над видео плейъра
@@ -440,8 +450,9 @@ Settings:
       Folder Button: Избор на папка
     Enter Fullscreen on Display Rotate: Режим на цял екран при завъртане на дисплея
     Skip by Scrolling Over Video Player: Превъртане над видео плейъра
+    Autoplay Interruption Timer: Таймер за прекъсване на автоматичното възпроизвеждане
   Privacy Settings:
-    Privacy Settings: 'Настройки за поверителност'
+    Privacy Settings: 'Поверителност'
     Remember History: 'Запазване на историята'
     Save Watched Progress: 'Запазване напредъка на гледането'
     Clear Search Cache: 'Изчистване кеша на търсенията'
@@ -463,22 +474,19 @@ Settings:
     Are you sure you want to remove all your playlists?: Сигурни ли сте, че искате
       да премахнете всичките си плейлисти?
   Subscription Settings:
-    Subscription Settings: 'Настройки на абонаменти'
+    Subscription Settings: 'Абонаменти'
     Hide Videos on Watch: 'Скриване на видеата при гледане'
     Fetch Feeds from RSS: 'Извличане на съдържания през RSS'
-    Manage Subscriptions: 'Управление на абонаменти'
     Fetch Automatically: Автоматично извличане на съдържание
-    Only Show Latest Video for Each Channel: Показване само най-новите видеа за всеки
-      канал
     Confirm Before Unsubscribing: Избягване на случайно отписване
+    'Limit the number of videos displayed for each channel': Ограничаване на броя
+      на показваните видеа за всеки канал
+    To: на
   Data Settings:
-    Data Settings: 'Настройки на данни'
+    Data Settings: 'Данни'
     Select Import Type: 'Избор на тип за внасяне'
     Select Export Type: 'Избор на тип за изнасяне'
     Import Subscriptions: 'Внасяне на абонаменти'
-    Import FreeTube: 'Внасяне от FreeTube формат'
-    Import YouTube: 'Внасяне от YouTube формат'
-    Import NewPipe: 'Внасяне от NewPipe формат'
     Export Subscriptions: 'Изнасяне на абонаменти'
     Export FreeTube: 'Изнасяне във FreeTube формат'
     Export YouTube: 'Изнасяне в YouTube формат'
@@ -506,7 +514,6 @@ Settings:
     Unable to write file: 'Файлът не се записа'
     Unknown data key: 'Непознат ключ данни'
     How do I import my subscriptions?: 'Как да внеса абонаментите си?'
-    Check for Legacy Subscriptions: Проверка за стари абонаменти
     Manage Subscriptions: Управление на абонаменти
     Export Playlists: Изнасяне на плейлисти
     All playlists has been successfully imported: Всички плейлисти са внесени успешно
@@ -525,32 +532,6 @@ Settings:
         на всички плейлисти\" в Настройки за поверителност.\n3. Стартирайте по-старата
         версия на FreeTube и внесете изнесените плейлисти.\""
       Label: Изнасяне на плейлисти за по-стари версии на FreeTube
-  Advanced Settings:
-    Advanced Settings: 'Разширени настройки'
-    Enable Debug Mode (Prints data to the console): 'Активиране на режим за дебъгване
-      (извежда данни в конзолата)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Адрес на прокси (пример:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Щракането
-      на бутон "Тест прокси" ще изпрати искане към https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Използване на TOR / прокси за интерфейсни запитвания'
-    TEST PROXY: 'Тест на прокси'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Преглед на публични инстанции'
-    Clear History:
-      Clear History: 'Изчистване на историята'
-      # On Click
-      Are you sure you want to delete your history?: 'Сигурни ли сте, че искате да
-        изтриете историята си?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Изтриване на абонаменти'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Сигурни ли сте, че искате
-        да премахнете всички абонаменти?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Скриване на чата на живо
@@ -561,7 +542,7 @@ Settings:
     Hide Channel Subscribers: Скриване броя на абонатите на канали
     Hide Video Likes And Dislikes: Скриване оценките на видеата
     Hide Video Views: Скриване броя показвания на видеата
-    Distraction Free Settings: Настройки за неразсейване
+    Distraction Free Settings: Без разсейване
     Hide Active Subscriptions: Скриване на активните абонаменти
     Hide Playlists: Скриване на плейлисти
     Hide Video Description: Скриване описанието на видеото
@@ -575,21 +556,20 @@ Settings:
     Display Titles Without Excessive Capitalisation: Показване на заглавията без излишни
       главни букви и препинателни знаци
     Hide Featured Channels: Скриване на препоръчаните канали
-    Hide Channel Playlists: Скриване на плейлистите на каналите
-    Hide Channel Community: Скриване на общността на каналите
-    Hide Channel Shorts: Скриване кратките видеа на канала
+    Hide Channel Playlists: Скриване на раздел "Плейлисти" на канала
+    Hide Channel Community: Скриване на раздел "Общност" на канала
+    Hide Channel Shorts: Скриване на раздел "Кратки видеа" на канала
     Sections:
       Channel Page: Страница на канала
       Side Bar: Странична лента
       Watch Page: Страница за гледане
       General: Общи
       Subscriptions Page: Страница с абонаменти
-    Hide Channel Releases: Скриване на изданията на канала
+    Hide Channel Releases: Скриване на раздел "Издания" на канала
     Hide Subscriptions Videos: Скриване на видеата в абонаментите
     Hide Subscriptions Shorts: Скриване на кратките видеа в абонаментите
     Hide Subscriptions Live: Скриване на абонаментите на живо
-    Hide Channel Podcasts: Скриване на подкастите на канала
-    Blur Thumbnails: Размазване на миниатюрите
+    Hide Channel Podcasts: Скриване на раздел "Подкасти" на канала
     Hide Profile Pictures in Comments: Скриване на профилните снимки в коментарите
     Hide Subscriptions Community: Скриване на абонаментите Общност
     Hide Channels Disabled Message: Някои канали бяха блокирани с чрез идентификатор
@@ -602,6 +582,7 @@ Settings:
       текст
     Hide Videos and Playlists Containing Text Placeholder: Дума, част от дума или
       фраза
+    Hide Channel Home: Скриване на раздел "Начало" на канала
   The app needs to restart for changes to take effect. Restart and apply change?: Приложението
     трябва да се рестартира за да се приложат промените. Рестартиране?
   Proxy Settings:
@@ -620,12 +601,17 @@ Settings:
     Proxy Host: Прокси хост
     Proxy Protocol: Прокси протокол
     Enable Tor / Proxy: Активиране на Tor / Proxy
-    Proxy Settings: Настройки на прокси
+    Proxy Settings: Прокси
+    Proxy Warning: FreeTube не разполага с вграден прокси сървър, но може да се свърже
+      с външен, например такъв, който работи на вашата машина, като Tor или SOCKS5
+      прокси сървър, предоставян от някои VPN услуги. Ако е активирано, уверете се,
+      че прокси сървърът/Tor е конфигуриран правилно, тъй като FreeTube няма да може
+      да извлича данни.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Известие при пропускане на спонсориран
       сегмент
     Enable SponsorBlock: Активиране на SponsorBlock
-    SponsorBlock Settings: SponsorBlock настройки
+    SponsorBlock Settings: SponsorBlock
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       адрес (по подразбиране е https://sponsor.ajay.app)
     Skip Options:
@@ -645,31 +631,31 @@ Settings:
     Ignore Unsupported Action Warnings: Игнориране на предупрежденията за неподдържани
       действия
     External Player: Външен плейър
-    External Player Settings: Настройки за външен плейър
+    External Player Settings: Външен плейър
     Players:
       None:
         Name: Няма
     Ignore Default Arguments: Игнориране на аргументите по подразбиране
   Download Settings:
-    Download Settings: Настройки за изтегляне
+    Download Settings: Изтегляне
     Choose Path: Избор на път
     Ask Download Path: Питане за пътя за изтегляне
     Download Behavior: Поведение при изтегляне
     Download in app: Изтегляне в приложението
     Open in web browser: Отваряне в уеб браузър
   Parental Control Settings:
-    Parental Control Settings: Настройки за родителски контрол
+    Parental Control Settings: Родителски контрол
     Hide Unsubscribe Button: Скриване на бутона за отписване
     Show Family Friendly Only: Показване само за семейства
     Hide Search Bar: Скриване на лентата за търсене
   Experimental Settings:
-    Experimental Settings: Експериментални настройки
+    Experimental Settings: Експериментални
     Replace HTTP Cache: Замяна на HTTP кеша
     Warning: Тези настройки са експериментални и може да причинят сривове, докато
       са разрешени. Силно се препоръчва създаването на резервни копия. Използвайте
       на свой риск!
   Password Settings:
-    Password Settings: Настройки на парола
+    Password Settings: Парола
     Set Password To Prevent Access: Задаване на парола, за предотвратяване на достъпа
       до настройките
     Set Password: Задаване на парола
@@ -679,39 +665,12 @@ Settings:
     Password Incorrect: Грешна парола
     Unlock: Отключване
     Password: Парола
-  Expand All Settings Sections: Разширяване на всички раздели с настройки
   Sort Settings Sections (A-Z): Сортиране на секциите на настройките (A-Z)
+  Return to Settings Menu: Връщане към менюто с настройки
 About:
   #On About page
   About: 'Относно'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Този
-    софтуер се разпространява свободно под AGPL-3.0 лиценз.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Откривате грешка? Искате да предложите нова функционалност? Или искате да помагате?
-    Проверете нашата GitHub страница. Добре дошли сте с готови предложения.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Благодарим
-    на хората и проектите, които правят възможен FreeTube!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Искате
-    да чатите? Включете се на нашия Element / Matrix сървър. Моля, преди да се присъедините
-    първо прочетете правилата.'
-
-  'Looking for help? Check out our Wiki page.': 'Нуждаете се от помощ? Погледнете
-    в нашата Wiki страница.'
-
-  Check out our Firefox extension!: 'Потърсете нашето разширение за Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ако
-    ползването на FreeTube ви харесва, помислете за дарение през Liberapay или през
-    Bitcoin адреса ни.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Последни FreeTube новини'
-
   Donate: Дарение
   these people and projects: тези хора и проекти
   FreeTube is made possible by: FreeTube благодарение на
@@ -731,8 +690,6 @@ About:
   Help: Помощ
   GitHub releases: GitHub издания
   Downloads / Changelog: Изтегляния / Дневник с промени
-  View License: Преглед на лиценза
-  Licensed under the AGPLv3: Лицензиран съгласно AGPLv3
   Source code: Програмен код
   Beta: Бета
   Credits: Заслуги
@@ -782,7 +739,7 @@ Profile:
     от другите профили.'
 #On Channel Page
   Profile Filter: Профилен филтър
-  Profile Settings: Настройки на профил
+  Profile Settings: Профил
   Toggle Profile List: Превключване на списъка с профили
   Profile Name: Име на профила
   Open Profile Dropdown: Отваряне на падащото меню на профила
@@ -833,6 +790,10 @@ Channel:
     Reveal Answers: Разкриване на отговорите
     Hide Answers: Скриване на отговорите
     Video hidden by FreeTube: Видео, скрито от FreeTube
+    Viewing Posts Only Supported By Invidious: Преглеждането на публикации се поддържа
+      само от Invidious. Отидете в раздела на общността на канала, за да видите съдържанието
+      там без Invidious.
+    View Full Post: Преглед на цялата публикация
   This channel does not exist: Каналът не съществува
   This channel does not allow searching: Каналът не позволява търсене
   This channel is age-restricted and currently cannot be viewed in FreeTube.: Каналът
@@ -853,6 +814,9 @@ Channel:
     Releases: Издания
     This channel does not currently have any releases: В момента този канал няма никакви
       издания
+  Home:
+    Home: Начало
+    View Playlist: Преглед на плейлиста
 Video:
   Mark As Watched: 'Отбелязване като гледано'
   Remove From History: 'Премахване от историята'
@@ -889,38 +853,8 @@ Video:
     на живо не се поддържа от интерфейса на Invidious. Изисква се директна връзка
     с YouTube.'
   Published:
-    Jan: 'Ян.'
-    Feb: 'Фев.'
-    Mar: 'Март'
-    Apr: 'Апр.'
-    May: 'Май'
-    Jun: 'Юни'
-    Jul: 'Юли'
-    Aug: 'Авг.'
-    Sep: 'Септ.'
-    Oct: 'Окт.'
-    Nov: 'Ное.'
-    Dec: 'Дек.'
-    Second: 'секунда'
-    Seconds: 'секунди'
-    Minute: 'минута'
-    Minutes: 'минути'
-    Hour: 'час'
-    Hours: 'часа'
-    Day: 'ден'
-    Days: 'дни'
-    Week: 'седмица'
-    Weeks: 'седмици'
-    Month: 'месец'
-    Months: 'месеца'
-    Year: 'година'
-    Years: 'години'
-    Ago: 'преди'
-    Upcoming: 'Премиера на'
-    Less than a minute: По-малко от минута
     In less than a minute: След по-малко от минута
   Published on: 'Публикувано на'
-  Publicationtemplate: 'Преди {number} {unit}'
 #& Videos
   audio only: само аудио
   video only: само видео
@@ -1000,6 +934,16 @@ Video:
     Theatre Mode: Широкоекранен режим
     Full Window: Цял прозорец
     Hide Stats: Скриване на статистиката
+  IP block: YouTube е блокирал вашия IP адрес за гледане на видеа. Опитайте да преминете
+    към друга VPN услуга или прокси сървър.
+  AgeRestricted: Видеата с възрастови ограничения не могат да се гледат с FreeTube,
+    тъй като изискват вход в Google и използване на проверен по възраст акаунт в YouTube.
+  Unlisted: Непосочен в списъка
+  MembersOnly: Видеата, предназначени само за членове, не могат да се гледат с FreeTube,
+    тъй като изискват вход в Google и платено членство в канала на качващия.
+  DeArrow:
+    Show Original Details: Показване на оригинални данни
+    Show Modified Details: Показване на променени данни
 Videos:
   #& Sort By
   Sort By:
@@ -1010,9 +954,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Преглед на пълен плейлист'
-  Videos: 'Видеа'
-  View: 'показване'
-  Views: 'Показвания'
   Last Updated On: 'Последна актуализиция на'
 
 # On Video Watch Page
@@ -1028,7 +969,8 @@ Playlist:
     VideoTitleAscending: Заглавие (A-Z)
     Custom: Потребителски
     VideoTitleDescending: Заглавие (Z-A)
-Toggle Theatre Mode: 'Режим "Широк екран"'
+    VideoDurationAscending: Първо най-кратките
+    VideoDurationDescending: Първо най-дългите
 Change Format:
   Change Media Formats: 'Смяна видео формати'
   Use Dash Formats: 'Използване на DASH формати'
@@ -1084,6 +1026,7 @@ Comments:
   View {replyCount} replies: Преглед на {replyCount} отговора
   Hearted: Сърдечно
   Subscribed: Абониран
+  There are no comments available for this post: За тази публикация няма налични коментари
 Up Next: 'Следващ'
 
 # Toast Messages
@@ -1094,7 +1037,6 @@ Falling back to Local API: 'Връщане към локалния интерф
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Видеото
   не е достъпно поради липсващи формати. Това може да се дължи на ограничен достъп
   за страната.'
-Subscriptions have not yet been implemented: 'Абонаментите все още не са завършени'
 Loop is now disabled: 'Повтарянето е изключено'
 Loop is now enabled: 'Повтарянето е включено'
 Shuffle is now disabled: 'Разбъркването е изключено'
@@ -1112,8 +1054,8 @@ Tooltips:
   Subscription Settings:
     Fetch Feeds from RSS: FreeTube ще използва RSS вместо метода по подразбиране за
       получаване на абонаментите. RSS е по-бърз метод и преодолява блокиранията на
-      IP адреса, но не получава някои съпътстващи данни, като продължителност на видеото
-      или дали е на живо
+      IP адреса, но не получава някои съпътстващи данни, като продължителност на видеото,
+      дали е на живо или публикации в общността
     Fetch Automatically: FreeTube автоматично ще извлича абонаментите при отваряне
       на нов прозорец и при смяна на профила.
   Player Settings:
@@ -1145,10 +1087,12 @@ Tooltips:
     External Link Handling: "Избор на поведението по подразбиране, когато щракнете
       върху връзка, която не може да бъде отворена във FreeTube.\nПо подразбиране
       FreeTube ще отвори връзката в браузъра по подразбиране.\n"
+    Open Deep Links In New Window: URL адресите, преминаващи през FreeTube, например
+      чрез разширения на браузъра или аргументи от командния ред, се отварят в нов
+      прозорец.
   External Player Settings:
     Custom External Player Arguments: Всички персонализирани аргументи от командния
-      ред, разделени с точка и запетая (";"), които искате да бъдат предадени на външния
-      плейър.
+      ред, които искате да бъдат предадени на външния плейър.
     Ignore Warnings: Премахване на предупрежденията, когато текущият външен плейър
       не поддържа текущото действие (напр. обръщане на плейлисти и др.).
     Custom External Player Executable: По подразбиране FreeTube предполага, че избраният
@@ -1185,8 +1129,6 @@ More: Още
 Playing Next Video Interval: Пускане на следващото видео веднага. Щракнете за отказ.
   | Пускане на следващото видео след {nextVideoInterval} секунда. Щракнете за отказ.
   | Пускане на следващото видео след {nextVideoInterval} секунди. Щракнете за отказ.
-Hashtags have not yet been implemented, try again later: Хаштаговете все още не са
-  завършени, опитайте отново по-късно
 Unknown YouTube url type, cannot be opened in app: Неизвестен тип URL адрес за YouTube,
   не може да се отвори в приложението
 Open New Window: Отваряне на нов прозорец
@@ -1208,8 +1150,6 @@ Screenshot Success: Запазена снимка на екрана като "{f
 New Window: Нов прозорец
 Channels:
   Count: Намерени са {number} канала.
-  Unsubscribe: Отписване
-  Unsubscribed: '{channelName} е премахнат от абонаментите'
   Unsubscribe Prompt: Сигурни ли сте, че искате да се отпишете от "{channelName}"?
   Search bar placeholder: Търсене на канали
   Channels: Канали
@@ -1225,6 +1165,7 @@ Chapters:
     текуща глава: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Списъкът с глави е скрит,
     текуща глава: {chapterName}'
+  Key Moments: Основни моменти
 Preferences: Предпочитания
 Ok: Добре
 Hashtag:
@@ -1261,5 +1202,26 @@ Search Listing:
     4K: 4K
     Subtitles: Субтитри
     Closed Captions: Затворени субтитри
+    VR180: VR180
+    3D: 3D
+    8K: 8K
+    360 Video: 360°
+    New: Нов
 'Blocked opening potentially unsafe URL': 'Блокирано отваряне на потенциално опасен
   URL адрес: "{url}".'
+Description:
+  Collapse Description: По-малко
+  Expand Description: '...още'
+Keys:
+  arrowleft: Стрелка наляво
+  arrowright: Стрелка надясно
+  arrowup: Стрелка нагоре
+  alt: Alt
+  arrowdown: Стрелка надолу
+  ctrl: Ctrl
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Right-click or hold to see history: Щракнете с десния бутон на мишката или задръжте,
+  за да видите историята
+Autoplay Interruption Timer: Автоматичното възпроизвеждане е отменено поради {autoplayInterruptionIntervalHours}
+  час(а) неактивност
diff --git a/static/locales/bn.yaml b/static/locales/bn.yaml
index 26612f6b121fb..9edb9828ee1fc 100644
--- a/static/locales/bn.yaml
+++ b/static/locales/bn.yaml
@@ -141,9 +141,7 @@ Channels:
   Channels: চ্যানেলসমূহ
   Title: চ্যানেল সুচি
   Empty: আপনার চ্যানেল সুচি এখন খালি ।
-  Unsubscribe: আনসাবস্ক্রাইব
   Count: '{number}চ্যানেল পাওয়া গিয়েছে ।'
-  Unsubscribed: '{channelName} সরিয়ে দেয়া হয়েছে আপনার সাবস্ক্রিপশন থেকে'
 Playlists: প্লে লিস্ট
 User Playlists:
   Your Playlists: আপনার প্লেলিস্ট
@@ -159,12 +157,6 @@ User Playlists:
   Save Changes: পরিবর্তন সংরক্ষণ করুন
   Cancel: বাতিল
   Edit Playlist Info: নির্বাচিত তালিকার তথ্য পরিবর্তন
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: আপনার
-    কোন সংরক্ষিত ভিডিও নেই, ভিডিও সংরক্ষণ করার জন্য ভিডিওর কোনায় যে বাটন আছে সেটিতে
-    চাপ দিলে সংরক্ষণ সম্পূর্ণ হবে।
-  Playlist Message: এই পেইজ এ সব গুলো প্লেলিস্ট নেই। এখানে শুধু যে ভিডিও গুলো সেইভ
-    করেছেন বা প্রিয় তালিকায় ছিল সেগুলো আছে। যখন কাজ শেষ হয়ে যাবে তখন, এখানকার সব ভিডিও
-    গুলো প্রিয় তালিকাতে নিয়ে যাওয়া হবে।
   Empty Search Message: এই তালিকাতে আপনার কাংখিত ভিডিও নেই যেটি আপনি খুঁজছেন
   You have no playlists. Click on the create new playlist button to create a new one.: নির্বাচিত
     তালিকা নেই। নতুন তালিকা তৈরির জন্য নিউ প্লে-লিস্ট বাটন এ চাপ দিয়ে অগ্রসর হতে পারেন।
diff --git a/static/locales/br.yaml b/static/locales/br.yaml
new file mode 100644
index 0000000000000..b3de25df2e8a6
--- /dev/null
+++ b/static/locales/br.yaml
@@ -0,0 +1,1239 @@
+# Put the name of your locale in the same language
+Locale Name: 'Brezhoneg'
+# Currently on Subscriptions, Playlists, and History
+'This part of the app is not ready yet. Come back later when progress has been made.': >-
+  N'eo ket prest lodenn-mañ an arload. Deuit en-dro diwezhatoc'h pa vo aet war-raok
+  an traoù.
+
+# Webkit Menu Bar
+File: 'Restr'
+New Window: 'Prenestr nevez'
+Preferences: 'Gwellvezioù'
+Quit: 'Kuitaat'
+Edit: 'Kemmañ'
+Undo: 'Dizober'
+Redo: 'Adober'
+Cut: 'Troc''hañ'
+Copy: 'Eilañ'
+Paste: 'Pegañ'
+Delete: 'Dilemel'
+Select all: 'Diuzañ pep tra'
+Reload: 'Adkargañ'
+Force Reload: 'Rediañ an adkargañ'
+Toggle Developer Tools: 'Enaouiñ/Lazhañ Ostilhoù diorren'
+Actual size: 'Ment a-vremañ'
+Zoom in: 'Zoum brassat'
+Zoom out: 'Zoum bihanaat'
+Toggle fullscreen: 'Tremen e skramm leun'
+Window: 'Prenestr'
+Minimize: 'Izekaat'
+Close: 'Seriñ'
+Back: 'Distreiñ'
+Forward: 'War-raok'
+Open New Window: 'Digeriñ ur prenestr nevez'
+Go to page: 'Mont d''ar bajenn {page}'
+Close Banner: 'Serriñ ar Giton'
+
+Version {versionNumber} is now available!  Click for more details: 'Stumm {versionNumber}
+  a zo hegerz !  Klikit amañ evit gouzout hiroc''h'
+Download From Site: 'Pellgargañ diwar al lec''hienn'
+A new blog is now available, {blogTitle}. Click to view more: 'Embannet ez eus bet
+  ur pennad nevez, {blogTitle}. Klikit amañ evit gouzout hiroc''h'
+Are you sure you want to open this link?: 'Ha sur oc''h e faot deoc''h digeriñ al
+  liamm-mañ ?'
+
+# Global
+# Anything shared among components / views should be put here
+Global:
+  Videos: 'Videoioù'
+  Shorts: 'Videoioù berr (Shorts)'
+  Live: 'War-eeun'
+  Community: 'Kumuniezh'
+  Counts:
+    Video Count: '1 video | {count} video'
+    Channel Count: '1 chadenn | {count} chadenn'
+    Subscriber Count: '1 den koumanantet | {count} den koumanantet'
+    View Count: '1 sell | {count} sell'
+    Like Count: '1 like | {count} like'
+    Comment Count: '1 evezhiadenn | {count} evezhiadenn'
+    Watching Count: '1 den o sellet | {count} den o sellet'
+  Input Tags:
+    Length Requirement: 'An dikedenn a rank bezañ {number} arouezenn enni da nebeutañ'
+
+# Search Bar
+Search / Go to URL: 'Klask / Mont betek un URL'
+Search Bar:
+  Clear Input: 'Skarzhañ an enankad'
+Search character limit: 'Ar c''hlask a ya dreist an hirder brasañ aotreet : {searchCharacterLimit}
+  arouezenn'
+Search Listing:
+  Label:
+    4K: '4K'
+    8K: '8K'
+    VR180: 'VR180'
+    360 Video: '360°'
+    Subtitles: 'Istitloù'
+    New: 'Nevez'
+    3D: '3D'
+    # Aria labels
+    Closed Captions: 'Teleteks'
+  # In Filter Button
+Search Filters:
+  Search Filters: 'Siloù evit Klask'
+  Sort By:
+    Sort By: 'Rummañ dre'
+    Most Relevant: 'Ar re wellañ'
+    Rating: 'Notenn'
+    Upload Date: 'Deiziad kargañ'
+    View Count: 'Niver a selloù'
+  Time:
+    Time: 'Padelezh'
+    Any Time: 'A-holl-viskoaz'
+    Last Hour: 'Eur diwezhañ'
+    Today: 'Hiziv'
+    This Week: 'Ar sizhun-mañ'
+    This Month: 'Ar miz-mañ'
+    This Year: 'Ar bloaz-mañ'
+  Type:
+    Type: 'Doare'
+    All Types: 'Holl zoareoù'
+    Videos: 'Videoioù'
+    Channels: 'Chadennoù'
+    Movies: 'Filmoù'
+    #& Playlists
+  Duration:
+    Duration: 'Padelezh'
+    All Durations: 'An holl badelezhioù'
+    Short (< 4 minutes): 'Berr (< 4 munud)'
+    Medium (4 - 20 minutes): 'Etre (4 - 20 munud)'
+    Long (> 20 minutes): 'Hir (> 20 munud)'
+  Features:
+    Features: 'Perzhioù'
+    HD: 'HD'
+    Subtitles: 'Istitloù'
+    Creative Commons: 'Creative Commons'
+    3D: '3D'
+    Live: 'War-eeun'
+    4K: '4K'
+    360 Video: 'Video 360'
+    Location: 'Lec’h'
+    HDR: 'HDR'
+    VR180: 'VR180'
+  # On Search Page
+  Search Results: 'Disoc''hoù ar c''hlask'
+  Fetching results. Please wait: 'O klask emañ. Gortozit mar-plij'
+  Fetch more results: 'Diskouez muioc''h a zisoc''hoù'
+  There are no more results for this search: 'N''eus ket mui netra da ziskouez evit
+    ar c''hlask-mañ'
+# Sidebar
+Subscriptions:
+    # On Subscriptions Page
+  Subscriptions: 'Koumanantoù'
+  # channels that were likely deleted
+  Error Channels: 'Chadennoù gant fazioù'
+  Latest Subscriptions: 'Koumanantoù diwezhañ'
+  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Ur
+    bochad koumanantoù en deus ar profil-mañ. Ar wazh RSS a yelo en tu all d''ar vevenn
+    lakaet'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Goullo
+    eo ho roll koumanantoù. Ma faot deoc''h enporzhiañ ho koumanantoù, e c''hellit
+    mont da Arventennoù ar Roadennoù ha choaz Enporzhiañ ho koumanantoù, mod all e
+    c''hellit klask chadennoù da goumanantiñ dezho.'
+  Disabled Automatic Fetching: 'Diweredekaet ho peus an adtapout koumanantoù ent emgefreek.
+    Hizivaat ar c''houmanantoù evit gwelet anezho.'
+  Empty Channels: 'N''eus video ebet gant ar chadennoù heuliet ganeoc''h evit poent.'
+  'Getting Subscriptions. Please wait.': 'O kerc''hat ar c''houmanantoù. Gortozit
+    mar plij.'
+  Empty Posts: 'N''eus kemennadenn ebet gant ar chadennoù heuliet ganeoc''h evit poent.'
+  Load More Videos: 'Kargañ muioc''h a videoioù'
+  Load More Posts: 'Kargañ muioc''h a bennadoù'
+  Subscriptions Tabs: 'Ivinelloù ar c''houmanantoù'
+  All Subscription Tabs Hidden: 'Kuzhet eo holl ivinelloù ar c''houmanantoù. Evit
+    gwelet traoù amañ, diguzhit un nebeud ivinelloù e lodenn "{subsection}" e-barzh
+    "{settingsSection}".'
+More: 'Muioc''h'
+Channels:
+  Channels: 'Chadennoù'
+  Title: 'Roll ar chadennoù'
+  Search bar placeholder: 'Klask chadennoù'
+  Count: '{number} chadenn kavet.'
+  Empty: 'Goullo eo ho roll chadennoù.'
+  Unsubscribe: ''
+  Unsubscribed: ''
+  Unsubscribe Prompt: 'Ha sur oc''h e faot deoc''h digoumanantiñ deus "{channelName}" ?'
+Trending:
+  Trending: 'Diouzh ar cʼhiz'
+  Default: 'Dre ziouer'
+  Music: 'Sonerezh'
+  Gaming: 'C''hoarioù video'
+  Movies: 'Filmoù'
+  Trending Tabs: 'Ivinelloù ar re diouzh ar c''hiz'
+Most Popular: 'Ar muiañ a verzh ganto'
+Feed:
+  Feed Last Updated: '{feedName} hizivadenn diwezhañ ar wazh : {date}'
+  Refresh Feed: 'Adkargañ {subscriptionName}'
+Playlists: 'Rolloù videoioù'
+User Playlists:
+  Your Playlists: 'Ho rolloù videoioù'
+  Playlist Message: ''
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
+  You have no playlists. Click on the create new playlist button to create a new one.: 'N''ho
+    peus ket a roll videoioù. Klikit war ar bouton krouiñ ur roll-videoioù nevez evit
+    krouiñ unan.'
+  Empty Search Message: 'N''eus video ebet e-barzh ar roll-vidoeioù-mañ a glotfe gant
+    ho klask'
+  Search bar placeholder: 'Klask rolloù-videoioù'
+  Playlists with Matching Videos: 'Rolloù-videoioù gant videoioù a glot'
+
+  This playlist currently has no videos.: 'Ar roll-videoioù-mañ n''en deus video ebet
+    evit poent.'
+
+  Create New Playlist: 'Krouiñ ur roll-videoioù nevez'
+
+  Add to Playlist: 'Ouzhpennañ d''ar roll-videoioù'
+  Add to Favorites: 'Ouzhpennañ da {playlistName}'
+  Remove from Favorites: 'Dilemel diwar {playlistName}'
+
+  Move Video Up: 'Kas ar video uheloc''h'
+  Move Video Down: 'Kas ar video izeloc’h'
+  Remove from Playlist: 'Tennañ kuit eus ar roll-videoioù'
+
+  Playlist Name: 'Anv ar roll-videoioù'
+  Playlist Description: 'Deskrivadur ar roll-videoioù'
+
+  Save Changes: 'Enrollañ ar c''hemmoù'
+  Cancel: 'Nullañ'
+  Edit Playlist Info: 'Kemmañ titouroù ar roll-videoioù'
+  Copy Playlist: 'Eilañ ar roll-videoioù'
+  Remove Duplicate Videos: 'Dilemel doublennoù ar videoioù'
+  Remove Watched Videos: 'Dilemel ar videoioù bet lennet'
+  Enable Quick Bookmark With This Playlist: 'Gweredekaat ar sined prim evit ar roll-videoioù-mañ'
+  Quick Bookmark Enabled: 'Sined prim gweredekaet'
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: 'Ha
+    sur oc''h e faot deoc''h dilemel 1 doublenn video diouzh ar roll-videoioù-mañ ?
+    Ne c''hall ket bezañ nullet. | Ha sur oc''h e faot deoc''h dilemel {playlistItemCount}
+    doublenn video diouzh ar roll-videoioù-mañ ? Ne c''hall ket bezañ nullet.'
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: 'Ha
+    sur oc''h e faot deoc''h dilemel 1 video bet lennet diouzh ar roll-videoioù-mañ ?
+    Ne c''hall ket bezañ nullet. | Ha sur oc''h e faot deoc''h dilemel {playlistItemCount}
+    video bet lennet diouzh ar roll-videoioù-mañ ? Ne c''hall ket bezañ nullet.'
+  Delete Playlist: 'Dilemel roll-videoioù'
+  Cannot delete the quick bookmark target playlist.: 'N''eo ket posupl dilemel ar
+    roll-videoioù e-lec''h ma vez enrollet ar sinedoù prim.'
+  Are you sure you want to delete this playlist? This cannot be undone: 'Ha sur oc''h
+    e faot deoc''h dilemel ar roll-videoioù-mañ ? Ne vo ket moaien da nullañ war-lerc''h.'
+
+  Sort By:
+    Sort By: 'Rummañ dre'
+
+    NameAscending: 'A-Z'
+    NameDescending: 'Z-A'
+
+    LatestCreatedFirst: 'Krouet nevez ''zo'
+    EarliestCreatedFirst: 'Krouet pell ''zo'
+
+    LatestUpdatedFirst: 'Kemmet nevez ''zo'
+    EarliestUpdatedFirst: 'Kemmet pell ''zo'
+
+    LatestPlayedFirst: 'Lennet nevez ''zo'
+    EarliestPlayedFirst: 'Lennet pell ''zo'
+  SinglePlaylistView:
+    Search for Videos: 'Klask Videoioù'
+
+    Toast:
+      This video cannot be moved up.: 'Ar video-mañ n''hall ket pignat er roll.'
+      This video cannot be moved down.: 'Ar video-mañ n''hall ket diskenn er roll.'
+      Video has been removed: 'Dilamet eo bet ar video'
+      There was a problem with removing this video: 'Ur gudenn a oa en ur glask dilemel
+        ar video-mañ'
+
+      This playlist is already being used for quick bookmark.: 'Implijet e vez dija
+        ar roll-videoioù-mañ evit enrollañ ar sinedoù prim.'
+      This playlist is now used for quick bookmark: 'Implijet e vo ar roll-videoioù-mañ
+        evit enrollañ ar sinedoù prim'
+      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: 'Implijet
+        e vo ar roll-videoioù-mañ evit enrollañ ar sinedoù prim e-lec''h {oldPlaylistName}.
+        Klikit amañ evit nullañ'
+      Reverted to use {oldPlaylistName} for quick bookmark: 'Adlakaat ar roll-videoioù
+        {oldPlaylistName} evit enrollañ ar sinedoù prim'
+
+      Some videos in the playlist are not loaded yet. Click here to copy anyway.: 'Videoioù
+        ''zo e-barzh ar roll-videoioù n''int ket karget c''hoazh. Klikit amañ evit
+        eilañ anezho memestra.'
+      Playlist name cannot be empty. Please input a name.: 'N''hall ket anv ar roll-videoioù
+        bezañ goullo. Lakait unan mar-plij.'
+      Playlist has been updated.: 'Kemmet eo bet ar roll-videoioù.'
+      There was an issue with updating this playlist.: 'C''hoarvezet ez eus ur gudenn
+        en ur cheñch ar roll-videoioù-mañ.'
+      "{videoCount} video(s) have been removed": "Dilamet ez eus bet 1 video | Dilamet
+        ez eus bet {videoCount} video"
+      There were no videos to remove.: 'Ne oa video ebet da zilemel.'
+      This playlist is protected and cannot be removed.: 'Gwarezet eo ar roll-videoioù-mañ
+        ha ne c''hall ket bezañ dilamet.'
+      Playlist {playlistName} has been deleted.: 'Dilamet eo bet ar roll-videoioù
+        {playlistName}.'
+      Playlist {playlistName} is the new quick bookmark playlist.: 'Ar roll-videoioù
+        {playlistName} a zo bremañ roll-videoioù nevez ar sinedoù prim.'
+
+      This playlist does not exist: 'N''eus ket eus ar roll-videoioù-mañ'
+
+      This playlist has a video with a duration error: 'Bez ez eus ur video d''an
+        nebeutañ hep padelezh e-barzh ar roll-videoioù, rummet e vo evel ma vije goullo
+        ar padelezh.'
+  AddVideoPrompt:
+    Select a playlist to add your N videos to: 'Choazit ur roll-videoioù evit ouzhpennañ
+      ho video e-barzh | Choazit ur roll-videoioù evit ouzhpennañ ho {videoCount}
+      video e-barzh'
+    N playlists selected: '{playlistCount} Diuzet'
+    Search in Playlists: 'Klask e-barzh ar rolloù-videoioù'
+    Allow Adding Duplicate Video(s): 'Aotren ouzhpennañ doublennoù videoioù'
+    Save: 'Enrollañ'
+
+    Added {count} Times: 'Ouzhpennet dija | Ouzhpennet {count} gwech'
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
+      video a vo ouzhpennet'
+    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
+      video bet ouzhpennet dija'
+
+    Toast:
+      You haven't selected any playlist yet.: 'N''ho peus diuzet ur roll-videoioù
+        c''hoazh.'
+      "{videoCount} video(s) added to 1 playlist": "1 video ouzhpennet d'1 roll-videoioù
+        | {videoCount} video ouzhpennet d'1 roll-videoioù"
+      "{videoCount} video(s) added to {playlistCount} playlists": "1 video ouzhpennet
+        da {playlistCount} roll-videoioù | {videoCount} video ouzhpennet da  {playlistCount}
+        roll-videoioù"
+  CreatePlaylistPrompt:
+    New Playlist Name: 'Anv nevez ar roll-videoioù'
+    Create: 'Krouiñ'
+
+    Toast:
+      There is already a playlist with this name. Please pick a different name.: 'Bez
+        ez eus dija ur roll-videoioù gant an anv-mañ. Choazit un anv disheñvel mar-plij.'
+      Playlist {playlistName} has been successfully created.: 'Krouet eo bet ar roll-videoioù
+        {playlistName} gant berzh.'
+      There was an issue with creating the playlist.: 'C''hoarvezet ez eus ur gudenn
+        en ur grouiñ ar roll-videoioù.'
+  Export Playlist: Ezporzhiañ ar Roll-videoioù
+  The playlist has been successfully exported: Ezporzhiet eo bet ar roll-videoioù
+    gant berzh
+History:
+  # On History Page
+  History: 'Roll istor'
+  Watch History: 'Roll istor ar videoioù lennet'
+  Your history list is currently empty.: 'Goullo eo ho roll istor.'
+  Empty Search Message: 'N''eus video ebet e-barzh ho roll istor o klotañ gant ho
+    klask'
+  Search bar placeholder: "Klask e-barzh ar roll istor"
+  Case Sensitive Search: 'Klask o toujañ d''ar pennlizherennoù'
+Settings:
+  # On Settings Page
+  Settings: 'Arventennoù'
+  Expand All Settings Sections: ''
+  Sort Settings Sections (A-Z): 'Rummañ lodennoù an arventennoù (A-Z)'
+  Return to Settings Menu: 'Distreiñ d''al lañser arventennoù'
+  The app needs to restart for changes to take effect. Restart and apply change?: 'Ezhomm
+    en deus an arload da vezañ adloc''het bremañ evit arloañ ar c''hemmoù. Adloc''hañ
+    hag arloañ ar c''hemmoù ?'
+  General Settings:
+    General Settings: 'Hollek'
+    Check for Updates: 'Klask Hizivadurioù'
+    Check for Latest Blog Posts: 'Diskouez pennadoù diwezhañ ar Blog'
+    Fallback to Non-Preferred Backend on Failure: 'Distreiñ d''ar Backend ha n''eo
+      ket hoc''h hini karetañ ma c''hoarvez ur gudenn'
+    Enable Search Suggestions: 'Gweredekaat Kinnigoù klask'
+    Auto Load Next Page:
+      Label: 'Kargañ ar bajenn da heul ent emgefreek'
+      Tooltip: 'Kargañ ar pajennoù hag an evezhiadennoù all ent emgefreek.'
+    Default Landing Page: 'Pajenn degemer dre ziouer'
+    Locale Preference: 'Yezh'
+    System Default: 'Reizhiad dre ziouer'
+    Preferred API Backend:
+      Preferred API Backend: 'API Backend muiañ karet'
+      Local API: 'API lec''hel'
+      Invidious API: 'API Invidious'
+    Video View Type:
+      Video View Type: 'Doare da ziskouez ar videoioù'
+      Grid: 'Kael'
+      List: 'Roll'
+    Thumbnail Preference:
+      Thumbnail Preference: 'Gwellvezioù ar skeudennoùigoù'
+      Default: 'Dre ziouer'
+      Beginning: 'Derou'
+      Middle: 'Kreiz'
+      End: 'Fin'
+      Hidden: 'Kuzhet'
+      Blur: 'Ruzed'
+    Current Invidious Instance: 'Istañs Invidious bremanel'
+    The currently set default instance is {instance}: 'An istañs dre ziouer a zo {instance}'
+    No default instance has been set: 'N''eus istañs dre ziouer ebet choazet'
+    Current instance will be randomized on startup: 'Dargouezheket e vo un istañs
+      dre ziouer pa vo adloc''het'
+    Set Current Instance as Default: 'Lakaat an istañs implijet bremañ evel an hini
+      dre ziouer'
+    Clear Default Instance: 'Diverkañ an istañs dre ziouer'
+    View all Invidious instance information: 'Gwelet titouroù an holl istañsoù Invidious'
+    Region for Trending: 'Bro evit ar videoioù diouzh ar c''hiz'
+    #! List countries
+    External Link Handling:
+      External Link Handling: 'Merañ al liammoù diavaez'
+      Open Link: 'Digeriñ an ere'
+      Ask Before Opening Link: 'Goulenn a-raok digeriñ ul liamm'
+      No Action: 'Netra'
+  Theme Settings:
+    Theme Settings: 'Tem'
+    Match Top Bar with Main Color: 'Lakaat da glotañ liv ar varenn e-krec''h gant
+      al liv pennañ'
+    Expand Side Bar by Default: 'Astenn ar varenn gostez dre ziouer'
+    Disable Smooth Scrolling: 'Diweredekaat an dibunañ flour'
+    UI Scale: 'Skeul an UI'
+    Hide Side Bar Labels: 'Kuzhat tikedennoù ar varrenn gostez'
+    Hide FreeTube Header Logo: 'Kuzhat logo FreeTube an talbenn'
+    Base Theme:
+      Base Theme: 'Tem diazez'
+      Black: 'Du'
+      Dark: 'Teñval'
+      System Default: 'Yezh ar reizhiad'
+      Light: 'Sklaer'
+      Dracula: 'Drakula'
+      Catppuccin Mocha: 'Catppuccin Mocha'
+      Pastel Pink: 'Roz pastel'
+      Hot Pink: 'Roz flamm'
+      Nordic: 'Nordik'
+      Solarized Dark: 'Du luc''hahelet'
+      Solarized Light: 'Sklaer luc''hahelet'
+    Main Color Theme:
+      Main Color Theme: 'Liv pennañ an tem'
+      Red: 'Ruz'
+      Pink: 'Roz'
+      Purple: 'Mouk'
+      Deep Purple: 'Mouk teñval'
+      Indigo: 'Indigo'
+      Blue: 'Glas'
+      Light Blue: 'Glas sklaer'
+      Cyan: 'Siañ'
+      Teal: 'Glas-gwer'
+      Green: 'Gwer'
+      Light Green: 'Gwer sklaer'
+      Lime: 'Liv sitroñs'
+      Yellow: 'Melen'
+      Amber: 'Goularz'
+      Orange: 'Orañjez'
+      Deep Orange: 'Orañjez teñval'
+      Dracula Cyan: 'Drakula Siañ'
+      Dracula Green: 'Drakula Gwer'
+      Dracula Orange: 'Drakula Orañjez'
+      Dracula Pink: 'Drakula Roz'
+      Dracula Purple: 'Drakula Mouk'
+      Dracula Red: 'Drakula Ruz'
+      Dracula Yellow: 'Drakula Melen'
+      Catppuccin Mocha Rosewater: 'Catppuccin Moka Roz sklaer'
+      Catppuccin Mocha Flamingo: 'Catppuccin Moka Flammeg boutin'
+      Catppuccin Mocha Pink: 'Catppuccin Moka Roz'
+      Catppuccin Mocha Mauve: 'Catppuccin Moka Mouk'
+      Catppuccin Mocha Red: 'Catppuccin Moka Ruz'
+      Catppuccin Mocha Maroon: 'Catppuccin Moka Gell'
+      Catppuccin Mocha Peach: 'Catppuccin Moka Pechez'
+      Catppuccin Mocha Yellow: 'Catppuccin Moka Melen'
+      Catppuccin Mocha Green: 'Catppuccin Moka Gwer'
+      Catppuccin Mocha Teal: 'Catppuccin Moka Glas-gwer'
+      Catppuccin Mocha Sky: 'Catppuccin Moka Glas oabl'
+      Catppuccin Mocha Sapphire: 'Catppuccin Moka Safir'
+      Catppuccin Mocha Blue: 'Catppuccin Moka Glas'
+      Catppuccin Mocha Lavender: 'Catppuccin Moka Lavand'
+      Solarized Yellow: 'Melen luc''hahelet'
+      Solarized Orange: 'Orañjez luc''hahelet'
+      Solarized Red: 'Ruz luc''hahelet'
+      Solarized Magenta: 'Majenta luc''hahelet'
+      Solarized Violet: 'Mouk luc''hahelet'
+      Solarized Blue: 'Glas luc''hahelet'
+      Solarized Cyan: 'Siañ luc''hahelet'
+      Solarized Green: 'Gwer luc''hahelet'
+    Secondary Color Theme: 'Liv eilvedel an tem'
+        #* Main Color Theme
+  Player Settings:
+    Player Settings: 'Lenner'
+    Play Next Video: 'Lenn ar video da-heul'
+    Turn on Subtitles by Default: 'Enaouiñ an istitloù dre ziouer'
+    Autoplay Videos: 'Lenn emgefreek ar videoioù'
+    Proxy Videos Through Invidious: 'Proksi video dre Invidious'
+    Autoplay Playlists: 'Lenn emgefreek ar rolloù-videoioù'
+    Enable Theatre Mode by Default: 'Gweredekaat ar mod sinema dre ziouer'
+    Scroll Volume Over Video Player: 'Kontrol al live-son en ur zibunañ rodellig al
+      logodenn war al lenner video'
+    Scroll Playback Rate Over Video Player: 'Kontrol ar feur lenn en ur zibunañ rodellig
+      al logodenn war al lenner video'
+    Skip by Scrolling Over Video Player: 'Tremen en ur zibunañ rodellig al logodenn
+      war al lenner video'
+    Display Play Button In Video Player: 'Diskouez ar bouton Lenn e-barzh al lenner
+      video'
+    Enter Fullscreen on Display Rotate: 'Tremen e skramm leun pa vez troet ar skramm'
+    Next Video Interval: 'Esaouenn a-raok ar video da heul'
+    Fast-Forward / Rewind Interval: 'Esaouenn evit mont War-raok / War-gil'
+    Default Volume: 'Ment ar son dre ziouer'
+    Default Playback Rate: 'Feur lenn dre ziouer'
+    Max Video Playback Rate: 'Feur lenn uhelañ ar videoioù'
+    Video Playback Rate Interval: 'Esaouenn feur lenn ar videoioù'
+    Default Video Format:
+      Default Video Format: 'Furmad video dre ziouer'
+      Dash Formats: 'Furmad DASH'
+      Legacy Formats: 'Furmad Legacy'
+      Audio Formats: 'Furmadoù son'
+    Default Quality:
+      Default Quality: 'Kalite dre ziouer'
+      Auto: 'Emgefreek'
+      144p: '144p'
+      240p: '240p'
+      360p: '360p'
+      480p: '480p'
+      720p: '720p'
+      1080p: '1080p'
+      1440p: '1440p'
+      4k: '4k'
+      8k: '8k'
+    Screenshot:
+      Enable: 'Gweredekaat Tapadennoù-skramm'
+      Format Label: 'Furmad an tapadennoù-skramm'
+      Quality Label: 'Kalite an tapadennoù-skramm'
+      Ask Path: 'Goulenn war-lerc''h an teuliad enrollañ'
+      Folder Label: 'Teuliad an tapadennoù-skramm'
+      Folder Button: 'Diuzañ un teuliad'
+      File Name Label: 'Patrom anv restr'
+      File Name Tooltip: 'Gallout a rit implijout an argemmennoù da-heul. %Y Bloavezh
+        4 sifr. %M Miz 2 sifr. %D Devezh 2 sifr. %H Eur 2 sifr. %N Munutennoù 2 sifr.
+        %S Eilennoù 2 sifr. %T Mili-eilennoù 3 sifr. %s Eilennoù ar video. %t Mili-eilennoù
+        ar video 3 sifr. %i ID ar video. Gallout a rit implijout ivez \ pe / evit
+        krouiñ teuliadoù.'
+      Error:
+        Forbidden Characters: 'Arouezennoù difennet'
+        Empty File Name: 'Goullo eo anv ar restr'
+  External Player Settings:
+    External Player Settings: 'Lenner diavaez'
+    External Player: 'Lenner diavaez'
+    Ignore Unsupported Action Warnings: 'Lezel a-gostez ar c''hemennadennoù evit an
+      obererezhioù nann skoret'
+    Ignore Default Arguments: 'Leuskel arguzennoù dre ziouer a-gostez'
+    Custom External Player Executable: 'Lenner diavaez personelaet'
+    Custom External Player Arguments: 'Arguzennoù al lenner diavaez personelaet'
+    Players:
+      None:
+        Name: 'Hini ebet'
+  Privacy Settings:
+    Privacy Settings: 'Prevezded'
+    Remember History: 'Derc''hel soñj ar roll istor'
+    Save Watched Progress: 'Mirout araokadur al lenn'
+    Save Watched Videos With Last Viewed Playlist: 'Enrollañ ar videoioù lennet e-barzh
+      roll-videoioù diwezhañ sellet'
+    Clear Search Cache: 'Skarzhañ roll-istor an enklaskoù'
+    Are you sure you want to clear out your search cache?: 'Ha sur oc''h e faot deoc''h
+      skarzhañ roll-istor an enklaskoù ?'
+    Search cache has been cleared: 'Skarzhet eo bet roll-istor an enklaskoù'
+    Remove Watch History: 'Dilemel ar roll istor'
+    Are you sure you want to remove your entire watch history?: 'Ha sur oc''h e faot
+      deoc''h dilemel ho roll istor a-bezh ?'
+    Watch history has been cleared: 'Dilamet eo bet roll istor ar videoioù lennet'
+    Remove All Subscriptions / Profiles: 'Dilemel an holl goumanantoù / profiloù'
+    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'Ha
+      sur oc''h e faot deoc''h dilemel an holl goumanantoù ha profiloù ? Ne c''hall
+      ket bezañ nullet.'
+    Remove All Playlists: 'Dilemel an holl rolloù-videoioù'
+    All playlists have been removed: 'Lamet eo bet an holl rolloù-videoioù'
+    Are you sure you want to remove all your playlists?: 'Ha sur oc''h e faot deoc''h
+      dilemel hoc''h holl rolloù-videoioù ?'
+  Subscription Settings:
+    Subscription Settings: 'Koumanant'
+    Hide Videos on Watch: 'Kuzhat ar videoioù lennet'
+    Fetch Feeds from RSS: 'Adtapout ar gwazhioù RSS'
+    Manage Subscriptions: ''
+    Fetch Automatically: 'Adtapout ar wazh ent emgefreek'
+    Only Show Latest Video for Each Channel: 'Diskouez ar video-diwezhañ hepken evit
+      pep chadenn'
+    Confirm Before Unsubscribing: 'Kadarnaat a-raok Digoumanantiñ'
+  Distraction Free Settings:
+    Distraction Free Settings: 'Disoursi'
+    Sections:
+      Side Bar: 'Barrenn gostez'
+      Subscriptions Page: 'Pajenn ar c''houmanantoù'
+      Channel Page: 'Pajenn ar chadenn'
+      Watch Page: 'Pajenn evit lenn'
+      General: 'Hollek'
+    Hide Video Views: 'Kuzhat an niver a selloù'
+    Hide Video Likes And Dislikes: 'Kuzhat bizied-meud ar videoioù'
+    Hide Channel Subscribers: 'Kuzhat an niver a dud koumanantet d''ar chadennoù'
+    Hide Comment Likes: 'Kuzhat an niver a vizied-meud evit an evezhiadennoù'
+    Hide Recommended Videos: 'Kuzhat ar videoioù aliet'
+    Hide Trending Videos: 'Kuzhat ar videoioù diouzh ar c''hiz'
+    Hide Popular Videos: 'Kuzhat ar videoioù muian karet'
+    Hide Playlists: 'Kuzhat ar rolloù-videoioù'
+    Hide Live Chat: 'Kuzhat ar flapiñ war-eeun'
+    Hide Active Subscriptions: 'Kuzhat ar c''houmanantoù oberiant'
+    Hide Video Description: 'Kuzhat deskrivadur ar video'
+    Hide Comments: 'Kuzhat an evezhiadennoù'
+    Hide Profile Pictures in Comments: 'Kuzhat ar skeudennoù profil e-barzh an evezhiadennoù'
+    Display Titles Without Excessive Capitalisation: 'Diskouez an titloù hep lizherennoù
+      bras hag hep re a boentadurioù'
+    Hide Live Streams: 'Kuzhat ar skignañ war-eeun'
+    Hide Upcoming Premieres: 'Kuzhat rakskignañ da zont'
+    Hide Sharing Actions: 'Kuzhat an doareoù da rannañ'
+    Hide Chapters: 'Kuzhat ar chabistroù'
+    Hide Channels: 'Kuzhat videoioù ar chadennoù'
+    Hide Channels Disabled Message: 'Stanket eo bet chadennadoù zo gant an ID ha n''int
+      ket evit bezañ diskouezet. Stanket eo an obererezh-mañ keit ma vez hizivaet
+      an IDoù-se'
+    Hide Channels Placeholder: 'ID ar chadenn'
+    Hide Channels Invalid: 'Direizh eo ID ar chadenn roet'
+    Hide Channels API Error: 'Fazi en ur adtapout an implijer gant an ID bet roet.
+      Gwiriit en-dro hag-eñ eo reizh an ID mar plij.'
+    Hide Channels Already Exists: 'ID ar chadenn a zo anezhañ dija'
+    Hide Featured Channels: 'Kuzhat ar chadennoù lakaet war-wel'
+    Hide Channel Playlists: 'Kuzhat rolloù-videoioù ar chadennoù'
+    Hide Channel Community: 'Kuzhat ivinell kumuniezh ar chadenn'
+    Hide Channel Shorts: 'Kuzhat Shortoù ar chadenn'
+    Hide Channel Podcasts: 'Kuzhat Podskignañ at chadenn'
+    Hide Channel Releases: 'Kuzhat ermaeziadennoù ar chadenn'
+    Hide Videos and Playlists Containing Text: 'Kuzhat ar videoioù hag ar rolloù-videoioù
+      gant testennoù'
+    Hide Videos and Playlists Containing Text Placeholder: 'Ger, lodenn deus ur ger,
+      pe frazenn'
+    Hide Subscriptions Videos: 'Kuzhat videoioù ar c''houmanantoù'
+    Hide Subscriptions Shorts: 'Kuzhat Shortoù ar c''houmanantoù'
+    Hide Subscriptions Live: 'Kuzhat ar skignañ war-eeun deus ar c''houmanantoù'
+    Hide Subscriptions Community: 'Kuzhat Kumuniezh ar c''houmanantoù'
+  Data Settings:
+    Data Settings: 'Roadennoù'
+    Select Import Type: 'Choaz doare enporzhiañ'
+    Select Export Type: 'Choaz doare ezporzhiañ'
+    Import Subscriptions: 'Enporzhiañ ho koumanantoù'
+    Subscription File: 'Restr ar c''houmanant'
+    History File: 'Rest ar roll istor'
+    Playlist File: 'Restr ar roll-videoioù'
+    Check for Legacy Subscriptions: ''
+    Export Subscriptions: 'Ezporzhiañ ar c''houmanantoù'
+    Export FreeTube: 'Ezporzhiañ FreeTube'
+    Export YouTube: 'Ezporzhiañ YouTube'
+    Export NewPipe: 'Ezporzhiañ NewPipe'
+    Import History: 'Enporzhiañ ar roll istor'
+    Export History: 'Ezporzhiañ ar roll istor'
+    Import Playlists: 'Enporzhiañ rolloù-videoioù'
+    Export Playlists: 'Ezporzhiañ rolloù-videoioù'
+    Export Playlists For Older FreeTube Versions:
+      Label: 'Ezporzhiañ rolloù-videoioù evit stummoù kozh FreeTube'
+      # |- = Keep newlines, No newline at end
+      Tooltip: |-
+        An dibarzh-mañ a ezporzh videoioù an holl rolloù-videoioù e-barzh ur roll-videoioù anvet « Favorites ».
+        Penaos ezporzhiañ & enporzhiañ videoioù e-barzh rolloù-videoioù gant stummoù kozh FreeTube :
+        1. Ezporzhiañ ho rolloù-videoioù gant an dibarzh-mañ gweredekaet.
+        2. Dilemel an holl rolloù-videoioù en ur implijout an dibarzh Dilemel an holl rolloù-videoioù dindan Prevezded.
+        3. Loc'hañ stumm kozh FreeTube hag enporzhiañ ar rolloù-videoioù ezporzhiet."
+    Profile object has insufficient data, skipping item: 'Diouer a roadennoù evit
+      profil an elfenn-mañ, o leuskel an elfenn a-gostez'
+    All subscriptions and profiles have been successfully imported: 'Enporzhiet eo
+      bet an holl goumanantoù ha profiloù gant berzh'
+    All subscriptions have been successfully imported: 'Enporzhiet eo bet an holl
+      goumanantoù gant berzh'
+    Invalid subscriptions file: 'Direizh eo restr ar c''houmanantoù'
+    Invalid history file: 'Restr ar roll istor direizh'
+    Subscriptions have been successfully exported: 'Ezporzhiet eo bet ar c''houmanantoù
+      gant berzh'
+    History object has insufficient data, skipping item: 'Lezel a-gostez an elfenn-mañ
+      peogwir e vank titouroù e-barzh ar roll istor'
+    All watched history has been successfully imported: 'Enporzhiet eo bet roll istor
+      ar videoioù lennet gant berzh'
+    All watched history has been successfully exported: 'Ezporzhiet eo bet roll istor
+      ar videoioù lennet gant berzh'
+    Playlist insufficient data: 'Diouer a roadennoù evit ar roll-videoioù "{playlist}",
+      o leuskel an elfenn a-gostez'
+    All playlists has been successfully imported: 'Enporzhiet eo bet an holl rolloù-videoioù
+      gant berzh'
+    All playlists has been successfully exported: 'Ezporzhiet eo bet an holl rolloù-videoioù
+      gant berzh'
+    Unable to read file: 'Ne c''haller ket lenn ar restr'
+    Unable to write file: 'N''haller ket skrivañ ar restr'
+    Unknown data key: 'Alc''hwez ar roadennoù dianav'
+    How do I import my subscriptions?: 'Penaos enporzhiañ ma c''houmanantoù ?'
+    Manage Subscriptions: 'Merañ ar c''houmanantoù'
+  Proxy Settings:
+    Proxy Settings: 'Proksi'
+    Enable Tor / Proxy: 'Gweredekaat Tor / Proksi'
+    Proxy Protocol: 'Komenad ar Proksi'
+    Proxy Host: 'Komenad Servijer'
+    Proxy Port Number: 'Niverenn borzh ar Proksi'
+    Clicking on Test Proxy will send a request to: 'En ur glikañ war Taol-esae Proksi
+      e vo kaset ur goulenn da'
+    Test Proxy: 'Taol-esae Proksi'
+    Your Info: 'Ho titouroù'
+    Ip: 'IP'
+    Country: 'Bro'
+    Region: 'Rannvro'
+    City: 'Kêr'
+    Error getting network information. Is your proxy configured properly?: 'C''hoarvezet
+      ez eus bet ur gudenn en ur glask war-lerc''h titouroù ar rouedad. Ha kefluniet
+      mat eo ho proksi ?'
+  SponsorBlock Settings:
+    SponsorBlock Settings: 'SponsorBlock'
+    Enable SponsorBlock: 'Gweredekaat SponsorBlock'
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'URL API SponsorBlock
+      (Dre ziouer https://sponsor.ajay.app)'
+    Notify when sponsor segment is skipped: 'Kelaouiñ pa vez tremenet ul lodenn paeroniet'
+    UseDeArrowTitles: 'Implijout titloù video DeArrow'
+    UseDeArrowThumbnails: 'Implijout DeArrow evit ar skeudennoùigoù'
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': 'URL
+      API DeArrow evit krouiñ skeudennoùigoù (Dre ziouer https://dearrow-thumb.ajay.app)'
+    Skip Options:
+      Skip Option: 'Laoskel a-gostez an dibarzh'
+      Auto Skip: 'Lamm emgefreek'
+      Show In Seek Bar: 'Diskouez er varenn glask'
+      Prompt To Skip: 'Kinnig da laoskel a-gostez'
+      Do Nothing: 'Ober netra'
+    Category Color: 'Liv ar rummad'
+  Parental Control Settings:
+    Parental Control Settings: 'Kontroll ar gerent'
+    Hide Unsubscribe Button: 'Kuzhat ar bouton digoumanantiñ'
+    Show Family Friendly Only: 'Diskouez videoioù evit ar familh hepken'
+    Hide Search Bar: 'Kuzhat ar varenn glask'
+  Download Settings:
+    Download Settings: 'Pellgargañ'
+    Ask Download Path: 'Goulenn war-lerc''h an hent pellgargañ'
+    Choose Path: 'Dibab an hent'
+    Download Behavior: 'Emzalc''h ar pellgargañ'
+    Download in app: 'Pellgargañ en arload'
+    Open in web browser: 'Digeriñ er merdeer web'
+  Experimental Settings:
+    Experimental Settings: 'Arnodel'
+    Warning: 'Arventennoù arnodel eo, gallout a ra ar sistem chom bout pa vezont gweredekaet.
+      Aliet-tre eo ober enrolladennoù. Kendalc’hit en ho riskl hoc’h-unan !'
+    Replace HTTP Cache: 'Erlec''hiañ ar grubuilh HTTP'
+  Password Dialog:
+    Password: 'Ger-tremen'
+    Enter Password To Unlock: 'Enankit ar ger-tremen evit dibrennañ an arventennoù'
+    Password Incorrect: 'Ger-tremen direizh'
+    Unlock: 'Dibrennañ'
+  Password Settings:
+    Password Settings: 'Ger-tremen'
+    Set Password To Prevent Access: 'Lakaat ur ger-tremen evit gwareziñ an arventennoù'
+    Set Password: 'Termeniñ ur ger-termen'
+    Remove Password: 'Dilemel ar ger-tremen'
+About:
+  #On About page
+  About: 'A-zivout'
+  Beta: 'Beta'
+  Source code: 'Kod mammenn'
+  Licensed under the: 'Dindan an aotre-implijout'
+  AGPLv3: 'AGPLv3'
+  Downloads / Changelog: 'Pellgargañ / Deizlevr ar cheñchamantoù'
+  GitHub releases: 'Ermaeziadennoù GitHub'
+  Help: 'Skoazell'
+  FreeTube Wiki: 'Wiki FreeTube'
+  FAQ: 'FAG'
+  Discussions: 'Kaozeadennoù'
+  Report a problem: 'Menegiñ ur gudenn'
+  GitHub issues: 'Kudennoù renablet war GitHub'
+  Please check for duplicates before posting: 'Gwiriekait an doublennoù a-raok embann,
+    mar-plij'
+  Website: 'Lec''hienn web'
+  Blog: 'Blog'
+  Email: 'Chomlec’h postel'
+  Mastodon: 'Mastodon'
+  Chat on Matrix: 'Flapañ war Matrix'
+  Please read the: 'Par-plij, lennit'
+  room rules: 'reolennoù ar sal'
+  Translate: 'Treiñ'
+  Credits: 'Kreditoù'
+  FreeTube is made possible by: 'Bez ez eus deus FreeTube a-drugarez da'
+  these people and projects: 'an dud-se hag ar raktresoù-se'
+  Donate: 'Ober un donezon'
+
+Profile:
+  Profile Settings: 'Profil'
+  Toggle Profile List: 'Diskouez roll ar profiloù'
+  Profile Select: 'Dibab ar profil'
+  Profile Filter: 'Silañ ar profil'
+  All Channels: 'An holl chadennoù'
+  Profile Manager: 'Merañ ar profil'
+  Create New Profile: 'Krouiñ ur profil nevez'
+  Edit Profile: 'Kemmañ ar profil'
+  Edit Profile Name: 'Kemmañ anv ar profil'
+  Create Profile Name: 'Krouiñ anv ar profil'
+  Profile Name: 'Anv ar profil'
+  Color Picker: 'Garrennig livioù'
+  Custom Color: 'Liv personelaet'
+  Profile Preview: 'Rakwelet ar profil'
+  Create Profile: 'Krouiñ ur profil'
+  Update Profile: 'Hizivaat ar profil'
+  Make Default Profile: 'Lakaat evel Profil dre ziouer'
+  Delete Profile: 'Dilemel ar profil'
+  Are you sure you want to delete this profile?: 'Ha sur oc''h e faot deoc''h dilemel
+    ar profil-mañ ?'
+  All subscriptions will also be deleted.: 'An holl goumanantoù a vo ivez dilamet.'
+  Profile could not be found: 'N''eus ket bet gallet kavout ar profil'
+  Your profile name cannot be empty: 'Ne c''hall ket anv ar profil bezañ goullo'
+  Profile has been created: 'Krouet eo bet ar profil'
+  Profile has been updated: 'Hizivaet eo bet ar profil'
+  Your default profile has been set to {profile}: 'Ho profil dre ziouer ''zo bet lakaet
+    da {profile}'
+  Removed {profile} from your profiles: 'Dilamet eo bet {profile} deus ho profiloù'
+  Your default profile has been changed to your primary profile: 'Kemmet eo bet ho
+    profil dre ziouer d''ho profil pennañ'
+  '{profile} is now the active profile': '{profile} a zo bremañ ar profil oberiant'
+  Subscription List: 'Roll ar c''houmanantoù'
+  Other Channels: 'Chadennoù all'
+  '{number} selected': '{number} diuzet'
+  Select All: 'Diuzañ an holl'
+  Select None: 'Diuzañ hini ebet'
+  Delete Selected: 'Dilemel ar re ziuzet'
+  Add Selected To Profile: 'Ouzhpennañ ar re ziuzet d’ar profil'
+  No channel(s) have been selected: 'Chadenn ebet diuzet'
+  ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
+    same channels will be deleted in any profile they are found in.
+  : 'Ho profil pennañ eo. Ha sur oc''h e faot deoc''h dilemel ar chadennoù diuzet ?
+    Ar memes chadennoù a vo dilamet deus ho profiloù all.'
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Ha
+    sur oc''h hoc''h e faot deoc''h dilemel ar chadennoù diuzet ?  Gant-se ne vo ket
+    dilamet ar chadenn diouzh profil ebet all.'
+  Close Profile Dropdown: 'Serriñ roll ar profil'
+  Open Profile Dropdown: 'Digeriñ roll ar profil'
+#On Channel Page
+Channel:
+  Subscribe: 'Koumanantiñ'
+  Unsubscribe: 'Digoumanantiñ'
+  Channel has been removed from your subscriptions: 'Dilamet eo bet ar chadenn diouzh
+    ho koumanantoù'
+  Removed subscription from {count} other channel(s): 'Dilamet eo bet ar c''houmanant
+    diouzh {count} chadenn all'
+  Added channel to your subscriptions: 'Chadenn ouzhpennet d''ho koumanantoù'
+  Search Channel: 'Klask e-barzh ar chadenn'
+  Your search results have returned 0 results: 'N''eus disoc''h ebet gant ho klask'
+  Sort By: 'Rummañ dre'
+  This channel does not exist: 'N''eus ket deus ar chadenn-mañ'
+  This channel does not allow searching: 'Ne vez ket aotreet klask gant ar chadenn-mañ'
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Ur
+    vevenn oad a zo d''ar chadenn-mañ ha ne c''hall ket bezañ gwelet war FreeTube
+    evit poent.'
+  Channel Tabs: 'Ivinelloù ar chadenn'
+  Videos:
+    Videos: 'Videoioù'
+    This channel does not currently have any videos: 'N''eus ket a video evit poent
+      gant ar chadenn-mañ'
+    Sort Types:
+      Newest: 'Nevesañ'
+      Oldest: 'Koshañ'
+      Most Popular: 'Ar muiañ a verzh ganto'
+  Shorts:
+    This channel does not currently have any shorts: 'N''eus ket a video short evit
+      poent gant ar chadenn-mañ'
+  Live:
+    Live: 'End-eeun'
+    This channel does not currently have any live streams: 'Ne vez ket skignet war-eeun
+      gant ar chadenn-mañ evit poent'
+  Playlists:
+    Playlists: 'Rolloù-videoioù'
+    This channel does not currently have any playlists: 'N''eus ket a roll-videoioù
+      evit poent gant ar chadenn-mañ'
+    Sort Types:
+      Last Video Added: 'Video diwezhañ ouzhpennet'
+      Newest: 'Nevesañ'
+      Oldest: 'Koshañ'
+  Podcasts:
+    Podcasts: 'Podskignañ'
+    This channel does not currently have any podcasts: 'N''eus ket a bodskignañ evit
+      poent gant ar chadenn-mañ'
+  Releases:
+    Releases: 'Ermaeziadennoù'
+    This channel does not currently have any releases: 'N''eus ket a ermaeziadenn
+      evit poent gant ar chadenn-mañ'
+  About:
+    About: 'A-zivout'
+    Channel Description: 'Deskrivadur ar chadenn'
+    Tags:
+      Tags: 'Tikedennoù'
+      Search for: 'Klask evit "{tag}"'
+    Details: 'Munudoù'
+    Joined: 'Enskrivet'
+    Location: 'Lec''hiadur'
+    Featured Channels: 'Chadennoù lakaet war-wel'
+  Community:
+    This channel currently does not have any posts: 'N''eus ket a gaozeadenn evit
+      poent gant ar chadenn-mañ'
+    votes: '{votes} a vouezhioù'
+    View Full Post: 'Gwelet ar pennad a-bezh'
+    Reveal Answers: 'Diskouez ar respontoù'
+    Hide Answers: 'Kuzhat ar respontoù'
+    Video hidden by FreeTube: 'Video kuzhet gant FreeTube'
+    Viewing Posts Only Supported By Invidious: 'Posupl eo gwelet ar pennadoù gant
+      Invidious hepken. Kit war ivinell kumuniezh ur chadenn evit gwelet he fennadoù
+      hep Invidious.'
+Video:
+  IP block: 'Stanket eo bet ho chomlec''h IP gant YouTube. Klaskit cheñch VPN pe proksi
+    evit lenn ar videoioù.'
+  More Options: 'Muioc''h a zibarzhioù'
+  Mark As Watched: 'Lakaat evel lennet'
+  Remove From History: 'Skarzhañ deus ar roll istor'
+  Video has been marked as watched: 'Lakaet eo bet ar video evel lennet'
+  Video has been removed from your history: 'Skarzhet eo bet ar video deus ho roll
+    istor'
+  Save Video: 'Enrollañ ar video'
+  Video has been saved: 'Enrollet eo bet ar video'
+  Video has been removed from your saved list: 'Dilamet eo bet ar video diouzh ho
+    roll-videoioù enrollet'
+  Open in YouTube: 'Digeriñ gant YouTube'
+  Copy YouTube Link: 'Eilañ liamm YouTube'
+  Open YouTube Embedded Player: 'Digeriñ lenner enkorfet YouTube'
+  Copy YouTube Embedded Player Link: 'Eilañ liamm lenner enkorfet YouTube'
+  Open in Invidious: 'Digeriñ gant Invidious'
+  Copy Invidious Link: 'Eilañ liamm Invidious'
+  Open Channel in YouTube: 'Digeriñ ar chadenn war YouTube'
+  Copy YouTube Channel Link: 'Eilañ liamm YouTube ar chadenn'
+  Open Channel in Invidious: 'Digeriñ ar chadenn war Invidious'
+  Copy Invidious Channel Link: 'Eilañ liamm Invidious ar chadenn'
+  Hide Channel: 'Kuzhat ar chadenn'
+  Unhide Channel: 'Diskouez ar chadenn'
+  Views: 'Sell'
+  Loop Playlist: 'Rodell roll-videoioù'
+  Shuffle Playlist: 'Meskañ ar roll-videoioù'
+  Reverse Playlist: 'Cheñch tu ar roll-videoioù'
+  Play Next Video: 'Lenn ar video da heul'
+  Play Previous Video: 'Lenn ar video a-raok'
+  Pause on Current Video: 'Ehan war ar video bremanel'
+  Watched: 'Lennet'
+  Autoplay: 'Lenn emgefreek'
+  Starting soon, please refresh the page to check again: 'Kregiñ a raio a-benn nebeut,
+    freskait ar bajenn evit gwiriañ en-dro'
+  # As in a Live Video
+  Premieres on: 'Rakskignañ war'
+  Premieres: 'Rakskignañ'
+  Upcoming: 'A-benn nebeut'
+  Live: 'End-eeun'
+  Live Now: 'War-eeun bremañ'
+  Live Chat: 'Flapañ war-eeun'
+  Enable Live Chat: 'Gweredekaat ar flapañ war-eeun'
+  Live Chat is currently not supported in this build.: 'N''eo ket skoret ar flapañ
+    war-eeun gant ar stumm-añ evit poent.'
+  'Chat is disabled or the Live Stream has ended.': 'Dihegerz eo ar flapañ war-eeun
+    pe ez eo echu ar skignañ war-eeun.'
+  Live chat is enabled. Chat messages will appear here once sent.: 'Gweredekaet eo
+    ar flapañ war-eeun.  Diskouezet e vo ar c''hemennadennoù amañ ur wech kaset.'
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'N''eo
+    ket skoret ar flapañ war-eeun gant API Invidious evit poent.  Ret eo bezañ kennasket
+    war-eeun ouzh YouTube.'
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Dihegerz
+    eo ar flapañ war-eeun evit ar skignañ-mañ. Marteze eo bet diweredekaet gant perc''henn
+    ar chadenn.'
+  Show Super Chat Comment: 'Diskouez evezhiadennoù ar flapañ-meur'
+  Scroll to Bottom: 'Dibunañ d''an traoñ'
+  Download Video: 'Pellgargañ ar video'
+  video only: 'video hepken'
+  audio only: 'aodio hepken'
+  Published:
+    In less than a minute: 'Nebeutoc''h eget ur vunutenn zo'
+  Published on: 'Embannet war'
+  Streamed on: 'Skignet d''ar'
+  Started streaming on: 'Kroget da skignañ'
+  Sponsor Block category:
+    sponsor: 'Sponsor'
+    intro: 'Rakskrid'
+    outro: 'Klozañ'
+    self-promotion: 'Emvrudañ'
+    interaction: 'Etregwered'
+    music offtopic: 'Sonerezh na glot ket gant an tem'
+    recap: 'Berrzastum'
+    filler: 'Serrdoull'
+  External Player:
+    OpenInTemplate: 'Digeriñ gant {externalPlayer}'
+    video: 'video'
+    playlist: 'roll-videoioù'
+    OpeningTemplate: 'Digeriñ {videoOrPlaylist} gant {externalPlayer}…'
+    UnsupportedActionTemplate: '{externalPlayer} ne skor ket : {action}'
+    Unsupported Actions:
+      starting video at offset: 'kregiñ gant ar video gant dale'
+      setting a playback rate: 'termenañ ur feur lenn'
+      opening playlists: 'digeriñ rolloù-videoioù'
+      opening specific video in a playlist (falling back to opening the video): 'digeriñ
+        ur video resis en ur roll-videoioù (distreiñ da zigeriñ ar video)'
+      reversing playlists: 'cheñch tu ar rolloù-videoioù'
+      shuffling playlists: 'meskañ ar rolloù-videoioù'
+      looping playlists: 'rodell rolloù-videoioù'
+  Player:
+    TranslatedCaptionTemplate: '{language} (troet diwar ar "{originalLanguage}")'
+    Audio Tracks: 'Tonioù aodio'
+    Theatre Mode: 'Mod c''hoariva'
+    Exit Theatre Mode: 'Kuitaat ar mod c''hoariva'
+    Full Window: 'Skramm a-bezh'
+    Exit Full Window: 'Kuitaat ar skramm a-bezh'
+    Take Screenshot: 'Kemer un dapadenn-skramm'
+    Show Stats: 'Diskouez Stadegoù'
+    Hide Stats: 'Kuzhat stadegoù'
+    Stats:
+      Stats: 'Stadegoù'
+      Video ID: 'ID ar Video : {videoId}'
+      Media Formats: 'Furmadoù ar media : {formats}'
+      Resolution: 'Spisder : {width}x{height}@{frameRate}'
+      Player Dimensions: 'Ment al lenner : {width}x{height}'
+      Bitrate: 'Fonnder bit : {bitrate} kbps'
+      Volume: 'Live-son : {volumePercentage}%'
+      Bandwidth: 'Bann drafet : {bandwidth} kbps'
+      Buffered: 'Karget e memor : {bufferedPercentage}%'
+      Dropped Frames / Total Frames: 'Frammadoù dilamet : {droppedFrames} / Frammadoù
+        hollek : {totalFrames}'
+      CodecAudio: 'Enboneger-ezvoneger : {audioCodec} ({audioItag})'
+      CodecsVideoAudio: 'Enboneger-ezvoneger : {videoCodec} ({videoItag}) / {audioCodec}
+        ({audioItag})'
+      CodecsVideoAudioNoItags: 'Enboneger-ezvoneger : {videoCodec} / {audioCodec}'
+    You appear to be offline: 'Emaoc''h ezlinenn war a seblant.'
+    Playback will resume automatically when your connection comes back: 'Kendalc''het
+      e vo da lenn ent emgefreek pa viot kennasket endro.'
+    Skipped segment: 'Lodenn {segmentCategory} tremenet'
+#& Videos
+  Unlisted: Anlistennet
+  MembersOnly: N'haller ket sellet ouzh ar videoioù miret d'an izili hepken gant FreeTube,
+    peogwir eo ret bezañ luget gant ur gont Google ha paeañ ur c'houmanant d'ar chadenn.
+  AgeRestricted: N'haller ket sellet ouzh ar videoioù gant ur vevenn oad war FreeTube,
+    peogwir eo ret bezañ luget gant ur gont Google kadarnaet gant hoc'h oad.
+Videos:
+  #& Sort By
+  Sort By:
+    Newest: 'Nevesañ'
+    Oldest: 'Koshañ'
+    #& Most Popular
+#& Playlists
+Playlist:
+  #& About
+  Playlist: 'Roll-videoioù'
+  View Full Playlist: 'Gwelet ar roll-videoioù a-bezh'
+  Videos: ''
+  View: ''
+  Views: ''
+  Last Updated On: 'Hizivadenn ziwezhañ'
+  Sort By:
+    Sort By: 'Rummañ dre'
+    DateAddedNewest: 'Ouzhpennet diwezhañ da gentañ'
+    DateAddedOldest: 'Ouzhpennet abretañ da gentañ'
+    AuthorAscending: 'Aozer (A-Z)'
+    AuthorDescending: 'Aozer (Z-A)'
+    VideoTitleAscending: 'Titl (A-Z)'
+    VideoTitleDescending: 'Titl (Z-A)'
+    VideoDurationAscending: 'Padelezh (Berrañ da gentañ)'
+    VideoDurationDescending: 'Padelezh (Hirañ da gentañ)'
+    Custom: 'Personelaat'
+
+# On Video Watch Page
+#* Published
+#& Views
+Toggle Theatre Mode: ''
+Change Format:
+  Change Media Formats: 'Cheñch furmad ar video'
+  Use Dash Formats: 'Implijout ar furmad DASH'
+  Use Legacy Formats: 'Implijout ar furmad Legacy'
+  Use Audio Formats: 'Implijout ar furmad aodio'
+  Dash formats are not available for this video: 'N''haller ket implijout ar furmad
+    DASH evit ar video-mañ'
+  Audio formats are not available for this video: 'N''haller ket implijout ar furmad
+    aodio evit ar video-mañ'
+  Legacy formats are not available for this video: 'N''haller ket implijout ar furmad
+    Legacy evit ar video-mañ'
+Share:
+  Share Video: 'Rannañ ar video'
+  Share Channel: 'Rannañ ar chadenn'
+  Share Playlist: 'Rannañ ar roll-videoioù'
+  Include Timestamp: 'Adalek ar mare resis'
+  Copy Link: 'Eilañ al liamm'
+  Open Link: 'Digeriñ an ere'
+  Copy Embed: 'Eilañ kod al lenner video enkorfet'
+  Open Embed: 'Digeriñ kod al lenner video enkorfet'
+  # On Click
+  Invidious URL copied to clipboard: 'Liamm Invidious eilet er golver'
+  Invidious Embed URL copied to clipboard: 'Liamm lenner enkorfet Invidious eilet
+    er golver'
+  Invidious Channel URL copied to clipboard: 'Liamm Invidious ar chadenn eilet er
+    golver'
+  YouTube URL copied to clipboard: 'Liamm YouTube eilet er golver'
+  YouTube Embed URL copied to clipboard: 'Liamm lenner enkorfet YouTube eilet er golver'
+  YouTube Channel URL copied to clipboard: 'Liamm YouTube ar chadenn eilet er golver'
+Clipboard:
+  Copy failed: 'Eilañ er golver c''hwitet'
+  Cannot access clipboard without a secure connection: 'Ne c''haller ket adtapout
+    ar golver hep ur c''hennask suraet'
+
+Chapters:
+  Chapters: 'Chabistroù'
+  'Chapters list visible, current chapter: {chapterName}': 'Roll ar chabistroù diskouezet,
+    chabistr bremanel : {chapterName}'
+  'Chapters list hidden, current chapter: {chapterName}': 'Roll ar chabistroù kuzhet,
+    chabistr bremanel : {chapterName}'
+
+Mini Player: 'Lenner bihan'
+Comments:
+  Comments: 'Evezhiadennoù'
+  Click to View Comments: 'Klikit amañ evit gwelet an evezhiadennoù'
+  Getting comment replies, please wait: 'O kerc''hat respontoù an evezhiadennoù, gortozit
+    mar plij'
+  There are no more comments for this video: 'Evezhiadenn ouzhpenn ebet evit ar video-mañ'
+  Show Comments: 'Diskouez an evezhiadennoù'
+  Hide Comments: 'Kuzhat an evezhiadennoù'
+  Sort by: 'Rummañ dre'
+  Top comments: 'Evezhiadennoù gwellañ'
+  Newest first: 'Nevesañ da gentañ'
+  View {replyCount} replies: 'Diskouez {replyCount} respont'
+  # Context: View 10 Replies, View 1 Reply, View 1 Reply from Owner, View 2 Replies from Owner and others
+  View: 'Gwelet'
+  Hide: 'Kuzhat'
+  Replies: 'Respontoù'
+  Show More Replies: 'Diskouez respontoù all'
+  Reply: 'Respont'
+  From {channelName}: 'deus {channelName}'
+  And others: 'ha reoù all'
+  There are no comments available for this video: 'N''eus evezhiadenn ebet evit ar
+    video-mañ'
+  There are no comments available for this post: 'N''eus evezhiadenn ebet evit ar
+    gemennadenn-mañ'
+  Load More Comments: 'Kargañ muioc''h a evezhiadennoù'
+  No more comments available: 'Evezhiadenn ouzhpenn ebet'
+  Pinned by: 'Spilhennet gant'
+  Member: 'Ezel'
+  Subscribed: 'Koumanantet'
+  Hearted: 'Karet'
+
+Up Next: 'Da-heul'
+
+#Tooltips
+Tooltips:
+  General Settings:
+    Preferred API Backend: 'Choazit ar backend implijet gant FreeTube evit tapout
+      ar roadennoù. Un eztenner enkorfet eo an API lec''hel. Ezhomm en deus an API
+      Invidious da gaout ur servijer Invidious evit kevreañ outañ.'
+    Fallback to Non-Preferred Backend on Failure: 'Pa c''hoarvezo ur gudenn gant hoc''h
+      API karetañ, e klasko FreeTube implijout an API ha n''eo ket hoc''h hini karetañ
+      evel doare sikour ma vez gweredekaet.'
+    Thumbnail Preference: 'Erlec''hiet e vo an holl skeudennoùigoù war FreeTube gant
+      ur skeudenn tennet eus ar video e-lec''h ar skeudennig dre ziouer.'
+    Invidious Instance: 'Istañs Invidious implijet gant FreeTube evit galvoù API.'
+    Region for Trending: 'Gant an dra-se e c''hallit dibab ar vro evit ar videoioù
+      diouzh ar c''hiz a faot deoc''h gwelet.'
+    External Link Handling: |
+      Choazit an emzalc'h dre ziouer pa vo kliket war ul liamm ha n'hall ket bezañ digoret gant FreeTube.
+      Dre ziouer, e vo digoret al liamm e-barzh ho merdeer web.
+  Player Settings:
+    Proxy Videos Through Invidious: 'Kevreañ a raio ouzh Invidious evit mont da gerc''hat
+      ar videoioù e-lec''h kevreañ war-eeun ouzh YouTube.'
+    Default Video Format: 'Arventennañ ar furmadoù implijet pa vez lennet ur video.
+      Ar furmadoù DASH a c''hell bezañ lennet gant ur c''halite uheloc''h. Bevennet
+      eo ar furmadoù Legacy da 720p d''ar muiañ met nebeutoc''h a vann- drafet a vez
+      implijet. Ar furmadoù aodio zo lanvioù aodio hepken.'
+    Scroll Playback Rate Over Video Player: 'Pa vez ar biz-red war ar video, dalc''hit
+      pouezet war an douchenn Ctrl (Command war Mac) ha dibunit rodellig al logodenn
+      war-raok pe war-gil evit cheñch ar feur lenn. Dalc''hit pouezet war an douchenn
+      Ctrl (Command war Mac) ha klikit war bouton kleiz al logodenn a-benn distreiñ
+      buan d''ar feur lenn dre ziouer (1x, nemet ma ''z eo bet kemmet en arventennoù).'
+    Skip by Scrolling Over Video Player: 'Tremen d''ur video d''egile en ur zibunañ
+      rodellig al logodenn war al lenner video, doare MPV.'
+  External Player Settings:
+    External Player: 'Dibab ul lenner diavaez a ziskouezo un ikon war ar skeudennig,
+      evit digeriñ ar video (pe ar roll-videoioù ma vez skoret) el lenner diavaez.
+      Diwallit, arventennoù Invidious n''o deus ket efed ebet war al lenner diavaez.'
+    Custom External Player Executable: 'Dre ziouer e soñjo FreeTube e c''hall mont
+      da glask al lenner diavaez choazet dre an argemmenn endro PATH. Mar bez ezhomm
+      e c''haller lakaat un hent personelaet amañ.'
+    Ignore Warnings: 'Diweredekaat ar c''hemennadennoù pa ne vez ket skoret un obererezh
+      bennak gant al lenner diavaez (da sk. cheñch tu ar rolloù-videoioù, etc.).'
+    Ignore Default Arguments: 'Arabat kas arguzennoù dre ziouer d''al lenner diavaez
+      nemet URL ar video (d.s. feur lenn, URL ar roll-videoioù, etc.). Treuzkaset
+      e vo an arguzennoù personelaet.'
+    Custom External Player Arguments: 'An holl arguzennoù personelaet el linennoù
+      urzhiañ, a faot deoc''h e vefe treuzkaset d''al lenner diavaez.'
+    DefaultCustomArgumentsTemplate: "(Dre ziouer : '{defaultCustomArguments}')"
+  Distraction Free Settings:
+    Hide Channels: 'Lakait ID ur chadenn evit mirout ouzh an holl videoioù, rolloù-videoioù
+      hag ar chadenn hec''h-unan da vezañ gwelet en enklaskoù, e roll ar videoioù
+      brudetañ, ar re vuiañ karet, hag ar re aliet. Ret eo d''an ID bezañ klot ha
+      ret eo doujañ d''ar pennlizherennoù.'
+    Hide Subscriptions Live: 'Erlec''hiet eo an arventenn-mañ gant an arventenn "{appWideSetting}"
+      evit an arload a-bezh, e lodenn "{subsection}" e-barzh "{settingsSection}"'
+    Hide Videos and Playlists Containing Text: 'Ebarzhit ur ger, lodenn ur ger pe
+      ur frazenn (o toujañ d''ar pennlizherennoù) evit kuzhat an holl videoioù & rolloù-videoioù
+      gant ar ger pe ar frazenn-mañ en titl orin war FreeTube, nemet er roll-istor,
+      e-barzh ho rolloù-videoioù hag ar videoioù e-barzh ar rolloù-videoioù.'
+  Subscription Settings:
+    Fetch Feeds from RSS: 'Pa vez gweredekaet e vez implijet RSS gant FreeTube e-lec''h
+      e zoare dre ziouer evit adtapout ho kwazh koumanantiñ. Buanoc''h ez an traoù
+      gant an RSS ha ne vo ket stanket ar chomlec''h IP, met ne ginnig ket titouroù
+      ''zo evel padelezh ar video, statud ar video war-eeun, pe c''hoazh an evezhiadennoù'
+    Fetch Automatically: 'Pa vo gweredekaet e vo adtapet ho kwazh koumanantiñ gant
+      FreeTube ent emgefre pa vo digoret ur prenestr nevez ha pa vo cheñchet profil.'
+  Experimental Settings:
+    Replace HTTP Cache: 'Diweredekaat ar grubuilh HTTP diazezet war ar bladenn Electron
+      ha gweredekaat krubuilh personelaet ar skeudennoù e-barzh ar memor. Implijet
+      e vo muioc''h a vemor RAM.'
+  SponsorBlock Settings:
+    UseDeArrowTitles: 'Erlec''hiañ titloù ar videoioù gant titloù kinniget gant implijerien
+      DeArrow.'
+    UseDeArrowThumbnails: 'Erlec''hiañ skeudennoùigoù ar videoioù gant skeudennoùigoù
+      DeArrow.'
+
+# Toast Messages
+Local API Error (Click to copy): 'Fazi un API lec''hel (Klikit evit eilañ)'
+Invidious API Error (Click to copy): 'Fazi gant API Invidious (Klikit evit eilañ)'
+Falling back to Invidious API: 'Distreiñ da API Invidious'
+Falling back to Local API: 'Distreiñ d''an API lec''hel'
+This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Dihegerz
+  eo ar video-mañ abalamour da furmadoù a vank. Gallout a ra c''hoarvezout e-barzh
+  broioù ''zo.'
+Subscriptions have not yet been implemented: ''
+Unknown YouTube url type, cannot be opened in app: 'Seurt url YouTube dianav, n''hall
+  ket bezañ digoret en arload'
+Hashtags have not yet been implemented, try again later: ''
+Loop is now disabled: 'Diweredekaet eo ar rodell bremañ'
+Loop is now enabled: 'Gweredekaet eo ar rodell bremañ'
+Shuffle is now disabled: 'Diweredekaet eo ar Mesk-ha-mesk bremañ'
+Shuffle is now enabled: 'Gweredekaet eo ar Mesk-ha-mesk bremañ'
+The playlist has been reversed: 'Eilpennet eo bet ar roll-videoioù'
+Playing Next Video: 'Lenn ar video da-heul'
+Playing Previous Video: 'Lenn ar video a-raok'
+Playlist will not pause when current video is finished: 'Ne vo ket ehanet ar roll-videoioù
+  pa vo echu da lenn ar video-mañ'
+Playlist will pause when current video is finished: 'Ehanet e vo ar roll-videoioù
+  pa vo echu da lenn ar video-mañ'
+Playing Next Video Interval: 'Lenn ar video da-heul a-benn nebeud-tre. Klikit evit
+  nullañ. | Lenn ar video da-heul a-benn {nextVideoInterval} eilenn. Klikit evit nullañ.
+  | Lenn ar video da-heul a-benn {nextVideoInterval} eilenn. Klikit evit nullañ.'
+Canceled next video autoplay: 'Nullañ al lenn emgefreek da-heul'
+
+Default Invidious instance has been set to {instance}: 'Istañs Invidious dre ziouer
+  a zo bet lakaet da {instance}'
+Default Invidious instance has been cleared: 'Diverket eo bet Istañs Invidious dre
+  ziouer'
+'The playlist has ended. Enable loop to continue playing': 'Echu eo ar roll-videoioù.  Gweredekaat
+  ar rodell evit kenderc''hel da lenn'
+Age Restricted:
+  This channel is age restricted: 'Ur vevenn oad a zo d''ar chadenn-mañ'
+  This video is age restricted: 'Ur vevenn oad a zo d''ar video-mañ'
+External link opening has been disabled in the general settings: 'Diweredekaet eo
+  al liammoù diavaez en arventennoù hollek'
+'Blocked opening potentially unsafe URL': 'Stanket eo an URL a c''hell bezañ arvarus :
+  "{url}".'
+Downloading has completed: '"{videoTitle}" a zo bet pellgarget'
+Starting download: 'Kregiñ da bellgargañ "{videoTitle}"'
+Downloading failed: 'C''hoarvezet ez eus ur gudenn en ur bellgargañ "{videoTitle}"'
+Screenshot Success: 'Enrollet eo bet an dapadenn-skramm evel "{filePath}"'
+Screenshot Error: 'Tapadenn skramm c''hwitet. {error}'
+Channel Hidden: '{channel} ouzhpennet da sil ar chadennoù'
+Channel Unhidden: '{channel} dilamet deus sil ar chadennoù'
+Trimmed input must be at least N characters long: 'An destenn bevennet a rank bezañ
+  1 arouezenn enni da nebeutañ | An destenn bevennet a rank bezañ {number} arouezenn
+  enni da nebeutañ'
+Tag already exists: 'Bez ez eus dija deus an dikedenn "{tagName}"'
+
+Hashtag:
+  Hashtag: 'Ger-klik'
+  This hashtag does not currently have any videos: 'N''eus ket a video evit poent
+    gant ar ger-klik-mañ'
+Moments Ago: 'nevez ''zo'
+Yes: 'Ya'
+No: 'Ket'
+Ok: 'Mat eo'
+Yes, Delete: 'Ya, Dilemel'
+Yes, Restart: 'Ya, Adloc''hañ'
+Yes, Open Link: 'Ya, digeriñ al liamm'
+Cancel: 'Nullañ'
+# symbol used to indicate that an item is correct
+checkmark: '✓'
+# French is the only language that should change this (they have a space before the colon)
+Display Label: '{label} : {value}'
diff --git a/static/locales/bs.yaml b/static/locales/bs.yaml
index f9d3f065e1ae4..5dadb9d75e566 100644
--- a/static/locales/bs.yaml
+++ b/static/locales/bs.yaml
@@ -122,14 +122,11 @@ Settings:
       Beginning: 'Početak'
       Middle: 'Sredina'
       End: 'Kraj'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious primjer
-      (standard je https://invidious.snopyta.org)'
     Region for Trending: 'Regiona za trend'
         #! List countries
   Theme Settings:
     Theme Settings: 'Postavke teme'
     Match Top Bar with Main Color: 'Koristi glavnu boju u gornjoj traci'
-  Advanced Settings: {}
 Channel:
   Videos: {}
 Tooltips: {}
diff --git a/static/locales/ca.yaml b/static/locales/ca.yaml
index b0ec4fc4b0b7c..c3978a4637bc5 100644
--- a/static/locales/ca.yaml
+++ b/static/locales/ca.yaml
@@ -105,13 +105,6 @@ Most Popular: 'Més populars'
 Playlists: 'Llistes de reproducció'
 User Playlists:
   Your Playlists: 'Les teves llistes de reproducció'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Els
-    vostres vídeos desats són buits. Feu clic al botó de desar a la cantonada d'un
-    vídeo per tenir-lo llistat aquí
-  Playlist Message: Aquesta pàgina no reflecteix les llistes de reproducció plenament
-    actives. Només llista els vídeos que heu desat o preferit. Quan la tasca hagi
-    acabat, tots els vídeos que hi ha actualment es migraran a una llista de reproducció
-    de "favorites".
   Search bar placeholder: Cerca a la llista de reproducció
   Empty Search Message: No hi ha cap vídeo en aquesta llista de reproducció que coincideixi
     amb la teva cerca
@@ -148,8 +141,6 @@ Settings:
       Beginning: 'Inici'
       Middle: 'Mig'
       End: 'Final'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instància Invidious
-      (https://invidious.snopyta.org per defecte)'
     Region for Trending: 'Regió per a les tendències'
         #! List countries
     View all Invidious instance information: Mostra tota la informació de la instància
@@ -267,15 +258,11 @@ Settings:
     Subscription Settings: 'Configuració de les subscripcions'
     Hide Videos on Watch: 'Oculta els vídeos visualitzats'
     Fetch Feeds from RSS: 'Recupera els canals de continguts des de l''RSS'
-    Manage Subscriptions: 'Gestiona les subscripcions'
   Data Settings:
     Data Settings: 'Configuració de les dades'
     Select Import Type: 'Selecciona tipus d''importació'
     Select Export Type: 'Selecciona tipus d''exportació'
     Import Subscriptions: 'Importa les subscripcions'
-    Import FreeTube: 'Importa FreeTube'
-    Import YouTube: 'Importa YouTube'
-    Import NewPipe: 'Importa NewPipe'
     Export Subscriptions: 'Exporta subscripcions'
     Export FreeTube: 'Exporta FreeTube'
     Export YouTube: 'Exporta YouTube'
@@ -313,8 +300,6 @@ Settings:
     Export Playlists: Exporta llistes de reproducció
     All playlists has been successfully imported: Totes les llistes de reproducció
       s'han importat amb èxit
-    Check for Legacy Subscriptions: Comprova les subscripcions antigues
-  Advanced Settings: {}
   The app needs to restart for changes to take effect. Restart and apply change?: Cal
     reiniciar l'aplicació perquè els canvis tinguin efecte. Vols reiniciar i aplicar
     els canvis?
@@ -370,8 +355,6 @@ About:
   Website: Lloc web
   Email: Correu-e
   Help: Ajuda
-  Licensed under the AGPLv3: Llicència AGPLv3
-  View License: Veure la llicència
   Downloads / Changelog: Descàrregues / Registre de canvis
   Chat on Matrix: Xat a Matrix
   Please read the: Si us plau, llegeix les
@@ -500,37 +483,7 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'El
     xat en directe no està actualment suportat per l''API d''Invidious.  Es requereix
     una connexió directa a YouTube.'
-  Published:
-    Jan: 'Gen'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Abr'
-    May: 'Maig'
-    Jun: 'Juny'
-    Jul: 'Jul'
-    Aug: 'Ag.'
-    Sep: 'Set'
-    Oct: 'Oct'
-    Nov: 'Nov'
-    Dec: 'Des'
-    Second: 'Segon'
-    Seconds: 'Segons'
-    Minute: 'Minut'
-    Minutes: 'Minuts'
-    Hour: 'Hora'
-    Hours: 'Hores'
-    Day: 'Dia'
-    Days: 'Dies'
-    Week: 'Setmana'
-    Weeks: 'Setmanes'
-    Month: 'Mes'
-    Months: 'Mesos'
-    Year: 'Any'
-    Years: 'Anys'
-    Ago: 'Fa'
-    Upcoming: 'S''estrena el'
   Published on: 'Publicat el'
-  Publicationtemplate: '{number} {unit} fa'
 #& Videos
   Started streaming on: Retransmissió iniciada el
   Sponsor Block category:
@@ -574,15 +527,11 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Visualitza la llista de reproducció sencera'
-  Videos: 'Vídeos'
-  View: 'Visualitza'
-  Views: 'Visualitzacions'
   Last Updated On: 'Última Actualització'
 
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: 'Commuta el mode teatre'
 Change Format:
   Change Media Formats: 'Canvia Els Formats De Vídeo'
   Use Dash Formats: 'Utilitza Formats DASH'
diff --git a/static/locales/ckb.yaml b/static/locales/ckb.yaml
index 524d79ab76411..f848e647f7f68 100644
--- a/static/locales/ckb.yaml
+++ b/static/locales/ckb.yaml
@@ -42,7 +42,7 @@ Are you sure you want to open this link?: 'دڵنیایت دەتەوێت ئەم
 # Anything shared among components / views should be put here
 Global:
   Videos: 'ڤیدیۆکان'
-  Shorts: ''
+  Shorts: 'کورتەڤیدیۆکان'
   Live: 'ڕاستەوخۆ'
   Community: 'کۆمەڵگە'
   Counts:
@@ -53,15 +53,16 @@ Global:
     Watching Count: '١ تەمەشاکردن | {count} تەمەشاکردن'
 
 # Search Bar
+    Comment Count: ١ توانج | {count} توانج
 Search / Go to URL: 'گەڕان/ بڕۆ بۆ ئرڵ'
 Search Bar:
-  Clear Input: ''
+  Clear Input: 'سڕینەوەی نووسراو'
   # In Filter Button
 Search Filters:
   Search Filters: 'پاڵفتەکردنی گەڕان'
   Sort By:
     Sort By: 'ڕیزکردن بە'
-    Most Relevant: ''
+    Most Relevant: 'پەیوەندیدار'
     Rating: 'هەڵسەنگاندن'
     Upload Date: 'ڕێکەوتی بارکردن'
     View Count: 'ژمارەی بینین'
@@ -92,6 +93,13 @@ Search Filters:
   Fetch more results: ''
   There are no more results for this search: 'ئەنجامەکی تر نییە بۆ ئەم گەڕانە'
 # Sidebar
+  Features:
+    Location: شوێن
+    3D: ٣ ڕەهەندی
+    Subtitles: ژێرنووس
+    Live: ڕاستەوخۆ
+    4K: ٤ک
+    360 Video: ڤیدیۆی ٣٦٠°
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: ''
@@ -105,7 +113,7 @@ Subscriptions:
   'Getting Subscriptions. Please wait.': ''
   Empty Posts: ''
   Refresh Subscriptions: ''
-  Load More Videos: 'بارکردنی ڤیدیۆی زۆرتر'
+  Load More Videos: 'ڤیدیۆی زۆرتر بار بکە'
   Load More Posts: ''
   Subscriptions Tabs: ''
   All Subscription Tabs Hidden: ''
@@ -113,14 +121,12 @@ More: 'زۆرتر'
 Channels:
   Channels: 'کەناڵەکان'
   Title: 'پێڕستی کەناڵەکان'
-  Search bar placeholder: ''
+  Search bar placeholder: 'گەڕان لە کەناڵەکان'
   Count: '{number} کەناڵ دۆزرانەوە.'
   Empty: 'ئێستا پێڕستی کەناڵەکانت بەتاڵە.'
-  Unsubscribe: ''
-  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
-  Trending: ''
+  Trending: 'باو'
   Default: 'بنەڕەت'
   Music: 'مۆسیقا'
   Gaming: 'یاری'
@@ -130,10 +136,33 @@ Most Popular: 'باوترین'
 Playlists: 'پێڕستی لێدانەکان'
 User Playlists:
   Your Playlists: 'پێڕستی لێدانەکانت'
-  Playlist Message: ''
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   Empty Search Message: ''
   Search bar placeholder: 'لەناو پێڕستی لێدان بگەڕێ'
+  Move Video Up: ڤیدیۆکە ببە سەرتر
+  Move Video Down: ڤیدیۆکە ببە خوارتر
+  Add to Favorites: بۆ {playlistName}، زیاد بکە
+  Remove from Favorites: لە {playlistName}، لایببە
+  Cancel: هەڵوەشاندنەوە
+  Save Changes: دەستکارییەکان پاشەکەوت بکە
+  Remove Watched Videos: ڤیدیۆ بینراوەکان دەرکە
+  SinglePlaylistView:
+    Toast:
+      This video cannot be moved down.: ئەم ڤیدیۆیە نابرێتە خوارتر.
+      There was a problem with removing this video: گرفتێک لە لابردنی ڤیدیۆکە هەیە
+      This video cannot be moved up.: ئەم ڤیدیۆیە نابرێتە سەرتر.
+      Video has been removed: ڤیدیۆکە لابرا
+    Search for Videos: لە ڤیدیۆ بگەڕێ
+  Sort By:
+    Sort By: ڕیزکردن بە
+    NameAscending: ئ-ێ
+    NameDescending: ێ-ئ
+    EarliestCreatedFirst: زوو درووستکراو
+    LatestUpdatedFirst: دوایین نوێ کراوە
+    LatestPlayedFirst: دوایین لێدراو
+    EarliestPlayedFirst: زوو لێدراو
+    LatestCreatedFirst: دوایین درووستکراو
+    EarliestUpdatedFirst: زوو نوێ کراوە
+  Remove Duplicate Videos: ڤیدیۆی پاتە دەرکە
 History:
   # On History Page
   History: 'مێژوو'
@@ -319,7 +348,6 @@ Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
-    Manage Subscriptions: ''
     Fetch Automatically: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -371,7 +399,6 @@ Settings:
     Subscription File: ''
     History File: 'پەڕگەی مێژوو'
     Playlist File: 'پەڕگەی پێڕستی لێدان'
-    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: 'هەناردەکردنی فریتیوب'
     Export YouTube: 'هەناردەکردنی یوتیوب'
@@ -458,8 +485,6 @@ About:
   About: 'دەربارە'
   Beta: ''
   Source code: 'کۆدی سەرچاوە'
-  Licensed under the AGPLv3: 'مۆڵەتی وەشانی سێیەمی AGPL هەیە'
-  View License: 'بینینی مۆڵەت'
   Downloads / Changelog: ''
   GitHub releases: ''
   Help: 'یارمەتی'
@@ -625,39 +650,10 @@ Video:
   video only: 'تەنیا ڤیدیۆ'
   audio only: 'تەنیا دەنگ'
   Published:
-    Jan: ''
-    Feb: ''
-    Mar: ''
-    Apr: ''
-    May: ''
-    Jun: ''
-    Jul: ''
-    Aug: ''
-    Sep: ''
-    Oct: ''
-    Nov: ''
-    Dec: ''
-    Second: 'چرکە'
-    Seconds: 'چرکە'
-    Minute: 'خولەک'
-    Minutes: 'خولەک'
-    Hour: 'کاتژمێر'
-    Hours: 'کاتژمێر'
-    Day: 'ڕۆژ'
-    Days: 'ڕۆژ'
-    Week: 'هەفتە'
-    Weeks: 'هەفتە'
-    Month: 'مانگ'
-    Months: 'مانگ'
-    Year: 'ساڵ'
-    Years: 'ساڵ'
-    Ago: ''
-    Upcoming: ''
     In less than a minute: ''
   Published on: 'بڵاوکرایەوە لە'
   Streamed on: ''
   Started streaming on: ''
-  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -695,15 +691,11 @@ Playlist:
   #& About
   Playlist: 'پێڕستی لێدان'
   View Full Playlist: ''
-  Videos: 'ڤیدیۆکان'
-  View: 'بینراو'
-  Views: 'بینراو'
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -802,9 +794,7 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
-Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
@@ -834,3 +824,11 @@ Yes: 'بەڵێ'
 No: 'نەخێر'
 Ok: 'باشە'
 Go to page: بڕۆ بۆ {page}
+Search Listing:
+  Label:
+    4K: ٤ک
+    Subtitles: ژێرنووس
+    8K: ٨ک
+    360 Video: ٣٦٠°
+    New: نوێ
+    3D: ٣ ڕەهەندی
diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index a6b4ad769f520..c046d339dbb07 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -46,8 +46,8 @@ Global:
     Comment Count: 1 komentář | {count} komentářů
   Input Tags:
     Length Requirement: Štítek musí být dlouhý alespoň {number} znaků
-Version {versionNumber} is now available!  Click for more details: 'Verze {versionNumber}
-  je k dispozici! Klikněte pro více informací'
+Version {versionNumber} is now available!  Click for more details: 'Je k dispozici
+  verze {versionNumber}! Klikněte pro více informací'
 Download From Site: 'Stáhnout ze stránky'
 A new blog is now available, {blogTitle}. Click to view more: 'Je dostupný nový článek
   na blogu: {blogTitle}. Kliknutím zobrazíte více'
@@ -93,7 +93,7 @@ Search Filters:
     další výsledky
   Features:
     HD: HD
-    360 Video: 360°
+    360 Video: 360° video
     Subtitles: Titulky
     Features: Vlastnosti
     Creative Commons: Creative Commons
@@ -109,8 +109,10 @@ Subscriptions:
   Latest Subscriptions: 'Nejnovější odběry'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Tento
     profil má velký počet odběrů.  Vynucení RSS, aby se zabránilo omezení rychlosti'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Vaše
-    odběry jsou prázdné. Přidejte odběry, zobrazí zde.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Váš
+    seznam odběrů je prázdný. Pokud chcete importovat své odběry, přejděte do Nastavení
+    dat a vyberte Importovat odběry. Můžete také jednoduše vyhledat kanál a přihlásit
+    se u něj k odběru.'
   'Getting Subscriptions. Please wait.': 'Získávám odběry. Prosím čekejte.'
   Refresh Subscriptions: 'Obnovit odběry'
   Load More Videos: 'Načíst více videí'
@@ -135,17 +137,9 @@ Most Popular: 'Populární'
 Playlists: 'Playlisty'
 User Playlists:
   Your Playlists: 'Vaše playlisty'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Vaše
-    uložená videa jsou prázdná. Kliknutím na tlačítko Uložit v rohu videa jej zobrazíte
-    zde
-  Playlist Message: Tato stránka neodráží plně funkční playlisty. Uvádí pouze videa,
-    která jste si uložili nebo zařadili mezi oblíbená. Po dokončení práce budou všechna
-    aktuálně zde umístěná videa přenesena do seznamu „Oblíbené“.
   Search bar placeholder: Hledat playlisty
   Empty Search Message: V tomto playlistu nejsou žádná videa, která by odpovídala
     vašemu vyhledávání
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Opravdu
-    chcete z tohoto playlistu odstranit všechna zhlédnutá videa? Tato akce je nevratná.
   AddVideoPrompt:
     Search in Playlists: Hledat v playlistech
     Save: Uložit
@@ -193,11 +187,13 @@ User Playlists:
         byl navrácen pro rychlé uložení
       This playlist is now used for quick bookmark: Tento playlist bude nyní použit
         pro rychlé uložení
-      Quick bookmark disabled: Rychlé uložení vypnuto
       This playlist is already being used for quick bookmark.: Tento playlist je již
         používán pro rychlou záložku.
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist {playlistName}
         je nový playlist rychlé záložky.
+      This playlist has a video with a duration error: Tento playlist obsahuje nejméně
+        jedno video, které nemá dobu trvání. Bude seřazeno tak, jako by mělo dobu
+        trvání nula.
     Search for Videos: Hledat videa
   Are you sure you want to delete this playlist? This cannot be undone: Opravdu chcete
     odstranit tento playlist? Tato akce je nevratná.
@@ -240,7 +236,6 @@ User Playlists:
   Playlist Description: Popis playlistu
   Add to Favorites: Přidat do playlistu {playlistName}
   Remove from Favorites: Odebrat z playlistu {playlistName}
-  Disable Quick Bookmark: Vypnout rychlé uložení
   Enable Quick Bookmark With This Playlist: Zapnout u tohoto playlistu rychlé uložení
   Playlists with Matching Videos: Playlisty s odpovídajícími videi
   Quick Bookmark Enabled: Rychlá záložka zapnuta
@@ -255,6 +250,8 @@ User Playlists:
     | Opravdu chcete odstranit {playlistItemCount} zhlédnutých videí z tohoto playlistu?
     Tato akce je nevratná.
   Remove Duplicate Videos: Odstranit duplicitní videa
+  Export Playlist: Exportovat tento playlist
+  The playlist has been successfully exported: Playlist byl úspěšně exportován
 History:
   # On History Page
   History: 'Historie'
@@ -270,7 +267,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: 'Aby
     se změny projevily, je třeba aplikaci restartovat. Restartovat a použít změny?'
   General Settings:
-    General Settings: 'Obecná nastavení'
+    General Settings: 'Obecné'
     Check for Updates: 'Kontrolovat aktualizace'
     Check for Latest Blog Posts: 'Kontrolovat nejnovější příspěvky na blogu'
     Fallback to Non-Preferred Backend on Failure: 'Při chybě přepnout na nepreferovaný
@@ -294,8 +291,6 @@ Settings:
       End: 'Konec'
       Hidden: Skryté
       Blur: Rozmazané
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instance Invidious
-      (Výchozí je https://invidious.snopyta.org)'
     Region for Trending: 'Oblast pro trendy'
         #! List countries
     View all Invidious instance information: Zobrazit všechny informace o instancích
@@ -317,8 +312,10 @@ Settings:
     Auto Load Next Page:
       Label: Automaticky načíst další stránku
       Tooltip: Automaticky načítat další stránky a komentáře.
+    Open Deep Links In New Window: Otevírat adresy předané aplikaci FreeTube v novém
+      okně
   Theme Settings:
-    Theme Settings: 'Nastavení motivu'
+    Theme Settings: 'Motiv'
     Match Top Bar with Main Color: 'Přizpůsobit horní lištu hlavní barvě'
     Expand Side Bar by Default: 'Ve výchozím stavu rozbalený postranní panel'
     Disable Smooth Scrolling: 'Zakázat plynulé posouvání'
@@ -336,6 +333,8 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarizovaná tmavá
       Solarized Light: Solarizovaná světlá
+      Gruvbox Dark: Gruvbox tmavý
+      Gruvbox Light: Gruvbox světlý
     Main Color Theme:
       Main Color Theme: 'Hlavní barva motivu'
       Red: 'Červená'
@@ -383,12 +382,22 @@ Settings:
       Solarized Blue: Solarizovaná modrá
       Solarized Cyan: Solarizovaná azurová
       Solarized Green: Solarizovaná zelená
+      Gruvbox Dark Green: Gruvbox tmavě zelený
+      Gruvbox Dark Yellow: Gruvbox tmavě žlutý
+      Gruvbox Dark Blue: Gruvbox tmavě modrý
+      Gruvbox Dark Purple: Gruvbox tmavě fialový
+      Gruvbox Dark Orange: Gruvbox tmavě oranžový
+      Gruvbox Light Red: Gruvbox světle červený
+      Gruvbox Light Purple: Gruvbox světle fialový
+      Gruvbox Dark Aqua: Gruvbox tmavě azurový
+      Gruvbox Light Blue: Gruvbox světle modrý
+      Gruvbox Light Orange: Gruvbox světle oranžový
     Secondary Color Theme: 'Sekundární barva motivu'
         #* Main Color Theme
     Hide Side Bar Labels: Skrýt popisky na bočním panelu
     Hide FreeTube Header Logo: Skrýt logo FreeTube v záhlaví
   Player Settings:
-    Player Settings: 'Nastavení přehrávače'
+    Player Settings: 'Přehrávač'
     Play Next Video: 'Přehrát další video'
     Turn on Subtitles by Default: 'Ve výchozím nastavení zapnout titulky'
     Autoplay Videos: 'Automaticky přehrávat videa'
@@ -415,7 +424,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Interval pro další video na playlistu
-    Next Video Interval: Další interval videa
+    Next Video Interval: Čas do automatického přehrání
     Display Play Button In Video Player: Zobrazit tlačítko Přehrát v přehrávači videa
     Scroll Volume Over Video Player: Měnit hlasitost posuvem kolečka myši na přehrávači
     Fast-Forward / Rewind Interval: Interval rychlého přetáčení vpřed / vzad
@@ -440,8 +449,9 @@ Settings:
       Folder Button: Vybrat složku
     Enter Fullscreen on Display Rotate: Při otočení displeje přejít na celou obrazovku
     Skip by Scrolling Over Video Player: Posouvat čas posuvem kolečka myši na přehrávači
+    Autoplay Interruption Timer: Čas přerušení automatického přehrávání
   Privacy Settings:
-    Privacy Settings: 'Nastavení soukromí'
+    Privacy Settings: 'Soukromí'
     Remember History: 'Zapamatovat historii'
     Save Watched Progress: 'Uložit průběh zhlédnutých videí'
     Clear Search Cache: 'Vymazat mezipaměť vyhledávání'
@@ -462,16 +472,16 @@ Settings:
     Are you sure you want to remove all your playlists?: Opravdu chcete odstranit
       všechny své playlisty?
   Subscription Settings:
-    Subscription Settings: 'Nastavení odběrů'
+    Subscription Settings: 'Odběry'
     Hide Videos on Watch: 'Skrýt přehraná videa'
     Fetch Feeds from RSS: 'Získávat odběry z RSS'
-    Manage Subscriptions: 'Spravovat odebírané kanály'
     Fetch Automatically: Automaticky načítat odběry
-    Only Show Latest Video for Each Channel: U každého kanálu zobrazit pouze nejnovější
-      video
     Confirm Before Unsubscribing: Zamezit nechtěným odběrům
+    To: Do
+    'Limit the number of videos displayed for each channel': Omezit počet videí zobrazených
+      u každého kanálu
   Distraction Free Settings:
-    Distraction Free Settings: 'Nastavení rozptylování'
+    Distraction Free Settings: 'Rozptylování'
     Hide Video Views: 'Skrýt počet přehrání videa'
     Hide Video Likes And Dislikes: 'Skrýt hodnocení videa'
     Hide Channel Subscribers: 'Skrýt odběratele kanálu'
@@ -493,22 +503,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Zobrazit názvy bez nadměrného
       použití velkých písmen a interpunkce
     Hide Featured Channels: Skrýt doporučené kanály
-    Hide Channel Playlists: Skrýt playlisty kanálu
-    Hide Channel Community: Skrýt komunitu kanálu
-    Hide Channel Shorts: Skrýt Shorts kanálu
+    Hide Channel Playlists: Skrýt kartu „Playlisty“ u kanálů
+    Hide Channel Community: Skrýt kartu „Komunita“ u kanálů
+    Hide Channel Shorts: Skrýt kartu „Shorts“ u kanálů
     Sections:
       Side Bar: Postranní lišta
       Channel Page: Stránka kanálu
       Watch Page: Stránka sledování
       General: Obecné
       Subscriptions Page: Stránka s odběry
-    Hide Channel Podcasts: Skrýt podcasty kanálu
-    Hide Channel Releases: Skrýt vydání kanálu
+    Hide Channel Podcasts: Skrýt kartu „Podcasty“ u kanálů
+    Hide Channel Releases: Skrýt kartu „Vydání“ u kanálů
     Hide Subscriptions Shorts: Skrýt Shorts odběrů
     Hide Subscriptions Videos: Skrýt videa odběrů
     Hide Subscriptions Live: Skrýt živá vysílání odběrů
     Hide Profile Pictures in Comments: Skrýt profilové obrázky v komentářích
-    Blur Thumbnails: Rozmazat náhledy
     Hide Subscriptions Community: Skrýt komunitu odběratelů
     Hide Channels Invalid: Zadané ID kanálu je neplatné
     Hide Channels Disabled Message: Některé kanály byly zablokovány pomocí ID a nebyly
@@ -520,15 +529,13 @@ Settings:
       text
     Hide Videos and Playlists Containing Text Placeholder: Slovo, část slova nebo
       fráze
+    Hide Channel Home: Skrýt kartu „Domovská stránka“ u kanálů
+    Show Added Items: Zobrazit přidané položky
   Data Settings:
-    Data Settings: 'Nastavení dat'
+    Data Settings: 'Data'
     Select Import Type: 'Vybrat typ importu'
     Select Export Type: 'Vybrat typ exportu'
     Import Subscriptions: 'Importovat odběry'
-    Import FreeTube: 'Importovat FreeTube'
-    Import YouTube: 'Importovat YouTube'
-    Import NewPipe: 'Importovat NewPipe'
-    Check for Legacy Subscriptions: 'Zkontrolovat již odebírané kanály'
     Export Subscriptions: 'Exportovat odebírané kanály'
     Export FreeTube: 'Exportovat FreeTube'
     Export YouTube: 'Exportovat YouTube'
@@ -572,34 +579,9 @@ Settings:
         všechny své stávající playlisty možností Odstranit všechny playlisty v nastavení
         soukromí.\n3. Spusťte starší verzi FreeTube a importujte exportované playlisty."
       Label: Exportovat playlisty pro starší verze FreeTube
-  Advanced Settings:
-    Advanced Settings: 'Rozšířené nastavení'
-    Enable Debug Mode (Prints data to the console): 'Povolit režim ladění (výstup
-      se zobrazuje do terminálu)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adresa proxy (příklad: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Kliknutím
-      na tlačítko „OTESTOVAT PROXY“ odešlete požadavek na https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Použít Tor / Proxy pro volání API'
-    TEST PROXY: 'OTESTOVAT PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Veřejné instance'
-    Clear History:
-      Clear History: 'Vyčistit historii'
-      # On Click
-      Are you sure you want to delete your history?: 'Opravdu chcete smazat svou historii?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Vyčistit odebíraní kanálů'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Opravdu chcete smazat své
-        odebírané kanály?'
-      #& Yes
-      #& No
 
   Proxy Settings:
-    Proxy Settings: Nastavení proxy
+    Proxy Settings: Proxy
     City: Město
     Ip: IP
     Your Info: Vaše informace
@@ -614,12 +596,18 @@ Settings:
     Proxy Protocol: Protokol proxy
     Error getting network information. Is your proxy configured properly?: Chyba při
       získávání informací o síti. Je vaše proxy správně nakonfigurována?
+    Proxy Warning: FreeTube nemá vestavěný proxy server, ale může se připojit k externímu
+      proxy serveru, například k proxy serveru běžícímu na vašem počítači, jako je
+      Tor, nebo k externímu proxy serveru, jako je proxy server SOCKS5 poskytovaný
+      některými sítěmi VPN. Pokud je tato funkce povolena, ujistěte se, že je proxy
+      server/Tor správně nakonfigurován, jinak FreeTube nebude moci načítat žádná
+      data.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Upozornit při přeskočení segmentu
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL API SponsorBlock
       (výchozí je https://sponsor.ajay.app)
     Enable SponsorBlock: Zapnout SponsorBlock
-    SponsorBlock Settings: Nastavení služby SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Do Nothing: Nic nedělat
       Skip Option: Možnost přeskočení
@@ -636,25 +624,25 @@ Settings:
     Custom External Player Executable: Spustitelný vlastní externí přehrávač
     Ignore Unsupported Action Warnings: Ignorovat varování u nepodporovaných akcí
     External Player: Externí přehrávač
-    External Player Settings: Nastavení externího přehrávače
+    External Player Settings: Externí přehrávač
     Players:
       None:
         Name: Žádný
     Ignore Default Arguments: Ignorovat výchozí argumenty
   Download Settings:
     Ask Download Path: Zeptat se na cestu umístění souboru
-    Download Settings: Nastavení stahování
+    Download Settings: Stahování
     Choose Path: Zvolit cestu
     Download in app: Stáhnout v aplikaci
     Open in web browser: Otevřít v prohlížeči
     Download Behavior: Chování stahování
   Parental Control Settings:
-    Parental Control Settings: Nastavení rodičovské kontroly
+    Parental Control Settings: Rodičovská kontrola
     Hide Search Bar: Skrýt lištu vyhledávání
     Show Family Friendly Only: Zobrazit pouze obsah vhodný pro rodiny
     Hide Unsubscribe Button: Skrýt tlačítko ke zrušení odběru
   Experimental Settings:
-    Experimental Settings: Experimentální nastavení
+    Experimental Settings: Experimentální
     Warning: Tato nastavení jsou experimentální, při jejich aktivaci může docházet
       k pádům. Důrazně doporučujeme vytvářet zálohy. Používejte na vlastní nebezpečí!
     Replace HTTP Cache: Nahradit mezipaměť HTTP
@@ -664,44 +652,16 @@ Settings:
     Password Incorrect: Nesprávné heslo
     Unlock: Odemknout
   Password Settings:
-    Password Settings: Nastavení hesla
-    Set Password To Prevent Access: Nastavte heslo, abyste zabránili přístupu k nastavení
+    Password Settings: Heslo
+    Set Password To Prevent Access: Nastavte heslo pro zabránění přístupu k nastavení
     Remove Password: Odebrat heslo
     Set Password: Nastavit heslo
-  Expand All Settings Sections: Rozbalit všechny sekce nastavení
   Sort Settings Sections (A-Z): Seřadit sekce nastavení (A-Z)
+  Return to Settings Menu: Vrátit se do nastavení
 About:
   #On About page
   About: 'O aplikaci'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Tento
-    copyleftovaný software je zdarma licencován podle AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Našli jste chybu? Chcete navrhnout funkci? Chcete pomoci? Podívejte se na naši
-    stránku GitHub. Pull requesty jsou vítány.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Děkuji
-    moc lidem a projektům, které umožňují existenci FreeTube!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Chcete
-    si popovídat? Připojte se k našemu serveru Element / Matrix. Před připojením si
-    prosím zkontrolujte pravidla.'
-
-  'Looking for help? Check out our Wiki page.': 'Potřebujete pomoct? Podívejte se
-    na naši wiki stránku.'
-
-  Check out our Firefox extension!: 'Podívejte se na naše rozšíření pro Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Pokud
-    rádi používáte FreeTube, zvažte dar prostřednictvím Liberapay nebo prostřednictvím
-    naší bitcoinové adresy.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Nejnovější zprávy z FreeTube'
-
-  Licensed under the AGPLv3: Licencováno pod licencí AGPLv3
   Source code: Zdrojový kód
   Beta: Beta
   Donate: Přispět
@@ -716,7 +676,6 @@ About:
   FAQ: Často kladené dotazy
   FreeTube Wiki: Wiki FreeTube
   Downloads / Changelog: Ke stažení / Seznam změn
-  View License: Zobrazit licenci
   Translate: Překlady
   these people and projects: těmto lidem a projektům
   FreeTube is made possible by: FreeTube je možné dělat díky
@@ -770,7 +729,7 @@ Profile:
     profilu.'
 #On Channel Page
   Profile Filter: Filtr profilu
-  Profile Settings: Nastavení profilu
+  Profile Settings: Profil
   Toggle Profile List: Přepnout seznam profilů
   Open Profile Dropdown: Otevřít rozbalovací nabídku profilu
   Close Profile Dropdown: Zavřít rozbalovací nabídku profilu
@@ -842,6 +801,9 @@ Channel:
     This channel does not currently have any podcasts: Tento kanál momentálně nemá
       žádné podcasty
     Podcasts: Podcasty
+  Home:
+    Home: Domovská stránka
+    View Playlist: Zobrazit playlist
 Video:
   Mark As Watched: 'Označit jako zhlédnuto'
   Remove From History: 'Odstranit z historie'
@@ -885,38 +847,8 @@ Video:
   video only: 'pouze video'
   audio only: 'pouze zvuk'
   Published:
-    Jan: 'Leden'
-    Feb: 'Únor'
-    Mar: 'Březen'
-    Apr: 'Duben'
-    May: 'Květen'
-    Jun: 'Červen'
-    Jul: 'Červenec'
-    Aug: 'Srpen'
-    Sep: 'Září'
-    Oct: 'Říjen'
-    Nov: 'Listopad'
-    Dec: 'Prosinec'
-    Second: 'sekundou'
-    Seconds: 'sekund'
-    Minute: 'minutou'
-    Minutes: 'minut'
-    Hour: 'hodina'
-    Hours: 'hodin'
-    Day: 'den'
-    Days: 'dnů'
-    Week: 'týden'
-    Weeks: 'týdny'
-    Month: 'měsíc'
-    Months: 'měsíci'
-    Year: 'rok'
-    Years: 'let'
-    Ago: 'Před'
-    Upcoming: 'Premiéra'
-    Less than a minute: Méně než minuta
     In less than a minute: Za méně než minutu
   Published on: 'Publikováno'
-  Publicationtemplate: '{number} {unit}'
 #& Videos
   Started streaming on: Začátek vysílání
   Streamed on: Vysíláno
@@ -989,6 +921,16 @@ Video:
     You appear to be offline: Zdá se, že jste offline.
     Playback will resume automatically when your connection comes back: Přehrávání
       bude automaticky pokračovat, jakmile budete opět připojeni.
+  IP block: YouTube zablokoval sledování videí z vaší IP adresy. Zkuste prosím přepnout
+    na jinou VPN nebo proxy.
+  Unlisted: Neveřejné
+  MembersOnly: Videa určená pouze pro členy nelze na FreeTube sledovat, protože vyžadují
+    přihlášení k účtu Google a placené členství v kanálu nahrávajícího.
+  AgeRestricted: Videa s věkovým omezením nelze na FreeTube sledovat, protože vyžadují
+    přihlášení ke službě Google a použití účtu YouTube s ověřeným věkem.
+  DeArrow:
+    Show Modified Details: Zobrazit upravené podrobnosti
+    Show Original Details: Zobrazit původní podrobnosti
 Videos:
   #& Sort By
   Sort By:
@@ -999,9 +941,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Zobrazit celý seznam skladeb'
-  Videos: 'Videa'
-  View: 'Zobrazit'
-  Views: 'Zobrazení'
   Last Updated On: 'Naposledy upraveno'
 
 # On Video Watch Page
@@ -1017,7 +956,8 @@ Playlist:
     VideoTitleDescending: Název (Z-A)
     VideoTitleAscending: Název (A-Z)
     Custom: Vlastní
-Toggle Theatre Mode: 'Přepnout režim divadla'
+    VideoDurationAscending: Doba trvání (od nejkratších)
+    VideoDurationDescending: Doba trvání (od nejdelších)
 Change Format:
   Change Media Formats: 'Změnit formát videa'
   Use Dash Formats: 'Použít formáty DASH'
@@ -1100,6 +1040,8 @@ Tooltips:
     External Link Handling: "Zvolte výchozí chování při kliknutí na odkaz, který nelze
       otevřít ve FreeTube.\nVe výchozím nastavení otevře FreeTube odkaz ve vašem výchozím
       prohlížeči.\n"
+    Open Deep Links In New Window: Adresy předané aplikaci FreeTube, například rozšířením
+      pro prohlížeč nebo argumenty v příkazovém řádku, budou otevřeny v novém okně.
   Player Settings:
     Proxy Videos Through Invidious: 'Připojí se k Invidious, aby poskytoval videa
       namísto přímého připojení k YouTube.'
@@ -1130,7 +1072,7 @@ Tooltips:
       seznamu skladeb, pokud je podporován) v externím přehrávači, na náhledu. Varování,
       nastavení Invidious neovlivňují externí přehrávače.
     Custom External Player Arguments: Jakékoliv vlastní argumenty příkazové řádky,
-      oddělené středníkem (';'), které chcete předávat externímu přehrávač.
+      které chcete předávat externímu přehrávač.
     Custom External Player Executable: Ve výchozím nastavení Freetube předpokládá,
       že vybraný externí přehrávač lze nalézt přes proměnnou prostředí cesty PATH.
       V případě potřeby zde lze nastavit vlastní cestu.
@@ -1161,7 +1103,6 @@ Falling back to Local API: 'Přepínám na lokální API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Toto
   video není k dispozici z důvodu chybějících formátů. K tomu může dojít z důvodu
   nedostupnosti země.'
-Subscriptions have not yet been implemented: 'Odběry kanálů nebyly ještě implementovány'
 Loop is now disabled: 'Smyčka je vypnuta'
 Loop is now enabled: 'Smyčka je zapnuta'
 Shuffle is now disabled: 'Zamíchání je vypnuto'
@@ -1179,8 +1120,6 @@ Playing Next Video Interval: Přehrávání dalšího videa bez prodlevy Kliknut
   | Přehrávání dalšího videa za {nextVideoInterval} s. Kliknutím zrušíte. | Přehrávání
   dalšího videa za {nextVideoInterval} s. Kliknutím zrušíte.
 More: Více
-Hashtags have not yet been implemented, try again later: Hashtagy nebyly dosud implementovány,
-  zkuste to znovu později
 Unknown YouTube url type, cannot be opened in app: Neznámý typ adresy URL YouTube,
   nelze v aplikaci otevřít
 Open New Window: Otevřít nové okno
@@ -1199,12 +1138,10 @@ New Window: Nové okno
 Channels:
   Channels: Kanály
   Title: Seznam kanálů
-  Unsubscribed: Kanál {channelName} byl odebrán z vašich odběrů
   Unsubscribe Prompt: Opavdu chcete zrušit odběr kanálu „{channelName}“?
   Empty: Seznam vašich kanálů je momentálně prázdný.
   Search bar placeholder: Hledat kanály
   Count: Nalezeno {number} kanálů.
-  Unsubscribe: Zrušit odběr
 Screenshot Success: Snímek uložen jako „{filePath}“
 Screenshot Error: Snímek selhal. {error}
 Clipboard:
@@ -1217,6 +1154,7 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Seznam kapitol je skrytý,
     současná kapitola: {chapterName}'
   Chapters: Kapitoly
+  Key Moments: Klíčové momenty
 Preferences: Předvolby
 Ok: Ok
 Hashtag:
@@ -1253,5 +1191,25 @@ Search Listing:
     4K: 4K
     Subtitles: Titulky
     Closed Captions: Skryté titulky
+    360 Video: 360°
+    New: Nové
+    8K: 8K
+    VR180: VR180
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Zablokováno otevření potenciálně nebezpečné
   adresy URL: „{url}“.'
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Šipka dolů
+  arrowup: Šipka nahoru
+  arrowright: Šipka vpravo
+  arrowleft: Šipka vlevo
+Right-click or hold to see history: Klikněte pravým pro zobrazení historie
+Autoplay Interruption Timer: Automatické přehrávání zrušeno kvůli {autoplayInterruptionIntervalHours}
+  hodinám nečinnosti
+Description:
+  Expand Description: '...další'
+  Collapse Description: Zobrazit méně
diff --git a/static/locales/cy.yaml b/static/locales/cy.yaml
index 143ff1e776c41..b889d41748964 100644
--- a/static/locales/cy.yaml
+++ b/static/locales/cy.yaml
@@ -1,7 +1,8 @@
 # Put the name of your locale in the same language
 Locale Name: 'Cymraeg'
 # Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >
+'This part of the app is not ready yet. Come back later when progress has been made.': >-
+  Nid yw'r rhan hon o'r ap yn barod eto. Dewch nôl pan fydd cynnydd wedi'i wneud.
 
 # Webkit Menu Bar
 File: 'Ffeil'
@@ -53,6 +54,10 @@ Global:
     Watching Count: '1 yn gwylio | {count} yn gwylio'
 
 # Search Bar
+    Like Count: 1 hoffi | {count} hoffi
+    Comment Count: 1 sylw | {count} sylw
+  Input Tags:
+    Length Requirement: Rhaid i'r tag fod yn o leiaf {number} nod
 Search / Go to URL: 'Chwilio / Mynd i URL'
 Search Bar:
   Clear Input: 'Clirio Mewnbwn'
@@ -94,76 +99,212 @@ Search Filters:
   There are no more results for this search: 'Dim canlyniadau pellach ar gyfer y chwiliad
     hwn'
 # Sidebar
+  Features:
+    Creative Commons: Creative Commons
+    Live: Byw
+    360 Video: Fideo 360
+    Location: Lleoliad
+    HDR: HDR
+    VR180: VR180
+    HD: HD
+    Subtitles: Isdeitlau
+    3D: 3D
+    Features: Nodweddion
+    4K: 4K
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Tanysgrifiadau'
   # channels that were likely deleted
   Error Channels: 'Sianeli gyda Gwallau'
   Latest Subscriptions: 'Tanysgrifiadau Diweddaraf'
-  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: ''
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': ''
-  Disabled Automatic Fetching: ''
-  Empty Channels: ''
+  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Mae
+    gan y proffil hwn nifer fawr o danysgrifiadau.  Yn gorfodi RSS i osgoi cyfyngu
+    ar gyfraddau'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Mae
+    eich rhestr Tanysgrifio yn wag ar hyn o bryd. Os ydych chi am fewnforio''ch tanysgrifiadau
+    gallwch fynd i Gosodiadau Data a dewis Mewnforio Tanysgrifiadau neu gallwch chwilio
+    am sianel a thanysgrifio iddyn nw.'
+  Disabled Automatic Fetching: 'Rydych wedi analluogi cyrchu tanysgrifiad awtomatig.
+    Adnewyddwch danysgrifiadau i''w gweld yma.'
+  Empty Channels: 'Nid oes gan eich sianeli tanysgrifio unrhyw fideos ar hyn o bryd.'
   'Getting Subscriptions. Please wait.': 'Wrthi''n nôl Tanysgrifiadau. Arhoswch os
     gwelwch yn dda.'
-  Empty Posts: ''
+  Empty Posts: 'Nid oes gan eich sianeli tanysgrifio unrhyw bostiadau ar hyn o bryd.'
   Refresh Subscriptions: 'Adnewyddu Tanysgrifiadau'
   Load More Videos: 'Llwytho Mwy o Fideos'
   Load More Posts: 'Llwytho Mwy o Bostiadau'
   Subscriptions Tabs: 'Tabiau Tanysgrifio'
-  All Subscription Tabs Hidden: ''
+  All Subscription Tabs Hidden: 'Mae pob tab tanysgrifio wedi''i guddio. I weld cynnwys
+    yma, dadguddiwch rhai tabiau yn yr adran "{subsection}" yn "{settingsSection}".'
 More: 'Mwy'
 Channels:
   Channels: 'Sianeli'
   Title: 'Rhestr Sianeli'
   Search bar placeholder: 'Chwilio Sianeli'
-  Count: ''
-  Empty: ''
-  Unsubscribe: 'Dad-danysgrifio'
-  Unsubscribed: ''
-  Unsubscribe Prompt: ''
+  Count: 'Canfuwyd {number} sianel.'
+  Empty: 'Mae eich rhestr sianeli yn wag ar hyn o bryd.'
+  Unsubscribe Prompt: 'Ydych chi''n siŵr eich bod am ddad-danysgrifio o "{channelName}"?'
 Trending:
-  Trending: 'Llosg'
+  Trending: 'Trendio'
   Default: 'Diofyn'
   Music: 'Cerddoriaeth'
   Gaming: 'Gemau'
   Movies: 'Ffilmiau'
-  Trending Tabs: 'Tabiau Llosg'
-Most Popular: 'Mwyaf Poblogaidd'
-Playlists: 'Rhestrau Chwarae'
+  Trending Tabs: 'Tabiau Trendio'
+Most Popular: 'Poblogaidd'
+Playlists: 'Rhestrau'
 User Playlists:
   Your Playlists: 'Eich Rhestrau Chwarae'
-  Playlist Message: ''
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
-  Empty Search Message: ''
-  Search bar placeholder: ''
+  Empty Search Message: 'Nid oes unrhyw fideos yn y rhestr chwarae hon sy''n cyfateb
+    i''ch chwiliad'
+  Search bar placeholder: 'Chwilio am Restrau Chwarae'
+  This playlist currently has no videos.: Nid oes gan y rhestr chwarae hon unrhyw
+    fideos ar hyn o bryd.
+  Add to Favorites: Ychwanegu at {playlistName}
+  Move Video Up: Symud Fideo i Fyny
+  Move Video Down: Symud Fideo i Lawr
+  AddVideoPrompt:
+    Save: Cadw
+    Select a playlist to add your N videos to: Dewiswch restr chwarae i ychwanegu
+      eich fideo i | Dewiswch restr chwarae i ychwanegu eich {videoCount} fideos ati
+    Added {count} Times: Wedi'u Hychwanegu Eisoes | Ychwanegwyd {count} Gwaith
+    Toast:
+      You haven't selected any playlist yet.: Nid ydych wedi dewis unrhyw restr chwarae
+        eto.
+      "{videoCount} video(s) added to 1 playlist": 1 fideo wedi'i ychwanegu at 1 rhestr
+        chwarae | {videoCount} fideo wedi'u hychwanegu at 1 rhestr chwarae
+      "{videoCount} video(s) added to {playlistCount} playlists": 1 fideo wedi'i ychwanegu
+        at {playlistCount} rhestr chwarae | {videoCount} fideo wedi'u hychwanegu at
+        {playlistCount} rhestr chwarae
+    Allow Adding Duplicate Video(s): Caniatáu Ychwanegu Fideo(s) Dyblyg
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": "{videoCount}/{totalVideoCount}
+      Fideo i'w Hychwanegu"
+    N playlists selected: "{playlistCount} Wedi'u dewis"
+    "{videoCount}/{totalVideoCount} Videos Already Added": "{videoCount}/{totalVideoCount}
+      Fideos Eisoes wedi'u Hychwanegu"
+    Search in Playlists: Chwilio mewn Rhestrau Chwarae
+  Add to Playlist: Ychwanegu at y Rhestr Chwarae
+  Remove from Favorites: Tynnu o {playlistName}
+  Quick Bookmark Enabled: Nod Tudalen Cyflym wedi'i Galluogi
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Ydych
+    chi'n siŵr eich bod am dynnu 1 fideo a wyliwyd o'r rhestr chwarae hon? Nid oes
+    modd dadwneud hyn. | A ydych yn siŵr eich bod am ddileu {playlistItemCount} fideos
+    a wyliwyd o'r rhestr chwarae hon? Nid oes modd dadwneud hyn.
+  Sort By:
+    LatestCreatedFirst: Crëwyd yn Ddiweddar
+    NameAscending: A-Z
+    EarliestCreatedFirst: Crëwyd Gynharaf
+    LatestUpdatedFirst: Diweddarwyd yn Ddiweddar
+    NameDescending: Z-A
+    LatestPlayedFirst: Chwaraewyd yn Ddiweddar
+    EarliestPlayedFirst: Chwaraewyd Cynharaf
+    EarliestUpdatedFirst: Diweddarwyd Cynharaf
+    Sort By: Trefnu yn Ôl
+  SinglePlaylistView:
+    Toast:
+      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Nid
+        yw rhai fideos yn y rhestr chwarae wedi'u llwytho eto. Cliciwch yma i gopïo
+        beth bynnag.
+      There were no videos to remove.: Nid oedd yna unrhyw fideos i'w tynnu.
+      This playlist has a video with a duration error: Mae'r rhestr chwarae hon yn
+        cynnwys o leiaf un fideo nad oes ganddo hyd, bydd yn cael ei drefnu fel pe
+        bai eu hyd yn sero.
+      This video cannot be moved up.: Nid oes modd symud y fideo hwn i fyny.
+      This video cannot be moved down.: Nid oes modd symud y fideo hwn i lawr.
+      Video has been removed: Mae'r fideo wedi'i dynnu
+      There was a problem with removing this video: Bu anhawster wrth dynnu'r fideo
+        hwn
+      This playlist is already being used for quick bookmark.: Mae'r rhestr chwarae
+        hon eisoes yn cael ei defnyddio ar gyfer nod tudalen cyflym.
+      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Mae'r
+        rhestr chwarae hon bellach yn cael ei defnyddio ar gyfer nodau tudalen cyflym
+        yn lle {oldPlaylistName}. Cliciwch yma i ddadwneud
+      Reverted to use {oldPlaylistName} for quick bookmark: Wedi dychwelyd i ddefnyddio
+        {oldPlaylistName} ar gyfer nod tudalen cyflym
+      Playlist has been updated.: Mae'r rhestr chwarae wedi'i diweddaru.
+      "{videoCount} video(s) have been removed": 1 fideo wedi'i dynnu | Mae {videoCount}
+        fideo wedi'u dileu
+      This playlist is now used for quick bookmark: Mae'r rhestr chwarae hon bellach
+        yn cael ei defnyddio ar gyfer nodau tudalen cyflym
+      Playlist {playlistName} is the new quick bookmark playlist.: Rhestr chwarae
+        {playlistName} yw'r rhestr chwarae nodau tudalen cyflym newydd.
+      This playlist is protected and cannot be removed.: Mae'r rhestr chwarae hon
+        wedi'i diogelu ac nid oes modd ei dileu.
+      Playlist {playlistName} has been deleted.: Mae rhestr chwarae {playlistName}
+        wedi'i dileu.
+      Playlist name cannot be empty. Please input a name.: Ni all enw'r rhestr chwarae
+        fod yn wag. Rhowch enw.
+      There was an issue with updating this playlist.: Bu problem gyda diweddaru'r
+        rhestr chwarae hon.
+      This playlist does not exist: Nid yw'r rhestr chwarae hon yn bodoli
+    Search for Videos: Chwilio am Fideos
+  CreatePlaylistPrompt:
+    Toast:
+      There is already a playlist with this name. Please pick a different name.: Mae
+        yna restr chwarae gyda'r enw hwn yn barod. Dewiswch enw gwahanol.
+      Playlist {playlistName} has been successfully created.: Mae rhestr chwarae {playlistName}
+        wedi'i chreu'n llwyddiannus.
+      There was an issue with creating the playlist.: Roedd problem gyda chreu'r rhestr
+        chwarae.
+    New Playlist Name: Enw Rhestr Chwarae Newydd
+    Create: Creu
+  Export Playlist: Allforio'r Rhestr Chwarae Hon
+  The playlist has been successfully exported: Mae'r rhestr chwarae wedi'i allforio'n
+    llwyddiannus
+  Delete Playlist: Dileu Rhestr Chwarae
+  Remove from Playlist: Dileu o'r Rhestr Chwarae
+  Playlist Name: Enw Rhestr Chwarae
+  Playlist Description: Disgrifiad o'r Rhestr Chwarae
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Ydych
+    chi'n siŵr eich bod am dynnu 1 fideo dyblyg o'r rhestr chwarae hon? Nid oes modd
+    dadwneud hyn. | Ydych chi'n siŵr eich bod am ddileu {playlistItemCount} fideos
+    dyblyg o'r rhestr chwarae hon? Nid oes modd dadwneud hyn.
+  Cancel: Diddymu
+  Edit Playlist Info: Golygu Manylion Rhestr Chwarae
+  Copy Playlist: Copïo Rhestr Chwarae
+  Cannot delete the quick bookmark target playlist.: Methu dileu'r rhestr chwarae
+    targed nod tudalen cyflym.
+  You have no playlists. Click on the create new playlist button to create a new one.: Nid
+    oes gennych unrhyw restrau chwarae. Cliciwch ar y botwm creu rhestr chwarae newydd
+    i greu un newydd.
+  Playlists with Matching Videos: Rhestrau chwarae gyda Fideos Cyfatebol
+  Create New Playlist: Creu Rhestr Chwarae Newydd
+  Enable Quick Bookmark With This Playlist: Galluogi Nod Tudalen Cyflym Gyda'r Rhestr
+    Chwarae Hon
+  Remove Watched Videos: Dileu Fideos Wedi'u Gwylio
+  Are you sure you want to delete this playlist? This cannot be undone: Ydych chi'n
+    siŵr eich bod am ddileu'r rhestr chwarae hon? Nid oes modd dadwneud hyn.
+  Save Changes: Cadw'r Newidiadau
+  Remove Duplicate Videos: Dileu Fideos Dyblyg
 History:
   # On History Page
   History: 'Hanes'
   Watch History: 'Hanes Gwylio'
-  Your history list is currently empty.: ''
-  Empty Search Message: ''
-  Search bar placeholder: ""
+  Your history list is currently empty.: 'Mae eich rhestr hanes yn wag ar hyn o bryd.'
+  Empty Search Message: 'Nid oes unrhyw fideos yn eich hanes sy''n cyfateb i''ch chwiliad'
+  Search bar placeholder: "Chwilio yn eich Hanes"
+  Case Sensitive Search: Chwiliad Nodau Mawr neu Fach
 Settings:
   # On Settings Page
   Settings: 'Gosodiadau'
-  Expand All Settings Sections: ''
-  The app needs to restart for changes to take effect. Restart and apply change?: ''
+  The app needs to restart for changes to take effect. Restart and apply change?: 'Mae
+    angen i''r ap ailgychwyn er mwyn i newidiadau ddod i rym. Ailgychwyn a gosod y
+    newidiadau?'
   General Settings:
-    General Settings: 'Gosodiadau Cyffredinol'
+    General Settings: 'Cyffredinol'
     Check for Updates: 'Chwilio am Ddiweddariadau'
-    Check for Latest Blog Posts: ''
-    Fallback to Non-Preferred Backend on Failure: ''
-    Enable Search Suggestions: ''
-    Default Landing Page: ''
+    Check for Latest Blog Posts: 'Gwiriwch am y Postiadau Blog Diweddaraf'
+    Fallback to Non-Preferred Backend on Failure: 'Nôl i''r Cefn Diddewis ar Fethiant'
+    Enable Search Suggestions: 'Galluogi Awgrymiadau Chwilio'
+    Default Landing Page: 'Tudalen Glanio Ragosodedig'
     Locale Preference: 'Dewis Iaith'
     System Default: 'Rhagosodyn y System'
     Preferred API Backend:
-      Preferred API Backend: ''
+      Preferred API Backend: 'Cefn API Dewisol'
       Local API: 'API Lleol'
       Invidious API: 'API Invidious'
     Video View Type:
-      Video View Type: ''
+      Video View Type: 'Math Gwylio Fideo'
       Grid: 'Grid'
       List: 'Rhestr'
     Thumbnail Preference:
@@ -173,45 +314,56 @@ Settings:
       Middle: 'Canol'
       End: 'Diwedd'
       Hidden: 'Wedi''u cuddio'
-      Blur: ''
-    Current Invidious Instance: ''
-    The currently set default instance is {instance}: ''
-    No default instance has been set: ''
-    Current instance will be randomized on startup: ''
-    Set Current Instance as Default: ''
-    Clear Default Instance: ''
-    View all Invidious instance information: ''
-    Region for Trending: ''
+      Blur: 'Pŵl'
+    Current Invidious Instance: 'Enghraifft Invidious Cyfredol'
+    The currently set default instance is {instance}: 'Yr enghraifft rhagosodedig
+      a osodwyd ar hyn o bryd yw {instance}'
+    No default instance has been set: 'Nid oes enghraifft rhagosodedig wedi''i gosod'
+    Current instance will be randomized on startup: 'Bydd yr enghraifft gyfredol ar
+      gael ar hap wrth gychwyn'
+    Set Current Instance as Default: 'Gosod yr Enghraifft Gyfredol fel Rhagosodiad'
+    Clear Default Instance: 'Clirio''r Enghraifft Rhagosodedig'
+    View all Invidious instance information: 'Gweld yr holl wybodaeth am enghraifft
+      Invidious'
+    Region for Trending: 'Rhanbarth Trendio'
     #! List countries
     External Link Handling:
-      External Link Handling: ''
+      External Link Handling: 'Trin Cyswllt Allanol'
       Open Link: 'Agor Dolen'
-      Ask Before Opening Link: ''
+      Ask Before Opening Link: 'Gofyn Cyn Agor Dolen'
       No Action: 'Dim Gweithred'
+    Auto Load Next Page:
+      Label: Llwytho'r Dudalen Nesaf yn Awtomatig
+      Tooltip: Llwytho tudalennau a sylwadau ychwanegol yn awtomatig.
   Theme Settings:
-    Theme Settings: 'Gosodiadau Thema'
-    Match Top Bar with Main Color: ''
-    Expand Side Bar by Default: ''
-    Disable Smooth Scrolling: ''
+    Theme Settings: 'Thema'
+    Match Top Bar with Main Color: 'Cydweddu Bar Uchaf gyda Phrif Lliw'
+    Expand Side Bar by Default: 'Ehangu Bar Ochr fel rhagosodedig'
+    Disable Smooth Scrolling: 'Analluogi Sgrolio Llyfn'
     UI Scale: 'Graddfa UI'
-    Hide Side Bar Labels: ''
-    Hide FreeTube Header Logo: ''
+    Hide Side Bar Labels: 'Cuddio Labeli Bar Ochr'
+    Hide FreeTube Header Logo: 'Cuddio Logo Pennawd FreeTube'
     Base Theme:
       Base Theme: 'Thema Sylfaenol'
       Black: 'Du'
       Dark: 'Tywyll'
       System Default: 'Rhagosodyn y System'
       Light: 'Golau'
-      Dracula: ''
+      Dracula: 'Draciwla'
       Catppuccin Mocha: 'Catppuccin Mocha'
-      Pastel Pink: ''
-      Hot Pink: ''
+      Pastel Pink: 'Pinc Meddal'
+      Hot Pink: 'Pinc Poeth'
+      Solarized Dark: Heulog Tywyll
+      Solarized Light: Heulog Golau
+      Nordic: Nordaidd
+      Gruvbox Dark: Gruvbox Tywyll
+      Gruvbox Light: Golau Gruvbox
     Main Color Theme:
-      Main Color Theme: ''
+      Main Color Theme: 'Thema Prif Lliw'
       Red: 'Coch'
       Pink: 'Pinc'
       Purple: 'Porffor'
-      Deep Purple: ''
+      Deep Purple: 'Porffor Dwfn'
       Indigo: 'Indigo'
       Blue: 'Glas'
       Light Blue: 'Glas Golau'
@@ -221,53 +373,72 @@ Settings:
       Light Green: 'Gwyrdd Golau'
       Lime: 'Leim'
       Yellow: 'Melyn'
-      Amber: ''
+      Amber: 'Ambr'
       Orange: 'Oren'
-      Deep Orange: ''
-      Dracula Cyan: ''
-      Dracula Green: ''
-      Dracula Orange: ''
-      Dracula Pink: ''
-      Dracula Purple: ''
-      Dracula Red: ''
-      Dracula Yellow: ''
-      Catppuccin Mocha Rosewater: ''
-      Catppuccin Mocha Flamingo: ''
-      Catppuccin Mocha Pink: ''
-      Catppuccin Mocha Mauve: ''
-      Catppuccin Mocha Red: ''
-      Catppuccin Mocha Maroon: ''
-      Catppuccin Mocha Peach: ''
-      Catppuccin Mocha Yellow: ''
-      Catppuccin Mocha Green: ''
-      Catppuccin Mocha Teal: ''
-      Catppuccin Mocha Sky: ''
-      Catppuccin Mocha Sapphire: ''
-      Catppuccin Mocha Blue: ''
-      Catppuccin Mocha Lavender: ''
-    Secondary Color Theme: ''
+      Deep Orange: 'Oren Dwfn'
+      Dracula Cyan: 'Cyan Dracula'
+      Dracula Green: 'Gwyrdd Draciwla'
+      Dracula Orange: 'Oren Draciwla'
+      Dracula Pink: 'Pinc Draciwla'
+      Dracula Purple: 'Piws Draciwla'
+      Dracula Red: 'Coch Draciwla'
+      Dracula Yellow: 'Melyn Draciwla'
+      Catppuccin Mocha Rosewater: 'Catppuccin Mocha Rosewater'
+      Catppuccin Mocha Flamingo: 'Catppuccin Mocha Flamingo'
+      Catppuccin Mocha Pink: 'Catppuccin Mocha Pinc'
+      Catppuccin Mocha Mauve: 'Catppuccin Mocha Mauve'
+      Catppuccin Mocha Red: 'Catppuccin Mocha Coch'
+      Catppuccin Mocha Maroon: 'Catppuccin Mocha Maroon'
+      Catppuccin Mocha Peach: 'Catppuccin Mocha Peach'
+      Catppuccin Mocha Yellow: 'Catppuccin Mocha Melyn'
+      Catppuccin Mocha Green: 'Catppuccin Mocha Gwyrdd'
+      Catppuccin Mocha Teal: 'Corhwyaden Catppuccin Mocha'
+      Catppuccin Mocha Sky: 'Awyr Catppuccin Mocha'
+      Catppuccin Mocha Sapphire: 'Catppuccin Mocha Sapphire'
+      Catppuccin Mocha Blue: 'Catppuccin Mocha Glas'
+      Catppuccin Mocha Lavender: 'Catppuccin Mocha Lafant'
+      Gruvbox Light Red: Gruvbox Golau Coch
+      Solarized Red: Coch Heulog
+      Solarized Violet: Fioled Heulog
+      Gruvbox Dark Green: Gruvbox Gwyrdd Tywyll
+      Gruvbox Dark Yellow: Gruvbox Melyn Tywyll
+      Gruvbox Dark Blue: Gruvbox Glas Tywyll
+      Gruvbox Dark Purple: Gruvbox Porffor Tywyll
+      Gruvbox Dark Aqua: Aqua Tywyll Gruvbox
+      Gruvbox Dark Orange: Gruvbox Oren Tywyll
+      Gruvbox Light Blue: Gruvbox Glas Ysgafn
+      Gruvbox Light Purple: Gruvbox Porffor Ysgafn
+      Gruvbox Light Orange: Gruvbox Oren Ysgafn
+      Solarized Magenta: Magenta Heulog
+      Solarized Orange: Oren Heulog
+      Solarized Green: Gwyrdd Heulog
+      Solarized Yellow: Melyn Heulog
+      Solarized Blue: Glas Heulog
+      Solarized Cyan: Cyan Heulog
+    Secondary Color Theme: 'Thema Lliw Eilaidd'
         #* Main Color Theme
   Player Settings:
     Player Settings: 'Gosodiadau Chwaraewr'
-    Play Next Video: ''
-    Turn on Subtitles by Default: ''
+    Play Next Video: 'Chwarae Fideo Nesaf'
+    Turn on Subtitles by Default: 'Troi Isdeitlau ymlaen fel rhagosodiad'
     Autoplay Videos: 'Awto-chwarae Fideos'
-    Proxy Videos Through Invidious: ''
+    Proxy Videos Through Invidious: 'Fideos Dirprwy Trwy Invidious'
     Autoplay Playlists: 'Awto-chwarae Rhestrau Chwarae'
-    Enable Theatre Mode by Default: ''
-    Scroll Volume Over Video Player: ''
-    Scroll Playback Rate Over Video Player: ''
-    Skip by Scrolling Over Video Player: ''
-    Display Play Button In Video Player: ''
-    Enter Fullscreen on Display Rotate: ''
-    Next Video Interval: ''
-    Fast-Forward / Rewind Interval: ''
+    Enable Theatre Mode by Default: 'Galluogi Modd Theatr fel rhagosodiad'
+    Scroll Volume Over Video Player: 'Sgrolio Sain Dros Chwaraewr Fideo'
+    Scroll Playback Rate Over Video Player: 'Sgrolio Graddfa Chwarae Nôl Dros Chwaraewr
+      Fideo'
+    Skip by Scrolling Over Video Player: 'Neidio drwy Sgrolio Dros Chwaraewr Fideo'
+    Display Play Button In Video Player: 'Dangos Botwm Chwarae yn y Chwaraewr Fideo'
+    Enter Fullscreen on Display Rotate: 'Mynd i''r Sgrin Lawn wrth Cylchdroi Dangosydd'
+    Next Video Interval: 'Ysbaid Fideo Nesaf'
+    Fast-Forward / Rewind Interval: 'Ysbaid Cyflym Ymlaen / Ailddirwyn'
     Default Volume: 'Sain Diofyn'
-    Default Playback Rate: ''
-    Max Video Playback Rate: ''
-    Video Playback Rate Interval: ''
+    Default Playback Rate: 'Cyfradd Chwarae rhagosodiad'
+    Max Video Playback Rate: 'Cyfradd Chwarae Fideo Uchaf'
+    Video Playback Rate Interval: 'Ysbaid Cyfradd Chwarae Fideo'
     Default Video Format:
-      Default Video Format: ''
+      Default Video Format: 'Fformat Fideo Rhagosodedig'
       Dash Formats: 'Fformatau DASH'
       Legacy Formats: 'Hen Fformatau'
       Audio Formats: 'Fformatau Sain'
@@ -287,94 +458,113 @@ Settings:
       Enable: 'Galluogi Sgrinlun'
       Format Label: 'Fformat Sgrinluniau'
       Quality Label: 'Ansawdd Sgrinlun'
-      Ask Path: ''
+      Ask Path: 'Gofynnwch am Ffolder Cadw'
       Folder Label: 'Ffolder Sgrinlun'
       Folder Button: 'Dewis Ffolder'
       File Name Label: 'Patrwm Enw Ffeil'
-      File Name Tooltip: ''
+      File Name Tooltip: 'Gallwch ddefnyddio newidynnau isod. %Y Blwyddyn 4 digid.
+        % M Mis 2 ddigid. %D Diwrnod 2 ddigid. % H Awr 2 ddigid. % N Munud 2 ddigid.
+        %S Ail 2 ddigid. % T Millisecond 3 digid. %s Eiliad Fideo. %t Fideo Millisecond
+        3 digid. %i ID fideo. Gallwch hefyd ddefnyddio "\" neu "/" i greu is-ffolderi.'
       Error:
         Forbidden Characters: 'Nodau Gwahardd'
-        Empty File Name: ''
+        Empty File Name: 'Enw Ffeil Gwag'
   External Player Settings:
-    External Player Settings: ''
+    External Player Settings: 'Chwaraewr Allanol'
     External Player: 'Chwaraewr Allanol'
-    Ignore Unsupported Action Warnings: ''
-    Custom External Player Executable: ''
-    Custom External Player Arguments: ''
+    Ignore Unsupported Action Warnings: 'Anwybyddu Rhybuddion Gweithredu Heb Gefnogaeth'
+    Custom External Player Executable: 'Gweithredadwy Chwaraewr Allanol Cyfaddas'
+    Custom External Player Arguments: 'Dadleuon Chwaraewr Allanol Cyfaddas'
     Players:
       None:
         Name: 'Dim'
+    Ignore Default Arguments: Anwybyddu Dadleuon Rhagosodedig
   Privacy Settings:
-    Privacy Settings: 'Gosodiadau Preifatrwydd'
+    Privacy Settings: 'Preifatrwydd'
     Remember History: 'Cadw Hanes'
-    Save Watched Progress: ''
-    Save Watched Videos With Last Viewed Playlist: ''
-    Clear Search Cache: ''
-    Are you sure you want to clear out your search cache?: ''
-    Search cache has been cleared: ''
-    Remove Watch History: ''
-    Are you sure you want to remove your entire watch history?: ''
-    Watch history has been cleared: ''
-    Remove All Subscriptions / Profiles: ''
-    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
+    Save Watched Progress: 'Cadw y Cynnydd Gwylio'
+    Save Watched Videos With Last Viewed Playlist: 'Cadw Fideos Wedi''u Gwylio Gyda
+      Rhestr Chwarae y Gwylio Diwethaf'
+    Clear Search Cache: 'Clirio''r Storfa Chwilio'
+    Are you sure you want to clear out your search cache?: 'Ydych chi''n siŵr eich
+      bod am glirio''ch storfa chwilio?'
+    Search cache has been cleared: 'Mae storfa chwilio wedi''i chlirio'
+    Remove Watch History: 'Dileu Hanes Gwylio'
+    Are you sure you want to remove your entire watch history?: 'Ydych chi''n siŵr
+      eich bod am ddileu eich hanes gwylio i gyd?'
+    Watch history has been cleared: 'Mae hanes gwylio wedi''i glirio'
+    Remove All Subscriptions / Profiles: 'Dileu Pob Tanysgrifiad / Proffil'
+    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'A
+      ydych yn siŵr eich bod am ddileu pob tanysgrifiad a phroffil?  Nid oes modd
+      dadwneud hyn.'
+    All playlists have been removed: Mae'r holl restrau chwarae wedi'u dileu
+    Remove All Playlists: Dileu Pob Rhestr Chwarae
+    Are you sure you want to remove all your playlists?: Ydych chi'n siŵr eich bod
+      am ddileu eich holl restrau chwarae?
   Subscription Settings:
-    Subscription Settings: 'Gosodiadau Tanysgrifio'
-    Hide Videos on Watch: ''
-    Fetch Feeds from RSS: ''
-    Manage Subscriptions: 'Rheoli Tanysgrifiadau'
-    Fetch Automatically: ''
-    Only Show Latest Video for Each Channel: ''
+    Subscription Settings: 'Tanysgrifiad'
+    Hide Videos on Watch: 'Cuddio Fideos wrth Wylio'
+    Fetch Feeds from RSS: 'Nôl Llif RSS'
+    Fetch Automatically: 'Nôl Llif yn Awtomatig'
+    Confirm Before Unsubscribing: Cadarnhau Cyn Dad-danysgrifio
   Distraction Free Settings:
-    Distraction Free Settings: ''
+    Distraction Free Settings: 'Dim Tarfu'
     Sections:
       Side Bar: 'Bar Ochr'
       Subscriptions Page: 'Tudalen Tanysgrifiadau'
       Channel Page: 'Tudalen Sianel'
       Watch Page: 'Tudalen Wylio'
       General: 'Cyffredinol'
-    Hide Video Views: ''
-    Hide Video Likes And Dislikes: ''
-    Hide Channel Subscribers: ''
-    Hide Comment Likes: ''
-    Hide Recommended Videos: ''
-    Hide Trending Videos: 'Cuddio Fideos Llosg'
+    Hide Video Views: 'Cuddio Golygon Fideo'
+    Hide Video Likes And Dislikes: 'Cuddio Hoffi a Chasáu Fideos'
+    Hide Channel Subscribers: 'Cuddio Tanysgrifwyr Sianel'
+    Hide Comment Likes: 'Cuddio Sylwadau Hoffi'
+    Hide Recommended Videos: 'Cuddio Fideos Da'
+    Hide Trending Videos: 'Cuddio Fideos Trendio'
     Hide Popular Videos: 'Cuddio Fideos Poblogaidd'
     Hide Playlists: 'Cuddio Rhestrau Chwarae'
-    Hide Live Chat: ''
-    Hide Active Subscriptions: ''
-    Hide Video Description: ''
+    Hide Live Chat: 'Cuddio Sgwrs Fyw'
+    Hide Active Subscriptions: 'Cuddio Tanysgrifiadau Gweithredol'
+    Hide Video Description: 'Cuddio Disgrifiad Fideo'
     Hide Comments: 'Cuddio Sylwadau'
-    Hide Profile Pictures in Comments: ''
-    Display Titles Without Excessive Capitalisation: ''
-    Hide Live Streams: ''
-    Hide Upcoming Premieres: ''
-    Hide Sharing Actions: ''
+    Hide Profile Pictures in Comments: 'Cuddio Lluniau Proffil mewn Sylwadau'
+    Display Titles Without Excessive Capitalisation: 'Dangos Teitlau Heb Prif Lythrennu
+      Ac Atalnodi Gormodol'
+    Hide Live Streams: 'Cuddio Ffrydiau Byw'
+    Hide Upcoming Premieres: 'Cuddio Cyflwyniadau i''r Dyfodol'
+    Hide Sharing Actions: 'Cuddio Gweithredoedd Rhannu'
     Hide Chapters: 'Cuddio Siapteri'
-    Hide Channels: ''
-    Hide Channels Disabled Message: ''
+    Hide Channels: 'Cuddio Fideos O Sianeli'
+    Hide Channels Disabled Message: 'Cafodd rhai sianeli eu rhwystro gan ddefnyddio
+      dull adnabod ac ni chawsant eu prosesu. Mae nodwedd wedi''i rhwystro tra bod
+      yr IDau hynny''n cael eu diweddaru'
     Hide Channels Placeholder: 'ID Sianel'
-    Hide Channels Invalid: ''
-    Hide Channels API Error: ''
-    Hide Channels Already Exists: ''
-    Hide Featured Channels: ''
-    Hide Channel Playlists: ''
-    Hide Channel Community: ''
-    Hide Channel Shorts: ''
-    Hide Channel Podcasts: ''
-    Hide Channel Releases: ''
-    Hide Subscriptions Videos: ''
-    Hide Subscriptions Shorts: ''
-    Hide Subscriptions Live: ''
-    Hide Subscriptions Community: ''
+    Hide Channels Invalid: 'Roedd ID y sianel a ddarparwyd yn annilys'
+    Hide Channels API Error: 'Gwall wrth adalw defnyddiwr gyda''r ID a ddarparwyd.
+      Gwiriwch eto a yw''r ID yn gywir.'
+    Hide Channels Already Exists: 'Mae ID y sianel eisoes yn bodoli'
+    Hide Featured Channels: 'Cuddio Sianeli Nodwedd'
+    Hide Channel Playlists: 'Cuddio Rhestrau Chwarae Sianel'
+    Hide Channel Community: 'Cuddio Cymuned Sianel'
+    Hide Channel Shorts: 'Cuddio Byrion Sianel'
+    Hide Channel Podcasts: 'Cuddio Podlediadau Sianel'
+    Hide Channel Releases: 'Cuddio Fideos Newydd Sianel'
+    Hide Subscriptions Videos: 'Cuddio Fideos Tanysgrifiadau'
+    Hide Subscriptions Shorts: 'Cuddio Tanysgrifiadau Byrion'
+    Hide Subscriptions Live: 'Cuddio Tanysgrifiadau Byw'
+    Hide Subscriptions Community: 'Cuddio Cymuned Tanysgrifiadau'
+    Hide Videos and Playlists Containing Text: Cuddio Fideos a Rhestrau Chwarae sy'n
+      Cynnwys Testun
+    Hide Videos and Playlists Containing Text Placeholder: Gair, Darn o Arian, neu
+      Ymadrodd
   Data Settings:
-    Data Settings: 'Gosodiadau Data'
-    Select Import Type: ''
-    Select Export Type: ''
+    Data Settings: 'Data'
+    Select Import Type: 'Dewis y Math o Fewnforio'
+    Select Export Type: 'Dewis y Math o Allforio'
     Import Subscriptions: 'Mewnforio Tanysgrifiadau'
     Subscription File: 'Ffeil Tanysgrifio'
     History File: 'Ffeil Hanes'
     Playlist File: 'Ffeil Rhestr Chwarae'
-    Check for Legacy Subscriptions: ''
     Export Subscriptions: 'Allforio Tanysgrifiadau'
     Export FreeTube: 'Allforio FreeTube'
     Export YouTube: 'Allforio YouTube'
@@ -383,309 +573,357 @@ Settings:
     Export History: 'Allforio Hanes'
     Import Playlists: 'Mewnforio Rhestrau Chwarae'
     Export Playlists: 'Allforio Rhestrau Chwarae'
-    Profile object has insufficient data, skipping item: ''
-    All subscriptions and profiles have been successfully imported: ''
-    All subscriptions have been successfully imported: ''
-    Invalid subscriptions file: ''
+    Profile object has insufficient data, skipping item: 'Nid oes gan y gwrthrych
+      proffil ddigon o ddata, gan hepgor yr eitem'
+    All subscriptions and profiles have been successfully imported: 'Mae''r holl danysgrifiadau
+      a phroffiliau wedi''u mewnforio''n llwyddiannus'
+    All subscriptions have been successfully imported: 'Mae pob tanysgrifiad wedi''i
+      fewnforio''n llwyddiannus'
+    Invalid subscriptions file: 'Ffeil tanysgrifiadau annilys'
     This might take a while, please wait: ''
-    Invalid history file: ''
-    Subscriptions have been successfully exported: ''
-    History object has insufficient data, skipping item: ''
-    All watched history has been successfully imported: ''
-    All watched history has been successfully exported: ''
-    Playlist insufficient data: ''
-    All playlists has been successfully imported: ''
-    All playlists has been successfully exported: ''
-    Unable to read file: ''
-    Unable to write file: ''
-    Unknown data key: ''
-    How do I import my subscriptions?: ''
+    Invalid history file: 'Ffeil hanes annilys'
+    Subscriptions have been successfully exported: 'Mae tanysgrifiadau wedi''u hallforio''n
+      llwyddiannus'
+    History object has insufficient data, skipping item: 'Nid oes gan y gwrthrych
+      hanes ddigon o ddata, gan hepgor yr eitem'
+    All watched history has been successfully imported: 'Mae''r holl hanes gwylio
+      wedi''i fewnforio''n llwyddiannus'
+    All watched history has been successfully exported: 'Mae''r holl hanes gwylio
+      wedi''i allforio''n llwyddiannus'
+    Playlist insufficient data: 'Dim digon o ddata ar gyfer rhestr chwarae "{playlist}",
+      hepgor eitem'
+    All playlists has been successfully imported: 'Mae''r holl restrau chwarae wedi''u
+      mewnforio yn llwyddiannus'
+    All playlists has been successfully exported: 'Mae''r holl restrau chwarae wedi''u
+      hallforio''n llwyddiannus'
+    Unable to read file: 'Methu darllen ffeil'
+    Unable to write file: 'Methu ysgrifennu ffeil'
+    Unknown data key: 'Allwedd ddata anhysbys'
+    How do I import my subscriptions?: 'Sut ydw i''n mewnforio fy nhanysgrifiadau?'
     Manage Subscriptions: 'Rheoli Tanysgrifiadau'
+    Export Playlists For Older FreeTube Versions:
+      Tooltip: "Mae'r opsiwn hwn yn allforio fideos o bob rhestr chwarae i un rhestr
+        chwarae o'r enw 'Ffefrynnau'.\nSut i allforio a mewnforio fideos mewn rhestrau
+        chwarae ar gyfer fersiwn hŷn o FreeTube:\n1. Allforio eich rhestri chwarae
+        gyda'r opsiwn hwn wedi'i alluogi.\n2. Dileu eich holl restrau chwarae presennol
+        gan ddefnyddio'r opsiwn Dileu Pob Rhestr Chwarae o dan Gosodiadau Preifatrwydd.\n
+        3. Lansio'r fersiwn hŷn o FreeTube a mewngludo'r rhestri chwarae allforio.\""
+      Label: Allforio Rhestrau Chwarae Fersiynau FreeTube Hŷn
   Proxy Settings:
     Proxy Settings: 'Gosodiadau Dirprwy'
-    Enable Tor / Proxy: ''
+    Enable Tor / Proxy: 'Galluogi Tor/Dirprwy'
     Proxy Protocol: 'Protocol Dirprwy'
     Proxy Host: 'Gweinydd Dirprwy'
-    Proxy Port Number: ''
-    Clicking on Test Proxy will send a request to: ''
+    Proxy Port Number: 'Rhif Porth Dirprwy'
+    Clicking on Test Proxy will send a request to: 'Bydd clicio ar Test Proxy yn anfon
+      cais at'
     Test Proxy: 'Profi Dirprwy'
     Your Info: 'Eich Gwybodaeth'
     Ip: 'IP'
     Country: 'Gwlad'
     Region: 'Rhanbarth'
     City: 'Dinas'
-    Error getting network information. Is your proxy configured properly?: ''
+    Error getting network information. Is your proxy configured properly?: 'Gwall
+      wrth gael gwybodaeth rhwydwaith. A yw eich dirprwy wedi''i ffurfweddu''n gywir?'
+    Proxy Warning: Nid oes gan FreeTube ddirprwy mewnol ond gall gysylltu â dirprwy
+      allanol, fel un sy'n rhedeg ar eich peiriant fel Tor neu ddirprwy allanol fel
+      dirprwy SOCKS5 a ddarperir gan rai VPNs. Os yw wedi'i alluogi, gwnewch yn siŵr
+      bod eich dirprwy/Tor wedi'i ffurfweddu'n gywir, neu ni fydd FreeTube yn gallu
+      nôl unrhyw ddata.
   SponsorBlock Settings:
     SponsorBlock Settings: 'Gosodiadau SponsorBlock'
     Enable SponsorBlock: 'Galluogi SponsorBlock'
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
-    Notify when sponsor segment is skipped: ''
-    UseDeArrowTitles: ''
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'Url API SponsorBlock
+      (Y rhagosodiad yw https://sponsor.ajay.app)'
+    Notify when sponsor segment is skipped: 'Rhoi gwybod pan fydd segment y noddwr
+      yn cael ei hepgor'
+    UseDeArrowTitles: 'Defnyddio Teitlau Fideo DeArrow'
     Skip Options:
       Skip Option: 'Opsiwn Hepgor'
       Auto Skip: 'Awto-Hepgor'
-      Show In Seek Bar: ''
-      Prompt To Skip: ''
+      Show In Seek Bar: 'Dangos yn y Bar Chwilio'
+      Prompt To Skip: 'Annog i Hepgor'
       Do Nothing: 'Gwneud Dim'
     Category Color: 'Lliw Categori'
+    UseDeArrowThumbnails: Defnyddio DeArrow ar gyfer lluniau bach
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': DeArrow
+      Thumbnail Generator API (Y rhagosodiad yw https://dearrow-thumb.ajay.app)
   Parental Control Settings:
-    Parental Control Settings: ''
+    Parental Control Settings: 'Rheolaeth Rhieni'
     Hide Unsubscribe Button: 'Cuddio Botwm Dad-danysgrifio'
-    Show Family Friendly Only: ''
+    Show Family Friendly Only: 'Dangos Dim ond Addas i Deuluoedd'
     Hide Search Bar: 'Cuddio Bar Chwilio'
   Download Settings:
-    Download Settings: 'Gosodiadau Lawrlwytho'
-    Ask Download Path: ''
+    Download Settings: 'Llwytho i lawr'
+    Ask Download Path: 'Gofyn am lwybr llwytho'
     Choose Path: 'Dewiswch Lwybr'
     Download Behavior: 'Ymddygiad Lawrlwytho'
-    Download in app: ''
-    Open in web browser: ''
+    Download in app: 'Llwytho mewn ap'
+    Open in web browser: 'Agor mewn porwr gwe'
   Experimental Settings:
     Experimental Settings: 'Gosodiadau Arbrofol'
-    Warning: ''
-    Replace HTTP Cache: ''
+    Warning: 'Mae''r gosodiadau hyn yn arbrofol, gallant achosi chwalu wrth eu galluogi.
+      Argymhellir yn gryf gwneud copïau wrth gefn. Defnyddiwch ar eich menter eich
+      hun!'
+    Replace HTTP Cache: 'Disodli HTTP Cache'
   Password Dialog:
     Password: 'Cyfrinair'
-    Enter Password To Unlock: ''
+    Enter Password To Unlock: 'Rhowch gyfrinair i ddatgloi gosodiadau'
     Password Incorrect: 'Cyfrinair Anghywir'
     Unlock: 'Datgloi'
   Password Settings:
-    Password Settings: 'Gosodiadau Cyfrinair'
-    Set Password To Prevent Access: ''
+    Password Settings: 'Cyfrinair'
+    Set Password To Prevent Access: 'Gosod cyfrinair i atal mynediad i osodiadau'
     Set Password: 'Gosod Cyfrinair'
     Remove Password: 'Tynnu Cyfrinair'
+  Return to Settings Menu: Nôl i'r Ddewislen Gosodiadau
+  Sort Settings Sections (A-Z): Adrannau Gosodiadau Trefnu (A-Z)
 About:
   #On About page
   About: 'Ynghylch'
   Beta: 'Beta'
   Source code: 'Cod ffynhonnell'
-  Licensed under the AGPLv3: ''
-  View License: 'Gweld Trwydded'
-  Downloads / Changelog: ''
-  GitHub releases: ''
+  Downloads / Changelog: 'Llwytho / Changelog'
+  GitHub releases: 'Ryddhau drwy GitHub'
   Help: 'Cymorth'
   FreeTube Wiki: 'Wici FreeTube'
   FAQ: 'Cwestiynau Cyffredin'
   Discussions: 'Sgyrsiau'
-  Report a problem: ''
+  Report a problem: 'Adrodd am broblem'
   GitHub issues: 'Materion GitHub'
-  Please check for duplicates before posting: ''
+  Please check for duplicates before posting: 'Gwiriwch am ddyblygiadau cyn postio'
   Website: 'Gwefan'
   Blog: 'Blog'
   Email: 'E-bost'
   Mastodon: 'Mastodon'
-  Chat on Matrix: ''
-  Please read the: ''
+  Chat on Matrix: 'Sgwrsio ar Matrix'
+  Please read the: 'Darllenwch y'
   room rules: 'rheolau ystafell'
   Translate: 'Cyfieithu'
   Credits: 'Cydnabyddiaeth'
-  FreeTube is made possible by: ''
-  these people and projects: ''
+  FreeTube is made possible by: 'Gwneir FreeTube yn bosibl gan'
+  these people and projects: 'y bobl a''r prosiectau hyn'
   Donate: 'Rhoi arian'
 
+  Licensed under the: Trwyddedig o dan y
+  AGPLv3: AGPLv3
 Profile:
-  Profile Settings: 'Gosodiadau Proffil'
-  Toggle Profile List: ''
+  Profile Settings: 'Proffil'
+  Toggle Profile List: 'Toglo Rhestr Proffil'
   Profile Select: 'Dewis Proffil'
   Profile Filter: 'Hidlydd Proffil'
   All Channels: 'Pob Sianel'
   Profile Manager: 'Rheoli Proffiliau'
   Create New Profile: 'Creu Proffil Newydd'
   Edit Profile: 'Golygu Proffil'
-  Edit Profile Name: ''
-  Create Profile Name: ''
+  Edit Profile Name: 'Golygu Enw Proffil'
+  Create Profile Name: 'Creu Enw Proffil'
   Profile Name: 'Enw Proffil'
   Color Picker: 'Dewisydd Lliw'
   Custom Color: 'Lliw Addas'
   Profile Preview: 'Rhagweld Proffil'
   Create Profile: 'Creu Proffil'
   Update Profile: 'Diweddaru Proffil'
-  Make Default Profile: ''
+  Make Default Profile: 'Gwneud Proffil Rhagosodedig'
   Delete Profile: 'Dileu Proffil'
-  Are you sure you want to delete this profile?: ''
-  All subscriptions will also be deleted.: ''
-  Profile could not be found: ''
-  Your profile name cannot be empty: ''
-  Profile has been created: ''
-  Profile has been updated: ''
-  Your default profile has been set to {profile}: ''
-  Removed {profile} from your profiles: ''
-  Your default profile has been changed to your primary profile: ''
-  '{profile} is now the active profile': ''
+  Are you sure you want to delete this profile?: 'Ydych chi''n siŵr eich bod am ddileu''r
+    proffil hwn?'
+  All subscriptions will also be deleted.: 'Bydd pob tanysgrifiad hefyd yn cael ei
+    ddileu.'
+  Profile could not be found: 'Nid oedd modd dod o hyd i broffil'
+  Your profile name cannot be empty: 'Ni all eich enw proffil fod yn wag'
+  Profile has been created: 'Mae proffil wedi''i greu'
+  Profile has been updated: 'Mae''r proffil wedi''i ddiweddaru'
+  Your default profile has been set to {profile}: 'Mae eich proffil rhagosodedig wedi''i
+    osod i {profile}'
+  Removed {profile} from your profiles: 'Wedi tynnu {profile} o''ch proffiliau'
+  Your default profile has been changed to your primary profile: 'Mae eich proffil
+    rhagosodedig wedi''i newid i''ch prif broffil'
+  '{profile} is now the active profile': '{profile} yw''r proffil gweithredol bellach'
   Subscription List: 'Rhestr Tanysgrifiadau'
   Other Channels: 'Sianeli Eraill'
-  '{number} selected': ''
+  '{number} selected': 'Mae {number} wedi''i ddewis'
   Select All: 'Dewis Popeth'
   Select None: 'Dewis Dim'
-  Delete Selected: ''
-  Add Selected To Profile: ''
-  No channel(s) have been selected: ''
+  Delete Selected: 'Dileu''r Dewis'
+  Add Selected To Profile: 'Ychwanegu''r Dewis i Broffil'
+  No channel(s) have been selected: 'Dim sianel(i) wedi''u dewis'
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
-  : ''
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
-  Close Profile Dropdown: ''
-  Open Profile Dropdown: ''
+  : 'Dyma''ch prif broffil.  Ydych chi''n siŵr eich bod am ddileu''r sianeli a ddewiswyd?  Bydd
+    yr un sianeli yn cael eu dileu mewn unrhyw broffil sydd ynddo.'
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Ydych
+    chi''n siŵr eich bod am ddileu''r sianeli a ddewiswyd?  Ni fydd hyn yn dileu''r
+    sianel o unrhyw broffil arall.'
+  Close Profile Dropdown: 'Cau''r Cwymplen Proffil'
+  Open Profile Dropdown: 'Agor Cwymplen Proffil'
 #On Channel Page
 Channel:
   Subscribe: 'Tanysgrifio'
   Unsubscribe: 'Dad-danysgrifio'
-  Channel has been removed from your subscriptions: ''
-  Removed subscription from {count} other channel(s): ''
-  Added channel to your subscriptions: ''
+  Channel has been removed from your subscriptions: 'Mae''r sianel wedi''i dynnu o''ch
+    tanysgrifiadau'
+  Removed subscription from {count} other channel(s): 'Tynnwyd y tanysgrifiad o {count}
+    sianel(i) arall'
+  Added channel to your subscriptions: 'Ychwanegwyd sianel at eich tanysgrifiadau'
   Search Channel: 'Chwilio Sianel'
-  Your search results have returned 0 results: ''
+  Your search results have returned 0 results: 'Mae eich canlyniadau chwilio wedi
+    dod o hyd i 0 canlyniad'
   Sort By: 'Trefnu yn ôl'
-  This channel does not exist: ''
-  This channel does not allow searching: ''
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
+  This channel does not exist: 'Nid yw''r sianel hon yn bodoli'
+  This channel does not allow searching: 'Nid yw''r sianel hon yn caniatáu chwilio'
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Mae
+    cyfyngiad oedran ar y sianel hon ac ar hyn o bryd nid oes modd ei gweld yn FreeTube.'
   Channel Tabs: 'Tabiau Sianel'
   Videos:
     Videos: 'Fideos'
-    This channel does not currently have any videos: ''
+    This channel does not currently have any videos: 'Nid oes gan y sianel hon unrhyw
+      fideos ar hyn o bryd'
     Sort Types:
       Newest: 'Diweddaraf'
       Oldest: 'Hynaf'
       Most Popular: 'Mwyaf Poblogaidd'
   Shorts:
-    This channel does not currently have any shorts: ''
+    This channel does not currently have any shorts: 'Nid oes gan y sianel hon unrhyw
+      siorts ar hyn o bryd'
   Live:
     Live: 'Byw'
-    This channel does not currently have any live streams: ''
+    This channel does not currently have any live streams: 'Nid oes gan y sianel hon
+      unrhyw ffrydiau byw ar hyn o bryd'
   Playlists:
     Playlists: 'Rhestrau Chwarae'
-    This channel does not currently have any playlists: ''
+    This channel does not currently have any playlists: 'Nid oes gan y sianel hon
+      unrhyw restrau chwarae ar hyn o bryd'
     Sort Types:
-      Last Video Added: ''
+      Last Video Added: 'Y Fideo Diwethaf a Ychwanegwyd'
       Newest: 'Diweddaraf'
       Oldest: 'Hynaf'
   Podcasts:
     Podcasts: 'Podlediadau'
-    This channel does not currently have any podcasts: ''
+    This channel does not currently have any podcasts: 'Nid oes gan y sianel hon unrhyw
+      bodlediadau ar hyn o bryd'
   Releases:
     Releases: 'Rhyddhadau'
-    This channel does not currently have any releases: ''
+    This channel does not currently have any releases: 'Nid oes gan y sianel hon unrhyw
+      fdeos newydd ar hyn o bryd'
   About:
     About: 'Ynghylch'
     Channel Description: 'Disgrifiad y Sianel'
     Tags:
       Tags: 'Tagiau'
-      Search for: ''
+      Search for: 'Chwilio am "{tag}"'
     Details: 'Manylion'
     Joined: 'Dyddiad ymuno'
     Location: 'Lleoliad'
     Featured Channels: 'Sianeli Dethol'
   Community:
-    This channel currently does not have any posts: ''
+    This channel currently does not have any posts: 'Nid oes gan y sianel hon unrhyw
+      bostiadau ar hyn o bryd'
     votes: '{votes} o bleidleisiau'
     Reveal Answers: 'Datgloi Atebion'
     Hide Answers: 'Cuddio Atebion'
+    Video hidden by FreeTube: Fideo wedi'i guddio gan FreeTube
+    View Full Post: Gweld Post Llawn
+    Viewing Posts Only Supported By Invidious: Dim ond Invidious sy'n cefnogi Gweld
+      Postiadau. Ewch i dab cymunedol sianel i weld cynnwys yno heb Invidious.
 Video:
-  Mark As Watched: ''
-  Remove From History: ''
-  Video has been marked as watched: ''
-  Video has been removed from your history: ''
+  Mark As Watched: 'Marcio wedi''i Wylio'
+  Remove From History: 'Dileu o Hanes'
+  Video has been marked as watched: 'Fideo wedi''i farcio fel wedi''i wylio'
+  Video has been removed from your history: 'Mae fideo wedi''i dynnu o''ch hanes'
   Save Video: 'Cadw Fideo'
-  Video has been saved: ''
-  Video has been removed from your saved list: ''
-  Open in YouTube: ''
-  Copy YouTube Link: ''
-  Open YouTube Embedded Player: ''
-  Copy YouTube Embedded Player Link: ''
-  Open in Invidious: ''
-  Copy Invidious Link: ''
-  Open Channel in YouTube: ''
-  Copy YouTube Channel Link: ''
-  Open Channel in Invidious: ''
-  Copy Invidious Channel Link: ''
+  Video has been saved: 'Mae fideo wedi''i gadw'
+  Video has been removed from your saved list: 'Mae fideo wedi''i dynnu oddi ar eich
+    rhestr sydd wedi''i chadw'
+  Open in YouTube: 'Agor yn YouTube'
+  Copy YouTube Link: 'Copïo Dolen YouTube'
+  Open YouTube Embedded Player: 'Agor Chwaraewr Mewnblannu YouTube'
+  Copy YouTube Embedded Player Link: 'Copïo Dolen Chwaraewr Mewnblanwyd YouTube'
+  Open in Invidious: 'Agor yn Invidious'
+  Copy Invidious Link: 'Copïo Dolen Invidious'
+  Open Channel in YouTube: 'Agor Sianel yn YouTube'
+  Copy YouTube Channel Link: 'Copïo Dolen Sianel YouTube'
+  Open Channel in Invidious: 'Agor Sianel yn Invidious'
+  Copy Invidious Channel Link: 'Copïo Dolen Sianel Invidious'
   Hide Channel: 'Cuddio Sianel'
   Unhide Channel: 'Dangos Sianel'
   Views: 'Edrychiadau'
   Loop Playlist: 'Ailadrodd Rhestr Chwarae'
-  Shuffle Playlist: ''
-  Reverse Playlist: ''
-  Play Next Video: ''
-  Play Previous Video: ''
-  Pause on Current Video: ''
+  Shuffle Playlist: 'Cymysgu Rhestr Chwarae'
+  Reverse Playlist: 'Gwrthdroi Rhestr Chwarae'
+  Play Next Video: 'Chwarae Fideo Nesaf'
+  Play Previous Video: 'Chwarae Fideo Blaenorol'
+  Pause on Current Video: 'Oedi ar Fideo Cyfredol'
   Watched: 'Wedi gwylio'
   Autoplay: 'Awtochwarae'
-  Starting soon, please refresh the page to check again: ''
+  Starting soon, please refresh the page to check again: 'Yn dechrau''n fuan, adnewyddwch
+    y dudalen i wirio eto'
   # As in a Live Video
-  Premieres on: ''
-  Premieres: ''
+  Premieres on: 'Premières ar'
+  Premieres: 'Premières'
   Upcoming: 'I ddod'
   Live: 'Byw'
   Live Now: 'Yn Fyw'
   Live Chat: 'Sgwrs Byw'
-  Enable Live Chat: ''
-  Live Chat is currently not supported in this build.: ''
-  'Chat is disabled or the Live Stream has ended.': ''
-  Live chat is enabled. Chat messages will appear here once sent.: ''
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
-  Show Super Chat Comment: ''
-  Scroll to Bottom: ''
+  Enable Live Chat: 'Galluogi Sgwrsio Byw'
+  Live Chat is currently not supported in this build.: 'Nid yw Sgwrsio Byw yn cael
+    ei gefnogi yn yr fersiwn hwn ar hyn o bryd.'
+  'Chat is disabled or the Live Stream has ended.': 'Mae Sgwrsio wedi''i analluogi
+    neu mae''r Llif Byw wedi dod i ben.'
+  Live chat is enabled. Chat messages will appear here once sent.: 'Mae sgwrs fyw
+    wedi''i galluogi.  Bydd negeseuon sgwrsio yn ymddangos yma ar ôl eu hanfon.'
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Nid
+    yw Sgwrsio Byw yn cael ei gefnogi gan yr API Invidious ar hyn o bryd.  Mae angen
+    cysylltiad uniongyrchol â YouTube.'
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Nid
+    yw Sgwrsio Byw ar gael ar gyfer y ffrwd hon. Mae''n bosib ei fod wedi''i analluogi
+    gan y llwythwr.'
+  Show Super Chat Comment: 'Dangos Sylw Sgwrsio Uwch'
+  Scroll to Bottom: 'Sgroliwch i''r Gwaelod'
   Download Video: 'Lawrlwytho Fideo'
   video only: 'fideo yn unig'
   audio only: 'sain yn unig'
   Published:
-    Jan: 'Ion'
-    Feb: 'Chw'
-    Mar: 'Maw'
-    Apr: 'Ebr'
-    May: 'Mai'
-    Jun: 'Meh'
-    Jul: 'Gor'
-    Aug: 'Awst'
-    Sep: 'Medi'
-    Oct: 'Hyd'
-    Nov: 'Tach'
-    Dec: 'Rhag'
-    Second: 'Eiliad'
-    Seconds: 'Eiliadau'
-    Minute: 'Munud'
-    Minutes: 'Munudau'
-    Hour: 'Awr'
-    Hours: 'Oriau'
-    Day: 'Diwrnod'
-    Days: 'Diwrnodau'
-    Week: 'Wythnos'
-    Weeks: 'Wythnosau'
-    Month: 'Mis'
-    Months: 'Misoedd'
-    Year: 'Blwyddyn'
-    Years: 'Blynyddoedd'
-    Ago: 'Yn ôl'
-    Upcoming: ''
-    In less than a minute: ''
-  Published on: ''
-  Streamed on: ''
-  Started streaming on: ''
-  Publicationtemplate: ''
+    In less than a minute: 'Mewn llai na munud'
+  Published on: 'Cyhoeddwyd ar'
+  Streamed on: 'Wedi''i ffrydio'
+  Started streaming on: 'Wedi dechrau ffrydio'
   Sponsor Block category:
     sponsor: 'Noddwr'
     intro: 'Cyflwyniad'
     outro: 'Diweddglo'
     self-promotion: 'Hunan-Hyrwyddo'
     interaction: 'Rhyngweithiad'
-    music offtopic: ''
+    music offtopic: 'Music Offtopic'
     recap: 'Crynhoi'
     filler: 'Dwli'
   External Player:
-    OpenInTemplate: ''
+    OpenInTemplate: 'Agor yn {externalPlayer}'
     video: 'fideo'
     playlist: 'rhestr chwarae'
-    OpeningTemplate: ''
-    UnsupportedActionTemplate: ''
+    OpeningTemplate: 'Yn agor {videoOrPlaylist} yn {externalPlayer}...'
+    UnsupportedActionTemplate: 'Nid yw {externalPlayer} yn cefnogi: {action}'
     Unsupported Actions:
-      starting video at offset: ''
-      setting a playback rate: ''
-      opening playlists: ''
-      opening specific video in a playlist (falling back to opening the video): ''
-      reversing playlists: ''
+      starting video at offset: 'dechrau fideo wrth wrthbwyso'
+      setting a playback rate: 'gosod cyfradd chwarae yn ôl'
+      opening playlists: 'agor rhestrau chwarae'
+      opening specific video in a playlist (falling back to opening the video): 'agor
+        fideo penodol mewn rhestr chwarae (gan ddychwelyd i agor y fideo)'
+      reversing playlists: 'gwrthdroi rhestrau chwarae'
       shuffling playlists: ''
       looping playlists: ''
 #& Videos
+  Player:
+    Take Screenshot: Tynnu Llun Sgrin
+  More Options: Rhagor o Ddewisiadau
+  AgeRestricted: Nid oes modd gwylio fideos â chyfyngiad oedran gyda FreeTube gan
+    fod angen mewngofnodi Google a defnyddio cyfrif YouTube a ddilysir yn ôl oedran
+    arnynt.
+  MembersOnly: Nid oes moddr gwylio fideos aelodau-yn-unig gyda FreeTube gan fod angen
+    mewngofnodi Google ac aelodaeth â thâl i sianel yr llwythwr.
+  Unlisted: Heb ei restru
+  IP block: Mae YouTube wedi rhwystro'ch cyfeiriad IP rhag gwylio fideos. Ceisiwch
+    newid i VPN neu ddirprwy arall.
 Videos:
   #& Sort By
   Sort By:
@@ -697,15 +935,14 @@ Playlist:
   #& About
   Playlist: 'Rhestr chwarae'
   View Full Playlist: ''
-  Videos: 'Fideos'
-  View: 'Edrychiad'
-  Views: 'Edrychiadau'
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: ''
+  Sort By:
+    Sort By: Didoli Wrth
+    Custom: Cyfaddas
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -741,7 +978,7 @@ Chapters:
 Mini Player: ''
 Comments:
   Comments: 'Sylwadau'
-  Click to View Comments: ''
+  Click to View Comments: 'Cliciwch i Weld Sylwadau'
   Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Show Comments: 'Dangos Sylwadau'
@@ -804,9 +1041,7 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
-Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
@@ -837,3 +1072,19 @@ Hashtag:
 Yes: 'Ie'
 No: 'Na'
 Ok: 'Iawn'
+Search character limit: Mae'r ymholiad chwilio tu hwnt i {searchCharacterLimit} nod
+Cancel: Diddymu
+Search Listing:
+  Label:
+    Subtitles: Isdeitlau
+    New: Newydd
+    3D: 3D
+    4K: 4K
+    Closed Captions: Capsiynau Caeedig
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+Feed:
+  Feed Last Updated: 'Diweddarwyd llif {feedName} ddiwethaf: {date}'
+  Refresh Feed: Adnewyddu {subscriptionName}
+Close Banner: Cau'r Faner
diff --git a/static/locales/da.yaml b/static/locales/da.yaml
index 1819499a853a5..ea8a04b386a0e 100644
--- a/static/locales/da.yaml
+++ b/static/locales/da.yaml
@@ -39,7 +39,9 @@ Global:
     View Count: 1 visning | {count} visninger
     Video Count: 1 video | {count} videoer
     Channel Count: 1 kanal | {count} kanaler
+    Comment Count: 1 kommentar | {count} kommentarer
   Community: Fællesskab
+  Live: Live
 Version {versionNumber} is now available!  Click for more details: 'Version {versionNumber}
   er nu tilgængelig!  Klik for flere detaljer'
 Download From Site: 'Hent Fra Netsted'
@@ -85,13 +87,22 @@ Search Filters:
 # Sidebar
   There are no more results for this search: Der er ikke flere resultater for denne
     søgning
+  Features:
+    Subtitles: Undertekster
+    HD: HD
+    3D: 3D
+    4K: 4K
+    Live: Live
+    HDR: HDR
+    Features: Funktioner
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Abonnenter'
   Latest Subscriptions: 'Seneste Abonnenter'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Din
-    abonnentliste er i øjeblikket tom. Begynd at tilføje abonnenter for at se dem
-    her.'
+    Abonnementsliste er i øjeblikket tom. Hvis du vil importere dine abonnementer,
+    kan du gå til Dataindstillinger og vælge Importér Abonnementer, eller du kan søge
+    efter en kanal og abonnere på den.'
   'Getting Subscriptions. Please wait.': 'Henter Abonnenter. Vent venligst.'
   Refresh Subscriptions: 'Opdatér Abonnenter'
   Load More Videos: Indlæs Flere Videoer
@@ -114,13 +125,7 @@ Most Popular: 'Mest Populære'
 Playlists: 'Playlister'
 User Playlists:
   Your Playlists: 'Dine Playlister'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Din
-    liste over gemte videoer er tom. Klik på gem-knappen i hjørnet af en video, for
-    at få den optegnet her
-  Playlist Message: Denne side afspejler ikke fuldt funktionelle playlister. Den optegner
-    blot videoer, som du har gemt eller favoriseret. Når arbejdet er færdigt, vil
-    alle videoer her blive flyttet til en 'Favoritter'-playliste.
-  Search bar placeholder: Søg i Playliste
+  Search bar placeholder: Søg efter Playlister
   Empty Search Message: Der er ingen videoer i denne playliste, der passer til din
     søgning
   This playlist currently has no videos.: Denne playliste har i øjeblikket ingen videoer.
@@ -178,14 +183,20 @@ User Playlists:
       You haven't selected any playlist yet.: Du har ikke valgt nogen playliste endnu.
       "{videoCount} video(s) added to 1 playlist": 1 video tilføjet til 1 playliste
         | {videoCount} videoer tilføjet til 1 playliste
-    Added {count} Times: Tilføjet {count} Gang | Tilføjet {count} Gange
+    Added {count} Times: Allerede Tilføjet | Tilføjet {count} Gange
     Save: Gem
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
+      Videoer Bliver Tilføjet'
+    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
+      Videoer Allerede Tilføjet'
   CreatePlaylistPrompt:
     Toast:
       There was an issue with creating the playlist.: Der opstod et problem med at
         oprette denne playliste.
       There is already a playlist with this name. Please pick a different name.: En
         playliste med dette navn eksisterer allerede. Vælg venligst et andet navn.
+      Playlist {playlistName} has been successfully created.: Playlisten {playlistName}
+        blev oprettet.
     New Playlist Name: Ny Playliste Navn
     Create: Opret
   Move Video Down: Flyt Video Ned
@@ -196,15 +207,12 @@ User Playlists:
   Add to Favorites: Føj til {playlistName}
   Remove from Playlist: Fjern fra Playliste
   Playlist Name: Playliste Navn
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Er
-    du sikker på, at du vil fjerne alle sete videoer fra denne playliste? Dette kan
-    ikke fortrydes.
 History:
   # On History Page
   History: 'Historik'
   Watch History: 'Set Historik'
   Your history list is currently empty.: 'Din historikliste er i øjeblikket tom.'
-  Empty Search Message: Der er ingen videoer i din historik som passer til din søgning
+  Empty Search Message: Der er ingen videoer i din historik, som passer til din søgning
   Search bar placeholder: Søg i Historik
 Settings:
   # On Settings Page
@@ -234,8 +242,6 @@ Settings:
       End: 'Slutning'
       Blur: Slør
       Hidden: Skjult
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious-Instans
-      (Standard er https://invidious.snopyta.org)'
     Region for Trending: 'Område for Trending'
         #! List countries
     View all Invidious instance information: Vis al Invidious-instans-information
@@ -253,6 +259,9 @@ Settings:
     Current Invidious Instance: Nuværende Invidious-instans
     No default instance has been set: Ingen standardinstans er angivet
     Set Current Instance as Default: Angiv Nuværende Instans som Standard
+    Auto Load Next Page:
+      Label: Auto-indlæs Næste Side
+      Tooltip: Indlæs flere sider og kommentarer automatisk.
   Theme Settings:
     Theme Settings: 'Temaindstillinger'
     Match Top Bar with Main Color: 'Tilpas Topbjælke til Primær Farve'
@@ -388,17 +397,13 @@ Settings:
     Subscription Settings: 'Abonnementsindstillinger'
     Hide Videos on Watch: 'Skjul Videoer på Se'
     Fetch Feeds from RSS: 'Hent Feeds fra RSS'
-    Manage Subscriptions: 'Abonnementshåndtering'
-    Only Show Latest Video for Each Channel: Vis Kun Seneste Video for Hver Kanal
     Fetch Automatically: Hent Feed Automatisk
+    Confirm Before Unsubscribing: Bekræft Før Afmelding
   Data Settings:
     Data Settings: 'Dataindstillinger'
     Select Import Type: 'Vælg Importtype'
     Select Export Type: 'Vælg Eksporttype'
     Import Subscriptions: 'Importér Abonnementer'
-    Import FreeTube: 'Importér FreeTube'
-    Import YouTube: 'Importér YouTube'
-    Import NewPipe: 'Importér NewPipe'
     Export Subscriptions: 'Eksportér Abonnementer'
     Export FreeTube: 'Eksportér FreeTube'
     Export YouTube: 'Eksportér YouTube'
@@ -426,7 +431,6 @@ Settings:
     Unknown data key: 'Ukendt datanøgle'
     How do I import my subscriptions?: 'Hvordan importerer jeg mine abonnementer?'
     Manage Subscriptions: Abonnementshåndtering
-    Check for Legacy Subscriptions: Søg efter Gamle Abonnementer
     Export Playlists: Eksportér Playlister
     Playlist insufficient data: Utilstrækkelig data for "{playlist}" playliste, springer
       objektet over
@@ -437,32 +441,6 @@ Settings:
       succesfuldt
     History File: Historik-fil
     Playlist File: Playliste-fil
-  Advanced Settings:
-    Advanced Settings: 'Avancerede indstillinger'
-    Enable Debug Mode (Prints data to the console): 'Aktivér fejlretningstilstand
-      (udskriver data til konsollen)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy Adresse (eksempel:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Ved
-      at klikke på "TEST PROXY" -knappen sendes en anmodning til https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Brug Tor / Proxy til API opkald'
-    TEST PROXY: 'PRØVE PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Se offentlige Instances'
-    Clear History:
-      Clear History: 'Ryd historie'
-      # On Click
-      Are you sure you want to delete your history?: 'Er du sikker på, at du vil slette
-        din historik?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Ryd abonnementer'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Er du sikker på, at du
-        vil fjerne alle abonnementer?'
-      #& Yes
-      #& No
 
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: Fejl ved
@@ -575,33 +553,6 @@ About:
   #On About page
   About: 'Om'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Denne
-    copyleftede software er frit licenseret til AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Fundet en fejl? Vil du foreslå en funktion? Vil du hjælpe? Tjek vores GitHub-side.
-    Træk anmodninger velkommen.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Mange
-    tak til de mennesker og projekter, der gør FreeTube muligt!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Vil
-    du chatte? Deltag i vores Element / Matrix Server. Kontroller reglerne inden du
-    tilmelder dig.'
-
-  'Looking for help? Check out our Wiki page.': 'Leder du efter hjælp? Tjek vores
-    Wiki-side.'
-
-  Check out our Firefox extension!: 'Tjek vores Firefox-udvidelse!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Hvis
-    du kan lide at bruge FreeTube, kan du overveje at donere via Liberapay eller via
-    vores Bitcoin adresse.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Seneste FreeTube Nyheder'
-
   Donate: Donér
   these people and projects: disse mennesker og projekter
   FreeTube is made possible by: FreeTube er gjort mulig af
@@ -623,10 +574,9 @@ About:
   Help: Hjælp
   GitHub releases: GitHub-udgivelser
   Downloads / Changelog: Overførsler / Ændringslog
-  View License: Vis Licens
-  Licensed under the AGPLv3: Licenseret under AGPLv3
   Source code: Kildekode
   Beta: Beta
+  Discussions: Diskussioner
 Profile:
   Profile Select: 'Vælg Profil'
   All Channels: 'Alle Kanaler'
@@ -706,6 +656,8 @@ Channel:
     Channel Description: 'Kanalbeskrivelse'
     Featured Channels: 'Fremhævede Kanaler'
     Details: Detaljer
+    Tags:
+      Search for: Søg efter "{tag}"
   Community:
     Hide Answers: Skjul Svar
     This channel currently does not have any posts: Denne kanal har i øjeblikket ingen
@@ -721,7 +673,12 @@ Channel:
   Podcasts:
     This channel does not currently have any podcasts: Denne kanal har i øjeblikket
       ingen podcasts
+    Podcasts: Podcasts
   This channel does not exist: Denne kanal eksisterer ikke
+  Releases:
+    Releases: Udgivelser
+    This channel does not currently have any releases: Denne kanal har i øjeblikket
+      ingen udgivelser
 Video:
   Mark As Watched: 'Markér Som Set'
   Remove From History: 'Fjern Fra Historik'
@@ -757,37 +714,7 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Direkte
     Chat understøttes i øjeblikket ikke med Invidious-APIen.  Direkte forbindelse
     til YouTube kræves.'
-  Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Maj'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Dec'
-    Second: 'Sekund'
-    Seconds: 'Sekunder'
-    Minute: 'Minut'
-    Minutes: 'Minutter'
-    Hour: 'Time'
-    Hours: 'Timer'
-    Day: 'Dag'
-    Days: 'Dage'
-    Week: 'Uge'
-    Weeks: 'Uger'
-    Month: 'Måned'
-    Months: 'Måneder'
-    Year: 'År'
-    Years: 'År'
-    Ago: 'Siden'
-    Upcoming: 'Har premiere'
   Published on: 'Udgivet'
-  Publicationtemplate: '{number} {unit} siden'
 #& Videos
   Copy Invidious Channel Link: Kopiér Invidious Kanal-Link
   Open Channel in Invidious: Åbn Kanal i Invidious
@@ -836,6 +763,15 @@ Video:
   Upcoming: Kommende
   Scroll to Bottom: Rul til Bunden
   Pause on Current Video: Pause på Nuværende Video
+  Player:
+    Stats:
+      Video ID: 'Video-ID: {videoId}'
+      Media Formats: 'Medieformater: {formats}'
+      Resolution: 'Opløsning: {width}x{height}@{frameRate}'
+      Bandwidth: 'Båndbredde: {bandwidth} kbps'
+    Skipped segment: Sprang {segmentCategory} segment over
+    Playback will resume automatically when your connection comes back: Afspilning
+      genoptager automatisk, når din forbindelse vender tilbage.
 Videos:
   #& Sort By
   Sort By:
@@ -846,16 +782,17 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vis Hele Playliste'
-  Videos: 'Videoer'
-  View: 'Visning'
-  Views: 'Visninger'
   Last Updated On: 'Sidst Opdateret'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Playliste
-Toggle Theatre Mode: 'Slå Biograftilstand til/fra'
+  Sort By:
+    DateAddedNewest: Seneste tilføjet først
+    VideoTitleDescending: Titel (Å-A)
+    VideoTitleAscending: Titel (A-Å)
+    Sort By: Sortér Efter
 Change Format:
   Change Media Formats: 'Skift Videoformater'
   Use Dash Formats: 'Brug DASH-Formater'
@@ -917,7 +854,6 @@ Local API Error (Click to copy): 'Lokal API-Fejl (Klik for at kopiere)'
 Invidious API Error (Click to copy): 'Invidious-API-Fejl (Klik for at kopiere)'
 Falling back to Invidious API: 'Falder tilbage til Invidious-API'
 Falling back to Local API: 'Falder tilbage til den lokale API'
-Subscriptions have not yet been implemented: 'Abonnementer er endnu ikke blevet implementerede'
 Loop is now disabled: 'Gentagelse er nu deaktiveret'
 Loop is now enabled: 'Gentagelse er nu aktiveret'
 Shuffle is now disabled: 'Bland er nu deaktiveret'
@@ -973,7 +909,7 @@ Tooltips:
       kan blive angivet her hvis det er nødvendigt.
     DefaultCustomArgumentsTemplate: "(Standard: '{defaultCustomArguments}')"
     Custom External Player Arguments: Alle brugerdefinerede kommandolinjeargumenter,
-      opdelt med semikoloner (';'), du ønsker viderebragt til den eksterne afspiller.
+      du ønsker viderebragt til den eksterne afspiller.
     External Player: 'Valg af ekstern afspiller vil fremvise et ikon, for åbning af
       videoen (playliste hvis understøttet) i den eksterne afspiller, på miniaturebilledet.
       Advarsel: Invidious-indstillinger har ingen effekt på eksterne afspillere.'
@@ -994,8 +930,6 @@ Channels:
   Unsubscribe Prompt: Er du sikker på at du vil afmelde dit abonnement på "{channelName}"?
   Search bar placeholder: Søg Kanaler
   Empty: Din kanalliste er i øjeblikket tom.
-  Unsubscribe: Afmeld
-  Unsubscribed: '{channelName} er fjernet fra dine abonnementer'
 Default Invidious instance has been set to {instance}: Standard Invidious-instans
   er blevet sat til {instance}
 Default Invidious instance has been cleared: Standard Invidious-instans er blevet
@@ -1007,8 +941,6 @@ Downloading failed: Der var et problem med at downloade "{videoTitle}"
 Unknown YouTube url type, cannot be opened in app: Ukendt YouTube URL-type, kan ikke
   åbnes i appen
 Screenshot Error: Skærmbillede mislykkedes. {error}
-Hashtags have not yet been implemented, try again later: Hashtags er ikke implementeret
-  endnu, prøv igen senere
 External link opening has been disabled in the general settings: Åbning af eksterne
   links er slået fra i generelle indstillinger
 Starting download: Starter download af "{videoTitle}"
@@ -1033,3 +965,9 @@ Chapters:
 Age Restricted:
   This video is age restricted: Denne video er aldersbegrænset
   This channel is age restricted: Denne kanal er aldersbegrænset
+Search Listing:
+  Label:
+    Subtitles: Undertekster
+    4K: 4K
+Feed:
+  Refresh Feed: Opdater {subscriptionName}
diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 11e0c250fd380..7f5f4cf07ba8e 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -100,12 +100,13 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: Abos
   Latest Subscriptions: Neueste Abos
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Deine
-    Aboliste ist aktuell leer. Beginne mit dem Hinzufügen von Abos, um sie hier zu
-    sehen.
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Ihre
+    Aboliste ist derzeit leer. Wenn Sie Ihre Abos importieren möchten, können Sie
+    zu den Dateneinstellungen gehen und "Abos importieren" wählen oder Sie können
+    nach einem Kanal suchen und ihn abonnieren.
   'Getting Subscriptions.  Please wait.': Rufe Abonnements ab. Bitte warten.
   Refresh Subscriptions: Abos aktualisieren
-  Getting Subscriptions. Please wait.: Abos werden geholt. Bitte warten.
+  Getting Subscriptions. Please wait.: Abos werden geladen. Bitte warten.
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Dieses
     Profil hat eine große Anzahl von Abos.  RSS zur Vermeidung von Geschwindigkeitsbeschränkungen
     erzwingen
@@ -131,13 +132,6 @@ Most Popular: Am beliebtesten
 Playlists: Wiedergabelisten
 User Playlists:
   Your Playlists: Deine Wiedergabelisten
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Deine
-    gespeicherten Videos sind leer. Klicke auf die Schaltfläche „Speichern“ in der
-    Ecke eines Videos, damit es hier aufgelistet wird
-  Playlist Message: Diese Seite spiegelt nicht die vollständig funktionierenden Wiedergabelisten
-    wider. Sie listet nur Videos auf, die du gespeichert oder favorisiert hast. Wenn
-    die Arbeiten abgeschlossen sind, werden alle Videos, die sich derzeit hier befinden,
-    in eine Wiedergabeliste „Favoriten“ migriert.
   Search bar placeholder: Nach Wiedergabelisten suchen
   Empty Search Message: Es gibt keine Videos in dieser Wiedergabeliste, die deiner
     Suche entsprechen
@@ -197,7 +191,6 @@ User Playlists:
       This playlist does not exist: Diese Wiedergabeliste existiert nicht
       This playlist is now used for quick bookmark: Diese Wiedergabeliste wird jetzt
         für Schnelles Merken genutzt
-      Quick bookmark disabled: 'Schnelles Merken deaktiviert'
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Diese
         Wiedergabeliste wird jetzt für Schnelles Merken genutzt, statt {oldPlaylistName}.
         Klicke hier zum zurücksetzen
@@ -207,6 +200,9 @@ User Playlists:
         {playlistName} ist die neue Wiedergabeliste für schnelle Lesezeichen.
       This playlist is already being used for quick bookmark.: Diese Wiedergabeliste
         wird bereits für schnelle Lesezeichen verwendet.
+      This playlist has a video with a duration error: Diese Wiedergabeliste enthält
+        mindestens ein Video ohne Dauer. Daher wird die Wiedergabeliste so sortiert,
+        als ob die Dauer null wäre.
     Search for Videos: Nach Videos suchen
   AddVideoPrompt:
     N playlists selected: '{playlistCount} ausgewählt'
@@ -241,14 +237,10 @@ User Playlists:
         wurde erfolgreich erstellt.
   Create New Playlist: Neue Wiedergabeliste erstellen
   Remove from Playlist: Aus der Wiedergabeliste entfernen
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Bist
-    du sicher, dass du alle angesehenen Videos aus dieser Wiedergabeliste entfernen
-    möchtest? Dies kann nicht rückgängig gemacht werden.
   Add to Favorites: Hinzufügen zu {playlistName}
   Remove from Favorites: Löschen aus {playlistName}
   Enable Quick Bookmark With This Playlist: Schnelles Merken für diese Wiedergabeliste
     aktivieren
-  Disable Quick Bookmark: Schnelles Merken deaktivieren
   Playlists with Matching Videos: Wiedergabelisten mit passenden Videos
   Quick Bookmark Enabled: Schnelles Lesezeichen aktiviert
   Cannot delete the quick bookmark target playlist.: Die Wiedergabeliste für das schnelle
@@ -264,6 +256,9 @@ User Playlists:
     möchten? Dies kann nicht rückgängig gemacht werden. | Sind Sie sicher, dass Sie
     {playlistItemCount} angesehene Videos aus dieser Wiedergabeliste entfernen möchten?
     Dies kann nicht rückgängig gemacht werden.
+  Export Playlist: Diese Wiedergabeliste exportieren
+  The playlist has been successfully exported: Die Wiedergabeliste wurde erfolgreich
+    exportiert
 History:
   # On History Page
   History: Verlauf
@@ -276,9 +271,9 @@ Settings:
   # On Settings Page
   Settings: Einstellungen
   General Settings:
-    General Settings: Allgemeine Einstellungen
-    Fallback to Non-Preferred Backend on Failure: Falle zu nicht-präferiertem System
-      bei Fehlschlag zurück
+    General Settings: Allgemein
+    Fallback to Non-Preferred Backend on Failure: Bei Ausfall auf nicht bevorzugtes
+      Backend zurückgreifen
     Enable Search Suggestions: Suchvorschläge aktivieren
     Default Landing Page: Standard Startseite
 
@@ -299,11 +294,9 @@ Settings:
       End: Ende
       Hidden: Versteckt
       Blur: Unschärfe
-    'Invidious Instance (Default is https://invidious.snopyta.org)': Invidious-Instanz
-      (Standard ist https://invidious.snopyta.org)
     Region for Trending: Region für Trends
         #! List countries
-    Check for Latest Blog Posts: Nach aktuellsten Blogeinträgen suchen
+    Check for Latest Blog Posts: Nach neuesten Blogeinträgen suchen
     Check for Updates: Auf Aktualisierungen prüfen
     View all Invidious instance information: Alle Informationen zur Invidious-Instanz
       anzeigen
@@ -324,8 +317,10 @@ Settings:
     Auto Load Next Page:
       Label: Nächste Seite automatisch laden
       Tooltip: Zusätzliche Seiten und Kommentare automatisch laden.
+    Open Deep Links In New Window: An FreeTube übergebene URLs in einem neuen Fenster
+      öffnen
   Theme Settings:
-    Theme Settings: Farbschema-Einstellungen
+    Theme Settings: Farbschema
     Match Top Bar with Main Color: Obere Leiste an Hauptfarbe anpassen
     Base Theme:
       Base Theme: Grundlegendes Farbschema
@@ -340,6 +335,8 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarisiert Dunkel
       Solarized Light: Solarisiert Hell
+      Gruvbox Light: Gruvbox Hell
+      Gruvbox Dark: Gruvbox Dunkel
     Main Color Theme:
       Main Color Theme: Hauptfarbe des Farbschemas
       Red: Rot
@@ -387,6 +384,16 @@ Settings:
       Solarized Cyan: Solarisiertes Cyan
       Solarized Violet: Solarisiertes Violett
       Solarized Green: Solarisiertes Grün
+      Gruvbox Dark Green: Gruvbox Dunkelgrün
+      Gruvbox Dark Yellow: Gruvbox Dunkelgelb
+      Gruvbox Dark Purple: Gruvbox Dunkellila
+      Gruvbox Light Red: Gruvbox Hellrot
+      Gruvbox Light Blue: Gruvbox Hellblau
+      Gruvbox Light Purple: Gruvbox Helllila
+      Gruvbox Dark Orange: Gruvbox Dunkelorange
+      Gruvbox Dark Aqua: Gruvbox dunkles Wasser
+      Gruvbox Light Orange: Gruvbox Hellorange
+      Gruvbox Dark Blue: Gruvbox Dunkelblau
     Secondary Color Theme: Sekundäres Farbschema
         #* Main Color Theme
     UI Scale: Skalierung der Benutzeroberfläche
@@ -395,8 +402,7 @@ Settings:
     Hide Side Bar Labels: Seitenleisten-Beschriftungen ausblenden
     Hide FreeTube Header Logo: FreeTube-Titellogo ausblenden
   Player Settings:
-    Player Settings: Videoabspieler-Einstellungen
-    Remember History: Verlauf speichern
+    Player Settings: Videoabspieler
     Play Next Video: Nächstes Video abspielen
     Turn on Subtitles by Default: Untertitel standardmäßig aktivieren
     Autoplay Videos: Videos automatisch abspielen
@@ -423,7 +429,7 @@ Settings:
       4k: 4k
       8k: 8k
     Playlist Next Video Interval: Zeit zwischen automatischer Videowiedergabe
-    Next Video Interval: Intervall bis zum nächsten Video
+    Next Video Interval: Automatischer Wiedergabe-Timer
     Display Play Button In Video Player: Wiedergabetaste im Videoabspieler anzeigen
     Scroll Volume Over Video Player: Lautstärke durch Scrollen auf Video ändern
     Fast-Forward / Rewind Interval: Intervall für schnelles Vor-/Zurückspulen
@@ -448,50 +454,17 @@ Settings:
         Unterordner zu erstellen.
     Enter Fullscreen on Display Rotate: Beim Drehen des Bildschirms zu Vollbild wechseln
     Skip by Scrolling Over Video Player: Überspringen durch Scrollen über den Videoabspieler
+    Autoplay Interruption Timer: Automatische Wiedergabe Unterbrechungs-Timer
   Subscription Settings:
-    Subscription Settings: Abo-Einstellungen
+    Subscription Settings: Abo
     Hide Videos on Watch: Videos bei Wiedergabe ausblenden
-    Subscriptions Export Format:
-      Subscriptions Export Format: Abonnement Exportierformat
-      #& Freetube
-      Newpipe: Newpipe
-      OPML: OPML
-    Manage Subscriptions: Abos verwalten
-    Import Subscriptions: Importiere Abonnements
-    Export Subscriptions: Exportiere Abonnements
-    How do I import my subscriptions?: Wie importiere ich meine Abonnements?
     Fetch Feeds from RSS: Feeds von RSS abrufen
     Fetch Automatically: Feed automatisch abrufen
-    Only Show Latest Video for Each Channel: Nur das neueste Video für jeden Kanal
-      anzeigen
     Confirm Before Unsubscribing: Unbeabsichtigtes Deabonnieren verhindern
-  Advanced Settings:
-    Advanced Settings: Erweiterte Einstellungen
-    Enable Debug Mode (Prints data to the console): Aktiviere Debug-Modus (Konsolenausgabe
-      des Programmes)
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy-Adresse (Beispiel:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': >-
-      Den "TESTE PROXY"-Knopf zu drücken, sendet eine Anfrage an https://ipinfo.io/json
-    Use Tor / Proxy for API calls: Nutze Tor / Proxy für API Aufrufe
-    TEST PROXY: TESTE PROXY
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: Zeige öffentliche Instanzen
-    Clear History:
-      Clear History: Lösche Verlauf
-      # On Click
-      Are you sure you want to delete your history?: Bist du sicher, dass du deinen
-        Verlauf löschen möchtest?
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: Lösche Abonnements
-      # On Click
-      Are you sure you want to remove all subscriptions?: Bist du sicher, dass du
-        deine Abonnements löschen möchtest?
-      #& Yes
-      #& No
 
+    'Limit the number of videos displayed for each channel': Die Anzahl der für jeden
+      Kanal angezeigten Videos begrenzen
+    To: Limitieren auf
   Privacy Settings:
     Watch history has been cleared: Wiedergabeverlauf wurde gelöscht
     Are you sure you want to remove your entire watch history?: Bist du sicher, dass
@@ -503,7 +476,7 @@ Settings:
     Clear Search Cache: Suchcache löschen
     Save Watched Progress: Videofortschritt speichern
     Remember History: Verlauf merken
-    Privacy Settings: Datenschutzeinstellungen
+    Privacy Settings: Datenschutz
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Bist
       du sicher, dass du alle Abos und Profile löschen möchtest?  Diese Aktion kann
       nicht rückgängig gemacht werden.
@@ -541,14 +514,10 @@ Settings:
     Export YouTube: YouTube exportieren
     Export FreeTube: FreeTube exportieren
     Export Subscriptions: Abos exportieren
-    Import NewPipe: Importiere NewPipe
-    Import YouTube: Importiere YouTube
-    Import FreeTube: Importiere FreeTube
     Import Subscriptions: Abos importieren
     Select Export Type: Exporttyp auswählen
     Select Import Type: Importtyp auswählen
-    Data Settings: Dateneinstellungen
-    Check for Legacy Subscriptions: Auf ältere Abos prüfen
+    Data Settings: Daten
     Manage Subscriptions: Abos verwalten
     Export Playlists: Wiedergabelisten exportieren
     Import Playlists: Wiedergabelisten importieren
@@ -579,7 +548,7 @@ Settings:
     Hide Comment Likes: Kommentarbewertungen ausblenden
     Hide Video Likes And Dislikes: Videobewertungen ausblenden
     Hide Video Views: Video-Aufrufe ausblenden
-    Distraction Free Settings: Einstellungen für ablenkungsfreien Modus
+    Distraction Free Settings: Ablenkungsfreier Modus
     Hide Active Subscriptions: Aktive Abos ausblenden
     Hide Playlists: Wiedergabelisten ausblenden
     Hide Comments: Kommentare ausblenden
@@ -592,9 +561,9 @@ Settings:
     Hide Channels Placeholder: Kanal-ID
     Display Titles Without Excessive Capitalisation: Titel ohne übermäßige Großschreibung
       und Zeichensetzung anzeigen
-    Hide Channel Playlists: Kanal-Wiedergabelisten ausblenden
-    Hide Channel Community: Kanal-Gemeinschaft ausblenden
-    Hide Channel Shorts: Kanal-Kurzvideos ausblenden
+    Hide Channel Playlists: 'Tab „Wiedergabelisten“ des Kanals ausblenden'
+    Hide Channel Community: 'Tab „Gemeinschaft“ des Kanals ausblenden'
+    Hide Channel Shorts: 'Tab „Kurzvideos“ des Kanals ausblenden'
     Hide Featured Channels: Hervorgehobene Kanäle ausblenden
     Sections:
       Side Bar: Seitenleiste
@@ -602,12 +571,11 @@ Settings:
       General: Allgemein
       Watch Page: Seite beobachten
       Subscriptions Page: Abos-Seite
-    Hide Channel Podcasts: Kanal-Podcasts ausblenden
+    Hide Channel Podcasts: 'Tab „Podcasts“ des Kanals ausblenden'
     Hide Subscriptions Videos: Abo-Videos ausblenden
     Hide Subscriptions Shorts: Abo-Kurzvideos ausblenden
-    Hide Channel Releases: Kanalveröffentlichungen ausblenden
-    Hide Subscriptions Live: Live der Abos ausblenden
-    Blur Thumbnails: Vorschaubilder unscharf machen
+    Hide Channel Releases: 'Tab „Veröffentlichungen“ des Kanals ausblenden'
+    Hide Subscriptions Live: Abo-Live ausblenden
     Hide Profile Pictures in Comments: Profilbilder in den Kommentaren ausblenden
     Hide Subscriptions Community: Abo-Gemeinschaft ausblenden
     Hide Channels Invalid: Kanal-ID war ungültig
@@ -616,10 +584,12 @@ Settings:
     Hide Channels Already Exists: Kanal-ID bereits vorhanden
     Hide Channels API Error: Fehler beim Abrufen von Benutzern mit der bereitgestellten
       ID. Bitte überprüfen Sie erneut, ob der Ausweis korrekt ist.
-    Hide Videos and Playlists Containing Text: Videos und Playlisten verstecken, die
-      Text enthalten
-    Hide Videos and Playlists Containing Text Placeholder: Wort, Teil eines Wortes
-      oder Satz
+    Hide Videos and Playlists Containing Text: Videos und Wiedergabelisten, die Text
+      enthalten, ausblenden
+    Hide Videos and Playlists Containing Text Placeholder: Wort, Wortfragment oder
+      Phrase
+    Hide Channel Home: 'Tab „Startseite“ des Kanals ausblenden'
+    Show Added Items: Hinzugefügte Elemente anzeigen
   The app needs to restart for changes to take effect. Restart and apply change?: Die
     App muss neu gestartet werden, damit die Änderungen wirksam werden. Neu starten
     und Änderung übernehmen?
@@ -638,14 +608,19 @@ Settings:
     Proxy Host: Proxy-Host
     Proxy Protocol: Proxy-Protokoll
     Enable Tor / Proxy: Tor / Proxy aktivieren
-    Proxy Settings: Proxy-Einstellungen
+    Proxy Settings: Proxy
+    Proxy Warning: FreeTube hat keinen eingebauten Proxy, kann aber mit einem externen
+      Proxy verbunden werden, wie z. B. einem, der auf deinem Rechner läuft wie Tor,
+      oder einem externen Proxy wie einem SOCKS5-Proxy, der von einigen VPNs bereitgestellt
+      wird. Falls aktiviert, stelle sicher, dass dein Proxy/Tor richtig konfiguriert
+      ist, oder FreeTube wird keine Daten abrufen können.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Benachrichtigen, wenn ein Sponsorsegment
       übersprungen wird
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock-API-URL
       (Standard ist https://sponsor.ajay.app)
     Enable SponsorBlock: SponsorBlock aktivieren
-    SponsorBlock Settings: SponsorBlock-Einstellungen
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Option überspringen
       Auto Skip: Automatisch überspringen
@@ -654,34 +629,34 @@ Settings:
       Do Nothing: Nichts tun
     Category Color: Kategoriefarbe
     UseDeArrowTitles: DeArrow-Videotitel verwenden
-    UseDeArrowThumbnails: Nutze DeArrow für Thumbnails
+    UseDeArrowThumbnails: DeArrow für Miniaturansichten verwenden
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': DeArrow
       Thumbnail Generator API URL (Standard ist https://dearrow-thumb.ajay.app)
   External Player Settings:
     Ignore Unsupported Action Warnings: Warnungen vor nicht unterstützten Aktionen
       ignorieren
     External Player: Externer Abspieler
-    External Player Settings: Einstellungen für externe Abspieler
+    External Player Settings: Externe Abspieler
     Custom External Player Executable: Benutzerdefinierte ausführbare Datei des Abspielers
     Custom External Player Arguments: Benutzerdefinierte Argumente für externe Abspieler
     Players:
       None:
         Name: Keine
-    Ignore Default Arguments: Ignoriere Standardargument
+    Ignore Default Arguments: Standardargumente ignorieren
   Download Settings:
-    Download Settings: Herunterladen-Einstellungen
+    Download Settings: Herunterladen
     Ask Download Path: Nach dem Herunterladepfad fragen
     Choose Path: Pfad auswählen
     Download Behavior: Herunterladeverhalten
     Download in app: In der App herunterladen
     Open in web browser: Im Webbrowser öffnen
   Parental Control Settings:
-    Parental Control Settings: Einstellungen der Kindersicherung
+    Parental Control Settings: Kindersicherung
     Hide Unsubscribe Button: Schaltfläche zum Entfernen des Abos ausblenden
     Show Family Friendly Only: Nur familienfreundliche Inhalte anzeigen
     Hide Search Bar: Suchleiste ausblenden
   Experimental Settings:
-    Experimental Settings: Experimentelle Einstellungen
+    Experimental Settings: Experimentell
     Warning: Diese Einstellungen sind experimentell und können zu Abstürzen führen,
       wenn sie aktiviert sind. Es wird dringend empfohlen, Sicherungskopien zu erstellen.
       Verwendung auf eigene Gefahr!
@@ -693,64 +668,25 @@ Settings:
     Unlock: Entsperren
   Password Settings:
     Remove Password: Passwort entfernen
-    Password Settings: Passworteinstellungen
+    Password Settings: Passwort
     Set Password To Prevent Access: Passwort festlegen, um den Zugriff auf die Einstellungen
       zu verhindern
     Set Password: Passwort festlegen
-  Expand All Settings Sections: Alle Einstellungsabschnitte aufklappen
-  Sort Settings Sections (A-Z): Einstellungsbereiche sortieren (A-Z)
+  Sort Settings Sections (A-Z): Einstellungsabschnitte sortieren (A-Z)
+  Return to Settings Menu: Zurück zum Einstellungsmenü
 About:
   #On About page
   About: Über
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0..': >-
-    Dieses Programm is unter der freien Lizent AGPL-3.0 veröffentlicht.
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Einen Programmfehler gefunden? Eine neue Funktion vorschlagen? Mithelfen? Schau
-    auf unserer GitHub-Seite vorbei. Änderungsvorschläge am Programmquelltext sind
-    dort willkommen.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: >-
-    Vielen Dank an all die Personen und Projekte die FreeTube möglich machen!
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': >-
-    Lust zu chatten? Tritt unserem Element- / Matrix-Server bei. Bitte lese zuvor
-    aber noch die Regeln.
-
-  'Looking for help? Check out our Wiki page.': Suchst Du nach Hilfe? Schaue auf unseren
-    Wiki vorbei.
-
-  Check out our Firefox extension!: Installiere auch unsere Firefox-Erweiterung!
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': >-
-    Falls du FreeTube gerne nutzt, erwäge doch das Spenden über Liberapay oder unsere
-    Bitcoinadresse.
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: Aktuellsten FreeTube-Neuigkeiten
-
 #On Channel Page
-  This software is FOSS and released under the GNU Affero General Public License v3.0.: Diese
-    freie Software ist unter der AGPL-3.0 lizenziert.
-  Translate via Weblate: Auf Weblate übersetzen
   Website: Website
-  Source Code: Quellcode
-  Release Notes: Versionshinweise
   Blog: Blog
   Credits: Danksagungen
   FAQ: Häufig gestellte Fragen
-  Wiki: Wiki
-  Report an Issue: Fehler melden
-  Channel Rules: Kanalregeln
   Email: E-Mail
-  License: Lizenz
   Beta: Beta
   Donate: Spenden
-  Useful Links: Nützliche Links
   Help: Hilfe
-  Contact: Kontakt
   these people and projects: diesen Menschen und Projekten
   FreeTube is made possible by: FreeTube wird ermöglicht von
   Translate: Übersetzen
@@ -765,8 +701,6 @@ About:
   FreeTube Wiki: FreeTube-Wiki
   GitHub releases: GitHub-Veröffentlichungen
   Downloads / Changelog: Downloads / Änderungsprotokoll
-  View License: Lizenz ansehen
-  Licensed under the AGPLv3: Lizenziert unter der AGPLv3
   Source code: Quellcode
   Discussions: Diskussionen
   Licensed under the: Lizenziert unter der
@@ -839,6 +773,9 @@ Channel:
     Releases: Veröffentlichungen
     This channel does not currently have any releases: Dieser Kanal hat derzeit keine
       Veröffentlichungen
+  Home:
+    Home: Startseite
+    View Playlist: Wiedergabeliste anzeigen
 Video:
   Open in YouTube: In YouTube öffnen
   Copy YouTube Link: YouTube-Link kopieren
@@ -863,38 +800,8 @@ Video:
     wird von der Invidious-API derzeit nicht unterstützt. Eine direkte Verbindung
     zu YouTube ist erforderlich.
   Published:
-    Jan: Jan
-    Feb: Feb
-    Mar: Mär
-    Apr: Apr
-    May: Mai
-    Jun: Jun
-    Jul: Jul
-    Aug: Aug
-    Sep: Sep
-    Oct: Okt
-    Nov: Nov
-    Dec: Dez
-    Second: Sekunde
-    Seconds: Sekunden
-    Hour: Stunde
-    Hours: Stunden
-    Day: Tag
-    Days: Tage
-    Week: Woche
-    Weeks: Wochen
-    Month: Monat
-    Months: Monate
-    Year: Jahr
-    Years: Jahre
-    Ago: vor
-    Upcoming: Premiere am
-    Minutes: Minuten
-    Minute: Minute
-    Less than a minute: Weniger als einer Minute
     In less than a minute: In weniger als einer Minute
   Published on: Veröffentlicht am
-  Publicationtemplate: vor {number} {unit}
 
 #& Videos
   Video has been removed from your history: Video wurde aus deinem Verlauf entfernt
@@ -982,11 +889,23 @@ Video:
       CodecsVideoAudioNoItags: 'Codecs: {videoCodec} / {audioCodec}'
     You appear to be offline: Sie scheinen offline zu sein.
     Playback will resume automatically when your connection comes back: Die Wiedergabe
-      wird automatisch wieder aufgenommen, wenn Ihre Verbindung zurückkommt.
+      wird automatisch fortgesetzt, wenn deine Verbindung wiederhergestellt ist.
     Skipped segment: 'Segment {segmentCategory} übersprungen'
     TranslatedCaptionTemplate: '{language} (übersetzt von {originalLanguage})'
     Exit Full Window: Vollständiges Fenster beenden
     Hide Stats: Statistiken ausblenden
+  IP block: YouTube hat Ihre IP-Adresse für die Videowiedergabe gesperrt. Bitte versuchen
+    Sie, zu einem anderen VPN oder Proxy zu wechseln.
+  Unlisted: Nicht gelistet
+  MembersOnly: Videos, die nur für Mitglieder bestimmt sind, können mit FreeTube nicht
+    angesehen werden, da sie einen Google-Login und eine kostenpflichtige Mitgliedschaft
+    im Kanal des Hochladers erfordern.
+  AgeRestricted: Videos mit Altersbeschränkung können mit FreeTube nicht angesehen
+    werden, da sie eine Google-Anmeldung und die Verwendung eines altersgeprüften
+    YouTube-Kontos erfordern.
+  DeArrow:
+    Show Modified Details: Geänderte Details anzeigen
+    Show Original Details: Originaldetails anzeigen
 Videos:
   #& Sort By
   Sort By:
@@ -997,9 +916,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: Vollständige Wiedergabeliste ansehen
-  Videos: Videos
-  View: Aufruf
-  Views: Aufrufe
   Last Updated On: Zuletzt aktualisiert am
   Playlist: Wiedergabeliste
 
@@ -1015,7 +931,8 @@ Playlist:
     AuthorDescending: Autor (Z-A)
     VideoTitleAscending: Titel (A-Z)
     Custom: Benutzerdefiniert
-Toggle Theatre Mode: Kinomodus umschalten
+    VideoDurationAscending: Dauer (Kürzeste zuerst)
+    VideoDurationDescending: Dauer (Längste zuerst)
 Change Format:
   Change Media Formats: Medienformate ändern
   Use Dash Formats: DASH-Formate verwenden
@@ -1088,7 +1005,6 @@ Falling back to Local API: Rückgriff auf lokale API
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Dieses
   Video ist aufgrund fehlender Formate nicht verfügbar. Zugriffsbeschränkungen im
   Land kann dafür der Grund sein.
-Subscriptions have not yet been implemented: Abos sind noch nicht implementiert
 Loop is now disabled: Wiederholung ist jetzt deaktiviert
 Loop is now enabled: Wiederholung ist jetzt aktiviert
 Shuffle is now disabled: Zufallswiedergabe ist jetzt deaktiviert
@@ -1144,7 +1060,7 @@ Profile:
   Subscription List: Abo-Liste
   Profile Select: Profilauswahl
   Profile Filter: Profilfilter
-  Profile Settings: Profileinstellungen
+  Profile Settings: Profil
   Toggle Profile List: Profilliste umschalten
   Profile Name: Profilname
   Edit Profile Name: Profilname bearbeiten
@@ -1175,6 +1091,9 @@ Tooltips:
     External Link Handling: "Wähle das Standardverhalten, wenn ein Link angeklickt
       wird, der nicht in FreeTube geöffnet werden kann.\nStandardmäßig wird FreeTube
       den angeklickten Link in deinem Standardbrowser öffnen.\n"
+    Open Deep Links In New Window: URLs die an FreeTube übergeben werden, z. B. durch
+      Redirect-Browser-Erweiterungen oder Befehlszeilenargumente, werden in einem
+      neuen Fenster geöffnet.
   Subscription Settings:
     Fetch Feeds from RSS: Wenn aktiviert, verwendet FreeTube RSS anstelle der Standardmethode,
       um deinen Abo-Feed abzurufen. RSS ist schneller und verhindert die IP-Blockierung,
@@ -1199,8 +1118,7 @@ Tooltips:
       zu springen, MPV-Stil.
   External Player Settings:
     Custom External Player Arguments: Alle benutzerdefinierten Befehlszeilenargumente,
-      getrennt durch Semikolon (';'), die an den externen Abspieler übergeben werden
-      sollen.
+      die an den externen Abspieler übergeben werden sollen.
     Ignore Warnings: Warnungen unterdrücken, wenn der aktuelle externe Abspieler die
       aktuelle Aktion nicht unterstützt (z. B. das Umkehren von Wiedergabelisten usw.).
     Custom External Player Executable: Standardmäßig wird FreeTube annehmen, dass
@@ -1234,14 +1152,13 @@ Tooltips:
   SponsorBlock Settings:
     UseDeArrowTitles: Videotitel durch von Benutzern eingereichte Titel von DeArrow
       ersetzen.
-    UseDeArrowThumbnails: Ersetze Video-Thumbnails mit Thumbnails von DeArrow.
+    UseDeArrowThumbnails: Video-Miniaturansichten durch Miniaturansichten von DeArrow
+      ersetzen.
 Playing Next Video Interval: Nächstes Video wird sofort abgespielt. Zum Abbrechen
   klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen
   klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen
   klicken.
 More: Mehr
-Hashtags have not yet been implemented, try again later: Hashtags wurden noch nicht
-  implementiert, bitte versuche es später noch einmal
 Unknown YouTube url type, cannot be opened in app: Unbekannter YouTube-URL-Typ, kann
   in der App nicht geöffnet werden
 Open New Window: Neues Fenster öffnen
@@ -1265,10 +1182,8 @@ Channels:
   Channels: Kanäle
   Title: Kanal-Liste
   Search bar placeholder: Kanäle durchsuchen
-  Count: '{number} Kanal/Kanäle gefunden'
+  Count: '{number} Kanal/Kanäle gefunden.'
   Empty: Deine Kanal-Liste ist derzeit leer.
-  Unsubscribe: Abo entfernen
-  Unsubscribed: '{channelName} wurde aus deinen Abos entfernt'
   Unsubscribe Prompt: Bist du sicher, dass du dein Abo für „{channelName}“ entfernen
     willst?
 Clipboard:
@@ -1281,6 +1196,7 @@ Chapters:
     aktuelles Kapitel: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Kapitelliste ausgeblendet,
     aktuelles Kapitel: {chapterName}'
+  Key Moments: Schlüsselmomente
 Preferences: Einstellungen
 Ok: OK
 Hashtag:
@@ -1311,12 +1227,33 @@ Feed:
 Yes, Delete: Ja, löschen
 Cancel: Abbrechen
 Search character limit: Die Suche ist länger als das {searchCharacterLimit}-Zeichen-Limit
-Yes, Restart: Ja, neustarten
+Yes, Restart: Ja, neu starten
 Yes, Open Link: Ja, Link öffnen
 Search Listing:
   Label:
     4K: 4K
     Closed Captions: Geschlossene Untertitel
     Subtitles: Untertitel
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Neu
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Das Öffnen einer potenziell unsicheren
   URL wurde blockiert: „{url}“.'
+Keys:
+  arrowdown: Pfeil nach unten
+  arrowleft: Pfeil nach links
+  arrowup: Pfeil nach oben
+  ctrl: Strg
+  alt: Alt
+  arrowright: Pfeil nach rechts
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Right-click or hold to see history: Mit der rechten Maustaste klicken oder halten,
+  um den Verlauf zu sehen
+Autoplay Interruption Timer: Automatische Wiedergabe wurde aufgrund von {autoplayInterruptionIntervalHours}
+  Stunden Inaktivität abgebrochen
+Description:
+  Collapse Description: Weniger anzeigen
+  Expand Description: '...mehr'
diff --git a/static/locales/el.yaml b/static/locales/el.yaml
index 03affc214f6dc..5e57bc21595ce 100644
--- a/static/locales/el.yaml
+++ b/static/locales/el.yaml
@@ -116,13 +116,6 @@ Most Popular: 'Δημοφιλέστερα'
 Playlists: 'Λίστες αναπαραγωγής'
 User Playlists:
   Your Playlists: 'Προσωπικές Λίστες αναπαραγωγής'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Τα
-    αποθηκευμένα βίντεο σας είναι κενά. Κάντε κλικ στο κουμπί αποθήκευσης στη γωνία
-    ενός βίντεο για να το εισάγετε εδώ
-  Playlist Message: Αυτή η σελίδα δεν αντικατοπτρίζει πλήρως λειτουργικές λίστες αναπαραγωγής.
-    Παραθέτει μόνο βίντεο που έχετε αποθηκεύσει ή προσθέσει στα αγαπημένα. Όταν ολοκληρωθεί
-    η εργασία, όλα τα βίντεο που βρίσκονται εδώ θα μεταφερθούν στη λίστα αναπαραγωγής
-    «Αγαπημένα».
   Search bar placeholder: Αναζήτηση στη λίστα αναπαραγωγής
   Empty Search Message: Δεν υπάρχουν βίντεο σε αυτήν τη λίστα αναπαραγωγής που να
     ταιριάζουν με την αναζήτησή σας
@@ -161,8 +154,6 @@ Settings:
       End: 'Τέλος'
       Hidden: Κρυμμένο
       Blur: 'Θάμπωμα'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Διακομιστής
-      Invidious (προεπιλογή https://invidious.snopyta.org)'
     Region for Trending: 'Περιοχή που καθορίζει την καρτέλα των τάσεων'
         #! List countries
     Check for Latest Blog Posts: Ελέγξτε για τις τελευταίες δημοσιεύσεις ιστολογίου
@@ -323,18 +314,12 @@ Settings:
     Subscription Settings: 'Ρυθμίσεις Συνδρομών'
     Hide Videos on Watch: 'Απόκρυψη των βίντεο κατά την αναπαραγωγή'
     Fetch Feeds from RSS: 'Φόρτωση τροφοδοσίας RSS'
-    Manage Subscriptions: 'Διαχείριση Εγγραφών'
     Fetch Automatically: Αυτόματη Λήψη Τροφοδοσίας
-    Only Show Latest Video for Each Channel: Εμφάνιση μόνο του τελευταίου βίντεο για
-      κάθε κανάλι
   Data Settings:
     Data Settings: 'Ρυθμίσεις Δεδομένων'
     Select Import Type: 'Επιλογή Τρόπου Εισαγωγής'
     Select Export Type: 'Επιλογή Τρόπου Εξαγωγής'
     Import Subscriptions: 'Εισαγωγή Συνδρομών'
-    Import FreeTube: 'Εισαγωγή από FreeTube'
-    Import YouTube: 'Εισαγωγή από το Youtube'
-    Import NewPipe: 'Εισαγωγή από το NewPipe'
     Export Subscriptions: 'Εξαγωγή Συνδρομών'
     Export FreeTube: 'Εξαγωγή για FreeTube'
     Export YouTube: 'Εξαγωγή για Youtube'
@@ -363,7 +348,6 @@ Settings:
     Unable to write file: 'Αδύνατη εγγραφή του αρχείου'
     Unknown data key: 'Άγνωστο κλειδί δεδομένων'
     How do I import my subscriptions?: 'Πως γίνεται η εισαγωγή των συνδρομών μου;'
-    Check for Legacy Subscriptions: Ελέγξτε για παλαιότερες εγγραφές
     Manage Subscriptions: Διαχείριση συνδρομών
     Import Playlists: Εισαγωγή λιστών αναπαραγωγής
     Export Playlists: Εξαγωγή Λιστών Αναπαραγωγής
@@ -376,33 +360,6 @@ Settings:
     Subscription File: Αρχείο Συνδρομής
     History File: Αρχείο Ιστορικού
     Playlist File: Αρχείο Λίστας Αναπαραγωγής
-  Advanced Settings:
-    Advanced Settings: 'Ρυθμίσεις για προχωρημένους'
-    Enable Debug Mode (Prints data to the console): 'Ενεργοποίηση λειτουργίας εντοπισμού
-      σφαλμάτων (Εκτυπώνει τα δεδομένα στην κονσόλα)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Διεύθυνση διακομιστή μεσολάβησης
-      (παράδειγμα: SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Κάνοντας
-      κλικ στο κουμπί "Δοκιμή διακομιστή μεσολάβησης" θα στείλετε μια αίτηση στο https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Χρήση Tor / Διακομιστής μεσολάβησης για κλήσεις
-      σε διεπαφή προγραμματισμού εφαρμογών (API)'
-    TEST PROXY: 'Δοκιμή Διακομιστή Μεσολάβησης'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Δείτε δημόσιους μεσολαβητές'
-    Clear History:
-      Clear History: 'Εκκαθάριση Ιστορικού'
-      # On Click
-      Are you sure you want to delete your history?: 'Είστε βέβαιοι πως θέλετε να
-        γίνει διαγραφή του ιστορικού σας ;'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Εκκαθάριση Συνδρομών/Εγγραφών'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Είστε βέβαιοι ότι θέλετε
-        να γίνει διαγραφή όλων των Συνδρομών/Εγγραφών;'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Distraction Free Settings: Ρυθμίσεις απόσπασης προσοχής
@@ -441,7 +398,6 @@ Settings:
     Hide Subscriptions Videos: Απόκρυψη Βίντεο Συνδρομών
     Hide Subscriptions Shorts: Απόκρυψη Shorts Συνδρομών
     Hide Subscriptions Live: Απόκρυψη Live Συνδρομών
-    Blur Thumbnails: Θάμπωμα Μικρογραφιών
     Hide Profile Pictures in Comments: Απόκρυψη Εικόνων Προφίλ στα Σχόλια
     Hide Subscriptions Community: Απόκρυψη Συνδρομών Κοινότητας
     Hide Channels Invalid: Το αναγνωριστικό καναλιού που δόθηκε δεν ήταν έγκυρο
@@ -526,41 +482,10 @@ Settings:
     Show Family Friendly Only: Εμφάνιση Μόνο Για Οικογένειες
     Hide Unsubscribe Button: Απόκρυψη Κουμπιού Απεγγραφής
     Hide Search Bar: Απόκρυψη Μπάρας Αναζήτησης
-  Expand All Settings Sections: Αναπτύξτε όλες τις ενότητες ρυθμίσεων
 About:
   #On About page
   About: 'Σχετικά με'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Αυτό
-    το ανοιχτό λογισμικό έχει άδεια χρήσης βάσει του AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Εντοπίσατε κάποιο σφάλμα ή μήπως θέλετε να προτείνετε κάποια περαιτέρω λειτουργία;
-    Θέλετε να συμβάλετε στο έργο μας; Ρίξτε μία ματιά στη σελίδα μας στο Github. Τα
-    αιτήματα για Pull Request είναι ευπρόσδεκτα.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Ένα
-    μεγάλο ευχαριστώ σε όλους τους ανθρώπους και τα έργα, που καθιστούν τη λειτουργία
-    του FreeTube εφικτή!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Θέλετε
-    μήπως να συζητήσετε; Μπορείτε να μας βρείτε στον δικό μας Element/Matrix Server.
-    Παρακαλώ ελέγξτε τους υπάρχοντες κανόνες πριν από την εγγραφή σας.'
-
-  'Looking for help? Check out our Wiki page.': 'Ψάχνετε για βοήθεια; Ελέγξτε την
-    σελίδα μας στο Wiki.'
-
-  Check out our Firefox extension!: 'Εγκαταστήστε την επέκταση μας για τον φυλλομετρητή
-    FIREFOX!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Εάν
-    σας αρέσει να χρησιμοποιείτε την εφαρμογή FreeTube, σκεφτείτε να κάνετε μία δωρεά
-    μέσω του Liberapay ή μέσω της διεύθυνσης Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Τελευταία νέα που αφορούν το FreeTube'
-
   Donate: Δωρεά
   these people and projects: αυτούς τους ανθρώπους και τα έργα
   FreeTube is made possible by: Το FreeTube καθίσταται δυνατό από
@@ -582,8 +507,6 @@ About:
   Help: Βοήθεια
   GitHub releases: Κυκλοφορίες GitHub
   Downloads / Changelog: Λήψεις / Αρχείο καταγραφής αλλαγών
-  View License: Προβολή άδειας
-  Licensed under the AGPLv3: Με άδεια βάσει του AGPLv3
   Source code: Πηγαίος κώδικας
   Beta: Βήτα
   Discussions: Συζητήσεις
@@ -741,37 +664,8 @@ Video:
     ζωντανή συνομιλία δεν υποστηρίζεται προς το παρόν με το Invidious API. Απαιτείται
     άμεση σύνδεση με το YouTube.'
   Published:
-    Jan: 'Ιαν'
-    Feb: 'Φεβ'
-    Mar: 'Μαρ'
-    Apr: 'Απρ'
-    May: 'Μάιος'
-    Jun: 'Ιουν'
-    Jul: 'Ιουλ'
-    Aug: 'Αυγ'
-    Sep: 'Σεπ'
-    Oct: 'Οκτ'
-    Nov: 'Νοε'
-    Dec: 'Δεκ'
-    Second: 'Δευτερόλεπτο'
-    Seconds: 'Δευτερόλεπτα'
-    Minute: 'Λεπτό'
-    Minutes: 'Λεπτά'
-    Hour: 'Ώρα'
-    Hours: 'Ώρες'
-    Day: 'Ημέρα'
-    Days: 'Ημέρες'
-    Week: 'Εβδομάδα'
-    Weeks: 'Εβδομάδες'
-    Month: 'Μήνας'
-    Months: 'Μήνες'
-    Year: 'Έτος'
-    Years: 'Χρόνια'
-    Ago: 'Πριν'
-    Upcoming: 'Κάνει πρεμιέρα στις'
     In less than a minute: Σε λιγότερο από ένα λεπτό
   Published on: 'Δημοσιεύθηκε στις'
-  Publicationtemplate: 'δημοσιεύθηκε πριν από {number} {unit}'
 #& Videos
   Starting soon, please refresh the page to check again: Έναρξη σύντομα, παρακαλούμε
     κάντε ανανέωση της σελίδας για επανέλεγχο
@@ -834,16 +728,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Προβολή πλήρους λίστας αναπαραγωγής'
-  Videos: 'Βίντεο'
-  View: 'Προβολή'
-  Views: 'Προβολές'
   Last Updated On: 'Τελευταία ενημέρωση στις'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Λίστα αναπαραγωγής
-Toggle Theatre Mode: 'Εναλλαγή λειτουργίας θεάτρου'
 Change Format:
   Change Media Formats: 'Αλλαγή μορφής του βίντεο'
   Use Dash Formats: 'Χρησιμοποίηση μορφών Dash'
@@ -912,7 +802,6 @@ Invidious API Error (Click to copy): 'Σφάλμα Διεπαφής προγρα
 Falling back to Invidious API: 'Επιστροφή στο Invidious API'
 Falling back to Local API: 'Επιστροφή στη τοπική Διεπαφή προγραμματισμού εφαρμογής
   (API)'
-Subscriptions have not yet been implemented: 'Οι συνδρομές δεν έχουν ακόμη υλοποιηθεί'
 Loop is now disabled: 'Η επανάληψη είναι πλέον απενεργοποιημένη'
 Loop is now enabled: 'Η επανάληψη έχει ενεργοποιηθεί'
 Shuffle is now disabled: 'Η τυχαία αναπαραγωγή είναι πλέον απενεργοποιημένη'
@@ -988,8 +877,7 @@ Tooltips:
       ρυθμίσεις δεν επηρεάζουν τις εξωτερικές συσκευές αναπαραγωγής.
     DefaultCustomArgumentsTemplate: "(Προεπιλογή: '{defaultCustomArguments}')"
     Custom External Player Arguments: Τυχόν προσαρμοσμένα ορίσματα γραμμής εντολών,
-      διαχωρισμένα με ερωτηματικά (';'), που θέλετε να μεταβιβαστούν στο εξωτερικό
-      πρόγραμμα αναπαραγωγής.
+      που θέλετε να μεταβιβαστούν στο εξωτερικό πρόγραμμα αναπαραγωγής.
   Experimental Settings:
     Replace HTTP Cache: Απενεργοποιεί το Electron's disk-based HTTP cache και ενεργοποιεί
       μια προσαρμοσμένη προσωρινή μνήμη εικόνων στη μνήμη. Θα οδηγήσει σε αυξημένη
@@ -1010,8 +898,6 @@ Playing Next Video Interval: Αναπαραγωγή επόμενου βίντε
   ακύρωση. | Αναπαραγωγή επόμενου βίντεο σε {nextVideoInterval} δευτερόλεπτα. Κάντε
   κλικ για ακύρωση.
 More: Περισσότερα
-Hashtags have not yet been implemented, try again later: Τα Hashtags δεν έχουν ακόμη
-  εφαρμοστεί, δοκιμάστε ξανά αργότερα
 Unknown YouTube url type, cannot be opened in app: Άγνωστος τύπος διεύθυνσης URL YouTube,
   δεν είναι δυνατό να ανοίξει στην εφαρμογή
 Search Bar:
@@ -1031,10 +917,8 @@ Channels:
   Channels: Κανάλια
   Title: Λίστα Καναλιών
   Search bar placeholder: Αναζήτηση Καναλιών
-  Unsubscribe: Απεγγραφή
   Count: '{number} κανάλι(α) βρέθηκαν.'
   Empty: Η λίστα καναλιών σας είναι άδεια.
-  Unsubscribed: '{channelName} αφαιρέθηκε από τις Συνδρομές σας'
   Unsubscribe Prompt: Θέλετε σίγουρα να απεγγραφείτε από το "{channelName}"?
 New Window: Νέο Παράθυρο
 Screenshot Error: 'Λήψη στιγμιότυπου απέτυχε. {error}'
diff --git a/static/locales/en-GB.yaml b/static/locales/en-GB.yaml
index 0e21909dd26f0..edb3eb0de337e 100644
--- a/static/locales/en-GB.yaml
+++ b/static/locales/en-GB.yaml
@@ -107,7 +107,9 @@ Subscriptions:
   Subscriptions: 'Subscriptions'
   Latest Subscriptions: 'Latest subscriptions'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Your
-    Subscription list is currently empty. Start adding subscriptions to see them here.'
+    Subscription list is currently empty. If you want to import your subscriptions
+    you can go to Data Settings and select Import Subscriptions or you can search
+    for a channel and subscribe to them.'
   'Getting Subscriptions. Please wait.': 'Getting Subscriptions. Please wait.'
   Refresh Subscriptions: 'Refresh Subscriptions'
   Load More Videos: Load more videos
@@ -133,12 +135,6 @@ Most Popular: 'Most Popular'
 Playlists: 'Playlists'
 User Playlists:
   Your Playlists: 'Your playlists'
-  Playlist Message: This page is not reflective of fully working playlists. It only
-    lists videos that you have saved or made a Favourite. When the work has finished,
-    all videos currently here will be migrated to a ‘Favourites’ playlist.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Your
-    saved videos are empty. Click on the save button on the corner of a video to have
-    it listed here
   Search bar placeholder: Search for playlists
   Empty Search Message: There are no videos in this playlist that match your search
   Create New Playlist: Create new Playlist
@@ -174,6 +170,10 @@ User Playlists:
       This playlist is protected and cannot be removed.: This playlist is protected
         and cannot be removed.
       This playlist does not exist: This playlist does not exist
+
+      This playlist has a video with a duration error: This playlist contains at least
+        one video that doesn't have a duration, it will be sorted as if their duration
+        is zero.
       Playlist {playlistName} has been deleted.: Playlist {playlistName} has been
         deleted.
       Video has been removed: Video has been removed
@@ -189,7 +189,6 @@ User Playlists:
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: This
         playlist is now used for quick bookmark instead of {oldPlaylistName}. Click
         here to undo
-      Quick bookmark disabled: Quick bookmark disabled
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist {playlistName}
         is the new quick bookmark playlist.
       This playlist is already being used for quick bookmark.: This playlist is already
@@ -231,15 +230,11 @@ User Playlists:
   Remove from Playlist: Remove from playlist
   Copy Playlist: Copy playlist
   Remove Watched Videos: Remove watched videos
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Are
-    you sure you want to remove all watched videos from this playlist? This cannot
-    be undone.
   Are you sure you want to delete this playlist? This cannot be undone: Are you sure
     you want to delete this playlist? This cannot be undone.
   Add to Favorites: Add to {playlistName}
   Remove from Favorites: Remove from {playlistName}
   Enable Quick Bookmark With This Playlist: Enable quick bookmark with this playlist
-  Disable Quick Bookmark: Disable quick bookmark
   Playlists with Matching Videos: Playlists with matching videos
   Quick Bookmark Enabled: Quick bookmark enabled
   Cannot delete the quick bookmark target playlist.: Cannot delete the quick bookmark
@@ -253,6 +248,9 @@ User Playlists:
     you sure you want to remove 1 watched video from this playlist? This cannot be
     undone. | Are you sure you want to remove {playlistItemCount} watched videos from
     this playlist? This cannot be undone.
+  Export Playlist: Export This Playlist
+  The playlist has been successfully exported: The playlist has been successfully
+    exported
 History:
   # On History Page
   History: 'History'
@@ -265,7 +263,7 @@ Settings:
   # On Settings Page
   Settings: 'Settings'
   General Settings:
-    General Settings: 'General settings'
+    General Settings: 'General'
     Check for Updates: 'Check for updates'
     Check for Latest Blog Posts: 'Check for latest blog posts'
     Fallback to Non-Preferred Backend on Failure: 'Revert to non-preferred backend
@@ -289,14 +287,10 @@ Settings:
       End: 'End'
       Blur: Blur
       Hidden: Hidden
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
-      (Default is https://invidious.snopyta.org)'
     Region for Trending: 'Region for trending'
         #! List countries
     View all Invidious instance information: View all Invidious instance information
     System Default: System default
-    External Player: External Player
-    External Player Executable: Custom External Player Executable
     Clear Default Instance: Clear default instance
     Set Current Instance as Default: Set current instance as default
     Current instance will be randomized on startup: Current instance will be randomised
@@ -313,8 +307,9 @@ Settings:
     Auto Load Next Page:
       Label: Auto load next page
       Tooltip: Load additional pages and comments automatically.
+    Open Deep Links In New Window: Open URLs Passed to FreeTube in a New Window
   Theme Settings:
-    Theme Settings: 'Theme settings'
+    Theme Settings: 'Theme'
     Match Top Bar with Main Color: 'Match top bar with main colour'
     Base Theme:
       Base Theme: 'Base theme'
@@ -329,6 +324,8 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarised Dark
       Solarized Light: Solarised Light
+      Gruvbox Dark: Gruvbox Dark
+      Gruvbox Light: Gruvbox Light
     Main Color Theme:
       Main Color Theme: 'Main colour theme'
       Red: 'Red'
@@ -376,6 +373,16 @@ Settings:
       Solarized Orange: Solarised Orange
       Solarized Blue: Solarised Blue
       Solarized Green: Solarised Green
+      Gruvbox Dark Green: Gruvbox Dark Green
+      Gruvbox Dark Yellow: Gruvbox Dark Yellow
+      Gruvbox Dark Blue: Gruvbox Dark Blue
+      Gruvbox Light Red: Gruvbox Light Red
+      Gruvbox Light Blue: Gruvbox Light Blue
+      Gruvbox Light Purple: Gruvbox Light Purple
+      Gruvbox Dark Purple: Gruvbox Dark Purple
+      Gruvbox Dark Aqua: Gruvbox Dark Aqua
+      Gruvbox Light Orange: Gruvbox Light Orange
+      Gruvbox Dark Orange: Gruvbox Dark Orange
     Secondary Color Theme: 'Secondary colour theme'
         #* Main Color Theme
     UI Scale: UI Scale
@@ -384,7 +391,7 @@ Settings:
     Hide Side Bar Labels: Hide side bar labels
     Hide FreeTube Header Logo: Hide FreeTube header logo
   Player Settings:
-    Player Settings: 'Player settings'
+    Player Settings: 'Player'
     Play Next Video: 'Play next video'
     Turn on Subtitles by Default: 'Turn on subtitles by default'
     Autoplay Videos: 'Autoplay Videos'
@@ -412,7 +419,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Playlist Next Video Interval
-    Next Video Interval: Next video interval
+    Next Video Interval: Autoplay Countdown Timer
     Display Play Button In Video Player: Display play button in video player
     Enter Fullscreen on Display Rotate: Enter fullscreen on display rotate
     Fast-Forward / Rewind Interval: Fast-forward / rewind interval
@@ -435,8 +442,9 @@ Settings:
       Ask Path: Ask for Save Folder
       File Name Label: Filename pattern
     Skip by Scrolling Over Video Player: Skip by scrolling over video player
+    Autoplay Interruption Timer: Autoplay Interruption Timer
   External Player Settings:
-    External Player Settings: External Player Settings
+    External Player Settings: External Player
     External Player: External Player
     Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
     Ignore Default Arguments: Ignore Default Arguments
@@ -446,7 +454,7 @@ Settings:
       None:
         Name: None
   Privacy Settings:
-    Privacy Settings: 'Privacy Settings'
+    Privacy Settings: 'Privacy'
     Remember History: 'Remember History'
     Save Watched Progress: 'Save Watched Progress'
     Clear Search Cache: 'Clear Search Cache'
@@ -468,21 +476,19 @@ Settings:
     Are you sure you want to remove all your playlists?: Are you sure you want to
       remove all your playlists?
   Subscription Settings:
-    Subscription Settings: 'Subscription Settings'
+    Subscription Settings: 'Subscription'
     Hide Videos on Watch: 'Hide Videos on Watch'
     Fetch Feeds from RSS: 'Fetch feeds from RSS'
-    Manage Subscriptions: 'Manage subscriptions'
     Fetch Automatically: Fetch feed automatically
-    Only Show Latest Video for Each Channel: Only show latest video for each channel
     Confirm Before Unsubscribing: Confirm before unsubscribing
+    'Limit the number of videos displayed for each channel': Limit the number of videos
+      displayed for each channel
+    To: To
   Data Settings:
-    Data Settings: 'Data settings'
+    Data Settings: 'Data'
     Select Import Type: 'Select import type'
     Select Export Type: 'Select export type'
     Import Subscriptions: 'Import subscriptions'
-    Import FreeTube: 'Import FreeTube'
-    Import YouTube: 'Import YouTube'
-    Import NewPipe: 'Import NewPipe'
     Export Subscriptions: 'Export Subscriptions'
     Export FreeTube: 'Export FreeTube'
     Export YouTube: 'Export YouTube'
@@ -510,7 +516,6 @@ Settings:
     Unable to write file: 'Unable to write file'
     Unknown data key: 'Unknown data key'
     How do I import my subscriptions?: 'How do I import my subscriptions?'
-    Check for Legacy Subscriptions: Check for Legacy subscriptions
     Manage Subscriptions: Manage Subscriptions
     Import Playlists: Import playlists
     Export Playlists: Export playlists
@@ -531,32 +536,6 @@ Settings:
         all of your existing playlists using the Remove All playlists option under
         Privacy settings.\n3. Launch the older version of FreeTube and import the
         exported playlists.’"
-  Advanced Settings:
-    Advanced Settings: 'Advanced Settings'
-    Enable Debug Mode (Prints data to the console): 'Enable Debug Mode (Prints data
-      to the console)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy Address (Example:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Clicking
-      ‘TEST PROXY’ button will send a request to https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Use Tor / Proxy for API calls'
-    TEST PROXY: 'TEST PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'See Public Instances'
-    Clear History:
-      Clear History: 'Clear History'
-      # On Click
-      Are you sure you want to delete your history?: 'Are you sure you want to delete
-        your history?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Clear Subscriptions'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Are you sure you want to
-        remove all subscriptions?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Hide Live Chat
@@ -568,7 +547,7 @@ Settings:
     Hide Video Likes And Dislikes: Hide Video Likes And Dislikes
     Hide Video Views: Hide Video Views
     Hide Active Subscriptions: Hide Active Subscriptions
-    Distraction Free Settings: Distraction Free Settings
+    Distraction Free Settings: Distraction Free
     Hide Playlists: Hide Playlists
     Hide Comments: Hide comments
     Hide Video Description: Hide video description
@@ -581,17 +560,17 @@ Settings:
     Display Titles Without Excessive Capitalisation: Display titles without excessive
       capitalisation and punctuation
     Hide Featured Channels: Hide featured channels
-    Hide Channel Playlists: Hide channel playlists
-    Hide Channel Community: Hide channel community
-    Hide Channel Shorts: Hide channel shorts
+    Hide Channel Playlists: Hide channel "playlists" tab
+    Hide Channel Community: Hide channel "community" tab
+    Hide Channel Shorts: Hide channel "shorts" tab
     Sections:
       Side Bar: Side bar
       General: General
       Channel Page: Channel Page
       Watch Page: Watch Page
       Subscriptions Page: Subscriptions page
-    Hide Channel Podcasts: Hide channel podcasts
-    Hide Channel Releases: Hide channel releases
+    Hide Channel Podcasts: Hide channel "podcasts" tab
+    Hide Channel Releases: Hide channel "releases" tab
     Hide Subscriptions Shorts: Hide subscriptions shorts
     Hide Subscriptions Live: Hide subscriptions live
     Hide Subscriptions Videos: Hide subscriptions videos
@@ -607,6 +586,7 @@ Settings:
       phrase
     Hide Videos and Playlists Containing Text: Hide videos and playlists containing
       text
+    Hide Channel Home: Hide Channel "Home" Tab
   The app needs to restart for changes to take effect. Restart and apply change?: The
     app needs to restart for changes to take effect. Do you want to restart and apply
     the changes?
@@ -625,13 +605,17 @@ Settings:
     Proxy Host: Proxy Host
     Proxy Protocol: Proxy Protocol
     Enable Tor / Proxy: Enable Tor / Proxy
-    Proxy Settings: Proxy Settings
+    Proxy Settings: Proxy
+    Proxy Warning: FreeTube doesn't have a built-in proxy but can connect to an external
+      proxy, such as one running on your machine like Tor or an external proxy such-as
+      a SOCKS5 proxy provided by some VPNs. If enabled, make sure your proxy/Tor is
+      configured properly, or FreeTube won't be able to fetch any data.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notify when sponsor segment is skipped
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       Url (Default is https://sponsor.ajay.app)
     Enable SponsorBlock: Enable SponsorBlock
-    SponsorBlock Settings: SponsorBlock Settings
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Skip option
       Auto Skip: Auto skip
@@ -644,7 +628,7 @@ Settings:
       Thumbnail Generator API URL (Default is https://dearrow-thumb.ajay.app)
     UseDeArrowThumbnails: Use DeArrow for thumbnails
   Download Settings:
-    Download Settings: Download Settings
+    Download Settings: Download
     Ask Download Path: Ask for download path
     Choose Path: Choose path
     Download Behavior: Download behaviour
@@ -652,12 +636,12 @@ Settings:
     Download in app: Download in app
   Parental Control Settings:
     Hide Unsubscribe Button: Hide Unsubscribe button
-    Parental Control Settings: Parental control settings
+    Parental Control Settings: Parental Control
     Show Family Friendly Only: Show family-friendly only
     Hide Search Bar: Hide search bar
   Experimental Settings:
     Replace HTTP Cache: Replace HTTP cache
-    Experimental Settings: Experimental settings
+    Experimental Settings: Experimental
     Warning: These settings are experimental, they may cause crashes while enabled.
       Making backups is highly recommended. Use at your own risk!
   Password Dialog:
@@ -668,30 +652,21 @@ Settings:
   Password Settings:
     Set Password To Prevent Access: Set a password to prevent access to settings
     Remove Password: Remove password
-    Password Settings: Password settings
+    Password Settings: Password
     Set Password: Set password
-  Expand All Settings Sections: Expand all settings sections
   Sort Settings Sections (A-Z): Sort settings sections (A-Z)
+  Return to Settings Menu: Return to Settings Menu
 About:
   #On About page
   About: About
-  Contact: Contact
   Help: Help
-  Useful Links: Useful Links
   Donate: Donate
   Beta: Beta
-  License: License
   Email: E-mail
-  Channel Rules: Channel Rules
-  Report an Issue: Report an Issue
-  Wiki: Wiki
   FAQ: FAQ
   Credits: Credits
   Blog: Blog
-  Release Notes: Release Notes
-  Source Code: Source Code
   Website: Website
-  Translate via Weblate: Translate via Weblate
 
   these people and projects: these people and projects
   FreeTube is made possible by: FreeTube is made possible by
@@ -706,14 +681,12 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub releases
   Downloads / Changelog: Downloads / Changelog
-  View License: View Licence
-  Licensed under the AGPLv3: Licensed under the AGPLv3
   Source code: Source code
   Discussions: Discussions
   Licensed under the: Licensed under the
   AGPLv3: AGPLv3
 Profile:
-  Profile Settings: Profile Settings
+  Profile Settings: Profile
   Profile Select: 'Profile Select'
   All Channels: 'All Channels'
   Profile Manager: 'Profile Manager'
@@ -741,7 +714,6 @@ Profile:
   '{profile} is now the active profile': '{profile} is now the active profile'
   Subscription List: 'Subscription List'
   Other Channels: 'Other Channels'
-  '{count} selected': '{count} selected'
   Select All: 'Select All'
   Select None: 'Select None'
   Delete Selected: 'Delete Selected'
@@ -831,6 +803,9 @@ Channel:
     Releases: Releases
     This channel does not currently have any releases: This channel does not currently
       have any releases
+  Home:
+    Home: Home
+    View Playlist: View Playlist
 Video:
   Mark As Watched: 'Mark As Watched'
   Remove From History: 'Remove From History'
@@ -867,38 +842,8 @@ Video:
     Chat is currently not supported with the Invidious API.  A direct connection to
     YouTube is required.'
   Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'May'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Oct'
-    Nov: 'Nov'
-    Dec: 'Dec'
-    Second: 'Second'
-    Seconds: 'Seconds'
-    Minute: 'Minute'
-    Minutes: 'Minutes'
-    Hour: 'Hour'
-    Hours: 'Hours'
-    Day: 'Day'
-    Days: 'Days'
-    Week: 'Week'
-    Weeks: 'Weeks'
-    Month: 'Month'
-    Months: 'Months'
-    Year: 'Year'
-    Years: 'Years'
-    Ago: 'Ago'
-    Upcoming: 'Premieres on'
-    Less than a minute: Less than a minute
     In less than a minute: In less than a minute
   Published on: 'Published on'
-  Publicationtemplate: '{number} {unit} ago'
 #& Videos
   Started streaming on: Started streaming on
   Streamed on: Streamed on
@@ -978,6 +923,16 @@ Video:
     Playback will resume automatically when your connection comes back: Playback will
       resume automatically when your connection comes back.
     Skipped segment: 'Skipped {segmentCategory} segment'
+  IP block: YouTube has blocked your IP address from watching videos. Please try switching
+    to a different VPN or proxy.
+  Unlisted: Unlisted
+  MembersOnly: Members-only videos cannot be watched with FreeTube as they require
+    Google login and paid membership to the uploader's channel.
+  AgeRestricted: Age-restricted videos cannot be watched with FreeTube as they require
+    Google login and using an age-verified YouTube account.
+  DeArrow:
+    Show Original Details: Show Original Details
+    Show Modified Details: Show Modified Details
 Videos:
   #& Sort By
   Sort By:
@@ -989,9 +944,6 @@ Playlist:
   #& About
   Playlist: Playlist
   View Full Playlist: 'View full playlist'
-  Videos: 'Videos'
-  View: 'View'
-  Views: 'Views'
   Last Updated On: 'Last updated on'
 
 # On Video Watch Page
@@ -1006,7 +958,8 @@ Playlist:
     AuthorAscending: Author (A-Z)
     AuthorDescending: Author (Z-A)
     VideoTitleAscending: Title (A-Z)
-Toggle Theatre Mode: 'Toggle Theatre Mode'
+    VideoDurationAscending: Duration (Shortest first)
+    VideoDurationDescending: Duration (Longest first)
 Change Format:
   Change Media Formats: 'Change Media Formats'
   Use Dash Formats: 'Use DASH Formats'
@@ -1066,13 +1019,15 @@ Comments:
   There are no comments available for this post: There are no comments available for
     this post
 Up Next: 'Up Next'
+Description:
+  Expand Description: '...more'
+  Collapse Description: Show less
 
 # Toast Messages
 Local API Error (Click to copy): 'Local API Error (Click to copy)'
 Invidious API Error (Click to copy): 'Invidious API Error (Click to copy)'
 Falling back to Invidious API: 'Falling back to Invidious API'
 Falling back to Local API: 'Falling back to Local API'
-Subscriptions have not yet been implemented: 'Subscriptions have not yet been implemented'
 Loop is now disabled: 'Loop is now disabled'
 Loop is now enabled: 'Loop is now enabled'
 Shuffle is now disabled: 'Shuffle is now disabled'
@@ -1126,6 +1081,8 @@ Tooltips:
     External Link Handling: "Choose the default behaviour when a link, which cannot
       be opened in FreeTube, is clicked.\nBy default FreeTube will open the clicked
       link in your default browser.\n"
+    Open Deep Links In New Window: URLs passed to FreeTube, such as by redirect browser
+      extensions or command line arguments, are opened in a new window.
   External Player Settings:
     External Player: Choosing an external player will display an icon, for opening
       the video (playlist if supported) in the external player, on the thumbnail.
@@ -1138,8 +1095,8 @@ Tooltips:
     Ignore Default Arguments: Do not send any default arguments to the external player
       aside from the video URL (e.g. playback rate, playlist URL, etc.). Custom arguments
       will still be passed on.
-    Custom External Player Arguments: Any custom command line arguments, separated
-      by semicolons (';'), you want to be passed to the external player.
+    Custom External Player Arguments: Any custom command line arguments you want to
+      be passed on to the external player.
     DefaultCustomArgumentsTemplate: '(Default: ‘{defaultCustomArguments}’)'
   Experimental Settings:
     Replace HTTP Cache: Disables Electron's disk-based HTTP cache and enables a custom
@@ -1161,8 +1118,6 @@ Playing Next Video Interval: Playing next video in no time. Click to cancel. | P
   next video in {nextVideoInterval} second. Click to cancel. | Playing next video
   in {nextVideoInterval} seconds. Click to cancel.
 More: More
-Hashtags have not yet been implemented, try again later: Hashtags have not yet been
-  implemented, try again later
 Unknown YouTube url type, cannot be opened in app: Unknown YouTube url type, cannot
   be opened in app
 Open New Window: Open New Window
@@ -1182,8 +1137,6 @@ Screenshot Success: Saved screenshot as ‘{filePath}’
 New Window: New window
 Channels:
   Empty: Your channel list is currently empty.
-  Unsubscribe: Unsubscribe
-  Unsubscribed: '{channelName} has been removed from your Subscriptions'
   Unsubscribe Prompt: Are you sure you want to Unsubscribe from ‘{channelName}’?
   Title: Channel list
   Search bar placeholder: Search channels
@@ -1198,6 +1151,7 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Chapters list hidden, current
     chapter: {chapterName}'
   Chapters: Chapters
+  Key Moments: Key Moments
 Clipboard:
   Copy failed: Copy to clipboard failed
   Cannot access clipboard without a secure connection: Cannot access clipboard without
@@ -1229,6 +1183,11 @@ Search Listing:
     4K: 4K
     Subtitles: Subtitles
     Closed Captions: Closed Captions
+    8K: 8K
+    3D: 3D
+    VR180: VR180
+    360 Video: 360°
+    New: New
 Search character limit: Search query is over the {searchCharacterLimit} character
   limit
 Feed:
@@ -1238,3 +1197,15 @@ Cancel: Cancel
 checkmark: ✓
 Display Label: '{label}: {value}'
 Moments Ago: moments ago
+Keys:
+  arrowup: Up Arrow
+  arrowleft: Left Arrow
+  arrowright: Right Arrow
+  ctrl: Ctrl
+  alt: Alt
+  arrowdown: Down Arrow
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Right-click or hold to see history: Right-click or hold to see history
+Autoplay Interruption Timer: Autoplay cancelled due to {autoplayInterruptionIntervalHours}
+  hours of inactivity
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 143515e178c8e..49d972440448b 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -29,6 +29,7 @@ Minimize: Minimize
 Close: Close
 Back: Back
 Forward: Forward
+Right-click or hold to see history: Right-click or hold to see history
 Open New Window: Open New Window
 Go to page: Go to {page}
 Close Banner: Close Banner
@@ -66,7 +67,12 @@ Search character limit: Search query is over the {searchCharacterLimit} characte
 Search Listing:
   Label:
     4K: 4K
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
     Subtitles: Subtitles
+    New: New
+    3D: 3D
     # Aria labels
     Closed Captions: Closed Captions
   # In Filter Button
@@ -125,7 +131,7 @@ Subscriptions:
   Latest Subscriptions: Latest Subscriptions
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: This
     profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Your Subscription list is currently empty. Start adding subscriptions to see them here.
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Your Subscription list is currently empty. If you want to import your subscriptions you can go to Data Settings and select Import Subscriptions or you can search for a channel and subscribe to them.
   Disabled Automatic Fetching: You have disabled automatic subscription fetching. Refresh subscriptions to see them here.
   Empty Channels: Your subscribed channels currently does not have any videos.
   'Getting Subscriptions. Please wait.': Getting Subscriptions. Please wait.
@@ -141,8 +147,6 @@ Channels:
   Search bar placeholder: Search Channels
   Count: '{number} channel(s) found.'
   Empty: Your channel list is currently empty.
-  Unsubscribe: Unsubscribe
-  Unsubscribed: '{channelName} has been removed from your subscriptions'
   Unsubscribe Prompt: Are you sure you want to unsubscribe from "{channelName}"?
 Trending:
   Trending: Trending
@@ -158,11 +162,6 @@ Feed:
 Playlists: Playlists
 User Playlists:
   Your Playlists: Your Playlists
-  Playlist Message: This page is not reflective of fully working playlists. It only
-    lists videos that you have saved or favorited. When the work has finished, all
-    videos currently here will be migrated to a 'Favorites' playlist.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Your saved videos are empty. Click on the save button on the corner of a video to have
-    it listed here
   You have no playlists. Click on the create new playlist button to create a new one.: You have no playlists. Click on the create new playlist button to create a new one.
   Empty Search Message: There are no videos in this playlist that match your search
   Search bar placeholder: Search for Playlists
@@ -191,6 +190,8 @@ User Playlists:
   Remove Watched Videos: Remove Watched Videos
   Enable Quick Bookmark With This Playlist: Enable Quick Bookmark With This Playlist
   Quick Bookmark Enabled: Quick Bookmark Enabled
+  Export Playlist: Export This Playlist
+  The playlist has been successfully exported: The playlist has been successfully exported
   Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Are you sure you want to remove 1 duplicate video from this playlist? This cannot be undone. | Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone.
   Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Are you sure you want to remove 1 watched video from this playlist? This cannot be undone. | Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone.
   Delete Playlist: Delete Playlist
@@ -236,6 +237,8 @@ User Playlists:
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist {playlistName} is the new quick bookmark playlist.
 
       This playlist does not exist: This playlist does not exist
+
+      This playlist has a video with a duration error: This playlist contains at least one video that doesn't have a duration, it will be sorted as if their duration is zero.
   AddVideoPrompt:
     Select a playlist to add your N videos to: 'Select a playlist to add your video to | Select a playlist to add your {videoCount} videos to'
     N playlists selected: '{playlistCount} Selected'
@@ -270,17 +273,18 @@ History:
 Settings:
   # On Settings Page
   Settings: Settings
-  Expand All Settings Sections: Expand All Settings Sections
   Sort Settings Sections (A-Z): Sort Settings Sections (A-Z)
+  Return to Settings Menu: Return to Settings Menu
   The app needs to restart for changes to take effect. Restart and apply change?: The
     app needs to restart for changes to take effect. Restart and apply change?
   General Settings:
-    General Settings: General Settings
+    General Settings: General
     Check for Updates: Check for Updates
     Check for Latest Blog Posts: Check for Latest Blog Posts
     Fallback to Non-Preferred Backend on Failure: Fallback to Non-Preferred Backend
       on Failure
     Enable Search Suggestions: Enable Search Suggestions
+    Open Deep Links In New Window: Open URLs Passed to FreeTube in a New Window
     Auto Load Next Page:
       Label: Auto Load Next Page
       Tooltip: Load additional pages and comments automatically.
@@ -318,7 +322,7 @@ Settings:
       Ask Before Opening Link: Ask Before Opening Link
       No Action: No Action
   Theme Settings:
-    Theme Settings: Theme Settings
+    Theme Settings: Theme
     Match Top Bar with Main Color: Match Top Bar with Main Color
     Expand Side Bar by Default: Expand Side Bar by Default
     Disable Smooth Scrolling: Disable Smooth Scrolling
@@ -336,6 +340,8 @@ Settings:
       Pastel Pink: Pastel Pink
       Hot Pink: Hot Pink
       Nordic: Nordic
+      Gruvbox Dark: Gruvbox Dark
+      Gruvbox Light: Gruvbox Light
       Solarized Dark: Solarized Dark
       Solarized Light: Solarized Light
     Main Color Theme:
@@ -377,6 +383,16 @@ Settings:
       Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire
       Catppuccin Mocha Blue: Catppuccin Mocha Blue
       Catppuccin Mocha Lavender: Catppuccin Mocha Lavender
+      Gruvbox Dark Green: Gruvbox Dark Green
+      Gruvbox Dark Yellow: Gruvbox Dark Yellow
+      Gruvbox Dark Blue: Gruvbox Dark Blue
+      Gruvbox Dark Purple: Gruvbox Dark Purple
+      Gruvbox Dark Aqua: Gruvbox Dark Aqua
+      Gruvbox Dark Orange: Gruvbox Dark Orange
+      Gruvbox Light Red: Gruvbox Light Red
+      Gruvbox Light Blue: Gruvbox Light Blue
+      Gruvbox Light Purple: Gruvbox Light Purple
+      Gruvbox Light Orange: Gruvbox Light Orange
       Solarized Yellow: Solarized Yellow
       Solarized Orange: Solarized Orange
       Solarized Red: Solarized Red
@@ -388,7 +404,7 @@ Settings:
     Secondary Color Theme: Secondary Color Theme
         #* Main Color Theme
   Player Settings:
-    Player Settings: Player Settings
+    Player Settings: Player
     Play Next Video: Play Next Video
     Turn on Subtitles by Default: Turn on Subtitles by Default
     Autoplay Videos: Autoplay Videos
@@ -400,7 +416,8 @@ Settings:
     Skip by Scrolling Over Video Player: Skip by Scrolling Over Video Player
     Display Play Button In Video Player: Display Play Button In Video Player
     Enter Fullscreen on Display Rotate: Enter Fullscreen on Display Rotate
-    Next Video Interval: Next Video Interval
+    Next Video Interval: Autoplay Countdown Timer
+    Autoplay Interruption Timer: Autoplay Interruption Timer
     Fast-Forward / Rewind Interval: Fast-Forward / Rewind Interval
     Default Volume: Default Volume
     Default Playback Rate: Default Playback Rate
@@ -438,7 +455,7 @@ Settings:
         Forbidden Characters: Forbidden Characters
         Empty File Name: Empty File Name
   External Player Settings:
-    External Player Settings: External Player Settings
+    External Player Settings: External Player
     External Player: External Player
     Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
     Ignore Default Arguments: Ignore Default Arguments
@@ -448,7 +465,7 @@ Settings:
       None:
         Name: None
   Privacy Settings:
-    Privacy Settings: Privacy Settings
+    Privacy Settings: Privacy
     Remember History: Remember History
     Save Watched Progress: Save Watched Progress
     Save Watched Videos With Last Viewed Playlist: Save Watched Videos With Last Viewed Playlist
@@ -468,15 +485,15 @@ Settings:
     All playlists have been removed: All playlists have been removed
     Are you sure you want to remove all your playlists?: Are you sure you want to remove all your playlists?
   Subscription Settings:
-    Subscription Settings: Subscription Settings
+    Subscription Settings: Subscription
     Hide Videos on Watch: Hide Videos on Watch
     Fetch Feeds from RSS: Fetch Feeds from RSS
-    Manage Subscriptions: Manage Subscriptions
     Fetch Automatically: Fetch Feed Automatically
-    Only Show Latest Video for Each Channel: Only Show Latest Video for Each Channel
+    'Limit the number of videos displayed for each channel': 'Limit the number of videos displayed for each channel'
+    To: To
     Confirm Before Unsubscribing: Confirm Before Unsubscribing
   Distraction Free Settings:
-    Distraction Free Settings: Distraction Free Settings
+    Distraction Free Settings: Distraction Free
     Sections:
       Side Bar: Side Bar
       Subscriptions Page: Subscriptions Page
@@ -508,26 +525,27 @@ Settings:
     Hide Channels API Error: Error retrieving user with the ID provided. Please check again if the ID is correct.
     Hide Channels Already Exists: Channel ID already exists
     Hide Featured Channels: Hide Featured Channels
-    Hide Channel Playlists: Hide Channel Playlists
-    Hide Channel Community: Hide Channel Community
-    Hide Channel Shorts: Hide Channel Shorts
-    Hide Channel Podcasts: Hide Channel Podcasts
-    Hide Channel Releases: Hide Channel Releases
+    Hide Channel Playlists: Hide Channel "Playlists" Tab
+    Hide Channel Community: Hide Channel "Community" Tab
+    Hide Channel Home: Hide Channel "Home" Tab
+    Hide Channel Shorts: Hide Channel "Shorts" Tab
+    Hide Channel Podcasts: Hide Channel "Podcasts" Tab
+    Hide Channel Releases: Hide Channel "Releases" Tab
     Hide Videos and Playlists Containing Text: Hide Videos and Playlists Containing Text
     Hide Videos and Playlists Containing Text Placeholder: Word, Word Fragment, or Phrase
     Hide Subscriptions Videos: Hide Subscriptions Videos
     Hide Subscriptions Shorts: Hide Subscriptions Shorts
     Hide Subscriptions Live: Hide Subscriptions Live
     Hide Subscriptions Community: Hide Subscriptions Community
+    Show Added Items: Show Added Items
   Data Settings:
-    Data Settings: Data Settings
+    Data Settings: Data
     Select Import Type: Select Import Type
     Select Export Type: Select Export Type
     Import Subscriptions: Import Subscriptions
     Subscription File: Subscription File
     History File: History File
     Playlist File: Playlist File
-    Check for Legacy Subscriptions: Check for Legacy Subscriptions
     Export Subscriptions: Export Subscriptions
     Export FreeTube: Export FreeTube
     Export YouTube: Export YouTube
@@ -572,7 +590,8 @@ Settings:
     How do I import my subscriptions?: How do I import my subscriptions?
     Manage Subscriptions: Manage Subscriptions
   Proxy Settings:
-    Proxy Settings: Proxy Settings
+    Proxy Settings: Proxy
+    Proxy Warning: FreeTube doesn't have a built-in proxy but can connect to an external proxy, such as one running on your machine like Tor or an external proxy such-as a SOCKS5 proxy provided by some VPNs. If enabled, make sure your proxy/Tor is configured properly, or FreeTube won't be able to fetch any data.
     Enable Tor / Proxy: Enable Tor / Proxy
     Proxy Protocol: Proxy Protocol
     Proxy Host: Proxy Host
@@ -586,7 +605,7 @@ Settings:
     City: City
     Error getting network information. Is your proxy configured properly?: Error getting network information. Is your proxy configured properly?
   SponsorBlock Settings:
-    SponsorBlock Settings: SponsorBlock Settings
+    SponsorBlock Settings: SponsorBlock
     Enable SponsorBlock: Enable SponsorBlock
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API Url (Default is https://sponsor.ajay.app)
     Notify when sponsor segment is skipped: Notify when sponsor segment is skipped
@@ -601,19 +620,19 @@ Settings:
       Do Nothing: Do Nothing
     Category Color: Category Color
   Parental Control Settings:
-    Parental Control Settings: Parental Control Settings
+    Parental Control Settings: Parental Control
     Hide Unsubscribe Button: Hide Unsubscribe Button
     Show Family Friendly Only: Show Family Friendly Only
     Hide Search Bar: Hide Search Bar
   Download Settings:
-    Download Settings: Download Settings
+    Download Settings: Download
     Ask Download Path: Ask for download path
     Choose Path: Choose Path
     Download Behavior: Download Behavior
     Download in app: Download in app
     Open in web browser: Open in web browser
   Experimental Settings:
-    Experimental Settings: Experimental Settings
+    Experimental Settings: Experimental
     Warning: These settings are experimental, they may cause crashes while enabled. Making backups is highly recommended. Use at your own risk!
     Replace HTTP Cache: Replace HTTP Cache
   Password Dialog:
@@ -622,7 +641,7 @@ Settings:
     Password Incorrect: Password Incorrect
     Unlock: Unlock
   Password Settings:
-    Password Settings: Password Settings
+    Password Settings: Password
     Set Password To Prevent Access: Set a password to prevent access to settings
     Set Password: Set Password
     Remove Password: Remove Password
@@ -656,7 +675,7 @@ About:
   Donate: Donate
 
 Profile:
-  Profile Settings: Profile Settings
+  Profile Settings: Profile
   Toggle Profile List: Toggle Profile List
   Profile Select: Profile Select
   Profile Filter: Profile Filter
@@ -741,6 +760,9 @@ Channel:
       Last Video Added: Last Video Added
       Newest: Newest
       Oldest: Oldest
+  Home:
+    Home: Home
+    View Playlist: View Playlist
   Podcasts:
     Podcasts: Podcasts
     This channel does not currently have any podcasts: This channel does not currently have any podcasts
@@ -766,6 +788,9 @@ Channel:
     Video hidden by FreeTube: Video hidden by FreeTube
     Viewing Posts Only Supported By Invidious: Viewing Posts is only supported by Invidious. Head to a channel's community tab to view content there without Invidious.
 Video:
+  IP block: 'YouTube has blocked your IP address from watching videos. Please try switching to a different VPN or proxy.'
+  MembersOnly: Members-only videos cannot be watched with FreeTube as they require Google login and paid membership to the uploader's channel.
+  AgeRestricted: Age-restricted videos cannot be watched with FreeTube as they require Google login and using an age-verified YouTube account.
   More Options: More Options
   Mark As Watched: Mark As Watched
   Remove From History: Remove From History
@@ -801,6 +826,7 @@ Video:
   Premieres on: Premieres on
   Premieres: Premieres
   Upcoming: Upcoming
+  Unlisted: Unlisted
   Live: Live
   Live Now: Live Now
   Live Chat: Live Chat
@@ -821,39 +847,13 @@ Video:
   video only: video only
   audio only: audio only
   Published:
-    Jan: Jan
-    Feb: Feb
-    Mar: Mar
-    Apr: Apr
-    May: May
-    Jun: Jun
-    Jul: Jul
-    Aug: Aug
-    Sep: Sep
-    Oct: Oct
-    Nov: Nov
-    Dec: Dec
-    Second: Second
-    Seconds: Seconds
-    Minute: Minute
-    Minutes: Minutes
-    Hour: Hour
-    Hours: Hours
-    Day: Day
-    Days: Days
-    Week: Week
-    Weeks: Weeks
-    Month: Month
-    Months: Months
-    Year: Year
-    Years: Years
-    Ago: Ago
-    Upcoming: Premieres on
     In less than a minute: In less than a minute
   Published on: Published on
   Streamed on: Streamed on
   Started streaming on: Started streaming on
-  Publicationtemplate: '{number} {unit} ago'
+  DeArrow:
+    Show Original Details: Show Original Details
+    Show Modified Details: Show Modified Details
   Sponsor Block category:
     sponsor: Sponsor
     intro: Intro
@@ -916,9 +916,6 @@ Playlist:
   #& About
   Playlist: Playlist
   View Full Playlist: View Full Playlist
-  Videos: Videos
-  View: View
-  Views: Views
   Last Updated On: Last Updated On
   Sort By:
     Sort By: Sort By
@@ -928,12 +925,13 @@ Playlist:
     AuthorDescending: Author (Z-A)
     VideoTitleAscending: Title (A-Z)
     VideoTitleDescending: Title (Z-A)
+    VideoDurationAscending: Duration (Shortest first)
+    VideoDurationDescending: Duration (Longest first)
     Custom: Custom
 
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: Toggle Theatre Mode
 Change Format:
   Change Media Formats: Change Media Formats
   Use Dash Formats: Use DASH Formats
@@ -967,6 +965,7 @@ Clipboard:
 
 Chapters:
   Chapters: Chapters
+  Key Moments: Key Moments
   'Chapters list visible, current chapter: {chapterName}': 'Chapters list visible, current chapter: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Chapters list hidden, current chapter: {chapterName}'
 
@@ -1001,6 +1000,9 @@ Comments:
   Hearted: Hearted
 
 Up Next: Up Next
+Description:
+  Expand Description: ...more
+  Collapse Description: Show less
 
 #Tooltips
 Tooltips:
@@ -1020,6 +1022,8 @@ Tooltips:
     External Link Handling: |
       Choose the default behavior when a link, which cannot be opened in FreeTube, is clicked.
       By default FreeTube will open the clicked link in your default browser.
+    Open Deep Links In New Window: URLs passed to FreeTube, such as by redirect
+      browser extensions or command line arguments, are opened in a new window.
   Player Settings:
     Proxy Videos Through Invidious: Will connect to Invidious to serve videos instead
       of making a direct connection to YouTube.
@@ -1042,8 +1046,7 @@ Tooltips:
     Ignore Default Arguments: Do not send any default arguments to the external player
       aside from the video URL (e.g. playback rate, playlist URL, etc.).
       Custom arguments will still be passed on.
-    Custom External Player Arguments: Any custom command line arguments, separated by semicolons (';'),
-      you want to be passed to the external player.
+    Custom External Player Arguments: Any custom command line arguments you want to be passed on to the external player.
     DefaultCustomArgumentsTemplate: "(Default: '{defaultCustomArguments}')"
   Distraction Free Settings:
     Hide Channels: Enter a channel ID to hide all videos, playlists and the channel itself from appearing in search, trending, most popular and recommended.
@@ -1070,9 +1073,7 @@ Falling back to Local API: Falling back to Local API
 This video is unavailable because of missing formats. This can happen due to country unavailability.: This
   video is unavailable because of missing formats. This can happen due to country
   unavailability.
-Subscriptions have not yet been implemented: Subscriptions have not yet been implemented
 Unknown YouTube url type, cannot be opened in app: Unknown YouTube url type, cannot be opened in app
-Hashtags have not yet been implemented, try again later: Hashtags have not yet been implemented, try again later
 Loop is now disabled: Loop is now disabled
 Loop is now enabled: Loop is now enabled
 Shuffle is now disabled: Shuffle is now disabled
@@ -1084,6 +1085,7 @@ Playlist will not pause when current video is finished: Playlist will not pause
 Playlist will pause when current video is finished: Playlist will pause when current video is finished
 Playing Next Video Interval: Playing next video in no time. Click to cancel. | Playing next video in {nextVideoInterval} second. Click to cancel. | Playing next video in {nextVideoInterval} seconds. Click to cancel.
 Canceled next video autoplay: Canceled next video autoplay
+Autoplay Interruption Timer: Autoplay canceled due to {autoplayInterruptionIntervalHours} hours of inactivity
 
 Default Invidious instance has been set to {instance}: Default Invidious instance has been set to {instance}
 Default Invidious instance has been cleared: Default Invidious instance has been cleared
@@ -1120,3 +1122,12 @@ Cancel: Cancel
 checkmark: ✓
 # French is the only language that should change this (they have a space before the colon)
 Display Label: '{label}: {value}'
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Down Arrow
+  arrowleft: Left Arrow
+  arrowright: Right Arrow
+  arrowup: Up Arrow
diff --git a/static/locales/eo.yaml b/static/locales/eo.yaml
index e3e94836f9100..5fa981f8a190a 100644
--- a/static/locales/eo.yaml
+++ b/static/locales/eo.yaml
@@ -98,7 +98,6 @@ Settings:
       Dark: 'Malluma'
       Light: 'Luma'
   Player Settings: {}
-  Advanced Settings: {}
 About:
   #On About page
   Blog: Blogo
diff --git a/static/locales/es-AR.yaml b/static/locales/es-AR.yaml
index ac0c5dd906a41..08b895302b525 100644
--- a/static/locales/es-AR.yaml
+++ b/static/locales/es-AR.yaml
@@ -100,13 +100,6 @@ Most Popular: 'Más popular'
 Playlists: 'Listas de reproducción'
 User Playlists:
   Your Playlists: 'Tus listas de reproducción'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Tu
-    lista de videos guardados está vacía. Hacé clic en el botón de guardado en la
-    esquina de un video para que aparezca acá
-  Playlist Message: Esta página no refleja listas de reproducción completamente funcionales.
-    Solo lista los videos que guardaste o marcaste como favoritos. Cuando el trabajo
-    esté terminado, todos los videos que se encuentren acá serán migrados a una lista
-    de reproducción de 'Favoritos'.
   Search bar placeholder: Buscar en la Lista de Reproducción
   Empty Search Message: No hay videos en esta lista de reproducción que coincidan
     con tu búsqueda
@@ -147,8 +140,6 @@ Settings:
       Middle: 'Medio'
       End: 'Final'
       Hidden: Oculto
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
-      Invidious (por defecto es https://invidious.snopyta.org)'
     Region for Trending: 'Región para Tendencias'
         #! List countries
     View all Invidious instance information: Ver toda la información sobre la instancia
@@ -301,7 +292,6 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Configuraciones de suscripción'
     Hide Videos on Watch: 'Ocultar videos vistos'
-    Manage Subscriptions: 'Administrar suscripciones'
     Fetch Automatically: Obtener feed automáticamente
     Fetch Feeds from RSS: Obtener feeds desde RSS
   Data Settings:
@@ -309,16 +299,12 @@ Settings:
     Select Import Type: 'Seleccionar tipo de importación'
     Select Export Type: 'Seleccionar tipo para exportar'
     Import Subscriptions: 'Importar suscripciones'
-    Import FreeTube: 'Importar FreeTube'
-    Import YouTube: 'Importar Youtube'
-    Import NewPipe: 'Importar NewPipe'
     Export Subscriptions: 'Exportar suscripciones'
     Export FreeTube: 'Exportar Freetube'
     Export YouTube: 'Exportar Youtube'
     Export NewPipe: 'Exportar NewPipe'
     Import History: 'Importar historial'
     Export History: 'Exportar historial'
-    Check for Legacy Subscriptions: Comprobar suscripciones de legado
     All playlists has been successfully exported: Todas las listas de reproducción
       se han exportado con éxito
     Playlist File: Archivo de lista de reproducción
@@ -351,7 +337,6 @@ Settings:
     Unknown data key: Clave de datos desconocida
     This might take a while, please wait: Esto puede tardar un rato. Por favor, esperá
     Invalid history file: Archivo de historial no válido
-  Advanced Settings: {}
   Distraction Free Settings:
     Hide Active Subscriptions: Ocultar suscripciones activas
     Hide Live Chat: Ocultar chat en vivo
@@ -363,7 +348,6 @@ Settings:
     Hide Video Likes And Dislikes: Ocultar calificaciones del video
     Hide Video Views: Ocultar vistas del video
     Distraction Free Settings: Configuraciones para evitar distraerse
-    Blur Thumbnails: Desenfocar miniaturas
     Hide Channels Placeholder: Nombre o ID del canal
     Hide Video Description: Ocultar la descripción del vídeo
     Hide Chapters: Ocultar los capítulos
@@ -474,9 +458,7 @@ Channels:
   Channels: Canales
   Title: Lista de canales
   Empty: Tu lista de canales está actualmente vacía.
-  Unsubscribe: Desuscribirse
   Count: '{number} canal(es) encontrado(s).'
-  Unsubscribed: '{channelName} ha sido eliminado de tus suscripciones'
 Preferences: Preferencias
 Tooltips:
   Distraction Free Settings:
diff --git a/static/locales/es-MX.yaml b/static/locales/es-MX.yaml
index 753719906bda7..0426058810b1b 100644
--- a/static/locales/es-MX.yaml
+++ b/static/locales/es-MX.yaml
@@ -33,6 +33,7 @@ Global:
 
 # Search Bar
   Community: Comunidad
+  Live: En vivo
 Search / Go to URL: 'Buscar / Ir a la URL'
   # In Filter Button
 Search Filters:
@@ -68,6 +69,9 @@ Search Filters:
   Fetch more results: 'Obtener más resultados'
 # Sidebar
   There are no more results for this search: No hay más resultados para ésta búsqueda
+  Features:
+    Features: Características
+    Subtitles: Subtitulos
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Suscripciones'
@@ -97,12 +101,6 @@ User Playlists:
   Search bar placeholder: Buscar en la lista de reproducción
   Empty Search Message: No hay videos en esta lista de reproducción que coincidan
     con su búsqueda
-  Playlist Message: Esta página no muestra listas de reproducción funcionales. Únicamente
-    enlista videos que ha guardado o marcado en favoritos. Una vez terminado el proyecto,
-    todos los videos de aquí serán trasladados a la lista de 'Favoritos'.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Aún
-    no ha guardado videos. Haga clic en el botón de guardado en la esquina de cualquier
-    video para enlistarlo aquí
 History:
   # On History Page
   History: 'Historial'
@@ -134,8 +132,6 @@ Settings:
       Beginning: 'Comienzo'
       Middle: 'Medio'
       End: 'Fin'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
-      Invidious (por defecto es https://invidious.snopyta.org)'
     Region for Trending: 'Tendencia por región'
         #! List countries
     Check for Updates: Buscar actualizaciones
@@ -199,7 +195,6 @@ Settings:
     Hide Side Bar Labels: Ocultar etiquetas de la barra lateral
   Player Settings:
     Player Settings: 'Ajustes del reproductor'
-    Remember History: 'Recordar historial'
     Play Next Video: 'Reproducir el video siguiente'
     Turn on Subtitles by Default: 'Activar subtitulos por defecto'
     Autoplay Videos: 'Reproduccion automatica'
@@ -236,42 +231,7 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Ajustes de suscripción'
     Hide Videos on Watch: 'Ocultar videos vistos'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Formato de exportación de suscripciones'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Administrar suscripciones'
-    Import Subscriptions: 'Importa tus suscripciones'
-    Export Subscriptions: 'Exporta tus suscripciones'
-    How do I import my subscriptions?: '¿Cómo importo mis suscripciones?'
     Fetch Feeds from RSS: Buscar Información desde RSS
-  Advanced Settings:
-    Advanced Settings: 'Ajustes avanzados'
-    Enable Debug Mode (Prints data to the console): 'Activar modo de depuración (Muestra
-      datos en la consola)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Dirección de mascara (Ejemplo:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Presionando
-      el botón "PROBAR MASCARA" enviará una solicitud a https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Usar Tor / Mascara para las llamadas API'
-    TEST PROXY: 'PROBAR MASCARA'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Ver Instancias Públicas'
-    Clear History:
-      Clear History: 'Borrar Historial'
-      # On Click
-      Are you sure you want to delete your history?: '¿Está seguro de que desea eliminar
-        su historial?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Borrar Suscripciones'
-      # On Click
-      Are you sure you want to remove all subscriptions?: '¿Está seguro de que desea
-        eliminar todas las suscripciones?'
-      #& Yes
-      #& No
 
   Privacy Settings:
     Search cache has been cleared: Se ha borrado la caché de búsqueda
@@ -297,9 +257,6 @@ Settings:
     Export YouTube: Exportar YouTube
     Export FreeTube: Exportar FreeTube
     Export Subscriptions: Exportar Suscripciones
-    Import NewPipe: Importar NewPipe
-    Import YouTube: Importar YouTube
-    Import FreeTube: Importar FreeTube
     Import Subscriptions: Importar Suscripciones
     Select Export Type: Seleccionar tipo de exportación
     Select Import Type: Seleccionar tipo de importación
@@ -326,7 +283,6 @@ Settings:
       datos insuficientes, ignorando artículo
     Import Playlists: Importar listas de reproducción
     Export Playlists: Exportar listas de reproducción
-    Check for Legacy Subscriptions: Revisar suscripciones heredadas
     All playlists has been successfully exported: Todas sus listas de reproducción
       han sido exportadas con éxito
     All playlists has been successfully imported: Todas sus listas han sido importadas
@@ -385,42 +341,13 @@ About:
   #On About page
   About: 'Acerca de'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
-    software copylefted tiene licencia libre AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    ¿Encontraste un bug? ¿Quieres sugerir una nueva característica? ¿Quieres ayudar?
-    Visita nuestra página de Github. Las contribuciones son bienvenidas.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: '¡Muchas
-    gracias a las personas y proyectos que hacen posible FreeTube!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '¿Desea
-    chatear? Únete a nuestro servidor de Element / Matrix. Por favor revise las reglas
-    antes de unirse.'
-
-  'Looking for help? Check out our Wiki page.': '¿Buscando ayuda? Visite nuestra pagina
-    de Wiki.'
-
-  Check out our Firefox extension!: '¡Prueba nuestra extensión para Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Si
-    te gusta usar Free Tube, considera donar a través de Liberapay o a través de nuestra
-    dirección de Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Últimas noticias de FreeTube'
-
 #On Channel Page
   Blog: Blog
   Website: Sitio web
   Email: Correo electrónico
   Mastodon: Mastodon
   Source code: Código fuente
-  View License: Ver licencia
   Beta: Beta
-  Licensed under the AGPLv3: Bajo licencia de AGPLv3
   Downloads / Changelog: Descargas / Informe de cambios
   GitHub releases: Lanzamientos en GitHub
   Help: Ayuda
@@ -500,37 +427,7 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'El
     chat en vivo no esta soportado actualmente con la API de Invidious. Es necesaria
     una conexión directa a YouTube.'
-  Published:
-    Jan: 'Ene'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Abr'
-    May: 'May'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Ago'
-    Sep: 'Sep'
-    Oct: 'Oct'
-    Nov: 'Nov'
-    Dec: 'Dic'
-    Second: 'Segundo'
-    Seconds: 'Segundos'
-    Hour: 'Hora'
-    Hours: 'Horas'
-    Day: 'Dia'
-    Days: 'Dias'
-    Week: 'Semana'
-    Weeks: 'Semanas'
-    Month: 'Mes'
-    Months: 'Meses'
-    Year: 'Año'
-    Years: 'Años'
-    Ago: 'Hace'
-    Upcoming: 'Pronto en estreno'
-    Minutes: minutos
-    Minute: minuto
   Published on: 'Publicado en'
-  Publicationtemplate: 'Hace {number} {unit}'
 #& Videos
   Autoplay: Reproducción Automática
   Play Previous Video: Reproducir el video anterior
@@ -586,16 +483,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver lista de reproducción completa'
-  Videos: 'Videos'
-  View: 'Vista'
-  Views: 'Vistas'
   Last Updated On: 'Última actualización el'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Lista de reproducción
-Toggle Theatre Mode: 'Alternar modo teatro'
 Change Format:
   Change Media Formats: 'Cambia formatos de vídeo'
   Use Dash Formats: 'Usar formatos DASH'
@@ -656,7 +549,6 @@ Invidious API Error (Click to copy): 'Error de la API de Invidious (Presione par
   copiar)'
 Falling back to Invidious API: 'Recurriendo a la API de Invidious'
 Falling back to Local API: 'Recurriendo a la API local'
-Subscriptions have not yet been implemented: 'Las suscripciones aún no se han implementado'
 Loop is now disabled: 'El bucle esta desactivado'
 Loop is now enabled: 'El bucle esta activado'
 Shuffle is now disabled: 'La reproducción aleatoria se ha desactivada'
@@ -743,8 +635,8 @@ Tooltips:
       problema, FreeTube intentará usar automáticamente otra API como método de respaldo
       al activar esta opción.
   External Player Settings:
-    Custom External Player Arguments: Cualquier argumento, con separaciones de punto
-      y coma (';'), que deseé anticipar al reproductor externo.
+    Custom External Player Arguments: Cualquier argumento, que deseé anticipar al
+      reproductor externo.
     DefaultCustomArgumentsTemplate: "(Por defecto: '{defaultCustomArguments}')"
     External Player: Elegir un reproductor externo mostrará un ícono, para abrir el
       video (o lista, si es compatible) en el reproductor externo, sobre la miniatura
@@ -790,8 +682,6 @@ Default Invidious instance has been set to {instance}: La dirección de Invidiou
   se ha establecido en {instance}
 Unknown YouTube url type, cannot be opened in app: Tipo de URL de YouTube desconocida,
   imposible de abrir en la app
-Hashtags have not yet been implemented, try again later: Las etiquetas aún no han
-  sido implementadas, próximamente estarán en nuevas versiones
 Playing Next Video Interval: El próximo video se abrirá inmediatamente. Haga clic
   aquí para cancelar. | Se abrirá el siguiente video en {nextVideoInterval} segundo.
   Haga clic aquí para cancelar. | Se abrirá el siguiente video en {nextVideoInterval}
@@ -802,3 +692,8 @@ Channels:
   Channels: Canales
   Title: Lista de Canales
   Search bar placeholder: Buscar Canales
+Search Listing:
+  Label:
+    Subtitles: Subtítulos
+    New: Nuevo
+Go to page: Ir a {page}
diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index f036c6ab46dc2..0253d3ca37006 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -2,8 +2,8 @@
 Locale Name: 'español (España)'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Esta parte de la aplicación aún no está lista. Vuelve más tarde cuando se hayan
-  hecho progresos.
+  Esta parte de la aplicación aún no está lista. Vuelve más tarde cuando haya logrado
+  avances.
 
 # Webkit Menu Bar
 File: 'Archivo'
@@ -102,7 +102,9 @@ Subscriptions:
   Subscriptions: 'Suscripciones'
   Latest Subscriptions: 'Últimas suscripciones'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Tu
-    lista de suscripciones está vacía. Suscríbete a canales para verlos aquí.'
+    lista de suscripciones está vacía. Si deseas importar tus suscripciones puedes
+    ir a Configuración de datos y seleccionar Importar suscripciones o puedes buscar
+    un canal y suscribirte.'
   'Getting Subscriptions. Please wait.': 'Obteniendo suscripciones. Por favor, espere.'
   Refresh Subscriptions: 'Recargar suscripciones'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Este
@@ -129,17 +131,9 @@ Most Popular: 'Más populares'
 Playlists: 'Listas de reproducción'
 User Playlists:
   Your Playlists: 'Tus listas de reproducción'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Tus
-    favoritos están vacíos. Haz clic en la estrella de cada vídeo para añadirlo aquí
-  Playlist Message: Esta página no refleja el estado final de las listas de reproducción,
-    solo muestra los vídeos guardados. En futuras actualizaciones, estos vídeos migrarán
-    a la lista de reproducción «Favoritos».
   Search bar placeholder: Buscar listas de reproducción
   Empty Search Message: No hay vídeos en esta lista de reproducción que coincidan
     con su búsqueda
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: ¿Estás
-    seguro de que quieres eliminar todos los vídeos vistos de esta lista de reproducción?
-    Esto no se puede deshacer.
   AddVideoPrompt:
     Search in Playlists: Buscar en listas de reproducción
     Save: Guardar
@@ -186,7 +180,6 @@ User Playlists:
       This video cannot be moved down.: Este vídeo no se puede bajar.
       This playlist is now used for quick bookmark: Esta lista de reproducción se
         utiliza ahora como marcador rápido
-      Quick bookmark disabled: Marcador rápido desactivado
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Esta
         lista de reproducción se utiliza ahora como marcador rápido en lugar de {oldPlaylistName}.
         Haga clic aquí para deshacer
@@ -196,6 +189,9 @@ User Playlists:
         ya se utiliza como marcador rápido.
       Playlist {playlistName} is the new quick bookmark playlist.: L lista de reproducción
         {playlistName} es la nueva lista de reproducción de marcadores rápidos.
+      This playlist has a video with a duration error: Esta lista de reproducción
+        contiene al menos un vídeo sin duración, se ordenará como si su duración fuera
+        cero.
     Search for Videos: Buscar vídeos
   Are you sure you want to delete this playlist? This cannot be undone: ¿Estás seguro
     de que quieres borrar esta lista de reproducción? Esto no se puede deshacer.
@@ -241,7 +237,6 @@ User Playlists:
   Remove from Favorites: Eliminar de {playlistName}
   Enable Quick Bookmark With This Playlist: Activar marcadores rápidos con esta lista
     de reproducción
-  Disable Quick Bookmark: Desactivar el marcador rápido
   Playlists with Matching Videos: Listas de reproducción con vídeos relacionados
   Quick Bookmark Enabled: Marcador rápido habilitado
   Cannot delete the quick bookmark target playlist.: No se puede eliminar la lista
@@ -255,6 +250,8 @@ User Playlists:
     seguro de que deseas eliminar 1 video duplicado de esta lista de reproducción?
     Esto no se puede deshacer. | ¿Estás seguro de que deseas eliminar {playlistItemCount}
     videos duplicados de esta lista de reproducción? Esto no se puede deshacer.
+  Export Playlist: Exportar esta Playlist
+  The playlist has been successfully exported: La playlist se ha exportado correctamente
 History:
   # On History Page
   History: 'Historial'
@@ -267,7 +264,7 @@ Settings:
   # On Settings Page
   Settings: 'Ajustes'
   General Settings:
-    General Settings: 'Ajustes generales'
+    General Settings: 'General'
     Fallback to Non-Preferred Backend on Failure: 'Vuelta al backend no preferido
       en caso de fallo'
     Enable Search Suggestions: 'Activar sugerencias de búsqueda'
@@ -289,8 +286,6 @@ Settings:
       End: 'Final'
       Hidden: Oculto
       Blur: Difuminar
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
-      Invidious (por defecto es https://invidious.snopyta.org)'
     Region for Trending: 'Región de las tendencias'
         #! List countries
     Check for Latest Blog Posts: Buscar últimas publicaciones del blog
@@ -315,8 +310,9 @@ Settings:
     Auto Load Next Page:
       Label: Carga automática de la página siguiente
       Tooltip: Cargar automáticamente páginas adicionales y comentarios.
+    Open Deep Links In New Window: Abrir URL pasadas a FreeTube en una nueva ventana
   Theme Settings:
-    Theme Settings: 'Configuración del tema'
+    Theme Settings: 'Tema'
     Match Top Bar with Main Color: 'Usar color principal para barra superior'
     Base Theme:
       Base Theme: 'Tema base'
@@ -331,6 +327,8 @@ Settings:
       Nordic: Nórdico
       Solarized Light: Solarized claro
       Solarized Dark: Solarized oscuro
+      Gruvbox Dark: Gruvbox oscuro
+      Gruvbox Light: Gruvbox claro
     Main Color Theme:
       Main Color Theme: 'Color principal'
       Red: 'Rojo'
@@ -378,6 +376,16 @@ Settings:
       Solarized Blue: Azul Solarized
       Solarized Cyan: Cian Solarized
       Solarized Green: Verde Solarized
+      Gruvbox Dark Green: Gruvbox verde oscuro
+      Gruvbox Dark Yellow: Gruvbox amarillo oscuro
+      Gruvbox Dark Blue: Gruvbox azul oscuro
+      Gruvbox Dark Purple: Gruvbox púrpura
+      Gruvbox Dark Aqua: Gruvbox aguamarina oscuro
+      Gruvbox Light Purple: Gruvbox violeta claro
+      Gruvbox Dark Orange: Gruvbox naranja oscuro
+      Gruvbox Light Red: Gruvbox rojo claro
+      Gruvbox Light Blue: Gruvbox azul claro
+      Gruvbox Light Orange: Gruvbox naranja claro
     Secondary Color Theme: 'Color secundario'
         #* Main Color Theme
     UI Scale: Escala de IU
@@ -386,7 +394,7 @@ Settings:
     Hide Side Bar Labels: Ocultar las etiquetas de la barra lateral
     Hide FreeTube Header Logo: Ocultar el logotipo de Freetube de la parte superior
   Player Settings:
-    Player Settings: 'Configuración del reproductor'
+    Player Settings: 'Reproductor'
     Play Next Video: 'Reproducción continua'
     Turn on Subtitles by Default: 'Activar subtítulos por defecto'
     Autoplay Videos: 'Reproducción automática de vídeos'
@@ -413,7 +421,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Intervalo de Siguiente Video en Playlist
-    Next Video Interval: Siguiente segmento de vídeo
+    Next Video Interval: Temporizador de cuenta atrás de reproducción automática
     Display Play Button In Video Player: Mostrar el botón de reproducción sobre el
       vídeo
     Scroll Volume Over Video Player: Cambiar el volumen con la rueda del ratón sobre
@@ -442,8 +450,9 @@ Settings:
     Enter Fullscreen on Display Rotate: Entrar en pantalla completa al girar la pantalla
     Skip by Scrolling Over Video Player: Omitir al desplazarse sobre el reproductor
       de vídeo
+    Autoplay Interruption Timer: Temporizador de interrupción de reproducción automática
   Privacy Settings:
-    Privacy Settings: 'Ajustes de Privacidad'
+    Privacy Settings: 'Privacidad'
     Remember History: 'Recordar historial'
     Save Watched Progress: 'Guardar progreso reproducido'
     Clear Search Cache: 'Borrar cache de búsqueda'
@@ -464,22 +473,19 @@ Settings:
     Are you sure you want to remove all your playlists?: ¿Estás seguro de que quieres
       eliminar todas tus listas de reproducción?
   Subscription Settings:
-    Subscription Settings: 'Ajustes de Suscripciones'
+    Subscription Settings: 'Suscripción'
     Hide Videos on Watch: 'Ocultar vídeos vistos'
     Fetch Feeds from RSS: 'Recuperar suministros desde RSS'
-    Manage Subscriptions: 'Gestionar suscripciones'
     Fetch Automatically: Obtener los feed automáticamente
-    Only Show Latest Video for Each Channel: Mostrar solo los últimos vídeos de cada
-      canal
     Confirm Before Unsubscribing: Evitar bajas accidentales
+    'Limit the number of videos displayed for each channel': Limitar el número de
+      vídeos mostrados para cada canal
+    To: A
   Data Settings:
-    Data Settings: 'Ajustes de Datos'
+    Data Settings: 'Datos'
     Select Import Type: 'Seleccionar tipo de importación'
     Select Export Type: 'Seleccionar tipo de exportación'
     Import Subscriptions: 'Importar suscripciones'
-    Import FreeTube: 'Importar FreeTube'
-    Import YouTube: 'Importar YouTube'
-    Import NewPipe: 'Importar NewPipe'
     Export Subscriptions: 'Exportar suscripciones'
     Export FreeTube: 'Exportar FreeTube'
     Export YouTube: 'Exportar YouTube'
@@ -507,7 +513,6 @@ Settings:
     Unable to write file: 'Imposible escribir el archivo'
     Unknown data key: 'Clave de datos desconocida'
     How do I import my subscriptions?: '¿Cómo puedo importar mis suscripciones?'
-    Check for Legacy Subscriptions: Comprobar suscripciones Legacy
     Manage Subscriptions: Administrar suscripciones
     Import Playlists: Importar listas de reproducción
     Export Playlists: Exportar listas de reproducción
@@ -529,32 +534,6 @@ Settings:
         listas de reproducción en Configuración de privacidad.\n3. Inicia la versión
         anterior de FreeTube e importa las listas de reproducción exportadas.\""
       Label: Exportar listas de reproducción de versiones anteriores de FreeTube
-  Advanced Settings:
-    Advanced Settings: 'Ajustes avanzados'
-    Enable Debug Mode (Prints data to the console): 'Activar modo de depuración (muestra
-      datos en la consola)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Dirección de máscara (Ejemplo:
-      SOCKS5://127.0.0.1:9050)'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Haciendo
-      click en "PROBAR MÁSCARA" se enviará una solicitud a https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Usa Tor / Máscara para llamadas API'
-    TEST PROXY: 'PROBAR MÁSCARA'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Ver instancias públicas'
-    Clear History:
-      Clear History: 'Borrar historial'
-      # On Click
-      Are you sure you want to delete your history?: '¿Seguro de que quieres borrar
-        el historial?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Borrar suscripciones'
-      # On Click
-      Are you sure you want to remove all subscriptions?: '¿Seguro de que quieres
-        borrar todas las suscripciones?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Video Likes And Dislikes: Ocultar «likes» y «dislikes» de vídeos
@@ -565,7 +544,7 @@ Settings:
     Hide Recommended Videos: Ocultar vídeos recomendados
     Hide Comment Likes: Ocultar «likes» de comentarios
     Hide Channel Subscribers: Ocultar suscriptores
-    Distraction Free Settings: Modo sin distracciones
+    Distraction Free Settings: Sin distracciones
     Hide Active Subscriptions: Ocultar suscripciones activas
     Hide Playlists: Ocultar listas de reproducción
     Hide Video Description: Ocultar la descripción del vídeo
@@ -579,22 +558,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Mostrar títulos sin mayúsculas
       ni signos de puntuación excesivos
     Hide Featured Channels: Ocultar canales recomendados
-    Hide Channel Playlists: Ocultar las listas de reproducción de los canales
-    Hide Channel Community: Ocultar canales de la comunidad
-    Hide Channel Shorts: Ocultar canales de shorts
+    Hide Channel Playlists: Ocultar la pestaña "Listas de reproducción" del canal
+    Hide Channel Community: Ocultar la pestaña "Comunidad" del canal
+    Hide Channel Shorts: Ocultar la pestaña "Vídeos cortos" del canal
     Sections:
       Side Bar: Barra lateral
       Channel Page: Página del canal
       Watch Page: Ver la página
       General: General
       Subscriptions Page: Página de suscripciones
-    Hide Channel Releases: Ocultar las nuevas publicaciones de los canales
-    Hide Channel Podcasts: Ocultar canales de podcasts
+    Hide Channel Releases: Ocultar la pestaña "Lanzamientos" del canal
+    Hide Channel Podcasts: Ocultar la pestaña "Podcasts" del canal
     Hide Subscriptions Shorts: Ocultar las suscripciones para shorts
     Hide Subscriptions Videos: Ocultar las suscripciones de los Vídeos
     Hide Subscriptions Live: Ocultar las suscripciones de los directos
     Hide Profile Pictures in Comments: Ocultar fotos de perfil en comentarios
-    Blur Thumbnails: Difuminar las miniaturas
     Hide Subscriptions Community: Ocultar las suscripciones de la comunidad
     Hide Channels Invalid: El ID del canal proporcionado no es válido
     Hide Channels Disabled Message: Algunos canales se bloquearon por ID y no se procesaron.
@@ -605,6 +583,7 @@ Settings:
     Hide Videos and Playlists Containing Text: Ocultar vídeos y listas de reproducción
       que contengan texto
     Hide Videos and Playlists Containing Text Placeholder: Palabra, fragmento o frase
+    Hide Channel Home: Ocultar la pestaña "Inicio" del canal
   The app needs to restart for changes to take effect. Restart and apply change?: ¿Quieres
     reiniciar FreeTube ahora para aplicar los cambios?
   Proxy Settings:
@@ -623,13 +602,18 @@ Settings:
     Proxy Protocol: Protocolo del proxy
     Enable Tor / Proxy: Activar Tor o «proxy»
     Proxy Settings: Proxy
+    Proxy Warning: FreeTube no tiene un proxy incorporado, pero puede conectarse a
+      un proxy externo, como uno que se ejecuta en su máquina como Tor o un proxy
+      externo como un proxy SOCKS5 proporcionado por algunas VPN. Si está habilitado,
+      asegúrese de que su proxy/Tor esté configurado correctamente, o FreeTube no
+      podrá recuperar ningún dato.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar cuando se salta un segmento
       de patrocinio
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL de la API de
       SponsorBlock (por defecto es https://sponsor.ajay.app)
     Enable SponsorBlock: Activar SponsorBlock
-    SponsorBlock Settings: Ajustes de SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Category Color: Color de categoría
     Skip Options:
       Show In Seek Bar: Mostrar en la barra de búsqueda
@@ -647,13 +631,13 @@ Settings:
     Custom External Player Executable: Ruta alternativa del ejecutable del reproductor
     Ignore Unsupported Action Warnings: Omitir advertencias sobre acciones no soportadas
     External Player: Reproductor externo
-    External Player Settings: Ajustes de reproductor externo
+    External Player Settings: Reproductor externo
     Players:
       None:
         Name: Ninguno
     Ignore Default Arguments: Ignorar argumentos por defecto
   Download Settings:
-    Download Settings: Descargas
+    Download Settings: Descargar
     Ask Download Path: Preguntar ruta de descarga
     Choose Path: Elegir ruta
     Download in app: Descargar en la aplicación
@@ -662,16 +646,16 @@ Settings:
   Parental Control Settings:
     Hide Unsubscribe Button: Ocultar botón de anular suscripción
     Hide Search Bar: Ocultar barra de búsqueda
-    Parental Control Settings: Ajustes del Control Parental
+    Parental Control Settings: Control parental
     Show Family Friendly Only: Mostrar solo lo apto para las familias
   Experimental Settings:
-    Experimental Settings: Ajustes experimentales
+    Experimental Settings: Experimental
     Warning: Estas configuraciones son experimentales, pueden causar fallos mientras
       están habilitadas. Es muy recomendable hacer copias de seguridad. ¡Úselo bajo
       su propio riesgo!
     Replace HTTP Cache: Reemplazar la caché HTTP
   Password Settings:
-    Password Settings: Configuración de la contraseña
+    Password Settings: Contraseña
     Set Password To Prevent Access: Establecer una contraseña para impedir el acceso
       a los ajustes
     Set Password: Establecer contraseña
@@ -681,39 +665,12 @@ Settings:
     Enter Password To Unlock: Introduce la contraseña para desbloquear los ajustes
     Password Incorrect: Contraseña incorrecta
     Unlock: Desbloquear
-  Expand All Settings Sections: Expandir todas las secciones de los ajustes
   Sort Settings Sections (A-Z): Ordenar secciones de configuración (A-Z)
+  Return to Settings Menu: Volver a los Ajustes
 About:
   #On About page
   About: 'Acerca de'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
-    software de copyleft tiene licencia libre AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    ¿Has encontrado algún fallo? ¿Tienes alguna sugerencia? ¿te gustaría colaborar?
-    Visita nuestra página en GitHub. Podrás solicitar nuevas características/cambios.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: '¡Muchísimas
-    gracias a todas las personas y los proyectos que han hecho posible FreeTube!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '¿Quieres
-    chatear? Únete a nuestro servidor en Element / Matrix. Por favor, antes de unirte,
-    lee las reglas.'
-
-  'Looking for help? Check out our Wiki page.': '¿Buscas ayuda? Visita nuestra página
-    Wiki.'
-
-  Check out our Firefox extension!: '¡Prueba nuestra extensión para Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Si
-    te gusta FreeTube, considera donar a través de Liberapay o a nuestra dirección
-    de Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Últimas noticias de FreeTube'
-
   Donate: Donar
   these people and projects: estas personas y proyectos
   FreeTube is made possible by: FreeTube es posible gracias a
@@ -735,8 +692,6 @@ About:
   Help: Ayuda
   GitHub releases: Lanzamientos de GitHub
   Downloads / Changelog: Descargas / Registro de cambios
-  View License: Ver licencia
-  Licensed under the AGPLv3: Licencia AGPLv3
   Source code: Código fuente
   Beta: Beta
   Discussions: Debates
@@ -785,7 +740,7 @@ Profile:
   Subscription List: Lista de suscripciones
   Profile Select: Seleccionar perfil
   Profile Filter: Filtro de perfil
-  Profile Settings: Ajustes del perfil
+  Profile Settings: Perfil
   Toggle Profile List: Alternar la lista de los perfiles
   Open Profile Dropdown: Abrir el desplegable del Perfil
   Close Profile Dropdown: Cerrar el desplegable del Perfil
@@ -860,6 +815,9 @@ Channel:
     Releases: Publicaciones
     This channel does not currently have any releases: Este canal no tiene actualmente
       ninguna publicación
+  Home:
+    Home: Inicio
+    View Playlist: Ver lista de reproducción
 Video:
   Mark As Watched: 'Marcar como visto'
   Remove From History: 'Borrar del historial'
@@ -890,38 +848,8 @@ Video:
     el chat no funciona con la API de Invidious. Se requiere una conexión directa
     con YouTube.'
   Published:
-    Jan: 'ene'
-    Feb: 'feb'
-    Mar: 'mar'
-    Apr: 'abr'
-    May: 'mayo'
-    Jun: 'jun'
-    Jul: 'jul'
-    Aug: 'ago'
-    Sep: 'sep'
-    Oct: 'oct'
-    Nov: 'nov'
-    Dec: 'dic'
-    Second: 'segundo'
-    Seconds: 'segundos'
-    Minute: 'minuto'
-    Minutes: 'minutos'
-    Hour: 'hora'
-    Hours: 'horas'
-    Day: 'día'
-    Days: 'días'
-    Week: 'semana'
-    Weeks: 'semanas'
-    Month: 'mes'
-    Months: 'meses'
-    Year: 'año'
-    Years: 'años'
-    Ago: 'Hace'
-    Upcoming: 'Se estrenará el'
-    Less than a minute: Menos de un minuto
     In less than a minute: En menos de un minuto
   Published on: 'Publicado el'
-  Publicationtemplate: 'Hace {number} {unit}'
 #& Videos
   Play Previous Video: Reproducir el vídeo anterior
   Play Next Video: Reproducir vídeo siguiente
@@ -1009,6 +937,17 @@ Video:
     Theatre Mode: Modo cine
     Exit Theatre Mode: Salir del modo cine
     Full Window: Pantalla completa
+  IP block: YouTube ha bloqueado tu dirección IP para ver vídeos. Por favor, intenta
+    cambiar a otra VPN o proxy.
+  MembersOnly: Los videos solo para miembros no se pueden ver con FreeTube ya que
+    requieren un inicio de sesión en Google y una membresía pagada al canal del cargador.
+  Unlisted: No listado
+  AgeRestricted: Los vídeos con restricciones de edad no se pueden ver con FreeTube
+    ya que requieren iniciar sesión en Google y usar una cuenta de YouTube verificada
+    por edad.
+  DeArrow:
+    Show Original Details: Mostrar detalles originales
+    Show Modified Details: Mostrar detalles modificados
 Videos:
   #& Sort By
   Sort By:
@@ -1019,9 +958,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver la lista de reproducción completa'
-  Videos: 'Vídeos'
-  View: 'Ver'
-  Views: 'Vistas'
   Last Updated On: 'Se actualizó por última vez el'
 
 # On Video Watch Page
@@ -1037,7 +973,8 @@ Playlist:
     VideoTitleAscending: Título (A-Z)
     Sort By: Ordenar por
     VideoTitleDescending: Título (Z-A)
-Toggle Theatre Mode: 'Activar modo cine'
+    VideoDurationAscending: Duración (primero la más corta)
+    VideoDurationDescending: Duración (la más larga primero)
 Change Format:
   Change Media Formats: 'Cambiar formato de vídeo'
   Use Dash Formats: 'Utilizar formatos DASH'
@@ -1106,7 +1043,6 @@ Invidious API Error (Click to copy): 'Error de la API de Invidious (Clic para co
   el código)'
 Falling back to Invidious API: 'Recurriendo a la API de Invidious'
 Falling back to Local API: 'Recurriendo a la API local'
-Subscriptions have not yet been implemented: 'Todavía no se han implementado las suscripciones'
 Loop is now disabled: 'Reproducción en bucle desactivada'
 Loop is now enabled: 'Reproducción en bucle activada'
 Shuffle is now disabled: 'Reproducción aleatoria desactivada'
@@ -1166,12 +1102,15 @@ Tooltips:
     External Link Handling: "Elija el comportamiento por defecto cuando se hace clic
       en un enlace que no se pueda abrirse en FreeTube. \nPor defecto, FreeTube abrirá
       el enlace en el que se hizo clic en su navegador predeterminado.\n"
+    Open Deep Links In New Window: Las URL que se pasan a FreeTube, por ejemplo mediante
+      la redirección de extensiones del navegador o argumentos de la línea de comandos,
+      se abren en una ventana nueva.
   External Player Settings:
     Custom External Player Executable: Por defecto, FreeTube buscará el reproductor
       externo seleccionado mediante la variable de entorno PATH, de no encontrarlo,
       podrás especificar una ruta personalizada aquí.
-    Custom External Player Arguments: Depara cada argumento mediante un punto y coma
-      (;) cada argumento será enviado al reproductor externo.
+    Custom External Player Arguments: Cualquier argumento personalizado de la línea
+      de comandos que desee pasar al reproductor externo.
     Ignore Warnings: Ocultar advertencias por argumentos incompatibles con el reproductor
       (ej. invertir listas de reproducción, etc.).
     External Player: La elección de un reproductor externo mostrará un icono, para
@@ -1207,8 +1146,6 @@ More: Más
 Unknown YouTube url type, cannot be opened in app: Tipo de URL desconocido. No se
   puede abrir en la aplicación
 Open New Window: Abrir ventana nueva
-Hashtags have not yet been implemented, try again later: Los hashtags no se han implementado
-  todavía, inténtalo más adelante
 Playing Next Video Interval: Reproduciendo el vídeo a continuación. Haz clic para
   cancelar. | El siguiente vídeo se reproducirá en {nextVideoInterval} segundos. Haz
   clic para cancelar. | El siguiente vídeo se reproducirá en {nextVideoInterval} segundos.
@@ -1235,8 +1172,6 @@ Channels:
   Search bar placeholder: Buscar canales
   Count: '{number} canal(es) encontrado(s).'
   Empty: Tu lista de canales está actualmente vacía.
-  Unsubscribe: Cancelar la suscripción
-  Unsubscribed: '{channelName} ha sido eliminado de tus suscripciones'
   Unsubscribe Prompt: ¿Está seguro/segura de querer desuscribirse de «{channelName}»?
 Clipboard:
   Copy failed: Error al copiar al portapapeles
@@ -1248,6 +1183,7 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Lista de los capítulos
     ocultos, capítulo actual: {chapterName}'
   Chapters: Capítulos
+  Key Moments: Momentos clave
 Preferences: Preferencias
 Ok: De acuerdo
 Hashtag:
@@ -1285,5 +1221,26 @@ Search Listing:
     Subtitles: Subtítulos
     Closed Captions: Subtítulos descriptivos
     4K: 4K
+    360 Video: 360°
+    New: Nuevo
+    8K: 8K
+    VR180: VR180
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Bloqueada la apertura de la URL potencialmente
   insegura: «{url}».'
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Right-click or hold to see history: Clic con el botón derecho del ratón o mantén presionado
+  para ver el historial
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Flecha hacia abajo
+  arrowleft: Flecha hacia la izquierda
+  arrowright: Flecha hacía la derecha
+  arrowup: Flecha hacia arriba
+Autoplay Interruption Timer: Reproducción automática cancelada debido a {autoplayInterruptionIntervalHours}
+  horas de inactividad
+Description:
+  Expand Description: '...más'
+  Collapse Description: Mostrar menos
diff --git a/static/locales/et.yaml b/static/locales/et.yaml
index 6dc971a053eb9..cbc855c3bea9c 100644
--- a/static/locales/et.yaml
+++ b/static/locales/et.yaml
@@ -107,7 +107,9 @@ Subscriptions:
   Subscriptions: 'Tellimused'
   Latest Subscriptions: 'Viimased tellimused'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Sinu
-    tellimuste loend on hetkel tühi. Telli kanaleid ja sa näed neid siin loendis.'
+    tellimuste loend on hetkel tühi. Kui sa soovid importida oma tellimusi, siis ava
+    seadistustest „Andmehaldus“ ja vali „Impordi tellimused“, aga samuti võid kanaleid
+    lihtsalt otsida ning seejärel tellida.'
   'Getting Subscriptions. Please wait.': 'Laadin tellimusi, palun oota.'
   Refresh Subscriptions: 'Värskenda tellimusi'
   Load More Videos: Laadi veel videosid
@@ -134,17 +136,8 @@ Most Popular: 'Populaarseimad'
 Playlists: 'Esitusloendid'
 User Playlists:
   Your Playlists: 'Sinu esitusloendid'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Sa
-    pole veel videosid siia salvestanud. Selleks palun vajuta video nurgas asuvat
-    salvestusnuppu
-  Playlist Message: See leht ei kirjelda terviklikke ja toimivad esitusloendeid. Siin
-    on kirjas vaid videod, mida oled salvestanud või mille oled märkinud lemmikuks.
-    Kui kõik on valmis, siis siin nähtavad videod on leitavad esitusloendist „Lemmikud“.
   Search bar placeholder: Otsi esindusloendeid
   Empty Search Message: Selles esitusloendis pole sinu otsingule vastavaid videosid
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Kas
-    sa oled kindel, et soovid kõik vaadatud videod sellest esitusloendist eemaldada?
-    Seda tegevust ei saa tagasi pöörata.
   You have no playlists. Click on the create new playlist button to create a new one.: Sul
     pole esitusloendeid. Uue esitusloendi loomiseks vajuta nuppu „Uus esitusloend“.
   Remove from Playlist: Eemalda esitusloendist
@@ -206,13 +199,15 @@ User Playlists:
         tühistamiseks klõpsi siin'
       This playlist is now used for quick bookmark: See esitusloend on kasutusel kiirjärjehoidjate
         jaoks
-      Quick bookmark disabled: Kiirjärjehoidjad ei ole kasutusel
       Reverted to use {oldPlaylistName} for quick bookmark: Võtsime {oldPlaylistName}
         uuesti kasutusele kiirjärjehoidjate jaoks
       Playlist {playlistName} is the new quick bookmark playlist.: Esitusloend {playlistName}
         on uus kiirjärjehoidjate esitusloend.
       This playlist is already being used for quick bookmark.: See esitusloend juba
         on kasutusel kiirjärjehoidjate jaoks.
+      This playlist has a video with a duration error: Selles esitusloendis on vähemalt
+        üks video, millel puudub kestus. Järjestamisel me sel puhul arvestame kestuseks
+        nulli.
     Search for Videos: Otsi videoid
   Are you sure you want to delete this playlist? This cannot be undone: Kas sa oled
     kindel, et soovid selle esitusloendi kustutada? Seda tegevust ei saa tagasi pöörata.
@@ -236,7 +231,6 @@ User Playlists:
       There is already a playlist with this name. Please pick a different name.: Sellise
         nimega esitusloend on juba olemas. Palun sisesta muu nimi.
     New Playlist Name: Esitusloendi uus nimi
-  Disable Quick Bookmark: Lülita kiirjärjehoidjate kasutamine välja
   Add to Favorites: Lisa esitusloendisse {playlistName}
   Remove from Favorites: Eemalda esitusloendist {playlistName}
   Enable Quick Bookmark With This Playlist: Võimalda kiirjärjehoidjate kasutamist
@@ -254,6 +248,8 @@ User Playlists:
     sa oled kindel, et soovid sellest esitusloendist eemaldada 1 vaadatud video? Seda
     tegevust ei saa tagasi pöörata. | Kas sa oled kindel, et soovid sellest esitusloendist
     eemaldada {playlistItemCount} vaadatud videot? Seda tegevust ei saa tagasi pöörata.
+  Export Playlist: Ekspordi see esitusloend
+  The playlist has been successfully exported: Esitusloendi eksportimine õnnestus
 History:
   # On History Page
   History: 'Ajalugu'
@@ -266,7 +262,7 @@ Settings:
   # On Settings Page
   Settings: 'Seadistused'
   General Settings:
-    General Settings: 'Üldised seadistused'
+    General Settings: 'Üldist'
     Check for Updates: 'Kontrolli uuendusi'
     Check for Latest Blog Posts: 'Vaata viimaseid blogipostitusi'
     Fallback to Non-Preferred Backend on Failure: 'Luba vigade korral kasutada teist
@@ -290,8 +286,6 @@ Settings:
       End: 'Lõpus'
       Hidden: Peidetud
       Blur: Hägusta pildid
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious''e
-      veebirakendus (vaikimisi kasutatav sait on https://invidious.snopyta.org)'
     Region for Trending: 'Mis geograafia alusel tuvastame hetkel menukad ehk populaarsust
       koguvad videod'
         #! List countries
@@ -314,8 +308,9 @@ Settings:
     Auto Load Next Page:
       Label: Laadi järgmine leht automaatselt
       Tooltip: Laadi järgmised lehed ja kommentaarid automaatselt.
+    Open Deep Links In New Window: Ava FreeTube'ile antud võrguaadressid uues aknas
   Theme Settings:
-    Theme Settings: 'Välimuse seadistused'
+    Theme Settings: 'Kujundus'
     Match Top Bar with Main Color: 'Kasuta ülaribal põhivärvi'
     Base Theme:
       Base Theme: 'Põhiteema'
@@ -330,6 +325,8 @@ Settings:
       Nordic: Põhjala
       Solarized Dark: Tume päikesekuma
       Solarized Light: Hele päikesekuma
+      Gruvbox Dark: Gruuvimasina tume
+      Gruvbox Light: Gruuvimasina hele
     Main Color Theme:
       Main Color Theme: 'Põhiline värviteema'
       Red: 'Punane'
@@ -377,6 +374,16 @@ Settings:
       Solarized Cyan: Rohekassinine päikesekuma
       Solarized Green: Roheline päikesekuma
       Solarized Yellow: Kollane päikesekuma
+      Gruvbox Dark Blue: Gruuvimasina tumesinine
+      Gruvbox Light Blue: Gruuvimasina helesinine
+      Gruvbox Dark Green: Gruuvimasina tumeroheline
+      Gruvbox Light Red: Gruuvimasina helepunane
+      Gruvbox Dark Purple: Gruuvimasina tumepurpur
+      Gruvbox Dark Orange: Gruuvimasina tumeoranž
+      Gruvbox Dark Yellow: Gruuvimasina kollane
+      Gruvbox Dark Aqua: Gruuvimasina tume vesi
+      Gruvbox Light Purple: Gruuvimasina helepurpur
+      Gruvbox Light Orange: Gruuvimasina heleoranž
     Secondary Color Theme: 'Värvide alamteema'
         #* Main Color Theme
     UI Scale: Kasutajaliidese suurus
@@ -385,7 +392,7 @@ Settings:
     Hide Side Bar Labels: Peida külgriba sildid
     Hide FreeTube Header Logo: Peida FreeTube'i päise logo
   Player Settings:
-    Player Settings: 'Videomängija seadistused'
+    Player Settings: 'Meediamängija'
     Play Next Video: 'Esita ka järgmist videot'
     Turn on Subtitles by Default: 'Vaikimisi näita subtiitreid'
     Autoplay Videos: 'Esita videod automaatselt'
@@ -411,7 +418,7 @@ Settings:
       1440p: '1440p'
       4k: '4k'
       8k: '8k'
-    Next Video Interval: Viivitus järgmise video esitamisel
+    Next Video Interval: Viivituse taimer järgmise video esitamisel
     Display Play Button In Video Player: Kuva videomängijas esitamise nuppu
     Scroll Volume Over Video Player: Muuda helivaljust videovaate kohal kerides
     Fast-Forward / Rewind Interval: Kiirkerimise välp
@@ -436,8 +443,9 @@ Settings:
         Alamkaustade loomiseks võid kasutada ka „\“ või „/“.
     Skip by Scrolling Over Video Player: Jäta vahele, kerides üle videopleieri
     Enter Fullscreen on Display Rotate: Ekraani pööramisel ava täisekraanivaade
+    Autoplay Interruption Timer: Viivituse taimer järgmise video esitamise katkestamisel
   Privacy Settings:
-    Privacy Settings: 'Privaatsuse seadistused'
+    Privacy Settings: 'Privaatsus'
     Remember History: 'Jäta ajalugu meelde'
     Save Watched Progress: 'Salvesta vaatamise olek'
     Clear Search Cache: 'Kustuta otsingute ajalugu'
@@ -459,21 +467,19 @@ Settings:
     Are you sure you want to remove all your playlists?: Kas sa oled kindel, et soovid
       kõik esitusloendid eemaldada?
   Subscription Settings:
-    Subscription Settings: 'Tellimuste seadistused'
+    Subscription Settings: 'Tellimused'
     Hide Videos on Watch: 'Vaatamisel peida videod'
     Fetch Feeds from RSS: 'Laadi RSS-uudisvood'
-    Manage Subscriptions: 'Halda tellimusi'
     Fetch Automatically: Laadi tellimuste voog automaatselt
-    Only Show Latest Video for Each Channel: Iga kanali puhul näita vaid viimast videot
     Confirm Before Unsubscribing: Väldi ekslikku ja juhuslikku tellimusest loobumist
+    To: Kuni
+    'Limit the number of videos displayed for each channel': Piira igas kanalis näidatavate
+      videote arvu
   Data Settings:
     Data Settings: 'Andmehaldus'
     Select Import Type: 'Vali imporditava faili vorming'
     Select Export Type: 'Vali eksporditava faili vorming'
     Import Subscriptions: 'Impordi tellimused'
-    Import FreeTube: 'Kasuta FreeTube vormingut'
-    Import YouTube: 'Kasuta YouTube vormingut'
-    Import NewPipe: 'Kasuta NewPipe vormingut'
     Export Subscriptions: 'Ekspordi tellimused'
     Export FreeTube: 'Ekspordi FreeTube vormingus'
     Export YouTube: 'Ekspordi YouTube vormingus'
@@ -501,7 +507,6 @@ Settings:
     Unknown data key: 'Tundmatu andmevõti'
     How do I import my subscriptions?: 'Kuidas ma saan oma tellimusi importida?'
     Manage Subscriptions: Halda tellimusi
-    Check for Legacy Subscriptions: Kontrolli pärandvormingus tellimuste olemasolu
     Export Playlists: Ekspordi esitusloendeid
     All playlists has been successfully imported: Kõikide esitusloendite import õnnestus
     All playlists has been successfully exported: Kõikide esitusloendite eksport õnnestus
@@ -519,7 +524,6 @@ Settings:
         „Kustuta kõik esitusloendid“.\n3. Käivita vanem FreeTube'i versioon ja impordi
         esimeses sammus eksporditud esitusloendid."
       Label: Ekspordi esitusloendid vanemate FreeTube'i versioonide jaoks
-  Advanced Settings: {}
   Distraction Free Settings:
     Hide Active Subscriptions: Peida aktiivsed tellimused
     Hide Live Chat: Peida veebivestlused
@@ -531,7 +535,7 @@ Settings:
     Hide Channel Subscribers: Peida kanalite tellijad
     Hide Video Likes And Dislikes: Peida videote meeldimiste ja mittemeeldimiste arvud
     Hide Video Views: Peida videote vaatamiskordade arv
-    Distraction Free Settings: Seadista endale võimalikult rahulik videote vaatamine
+    Distraction Free Settings: Rahulik vaade
     Hide Video Description: Peida video kirjeldus
     Hide Comments: Peida kommentaarid
     Hide Live Streams: Peida otseülekanded
@@ -549,16 +553,15 @@ Settings:
       Watch Page: Videovaade
       Subscriptions Page: Tellimuste vaade
     Hide Featured Channels: Peaida soovitatud kanalid
-    Hide Channel Playlists: Peida kanali esitusloendid
-    Hide Channel Shorts: Peida kanali lühivideod
-    Hide Channel Community: Peida kanali kogukond
-    Hide Channel Podcasts: Peida kanali taskuhäälingud
-    Hide Channel Releases: Peida kanali väljalasked
+    Hide Channel Playlists: Peida kanalite vahekaart „Esitusloendid“
+    Hide Channel Shorts: Peida kanalite vahekaart „Lühivideod“
+    Hide Channel Community: Peida kanalite vahekaart „Kogukond“
+    Hide Channel Podcasts: Peida kanalite vahekaart „Taskuhäälingud“
+    Hide Channel Releases: Peida kanalite vahekaart „Väljalasked“
     Hide Subscriptions Videos: Peida tellimuste videod
     Hide Subscriptions Shorts: Peida tellimuste lühivideod
     Hide Subscriptions Live: Peida tellimuste otse-eetrid
     Hide Profile Pictures in Comments: Peida kommentaaride profiilipildid
-    Blur Thumbnails: Hägusta pisipildid
     Hide Subscriptions Community: Peida tellijate loend
     Hide Channels Invalid: Sisestatud kanali tunnus on vigane
     Hide Channels Disabled Message: Mõned kanalid on blokeeritud nende tunnuste alusel
@@ -570,6 +573,8 @@ Settings:
     Hide Videos and Playlists Containing Text Placeholder: Sõna, sõnaosa või fraas
     Hide Videos and Playlists Containing Text: Peida videod ja esitusloendid, kus
       leidub sellist teksti
+    Hide Channel Home: Peida kanalite vahekaart „Avaleht“
+    Show Added Items: Näita lisatud kirjeid
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: Võrguteavet
       ei õnnestu leida. Kas sa oled puhverserveri ikka korralikult seadistanud?
@@ -585,7 +590,13 @@ Settings:
     Proxy Host: Puhverserveri aadress
     Proxy Protocol: Puhverserveri protokoll
     Enable Tor / Proxy: Kasuta Tor'i või puhverserverit
-    Proxy Settings: Puhverserveri seadistused
+    Proxy Settings: Puhverserver
+    Proxy Warning: FreeTube'is pole sisseehitatud proksilahendust, kuid ta võib luua
+      ühenduse välise proksi kaudu. Näiteks kasutades sellist, mis töötab sinu arvutis
+      või nutiseadmes, olgu selleks Tor või mõne VPNi poolt pakutav SOCKS5. Kui sa
+      selle eelistuse sisse lülitad, palun jälgi et selline väline proksi on korralikult
+      seadistatud. Vastasel juhul võrguühendus ei toimi ja FreeTube ei saa andmeid
+      laadida.
   The app needs to restart for changes to take effect. Restart and apply change?: See
     rakendus vajab muudatuste jõustamiseks uuesti käivitamist. Kas teeme seda nüüd?
   SponsorBlock Settings:
@@ -593,7 +604,7 @@ Settings:
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Sponsorite blokeerija
       API URL (vaikimisi https://sponsor.ajay.app)
     Enable SponsorBlock: Kasuta sponsorite blokeerijat
-    SponsorBlock Settings: Sponsorite blokeerija seadistused
+    SponsorBlock Settings: Sponsorite blokeerija
     Skip Options:
       Auto Skip: Automaatne vahelejätmine
       Show In Seek Bar: Näita otsinguribal
@@ -607,7 +618,7 @@ Settings:
       pisipiltide loomise teenuse API url (Vaikimisi on see https://dearrow-thumb.ajay.app)
   External Player Settings:
     External Player: Väline meediamängija
-    External Player Settings: Välise meediamängija seadistused
+    External Player Settings: Väline meediamängija
     Custom External Player Arguments: Välise meediamängija rakenduse argumendid
     Custom External Player Executable: Välise meediamängija rakenduse asukoht
     Ignore Unsupported Action Warnings: Eira mittetoetatud toimingute hoiatusi
@@ -616,19 +627,19 @@ Settings:
         Name: Puudub
     Ignore Default Arguments: Eira vaikimisi käsureaargumente
   Download Settings:
-    Download Settings: Allalaadimise seadistused
+    Download Settings: Allalaadimised
     Ask Download Path: Küsi kuhu kausta soovid faile alla laadida
     Choose Path: Vali asukoht
     Download Behavior: Tegevus allalaadimisel
     Open in web browser: Ava veebibrauseris
     Download in app: Laadi alla rakenduses
   Parental Control Settings:
-    Parental Control Settings: Vanemliku järelevalve seadistused
+    Parental Control Settings: Vanemlik järelevalve
     Hide Unsubscribe Button: Peida tellimuse tühistamise nupp
     Show Family Friendly Only: Näita ainult peresõbralikku sisu
     Hide Search Bar: Peida otsinguriba
   Experimental Settings:
-    Experimental Settings: Katselised seadistused
+    Experimental Settings: Katsed
     Warning: Tegemist on katseliste seadistustega ja sisselülitamisel võivad põhjustada
       rakenduse kokkujooksmist. Kindlasti ära unusta oma andmete varundamist. Jätka
       omal vastutusel!
@@ -639,12 +650,12 @@ Settings:
     Unlock: Võta lukust lahti
     Password: Salasõna
   Password Settings:
-    Password Settings: Salasõna seadistused
+    Password Settings: Salasõnad
     Remove Password: Eemalda salasõna
     Set Password: Määra salasõna
     Set Password To Prevent Access: Vältimaks ligipääsu seadistustele määra salasõna
-  Expand All Settings Sections: Laienda kõik seadistuste lõigud
   Sort Settings Sections (A-Z): Järjesta seadistused (A-Z)
+  Return to Settings Menu: Tagasi seadistuste menüü juurde
 About:
   #On About page
   About: 'Teave'
@@ -670,8 +681,6 @@ About:
   Help: Abiteave
   GitHub releases: Avaldatud versioonid leiad GitHub'ist
   Downloads / Changelog: Allalaadimised ja muudatuste logi
-  View License: Vaata litsentsiteavet inglise keeles
-  Licensed under the AGPLv3: Avaldatud AGPLv3 litsentsi alusel
   Source code: Lähtekood
   Beta: beetaversioon
   Discussions: Arutelud
@@ -720,7 +729,7 @@ Profile:
     profiilidest.'
 #On Channel Page
   Profile Filter: Sirvi profiile
-  Profile Settings: Profiili seadistused
+  Profile Settings: Profiil
   Toggle Profile List: Lülita profiilide loend sisse/välja
   Profile Name: Profiili nimi
   Edit Profile Name: Muuda profiili nime
@@ -736,7 +745,7 @@ Channel:
   Added channel to your subscriptions: 'Lisasin kanali sinu tellimuste hulka'
   Search Channel: 'Otsi kanalit'
   Your search results have returned 0 results: 'Otsingul on 0 tulemust'
-  Sort By: 'Sortimise alus'
+  Sort By: 'Järjestus'
   Videos:
     Videos: 'Videod'
     This channel does not currently have any videos: 'Sellel kanalik pole hetkel ühtegi
@@ -792,6 +801,9 @@ Channel:
     This channel does not currently have any releases: Sellel kanalil pole hetkel
       ühtegi väljalaset
     Releases: Väljalasked
+  Home:
+    Home: Avaleht
+    View Playlist: Vaata esitusloendit
 Video:
   Mark As Watched: 'Märgi vaadatuks'
   Remove From History: 'Kustuta ajaloost'
@@ -828,37 +840,8 @@ Video:
     kasutad Invidious''e veebiteenuse-põhist API''t, siis reaalajas vestlus ei ole
     toetatud. Selleks on vajalik otseliidestus YouTube''ga.'
   Published:
-    Jan: 'Jaan'
-    Feb: 'Veeb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Mai'
-    Jun: 'Juuni'
-    Jul: 'Juuli'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Dets'
-    Second: 'Sekund'
-    Seconds: 'Sekundit'
-    Minute: 'Minut'
-    Minutes: 'Minutit'
-    Hour: 'Tund'
-    Hours: 'Tundi'
-    Day: 'Päev'
-    Days: 'Päeva'
-    Week: 'Nädal'
-    Weeks: 'Nädalat'
-    Month: 'Kuu'
-    Months: 'Kuud'
-    Year: 'Aasta'
-    Years: 'Aastat'
-    Ago: 'tagasi'
-    Upcoming: 'Esilinastus'
     In less than a minute: Vähem kui minuti pärast
   Published on: 'Avaldatud'
-  Publicationtemplate: '{number} {unit} tagasi'
 #& Videos
   Copy Invidious Channel Link: Kopeeri kanali link Invidious'e veebirakenduses
   Open Channel in Invidious: Ava kanal Invidious'e veebirakenduses
@@ -937,6 +920,17 @@ Video:
     Playback will resume automatically when your connection comes back: Taasesitus
       jätkub automaatselt niipea, kui sinu seadme võrguühendus taastub.
     You appear to be offline: Sa ei tundu olema võrgus.
+  IP block: YouTube on blokeerinud sinu nutiseadme IP-aadressilt videote vaatamise.
+    Palun kasuta mõnda muud VPN-teenust või puhverserverit.
+  MembersOnly: Kuna vajalik on sisselogimine Google'i kontoga ja tasuline liikmelisus
+    üleslaadija kanalis, siis ainult liikmetele mõeldud videoid ei saa FreeTube'is
+    vaadata.
+  AgeRestricted: Kuna vajalik on sisselogimine Google'i kontoga, kus vanus on kontrollitud,
+    siis vanusepiiranguga videoid ei saa FreeTube'is vaadata.
+  Unlisted: Registriväline
+  DeArrow:
+    Show Original Details: Näita algseid üksikasju
+    Show Modified Details: Näita muudetud üksikasju
 Videos:
   #& Sort By
   Sort By:
@@ -947,9 +941,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Näita kogu esitusloendit'
-  Videos: 'Videod'
-  View: 'Vaata'
-  Views: 'vaatamist'
   Last Updated On: 'Viimati uuendatud'
 
 # On Video Watch Page
@@ -965,7 +956,8 @@ Playlist:
     AuthorDescending: Autori alusel (Z-A)
     VideoTitleAscending: Pealkirja alusel (A-Z)
     VideoTitleDescending: Pealkirja alusel (Z-A)
-Toggle Theatre Mode: 'Lülita lai vaade sisse/välja'
+    VideoDurationAscending: Kestuse alusel (esmalt lühemad)
+    VideoDurationDescending: Kestuse alusel (esmalt pikemad)
 Change Format:
   Change Media Formats: 'Muuda videovorminguid'
   Use Dash Formats: 'Kasuta DASH-vorminguid'
@@ -1010,7 +1002,7 @@ Comments:
   Reply: 'vastus'
   There are no comments available for this video: 'Seda videot pole veel kommenteeritud'
   Load More Comments: 'Laadi veel kommentaare'
-  Sort by: Sortimise alus
+  Sort by: Järjestus
   No more comments available: Rohkem kommentaare pole
   Newest first: Uuemad esimesena
   Top comments: Parimad esimesena
@@ -1033,7 +1025,6 @@ Falling back to Local API: 'Varuvariandina kasutan kohalikku API''t'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Kuna
   vajalikke vorminguid ei leidu, siis see video pole saadaval. Niisugune viga võib
   juhtuda ka maapiirangute tõttu.'
-Subscriptions have not yet been implemented: 'Tellimuste kasutamine pole veel implementeeritud'
 Loop is now disabled: 'Esituse kordamine ei ole nüüd kasutusel'
 Loop is now enabled: 'Esituse kordamine on nüüd kasutusel'
 Shuffle is now disabled: 'Juhuslik esitus ei ole nüüd kasutusel'
@@ -1049,8 +1040,6 @@ Yes: 'Jah'
 No: 'Ei'
 More: Veel
 Open New Window: Ava uus aken
-Hashtags have not yet been implemented, try again later: Teemaviiteid ei saa veel
-  kasutada, palun proovi hiljem uuesti
 Unknown YouTube url type, cannot be opened in app: Tundmatu YouTube'i urli tüüp, mida
   ei saa rakenduses avada
 Tooltips:
@@ -1060,8 +1049,8 @@ Tooltips:
       muu asukoha.
     Ignore Warnings: Kui väline meediamängija antud funktsionaalsust (näiteks esitusloendi
       järjekorra pööramine) ei toeta, siis ära näita hoiatusi.
-    Custom External Player Arguments: Semikoolonitega (;) eraldatud käsurea argumendid,
-      mida sa soovid välisele meediamängijale saata.
+    Custom External Player Arguments: Misiganes käsurea argumendid, mida sa soovid
+      välisele meediamängijale saata.
     External Player: "Seadistades välise meediamängija kuvame pisipildil ikooni video
       (või esitusloendi) esitamiseks välises meediamängijas. Hoiatus: Invidious'e
       seadistused ei mõjuta välise meediamängija kasutamist."
@@ -1089,6 +1078,8 @@ Tooltips:
       tegemisel.
     External Link Handling: "Vali vaikekäitumine, kui vajutatakse linki, mida ei saa
       avada FreeTubes.\nVaikimisi avaneb link kasutaja vaikebrauseris.\n"
+    Open Deep Links In New Window: FreeTube'ile brauseritest või käsurealt antud võrguaadressid
+      avatakse uues aknas.
   Player Settings:
     Default Video Format: Vali kasutatavad videovormingud. DASH-vormingutel on üldjuhul
       parem kvaliteet. Pärandvormingute kvaliteedi ülempiir on 720p ja seetõttu kasutavad
@@ -1144,8 +1135,6 @@ Channels:
   Search bar placeholder: Otsi kanaleid
   Count: Leidsime {number} kanali(t).
   Empty: Sinu kanalite loend on praegu tühi.
-  Unsubscribe: Loobu tellimusest
-  Unsubscribed: '{channelName} on sinu tellimustest eemaldatud'
   Unsubscribe Prompt: Kas oled kindel, et soovid „{channelName}“ tellimusest loobuda?
 Screenshot Success: Kuvatõmmis on salvestatud faili „{filePath}“
 Clipboard:
@@ -1158,6 +1147,7 @@ Chapters:
     praegune peatükk: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Peatükkide loend on peidetud,
     praegune peatükk: {chapterName}'
+  Key Moments: Olulised hetked
 Ok: Sobib
 Preferences: Eelistused
 Hashtag:
@@ -1195,5 +1185,26 @@ Search Listing:
     Subtitles: Subtiitrid
     Closed Captions: Subtiitrid
     4K: 4K
+    New: Uus
+    3D: 3D-sisu
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
 'Blocked opening potentially unsafe URL': 'Blokeerisime võimaliku ohtliku aadressi
   avamise: „{url}“.'
+shortcutJoinOperator: +
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Keys:
+  arrowup: Nool üles
+  alt: Alt
+  ctrl: Ctrl
+  arrowleft: Nool vasakule
+  arrowright: Nool paremale
+  arrowdown: Nool alla
+Right-click or hold to see history: Ajaloo nägemiseks klõpsa parema hiireklahviga
+  ja hoia klahvi all
+Autoplay Interruption Timer: Automaatne esitamine katkes peale {autoplayInterruptionIntervalHours}
+  tundi jõudeolekut
+Description:
+  Expand Description: '...vaata lisaks'
+  Collapse Description: Näita vähem
diff --git a/static/locales/eu.yaml b/static/locales/eu.yaml
index eab187cf4a4a9..41b6ccc45bb80 100644
--- a/static/locales/eu.yaml
+++ b/static/locales/eu.yaml
@@ -109,7 +109,9 @@ Subscriptions:
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Honako
     profilak harpidetza anitz ditu. RSS behartu abiadura muga saihesteko'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Zure
-    harpidetzen zerrenda hutsik da. Has zaitez harpidetzak gehitzen hemen ikusteko'
+    harpidetza-zerrenda hutsik dago. Zure harpidetzak inportatu nahi badituzu, Datuen
+    konfigurazioa atalera joan eta Inportaziorako harpidetzak aukera ditzakezu, edo
+    kanal bat bilatu eta harpidetza egin dezakezu.'
   'Getting Subscriptions. Please wait.': 'Harpidetzak eskuratzen. Itxaron mesedez.'
   Refresh Subscriptions: 'Harpidetzak freskatu'
   Load More Videos: 'Bideo gehiago kargatu'
@@ -134,12 +136,6 @@ Most Popular: 'Ikusienak'
 Playlists: 'Erreprodukzio zerrendak'
 User Playlists:
   Your Playlists: 'Zure erreprodukzio zerrendak'
-  Playlist Message: 'Orrialde honek ez ditu guztiz funtzionatzen duten erreprodukzio-zerrendak
-    islatzen. Gorde dituzun edo gogoko dituzun bideoak bakarrik zerrendatzen ditu.
-    Lana amaitzen denean, hemen dauden bideo guztiak "Gogokoak" erreprodukzio-zerrenda
-    batera migratuko dira.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Gordetako
-    bideoak hutsik daude. Egin klik bideoaren izkinan den "gorde" botoian hemen zerrendatzeko'
   Search bar placeholder: Bilatu erreprodukzio-zerrendak
   Empty Search Message: Erreprodukzio-zerrenda honetan ez dago zure bilaketarekin
     bat datorren bideorik
@@ -174,7 +170,6 @@ User Playlists:
     Create: Sortu
   Enable Quick Bookmark With This Playlist: Gaitu laster-marka azkarra erreprodukzio-zerrenda
     honekin
-  Disable Quick Bookmark: Desgaitu laster-marka azkarra
   Sort By:
     NameDescending: Z-A
     LatestCreatedFirst: Sortu berria
@@ -199,7 +194,6 @@ User Playlists:
       There was a problem with removing this video: Arazo bat izan da bideoa kentzean
       This playlist is now used for quick bookmark: Erreprodukzio-zerrenda hau laster-markak
         egiteko erabiltzen da orain
-      Quick bookmark disabled: Laster-marka azkarra desgaituta dago
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Erreprodukzio-zerrenda
         hau laster-marketarako erabiltzen da orain {oldPlaylistName}-ren ordez. Egin
         klik hemen desegiteko
@@ -221,6 +215,9 @@ User Playlists:
         hau laster-markak egiteko erabiltzen ari da dagoeneko.
       Playlist {playlistName} is the new quick bookmark playlist.: '{playlistName}
         erreprodukzio-zerrenda laster-marken erreprodukzio-zerrenda azkarra da.'
+      This playlist has a video with a duration error: Erreprodukzio-zerrenda honek
+        iraupenik ez duen bideo bat du gutxienez. Hortaz, zero balitz bezala sailkatuko
+        da.
     Search for Videos: Bilatu bideoak
   AddVideoPrompt:
     Added {count} Times: Gehitu da | {count} aldiz gehitu da
@@ -243,9 +240,6 @@ User Playlists:
       bideo gehituko dira'
     "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
       gehitu dira'
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Ziur
-    ikusitako bideo guztiak erreprodukzio-zerrenda honetatik kendu nahi dituzula?
-    Hau ezin da desegin.
   Playlists with Matching Videos: Bat datozen bideoak dituzten erreprodukzio-zerrendak
   Remove Duplicate Videos: Kendu bideo bikoiztuak
   Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Ziur
@@ -259,6 +253,9 @@ User Playlists:
     honetatik kendu nahi dituzula? Hau ezin da desegin.
   Cannot delete the quick bookmark target playlist.: Ezin da laster-marken helburuko
     erreprodukzio zerrenda azkarra ezabatu.
+  Export Playlist: Erreprodukzio-zerrenda hau esportatu
+  The playlist has been successfully exported: Erreprodukzio-zerrenda ongi esportatu
+    da
 History:
   # On History Page
   History: 'Historikoa'
@@ -274,7 +271,7 @@ Settings:
     berrabiarazi behar da aldaketek eragina izan dezaten. Berrabiarazi eta aldaketa
     aplikatu?'
   General Settings:
-    General Settings: 'Ezarpen orokorrak'
+    General Settings: 'Orokorra'
     Check for Updates: 'Eguneraketak bilatu'
     Check for Latest Blog Posts: 'Egiaztatu blogeko azken argitalpenak'
     Fallback to Non-Preferred Backend on Failure: 'Hutsegitean, hobetsi gabeko backend-era
@@ -319,8 +316,10 @@ Settings:
     Auto Load Next Page:
       Tooltip: Kargatu orrialde eta iruzkin gehigarriak automatikoki.
       Label: Kargatu automatikoki hurrengo orria
+    Open Deep Links In New Window: Ireki FreeTube-ra pasatu diren URLak leiho berri
+      batean
   Theme Settings:
-    Theme Settings: 'Gaien ezarpenak'
+    Theme Settings: 'Gaia'
     Match Top Bar with Main Color: 'Lotu goiko barra kolore nagusiarekin'
     Expand Side Bar by Default: 'Zabaldu alboko barra lehenespenez'
     Disable Smooth Scrolling: 'Desgaitu korritze leuna'
@@ -338,6 +337,8 @@ Settings:
       Hot Pink: Arrosa beroa
       Solarized Dark: Solarizatu iluna
       Solarized Light: Solarizatu argia
+      Gruvbox Dark: Gruvbox Iluna
+      Gruvbox Light: Gruvbox Argia
     Main Color Theme:
       Main Color Theme: 'Oinarrizko koloreen gaia'
       Red: 'Gorria'
@@ -385,12 +386,22 @@ Settings:
       Solarized Cyan: Zian solarizatua
       Solarized Violet: Violeta solarizatua
       Solarized Green: Berde solarizatua
+      Gruvbox Dark Yellow: Gruvbox Hori Iluna
+      Gruvbox Dark Purple: gruvbox Ubel Iluna
+      Gruvbox Dark Orange: gruvbox Laranja Iluna
+      Gruvbox Light Red: Gruvbox Gorri Argia
+      Gruvbox Light Blue: Gruvbox Urdin Argia
+      Gruvbox Light Orange: Gruvbox Laranja Argia
+      Gruvbox Dark Aqua: Gruvbox Aqua Iluna
+      Gruvbox Light Purple: Gruvbox Ubel Argia
+      Gruvbox Dark Blue: Gruvbox Urdin Iluna
+      Gruvbox Dark Green: Gruvbox Berde Iluna
     Secondary Color Theme: 'Gaiaren bigarren mailako kolorea'
         #* Main Color Theme
     Hide Side Bar Labels: Ezkutatu alboko barraren etiketak
     Hide FreeTube Header Logo: Ezkutatu FreeTube goiburuko logotipoa
   Player Settings:
-    Player Settings: 'Erreprodukzioaren ezarpenak'
+    Player Settings: 'Erreproduzitzailea'
     Play Next Video: 'Hurrengo bideoa erreproduzitu'
     Turn on Subtitles by Default: 'Aktibatu Azpitituluak lehenespenez'
     Autoplay Videos: 'Bideoen erreprodukzio automatikoa'
@@ -418,7 +429,7 @@ Settings:
       8k: '8k'
     Fast-Forward / Rewind Interval: Aurrera / atzera egiteko tartea
     Scroll Volume Over Video Player: Aldatu bolumena bideo erreproduzitzailean
-    Next Video Interval: Hurrengo bideo tartea
+    Next Video Interval: Erreproduzitu automatikoki atzerako kontaketaren tenporizadorea
     Screenshot:
       Enable: Bidea eman pantaila argazkiei
       Error:
@@ -441,8 +452,9 @@ Settings:
     Video Playback Rate Interval: Bideo Erreprodukzio-tasa tartea
     Skip by Scrolling Over Video Player: Saltatu bideo-erreproduzitzailean korrituz
     Enter Fullscreen on Display Rotate: Sartu pantaila osoko pantaila biratu pantailan
+    Autoplay Interruption Timer: Erreprodukzio automatikoa eteteko tenporizadorea
   Privacy Settings:
-    Privacy Settings: 'Pribatutasunari buruzko ezarpenak'
+    Privacy Settings: 'Pribatutasuna'
     Remember History: 'Historikoa oroitu'
     Save Watched Progress: 'Ikusitakoaren progresioa gorde'
     Clear Search Cache: 'Bilaketen cachea ezabatu'
@@ -464,16 +476,16 @@ Settings:
     Are you sure you want to remove all your playlists?: Ziur erreprodukzio-zerrenda
       guztiak kendu nahi dituzula?
   Subscription Settings:
-    Subscription Settings: 'Harpidetzen ezarpenak'
+    Subscription Settings: 'Harpidetza'
     Hide Videos on Watch: 'Ikusten ari zaren bideoa ezkutatu'
     Fetch Feeds from RSS: 'RSS jarioak eskuratu'
-    Manage Subscriptions: 'Harpidetzak kudeatu'
     Fetch Automatically: Eskuratu jarioa automatikoki
-    Only Show Latest Video for Each Channel: Erakutsi soilik kanal bakoitzeko azken
-      bideoa
     Confirm Before Unsubscribing: Saihestu ustekabeko harpidetza kentzea
+    'Limit the number of videos displayed for each channel': Mugatu kanal bakoitzeko
+      bistaratzen diren bideo kopurua
+    To: Hona
   Distraction Free Settings:
-    Distraction Free Settings: 'Oharkabetasunak ekiditeko ezarpenak'
+    Distraction Free Settings: 'Oharkabetasunik ez'
     Hide Video Views: 'Bideoen ikustaldi kopurua ezkutatu'
     Hide Video Likes And Dislikes: 'Bideoen atsegiteak eta desatsegiteak ezkutatu'
     Hide Channel Subscribers: 'Kanalaren harpidedun kopurua ezkutatu'
@@ -498,21 +510,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Bistaratu izenburuak gehiegizko
       letra larriz eta puntuaziorik gabe
     Hide Channels Placeholder: Kanalaren IDa
-    Hide Channel Playlists: Ezkutatu kanaleko erreprodukzio-zerrendak
-    Hide Channel Community: Ezkutatu kanalaren komunitatea
-    Hide Channel Podcasts: Ezkutatu kanaleko podcastak
+    Hide Channel Playlists: Ezkutatu kanaleko "erreprodukzio-zerrendak" fitxa
+    Hide Channel Community: Ezkutatu kanalaren "komunitatea" fitxa
+    Hide Channel Podcasts: Ezkutatu kanaleko "podcastak" fitxa
     Hide Videos and Playlists Containing Text: Ezkutatu testua duten bideoak eta erreprodukzio-zerrendak
     Hide Channels: Ezkutatu bideoak kanaletatik
     Hide Upcoming Premieres: Ezkutatu datozen estreinaldiak
     Hide Subscriptions Videos: Ezkutatu harpidetza-bideoak
     Hide Subscriptions Shorts: Ezkutatu bideo laburren harpidetzak
-    Hide Channel Releases: Ezkutatu kanalen kaleratzeak
+    Hide Channel Releases: Ezkutatu kanalen "Argitalpenak" fitxa
     Hide Chapters: Ezkutatu kapituluak
     Hide Channels Invalid: Emandako kanalaren IDa baliogabea da
     Hide Channels API Error: Errore bat gertatu da emandako IDa duen erabiltzailea
       berreskuratzean. Mesedez, egiaztatu berriro IDa zuzena den.
     Hide Channels Already Exists: Kanalaren IDa badago jada
-    Hide Channel Shorts: Ezkutatu kanalaren bideo laburrak
+    Hide Channel Shorts: Ezkutatu kanalaren "bideo laburrak" fitxa
     Hide Videos and Playlists Containing Text Placeholder: Hitza, Hitzaren zatia edo
       esaldia
     Hide Subscriptions Live: Ezkutatu zuzenekoen harpidetzak
@@ -520,15 +532,12 @@ Settings:
     Hide Featured Channels: Ezkutatu nabarmendutako kanalak
     Hide Channels Disabled Message: Kanal batzuk IDa erabiliz blokeatu dira eta ez
       dira prozesatu. Eginbidea blokeatuta dago ID horiek eguneratzen ari diren bitartean
+    Hide Channel Home: Ezkutatu kanala "Hasierako" fitxa
   Data Settings:
-    Data Settings: 'Datuen ezarpenak'
+    Data Settings: 'Datuak'
     Select Import Type: 'Hautatu Inportazio mota'
     Select Export Type: 'Hautatu esportazio mota'
     Import Subscriptions: 'Harpidetzak inportatu'
-    Import FreeTube: 'Freetube inportatu'
-    Import YouTube: 'Youtubetik inportatu'
-    Import NewPipe: 'Newpipetik inportatu'
-    Check for Legacy Subscriptions: 'Legacy harpidetzak bilatu'
     Export Subscriptions: 'Harpidetzak esportatu'
     Export FreeTube: 'Freetubera esportatu'
     Export YouTube: 'Youtubera esportatu'
@@ -578,7 +587,7 @@ Settings:
         bertsio zaharra eta inportatu esportatutako erreprodukzio-zerrendak.\""
     Subscription File: Harpidetza Fitxategia
   Proxy Settings:
-    Proxy Settings: 'Proxy-aren ezarpenak'
+    Proxy Settings: 'Proxy-a'
     Enable Tor / Proxy: 'Tor / Proxy ahalbidetu'
     Proxy Protocol: 'Proxy protokoloa'
     Proxy Host: 'Proxy ostalaria'
@@ -594,10 +603,14 @@ Settings:
     Error getting network information. Is your proxy configured properly?: 'Errore
       bat gertatu da sareko informazioa eskuratzean. Zure proxya behar bezala konfiguratuta
       al dago?'
+    Proxy Warning: FreeTube-k ez du proxy-rik, baina kanpoko proxy batera konekta
+      daiteke, adibidez, zure makinan Tor gisa exekutatzen den bat edo kanpoko proxy
+      bat, VPN batzuek emandako proxy bat bezala. Aktibatuta badago, ziurtatu proxy/Tor
+      behar bezala konfiguratuta dagoela, edo FreeTube-k ezingo du daturik lortu.
   External Player Settings:
     Ignore Unsupported Action Warnings: Onartu gabeko ekintzen oharrei ez ikusiarena
       egin
-    External Player Settings: Kanpoko erreproduzitzailearen ezarpenak
+    External Player Settings: Kanpoko erreproduzitzailea
     External Player: Kanpoko erreproduzitzailea
     Custom External Player Executable: Lehenetsitako kanpo erreproduzitzailea exekutagarria
     Custom External Player Arguments: Lehenetsitako kanpo erreproduzitzailea argudioak
@@ -606,7 +619,7 @@ Settings:
       None:
         Name: Bat ere ez
   Download Settings:
-    Download Settings: Deskargen ezarpenak
+    Download Settings: Deskargak
     Ask Download Path: Deskargaren ibilbidea galdetu
     Choose Path: Ibilbidea hautatu
     Download Behavior: Deskargen portaera
@@ -625,7 +638,7 @@ Settings:
     Enable SponsorBlock: Babesleak blokeatzea ahalbidetu
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Babesleak blokeatzeko
       API Url (lehenetsia https://sponsor.ajay.app da)
-    SponsorBlock Settings: Babesleak blokeatzeko ezarpenak
+    SponsorBlock Settings: Babesleak blokeatu
     UseDeArrowTitles: Erabili DeArrow bideo-izenburuak
     UseDeArrowThumbnails: Erabili DeArrow irudi txikietarako
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': DeArrow
@@ -633,7 +646,7 @@ Settings:
   Parental Control Settings:
     Show Family Friendly Only: Erakutsi familientzat aproposa dena bakarrik
     Hide Unsubscribe Button: Harpidetza kendu botoia ezkutatu
-    Parental Control Settings: Gurasoen kontrolaren ezarpenak
+    Parental Control Settings: Gurasoen kontrola
     Hide Search Bar: Bilaketa barra ezkutatu
   Password Dialog:
     Password: Pasahitza
@@ -642,23 +655,21 @@ Settings:
     Enter Password To Unlock: Sartu pasahitza ezarpenak desblokeatzeko
   Experimental Settings:
     Replace HTTP Cache: Ordeztu HTTP cachea
-    Experimental Settings: Ezarpen esperimentalak
+    Experimental Settings: Esperimentalak
     Warning: Ezarpen hauek esperimentalak dira, aktibatuta dauden bitartean hutsegiteak
       eragin ditzakete. Oso gomendagarria da babeskopiak egitea. Erabili zure ardurapean!
   Password Settings:
-    Password Settings: Pasahitz ezarpenak
+    Password Settings: Pasahitza
     Set Password To Prevent Access: Ezarri pasahitz bat ezarpenetara sarbidea galarazteko
     Remove Password: Pasahitza ezabatu
     Set Password: Ezarri pasahitza
-  Expand All Settings Sections: Zabaldu ezarpen guztien atalak
   Sort Settings Sections (A-Z): Ordenatu ezarpenen atalak (A-Z)
+  Return to Settings Menu: Ezarpenen menura itzuli
 About:
   #On About page
   About: 'Honi buruz'
   Beta: 'Beta'
   Source code: 'Kode iturria'
-  Licensed under the AGPLv3: 'AGPLv3 lizentziapean'
-  View License: 'Lizentzia ikusi'
   Downloads / Changelog: 'Deskargak / Aldaketen erregistroa'
   GitHub releases: 'Github argitalpenak'
   Help: 'Laguntza'
@@ -727,7 +738,7 @@ Profile:
     al zaude hautatutako kanalak ezabatu nahi dituzula? Honek ez du kanala beste profil
     batetik ezabatuko.'
 #On Channel Page
-  Profile Settings: Profilaren ezarpenak
+  Profile Settings: Profila
   Close Profile Dropdown: Itxi goitibeherako profila
   Open Profile Dropdown: Ireki goitibeherako profila
   Toggle Profile List: Aldatu profilen zerrenda
@@ -801,6 +812,9 @@ Channel:
     Podcasts: Podcastak
     This channel does not currently have any podcasts: Une honetan kanal honek ez
       du podcastik
+  Home:
+    Home: Menu nagusia
+    View Playlist: Ikusi Erreprodukzio zerrenda
 Video:
   Mark As Watched: 'Ikusitako gisa jarri'
   Remove From History: 'Historikotik ezabatu'
@@ -850,39 +864,10 @@ Video:
   video only: 'Bideoa soilik'
   audio only: 'Audioa soilik'
   Published:
-    Jan: 'Urtarrila'
-    Feb: 'Otsaila'
-    Mar: 'Martxoa'
-    Apr: 'Apirila'
-    May: 'Maiatza'
-    Jun: 'Ekaina'
-    Jul: 'Uztaila'
-    Aug: 'Abuztua'
-    Sep: 'Iraila'
-    Oct: 'Urria'
-    Nov: 'Azaroa'
-    Dec: 'Abendua'
-    Second: 'Segundua'
-    Seconds: 'Segundoak'
-    Minute: 'Minutua'
-    Minutes: 'Minutuak'
-    Hour: 'Ordua'
-    Hours: 'Orduak'
-    Day: 'Eguna'
-    Days: 'Egunak'
-    Week: 'Astea'
-    Weeks: 'Asteak'
-    Month: 'Hilabetea'
-    Months: 'Hilabeteak'
-    Year: 'Urtea'
-    Years: 'Urteak'
-    Ago: 'Duela'
-    Upcoming: 'Estreinaldiak'
     In less than a minute: Minutu bat baino gutxiagoan
   Published on: 'Noiz argitaratua'
   Streamed on: 'Noiz zuzenean emana'
   Started streaming on: 'Noiz hasi zen zuzenekoa'
-  Publicationtemplate: 'Duela {number} {unit}'
 #& Videos
   External Player:
     Unsupported Actions:
@@ -948,6 +933,17 @@ Video:
     Playback will resume automatically when your connection comes back: Erreprodukzioa
       automatikoki berrekingo da konexioa itzultzen denean.
     Full Window: Pantaila osoa
+  MembersOnly: Kideentzat baino ez diren bideoak ezin dira FreeTube-rekin ikusi, Googleren
+    saioa hastea eta eduki sortzailearen kanalari ordaindutako bazkidetza eskatzen
+    baitute.
+  Unlisted: Zerrendatugabeak
+  AgeRestricted: Adin muga duten bideoak ezin dira FreeTube-rekin ikusi, Googlen saioa
+    hasi eta adinak egiaztatutako YouTube-ko kontu bat erabili behar delako.
+  IP block: YouTubek bideoak ikusteko zure IP helbidea blokeatu du. Mesedez, saiatu
+    VPN edo proxy desberdin batera aldatzen.
+  DeArrow:
+    Show Original Details: Erakutsi jatorrizko xehetasunak
+    Show Modified Details: Erakutsi aldatutako xehetasunak
 Videos:
   #& Sort By
   Sort By:
@@ -958,9 +954,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ikusi erreprodukzio-zerrenda osoa'
-  Videos: 'Bideoak'
-  View: 'Ikusi'
-  Views: 'Ikustaldiak'
   Last Updated On: 'Azkenengoz eguneratua'
 
 # On Video Watch Page
@@ -976,7 +969,8 @@ Playlist:
     VideoTitleDescending: Izenburua (Z-A)
     AuthorAscending: Egilea (A-Z)
     AuthorDescending: Egilea (Z-A)
-Toggle Theatre Mode: 'Aldatu Antzerki modura'
+    VideoDurationDescending: Iraupena (luzeenetik laburrenera)
+    VideoDurationAscending: Iraupena (laburrenetik luzeenera)
 Change Format:
   Change Media Formats: 'Bideoen formatuak aldatu'
   Use Dash Formats: 'DASH formatuak erabili'
@@ -1060,6 +1054,9 @@ Tooltips:
     External Link Handling: "Lehenetsitako portaera hautatu, Freetube-n ireki ezin
       den esteka bat klikatua izan denean.\nLehentasunez, Freetube-k lehenetsitako
       nabigatazailean irekiko du klikatutako esteka.\n"
+    Open Deep Links In New Window: FreeTube-ra pasatzen diren URLak, birbideratzeko
+      arakatzailearen luzapenek edo komando-lerroko argumentuek, leiho berri batean
+      irekiko dira.
   Player Settings:
     Proxy Videos Through Invidious: 'Bideoak hornitzeko Invidious-era konektatuko
       da, YouTube-ra zuzeneko konexioa egin beharrean.'
@@ -1076,10 +1073,9 @@ Tooltips:
     Skip by Scrolling Over Video Player: Erabili korritze-gurpila bideoa saltatzeko,
       MPV estiloa.
   Subscription Settings:
-    Fetch Feeds from RSS: 'Posible denean, Freetube-k bere lehenetsitako metodoa erabili
-      beharrean RSS-ak baliatuko ditu zure harpidetzen jariora konektatzeko. RSS arinagoa
-      izateaz gain, IP-en blokeoak saihesten ditu. Aldiz, zuzenekoaren egoeraren edo
-      bideoaren iraupenaren informaziorik ez du ematen, besteak beste'
+    Fetch Feeds from RSS: 'Gaituta dagoenean, FreeTube-k RSS erabiliko du zure harpidetza-elikadurari
+      eusteko. RSSa azkarragoa da eta IP blokeoa saihesten du, baina ez du informaziorik
+      ematen, hala nola bideoaren iraupena, zuzeneko egoera edo komunitateko mezuak'
     Fetch Automatically: Gaituta dagoenean, FreeTubek automatikoki eskuratuko du zure
       harpidetza-jarioa leiho berri bat irekitzen denean eta profila aldatzean.
 
@@ -1095,7 +1091,7 @@ Tooltips:
       zerrenda (posible bada) irekitzerakoan, ikono bat agertuko da miniaturan. Kontuz,
       Individious-en ezarpenek ez dituzte kanpo erreproduzitzaileak trabatzen.
     Custom External Player Arguments: Komando-lerroko argumentu pertsonalizatuak,
-      puntu eta komaz bereizita (';'), kanpoko erreproduzitzailera pasatzea nahi duzu.
+      kanpoko erreproduzitzailera pasatzea nahi duzu.
     Ignore Default Arguments: Ez bidali argumentu lehenetsirik kanpoko erreproduzitzaileari
       bideoaren URLaz gain (adibidez, erreprodukzio-tasa, erreprodukzio-zerrendaren
       URLa, etab.). Argumentu pertsonalizatuak transmitituko dira oraindik.
@@ -1127,7 +1123,6 @@ Falling back to Local API: 'Tokiko APIra itzultzen'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Bideo
   hau ez dago erabilgarri, zenbait formatu eskas baitira. Honakoa zure herrialdean
   erabilgarri ez dagoelako gerta daiteke.'
-Subscriptions have not yet been implemented: 'Harpidetzak ez dira oraindik aktibatu'
 Loop is now disabled: 'Etengabeko erreprodukzioa desaktibatu egin da'
 Loop is now enabled: 'Etengabeko ereprodukzioa aktibatu egin da'
 Shuffle is now disabled: 'Erreprodukzioen nahasketak desaktibatu egin dira'
@@ -1158,8 +1153,6 @@ External link opening has been disabled in the general settings: Kanpo estekak i
 Downloading has completed: '"{videoTitle}" deskargatu egin da'
 Unknown YouTube url type, cannot be opened in app: Youtube-ko URL mota ezezaguna,
   ezin da aplikazioan ireki
-Hashtags have not yet been implemented, try again later: Etiketak ez dira oraindik
-  aktibatu, berriz ere saiatu zaitez beranduago
 Downloading failed: Akats bat gertatu da "{videoTitle}" deskargatzerakoan
 Screenshot Success: Pantaila-argazkia gode da "{filePath}" gisa
 Screenshot Error: Pantaila-argazkiak huts egin du. {error}
@@ -1169,8 +1162,6 @@ Channels:
   Channels: Kanalak
   Title: Kanalen zerrenda
   Search bar placeholder: Kanalak bilatu
-  Unsubscribe: Harpidetza kendu
-  Unsubscribed: '{channelName} zure harpidetzen zerrendatik ezabatu da'
   Unsubscribe Prompt: Ziur al zaude "{channelName}"-ren harpidetza kendu nahi duzula?
   Count: '{number} kanal aurkitu dira.'
   Empty: Zure kanalen zerrenda hutsik da.
@@ -1199,6 +1190,7 @@ Chapters:
   Chapters: Kapituluak
   'Chapters list visible, current chapter: {chapterName}': 'Kapituluen zerrenda ikusgai,
     uneko kapitulua: {chapterName}'
+  Key Moments: Une garrantzitsuenak
 Hashtag:
   Hashtag: Traola
   This hashtag does not currently have any videos: Traola honek ez du bideorik une
@@ -1222,5 +1214,26 @@ Search Listing:
     4K: 4K
     Subtitles: Azpitituluak
     Closed Captions: Azpititulu deskriptiboak
+    8K: 8K
+    VR180: VR180
+    360 Video: 360º
+    New: Berria
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Insegurua izan daitekeen URLa irekitzea
   blokeatu da: "{url}".'
+Keys:
+  arrowleft: Gezia ezkerrera
+  arrowright: Gezia eskuinera
+  arrowup: Gezia gora
+  arrowdown: Gezia behera
+  alt: Alt
+  ctrl: Ctrl
+shortcutJoinOperator: +
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Right-click or hold to see history: Egin klik eskuineko botoiarekin edo mantendu sakatuta
+  historia ikusteko
+Autoplay Interruption Timer: Erreprodukzio automatikoa bertan behera utzi da {autoplayInterruptionIntervalHours}
+  orduz geldirik egon delako
+Description:
+  Collapse Description: Gutxiago erakutsi
+  Expand Description: '...gehiago'
diff --git a/static/locales/fa.yaml b/static/locales/fa.yaml
index c918fe849ac85..a45984c378042 100644
--- a/static/locales/fa.yaml
+++ b/static/locales/fa.yaml
@@ -78,14 +78,18 @@ Search Filters:
     4K: ۴کی
     HD: وضوح‌بالا
     Creative Commons: کرییتیو کامنز
+    VR180: VR180
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'دنبال کرده ها'
   Latest Subscriptions: 'اخرین دنبال کرده ها'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'این
     پروفایل تعداد زیادی اشتراک دارد. اجبار RSS برای جلوگیری از محدودیت نرخ'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'چیزی
-    دنبال نکرده اید.شروع به افزودن دنبال کننده ها کنید تا اینجا نشان داده شوند.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'لیست
+    اشتراک شما در حال حاضر خالی است. اضافه کردن اشتراک‌ها را برای مشاهده آنها در اینجا
+    شروع کنید. اگر می‌خواهید اشتراک‌های خود را وارد کنید، می‌توانید به تنظیمات داده
+    رفته و وارد کردن اشتراک‌ها را انتخاب کنید یا می‌توانید کانالی را جستجو کرده و
+    در آن‌ها مشترک شوید.'
   'Getting Subscriptions. Please wait.': 'درحال گرفتن دنبال کرده ها.لطفا صبر کنید.'
   Refresh Subscriptions: 'تازه سازی دنبال کرده ها'
   Load More Videos: 'بارگیری ویدیو های بیشتر'
@@ -111,15 +115,9 @@ Most Popular: 'پر طرفدارترین ها'
 Playlists: 'لیست های پخش'
 User Playlists:
   Your Playlists: 'لیست های پخش شما'
-  Playlist Message: 'این صفحه، فهرست پخشی را نمایش میدهد که هنوز تکمیل نشده و در حال
-    کار میباشد. در اینجا فقط ویدیو هایی که ذخیره شده اند یا موردعلاقه اند را می بینید.
-    وقتی که عملیات تکمیل شد، این ویدیوها به بخش فهرت پخش «مورد علاقه ها» منتقل خواهند
-    شد.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'ویدیوی
-    ذخیره شده ای ندارید.بر روی دکمه ذخیره در گوشه ویدیو کلیک کنید تا اینجا لیست شوند'
   Search bar placeholder: جستجو برای فهرست های پخش
-  Empty Search Message: هیچ ویدیویی در این فهرست پخش وجود ندارد که با جستجوی شما مطابق
-    باشد
+  Empty Search Message: هیچ ویدیویی در این لیست پخش وجود ندارد که با جستجوی شما مطابقت
+    داشته باشد
   Cancel: لغو
   Remove from Playlist: پاک کردن از فهرست پخش
   Playlist Name: نام فهرست پخش
@@ -138,17 +136,109 @@ User Playlists:
   Remove Duplicate Videos: حذف ویدیوهای تکراری
   AddVideoPrompt:
     Save: ذخیره کنید
+    Search in Playlists: جستجو در لیست‌های پخش
+    Allow Adding Duplicate Video(s): اجازه افزودن ویدیو(های) تکراری
+    Toast:
+      "{videoCount} video(s) added to {playlistCount} playlists": 1 ویدیو به {playlistCount}
+        لیست پخش اضافه شد | {videoCount} ویدیو به {playlistCount} لیست پخش اضافه شد
+      You haven't selected any playlist yet.: هنوز هیچ لیست پخشی را انتخاب نکرده‌اید.
+      "{videoCount} video(s) added to 1 playlist": 1 ویدیو به 1 لیست پخش اضافه شد
+        | {videoCount} ویدیو به 1 لیست پخش اضافه شد
+    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
+      ویدیو از قبل اضافه شده'
+    N playlists selected: '{playlistCount} انتخاب شد'
+    Added {count} Times: قبلا اضافه شده | {count} بار اضافه شد
+    Select a playlist to add your N videos to: یک لیست پخش برای افزودن ویدیوی خود
+      به | انتخاب کنید یک لیست پخش برای افزودن ویدیوهای {videoCount} خود انتخاب کنید
+      در
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
+      ویدیو اضافه خواهند شد'
   SinglePlaylistView:
     Toast:
       Video has been removed: ویدیو حذف شده است
       There was a problem with removing this video: در حذف این ویدیو مشکلی وجود داشت
+      This playlist is now used for quick bookmark: این لیست پخش اکنون برای نشانک
+        سریع استفاده می‌شود
+      Some videos in the playlist are not loaded yet. Click here to copy anyway.: برخی
+        از ویدیوها در لیست پخش هنوز بارگیری نشده اند. به هر حال برای کپی اینجا کلیک
+        کنید.
+      "{videoCount} video(s) have been removed": 1 ویدئو حذف شد | {videoCount} ویدیو
+        حذف شد
+      Playlist {playlistName} has been deleted.: فهرست پخش {playlistName} حذف شد.
+      Playlist {playlistName} is the new quick bookmark playlist.: لیست پخش {playlistName}
+        یک فهرست پخش نشانک سریع جدید است.
+      This video cannot be moved up.: این ویدئو را نمی‌توان به بالا منتقل کرد.
+      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: این
+        لیست پخش اکنون برای نشانک سریع به جای {oldPlaylistName} استفاده می شود. برای
+        لغو اینجا را کلیک کنید
+      This playlist is already being used for quick bookmark.: این لیست پخش در حال
+        حاضر برای نشانک سریع استفاده می شود.
+      Playlist name cannot be empty. Please input a name.: نام لیست پخش نمی تواند
+        خالی باشد. لطفا یک نام وارد کنید.
+      There were no videos to remove.: هیچ ویدیویی برای حذف وجود نداشت.
+      This playlist is protected and cannot be removed.: این لیست پخش محافظت می‌شود
+        و نمی‌توان آن را حذف کرد.
+      This video cannot be moved down.: این ویدئو را نمی‌توان به پایین منتقل کرد.
+      Playlist has been updated.: لیست پخش به روز شد.
+      There was an issue with updating this playlist.: مشکلی در به‌روزرسانی این لیست
+        پخش وجود داشت.
+      This playlist does not exist: این لیست پخش وجود ندارد
+      Reverted to use {oldPlaylistName} for quick bookmark: به استفاده از {oldPlaylistName}
+        برای نشانک‌گذاری سریع بازگردد
+      This playlist has a video with a duration error: این لیست پخش شامل حداقل یک
+        ویدیو است که مدت زمان ندارد، به گونه‌ای مرتب می‌شود که گویی مدت زمان آنها
+        صفر است.
+    Search for Videos: جستجوی ویدئوها
+  Sort By:
+    EarliestUpdatedFirst: اولین به روز شده
+    LatestUpdatedFirst: به تازگی به روز شده
+    NameAscending: آ-ی
+    NameDescending: ی-آ
+    LatestCreatedFirst: به تازگی ایجاد شده
+    Sort By: مرتب‌کردن بر اساس
+    LatestPlayedFirst: اخیراً پخش شده
+    EarliestPlayedFirst: اولین پخش شده
+    EarliestCreatedFirst: قدیمی ترین ایجاد شده
+  CreatePlaylistPrompt:
+    Toast:
+      Playlist {playlistName} has been successfully created.: لیست پخش {playlistName}
+        با موفقیت ایجاد شد.
+      There is already a playlist with this name. Please pick a different name.: از
+        قبل یک فهرست پخش با این نام وجود دارد. لطفا نام دیگری انتخاب کنید.
+      There was an issue with creating the playlist.: مشکلی در ایجاد لیست پخش وجود
+        داشت.
+    New Playlist Name: نام لیست پخش جدید
+    Create: ایجاد
+  You have no playlists. Click on the create new playlist button to create a new one.: شما
+    هیچ لیست پخشی ندارید. بر روی دکمه ایجاد لیست پخش جدید کلیک کنید تا لیست پخش جدیدی
+    ایجاد شود.
+  Export Playlist: صادر کردن این لیست پخش
+  The playlist has been successfully exported: لیست پخش با موفقیت صادر شد
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: آیا
+    مطمئنید که می خواهید 1 ویدیوی تماشا شده را از این لیست پخش حذف کنید؟ این قابل
+    واگرد نیست. | آیا مطمئن هستید که می خواهید {playlistItemCount} ویدیو تماشا شده
+    را از این لیست پخش حذف کنید؟ این قابل واگرد نیست.
+  Cannot delete the quick bookmark target playlist.: نمی توان لیست پخش مورد نظر نشانک
+    سریع را حذف کرد.
+  Are you sure you want to delete this playlist? This cannot be undone: آیا مطمئن
+    هستید که می خواهید این لیست پخش را حذف کنید؟ این قابل واگرد نیست.
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: آیا
+    مطمئنید که می‌خواهید 1 ویدیوی تکراری را از این فهرست پخش حذف کنید؟ این قابل واگرد
+    نیست. | آیا مطمئنید که می خواهید {playlistItemCount} ویدیو تکراری را از این لیست
+    پخش حذف کنید؟ این قابل واگرد نیست.
+  Copy Playlist: رونوشت لیست‌پخش
+  Enable Quick Bookmark With This Playlist: فعال کردن نشانک سریع با این لیست پخش
+  Quick Bookmark Enabled: نشانک سریع فعال شد
+  Delete Playlist: حذف لیست پخش
 History:
   # On History Page
   History: 'تاریخچه'
   Watch History: 'تاریخچه تماشا'
   Your history list is currently empty.: 'تاریخچه شما در حال حاضر خالی است.'
   Search bar placeholder: جستجو در تاریخچه
-  Empty Search Message: هیچ ویدیویی در تاریخچه وجود ندارد که با جستجوی شما مطابق باشد
+  Empty Search Message: هیچ ویدیویی در سابقه شما وجود ندارد که با جستجوی شما مطابقت
+    داشته باشد
+  Case Sensitive Search: جستجوی حساس به حروف کوچک و بزرگ
 Settings:
   # On Settings Page
   Settings: 'تنظیمات'
@@ -156,7 +246,7 @@ Settings:
     نرم افزار نیاز به راه اندازی دوباره دارد تا تغییرات لحاظ شوند. تغییرات ذخیره و
     راه اندازی شود؟'
   General Settings:
-    General Settings: 'تنظیمات عمومی'
+    General Settings: 'عمومی'
     Check for Updates: 'بررسی برای به روزرسانی ها'
     Check for Latest Blog Posts: 'بررسی آخرین مطالب وبلاگ'
     Fallback to Non-Preferred Backend on Failure: 'بازگشت به Backend غیر ترجیحی در
@@ -180,6 +270,7 @@ Settings:
       Middle: 'وسط'
       End: 'انتها'
       Hidden: مخفی
+      Blur: تاری
     Current Invidious Instance: 'نمونه فعلی Invidious'
     The currently set default instance is {instance}: 'در حال حاضر نمونه Invidious
       پیشفرض {instance} است'
@@ -196,8 +287,13 @@ Settings:
       Ask Before Opening Link: پرسیدن قبل از باز کردن لینک
       No Action: کاری نکردن
       External Link Handling: اداره کردن لینک های خارجی
+    Auto Load Next Page:
+      Label: بارگذاری خودکار صفحه بعدی
+      Tooltip: صفحات و نظرات اضافی را به صورت خودکار بارگیری کنید.
+    Open Deep Links In New Window: نشانی های ارسال شده به FreeTube را در یک پنجره
+      جدید باز کنید
   Theme Settings:
-    Theme Settings: 'تنظیمات قالب'
+    Theme Settings: 'طرح'
     Match Top Bar with Main Color: 'یکسان سازی قطعه بالا با رنگ اصلی'
     Expand Side Bar by Default: 'گسترش ستون فرعی به صورت پیشفرض'
     Disable Smooth Scrolling: 'غیرفعال کردن حرکت ملایم'
@@ -212,6 +308,11 @@ Settings:
       Catppuccin Mocha: مجموعه رنگ کتپوسین موکا
       Hot Pink: صورتی داغ
       Pastel Pink: صورتی پاستلی
+      Solarized Dark: درخشش تاریک
+      Solarized Light: درخشش روشن
+      Gruvbox Dark: جعبه تیره تاریک
+      Gruvbox Light: جعبه تیره روشن
+      Nordic: شمال اروپا
     Main Color Theme:
       Main Color Theme: 'رنگ تم اصلی'
       Red: 'قرمز'
@@ -251,12 +352,30 @@ Settings:
       Catppuccin Mocha Peach: هلویی
       Catppuccin Mocha Yellow: کتپوسین موکا زرد
       Catppuccin Mocha Green: کتپوچین موکا سبز
+      Gruvbox Light Orange: جعبه‌تیره نارنجی روشن
+      Solarized Cyan: فیروزه‌ای درخشان
+      Solarized Orange: نارنجی درخشان
+      Solarized Red: قرمز درخشان
+      Solarized Violet: بنفش درخشان
+      Solarized Blue: آبی درخشان
+      Solarized Magenta: سرخابی درخشان
+      Solarized Green: سبز درخشان
+      Gruvbox Dark Yellow: جعبه‌تیره زرد
+      Gruvbox Dark Blue: جعبه‌تیره آبی
+      Gruvbox Dark Aqua: جعبه‌تیره آسمانی
+      Gruvbox Dark Purple: جعبه‌تیره ارغوانی
+      Gruvbox Dark Orange: جعبه‌تیره نارنجی
+      Gruvbox Light Red: جعبه‌تیره قرمز
+      Solarized Yellow: زرد درخشان
+      Gruvbox Dark Green: جعبه‌تیره سبز
+      Gruvbox Light Blue: جعبه‌تیره آبی روشن
+      Gruvbox Light Purple: جعبه‌تیره ارغوانی روشن
     Secondary Color Theme: 'رنگ دوم تم'
         #* Main Color Theme
     Hide Side Bar Labels: مخفی کردن عنوان های ستون فرعی
     Hide FreeTube Header Logo: لوگوی سربرگ FreeTube را مخفی کنید
   Player Settings:
-    Player Settings: 'تنظیمات پخش کننده'
+    Player Settings: 'پخش کننده'
     Play Next Video: 'پخش ویدیو بعدی'
     Turn on Subtitles by Default: 'فعال کردن زیرنویس به عنوان پیشفرض'
     Autoplay Videos: 'پخش خودکار ویدیو ها'
@@ -265,7 +384,7 @@ Settings:
     Enable Theatre Mode by Default: 'فعال کردن حالت تئاتر به عنوان پیشفرض'
     Scroll Volume Over Video Player: 'کنترل صدا با حرکت اسکرول موس روی پخش کننده ویدیو'
     Display Play Button In Video Player: 'نمایش دکمه پخش داخل پخش کننده ویدیو'
-    Next Video Interval: 'بازه زمانی ویدیو بعدی'
+    Next Video Interval: 'تایمر شمارش معکوس پخش خودکار'
     Fast-Forward / Rewind Interval: 'بازه زمانی جلو / عقب رفتن سریع'
     Default Volume: 'میزان صدای پیشفرض'
     Default Playback Rate: 'سرعت پخش پیشفرض'
@@ -307,8 +426,9 @@ Settings:
       Folder Label: پوشه اسکرین شات
       Folder Button: پوشه را انتخاب کنید
     Skip by Scrolling Over Video Player: با پیمایش روی پخش‌کننده ویدیو از آن بگذرید
+    Autoplay Interruption Timer: تایمر وقفه پخش خودکار
   External Player Settings:
-    External Player Settings: 'تنظیمات پخش کننده خارجی'
+    External Player Settings: 'پخش کننده خارجی'
     External Player: 'پخش کننده خارجی'
     Ignore Unsupported Action Warnings: 'به اخطارهای فعالیت پشتیبانی نشده اهمیت نده'
     Custom External Player Executable: 'پخش کننده خارجی شخصی سازی شده قابل اجرا'
@@ -316,8 +436,9 @@ Settings:
     Players:
       None:
         Name: هیچ کدام
+    Ignore Default Arguments: نادیده گرفتن برهان های پیش فرض
   Privacy Settings:
-    Privacy Settings: 'تنظیمات امنیتی'
+    Privacy Settings: 'امنیتی'
     Remember History: 'حفظ تاریخچه'
     Save Watched Progress: 'ذخیره ویدیو های دیده شده'
     Clear Search Cache: 'پاک کردن کش جستجو'
@@ -334,14 +455,21 @@ Settings:
       نیست.'
     Save Watched Videos With Last Viewed Playlist: ویدئوهای تماشا شده را با لیست پخش
       آخرین مشاهده ذخیره کنید
+    All playlists have been removed: تمام لیست های پخش حذف شد
+    Remove All Playlists: حذف تمام لیست های پخش
+    Are you sure you want to remove all your playlists?: آیا مطمئنید که می‌خواهید
+      همه فهرست‌های پخش خود را حذف کنید؟
   Subscription Settings:
-    Subscription Settings: 'تنظیمات دنبال شوندگان'
+    Subscription Settings: 'دنبال شوندگان'
     Hide Videos on Watch: 'مخفی کردن ویدیو ها هنگام تماشا'
     Fetch Feeds from RSS: 'دریافت feed ها از RSS'
-    Manage Subscriptions: 'سامان دهی دنبال شوندگان'
     Fetch Automatically: آوردن خودکار فید
+    Confirm Before Unsubscribing: تایید لغو اشتراک
+    'Limit the number of videos displayed for each channel': تعداد ویدیوهای نمایش
+      داده شده برای هر کانال را محدود کنید
+    To: به
   Distraction Free Settings:
-    Distraction Free Settings: 'تنظیمات اضافی مفید'
+    Distraction Free Settings: 'اضافات مفید'
     Hide Video Views: 'مخفی کردن دیده های ویدیو'
     Hide Video Likes And Dislikes: 'مخفی کردن لایک و دیسلایک های ویدیو'
     Hide Channel Subscribers: 'مخفی کردن دنبال کنندگان کانال'
@@ -352,7 +480,7 @@ Settings:
     Hide Playlists: 'مخفی کردن فهرست های پخش'
     Hide Live Chat: 'مخفی کردن چت لایو'
     Hide Active Subscriptions: 'مخفی کردن دنبال کنندگان فعال'
-    Hide Channel Playlists: لیست های پخش کانال را مخفی کنید
+    Hide Channel Playlists: '"لیست های پخش" کانال را مخفی کنید'
     Sections:
       Watch Page: صفحه تماشا
       Subscriptions Page: صفحه اشتراک ها
@@ -365,28 +493,36 @@ Settings:
     Hide Featured Channels: پنهان کردن کانال های ویژه
     Hide Comments: پنهان کردن نظرات
     Hide Profile Pictures in Comments: مخفی کردن تصاویر پروفایل در نظرات
-    Display Titles Without Excessive Capitalisation: نمایش عناوین بدون حروف بزرگ
+    Display Titles Without Excessive Capitalisation: نمایش عناوین بدون حروف بزرگ و
+      نقطه گذاری
     Hide Channels: پنهان کردن ویدیوها از کانال ها
     Hide Upcoming Premieres: مخفی کردن اولین نمایش های آینده
     Hide Chapters: پنهان کردن فصل ها
-    Hide Channels Placeholder: نام یا آیدی کانال
+    Hide Channels Placeholder: شناسه کانال
     Hide Subscriptions Live: مخفی کردن اشتراک های زنده
-    Hide Channel Community: مخفی کردن انجمن کانال
-    Hide Channel Shorts: مخفی کردن شورت های کانال
+    Hide Channel Community: مخفی کردن "انجمن" کانال
+    Hide Channel Shorts: مخفی کردن "ویدئو های کوتاه" کانال
     Hide Subscriptions Shorts: مخفی کردن شورت اشتراک ها
-    Hide Channel Podcasts: پنهان کردن پادکست های کانال
-    Hide Channel Releases: مخفی کردن انتشارات کانال
+    Hide Channel Podcasts: پنهان کردن "پادکست‌های" کانال
+    Hide Channel Releases: مخفی کردن "انتشارات" کانال
     Hide Sharing Actions: مخفی کردن فعالیت های مشترک
-    Blur Thumbnails: تار کردن ریز عکسها
+    Hide Videos and Playlists Containing Text Placeholder: کلمه، بخش کلمه یا عبارت
+    Hide Channels Invalid: شناسه کانال ارائه شده نامعتبر بود
+    Hide Channels Already Exists: شناسه کانال از قبل وجود دارد
+    Hide Videos and Playlists Containing Text: ویدیوها و لیست های پخش حاوی متن را
+      مخفی کنید
+    Hide Subscriptions Community: مخفی کردن انجمن دنبال‌شده ها
+    Hide Channel Home: مخفی کردن "صفحه اصلی" کانال
+    Hide Channels API Error: خطای بازیابی کاربر با شناسه ارائه شده. لطفا دوباره بررسی
+      کنید که شناسه درست باشد.
+    Hide Channels Disabled Message: برخی از کانال‌ها با استفاده از شناسه مسدود شدند
+      و پردازش نشدند. در حالی که آن شناسه ها در حال به روز رسانی هستند، ویژگی مسدود
+      می شود
   Data Settings:
-    Data Settings: 'تنظیمات اطلاعات'
+    Data Settings: 'داده ها'
     Select Import Type: 'انتخاب روش وارد کردن فایل بک آپ'
     Select Export Type: 'انتخاب روش پشتیبان گیری'
     Import Subscriptions: 'وارد کردن بک آپ دنبال شوندگان'
-    Import FreeTube: 'وارد کردن از FreeTube'
-    Import YouTube: 'وارد کردن از YouTube'
-    Import NewPipe: 'وارد کردن از NewPipe'
-    Check for Legacy Subscriptions: 'بررسی برای دنبال‌شوندگان قدیمی'
     Export Subscriptions: 'ذخیره (پشتیبان گیری)دنبال شوندگان'
     Export FreeTube: 'استخراج FreeTube'
     Export YouTube: 'استخراج YouTube'
@@ -426,6 +562,14 @@ Settings:
     Subscription File: فایل اشتراک
     Playlist insufficient data: داده ناکافی برای لیست پخش «{playlist}»، در حال رد
       شدن از مورد
+    Export Playlists For Older FreeTube Versions:
+      Tooltip: "این گزینه ویدئوها را از همه لیست های پخش به یک لیست پخش به نام \"
+        مورد علاقه\" صادر می کند.\nنحوه صادر کردن و وارد کردن ویدیوها در لیست پخش
+        برای نسخه قدیمی FreeTube:\n1. لیست های پخش خود را با فعال بودن این گزینه صادر
+        کنید.\n2. با استفاده از گزینه حذف تمام لیست‌های پخش در قسمت تنظیمات حریم خصوصی،
+        تمام لیست های پخش موجود خود را حذف کنید.\n3. نسخه قدیمی FreeTube را راه اندازی
+        کنید و لیست های پخش صادر شده را وارد کنید.\""
+      Label: صادر‌کردن لیست‌های پخش برای نسخه های قدیمی FreeTube
   Proxy Settings:
     Proxy Host: میزبان پروکسی
     Region: منطقه
@@ -433,7 +577,7 @@ Settings:
       دریافت اطلاعات شبکه. آیا پروکسی شما به درستی پیکربندی شده است؟
     Ip: آی پی
     Country: کشور
-    Proxy Settings: تنظیمات پروکسی
+    Proxy Settings: پروکسی
     Proxy Port Number: شماره پورت پروکسی
     Test Proxy: تست پروکسی
     Enable Tor / Proxy: پروکسی / تور را فعال کنید
@@ -442,6 +586,11 @@ Settings:
     Clicking on Test Proxy will send a request to: با کلیک بر روی تست پروکسی یک درخواست
       ارسال می شود
     Your Info: اطلاعات شما
+    Proxy Warning: FreeTube یک پروکسی داخلی ندارد اما می‌تواند به یک پروکسی خارجی
+      مانند پروکسی که روی دستگاه شما اجرا می‌شود مانند تور یا یک پراکسی خارجی مثل
+      یک پراکسی SOCKS5 که توسط برخی VPN‌ها ارائه می‌شود، متصل شود. در صورت فعال بودن،
+      مطمئن شوید که پروکسی/تور شما به درستی پیکربندی شده است، در غیر این صورت FreeTube
+      نمی تواند هیچ داده ای را واکشی کند.
   SponsorBlock Settings:
     Skip Options:
       Skip Option: گزینه پرش
@@ -450,16 +599,19 @@ Settings:
       Auto Skip: پرش خودکار
       Prompt To Skip: اعلان برای پرش
     Enable SponsorBlock: فعال کردن محدود کردن حامی
-    SponsorBlock Settings: تنظیمات محدود کردن حامی
+    SponsorBlock Settings: محدود کردن حامی
     Notify when sponsor segment is skipped: وقتی بخش حامی رد شد اطلاع دهید
     UseDeArrowTitles: از عنوان های ویدیویی DeArrow استفاده کنید
     Category Color: رنگ دسته
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       URL (پیش‌فرض https://sponsor.ajay.app است)
+    UseDeArrowThumbnails: استفاده از افزونه DeArrow برای ریز‌عکسها
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': رابط
+      آدرس سازنده ریز‌عکس DeArrow (پیش‌فرض https://dearrow-thumb.ajay.app است)
   Download Settings:
     Download in app: دانلود از طریق برنامه
     Open in web browser: در مرورگر وب باز کنید
-    Download Settings: تنظیمات دانلود
+    Download Settings: بارگیری
     Ask Download Path: هربار مسیر دانلود را سوال کند
     Choose Path: مکان ذخیره دانلود را انتخاب کنید
     Download Behavior: روش دانلود
@@ -467,15 +619,15 @@ Settings:
     Hide Unsubscribe Button: پنهان کردن دکمه لغو اشتراک
     Show Family Friendly Only: نمایش فقط دوستانه برای خانواده
     Hide Search Bar: پنهان کردن نوار جستجو
-    Parental Control Settings: تنظیمات کنترل والدین
+    Parental Control Settings: کنترل والدین
   Experimental Settings:
-    Experimental Settings: تنظیمات آزمایشی
+    Experimental Settings: آزمایشی
     Replace HTTP Cache: ‍کش HTTP را جایگزین کنید
     Warning: این تنظیمات آزمایشی هستند، ممکن است هنگام فعال بودن باعث خرابی شوند.
       تهیه نسخه پشتیبان به شدت توصیه می شود. با مسئولیت خود استفاده کنید!
   Password Settings:
     Remove Password: رمز عبور را حذف کنید
-    Password Settings: تنظیمات رمز عبور
+    Password Settings: رمز عبور
     Set Password To Prevent Access: برای جلوگیری از دسترسی به تنظیمات، رمز عبور تنظیم
       کنید
     Set Password: قراردادن رمز عبور
@@ -484,6 +636,8 @@ Settings:
     Enter Password To Unlock: برای باز کردن قفل تنظیمات رمز عبور را وارد کنید
     Password Incorrect: رمز عبور اشتباه است
     Unlock: باز کردن
+  Sort Settings Sections (A-Z): مرتب‌سازی بخش‌های تنظیمات (آ-ی)
+  Return to Settings Menu: بازگشت به منوی تنظیمات
 Channel:
   Playlists:
     Sort Types:
@@ -519,6 +673,10 @@ Channel:
     This channel currently does not have any posts: این کانال در حال حاضر هیچ پستی
       ندارد
     Hide Answers: پنهان کردن پاسخ ها
+    View Full Post: مشاهده کامل پست
+    Video hidden by FreeTube: ویدیو توسط FreeTube مخفی شده
+    Viewing Posts Only Supported By Invidious: مشاهده پست ها فقط توسط Invidious پشتیبانی
+      می شود. برای مشاهده محتوا بدون Invidious، به برگه انجمن کانال بروید.
   Removed subscription from {count} other channel(s): اشتراک از {count} کانال(های)
     دیگر حذف شد
   About:
@@ -549,6 +707,9 @@ Channel:
   Channel has been removed from your subscriptions: کانال از اشتراک های شما حذف شده
     است
   Added channel to your subscriptions: کانال به اشتراک های شما اضافه شد
+  Home:
+    View Playlist: نمایش لیست‌پخش
+    Home: خانه
 Video:
   External Player:
     video: ویدیو
@@ -566,34 +727,6 @@ Video:
     playlist: فهرست پخش
     OpeningTemplate: باز کردن {videoOrPlaylist} در {externalPlayer}...
   Published:
-    Sep: سپتامبر
-    Month: ماه
-    Months: ماه ها
-    Year: سال
-    May: می
-    Minute: دقیقه
-    Hours: ساعت ها
-    Day: روز
-    Weeks: هفته ها
-    Feb: فوریه
-    Hour: ساعت
-    Mar: مارس
-    Jul: ژوئیه
-    Jan: جان
-    Apr: آپریل
-    Jun: ژوئن
-    Aug: اوت
-    Oct: اکتبر
-    Nov: نوامبر
-    Dec: دسامبر
-    Second: دوم
-    Seconds: ثانیه ها
-    Minutes: دقیقه ها
-    Days: روزها
-    Week: هفته
-    Years: سالها
-    Ago: پیش
-    Upcoming: اولین نمایش در
     In less than a minute: در کمتر از یک دقیقه
   Copy Invidious Link: لینک Invidious را کپی کنید
   Play Previous Video: پخش ویدیوی قبلی
@@ -623,7 +756,7 @@ Video:
     است
   Download Video: دانلود ویدیو
   Open in YouTube: در یوتیوب باز کنید
-  Play Next Video: پخش ویدیوی بعدی
+  Play Next Video: پخش ویدئوی بعدی
   Open Channel in Invidious: کانال را در Invidious باز کنید
   Copy Invidious Channel Link: لینک کانال Invidious را کپی کنید
   Watched: دیده شده
@@ -640,7 +773,6 @@ Video:
   Streamed on: پخش جریانی
   Published on: منتشر شده در
   audio only: فقط صدا
-  Publicationtemplate: '{number} {unit} پیش'
   Video has been saved: ویدیو ذخیره شده است
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': گفتگوی
     زنده در حال حاضر با Invidious API پشتیبانی نمی شود. اتصال مستقیم به YouTube مورد
@@ -659,6 +791,50 @@ Video:
   Video has been marked as watched: ویدیو به عنوان تماشا شده علامت گذاری شده است
   Mark As Watched: علامت گذاری به عنوان تماشا شده
   Video has been removed from your history: ویدیو از سابقه شما حذف شده است
+  Player:
+    You appear to be offline: به نظر می رسد آفلاین هستید.
+    Exit Theatre Mode: خروج از حالت تئاتر
+    Stats:
+      Video ID: 'شناسه ویدئو: {videoId}'
+      Media Formats: 'فرمت ویدئو: {formats}'
+      Stats: اطلاعات
+      Resolution: 'وضوح: {width}x{height}@{frameRate}'
+      Bandwidth: 'پهنای باند: {bandwidth} کیلوبیت‌بر‌ثانیه'
+      Player Dimensions: 'ابعاد پخش کننده: {width}x{height}'
+      Bitrate: 'نرخ بیت: {bitrate} کیلوبیت‌بر‌ثانیه'
+      Buffered: 'بافر: {bufferedPercentage}%'
+      Volume: 'صدا: {volumePercentage}%'
+      CodecAudio: 'کدک: {audioCodec} ({audioItag})'
+      Dropped Frames / Total Frames: 'فریم‌های رد شده: {droppedFrames} / مجموع فریم‌ها:
+        {totalFrames}'
+      CodecsVideoAudio: 'کدک‌ها: {video Codec} ({video tag}) / {audio Codec} ({audio
+        Itag})'
+      CodecsVideoAudioNoItags: 'کدک‌ها: {video Codec} / {audio Codec}'
+    Take Screenshot: گرفتن عکس صفحه
+    Show Stats: نمایش اطلاعات
+    Skipped segment: بخش {segmentCategory} رد شد
+    TranslatedCaptionTemplate: '{language} (ترجمه شده از "{originalLanguage}")'
+    Hide Stats: مخفی کردن اطلاعات
+    Full Window: تمام‌صفحه
+    Exit Full Window: خروج از تمام‌صفحه
+    Playback will resume automatically when your connection comes back: با بازگشت
+      اتصال شما، پخش به طور خودکار از سر گرفته می شود.
+    Audio Tracks: تراک صوتی
+    Theatre Mode: حالت تئاتر
+  Hide Channel: مخفی‌کردن کانال
+  Pause on Current Video: توقف در ویدیو فعلی
+  IP block: YouTube آدرس نشانی شما را از تماشای ویدیو مسدود کرده است. لطفاً سعی کنید
+    به فیلترشکن یا پروکسی دیگری بروید.
+  More Options: گزینه‌های بیشتر
+  Unhide Channel: نمایش کانال
+  Unlisted: بدون لیست
+  MembersOnly: ویدیوهای مختص اعضا را نمی‌توان با FreeTube تماشا کرد زیرا به ورود Google
+    و عضویت پولی در کانال آپلودکننده نیاز دارند.
+  AgeRestricted: ویدیوهای دارای محدودیت سنی را نمی‌توان با FreeTube تماشا کرد، زیرا
+    نیاز به ورود به سیستم Google و استفاده از یک حساب YouTube تأیید شده برای سن دارند.
+  DeArrow:
+    Show Original Details: نمایش جزئیات اصلی
+    Show Modified Details: نمایش جزئیات اصلاح شده
 Tooltips:
   General Settings:
     External Link Handling: "وقتی روی پیوندی که در FreeTube باز نمی شود، روی آن کلیک
@@ -676,9 +852,12 @@ Tooltips:
     Preferred API Backend: پس زمینه ای را انتخاب کنید که FreeTube برای به دست آوردن
       داده ها استفاده می کند. API محلی یک استخراج کننده داخلی است. Invidious API برای
       اتصال به سرور Invidious نیاز دارد.
+    Open Deep Links In New Window: نشانی هایی که به FreeTube ارسال می شوند، مانند
+      پسوندهای مرورگر تغییر مسیر یا برهان های خط فرمان، در یک پنجره جدید باز می شوند.
   SponsorBlock Settings:
     UseDeArrowTitles: عناوین ویدیویی را با عناوین ارسال شده توسط کاربر از DeArrow
       جایگزین کنید.
+    UseDeArrowThumbnails: ریز عکسها را با ریز عکسهای DeArrow جایگزین کنید.
   Player Settings:
     Skip by Scrolling Over Video Player: از چرخ اسکرول برای رد شدن از ویدیو، سبک MPV
       استفاده کنید.
@@ -688,16 +867,16 @@ Tooltips:
       و نگه دارید و روی ماوس کلیک چپ کنید تا به سرعت به سرعت پخش پیش فرض برگردید (مگر
       اینکه در تنظیمات تغییر نکرده باشد).
     Proxy Videos Through Invidious: به جای اتصال مستقیم به YouTube، به Invidious متصل
-      می شود تا ویدیوها را ارائه دهد. اولویت API را لغو می کند.
+      می شود تا ویدیوها را ارائه دهد.
     Default Video Format: فرمت های مورد استفاده هنگام پخش ویدیو را تنظیم کنید. فرمت
       های DASH می توانند کیفیت های بالاتری را پخش کنند. فرمت های قدیمی به حداکثر 720p
       محدود می شوند اما از پهنای باند کمتری استفاده می کنند. فرمت های صوتی فقط جریان
       های صوتی هستند.
   Subscription Settings:
-    Fetch Feeds from RSS: هنگامی که FreeTube فعال باشد، از RSS به جای روش پیش فرض
+    Fetch Feeds from RSS: هنگامی که فعال باشد، FreeTube از RSS به جای روش پیش فرض
       خود برای گرفتن فید اشتراک شما استفاده می کند. RSS سریعتر است و از مسدود شدن
-      IP جلوگیری می کند، اما اطلاعات خاصی مانند مدت زمان ویدیو یا وضعیت زنده را ارائه
-      نمی دهد
+      IP جلوگیری می کند، اما اطلاعات خاصی مانند مدت زمان ویدیو، وضعیت زنده یا پست
+      های انجمن را ارائه نمی دهد.
     Fetch Automatically: هنگامی که فعال باشد، FreeTube به طور خودکار فید اشتراک شما
       را هنگام باز شدن یک پنجره جدید و هنگام تغییر نمایه دریافت می کند.
   External Player Settings:
@@ -707,17 +886,24 @@ Tooltips:
     DefaultCustomArgumentsTemplate: "(پیش‌فرض: '{defaultCustomArguments}')"
     Ignore Warnings: اخطارها را برای زمانی که پخش کننده خارجی فعلی از عملکرد فعلی
       پشتیبانی نمی کند (به عنوان مثال معکوس کردن لیست های پخش و غیره) حذف کنید.
-    Custom External Player Arguments: هر آرگومان خط فرمان سفارشی، که با نقطه ویرگول
-      (';') از هم جدا شده اند، می خواهید به پخش کننده خارجی منتقل شوند.
+    Custom External Player Arguments: هر برهان خط فرمان سفارشی که می خواهید به پخش
+      کننده خارجی منتقل شود.
     External Player: با انتخاب یک پخش کننده خارجی، نمادی برای باز کردن ویدیو (در صورت
       پشتیبانی لیست پخش) در پخش کننده خارجی، روی تصویر کوچک نمایش داده می شود. هشدار،
       تنظیمات ناخوشایند بر پخش کننده های خارجی تأثیر نمی گذارد.
+    Ignore Default Arguments: هیچ برهان پیش فرضی را به غیر از آدرس ویدیو به پخش کننده
+      خارجی ارسال نکنید (به عنوان مثال نرخ پخش، آدرس لیست پخش و غیره). برهان های سفارشی
+      همچنان منتقل خواهند شد.
   Distraction Free Settings:
-    Hide Subscriptions Live: این تنظیم با «{appWideSetting}» در سراسر برنامه، در بخش
-      «{subsection}» در «{settingsSection}» لغو می‌شود.
-    Hide Channels: نام کانال یا شناسه کانال را وارد کنید تا همه ویدیوها، فهرست‌های
-      پخش و خود کانال در جستجو، پرطرفدار، محبوب‌ترین و توصیه‌شده‌ها ظاهر نشوند. نام
-      کانال وارد شده باید کاملا مطابقت داشته باشد و به حروف کوچک و بزرگ حساس باشد.
+    Hide Subscriptions Live: این تنظیمات توسط تنظیم "{appWideSetting}" در سراسر برنامه،
+      در بخش "{subsection}" در "{settingsSection}" لغو شده است.
+    Hide Channels: یک شناسه کانال وارد کنید تا همه ویدیوها، لیست‌های پخش و خود کانال
+      در جستجو، پرطرفدار، محبوب‌ترین و توصیه‌شده‌ها ظاهر نشود. شناسه کانال وارد شده
+      باید کاملاً مطابقت داشته باشد و شامل حروف کوچک و بزرگ باشد.
+    Hide Videos and Playlists Containing Text: یک کلمه، قطعه کلمه یا عبارت (بدون حساسیت
+      به حروف کوچک) وارد کنید تا همه ویدیوها و فهرست‌های پخشی که عنوان اصلی آنها حاوی
+      آن در تمام FreeTube است، پنهان شود، به استثنای تاریخچه، فهرست‌های پخش شما، و
+      ویدیوهای داخل فهرست‌های پخش.
   Experimental Settings:
     Replace HTTP Cache: حافظه پنهان HTTP مبتنی بر دیسک Electron را غیرفعال می کند
       و یک کش تصویر سفارشی در حافظه را فعال می کند. منجر به افزایش مصرف رم خواهد شد.
@@ -744,15 +930,15 @@ About:
   Translate: ترجمه
   Blog: وبلاگ
   Chat on Matrix: چت در ماتریکس
-  Licensed under the AGPLv3: تحت مجوز AGPLv3
   these people and projects: این افراد و پروژه ها
-  View License: مشاهده مجوز
   Report a problem: گزارش یک مشکل
   GitHub issues: مشکلات گیت هاب
   Donate: اهدا
   Source code: کد منبع
-  Mastodon: Mastodon
+  Mastodon: برنامه ماستودون
   FreeTube is made possible by: فری تیوب ممکن است ساخته شده توسط
+  AGPLv3: پروانه‌عمومی‌جامع‌آفرو نسخه‌3
+  Licensed under the: دارای مجوز تحت
 New Window: پنجره جدید
 Preferences: تنظیمات
 Version {versionNumber} is now available!  Click for more details: نسخه {versionNumber}
@@ -761,8 +947,6 @@ A new blog is now available, {blogTitle}. Click to view more: یک مطلب جد
   است, {blogTitle}. برای مشاهده بیشتر کلیک کنید
 Channels:
   Channels: کانال ها
-  Unsubscribe: لغو اشتراک
-  Unsubscribed: '{channelName}از اشتراک های شما حذف شده است'
   Unsubscribe Prompt: آیا مطمئنید که می‌خواهید اشتراک «{channelName}» را لغو کنید؟
   Title: لیست کانال
   Search bar placeholder: جستجو در کانال ها
@@ -778,6 +962,8 @@ Global:
     Watching Count: ۱ در حال تماشا | {count} در حال تماشا
     Channel Count: ۱ کانال | {count} کانال
     Video Count: ۱ ویدیو | {count} ویدیو
+    Like Count: 1 پسند | {count} پسند
+    Comment Count: 1 نظر | {count} نظر
   Community: جامعه
   Input Tags:
     Length Requirement: برچسب باید حداقل {number} کاراکتر داشته باشد
@@ -806,12 +992,15 @@ Change Format:
     نیست
   Use Dash Formats: از فرمت های دش استفاده کنید
   Use Audio Formats: از فرمت های صوتی استفاده کنید
+  Legacy formats are not available for this video: قالب‌های قدیمی برای این ویدیو موجود
+    نیست
 Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'فهرست فصل‌ها پنهان است،
     فصل فعلی: {chapterName}'
   'Chapters list visible, current chapter: {chapterName}': 'فهرست فصل‌ها قابل مشاهده
     است، فصل فعلی: {chapterName}'
   Chapters: فصل
+  Key Moments: لحظات کلیدی
 Hashtag:
   This hashtag does not currently have any videos: این هشتگ در حال حاضر هیچ ویدیویی
     ندارد
@@ -854,6 +1043,8 @@ Comments:
   Hide: مخفی کردن
   Replies: پاسخ
   Hearted: دلی
+  There are no comments available for this post: هیچ نظری برای این پست موجود نیست
+  Subscribed: دنبال شده
 The playlist has been reversed: لیست پخش معکوس شده است
 Default Invidious instance has been cleared: نمونه پیش فرض Invidious پاک شده است
 Profile:
@@ -867,7 +1058,7 @@ Profile:
     same channels will be deleted in any profile they are found in.
   : این نمایه اصلی شماست. آیا مطمئن هستید که می خواهید کانال های انتخاب شده را حذف
     کنید؟ همان کانال ها در هر نمایه ای که در آن یافت می شوند حذف می شوند.
-  Profile Settings: تنظیمات پروفایل
+  Profile Settings: نمایه
   Profile Filter: فیلتر پروفایل
   Profile Manager: مدیر پروفایل
   Custom Color: رنگ سفارشی
@@ -900,6 +1091,11 @@ Profile:
   Your default profile has been changed to your primary profile: پروفایل پیش فرض شما
     به پروفایل اصلی شما تغییر یافته است
   Profile Select: پروفایل را انتخاب کنید
+  Edit Profile Name: ویرایش نام نمایه
+  Create Profile Name: ایجاد نام نمایه
+  Profile Name: نام نمایه
+  Open Profile Dropdown: بازکردن نمایه کشویی
+  Close Profile Dropdown: بستن نمایه کشویی
 Screenshot Success: اسکرین شات به عنوان «{filePath}» ذخیره شد
 Ok: تایید
 Downloading has completed: دانلود '{videoTitle}' به پایان رسید
@@ -915,35 +1111,84 @@ Falling back to Local API: بازگشت به API محلی
 This video is unavailable because of missing formats. This can happen due to country unavailability.: این
   ویدیو به دلیل عدم وجود قالب در دسترس نیست. این ممکن است به دلیل در دسترس نبودن کشور
   اتفاق بیفتد.
-Subscriptions have not yet been implemented: اشتراک ها هنوز اجرا نشده است
 Playing Previous Video: پخش ویدیوی قبلی
 Default Invidious instance has been set to {instance}: نمونه پیش‌فرض Invidious روی
   {instance} تنظیم شده است
 Starting download: شروع دانلود «{videoTitle}»
 Yes: بلی
 Invidious API Error (Click to copy): خطای Invidious API (برای کپی کلیک کنید)
-Hashtags have not yet been implemented, try again later: هشتگ ها هنوز پیاده سازی نشده
-  اند، بعداً دوباره امتحان کنید
 Downloading failed: مشکلی در بارگیری «{videoTitle}» وجود داشت
 No: خیر
 Playlist:
-  Views: مشاهدات
   Last Updated On: آخرین بروز رسانی در تاریخ
   View Full Playlist: مشاهده لیست پخش کامل
-  Videos: ویدیوها
-  View: مشاهده
   Playlist: فهرست پخش
+  Sort By:
+    VideoDurationDescending: مدت (اول طولانی‌ترین)
+    VideoDurationAscending: مدت (اول کوتاه ترین)
+    VideoTitleAscending: عنوان (آ-ی)
+    DateAddedNewest: آخرین اضافه شده در ابتدا
+    DateAddedOldest: اولین اضافه شده در ابتدا
+    AuthorDescending: نویسنده (ی-آ)
+    VideoTitleDescending: عنوان (ی-آ)
+    Custom: سفارشی
+    Sort By: به ترتیب
+    AuthorAscending: نویسنده (آ-ی)
 Mini Player: مینی پلیر
 Videos:
   Sort By:
     Newest: جدیدترین
     Oldest: قدیمی ترین
-Toggle Theatre Mode: حالت تئاتر را تغییر دهید
 Up Next: تا بعدی
 Feed:
   Refresh Feed: تازه‌سازی {subscriptionName}
+  Feed Last Updated: '{feedName} آخرین به روز رسانی فید: {date}'
 Go to page: برو به {page}
 Search Listing:
   Label:
     Subtitles: زیرنویس
+    4K: 4K
+    Closed Captions: زیرنویس‌ها
+    3D: 3 بعدی
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: جدید
 Close Banner: بستن بنر
+Age Restricted:
+  This video is age restricted: این ویدیو دارای محدودیت سنی است
+  This channel is age restricted: این کانال دارای محدودیت سنی می باشد
+Search character limit: عبارت جستجو از حد مجاز نویسه {searchCharacterLimit} فراتر
+  است
+Playlist will pause when current video is finished: پس از پایان ویدیوی فعلی، فهرست
+  پخش متوقف می‌شود
+Yes, Delete: بله حذف شود
+Yes, Restart: بله شروع دوباره
+Cancel: لغو
+Trimmed input must be at least N characters long: ورودی بریده شده باید حداقل 1 کاراکتر
+  طول داشته باشد | ورودی بریده شده باید حداقل {length} کاراکتر باشد
+Tag already exists: برچسب "{tagName}" از قبل وجود دارد
+checkmark: ✓
+Channel Unhidden: '{channel} از فیلتر کانال حذف شد'
+'Blocked opening potentially unsafe URL': 'باز کردن آدرس بالقوه ناامن مسدود شد: "{url}".'
+Channel Hidden: '{channel} به فیلتر کانال اضافه شد'
+Yes, Open Link: بله بازکردن پیوند
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Right-click or hold to see history: برای دیدن تاریخچه کلیک راست کرده یا نگه دارید
+Moments Ago: لحظاتی پیش
+Playlist will not pause when current video is finished: پس از اتمام ویدیوی فعلی، لیست
+  پخش متوقف نمی شود
+Display Label: '{label}: {value}'
+Autoplay Interruption Timer: پخش خودکار به دلیل {autoplayInterruptionIntervalHours}
+  ساعت عدم فعالیت لغو شد
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: فلش پایین
+  arrowleft: فلش چپ
+  arrowright: ‌فلش راست
+  arrowup: فلش بالا
+Description:
+  Expand Description: '...بیشتر'
+  Collapse Description: نمایش کمتر
diff --git a/static/locales/fi.yaml b/static/locales/fi.yaml
index 9d2ccda264aee..5d7bf13ac9add 100644
--- a/static/locales/fi.yaml
+++ b/static/locales/fi.yaml
@@ -118,12 +118,6 @@ Most Popular: 'Suosituimmat'
 Playlists: 'Soittolistat'
 User Playlists:
   Your Playlists: 'Omat soittolistat'
-  Playlist Message: Tämä sivu ei kuvasta täysin toimivia soittolistoja. Se listaa
-    vain tallentamasi tai tykkäämäsi videot. Kun tämä on valmis, kaikki täällä olevat
-    videot siirretään soittolistaan ”Tykkäykset”.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Et
-    ole tallentanut videoita. Paina "Tallenna"-painiketta videon kulmassa tallentaaksesi
-    sen tänne
   Search bar placeholder: Etsi soittolistoja
   Empty Search Message: Tällä soittolistalla ei ole hakuasi vastaavia videoita
   Sort By:
@@ -222,8 +216,6 @@ Settings:
       End: 'Loppu'
       Hidden: Piilotettu
       Blur: Sumennettu
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious instanssi
-      (Oletus on https://invidious.snopyta.org)'
     Region for Trending: 'Nousussa-sivun alue'
         #! List countries
     Check for Latest Blog Posts: Tarkista tuoreimmat blogimerkinnät
@@ -307,7 +299,6 @@ Settings:
     Hide FreeTube Header Logo: Piilota FreeTube-otsikkologo
   Player Settings:
     Player Settings: 'Soittimen asetukset'
-    Remember History: 'Muista historia'
     Play Next Video: 'Toista seuraava video'
     Turn on Subtitles by Default: 'Ota tekstitys käyttöön oletusarvoisesti'
     Autoplay Videos: 'Toista videot automaattisesti'
@@ -362,44 +353,8 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Tilausasetukset'
     Hide Videos on Watch: 'Piilota katsotut videot'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Tilausten vientiformaatti'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Hallinnoi tilauksia'
-    Import Subscriptions: 'Tuo tilauksia'
-    Export Subscriptions: 'Vie tilauksia'
-    How do I import my subscriptions?: 'Miten voin tuoda tilaukseni?'
     Fetch Feeds from RSS: Nouda RSS-syöte
     Fetch Automatically: Nouda syöte automaattisesti
-    Only Show Latest Video for Each Channel: Näytä vain jokaisen kanavan uusin video
-  Advanced Settings:
-    Advanced Settings: 'Lisäasetukset'
-    Enable Debug Mode (Prints data to the console): 'Ota virheenkorjaustila käyttöön
-      (Tulostaa tiedot konsoliin)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Välityspalvelimen osoite
-      (Esimerkiksi: SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '"TESTAA
-      VÄLITYSPALVELIN" -painikkeen napsauttaminen lähettää pyynnön osoitteeseen https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Käytä Tor-verkkoa / Välityspalvelinta API-pyynnöille'
-    TEST PROXY: 'TESTAA VÄLITYSPALVELIN'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Näytä julkiset instanssit'
-    Clear History:
-      Clear History: 'Tyhjennä historia'
-      # On Click
-      Are you sure you want to delete your history?: 'Haluatko varmasti poistaa historian?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Tyhjennä tilaukset'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Haluatko varmasti poistaa
-        kaikki tilaukset?'
-      #& Yes
-      #& No
-
   Privacy Settings:
     Watch history has been cleared: Katseluhistoria poistettiin
     Are you sure you want to remove your entire watch history?: Haluatko varmasti
@@ -447,14 +402,10 @@ Settings:
     Export YouTube: Vie YouTube-tilaukset
     Export FreeTube: Vie FreeTube-tilaukset
     Export Subscriptions: Vie tilaukset
-    Import NewPipe: Tuo NewPipe-tilaukset
-    Import YouTube: Tuo YouTube-tilaukset
-    Import FreeTube: Tuo FreeTube-tilaukset
     Import Subscriptions: Tuo tilaukset
     Select Export Type: Valitse Viennin tyyppi
     Select Import Type: Valitse Tuonnin tyyppi
     Data Settings: Data-asetukset
-    Check for Legacy Subscriptions: Tarkista vanhat tilaukset
     Manage Subscriptions: Hallitse tilauksia
     All playlists has been successfully imported: Kaikki soittolistat on onnistuneesti
       tuotu
@@ -504,7 +455,6 @@ Settings:
     Hide Channel Podcasts: Piilota kanavan podcastit
     Hide Subscriptions Videos: Piilota tilausvideot
     Hide Subscriptions Live: Piilota tilausten livet
-    Blur Thumbnails: Sumenna pikkukuvat
     Hide Profile Pictures in Comments: Piilota profiilikuvat kommenteissa
     Hide Channels Invalid: Annettu kanavatunnus oli virheellinen
     Hide Subscriptions Shorts: Piilota tilattujen kanavien Shorts-videot
@@ -580,48 +530,21 @@ Settings:
     Password Settings: Salasana-asetukset
     Set Password: Aseta salasana
     Remove Password: Poista salasana
-  Expand All Settings Sections: Laajenna asetusten kaikki osiot
   Sort Settings Sections (A-Z): Järjestä asetusosio (A-Ö)
 About:
   #On About page
   About: 'Tietoja'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Tämä
-    avoin ohjelmisto on julkaistu AGPL-3.0 -lisenssin alla.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Löysitko bugin? Haluatko ehdottaa ominaisuutta? Haluatko auttaa? Katso GitHub-sivumme.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Kiitos
-    ihmiset ja projektit, jotka tekevät FreeTuben mahdolliseksi!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Haluatko
-    keskustella? Liity Element / Matrix -serverillemme. Luethan säännöt ennen liittymistä.'
-
-  'Looking for help? Check out our Wiki page.': 'Tarvitko apua? Tutustu Wiki-sivuumme.'
-
-  Check out our Firefox extension!: 'Tutustu Firefox-laajennukseemme!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Jos
-    nautit FreeTuben käytöstä, harkitse lahjoittamista LiberaPayn tai Bitcoin-osoittemme
-    kautta.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Viimeisimmät Freetube-uutiset'
-
 #On Channel Page
   GitHub issues: GitHub-ongelmat
   Report a problem: Ilmoita ongelmasta
   FAQ: UKK
   Blog: Blogi
   Email: Sähköposti
-  Licensed under the AGPLv3: Lisensoitu AGPLv3:n alle
   Chat on Matrix: Matrix
   these people and projects: nämä henkilöt ja projektit
   room rules: huoneen säännöt
   Please read the: Lue
-  View License: Katso lisenssi
   Please check for duplicates before posting: Tarkista kopioiden varalta ennen julkaisua
   Website: Verkkosivusto
   Mastodon: Mastodon
@@ -724,38 +647,8 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Live-keskustelua
     ei tueta nykyisessä Invidious API:ssa. Suora yhteys Youtubeen vaaditaan.'
   Published:
-    Jan: 'Tam'
-    Feb: 'Hel'
-    Mar: 'Maa'
-    Apr: 'Huh'
-    May: 'Tou'
-    Jun: 'Kes'
-    Jul: 'Hei'
-    Aug: 'Elo'
-    Sep: 'Syy'
-    Oct: 'Lok'
-    Nov: 'Mar'
-    Dec: 'Jou'
-    Second: 'Sekunti'
-    Seconds: 'Sekuntia'
-    Hour: 'Tunti'
-    Hours: 'Tuntia'
-    Day: 'Päivä'
-    Days: 'Päivää'
-    Week: 'Viikko'
-    Weeks: 'Viikkoa'
-    Month: 'Kuukausi'
-    Months: 'Kuukautta'
-    Year: 'Vuosi'
-    Years: 'Vuotta'
-    Ago: 'sitten'
-    Upcoming: 'Ensiesitys'
-    Minutes: Minuuttia
-    Minute: Minuutti
-    Less than a minute: Vähemmän kuin minuutti
     In less than a minute: Alle minuutin kuluessa
   Published on: 'Julkaistu'
-  Publicationtemplate: '{number} {unit} sitten'
 #& Videos
   Video has been removed from your history: Video on poistettu historiastasi
   Video has been marked as watched: Video on merkitty katsotuksi
@@ -826,9 +719,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Näytä koko soittolista'
-  Videos: 'Videot'
-  View: 'Katselu'
-  Views: 'Katsomiskertaa'
   Last Updated On: 'Viimeksi päivitetty'
 
 # On Video Watch Page
@@ -840,7 +730,6 @@ Playlist:
     DateAddedNewest: Viimeksi lisätty ensin
     AuthorAscending: Tekijä (A-Ö)
     AuthorDescending: Tekijä (Ö-A)
-Toggle Theatre Mode: 'Teatteritila'
 Change Format:
   Change Media Formats: 'Vaihda videoformaattia'
   Use Dash Formats: 'Käytä DASH-formaatteja'
@@ -900,7 +789,6 @@ Local API Error (Click to copy): 'Paikallinen API-virhe (Kopioi napsauttamalla)'
 Invidious API Error (Click to copy): 'Invidious API-virhe (Kopioi napsauttamalla)'
 Falling back to Invidious API: 'Palaa takaisin Invidious-sovellusliittymään'
 Falling back to Local API: 'Palaa takaisin paikalliseen sovellusliittymään'
-Subscriptions have not yet been implemented: 'Tilauksia ei ole vielä jalkautettu'
 Loop is now disabled: 'Silmukka on poistettu käytöstä'
 Loop is now enabled: 'Silmukka on nyt käytössä'
 Shuffle is now disabled: 'Satunnaistoisto on poistettu käytöstä'
@@ -1002,8 +890,7 @@ Tooltips:
       MPV-tyyliin.
   External Player Settings:
     Custom External Player Arguments: Kaikki ne omavalintaiset komentorivin määreet,
-      puolipisteillä eroteltuina (';'), jotka haluat siirtää eteenpäin ulkoiselle
-      toisto-ohjelmalle.
+      jotka haluat siirtää eteenpäin ulkoiselle toisto-ohjelmalle.
     Ignore Warnings: Estä varoitukset, kun käytetty ulkoinen toisto-ohjelma ei tue
       määrättyä toimintamallia (kuten käänteiset soittoluettelot, jne.).
     Custom External Player Executable: Vakiollisesti FreeTube olettaa, että valittu
@@ -1030,8 +917,6 @@ More: Lisää
 Playing Next Video Interval: Seuraava video alkaa. Klikkaa peruuttaaksesi. |Seuraava
   video alkaa {nextVideoInterval} sekunnin kuluttua. Klikkaa peruuttaaksesi. | Seuraava
   video alkaa {nextVideoInterval} sekunnin kuluttua. Klikkaa peruuttaaksesi.
-Hashtags have not yet been implemented, try again later: Hashtageja ei vielä ole lisätty,
-  yritä uudelleen myöhemmin
 Open New Window: Avaa uusi ikkuna
 Unknown YouTube url type, cannot be opened in app: Tuntematon YouTube-videon osoitemuoto,
   ei voida avata sovelluksessa
@@ -1056,9 +941,7 @@ Channels:
   Search bar placeholder: Etsi kanavia
   Count: '{number} kanava(a) löydetty.'
   Empty: Kanavaluettelosi on tällä hetkellä tyhjä.
-  Unsubscribe: Peruuta tilaus
   Unsubscribe Prompt: Haluatko varmasti perua kanavan ”{channelName}” tilauksen?
-  Unsubscribed: '{channelName} on poistettu tilauksistasi'
 Clipboard:
   Copy failed: Kopiointi leikepöydälle epäonnistui
   Cannot access clipboard without a secure connection: Leikepöytää ei voi käyttää
diff --git a/static/locales/fil.yaml b/static/locales/fil.yaml
index d427776684e50..309e0e035da03 100644
--- a/static/locales/fil.yaml
+++ b/static/locales/fil.yaml
@@ -113,8 +113,6 @@ External link opening has been disabled in the general settings: Ang pag bukas n
 Age Restricted:
   This channel is age restricted: Itong channel ay pinaghihigpitan sa edad
   This video is age restricted: Ang video na ito ay pinaghihigpitan sa edad
-Hashtags have not yet been implemented, try again later: Walang hashtags sa kasalukuyan,
-  subukan muli
 Close Banner: I-Sara ang banner
 Are you sure you want to open this link?: Sigurado mo na buksan itong link?
 Search character limit: Na sobrahan ng {searchCharacterLimit} na tilik ang Search
diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index dd7721d94ada4..79291ddc4edad 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -43,7 +43,7 @@ Global:
     Subscriber Count: 1 abonné | {count} abonnés
     Watching Count: 1 spectateur | {count} spectateurs
     Comment Count: 1 commentaire | {count} commentaires
-    Like Count: 1 like | {count} likes
+    Like Count: 1 j’aime | {count} j’aime
   Input Tags:
     Length Requirement: L'étiquette doit comporter au moins {number} caractères
 Search / Go to URL: 'Rechercher / ouvrir l''URL'
@@ -82,7 +82,7 @@ Search Filters:
   Fetching results. Please wait: 'Récupération des résultats. Veuillez patienter'
   Fetch more results: 'Afficher plus de résultats'
 # Sidebar
-  There are no more results for this search: Il n'y a plus de résultats pour cette
+  There are no more results for this search: Il n’y a pas plus de résultats pour cette
     recherche
   Features:
     Creative Commons: Creative Commons
@@ -101,14 +101,15 @@ Subscriptions:
   Subscriptions: 'Abonnements'
   Latest Subscriptions: 'Derniers abonnements'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Votre
-    liste d''abonnements est vide. Ajoutez des abonnements pour les voir apparaître
-    ici.'
+    liste d’abonnements est actuellement vide. Si vous souhaitez importer vos abonnements,
+    vous pouvez aller dans Paramètres des données et sélectionner Importer des abonnements
+    ou vous pouvez rechercher une chaîne et vous y abonner.'
   'Getting Subscriptions.  Please wait.': 'Récupération des vidéos de vos abonnements,
     veuillez patienter.'
   Getting Subscriptions. Please wait.: Obtention des abonnements. Veuillez patienter.
   Refresh Subscriptions: Actualiser les abonnements
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Ce
-    profil comporte un grand nombre d'abonnements.  Le flux RSS outrepassera la limite
+    profil comporte un grand nombre d'abonnements.  Le flux RSS dépassera la limite
     fixée
   Load More Videos: Charger plus de vidéos
   Error Channels: Chaînes avec des erreurs
@@ -133,25 +134,15 @@ Most Popular: 'Les plus populaires'
 Playlists: 'Listes de lecture'
 User Playlists:
   Your Playlists: 'Vos listes de lecture'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Vous
-    n'avez enregistré aucune vidéo. Cliquez sur le bouton Enregistrer dans le coin
-    d'une vidéo pour l'afficher ici
-  Playlist Message: Cette page ne reflète pas les listes de lecture entièrement fonctionnelles.
-    Elle ne répertorie que les vidéos que vous avez enregistrées ou mises en favoris.
-    Une fois le travail terminé, toutes les vidéos actuellement présentes ici seront
-    migrées vers une liste de lecture « Favoris ».
   Search bar placeholder: Recherche de listes de lecture
   Empty Search Message: Il n'y a pas de vidéos dans cette liste de lecture qui correspondent
     à votre recherche
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Êtes-vous
-    sûr(e) de vouloir supprimer toutes les vidéos visionnées de cette liste de lecture ?
-    Cette opération ne peut pas être annulée.
   AddVideoPrompt:
     Search in Playlists: Recherche dans les listes de lecture
     Save: Sauvegarder
     Select a playlist to add your N videos to: Sélectionnez une liste de lecture à
       laquelle ajouter votre vidéo | Sélectionnez une liste de lecture à laquelle
-      ajouter vos vidéos {videoCount}
+      ajouter vos {videoCount} vidéos
     Toast:
       "{videoCount} video(s) added to 1 playlist": 1 vidéo ajoutée à 1 liste de lecture
         | {videoCount} vidéos ajoutées à 1 liste de lecture
@@ -194,7 +185,6 @@ User Playlists:
         le bas.
       This playlist is now used for quick bookmark: Cette liste de lecture est maintenant
         utilisée comme marque-page rapide
-      Quick bookmark disabled: Marque-page rapide désactivé
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Cette
         liste de lecture est désormais utilisée comme marque-page rapide à la place
         de {oldPlaylistName}. Cliquez ici pour annuler
@@ -204,6 +194,9 @@ User Playlists:
         est déjà utilisée comme signet rapide.
       Playlist {playlistName} is the new quick bookmark playlist.: La liste de lecture
         {playlistName} est la nouvelle liste de lecture des signets rapides.
+      This playlist has a video with a duration error: Cette liste de lecture contient
+        au moins une vidéo qui n'a pas de durée, elle sera triée comme si la durée
+        était nulle.
     Search for Videos: Rechercher des vidéos
   Are you sure you want to delete this playlist? This cannot be undone: Êtes-vous
     sûr(e) de vouloir supprimer cette liste de lecture ? Cette opération ne peut pas
@@ -251,7 +244,6 @@ User Playlists:
   Remove from Favorites: Retirer de {playlistName}
   Enable Quick Bookmark With This Playlist: Activer le marque-page rapide avec cette
     liste de lecture
-  Disable Quick Bookmark: Désactiver le marque-page rapide
   Playlists with Matching Videos: Listes de lecture avec des vidéos correspondantes
   Quick Bookmark Enabled: Signet rapide activé
   Cannot delete the quick bookmark target playlist.: Impossible de supprimer la liste
@@ -265,6 +257,9 @@ User Playlists:
     opération est irréversible. | Êtes-vous sûr(e) de vouloir supprimer {playlistItemCount}
     vidéos regardées de cette liste de lecture ? Cette opération est irréversible.
   Remove Duplicate Videos: Supprimer les vidéos en double
+  The playlist has been successfully exported: La liste de lecture a été exportée
+    avec succès
+  Export Playlist: Exporter cette liste de lecture
 History:
   # On History Page
   History: 'Historique'
@@ -278,7 +273,7 @@ Settings:
   # On Settings Page
   Settings: 'Paramètres'
   General Settings:
-    General Settings: 'Paramètres généraux'
+    General Settings: 'Général'
     Fallback to Non-Preferred Backend on Failure: 'Revenir au Backend non préférentiel
       en cas d''échec'
     Enable Search Suggestions: 'Activer les suggestions de recherche'
@@ -300,8 +295,6 @@ Settings:
       End: 'Fin'
       Hidden: Masqué
       Blur: Flou
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instance Individious
-      (https://invidious.snopyta.org par défaut)'
     Region for Trending: 'Pays pour les tendances'
         #! List countries
     Check for Latest Blog Posts: Consultez les derniers billets du blog
@@ -326,8 +319,10 @@ Settings:
     Auto Load Next Page:
       Label: Chargement automatique de la page suivante
       Tooltip: Chargement automatique des pages supplémentaires et des commentaires.
+    Open Deep Links In New Window: Les URL ouvertes ont été transmises à FreeTube
+      dans une nouvelle fenêtre
   Theme Settings:
-    Theme Settings: 'Paramètres du thème'
+    Theme Settings: 'Thème'
     Match Top Bar with Main Color: 'Faire correspondre la barre supérieure à la couleur
       principale'
     Base Theme:
@@ -343,6 +338,8 @@ Settings:
       Nordic: Nordic
       Solarized Light: Clair polarisé
       Solarized Dark: Noir polarisé
+      Gruvbox Light: Gruvbox Clair
+      Gruvbox Dark: Gruvbox Sombre
     Main Color Theme:
       Main Color Theme: 'Couleur principale du thème'
       Red: 'Rouge'
@@ -390,6 +387,16 @@ Settings:
       Solarized Yellow: Jaune polarisé
       Solarized Orange: Orange polarisé
       Solarized Red: Rouge polarisé
+      Gruvbox Dark Yellow: Gruvbox Jaune Sombre
+      Gruvbox Dark Purple: Gruvbox Violet Sombre
+      Gruvbox Dark Aqua: Gruvbox Eau Sombre
+      Gruvbox Dark Orange: Gruvbox Orange Sombre
+      Gruvbox Light Red: Gruvbox Rouge Sombre
+      Gruvbox Light Blue: Gruvbox Bleu Clair
+      Gruvbox Light Purple: Gruvbox Violet Clair
+      Gruvbox Light Orange: Gruvbox Orange Clair
+      Gruvbox Dark Green: Gruvbox Vert Sombre
+      Gruvbox Dark Blue: Gruvbox Bleu Sombre
     Secondary Color Theme: 'Couleur secondaire du thème'
         #* Main Color Theme
     UI Scale: Échelle de l'interface utilisateur
@@ -398,8 +405,7 @@ Settings:
     Hide Side Bar Labels: Masquer les étiquettes de la barre latérale
     Hide FreeTube Header Logo: Masquer le logo d'en-tête de FreeTube
   Player Settings:
-    Player Settings: 'Paramètres du lecteur'
-    Remember History: 'Se souvenir de l''historique'
+    Player Settings: 'Lecteur'
     Play Next Video: 'Lire la vidéo suivante'
     Turn on Subtitles by Default: 'Activer les sous-titres par défaut'
     Autoplay Videos: 'Lecture automatique des vidéos'
@@ -427,7 +433,7 @@ Settings:
       8k: '8k'
     Playlist Next Video Interval: Intervalle de la prochaine vidéo dans la liste de
       lecture
-    Next Video Interval: Intervalle vidéo suivante
+    Next Video Interval: Minuteur de lecture automatique
     Scroll Volume Over Video Player: Contrôler le niveau du volume avec la molette
       au dessus du lecteur vidéo
     Display Play Button In Video Player: Afficher le bouton de lecture dans le lecteur
@@ -455,52 +461,19 @@ Settings:
       Folder Label: Dossier de capture d'écran
     Enter Fullscreen on Display Rotate: Entrer en plein écran sur l'affichage Rotation
     Skip by Scrolling Over Video Player: Sauter en faisant défiler le lecteur vidéo
+    Autoplay Interruption Timer: Minuteur d'arrêt de la lecture automatique
   Subscription Settings:
-    Subscription Settings: 'Paramètres des abonnements'
+    Subscription Settings: 'Abonnements'
     Hide Videos on Watch: 'Masquer les vidéos visionnées'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Format d''exportation des abonnements'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Gérer les abonnements'
-    Import Subscriptions: 'Importer vos abonnements'
-    Export Subscriptions: 'Exporter vos abonnements'
-    How do I import my subscriptions?: 'Comment importer mes abonnements ?'
     Fetch Feeds from RSS: Récupération de flux RSS
     Fetch Automatically: Récupération automatique des flux
-    Only Show Latest Video for Each Channel: Afficher uniquement la dernière vidéo
-      pour chaque chaîne
     Confirm Before Unsubscribing: Évitez les désabonnements accidentels
-  Advanced Settings:
-    Advanced Settings: 'Paramètres Avancés'
-    Enable Debug Mode (Prints data to the console): 'Activer le mode débug (afficher
-      les données dans la console)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adresse Proxy (Exemple :
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Cliquer
-      sur le bouton « TEST PROXY » enverra une demande à https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Utiliser Tor / Proxy pour les appels de l''API'
-    TEST PROXY: 'TESTER LE PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Voir les instances publiques'
-    Clear History:
-      Clear History: 'Effacer l’historique'
-      # On Click
-      Are you sure you want to delete your history?: 'Êtes-vous sûr(e) de vouloir
-        effacer votre historique ?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Effacer les abonnements'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Êtes-vous sûr(e) de vouloir
-        supprimer tous les abonnements ?'
-      #& Yes
-      #& No
 
+    'Limit the number of videos displayed for each channel': Limiter le nombre de
+      vidéos affichées pour chaque chaîne
+    To: Pour
   Privacy Settings:
-    Privacy Settings: Paramètres de confidentialité
+    Privacy Settings: Confidentialité
     Remember History: Enregistrer l'historique
     Watch history has been cleared: L'historique a été effacé
     Are you sure you want to remove your entire watch history?: Êtes-vous sûr(e) de
@@ -535,9 +508,6 @@ Settings:
     Export YouTube: Exporter YouTube
     Export FreeTube: Exporter FreeTube
     Export Subscriptions: Exporter vos abonnements
-    Import NewPipe: Importer NewPipe
-    Import YouTube: Importer YouTube
-    Import FreeTube: Importer FreeTube
     Import Subscriptions: Importer vos abonnements
     Select Export Type: Sélectionner le type d'exportation
     Select Import Type: Sélectionner le type d'importation
@@ -548,7 +518,7 @@ Settings:
     This might take a while, please wait: Cela pourrait prendre un certain temps,
       veuillez patienter
     Invalid subscriptions file: Fichier d'abonnements invalide
-    Data Settings: Paramètres des données
+    Data Settings: Données
     All watched history has been successfully exported: Tout votre historique de visionnage
       a été exporté avec succès
     All watched history has been successfully imported: Tout votre historique de visionnage
@@ -557,7 +527,6 @@ Settings:
       données d'historique sont insuffisantes
     Profile object has insufficient data, skipping item: Ignorer cet élément car les
       données de profil sont insuffisantes
-    Check for Legacy Subscriptions: Vérifier les abonnements Legacy
     Manage Subscriptions: Gérer les abonnements
     Import Playlists: Importer des listes de lecture
     Export Playlists: Exporter des listes de lecture
@@ -588,7 +557,7 @@ Settings:
     Hide Popular Videos: Masquer les vidéos populaires
     Hide Trending Videos: Masquer les tendances
     Hide Recommended Videos: Masquer les vidéos recommandées
-    Distraction Free Settings: Mode sans distraction
+    Distraction Free Settings: Sans distraction
     Hide Active Subscriptions: Masquer les abonnements actifs
     Hide Playlists: Masquer les listes de lecture
     Hide Video Description: Masquer la description de la vidéo
@@ -601,22 +570,21 @@ Settings:
     Hide Channels Placeholder: Identifiant de la chaîne
     Display Titles Without Excessive Capitalisation: Afficher les titres sans majuscules
       ni ponctuation excessives
-    Hide Channel Playlists: Masquer les listes de lecture des chaînes
+    Hide Channel Playlists: Masquer l'onglet de la chaîne "Listes de lecture"
     Hide Featured Channels: Masquer les chaînes en vedette
-    Hide Channel Community: Masquer la communauté de la chaîne
-    Hide Channel Shorts: Masquer les shorts de la chaîne
+    Hide Channel Community: Masquer l'onglet de la chaîne "Communauté"
+    Hide Channel Shorts: Masquer l'onglet "Shorts" de la chaîne
     Sections:
       Channel Page: Page de la chaîne
       Side Bar: Barre latérale
       Watch Page: Page de lecture
       General: Général
       Subscriptions Page: Page Abonnements
-    Hide Channel Podcasts: Masquer les podcasts de la chaîne
-    Hide Channel Releases: Masquer les publications de la chaîne
+    Hide Channel Podcasts: Masquer l'onglet de la chaîne "Podcasts"
+    Hide Channel Releases: Masquer l'onglet de la chaîne "Publications"
     Hide Subscriptions Videos: Masquer les vidéos des abonnements
     Hide Subscriptions Shorts: Masquer les shorts des abonnements
     Hide Subscriptions Live: Masquer les diffusions en direct des abonnements
-    Blur Thumbnails: Flouter les miniatures
     Hide Profile Pictures in Comments: Masquer les photos de profil dans les commentaires
     Hide Subscriptions Community: Masquer les communautés abonnées
     Hide Channels Invalid: L'identifiant de la chaîne fourni n'est pas valide
@@ -630,6 +598,8 @@ Settings:
       lecture contenant du texte
     Hide Videos and Playlists Containing Text Placeholder: Mot, fragment de mot ou
       phrase
+    Hide Channel Home: Masquer l'onglet "Accueil" de la chaîne
+    Show Added Items: Afficher les articles ajoutés
   The app needs to restart for changes to take effect. Restart and apply change?: L'application
     doit être redémarrée pour que les changements prennent effet. Redémarrer et appliquer
     les changements ?
@@ -649,14 +619,19 @@ Settings:
     Proxy Host: Hôte du proxy
     Proxy Protocol: Protocole du proxy
     Enable Tor / Proxy: Activer Tor / proxy
-    Proxy Settings: Paramètres du proxy
+    Proxy Settings: Proxy
+    Proxy Warning: FreeTube n'a pas de proxy intégré mais peut se connecter à un proxy
+      externe, tel qu'un proxy fonctionnant sur votre machine comme Tor ou un proxy
+      externe tel qu'un proxy SOCKS5 fourni par certains VPN. Si cette option est
+      activée, assurez-vous que votre proxy/Tor est configuré correctement, sinon
+      FreeTube ne pourra pas récupérer de données.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notification lorsqu'un segment sponsorisé
       est ignoré
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL de l'API SponsorBlock
       (la valeur par défaut est https://sponsor.ajay.app)
     Enable SponsorBlock: Activer SponsorBlock
-    SponsorBlock Settings: Paramètres de SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Ignorer l'option
       Auto Skip: Ignorer automatiquement
@@ -672,7 +647,7 @@ Settings:
     Ignore Unsupported Action Warnings: Ignorer les avertissements concernant les
       actions non prises en charge
     External Player: Lecteur externe
-    External Player Settings: Paramètres du lecteur externe
+    External Player Settings: Lecteur externe
     Custom External Player Arguments: Arguments personnalisés du lecteur externe
     Custom External Player Executable: Exécutable de lecteur externe personnalisé
     Players:
@@ -680,7 +655,7 @@ Settings:
         Name: Aucun
     Ignore Default Arguments: Ignorer les arguments par défaut
   Download Settings:
-    Download Settings: 'Paramètres de téléchargement'
+    Download Settings: 'Téléchargement'
     Ask Download Path: 'Demander l''emplacement de téléchargement'
     Choose Path: 'Choisir l''emplacement'
     Download Behavior: Comportement de téléchargement
@@ -689,11 +664,11 @@ Settings:
   Parental Control Settings:
     Hide Unsubscribe Button: Masquer le bouton de désabonnement
     Hide Search Bar: Masquer la barre de recherche
-    Parental Control Settings: Paramètres du contrôle parental
+    Parental Control Settings: Contrôle parental
     Show Family Friendly Only: Afficher uniquement le contenu familial
   Experimental Settings:
     Replace HTTP Cache: Remplacer le cache HTTP
-    Experimental Settings: Paramètres expérimentaux
+    Experimental Settings: Expérimental
     Warning: Ces paramètres sont expérimentaux ; ils peuvent provoquer des plantages
       lorsqu'ils sont activés. Il est fortement recommandé de faire des sauvegardes.
       Utilisez-les à vos risques et périls !
@@ -707,66 +682,26 @@ Settings:
     Set Password To Prevent Access: Définir un mot de passe pour empêcher l'accès
       aux paramètres
     Set Password: Définir un mot de passe
-    Password Settings: Paramètres de mot de passe
-  Expand All Settings Sections: Développer toutes les sections des paramètres
+    Password Settings: Mot de passe
   Sort Settings Sections (A-Z): Trier les rubriques de paramètres (A-Z)
+  Return to Settings Menu: Revenir au Menu paramètres
 About:
   #On About page
   About: 'À propos'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ce
-    logiciel est sous licence AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Vous avez trouvé une erreur ? Vous souhaitez suggérer une nouvelle fonctionnalité
-    ? Vous voulez aider de façon générale ? Rendez-vous sur la page GitHub. Les pull
-    requests sont les bienvenues.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Un
-    grand merci à toutes les personnes et à tous les projets qui ont rendu FreeTube
-    possible !'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Envie
-    de discuter ? Rejoigner notre serveur Element / Matrix. Merci de lire les règles
-    avant de nous rejoindre.'
-
-  'Looking for help? Check out our Wiki page.': 'Vous cherchez de l''aide ? Consultez
-    notre page Wiki.'
-
-  Check out our Firefox extension!: 'Découvrez notre extension Firefox !'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Si
-    vous aimez utiliser FreeTube, envisagez de faire un don via Liberapay ou via notre
-    adresse Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Les dernières actualités FreeTube'
-
 #On Channel Page
-  Channel Rules: Règles du salon
   Website: Site web
-  Source Code: Code source
-  Release Notes: Notes de version
   Email: Courriel
-  License: Licence
   Help: Aide
-  Contact: Contacts
-  Translate via Weblate: Traduire via Weblate
   Blog: Blog
   Credits: Crédits
   FAQ: FAQ
-  Wiki: Wiki
-  Report an Issue: Signaler un problème
   Beta: Bêta
   Donate: Faire un don
-  Useful Links: Liens utiles
   Translate: Aidez-nous à traduire FreeTube
   Chat on Matrix: Discuter sur Matrix
   Mastodon: Mastodon
   Report a problem: Signaler un problème
-  View License: Voir la licence
-  Licensed under the AGPLv3: Sous licence AGPLv3
   Source code: Code source
   these people and projects: ces personnes et ces projets
   FreeTube is made possible by: FreeTube est rendu possible par
@@ -850,6 +785,9 @@ Channel:
     Podcasts: Podcasts
     This channel does not currently have any podcasts: Cette chaîne n'a pas encore
       de podcasts
+  Home:
+    Home: Accueil
+    View Playlist: Afficher la liste de lecture
 Video:
   Mark As Watched: 'Marquer comme vu'
   Remove From History: 'Supprimer de l''historique'
@@ -878,38 +816,8 @@ Video:
     tchat en direct n''est actuellement pas pris en charge avec l''API Invidious.
     Une connexion directe à YouTube est requise.'
   Published:
-    Jan: 'jan'
-    Feb: 'fév'
-    Mar: 'mar'
-    Apr: 'avr'
-    May: 'mai'
-    Jun: 'juin'
-    Jul: 'juil'
-    Aug: 'août'
-    Sep: 'sep'
-    Oct: 'oct'
-    Nov: 'nov'
-    Dec: 'déc'
-    Second: 'seconde'
-    Seconds: 'secondes'
-    Hour: 'heure'
-    Hours: 'heures'
-    Day: 'jour'
-    Days: 'jours'
-    Week: 'semaine'
-    Weeks: 'semaines'
-    Month: 'mois'
-    Months: 'mois'
-    Year: 'année'
-    Years: 'années'
-    Ago: 'Il y a'
-    Upcoming: 'Avant-première le'
-    Minutes: minutes
-    Minute: minute
-    Less than a minute: Moins d'une minute
     In less than a minute: En moins d'une minute
   Published on: 'Mise en ligne le'
-  Publicationtemplate: 'Il y a {number} {unit}'
 #& Videos
   Play Previous Video: Lire la vidéo précédente
   Play Next Video: Lire la vidéo suivante
@@ -999,6 +907,18 @@ Video:
     You appear to be offline: Vous semblez être hors ligne.
     Playback will resume automatically when your connection comes back: La lecture
       reprendra automatiquement quand votre connexion reviendra.
+  IP block: YouTube a bloqué votre adresse IP pour le visionnage de vidéos. Veuillez
+    essayer de changer de VPN ou de proxy.
+  Unlisted: Non répertorié
+  AgeRestricted: Les vidéos soumises à des restrictions d'âge ne peuvent pas être
+    regardées avec FreeTube car elles nécessitent une connexion Google et l'utilisation
+    d'un compte YouTube dont l'âge a été vérifié.
+  MembersOnly: Les vidéos réservées aux membres ne peuvent pas être visionnées avec
+    FreeTube, car elles nécessitent une connexion Google et une adhésion payante à
+    la chaîne du vidéaste.
+  DeArrow:
+    Show Original Details: Afficher les détails originaux
+    Show Modified Details: Afficher les détails modifiés
 Videos:
   #& Sort By
   Sort By:
@@ -1009,9 +929,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Afficher la liste de lecture complète'
-  Videos: 'Vidéos'
-  View: 'Vue'
-  Views: 'Vues'
   Last Updated On: 'Dernière mise à jour le'
 
 # On Video Watch Page
@@ -1027,7 +944,8 @@ Playlist:
     VideoTitleAscending: Titre (A-Z)
     VideoTitleDescending: Titre (Z-A)
     Custom: Personnalisé
-Toggle Theatre Mode: 'Mode Cinéma'
+    VideoDurationDescending: Durée (la plus longue en premier)
+    VideoDurationAscending: Durée (la plus courte en premier)
 Change Format:
   Change Media Formats: 'Changer le format de la vidéo'
   Use Dash Formats: 'Utiliser le format DASH'
@@ -1097,8 +1015,6 @@ Local API Error (Click to copy): 'Erreur d''API locale (Cliquez pour copier)'
 Invidious API Error (Click to copy): 'Erreur d''API Invidious (Cliquez pour copier)'
 Falling back to Invidious API: 'Revenir à l''API Invidious'
 Falling back to Local API: 'Revenir à l''API locale'
-Subscriptions have not yet been implemented: 'Les abonnements n''ont pas encore été
-  implémentés'
 Loop is now disabled: 'La boucle est maintenant désactivée'
 Loop is now enabled: 'La boucle est maintenant activée'
 Shuffle is now disabled: 'Mode aléatoire désactivé'
@@ -1111,7 +1027,7 @@ Canceled next video autoplay: 'Annuler la lecture automatique'
 
 Yes: 'Oui'
 No: 'Non'
-Locale Name: Français
+Locale Name: Français (France)
 Profile:
   '{profile} is now the active profile': '{profile} est maintenant le profil actif'
   Your default profile has been changed to your primary profile: Votre profil par
@@ -1155,7 +1071,7 @@ Profile:
   '{number} selected': '{number} sélectionné(s)'
   Other Channels: Autres chaînes
   Profile Filter: Filtre de profil
-  Profile Settings: Paramètres du profil
+  Profile Settings: Profil
   Toggle Profile List: Afficher la liste des profils
   Open Profile Dropdown: Ouvrir la liste déroulante du profil
   Close Profile Dropdown: Fermer la liste déroulante du profil
@@ -1211,10 +1127,12 @@ Tooltips:
     External Link Handling: "Choisissez le comportement par défaut quand on clique
       sur un lien qui ne peut être ouvert dans FreeTube.\nPar défaut, FreeTube ouvrira
       le lien dans votre navigateur par défaut.\n"
+    Open Deep Links In New Window: Les URL transmises à FreeTube, par des extensions
+      de redirection d'un navigateur ou par les arguments de la ligne de commande,
+      sont ouvertes dans une nouvelle fenêtre.
   External Player Settings:
     Custom External Player Arguments: Tous les arguments de ligne de commande personnalisés,
-      séparés par des points-virgules (';'), que vous souhaitez transmettre au lecteur
-      externe.
+      que vous souhaitez transmettre au lecteur externe.
     Ignore Warnings: Suppression des avertissements lorsque le lecteur externe actuel
       ne prend pas en charge l'action en cours (par exemple, inversion des listes
       de lecture, etc.).
@@ -1255,8 +1173,6 @@ Playing Next Video Interval: Lecture de la prochaine vidéo en un rien de temps.
   pour annuler. | Lecture de la prochaine vidéo dans {nextVideoInterval} seconde.
   Cliquer pour annuler. | Lecture de la vidéo suivante dans {nextVideoInterval} secondes.
   Cliquer pour annuler.
-Hashtags have not yet been implemented, try again later: Les hashtags n'ont pas encore
-  été implémentés, réessayez plus tard
 Unknown YouTube url type, cannot be opened in app: Type d'URL YouTube inconnu, ne
   peut pas être ouvert dans l'application
 Open New Window: Ouvrir une nouvelle fenêtre
@@ -1282,10 +1198,8 @@ Channels:
   Channels: Chaînes
   Title: Liste des chaînes
   Empty: Votre liste de chaînes est actuellement vide.
-  Unsubscribe: Se désabonner
   Search bar placeholder: Rechercher des chaînes
   Count: '{number} chaîne(s) trouvée(s).'
-  Unsubscribed: '{channelName} a été supprimé de vos abonnements'
   Unsubscribe Prompt: Êtes-vous sûr(e) de vouloir vous désabonner de « {channelName} » ?
 Clipboard:
   Copy failed: La copie dans le presse-papiers a échoué
@@ -1297,6 +1211,7 @@ Chapters:
     chapitre actuel : {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Liste des chapitres cachée,
     chapitre actuel : {chapterName}'
+  Key Moments: Moments clés
 Preferences: Préférences
 Ok: OK
 Hashtag:
@@ -1334,5 +1249,25 @@ Search Listing:
     4K: 4K
     Subtitles: Sous-titres
     Closed Captions: Sous-titrage codé
+    8K: 8k
+    VR180: VR180
+    360 Video: 360°
+    New: Nouveau
+    3D: 3D
 'Blocked opening potentially unsafe URL': "Blocage de l'ouverture d'une URL potentiellement
   dangereuse : « {url} »."
+shortcutJoinOperator: +
+Keys:
+  ctrl: Ctrl
+  arrowdown: Flèche bas
+  arrowleft: Flèche gauche
+  arrowright: Flèche droite
+  arrowup: Flèche haut
+  alt: Alt
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Right-click or hold to see history: Clic droit ou maintenez pour voir l'historique
+Autoplay Interruption Timer: Lecture automatique annulée après {autoplayInterruptionIntervalHours}
+  heures d'inactivité
+Description:
+  Expand Description: '...plus'
+  Collapse Description: Montrer moins
diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index ea663d8f4b5a7..598ddc5bc44a4 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -110,13 +110,6 @@ Most Popular: 'Máis populares'
 Playlists: 'Listaxes de reprodución'
 User Playlists:
   Your Playlists: 'As túas listaxes de reprodución'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Os
-    teus vídeos gardados están baleiros. Fai clic no botón Gardar na esquina dun vídeo
-    para que apareza aquí
-  Playlist Message: Esta páxina non reflicte as listas de reprodución que funcionan
-    completamente. Só lista os vídeos que gardaches ou marcaches como favoritos. Cando
-    remate o traballo, todos os vídeos que hai aquí migraranse a unha lista de reprodución
-    "Favoritos".
   Empty Search Message: Non hai vídeos nesta lista de reprodución que coincidan coa
     túa busca
   Search bar placeholder: Atopar na lista de reprodución
@@ -155,8 +148,6 @@ Settings:
       Beginning: 'Principio'
       Middle: 'Metade'
       End: 'Final'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
-      Invidious (por defecto é https://invidious.snopyta.org)'
     Region for Trending: 'Rexión para as tendencias'
         #! List countries
     View all Invidious instance information: Ver todala información da instancia de
@@ -307,7 +298,6 @@ Settings:
     Subscription Settings: 'Axustes de subscricións'
     Hide Videos on Watch: 'Agochar vídeos visualizados'
     Fetch Feeds from RSS: 'Obter subscricións a través de RSS'
-    Manage Subscriptions: 'Xestionar subscricións'
     Fetch Automatically: Obter feed automaticamente
   Distraction Free Settings:
     Distraction Free Settings: 'Sen distraccións'
@@ -336,10 +326,6 @@ Settings:
     Select Import Type: 'Escoller tipo de importación'
     Select Export Type: 'Escoller tipo de exportación'
     Import Subscriptions: 'Importar subscricións'
-    Import FreeTube: 'Importar FreeTube'
-    Import YouTube: 'Importar YouTube'
-    Import NewPipe: 'Importar NewPipe'
-    Check for Legacy Subscriptions: 'Comprobar subscricións antigas (Legacy)'
     Export Subscriptions: 'Exportar subscricións'
     Export FreeTube: 'Exportar Freetube'
     Export YouTube: 'Exportar YouTube'
@@ -379,31 +365,6 @@ Settings:
     All playlists has been successfully exported: Todalas listas de reprodución exportáronse
       correctamente
     Export Playlists: Exportalas listas de reprodución
-  Advanced Settings:
-    Enable Debug Mode (Prints data to the console): 'Activar modo de depuración (escribe
-      datos na consola)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Enderezo proxy (Exemplo:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Premendo
-      en "TESTAR PROXY" enviarase unha petición a https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Usar Tor / Proxy para chamadas API'
-    TEST PROXY: 'TESTAR PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Ver instancias públicas'
-    Clear History:
-      Clear History: 'Limpar histórico'
-      # On Click
-      Are you sure you want to delete your history?: 'Estás seguro de querer limpar
-        o histórico?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Limpar subscricións'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Estás seguro de querer
-        limpar tódalas subscricións?'
-      #& Yes
-      #& No
 
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar cando se omita o segmento do
@@ -477,33 +438,6 @@ About:
   #On About page
   About: 'Sobre'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
-    software ten licencia libre AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Atopaches un erro? Tes algunha suxestión? Queres axudar? Visita a nosa páxina
-    de GitHub. Calquera petición é benvida.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Moitas
-    grazas a tódalas persoas e proxectos que fan FreeTube posible!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Queres
-    chatear? Únete ao noso servidor Element / Matrix. Lembra comprobar as regras antes
-    de te unir.'
-
-  'Looking for help? Check out our Wiki page.': 'Precisas axuda? Visita a nosa páxina
-    Wiki.'
-
-  Check out our Firefox extension!: 'Comproba a nosa extensión para Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Se
-    estás a desfrutar FreeTube, considera doar através de Liberapay ou ao noso enderezo
-    Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Noticias recentes sobre FreeTube'
-
   Donate: Doar
   these people and projects: aquelas persoas e proxectos
   FreeTube is made possible by: FreeTube é posible grazas a
@@ -525,8 +459,6 @@ About:
   Help: Axuda
   GitHub releases: Lanzamentos de GitHub
   Downloads / Changelog: Descargas / Rexistro de cambios
-  View License: Ver licenza
-  Licensed under the AGPLv3: Licenza baixo o AGPLv3
   Source code: Código fonte
   Beta: Beta
 Profile:
@@ -661,39 +593,10 @@ Video:
   video only: 'Só vídeo'
   audio only: 'Só audio'
   Published:
-    Jan: 'Xan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Abr'
-    May: 'Mai'
-    Jun: 'Xuñ'
-    Jul: 'Xul'
-    Aug: 'Ago'
-    Sep: 'Set'
-    Oct: 'Out'
-    Nov: 'Nov'
-    Dec: 'Dec'
-    Second: 'Segundo'
-    Seconds: 'Segundos'
-    Minute: 'Minuto'
-    Minutes: 'Minutos'
-    Hour: 'Hora'
-    Hours: 'Horas'
-    Day: 'Día'
-    Days: 'Días'
-    Week: 'Semana'
-    Weeks: 'Semanas'
-    Month: 'Mes'
-    Months: 'Meses'
-    Year: 'Ano'
-    Years: 'Anos'
-    Ago: 'Hai'
-    Upcoming: 'Estrea'
     In less than a minute: En menos dun minuto
   Published on: 'Publicado'
   Streamed on: 'Transmitido'
   Started streaming on: 'A transmisión comezou'
-  Publicationtemplate: 'Fai {number} {unit}'
 #& Videos
   External Player:
     Unsupported Actions:
@@ -737,16 +640,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver listaxe de reprodución completa'
-  Videos: 'Vídeos'
-  View: 'Visualización'
-  Views: 'Visualizacións'
   Last Updated On: 'Última actualización'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Lista de reprodución
-Toggle Theatre Mode: 'Activar modo cinema'
 Change Format:
   Change Media Formats: 'Mudar formato do vídeo'
   Use Dash Formats: 'Utilizar formato Dash'
@@ -850,7 +749,7 @@ Tooltips:
       teu feed da subscrición, cando se abra unha nova ventá e cando cambies de perfil.
   External Player Settings:
     Custom External Player Arguments: Calquera argumento de liña de comandos personalizado,
-      separado por puntos e coma (';'), que desexa que se pase ao reprodutor externo.
+      que desexa que se pase ao reprodutor externo.
     Ignore Warnings: Suprime avisos para cando os reprodutores externos actuais non
       apoian a acción actual (e.g. Invertendo listas de reprodución, etc.).
     Custom External Player Executable: Por defecto, FreeTube asumirá que o reprodutor
@@ -876,7 +775,6 @@ Falling back to Local API: 'Recorrendo á API local'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Este
   vídeo non está dispoñible porque faltan formatos. Isto pode ocorrer debido á non
   dispoñibilidade do país.'
-Subscriptions have not yet been implemented: 'As subscricións aínda non foron implementadas'
 Loop is now disabled: 'Reprodución en bucle desactivada'
 Loop is now enabled: 'Reprodución en bucle activada'
 Shuffle is now disabled: 'Reprodución aleatoria desactivada'
@@ -894,8 +792,6 @@ Playing Next Video Interval: Reproducindo o seguinte vídeo en pouco tempo. Prem
   cancelar. | Reproducindo o seguinte vídeo en {nextVideoInterval} segundo. Prema
   para cancelar. | Reproducindo o seguinte vídeo en {nextVideoInterval} segundos.
   Prema para cancelar.
-Hashtags have not yet been implemented, try again later: Os cancelos non foron aínda
-  aplicados. Inténtao outra vez máis tarde
 Unknown YouTube url type, cannot be opened in app: O tipo de URL de YouTube descoñecido
   non se pode abrir no aplicativo
 More: Máis
@@ -907,8 +803,6 @@ Channels:
   Search bar placeholder: Busca canles
   Count: Atopouse {number} canle(s).
   Empty: A túa lista de canles atopase baleira.
-  Unsubscribe: Cancelar a subscrición
-  Unsubscribed: Eliminouse {channelName} das túas subscricións
   Unsubscribe Prompt: Estás seguro de que queres cancelar a subscrición a "{channelName}"?
 Search Bar:
   Clear Input: Borrar entrada
diff --git a/static/locales/he.yaml b/static/locales/he.yaml
index 589f7bf9b28b8..3ec3ef1fa3e04 100644
--- a/static/locales/he.yaml
+++ b/static/locales/he.yaml
@@ -107,7 +107,8 @@ Subscriptions:
   Subscriptions: 'מינויים'
   Latest Subscriptions: 'מינויים אחרונים'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'רשימת
-    המינויים שלך ריקה כרגע. יש להוסיף מינויים כדי לראות אותם כאן.'
+    המינויים שלך ריקה כרגע. כדי לייבא את המינויים שלך ניתן לגשת להגדרות הנתונים ולבחור
+    בייבוא מנויים או לחפש ערוצים ולהירשם אליהם.'
   'Getting Subscriptions. Please wait.': 'מינויים נאספים. נא להמתין.'
   Refresh Subscriptions: 'רענון מינויים'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: לפרופיל
@@ -133,11 +134,6 @@ Most Popular: 'הכי פופולרי'
 Playlists: 'רשימות נגינה'
 User Playlists:
   Your Playlists: 'רשימות הנגינה שלך'
-  Playlist Message: העמוד הזה אינו משקף רשימות נגינה תקינות לחלוטין. הוא מציג רק סרטונים
-    ששמרת או הוספת כמועדפים. עם סיום העבודה, כל הסרטונים שכאן ייובאו אל רשימת הנגינה
-    ‚מועדפים’.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: לא
-    שמרת סרטונים. יש ללחוץ על כפתור השמירה בפינת הסרטון כדי שיופיע כאן
   Search bar placeholder: חיפוש רשימות נגינה
   Empty Search Message: אין סרטונים ברשימת הנגינה הזו שעונים לחיפוש שלך
   You have no playlists. Click on the create new playlist button to create a new one.: אין
@@ -179,7 +175,7 @@ User Playlists:
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: רשימת
         הנגינה הזאת משמשת לסימניות מהירות במקום {oldPlaylistName}. לחיצה כאן תבטל
         את זה
-      This playlist does not exist: רשימת השידורים הזו לא קיימת.
+      This playlist does not exist: רשימת השידורים הזו לא קיימת
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: חלק
         מהסרטונים ברשימת השידורים עדיין לא הועלו. לחץ כאן כדי להעתיק בכל זאת.
       Playlist name cannot be empty. Please input a name.: שם רשימת השידורים לא יכול
@@ -197,6 +193,8 @@ User Playlists:
         הזו.
       Playlist {playlistName} is the new quick bookmark playlist.: רשימת השידורים
         {playlistName} היא רשימת הסימנייה המהירה החדשה.
+      This playlist has a video with a duration error: רשימת הנגינה הזאת מכילה סרטון
+        אחד לפחות שאין לו אורך, הם ימוינו כאילו המשך שלהם הוא אפס.
     Search for Videos: חיפוש סרטונים
   Cannot delete the quick bookmark target playlist.: לא ניתן למחוק את רשימת הנגינה
     ביעד הסימניות הזריזות.
@@ -217,8 +215,8 @@ User Playlists:
       | בחר רשימת שידורים להוספת {videoCount} הסרטונים שלך
     Toast:
       You haven't selected any playlist yet.: עדיין לא נבחרה רשימת שידורים.
-      "{videoCount} video(s) added to 1 playlist": סרטון 1 נוסף לרשימת השמעה 1 |  {videoCount}
-        סרטונים שנוספו לרשימת השמעה 1
+      "{videoCount} video(s) added to 1 playlist": סרטון נוסף לרשימת השמעה | {videoCount}
+        סרטונים נוספו לרשימת השמעה
       "{videoCount} video(s) added to {playlistCount} playlists": 1 סרטון הוסף ל{playlistCount}
         רשימות שידורים | {videoCount} סרטונים הוספו ל{playlistCount} רשימות שידורים
   CreatePlaylistPrompt:
@@ -242,6 +240,8 @@ User Playlists:
   Add to Favorites: הוספה אל {playlistName}
   Quick Bookmark Enabled: סימנייה מהירה מופעלת
   Enable Quick Bookmark With This Playlist: אפשר סימנייה מהירה עם רשימת השידורים הזו
+  Export Playlist: ייצוא רשימת הנגינה הזאת
+  The playlist has been successfully exported: רשימת הנגינה יוצאה בהצלחה
 History:
   # On History Page
   History: 'היסטוריה'
@@ -254,7 +254,7 @@ Settings:
   # On Settings Page
   Settings: 'הגדרות'
   General Settings:
-    General Settings: 'הגדרות כלליות'
+    General Settings: 'כללי'
     Check for Updates: 'לבדוק אם קיימים עדכונים'
     Check for Latest Blog Posts: 'לבדוק אם קיימים פוסטים חדשים בבלוג'
     Fallback to Non-Preferred Backend on Failure: 'נסיגה למנגנון שאינו מועדף בעת כשל'
@@ -277,8 +277,6 @@ Settings:
       End: 'סוף'
       Hidden: מוסתר
       Blur: טשטוש
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'שרת Invidious
-      (ברירת המחדל היא https://invidious.snopyta.org)'
     Region for Trending: 'אזור לסרטונים חמים'
         #! List countries
     View all Invidious instance information: הצגת כל פרטי העותק של Invidious
@@ -299,8 +297,9 @@ Settings:
     Auto Load Next Page:
       Label: טעינת העמוד הבא אוטומטית
       Tooltip: טען דפים ותגובות נוספים באופן אוטומטי.
+    Open Deep Links In New Window: פתיחת כתובות שהועברו ל־FreeTube בחלון חדש
   Theme Settings:
-    Theme Settings: 'הגדרת ערכת עיצוב'
+    Theme Settings: 'ערכת עיצוב'
     Match Top Bar with Main Color: 'התאמת האזור העליון לצבע הראשי'
     Base Theme:
       Base Theme: 'ערכת עיצוב בסיסית'
@@ -315,6 +314,8 @@ Settings:
       Nordic: נורדית
       Solarized Dark: חשוך זוהר
       Solarized Light: בהיר זוהר
+      Gruvbox Dark: תיבת גרוב כהה
+      Gruvbox Light: תיבת גרוב בהירה
     Main Color Theme:
       Main Color Theme: 'צבע ראשי'
       Red: 'אדום'
@@ -362,6 +363,16 @@ Settings:
       Solarized Blue: כחול זוהר
       Solarized Violet: ויולט מואר בשמש
       Solarized Cyan: סולרייזד כחול-ירוק
+      Gruvbox Light Orange: תיבת גרוב כתומה בהירה
+      Gruvbox Dark Green: תיבת גרוב ירוקה כהה
+      Gruvbox Dark Purple: תיבת גרוב סגולה כהה
+      Gruvbox Light Purple: תיבת גרוב סגולה בהירה
+      Gruvbox Dark Blue: תיבת גרוב כחולה כהה
+      Gruvbox Light Red: תיבת גרוב אדומה בהירה
+      Gruvbox Dark Yellow: תיבת גרוב צהובה כהה
+      Gruvbox Dark Orange: תיבת גרוב כתומה כהה
+      Gruvbox Dark Aqua: תיבת גרוב מים כהים
+      Gruvbox Light Blue: תיבת גרוב כחולה בהירה
     Secondary Color Theme: 'ערכת צבע משנית'
         #* Main Color Theme
     UI Scale: יחס גודל הממשק
@@ -370,7 +381,7 @@ Settings:
     Hide Side Bar Labels: הסתרת התוויות בסרגל הצד
     Hide FreeTube Header Logo: הסתרת הלוגו התחתון של FreeTube
   Player Settings:
-    Player Settings: 'הגדרת נגן'
+    Player Settings: 'נגן'
     Play Next Video: 'ניגון הסרטון הבא'
     Turn on Subtitles by Default: 'הפעלת כתוביות כברירת מחדל'
     Autoplay Videos: 'הפעלה אוטומטית לסרטונים'
@@ -397,7 +408,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: מרווח זמן לפני ניגון הסרטון הבא בפלייליסט
-    Next Video Interval: משך הסרטון הבא
+    Next Video Interval: מתזמן ספירה לאחור של נגינה אוטומטית
     Display Play Button In Video Player: הצגת כפתור הניגון בתוך נגן הווידאו
     Scroll Volume Over Video Player: גלילה על הסרטון לשינוי עוצמת השמע
     Scroll Playback Rate Over Video Player: גלילת מהירות הנגינה על גבי נגן הווידאו
@@ -422,7 +433,7 @@ Settings:
     Enter Fullscreen on Display Rotate: מעבר למסך מלא עם סיבוב התצוגה
     Skip by Scrolling Over Video Player: אפשר לדלג על ידי גלילה על נגן הווידאו
   Privacy Settings:
-    Privacy Settings: 'הגדרות פרטיות'
+    Privacy Settings: 'פרטיות'
     Remember History: 'לזכור את היסטוריית הצפייה'
     Save Watched Progress: 'שמירת משך הצפייה'
     Clear Search Cache: 'ניקוי מטמון החיפוש'
@@ -442,21 +453,16 @@ Settings:
     Are you sure you want to remove all your playlists?: האם אתה בטוח שברצונך למחוק
       את כל רשימות השידורים שלך?
   Subscription Settings:
-    Subscription Settings: 'הגדרות מינויים'
+    Subscription Settings: 'מינוי'
     Hide Videos on Watch: 'הסתרת סרטונים לאחר הצפייה'
     Fetch Feeds from RSS: 'ייבוא עדכונים בעזרת RSS'
-    Manage Subscriptions: 'ניהול מינויים'
     Fetch Automatically: משיכת ערוץ העדכונים אוטומטית
-    Confirm Before Unsubscribing: אשר לפני ביטול מנוי
-    Only Show Latest Video for Each Channel: הצג רק את הסרטון האחרון לכל ערוץ
+    Confirm Before Unsubscribing: אישור לפני ביטול מינוי
   Data Settings:
-    Data Settings: 'הגדרות נתונים'
+    Data Settings: 'נתונים'
     Select Import Type: 'נא לבחור את תסדיר הייבוא'
     Select Export Type: 'נא לבחור את תסדיר הייצוא'
     Import Subscriptions: 'ייבוא מינויים'
-    Import FreeTube: 'יבוא בפורמט FreeTube'
-    Import YouTube: 'יבוא בפורמט YouTube'
-    Import NewPipe: 'יבוא בפורמט NewPipe'
     Export Subscriptions: 'ייצוא מינויים'
     Export FreeTube: 'ייצוא בתסדיר של FreeTube'
     Export YouTube: 'ייצוא בתסדיר של YouTube'
@@ -482,7 +488,6 @@ Settings:
     Unable to write file: 'לא ניתן ליצור את הקובץ'
     Unknown data key: 'מפתח נתון לא ידוע'
     How do I import my subscriptions?: 'איך לייבא את המינויים שלי?'
-    Check for Legacy Subscriptions: איתור מינויים מיושנים
     Manage Subscriptions: ניהול מינויים
     All playlists has been successfully exported: כל רשימות הנגינה יוצאו בהצלחה
     All playlists has been successfully imported: כל רשימות הנגינה יובאו בהצלחה
@@ -500,32 +505,6 @@ Settings:
         הסרת כל הרשימות בהגדרות הפרטיות.\n3. הפעל את הגרסה הישנה של FreeTube וייבא
         את הרשימות שיוצאו."
       Label: ייצוא רשימות לגרסאות ישנות של FreeTube
-  Advanced Settings:
-    Advanced Settings: 'הגדרות מתקדמות'
-    Enable Debug Mode (Prints data to the console): 'הפעל מצב Debug ( מציג נתונים
-      בקונסול)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'כתובת פרוקסי (דוגמה: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'לחיצה
-      על כפתור "בדיקת פרוקסי" תשלח בקשה לאתר https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'השתמש ב-Tor או פרוקסי לקריאות API'
-    TEST PROXY: 'בדוק פרוקסי'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'ראה שרתים פומביים'
-    Clear History:
-      Clear History: 'נקה היסטוריה'
-      # On Click
-      Are you sure you want to delete your history?: 'האם אתה בטוח שאתה רוצה למחוק
-        את ההיסטוריה שלך?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'נקה מנויים'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'האם אתה בטוח שאתה רוצה
-        למחוק את כל המנויים?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Live Chat: הסתרת צ׳אט חי
@@ -535,7 +514,7 @@ Settings:
     Hide Comment Likes: הסתרת לייקים על תגובות
     Hide Channel Subscribers: הסתרת מנויי הערוץ
     Hide Video Likes And Dislikes: הסתרת לייקים ודיסלייקים לסרטון
-    Distraction Free Settings: הגדרות להשבתת הסחות
+    Distraction Free Settings: השבתת הסחות
     Hide Video Views: הסתרת תצוגות סרטונים
     Hide Active Subscriptions: הסתרת מינויים פעילים
     Hide Playlists: הסתרת רשימות נגינה
@@ -550,21 +529,20 @@ Settings:
     Display Titles Without Excessive Capitalisation: הצג כותרות ללא אותיות גדולות
       וסימני פיסוק מיותרים
     Hide Featured Channels: הסתרת ערוצים מומלצים
-    Hide Channel Playlists: הסתרת רשימת נגינה של ערוץ
-    Hide Channel Community: הסתרת קהילת הערוץ
-    Hide Channel Shorts: הסתרת ה־Shorts של הערוץ
+    Hide Channel Playlists: הסתרת לשונית „רשימות נגינה” של ערוץ
+    Hide Channel Community: הסתרת לשונית ה„קהילת” הערוץ
+    Hide Channel Shorts: הסתרת לשונית ה־„Shorts” של הערוץ
     Sections:
       Watch Page: עמוד הצפייה
       Channel Page: עמוד ערוץ
       Side Bar: סרגל צד
       General: כללי
       Subscriptions Page: עמוד מינויים
-    Hide Channel Podcasts: הסתרת הסכתים של הערוץ
-    Hide Channel Releases: הסתרת שחרורים של הערוץ
+    Hide Channel Podcasts: הסתרת לשונית ה„הסכתים” של הערוץ
+    Hide Channel Releases: הסתרת לשונית ה„שחרורים” של הערוץ
     Hide Subscriptions Live: הסתרת שידורים חיים של המינויים
     Hide Subscriptions Shorts: הסתרת Shorts של המינויים
     Hide Subscriptions Videos: הסתרת סרטוני מינוי
-    Blur Thumbnails: טשטוש התמונות הממוזערות
     Hide Profile Pictures in Comments: הסתרת תמונות הפרופיל בהערות
     Hide Subscriptions Community: הסתרת קהילת המינויים
     Hide Videos and Playlists Containing Text Placeholder: מילה, חלק מילה או ביטוי
@@ -574,8 +552,9 @@ Settings:
     Hide Channels Already Exists: ID הערוץ כבר קיים
     Hide Channels API Error: אירעה שגיאה באיחזור משתמש עם ה-ID שסופק. נא לבדוק שוב
       אם ה-ID נכון.
-    Hide Videos and Playlists Containing Text: הסתר סרטונים ורשימות שידורים המכילים
+    Hide Videos and Playlists Containing Text: הסתרת סרטונים ורשימות שידורים המכילים
       טקסט
+    Hide Channel Home: הסתרת לשונית ה„בית” של הערוץ
   The app needs to restart for changes to take effect. Restart and apply change?: צריך
     להפעיל את היישומון מחדש כדי שהשינויים ייכנסו לתוקף. להפעיל מחדש ולהחיל את השינוי?
   Proxy Settings:
@@ -593,10 +572,14 @@ Settings:
     Proxy Host: מארח מתווך
     Proxy Protocol: פרוטוקול מתווך
     Enable Tor / Proxy: הפעלת Tor / מתווך
-    Proxy Settings: הגדרות מתווך (פרוקסי)
+    Proxy Settings: מתווך (פרוקסי)
+    Proxy Warning: ל־FreeTube אין מתווך מובנה אבל הוא יכול להתחבר למתווך חיצוני, כמו
+      למשל כזה שרץ על המחשב שלך כמו Tor או מתווך חיצוני כגון מתווך SOCKS5 שמסופק על
+      ידי איזשהו ספק VPN. אם האפשרות פעילה, נא לוודא שהמתווך/Tor שלך מוגדרים כראוי,
+      או ש־FreeTube לא יוכל למשוך נתונים כלל.
   External Player Settings:
     External Player: נגן חיצוני
-    External Player Settings: הגדרות נגן חיצוני
+    External Player Settings: נגן חיצוני
     Custom External Player Executable: קובץ בר־הרצה מותאם אישית לַנַּגָּן
     Ignore Unsupported Action Warnings: התעלמות מאזהרות על פעולות שאינן נתמכות
     Custom External Player Arguments: משתנים לנגן חיצוני בהתאמה אישית
@@ -606,7 +589,7 @@ Settings:
     Ignore Default Arguments: התעלם מפרמטרים ברירת מחדל
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: להודיע לגבי דילוג על קטע החסוּת
-    SponsorBlock Settings: הגדרות חוסם מממנים
+    SponsorBlock Settings: חוסם מממנים
     Enable SponsorBlock: הפעלת חוסם מממנים
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': כתובת ה־API של חוסם
       המממנים (ברירת המחדל היא https://sponsor.ajay.app)
@@ -622,19 +605,19 @@ Settings:
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': כתובת
       API של DeArrow Thumbnail Generator (ברירת מחדל היא https://dearrow-thumb.ajay.app)
   Download Settings:
-    Download Settings: הגדרות הורדה
+    Download Settings: הורדה
     Ask Download Path: לשאול מה נתיב ההורדות
     Choose Path: בחירת נתיב
     Download Behavior: התנהגות הורדה
     Download in app: הורדה ביישומון
     Open in web browser: פתיחה בדפדפן
   Parental Control Settings:
-    Parental Control Settings: הגדרות בקרת הורים
+    Parental Control Settings: בקרת הורים
     Hide Search Bar: הסתרת סרגל החיפוש
     Hide Unsubscribe Button: הסתרת כפתור ביטול מינוי
     Show Family Friendly Only: הצגת דברים ידידותיים למשפחה בלבד
   Experimental Settings:
-    Experimental Settings: הגדרות ניסיוניות
+    Experimental Settings: ניסיוני
     Replace HTTP Cache: החלפת מטמון HTTP
     Warning: הגדרות אלו הן ניסיוניות, הן גורמות לקריסות כשהן מופעלות. מומלץ מאוד לבצע
       גיבויים. השימוש על אחריותך בלבד!
@@ -644,58 +627,24 @@ Settings:
     Password: סיסמה
     Enter Password To Unlock: נא למלא סיסמה כדי לשחרר את ההגדרות
   Password Settings:
-    Password Settings: הגדרות סיסמה
+    Password Settings: סיסמה
     Set Password: הגדרת סיסמה
     Remove Password: הסרת סיסמה
     Set Password To Prevent Access: יש להגדיר סיסמה כדי למנוע גישה להגדרות
-  Expand All Settings Sections: פתח את כל חלקי ההגדרות
-  Sort Settings Sections (A-Z): מיין חלקי הגדרות (א-ת)
+  Sort Settings Sections (A-Z): מיון אזורי הגדרות (א-ת)
+  Return to Settings Menu: חזרה לתפריט ההגדרות
 About:
   #On About page
   About: 'על אודות'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'תוכנה
-    זו היא Copyleft המופצת ברשיון החופשי AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    מצאתם באג? יש הצעות לשיפור? רוצים לעזור? בקרו את עמוד ה-GitHub שלנו. Pull requests
-    ייתקבלו בברכה.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'תודה
-    רבה לאנשים ולפרוייקטים שהופכים את FreeTube לאפשרי!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'רוצים
-    לדבר? הצטרפו לשרת ה- Element / Matrix שלנו. בבקשה לקרוא את החוקים לפני ההצטרפות.'
-
-  'Looking for help? Check out our Wiki page.': 'צריכים עזרה? בקרו את עמוד ה- Wiki
-    שלנו.'
-
-  Check out our Firefox extension!: 'יש לנו תוסף ל-Firefox !'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'במידה
-    ואתם נהנים מ-FreeTube, בבקשה תשקלו לתרום דרך Liberapay או דרך ארנק ה-Bitcoin שלנו.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'מה חדש ב-FreeTube'
-
-  Translate via Weblate: תרגום עם Weblate
   Website: אתר
-  Source Code: קוד מקור
-  Release Notes: הערות מהדורה
   Blog: בלוג
   Credits: תודות
   FAQ: שו״ת
-  Wiki: ויקי
-  Report an Issue: דיווח על תקלה
-  Channel Rules: כללי הערוץ
   Email: דוא״ל
-  License: רישיון
   Beta: בטא
   Donate: תרומה
-  Useful Links: קישורים שימושיים
   Help: עזרה
-  Contact: יצירת קשר
   these people and projects: האנשים והמיזמים האלו
   FreeTube is made possible by: FreeTube קיים בזכות
   Translate: תרגום
@@ -709,8 +658,6 @@ About:
   FreeTube Wiki: הוויקי של FreeTube
   GitHub releases: מהדורות ב־GitHub
   Downloads / Changelog: הורדות / יומן שינויים
-  View License: הצגת הרישיון
-  Licensed under the AGPLv3: בכפוף לרישיון AGPLv3
   Source code: קוד מקור
   Discussions: דיונים
   AGPLv3: AGPLv3
@@ -756,7 +703,7 @@ Profile:
     את הערוצים שבחרת? הערוצים לא יימחקו משאר הפרופילים.'
 #On Channel Page
   Profile Filter: מסנן פרופילים
-  Profile Settings: הגדרת הפרופיל
+  Profile Settings: הפרופיל
   Toggle Profile List: החלפת תצוגת רשימת פרופילים
   Edit Profile Name: ערוך שם הפרופיל
   Close Profile Dropdown: סגור תפריט הפרופיל
@@ -824,6 +771,9 @@ Channel:
   Releases:
     Releases: שחרורים
     This channel does not currently have any releases: בערוץ הזה אין שחרורים כרגע
+  Home:
+    Home: בית
+    View Playlist: הצגת רשימת נגינה
 Video:
   Mark As Watched: 'סימון כנצפה'
   Remove From History: 'הסרה מהיסטוריית הצפייה'
@@ -858,38 +808,8 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'מנגנון
     הצ׳אט כרגע לא נתמך ע״י ה־API של Invidious. דרוש חיבור ישיר ל־YouTube.'
   Published:
-    Jan: 'בינו׳'
-    Feb: 'בפבר׳'
-    Mar: 'במרץ'
-    Apr: 'באפר׳'
-    May: 'במאי'
-    Jun: 'ביונ׳'
-    Jul: 'ביול׳'
-    Aug: 'באוג׳'
-    Sep: 'בספט׳'
-    Oct: 'באוק׳'
-    Nov: 'בנוב׳'
-    Dec: 'בדצמ׳'
-    Second: 'שנייה'
-    Seconds: 'שניות'
-    Minute: 'דקה'
-    Minutes: 'דקות'
-    Hour: 'שעה'
-    Hours: 'שעות'
-    Day: 'יום'
-    Days: 'ימים'
-    Week: 'שבוע'
-    Weeks: 'שבועות'
-    Month: 'חודש'
-    Months: 'חודשים'
-    Year: 'שנה'
-    Years: 'שנים'
-    Ago: 'לפני'
-    Upcoming: 'שידור הבכורה ישודר ב־'
-    Less than a minute: פחות מדקה
     In less than a minute: עוד פחות מדקה
   Published on: 'פורסם'
-  Publicationtemplate: 'לפני {number} {unit}'
 #& Videos
   audio only: שמע בלבד
   video only: סרטון בלבד
@@ -951,7 +871,7 @@ Video:
       Stats: נתונים
       Media Formats: 'פורמטים מדיה: {formats}'
       Player Dimensions: 'ממדי הנגן: {height}x‏{width}'
-      Bitrate: 'קצב נתונים:  kbps‏ {bitrate}'
+      Bitrate: 'קצב סיביות: {bitrate} קסל״ש'
       Buffered: 'מטופל: %{bufferedPercentage}‏‏‎‏‏‏‏‏'
       Volume: 'עוצמת קול: %{volumePercentage}'
       Bandwidth: 'רוחב פס: kbps ‏‏‏‏‎‎‎{bandwidth}‏‎'
@@ -961,13 +881,23 @@ Video:
       CodecsVideoAudio: 'קודקים: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
       CodecsVideoAudioNoItags: 'קודקים: {videoCodec} / {audioCodec}'
     Hide Stats: הסתר נתונים
-    You appear to be offline: נראה שאתה לא מחובר
+    You appear to be offline: נראה שהחיבור שלך נקטע.
     Playback will resume automatically when your connection comes back: הפלייבק יחודש
       אוטומטית כאשר החיבור שלך יחזור.
     Skipped segment: דילגתי על {segmentCategory}
   Hide Channel: הסתר ערוץ
   Unhide Channel: הצג ערוץ
   More Options: אפשרויות נוספות
+  IP block: YouTube חסמו את כתובת ה־IP לצפייה בסרטונים. נא לנסות לעבור ל־VPN או למתווך
+    אחרים.
+  MembersOnly: אי אפשר לצפות בסרטונים לחברים בלבד עם FreeTube כיוון שהם דורשים כניסה
+    ל־Google וחברות בתשלום לערוץ של מי שהעלה.
+  AgeRestricted: אי אפשר לצפות בסרטונים שמוגבלים בגיל עם FreeTube כיוון שהם דורשים
+    כניסה עם Google ושימוש בחשבון YouTube עם גיל מאומת.
+  Unlisted: לא מופיע
+  DeArrow:
+    Show Modified Details: הצגת פרטים לאחר שינוי
+    Show Original Details: הצגת פרטים מקוריים
 Videos:
   #& Sort By
   Sort By:
@@ -978,9 +908,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'צפייה ברשימת הנגינה המלאה'
-  Videos: 'סרטונים'
-  View: 'צפייה'
-  Views: 'צפיות'
   Last Updated On: 'עודכן לאחרונה ב־'
 
 # On Video Watch Page
@@ -996,7 +923,8 @@ Playlist:
     Custom: מותאם
     VideoTitleDescending: כותר (ת-א)
     DateAddedNewest: האחרונים שנוספו ראשונים
-Toggle Theatre Mode: 'הפעלת / השבתת מצב קולנוע'
+    VideoDurationAscending: משך (קצרים בהתחלה)
+    VideoDurationDescending: משך (ארוכים בהתחלה)
 Change Format:
   Change Media Formats: 'שינוי תסדירי המדיה'
   Use Dash Formats: 'שימוש בתסדירי DASH'
@@ -1059,7 +987,6 @@ Falling back to Invidious API: 'מתבצעת נסיגה ל־API של Invidious'
 Falling back to Local API: 'מתבצעת נסיגה ל־API המקומי'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'חסרות
   תצורות לסרטון הזה. הדבר יכול להיגרם בגלל חוסר זמינות למדינה.'
-Subscriptions have not yet been implemented: 'מנגנון המינויים עדיין לא מוכן'
 Loop is now disabled: 'ניגון בלולאה מושבת'
 Loop is now enabled: 'ניגון בלולאה הופעל'
 Shuffle is now disabled: 'ערבוב מושבת'
@@ -1088,9 +1015,11 @@ Tooltips:
       שלך.\n"
     Region for Trending: מגמות אזוריות מאפשרות לך לבחור סרטונים חמים של איזו מדינה
       שמעניין אותך לראות.
+    Open Deep Links In New Window: כתובות שמועברות ל־FreeTube, כגון העברת הרחבות דפדפן
+      או ארגומנטים בשורת הפקודה, תיפתחנה בחלון חדש.
   Player Settings:
     Proxy Videos Through Invidious: יתבצע חיבור ל־Invidious כדי להגיש סרטונים במקום
-      להתחבר ישירות ל־YouTube. דורס את העדפת ה־API.
+      להתחבר ישירות ל־YouTube.
     Default Video Format: קביעת התסדירים בעת ניגון סרטונים. תסדירי DASH יכולים להתנגן
       באיכויות גבוהות יותר. התסדירים המיושנים מוגבלים ל־720 פיקסלים לכל היותר אך משתמשויםבפחות
       רוחב פס. תסדירי שמע הם הזרמות של שמע בלבד.
@@ -1116,8 +1045,8 @@ Tooltips:
       על נגנים חיצוניים.
     Custom External Player Executable: כברירת מחדל FreeTube יניח שהנגן החיצוני הנבחר
       נגיש דרך משתנה הסביבה PATH. במקרה הצורך, ניתן להגדיר כאן נתיב משלך.
-    Custom External Player Arguments: הארגומנטים משלך לשורת הפקודה שיועברו לנגן החיצוני,
-      מופרדים בפסיקים (‚;’).
+    Custom External Player Arguments: ארגומנטים כלשהם משלך לשורת הפקודה להעברה הלאה
+      לנגן החיצוני.
     Ignore Default Arguments: אל תשלח אף ארגומנט סטנדרטי לנגן החיצוני, מלבד כתובת
       הסרטון (למשל, קצב הפלייבק, כתובת הרשימה, וכו'). ארגומנטים מותאמים ימשיכו להיות
       מועברים.
@@ -1148,8 +1077,6 @@ Default Invidious instance has been set to {instance}: עותק Invidious שהו
 Default Invidious instance has been cleared: נוקתה העדפת עותק ברירת המחדל של Invidious
 External link opening has been disabled in the general settings: פתיחת הקישורים החיצוניים
   מושבתת בהגדרות הכלליות
-Hashtags have not yet been implemented, try again later: עדיין לא הוטמעו תגיות הקבץ,
-  נא לנסות בהמשך
 Downloading failed: אירעה שגיאה בהורדת "{videoTitle}"
 Starting download: 'ההורדה של „{videoTitle}” החלה'
 Downloading has completed: 'ההורדה של „{videoTitle}” הסתיימה'
@@ -1162,8 +1089,6 @@ New Window: חלון חדש
 Channels:
   Search bar placeholder: חיפוש ערוצים
   Empty: רשימת הערוצים שלך ריקה כרגע.
-  Unsubscribe: ביטול מינוי
-  Unsubscribed: '{channelName} הוסר מרשימת המינויים שלך'
   Count: '{number} ערוצים נמצאו.'
   Channels: ערוצים
   Title: רשימת ערוצים
@@ -1174,6 +1099,7 @@ Chapters:
   Chapters: פרקים
   'Chapters list visible, current chapter: {chapterName}': 'רשימת הפרקים גלויה, הפרק
     הנוכחי: {chapterName}'
+  Key Moments: רגעי שיא
 Clipboard:
   Copy failed: ההעתקה ללוח הגזירים נכשלה
   Cannot access clipboard without a secure connection: לא ניתן לגשת ללוח הגזירים ללא
@@ -1194,6 +1120,11 @@ Search Listing:
     4K: 4K
     Subtitles: כתוביות
     Closed Captions: כתוביות לכבדי שמיעה
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: חדש
+    3D: תלת־ממד
 Search character limit: שאילתת החיפוש חורגת ממגבלת התווים {searchCharacterLimit}
 Feed:
   Feed Last Updated: 'הערוץ {feedName} התעדכן לאחרונה: {date}'
@@ -1214,3 +1145,13 @@ Channel Unhidden: '{channel} הוסר ממסנן ערוצים'
 Channel Hidden: '{channel} נוסף למסנן ערוצים'
 Trimmed input must be at least N characters long: הקלט המקוצץ חייב להיות באורך של
   לפחות תו אחד | הקלט המקוצץ חייב להיות באורך של לפחות {length} תווים
+Keys:
+  arrowright: חץ ימינה
+  arrowup: חץ למעלה
+  arrowdown: חץ למטה
+  arrowleft: חץ שמאלה
+  ctrl: Ctrl
+  alt: Alt
+Right-click or hold to see history: לחיצה ימנית או החזקה כדי לראות היסטוריה
+shortcutJoinOperator: +
+KeyboardShortcutTemplate: '{label} ({shortcut})'
diff --git a/static/locales/hi.yaml b/static/locales/hi.yaml
index 7a5fa624e6781..94b7151eae486 100644
--- a/static/locales/hi.yaml
+++ b/static/locales/hi.yaml
@@ -99,13 +99,6 @@ Most Popular: 'सबसे लोकप्रिय'
 Playlists: 'प्लेलिस्ट'
 User Playlists:
   Your Playlists: 'आपकी प्लेलिस्ट'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: आपके
-    सहेजे गए वीडियो खाली हैं। किसी वीडियो को यहां सूचीबद्ध करने के लिए उसके कोने पर
-    सहेजें बटन पर क्लिक करें
-  Playlist Message: यह पृष्ठ पूरी तरह से काम करने वाली प्लेलिस्ट को प्रतिबिंबित नहीं
-    करता है। यह केवल उन वीडियो को सूचीबद्ध करता है जिन्हें आपने सहेजा है या पसंदीदा
-    है। जब काम समाप्त हो जाता है, तो वर्तमान में यहां सभी वीडियो 'पसंदीदा' प्लेलिस्ट
-    में स्थानांतरित हो जाएंगे।
   Empty Search Message: इस प्लेलिस्ट में आपकी खोज से मेल खाने वाला कोई वीडियो नहीं
     है
   Search bar placeholder: प्लेलिस्ट में खोजें
@@ -168,7 +161,6 @@ Settings:
     Match Top Bar with Main Color: 'टॉप बार को मेन कलर से मैच करें'
   Player Settings:
     Proxy Videos Through Invidious: 'इनविडियस के माध्यम से प्रॉक्सी वीडियो'
-  Advanced Settings: {}
 About:
   #On About page
   Email: ईमेल करें
@@ -213,8 +205,6 @@ Channels:
   Count: '{number} चैनल मिला(मिले)।'
   Title: चैनल सूची
   Empty: आपकी चैनल सूची वर्तमान में खाली है।
-  Unsubscribe: अनसब्सक्राईब करें
-  Unsubscribed: '{channelName} को आपकी सब्सक्रिप्शन से हटा दिया गया है'
   Unsubscribe Prompt: क्या आप वाकई "{channelName}" की सदस्यता छोड़ना चाहते हैं?
 Are you sure you want to open this link?: क्या आप वाकई इस लिंक को खोलना चाहते हैं?
 Search Bar:
diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index 9e8d51359ab80..b55df64ea13e7 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -41,8 +41,10 @@ Global:
     Video Count: 1 video | {count} videa
     Subscriber Count: 1 pretplatnik | {count} pretplatnika
     View Count: 1 prikaz | {count} prikaza
-    Watching Count: 1 praćenje | {count} praćenja
+    Watching Count: 1 gledatelj | {count} gledatelja
     Channel Count: 1 kanal | {count} kanala
+    Comment Count: 1 komentar | {count} komentara
+    Like Count: 1 lajk | {count} lajkova
   Input Tags:
     Length Requirement: Oznaka mora imati barem {number} znakova
 Search / Go to URL: 'Pretraži / Idi na URL'
@@ -99,8 +101,9 @@ Subscriptions:
   Subscriptions: 'Pretplate'
   Latest Subscriptions: 'Najnovije pretplate'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Tvoj
-    popis pretplata je trenutačno prazan. Za prikaz pretplata na ovom mjestu, dodaj
-    neke pretplate.'
+    popis pretplata je trenutačno prazan. Ako želiš uvesti tvoje pretplate, idi u
+    postavke podataka i odaberi „Uvezi pretplate” ili traži kanale i pretplati se
+    na njih.'
   'Getting Subscriptions. Please wait.': 'Preuzimanje pretplata. Pričekaj.'
   Refresh Subscriptions: 'Aktualiziraj pretplate'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Ovaj
@@ -127,12 +130,6 @@ Most Popular: 'Najpopularniji'
 Playlists: 'Zbirke'
 User Playlists:
   Your Playlists: 'Tvoje zbirke'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nemaš
-    spremljenih videa. Pritisni gumb za spremanje u sličici videa, kako bi se video
-    ovdje prikazao
-  Playlist Message: Ova stranica ne odražava potpuno funkcionalne zbirke. Prikazuje
-    samo spremljena ili kao favoriti označena videa. Kad posao završi, sva trenutačno
-    ovdje prisutna videa premjestit će se u zbirku „Favoriti”.
   Search bar placeholder: Traži zbirke
   Empty Search Message: U ovoj zbirci nema videa koji odgovaraju tvojem pretraživanju
   This playlist currently has no videos.: Ova zbirka trenutačno nema nijedan video.
@@ -146,8 +143,6 @@ User Playlists:
   Cancel: Odustani
   Edit Playlist Info: Uredi podatke zbirke
   Copy Playlist: Kopiraj zbirku
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Stvarno
-    želiš ukloniti sva gledana videa iz ove zbirke? To se ne može poništiti.
   Delete Playlist: Ukloni zbirku
   Are you sure you want to delete this playlist? This cannot be undone: Stvarno želiš
     izbrisati ovu zbirku? To se ne može poništiti.
@@ -188,7 +183,6 @@ User Playlists:
       There were no videos to remove.: Nije bilo videa za uklanjanje.
       This playlist is now used for quick bookmark: Ova se zbirka sada koristi za
         brze zabilješke
-      Quick bookmark disabled: Brze zabilješke su deaktivirane
       Reverted to use {oldPlaylistName} for quick bookmark: Vraćeno na korištenje
         zbirke „{oldPlaylistName}” za brze zabilješke
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Ova
@@ -198,6 +192,9 @@ User Playlists:
         je nova zbirka za brze zabilješke.
       This playlist is already being used for quick bookmark.: Ova se zbirka već koristi
         za brze zabilješke.
+      This playlist has a video with a duration error: Ova zbirka sadrži barem jedan
+        video koji nema trajanje. Video će se svrstati kao da je njegovo trajanje
+        nula.
     Search for Videos: Traži videa
   AddVideoPrompt:
     N playlists selected: 'Odabrano: {playlistCount}'
@@ -230,7 +227,6 @@ User Playlists:
   Add to Favorites: Dodaj u zbirku „{playlistName}”
   Remove from Favorites: Ukloni iz zbirke „{playlistName}”
   Enable Quick Bookmark With This Playlist: Aktiviraj brze zabilješke s ovom zbirkom
-  Disable Quick Bookmark: Deaktiviraj brze zabilješke
   Playlists with Matching Videos: Zbirke s poklapajućim videima
   Quick Bookmark Enabled: Brze zabilješke aktivirano
   Cannot delete the quick bookmark target playlist.: Nije moguće izbrisati zbirku
@@ -244,6 +240,8 @@ User Playlists:
     želiš ukloniti 1 gledani video iz ove zbirke? To se ne može poništiti. | Stvarno
     želiš ukloniti {playlistItemCount} gledana/ih videa iz ove zbirke? To se ne može
     poništiti.
+  Export Playlist: Izvezi ovu zbirku
+  The playlist has been successfully exported: Zbirka je uspješno izvezena
 History:
   # On History Page
   History: 'Povijest'
@@ -257,7 +255,7 @@ Settings:
   # On Settings Page
   Settings: 'Postavke'
   General Settings:
-    General Settings: 'Opće postavke'
+    General Settings: 'Opće'
     Fallback to Non-Preferred Backend on Failure: 'U slučaju problema koristi sekundarni
       pozadinski sustav'
     Enable Search Suggestions: 'Aktiviraj prijedloge pretrage'
@@ -279,8 +277,6 @@ Settings:
       End: 'Kraj'
       Hidden: Skriveno
       Blur: Neoštro
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious primjerak
-      (standardno se koristi https://invidious.snopyta.org)'
     Region for Trending: 'Regija za videa u trendu'
         #! List countries
     Check for Latest Blog Posts: Traži najnovije objave na blogu
@@ -304,8 +300,8 @@ Settings:
       Label: Automatski učitaj sljedeću stranicu
       Tooltip: Automatski učitaj dodatne stranice i komentare.
   Theme Settings:
-    Theme Settings: 'Postavke teme'
-    Match Top Bar with Main Color: 'Koristi glavnu boju u gornjoj traci'
+    Theme Settings: 'Tema'
+    Match Top Bar with Main Color: 'Uskladi gornju traku s glavnom bojom'
     Base Theme:
       Base Theme: 'Osnova teme'
       Black: 'Crna'
@@ -337,27 +333,27 @@ Settings:
       Amber: 'Žutosmeđa'
       Orange: 'Narančasta'
       Deep Orange: 'Tamnonarančasta'
-      Dracula Cyan: 'Drakula Cijan'
-      Dracula Green: 'Drakula Zelena'
-      Dracula Orange: 'Drakula Narančasta'
-      Dracula Pink: 'Drakula Ružičasta'
-      Dracula Purple: 'Drakula Ljubičasta'
-      Dracula Red: 'Drakula Crvena'
-      Dracula Yellow: 'Drakula Žuta'
-      Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater
-      Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo
-      Catppuccin Mocha Pink: Catppuccin Mocha Ružičasta
-      Catppuccin Mocha Mauve: Catppuccin Mocha Ljubičasta
-      Catppuccin Mocha Red: Catppuccin Mocha Crvena
-      Catppuccin Mocha Maroon: Catppuccin Mocha Kestenjasta
-      Catppuccin Mocha Peach: Catppuccin Mocha Breskva
-      Catppuccin Mocha Yellow: Catppuccin Mocha Žuta
-      Catppuccin Mocha Teal: Catppuccin Mocha Plavozelena
-      Catppuccin Mocha Sky: Catppuccin Mocha Nebo
-      Catppuccin Mocha Sapphire: Catppuccin Mocha Safir
-      Catppuccin Mocha Blue: Catppuccin Mocha Plava
-      Catppuccin Mocha Lavender: Catppuccin Mocha Lavanda
-      Catppuccin Mocha Green: Catppuccin Mocha Zelena
+      Dracula Cyan: 'Drakula cijan'
+      Dracula Green: 'Drakula zelena'
+      Dracula Orange: 'Drakula narančasta'
+      Dracula Pink: 'Drakula ružičasta'
+      Dracula Purple: 'Drakula ljubičasta'
+      Dracula Red: 'Drakula crvena'
+      Dracula Yellow: 'Drakula žuta'
+      Catppuccin Mocha Rosewater: Catppuccin Mocha ruža
+      Catppuccin Mocha Flamingo: Catppuccin Mocha flamingo
+      Catppuccin Mocha Pink: Catppuccin Mocha ružičasta
+      Catppuccin Mocha Mauve: Catppuccin Mocha ljubičasta
+      Catppuccin Mocha Red: Catppuccin Mocha crvena
+      Catppuccin Mocha Maroon: Catppuccin Mocha kestenjasta
+      Catppuccin Mocha Peach: Catppuccin Mocha breskva
+      Catppuccin Mocha Yellow: Catppuccin Mocha žuta
+      Catppuccin Mocha Teal: Catppuccin Mocha plavozelena
+      Catppuccin Mocha Sky: Catppuccin Mocha nebo
+      Catppuccin Mocha Sapphire: Catppuccin Mocha safir
+      Catppuccin Mocha Blue: Catppuccin Mocha plava
+      Catppuccin Mocha Lavender: Catppuccin Mocha lavanda
+      Catppuccin Mocha Green: Catppuccin Mocha zelena
       Solarized Blue: Solarna plava
       Solarized Green: Solarna zelena
       Solarized Yellow: Solarna žuta
@@ -374,7 +370,7 @@ Settings:
     Hide Side Bar Labels: Sakrij oznake bočnih traka
     Hide FreeTube Header Logo: Sakrij FreeTube logotip u zaglavlju
   Player Settings:
-    Player Settings: 'Postavke playera'
+    Player Settings: 'Player'
     Play Next Video: 'Reproduciraj sljedeći video'
     Turn on Subtitles by Default: 'Standardno uključi titlove'
     Autoplay Videos: 'Automatski reproduciraj videa'
@@ -391,15 +387,15 @@ Settings:
     Default Quality:
       Default Quality: 'Standardna kvaliteta'
       Auto: 'Automatski'
-      144p: '144 p'
-      240p: '240 p'
-      360p: '360 p'
-      480p: '480 p'
-      720p: '720 p'
-      1080p: '1080 p'
-      1440p: '1440 p'
+      144p: '144p'
+      240p: '240p'
+      360p: '360p'
+      480p: '480p'
+      720p: '720p'
+      1080p: '1080p'
+      1440p: '1440p'
       4k: '4k'
-      8k: '8 k'
+      8k: '8k'
     Playlist Next Video Interval: Interval sljedećeg videa zbirke
     Next Video Interval: Interval za sljedeći video
     Scroll Volume Over Video Player: Mijenjaj glasnoću u video playeru
@@ -428,7 +424,7 @@ Settings:
       ekrana
     Skip by Scrolling Over Video Player: Preskoči pomicanjem preko video playera
   Privacy Settings:
-    Privacy Settings: 'Postavke privatnosti'
+    Privacy Settings: 'Privatnost'
     Remember History: 'Zapamti povijest'
     Save Watched Progress: 'Spremi napredak gledanja'
     Clear Search Cache: 'Isprazni predmemoriju pretrage'
@@ -449,47 +445,11 @@ Settings:
     Are you sure you want to remove all your playlists?: Stvarno želiš ukloniti sve
       tvoje zbirke?
   Subscription Settings:
-    Subscription Settings: 'Postavke pretplata'
+    Subscription Settings: 'Pretplata'
     Hide Videos on Watch: 'Sakrij video nakon gledanja'
     Fetch Feeds from RSS: 'Dohvati feedove s RSS-a'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Format izvoza pretplata'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Upravljaj pretplatama'
-    Import Subscriptions: 'Uvoz pretplata'
-    Export Subscriptions: 'Izvoz pretplata'
-    How do I import my subscriptions?: 'Kako mogu uvesti pretplate?'
     Fetch Automatically: Automatski dohvati feed
-    Only Show Latest Video for Each Channel: Prikaži samo najnoviji video za svaki
-      kanal
     Confirm Before Unsubscribing: Izbjegni slučajno otkazivanje pretplate
-  Advanced Settings:
-    Advanced Settings: 'Napredne postavke'
-    Enable Debug Mode (Prints data to the console): 'Aktiviraj modus otklanjanja grešaka
-      (ispisuje podatke na konzolu)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adresa posrednika (npr.:
-      SOCKS5: //127.0.0.1: 9050)'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Pritiskom
-      gumba „TESTIRAJ POSREDNIKA” poslat će se zahtjev na https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Koristi Tor/posrednika za pozive sučelja'
-    TEST PROXY: 'TESTIRAJ POSREDNIKA'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Pogledaj javne primjerke'
-    Clear History:
-      Clear History: 'Izbriši povijest'
-      # On Click
-      Are you sure you want to delete your history?: 'Stvarno želiš izbrisati povijest?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Izbriši pretplate'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Stvarno želiš ukloniti
-        sve pretplate?'
-      #& Yes
-      #& No
 
   Data Settings:
     Unknown data key: Nepoznat podatkovni ključ
@@ -516,15 +476,11 @@ Settings:
     Export YouTube: Izvezi YouTube
     Export FreeTube: Izvezi FreeTube
     Export Subscriptions: Izvezi pretplate
-    Import NewPipe: Uvezi NewPipe
-    Import YouTube: Uvezi YouTube
     Import Subscriptions: Uvezi pretplate
-    Import FreeTube: Uvezi FreeTube
     Select Export Type: Odaberi vrstu izvoza
     Select Import Type: Odaberi vrstu uvoza
-    Data Settings: Postavke podataka
+    Data Settings: Podaci
     How do I import my subscriptions?: Kako uvesti pretplate?
-    Check for Legacy Subscriptions: Potraži stare pretplate
     Manage Subscriptions: Upravljaj pretplatama
     Import Playlists: Uvezi zbirke
     Export Playlists: Izvezi zbirke
@@ -549,9 +505,9 @@ Settings:
     Hide Live Chat: Sakrij razgovor uživo
     Hide Popular Videos: Sakrij popularna videa
     Hide Comment Likes: Sakrij ocjene komentara
-    Hide Video Likes And Dislikes: Sakrij ocjenjivanje videa
+    Hide Video Likes And Dislikes: Sakrij broj sviđanja videa
     Hide Video Views: Sakrij broj gledanja videa
-    Distraction Free Settings: Postavke za nesmetan rad
+    Distraction Free Settings: Nesmetan rad
     Hide Active Subscriptions: Sakrij aktivne pretplate
     Hide Playlists: Sakrij zbirke
     Hide Comments: Sakrij komentare
@@ -579,7 +535,6 @@ Settings:
     Hide Subscriptions Shorts: Sakrij pretplate kratkih videa
     Hide Subscriptions Live: Sakrij pretplate videa uživo
     Hide Subscriptions Videos: Sakrij pretplate videa
-    Blur Thumbnails: Zamuti minijature
     Hide Profile Pictures in Comments: Sakrij slike profila u komentarima
     Hide Subscriptions Community: Sakrij pretplate zajednice
     Hide Channels Invalid: Navedeni ID kanala nije bio ispravan
@@ -608,13 +563,13 @@ Settings:
     Proxy Host: Računalo posrednika
     Proxy Protocol: Protokol posrednika
     Enable Tor / Proxy: Aktiviraj Tor/Posrednik
-    Proxy Settings: Postavke posrednika
+    Proxy Settings: Posrednik
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Obavijesti kad se preskoči segment sponzora
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL API-a za blokiranja
       sponzora (standardno je https://sponsor.ajay.app)
     Enable SponsorBlock: Aktiviraj blokiranja sponzora
-    SponsorBlock Settings: Postavke blokiranja sponzora
+    SponsorBlock Settings: Blokiranja sponzora
     Skip Options:
       Auto Skip: Automatsko preskakanje
       Show In Seek Bar: Prikaži u traci napretka
@@ -631,27 +586,27 @@ Settings:
     Custom External Player Executable: Izvršna datoteka prilagođenog eksternog playera
     Ignore Unsupported Action Warnings: Zanemari upozorenja o nepodržanim radnjama
     External Player: Vanjski player
-    External Player Settings: Postavke vanjskog playera
+    External Player Settings: Eksterni player
     Players:
       None:
         Name: Bez
     Ignore Default Arguments: Zanemari zadane argumente
   Download Settings:
     Choose Path: Odaberi stazu
-    Download Settings: Postavke preuzimanja
-    Ask Download Path: Zatraži stazu preuzimanja
+    Download Settings: Preuzimanje
+    Ask Download Path: Zatraži stazu za preuzimanja
     Download in app: Preuzmi u aplikaciji
     Open in web browser: Otvori u web-pregledniku
     Download Behavior: Ponašanje preuzimanja
   Parental Control Settings:
-    Parental Control Settings: Postavke roditeljskog nadzora
+    Parental Control Settings: Roditeljski nadzor
     Hide Unsubscribe Button: Sakrij gumb za odjavu
     Hide Search Bar: Sakrij traku pretrage
     Show Family Friendly Only: Prikaži samo prikladne za obitelji
   Experimental Settings:
     Warning: Ovo su eksperimentalne postavke. Kad su aktivirane mogu prouzročiti prekid
       programa. Preporučujemo spremanje sigurnosnih kopija. Koristi na vlastitu odgovornost!
-    Experimental Settings: Eksperimentalne postavke
+    Experimental Settings: Eksperimentalno
     Replace HTTP Cache: Zamijeni HTTP predmemoriju
   Password Dialog:
     Password Incorrect: Lozinka neispravna
@@ -659,60 +614,24 @@ Settings:
     Enter Password To Unlock: Za otključavanje postavki upiši lozinku
     Password: Lozinka
   Password Settings:
-    Password Settings: Lozinka za postavke
+    Password Settings: Lozinka
     Set Password: Postavi lozinku
     Remove Password: Ukloni lozinku
     Set Password To Prevent Access: Postavi lozinku za sprečavanja pristupa postavkama
-  Expand All Settings Sections: Rasklopi sve odjeljke postavki
   Sort Settings Sections (A-Z): Razvrstaj odjeljke postavki (A-Z)
+  Return to Settings Menu: Vrati se na izbornik postavki
 About:
   #On About page
   About: 'Informacije'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ovaj
-    je program licenciran pod uvjetima AGPL-3.0 licence.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Pronašao/la si grešku? Želiš predložiti funkciju? Želiš pomoći? Pogledaj našu
-    GitHub stranicu. Zahtjevi za povlačenje su dobrodošli.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Zahvaljujemo
-    svim ljudima i projektima koji omogućuju razvoj programa FreeTube!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Želiš
-    razgovarati? Pridruži se našem Element/Matrix poslužitelju. Pročitaj pravila prije
-    pridruživanja.'
-
-  'Looking for help? Check out our Wiki page.': 'Tražiš pomoć? Pogledaj našu Wiki
-    stranicu.'
-
-  Check out our Firefox extension!: 'Isprobaj naše proširenje za Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ako
-    voliš koristiti FreeTube, doniraj projektu putem Liberapaya ili putem naše Bitcoin
-    adrese.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Najnovije vijesti o programu FreeTube'
-
-  Translate via Weblate: Prevedi putem Weblatea
   Website: Web-stranica
-  Source Code: Izvorni kod
-  Release Notes: Napomene uz izdanje
   Blog: Blog
   Credits: Zasluge
   FAQ: Često postavljena pitanja
-  Wiki: Wiki
-  Report an Issue: Prijavi problem
-  Channel Rules: Pravila kanala
   Email: E-adresa
-  License: Licenca
   Beta: Beta
   Donate: Doniraj
-  Useful Links: Korisne poveznice
   Help: Pomoć
-  Contact: Kontakt
   Chat on Matrix: Razgovaraj na Matrixu
   Please check for duplicates before posting: Prije slanja greške, provjeri, je li
     ista greška već prijavljena
@@ -727,8 +646,6 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub izdanja
   Downloads / Changelog: Preuzimanja/dnevnik promjena
-  View License: Pogledaj licencu
-  Licensed under the AGPLv3: AGPLv3 licenca
   Source code: Izvorni kod
   Discussions: Diskusije
   Licensed under the: Licencirano pod
@@ -774,7 +691,7 @@ Profile:
   Other Channels: Ostali kanali
   Subscription List: Popis pretplata
   Profile Filter: Filtar profila
-  Profile Settings: Postavke profila
+  Profile Settings: Profil
   Toggle Profile List: Uključi/Isključi popis profila
   Profile Name: Ime profila
   Edit Profile Name: Uredi ime profila
@@ -832,6 +749,9 @@ Channel:
     Hide Answers: Sakrij odgovore
     votes: '{votes} glasa'
     Video hidden by FreeTube: Video skriven od FreeTubea
+    View Full Post: Pogledaj cijeli post
+    Viewing Posts Only Supported By Invidious: Prikazivanje postova podržava samo
+      Invidious. Idi na karticu zajednice kanala za prikaz sadržaja bez Invidiousa.
   Shorts:
     This channel does not currently have any shorts: Ovaj kanal trenutačno nema kratka
       videa
@@ -871,38 +791,8 @@ Video:
     uživo trenutačno nije podržan s Invidious sučeljem. Potrebna je izravna veza s
     YouTubeom.'
   Published:
-    Jan: 'sij.'
-    Feb: 'velj.'
-    Mar: 'ožu.'
-    Apr: 'tra.'
-    May: 'svi.'
-    Jun: 'lip.'
-    Jul: 'srp.'
-    Aug: 'kol.'
-    Sep: 'ruj.'
-    Oct: 'lis.'
-    Nov: 'stu.'
-    Dec: 'pro.'
-    Second: 's'
-    Seconds: 's'
-    Minute: 'min'
-    Minutes: 'min'
-    Hour: 'h'
-    Hours: 'h'
-    Day: 'dan'
-    Days: 'dana'
-    Week: 'tj.'
-    Weeks: 'tj.'
-    Month: 'mj.'
-    Months: 'mj.'
-    Year: 'god.'
-    Years: 'god.'
-    Ago: 'Prije'
-    Upcoming: 'Premijera'
-    Less than a minute: Manje od jedne minute
     In less than a minute: Manje od jedne minute
   Published on: 'Objavljeno'
-  Publicationtemplate: 'prije {number} {unit}'
 #& Videos
   Autoplay: Automatska reprodukcija
   Play Previous Video: Reproduciraj prethodni video
@@ -956,11 +846,47 @@ Video:
   Scroll to Bottom: Pomakni se skroz dolje
   Upcoming: Predstojeći
   'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Razgovor
-    uživo nije dostupan za ovaj prijenos. Možda ga je prenosnik deaktivirao.
+    uživo nije dostupan za ovaj prijenos. Možda ga je autor deaktivirao.
   Pause on Current Video: Zaustavi trenutačni video
   Unhide Channel: Prikaži kanal
   Hide Channel: Sakrij kanal
   More Options: Više opcija
+  Player:
+    Stats:
+      Stats: Statistika
+      CodecsVideoAudio: 'Kodeci: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
+      Bitrate: 'Brzina: {bitrate} kbps'
+      Resolution: 'Rezolucija: {width}x{height}@{frameRate}'
+      CodecsVideoAudioNoItags: 'Kodeci: {videoCodec} / {audioCodec}'
+      Volume: 'Glasnoća: {volumePercentage}%'
+      Video ID: 'ID videa: {videoId}'
+      Media Formats: 'Formati medija: {formats}'
+      CodecAudio: 'Kodek: {audioCodec} ({audioItag})'
+      Dropped Frames / Total Frames: 'Ispušteni kadrovi: {droppedFrames} / Ukupni
+        broj kadrova: {totalFrames}'
+      Bandwidth: 'Propusnost: {bandwidth} kbps'
+      Player Dimensions: 'Veličina playera: {width}x{height}'
+      Buffered: 'Učitano: {bufferedPercentage}%'
+    You appear to be offline: Čini se da ne postoji veza s internetom.
+    Skipped segment: Preskočen segment „{segmentCategory}”
+    Take Screenshot: Snimi snimku ekrana
+    Show Stats: Prikaži statistiku
+    Hide Stats: Sakrij statistiku
+    Playback will resume automatically when your connection comes back: Reprodukcija
+      će se automatski nastaviti nakon što se veza ponovo uspostavi.
+    TranslatedCaptionTemplate: '{language} (izvorni jezik prijevoda: {originalLanguage})'
+    Exit Full Window: Zatvori cjeloekranski prikaz
+    Theatre Mode: Kazališni modus
+    Audio Tracks: Audio snimke
+    Exit Theatre Mode: Zatvori kazališni modus
+    Full Window: Cjeloekranski prikaz
+  MembersOnly: Videa koja su namijenjena samo za članove ne mogu se gledati putem
+    FreeTubea jer zahtijevaju prijavu na Google i plaćeno članstvo na kanalu prenositelja.
+  Unlisted: Skriveni za javnost
+  IP block: YouTube je blokirao tvoju IP adresu za gledanje videa. Pokušaj se prebaciti
+    na jedan drugi VPN ili proxy.
+  AgeRestricted: Videa s dobnim ograničenjem se ne mogu gledati s FreeTubeom jer zahtijevaju
+    prijavu na Google i korištenje YouTube računa s dobnom provjerom.
 Videos:
   #& Sort By
   Sort By:
@@ -971,9 +897,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Pogledaj cijelu zbirku'
-  Videos: 'Videa'
-  View: 'Prikaz'
-  Views: 'Prikazi'
   Last Updated On: 'Zadnje aktualiziranje'
 
 # On Video Watch Page
@@ -989,7 +912,8 @@ Playlist:
     VideoTitleAscending: Naslov (A-Z)
     VideoTitleDescending: Naslov (Z-A)
     Custom: Prilagođeno
-Toggle Theatre Mode: 'Uključi/isključi kazališni modus'
+    VideoDurationDescending: Trajanje (najprije najduže)
+    VideoDurationAscending: Trajanje (najprije najkraće)
 Change Format:
   Change Media Formats: 'Promijeni videoformate'
   Use Dash Formats: 'Koristi DASH formate'
@@ -999,6 +923,8 @@ Change Format:
     video
   Dash formats are not available for this video: DASH formati nisu dostupni za ovaj
     video
+  Legacy formats are not available for this video: Stari formati nisu dostupni za
+    ovaj video
 Share:
   Share Video: 'Dijeli video'
   Share Playlist: 'Dijeli zbirku'
@@ -1029,7 +955,7 @@ Comments:
   Hide: 'Sakrij'
   Replies: 'Odgovori'
   Reply: 'Odgovor'
-  There are no comments available for this video: 'Nema komentara za ovaj video'
+  There are no comments available for this video: 'Za ovaj video nema komentara'
   Load More Comments: 'Učitaj još komentara'
   There are no more comments for this video: Nema daljnjih komentara za ovaj video
   No more comments available: Nema daljnjih komentara
@@ -1044,6 +970,7 @@ Comments:
   Hearted: Omiljeno
   View {replyCount} replies: Pogledaj {replyCount} odgovora
   Subscribed: Pretplaćeno
+  There are no comments available for this post: Za ovaj post nema komentara
 Up Next: 'Sljedeći'
 
 # Toast Messages
@@ -1051,7 +978,6 @@ Local API Error (Click to copy): 'Greška lokalnog sučelja (pritisni za kopiran
 Invidious API Error (Click to copy): 'Greška Invidious sučelja (pritisni za kopiranje)'
 Falling back to Invidious API: 'Koristit će se Invidious sučelje'
 Falling back to Local API: 'Koristit će se lokalno sučelje'
-Subscriptions have not yet been implemented: 'Pretplate još nisu implementirane'
 Loop is now disabled: 'Ponavljanje je sada deaktivirano'
 Loop is now enabled: 'Ponavljanje je sada aktivirano'
 Shuffle is now disabled: 'Slučajni redoslijed je sada deaktiviran'
@@ -1106,8 +1032,8 @@ Tooltips:
   Subscription Settings:
     Fetch Feeds from RSS: Kada je aktivirano, FreeTube će koristiti RSS umjesto vlastite
       standardne metode za dohvaćanje podataka tvoje pretplate. RSS je brži i sprečava
-      blokiranje IP adresa, ali ne pruža određene podatke kao što su trajanje videa
-      ili stanja „uživo”
+      blokiranje IP adresa, ali ne pruža određene podatke kao što su trajanje videa,
+      stanje „uživo” ili postova zajednice
     Fetch Automatically: Kada je aktivirano, FreeTube će automatski dohvatiti feed
       tvoje pretplate kada se otvori novi prozor i prilikom mijenjanja profila.
   External Player Settings:
@@ -1115,7 +1041,7 @@ Tooltips:
       videa (zbirka, ako je podržana) u vanjskom playeru, na minijaturi. Upozorenje,
       Invidious postavke ne utječu na vanjske playere.
     Custom External Player Arguments: Svi prilagođeni argumenti naredbenog retka,
-      odvojene točka-zarezom (;), koje želiš da se proslijede vanjskom playeru.
+      koje želiš da se proslijede vanjskom playeru.
     Ignore Warnings: Nemoj prikazati upozorenja kad trenutačni vanjski player ne podržava
       trenutačnu radnju (npr. preokretanje redoslijeda zbirke itd.).
     Custom External Player Executable: Prema standardnim postavkama, FreeTube će pretpostaviti
@@ -1145,8 +1071,6 @@ Playing Next Video Interval: Trenutna reprodukcija sljedećeg videa. Pritisni za
   | Reprodukcija sljedećeg videa za {nextVideoInterval} sekunde. Pritisni za prekid.
   | Reprodukcija sljedećeg videa za {nextVideoInterval} sekundi. Pritisni za prekid.
 More: Još
-Hashtags have not yet been implemented, try again later: Hashtagovi još nisu implementirani,
-  pokušaj kasnije ponovo
 Unknown YouTube url type, cannot be opened in app: Nepoznata vrsta URL adrese na YouTubeu,
   ne može se otvoriti u programu
 Open New Window: Otvori novi prozor
@@ -1170,9 +1094,7 @@ Channels:
   Search bar placeholder: Pretraži kanale
   Count: '{number} kanala pronađena.'
   Empty: Tvoj popis kanala je trenutačno prazan.
-  Unsubscribe: Otkaži pretplatu
   Unsubscribe Prompt: Stvarno želiš prekinuti pretplatu na „{channelName}”?
-  Unsubscribed: '{channelName} je uklonjen iz tvojih pretplata'
 Clipboard:
   Copy failed: Neuspjelo kopiranje u međuspremnik
   Cannot access clipboard without a secure connection: Pristup međuspremniku nije
@@ -1183,6 +1105,7 @@ Chapters:
     aktualno poglavlje: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Popis poglavlja skriven,
     aktualno poglavlje: {chapterName}'
+  Key Moments: Ključni trenuci
 Preferences: Korisničke postavke
 Ok: U redu
 Hashtag:
@@ -1219,5 +1142,10 @@ Search Listing:
     4K: 4K
     Subtitles: Titlovi
     Closed Captions: Titlovi za gluhe
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Novi
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Blokirano je otvaranje potencijalno nesigurnog
   URL-a: „{url}”.'
diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
index 85838d3863441..7f5b5667b87a4 100644
--- a/static/locales/hu.yaml
+++ b/static/locales/hu.yaml
@@ -33,7 +33,7 @@ Forward: 'Előre'
 # Anything shared among components / views should be put here
 Global:
   Videos: 'Videók'
-  Shorts: Rövidfilmek
+  Shorts: Rövid videók
   Live: Élő
   Community: Közösség
 
@@ -108,8 +108,9 @@ Subscriptions:
   Subscriptions: 'Feliratkozások'
   Latest Subscriptions: 'Legfrissebb feliratkozások'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'A
-    feliratkozások listája jelenleg üres. Kezdjen hozzáadni a feliratkozásokat, hogy
-    itt láthassa őket.'
+    feliratkozások listája jelenleg üres. Ha importálni szeretné előfizetéseit, lépjen
+    az Adatok beállításaiba és válassza a feliratkozások importálása lehetőséget,
+    vagy kereshet csatornákat és feliratkozhat rájuk.'
   'Getting Subscriptions. Please wait.': 'Feliratkozások megszerzése. Kis türelmet
     kérünk.'
   Refresh Subscriptions: 'Feliratkozások frissítése'
@@ -128,7 +129,7 @@ Subscriptions:
   Load More Posts: További bejegyzések betöltése
   Empty Posts: A feliratkozott csatornáinak jelenleg nincsenek bejegyzései.
 Trending:
-  Trending: 'Népszerű'
+  Trending: 'Népszerűek'
   Trending Tabs: Népszerű lapok
   Movies: Filmek
   Gaming: Játék
@@ -137,20 +138,10 @@ Trending:
 Most Popular: 'Legnépszerűbbek'
 Playlists: 'Lejátszási listák'
 User Playlists:
-  Your Playlists: 'A lejátszási listáid'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: A
-    mentett videók üresek. Kattintson a videó sarkában található mentés gombra, hogy
-    itt szerepeljen
-  Playlist Message: Ez az oldal nem tükrözi a teljesen működő lejátszási listákat.
-    Csak azokat a videókat sorolja fel, amelyeket ön elmentett vagy a kedvencek közé
-    helyezett. A munka befejezése után az összes itt található videó átkerül a „Kedvencek”
-    lejátszási listára.
+  Your Playlists: 'Az Ön lejátszási listái'
   Search bar placeholder: Lejátszási listák keresése
   Empty Search Message: Ebben a lejátszási listában nincsenek olyan videók, amelyek
     megfelelnek a keresésnek
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Biztos,
-    hogy el akarja távolítani az összes megtekintett videót ebből a lejátszási listából?
-    Ezt nem lehet visszacsinálni.
   AddVideoPrompt:
     Search in Playlists: Keresés a lejátszási listában
     Save: Mentés
@@ -196,7 +187,6 @@ User Playlists:
       This video cannot be moved down.: Ez a videó nem mozgatható lejjebb.
       This playlist is now used for quick bookmark: Ez a lejátszási lista most gyors
         könyvjelzőként van használva
-      Quick bookmark disabled: Gyors könyvjelző letiltva
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: A(z)
         {oldPlaylistName} helyett mostantól ez a lejátszási lista szolgál gyors könyvjelzőként.
         Kattintson ide a visszavonáshoz
@@ -206,6 +196,9 @@ User Playlists:
         lejátszási lista az új gyors könyvjelző lejátszási lista.
       This playlist is already being used for quick bookmark.: Ez a lejátszási lista
         már használatban van mint gyors könyvjelző.
+      This playlist has a video with a duration error: Ez a lejátszási lista legalább
+        egy olyan videót tartalmaz, amelynek nincs időtartama, ezért úgy lesz rendezve,
+        mintha az időtartamuk nulla lenne.
     Search for Videos: Videók keresése
   Are you sure you want to delete this playlist? This cannot be undone: Biztos, hogy
     törölni szeretné ezt a lejátszási listát? Ezt nem lehet visszacsinálni.
@@ -248,7 +241,6 @@ User Playlists:
   Copy Playlist: Lejátszási lista másolása
   Playlist Description: Lejátszási lista leírása
   Add to Favorites: Hozzáadás a(z) {playlistName} lejátszási listához
-  Disable Quick Bookmark: Gyors Könyvjelző Letiltása
   Remove from Favorites: Eltávolítás a(z) {playlistName} lejátszási listából
   Enable Quick Bookmark With This Playlist: Gyors könyvjelző engedélyezése ezzel a
     lejátszási listával
@@ -265,6 +257,9 @@ User Playlists:
     eltávolít 1 megtekintett videót ebből a lejátszási listából? Ez a művelet nem
     vonható vissza. | Biztosan eltávolít {playlistItemCount} megtekintett videót ebből
     a lejátszási listából? Ez a művelet nem vonható vissza.
+  Export Playlist: Ezen lejátszási lista exportálása
+  The playlist has been successfully exported: A lejátszási lista sikeresen exportálva
+    lett
 History:
   # On History Page
   History: 'Előzmények'
@@ -278,7 +273,7 @@ Settings:
   # On Settings Page
   Settings: 'Beállítások'
   General Settings:
-    General Settings: 'Általános beállítások'
+    General Settings: 'Általános'
     Check for Updates: 'Frissítések keresése'
     Check for Latest Blog Posts: 'Legújabb blogbejegyzések keresése'
     Fallback to Non-Preferred Backend on Failure: 'A nem előnyben részesített háttéralkalmazás
@@ -291,7 +286,7 @@ Settings:
       Local API: 'Helyi API'
       Invidious API: 'Invidious-API'
     Video View Type:
-      Video View Type: 'Videó nézet típusa'
+      Video View Type: 'Videónézet típusa'
       Grid: 'Rács'
       List: 'Lista'
     Thumbnail Preference:
@@ -302,8 +297,6 @@ Settings:
       End: 'Vég'
       Hidden: Rejtett
       Blur: Elhomályosítás
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious példány
-      (Alapértelmezés: https://invidious.snopyta.org)'
     Region for Trending: 'Népszerűek innen'
         #! List countries
     View all Invidious instance information: Az Invidious-példányok listájának megtekintése
@@ -311,7 +304,8 @@ Settings:
     Current Invidious Instance: Jelenlegi Invidious-példány
     Clear Default Instance: Alapértelmezett példány eltávolítása
     Set Current Instance as Default: Állítsa be a jelenlegi példányt alapértelmezettként
-    Current instance will be randomized on startup: Jelenlegi példány indításkor véletlenszerűsített
+    Current instance will be randomized on startup: Véletlenszerű jelenlegi példány
+      használata indításkor
     No default instance has been set: Az alapértelmezett példány nincs beállítva
     The currently set default instance is {instance}: A jelenleg beállított alapértelmezett
       példány {instance}
@@ -323,8 +317,9 @@ Settings:
     Auto Load Next Page:
       Label: Következő oldal automatikus betöltése
       Tooltip: További oldalak és a hozzászólások automatikus betöltése.
+    Open Deep Links In New Window: A FreeTube-nak átadott webcímek megnyitása új ablakban
   Theme Settings:
-    Theme Settings: 'Téma beállítások'
+    Theme Settings: 'Téma'
     Match Top Bar with Main Color: 'Illessze a felső sávot a fő színnel'
     Base Theme:
       Base Theme: 'Alap téma'
@@ -339,6 +334,8 @@ Settings:
       Nordic: Skandináv
       Solarized Light: Szolarizált világos
       Solarized Dark: Szolarizált sötét
+      Gruvbox Light: Világos Gruvbox
+      Gruvbox Dark: Sötét Gruvbox
     Main Color Theme:
       Main Color Theme: 'Fő színtéma'
       Red: 'Vörös'
@@ -386,21 +383,31 @@ Settings:
       Solarized Green: Szolarizált zöld
       Solarized Magenta: Szolarizált magenta
       Solarized Violet: Szolarizált ibolya
+      Gruvbox Dark Yellow: Sötétsárga Gruvbox
+      Gruvbox Dark Blue: Sötétkék Gruvbox
+      Gruvbox Dark Aqua: Sötét-vízkék Gruvbox
+      Gruvbox Dark Orange: Sötétnarancssárga Gruvbox
+      Gruvbox Light Red: Világospiros Gruvbox
+      Gruvbox Light Blue: Világoskék Gruvbox
+      Gruvbox Dark Green: Sötétzöld Gruvbox
+      Gruvbox Dark Purple: Sötétlila Gruvbox
+      Gruvbox Light Orange: Világosnarancssárga Gruvbox
+      Gruvbox Light Purple: Világoslila Gruvbox
     Secondary Color Theme: 'Másodlagos színtéma'
         #* Main Color Theme
     UI Scale: Felhasználói felület méretezése
     Expand Side Bar by Default: Alapértelmezés szerinti oldalsáv megjelenítés
     Disable Smooth Scrolling: Finomgörgetés kikapcsolása
-    Hide Side Bar Labels: Oldalsáv címkék elrejtése
+    Hide Side Bar Labels: Gombfeliratok elrejtése az oldalsávról
     Hide FreeTube Header Logo: FreeTube logo elrejtése a fejlécből
   Player Settings:
-    Player Settings: 'Lejátszó beállításai'
+    Player Settings: 'Lejátszó'
     Play Next Video: 'Következő videó lejátszása'
-    Turn on Subtitles by Default: 'Alapértelmezetten a feliratok megjelenítése'
+    Turn on Subtitles by Default: 'Feliratok bekapcsolása alapértelemezetten'
     Autoplay Videos: 'Videók automatikus lejátszása'
-    Proxy Videos Through Invidious: 'Meghatalmazás videók az Invidious révén'
+    Proxy Videos Through Invidious: 'Videók proxyzása az Invidiouson keresztül'
     Autoplay Playlists: 'Lejátszási listák automatikus lejátszása'
-    Enable Theatre Mode by Default: 'Alapértelmezetten a mozi mód engedélyezése'
+    Enable Theatre Mode by Default: 'A mozimód bekapcsolása alapértelmezetten'
     Default Volume: 'Alapértelmezett hangerő'
     Default Playback Rate: 'Alapértelmezett lejátszási sebesség'
     Default Video Format:
@@ -422,7 +429,7 @@ Settings:
       4k: '4K'
       8k: '8K'
     Playlist Next Video Interval: Lejátszási lista következő videó intervalluma
-    Next Video Interval: Következő videó időköze
+    Next Video Interval: Automatikus lejátszás időköze
     Scroll Volume Over Video Player: A hangerő szintjét a videolejátszó feletti kerékkel
       szabályozhatja
     Display Play Button In Video Player: Lejátszás gomb megjelenítése a videolejátszóban
@@ -432,7 +439,7 @@ Settings:
       File Name Label: Fájlnévminta
       Folder Label: Képernyőképek mappa
       Folder Button: Mappa kiválasztása
-      Enable: Képernyőkép engedélyezése
+      Enable: Képernyőkép készítésének engedélyezése
       Format Label: Képernyőkép formátuma
       Error:
         Forbidden Characters: Tiltott karakterek
@@ -449,8 +456,9 @@ Settings:
     Video Playback Rate Interval: Videó lejátszási sebesség léptetési köze
     Enter Fullscreen on Display Rotate: Teljes képernyős mód a kijelzőn forgatáshoz
     Skip by Scrolling Over Video Player: Kihagyás a Videolejátszó felett görgetve
+    Autoplay Interruption Timer: Automatikus lejátszás megszakításának időköze
   Privacy Settings:
-    Privacy Settings: 'Adatvédelmi beállítások'
+    Privacy Settings: 'Adatvédelem'
     Remember History: 'Előzmények megjegyzése'
     Save Watched Progress: 'Megtekintési előrehaladás mentése'
     Clear Search Cache: 'Keresési gyorsítótár törlése'
@@ -471,22 +479,19 @@ Settings:
     Are you sure you want to remove all your playlists?: Biztosan el akarja távolítani
       az összes lejátszási listáját?
   Subscription Settings:
-    Subscription Settings: 'Feliratkozás beállításai'
+    Subscription Settings: 'Feliratkozás'
     Hide Videos on Watch: 'Videók elrejtése megtekintés után'
     Fetch Feeds from RSS: 'RSS-hírcsatornák beolvasása'
-    Manage Subscriptions: 'Feliratkozások kezelése'
     Fetch Automatically: Hírcsatorna automatikus lekérdezése
-    Only Show Latest Video for Each Channel: Csak a legújabb videókat jelenítse meg
-      a csatornáktól
     Confirm Before Unsubscribing: Kerülje el a véletlen leiratkozást
+    'Limit the number of videos displayed for each channel': Az egyes csatornákon
+      megjelenített videók számának korlátozása
+    To: 'Ennyire'
   Data Settings:
-    Data Settings: 'Adatbeállítások'
+    Data Settings: 'Adat'
     Select Import Type: 'Importálási típus kiválasztása'
     Select Export Type: 'Exportálási típus kiválasztása'
     Import Subscriptions: 'Feliratkozások importálása'
-    Import FreeTube: 'SzabadCső importálása'
-    Import YouTube: 'YouTube importálása'
-    Import NewPipe: 'NewPipe importálása'
     Export Subscriptions: 'Feliratkozások exportálása'
     Export FreeTube: 'FreeTube exportálása'
     Export YouTube: 'YouTube exportálása'
@@ -512,8 +517,7 @@ Settings:
     Unable to read file: 'Nem lehet olvasni a fájlt'
     Unable to write file: 'Nem lehet írni a fájlt'
     Unknown data key: 'Ismeretlen adatkulcs'
-    How do I import my subscriptions?: 'Hogyan importálhatom a feliratkozásaimat?'
-    Check for Legacy Subscriptions: Örökölt feliratkozások keresése
+    How do I import my subscriptions?: 'Hogyan importálhatja a feliratkozásait?'
     Manage Subscriptions: Feliratkozások kezelése
     Playlist insufficient data: Nincs elegendő adat a(z) „{playlist}” lejátszási listához,
       elem kihagyása
@@ -535,33 +539,6 @@ Settings:
         lista eltávolítása opcióval.\n3. Indítsa el a FreeTube régebbi verzióját,
         és importálja az exportált lejátszási listákat."
       Label: Lejátszási listák exportálása régebbi FreeTube verziókhoz
-  Advanced Settings:
-    Advanced Settings: 'További beállítások'
-    Enable Debug Mode (Prints data to the console): 'Hibakeresési mód engedélyezése
-      (Adatok nyomtatása a konzolra)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Meghatalmazás kiszolgáló
-      címe (Példa: SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'A
-      „Meghatalmazás kiszolgáló ellenőrzése” gombra kattintva kérelmet küld a https://ipinfo.io/json
-      címre'
-    Use Tor / Proxy for API calls: 'Használja a Tor/meghatalmazás kiszolgálót az API
-      hívásokhoz'
-    TEST PROXY: 'Meghatalmazás kiszolgáló ellenőrzése'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Nyilvános példányok megjelenítése'
-    Clear History:
-      Clear History: 'Előzmények törlése'
-      # On Click
-      Are you sure you want to delete your history?: 'Biztosan törli az előzményeket?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Feliratkozások törlése'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Biztosan eltávolítja az
-        összes feliratkozást?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Élő csevegés elrejtése
@@ -569,13 +546,13 @@ Settings:
     Hide Trending Videos: Felkapott videók elrejtése
     Hide Recommended Videos: Ajánlott videók elrejtése
     Hide Comment Likes: Hozzászólás-kedvelések elrejtése
-    Hide Channel Subscribers: Csatorna feliratkozók elrejtése
-    Hide Video Likes And Dislikes: Videó kedvelések és nemtetszések elrejtése
+    Hide Channel Subscribers: Csatorna-feliratkozók elrejtése
+    Hide Video Likes And Dislikes: Kedvelések és nemtetszések elrejtése a videóknál
     Hide Video Views: Videónézettség elrejtése
-    Distraction Free Settings: Ne zavarjanak beállítások
+    Distraction Free Settings: Ne zavarjanak
     Hide Active Subscriptions: Elérhető feliratkozások elrejtése
     Hide Playlists: Lejátszási listák elrejtése
-    Hide Video Description: Videó leírásának elrejtése
+    Hide Video Description: Videóleírás elrejtése
     Hide Comments: Hozzászólások elrejtése
     Hide Live Streams: Élő közvetítések elrejtése
     Hide Sharing Actions: Megosztási műveletek elrejtése
@@ -586,21 +563,20 @@ Settings:
     Display Titles Without Excessive Capitalisation: Címek túlzott nagybetűs írás
       és írásjelek nélkül való megjelenítése
     Hide Featured Channels: Kiemelt csatornák elrejtése
-    Hide Channel Playlists: Csatorna lejátszási listák elrejtése
-    Hide Channel Community: Csatornaközösség elrejtése
-    Hide Channel Shorts: Csatorna rövidfilmek elrejtése
+    Hide Channel Playlists: Csatorna „lejátszási listák” lap elrejtése
+    Hide Channel Community: Csatorna „közösség” lap elrejtése
+    Hide Channel Shorts: Csatorna „rövid videók” lap elrejtése
     Sections:
       Side Bar: Oldalsáv
       Channel Page: Csatornalap
       Watch Page: Nézőlap
       General: Általános
       Subscriptions Page: Feliratkozások oldal
-    Hide Channel Podcasts: Csatornapodcastok elrejtése
-    Hide Channel Releases: Csatornakiadások elrejtése
-    Hide Subscriptions Shorts: Feliratkozásos rövidfilmek elrejtése
+    Hide Channel Podcasts: Csatorna „podcastok” lap elrejtése
+    Hide Channel Releases: Csatorna „kiadások” lap elrejtése
+    Hide Subscriptions Shorts: Feliratkozások rövid videóinak elrejtése
     Hide Subscriptions Videos: Feliratkozási videók elrejtése
     Hide Subscriptions Live: Élő feliratkozások elrejtése
-    Blur Thumbnails: Indexkép elhomályosítása
     Hide Profile Pictures in Comments: Profilképek elrejtése a hozzászólásokban
     Hide Subscriptions Community: Közösségi feliratkozások elrejtése
     Hide Channels Invalid: Érvénytelen a megadott csatornaazonosító
@@ -612,6 +588,8 @@ Settings:
     Hide Videos and Playlists Containing Text Placeholder: Szó, szótöredék, vagy kifejezés
     Hide Videos and Playlists Containing Text: Szöveget tartalmazó videók és lejátszási
       listák elrejtése
+    Hide Channel Home: Csatorna „főoldal” lap elrejtése
+    Show Added Items: Hozzáadott elemek megjelenítése
   The app needs to restart for changes to take effect. Restart and apply change?: Az
     alkalmazásnak újra kell indulnia, hogy a változtatások életbe lépjenek. Induljon
     újra és alkalmazza a módosítást?
@@ -625,18 +603,23 @@ Settings:
       kérést küld a következő címre'
     Test Proxy: Proxy tesztelés
     Proxy Port Number: Proxy port száma
-    Proxy Host: Proxy gazdaszámítógép
+    Proxy Host: Proxy-kiszolgáló
     Proxy Protocol: Proxy protokoll
     Enable Tor / Proxy: Tor/Proxy engedélyezése
-    Proxy Settings: Proxy beállítások
+    Proxy Settings: Proxy
     Error getting network information. Is your proxy configured properly?: Hiba a
       hálózati adatok lekérésekor. Megfelelő a proxy beállítása?
+    Proxy Warning: A FreeTube nem rendelkezik beépített proxyval, de képes csatlakozni
+      egy külső proxyhoz, például egy olyanhoz, amely az Ön gépén fut, mint a Tor,
+      vagy egy külső proxyhoz, például egy SOCKS5 proxyhoz, amelyet egyes VPN-ek biztosítanak.
+      Ha engedélyezve van, győződjön meg róla, hogy a proxy/Tor megfelelően van beállítva,
+      különben a FreeTube nem fog tudni adatokat lekérni.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Értesítés a szponzorált szakasz kihagyásáról
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'SponsorBlock API
       webcíme (Alapértelmezett: https://sponsor.ajay.app)'
     Enable SponsorBlock: SponsorBlock engedélyezése
-    SponsorBlock Settings: SponsorBlock beállításai
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Beállítás kihagyása
       Auto Skip: Automatikus kihagyás
@@ -654,7 +637,7 @@ Settings:
     Custom External Player Arguments: Egyéni külső lejátszó argumentumok
     Custom External Player Executable: Egyéni külső lejátszó végrehajthatója
     External Player: Külső lejátszó
-    External Player Settings: Külső lejátszó beállításai
+    External Player Settings: Külső lejátszó
     Players:
       None:
         Name: Nincs
@@ -662,18 +645,18 @@ Settings:
   Download Settings:
     Ask Download Path: Rákérdezés a letöltés elérési útjára
     Choose Path: Elérési út kiválasztása
-    Download Settings: Letöltési beállítások
+    Download Settings: Letöltés
     Download Behavior: Letöltés viselkedése
     Open in web browser: Megnyitás böngészőben
     Download in app: Letöltés az alkalmazásban
   Parental Control Settings:
-    Parental Control Settings: Szülői felügyelet beállításai
-    Show Family Friendly Only: Kizárólag családbarát megjelenítése
+    Parental Control Settings: Szülői felügyelet
+    Show Family Friendly Only: Csak a családbarát videók megjelenítése
     Hide Search Bar: Keresősáv elrejtése
     Hide Unsubscribe Button: Leiratkozás gomb elrejtése
   Experimental Settings:
     Replace HTTP Cache: HTTP-gyorsítótár cseréje
-    Experimental Settings: Kísérleti beállítások
+    Experimental Settings: Kísérleti
     Warning: Ezek a beállítások kísérleti jellegűek, összeomlást okozhatnak, ha engedélyezve
       vannak. Erősen ajánlott biztonsági mentéseket készíteni. Csak saját felelősségre
       használja!
@@ -683,45 +666,17 @@ Settings:
     Enter Password To Unlock: Jelszó megadása a beállítások feloldásához
     Password: Jelszó
   Password Settings:
-    Password Settings: Jelszóbeállítások
+    Password Settings: Jelszó
     Set Password To Prevent Access: Jelszó megadása a beállításokhoz való hozzáférés
       megakadályozásához
     Set Password: Jelszó megadása
     Remove Password: Jelszó eltávolítása
-  Expand All Settings Sections: Beállítások kibontása
   Sort Settings Sections (A-Z): Beállítások rendezése (A-Z)
+  Return to Settings Menu: Vissza a „Beállítások” menübe
 About:
   #On About page
   About: 'Névjegy'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ez
-    a másolással szállított szoftver szabadon licencelt az AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Talált egy hibát? Szeretne javaslatot tenni egy szolgáltatásra? Szeretne segíteni?
-    Nézze meg GitHub oldalunkat. Húzni kéréseket szívesen fogadjuk.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Nagyon
-    köszönöm azoknak az embereknek és projekteknek, amelyek lehetővé teszik a FreeTube
-    használatát!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Szeretnél
-    csevegni? Csatlakozzon az Element/Matrix kiszolgálóhoz. Kérjük, csatlakozás előtt
-    ellenőrizze a szabályokat.'
-
-  'Looking for help? Check out our Wiki page.': 'Segítséget keres? Nézze meg Wiki
-    oldalunkat.'
-
-  Check out our Firefox extension!: 'Nézze meg Firefox kiegészítőnket!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ha
-    FreeTube-t használ, fontolja meg az adományozást a Liberapay-n keresztül vagy
-    a Bitcoin-címen keresztül.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Legfrissebb FreeTube hírek'
-
   these people and projects: az alábbi emberek és projektek
   FreeTube is made possible by: 'A FreeTube elkészítését lehetővé tették'
   Donate: Adományozás
@@ -739,10 +694,7 @@ About:
   GitHub issues: GitHub hibajegyek
   Help: Súgó
   GitHub releases: GitHub kiadások
-  Downloads / Changelog: Letöltések/Változásnapló
-  View License: Licenc megtekintése
-  Licensed under the AGPLv3: Az AGPL (GNU Affero General Public License - GNU Affero
-    általános nyilvános licenc) 3. verziója alatt licencelt
+  Downloads / Changelog: Letöltések / Változáslista
   FreeTube Wiki: FreeTube Wiki
   Source code: Forráskód
   Beta: Béta
@@ -793,7 +745,7 @@ Profile:
     törli a kiválasztott csatornákat? Ez nem törli a csatornát más profilokból.'
 #On Channel Page
   Profile Filter: Profilszűrő
-  Profile Settings: Profilbeállítások
+  Profile Settings: Profil
   Toggle Profile List: Profillista be-/kikapcsolása
   Profile Name: Profilnév
   Edit Profile Name: Profilnév szerkesztése
@@ -857,7 +809,7 @@ Channel:
       fülét.
   Shorts:
     This channel does not currently have any shorts: Ezen a csatornán jelenleg nincsenek
-      rövidfilmek
+      rövid videók
   This channel does not exist: Nem létezik ez a csatorna
   This channel does not allow searching: Keresés nem engedélyezett ezen a csatornán
   Releases:
@@ -868,6 +820,9 @@ Channel:
     Podcasts: Podcastok
     This channel does not currently have any podcasts: Ez a csatorna jelenleg nem
       rendelkezik podcastokkal
+  Home:
+    View Playlist: Lejátszási listák megtekintése
+    Home: Főoldal
 Video:
   Mark As Watched: 'Megjelölés megnézettként'
   Remove From History: 'Eltávolítás az előzményekből'
@@ -904,37 +859,8 @@ Video:
     élő csevegést jelenleg nem támogatja az Invidious API. Közvetlen kapcsolat szükséges
     a YouTube-hoz.'
   Published:
-    Jan: 'január'
-    Feb: 'február'
-    Mar: 'március'
-    Apr: 'április'
-    May: 'május'
-    Jun: 'június'
-    Jul: 'július'
-    Aug: 'augusztus'
-    Sep: 'szeptember'
-    Oct: 'október'
-    Nov: 'november'
-    Dec: 'december'
-    Second: 'másodperccel'
-    Seconds: 'másodperccel'
-    Minute: 'perccel'
-    Minutes: 'perccel'
-    Hour: 'órával'
-    Hours: 'órával'
-    Day: 'nappal'
-    Days: 'nappal'
-    Week: 'héttel'
-    Weeks: 'héttel'
-    Month: 'hónappal'
-    Months: 'hónappal'
-    Year: 'évvel'
-    Years: 'évvel'
-    Ago: 'ezelőtt'
-    Upcoming: 'Bemutató dátuma'
     In less than a minute: Kevesebb, mint egy perce
   Published on: 'Megjelent'
-  Publicationtemplate: '{number} {unit} ezelőtt'
 #& Videos
   audio only: csak hang
   video only: csak videó
@@ -977,7 +903,7 @@ Video:
     OpenInTemplate: 'Megnyitás itt: {externalPlayer}'
   Premieres on: 'Bemutató dátuma'
   Premieres: Első előadások
-  Show Super Chat Comment: Haladó csevegési hozzászólás megjelenítése
+  Show Super Chat Comment: Super Chat hozzászólás megjelenítése
   Scroll to Bottom: Görgetés legalulra
   Upcoming: Közelgő
   'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Az
@@ -1015,6 +941,16 @@ Video:
     Show Stats: Statisztika megjelenítése
     Playback will resume automatically when your connection comes back: A lejátszás
       automatikusan folytatódik, amikor a kapcsolat helyreáll.
+  IP block: A YouTube letiltotta az IP-címét a videók megtekintéséhez. Próbáljon meg
+    másik VPN-re vagy proxyra váltani.
+  Unlisted: Listázatlan
+  AgeRestricted: A FreeTube-on nem lehet korhatáros videókat megtekinteni, mivel ezekhez
+    Google bejelentkezés és korhatár-ellenőrzött YouTube-fiók használata szükséges.
+  MembersOnly: A csak tagoknak szóló videók nem tekinthetők meg a FreeTube-on, mivel
+    ezekhez Google bejelentkezés és fizetett tagság szükséges a feltöltő csatornájához.
+  DeArrow:
+    Show Modified Details: Módosított részletek megjelenítése
+    Show Original Details: Eredeti részletek megjelenítése
 Videos:
   #& Sort By
   Sort By:
@@ -1025,9 +961,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Teljes lejátszási lista megtekintése'
-  Videos: 'Videók'
-  View: 'Megtekintés'
-  Views: 'Megtekintés'
   Last Updated On: 'Utoljára frissítve'
 
 # On Video Watch Page
@@ -1043,7 +976,8 @@ Playlist:
     VideoTitleAscending: Cím szerint (A-Z)
     VideoTitleDescending: Cím szerint (Z-A)
     Custom: Egyéni rendezés
-Toggle Theatre Mode: 'Mozi mód be-/kikapcsolása'
+    VideoDurationAscending: Időtartam (legrövidebb elöl)
+    VideoDurationDescending: Időtartam (leghosszabb elöl)
 Change Format:
   Change Media Formats: 'Videoformátumok módosítása'
   Use Dash Formats: 'DASH (Dinamikus adaptív sávszélességű folyamatos átvitel HTTP-n
@@ -1093,9 +1027,9 @@ Comments:
     hozzászólások'
   Load More Comments: 'További hozzászólások betöltése'
   No more comments available: Nincs több hozzászólás
-  Newest first: Legújabb először
+  Newest first: Legújabb elöl
   Top comments: Legnépszerűbb hozzászólások
-  Sort by: Rendezés alapja
+  Sort by: Rendezési szempont
   Show More Replies: További válaszok megjelenítése
   From {channelName}: 'forrás: {channelName}'
   And others: és mások
@@ -1115,7 +1049,6 @@ Falling back to Local API: 'Helyi-API-ra visszatérve'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Ez
   a videó hiányzó formátumok miatt nem érhető el. Ez az ország nem elérhetősége miatt
   következhet be.'
-Subscriptions have not yet been implemented: 'Feliratkozások még nincsenek implementálva'
 Loop is now disabled: 'Folyamatos lejátszás kikapcsolva'
 Loop is now enabled: 'Folyamatos lejátszás bekapcsolva'
 Shuffle is now disabled: 'Véletlen sorrendű lejátszás kikapcsolva'
@@ -1146,6 +1079,8 @@ Tooltips:
     External Link Handling: "Válassza ki az alapértelmezett viselkedést, amikor egy
       hivatkozásra kattint, amely nem nyitható meg FreeTube-ban.\nA FreeTube alapértelmezés
       szerint megnyitja a kattintott hivatkozást az alapértelmezett böngészőben.\n"
+    Open Deep Links In New Window: A FreeTube-nak átadott webcímek, például a böngészőbővítmények
+      vagy parancssori argumentumok átirányításával, új ablakban nyílnak meg.
   Subscription Settings:
     Fetch Feeds from RSS: Amikor engedélyezve van, a FreeTube az RSS-t fogja használni
       az alapértelmezett módszer helyett az előfizetéses hírcsatorna lekérdezéséhez.
@@ -1176,8 +1111,8 @@ Tooltips:
       változón keresztül. Szükség esetén itt egyéni útvonal állítható be.
     Ignore Warnings: A figyelmeztetések mellőzése, amikor a jelenlegi külső lejátszó
       nem támogatja a jelenlegi műveletet (pl. lejátszási listák megfordítása stb.).
-    Custom External Player Arguments: Bármely egyéni parancssori pontosvesszővel (;)
-      elválasztott argumentumot át kell adni a külső lejátszónak.
+    Custom External Player Arguments: A külső lejátszónak átadni kívánt egyéni parancssori
+      argumentumok.
     External Player: Külső lejátszó kiválasztása esetén megjelenik egy ikon a videó
       (lejátszási lista, ha támogatott) megnyitásához a külső lejátszóban, az indexképen.
       Figyelem! Az Invidious beállításai nincsenek hatással a külső lejátszókra.
@@ -1209,8 +1144,6 @@ Playing Next Video Interval: A következő videó lejátszása folyamatban van.
   Kattintson a megszakításhoz. | A következő videó lejátszása {nextVideoInterval}
   másodperc múlva. Kattintson a megszakításhoz.
 More: Több
-Hashtags have not yet been implemented, try again later: A kettőskereszt címkék kezelése
-  még nincs implementálva, próbálkozzon újra később
 Unknown YouTube url type, cannot be opened in app: Ismeretlen YouTube webcímtípus,
   nem nyitható meg az alkalmazásban
 Open New Window: Új ablak megnyitása
@@ -1230,24 +1163,23 @@ Channels:
   Search bar placeholder: Csatornák keresése
   Count: '{number} csatorna találat.'
   Empty: A csatornalistája jelenleg üres.
-  Unsubscribe: Leiratkozás
-  Unsubscribed: 'A(z) {channelName} nevű csatorna el lett távolítva a feliratkozásáiból'
   Unsubscribe Prompt: Biztosan le szeretne iratkozni a(z) „{channelName}” csatornáról?
 Downloading failed: Hiba történt a(z) „{videoTitle}” letöltésekor
 Starting download: „{videoTitle}” letöltésének indítása
 Downloading has completed: A(z) „{videoTitle}” letöltése befejeződött
-Screenshot Success: Képernyőkép „{filePath}” néven mentve
+Screenshot Success: A képernyőkép „{filePath}” néven mentve
 Chapters:
   Chapters: Fejezetek
   'Chapters list visible, current chapter: {chapterName}': 'Fejezetlista látható,
     jelenlegi fejezet: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Fejezetlista elrejtve,
     jelenlegi fejezet: {chapterName}'
+  Key Moments: Fontos pillanatok
 Clipboard:
   Cannot access clipboard without a secure connection: Biztonságos kapcsolat nélkül
     nem lehet hozzáférni a vágólaphoz
   Copy failed: A vágólapra másolás nem sikerült
-Screenshot Error: A képernyőkép nem sikerült. {error}
+Screenshot Error: Nem sikerült képernyőképet készíteni. {error}
 Preferences: Beállítások
 Ok: OK
 Hashtag:
@@ -1285,5 +1217,26 @@ Search Listing:
     4K: 4K
     Subtitles: Feliratok
     Closed Captions: Feliratok (effektek is)
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Új
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Potenciálisan nem biztonságos webcím megnyitása
   letiltva: „{url}”.'
+Keys:
+  arrowup: Felfele nyíl
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Lefele nyíl
+  arrowleft: Balra nyíl
+  arrowright: Jobbra nyíl
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Right-click or hold to see history: Kattintson a jobb gombbal vagy tartsa lenyomva
+  az előzmények megtekintéséhez
+Autoplay Interruption Timer: Az automatikus lejátszás {autoplayInterruptionIntervalHours}
+  óra inaktivitás miatt visszavonásra került
+Description:
+  Collapse Description: Kevesebb megjelenítése
+  Expand Description: …továbbiak
diff --git a/static/locales/id.yaml b/static/locales/id.yaml
index bbb3560a6ca42..5a0eb5fee527e 100644
--- a/static/locales/id.yaml
+++ b/static/locales/id.yaml
@@ -118,11 +118,6 @@ Most Popular: 'Paling Populer'
 Playlists: 'Daftar Putar'
 User Playlists:
   Your Playlists: 'Daftar Putar Anda'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Penyimpanan
-    video Anda kosong. Klik tombol simpan pada pojok video untuk menyimpannya di sini
-  Playlist Message: Halaman ini tidak mencerminkan playlist yang berfungsi sepenuhnya.
-    Ini hanya mencantumkan video yang telah Anda simpan atau favorit. Setelah selesai,
-    semua video yang ada di sini akan dipindahkan ke daftar putar 'Favorit'.
   Search bar placeholder: Cari Daftar Putar
   Empty Search Message: Tidak ada video di dalam daftar putar ini yang cocok dengan
     pencarian Anda
@@ -216,8 +211,6 @@ Settings:
       End: 'Akhir'
       Hidden: Tersembunyi
       Blur: Buramkan
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Situs Invidious
-      (Bawaan: https://invidious.snopyta.org)'
     Region for Trending: 'Wilayah untuk Sedang Tren'
         #! List countries
     View all Invidious instance information: Tampilkan informasi semua peladen Invidious
@@ -353,18 +346,12 @@ Settings:
     Subscription Settings: 'Pengaturan Langganan'
     Hide Videos on Watch: 'Sembunyikan Video saat Menonton'
     Fetch Feeds from RSS: 'Ambil Umpan dari RSS'
-    Manage Subscriptions: 'Kelola Langganan'
     Fetch Automatically: Ambil Umpan Secara Otomatis
-    Only Show Latest Video for Each Channel: Hanya Tampilkan Video Terbaru untuk Setiap
-      Kanal
   Data Settings:
     Data Settings: 'Pengaturan Data'
     Select Import Type: 'Pilih Tipe Impor'
     Select Export Type: 'Pilih Tipe Ekspor'
     Import Subscriptions: 'Impor Langganan'
-    Import FreeTube: 'Impor FreeTube'
-    Import YouTube: 'Impor YouTube'
-    Import NewPipe: 'Impor NewPipe'
     Export Subscriptions: 'Ekspor Langganan'
     Export FreeTube: 'Ekspor FreeTube'
     Export YouTube: 'Ekspor YouTube'
@@ -392,7 +379,6 @@ Settings:
     Unable to write file: 'Tidak dapat menulis berkas'
     Unknown data key: 'Kunci data tidak diketahui'
     How do I import my subscriptions?: 'Bagaimana saya mengimpor langganan saya?'
-    Check for Legacy Subscriptions: Periksa Langganan Lawas
     Manage Subscriptions: Kelola Langganan
     Import Playlists: Impor Playlist
     Export Playlists: Ekspor Playlist
@@ -405,32 +391,6 @@ Settings:
     Playlist File: Berkas Daftar Putar
     Export Playlists For Older FreeTube Versions:
       Label: Ekspor Daftar Putar untuk Versi FreeTube yang Lebih Tua
-  Advanced Settings:
-    Advanced Settings: 'Pengaturan Lanjutan'
-    Enable Debug Mode (Prints data to the console): 'Aktifkan Mode Debug (Menampilkan
-      data ke konsol)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Alamat Proksi (Contoh: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Meng-klik
-      tombol "TES PROKSI" akan mengirim permintaan ke https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Gunakan Tor / Proksi untuk panggilan API'
-    TEST PROXY: 'TES PROKSI'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Lihat Situs Publik'
-    Clear History:
-      Clear History: 'Bersihkan Riwayat'
-      # On Click
-      Are you sure you want to delete your history?: 'Apakah anda yakin ingin menghapus
-        riwayat anda?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Bersihkan Langganan'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Apakah anda yakin ingin
-        menghapus semua langganan?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Comment Likes: Sembunyikan Jumlah Suka pada Komentar
@@ -545,37 +505,10 @@ Settings:
     Hide Unsubscribe Button: Sembunyikan Tombol Berhenti Berlangganan
     Show Family Friendly Only: Tampilkan Hanya yang Ramah Keluarga
     Hide Search Bar: Sembunyikan Kotak Pencarian
-  Expand All Settings Sections: Buka Semua Bagian Pengaturan
 About:
   #On About page
   About: 'Tentang'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Perangkat
-    lunak copyleft ini berlisensi bebas AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Menemukan bug? Ingin mengajukan fitur? Ingin membantu? Kunjungi halaman Github
-    kami. Terbuka untuk pull request.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Terima
-    kasih banyak untuk orang-orang dan proyek-proyek yang membuat Freetube terwujud!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Ingin
-    mengobrol? Gabung Element / Server Matrix kami. Harap cek peraturannya sebelum
-    bergabung.'
-
-  'Looking for help? Check out our Wiki page.': 'Mencari bantuan? Cek laman Wiki kami.'
-
-  Check out our Firefox extension!: 'Cek ekstensi Firefox kami!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Jika
-    anda menyukai Freetube, pertimbangkan berdonasi via Liberapay atau melalui alamat
-    Bitcoin kami.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Berita FreeTube Terbaru'
-
   Donate: Donasi
   these people and projects: pengembang dan proyek berikut
   FreeTube is made possible by: FreeTube dikembangkan oleh
@@ -596,8 +529,6 @@ About:
   Help: Bantuan
   GitHub releases: Rilis GitHub
   Downloads / Changelog: Unduhan / Catatan Perubahan
-  View License: Lihat Lisensi
-  Licensed under the AGPLv3: Lisensi AGPLv3
   Source code: Kode sumber
   Beta: Beta
   Discussions: Diskusi
@@ -736,37 +667,7 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Obrolan
     Langsung belum didukung dengan API Invidious. Koneksi langsung dengan YouTube
     dibutuhkan.'
-  Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Mei'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Agu'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Des'
-    Second: 'Detik'
-    Seconds: 'Detik'
-    Minute: 'Menit'
-    Minutes: 'Menit'
-    Hour: 'Jam'
-    Hours: 'Jam'
-    Day: 'Hari'
-    Days: 'Hari'
-    Week: 'Pekan'
-    Weeks: 'Pekan'
-    Month: 'Bulan'
-    Months: 'Bulan'
-    Year: 'Tahun'
-    Years: 'Tahun'
-    Ago: 'Lalu'
-    Upcoming: 'Segera tayang di'
   Published on: 'Dipublikasi pada'
-  Publicationtemplate: '{number} {unit} yang lalu'
 #& Videos
   audio only: hanya audio
   video only: hanya video
@@ -819,9 +720,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Tampilkan Daftar Putar Penuh'
-  Videos: 'Video'
-  View: 'Tampilan'
-  Views: 'Tampilan'
   Last Updated On: 'Terakhir Diperbarui Pada'
 
 # On Video Watch Page
@@ -830,7 +728,6 @@ Playlist:
   Playlist: Daftar Putar
   Sort By:
     Sort By: Urut Menurut
-Toggle Theatre Mode: 'Mode Teater'
 Change Format:
   Change Media Formats: 'Ubah Format Video'
   Use Dash Formats: 'Gunakan Format DASH'
@@ -893,7 +790,6 @@ Local API Error (Click to copy): 'API Lokal Galat (Klik untuk menyalin)'
 Invidious API Error (Click to copy): 'API Invidious Galat (Klik untuk menyalin)'
 Falling back to Invidious API: 'Kembali ke API Invidious'
 Falling back to Local API: 'Kembali ke API lokal'
-Subscriptions have not yet been implemented: 'Langganan masih belum diterapkan'
 Loop is now disabled: 'Putar-Ulang sekarang dimatikan'
 Loop is now enabled: 'Putar-Ulang sekarang diaktifkan'
 Shuffle is now disabled: 'Acak sekarang dimatikan'
@@ -951,8 +847,8 @@ Tooltips:
       dibuka di FreeTube, diklik.\nSecara default FreeTube akan membuka tautan yang
       diklik dengan browser default Anda.\n"
   External Player Settings:
-    Custom External Player Arguments: Semua argumen perintah khusus, dipisahkan dengan
-      titik koma (';'), yang Anda ingin gunakan dengan pemutar eksternal.
+    Custom External Player Arguments: Semua argumen perintah khusus, yang Anda ingin
+      gunakan dengan pemutar eksternal.
     Ignore Warnings: Jangan tampilkan peringatan saat pemutar eksternal saat ini tidak
       mendukung tindakan yang ada (mis. membalik urutan daftar putar, dsb.).
     Custom External Player Executable: Secara bawaan, FreeTube akan berasumsi bahwa
@@ -974,8 +870,6 @@ Playing Next Video Interval: Langsung putar video berikutnya. Klik untuk membata
   | Putar video berikutnya dalam {nextVideoInterval} detik. Klik untuk membatalkan.
   | Putar video berikutnya dalam {nextVideoInterval} detik. Klik untuk membatalkan.
 More: Lebih banyak
-Hashtags have not yet been implemented, try again later: Hashtag belum diimplementasikan,
-  silakan coba lagi nanti
 Unknown YouTube url type, cannot be opened in app: Tipe URL YouTube tidak dikenal,
   tidak bisa dibuka di aplikasi
 Open New Window: Buka Jendela Baru
@@ -999,8 +893,6 @@ Channels:
   Count: '{number} kanal ditemukan.'
   Unsubscribe Prompt: Apakah Anda yakin ingin berhenti berlangganan "{channelName}"?
   Empty: Daftar kanal Anda kosong.
-  Unsubscribe: Berhenti langganan
-  Unsubscribed: '{channelName} telah dihapus dari daftar langganan Anda'
 Preferences: Pengaturan
 Clipboard:
   Copy failed: Gagal menyalin ke papan klip
diff --git a/static/locales/is.yaml b/static/locales/is.yaml
index 88d74c5e621ee..d72f552fbf474 100644
--- a/static/locales/is.yaml
+++ b/static/locales/is.yaml
@@ -43,6 +43,8 @@ Global:
     Subscriber Count: 1 áskrifandi | {count} áskrifendur
     View Count: 1 áhorf | {count} áhorf
     Watching Count: 1 að horfa | {count} að horfa
+    Like Count: 1 líkaði | {count} líkaði
+    Comment Count: 1 athugasemd | {count} athugasemdir
   Input Tags:
     Length Requirement: Merki þarf að vera a.m.k. {number} stafa langt
 Version {versionNumber} is now available!  Click for more details: 'Útgáfa {versionNumber}
@@ -110,8 +112,9 @@ Subscriptions:
     notkunarsnið er með mikinn fjölda áskrifta. Þvinga notkun á RSS til að forðast
     takmarkanir á magni'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Listi
-    með áskriftum er tómur í augnablikinu. Gerstu áskrifandi að rásum og þær munu
-    birtast hér.'
+    með áskriftum er tómur í augnablikinu. Ef þú vilt flytja inn áskriftirnar þínar,
+    geturðu farið í stillingar gagna og valið ''Flytja inn áskriftir'' eða leitað
+    að rás og gerst áskrifandi að henni.'
   'Getting Subscriptions. Please wait.': 'Sæki áskriftir. Hinkraðu aðeins.'
   Refresh Subscriptions: 'Endurlesa áskriftir'
   Load More Videos: 'Hlaða inn fleiri myndskeiðum'
@@ -136,12 +139,6 @@ Most Popular: 'Vinsælast'
 Playlists: 'Spilunarlistar'
 User Playlists:
   Your Playlists: 'Spilunarlistarnir þínir'
-  Playlist Message: 'Þessi síða endurspeglar ekki alveg fullvirka spilunarlista. Hún
-    telur aðeins upp þau myndskeið sem þú hefur vistað eða sett í eftirlæti. Þegar
-    verkinu er lokið munu öll þessi myndskeið færast yfir í ''Eftirlæti''-spilunarlista.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Listinn
-    þinn yfir vistuð myndskeið er tómur. Smelltu á vistunarhnapp myndskeiðs til að
-    það birtist hér'
   Search bar placeholder: Leita að spilunarlistum
   Empty Search Message: Það eru engin myndskeið í þessum spilunarlista sem samsvara
     leitinni þinni
@@ -189,7 +186,6 @@ User Playlists:
         afrita samt.
       This playlist is now used for quick bookmark: Þessi spilunarlisti er núna notaður
         undir flýtibókamerki
-      Quick bookmark disabled: Flýtibókamerki óvirk
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Þessi
         spilunarlisti er núna notaður undir flýtibókamerki í stað {oldPlaylistName}.
         Smelltu hér til að afturkalla
@@ -199,6 +195,9 @@ User Playlists:
         {playlistName} er nýi spilunarlistinn með flýtibókamerkjum.
       This playlist is already being used for quick bookmark.: Þessi spilunarlisti
         er nú þegar notaður undir flýtibókamerki.
+      This playlist has a video with a duration error: Spilunarlistinn inniheldur
+        a.m.k. eitt myndskeið sem er ekki með neina tímalengd; það verður flokkað
+        eins og tímalengdin sé núll.
     Search for Videos: Leita að myndskeiðum
   AddVideoPrompt:
     N playlists selected: '{playlistCount} valin'
@@ -235,16 +234,12 @@ User Playlists:
   Move Video Down: Færa myndskeið niður
   Copy Playlist: Afrita spilunarlista
   Remove Watched Videos: Fjarlægja áhorfð myndskeið
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Ertu
-    viss um að þú viljir eyða öllum myndskeiðum sem búið er að horfa á af þessum spilunarlista?
-    Aðgerðin er ekki afturkallanleg.
   Delete Playlist: Eyða spilunarlista
   Are you sure you want to delete this playlist? This cannot be undone: Ertu viss
     um að þú viljir eyða þessum spilunarlista? Aðgerðin er ekki afturkallanleg.
   Add to Favorites: Bæta í {playlistName}
   Remove from Favorites: Fjarlægja af {playlistName}
   Enable Quick Bookmark With This Playlist: Virkja flýtibókamerki með þessum spilunarlista
-  Disable Quick Bookmark: Eyða flýtibókamerki
   Playlists with Matching Videos: Spilunarlistar með samsvarandi myndskeiðum
   Quick Bookmark Enabled: Flýtibókamerki virkjuð
   Remove Duplicate Videos: Fjarlægja tvítekin Myndskeið
@@ -258,6 +253,8 @@ User Playlists:
     viss um að þú viljir fjarlægja 1 áhorft myndskeið af þessum spilunarlista? Þetta
     er ekki hægt að afturkalla. | Ertu viss um að þú viljir fjarlægja {playlistItemCount}
     áhorfð myndskeið af þessum spilunarlista? Þetta er ekki hægt að afturkalla.
+  Export Playlist: Flytja út þennan spilunarlista
+  The playlist has been successfully exported: Það tókst að flytja út þennan spilunarlista
 History:
   # On History Page
   History: 'Áhorf'
@@ -274,7 +271,7 @@ Settings:
     þarft að endurræsa forritið svo breytingarnar taki gildi. á að endurræsa og virkja
     breytingar?'
   General Settings:
-    General Settings: 'Almennar stillingar'
+    General Settings: 'Almennt'
     Check for Updates: 'Athuga með uppfærslur'
     Check for Latest Blog Posts: 'Athuga með nýjustu bloggfærslur'
     Fallback to Non-Preferred Backend on Failure: 'Nota varaleið um ekki-forgangsbakenda
@@ -298,8 +295,6 @@ Settings:
       End: 'Endir'
       Hidden: Falið
       Blur: Móska
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious-tilvik
-      (sjálfgefið er https://invidious.snopyta.org)'
     View all Invidious instance information: 'Skoða allar upplýsingar um Invidious-tilvik'
     Region for Trending: 'Landssvæði sem skal miða vinsældir við'
         #! List countries
@@ -320,8 +315,9 @@ Settings:
     Auto Load Next Page:
       Label: Hlaða næstu síðu sjálfvirkt
       Tooltip: Hlaða viðbótarsíðum og athugasemdum sjálfkrafa inn.
+    Open Deep Links In New Window: Opna slóðir sem beint er til FreeTube í nýjum glugga
   Theme Settings:
-    Theme Settings: 'Þemastillingar'
+    Theme Settings: 'Þema'
     Match Top Bar with Main Color: 'Láta toppstiku samsvara aðallit'
     Expand Side Bar by Default: 'Fletta sjálfgefið út hliðarstiku'
     Disable Smooth Scrolling: 'Gera mjúkt skrun óvirkt'
@@ -339,6 +335,8 @@ Settings:
       Nordic: Norrænt
       Solarized Dark: Sólaríserað dökkt
       Solarized Light: Sólaríserað ljóst
+      Gruvbox Dark: Gruvbox dökkt
+      Gruvbox Light: Gruvbox ljóst
     Main Color Theme:
       Main Color Theme: 'Aðallitur þema'
       Red: 'Rautt'
@@ -386,12 +384,22 @@ Settings:
       Solarized Magenta: Sólaríserað blárautt
       Solarized Red: Sólaríserað rautt
       Solarized Green: Sólaríserað grænt
+      Gruvbox Dark Green: Gruvbox dökkgrænt
+      Gruvbox Dark Yellow: Gruvbox dökkgult
+      Gruvbox Dark Aqua: Gruvbox dökksægrænt
+      Gruvbox Light Red: Gruvbox ljósrautt
+      Gruvbox Light Blue: Gruvbox ljósblátt
+      Gruvbox Light Purple: Gruvbox ljósfjólublátt
+      Gruvbox Light Orange: Gruvbox ljósappelsínugult
+      Gruvbox Dark Orange: Gruvbox dökkappelsínugult
+      Gruvbox Dark Blue: Gruvbox dökkblátt
+      Gruvbox Dark Purple: Gruvbox dökkfjólublátt
     Secondary Color Theme: 'Aukalitur þema'
         #* Main Color Theme
     Hide Side Bar Labels: Fela skýringar á hliðarstiku
     Hide FreeTube Header Logo: Fela táknmynd FreeTube í haus
   Player Settings:
-    Player Settings: 'Stillingar spilara'
+    Player Settings: 'Spilari'
     Play Next Video: 'Spila næsta myndskeið'
     Turn on Subtitles by Default: 'Sjálfgefið kveikja á skjátextum'
     Autoplay Videos: 'Spila myndskeið sjálfkrafa'
@@ -418,7 +426,7 @@ Settings:
       1440p: '1440p'
       4k: '4k'
       8k: '8k'
-    Next Video Interval: Bil í næsta myndskeið
+    Next Video Interval: Niðurtalning í sjálfvirka spilun
     Display Play Button In Video Player: Birta afspilunarhnapp í myndspilara
     Scroll Volume Over Video Player: Skruna hljóðstyrk ofan á myndspilara
     Fast-Forward / Rewind Interval: Millibil hraðspólunar / spóla til baka
@@ -443,8 +451,9 @@ Settings:
       File Name Label: Mynstur skráaheita
     Enter Fullscreen on Display Rotate: Fara í skjáfylli við snúning á skjá
     Skip by Scrolling Over Video Player: Sleppa með því að skruna ofan á myndspilara
+    Autoplay Interruption Timer: Niðurtalning í stöðvun á sjálfvirkri spilun
   Privacy Settings:
-    Privacy Settings: 'Stillingar gagnaleyndar'
+    Privacy Settings: 'Gagnaleynd'
     Remember History: 'Muna áhorfsferil'
     Save Watched Progress: 'Vista framvindu áhorfs'
     Clear Search Cache: 'Hreinsa skyndiminni leitar'
@@ -466,16 +475,16 @@ Settings:
       fjarlægja alla spilunarlistana þína?
     All playlists have been removed: Allir spilunarlistar hafa verið fjarlægðir
   Subscription Settings:
-    Subscription Settings: 'Stillingar áskrifta'
+    Subscription Settings: 'Áskrift'
     Hide Videos on Watch: 'Fela myndskeið eftir áhorf'
     Fetch Feeds from RSS: 'Ná í streymi úr RSS'
-    Manage Subscriptions: 'Sýsla með áskriftir'
     Fetch Automatically: Sækja streymi sjálfvirkt
-    Only Show Latest Video for Each Channel: Aðeins birta nýjasta myndskeið fyrir
-      hverja myndskeiðarás
     Confirm Before Unsubscribing: Staðfesta uppsögn áskriftar
+    To: Við
+    'Limit the number of videos displayed for each channel': Takmarka fjölda myndskeiða
+      sem birt eru fyrir hverja rás
   Distraction Free Settings:
-    Distraction Free Settings: 'Truflanaminnkandi stillingar'
+    Distraction Free Settings: 'Truflanaminnkandi'
     Hide Video Views: 'Fela fjölda áhorfa á myndskeið'
     Hide Video Likes And Dislikes: 'Fela hve mörgum líkar eða mislíkar myndskeið'
     Hide Channel Subscribers: 'Fela fjölda áskrifenda myndskeiða'
@@ -502,16 +511,15 @@ Settings:
       Watch Page: Áhorfssíða
       General: Almennt
       Subscriptions Page: Áskriftasíða
-    Hide Channel Shorts: Fela stuttmyndir rása
-    Hide Channel Playlists: Fela spilunarlista rása
-    Hide Channel Community: Fela samfélag rása
+    Hide Channel Shorts: Fela stuttmyndaflipa rása
+    Hide Channel Playlists: Fela spilunarlistaflipa rása
+    Hide Channel Community: Fela samfélagsflipa rása
     Hide Featured Channels: Fela rásir í deiglunni
-    Hide Channel Podcasts: Fela hlaðvörp rása
-    Hide Channel Releases: Fela útgáfur rása
+    Hide Channel Podcasts: Fela hlaðvarpsflipa rása
+    Hide Channel Releases: Fela útgáfuflipa rása
     Hide Subscriptions Shorts: Fela stuttmyndir áskrifta
     Hide Subscriptions Live: Fela bein streymi áskrifta
     Hide Subscriptions Videos: Fela myndskeið áskrifta
-    Blur Thumbnails: Móska smámyndir
     Hide Profile Pictures in Comments: Fela auðkennismyndir í athugasemdum
     Hide Subscriptions Community: Fela samfélag áskrifenda
     Hide Channels Invalid: Uppgefið auðkenni rásar er ógilt
@@ -524,15 +532,13 @@ Settings:
     Hide Videos and Playlists Containing Text: Fela myndskeið og spilunarlista sem
       innihalda texta
     Hide Videos and Playlists Containing Text Placeholder: Orð, orðhluti eða setning
+    Hide Channel Home: Fela "Heim"-flipa rása
+    Show Added Items: Sýna atriði sem bætt hefur verið við
   Data Settings:
-    Data Settings: 'Stillingar gagna'
+    Data Settings: 'Gögn'
     Select Import Type: 'Veldu tegund innflutnings'
     Select Export Type: 'Veldu tegund útflutnings'
     Import Subscriptions: 'Flytja inn áskriftir'
-    Import FreeTube: 'Flytja inn FreeTube'
-    Import YouTube: 'Flytja inn YouTube'
-    Import NewPipe: 'Flytja inn NewPipe'
-    Check for Legacy Subscriptions: 'Athuga með eldri áskriftir'
     Export Subscriptions: 'Flytja út áskriftir'
     Export FreeTube: 'Flytja út FreeTube'
     Export YouTube: 'Flytja út YouTube'
@@ -581,7 +587,7 @@ Settings:
         spilunarlista' í stillingum gagnaleyndar.\n3. Ræstu eldri útgáfu FreeTube
         og flyttu inn spilunarlistana sem þú fluttir út.\""
   Proxy Settings:
-    Proxy Settings: 'Stillingar milliþjóns (proxy)'
+    Proxy Settings: 'Milliþjónn (proxy)'
     Enable Tor / Proxy: 'Virkja Tor / milliþjón'
     Proxy Protocol: 'Samskiptamáti milliþjóns'
     Proxy Host: 'Hýsilvél milliþjóns'
@@ -596,12 +602,17 @@ Settings:
     City: 'Borg/Sveitarfélag'
     Error getting network information. Is your proxy configured properly?: 'Það tókst
       ekki að sækja upplýsingar um netkerfið. Er milliþjónninn rétt uppsettur?'
+    Proxy Warning: FreeTube er ekki með innbyggðan milliþjón en getur tengst við utanaðkomandi
+      milliþjóna, til dæmis einhvern sem keyrir á vélinni þinni eins og Tor eða fjartengdan
+      milliþjón á borð við SOCKS5-milliþjóna sem sumar VPN-þjónustur bjóða. Ef þetta
+      er virkt skaltu ganga úr skugga um að milliþjónninn/Tor sé rétt stillt, annars
+      mun FreeTube ekki geta sótt nein gögn.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Láta vita þegar kostaður hluti er hunsaður
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API-slóð
       (sjálfgefið er https://sponsor.ajay.app)
     Enable SponsorBlock: Virkja SponsorBlock
-    SponsorBlock Settings: Stillingar SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Valkostir við hunsun
       Auto Skip: Hunsa sjálfvirkt
@@ -619,13 +630,13 @@ Settings:
     Custom External Player Executable: Sérsniðin skipun fyrir utanaðkomandi spilara
     Ignore Unsupported Action Warnings: Hunsa aðvarinir vegna óstuddra aðgerða
     External Player: Utanaðkomandi spilari
-    External Player Settings: Stillingar utanaðkomandi spilara
+    External Player Settings: Utanaðkomandi spilari
     Players:
       None:
         Name: Ekkert
     Ignore Default Arguments: Hunsa sjálfgefnar breytur
   Download Settings:
-    Download Settings: Stillingar niðurhals
+    Download Settings: Niðurhal
     Ask Download Path: Spyrja hvar eigi að vista skrár
     Choose Path: Veldu slóð
     Download in app: Sækja í forritinu
@@ -635,9 +646,9 @@ Settings:
     Hide Unsubscribe Button: Fela hnapp til að segja upp áskrift
     Show Family Friendly Only: Aðeins sýna fjölskylduvænt efni
     Hide Search Bar: Fela leitarstiku
-    Parental Control Settings: Stillingar foreldrastýringar
+    Parental Control Settings: Foreldrastýringar
   Experimental Settings:
-    Experimental Settings: Stillingar á tilraunastigi
+    Experimental Settings: Á tilraunastigi
     Warning: Þessar stillingar eru á tilraunastigi, þær geta valdið hruni þegar þær
       eru virkjaðar. Mælt er með því að öryggisafrit séu tekin. Notist á eigin ábyrgð!
     Replace HTTP Cache: Skipta út HTTP-skyndiminni
@@ -650,16 +661,14 @@ Settings:
     Set Password To Prevent Access: Settu lykilorð til að hindra aðgang að stillingum
     Set Password: Setja lykilorð
     Remove Password: Fjarlægja lykilorð
-    Password Settings: Stillingar lykilorðs
-  Expand All Settings Sections: Fletta út öllum stillingahlutum
+    Password Settings: Lykilorð
   Sort Settings Sections (A-Z): Röðun stillingahluta (A-Ö)
+  Return to Settings Menu: Fara aftur í stillingavalmynd
 About:
   #On About page
   About: 'Um hugbúnaðinn'
   Beta: 'Beta-prófunarútgáfa'
   Source code: 'Grunnkóði'
-  Licensed under the AGPLv3: 'Gefið út með AGPLv3-notkunarleyfi'
-  View License: 'Skoða notkunarleyfi'
   Downloads / Changelog: 'Sóttar skrár / Breytingaskrá'
   GitHub releases: 'Útgáfur af GitHub'
   Help: 'Hjálp'
@@ -728,7 +737,7 @@ Profile:
     viss um að þú viljir eyða völdu rásunum? Þetta mun ekki eyða rásunum úr öðrum
     notkunarsniðum.'
 #On Channel Page
-  Profile Settings: Stillingar notkunarsniðs
+  Profile Settings: Notkunarsnið
   Toggle Profile List: Víxla lista með notkunarsniðum af/á
   Profile Name: Heiti notkunarsniðs
   Edit Profile Name: Breyta heiti notkunarsniðs
@@ -786,6 +795,9 @@ Channel:
     Hide Answers: Fela svör
     votes: '{votes} atkvæði'
     Video hidden by FreeTube: Myndskeið falið af FreeTube
+    View Full Post: Skoða alla færsluna
+    Viewing Posts Only Supported By Invidious: Einungis er hægt að skoða innsendar
+      færslur á Invidious. Farðu á samfélagsflipa rásar til að skoða efni þar án Invidious.
   Shorts:
     This channel does not currently have any shorts: Þessi rás er í augnablikinu ekki
       með neinar stuttmyndir
@@ -797,6 +809,9 @@ Channel:
     Podcasts: Hlaðvörp
     This channel does not currently have any podcasts: Þessi rás er ekki með nein
       hlaðvörp í augnablikinu
+  Home:
+    Home: Heim
+    View Playlist: Skoða spilunarlista
 Video:
   Mark As Watched: 'Merkja sem búið að horfa á'
   Remove From History: 'Fjarlægja úr áhorfsferli'
@@ -845,40 +860,10 @@ Video:
   video only: 'einungis myndmerki'
   audio only: 'einungis hljóð'
   Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Maí'
-    Jun: 'Jún'
-    Jul: 'Júl'
-    Aug: 'Ágú'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nóv'
-    Dec: 'Des'
-    Second: 'sekúndu'
-    Seconds: 'sekúndum'
-    Minute: 'mínútu'
-    Minutes: 'mínútum'
-    Hour: 'klukkustund'
-    Hours: 'klukkustundum'
-    Day: 'degi'
-    Days: 'dögum'
-    Week: 'viku'
-    Weeks: 'vikum'
-    Month: 'mánuði'
-    Months: 'mánuðum'
-    Year: 'ári'
-    Years: 'árum'
-    Ago: 'síðan'
-    Upcoming: 'Frumsýnt'
-    Less than a minute: Minna en mínútu
     In less than a minute: eftir minna en mínútu
   Published on: 'Gefið út'
   Streamed on: 'Streymt'
   Started streaming on: 'Byrjaði streymi'
-  Publicationtemplate: 'Fyrir {number} {unit} síðan'
 #& Videos
   Sponsor Block category:
     music offtopic: Tónlist óskyld efni
@@ -917,6 +902,46 @@ Video:
   Unhide Channel: Birta rás
   Hide Channel: Fela rás
   More Options: Fleiri valkostir
+  Player:
+    Stats:
+      Player Dimensions: 'Stærðir spilara: {width}x{height}'
+      Bitrate: 'Bitahraði: {bitrate} kbps'
+      Resolution: 'Upplausn: {width}x{height}@{frameRate}'
+      Volume: 'Hljóðstyrkur: {volumePercentage}%'
+      Stats: Tölfræði
+      Bandwidth: 'Bandbreidd: {bandwidth} kbps'
+      Buffered: 'Biðminni: {bufferedPercentage}%'
+      CodecsVideoAudio: 'Kóðunarlyklar: {videoCodec} ({videoItag}) / {audioCodec}
+        ({audioItag})'
+      CodecsVideoAudioNoItags: 'Kóðunarlyklar: {videoCodec} / {audioCodec}'
+      Video ID: 'Auðkenni myndskeiðs: {videoId}'
+      Media Formats: 'Snið efnis: {formats}'
+      CodecAudio: 'Kóðunarlykill: {audioCodec} ({audioItag})'
+      Dropped Frames / Total Frames: 'Römmum sleppt: {droppedFrames} / Rammar alls:
+        {totalFrames}'
+    TranslatedCaptionTemplate: '{language} (þýtt úr "{originalLanguage}")'
+    Take Screenshot: Taka skjámynd
+    Hide Stats: Fela tölfræði
+    Show Stats: Birta tölfræði
+    Audio Tracks: Hljóðrásir
+    Full Window: Skjáfylli
+    You appear to be offline: Þú virðist ekki vera með tengingu við netið.
+    Skipped segment: Sleppti {segmentCategory} bút
+    Exit Full Window: Hætta í skjáfylli
+    Playback will resume automatically when your connection comes back: Afspilun heldur
+      sjálfkrafa áfram þegar tenging næst aftur.
+    Exit Theatre Mode: Fara út úr bíóham
+    Theatre Mode: Bíóhamur
+  Unlisted: Óskráð
+  MembersOnly: Ekki er hægt að horfa á myndskeið einungis fyrir meðlimi með FreeTube
+    þar sem þau krefjast innskráningar á Google og greiddu þátttökugjaldi á rás innsendandans.
+  AgeRestricted: Ekki er hægt að horfa á aldurstakmörkuð myndskeið með FreeTube þar
+    sem þau krefjast innskráningar á Google og notkunar á aldursvottuðum YouTube-reikningi.
+  IP block: YouTube hefur útilokað IP-vistfang þitt frá því að horfa á myndskeið.
+    Prófaðu að skipta yfir á annan VPN eða milliþjón.
+  DeArrow:
+    Show Original Details: Birta upprunalegar nánari upplýsingar
+    Show Modified Details: Birta breyttar nánari upplýsingar
 Videos:
   #& Sort By
   Sort By:
@@ -927,9 +952,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Sjá allan spilunarlistann'
-  Videos: 'Myndskeið'
-  View: 'Áhorf'
-  Views: 'Áhorf'
   Last Updated On: 'Síðast uppfært'
 
 # On Video Watch Page
@@ -945,7 +967,8 @@ Playlist:
     VideoTitleDescending: Titill (Ö-A)
     Custom: Sérsniðið
     DateAddedOldest: Elsta bætt við fyrst
-Toggle Theatre Mode: 'Víxla bíóham af/á'
+    VideoDurationAscending: Tímalengd (stysta fyrst)
+    VideoDurationDescending: Tímalengd (lengsta fyrst)
 Change Format:
   Change Media Formats: 'Skipta um myndskeiðasnið'
   Use Dash Formats: 'Nota DASH-skráasnið'
@@ -955,6 +978,8 @@ Change Format:
     þetta myndskeið'
   Audio formats are not available for this video: 'Hljóðskráasnið eru ekki tiltæk
     fyrir þetta myndskeið'
+  Legacy formats are not available for this video: Eldri snið eru ekki tiltæk fyrir
+    þetta myndskeið
 Share:
   Share Video: 'Deila myndskeiði'
   Share Playlist: 'Deila spilunarlista'
@@ -1001,6 +1026,8 @@ Comments:
   View {replyCount} replies: Skoða {replyCount} svör
   Hearted: Líkað
   Subscribed: Áskrifandi
+  There are no comments available for this post: Engar athugasemdir finnast fyrir
+    þessa færslu
 Up Next: 'Næst í spilun'
 
 #Tooltips
@@ -1021,6 +1048,9 @@ Tooltips:
     External Link Handling: "Veldu sjálfgefna hegðun þegar smellt er á tengil sem
       ekki er hægt að opna í FreeTube.\nSjálfgefið mun FreeTube opna viðkomandi tengil
       í sjálfgefna vafranum þínum.\n"
+    Open Deep Links In New Window: Slóðir sem beint er til FreeTube, til dæmis með
+      endurbeiningum vafraviðbóta eða skipanalínuviðföngum, verða opnaðar í nýjum
+      glugga.
   Player Settings:
     Proxy Videos Through Invidious: 'Mun tengjast við Invidious til að miðla myndskeiðum
       í stað þess að tengjast beint við YouTube.'
@@ -1040,14 +1070,14 @@ Tooltips:
     Fetch Feeds from RSS: 'Þegar þetta er virkt, mun FreeTube nota RSS í stað sjálfgefinnar
       aðferðar við að safna streymi áskriftarinnar þinnar. RSS er hraðvirkara og kemur
       í veg fyrir útilokun IP-vistfanga, en nær ekki að birta ákveðnar upplýsingar
-      á borð við tímalengd myndskeiða eða stöðu í beinni útsendingu'
+      á borð við tímalengd myndskeiða, stöðu í beinni útsendingu eða færslur á samfélagsgáttum'
 
 # Toast Messages
     Fetch Automatically: Þegar þetta er virkt, mun FreeTube sækja sjálfkrafa áskriftarstreymin
       þín þegar nýr gluggi er opnaður og þegar skipt er um notkunarsnið.
   External Player Settings:
-    Custom External Player Arguments: Öll sérsniðin skipanaviðföng og rofar, aðskilin
-      með semíkommum (';'), sem beina á til utanaðkomandi spilarans.
+    Custom External Player Arguments: Öll sérsniðin skipanaviðföng og rofar, sem beina
+      á til utanaðkomandi spilarans.
     Ignore Warnings: Hunsa aðvarinir þegar valinn utanaðkomandi spilari styður ekki
       viðkomandi aðgerð (t.d. að snúa við spilunarlista, o.s.frv.).
     Custom External Player Executable: Sjálfgefið gengur FreeTube út frá því að valinn
@@ -1088,7 +1118,6 @@ Falling back to Local API: 'Nota til vara staðvært API-kerfisviðmót'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Þetta
   myndskeiðer ekki tiltækt vegna þess að það vantar skráasnið. Þetta getur gest ef
   þau eru ekki tiltæk í viðkomandi landi.'
-Subscriptions have not yet been implemented: 'Áskriftir eru enn ekki frágengnar'
 Loop is now disabled: 'Endurtekning er núna óvirk'
 Loop is now enabled: 'Endurtekning er núna virk'
 Shuffle is now disabled: 'Stokkun er núna óvirk'
@@ -1106,8 +1135,6 @@ Canceled next video autoplay: 'Hætti við sjálfvirka afspilun næsta myndskei
 
 Yes: 'Já'
 No: 'Nei'
-Hashtags have not yet been implemented, try again later: Ekki er ennþá stuðningur
-  við myllumerki (hashtags), prófaðu aftur síðar
 Unknown YouTube url type, cannot be opened in app: Óþekkt gerð YouTube-slóðar, er
   ekki hægt að opna í forritinu
 Open New Window: Opna í nýjum glugga
@@ -1130,11 +1157,9 @@ Channels:
   Search bar placeholder: Leita í rásum
   Count: '{number} rás/rásir fundust.'
   Empty: Rásalistinn þinn er tómur.
-  Unsubscribed: '{channelName} hefur verið fjarlægð úr áskriftunum þínum'
   Unsubscribe Prompt: Ertu viss um að þú viljir hætta áskrift að "{channelName}"?
   Channels: Rásir
   Title: Rásalisti
-  Unsubscribe: Segja upp áskrift
 Clipboard:
   Copy failed: Afritun á klippispjald mistókst
   Cannot access clipboard without a secure connection: Get ekki tengst klippispjaldi
@@ -1145,6 +1170,7 @@ Chapters:
     núverandi kafli: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Listi yfir kafla falinn,
     núverandi kafli: {chapterName}'
+  Key Moments: Helstu augnablik
 Preferences: Kjörstillingar
 Ok: Í lagi
 Hashtag:
@@ -1185,3 +1211,23 @@ Search Listing:
     4K: 4K
     Subtitles: Skjátextar
     Closed Captions: Þýðingartextar
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Nýtt
+    3D: 3D
+Keys:
+  arrowright: Hægri-ör
+  arrowleft: Vinstri-ör
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Niður-ör
+  arrowup: Upp-ör
+Right-click or hold to see history: Hægri-smelltu til að sjá feril
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Autoplay Interruption Timer: Hætt sjálfvirkri spilun vegna {autoplayInterruptionIntervalHours}
+  klst án aðgerða
+Description:
+  Expand Description: '...meira'
+  Collapse Description: Birta minna
diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index dcac632b8efce..54317d31ede33 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -48,7 +48,7 @@ Global:
     Like Count: 1 mi piace | {count} mi piace
   Input Tags:
     Length Requirement: Il tag deve essere lungo almeno {number} caratteri
-Search / Go to URL: 'Cerca o aggiungi URL YouTube'
+Search / Go to URL: 'Ricerca o aggiungi URL YouTube'
   # In Filter Button
 Search Filters:
   Search Filters: 'Filtri di ricerca'
@@ -102,8 +102,10 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Iscrizioni'
   Latest Subscriptions: 'Ultime iscrizioni'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'L''elenco
-    delle iscrizioni è vuoto. Iscriviti a qualche canale per visualizzare qui i video.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Il
+    tuo elenco di iscrizioni è attualmente vuoto. Se vuoi importare le tue iscrizioni
+    puoi andare su Impostazioni dati e selezionare Importa iscrizioni oppure puoi
+    cercare un canale e iscriverti ad esso.'
   'Getting Subscriptions.  Please wait.': 'Caricamento Iscrizioni. Attendi.'
   Refresh Subscriptions: Ricarica le iscrizioni
   'Getting Subscriptions. Please wait.': Scaricamento delle iscrizioni. Per favore
@@ -131,20 +133,11 @@ Most Popular: 'Più popolari'
 Playlists: 'Playlist'
 User Playlists:
   Your Playlists: 'Le tue playlist'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Non
-    ci sono video salvati. Fai clic sulla stella in alto a destra di un video per
-    aggiungerlo qui
-  Playlist Message: Questa pagina non è rappresentativa di una playlist completa.
-    Mostra solo i video che hai salvato o aggiunto ai preferiti. A lavoro finito,
-    tutti i video che si trovano qui saranno spostati in una playlist preferiti.
-  Search bar placeholder: Cerca nelle playlist
+  Search bar placeholder: Ricerca nelle playlist
   Empty Search Message: Non ci sono video in questa playlist che corrispondono alla
     tua ricerca
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Sei
-    sicuro di voler rimuovere tutti i video guardati da questa playlist? Questa operazione
-    non può essere annullata.
   AddVideoPrompt:
-    Search in Playlists: Cerca nelle playlist
+    Search in Playlists: Ricerca nelle playlist
     Save: Salva
     Toast:
       "{videoCount} video(s) added to {playlistCount} playlists": 1 video aggiunto
@@ -175,7 +168,7 @@ User Playlists:
       Playlist {playlistName} has been deleted.: La playlist {playlistName} è stata
         eliminata.
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: Alcuni
-        video nella playlist non sono ancora stati caricati. Clicca qui per copiare
+        video nella playlist non sono ancora stati caricati. Fai clic qui per copiare
         comunque.
       This playlist does not exist: Questa playlist non esiste
       Playlist name cannot be empty. Please input a name.: Il nome della playlist
@@ -188,7 +181,6 @@ User Playlists:
         il basso.
       This playlist is now used for quick bookmark: Questa playlist è ora usata per
         i segnalibri rapidi
-      Quick bookmark disabled: Segnalibro rapido disabilitato
       Reverted to use {oldPlaylistName} for quick bookmark: Ripristinato l'uso di
         {oldPlaylistName} per i segnalibri rapidi
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Questa
@@ -198,7 +190,10 @@ User Playlists:
         utilizzata per i segnalibri rapidi.
       Playlist {playlistName} is the new quick bookmark playlist.: La playlist {playlistName}
         è la nuova playlist con segnalibri rapidi.
-    Search for Videos: Cerca video
+      This playlist has a video with a duration error: Questa playlist contiene almeno
+        un video che non ha durata; verranno ordinati come se la loro durata fosse
+        zero.
+    Search for Videos: Ricerca nei video
   Are you sure you want to delete this playlist? This cannot be undone: Sei sicuro
     di voler eliminare questa playlist? Questa operazione non può essere annullata.
   Sort By:
@@ -241,7 +236,6 @@ User Playlists:
   Add to Favorites: Aggiungi a {playlistName}
   Remove from Favorites: Rimuovi da {playlistName}
   Enable Quick Bookmark With This Playlist: Abilita segnalibro rapido con questa playlist
-  Disable Quick Bookmark: Disabilita segnalibro rapido
   Playlists with Matching Videos: Playlist con video correlati
   Cannot delete the quick bookmark target playlist.: Impossibile eliminare la playlist
     di destinazione dei segnalibri rapidi.
@@ -255,12 +249,14 @@ User Playlists:
     sicuro di voler rimuovere 1 video guardato da questa playlist? Questa operazione
     non può essere annullata. | Vuoi rimuovere {playlistItemCount} video guardati
     da questa playlist? Questa operazione non può essere annullata.
+  Export Playlist: Esporta questa playlist
+  The playlist has been successfully exported: La playlist è stata esportata correttamente
 History:
   # On History Page
   History: 'Cronologia'
   Watch History: 'Cronologia delle visualizzazioni'
   Your history list is currently empty.: 'La tua cronologia è attualmente vuota.'
-  Search bar placeholder: Cerca nella cronologia
+  Search bar placeholder: Ricerca nella cronologia
   Empty Search Message: Non ci sono video nella tua cronologia che corrispondono alla
     tua ricerca
   Case Sensitive Search: Ricerca con distinzione tra maiuscole e minuscole
@@ -268,7 +264,7 @@ Settings:
   # On Settings Page
   Settings: 'Impostazioni'
   General Settings:
-    General Settings: 'Impostazioni generali'
+    General Settings: 'Generale'
     Fallback to Non-Preferred Backend on Failure: 'Ritorna al backend non preferito
       in caso di errore'
     Enable Search Suggestions: 'Abilita suggerimenti di ricerca'
@@ -290,8 +286,6 @@ Settings:
       End: 'Fine'
       Hidden: Nascoste
       Blur: Sfocatura
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Istanza Invidious
-      (La predefinita è https://invidious.snopyta.org)'
     Region for Trending: 'Regione per le tendenze'
         #! List countries
     Check for Latest Blog Posts: Controlla gli ultimi post del blog
@@ -315,11 +309,12 @@ Settings:
     Auto Load Next Page:
       Label: Carica automaticamente la pagina successiva
       Tooltip: Carica automaticamente pagine e commenti aggiuntivi.
+    Open Deep Links In New Window: Apri URL passati a FreeTube in una nuova finestra
   Theme Settings:
-    Theme Settings: 'Impostazioni del tema'
+    Theme Settings: 'Tema'
     Match Top Bar with Main Color: 'Abbina la barra superiore al colore principale'
     Base Theme:
-      Base Theme: 'Tema'
+      Base Theme: 'Tema di base'
       Black: 'Nero'
       Dark: 'Scuro'
       Light: 'Chiaro'
@@ -331,6 +326,8 @@ Settings:
       Nordic: Nordico
       Solarized Dark: Solarizzato scuro
       Solarized Light: Solarizzato chiaro
+      Gruvbox Light: Gruvbox chiaro
+      Gruvbox Dark: Gruvbox scuro
     Main Color Theme:
       Main Color Theme: 'Colore principale del tema'
       Red: 'Rosso'
@@ -339,7 +336,7 @@ Settings:
       Deep Purple: 'Viola scuro'
       Indigo: 'Indaco'
       Blue: 'Blu'
-      Light Blue: 'Azzurro'
+      Light Blue: 'Blu chiaro'
       Cyan: 'Ciano'
       Teal: 'Verde acqua'
       Green: 'Verde'
@@ -378,6 +375,16 @@ Settings:
       Solarized Cyan: Solarizzato ciano
       Solarized Green: Solarizzato verde
       Solarized Blue: Solarizzato blu
+      Gruvbox Dark Yellow: Gruvbox giallo scuro
+      Gruvbox Dark Purple: Gruvbox viola scuro
+      Gruvbox Light Blue: Gruvbox blu chiaro
+      Gruvbox Light Purple: Gruvbox viola chiaro
+      Gruvbox Light Orange: Gruvbox arancione chiaro
+      Gruvbox Dark Aqua: Gruvbox acqua marina scuro
+      Gruvbox Dark Green: Gruvbox verde scuro
+      Gruvbox Dark Blue: Gruvbox blu scuro
+      Gruvbox Light Red: Gruvbox rosso chiaro
+      Gruvbox Dark Orange: Gruvbox arancione scuro
     Secondary Color Theme: 'Colore secondario del tema'
         #* Main Color Theme
     UI Scale: Dimensioni dell'interfaccia utente
@@ -386,7 +393,7 @@ Settings:
     Hide Side Bar Labels: Nascondi le etichette della barra laterale
     Hide FreeTube Header Logo: Nascondi il logo dell'intestazione di FreeTube
   Player Settings:
-    Player Settings: 'Impostazioni del lettore'
+    Player Settings: 'Lettore'
     Play Next Video: 'Riproduci il prossimo video'
     Turn on Subtitles by Default: 'Abilita i sottotitoli per impostazione predefinita'
     Autoplay Videos: 'Riproduci i video automaticamente'
@@ -414,7 +421,7 @@ Settings:
       8k: '8k'
     Playlist Next Video Interval: Intervallo video successivo nella playlist
     Fast-Forward / Rewind Interval: Avanzamento veloce o riavvolgimento video
-    Next Video Interval: Prossimo intervallo video
+    Next Video Interval: Timer di conto alla rovescia per la riproduzione automatica
     Display Play Button In Video Player: Visualizza il pulsante di riproduzione nel
       lettore video
     Scroll Volume Over Video Player: Controlla il volume scorrendo sul lettore video
@@ -439,8 +446,9 @@ Settings:
         del video 3 cifre. %i ID video. Puoi anche usare \ o / per creare sottocartelle.
     Enter Fullscreen on Display Rotate: Entra a schermo intero su Ruota schermo
     Skip by Scrolling Over Video Player: Salta tramite scorrimento sul lettore video
+    Autoplay Interruption Timer: Timer di interruzione della riproduzione automatica
   Privacy Settings:
-    Privacy Settings: 'Impostazioni della privacy'
+    Privacy Settings: 'Privacy'
     Remember History: 'Salva la cronologia'
     Save Watched Progress: 'Salva i progressi raggiunti'
     Clear Search Cache: 'Svuota la cache della ricerca'
@@ -462,47 +470,15 @@ Settings:
     Are you sure you want to remove all your playlists?: Sei sicuro di voler rimuovere
       tutte le tue playlist?
   Subscription Settings:
-    Subscription Settings: 'Impostazioni delle iscrizioni'
+    Subscription Settings: 'Iscrizioni'
     Hide Videos on Watch: 'Nascondi i video visualizzati'
-    Subscriptions Export Format:
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Gestisci le iscrizioni'
-    Import Subscriptions: 'Importa Iscrizioni'
-    Export Subscriptions: 'Esporta Iscrizioni'
-    How do I import my subscriptions?: 'Come importo le mie iscrizioni?'
     Fetch Feeds from RSS: Scarica gli aggiornamenti dai flussi RSS
     Fetch Automatically: Recupera i feed automaticamente
-    Only Show Latest Video for Each Channel: Mostra solo il video più recente per
-      ciascun canale
     Confirm Before Unsubscribing: Evita la cancellazione accidentale dell'iscrizione
-  Advanced Settings:
-    Advanced Settings: 'Impostazioni Avanzate'
-    Enable Debug Mode (Prints data to the console): 'Abilità modalità Sviluppatore
-      (log nella console)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Indirizzo Proxy (Esempio:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Cliccare
-      "PROVA PROXY" manderà una richiesta a https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Usa Tor / Proxy per chiamate API'
-    TEST PROXY: 'PROVA PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Vedi Istanze Pubbliche'
-    Clear History:
-      Clear History: 'Pulisci Cronologia'
-      # On Click
-      Are you sure you want to delete your history?: 'Sei sicuro di voler eliminare
-        la cronologia?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Pulisci Iscrizioni'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Sei sicuro di voler rimuovere
-        tutte le iscrizioni?'
-      #& Yes
-      #& No
 
+    'Limit the number of videos displayed for each channel': Limita il numero di video
+      visualizzati per ogni canale
+    To: A
   Data Settings:
     How do I import my subscriptions?: Come posso importare le mie iscrizioni?
     Unknown data key: Chiave dati sconosciuta
@@ -533,13 +509,9 @@ Settings:
     Export YouTube: Esporta per YouTube
     Export FreeTube: Esporta per FreeTube
     Export Subscriptions: Esporta le iscrizioni
-    Import NewPipe: Importa da NewPipe
-    Import YouTube: Importa da YouTube
-    Import FreeTube: Importa da FreeTube
     Select Export Type: Seleziona il tipo di esportazione
     Select Import Type: Seleziona il tipo di importazione
-    Data Settings: Impostazioni dei dati
-    Check for Legacy Subscriptions: Controlla le iscrizioni obsolete
+    Data Settings: Dati
     Manage Subscriptions: Gestisci i profili
     Import Playlists: Importa playlist
     Export Playlists: Esporta playlist
@@ -567,7 +539,7 @@ Settings:
     Hide Comment Likes: Nascondi Mi piace dai commenti
     Hide Channel Subscribers: Nascondi il numero di iscritti
     Hide Video Views: Nascondi le visualizzazioni dei video
-    Distraction Free Settings: Impostazioni della modalità senza distrazioni
+    Distraction Free Settings: Modalità senza distrazioni
     Hide Live Chat: Nascondi la chat dal vivo
     Hide Video Likes And Dislikes: Nascondi Mi piace e Non mi piace
     Hide Active Subscriptions: Nascondi le iscrizioni attive
@@ -583,22 +555,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Visualizza i titoli senza maiuscole
       e punteggiatura eccessive
     Hide Featured Channels: Nascondi i canali in evidenza
-    Hide Channel Playlists: Nascondi le playlist del canale
-    Hide Channel Community: Nascondi la comunità del canale
-    Hide Channel Shorts: Nascondi i video brevi del canale
+    Hide Channel Playlists: Nascondi la scheda "Playlist" del canale
+    Hide Channel Community: Nascondi la scheda "Comunità" del canale
+    Hide Channel Shorts: Nascondi i "Video brevi" del canale
     Sections:
       General: Generale
       Watch Page: Pagina di visualizzazione
       Side Bar: Barra laterale
       Channel Page: Pagina del canale
       Subscriptions Page: Pagina delle iscrizioni
-    Hide Channel Podcasts: Nascondi i podcast del canale
-    Hide Channel Releases: Nascondi i rilasci del canale
+    Hide Channel Podcasts: Nascondi la scheda "Podcast" del canale
+    Hide Channel Releases: Nascondi la scheda "Rilasci" del canale
     Hide Subscriptions Live: Nascondi le iscrizioni dal vivo
     Hide Subscriptions Videos: Nascondi i video delle iscrizioni
     Hide Subscriptions Shorts: Nascondi le iscrizioni ai video brevi
     Hide Profile Pictures in Comments: Nascondi le immagini del profilo nei commenti
-    Blur Thumbnails: Miniature sfocate
     Hide Subscriptions Community: Nascondi la comunità di iscritti
     Hide Channels Invalid: L'ID canale fornito non è valido
     Hide Channels Disabled Message: Alcuni canali sono stati bloccati usando l'ID
@@ -611,13 +582,15 @@ Settings:
       il testo
     Hide Videos and Playlists Containing Text Placeholder: Parola, frammento di parola
       o frase
+    Hide Channel Home: Nascondi la scheda "Pagina iniziale" del canale
+    Show Added Items: Mostra elementi aggiunti
   The app needs to restart for changes to take effect. Restart and apply change?: L'app
     deve essere riavviata affinché le modifiche abbiano effetto. Riavviare e applicare
     la modifica?
   Proxy Settings:
     Proxy Protocol: Protocollo Proxy
     Enable Tor / Proxy: Attiva Tor o Proxy
-    Proxy Settings: Impostazioni del proxy
+    Proxy Settings: Proxy
     Error getting network information. Is your proxy configured properly?: C'è stato
       un errore di acquisizione delle informazioni di rete. Il proxy è stato configurato
       correttamente?
@@ -627,17 +600,22 @@ Settings:
     Ip: Ip
     Your Info: Le tue informazioni
     Test Proxy: Testa proxy
-    Clicking on Test Proxy will send a request to: Cliccando su Testa proxy verrà
+    Clicking on Test Proxy will send a request to: Facendo clic su Testa proxy verrà
       inviata una richiesta a
     Proxy Port Number: Numero di porta del proxy
     Proxy Host: Host del proxy
+    Proxy Warning: FreeTube non ha un proxy integrato ma può connettersi a un proxy
+      esterno, come uno in esecuzione sul tuo computer come Tor o un proxy esterno
+      come un proxy SOCKS5 fornito da alcune VPN. Se abilitato, assicurati che il
+      tuo proxy/Tor sia configurato correttamente, altrimenti FreeTube non sarà in
+      grado di recuperare alcun dato.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notifica quando un segmento sponsor viene
       saltato
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL dell'API di
       SponsorBlock (l'impostazione predefinita è https://sponsor.ajay.app)
     Enable SponsorBlock: Abilita SponsorBlock
-    SponsorBlock Settings: Impostazioni di SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Salta l'opzione
       Show In Seek Bar: Mostra nella barra di ricerca
@@ -654,13 +632,13 @@ Settings:
     Custom External Player Executable: File eseguibile del lettore esterno personalizzato
     Ignore Unsupported Action Warnings: Ignora avvisi per azioni non supportate
     External Player: Lettore esterno
-    External Player Settings: Impostazioni del lettore esterno
+    External Player Settings: Lettore esterno
     Players:
       None:
         Name: Nessuno
     Ignore Default Arguments: Ignora argomenti predefiniti
   Download Settings:
-    Download Settings: Impostazioni dei download
+    Download Settings: Download
     Ask Download Path: Chiedi il percorso di download
     Choose Path: Scegli percorso
     Download Behavior: Comportamento download
@@ -668,12 +646,12 @@ Settings:
     Download in app: Download nell'app
   Parental Control Settings:
     Hide Unsubscribe Button: Nascondi il pulsante Annulla iscrizione
-    Parental Control Settings: Impostazioni del controllo parentale
+    Parental Control Settings: Controllo genitori
     Show Family Friendly Only: Mostra Solo per famiglie
     Hide Search Bar: Nascondi la barra di ricerca
   Experimental Settings:
     Replace HTTP Cache: Sostituisci la cache HTTP
-    Experimental Settings: Impostazioni sperimentali
+    Experimental Settings: Sperimentale
     Warning: Queste Impostazioni sono sperimentali, causano arresti anomali se abilitate.
       Si consiglia prima di fare un backup. Usare a proprio rischio!
   Password Dialog:
@@ -683,43 +661,16 @@ Settings:
     Unlock: Sblocca
   Password Settings:
     Set Password: Imposta password
-    Password Settings: Impostazioni password
+    Password Settings: Password
     Set Password To Prevent Access: Imposta una password per impedire l'accesso alle
       Impostazioni
     Remove Password: Rimuovi password
-  Expand All Settings Sections: Espandi tutte le sezioni delle Impostazioni
   Sort Settings Sections (A-Z): Ordina le sezioni delle Impostazioni (A-Z)
+  Return to Settings Menu: Torna al menu Impostazioni
 About:
   #On About page
   About: 'Informazioni'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Questo
-    software è rilasciato con licenza gratuita AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Hai trovato un problema? Vuoi suggerire nuove funzionalità? Vuoi dare una mano?
-    Controlla la nostra pagina GitHub. Accettiamo volentieri pull request.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Grazie
-    mille alle persone e ai progetti che rendono FreeTube possibile!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Vuoi
-    chattare? Entra nel nostro server Element / Matrix. Per favore, leggi il regolamento
-    prima di entrare.'
-
-  'Looking for help? Check out our Wiki page.': 'Cerchi aiuto? Dai un’occhiata alla
-    nostra pagina Wiki.'
-
-  Check out our Firefox extension!: 'Dai un’occhiata alla nostra estensione Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Se
-    ti piace FreeTube, prendi in considerazione di donare con Liberapay o al nostro
-    indirizzo Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Ultime Notizie di Freetube'
-
 #On Channel Page
   Donate: Dona
   Blog: Blog
@@ -742,8 +693,6 @@ About:
   Website: Sito web
   Please check for duplicates before posting: Controlla se ci sono duplicati prima
     di pubblicare
-  View License: Vedi licenza
-  Licensed under the AGPLv3: Distribuito sotto la licenza AGPLv3
   Source code: Codice sorgente
   Beta: Beta
   Discussions: Discussioni
@@ -752,7 +701,7 @@ About:
 Channel:
   Subscribe: 'Iscriviti'
   Unsubscribe: 'Disiscriviti'
-  Search Channel: 'Cerca nel canale'
+  Search Channel: 'Ricerca nel canale'
   Your search results have returned 0 results: 'La tua ricerca ha prodotto 0 risultati'
   Sort By: 'Ordina per'
   Videos:
@@ -776,7 +725,7 @@ Channel:
     Channel Description: 'Descrizione canale'
     Featured Channels: 'Canali in evidenza'
     Tags:
-      Search for: Cerca "{tag}"
+      Search for: Ricerca "{tag}"
       Tags: Etichette
     Details: Dettagli
     Joined: Iscrizione
@@ -818,6 +767,9 @@ Channel:
     Releases: Rilasci
     This channel does not currently have any releases: Questo canale non ha attualmente
       alcun rilascio
+  Home:
+    Home: Pagina iniziale
+    View Playlist: Visualizza la playlist
 Video:
   Mark As Watched: 'Contrassegna come guardato'
   Remove From History: 'Rimuovi dalla cronologia'
@@ -847,38 +799,8 @@ Video:
     chat dal vivo non è attualmente supportata con le API di Invidious. È necessaria
     una connessione diretta a YouTube.'
   Published:
-    Jan: 'Gen'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Mag'
-    Jun: 'Giu'
-    Jul: 'Lug'
-    Aug: 'Ago'
-    Sep: 'Set'
-    Oct: 'Ott'
-    Nov: 'Nov'
-    Dec: 'Dic'
-    Second: 'Secondo'
-    Seconds: 'Secondi'
-    Hour: 'Ora'
-    Hours: 'Ore'
-    Day: 'Giorno'
-    Days: 'Giorni'
-    Week: 'Settimana'
-    Weeks: 'Settimane'
-    Month: 'Mese'
-    Months: 'Mesi'
-    Year: 'Anno'
-    Years: 'Anni'
-    Ago: 'Fa'
-    Upcoming: 'Première il'
-    Minutes: Minuti
-    Minute: Minuto
-    Less than a minute: Meno di un minuto
     In less than a minute: In meno di un minuto
   Published on: 'Pubblicato il'
-  Publicationtemplate: '{number} {unit} fa'
 #& Videos
   Play Previous Video: Riproduci il video precedente
   Play Next Video: Riproduci il prossimo video
@@ -967,6 +889,18 @@ Video:
     Playback will resume automatically when your connection comes back: La riproduzione
       riprenderà automaticamente quando verrà ripristinata la connessione.
     Skipped segment: Segmento {segmentCategory} saltato
+  IP block: YouTube ha bloccato il tuo indirizzo IP impedendogli di guardare i video.
+    Prova a passare a una VPN o a un proxy diverso.
+  Unlisted: Non elencato
+  MembersOnly: I video riservati agli abbonati non possono essere guardati con FreeTube,
+    poiché richiedono l'accesso a Google e l'iscrizione a pagamento al canale dell'utente
+    che li ha caricati.
+  AgeRestricted: I video con limiti di età non possono essere guardati con FreeTube
+    poiché richiedono l'accesso a Google e l'utilizzo di un account YouTube con età
+    verificata.
+  DeArrow:
+    Show Original Details: Mostra dettagli originali
+    Show Modified Details: Mostra dettagli modificati
 Videos:
   #& Sort By
   Sort By:
@@ -977,9 +911,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Guarda playlist completa'
-  Videos: 'Video'
-  View: 'Visualizzazione'
-  Views: 'Visualizzazioni'
   Last Updated On: 'Ultimo aggiornamento il'
 
 # On Video Watch Page
@@ -995,7 +926,8 @@ Playlist:
     DateAddedNewest: Prima gli aggiunti più nuovi
     DateAddedOldest: Prima gli aggiunti più vecchi
     VideoTitleAscending: Titolo (A-Z)
-Toggle Theatre Mode: 'Attiva/disattiva la modalità teatro'
+    VideoDurationAscending: Durata (prima la più breve)
+    VideoDurationDescending: Durata (prima la più lunga)
 Change Format:
   Change Media Formats: 'Cambia formato video'
   Use Dash Formats: 'Usa i formati DASH'
@@ -1029,7 +961,7 @@ Share:
 Mini Player: 'Mini visualizzatore'
 Comments:
   Comments: 'Commenti'
-  Click to View Comments: 'Clicca per vedere i commenti'
+  Click to View Comments: 'Fai clic per vedere i commenti'
   Getting comment replies, please wait: 'Sto scaricando le risposte ai commenti, per
     favore attendi'
   Show Comments: 'Mostra i commenti'
@@ -1060,12 +992,10 @@ Comments:
 Up Next: 'Prossimi video'
 
 # Toast Messages
-Local API Error (Click to copy): 'Errore API Locale (Clicca per copiare)'
-Invidious API Error (Click to copy): 'Errore API Invidious (Clicca per copiare)'
+Local API Error (Click to copy): 'Errore API locale (fai clic per copiare)'
+Invidious API Error (Click to copy): 'Errore API Invidious (fai clic per copiare)'
 Falling back to Invidious API: 'Torno alle API Invidious'
 Falling back to Local API: 'Torno alle API locali'
-Subscriptions have not yet been implemented: 'Le Iscrizioni non sono ancora state
-  implementate'
 Loop is now disabled: 'Il loop è ora disabilitato'
 Loop is now enabled: 'Il loop è ora abilitato'
 Shuffle is now disabled: 'La riproduzione casuale è disabilitata'
@@ -1079,9 +1009,9 @@ Canceled next video autoplay: 'Riproduzione automatica del prossimo video annull
 Yes: 'Sì'
 No: 'No'
 A new blog is now available, {blogTitle}. Click to view more: 'Un nuovo blog è ora
-  disponibile, {blogTitle}. Clicca per saperne di più'
+  disponibile, {blogTitle}. Fai clic per saperne di più'
 Version {versionNumber} is now available!  Click for more details: La versione {versionNumber}
-  è ora disponibile! Clicca per maggiori dettagli
+  è ora disponibile! Fai clic per maggiori dettagli
 Download From Site: Scarica dal sito
 The playlist has been reversed: La playlist è stata invertita
 Profile:
@@ -1126,7 +1056,7 @@ Profile:
   All Channels: Tutti i canali
   Profile Select: Seleziona il profilo
   Profile Filter: Filtro del profilo
-  Profile Settings: Impostazioni dei profili
+  Profile Settings: Profilo
   Toggle Profile List: Attiva/disattiva elenco profili
   Open Profile Dropdown: Apri il menu a discesa del profilo
   Close Profile Dropdown: Chiudi il menu a discesa del profilo
@@ -1147,9 +1077,9 @@ Tooltips:
     Scroll Playback Rate Over Video Player: Mentre il cursore è sopra il video, tieni
       premuto il tasto CTRL (Command su Mac) e scorri la rotella del mouse in avanti
       o indietro per controllare la velocità di riproduzione. Tieni premuto il tasto
-      CTRL (Command su Mac) e clicca con il tasto sinistro del mouse per tornare rapidamente
-      alla velocità di riproduzione predefinita (1x a meno che non sia stata cambiata
-      nelle Impostazioni).
+      CTRL (Command su Mac) e fai clic con il tasto sinistro del mouse per tornare
+      rapidamente alla velocità di riproduzione predefinita (1x a meno che non sia
+      stata cambiata nelle Impostazioni).
     Skip by Scrolling Over Video Player: Usa la rotella di scorrimento per saltare
       il video, in stile MPV.
   Subscription Settings:
@@ -1174,11 +1104,14 @@ Tooltips:
     External Link Handling: "Scegli il comportamento predefinito quando si fa clic
       su un link che non può essere aperto in FreeTube.\nPer impostazione predefinita,
       FreeTube aprirà il link cliccato nel browser predefinito.\n"
+    Open Deep Links In New Window: Gli URL passati a FreeTube, ad esempio tramite
+      estensioni del browser di reindirizzamento o argomenti della riga di comando,
+      vengono aperti in una nuova finestra.
   External Player Settings:
     Ignore Warnings: Non notifica gli avvisi quando il lettore esterno selezionato
       non supporta l'azione richiesta (ad esempio invertire la playlist, etc.).
     Custom External Player Arguments: Invia al lettore esterno qualsiasi argomento
-      personalizzato dalla linea di comando, separato da punto e virgola (';').
+      personalizzato dalla linea di comando.
     Custom External Player Executable: Per impostazione predefinita, FreeTube imposta
       il lettore esterno scelto tramite la variabile d'ambiente PATH. Se necessario,
       un percorso personalizzato può essere impostato qui.
@@ -1208,18 +1141,16 @@ Tooltips:
     UseDeArrowTitles: Sostituisci i titoli dei video coi titoli inviati dagli utenti
       di DeArrow.
     UseDeArrowThumbnails: Sostituisci le miniature dei video con le miniature di DeArrow.
-Playing Next Video Interval: Riproduzione del video successivo tra un attimo. Clicca
-  per annullare. | Riproduzione del video successivo tra {nextVideoInterval} secondi.
-  Clicca per annullare. | Riproduzione del video successivo tra {nextVideoInterval}
-  secondi. Clicca per annullare.
+Playing Next Video Interval: Riproduzione del video successivo tra un attimo. Fai
+  clic per annullare. | Riproduzione del video successivo tra {nextVideoInterval}
+  secondi. Fai clic per annullare. | Riproduzione del video successivo tra {nextVideoInterval}
+  secondi. Fai clic per annullare.
 More: Altro
 Open New Window: Apri una nuova finestra
 Default Invidious instance has been cleared: L'istanza predefinita di Invidious è
   stata cancellata
 Default Invidious instance has been set to {instance}: L'istanza predefinita di Invidious
   è stata impostata a {instance}
-Hashtags have not yet been implemented, try again later: Gli hashtag non sono ancora
-  stati implementati, riprova più tardi
 Unknown YouTube url type, cannot be opened in app: Tipo di URL di YouTube sconosciuto,
   non può essere aperto nell'app
 Search Bar:
@@ -1234,14 +1165,12 @@ Screenshot Success: Screenshot salvato come "{filePath}"
 Screenshot Error: Screenshot non riuscito. {error}
 New Window: Nuova finestra
 Channels:
-  Unsubscribed: '{channelName} è stato rimosso dalle tue iscrizioni'
   Title: Elenco canali
   Channels: Canali
-  Search bar placeholder: Cerca canali
+  Search bar placeholder: Ricerca canali
   Count: '{number} canale/i trovato/i.'
   Empty: L'elenco dei tuoi canali è attualmente vuoto.
   Unsubscribe Prompt: Sei sicuro di voler annullare l'iscrizione a "{channelName}"?
-  Unsubscribe: Annulla l'iscrizione
 Clipboard:
   Cannot access clipboard without a secure connection: Impossibile accedere agli appunti
     senza una connessione sicura
@@ -1252,6 +1181,7 @@ Chapters:
     capitolo corrente: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Elenco capitoli nascosto,
     capitolo corrente: {chapterName}'
+  Key Moments: Momenti chiave
 Preferences: Preferenze
 Ok: OK
 Hashtag:
@@ -1288,5 +1218,26 @@ Search Listing:
     4K: 4K
     Closed Captions: Sottotitoli per non udenti
     Subtitles: Sottotitoli
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Nuovo
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Apertura di URL potenzialmente non sicura
   bloccata: "{url}".'
+shortcutJoinOperator: +
+Keys:
+  ctrl: Ctrl
+  arrowdown: Freccia giù
+  arrowleft: Freccia sinistra
+  arrowright: Freccia destra
+  arrowup: Freccia su
+  alt: Alt
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Right-click or hold to see history: Fai clic con il tasto destro o tieni premuto per
+  visualizzare la cronologia
+Autoplay Interruption Timer: Riproduzione automatica annullata a causa di {autoplayInterruptionIntervalHours}
+  ore di inattività
+Description:
+  Expand Description: '...di più'
+  Collapse Description: Mostra meno
diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml
index 0fc9fe86a799a..9bb728a19eab0 100644
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@@ -98,7 +98,7 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: '登録チャンネル'
   Latest Subscriptions: '最新の登録'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '登録チャンネルリストは空です。チャンネル登録をするとこちらに表示されます。'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '登録チャンネルリストは現在空です。登録チャンネルをインポートするには、設定からデータの設定に移動して登録チャンネルをインポートするか、チャンネルを検索して登録することができます。'
   'Getting Subscriptions.  Please wait.': '登録を取得中。お待ちください...'
   Refresh Subscriptions: 登録チャンネルの更新
   Getting Subscriptions. Please wait.: 登録チャンネルの内容を取得中。しばらくお待ちください。
@@ -119,14 +119,11 @@ Trending:
   Movies: 映画
   Gaming: ゲーム
   Music: 音楽
-  Default: 既定
+  Default: デフォルト
 Most Popular: '人気'
 Playlists: '再生リスト'
 User Playlists:
   Your Playlists: 'あなたの再生リスト'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 保存した動画はありません。一覧に表示させるには、ビデオの角にある保存ボタンをクリックします
-  Playlist Message: 
-    このページは完全に機能する再生リストを反映していません。保存した動画やお気に入りの動画のみが表示されます。作業が完了すると、現在ここにあるすべての動画は「Favorites」の再生リストに移行されます。
   Search bar placeholder: 再生リストの検索
   Empty Search Message: この再生リストに、検索に一致する動画はありません
   This playlist currently has no videos.: 現在、この再生リストには動画がありません。
@@ -157,7 +154,6 @@ User Playlists:
       This video cannot be moved up.: この動画は上に移動できません.
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: 再生リスト内のすべての動画が読み込まれていません。とにかくコピーするにはここをクリック。
       There was an issue with updating this playlist.: この再生リストの更新に問題が発生しました。
-      Quick bookmark disabled: クイックブックマークは無効です
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: この再生リストは、{oldPlaylistName}
         の代わりにクイックブックマークとして使用されるようになりました。元に戻すにはここをクリック
       Video has been removed: 動画は削除されました
@@ -174,6 +170,8 @@ User Playlists:
       This playlist is already being used for quick bookmark.: この再生リストはすでにクイックブックマークとして使用されています。
       Playlist {playlistName} is the new quick bookmark playlist.: 再生リスト {playlistName}
         が新しいクイックブックマーク再生リストです。
+      This playlist has a video with a duration error: このプレイリストには、再生時間のない動画が少なくとも
+        1 つ含まれています。これらの動画は、再生時間が 0 であるかのように並べられます。
     Search for Videos: 動画検索
   Save Changes: 変更の保存
   Move Video Up: 動画を上へ移動
@@ -182,9 +180,7 @@ User Playlists:
   Add to Playlist: 再生リストに追加
   Delete Playlist: 再生リストの削除
   Cancel: キャンセル
-  Disable Quick Bookmark: クイック ブックマークを無効にする
   Are you sure you want to delete this playlist? This cannot be undone: この再生リストを削除してもいいですか？復元は不可能です。
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: 再生リストから再生済みの動画を削除してもいいですか？復元は不可能です。
   You have no playlists. Click on the create new playlist button to create a new one.: 再生リストがありません。新しい再生リストを作成するには、「新しい再生リストの作成」ボタンをクリックしてください。
   AddVideoPrompt:
     "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
@@ -219,6 +215,8 @@ User Playlists:
   Remove Duplicate Videos: 重複した動画を削除
   Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: この再生リストから視聴済みの動画を1本削除してもよろしいですか？この操作は元に戻せません。
     | この再生リストから視聴済みの {playlistItemCount} 本の動画を削除してもよろしいですか？この操作は元に戻せません。
+  The playlist has been successfully exported: 再生リストのエクスポートに成功しました
+  Export Playlist: この再生リストをエクスポート
 History:
   # On History Page
   History: '履歴'
@@ -231,7 +229,7 @@ Settings:
   # On Settings Page
   Settings: '設定'
   General Settings:
-    General Settings: '一般設定'
+    General Settings: '一般'
     Fallback to Non-Preferred Backend on Failure: 'データ取得の問題発生時には取得方法を自動変更'
     Enable Search Suggestions: '検索候補の有効化'
     Default Landing Page: '起動時の表示'
@@ -252,8 +250,6 @@ Settings:
       End: '最後'
       Hidden: 非表示
       Blur: ぼかし
-    'Invidious Instance (Default is https://invidious.snopyta.org)': '接続先の Invidious
-      サーバー（初期値は https://invidious.snopyta.org）'
     Region for Trending: '急上昇の地域設定'
         #! List countries
     Check for Latest Blog Posts: 新着ブログの確認
@@ -275,8 +271,9 @@ Settings:
     Auto Load Next Page:
       Label: 次のページを自動で読み込む
       Tooltip: 追加のページやコメント欄の続きを自動的に読み込みます。
+    Open Deep Links In New Window: FreeTube に渡された URL を新しいウィンドウで開く
   Theme Settings:
-    Theme Settings: 'テーマの設定'
+    Theme Settings: 'テーマ'
     Match Top Bar with Main Color: '上部のバーをメインカラーに合わせる'
     Base Theme:
       Base Theme: 'テーマの選択'
@@ -291,6 +288,8 @@ Settings:
       Nordic: ノルディック
       Solarized Dark: ソラライズド・ダーク
       Solarized Light: ソラライズド・ライト
+      Gruvbox Dark: Gruvbox ダーク
+      Gruvbox Light: Gruvbox ライト
     Main Color Theme:
       Main Color Theme: 'テーマのメイン カラー'
       Red: '赤'
@@ -338,6 +337,16 @@ Settings:
       Solarized Cyan: ソラライズド・シアン
       Solarized Green: ソラライズド・グリーン
       Solarized Blue: ソラライズド・ブルー
+      Gruvbox Dark Green: Gruvbox ダークグリーン
+      Gruvbox Dark Blue: Gruvbox ダークブルー
+      Gruvbox Dark Aqua: Gruvbox ダークアクア
+      Gruvbox Light Red: Gruvbox ライトレッド
+      Gruvbox Light Blue: Gruvbox ライトブルー
+      Gruvbox Light Purple: Gruvbox ライトパープル
+      Gruvbox Dark Orange: Gruvbox ダークオレンジ
+      Gruvbox Dark Yellow: Gruvbox ダークイエロー
+      Gruvbox Dark Purple: Gruvbox ダークパープル
+      Gruvbox Light Orange: Gruvbox ライトオレンジ
     Secondary Color Theme: 'テーマのアクセント カラー'
         #* Main Color Theme
     UI Scale: UIの拡大率
@@ -346,8 +355,7 @@ Settings:
     Hide Side Bar Labels: サイドバー ラベルの非表示
     Hide FreeTube Header Logo: FreeTube ヘッダー ロゴの非表示
   Player Settings:
-    Player Settings: 'プレーヤーの設定'
-    Remember History: '履歴を記憶'
+    Player Settings: 'プレーヤー'
     Play Next Video: '次の動画の自動再生'
     Turn on Subtitles by Default: 'デフォルトで字幕を有効にする'
     Autoplay Videos: '動画の自動再生'
@@ -396,45 +404,15 @@ Settings:
       Folder Button: フォルダの選択
     Enter Fullscreen on Display Rotate: 画面の回転時に全画面表示にする
     Skip by Scrolling Over Video Player: 動画プレーヤーをスクロールして動画をスキップ
+    Autoplay Interruption Timer: 自動再生の停止タイマー
   Subscription Settings:
-    Subscription Settings: '登録チャンネルの設定'
+    Subscription Settings: '登録チャンネル'
     Hide Videos on Watch: '視聴済みの動画を非表示にする'
-    Subscriptions Export Format:
-      Subscriptions Export Format: '登録のエクスポート形式'
-      #& Freetube
-      Newpipe: 'NewPipe'
-      OPML: 'OPML'
-    Manage Subscriptions: '登録の管理'
-    Import Subscriptions: '登録のインポート'
-    Export Subscriptions: '登録のエクスポート'
-    How do I import my subscriptions?: 'どうやってインポートするのですか？'
     Fetch Feeds from RSS: RSS から情報取得
     Fetch Automatically: フィードの自動取得
     Confirm Before Unsubscribing: 登録解除する前に確認画面を表示する
-    Only Show Latest Video for Each Channel: 各チャンネルの最新動画のみを表示する
-  Advanced Settings:
-    Advanced Settings: '詳細設定'
-    Enable Debug Mode (Prints data to the console): 'デバッグ モードの有効化（コンソールにデータ出力）'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'プロキシーのアドレス（例：SOCKS5://127.0.0.1:9050）'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '「プロキシーのテスト」ボタンをクリックすると、https://ipinfo.io/json
-      へリクエストを送信します'
-    Use Tor / Proxy for API calls: 'API 呼び出しに Tor/Proxy を使用'
-    TEST PROXY: 'プロキシーのテスト'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: '公開インスタンスを参照'
-    Clear History:
-      Clear History: '履歴の削除'
-      # On Click
-      Are you sure you want to delete your history?: '履歴を削除しますか？'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: '登録の削除'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'すべての登録チャンネルを削除しますか？'
-      #& Yes
-      #& No
-
+    'Limit the number of videos displayed for each channel': 各チャンネルに表示する動画の数を制限する
+    To: 上限
   Privacy Settings:
     Save Watched Progress: 再生位置の保存
     Remember History: 履歴の保存
@@ -444,7 +422,7 @@ Settings:
     Search cache has been cleared: 検索キャッシュを削除しました
     Are you sure you want to clear out your search cache?: 検索キャッシュを削除しますか？
     Clear Search Cache: 検索キャッシュの削除
-    Privacy Settings: プライバシーの設定
+    Privacy Settings: プライバシー
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: すべての登録チャンネルとプロファイルを削除しますか？元に戻せません。
     Remove All Subscriptions / Profiles: 登録とプロファイルをすべて削除
     Save Watched Videos With Last Viewed Playlist: 視聴済み動画を最後に見た再生リストと共に保存する
@@ -471,15 +449,11 @@ Settings:
     Export NewPipe: NewPipe エクスポート
     Export YouTube: YouTube エクスポート
     Export FreeTube: FreeTube エクスポート
-    Import YouTube: YouTube インポート
-    Import NewPipe: NewPipe インポート
-    Import FreeTube: FreeTube インポート
     Export Subscriptions: 登録チャンネルのエクスポート
     Import Subscriptions: 登録チャンネルのインポート
     Select Export Type: エクスポート形式の選択
     Select Import Type: インポート形式の選択
-    Data Settings: データの設定
-    Check for Legacy Subscriptions: 旧型式の登録チャンネルの確認
+    Data Settings: データ
     Manage Subscriptions: 登録チャンネルの管理
     Playlist insufficient data: 再生リスト「{playlist}」のデータが不十分なため、項目をスキップします
     All playlists has been successfully imported: すべての再生リストが正常にインポートされました
@@ -503,7 +477,7 @@ Settings:
     Hide Channel Subscribers: チャンネル登録者数の非表示
     Hide Video Views: 再生数の非表示
     Hide Video Likes And Dislikes: 評価の非表示
-    Distraction Free Settings: 集中モードの設定
+    Distraction Free Settings: 集中モード
     Hide Active Subscriptions: 登録チャンネルの非表示
     Hide Playlists: 再生リストの非表示
     Hide Video Description: 動画概要欄の非表示
@@ -515,8 +489,8 @@ Settings:
     Hide Channels: チャンネルから動画を非表示にする
     Hide Channels Placeholder: チャンネル ID
     Display Titles Without Excessive Capitalisation: 過剰な大文字や句読点のないタイトルの表示
-    Hide Channel Playlists: チャンネル再生リストの非表示
-    Hide Channel Community: チャンネルコミュニティの非表示
+    Hide Channel Playlists: チャンネルの「再生リスト」タブを隠す
+    Hide Channel Community: チャンネルの「コミュニティ」タブを隠す
     Sections:
       Side Bar: サイドバー
       Channel Page: チャンネル ページ
@@ -524,14 +498,13 @@ Settings:
       General: 一般
       Subscriptions Page: 登録チャンネル ページ
     Hide Featured Channels: おすすめチャンネルの非表示
-    Hide Channel Shorts: ショート動画チャンネルの非表示
-    Hide Channel Podcasts: ポッドキャスト チャンネルの非表示
+    Hide Channel Shorts: チャンネルの「ショート動画」タブを隠す
+    Hide Channel Podcasts: チャンネルの「ポッドキャスト」タブを隠す
     Hide Subscriptions Shorts: 登録チャンネルのショート動画の非表示
     Hide Subscriptions Live: 登録チャンネルのライブ配信の非表示
     Hide Subscriptions Videos: 登録チャンネルの動画の非表示
-    Hide Channel Releases: チャンネルの新着情報の非表示
+    Hide Channel Releases: チャンネルの「新着情報」タブを隠す
     Hide Profile Pictures in Comments: コメント欄のプロフィール写真を隠す
-    Blur Thumbnails: サムネイルをぼかす
     Hide Subscriptions Community: 登録チャンネルのコミュニティの非表示
     Hide Channels Invalid: 提供されたチャンネル ID が無効です
     Hide Channels Disabled Message: 一部のチャンネルが ID を使用してブロックされ、処理されませんでした。これらの ID が更新されている間、機能はブロックされます
@@ -539,6 +512,7 @@ Settings:
     Hide Channels API Error: 指定されたIDのユーザーを検索する際にエラーが発生しました。IDが正しいかもう一度確認してください。
     Hide Videos and Playlists Containing Text Placeholder: 単語、単語の一部、またはフレーズ
     Hide Videos and Playlists Containing Text: 特定のテキストを含む動画と再生リストを非表示にする
+    Hide Channel Home: チャンネルの「ホーム」タブを隠す
   The app needs to restart for changes to take effect. Restart and apply change?: 変更の反映には、アプリの再起動が必要です。再起動して変更を適用しますか？
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: ネットワーク情報の取得中にエラーが発生しました。プロキシーを正しく設定してますか?
@@ -553,13 +527,16 @@ Settings:
     Proxy Host: プロキシのホスト
     Proxy Protocol: プロキシのプロトコル
     Enable Tor / Proxy: Tor / プロキシの有効化
-    Proxy Settings: プロキシの設定
+    Proxy Settings: プロキシ
+    Proxy Warning: FreeTube にはプロキシは内蔵されていませんが、Tor のようなご使用のマシン上で動作するものや、一部の VPN が提供する
+      SOCKS5 プロキシのような外部プロキシに接続することができます。有効にした場合は、プロキシ/Tor が適切に設定されていることを確認してください。そうでないと、FreeTube
+      はデータを取得できなくなります。
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: スポンサーセグメントがスキップされたときに通知する
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': スポンサーブロック APIのURL（デフォルト
       https://sponsor.ajay.app）
     Enable SponsorBlock: スポンサーブロックの有効化
-    SponsorBlock Settings: スポンサーブロックの設定
+    SponsorBlock Settings: スポンサーブロック
     Skip Options:
       Skip Option: スキップの設定
       Auto Skip: 自動スキップ
@@ -576,13 +553,13 @@ Settings:
     Custom External Player Executable: カスタム外部プレーヤーの実行可能ファイル
     Ignore Unsupported Action Warnings: 未対応のアクションの警告を無視
     External Player: 外部プレーヤー
-    External Player Settings: 外部プレーヤーの設定
+    External Player Settings: 外部プレーヤー
     Players:
       None:
         Name: なし
     Ignore Default Arguments: デフォルト引数を無視する
   Download Settings:
-    Download Settings: ダウンロードの設定
+    Download Settings: ダウンロード
     Ask Download Path: ダウンロードパスを尋ねる
     Choose Path: パスの選択
     Download Behavior: ダウンロードの処理方法
@@ -590,16 +567,16 @@ Settings:
     Download in app: アプリでダウンロード
   Parental Control Settings:
     Hide Search Bar: 検索バーの非表示
-    Parental Control Settings: 制限付きモードの設定
+    Parental Control Settings: 制限付きモード
     Show Family Friendly Only: ファミリー向けのみ表示
     Hide Unsubscribe Button: 登録解除ボタンの非表示
   Experimental Settings:
     Replace HTTP Cache: HTTP キャッシュの置換
-    Experimental Settings: 実験中の設定
+    Experimental Settings: 試験的
     Warning: 
       これらの設定は実験的なものであり、有効にするとアプリのクラッシュを引き起こす恐れがあります。バックアップをとっておくことを強くお勧めします。自己責任で使用してください！
   Password Settings:
-    Password Settings: パスワードの設定
+    Password Settings: パスワード
     Set Password To Prevent Access: 設定にアクセスするためのパスワードの設定
     Set Password: パスワードの設定
     Remove Password: パスワードの削除
@@ -609,34 +586,11 @@ Settings:
     Password: パスワード
     Unlock: ロック解除
   Sort Settings Sections (A-Z): 設定項目の並べ替え（A-Z）
-  Expand All Settings Sections: 全ての設定項目を展開する
+  Return to Settings Menu: 設定に戻る
 About:
   #On About page
   About: '概要'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'このコピーレフトのソフトウェアは、AGPL-3.0
-    の自由なライセンスです。'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    バグの報告や機能要望、サポートが必要であれば、私たちの GitHub をご覧ください。プルリクエストも歓迎します。
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'FreeTube
-    の実現のために努力している人々とプロジェクトに感謝します！'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'チャットが必要であれば私たちの
-    Element / Matrix に参加してください。参加前にルールの確認をお願いします。'
-
-  'Looking for help? Check out our Wiki page.': 'ヘルプが必要なら私たちの Wiki をご覧ください。'
-
-  Check out our Firefox extension!: 'Firefox 拡張機能をご覧ください！'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'FreeTube
-    をお楽しみの方は、Liberapay か Bitcoin アドレスを通じて寄付をお願いします。'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'FreeTube 新着情報'
-
 #On Channel Page
   Donate: 寄付
   FreeTube is made possible by: FreeTube が実現できているのは
@@ -658,8 +612,6 @@ About:
   Help: ヘルプ
   GitHub releases: GitHub リリース
   Downloads / Changelog: ダウンロード / 変更ログ
-  View License: ライセンスの表示
-  Licensed under the AGPLv3: AGPLv3 の下でライセンス供与
   Source code: ソースコード
   Beta: ベータ
   Discussions: 議論
@@ -723,6 +675,9 @@ Channel:
   Podcasts:
     This channel does not currently have any podcasts: このチャンネルにはポッドキャストがありません
     Podcasts: ポッドキャスト
+  Home:
+    View Playlist: 再生リストを表示
+    Home: ホーム
 Video:
   Open in YouTube: 'YouTube で表示'
   Copy YouTube Link: 'YouTube リンクのコピー'
@@ -743,38 +698,8 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': '現在、ライブチャットは
     Invidious API では未対応です。直接 YouTube への接続が必要です。'
   Published:
-    Jan: '1 月'
-    Feb: '2 月'
-    Mar: '3 月'
-    Apr: '4 月'
-    May: '5 月'
-    Jun: '6 月'
-    Jul: '7 月'
-    Aug: '8 月'
-    Sep: '9 月'
-    Oct: '10 月'
-    Nov: '11 月'
-    Dec: '12 月'
-    Second: '秒'
-    Seconds: '秒'
-    Hour: '時間'
-    Hours: '時間'
-    Day: '日'
-    Days: '日'
-    Week: '週間'
-    Weeks: '週間'
-    Month: 'ヶ月'
-    Months: 'ヶ月'
-    Year: '年'
-    Years: '年'
-    Ago: '前'
-    Upcoming: 'プレミア公開'
-    Minutes: 分
-    Minute: 分
-    Less than a minute: 1分以内
-    In less than a minute: 1 分以内に
+    In less than a minute: 1 分以内
   Published on: '公開日'
-  Publicationtemplate: '{number} {unit} 前'
 #& Videos
   Video has been removed from your history: 動画を履歴から削除しました
   Remove From History: 履歴から削除
@@ -814,7 +739,7 @@ Video:
       looping playlists: 再生リストのループ
       shuffling playlists: シャッフル再生リスト
       reversing playlists: 再生リストを反転させる
-      opening specific video in a playlist (falling back to opening the video): 再生リストで特定のビデオを開く
+      opening specific video in a playlist (falling back to opening the video): 再生リストで特定の動画を開く
         (ビデオを開く前にフォールバック)
       opening playlists: 再生リストを開く
       setting a playback rate: 再生レートの設定
@@ -861,6 +786,14 @@ Video:
     Hide Stats: 統計を隠す
     Take Screenshot: スクリーンショットを撮る
     Show Stats: 統計を表示
+  IP block: YouTube はあなたのIPアドレスからの動画視聴をブロックしました。別の VPN またはプロキシに切り替えてみてください。
+  Unlisted: 限定公開
+  MembersOnly: メンバー限定動画は Google にログインし、投稿チャンネルに課金する必要があるので FreeTube から直接見ることはできません。
+  AgeRestricted: 年齢制限がかかっている 動画 は Google にログインしておりかつ年齢確認を済ましている YouTube アカウントが必要なため、FreeTube
+    から直接見ることはできません。
+  DeArrow:
+    Show Original Details: 元の情報を表示
+    Show Modified Details: 変更された詳細を表示
 Videos:
   #& Sort By
   Sort By:
@@ -871,9 +804,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '完全な再生リストの表示'
-  Videos: '本の動画'
-  View: '回視聴'
-  Views: '回視聴'
   Last Updated On: '最終更新日'
 
 # On Video Watch Page
@@ -889,7 +819,8 @@ Playlist:
     AuthorDescending: 著者名（Z-A）
     VideoTitleAscending: タイトル（A-Z）
     Sort By: 並び替え
-Toggle Theatre Mode: 'シアターモードの切替'
+    VideoDurationAscending: 再生時間（短い順）
+    VideoDurationDescending: 再生時間（長い順）
 Change Format:
   Change Media Formats: '動画形式の変更'
   Use Dash Formats: 'DASH 形式の使用'
@@ -949,7 +880,6 @@ Local API Error (Click to copy): '内部 API エラー（クリックしてコ
 Invidious API Error (Click to copy): 'Invidious API エラー（クリックしてコピー）'
 Falling back to Invidious API: '代替の Invidious API に切替'
 Falling back to Local API: '代替の内部 API に切替'
-Subscriptions have not yet been implemented: '登録チャンネルは未実装です'
 Loop is now disabled: 'ループ再生を無効にしました'
 Loop is now enabled: 'ループ再生を有効にしました'
 Shuffle is now disabled: 'シャッフル再生を無効にしました'
@@ -998,7 +928,7 @@ Profile:
     same channels will be deleted in any profile they are found in.
   : これはあなたのメインのプロファイルです。選択したチャンネルを本当に削除しますか？同じチャンネルがほかのプロファイルにも登録されていれば削除されます。
   Profile Filter: プロファイルのフィルター
-  Profile Settings: プロファイルの設定
+  Profile Settings: プロファイル
   Toggle Profile List: プロファイル一覧の切替
   Create Profile Name: プロファイル名を作成
   Profile Name: プロファイル名
@@ -1033,8 +963,9 @@ Tooltips:
     Region for Trending: 急上昇の地域設定では、急上昇動画を表示する国を選択できます。
     External Link Handling: "FreeTube で開けないリンクをクリックしたときのデフォルトの動作を選択します。\nデフォルトでは、FreeTube
       はクリックしたリンクをデフォルトのブラウザで開きます。\n"
+    Open Deep Links In New Window: FreeTube に渡された URL は、ブラウザの拡張機能やコマンドライン引数などによって、新しいウィンドウで開かれます。
   External Player Settings:
-    Custom External Player Arguments: '";"、セミコロンで区切られたカスタム コマンド ライン引数を外部プレーヤーに渡します。'
+    Custom External Player Arguments: '外部プレイヤーに渡したいカスタムコマンドライン引数。'
     Ignore Warnings: 現在の外部プレーヤーが、現在のアクションに未対応の場合（再生リストを逆順にするなど）に警告を抑制します。
     Custom External Player Executable: デフォルトでは、FreeTube は選択した外部プレーヤーが PATH 環境変数を介して見つかると想定します。必要に応じて、カスタム
       パスをここで設定できます。
@@ -1058,7 +989,6 @@ Tooltips:
 Playing Next Video Interval: すぐに次の動画を再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval}
   秒で再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval} 秒で再生します。クリックするとキャンセル。
 More: もっと見る
-Hashtags have not yet been implemented, try again later: ハッシュタグは未実装です。実装後に実行してください
 Unknown YouTube url type, cannot be opened in app: 不明な YouTube URL タイプのため、アプリで開くことができません
 Open New Window: 新しいウィンドウを開く
 Default Invidious instance has been cleared: デフォルトの Invidious インスタンスがクリアされました
@@ -1072,8 +1002,6 @@ Downloading has completed: '"{videoTitle}" のダウンロードが完了しま
 Downloading failed: '"{videoTitle}" のダウンロード中に問題が発生しました'
 Channels:
   Channels: チャンネル
-  Unsubscribe: 登録解除
-  Unsubscribed: '「{channelName} 」のチャンネル登録を解除しました'
   Title: チャンネル一覧
   Search bar placeholder: チャンネル検索
   Unsubscribe Prompt: 「{channelName}」のチャンネル登録を解除しますか？
@@ -1091,6 +1019,7 @@ Chapters:
     {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'チャプター リストを非表示、現在のチャプター：
     {chapterName}'
+  Key Moments: ハイライト
 Preferences: 環境設定
 Ok: オーケー
 Hashtag:
@@ -1112,6 +1041,11 @@ Search Listing:
     4K: 4K
     Subtitles: 字幕
     Closed Captions: クローズドキャプション
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: 最新
+    3D: 3D
 Yes, Delete: はい、削除します
 Yes, Restart: はい、再起動します
 Yes, Open Link: はい、リンクを開きます
@@ -1125,3 +1059,17 @@ Trimmed input must be at least N characters long: トリミングされた入力
   | トリミングされた入力は少なくとも {length} 文字以上でなければなりません
 'Blocked opening potentially unsafe URL': '安全でない可能性のあるURLをブロックしました： "{url}"。'
 Display Label: '{label}：{value}'
+KeyboardShortcutTemplate: '{label} （{shortcut}）'
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: 下矢印
+  arrowleft: 左矢印
+  arrowright: 右矢印
+  arrowup: 上矢印
+Right-click or hold to see history: 右クリックまたは長押しで 履歴 を表示
+Autoplay Interruption Timer: '{autoplayInterruptionIntervalHours} 時間の無操作状態が続いたため、自動再生をキャンセルしました'
+Description:
+  Expand Description: '...もっと見る'
+  Collapse Description: 表示を減らす
diff --git a/static/locales/ka.yaml b/static/locales/ka.yaml
index 3cee0eeade543..9f030969a3569 100644
--- a/static/locales/ka.yaml
+++ b/static/locales/ka.yaml
@@ -99,8 +99,6 @@ Channels:
   Search bar placeholder: 'არხების ძიება'
   Count: 'ნაპოვნია {number} არხი.'
   Empty: 'თქვენი არხების სია ამჟამად ცარიელია.'
-  Unsubscribe: 'გამოწერის გაუქმება'
-  Unsubscribed: '{channelName} წაიშალა თქვენი გამოწერებიდან'
   Unsubscribe Prompt: 'დარწმუნებული ხართ, რომ გსურთ "{channelName}"ის გამოწერის გაუქმება?'
 Trending:
   Trending: 'პოპულარული'
@@ -113,13 +111,6 @@ Most Popular: 'ყველაზე პოპულარული'
 Playlists: 'დასაკრავი სიები'
 User Playlists:
   Your Playlists: 'თქვენი დასაკრავი სიები'
-  Playlist Message: 'ეს გვერდი არ ასახავს სრულად მოქმედ დასაკრავ სიებს. აქ მხოლოდ
-    ჩამოთვლილი იქნება ვიდეოები, რომლებიც თქვენ გაქვთ შენახული ან დამატებული გაქვთ
-    რჩეულებში. როდესაც მუშაობა დასრულდება, ყველა აქ ჩამოთვლილი ვიდეო გადაინაცვლებს
-    „რჩეულების“ დასაკრავ სიაში.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'თქვენი
-    შენახული ვიდეოები ცარიელია. დააჭირეთ ღილაკს შენახვა ვიდეოს კუთხეში, რათა ის აქ
-    გამოჩნდეს'
   Empty Search Message: 'ამ დასაკრავ სიაში თქვენი ძიების შესაბამისი ვიდეოები არ არის'
   Search bar placeholder: 'დასაკრავ სიაში ძიება'
 History:
diff --git a/static/locales/ko.yaml b/static/locales/ko.yaml
index 37d10467d5aca..48594bba59ce7 100644
--- a/static/locales/ko.yaml
+++ b/static/locales/ko.yaml
@@ -105,10 +105,6 @@ Most Popular: '인기 동영상'
 Playlists: '재생 목록'
 User Playlists:
   Your Playlists: '나의 재생 목록'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 재생
-    목록이 없습니다. 영상의 오른쪽 아래에 있는 저장 버튼을 사용하여 재생 목록에 영상을 추가하세요
-  Playlist Message: 지금 보시는 페이지는 완전한 플레이 리스트가 아닙니다. 이곳에는 저장되었거나 즐겨 찾기 표시가 된 항목만 표시
-    됩니다. 작업이 끝나면, 여기에 표시된 영상들은 '즐겨 찾기' 항목으로 옮겨집니다.
   Search bar placeholder: 재생 목록에서 검색
   Empty Search Message: 이 재생 목록에 검색과 일치하는 동영상이 없습니다
 History:
@@ -145,8 +141,6 @@ Settings:
       Beginning: '시작장면'
       Middle: '중간장면'
       End: '마지막장면'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
-      (기본설정은 https://invidious.snopyta.org)'
     Region for Trending: '트렌드 국가'
         #! List countries
     View all Invidious instance information: Indivious 서버의 전체 목록 보기
@@ -287,7 +281,6 @@ Settings:
     Subscription Settings: '구독 설정'
     Hide Videos on Watch: '시청한 동영상 숨기기'
     Fetch Feeds from RSS: 'RSS에서 피드 가져오기'
-    Manage Subscriptions: '구독 관리'
     Fetch Automatically: 자동으로 피드 수집하기
   Distraction Free Settings:
     Distraction Free Settings: '방해받지 않는 모드 설정'
@@ -315,10 +308,6 @@ Settings:
     Select Import Type: '가져오기 유형 선택'
     Select Export Type: '내보내기 유형 선택'
     Import Subscriptions: '구독 목록 가져오기'
-    Import FreeTube: 'FreeTube 가져오기'
-    Import YouTube: 'YouTube 가져오기'
-    Import NewPipe: 'NewPipe 가져오기'
-    Check for Legacy Subscriptions: '레거시 구독 확인'
     Export Subscriptions: '구독 목록 내보내기'
     Export FreeTube: 'FreeTube 내보내기'
     Export YouTube: 'YouTube 내보내기'
@@ -349,7 +338,6 @@ Settings:
     Subscription File: 구독 정보 파일
     Playlist File: 재생목록 파일
     History File: 시청기록 파일
-  Advanced Settings: {}
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: 네트워크 정보를
       가져오는 중 오류가 발생했습니다. 프록시가 올바르게 구성되어 있습니까?
@@ -438,8 +426,6 @@ About:
   Help: 도움말
   GitHub releases: GitHub 릴리스
   Downloads / Changelog: 다운로드 / 변경 로그
-  View License: 라이센스 보기
-  Licensed under the AGPLv3: AGPLv3에 따라 라이센스가 부여됨
   Source code: 소스 코드
   Beta: 베타
 Profile:
@@ -483,8 +469,6 @@ Profile:
   Profile Filter: 프로필 필터
   Profile Settings: 프로필 설정
 Channel:
-  Subscriber: '구독자'
-  Subscribers: '구독자'
   Subscribe: '구독'
   Unsubscribe: '구독 취소'
   Channel has been removed from your subscriptions: '채널이 구독에서 제거되었습니다'
@@ -550,39 +534,10 @@ Video:
   video only: '비디오만'
   audio only: '오디오만'
   Published:
-    Jan: '1월'
-    Feb: '2월'
-    Mar: '3월'
-    Apr: '4월'
-    May: '5월'
-    Jun: '6월'
-    Jul: '7월'
-    Aug: '8월'
-    Sep: '9월'
-    Oct: '10월'
-    Nov: '11월'
-    Dec: '12월'
-    Second: '초'
-    Seconds: '초'
-    Minute: '분'
-    Minutes: '분'
-    Hour: '시'
-    Hours: '시'
-    Day: '일'
-    Days: '일'
-    Week: '주'
-    Weeks: '주'
-    Month: '월'
-    Months: '월'
-    Year: '년'
-    Years: '년'
-    Ago: '전에'
-    Upcoming: '초연일'
     In less than a minute: 1분 이내에
   Published on: '게시일'
   Streamed on: '스트리밍됨'
   Started streaming on: '스트리밍 시작'
-  Publicationtemplate: '{number} {unit} 전'
 #& Videos
   Video has been saved: 동영상이 저장되었습니다
   Video has been removed from your saved list: 저장된 목록에서 동영상이 제거되었습니다
@@ -626,16 +581,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '전체 재생 목록 보기'
-  Videos: '비디오'
-  View: '보기'
-  Views: '보기'
   Last Updated On: '마지막 업데이트 날짜'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: 재생 목록
-Toggle Theatre Mode: '극장 모드 전환'
 Change Format:
   Change Media Formats: '비디오 형식 변경'
   Use Dash Formats: 'DASH 형식 사용'
@@ -732,7 +683,6 @@ Falling back to Invidious API: 'Invidious API로 대체'
 Falling back to Local API: '로컬 API로 대체'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: '이
   동영상은 형식이 누락되어 사용할 수 없습니다. 이는 국가를 사용할 수 없기 때문에 발생할 수 있습니다.'
-Subscriptions have not yet been implemented: '구독이 아직 구현되지 않았습니다'
 Loop is now disabled: '반복이 비활성화되었습니다'
 Loop is now enabled: '반복이 활성화되었습니다'
 Shuffle is now disabled: '셔플이 비활성화되었습니다'
@@ -749,8 +699,6 @@ No: '아니오'
 More: 더 보기
 Unknown YouTube url type, cannot be opened in app: 알 수 없는 YouTube URL 유형, 앱에서 열 수
   없음
-Hashtags have not yet been implemented, try again later: 해시태그가 아직 구현되지 않았습니다. 나중에
-  다시 시도하세요
 Playing Next Video Interval: 즉시 다음 동영상을 재생합니다. 취소하려면 클릭하세요. | {nextVideoInterval}초
   후에 다음 동영상을 재생합니다. 취소하려면 클릭하세요. | {nextVideoInterval}초 후에 다음 동영상을 재생합니다. 취소하려면 클릭하세요.
 Default Invidious instance has been set to {instance}: 기본 Invidious 인스턴스가 {instance}로
@@ -768,10 +716,8 @@ Channels:
   Title: 채널 목록
   Search bar placeholder: 채널 검색
   Empty: 채널 목록이 비어 있습니다.
-  Unsubscribe: 구독 취소
   Unsubscribe Prompt: '"{channelName}"에서 구독을 취소하시겠습니까?'
   Count: '{number} 채널이 발견되었습니다.'
-  Unsubscribed: '{channelName} 구독에서 제거되었습니다'
 Downloading has completed: '"{videoTitle}" 다운로드가 완료되었습니다'
 Starting download: '"{videoTitle}" 다운로드를 시작하는 중'
 Downloading failed: '"{videoTitle}"를 다운로드하는 동안 문제가 발생했습니다'
diff --git a/static/locales/ku.yaml b/static/locales/ku.yaml
index a0278df86c552..07e42cbd116cc 100644
--- a/static/locales/ku.yaml
+++ b/static/locales/ku.yaml
@@ -89,11 +89,6 @@ Most Popular: 'بەناوبانگترین'
 Playlists: 'پلەیلیست'
 User Playlists:
   Your Playlists: 'پلیەلیستەکانت'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ڤیدیۆ
-    سەڤکراوەکانت بەتاڵن. کلیک لە دوگمەی سەیڤ کە لە سووچی ڤیدیۆیەک بۆ ئەوەی لێرە لیستکرێت
-  Playlist Message: ئەم پەیجە شێوەی کۆتایی پلەیلیستەکە دەرناخات. تەنها ڤیدیۆت پیشان
-    دەدات کە سیڤت کردووە یان فەیڤرتت کردووە. کاتێک کارەکە تەواو بووە، گشت ئەم ڤیدیۆیانەی
-    لێرەدان دەبرێنە لیستی 'فەیڤرتەکان'.
 History:
   # On History Page
   History: 'مێژوو'
@@ -117,7 +112,6 @@ Settings:
     Unknown data key: 'کلیلی داتای نەناسراو'
     How do I import my subscriptions?: 'چۆن بەشدارییەکانم داخڵ بکەم؟'
     Manage Subscriptions: بەشدارییەکانت رێکبخە
-  Advanced Settings: {}
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: کێشە لە
       وەرگرتنی زانیاری نێتۆرک. ئایە پرۆکسێکەت بە رێکوپێکی رێکخراوە؟
@@ -160,8 +154,6 @@ About:
   Help: یارمەتی
   GitHub releases: GitHub دەرچونەکانی
   Downloads / Changelog: دابەزاندنەکان / لیستی گۆڕانکاری
-  View License: قەیدەکە پیشاندە
-  Licensed under the AGPLv3: AGPLv3 دەرکراوە لەژیر
   Source code: سەرچاوەی کۆد
   Beta: تاقیکارییە
 Profile:
diff --git a/static/locales/la.yaml b/static/locales/la.yaml
index e4b20b5a28e35..66fdd19f25421 100644
--- a/static/locales/la.yaml
+++ b/static/locales/la.yaml
@@ -87,9 +87,6 @@ Most Popular: 'Maxime Popular'
 Playlists: 'Album ludere'
 User Playlists:
   Your Playlists: 'Album Ludere Vestra'
-  Playlist Message: Haec pagina est a plene reflective opus playlists. Is solum album
-    et conservi videos quod favorited. Ubi consummatum opus est, omnia hic Move Imaginibus
-    commodum migravit ad "Favorites" Album Ludere.
 History:
   # On History Page
   History: 'Historiam'
@@ -121,8 +118,6 @@ Settings:
       Beginning: 'Initium'
       Middle: 'Medium'
       End: 'Finis'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious nusquam
-      esset (Iusto est https://invidious.snopyta.org)'
     Region for Trending: 'ad usum inclinanatus regionem'
         #! List countries
   Theme Settings:
@@ -155,7 +150,6 @@ Settings:
       Dracula Red: 'Dracula Ruber'
       Dracula Yellow: 'Dracula Flavum'
   Player Settings: {}
-  Advanced Settings: {}
 Channel:
   Videos: {}
   Playlists: {}
diff --git a/static/locales/lt.yaml b/static/locales/lt.yaml
index 7ed2beb644efb..8290b04ce3d2e 100644
--- a/static/locales/lt.yaml
+++ b/static/locales/lt.yaml
@@ -115,13 +115,6 @@ Most Popular: 'Populiariausia'
 Playlists: 'Grojaraščiai'
 User Playlists:
   Your Playlists: 'Tavo grojaraščiai'
-  Playlist Message: 'Šis puslapis neatspindi visiškai veikiančių grojaraščių. Jame
-    pateikiami tik vaizdo įrašai, kuriuos išsaugojote arba įtraukėte į adresyną. Kai
-    darbas bus baigtas, visi šiuo metu čia esantys vaizdo įrašai bus perkelti į „Mėgiamiausi“
-    grojaraštį.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Jūsų
-    išsaugotų vaizdo įrašų skiltis tuščia. Spustelėkite vaizdo įrašo kampe esantį
-    išsaugojimo mygtuką, kad jis būtų pateikiamas čia'
   Empty Search Message: Šiame grojaraštyje nėra vaizdo įrašų, kurie atitiktų jūsų
     paiešką
   Search bar placeholder: Ieškoti grojaraštyje
@@ -162,8 +155,6 @@ Settings:
       Beginning: 'Vaizdo įrašo pradžia'
       Middle: 'Vaizdo įrašo vidurys'
       End: 'Vaizdo įrašo pabaiga'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
-      (Numatytoji yra https://invidious.snopyta.org)'
     View all Invidious instance information: 'Žiūrėti visą Invidious perdavimo šaltinio
       informaciją'
     Region for Trending: '„Dabar populiaru“ regionas'
@@ -322,7 +313,6 @@ Settings:
     Subscription Settings: 'Prenumeratų nustatymai'
     Hide Videos on Watch: 'Slėpti vaizdo įrašus po peržiūros'
     Fetch Feeds from RSS: 'Gauti kanalus iš RSS'
-    Manage Subscriptions: 'Valdyti prenumeratas'
     Fetch Automatically: Gauti sklaidos kanalą automatiškai
   Distraction Free Settings:
     Distraction Free Settings: 'Blaškančių elementų nustatymai'
@@ -360,10 +350,6 @@ Settings:
     Select Import Type: 'Pasirinkti importavimo tipą'
     Select Export Type: 'Pasirinkti eksportavimo tipą'
     Import Subscriptions: 'Importuoti prenumeratas'
-    Import FreeTube: 'Importuoti FreeTube'
-    Import YouTube: 'Importuot YouTube'
-    Import NewPipe: 'Importuoti NewPipe'
-    Check for Legacy Subscriptions: 'Patikrinti, ar nėra Senojo formato prenumeratų'
     Export Subscriptions: 'Eksportuoti prenumeratas'
     Export FreeTube: 'Eksportuoti FreeTube'
     Export YouTube: 'Eksportuoti YouTube'
@@ -458,8 +444,6 @@ About:
   About: 'Apie'
   Beta: 'Beta'
   Source code: 'Pirminis kodas'
-  Licensed under the AGPLv3: 'Licencijuota pagal AGPLv3'
-  View License: 'Žiūrėti licenciją'
   Downloads / Changelog: 'Atsisiuntimai / pakeitimų žurnalas'
   GitHub releases: 'Versijos GitHub'
   Help: 'Pagalba'
@@ -525,8 +509,6 @@ Profile:
 #On Channel Page
   Profile Settings: Profilio nustatymai
 Channel:
-  Subscriber: 'Prenumeratorius'
-  Subscribers: 'Prenumeratoriai'
   Subscribe: 'Prenumeruoti'
   Unsubscribe: 'Atšaukti prenumeratą'
   Channel has been removed from your subscriptions: 'Kanalas pašalintas iš jūsų prenumeratų'
@@ -604,39 +586,10 @@ Video:
   video only: 'tik video'
   audio only: 'tik audio'
   Published:
-    Jan: 'Sau'
-    Feb: 'Vas'
-    Mar: 'Kov'
-    Apr: 'Bal'
-    May: 'Geg'
-    Jun: 'Bir'
-    Jul: 'Lie'
-    Aug: 'Rug'
-    Sep: 'Rgs'
-    Oct: 'Spa'
-    Nov: 'Lap'
-    Dec: 'Gru'
-    Second: 'Sekundė'
-    Seconds: 'Sekundės'
-    Minute: 'Minutė'
-    Minutes: 'Minutės'
-    Hour: 'val.'
-    Hours: 'val.'
-    Day: 'd.'
-    Days: 'd.'
-    Week: 'sav.'
-    Weeks: 'sav.'
-    Month: 'mėn.'
-    Months: 'mėn.'
-    Year: 'm.'
-    Years: 'm.'
-    Ago: 'atgal'
-    Upcoming: 'premjera'
     In less than a minute: prieš mažiau nei minutę
   Published on: 'Publikuota'
   Streamed on: 'Transliuota'
   Started streaming on: 'Transliaciją pradėjo'
-  Publicationtemplate: 'prieš {number} {unit}'
   Sponsor Block category:
     sponsor: 'Rėmėjas'
     intro: 'Įžanga'
@@ -674,16 +627,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Peržiūrėti visą grojaraštį'
-  Videos: 'Vaizdo įrašai'
-  View: 'Žiūrėti'
-  Views: 'Peržiūros'
   Last Updated On: 'Paskutinį kartą atnaujinta'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Grojaraštis
-Toggle Theatre Mode: 'Įjungti teatro rėžimą'
 Change Format:
   Change Media Formats: 'Keisti vaizdo įrašo formatus'
   Use Dash Formats: 'Naudoti DASH formatus'
@@ -780,8 +729,7 @@ Tooltips:
     Ignore Warnings: 'Neatvaizduoti įspėjimų, kai dabartinis išorinis grotuvas nepalaiko
       dabartinio veiksmo (pvz., grojaraščių atkūrimas ir kt.).'
     Custom External Player Arguments: 'Bet kokius pasirinktinius komandinės eilutės
-      argumentus, atskirtus kabliataškiais ('';''), kuriuos norite perduoti išoriniam
-      grotuvui.'
+      argumentus, kuriuos norite perduoti išoriniam grotuvui.'
     DefaultCustomArgumentsTemplate: '(Numatytasis: „{defaultCustomArguments}“)'
   Subscription Settings:
     Fetch Feeds from RSS: 'Kai bus įgalinta, „FreeTube“ naudos RSS, o ne numatytąjį
@@ -804,11 +752,8 @@ Falling back to Local API: 'Grįžtama prie vietinio API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Šis
   vaizdo įrašas nepasiekiamas, nes trūksta formatų. Tai gali nutikti dėl to, kad šalis
   yra nepasiekiama.'
-Subscriptions have not yet been implemented: 'Prenumeratos dar nėra įgyvendintos'
 Unknown YouTube url type, cannot be opened in app: 'Nežinomas YouTube URL tipas, nėra
   galimybės jo atidaryti programoje'
-Hashtags have not yet been implemented, try again later: 'Grotažymės dar neveikia,
-  bandykite dar kartą vėliau'
 Loop is now disabled: 'Sukimas ciklu išjungtas'
 Loop is now enabled: 'Sukimas ciklu dabar įjungtas'
 Shuffle is now disabled: 'Maišymas dabar išjungtas'
@@ -842,8 +787,6 @@ Channels:
   Search bar placeholder: Ieškoti kanalų
   Count: rastas (-i) {number} kanalas (-ai).
   Empty: Jūsų kanalų sąrašas šiuo metu tuščias.
-  Unsubscribe: Atšaukti prenumeratą
-  Unsubscribed: '{channelName} buvo pašalintas iš jūsų prenumeratų'
   Unsubscribe Prompt: Ar tikrai norite atšaukti {channelName} prenumeratą?
 Downloading has completed: „{videoTitle}“ atsisiuntimas baigtas
 Starting download: Pradedamas „{videoTitle}“ atsisiuntimas
diff --git a/static/locales/lv.yaml b/static/locales/lv.yaml
index 42d4b3a67a3b3..510a878cda8be 100644
--- a/static/locales/lv.yaml
+++ b/static/locales/lv.yaml
@@ -1,7 +1,8 @@
 # Put the name of your locale in the same language
 Locale Name: 'Latviešu'
 # Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >
+'This part of the app is not ready yet. Come back later when progress has been made.': >-
+  Šī aplikācijas sadaļa vēl nav gatava. Atnāc vēlāk, kad būs veikti uzlabojumi.
 
 # Webkit Menu Bar
 File: 'Datne'
@@ -30,10 +31,13 @@ Back: 'Atpakaļ'
 Forward: 'Uz priekšu'
 Open New Window: 'Atvērt jaunu logu'
 
-Version {versionNumber} is now available!  Click for more details: ''
+Version {versionNumber} is now available!  Click for more details: 'Versija {versionNumber}
+  tagad ir pieejama!  Spied, lai skatītu detaļas'
 Download From Site: 'Lejuplādēt no vietnes'
-A new blog is now available, {blogTitle}. Click to view more: ''
-Are you sure you want to open this link?: ''
+A new blog is now available, {blogTitle}. Click to view more: 'Jauns emuāra ieraksts
+  ir pieejams, {blogTitle}. Spied, lai skatītu vairāk'
+Are you sure you want to open this link?: 'Vai esi pārliecināts, ka vēlies atvērt
+  šo saiti?'
 
 # Global
 # Anything shared among components / views should be put here
@@ -43,21 +47,25 @@ Global:
   Live: 'Tiešraides'
   Community: 'Kopiena'
   Counts:
-    Video Count: ''
-    Channel Count: ''
-    Subscriber Count: ''
-    View Count: ''
-    Watching Count: ''
+    Video Count: '1 video | {count} video'
+    Channel Count: '1 kanāls | {count} kanāli'
+    Subscriber Count: '1 abonents | {count} abonenti'
+    View Count: '1 skatījums | {count} skatījumi'
+    Watching Count: '1 skatās | {count} skatās'
 
 # Search Bar
-Search / Go to URL: ''
+    Like Count: 1 patikšana | {count} patikšanas
+    Comment Count: 1 viedoklis | {count} viedokļi
+  Input Tags:
+    Length Requirement: Birkai jābūt vismaz {number} simbolus garai
+Search / Go to URL: 'Meklē / Dodies uz URL'
 Search Bar:
   Clear Input: 'Tīrīt ievadi'
   # In Filter Button
 Search Filters:
-  Search Filters: ''
+  Search Filters: 'Meklēšanas atlase'
   Sort By:
-    Sort By: ''
+    Sort By: 'Kārto pēc'
     Most Relevant: 'Visatbilstošākie'
     Rating: 'Vērtējums'
     Upload Date: 'Augšuplādes datums'
@@ -84,88 +92,187 @@ Search Filters:
     Medium (4 - 20 minutes): 'Vidējs (4 - 20 minūtes)'
     Long (> 20 minutes): 'Ilgs (> 20 minūtes)'
   # On Search Page
-  Search Results: ''
-  Fetching results. Please wait: ''
-  Fetch more results: ''
-  There are no more results for this search: ''
+  Search Results: 'Meklēšanas rezultāti'
+  Fetching results. Please wait: 'Iegūst rezultātus. Lūdzu gaidi'
+  Fetch more results: 'Iegūt vairāk rezultātu'
+  There are no more results for this search: 'Šim meklējumam nav vairāk rezultātu'
 # Sidebar
+  Features:
+    HD: HD
+    4K: 4K
+    360 Video: 360 Video
+    Location: Atrašanās vieta
+    Live: Tiešraide
+    3D: 3D
+    HDR: HDR
+    VR180: VR180
+    Features: Īpašības
+    Subtitles: Paraksti
+    Creative Commons: Creative Commons
 Subscriptions:
     # On Subscriptions Page
-  Subscriptions: ''
+  Subscriptions: 'Abonementi'
   # channels that were likely deleted
-  Error Channels: ''
-  Latest Subscriptions: ''
-  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: ''
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': ''
-  Disabled Automatic Fetching: ''
-  Empty Channels: ''
-  'Getting Subscriptions. Please wait.': ''
-  Empty Posts: ''
+  Error Channels: 'Kanāli ar kļūdām'
+  Latest Subscriptions: 'Jaunākie abonementi'
+  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Šim
+    profilam ir daudz abonementu.  Piespiežu RSS, lai izvairītos no ierobežojumiem'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Tavs
+    abonementu saraksts ir tukšs. Ja vēlies ievest savus abonementus, dodies uz "Datņu
+    iestatījumiem" un izvēlies "Ievest abonementus", vai arī vari meklēt kanālus un
+    abonēt tos.'
+  Disabled Automatic Fetching: 'Tu esi izslēdzis automātisko abonementu iegūšanu.
+    Atsvaidzini abonementus, lai redzētu tos šeit.'
+  Empty Channels: 'Taviem abonētajiem kanāliem pašreiz nav neviena video.'
+  'Getting Subscriptions. Please wait.': 'Iegūst abonementus. Lūdzu gaidi.'
+  Empty Posts: 'Taviem abonētajiem kanāliem pašreiz nav neviena ieraksta.'
   Refresh Subscriptions: ''
-  Load More Videos: ''
+  Load More Videos: 'Ielādē vairāk video'
   Load More Posts: 'Ielādēt vairāk ierakstus'
-  Subscriptions Tabs: ''
-  All Subscription Tabs Hidden: ''
-More: ''
+  Subscriptions Tabs: 'Abonementu cilnes'
+  All Subscription Tabs Hidden: 'Visas abonementu cilnes ir paslēptas. Lai redzētu
+    saturu šeit, lūdzu atslēp dažas cilnes "{settingsSection}" sadaļā "{subsection}".'
+More: 'Vairāk'
 Channels:
-  Channels: ''
-  Title: ''
-  Search bar placeholder: ''
-  Count: ''
-  Empty: ''
-  Unsubscribe: ''
-  Unsubscribed: ''
-  Unsubscribe Prompt: ''
+  Channels: 'Kanāli'
+  Title: 'Kanālu saraksts'
+  Search bar placeholder: 'Meklē kanālus'
+  Count: '{number} kanāls(-i) atrasti.'
+  Empty: 'Tavs kanālu saraksts pašreiz ir tukšs.'
+  Unsubscribe Prompt: 'Vai esi drošs, ka vēlies atcelt abonementu no "{channelName}"?'
 Trending:
-  Trending: ''
-  Default: ''
+  Trending: 'Tendences'
+  Default: 'Noklusējuma'
   Music: 'Mūzika'
   Gaming: 'Spēles'
   Movies: 'Filmas'
-  Trending Tabs: ''
-Most Popular: ''
-Playlists: ''
+  Trending Tabs: 'Tendenču cilnes'
+Most Popular: 'Vispopulārākie'
+Playlists: 'Atskaņošanas saraksti'
 User Playlists:
-  Your Playlists: ''
-  Playlist Message: ''
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
-  Empty Search Message: ''
-  Search bar placeholder: ''
+  Your Playlists: 'Tavi atskaņošanas saraksti'
+  Empty Search Message: 'Šajā atskaņošanas sarakstā nav video, kas atbilst tavam meklējumam'
+  Search bar placeholder: 'Meklē atskaņošanas sarakstus'
+  Playlist Description: Atskaņošanas saraksta apraksts
+  Sort By:
+    Sort By: Kārto pēc
+    NameDescending: Z-A
+    NameAscending: A-Z
+    EarliestUpdatedFirst: Visagrāk atjaunināti
+    LatestPlayedFirst: Nesen atskaņoti
+    LatestUpdatedFirst: Nesen atjaunināti
+    LatestCreatedFirst: Nesen izveidoti
+    EarliestCreatedFirst: Visagrāk izveidoti
+    EarliestPlayedFirst: Visagrāk atskaņoti
+  Cannot delete the quick bookmark target playlist.: Nevar izdzēst ātrās grāmatzīmes
+    mērķa atskaņošanas sarakstu.
+  Delete Playlist: Dzēs atskaņošanas sarakstu
+  Remove from Favorites: Noņem no {playlistName}
+  Move Video Up: Pārvieto video augšup
+  Save Changes: Saglabā izmaiņas
+  Edit Playlist Info: Rediģē atskaņošanas saraksta info
+  Copy Playlist: Kopē atskaņošanas sarakstu
+  Remove Watched Videos: Noņem skatītos video
+  SinglePlaylistView:
+    Toast:
+      This playlist is already being used for quick bookmark.: Šis atskaņošanas saraksts
+        jau tiek lietots priekš ātrās grāmatzīmes.
+      This playlist is now used for quick bookmark: Šis atskaņošanas saraksts tagad
+        tiek lietots priekš ātrās grāmatzīmes
+      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Šis
+        atskaņošanas saraksts tagad tiek lietots priekš ātrās grāmatzīmes {oldPlaylistName}
+        vietā. Spied šeit, lai atceltu
+      Playlist name cannot be empty. Please input a name.: Atskaņošanas saraksta nosaukums
+        nevar būt tukšs. Lūdzu ievadi nosaukumu.
+      Playlist has been updated.: Atskaņošanas saraksts tika atjaunināts.
+      Video has been removed: Video tika noņemts
+      This video cannot be moved up.: Šo video nevar pārvietot augšup.
+      This video cannot be moved down.: Šo video nevar pārvietot lejup.
+      Reverted to use {oldPlaylistName} for quick bookmark: Atgriezts pie {oldPlaylistName}
+        priekš ātrās grāmatzīmes
+      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Daži
+        video atskaņošanas sarakstā vēl nav ielādēti. Spied šeit, lai kopētu tik un
+        tā.
+      There was an issue with updating this playlist.: Radās problēma atjauninot šo
+        atskaņošanas sarakstu.
+      There was a problem with removing this video: Radās problēma noņemot video
+      This playlist is protected and cannot be removed.: Šis atskaņošanas saraksts
+        ir aizsargāts un nevar tikt noņemts.
+      There were no videos to remove.: Nebija video, ko noņemt.
+      Playlist {playlistName} has been deleted.: '{playlistName} atskaņošanas saraksts
+        tika dzēsts.'
+      "{videoCount} video(s) have been removed": 1 video tika noņemts | {videoCount}
+        video tika noņemti
+      Playlist {playlistName} is the new quick bookmark playlist.: '{playlistName}
+        atskaņošanas saraksts ir jaunais ātrās grāmatzīmes atskaņošanas saraksts.'
+    Search for Videos: Meklē video
+  You have no playlists. Click on the create new playlist button to create a new one.: Tev
+    nav atskaņošanas sarakstu. Spied uz "Izveido jaunu atskaņošanas sarakstu", lai
+    izveidotu jaunu.
+  This playlist currently has no videos.: Šajā atskaņošanas sarakstā pašreiz nav video.
+  Add to Favorites: Pievieno pie {playlistName}
+  Move Video Down: Pārvieto video lejup
+  Cancel: Atcel
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Vai
+    esi drošs, ka vēlies noņemt 1 skatīto video no šī atskaņošanas saraksta? To nevar
+    atcelt. | Vai esi drošs, ka vēlies noņemt {playlistItemCount} skatītos video no
+    šī atskaņošanas saraksta? To nevar atcelt.
+  Are you sure you want to delete this playlist? This cannot be undone: Vai esi drošs,
+    ka vēlies dzēst šo atskaņošanas sarakstu? To nevar atcelt.
+  Playlist Name: Atskaņošanas saraksta nosaukums
+  Create New Playlist: Izveido jaunu atskaņošanas sarakstu
+  Playlists with Matching Videos: Atskaņošanas saraksti ar atbilstošiem video
+  Remove Duplicate Videos: Noņem video dublikātus
+  Enable Quick Bookmark With This Playlist: Iespējo ātro grāmatzīmi ar šo atskaņošanas
+    sarakstu
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Vai
+    esi drošs, ka vēlies noņemt 1 video dublikātu no šī atskaņošanas saraksta? To
+    nevar atcelt. | Vai esi drošs, ka vēlies noņemt {playlistItemCount} video dublikātus
+    no šī atskaņošanas saraksta? To nevar atcelt.
+  Add to Playlist: Pievieno atskaņošanas sarakstam
+  Remove from Playlist: Noņem no atskaņošanas saraksta
+  Quick Bookmark Enabled: Atrā grāmatzīme iespējota
+  CreatePlaylistPrompt:
+    Toast:
+      There was an issue with creating the playlist.: Izveidojot atskaņošanas sarakstu
+        radās kļūda.
 History:
   # On History Page
-  History: ''
-  Watch History: ''
-  Your history list is currently empty.: ''
+  History: 'Vēsture'
+  Watch History: 'Skatīšanās vēsture'
+  Your history list is currently empty.: 'Tava skatīšanās vēsture pašreiz ir tukša.'
   Empty Search Message: ''
-  Search bar placeholder: ""
+  Search bar placeholder: "Meklē vēsturē"
+  Case Sensitive Search: Reģistrjūtīga meklēšana
 Settings:
   # On Settings Page
-  Settings: ''
+  Settings: 'Iestatījumi'
   The app needs to restart for changes to take effect. Restart and apply change?: ''
   General Settings:
-    General Settings: 'Galvenie iestatījumi'
+    General Settings: 'Galvenie'
     Check for Updates: 'Pārbaudīt atjauninājumus'
     Check for Latest Blog Posts: 'Skatīt jaunākos bloga ierakstus'
     Fallback to Non-Preferred Backend on Failure: ''
-    Enable Search Suggestions: ''
-    Default Landing Page: ''
+    Enable Search Suggestions: 'Iespējo meklēšanas ieteikumus'
+    Default Landing Page: 'Noklusējuma sākumlapa'
     Locale Preference: 'Vietas iestatījums'
-    System Default: ''
+    System Default: 'Sistēmas noklusējums'
     Preferred API Backend:
-      Preferred API Backend: ''
+      Preferred API Backend: 'Vēlamā API aizmugure'
       Local API: 'Vietējais API'
-      Invidious API: ''
+      Invidious API: 'Invidious API'
     Video View Type:
       Video View Type: 'Video skata veids'
       Grid: 'Režģis'
       List: 'Saraksts'
     Thumbnail Preference:
       Thumbnail Preference: 'Sīktēlu iestatījums'
-      Default: ''
+      Default: 'Noklusējums'
       Beginning: 'Sākums'
       Middle: 'Vidus'
       End: 'Beigas'
       Hidden: 'Paslēpts'
+      Blur: Aizmiglo
     Current Invidious Instance: 'Pašreizējais Invidious gadījums'
     The currently set default instance is {instance}: ''
     No default instance has been set: ''
@@ -181,10 +288,12 @@ Settings:
       Open Link: 'Atvērt saiti'
       Ask Before Opening Link: 'Jautāt pirms saites atvēršanas'
       No Action: 'Nedarīt neko'
+    Auto Load Next Page:
+      Label: Autoielādē nākamo lapu
   Theme Settings:
-    Theme Settings: 'Izskata iestatījumi'
-    Match Top Bar with Main Color: ''
-    Expand Side Bar by Default: ''
+    Theme Settings: 'Izskats'
+    Match Top Bar with Main Color: 'Saskaņo augšmalu ar galveno krāsu'
+    Expand Side Bar by Default: 'Izvērs sānu malu pēc noklusējuma'
     Disable Smooth Scrolling: 'Atspējot plūdeno ritināšanu'
     UI Scale: 'Saskarnes izmērs'
     Hide Side Bar Labels: 'Paslēpt sānu paneļa etiķetes'
@@ -193,12 +302,13 @@ Settings:
       Base Theme: 'Pamata izskats'
       Black: 'Melns'
       Dark: 'Tumšs'
-      System Default: ''
+      System Default: 'Sistēmas noklusējums'
       Light: 'Gaišs'
       Dracula: 'Drakula'
       Catppuccin Mocha: 'Kaķpučīn moka'
       Pastel Pink: 'Pasteļu rozā'
       Hot Pink: 'Karsti rozā'
+      Nordic: Ziemeļvalsts
     Main Color Theme:
       Main Color Theme: 'Galvenās krāsas izskats'
       Red: 'Sarkans'
@@ -241,7 +351,7 @@ Settings:
     Secondary Color Theme: 'Otrās krāsas izskats'
         #* Main Color Theme
   Player Settings:
-    Player Settings: 'Atskaņotāja iestatījumi'
+    Player Settings: 'Atskaņotāja'
     Play Next Video: 'Atskaņot nākamo video'
     Turn on Subtitles by Default: ''
     Autoplay Videos: 'Autoatskaņot video'
@@ -256,18 +366,18 @@ Settings:
     Enter Fullscreen on Display Rotate: 'Pagriežot ekrānu pārslēgt uz pilnekrānu'
     Next Video Interval: 'Nākošā video intervāls'
     Fast-Forward / Rewind Interval: ''
-    Default Volume: ''
-    Default Playback Rate: ''
+    Default Volume: 'Noklusējuma skaļums'
+    Default Playback Rate: 'Noklusējuma atskaņošanas ātrums'
     Max Video Playback Rate: 'Maksimālais video atskaņošanas ātrums'
     Video Playback Rate Interval: 'Video atskaņošanas ātruma intervāls'
     Default Video Format:
-      Default Video Format: ''
+      Default Video Format: 'Noklusējuma video formāts'
       Dash Formats: 'DASH formāti'
       Legacy Formats: 'Mantojuma formāti'
       Audio Formats: 'Audio formāti'
     Default Quality:
-      Default Quality: ''
-      Auto: ''
+      Default Quality: 'Noklusējuma kvalitāte'
+      Auto: 'Auto'
       144p: '144p'
       240p: '240p'
       360p: '360p'
@@ -290,7 +400,7 @@ Settings:
         Forbidden Characters: 'Aizliegtās rakstzīmes'
         Empty File Name: 'Tukšs datnes nosaukums'
   External Player Settings:
-    External Player Settings: 'Ārējā atskaņotāja iestatījumi'
+    External Player Settings: 'Ārējā atskaņotāja'
     External Player: 'Ārējais atskaņotājs'
     Ignore Unsupported Action Warnings: 'Ignorēt neatbalstītas darbības brīdinājumus'
     Custom External Player Executable: 'Pielāgota ārējā atskaņotāja izpilddatne'
@@ -298,35 +408,36 @@ Settings:
     Players:
       None:
         Name: 'Nekas'
+    Ignore Default Arguments: Ignorēt noklusējuma argumentus
   Privacy Settings:
-    Privacy Settings: 'Privātuma iestatījumi'
+    Privacy Settings: 'Privātuma'
     Remember History: 'Atcerēties vēsturi'
     Save Watched Progress: 'Saglabāt skatīto attīstību'
     Save Watched Videos With Last Viewed Playlist: ''
-    Clear Search Cache: ''
+    Clear Search Cache: 'Iztīri meklēšanas kešatmiņu'
     Are you sure you want to clear out your search cache?: ''
-    Search cache has been cleared: ''
+    Search cache has been cleared: 'Meklēšanas kešatmiņa tika iztīrīta'
     Remove Watch History: 'Noņemt skatīšanās vēsturi'
     Are you sure you want to remove your entire watch history?: 'Vai tu esi pārliecināts,
       ka vēlies noņemt visu skatīšanās vēsturi?'
     Watch history has been cleared: 'Skatīšanās vēsture tika noņemta'
-    Remove All Subscriptions / Profiles: ''
+    Remove All Subscriptions / Profiles: 'Noņemt visus abonementus / profilus'
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
+    All playlists have been removed: Visi atskaņošanas saraksti tika noņemti
+    Remove All Playlists: Noņemt visus atskaņošanas sarakstus
   Subscription Settings:
-    Subscription Settings: ''
+    Subscription Settings: 'Abonementu'
     Hide Videos on Watch: 'Paslēpt video pēc skatīšanas'
     Fetch Feeds from RSS: 'Iegūt plūsmu no RSS'
-    Manage Subscriptions: ''
     Fetch Automatically: 'Iegūt plūsmu automātiski'
   Distraction Free Settings:
-    Distraction Free Settings: 'Beztraucēšanas iestatījumi'
+    Distraction Free Settings: 'Beztraucēšanas'
     Sections:
       Side Bar: 'Sānu panelis'
-      Subscriptions Page: ''
+      Subscriptions Page: 'Abonementu lapa'
       Channel Page: 'Kanāla lapa'
       Watch Page: 'Skatīšanās lapa'
       General: 'Galvenais'
-    Blur Thumbnails: 'Izpludināt sīktēlus'
     Hide Video Views: 'Paslēpt video skatījumus'
     Hide Video Likes And Dislikes: 'Paslēpt video novērtējuma atzīmes'
     Hide Channel Subscribers: 'Paslēpt kanāla abonentus'
@@ -336,38 +447,40 @@ Settings:
     Hide Popular Videos: 'Paslēpt populāros video'
     Hide Playlists: 'Paslēpt sarakstus'
     Hide Live Chat: 'Paslēpt dzīvo čatu'
-    Hide Active Subscriptions: ''
+    Hide Active Subscriptions: 'Paslēp aktīvos abonementus'
     Hide Video Description: 'Paslēpt video aprakstu'
     Hide Comments: 'Paslēpt komentārus'
     Hide Profile Pictures in Comments: 'Paslēpt kontu atēlus komentāros'
     Display Titles Without Excessive Capitalisation: 'Attēlot nosaukumus nepārspīlējot
-      ar lielajiem burtiem'
+      ar lielajiem burtiem un interpunkciju'
     Hide Live Streams: 'Paslēpt dzīvās straumes'
     Hide Upcoming Premieres: 'Paslēpt tuvojošās pirmizrādes'
     Hide Sharing Actions: 'Paslēpt dalīšanās darbības'
     Hide Chapters: 'Paslēpt nodaļas'
     Hide Channels: 'Kanālos paslēpt video'
-    Hide Channels Placeholder: 'Kanāla vārds vai ID'
+    Hide Channels Placeholder: 'Kanāla ID'
     Hide Featured Channels: 'Paslēpt izceltos kanālus'
     Hide Channel Playlists: 'Kanālā paslēpt sarakstus'
     Hide Channel Community: 'Kanālā paslēpt kopienu'
     Hide Channel Shorts: 'Kanālā paslēpt īsos'
     Hide Channel Podcasts: 'Kanālā paslēpt podkāstus'
     Hide Channel Releases: 'Kanālā paslēpt relīzes'
-    Hide Subscriptions Videos: ''
-    Hide Subscriptions Shorts: ''
-    Hide Subscriptions Live: ''
-    Hide Subscriptions Community: ''
+    Hide Subscriptions Videos: 'Paslēp abonementu video'
+    Hide Subscriptions Shorts: 'Paslēp abonementu īsos video'
+    Hide Subscriptions Live: 'Paslēp abonementu tiešraides'
+    Hide Subscriptions Community: 'Paslēp abonementu komūnu'
+    Hide Channels Already Exists: Kanāla ID jau eksistē
+    Hide Videos and Playlists Containing Text Placeholder: Vārds, vārda daļa, vai
+      frāze
   Data Settings:
-    Data Settings: 'Datu iestatījumi'
+    Data Settings: 'Datu'
     Select Import Type: 'Izvēlēties importa veidu'
     Select Export Type: 'Izvēlēties eksporta veidu'
-    Import Subscriptions: ''
-    Subscription File: ''
+    Import Subscriptions: 'Ievest abonementus'
+    Subscription File: 'Aboenementu datne'
     History File: 'Vēstures datne'
-    Playlist File: ''
-    Check for Legacy Subscriptions: ''
-    Export Subscriptions: ''
+    Playlist File: 'Atskaņošanas saraksta datne'
+    Export Subscriptions: 'Izvest abonementus'
     Export FreeTube: 'Eksportēt FreeTube'
     Export YouTube: 'Eksportēt YouTube'
     Export NewPipe: 'Eksportēt NewPipe'
@@ -378,11 +491,13 @@ Settings:
     Profile object has insufficient data, skipping item: 'Profila objektam nav pietiekami
       datu, izlaiž vienumu'
     All subscriptions and profiles have been successfully imported: ''
-    All subscriptions have been successfully imported: ''
-    Invalid subscriptions file: ''
+    All subscriptions have been successfully imported: 'Visi abonementi tika veiksmīgi
+      ievesti'
+    Invalid subscriptions file: 'Nederīga abonementu datne'
     This might take a while, please wait: 'Tas var aizņemt kādu laiku, lūdzu gaidiet'
     Invalid history file: 'Nederīga vēstures datne'
-    Subscriptions have been successfully exported: ''
+    Subscriptions have been successfully exported: 'Visi abonementi tika veiksmīgi
+      izvesti'
     History object has insufficient data, skipping item: 'Vēstures objektam nav pietiekami
       datu, izlaiž vienumu'
     All watched history has been successfully imported: 'Visa skatīšanās vēstures
@@ -396,9 +511,9 @@ Settings:
     Unable to write file: 'Nespēj ierakstīt datni'
     Unknown data key: 'Nezināma datu atslēga'
     How do I import my subscriptions?: ''
-    Manage Subscriptions: ''
+    Manage Subscriptions: 'Pārvaldīt abonementus'
   Proxy Settings:
-    Proxy Settings: 'Starpniekserveru iestatījumi'
+    Proxy Settings: 'Starpniekserveru'
     Enable Tor / Proxy: 'Iespējot Tor / starpniekserveri'
     Proxy Protocol: 'Starpniekservera protokols'
     Proxy Host: 'Starpniekservera saimnieks'
@@ -414,7 +529,7 @@ Settings:
     Error getting network information. Is your proxy configured properly?: 'Kļūda
       saņemot tīkla informāciju. Vai jūsu starpniekserveris ir uzstādīts pareizi?'
   SponsorBlock Settings:
-    SponsorBlock Settings: 'SponsorBlock iestatījumi'
+    SponsorBlock Settings: 'SponsorBlock'
     Enable SponsorBlock: 'Iespējot SponsorBlock'
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
     Notify when sponsor segment is skipped: 'Ziņot, kad sponsora gabals tiek izlaists'
@@ -426,20 +541,21 @@ Settings:
       Prompt To Skip: 'Jautāt, lai izlaistu'
       Do Nothing: 'Nedarīt neko'
     Category Color: 'Iedalījuma krāsa'
+    UseDeArrowThumbnails: Izmanto DeArrow priekš sīktēliem
   Parental Control Settings:
-    Parental Control Settings: 'Vecāku vadības iestatījumi'
+    Parental Control Settings: 'Vecāku vadības'
     Hide Unsubscribe Button: 'Paslēpt Atabonēt pogu'
     Show Family Friendly Only: 'Rādīt tikai ģimenei draudzīgi'
-    Hide Search Bar: ''
+    Hide Search Bar: 'Paslēp meklēšanas joslu'
   Download Settings:
-    Download Settings: 'Lejuplādes iestatījumi'
+    Download Settings: 'Lejuplādes'
     Ask Download Path: 'Jautāt lejuplādes ceļu'
     Choose Path: 'Izvēlēties ceļu'
     Download Behavior: 'Lejuplādes uzvedība'
     Download in app: 'Lejuplādēt aplikācijā'
     Open in web browser: 'Atvērt tīkla pārlūkā'
   Experimental Settings:
-    Experimental Settings: 'Izmēģinājuma iestatījumi'
+    Experimental Settings: 'Izmēģinājuma'
     Warning: ''
     Replace HTTP Cache: 'Aizvietot HTTP kešatmiņu'
   Password Dialog:
@@ -448,17 +564,17 @@ Settings:
     Password Incorrect: 'Parole nepareiza'
     Unlock: 'Atslēgt'
   Password Settings:
-    Password Settings: 'Paroles iestatījumi'
+    Password Settings: 'Paroles'
     Set Password To Prevent Access: 'Uzstādi paroli, lai neļautu piekļūt uzstādījumiem'
     Set Password: 'Uzstādi paroli'
     Remove Password: 'Noņem paroli'
+  Return to Settings Menu: Atgriezies iestatījumu izvēlnē
+  Sort Settings Sections (A-Z): Kārto iestatījumu sadaļas (A-Z)
 About:
   #On About page
   About: 'Par'
   Beta: 'Beta'
   Source code: 'Pirmkods'
-  Licensed under the AGPLv3: ''
-  View License: ''
   Downloads / Changelog: 'Lejuplādes / izmaiņu žurnāls'
   GitHub releases: 'GitHub laidieni'
   Help: 'Palīdzība'
@@ -481,8 +597,10 @@ About:
   these people and projects: 'šie cilvēki un apvienības'
   Donate: 'Ziedot'
 
+  Licensed under the: Licenzēts ar
+  AGPLv3: AGPLv3
 Profile:
-  Profile Settings: 'Profila iestatījumi'
+  Profile Settings: 'Profila'
   Toggle Profile List: 'Pārslēgt profilu sarakstu'
   Profile Select: 'Izvēlēties profilu'
   Profile Filter: 'Profilu filtrs'
@@ -495,11 +613,11 @@ Profile:
   Profile Preview: 'Profila priekšskatījums'
   Create Profile: 'Veidot profilu'
   Update Profile: 'Atjaunināt profilu'
-  Make Default Profile: ''
+  Make Default Profile: 'Izveido noklusējuma profilu'
   Delete Profile: 'Dzēst profilu'
   Are you sure you want to delete this profile?: 'Vai tu esi drošs, ka gribi dzēst
     šo profilu?'
-  All subscriptions will also be deleted.: ''
+  All subscriptions will also be deleted.: 'Arī visi abonementi tiks izdzēsti.'
   Profile could not be found: 'Profils netika atrasts'
   Your profile name cannot be empty: 'Tavs profila vārds nevar būt tukšs'
   Profile has been created: 'Profils tika izveidots'
@@ -507,10 +625,10 @@ Profile:
   Your default profile has been set to {profile}: ''
   Removed {profile} from your profiles: ''
   Your default profile has been changed to your primary profile: ''
-  '{profile} is now the active profile': ''
-  Subscription List: ''
+  '{profile} is now the active profile': '{profile} tagad ir aktīvais profils'
+  Subscription List: 'Abonementu saraksts'
   Other Channels: 'Citi kanāli'
-  '{number} selected': ''
+  '{number} selected': '{number} izvēlēts'
   Select All: 'Izvēlēties visus'
   Select None: 'Neizvēlēties nevienu'
   Delete Selected: 'Dzēst izvēlētos'
@@ -521,6 +639,9 @@ Profile:
   : ''
   Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
 #On Channel Page
+  Create Profile Name: Izveido profila vārdu
+  Profile Name: Profila vārds
+  Edit Profile Name: Rediģē profila vārdu
 Channel:
   Subscribe: 'Abonē'
   Unsubscribe: 'Atabonē'
@@ -625,39 +746,10 @@ Video:
   video only: ''
   audio only: ''
   Published:
-    Jan: ''
-    Feb: ''
-    Mar: ''
-    Apr: ''
-    May: ''
-    Jun: ''
-    Jul: ''
-    Aug: ''
-    Sep: ''
-    Oct: ''
-    Nov: ''
-    Dec: ''
-    Second: ''
-    Seconds: ''
-    Minute: ''
-    Minutes: ''
-    Hour: ''
-    Hours: ''
-    Day: ''
-    Days: ''
-    Week: ''
-    Weeks: ''
-    Month: ''
-    Months: ''
-    Year: ''
-    Years: ''
-    Ago: ''
-    Upcoming: ''
     In less than a minute: ''
   Published on: ''
   Streamed on: ''
   Started streaming on: ''
-  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -693,15 +785,11 @@ Playlist:
   #& About
   Playlist: ''
   View Full Playlist: ''
-  Videos: ''
-  View: ''
-  Views: ''
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -800,9 +888,7 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
-Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
@@ -831,3 +917,19 @@ Hashtag:
 Yes: ''
 No: ''
 Ok: ''
+Search character limit: Meklējamā frāze pārsniedz {searchCharacterLimit} simbolu ierobežojumu
+Feed:
+  Refresh Feed: Atsvaidzini {subscriptionName}
+  Feed Last Updated: '{feedName} barotne pēdējoreiz atjaunināta: {date}'
+Go to page: Iet uz {page}
+Close Banner: Aizvērt karogu
+Search Listing:
+  Label:
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Jauns
+    3D: 3D
+    Subtitles: Paraksti
+    Closed Captions: Slēgtie paraksti
+    4K: 4K
diff --git a/static/locales/nb-NO.yaml b/static/locales/nb-NO.yaml
index 624c9e2578a26..9c214f5180838 100644
--- a/static/locales/nb-NO.yaml
+++ b/static/locales/nb-NO.yaml
@@ -32,11 +32,21 @@ Forward: 'Framover'
 # Anything shared among components / views should be put here
 Global:
   Videos: 'Videoer'
-  Shorts: Kortvideoer
-  Live: Direkte
-  Community: Gemenskap
+  Shorts: Shorts-videoer
+  Live: Direktesendinger
+  Community: Fellesskap
 
 # Search Bar
+  Counts:
+    Subscriber Count: 1 abonnent | {count} abonnenter
+    Watching Count: 1 seer | {count] seere
+    Channel Count: 1 kanal | {count} kanaler
+    Comment Count: 1 kommentar | {count} kommentarer
+    Video Count: 1 video | {count} videoer
+    View Count: 1 visning | {count} visninger
+    Like Count: 1 liker | {count} liker
+  Input Tags:
+    Length Requirement: Etiketten må minst være {number} tegn lang.
 Search / Go to URL: 'Søk/gå til nettadresse'
   # In Filter Button
 Search Filters:
@@ -74,6 +84,18 @@ Search Filters:
   Fetch more results: 'Hent flere resultater'
 # Sidebar
   There are no more results for this search: Søket ga ingen flere resultater
+  Features:
+    HD: HD
+    VR180: VR180
+    Subtitles: Underskrifter
+    Creative Commons: Creative Commons
+    3D: 3D
+    Live: Direktesendt
+    4K: 4K
+    Location: Sted
+    HDR: HDR
+    Features: Egenskaper
+    360 Video: 360 Video
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Abonnementer'
@@ -83,7 +105,7 @@ Subscriptions:
   'Getting Subscriptions.  Please wait.': 'Henter abonnementer. Vent.'
   Refresh Subscriptions: Oppdater abonnementer
   Getting Subscriptions. Please wait.: Henter abonnementer. Vennligst vent.
-  Load More Videos: Last flere videoer
+  Load More Videos: Last inn flere videoer
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Denne
     profilen har mange abonnementer. Påtvinger RSS for å unngå adgangsbegrensning
   Error Channels: Kanaler med feil
@@ -93,6 +115,8 @@ Subscriptions:
   Subscriptions Tabs: Abonnementsfaner
   All Subscription Tabs Hidden: Alle abonnementsfaner er skjult. Opphev skjuling av
     noen faner i «{subsection}»-delen av «{settingsSection}» for å vise innhold her.
+  Empty Posts: Kanalene du abonnerer på, har ikke noen innlegg for øyeblikket.
+  Load More Posts: Last inn flere poster
 Trending:
   Trending: 'På vei opp'
   Trending Tabs: På vei opp-faner
@@ -104,14 +128,97 @@ Most Popular: 'Mest populært'
 Playlists: 'Spillelister'
 User Playlists:
   Your Playlists: 'Dine spillelister'
-  Playlist Message: Denne siden reflekterer ikke fullstendig fungerende spillelister.
-    Den viser kun videoer du har lagret eller favorittmerket. Når arbeidet er fullført,
-    vil alle videoer som vises her bli overført til en «Favoritt»-spilleliste.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Du
-    har ikke lagret noen videoer enda. Klikk på «Lagre»-knappen i hjørnet av en video
-    for å sende den hit
   Empty Search Message: Ingen videoer i denne spillelisten samsvarer med søket ditt
   Search bar placeholder: Søk i spilleliste
+  SinglePlaylistView:
+    Toast:
+      This playlist does not exist: Denne spillelisten finnes ikke
+      This video cannot be moved down.: Denne videoen kan ikke bli flyttet ned.
+      Video has been removed: Videoen har blitt fjernet
+      There were no videos to remove.: Det var ingen videoer å fjerne
+      There was an issue with updating this playlist.: Det oppstod et problem ved
+        oppdateringen av denne spillelisten.
+      "{videoCount} video(s) have been removed": 1 video har blitt fjernet | {videoCount}
+        videoer har blitt fjernet
+      Playlist has been updated.: Spilleliste har blitt endret
+      There was a problem with removing this video: Det oppstod et problem ved fjerningen
+        av denne videoen
+      This video cannot be moved up.: Denne videoen kan ikke bli flyttet opp.
+      Playlist {playlistName} has been deleted.: Spillelisten {playlistName} har blitt
+        fjernet.
+      This playlist is protected and cannot be removed.: Denne spillelisten er beskyttet,
+        og kan derfor ikke bli fjernet.
+      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Noen
+        av videoene i spillelisten har ikke blitt lastet inn skikkelig, enda. Trykk
+        her for å kopiere, uansett.
+      Playlist name cannot be empty. Please input a name.: Spillelisten må ha et navn.
+        Vennligst gi den et navn.
+    Search for Videos: Søk etter videoer
+  AddVideoPrompt:
+    Allow Adding Duplicate Video(s): Tillat å legge til dupliserte videoer
+    Search in Playlists: Søk i spillelister
+    Save: Lagre
+    N playlists selected: '{playlistCount} valgt'
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
+      videoer vil bli lagt til'
+    Toast:
+      You haven't selected any playlist yet.: Du har ikke valgt noen spillelister
+        enda.
+      "{videoCount} video(s) added to 1 playlist": 1 video lagt til 1 spilleliste
+        | {videoCount} videoer lagt til 1 spilleliste
+  Cancel: Avbryt
+  Add to Playlist: Legg til spilleliste
+  This playlist currently has no videos.: Denne spillelisten har ikke noen videoer
+    for øyeblikket.
+  Export Playlist: Eksporter denne spillelisten
+  Sort By:
+    EarliestCreatedFirst: Tidligst opprettet
+    Sort By: Sorter etter
+    EarliestUpdatedFirst: Tidligst endret
+    LatestPlayedFirst: Sist spilt av
+    EarliestPlayedFirst: Tidligst spilt av
+    LatestUpdatedFirst: Nylig endret
+    NameAscending: A-Å
+    NameDescending: Å-A
+    LatestCreatedFirst: Nylig opprettet
+  Add to Favorites: Legg til {playlistName}
+  Move Video Up: Flytt video opp
+  Move Video Down: Flytt video ned
+  Playlist Description: Beskrivelse på spilleliste
+  Save Changes: Lagre endringer
+  Copy Playlist: Kopier spilleliste
+  Playlist Name: Navn på spilleliste
+  Remove Watched Videos: Fjern sette videoer
+  Playlists with Matching Videos: Spillelister med like videoer
+  Create New Playlist: Opprett ny spilleliste
+  Remove from Favorites: Fjern fra {playlistName}
+  The playlist has been successfully exported: Spillelisten ble eksportert
+  Delete Playlist: Fjern spilleliste
+  CreatePlaylistPrompt:
+    Create: Opprett
+    New Playlist Name: Nytt navn på spilleliste
+    Toast:
+      There was an issue with creating the playlist.: Det oppstod et problem ved opprettelsen
+        av spillelisten.
+      There is already a playlist with this name. Please pick a different name.: Det
+        finnes allerede en spilleliste med det navnet. Vennligst velg et annet navn.
+      Playlist {playlistName} has been successfully created.: Spillelisten {playlistName}
+        har blitt opprettet.
+  Edit Playlist Info: Endre informasjon til spilleliste
+  Remove Duplicate Videos: Fjern duplikatvideoer
+  Remove from Playlist: Fjern fra spilleliste
+  You have no playlists. Click on the create new playlist button to create a new one.: Du
+    har ingen spillelister. Trykk på plusstegnet for å opprette en ny en.
+  Are you sure you want to delete this playlist? This cannot be undone: Er du sikker
+    på at du vil fjerne denne spillelisten? Dette kan ikke bli omgjort.
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Er
+    du sikker på at du vil fjerne en duplikatvideo fra denne spillelisten? Dette kan
+    ikke bli omgjort. Er du sikker på at du vil fjerne {playlistItemCount} duplikate
+    videoer fra denne spillelisten? Denne kan ikke bli omgjort.
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Er
+    du sikker på at du vil fjerne 1 sett video fra denne spillelisten? Dette kan ikke
+    bli omgjort. | Er du sikker på at du vil fjerne {playlistItemCount} sette videoer
+    fra denne spillelisten? Dette kan ikke bli omgjort.
 History:
   # On History Page
   History: 'Historikk'
@@ -128,7 +235,7 @@ Settings:
       bakende ved feil'
     Enable Search Suggestions: 'Slå på søkeforslag'
     Default Landing Page: 'Forvalgt landingsside'
-    Locale Preference: 'Språkinnstilling'
+    Locale Preference: 'Innstillinger for språk'
     Preferred API Backend:
       Preferred API Backend: 'Foretrukket API-bakende'
       Local API: 'Lokalt API'
@@ -138,13 +245,12 @@ Settings:
       Grid: 'Rutenett'
       List: 'Liste'
     Thumbnail Preference:
-      Thumbnail Preference: 'Miniatyrbilde-innstilling'
+      Thumbnail Preference: 'Innstillinger for miniatyrbilder'
       Default: 'Forvalg'
       Beginning: 'Begynnelsen'
       Middle: 'Midten'
       End: 'Slutten'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Individious-forekomst
-      (forvalget er https://invidious.snopyta.org)'
+      Hidden: Skjult
     Region for Trending: 'Region for "På vei opp"'
         #! List countries
     Check for Updates: Se etter oppdateringer
@@ -163,8 +269,11 @@ Settings:
       Ask Before Opening Link: Spør før åpning av lenke
       Open Link: Åpne lenke
       External Link Handling: Håndtering av eksterne lenker
+    Auto Load Next Page:
+      Label: Last inn den neste siden automatisk
+      Tooltip: Last inn flere sider og kommentarer automatisk.
   Theme Settings:
-    Theme Settings: 'Draktvalg'
+    Theme Settings: 'Tema'
     Match Top Bar with Main Color: 'Tilpass topplinjen slik at den har samme farge
       som hovedfargen'
     Base Theme:
@@ -175,6 +284,8 @@ Settings:
       Dracula: 'Dracula'
       System Default: Systemforvalg
       Catppuccin Mocha: Catppuccin-mokka
+      Pastel Pink: Pastellrosa
+      Nordic: Nordisk
     Main Color Theme:
       Main Color Theme: 'Hovedfarge'
       Red: 'Rød'
@@ -220,9 +331,9 @@ Settings:
     Disable Smooth Scrolling: Slå av myk rulling
     Expand Side Bar by Default: Utvidet sidefelt som forvalg
     Hide Side Bar Labels: Skjul sidefeltsetiketter
-    Hide FreeTube Header Logo: Skjul FreeTube-tittellogo
+    Hide FreeTube Header Logo: Skjul FreeTubes tittel og logo
   Player Settings:
-    Player Settings: 'Videoavspillingsinnstillinger'
+    Player Settings: 'Innstillinger for avspilling av video'
     Play Next Video: 'Spill av neste video'
     Turn on Subtitles by Default: 'Undertekster som forvalg'
     Autoplay Videos: 'Spill av videoer automatisk'
@@ -237,7 +348,7 @@ Settings:
       Legacy Formats: 'Gamle formater'
       Audio Formats: 'Lydformater'
     Default Quality:
-      Default Quality: 'Kvalitetsinnstilling'
+      Default Quality: 'Forvalt kvalitet'
       Auto: 'Automatisk'
       144p: '144p'
       240p: '240p'
@@ -258,30 +369,31 @@ Settings:
       Error:
         Forbidden Characters: Forbudte tegn
         Empty File Name: Tomt filnavn
-      Enable: Skru på skjermavbildninger
+      Enable: Aktiver skjermbilde
       Folder Label: Skjermavbildningsmappe
       Folder Button: Velg mappe
-      Format Label: Skjermavbildningsformat
-      Quality Label: Skjermavbildningskvalitet
+      Format Label: Format for skjermbilde
+      Quality Label: Kvalitet for skjermbilde
       Ask Path: Spør om hvor ting skal lagres
       File Name Tooltip: Du kan bruke variablene nedenfor. %Y år, i 4 siffer. %M måned,
         i 2 siffer. %D dag, i to siffer. %H time, i to siffer. %N minutt, i to siffer.
         %s sekund, i to siffer. %T millisekunder, i tre siffer. %s videosekund. %t
         videomillisekunder, i tre siffer. %i video-ID. Du kan også bruke «\», eller
         «/» for å lage undermapper.
-    Max Video Playback Rate: Maks. videoavspillingshastighet
+    Max Video Playback Rate: Maksimal hastighet for videoavspilling
     Scroll Playback Rate Over Video Player: Avspillingshastighet ved rulling over
       videoavspiller
     Video Playback Rate Interval: Intervall for videoavspillingshastighet
     Enter Fullscreen on Display Rotate: Fullskjermsvisning når skjermen roteres
     Skip by Scrolling Over Video Player: Hopp over ved å rulle over videoavspiller
   Privacy Settings:
-    Privacy Settings: 'Personvernsinnstillinger'
+    Privacy Settings: 'Innstillinger for personvern'
     Remember History: 'Husk historikk'
     Save Watched Progress: 'Husk avspillingsposisjon'
-    Clear Search Cache: 'Tøm søkehurtiglager'
-    Are you sure you want to clear out your search cache?: 'Tøm søkehurtiglager?'
-    Search cache has been cleared: 'Søkehurtiglager tømt'
+    Clear Search Cache: 'Tøm hurtiglager for søk'
+    Are you sure you want to clear out your search cache?: 'Er du sikker på at du
+      vil tømme hurtiglageret for søk?'
+    Search cache has been cleared: 'Hurtiglageret for søk har blitt tømt'
     Remove Watch History: 'Fjern visningshistorikk'
     Are you sure you want to remove your entire watch history?: 'Er du sikker på at
       du vil fjerne hele visningshistorikken din?'
@@ -289,41 +401,23 @@ Settings:
     Remove All Subscriptions / Profiles: Fjern alle abonnementer/profiler
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Er
       du sikker på at du vil fjerne alle abonnementer og profiler? Dette kan ikke
-      angres.
+      bli omgjort.
     Save Watched Videos With Last Viewed Playlist: Lagre sette videoer med sist sette
       spilleliste
+    Remove All Playlists: Fjern alle spillelister
+    Are you sure you want to remove all your playlists?: Er du sikker på at du vil
+      fjerne alle spillelistene dine?
+    All playlists have been removed: Alle spillelister har blitt fjernet
   Subscription Settings:
-    Subscription Settings: 'Abonnementsinnstillinger'
+    Subscription Settings: 'Innstillinger for abonnementer'
     Hide Videos on Watch: 'Skjul sette videoer'
-    Subscriptions Export Format:
-      Newpipe: 'NewPipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Håndter abonnementer'
-    Import Subscriptions: 'Importer abonnementer'
-    Export Subscriptions: 'Eksporter abonnementer'
-    How do I import my subscriptions?: 'Hvordan importerer jeg mine abonnementer?'
     Fetch Feeds from RSS: Hent informasjonskanaler fra RSS
     Fetch Automatically: Hent informasjonskanaler automatisk
-  Advanced Settings:
-    Advanced Settings: 'Avanserte innstillinger'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Mellomtjener-adresse (Eksempel:
-      SOCKS5://127.0.0.1:9050 )'
-    Use Tor / Proxy for API calls: 'Bruk Tor / mellomtjener for API-kall'
-    Clear History:
-      Clear History: 'Tøm historikk'
-      # On Click
-      Are you sure you want to delete your history?: 'Er du sikker på at du vil slette
-        historikken din?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Tøm abonnementer'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Er du sikker på at du vil
-        fjerne alle abonnementer?'
-      #& Yes
-      #& No
 
+    Confirm Before Unsubscribing: Bekreft avslutning av abonnement
+    'Limit the number of videos displayed for each channel': Begrens antallet videoer
+      vist for hver kanal
+    To: Til
   Data Settings:
     How do I import my subscriptions?: Hvordan importerer jeg abonnementene mine?
     Unknown data key: Ukjent datanøkkel
@@ -344,7 +438,6 @@ Settings:
     Invalid subscriptions file: Ugyldig abonnementsfil
     Profile object has insufficient data, skipping item: Hopper over profilobjektet
       siden det har utilstrekkelig data.
-    Check for Legacy Subscriptions: Se etter foreldede abonnementer
     Subscriptions have been successfully exported: Abonnementer eksportert
     This might take a while, please wait: Dette kan ta litt tid …
     Export History: Eksporter historikk
@@ -353,13 +446,10 @@ Settings:
     Export YouTube: YouTube-eksport
     Export FreeTube: FreeTube-eksport
     Export Subscriptions: Eksporter abonnementer
-    Import NewPipe: Importer NewPipe
-    Import YouTube: Importer YouTube
-    Import FreeTube: Importer FreeTube
     Import Subscriptions: Importer abonnementer
     Select Export Type: Velg eksporttype
     Select Import Type: Velg importtype
-    Data Settings: Datainnstillinger
+    Data Settings: Innstillinger for data
     All playlists has been successfully imported: Importerte alle spillelister
     Subscription File: Abonnementsfil
     History File: Historikkfil
@@ -384,44 +474,51 @@ Settings:
     Proxy Host: Mellomtjenervert
     Proxy Protocol: Mellomtjenerprotokoll
     Enable Tor / Proxy: Skru på Tor/mellomtjener
-    Proxy Settings: Mellomtjenerinnstillinger
+    Proxy Settings: Innstillinger for mellomtjenere
   Distraction Free Settings:
     Hide Trending Videos: Skjul "På vei opp"
     Hide Video Likes And Dislikes: Skjul videogunst
-    Distraction Free Settings: Distraksjonsfri-innstillinger
+    Distraction Free Settings: Innstillinger for andre tilpasninger
     Hide Active Subscriptions: Skjul aktive abonnementer
     Hide Recommended Videos: Skjul anbefalte videoer
     Hide Comment Likes: Skjul kommentargunst
     Hide Channel Subscribers: Skjul kanalabonnementer
     Hide Popular Videos: Skjul "Mest populært"
     Hide Video Views: Skjul videovisninger
-    Hide Live Chat: Skjul sanntidssludring
+    Hide Live Chat: Skjul direktechat
     Hide Playlists: Skjul spillelister
     Hide Comments: Skjul kommentarer
-    Hide Live Streams: "Skjul direktestrømmer"
+    Hide Live Streams: "Skjul direktesendinger"
     Hide Chapters: Skjul kapitler
-    Hide Channels Placeholder: Kanalnavn eller ID
+    Hide Channels Placeholder: Kanal-ID
     Hide Channels: Skjul videoer fra kanaler
     Hide Sharing Actions: Skjul delingshandlinger
     Hide Upcoming Premieres: Skjul kommende premièrer
     Hide Video Description: Skjul videobeskrivelse
     Display Titles Without Excessive Capitalisation: Vis titler uten overdrevet bruk
       av store bokstaver
-    Hide Featured Channels: Skjult framhevede kanaler
-    Hide Channel Community: Skjul kanalgemenskap
-    Hide Channel Shorts: Skjul kanal-kortvideoer
+    Hide Featured Channels: Skjul fremhevede kanaler
+    Hide Channel Community: Skjul fane for "fellesskap" i kanaler
+    Hide Channel Shorts: Skjul fane for "Shorts-videoer" i kanaler
     Sections:
       Side Bar: Sidefelt
       Channel Page: Kanalside
       General: Generelt
       Watch Page: Seerlogg
       Subscriptions Page: Abonnementsside
-    Hide Channel Playlists: Skjul kanalspilleliste
+    Hide Channel Playlists: Skjul fane for "spillelister" i kanalar
     Hide Channel Releases: Skjul kanalpubliseringer
-    Hide Channel Podcasts: Skjul kanal-nettradioopptak
+    Hide Channel Podcasts: Skjul fane for "podcaster" i kanaler
     Hide Subscriptions Videos: Skjul abonnementsvideoer
-    Hide Subscriptions Shorts: Skjul abonnements-kortvideoer
+    Hide Subscriptions Shorts: Skjul Shorts
     Hide Subscriptions Live: Skjul abonnement det sendes direkte fra
+    Hide Profile Pictures in Comments: Skjul profilbilder i kommentarfeltet
+    Hide Channel Home: Skjule fane for "start" i kanaler
+    Hide Videos and Playlists Containing Text: Skjul videoer og spillelister som inneholder
+      tekst
+    Hide Channels Already Exists: Kanal-ID-en finnes allerede
+    Hide Videos and Playlists Containing Text Placeholder: Ord, del av ord eller setning
+    Hide Channels Invalid: Kanal-ID-en var ugyldig
   The app needs to restart for changes to take effect. Restart and apply change?: Start
     programmet på ny for å ta i bruk endringene?
   SponsorBlock Settings:
@@ -430,7 +527,7 @@ Settings:
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock-API-nettadresse
       (forvalget er https://sponsor.ajay.app)
     Enable SponsorBlock: Skru på SponsorBlock
-    SponsorBlock Settings: SponsorBlock-innstillinger
+    SponsorBlock Settings: Innstillinger for SponsorBlock
     Skip Options:
       Do Nothing: Ikke gjør noe
       Prompt To Skip: Spør om å hoppe over
@@ -439,10 +536,12 @@ Settings:
       Show In Seek Bar: Vis i blafringsfelt
     Category Color: Kategorifarge
     UseDeArrowTitles: Bruk DeArrow-videonavn
+    UseDeArrowThumbnails: Bruk DeArrow for miniatyrbilder
   External Player Settings:
     Custom External Player Arguments: Egendefinerte argumenter for ekstern avspiller
     Custom External Player Executable: Egendefinert kjørbar fil for ekstern avspiller
-    Ignore Unsupported Action Warnings: Ignorer advarsler om ustøttede handlinger
+    Ignore Unsupported Action Warnings: Ignorer advarsler om handlinger som ikke er
+      støttet
     External Player Settings: Innstillinger for ekstern avspiller
     External Player: Ekstern avspiller
     Players:
@@ -450,7 +549,7 @@ Settings:
         Name: Ingen
   Download Settings:
     Choose Path: Velg sti
-    Download Settings: Nedlastingsinnstillinger
+    Download Settings: Innstillinger for nedlastninger
     Download in app: Last ned i programmet
     Open in web browser: Åpne i nettleser
     Download Behavior: Nedlastingsadferd
@@ -458,7 +557,7 @@ Settings:
   Parental Control Settings:
     Parental Control Settings: Foreldrekontroll
     Hide Search Bar: Skjul søkefelt
-    Show Family Friendly Only: Kun vis familievennlige
+    Show Family Friendly Only: Vis kun familievennlig innhold
     Hide Unsubscribe Button: Skjul knapp for opphevelse av abonnement
   Experimental Settings:
     Experimental Settings: Eksperimentelle innstillinger
@@ -467,7 +566,7 @@ Settings:
       anbefales. Bruk på egen risiko.
   Password Settings:
     Remove Password: Fjern passord
-    Password Settings: Passordinnstillinger
+    Password Settings: Innstillinger for passord
     Set Password To Prevent Access: Sett et passord for å forhindre tilgang til innstillingene
     Set Password: Sett passord
   Password Dialog:
@@ -475,23 +574,20 @@ Settings:
     Enter Password To Unlock: Skriv inn passord for å låse opp innstillinger
     Password Incorrect: Feil passord
     Password: Passord
+  Return to Settings Menu: Gå tilbake til menyen for innstillinger
 About:
   #On About page
   About: 'Om'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Denne
-    gemenslig frie programvaren er lisensiert AGPL-3.0.'
 
   FAQ: Ofte stilte spørsmål
   Downloads / Changelog: Nedlastninger / Endringslogg
-  Licensed under the AGPLv3: Lisensiert AGPLv3.
   Help: Hjelp
-  View License: Vis lisens
   Donate: Doner
   Website: Nettsted
   Report a problem: Rapporter et problem
   Source code: Kildekode
-  Please read the: Les
+  Please read the: Vennligst les
   Mastodon: Mastodon
   Email: E-post
   Blog: Blogg
@@ -500,16 +596,16 @@ About:
   these people and projects: disse folkene og prosjektene
   FreeTube is made possible by: FreeTube er gjort mulig av
   Credits: Bidragsytere
-  room rules: romregler
+  room rules: reglene for rommet
   GitHub issues: GitHub-problemsporer
   FreeTube Wiki: FreeTube-wiki
   GitHub releases: GitHub-utgivelser
   Beta: Beta
   Chat on Matrix: Snakk med oss på Matrix
   Discussions: Diskusjoner
+  Licensed under the: Lisensiert under
+  AGPLv3: AGPLv3
 Channel:
-  Subscriber: 'Abonnent'
-  Subscribers: 'Abonnenter'
   Subscribe: 'Abonner'
   Unsubscribe: 'Opphev abonnement'
   Search Channel: 'Søk i kanal'
@@ -553,11 +649,11 @@ Channel:
   Community:
     This channel currently does not have any posts: Denne kanalen har ingen oppføringer
   Shorts:
-    This channel does not currently have any shorts: Denne kanalen har ingen kortvideoer
+    This channel does not currently have any shorts: Denne kanalen har ingen Shorts-videoer
   Live:
     Live: Direkte
     This channel does not currently have any live streams: Denne kanalen har ikke
-      noen direktestrømmer
+      noen direktesendinger
   Podcasts:
     Podcasts: Nettradioopptak
     This channel does not currently have any podcasts: Denne kanalen har ingen nettradioopptak
@@ -581,48 +677,19 @@ Video:
   # As in a Live Video
   Live: 'Direkte'
   Live Now: 'Direkte'
-  Live Chat: 'Sanntidssludring'
-  Enable Live Chat: 'Slå på sanntidssludring'
-  Live Chat is currently not supported in this build.: 'Sanntidssludring støttes ikke
-    i denne versjonen.'
+  Live Chat: 'Direktechat'
+  Enable Live Chat: 'Slå på direktechat'
+  Live Chat is currently not supported in this build.: 'Direktechat støttes ikke i
+    denne versjonen.'
   'Chat is disabled or the Live Stream has ended.': 'Sludringen er slått av, eller
     så er direktesendingen avsluttet.'
-  Live chat is enabled. Chat messages will appear here once sent.: 'Sanntidssludring
-    er påslått. Meldinger vil vises her når de er sendt.'
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Sanntidssludring
+  Live chat is enabled. Chat messages will appear here once sent.: 'Direktechat er
+    påslått. Meldinger vil vises her når de er sendt.'
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Direktechat
     støttes for tiden ikke med Invidious-API-et. Direkte tilkobling til YouTube kreves.'
   Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Mai'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Des'
-    Second: 'Sekund'
-    Seconds: 'Sekunder'
-    Hour: 'Time'
-    Hours: 'Timer'
-    Day: 'Dag'
-    Days: 'Dager'
-    Week: 'Uke'
-    Weeks: 'Uker'
-    Month: 'Måned'
-    Months: 'Måneder'
-    Year: 'År'
-    Years: 'År'
-    Ago: 'Siden'
-    Upcoming: 'Har premiere'
-    Minutes: Minutter
-    Minute: Minutt
     In less than a minute: Om mindre enn ett minutt
   Published on: 'Publisert'
-  Publicationtemplate: '{number} {unit} siden'
 #& Videos
   audio only: Bare lyd
   video only: Bare video
@@ -674,7 +741,7 @@ Video:
   Premieres on: Har première
   Premieres: Première
   Upcoming: Kommende
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Sanntidssludring
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Direktechat
     er ikke tilgjengelig for denne strømmen. Opplasteren kan ha skrudd det av.
 Videos:
   #& Sort By
@@ -686,16 +753,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vis full spilleliste'
-  Videos: 'Videoer'
-  View: 'Visning'
-  Views: 'Visninger'
   Last Updated On: 'Sist oppdatert'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Spilleliste
-Toggle Theatre Mode: 'Teatermodus'
 Change Format:
   Change Media Formats: 'Endre videoformater'
   Use Dash Formats: 'Bruk DASH-formater'
@@ -758,8 +821,6 @@ Local API Error (Click to copy): 'Lokal API-feil (Klikk her for å kopiere)'
 Invidious API Error (Click to copy): 'Invidious-API-feil (Klikk her for å kopiere)'
 Falling back to Invidious API: 'Faller tilbake til Invidious-API-et'
 Falling back to Local API: 'Faller tilbake til det lokale API-et'
-Subscriptions have not yet been implemented: 'Abonnement har ikke blitt implementert
-  enda'
 Loop is now disabled: 'Gjenta er nå deaktivert'
 Loop is now enabled: 'Gjenta er nå aktivert'
 Shuffle is now disabled: 'Tilfeldig avspilling er nå deaktivert'
@@ -779,8 +840,8 @@ Profile:
   Removed {profile} from your profiles: Fjernet {profile} fra dine profiler
   Your default profile has been set to {profile}: 'Din forvalgte profil har blitt
     satt til {profile}'
-  Profile has been updated: Profil oppdatert
-  Profile has been created: Profil opprettet
+  Profile has been updated: Profilen har blitt oppdatert
+  Profile has been created: Profilen har blitt opprettet
   Your profile name cannot be empty: Profilnavnet ditt kan ikke stå tomt
   Profile could not be found: Fant ikke profilen
   All subscriptions will also be deleted.: Alle abonnementer vil også bli slettet.
@@ -809,13 +870,16 @@ Profile:
     De samme kanalene vil bli slettet i enhver profil de finnes i.
   Select None: Velg ingen
   Delete Selected: Slett valgte
-  Add Selected To Profile: Legg til valgt i profil
+  Add Selected To Profile: Legg til de valgte kanalene til profilen
   Subscription List: Abonnementsliste
   Profile Preview: Profilforhåndsvisning
   Custom Color: Egendefinert farge
   Profile Filter: Profilfilter
   Profile Settings: Profilinnstillinger
   Toggle Profile List: Slå av/på profilliste
+  Profile Name: Profilnavn
+  Create Profile Name: Lag profilnavn
+  Edit Profile Name: Endre profilnavn
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Denne
   videoen er utilgjengelig grunnet manglende formater. Dette kan skyldes tilgangbegrensninger
   i ditt land.
@@ -888,8 +952,6 @@ Playing Next Video Interval: Spiller av neste video nå. Klikk her for å avbryt
 More: Mer
 Unknown YouTube url type, cannot be opened in app: Ukjent YouTube-nettadressetype,
   kan ikke åpnes i programmet
-Hashtags have not yet been implemented, try again later: Emneknagger er ikke implementert
-  enda, prøv igjen senere
 Open New Window: Åpne et nytt vindu
 Default Invidious instance has been cleared: Fjernet forvalgt Invidious-instans
 Default Invidious instance has been set to {instance}: Forvalgt Invidious-instans
@@ -906,8 +968,6 @@ Channels:
   Search bar placeholder: Søk i kanaler
   Count: Fant {number} kanal(er).
   Empty: Kanallisten din er tom.
-  Unsubscribe: Opphev abonnement
-  Unsubscribed: '{channelName} ble fjernet fra dine abonnementer'
   Unsubscribe Prompt: Opphev abonnement på «{channelName}»?
 Chapters:
   Chapters: Kapitler
@@ -931,3 +991,34 @@ Hashtag:
   This hashtag does not currently have any videos: Denne emneknaggen har ingen videoer
     enda
 checkmark: ✓
+Cancel: Avbryt
+Yes, Restart: Ja, start på nytt
+Search Listing:
+  Label:
+    Subtitles: Undertekster
+    4K: 4K
+    Closed Captions: Undertekster
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Ny
+    3D: 3D
+Feed:
+  Refresh Feed: Oppdater {subscriptionName}
+Yes, Delete: Ja, slett
+Keys:
+  alt: Alt
+  arrowup: Piltast opp
+  arrowleft: Venstre piltast
+  arrowright: Høyre piltast
+  ctrl: Ctrl
+  arrowdown: Piltast ned
+Right-click or hold to see history: Høyreklikk eller hold musepekeren over for å se
+  historikk
+Close Banner: Lukk banner
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Yes, Open Link: Ja, åpne lenke
+Display Label: '{label}: {value}'
+Go to page: Gå til {page}
+Search character limit: Spørringen er over tegngrensen på {searchCharacterLimit}
diff --git a/static/locales/ne.yaml b/static/locales/ne.yaml
index 88cb5e2749fe1..6ff55a8728c96 100644
--- a/static/locales/ne.yaml
+++ b/static/locales/ne.yaml
@@ -96,9 +96,6 @@ Most Popular: 'सबैभन्दा लोकप्रिय'
 Playlists: 'प्लेसूचीहरू'
 User Playlists:
   Your Playlists: 'तपाईंका प्लेसूचीहरू'
-  Playlist Message: 'यो पृष्ठले पूरै काम गर्ने प्लेसूचीहरूको प्रतिबिम्बित गर्दैन।
-    यसले तपाईंले बचत गर्नुभएका वा मन पराउनुभएका भिडियोहरू मात्र सूचीबद्ध गर्दछ। काम
-    सकिएपछि हाल यहाँ रहेका सबै भिडियोहरू ''मन पराइएका'' प्लेसूचीमा स्थानान्तरण गरिनेछ।'
 Settings:
   # On Settings Page
   Theme Settings: {}
diff --git a/static/locales/nl.yaml b/static/locales/nl.yaml
index 93a2dc8100c48..df79871d74811 100644
--- a/static/locales/nl.yaml
+++ b/static/locales/nl.yaml
@@ -129,13 +129,6 @@ Most Popular: 'Populairst'
 Playlists: 'Afspeel­lijsten'
 User Playlists:
   Your Playlists: 'Uw afspeel­lijsten'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Je
-    opgeslagen video's is leeg. Klik op de opslaan knop in de hoek van een video om
-    het hier in de lijst te plaatsen
-  Playlist Message: Deze pagina is niet reflectief van volledig functionele afspeellijst.
-    Er worden alleen video's weergegeven die jij hebt opgeslagen of gefavoriet. Wanneer
-    we klaar zijn met de ontwikkeling van deze feature zullen al deze video's worden
-    gemigreerd naar de 'favorieten' afspeellijst.
   Search bar placeholder: Zoeken naar afspeel­lijsten
   Empty Search Message: Deze afspeel­lijst bevat geen video's die overeen­komen met
     de zoek­opdracht
@@ -194,11 +187,9 @@ User Playlists:
   Remove Watched Videos: Bekeken video's verwijderen
   Add to Favorites: Toevoegen aan {playlistName}
   Remove from Favorites: Verwijderen uit {playlistName}
-  Disable Quick Bookmark: Snelle bladwijzers uitschakelen
   SinglePlaylistView:
     Toast:
       Video has been removed: Video is verwijderd
-      Quick bookmark disabled: Snelle bladwijzers uitgeschakeld
       Playlist has been updated.: De afspeel­lijst is bijgewerkt.
       This video cannot be moved up.: Deze video kan niet omhoog verplaatst worden.
       This video cannot be moved down.: Deze video kan niet omlaag verplaatst worden.
@@ -235,9 +226,6 @@ User Playlists:
   This playlist currently has no videos.: Deze afspeel­lijst bevat geen video's.
   Enable Quick Bookmark With This Playlist: Snelle blad­wijzers inschakelen voor deze
     afspeel­lijst
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Weet
-    u zeker dat u alle bekeken video's uit deze afspeel­lijst wilt verwijderen? Dit
-    kan niet ongedaan gemaakt worden.
   Are you sure you want to delete this playlist? This cannot be undone: Weet u zeker
     dat u deze afspeel­lijst wilt verwijderen? Dit kan niet ongedaan gemaakt worden.
   Playlists with Matching Videos: Afspeel­lijsten met overeen­komende video's
@@ -287,8 +275,6 @@ Settings:
       End: 'Eind'
       Hidden: Verborgen
       Blur: Vervagen
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instantie
-      (Standaard is https://invidious.snopyta.org)'
     Region for Trending: 'Regio voor trending'
         #! List countries
     Check for Latest Blog Posts: Op nieuwe blog­posts controleren
@@ -460,38 +446,9 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Abonnement­instellingen'
     Hide Videos on Watch: 'Bekeken video''s verbergen'
-    Manage Subscriptions: 'Abonnementen beheren'
     Fetch Feeds from RSS: Feeds ophalen via RSS
     Fetch Automatically: Feed automatisch ophalen
-    Only Show Latest Video for Each Channel: Alleen nieuwste video voor elk kanaal
-      tonen
     Confirm Before Unsubscribing: Onbedoeld deabonneren voor­komen
-  Advanced Settings:
-    Advanced Settings: 'Geavanceerde Instellingen'
-    Enable Debug Mode (Prints data to the console): 'Schakel Debug Modus in (Print
-      data naar console)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy Adres (Voorbeeld:
-      SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Door
-      op "TEST PROXY" te klikken zal er een verzoek worden gestuurd naar https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Gebruik Tor / Proxy voor API calls'
-    TEST PROXY: 'TEST PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Zie Publieke Instanties'
-    Clear History:
-      Clear History: 'Geschiedenis Opschonen'
-      # On Click
-      Are you sure you want to delete your history?: 'Weet u zeker dat u uw geschiedenis
-        wil verwijderen?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Abonnementen Opschonen'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Weet u zeker dat u alle
-        abonnementen wil verwijderen?'
-      #& Yes
-      #& No
 
   Data Settings:
     History object has insufficient data, skipping item: Geschiedenis object heeft
@@ -512,9 +469,6 @@ Settings:
     Export YouTube: YouTube exporteren
     Export FreeTube: FreeTube exporteren
     Export Subscriptions: Abonnementen exporteren
-    Import NewPipe: NewPipe importeren
-    Import YouTube: YouTube importeren
-    Import FreeTube: Importeer FreeTube
     Import Subscriptions: Abonnementen importeren
     Select Export Type: Exporteertype selecteren
     Select Import Type: Importeertype selecteren
@@ -527,7 +481,6 @@ Settings:
       met succes geëxporteerd
     All watched history has been successfully imported: De bekeken geschiedenis is
       met succes geïmporteerd
-    Check for Legacy Subscriptions: Op legacy-abonnementen controleren
     Manage Subscriptions: Abonnementen beheren
     Export Playlists: Afspeellijsten exporteren
     All playlists has been successfully imported: Alle speellijsten zijn met succes
@@ -575,7 +528,6 @@ Settings:
     Hide Chapters: Hoofdstukken verbergen
     Hide Upcoming Premieres: Aankomende premières verbergen
     Hide Featured Channels: Uitgelichte kanalen verbergen
-    Blur Thumbnails: Miniaturen vervagen
     Hide Channel Playlists: Kanaal­afspeellijsten verbergen
     Hide Channel Community: Kanaal­gemeenschap verbergen
     Hide Channels: Video's van kanalen verbergen
@@ -676,39 +628,11 @@ Settings:
     Password Incorrect: Wachtwoord onjuist
     Unlock: Ontgrendelen
     Enter Password To Unlock: Voer wachtwoord in om instellingen te ontgrendelen
-  Expand All Settings Sections: Alle instellingen­secties uitvouwen
   Sort Settings Sections (A-Z): Instellingen­secties sorteren (A-Z)
 About:
   #On About page
   About: 'Over'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Dit
-    is copyleft software en is vrij beschikbaar onder de AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Een probleem gevonden? Idee voor een feature? Wil je helpen? Ga naar onze GitHub
-    pagina. Pull requests zijn welkom.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Hartelijk
-    dank naar de Mensen en Projecten die FreeTube mogelijk maken!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Wil
-    je chatten? Kom op onze Element / Matrix Server. Lees alstublieft eerst de groep
-    regels voordat u in de chat springt.'
-
-  'Looking for help? Check out our Wiki page.': 'Heeft u hulp nodig? Bezichtig onze
-    Wiki pagina.'
-
-  Check out our Firefox extension!: 'Bekijk onze Firefox extensie!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Als
-    u FreeTube met plezier gebruikt denk er over na om te doneren via Liberapay of
-    via ons Bitcoin adres.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Laatste FreeTube nieuws'
-
 #On Channel Page
   Donate: Doneren
   these people and projects: deze mensen en projecten
@@ -731,16 +655,12 @@ About:
   Help: Hulp
   GitHub releases: GitHub-uitgaven
   Downloads / Changelog: Downloads en wijzigings­logboek
-  View License: Licentie bekijken
-  Licensed under the AGPLv3: Vrijgegeven onder de AGPLv3 licentie
   Source code: Broncode
   Beta: Bèta
   Discussions: Discussies
   AGPLv3: AGPLv3
   Licensed under the: Gelicentieerd onder de
 Channel:
-  Subscriber: 'Abonnee'
-  Subscribers: 'Abonnees'
   Subscribe: 'Abonneren'
   Unsubscribe: 'Deabonneren'
   Search Channel: 'Kanaal zoeken'
@@ -835,37 +755,8 @@ Video:
     wordt momenteel niet ondersteund door de Invidious API. Een directe verbinding
     met YouTube is nodig.'
   Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mrt'
-    Apr: 'Apr'
-    May: 'Mei'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Dec'
-    Second: 'Seconde'
-    Seconds: 'Seconden'
-    Hour: 'Uur'
-    Hours: 'Uur'
-    Day: 'Dag'
-    Days: 'Dagen'
-    Week: 'Week'
-    Weeks: 'Weken'
-    Month: 'Maand'
-    Months: 'Maanden'
-    Year: 'Jaar'
-    Years: 'Jaar'
-    Ago: 'Geleden'
-    Upcoming: 'Première start op'
-    Minutes: Minuten
-    Minute: Minuut
     In less than a minute: In minder dan één minuut
   Published on: 'Gepubliceerd op'
-  Publicationtemplate: '{number} {unit} geleden'
 #& Videos
   Autoplay: Automatisch afspelen
   Play Previous Video: Vorige video afspelen
@@ -933,9 +824,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Volledige afspeellijst bekijken'
-  Videos: 'Video''s'
-  View: 'Weergave'
-  Views: 'Weergaven'
   Last Updated On: 'Laatst bijgewerkt op'
 
 # On Video Watch Page
@@ -951,7 +839,6 @@ Playlist:
     VideoTitleDescending: Titel (Z-A)
     DateAddedOldest: Eerst toegevoegd bovenaan
     Custom: Aangepast
-Toggle Theatre Mode: 'Theatermodus omschakelen'
 Change Format:
   Change Media Formats: 'Videoformaten veranderen'
   Use Dash Formats: 'DASH-formaten gebruiken'
@@ -1016,7 +903,6 @@ Local API Error (Click to copy): 'Fout in lokale API (Klik om te kopiëren)'
 Invidious API Error (Click to copy): 'Fout in API van Invidious (Klik op te kopiëren)'
 Falling back to Invidious API: 'Terugvallen op Invidious API'
 Falling back to Local API: 'Terugvallen op lokale API'
-Subscriptions have not yet been implemented: 'Abonnementen zijn nog niet geïmplementeerd'
 Loop is now disabled: 'Herhalen is nu uitgeschakeld'
 Loop is now enabled: 'Herhalen is nu ingeschakeld'
 Shuffle is now disabled: 'Willekeurig afspelen is nu uitgeschakeld'
@@ -1127,8 +1013,8 @@ Tooltips:
       kan worden geopend in FreeTube is aangeklikt.\nStandaard zal FreeTube de aangeklikte
       link openen in je standaardbrowser.\n"
   External Player Settings:
-    Custom External Player Arguments: Aangepaste opdrachtregelargumenten, gescheiden
-      door puntkomma's (';'), die je wil doorgeven aan de externe videospeler.
+    Custom External Player Arguments: Aangepaste opdrachtregelargumenten, die je wil
+      doorgeven aan de externe videospeler.
     Ignore Warnings: Onderdruk waarschuwingen wanneer de geselecteerde videospeler
       een opgegeven actie niet ondersteund (bijv. afspeellijsten omkeren, etc.).
     Custom External Player Executable: Standaard gaat FreeTube er vanuit dat de gekozen
@@ -1164,8 +1050,6 @@ Playing Next Video Interval: Volgende video wordt afgespeeld. Klik om te onderbr
   | Volgende video wordt afgespeeld in {nextVideoInterval} seconde. Klik om te onderbreken.
   | Volgende video wordt afgespeeld in {nextVideoInterval} seconden. Klik om te onderbreken.
 More: Meer
-Hashtags have not yet been implemented, try again later: Hastags zijn nog niet geïmplementeerd,
-  probeer het later nogmaals
 Unknown YouTube url type, cannot be opened in app: Onbekende YouTube-URL; de URL kan
   niet worden geopend in de app
 Open New Window: Nieuw venster openen
@@ -1191,8 +1075,6 @@ Channels:
   Count: '{number} kanaal/kanalen gevonden'
   Channels: Kanalen
   Empty: Uw lijst van kanalen is momenteel leeg.
-  Unsubscribe: Deabonneren
-  Unsubscribed: '{channelName} is verwijderd uit uw lijst van abonnementen'
   Unsubscribe Prompt: Weet u zeker dat u zich wilt deabonneren van ‘{channelName}’?
 Screenshot Error: Schermafbeelding kon niet worden opgeslagen. {error}
 Preferences: Voorkeuren
diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index d2b542bcfdcff..9d1fb5a5cb34b 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -34,6 +34,15 @@ Forward: 'Framover'
 Global:
   Videos: 'Videoar'
 
+  Counts:
+    Comment Count: 1 kommentar | {count} kommentarar
+    Video Count: 1 video | {count} videoar
+    Channel Count: 1 kanal | {count} kanalar
+    Subscriber Count: 1 abonnent | {count} abonnentar
+    View Count: 1 visning | {count} visningar
+  Shorts: Shorts
+  Live: Direkte
+  Community: Fellesskap
 Version {versionNumber} is now available!  Click for more details: 'Versjon {versionNumber}
   er no tilgjengeleg! Klikk for meir informasjon'
 Download From Site: 'Last ned frå nettstaden'
@@ -104,12 +113,6 @@ Most Popular: 'Mest populært'
 Playlists: 'Spelelister'
 User Playlists:
   Your Playlists: 'Dine spelelister'
-  Playlist Message: 'Denne sida reflekterer ikkje fullt fungerande spelelister. Den
-    viser berre videoar som du har lagra eller lagt til favorittar. Når arbeidet er
-    ferdig, blir alle videoane som for augeblikket er her overført til ei "Favoritt"-speleliste.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Du
-    har ingen lagra videoar for augeblikket. Klikk på "Lagre"-knappen i hjørnet av
-    ein video slik at den bli oppført her'
   Search bar placeholder: Søk i speleliste
   Empty Search Message: Det er ingen videoar i denne spelelista som samsvarar med
     søket ditt
@@ -150,8 +153,6 @@ Settings:
       Beginning: 'Begynning'
       Middle: 'Mellom'
       End: 'Slutt'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious-førekomst
-      (forvalet er https://invidious.snopyta.org)'
     View all Invidious instance information: 'Vis informasjon om alle Invidious-førekomstar'
     Region for Trending: 'Region for "På veg opp"'
         #! List countries
@@ -300,7 +301,6 @@ Settings:
     Subscription Settings: 'Abonnementinnstillingar'
     Hide Videos on Watch: 'Skjul sette videoar'
     Fetch Feeds from RSS: 'Hent informasjonkanalar frå RSS'
-    Manage Subscriptions: 'Behandle abonnement'
     Fetch Automatically: Hent informasjonkanalar automatisk
   Distraction Free Settings:
     Distraction Free Settings: '"Ikkje forstyrr"-innstillingar'
@@ -329,10 +329,6 @@ Settings:
     Select Import Type: 'Vel importtype'
     Select Export Type: 'Vel eksporttype'
     Import Subscriptions: 'Importer abonnement'
-    Import FreeTube: 'Importer FreeTube'
-    Import YouTube: 'Importer YouTube'
-    Import NewPipe: 'Importer NewPipe'
-    Check for Legacy Subscriptions: 'Sjå etter utdaterte abonnement'
     Export Subscriptions: 'Eksporter abonnement'
     Export FreeTube: 'Eksporter FreeTube'
     Export YouTube: 'Eksporter YouTube'
@@ -442,8 +438,6 @@ About:
   About: 'Om'
   Beta: 'Beta'
   Source code: 'Kjeldekode'
-  Licensed under the AGPLv3: 'Lisensiert under AGPLv3'
-  View License: 'Vis lisens'
   Downloads / Changelog: 'Nedlastingar / Endringslogg'
   GitHub releases: 'GitHub-utgjevingar'
   Help: 'Hjelp'
@@ -511,8 +505,6 @@ Profile:
   Profile Filter: Profilfilter
   Profile Settings: Profilinnstillingar
 Channel:
-  Subscriber: 'Abonnent'
-  Subscribers: 'Abonnentar'
   Subscribe: 'Abonner'
   Unsubscribe: 'Opphev abonnement'
   Channel has been removed from your subscriptions: 'Kanalen har blitt fjerna frå
@@ -590,39 +582,10 @@ Video:
   video only: 'berre video'
   audio only: 'berre lyd'
   Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Mai'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Des'
-    Second: 'Sekund'
-    Seconds: 'Sekund'
-    Minute: 'Minutt'
-    Minutes: 'Minutt'
-    Hour: 'Time'
-    Hours: 'Timar'
-    Day: 'Dag'
-    Days: 'Dagar'
-    Week: 'Veke'
-    Weeks: 'Veker'
-    Month: 'Månad'
-    Months: 'Månadar'
-    Year: 'År'
-    Years: 'År'
-    Ago: 'Sidan'
-    Upcoming: 'Har premiere på'
     In less than a minute: Om mindre enn eit minutt
   Published on: 'Publisert på'
   Streamed on: 'Strauma på'
   Started streaming on: 'Begynte å straume på'
-  Publicationtemplate: '{number} {unit} sidan'
 #& Videos
   Sponsor Block category:
     outro: Avslutting
@@ -663,16 +626,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vis heile spelelista'
-  Videos: 'Videoar'
-  View: 'Vising'
-  Views: 'Visingar'
   Last Updated On: 'Sist oppdatert'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Speleliste
-Toggle Theatre Mode: 'Veksle teatermodus'
 Change Format:
   Change Media Formats: 'Endre videoformat'
   Use Dash Formats: 'Bruk DASH-format'
@@ -781,7 +740,7 @@ Tooltips:
       ekstern videoavspelar. Ver merksam på at Invidious-innstillingar ikkje påverker
       den eksterne videoavspelaren.
     Custom External Player Arguments: Eventuelle eigendefinerte kommandolinjeargument,
-      åtskilt med semikolon (";"), du vil at skal bli sendt til den eksterne videoavspelaren.
+      du vil at skal bli sendt til den eksterne videoavspelaren.
   Experimental Settings:
     Replace HTTP Cache: Deaktiver Electrons diskbaserte HTTP-hurtiglager og aktiver
       eit eigendefinert biletehurtiglager i minnet. Dette vil føre til ei auking i
@@ -797,8 +756,6 @@ Falling back to Local API: 'Faller tilbake til det lokale API-et'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Denne
   videoen er utilgjengeleg grunna manglande format. Dette kan skuldast tilgangsavgrensingar
   i ditt land.'
-Subscriptions have not yet been implemented: 'Abonnement har ikkje blitt implementert
-  enda'
 Loop is now disabled: 'Gjenta er no deaktivert'
 Loop is now enabled: 'Gjenta er no aktivert'
 Shuffle is now disabled: 'Tilfeldig avspeling er no deaktivert'
@@ -819,8 +776,6 @@ Playing Next Video Interval: Speler av neste video no. Klikk her for å avbryte.
   Speler av neste video om {nextVideoInterval} sekund. Klikk her for å avbryte.
 More: Meir
 Open New Window: Opne nytt vindauge
-Hashtags have not yet been implemented, try again later: Emneknaggar er ikkje implementert
-  enda, ver venleg og prøv igjen seinare
 Search Bar:
   Clear Input: Tøm inndata
 Are you sure you want to open this link?: Er du sikker på at du vil opne denne lenka?
@@ -832,9 +787,7 @@ Channels:
   Search bar placeholder: Søk etter kanalar
   Count: Fant {number} kanal(ar).
   Empty: Kanallista di er tom.
-  Unsubscribed: '{channelName} blei fjerna frå dine abonnement'
   Unsubscribe Prompt: Er du sikker på at du vil avslutte abonnementet på "{channelName}"?
-  Unsubscribe: Opphev abonnement
 Screenshot Success: Lagra skjermbilete som "{filePath}"
 Screenshot Error: Skjermbilete feila. {error}
 Downloading has completed: Nedlastinga av "{videoTitle}" er fullført
@@ -857,3 +810,12 @@ Default Invidious instance has been set to {instance}: Standard-Invidious-førek
   har blitt satt til {instance}
 External link opening has been disabled in the general settings: Opening av eksterne
   lenker har blitt deaktivert i innstillingane
+Go to page: Gå til {page}
+Search Listing:
+  Label:
+    8K: 8K
+    New: Ny
+    3D: 3D
+    4K: 4K
+    Subtitles: Undertekstar
+    Closed Captions: Undertekstar
diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index 6a9f24e01d584..405075f226751 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -100,8 +100,8 @@ Subscriptions:
   Subscriptions: 'Subskrypcje'
   Latest Subscriptions: 'Ostatnie subskrypcje'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Twoja
-    lista subskrypcji jest obecnie pusta. Zacznij dodawać subskrypcje, aby zobaczyć
-    je tutaj.'
+    lista subskrypcji jest obecnie pusta. Możesz zaimportować swoje subskrypcje w
+    Ustawieniach danych, klikając w „Zaimportuj subskrypcje”.'
   'Getting Subscriptions.  Please wait.': 'Pobieranie subskrypcji. Proszę czekać...'
   Refresh Subscriptions: Odśwież subskrypcje
   Getting Subscriptions. Please wait.: Pobieranie subskrypcji. Proszę poczekać.
@@ -129,19 +129,9 @@ Most Popular: 'Popularne'
 Playlists: 'Playlisty'
 User Playlists:
   Your Playlists: 'Twoje playlisty'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nie
-    masz żadnych zapisanych filmów. Kliknij przycisk „Zapisz film” w rogu filmu, aby
-    został on wymieniony na tej liście
-  Playlist Message: Ta strona nie odzwierciedla w pełni działających playlist. Są
-    tu jedynie wymienione filmy, które zapisałeś lub oznaczyłeś jako ulubione. Kiedy
-    prace nad tą stroną zostaną zakończone, wszystkie filmy tu obecne zostaną przeniesione
-    do playlisty „Ulubione”.
   Search bar placeholder: Szukaj playlist
   Empty Search Message: Na tej playliście nie ma filmów, które pasowałyby do Twojego
     zapytania
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Czy
-    na pewno chcesz usunąć wszystkie obejrzane filmy z tej playlisty? Nie można cofnąć
-    tej czynności.
   AddVideoPrompt:
     Search in Playlists: Szukaj w playlistach
     Save: Zapisz
@@ -192,11 +182,13 @@ User Playlists:
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Teraz
         ta playlista, zamiast „{oldPlaylistName}”, będzie używana dla funkcji Szybkiej
         Zakładki . Kliknij tutaj, by cofnąć zmianę
-      Quick bookmark disabled: Wyłączono Szybką Zakładkę
       Playlist {playlistName} is the new quick bookmark playlist.: Playlista „{playlistName}”
         jest od teraz playlistą używaną dla funkcji Szybkiej Zakładki.
       This playlist is already being used for quick bookmark.: Ta playlista jest już
         używana dla funkcji Szybkiej Zakładki.
+      This playlist has a video with a duration error: Ta playlista zawiera przynajmniej
+        jeden film bez określonego czasu trwania. Będą one rozmieszczone tak, jakby
+        ich czas trwania wynosił zero.
     Search for Videos: Szukaj filmów
   Are you sure you want to delete this playlist? This cannot be undone: Czy na pewno
     chcesz usunąć tę playlistę? Nie można cofnąć tej czynności.
@@ -238,7 +230,6 @@ User Playlists:
   Playlist Description: Opis playlisty
   Add to Favorites: Dodaj do „{playlistName}”
   Remove from Favorites: Usuń z „{playlistName}”
-  Disable Quick Bookmark: Wyłącz Szybką Zakładkę
   Enable Quick Bookmark With This Playlist: Włącz Szybką Zakładkę z tą playlistą
   Playlists with Matching Videos: Playlisty z pasującymi filmami
   Quick Bookmark Enabled: Włączono Szybką Zakładkę
@@ -253,6 +244,9 @@ User Playlists:
     na pewno chcesz usunąć 1 zduplikowany film z tej listy odtwarzania? Nie można
     tego cofnąć. | Czy na pewno chcesz usunąć {playlistItemCount} duplikatów wideo
     z tej listy odtwarzania? Nie można tego cofnąć.
+  Export Playlist: Eksportuj listę odtwarzania
+  The playlist has been successfully exported: Lista odtwarzania została pomyślnie
+    wyeksportowana
 History:
   # On History Page
   History: 'Historia'
@@ -265,7 +259,7 @@ Settings:
   # On Settings Page
   Settings: 'Ustawienia'
   General Settings:
-    General Settings: 'Ustawienia ogólne'
+    General Settings: 'Ogólne'
     Fallback to Non-Preferred Backend on Failure: 'Wycofaj się do niepreferowanego
       back-endu przy niepowodzeniu'
     Enable Search Suggestions: 'Włącz sugestie wyszukiwania'
@@ -287,8 +281,6 @@ Settings:
       End: 'Koniec'
       Hidden: Nie pokazuj
       Blur: Rozmyte
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Serwer Invidious
-      (Domyślnie jest https://invidious.snopyta.org)'
     Region for Trending: '„Na czasie” z obszaru'
         #! List countries
     Check for Latest Blog Posts: Sprawdź ostatnie wpisy na blogu
@@ -312,8 +304,10 @@ Settings:
     Auto Load Next Page:
       Tooltip: Wczytuj kolejne strony oraz komentarze automatycznie.
       Label: Automatycznie wczytaj kolejną stronę
+    Open Deep Links In New Window: Odnośniki URL przekazane do FreeTube otwieraj w
+      nowym oknie
   Theme Settings:
-    Theme Settings: 'Ustawienia wyglądu'
+    Theme Settings: 'Wygląd'
     Match Top Bar with Main Color: 'Dopasuj górną belkę do głównego koloru'
     Base Theme:
       Base Theme: 'Bazowy motyw'
@@ -328,6 +322,8 @@ Settings:
       Nordic: Nordycki
       Solarized Light: Nasłoneczniony jasny
       Solarized Dark: Nasłoneczniony ciemny
+      Gruvbox Dark: Gruvbox ciemny
+      Gruvbox Light: Gruvbox jasny
     Main Color Theme:
       Main Color Theme: 'Główny kolor motywu'
       Red: 'Czerwony'
@@ -375,6 +371,16 @@ Settings:
       Solarized Cyan: Nasłoneczniony cyjan
       Solarized Green: Nasłoneczniony zielony
       Solarized Yellow: Nasłoneczniony żółty
+      Gruvbox Dark Green: Gruvbox ciemnozielony
+      Gruvbox Dark Yellow: Gruvbox żółty
+      Gruvbox Dark Blue: Gruvbox niebieski
+      Gruvbox Dark Purple: Gruvbox ciemnopurpurowy
+      Gruvbox Dark Aqua: Gruvbox ciemny wodny
+      Gruvbox Dark Orange: Gruvbox ciemnopomarańczowy
+      Gruvbox Light Red: Gruvbox jasnoczerwony
+      Gruvbox Light Blue: Gruvbox jasnoniebieski
+      Gruvbox Light Purple: Gruvbox jasnopurpurowy
+      Gruvbox Light Orange: Gruvbox jasnopomarańczowy
     Secondary Color Theme: 'Drugi kolor motywu'
         #* Main Color Theme
     UI Scale: Skala UI
@@ -383,7 +389,7 @@ Settings:
     Hide Side Bar Labels: Schowaj etykiety paska bocznego
     Hide FreeTube Header Logo: Schowaj logo FreeTube z paska górnego
   Player Settings:
-    Player Settings: 'Ustawienia odtwarzacza'
+    Player Settings: 'Odtwarzacz'
     Play Next Video: 'Odtwórz następny film'
     Turn on Subtitles by Default: 'Domyślnie odtwarzaj z napisami'
     Autoplay Videos: 'Autoodtwarzanie filmów'
@@ -410,7 +416,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Przerwa przed kolejną pozycją playlisty
-    Next Video Interval: Czas do następnego filmu
+    Next Video Interval: Czas do następnego autoodtwarzania
     Scroll Volume Over Video Player: Kontroluj głośność kółkiem myszy na obszarze
       odtwarzacza
     Display Play Button In Video Player: Pokaż przycisk odtwarzania na odtwarzaczu
@@ -439,50 +445,17 @@ Settings:
       orientacji ekranu
     Skip by Scrolling Over Video Player: Przewijaj film kółkiem myszy na obszarze
       odtwarzacza
+    Autoplay Interruption Timer: Czas do przerwania autoodtwarzania
   Subscription Settings:
-    Subscription Settings: 'Ustawienia subskrypcji'
+    Subscription Settings: 'Subskrypcje'
     Hide Videos on Watch: 'Ukrywaj filmy po obejrzeniu'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Format exportu subskrypcji'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Zarządzaj subskrypcjami'
-    Import Subscriptions: 'Importuj subskrypcje'
-    Export Subscriptions: 'Eksportuj subskrypcje'
-    How do I import my subscriptions?: 'Jak zaimportować swoje subskrypcje?'
     Fetch Feeds from RSS: Pobierz subskrypcje z RSS
     Fetch Automatically: Automatycznie odświeżaj subskrypcje
-    Only Show Latest Video for Each Channel: Pokaż tylko najnowszy film z każdego
-      kanału
     Confirm Before Unsubscribing: Uniknij przypadkowego usunięcia subskrypcji
-  Advanced Settings:
-    Advanced Settings: 'Ustawienia zaawansowane'
-    Enable Debug Mode (Prints data to the console): 'Włącz tryb dubugowania (pokazuje
-      dane w konsoli)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adres proxy (przykład: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Kliknięcie
-      przycisku „SPRAWDŹ PROXY” wyśle zapytanie na https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Użyj proxy, lub sieci Tor do wywołań API'
-    TEST PROXY: 'SPRAWDŹ PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Zobacz publiczne serwery'
-    Clear History:
-      Clear History: 'Wyczyść historię'
-      # On Click
-      Are you sure you want to delete your history?: 'Czy jesteś pewny/a, że chcesz
-        usunąć swoją historię?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Wyczyść subskrypcje'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Czy jesteś pewny/a, że
-        chcesz usunąć wszystkie subskrypcje?'
-      #& Yes
-      #& No
 
+    To: do
+    'Limit the number of videos displayed for each channel': Ogranicz liczbę filmów
+      wyświetlanych dla każdego z kanałów
   Privacy Settings:
     Watch history has been cleared: Historia oglądania została wyczyszczona
     Are you sure you want to remove your entire watch history?: Jesteś pewny/a, że
@@ -494,7 +467,7 @@ Settings:
     Clear Search Cache: Wyczyść plik pamięci podręcznej wyszukiwań
     Save Watched Progress: Zapisuj postęp odtwarzania
     Remember History: Pamiętaj historię
-    Privacy Settings: Ustawienia prywatności
+    Privacy Settings: Prywatność
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Czy
       jesteś pewny/a, że chcesz usunąć wszystkie subskrypcje i profile? Nie będzie
       można tego cofnąć.
@@ -533,14 +506,10 @@ Settings:
     Export YouTube: Eksport do YouTube
     Export NewPipe: Eksport do NewPipe
     Export Subscriptions: Wyeksportuj subskrypcje
-    Import NewPipe: Import z NewPipe
-    Import YouTube: Import z YouTube
-    Import FreeTube: Import z FreeTube
     Import Subscriptions: Zaimportuj subskrypcje
     Select Export Type: Wybierz typ eksportu
     Select Import Type: Wybierz typ importu
-    Data Settings: Ustawienia danych
-    Check for Legacy Subscriptions: Sprawdź subskrypcje ze starej wersji
+    Data Settings: Dane
     Manage Subscriptions: Zarządzaj subskrypcjami
     Export Playlists: Wyeksportuj playlisty
     All playlists has been successfully exported: Wszystkie playlisty pomyślnie wyeksportowano
@@ -560,7 +529,7 @@ Settings:
         zaimportuj wyeksportowane playlisty."
       Label: Wyeksportuj playlisty dla starszych wersji FreeTube
   Distraction Free Settings:
-    Distraction Free Settings: Ustawienia skupienia uwagi
+    Distraction Free Settings: Skupienie uwagi
     Hide Live Chat: Schowaj czat na żywo
     Hide Popular Videos: Schowaj filmy „Popularne”
     Hide Trending Videos: Schowaj filmy „Na czasie”
@@ -581,23 +550,22 @@ Settings:
     Hide Channels Placeholder: ID kanału
     Display Titles Without Excessive Capitalisation: Wyświetlaj tytuły nie nadużywając
       wielkich liter i interpunkcji
-    Hide Channel Community: Schowaj społeczność kanału
-    Hide Channel Shorts: Schowaj filmy Short kanału
+    Hide Channel Community: Schowaj kartę kanału „Społeczność”
+    Hide Channel Shorts: Schowaj kartę kanału „Filmy Short”
     Hide Featured Channels: Schowaj polecane kanały
-    Hide Channel Playlists: Schowaj playlisty kanału
+    Hide Channel Playlists: Schowaj kartę kanału „Playlisty”
     Sections:
       Side Bar: Pasek boczny
       Channel Page: Strona kanału
       General: Ogólne
       Watch Page: Strona odtwarzacza
       Subscriptions Page: Strona subskrypcji
-    Hide Channel Releases: Schowaj wydawnictwa kanału
-    Hide Channel Podcasts: Schowaj podkasty kanału
+    Hide Channel Releases: Schowaj kartę kanału „Wydawnictwa”
+    Hide Channel Podcasts: Schowaj kartę kanału „Podkasty”
     Hide Subscriptions Videos: Schowaj filmy z subskrypcji
     Hide Subscriptions Shorts: Schowaj filmy Short z subskrypcji
     Hide Subscriptions Live: Schowaj transmisje live z subskrypcji
     Hide Profile Pictures in Comments: Nie pokazuj zdjęć profilowych w komentarzach
-    Blur Thumbnails: Rozmazuj miniaturki
     Hide Subscriptions Community: Schowaj „Społeczność” kanałów
     Hide Channels Invalid: Podane ID kanału jest niepoprawne
     Hide Channels Disabled Message: Niektóre z kanałów nie zostały przetworzone, ponieważ
@@ -610,6 +578,7 @@ Settings:
       poniższy tekst
     Hide Videos and Playlists Containing Text Placeholder: Słowo, fragment słowa,
       lub wyrażenie
+    Hide Channel Home: Schowaj kartę kanału „Główna”
   The app needs to restart for changes to take effect. Restart and apply change?: Aplikacja
     musi zostać ponownie uruchomiona, aby zmiany zostały wprowadzone. Uruchomić ponownie
     i zastosować zmiany?
@@ -628,14 +597,19 @@ Settings:
     Proxy Host: Host proxy
     Proxy Protocol: Protokół proxy
     Enable Tor / Proxy: Włącz Tor / Proxy
-    Proxy Settings: Ustawienia proxy
+    Proxy Settings: Proxy
+    Proxy Warning: FreeTube nie ma wbudowanego proxy, ale może połączyć z zewnętrznym
+      proxy. Na przykład z uruchomionym na Twoim komputerze, jak Tor, albo z uruchomionym
+      na zewnętrznym serwerze, takim jak SOCKS5 proxy, oferowanym przez niektórych
+      dostawców VPN. Po włączeniu upewnij się, że twoje proxy lub Tor są skonfigurowane
+      poprawnie, by FreeTube był w stanie wymieniać jakiekolwiek dane.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Powiadamiaj, kiedy segment sponsorowany
       zostanie pominięty
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Adres URL interfejsu
       API SponsorBlock (Domyślnie jest https://sponsor.ajay.app)
     Enable SponsorBlock: Włącz SponsorBlock
-    SponsorBlock Settings: Ustawienia SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Opcja pominięcia
       Auto Skip: Pomijaj automatycznie
@@ -653,26 +627,26 @@ Settings:
       odtwarzacza
     Ignore Unsupported Action Warnings: Ignoruj ostrzeżenia o nieobsługiwanych działaniach
     External Player: Zewnętrzny odtwarzacz
-    External Player Settings: Ustawienia zewnętrznego odtwarzacza
+    External Player Settings: Zewnętrzny odtwarzacz
     Players:
       None:
         Name: Żaden
     Ignore Default Arguments: Zignoruj argumenty domyślne
   Download Settings:
     Ask Download Path: Pytaj o lokalizację pobierania
-    Download Settings: Ustawienia pobierania
+    Download Settings: Pobieranie
     Choose Path: Wybierz folder
     Download Behavior: Sposób pobierania
     Download in app: Pobierz w aplikacji
     Open in web browser: Otwórz w przeglądarce
   Parental Control Settings:
-    Parental Control Settings: Ustawienia kontroli rodzicielskiej
+    Parental Control Settings: Kontrola rodzicielska
     Hide Unsubscribe Button: Schowaj przycisk „Odsubskrybuj”
     Show Family Friendly Only: Pokazuj tylko filmy przyjazne rodzinie
     Hide Search Bar: Schowaj pole wyszukiwania
   Experimental Settings:
     Replace HTTP Cache: Zastąp pamięć podręczną HTTP
-    Experimental Settings: Ustawienia eksperymentalne
+    Experimental Settings: Eksperymentalne
     Warning: Te ustawienia są w fazie testów i po włączeniu mogą powodować wywalanie
       się programu. Zalecane jest stworzenie kopii zapasowej. Używaj na własne ryzyko!
   Password Dialog:
@@ -681,61 +655,25 @@ Settings:
     Password Incorrect: Niepoprawne hasło
     Password: Hasło
   Password Settings:
-    Password Settings: Ustawienia hasła
+    Password Settings: Hasło
     Set Password To Prevent Access: Ustaw hasło, aby zabezpieczyć dostęp do ustawień
     Set Password: Ustaw hasło
     Remove Password: Usuń hasło
-  Expand All Settings Sections: Rozwiń wszystkie sekcje ustawień
   Sort Settings Sections (A-Z): Sortuj sekcje ustawień (A-Z)
+  Return to Settings Menu: Wróć do menu „Ustawienia”
 About:
   #On About page
   About: 'O projekcie'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ten
-    program copyleft jest objęty wolną licencją APGL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Znalazłeś/aś błąd? Masz pomysł na nową funkcję? Chcesz jakoś pomóc? Zajrzyj na
-    naszą stronę GitHub. Mile widziane pull requesty.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Wielkie
-    dzięki za wszystkich ludzi i projekty, dzięki którym istnienie FreeTube jest możliwe!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Chcesz
-    pogadać? Dołącz do naszej społeczności Element (serwer Matrix). Przejrzyj proszę
-    zasady zanim dołączysz.'
-
-  'Looking for help? Check out our Wiki page.': 'Szukasz pomocy? Sprawdź naszą stronę
-    Wiki.'
-
-  Check out our Firefox extension!: 'Sprawdź nasz dodatek do Firefoxa!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Jeśli
-    lubisz korzystać z FreeTube, rozważ darowiznę poprzez Liberapay lub naszego adresu
-    Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Ostatnie wieści o FreeTube'
-
 #On Channel Page
-  Translate via Weblate: Przetłumaczone poprzez Weblate
   Website: Strona internetowa
-  Source Code: Kod źródłowy
-  Release Notes: Informacje o wydaniu
   Blog: Blog
   Credits: Zasługi
   FAQ: FAQ
-  Wiki: Wiki
-  Report an Issue: Zgłoś problem
-  Channel Rules: Zasady kanału
   Email: E-mail
-  License: Licencja
   Beta: Beta
   Donate: Wesprzyj
-  Useful Links: Przydatne linki
   Help: Pomoc
-  Contact: Kontakt
   these people and projects: tym ludziom i projektom
   Translate: Przetłumacz
   room rules: zasady pokoju
@@ -748,16 +686,12 @@ About:
   FreeTube Wiki: Wiki FreeTube
   GitHub releases: wydania na GitHub
   Downloads / Changelog: Wydania / Lista zmian
-  View License: Zobacz licencję
-  Licensed under the AGPLv3: Na licencji AGPLv3
   Source code: Kod źródłowy
   FreeTube is made possible by: FreeTube powstał dzięki
   Discussions: Dyskusje
   Licensed under the: Licencjonowany na
   AGPLv3: AGPLv3
 Channel:
-  Subscriber: 'Subskrybent/ka'
-  Subscribers: 'subskrybentów'
   Subscribe: 'Zasubskrybuj'
   Unsubscribe: 'Odsubskrybuj'
   Search Channel: 'Przeszukaj kanał'
@@ -809,7 +743,7 @@ Channel:
     View Full Post: Zobacz całe posty
     Viewing Posts Only Supported By Invidious: Wyświetlanie postów jest wspierane
       tylko przez Invidious. Możesz zobaczyć zawartość nie korzystając z Invidious,
-      przechodząc do zakładki „Społeczność” danego kanału.
+      przechodząc do karty „Społeczność” danego kanału.
   Live:
     Live: Transmisje
     This channel does not currently have any live streams: Ten kanał nie ma obecnie
@@ -824,6 +758,9 @@ Channel:
   Podcasts:
     Podcasts: Podkasty
     This channel does not currently have any podcasts: Ten kanał nie ma żadnych podkastów
+  Home:
+    Home: Główna
+    View Playlist: Zobacz playlistę
 Video:
   Mark As Watched: 'Oznacz jako obejrzany'
   Remove From History: 'Usuń z historii'
@@ -852,38 +789,8 @@ Video:
     na żywo nie wspiera obecnie API Invidious. Konieczne jest połączenie bezpośrednie
     z YouTube.'
   Published:
-    Jan: 'sty.'
-    Feb: 'lut.'
-    Mar: 'mar.'
-    Apr: 'kwi.'
-    May: 'maj'
-    Jun: 'cze.'
-    Jul: 'lip.'
-    Aug: 'sie.'
-    Sep: 'wrz.'
-    Oct: 'paź.'
-    Nov: 'lis.'
-    Dec: 'gru.'
-    Second: 'sekundę'
-    Seconds: 'sekund/y'
-    Hour: 'godzinę'
-    Hours: 'godzin/y'
-    Day: 'dzień'
-    Days: 'dni'
-    Week: 'tydzień'
-    Weeks: 'tygodni/e'
-    Month: 'miesiąc'
-    Months: 'miesiące/y'
-    Year: 'rok'
-    Years: 'lat/a'
-    Ago: 'temu'
-    Upcoming: 'Premiera'
-    Minutes: minut/y
-    Minute: minutę
-    Less than a minute: mniej niż minutę
     In less than a minute: Za mniej niż minutę
   Published on: 'Opublikowano'
-  Publicationtemplate: '{number} {unit} temu'
 #& Videos
   Autoplay: Autoodtwarzanie
   Play Previous Video: Odtwórz poprzedni film
@@ -972,6 +879,16 @@ Video:
       zostanie wznowione, jak tylko połączenie zostanie odzyskane.
     Skipped segment: Pominięto segment {segmentCategory}
     Full Window: Pełny ekran
+  IP block: YouTube uniemożliwił odtworzenie filmów blokując Twój adres IP. Możesz
+    spróbować przełączyć się na inny, korzystając z VPN lub proxy.
+  AgeRestricted: Filmy z ograniczeniem wiekowym nie mogą być odtwarzane przez FreeTube,
+    ponieważ wymagają danych logowania do konta Google z potwierdzonym wiekiem użytkownika.
+  MembersOnly: Filmy tylko dla wspierających nie mogą być odtwarzane przez FreeTube,
+    ponieważ wymagają danych logowania do konta Googla oraz płatną subskrypcje kanału.
+  Unlisted: Niepubliczny
+  DeArrow:
+    Show Original Details: Pokaż szczegóły oryginału
+    Show Modified Details: Pokaż zmodyfikowane szczegóły
 Videos:
   #& Sort By
   Sort By:
@@ -982,9 +899,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Zobacz całą playlistę'
-  Videos: 'filmów'
-  View: 'wyświetlenie'
-  Views: 'wyświetleń'
   Last Updated On: 'Ostatnio zaktualizowano'
 
 # On Video Watch Page
@@ -1000,7 +914,8 @@ Playlist:
     Sort By: Sortuj
     AuthorAscending: Po autorze (A-Z)
     AuthorDescending: Po autorze (Z-A)
-Toggle Theatre Mode: 'Włącz/wyłącz tryb kinowy'
+    VideoDurationDescending: Czas trwania (od najdłuższych)
+    VideoDurationAscending: Czas trwania (od najkrótszych)
 Change Format:
   Change Media Formats: 'Zmień formaty wideo'
   Use Dash Formats: 'Użyj formatów DASH'
@@ -1068,7 +983,6 @@ Local API Error (Click to copy): 'Błąd lokalnego API (kliknij by skopiować)'
 Invidious API Error (Click to copy): 'Błąd API Invidious (kliknij by skopiować)'
 Falling back to Invidious API: 'Wycofywanie do API Invidious'
 Falling back to Local API: 'Wycofywanie do lokalnego API'
-Subscriptions have not yet been implemented: 'Subskrypcje nie zostały jeszcze wprowadzone'
 Loop is now disabled: 'Zapętlenie jest teraz wyłączone'
 Loop is now enabled: 'Zapętlenie jest teraz włączone'
 Shuffle is now disabled: 'Losowanie jest teraz wyłączone'
@@ -1124,7 +1038,7 @@ Profile:
   Other Channels: Inne kanały
   Subscription List: Lista subskrypcji
   Profile Filter: Filtr profilu
-  Profile Settings: Ustawienia profilu
+  Profile Settings: Profil
   Toggle Profile List: Włącz/wyłącz listę profili
   Open Profile Dropdown: Otwórz rozwijane menu profilu
   Close Profile Dropdown: Zamknij rozwijane menu profilu
@@ -1164,6 +1078,9 @@ Tooltips:
     External Link Handling: "Wybierz domyślne zachowanie kiedy odnośnik, który nie
       może zostać otworzony w FreeTube, został kliknięty.\nDomyślnie FreeTube otworzy
       kliknięty odnośnik w domyślnej przeglądarce.\n"
+    Open Deep Links In New Window: Odnośniki URL przekazane do FreeTube (np. przez
+      rozszerzenie przeglądarki, albo argumenty linii komend) są otwierane w nowym
+      oknie.
   Player Settings:
     Default Video Format: Ustaw formaty, które zostaną użyte do odtwarzania filmów.
       Formaty DASH obsługują wyższe rozdzielczości. Stare formaty są ograniczone do
@@ -1184,7 +1101,7 @@ Tooltips:
       ikony, która otworzy film (playlistę, jeśli są obsługiwane) w zewnętrznym odtwarzaczu.
       Uwaga! Ustawienia Invidious nie mają wpływu na zewnętrzny odtwarzacz.
     Custom External Player Arguments: Wszelkie niestandardowe argumenty wiersza poleceń,
-      oddzielone średnikami (';'), które chcesz przekazać do zewnętrznego odtwarzacza.
+      które chcesz przekazać do zewnętrznego odtwarzacza.
     Custom External Player Executable: FreeTube domyślnie przyjmie, że wybrany odtwarzacz
       jest do znalezienia za pomocą zmiennej środowiskowej PATH. Jeśli trzeba, można
       tutaj ustawić niestandardową ścieżkę.
@@ -1218,8 +1135,6 @@ Playing Next Video Interval: Odtwarzanie kolejnego filmu już za chwilę. Wciśn
 More: Więcej
 Unknown YouTube url type, cannot be opened in app: Nieznany typ adresu URL YouTube,
   nie można go otworzyć w aplikacji
-Hashtags have not yet been implemented, try again later: Hashtagi nie zostały jeszcze
-  wprowadzone, spróbuj później
 Open New Window: Otwórz nowe okno
 Default Invidious instance has been cleared: Domyślna instancja Invidious została
   wyczyszczona
@@ -1243,9 +1158,7 @@ Channels:
   Title: Lista kanałów
   Count: Znaleziono {number} kanał(y/ów).
   Empty: Twoja lista kanałów jest na razie pusta.
-  Unsubscribe: Odsubskrybuj
   Unsubscribe Prompt: Czy na pewno chcesz zrezygnować z subskrypcji „{channelName}”?
-  Unsubscribed: '{channelName} został usunięty z Twoich subskrypcji'
   Channels: Kanały
   Search bar placeholder: Przeszukaj kanały
 Clipboard:
@@ -1258,6 +1171,7 @@ Chapters:
     obecny rozdział: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Spis treści schowany, obecny
     rozdział: {chapterName}'
+  Key Moments: Kluczowe momenty
 Preferences: Preferencje
 Ok: Ok
 Hashtag:
@@ -1294,5 +1208,25 @@ Search Listing:
     Subtitles: Napisy
     Closed Captions: Napisy z opisami
     4K: 4K
+    New: Nowe
+    3D: 3D
+    VR180: VR180
+    8K: 8K
+    360 Video: 360°
 'Blocked opening potentially unsafe URL': 'Zablokowano otwarcie potencjalnie niebezpiecznego
   URL: "{url}".'
+Keys:
+  arrowup: Strzałka do góry
+  arrowright: Strzałka w prawo
+  arrowleft: Strzałka w lewo
+  arrowdown: Strzałka w dół
+  alt: Alt
+  ctrl: Ctrl
+Right-click or hold to see history: Kliknij prawym lub przytrzymaj, by zobaczyć historię
+shortcutJoinOperator: +
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Autoplay Interruption Timer: Automatyczne odtwarzanie zostało anulowane, z powodu
+  {autoplayInterruptionIntervalHours} godzin(y) braku aktywności
+Description:
+  Expand Description: '...więcej'
+  Collapse Description: Zwiń
diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml
index 71777ac7b5a8a..f659aa820d8e6 100644
--- a/static/locales/pt-BR.yaml
+++ b/static/locales/pt-BR.yaml
@@ -100,7 +100,9 @@ Subscriptions:
   Subscriptions: 'Inscrições'
   Latest Subscriptions: 'Últimas inscrições'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Sua
-    lista de inscrições está vazia no momento. Adicione algumas para vê-las aqui.'
+    lista de inscrições está vazia no momento. Se quiser importar suas inscrições,
+    acesse "Configurações de dados" e selecione "Importar inscrições" ou pesquise
+    um canal para inscrever-se.'
   'Getting Subscriptions.  Please wait.': 'Buscando inscrições. Por favor, aguarde.'
   Refresh Subscriptions: Atualizar inscrições
   'Getting Subscriptions. Please wait.': Obtendo inscrições. Por favor, aguarde.
@@ -128,13 +130,6 @@ Most Popular: 'Mais populares'
 Playlists: 'Playlists'
 User Playlists:
   Your Playlists: 'Suas playlists'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Os
-    seus vídeos salvos estão vazios. Clique no botão salvar no canto de um vídeo para
-    que ele seja listado aqui
-  Playlist Message: Esta página não reflete playlists totalmente funcionais. Ela lista
-    apenas os vídeos que você salvou ou adicionou aos favoritos. Quando o trabalho
-    terminar, todos os vídeos atualmente aqui serão migrados para uma playlist chamada
-    "Favoritos".
   Search bar placeholder: Pesquisar playlists
   Empty Search Message: Não há vídeos nesta playlist que correspondam à sua pesquisa
   You have no playlists. Click on the create new playlist button to create a new one.: Você
@@ -164,7 +159,6 @@ User Playlists:
   Edit Playlist Info: Editar informação da playlist
   Copy Playlist: Copiar playlist
   Enable Quick Bookmark With This Playlist: Habilitar "Quick Bookmark" para esta playlist
-  Disable Quick Bookmark: Desativar Favoritos Rápidos
   Delete Playlist: Excluir playlist
   Are you sure you want to delete this playlist? This cannot be undone: Tem certeza
     de que deseja excluir esta playlist? Isto não pode ser desfeito.
@@ -182,7 +176,6 @@ User Playlists:
     Toast:
       This playlist is now used for quick bookmark: Esta playlist agora é usada como
         "Quick Bookmark"
-      Quick bookmark disabled: Favoritos Rápidos desativado
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Esta
         playlist agora é usada como "Quick Bookmark" em vez de "{oldPlaylistName}".
         Clique aqui para desfazer
@@ -212,6 +205,9 @@ User Playlists:
         sendo usada como "Quick Bookmark".
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist "{playlistName}"
         é a nova playlist em "Quick Bookmark".
+      This playlist has a video with a duration error: Esta playlist contém pelo menos
+        um vídeo que não tem duração, ela será classificada como se sua duração fosse
+        zero.
     Search for Videos: Pesquisar vídeos
   AddVideoPrompt:
     Toast:
@@ -232,9 +228,6 @@ User Playlists:
       vídeos serão adicionados'
     "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
       vídeos já adicionados'
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Tem
-    certeza de que deseja remover todos os vídeos assistidos desta playlist? Isto
-    não pode ser desfeito.
   Remove Watched Videos: Remove vídeos assistidos
   Playlists with Matching Videos: Playlists com vídeos correspondentes
   Quick Bookmark Enabled: Quick Bookmark ativado
@@ -249,6 +242,8 @@ User Playlists:
     certeza de que deseja remover 1 vídeo assistido desta playlist? Isso não pode
     ser desfeito. | Tem certeza de que deseja remover {playlistItemCount} vídeos assistidos
     desta playlist? Isso não pode ser desfeito.
+  The playlist has been successfully exported: Playlist exportada com sucesso
+  Export Playlist: Exportar esta playlist
 History:
   # On History Page
   History: 'Histórico'
@@ -261,7 +256,7 @@ Settings:
   # On Settings Page
   Settings: 'Configurações'
   General Settings:
-    General Settings: 'Configurações gerais'
+    General Settings: 'Geral'
     Fallback to Non-Preferred Backend on Failure: 'Usar mecanismo de pesquisa alternativo
       em caso de falha'
     Enable Search Suggestions: 'Habilitar sugestões de pesquisa'
@@ -283,9 +278,7 @@ Settings:
       End: 'No fim'
       Hidden: Escondido
       Blur: Desfocar
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instância do
-      Invidious (A padrão é https://invidious.snopyta.org)'
-    Region for Trending: 'Região'
+    Region for Trending: 'Região de Tendências'
         #! List countries
     Check for Updates: Buscar por atualizações
     Check for Latest Blog Posts: Verificar se há novas postagens no blog
@@ -308,8 +301,9 @@ Settings:
     Auto Load Next Page:
       Label: Carregamento automático da próxima página
       Tooltip: Carregar páginas e comentários adicionais automaticamente.
+    Open Deep Links In New Window: Abrir URLs a partir do FreeTube em uma nova janela
   Theme Settings:
-    Theme Settings: 'Configurações de aparência'
+    Theme Settings: 'Tema'
     Match Top Bar with Main Color: 'Usar cor principal na barra superior'
     Base Theme:
       Base Theme: 'Tema base'
@@ -324,6 +318,8 @@ Settings:
       Nordic: Nordico
       Solarized Light: Claro Solarizado
       Solarized Dark: Escuro Solarizado
+      Gruvbox Light: Gruvbox modo claro
+      Gruvbox Dark: Gruvbox modo escuro
     Main Color Theme:
       Main Color Theme: 'Cor principal'
       Red: 'Vermelha'
@@ -371,6 +367,16 @@ Settings:
       Solarized Cyan: Ciano Solarizado
       Solarized Green: Verde Solarizado
       Solarized Orange: Laranja Solarizada
+      Gruvbox Dark Blue: Gruvbox modo azul escuro
+      Gruvbox Dark Purple: Gruvbox modo roxo escuro
+      Gruvbox Dark Aqua: Gruvbox modo água escura
+      Gruvbox Light Red: Gruvbox modo vermelho claro
+      Gruvbox Light Blue: Gruvbox modo azul claro
+      Gruvbox Light Purple: Gruvbox modo roxo claro
+      Gruvbox Light Orange: Gruvbox modo laranja claro
+      Gruvbox Dark Green: Gruvbox modo verde escuro
+      Gruvbox Dark Yellow: Gruvbox modo amarelo escuro
+      Gruvbox Dark Orange: Gruvbox modo laranja escuro
     Secondary Color Theme: 'Cor secundária'
         #* Main Color Theme
     UI Scale: Escala da Interface de Usuário
@@ -379,8 +385,7 @@ Settings:
     Hide Side Bar Labels: Ocultar título na barra lateral
     Hide FreeTube Header Logo: Ocultar logotipo FreeTube na barra superior
   Player Settings:
-    Player Settings: 'Configurações de reprodução'
-    Remember History: 'Lembrar do histórico'
+    Player Settings: 'Player'
     Play Next Video: 'Reproduzir próximo vídeo'
     Turn on Subtitles by Default: 'Ativar legendas por padrão'
     Autoplay Videos: 'Reprodução automática de vídeos'
@@ -407,7 +412,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Intervalo do próximo vídeo da lista de reprodução
-    Next Video Interval: Intervalo para o próximo vídeo
+    Next Video Interval: Temporizador de contagem regressiva para reprodução automática
     Display Play Button In Video Player: Mostrar botão "Reproduzir" no centro do player
     Scroll Volume Over Video Player: Alterar volume ao rolar sobre o player
     Fast-Forward / Rewind Interval: Intervalo para avançar/retroceder rapidamente
@@ -434,50 +439,17 @@ Settings:
     Enter Fullscreen on Display Rotate: Entrar em tela cheia ao girar o dispositivo
       para o modo paisagem
     Skip by Scrolling Over Video Player: Pular vídeo ao rolar sobre o player
+    Autoplay Interruption Timer: Temporizador de interrupção para reprodução automática
   Subscription Settings:
-    Subscription Settings: 'Configurações de inscrições'
+    Subscription Settings: 'Inscrições'
     Hide Videos on Watch: 'Ocultar vídeos após assisti-los'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Formato de exportação das inscrições'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Gerenciar inscrições'
-    Import Subscriptions: 'Importar inscrições'
-    Export Subscriptions: 'Exportar inscrições'
-    How do I import my subscriptions?: 'Como posso importar minhas inscrições?'
     Fetch Feeds from RSS: Buscar Informações através de RSS
     Fetch Automatically: Buscar feed automaticamente
-    Only Show Latest Video for Each Channel: Mostrar apenas vídeo mais recente para
-      cada canal
     Confirm Before Unsubscribing: Evitar cancelamento acidental de inscrições
-  Advanced Settings:
-    Advanced Settings: 'Configurações avançadas'
-    Enable Debug Mode (Prints data to the console): 'Habilitar modo de depuração (Mostra
-      dados no console)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Endereço de proxy (ex.:
-      SOCKS5://127.0.0.1:9050)'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Clicar
-      em "TESTAR PROXY" enviara uma requisição para https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Usar tor / proxy para chamadas da API'
-    TEST PROXY: 'TESTAR PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Ver instâncias públicas'
-    Clear History:
-      Clear History: 'Apagar histórico'
-      # On Click
-      Are you sure you want to delete your history?: 'Tens certeza que queres apagar
-        teu histórico?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Apagar inscrições'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Tens certeza que queres
-        remover todas as tuas inscrições?'
-      #& Yes
-      #& No
 
+    'Limit the number of videos displayed for each channel': Limitar o número de vídeos
+      exibidos para cada canal
+    To: Para
   Privacy Settings:
     Watch history has been cleared: O histórico de exibição foi apagado
     Are you sure you want to remove your entire watch history?: Tem certeza de que
@@ -489,7 +461,7 @@ Settings:
     Clear Search Cache: Limpar cache de buscas
     Save Watched Progress: Habilitar histórico de exibição
     Remember History: Lembrar histórico
-    Privacy Settings: Configurações de privacidade
+    Privacy Settings: Privacidade
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Tem
       certeza de que deseja remover todas as inscrições e perfis? Isto não pode ser
       desfeito.
@@ -507,17 +479,13 @@ Settings:
     All subscriptions have been successfully imported: Todas as inscrições foram importadas
       com sucesso
     Select Import Type: Selecionar tipo de importação
-    Data Settings: Configurações de dados
+    Data Settings: Dados
     Export History: Exportar histórico
     Import History: Importar histórico
     Export NewPipe: Exportar NewPipe
     Export YouTube: Exportar YouTube
     Export FreeTube: Exportar FreeTube
     Export Subscriptions: Exportar inscrições
-    Check for Legacy Subscriptions: Verificar se há inscrições em formato antigo
-    Import NewPipe: Importar NewPipe
-    Import YouTube: Importar YouTube
-    Import FreeTube: Importar FreeTube
     Import Subscriptions: Importar inscrições
     Select Export Type: Escolher tipo de exportação
     How do I import my subscriptions?: Como faço para importar minhas inscrições?
@@ -562,7 +530,7 @@ Settings:
     Hide Trending Videos: Ocultar vídeos em alta
     Hide Recommended Videos: Ocultar vídeos recomendados
     Hide Comment Likes: Ocultar "curtidas" em comentários
-    Distraction Free Settings: Configurações de distrações
+    Distraction Free Settings: Modo Sem Distrações
     Hide Channel Subscribers: Ocultar número de inscritos
     Hide Video Likes And Dislikes: Ocultar "curtidas" em vídeo
     Hide Video Views: Ocultar visualizações do vídeo
@@ -585,16 +553,15 @@ Settings:
       General: Geral
       Subscriptions Page: Página de inscrições
     Hide Featured Channels: Ocultar canais em destaque
-    Hide Channel Playlists: Ocultar playlists de canais
-    Hide Channel Community: Ocultar comunidade do canal
-    Hide Channel Shorts: Ocultar "Shorts" do canal
-    Hide Channel Podcasts: Ocultar podcasts do canal
-    Hide Channel Releases: Ocultar lançamentos do canal
+    Hide Channel Playlists: Ocultar a guia "Playlists" do canal
+    Hide Channel Community: Ocultar a guia "Comunidade" do canal
+    Hide Channel Shorts: Ocultar a guia "Shorts" do canal
+    Hide Channel Podcasts: Ocultar a guia "Podcasts" do canal
+    Hide Channel Releases: Ocultar a guia "Lancamentos" do canal
     Hide Subscriptions Videos: Ocultar vídeos de suas inscrições
     Hide Subscriptions Shorts: Ocultar "Shorts" de suas inscrições
     Hide Subscriptions Live: Ocultar transmissões ao vivo de suas inscrições
     Hide Profile Pictures in Comments: Ocultar foto do perfil nos comentários
-    Blur Thumbnails: Desfocar Miniaturas
     Hide Subscriptions Community: Ocultar comunidade de suas inscrições
     Hide Channels Invalid: ID do canal fornecido é inválido
     Hide Channels Disabled Message: Alguns canais foram bloqueados por ID e não foram
@@ -606,6 +573,7 @@ Settings:
       palavra ou frase
     Hide Videos and Playlists Containing Text: Ocultar vídeos e playlists que contenham
       texto
+    Hide Channel Home: Ocultar a guia "Início" do canal
   The app needs to restart for changes to take effect. Restart and apply change?: O
     aplicativo necessita reiniciar para as mudanças fazerem efeito. Reiniciar e aplicar
     mudança?
@@ -620,18 +588,23 @@ Settings:
     Proxy Host: Host do Proxy
     Proxy Protocol: Protocolo do Proxy
     Enable Tor / Proxy: Ativar Tor/Proxy
-    Proxy Settings: Configurações de Proxy
+    Proxy Settings: Proxy
     Error getting network information. Is your proxy configured properly?: Erro ao
       obter informações da rede. Seu proxy está configurado corretamente?
     City: Cidade
     Region: Região
+    Proxy Warning: FreeTube não tem um proxy integrado, mas pode se conectar a um
+      proxy externo, como um proxy em execução no seu computador, como o Tor, ou um
+      proxy externo, como um proxy SOCKS5 fornecido por algumas VPNs. Se estiver ativado,
+      certifique-se de que seu proxy/Tor esteja configurado corretamente, ou o FreeTube
+      não conseguirá obter nenhum dado.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar quando vídeos publicitários
       for ignorado
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL da API SponsorBlock
       (o padrão é https://sponsor.ajay.app)
     Enable SponsorBlock: Ativar SponsorBlock
-    SponsorBlock Settings: Configurações SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Show In Seek Bar: Mostrar na barra de busca
       Prompt To Skip: Solicitar para pular
@@ -647,14 +620,14 @@ Settings:
     Custom External Player Arguments: Argumentos do player externo personalizados
     External Player: Player externo
     Ignore Unsupported Action Warnings: Ignorar avisos de ação não suportada
-    External Player Settings: Configurações para players externos
+    External Player Settings: Player externo
     Custom External Player Executable: Executável do player externo personalizado
     Players:
       None:
         Name: Nenhum
     Ignore Default Arguments: Ignorar argumentos padrão
   Download Settings:
-    Download Settings: Configurações de download
+    Download Settings: Download
     Ask Download Path: Perguntar onde salvar o download
     Choose Path: Escolha o caminho
     Open in web browser: Abrir no navegador
@@ -663,16 +636,16 @@ Settings:
   Parental Control Settings:
     Show Family Friendly Only: Mostrar apenas conteúdo adequado para todos os públicos
     Hide Search Bar: Ocultar barra de pesquisa
-    Parental Control Settings: Configurações de Controle Parental
+    Parental Control Settings: Controle dos Pais
     Hide Unsubscribe Button: Ocultar botão "Cancelar inscrição"
   Experimental Settings:
-    Experimental Settings: Configurações experimentais
+    Experimental Settings: Experimental
     Warning: Essas configurações são experimentais, elas podem causar travamentos
       enquanto ativadas. Fazer backups é altamente recomendado. Use por sua conta
       e risco!
     Replace HTTP Cache: Repor cache HTTP
   Password Settings:
-    Password Settings: Configurações de senha
+    Password Settings: Senha
     Set Password: Definir senha
     Remove Password: Remover senha
     Set Password To Prevent Access: Defina uma senha para impedir o acesso às configurações
@@ -681,38 +654,12 @@ Settings:
     Password Incorrect: Senha incorreta
     Password: Senha
     Enter Password To Unlock: Digite a senha para desbloquear as configurações
-  Expand All Settings Sections: Expandir todas as seções de configurações
   Sort Settings Sections (A-Z): Classificar seções de configurações (A-Z)
+  Return to Settings Menu: Retornar ao menu de configurações
 About:
   #On About page
   About: 'Sobre'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
-    software é Livre sob a licença AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Encontrastes um problema? Tens uma sugestão de funcionalidade? Queres ajudar?
-    Veja como na nossa página na GitHub. PR são bem-vindas.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Muito
-    Obrigado a todas as pessoas e projetos que tornam o FreeTube possível!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Queres
-    conversar? Junte-se ao nosso servidor Element/Matrix. Verifique as regras antes
-    de juntar-se.'
-
-  'Looking for help? Check out our Wiki page.': 'Procurastes ajuda? Veja na nossa
-    página Wiki.'
-
-  Check out our Firefox extension!: 'Experimente nosso complemento do Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Gosta
-    de usar o FreeTube, considere realizar uma doação via Liberapay ou via Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Ultimas notícias sobre o FreeTube'
-
 #On Channel Page
   GitHub issues: Relatórios no GitHub
   Report a problem: Informar um problema
@@ -721,8 +668,6 @@ About:
   Help: Ajuda
   GitHub releases: Lançamentos do GitHub
   Downloads / Changelog: Downloads / Modificações
-  View License: Ver Licença
-  Licensed under the AGPLv3: Licença AGPLv3
   Source code: Código-fonte
   Beta: Beta
   Donate: Fazer doação
@@ -743,8 +688,6 @@ About:
   Licensed under the: Licenciado sob o
   AGPLv3: AGPLv3
 Channel:
-  Subscriber: 'Inscrito'
-  Subscribers: 'Inscritos'
   Subscribe: 'Inscrever-se'
   Unsubscribe: 'Remover inscrição'
   Search Channel: 'Buscar no canal'
@@ -811,6 +754,9 @@ Channel:
     Releases: Lançamentos
     This channel does not currently have any releases: Este canal não tem nenhum lançamento
       no momento
+  Home:
+    Home: Início
+    View Playlist: Ver playlist
 Video:
   Mark As Watched: 'Marcar como assistido'
   Remove From History: 'Remover do histórico'
@@ -839,38 +785,8 @@ Video:
     chat ao vivo não é suportado pela API do Invidious. Uma conexão com o YouTube
     é necessária.'
   Published:
-    Jan: 'jan'
-    Feb: 'fev'
-    Mar: 'mar'
-    Apr: 'abr'
-    May: 'mai'
-    Jun: 'jun'
-    Jul: 'jul'
-    Aug: 'ago'
-    Sep: 'set'
-    Oct: 'out'
-    Nov: 'nov'
-    Dec: 'dez'
-    Second: 'segundo'
-    Seconds: 'segundos'
-    Hour: 'hora'
-    Hours: 'horas'
-    Day: 'dia'
-    Days: 'dias'
-    Week: 'semana'
-    Weeks: 'semanas'
-    Month: 'mês'
-    Months: 'meses'
-    Year: 'ano'
-    Years: 'anos'
-    Ago: 'atrás'
-    Upcoming: 'Estreia em'
-    Minutes: minutos
-    Minute: minuto
-    Less than a minute: Menos de um minuto
     In less than a minute: Em menos de um minuto
   Published on: 'Publicado em'
-  Publicationtemplate: 'Há {number} {unit}'
 #& Videos
   Started streaming on: Transmissão iniciada em
   Streamed on: Transmitido em
@@ -959,6 +875,16 @@ Video:
     TranslatedCaptionTemplate: '{language} (traduzido do "{originalLanguage}")'
     Show Stats: Mostrar estatísticas
     Exit Full Window: Sair do preenchimento de janela
+  IP block: O YouTube bloqueou seu endereço IP para assistir a vídeos. Tente mudar
+    para uma VPN ou proxy diferente.
+  Unlisted: Não listado
+  MembersOnly: Vídeos exclusivos para membros não podem ser assistidos com o FreeTube,
+    pois exigem login do Google e assinatura paga do canal do remetente.
+  AgeRestricted: Vídeos com restrição de idade não podem ser assistidos com o FreeTube,
+    pois exigem login do Google e uso de uma conta do YouTube com verificação de idade.
+  DeArrow:
+    Show Original Details: Mostrar detalhes originais
+    Show Modified Details: Mostrar detalhes modificados
 Videos:
   #& Sort By
   Sort By:
@@ -969,9 +895,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Visualizar playlist completa'
-  Videos: 'Vídeos'
-  View: 'Visualização'
-  Views: 'Visualizações'
   Last Updated On: 'Atualizado em'
 
 # On Video Watch Page
@@ -987,7 +910,8 @@ Playlist:
     DateAddedOldest: Mais antigos
     AuthorDescending: Autor (Z-A)
     VideoTitleDescending: Título (Z-A)
-Toggle Theatre Mode: 'Alternar "Modo Teatro"'
+    VideoDurationAscending: Duração (a mais curta primeiro)
+    VideoDurationDescending: Duração (a mais longa primeiro)
 Change Format:
   Change Media Formats: 'Mudar formato do vídeo'
   Use Dash Formats: 'Usar formatos DASH'
@@ -1056,7 +980,6 @@ Local API Error (Click to copy): 'Erro da API local (clique para copiar)'
 Invidious API Error (Click to copy): 'Erro da API do Invidious (clique para copiar)'
 Falling back to Invidious API: 'Recorrendo à API do Invidious'
 Falling back to Local API: 'Recorrendo à API local'
-Subscriptions have not yet been implemented: 'Inscrições ainda não foram implementadas'
 Loop is now disabled: 'Modo de repetição desativado'
 Loop is now enabled: 'Modo de repetição ativado'
 Shuffle is now disabled: 'Reprodução aleatória desativada'
@@ -1112,7 +1035,7 @@ Profile:
   Profile has been created: Perfil criado
   Your profile name cannot be empty: O nome do seu perfil não pode ficar vazio
   Profile Filter: Filtrar perfil
-  Profile Settings: Configurações do perfil
+  Profile Settings: Perfil
   Toggle Profile List: Alternar lista de perfis
   Profile Name: Nome do perfil
   Edit Profile Name: Editar nome do perfil
@@ -1167,10 +1090,12 @@ Tooltips:
     External Link Handling: "Escolha o comportamento padrão quando um link que não
       pode ser aberto no FreeTube for clicado.\nPor padrão, o FreeTube abrirá o link
       clicado em seu navegador padrão.\n"
+    Open Deep Links In New Window: Os URLs a partir do FreeTube, como por extensões
+      de navegador de redirecionamento ou argumentos de linha de comando, são abertos
+      em uma nova janela.
   External Player Settings:
     Custom External Player Arguments: Quaisquer argumentos de linha de comando personalizados,
-      separados por ponto e vírgula (';'), você deseja que seja passado para o player
-      externo.
+      você deseja que seja passado para o player externo.
     Ignore Warnings: Suprime os avisos para quando o player externo atual não suporta
       a ação atual (por exemplo, reverter playlist, etc.).
     Custom External Player Executable: Por padrão, o FreeTube assumirá que o player
@@ -1206,8 +1131,6 @@ Playing Next Video Interval: A reproduzir o próximo vídeo imediatamente. Cliqu
   cancelar. | A reproduzir o próximo vídeo em {nextVideoInterval} segundo. Clique
   para cancelar. | A reproduzir o próximo vídeo em {nextVideoInterval} segundos. Clique
   para cancelar.
-Hashtags have not yet been implemented, try again later: Hashtags ainda não foram
-  implementadas, tente novamente mais tarde
 Unknown YouTube url type, cannot be opened in app: Tipo de URL do YouTube desconhecida,
   não pode ser aberta no aplicativo
 Open New Window: Abrir uma nova janela
@@ -1228,8 +1151,6 @@ Channels:
   Title: Lista de canais
   Search bar placeholder: Buscar canais
   Empty: Sua lista de canais está vazia no momento.
-  Unsubscribe: Cancelar inscrição
-  Unsubscribed: '"{channelName}" foi removido de suas inscrições'
   Unsubscribe Prompt: Tem certeza de que quer cancelar a sua inscrição de "{channelName}"?
   Count: '{number} canais encontrados.'
 Screenshot Success: Captura de tela salva em "{filePath}"
@@ -1245,6 +1166,7 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Lista oculta de capítulos,
     capítulo atual: {chapterName}'
   Chapters: Capítulos
+  Key Moments: Melhores momentos
 Ok: OK
 Hashtag:
   This hashtag does not currently have any videos: Esta hashtag não tem atualmente
@@ -1281,5 +1203,26 @@ Search Listing:
     Subtitles: Legendas
     Closed Captions: Legendas ocultas (CC)
     4K: 4K
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    3D: 3D
+    New: Novo
 'Blocked opening potentially unsafe URL': 'Impedido de abrir URL potencialmente inseguro:
   "{url}".'
+Keys:
+  alt: Alt
+  arrowup: Seta para cima
+  arrowright: Seta para a direita
+  ctrl: Ctrl
+  arrowdown: Seta para baixo
+  arrowleft: Seta para a esquerda
+shortcutJoinOperator: +
+Right-click or hold to see history: Clique com o botão direito do mouse ou mantenha-o
+  pressionado para ver o histórico
+Autoplay Interruption Timer: Reprodução automática cancelada devido a {autoplayInterruptionIntervalHours}
+  horas de inatividade
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Description:
+  Expand Description: '...mais'
+  Collapse Description: Mostrar menos
diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
index 665e7e1b7ccc9..269ae1acdfded 100644
--- a/static/locales/pt-PT.yaml
+++ b/static/locales/pt-PT.yaml
@@ -134,18 +134,9 @@ Most Popular: Mais populares
 Playlists: Listas de reprodução
 User Playlists:
   Your Playlists: As suas listas de reprodução
-  Playlist Message: Esta página não é indicativa do resultado final. Apenas mostra
-    os vídeos que foram guardados ou marcados como favoritos. Quando estiver pronta,
-    todos os vídeos que estiverem aqui serão postos numa lista chamada 'Favoritos'.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: A
-    lista está vazia. Clique no botão Guardar no canto de um vídeo para o mostrar
-    aqui.
   Search bar placeholder: Procurar listas de reprodução
   Empty Search Message: Não há vídeos nesta lista de reprodução que coincidam com
     a sua pesquisa
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Tem
-    certeza que quer remover todos os vídeos vistos desta lista de reprodução? Isto
-    não pode ser revertido.
   Are you sure you want to delete this playlist? This cannot be undone: Tem certeza
     de que pretende eliminar esta lista de reprodução? Isto não pode ser revertido.
   SinglePlaylistView:
@@ -275,8 +266,6 @@ Settings:
       End: Final
       Blur: Desfocar
       Hidden: Oculta
-    'Invidious Instance (Default is https://invidious.snopyta.org)': Instância Invidious
-      (Por omissão é https://invidious.snopyta.org)
     View all Invidious instance information: Mostrar toda a informação sobre esta
       instância Invidious
     Region for Trending: Região para as tendências
@@ -369,7 +358,6 @@ Settings:
     Hide FreeTube Header Logo: Ocultar logotipo FreeTube no topo
   Player Settings:
     Player Settings: Definições do reprodutor
-    Remember History: Lembrar Histórico
     Play Next Video: Reproduzir vídeo seguinte
     Turn on Subtitles by Default: Ativar legendas automaticamente
     Autoplay Videos: Reproduzir vídeos automaticamente
@@ -447,15 +435,7 @@ Settings:
     Subscription Settings: Definições de subscrições
     Hide Videos on Watch: Ocultar vídeos visualizados
     Fetch Feeds from RSS: Obter subscrições através de RSS
-    Subscriptions Export Format:
-      Subscriptions Export Format: Formato de Exportação de Subscrições
-      #& Freetube
-      Newpipe: Newpipe
-      OPML: OPML
-    Manage Subscriptions: Gerir subscrições
     Fetch Automatically: Obter fontes automaticamente
-    Only Show Latest Video for Each Channel: Mostrar apenas o último vídeo de cada
-      canal
     Confirm Before Unsubscribing: Impedir cancelamento acidental de subscrições
   Distraction Free Settings:
     Distraction Free Settings: Definições de distrações
@@ -512,10 +492,6 @@ Settings:
     Select Import Type: Selecione o tipo de importação
     Select Export Type: Selecione o tipo de exportação
     Import Subscriptions: Importar subscrições
-    Import FreeTube: Importar FreeTube
-    Import YouTube: Importar YouTube
-    Import NewPipe: Importar NewPipe
-    Check for Legacy Subscriptions: Verificar se há subscrições no formato antigo
     Export Subscriptions: Exportar subscrições
     Export FreeTube: Exportar FreeTube
     Export YouTube: Exportar YouTube
@@ -635,15 +611,12 @@ Settings:
       às definições
     Set Password: Definir palavra-passe
     Remove Password: Remover palavra-passe
-  Expand All Settings Sections: Expandir todas as secções de definições
   Sort Settings Sections (A-Z): Ordenar definições (A-Z)
 About:
   #On About page
   About: Acerca
   Beta: Beta
   Source code: Código-fonte
-  Licensed under the AGPLv3: Licenciado nos termos da AGPLv3
-  View License: Ver licença
   Downloads / Changelog: Descargas/Alterações
   GitHub releases: Versões no GitHub
   Help: Ajuda
@@ -721,8 +694,6 @@ Profile:
   Create Profile Name: Criar nome do perfil
   Profile Name: Nome do perfil
 Channel:
-  Subscriber: Subscritor
-  Subscribers: Subscritores
   Subscribe: Subscrever
   Unsubscribe: Cancelar subscrição
   Channel has been removed from your subscriptions: O canal foi removido das suas
@@ -827,39 +798,10 @@ Video:
   video only: apenas vídeo
   audio only: apenas áudio
   Published:
-    Jan: jan
-    Feb: fev
-    Mar: mar
-    Apr: abr
-    May: mai
-    Jun: jun
-    Jul: jul
-    Aug: ago
-    Sep: set
-    Oct: out
-    Nov: nov
-    Dec: dez
-    Second: Segundo
-    Seconds: Segundos
-    Minute: Minuto
-    Minutes: Minutos
-    Hour: Hora
-    Hours: Horas
-    Day: Dia
-    Days: Dias
-    Week: Semana
-    Weeks: Semanas
-    Month: Mês
-    Months: Meses
-    Year: Ano
-    Years: Anos
-    Ago: Há
-    Upcoming: Estreia em
     In less than a minute: Em menos de um minuto
   Published on: Publicado a
   Streamed on: Transmitido a
   Started streaming on: Transmissão iniciada em
-  Publicationtemplate: Há {number} {unit}
 #& Videos
   Play Previous Video: Reproduzir vídeo anterior
   Play Next Video: Reproduzir vídeo seguinte
@@ -912,9 +854,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: Ver lista de reprodução completa
-  Videos: Vídeos
-  View: Visualização
-  Views: Visualizações
   Last Updated On: Última atualização
 
 # On Video Watch Page
@@ -930,7 +869,6 @@ Playlist:
     Sort By: Ordenar por
     AuthorDescending: Autor (Z-A)
     VideoTitleAscending: Título (A-Z)
-Toggle Theatre Mode: Alternar modo cinema
 Change Format:
   Change Media Formats: Alterar formatos multimédia
   Use Dash Formats: Utilizar formatos DASH
@@ -1033,8 +971,8 @@ Tooltips:
     Fetch Automatically: Se ativa, FreeTube irá obter automaticamente as subscrições
       ao abrir uma nova janela e/ou quando mudar de perfil.
   External Player Settings:
-    Custom External Player Arguments: Quaisquer argumentos de linha de comando, separados
-      por ponto e vírgula (';'), que quiser passar ao reprodutor externo.
+    Custom External Player Arguments: Quaisquer argumentos de linha de comando, que
+      quiser passar ao reprodutor externo.
     Ignore Warnings: Ignorar avisos quando o reprodutor externo escolhido não suporte
       uma ação (por exemplo, inverter listas de reprodução).
     Custom External Player Executable: Por omissão, FreeTube assume que o reprodutor
@@ -1065,7 +1003,6 @@ Falling back to Local API: Ocorreu um erro e a API local será utilizada
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Este
   vídeo não está disponível porque faltam formatos. Isto pode acontecer devido à indisponibilidade
   no seu país.
-Subscriptions have not yet been implemented: As subscrições ainda não foram implementadas
 Loop is now disabled: Repetição desativada
 Loop is now enabled: Repetição ativada
 Shuffle is now disabled: Reprodução aleatória desativada
@@ -1086,8 +1023,6 @@ Playing Next Video Interval: A reproduzir o vídeo seguinte imediatamente. Cliqu
   para cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundos.
   Clique para cancelar.
 More: Mais
-Hashtags have not yet been implemented, try again later: As 'hashtags' ainda não foram
-  implementadas, tente mais tarde
 Unknown YouTube url type, cannot be opened in app: O tipo de URL YouTube é desconhecido
   e não pode ser aberto na aplicação
 Open New Window: Abrir nova janela
@@ -1106,8 +1041,6 @@ Channels:
   Search bar placeholder: Procurar canais
   Count: '{number} canais encontrados.'
   Empty: A lista de canais está vazia.
-  Unsubscribe: Anular subscrição
-  Unsubscribed: '{channelName} foi removido das suas subscrições'
   Unsubscribe Prompt: Tem a certeza de que pretende cancelar a subscrição em "{channelName}"?
 Downloading has completed: '"{videoTitle}" foi descarregado'
 Starting download: A descarregar "{videoTitle}"
diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 2032179bd2db0..3faed77643f40 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -2,10 +2,10 @@
 Locale Name: 'Português'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Esta parte da aplicação ainda não está pronta. Volte mais tarde quando já houver
+  Esta parte do aplicativo ainda não está pronta. Volte mais tarde quando já houver
   progresso.
 # Webkit Menu Bar
-File: 'Ficheiro'
+File: 'Arquivo'
 Quit: 'Sair'
 Edit: 'Editar'
 Undo: 'Desfazer'
@@ -42,6 +42,8 @@ Global:
     Subscriber Count: 1 subscritor | {count} subscritores
     View Count: 1 visualização | {count} visualizações
     Watching Count: 1 a assistir | {count} a assistir
+    Like Count: 1 gosto | {count} gostos
+    Comment Count: 1 comentário | {count} comentários
   Input Tags:
     Length Requirement: A etiqueta tem que ter, pelo menos, {number} caracteres
 Version {versionNumber} is now available!  Click for more details: 'A versão {versionNumber}
@@ -105,7 +107,9 @@ Subscriptions:
   Subscriptions: 'Subscrições'
   Latest Subscriptions: 'Subscrições recentes'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'A
-    sua lista de subscrições está vazia. Adicione algumas para as ver aqui.'
+    sua lista de subscrições está vazia. Se quiser importar subscrições, pode aceder
+    às definições de dados e selecionar Importar subscrições. Em alternativa, pode
+    procurar os canais e efetuar a subscrição.'
   'Getting Subscriptions. Please wait.': 'A carregar subscrições. Por favor aguarde.'
   Refresh Subscriptions: 'Recarregar subscrições'
   Load More Videos: Carregar mais vídeos
@@ -133,12 +137,6 @@ Most Popular: 'Mais populares'
 Playlists: 'Listas de reprodução'
 User Playlists:
   Your Playlists: 'As suas listas de reprodução'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: A
-    lista está vazia. Clique no botão Guardar no canto de um vídeo para o mostrar
-    aqui.
-  Playlist Message: Esta página não é indicativa do resultado final. Apenas mostra
-    os vídeos que foram guardados ou marcados como favoritos. Quando estiver pronta,
-    todos os vídeos que estiverem aqui serão postos numa lista chamada 'Favoritos'.
   Search bar placeholder: Procurar listas de reprodução
   Empty Search Message: Não há vídeos nesta lista de reprodução que coincidam com
     a sua pesquisa
@@ -189,9 +187,15 @@ User Playlists:
       This playlist does not exist: Esta lista de reprodução não existe
       This playlist is now used for quick bookmark: Esta lista de reprodução é agora
         usada como marcador rápido
-      Quick bookmark disabled: Marcador rápido desativado
       This playlist is already being used for quick bookmark.: Esta lista de reprodução
         já está a ser usada como marcador rápido.
+      This playlist has a video with a duration error: A lista de reprodução contém,
+        pelo menos, um vídeo sem informação de duração. Será organizado como se tivesse
+        0 segundos.
+      Reverted to use {oldPlaylistName} for quick bookmark: Revertido para usar {oldPlaylistName}
+        para favoritos rápidos
+      Playlist {playlistName} is the new quick bookmark playlist.: Revertido para
+        usar {oldPlaylistName} para favoritos rápidos
     Search for Videos: Procurar vídeos
   AddVideoPrompt:
     Search in Playlists: Procurar nas listas de reprodução
@@ -229,15 +233,11 @@ User Playlists:
     para criar uma.
   Move Video Down: Mover vídeo para baixo
   Edit Playlist Info: Editar informação da lista de reprodução
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Tem
-    certeza que quer remover todos os vídeos vistos desta lista de reprodução? Isto
-    não pode ser revertido.
   Playlist Description: Descrição da lista de reprodução
   Add to Favorites: Adicionar a {playlistName}
   Remove from Favorites: Remover de {playlistName}
   Enable Quick Bookmark With This Playlist: Ativar marcador rápido para esta lista
     de reprodução
-  Disable Quick Bookmark: Desativar marcador rápido
   Playlists with Matching Videos: Listas de reprodução coincidentes
   Quick Bookmark Enabled: Marcador rápido ativado
   Remove Duplicate Videos: Remover duplicados
@@ -249,6 +249,10 @@ User Playlists:
     a certeza de que pretende remover 1 vídeo duplicado desta lista de reprodução?
     Esta remoção não pode ser revertida. | Tem a certeza de que pretende remover {playlistItemCount}
     vídeos duplicados desta lista de reprodução? Esta remoção não pode ser revertida.
+  Export Playlist: Exportar lista de reprodução
+  The playlist has been successfully exported: Lista de reprodução exportada com sucesso
+  Cannot delete the quick bookmark target playlist.: Não é possível excluir a lista
+    de reprodução de destino dos favoritos rápidos.
 History:
   # On History Page
   History: 'Histórico'
@@ -256,11 +260,12 @@ History:
   Your history list is currently empty.: 'O seu histórico está vazio.'
   Search bar placeholder: Procurar no histórico
   Empty Search Message: Não há vídeos no histórico que coincidam com a sua pesquisa
+  Case Sensitive Search: Diferenciar maiúsculas e minúsculas
 Settings:
   # On Settings Page
   Settings: 'Definições'
   General Settings:
-    General Settings: 'Definições gerais'
+    General Settings: 'Geral'
     Check for Updates: 'Procurar atualizações'
     Check for Latest Blog Posts: 'Verificar se há novas publicações no blogue'
     Fallback to Non-Preferred Backend on Failure: 'Utilizar sistema de ligação secundário,
@@ -284,8 +289,6 @@ Settings:
       End: 'Final'
       Hidden: Oculta
       Blur: Desfocar
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instância Invidious
-      (Por omissão é https://invidious.snopyta.org)'
     Region for Trending: 'Região para as tendências'
         #! List countries
     View all Invidious instance information: Mostrar toda a informação sobre esta
@@ -307,7 +310,7 @@ Settings:
       Label: Carregar seguinte automaticamente
       Tooltip: Carrega as páginas e comentários automaticamente.
   Theme Settings:
-    Theme Settings: 'Definições de tema'
+    Theme Settings: 'Tema'
     Match Top Bar with Main Color: 'Utilizar cor principal na barra superior'
     Base Theme:
       Base Theme: 'Tema base'
@@ -322,6 +325,8 @@ Settings:
       Nordic: Nórdico
       Solarized Dark: Escuro solar
       Solarized Light: Claro solar
+      Gruvbox Dark: Gruvbox Escuro
+      Gruvbox Light: Luz Gruvbox
     Main Color Theme:
       Main Color Theme: 'Cor principal'
       Red: 'Vermelho'
@@ -377,7 +382,7 @@ Settings:
     Hide Side Bar Labels: Ocultar texto na barra lateral
     Hide FreeTube Header Logo: Ocultar logotipo FreeTube no topo
   Player Settings:
-    Player Settings: 'Definições do reprodutor'
+    Player Settings: 'Reprodutor'
     Play Next Video: 'Reproduzir vídeo seguinte'
     Turn on Subtitles by Default: 'Ativar legendas automaticamente'
     Autoplay Videos: 'Reproduzir vídeos automaticamente'
@@ -430,7 +435,7 @@ Settings:
     Enter Fullscreen on Display Rotate: Ativar modo de ecrã completo ao rodar o ecrã
     Skip by Scrolling Over Video Player: Ignorar ao deslocar por cima do reprodutor
   Privacy Settings:
-    Privacy Settings: 'Definições de privacidade'
+    Privacy Settings: 'Privacidade'
     Remember History: 'Memorizar histórico'
     Save Watched Progress: 'Guardar progresso de reprodução'
     Clear Search Cache: 'Limpar cache de pesquisas'
@@ -452,22 +457,16 @@ Settings:
     Are you sure you want to remove all your playlists?: Tem a certeza de que pretende
       remover todas as suas listas de reprodução?
   Subscription Settings:
-    Subscription Settings: 'Definições de subscrições'
+    Subscription Settings: 'Subscrição'
     Hide Videos on Watch: 'Ocultar vídeos visualizados'
     Fetch Feeds from RSS: 'Obter subscrições através de RSS'
-    Manage Subscriptions: 'Gerir subscrições'
     Fetch Automatically: Obter fontes automaticamente
-    Only Show Latest Video for Each Channel: Mostrar apenas o último vídeo de cada
-      canal
     Confirm Before Unsubscribing: Impedir cancelamento acidental de subscrições
   Data Settings:
-    Data Settings: 'Definições de dados'
+    Data Settings: 'Dados'
     Select Import Type: 'Selecione o tipo de importação'
     Select Export Type: 'Selecione o tipo de exportação'
     Import Subscriptions: 'Importar subscrições'
-    Import FreeTube: 'Importar FreeTube'
-    Import YouTube: 'Importar YouTube'
-    Import NewPipe: 'Importar NewPipe'
     Export Subscriptions: 'Exportar subscrições'
     Export FreeTube: 'Exportar FreeTube'
     Export YouTube: 'Exportar YouTube'
@@ -496,7 +495,6 @@ Settings:
     Unknown data key: 'Chave de dados desconhecida'
     How do I import my subscriptions?: 'Como importar as minhas subscrições?'
     Manage Subscriptions: Gerir subscrições
-    Check for Legacy Subscriptions: Verificar se há subscrições no formato antigo
     Import Playlists: Importar listas de reprodução
     Export Playlists: Exportar listas de reprodução
     Playlist insufficient data: Dados insuficientes para a lista de reprodução "{playlist}",
@@ -517,39 +515,13 @@ Settings:
         listas de reprodução existentes usando a opção \"Remover todas as listas de
         reprodução\" em \"Definições de privacidade\".\n3. Abra a versão mais antiga
         do FreeTube e importe as listas de reprodução."
-  Advanced Settings:
-    Advanced Settings: 'Definições Avançadas'
-    Enable Debug Mode (Prints data to the console): 'Ligar Modo de Depuração (Escreve
-      dados à consola)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Endereço de intermediário
-      (Exemplo: SOCKS5://127.0.0.1:9050 )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Ao
-      Carregar "TESTAR INTERMEDIÁRIO" um pedido vai ser enviado a https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Usar Tor / Intermediário para Chamadas API'
-    TEST PROXY: 'TESTAR INTERMEDIÁRIO'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Ver Instâncias Públicas'
-    Clear History:
-      Clear History: 'Limpar Histórico'
-      # On Click
-      Are you sure you want to delete your history?: 'Tem a certeza de que quer apagar
-        o seu histórico?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Limpar Subscrições'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Tem a certeza de que quer
-        apagar as suas subscrições?'
-      #& Yes
-      #& No
 
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar se um anúncio for ignorado
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL da API SponsorBlock
       (padrão é https://sponsor.ajay.app)
     Enable SponsorBlock: Ativar bloqueio da publicidade SponsorBlock
-    SponsorBlock Settings: Definições SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Opção para ignorar
       Auto Skip: Ignorar automaticamente
@@ -576,7 +548,7 @@ Settings:
     Proxy Host: Servidor do proxy
     Proxy Protocol: Protocolo do proxy
     Enable Tor / Proxy: Ativar Tor/Proxy
-    Proxy Settings: Definições de proxy
+    Proxy Settings: Proxy
   Distraction Free Settings:
     Hide Active Subscriptions: Ocultar subscrições ativas
     Hide Live Chat: Ocultar conversas em direto
@@ -588,7 +560,7 @@ Settings:
     Hide Channel Subscribers: Ocultar número de subscritores
     Hide Video Likes And Dislikes: Ocultar "gostos" em vídeos
     Hide Video Views: Ocultar visualizações
-    Distraction Free Settings: Definições de distrações
+    Distraction Free Settings: Distrações
     Hide Video Description: Ocultar descrição dos vídeos
     Hide Sharing Actions: Ocultar ações de partilha
     Hide Live Streams: Ocultar transmissões em direto
@@ -615,7 +587,6 @@ Settings:
     Hide Subscriptions Shorts: Ocultar subscrições de curtos
     Hide Subscriptions Live: Ocultar subscrições de emissões em direto
     Hide Profile Pictures in Comments: Ocultar imagens de perfil nos comentários
-    Blur Thumbnails: Desfocar miniaturas
     Hide Subscriptions Community: Ocultar subscrições de comunidades
     Hide Channels Invalid: O ID do canal não é válido
     Hide Channels Disabled Message: Alguns canais foram bloqueados e não foram processados.
@@ -633,7 +604,7 @@ Settings:
     Custom External Player Executable: Executável do reprodutor externo
     Ignore Unsupported Action Warnings: Ignorar avisos sobre ações inválidas
     External Player: Reprodutor externo
-    External Player Settings: Definições para reprodutores externos
+    External Player Settings: Reprodutores externos
     Players:
       None:
         Name: Nenhum
@@ -641,7 +612,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: Tem
     que reiniciar a aplicação para aplicar as alterações. Reiniciar e aplicar alterações?
   Download Settings:
-    Download Settings: Definições para descargas
+    Download Settings: Descargas
     Ask Download Path: Perguntar local para guardar
     Choose Path: Escolher local
     Download in app: Descarregar na aplicação
@@ -651,10 +622,10 @@ Settings:
     Hide Unsubscribe Button: Ocultar botão "Cancelar subscrição"
     Show Family Friendly Only: Mostrar apenas "Para famílias"
     Hide Search Bar: Ocultar barra de pesquisa
-    Parental Control Settings: Definições de controlo parental
+    Parental Control Settings: Controlo parental
   Experimental Settings:
     Replace HTTP Cache: Substituir cache HTTP
-    Experimental Settings: Definições experimentais
+    Experimental Settings: Experimentais
     Warning: Estas definições são experimentais e podem provocar falhas se ativadas.
       É altamente recomendado fazer cópias de segurança. Use por sua conta e risco!
   Password Dialog:
@@ -663,43 +634,17 @@ Settings:
     Password: Palavra-passe
     Unlock: Desbloquear
   Password Settings:
-    Password Settings: Definições de palavra-passe
+    Password Settings: Palavra-passe
     Set Password To Prevent Access: Defina uma palavra-passe para impedir o acesso
       às definições
     Set Password: Definir palavra-passe
     Remove Password: Remover palavra-passe
-  Expand All Settings Sections: Expandir todas as secções de definições
   Sort Settings Sections (A-Z): Ordenar definições (A-Z)
+  Return to Settings Menu: Voltar para as definições
 About:
   #On About page
   About: 'Acerca'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
-    software é licenciado livremente via AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Encontraste um bug? Queres sugerir uma funcionalidade? Queres ajudar-nos? Vai
-    á nossa página de GitHub. Pull requests são bem vindos.
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Agradeço
-    imenso a todas as pessoas e projetos que façam com que o FreeTube seja possivel!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Queres
-    conversar? Junta-te ao nosso servidor Element / Matrix. Por favor verifica as
-    regras antes de te juntares.'
-
-  'Looking for help? Check out our Wiki page.': 'Há procura de ajuda? Vê a nossa página
-    Wiki.'
-
-  Check out our Firefox extension!: 'Experimenta a nossa extensão Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Se
-    gostas de usar FreeTube, considera doar via Liberapay ou através do nosso endereço
-    Bitcoin.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Notícias recentes sobre FreeTube'
-
   FAQ: FAQ
   Blog: Blogue
   Website: Página web
@@ -721,8 +666,6 @@ About:
   Help: Ajuda
   GitHub releases: Versões no GitHub
   Downloads / Changelog: Descargas/Alterações
-  View License: Ver licença
-  Licensed under the AGPLv3: Licenciado nos termos da AGPLv3
   Source code: Código-fonte
   Beta: Beta
   Discussions: Discussões
@@ -773,7 +716,7 @@ Profile:
     os canais dos outros perfis.'
 #On Channel Page
   Profile Filter: Filtro de perfil
-  Profile Settings: Definições do perfil
+  Profile Settings: Perfil
   Toggle Profile List: Alternar lista de perfis
   Profile Name: Nome do perfil
   Edit Profile Name: Editar nome do perfil
@@ -781,8 +724,6 @@ Profile:
   Open Profile Dropdown: Abrir menu do perfil
   Close Profile Dropdown: Fechar menu do perfil
 Channel:
-  Subscriber: 'Subscritor'
-  Subscribers: 'Subscritores'
   Subscribe: 'Subscrever'
   Unsubscribe: 'Cancelar subscrição'
   Channel has been removed from your subscriptions: 'O canal foi removido das suas
@@ -832,6 +773,10 @@ Channel:
     Reveal Answers: Mostrar respostas
     votes: '{votes} votos'
     Video hidden by FreeTube: Freetube ocultou este vídeo
+    View Full Post: Ver publicação na íntegra
+    Viewing Posts Only Supported By Invidious: A visualização de comentários apenas
+      é suportada por Indivious. Aceda ao separador Comunidade de um canal para ver
+      o seu conteúdo sem Indivious.
   Live:
     Live: Em direto
     This channel does not currently have any live streams: Este canal não tem, atualmente,
@@ -881,38 +826,8 @@ Video:
     conversa em direto não se encontra a funcionar com a API Invividious. É necessária
     uma ligação direta ao YouTube.'
   Published:
-    Jan: 'jan'
-    Feb: 'fev'
-    Mar: 'mar'
-    Apr: 'abr'
-    May: 'mai'
-    Jun: 'jun'
-    Jul: 'jul'
-    Aug: 'ago'
-    Sep: 'set'
-    Oct: 'out'
-    Nov: 'nov'
-    Dec: 'dez'
-    Second: 'Segundo'
-    Seconds: 'Segundos'
-    Minute: 'Minuto'
-    Minutes: 'Minutos'
-    Hour: 'Hora'
-    Hours: 'Horas'
-    Day: 'Dia'
-    Days: 'Dias'
-    Week: 'Semana'
-    Weeks: 'Semanas'
-    Month: 'Mês'
-    Months: 'Meses'
-    Year: 'Ano'
-    Years: 'Anos'
-    Ago: 'Há'
-    Upcoming: 'Estreia em'
-    Less than a minute: Menos de um minuto
     In less than a minute: Em menos de um minuto
   Published on: 'Publicado a'
-  Publicationtemplate: 'Há {number} {unit}'
 #& Videos
   Starting soon, please refresh the page to check again: Irá começar brevemente. Recarregue
     a página para reanalisar
@@ -970,6 +885,43 @@ Video:
   Unhide Channel: Mostrar canal
   Hide Channel: Ocultar canal
   More Options: Mais opções
+  Player:
+    Theatre Mode: Modo teatro
+    Stats:
+      Media Formats: 'Formatos multimédia: {formats}'
+      Bitrate: Taxa de dados :{bitrate} kbps
+      Volume: 'Volume: {volumePercentage}%'
+      Bandwidth: 'Largura de banda: {bandwidth} kbps'
+      Resolution: 'Resolução: {width}x{height}@{frameRate}'
+      Player Dimensions: 'Dimensões do reprodutor: {width}x{height}'
+      Stats: Estatísticas
+      Video ID: 'ID do vídeo: {videoId}'
+      CodecAudio: 'Codificador: {audioCodec} ({audioItag})'
+      Buffered: 'A processar: {bufferedPercentage}%'
+      CodecsVideoAudio: 'Codificadores: {videoCodec} ({videoItag}) / {audioCodec}
+        ({audioItag})'
+      CodecsVideoAudioNoItags: 'Codificadores: {videoCodec} / {audioCodec}'
+    TranslatedCaptionTemplate: '{language} (traduzido de "{originalLanguage}")'
+    Audio Tracks: Faixas de áudio
+    Exit Theatre Mode: Sair do modo teatro
+    Full Window: Ecrã completo
+    Exit Full Window: Sair de ecrã completo
+    Take Screenshot: Captura de ecrã
+    Show Stats: Mostrar estatísticas
+    Hide Stats: Ocultar estatísticas
+    You appear to be offline: Parece que está offline.
+    Playback will resume automatically when your connection comes back: A reprodução
+      será retomada assim que se estabeleça uma nova ligação.
+    Skipped segment: Segmento {segmentCategory} ignorado
+  MembersOnly: Os vídeos apenas disponíveis para membros não podem ser vistos nesta
+    aplicação pois requerem que o utilizador inicie sessão e que tenha uma subscrição
+    paga.
+  IP block: O YouTube está a impedir o seu IP de ver vídeos. Experimente utilizar
+    outra VPN ou proxy.
+  AgeRestricted: Os vídeos com restrição de idade não podem ser vistos nesta aplicação
+    pois requerem que o utilizador inicie sessão com uma conta que tenha confirmação
+    da sua idade..
+  Unlisted: Não listado
 Videos:
   #& Sort By
   Sort By:
@@ -980,9 +932,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver lista de reprodução completa'
-  Videos: 'Vídeos'
-  View: 'Visualização'
-  Views: 'Visualizações'
   Last Updated On: 'Última atualização'
 
 # On Video Watch Page
@@ -998,7 +947,8 @@ Playlist:
     VideoTitleAscending: Título (A-Z)
     VideoTitleDescending: Título (Z-A)
     Custom: Personalizado
-Toggle Theatre Mode: 'Alternar modo cinema'
+    VideoDurationDescending: Duração (longos primeiro)
+    VideoDurationAscending: Duração (curtos primeiro)
 Change Format:
   Change Media Formats: 'Alterar formatos multimédia'
   Use Dash Formats: 'Utilizar formatos DASH'
@@ -1008,6 +958,8 @@ Change Format:
     para este vídeo'
   Audio formats are not available for this video: 'Os formatos de áudio não estão
     disponíveis para este vídeo'
+  Legacy formats are not available for this video: Este vídeo não permite formatos
+    antigos
 Share:
   Share Video: 'Partilhar vídeo'
   Share Playlist: 'Partilhar lista'
@@ -1056,6 +1008,8 @@ Comments:
   Hearted: Favorito
   View {replyCount} replies: Ver {replyCount} respostas
   Subscribed: Subscrito
+  There are no comments available for this post: Não existem comentários para esta
+    publicação
 Up Next: 'Próximo'
 
 # Toast Messages
@@ -1063,7 +1017,6 @@ Local API Error (Click to copy): 'Erro na API local (clique para copiar)'
 Invidious API Error (Click to copy): 'Erro na API Invidious (clique para copiar)'
 Falling back to Invidious API: 'Ocorreu um erro e a API Invidious será utilizada'
 Falling back to Local API: 'Ocorreu um erro e a API local será utilizada'
-Subscriptions have not yet been implemented: 'As subscrições ainda não foram implementadas'
 Loop is now disabled: 'Repetição desativada'
 Loop is now enabled: 'Repetição ativada'
 Shuffle is now disabled: 'Reprodução aleatória desativada'
@@ -1086,8 +1039,6 @@ Playing Next Video Interval: A reproduzir o vídeo seguinte imediatamente. Cliqu
   cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundo. Clique
   para cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundos.
   Clique para cancelar.
-Hashtags have not yet been implemented, try again later: As 'hashtags' ainda não foram
-  implementadas, tente mais tarde
 Unknown YouTube url type, cannot be opened in app: O tipo de URL YouTube é desconhecido
   e não pode ser aberto na aplicação
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Este
@@ -1098,12 +1049,12 @@ Tooltips:
     Fetch Feeds from RSS: Se ativa, FreeTube irá obter as subscrições através de RSS
       em vez do método normal. O formato RSS é mais rápido e não é bloqueado pelo
       YouTube, mas não disponibiliza certas informações como, por exemplo, a duração
-      dos vídeos ou se são emissões em direto.
+      dos vídeos, se são emissões em direto e as publicações da comunidade
     Fetch Automatically: Se ativa, FreeTube irá obter automaticamente as subscrições
       ao abrir uma nova janela e/ou quando mudar de perfil.
   External Player Settings:
-    Custom External Player Arguments: Quaisquer argumentos de linha de comando, separados
-      por ponto e vírgula (';'), que quiser passar ao reprodutor externo.
+    Custom External Player Arguments: Quaisquer argumentos de linha de comando, que
+      quiser passar ao reprodutor externo.
     Ignore Warnings: Ignorar avisos quando o reprodutor externo escolhido não suporte
       uma ação (por exemplo, inverter listas de reprodução).
     Custom External Player Executable: Por omissão, FreeTube assume que o reprodutor
@@ -1174,8 +1125,6 @@ New Window: Nova janela
 Channels:
   Count: '{number} canais encontrados.'
   Empty: A lista de canais está vazia.
-  Unsubscribe: Anular subscrição
-  Unsubscribed: '{channelName} foi removido das suas subscrições'
   Search bar placeholder: Procurar canais
   Channels: Canais
   Title: Lista de canais
@@ -1224,3 +1173,8 @@ Search Listing:
     4K: 4K
     Subtitles: Legendas
     Closed Captions: Legendas fechadas
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Nova
+    3D: 3D
diff --git a/static/locales/ro.yaml b/static/locales/ro.yaml
index d3f5541960c65..cd8613e1aa0e1 100644
--- a/static/locales/ro.yaml
+++ b/static/locales/ro.yaml
@@ -133,13 +133,6 @@ Most Popular: 'Cele mai populare'
 Playlists: 'Liste de redare'
 User Playlists:
   Your Playlists: 'Listele tale de redare'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nu
-    ați salvat niciun videoclip. Faceți clic pe butonul de salvare din colțul unui
-    videoclip pentru a-l afișa aici
-  Playlist Message: Această pagină nu reflectă listele de redare complet funcționale.
-    Aceasta enumeră doar videoclipurile pe care le-ați salvat sau le-ați favorizat.
-    Când lucrările vor fi finalizate, toate videoclipurile care se află în prezent
-    aici vor fi migrate într-o listă de redare "Favorite".
   Search bar placeholder: Căutați liste de redare
   Empty Search Message: Nu există videoclipuri în această listă de redare care să
     corespundă căutării dvs.
@@ -184,9 +177,6 @@ User Playlists:
   Edit Playlist Info: Editați informațiile despre lista de redare
   Copy Playlist: Copiați lista de redare
   Remove Watched Videos: Eliminați videoclipurile vizionate
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Sunteți
-    sigur că doriți să eliminați toate videoclipurile vizionate din această listă
-    de redare? Acest lucru nu poate fi anulat.
   Create New Playlist: Creați o nouă listă de redare
   Add to Playlist: Adăugați la lista de redare
   Add to Favorites: Adaugă la {playlistName}
@@ -196,7 +186,6 @@ User Playlists:
   Playlist Name: Numele listei de redare
   Playlist Description: Descrierea listei de redare
   Save Changes: Salvați modificările
-  Disable Quick Bookmark: Dezactivați marcajul rapid
   Delete Playlist: Ștergeți lista de redare
   Are you sure you want to delete this playlist? This cannot be undone: Sunteți sigur
     că doriți să ștergeți această listă de redare? Acest lucru nu poate fi anulat.
@@ -222,7 +211,6 @@ User Playlists:
       This video cannot be moved down.: Acest videoclip nu poate fi mutat în jos.
       This video cannot be moved up.: Acest videoclip nu poate fi mutat în sus.
       Video has been removed: Videoclipul a fost eliminat
-      Quick bookmark disabled: Marcaj rapid dezactivat
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: Unele
         videoclipuri din lista de redare nu au fost incă încărcate. Face-ți click
         aici pentru a le copia oricum.
@@ -448,19 +436,13 @@ Settings:
     Subscription Settings: 'Setări de abonament'
     Hide Videos on Watch: 'Ascunde videoclipurile la vizionare'
     Fetch Feeds from RSS: 'Preluare de fluxuri din RSS'
-    Manage Subscriptions: 'Gestionați abonamentele'
     Fetch Automatically: Preluați feedul automat
     Confirm Before Unsubscribing: Confirmă înainte de dezabonare
-    Only Show Latest Video for Each Channel: Arată doar cele mai noi videoclipuri
-      pentru fiecare canal
   Data Settings:
     Data Settings: 'Setări de date'
     Select Import Type: 'Selectează tipul de import'
     Select Export Type: 'Selectează tipul de export'
     Import Subscriptions: 'Importă abonamente'
-    Import FreeTube: 'Importă FreeTube'
-    Import YouTube: 'Importă YouTube'
-    Import NewPipe: 'Importă NewPipe'
     Export Subscriptions: 'Exportați abonamentele'
     Export FreeTube: 'Exportați FreeTube'
     Export YouTube: 'Exportați YouTube'
@@ -489,7 +471,6 @@ Settings:
     Unable to write file: 'Nu se poate scrie fișierul'
     Unknown data key: 'Cheie de date necunoscută'
     How do I import my subscriptions?: 'Cum îmi pot importa abonamentele?'
-    Check for Legacy Subscriptions: Verificați dacă există abonamente vechi
     Manage Subscriptions: Gestionare abonamente
     All playlists has been successfully imported: Toate listele de redare au fost
       importate cu succes
@@ -502,7 +483,6 @@ Settings:
     Playlist File: Fișier listă de redare
     History File: Fișier istoric
     Subscription File: Fișier abonament
-  Advanced Settings: {}
   The app needs to restart for changes to take effect. Restart and apply change?: Aplicația
     trebuie repornită pentru ca modificările să intre în vigoare. Reporniți și aplicați
     modificările?
@@ -552,7 +532,6 @@ Settings:
     Hide Channels Placeholder: ID-ul canalului
     Hide Channel Playlists: Ascunde playlisturile canalului
     Hide Upcoming Premieres: Ascundeți premierele viitoare
-    Blur Thumbnails: Estomparea miniaturilor
     Hide Profile Pictures in Comments: Ascundeți imaginile de profil în comentarii
     Hide Channels Already Exists: ID-ul Canalului există deja
   SponsorBlock Settings:
@@ -641,8 +620,6 @@ About:
   Help: Ajutor
   GitHub releases: Lansări GitHub
   Downloads / Changelog: Descărcări / Jurnal de modificări
-  View License: Vezi licența
-  Licensed under the AGPLv3: Licențiat sub AGPLv3
   Source code: Codul sursă
   Beta: Beta
   Discussions: Discuții
@@ -696,8 +673,6 @@ Profile:
   Profile Name: Numele Profilului
   Edit Profile Name: Editează Numele Profilului
 Channel:
-  Subscriber: 'Abonat'
-  Subscribers: 'Abonați'
   Subscribe: 'Abonați-vă'
   Unsubscribe: 'Dezabonați-vă'
   Channel has been removed from your subscriptions: 'Canalul a fost eliminat din abonamentele
@@ -797,38 +772,8 @@ Video:
     în direct nu este acceptat în prezent cu API-ul Invidious.  Este necesară o conexiune
     directă la YouTube.'
   Published:
-    Jan: 'Ian'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Mai'
-    Jun: 'iun'
-    Jul: 'Iul'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Oct'
-    Nov: 'Noi'
-    Dec: 'Dec'
-    Second: 'Secundă'
-    Seconds: 'Secunde'
-    Minute: 'Minut'
-    Minutes: 'Minute'
-    Hour: 'Oră'
-    Hours: 'Ore'
-    Day: 'Zi'
-    Days: 'Zile'
-    Week: 'Săptămână'
-    Weeks: 'Săptămâni'
-    Month: 'Lună'
-    Months: 'Luni'
-    Year: 'An'
-    Years: 'Ani'
-    Ago: 'În urmă'
-    Upcoming: 'În premieră la'
-    Less than a minute: Mai putin de un minut
     In less than a minute: În mai puțin de un minut
   Published on: 'Publicat pe'
-  Publicationtemplate: 'acum {number} {unit}'
 #& Videos
   External Player:
     Unsupported Actions:
@@ -889,16 +834,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vezi lista de redare completă'
-  Videos: 'Videoclipuri'
-  View: 'Vizionări'
-  Views: 'Vizualizări'
   Last Updated On: 'Ultima actualizare la'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Listă de redare
-Toggle Theatre Mode: 'Comutați modul Teatru'
 Change Format:
   Change Media Formats: 'Schimbați formatele video'
   Use Dash Formats: 'Utilizați formate DASH'
@@ -966,7 +907,6 @@ Falling back to Local API: 'Revenire la API-ul local'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Acest
   videoclip nu este disponibil din cauza lipsei de formate. Acest lucru se poate întâmpla
   din cauza indisponibilității țării.'
-Subscriptions have not yet been implemented: 'Abonamentele nu au fost încă implementate'
 Loop is now disabled: 'Bucla este acum dezactivată'
 Loop is now enabled: 'Bucla este acum activată'
 Shuffle is now disabled: 'Amestecarea este acum dezactivată'
@@ -993,8 +933,6 @@ Playing Next Video Interval: Se redară următorul videoclip în cel mai scurt t
   Faceți clic pentru a anula. | Se redă următorul videoclip în {nextVideoInterval}
   secundă. Faceți clic pentru a anula. | Se redă următorul videoclip în {nextVideoInterval}
   secunde. Faceți clic pentru a anula.
-Hashtags have not yet been implemented, try again later: Hashtag-urile nu au fost
-  încă implementate, încercați din nou mai târziu
 Unknown YouTube url type, cannot be opened in app: Tip url YouTube necunoscut, nu
   poate fi deschis în aplicație
 Tooltips:
@@ -1007,8 +945,7 @@ Tooltips:
       când se deschide o fereastră nouă și când schimbați profilul.
   External Player Settings:
     Custom External Player Arguments: Orice argumente personalizate din linia de comandă,
-      separate prin punct și virgulă (";"), pe care doriți să le transmiteți playerului
-      extern.
+      pe care doriți să le transmiteți playerului extern.
     Ignore Warnings: Suprimarea avertismentelor în cazul în care playerul extern curent
       nu acceptă acțiunea curentă (de exemplu, inversarea listelor de redare etc.).
     Custom External Player Executable: În mod implicit, FreeTube va presupune că playerul
@@ -1075,8 +1012,6 @@ Channels:
   Search bar placeholder: Caută canale
   Count: '{number} canal(e) găsit(e).'
   Empty: Lista ta de canale este goală.
-  Unsubscribe: Dezabonează-te
-  Unsubscribed: '{channelName} a fost eliminat din lista ta de abonamente'
   Unsubscribe Prompt: Ești sigur că dorești să te dezabonezi de la "{channelName}"?
 Screenshot Success: Capturi de ecran salvate ca "{filePath}"
 Screenshot Error: Captura de ecran a eșuat {error}
diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index e29684f82c692..1386d8e9c0630 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -98,9 +98,10 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Подписки'
   Latest Subscriptions: 'Последние подписки'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваш
-    список подписок в настоящее время пуст. Начните добавлять подписки, чтобы увидеть
-    их здесь.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'В
+    настоящее время список подписок пуст. Если вы хотите импортировать свои подписки,
+    вы можете перейти в Настройки данных и выбрать Импорт подписок или найти канал
+    и подписаться на него.'
   'Getting Subscriptions.  Please wait.': 'Получение подписок. Пожалуйста, подождите.'
   Refresh Subscriptions: Обновить подписки
   Getting Subscriptions. Please wait.: Получение подписок, подождите.
@@ -128,13 +129,6 @@ Most Popular: 'Самые популярные'
 Playlists: 'Подборки'
 User Playlists:
   Your Playlists: 'Ваши подборки'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: У
-    вас нет сохранённых видео. Нажмите «Добавить видео в сохранённые», чтобы добавить
-    сюда
-  Playlist Message: Эта страница не отражает все возможности подборок. Она показывает
-    только те видео, которые вы сохранили или добавили в избранное. После переработки
-    этой страницы все видео, которые сейчас находятся здесь, переместятся в подборку
-    «Избранное».
   Search bar placeholder: Поиск подборок
   Empty Search Message: В этом плейлисте нет видео, соответствующих вашему запросу
   This playlist currently has no videos.: Пока в этой подборке нет видео.
@@ -188,6 +182,8 @@ User Playlists:
         для быстрого создания закладок.
       Playlist {playlistName} is the new quick bookmark playlist.: Плейлист {playlistName}
         - это новый плейлист быстрых закладок.
+      This playlist has a video with a duration error: Этот плейлист содержит хотя-бы
+        одно видео без продолжтельности, оно будет отсротрированно как с нулевой продолжительностью.
     Search for Videos: Поиск видео
   AddVideoPrompt:
     N playlists selected: '{playlistCount} выбрано'
@@ -222,9 +218,6 @@ User Playlists:
   Save Changes: Сохранить изменения
   Edit Playlist Info: Изменить сведения о подборке
   Remove Watched Videos: Удалить просмотренные видео
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Ты
-    действительно хочешь удалить все просмотренные видео из этой подборки? Это действие
-    необратимо.
   Cancel: Отмена
   You have no playlists. Click on the create new playlist button to create a new one.: У
     тебя нет подборок. Нажми на кнопку создания новой подборки, чтобы создать новую.
@@ -246,6 +239,8 @@ User Playlists:
     уверены, что хотите удалить 1 просмотренное видео из этого плейлиста? Это нельзя
     отменить. | Вы уверены, что хотите удалить {playlistItemCount} просмотренных видео
     из этого плейлиста? Это нельзя отменить.
+  Export Playlist: Экспортировать этот плейлист
+  The playlist has been successfully exported: Плейлист успешно экспортирован
 History:
   # On History Page
   History: 'История'
@@ -258,36 +253,34 @@ Settings:
   # On Settings Page
   Settings: 'Настройки'
   General Settings:
-    General Settings: 'Общие настройки'
+    General Settings: 'Общие'
     Fallback to Non-Preferred Backend on Failure: 'Откатить к непредпочтительному
       движку при сбое'
-    Enable Search Suggestions: 'Отображать поисковые предложения'
-    Default Landing Page: 'Целевая страница по умолчанию'
+    Enable Search Suggestions: 'Включить поисковые предложения'
+    Default Landing Page: 'Страница по умолчанию'
     Locale Preference: 'Язык приложения'
     Preferred API Backend:
-      Preferred API Backend: 'Предпочитаемый движок набора функций'
-      Local API: 'Локальный набор функций'
-      Invidious API: 'Набор функций Invidious'
+      Preferred API Backend: 'Предпочитаемый движок API'
+      Local API: 'Локальный API'
+      Invidious API: 'Invidious API'
     Video View Type:
-      Video View Type: 'Тип отображения видео'
+      Video View Type: 'Способ отображения видео'
       Grid: 'Сеткой'
       List: 'Списком'
     Thumbnail Preference:
       Thumbnail Preference: 'Настройка заставок'
       Default: 'По умолчанию'
       Beginning: 'В начале'
-      Middle: 'В середине'
+      Middle: 'По середине'
       End: 'В конце'
       Blur: Размытие
       Hidden: Скрыто
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Экземпляр Invidious
-      (по умолчанию https://invidious.snopyta.org)'
     Region for Trending: 'Регион подбора трендов'
         #! List countries
     Check for Latest Blog Posts: Проверять последние записи в блоге
-    Check for Updates: Проверять обновления
+    Check for Updates: Проверить на наличие новых версий
     View all Invidious instance information: Просмотреть все экземпляры Invidious
-    System Default: Системные установки по умолчанию
+    System Default: Системные настройки по умолчанию
     Clear Default Instance: Очистить экземпляр по умолчанию
     Set Current Instance as Default: Установить текущий экземпляр по умолчанию
     Current instance will be randomized on startup: Текущий экземпляр при запуске
@@ -302,8 +295,10 @@ Settings:
       Open Link: Открыть ссылку
       External Link Handling: Обработка внешних ссылок
     Auto Load Next Page:
-      Label: Автоматическая загрузка следующей страницы
+      Label: Авто-загрузка следующей страницы
       Tooltip: Автоматическая загрузка дополнительных страниц и комментариев.
+    Open Deep Links In New Window: Открыть URL-адреса, переданные в FreeTube, в новом
+      окне
   Theme Settings:
     Theme Settings: 'Внешний вид'
     Match Top Bar with Main Color: 'Использовать основной цвет к верхней панели'
@@ -320,6 +315,8 @@ Settings:
       Nordic: Северный
       Solarized Dark: Соляризованная темнота
       Solarized Light: Солнечное освещение
+      Gruvbox Dark: Gruvbox Темный
+      Gruvbox Light: Gruvbox Светлый
     Main Color Theme:
       Main Color Theme: 'Основной цвет темы'
       Red: 'Красный'
@@ -367,6 +364,16 @@ Settings:
       Solarized Cyan: Соляризованный голубой
       Solarized Violet: Соляризованный фиолетовый
       Solarized Green: Соляризованный зеленый
+      Gruvbox Dark Green: Gruvbox Темно-зеленый
+      Gruvbox Dark Blue: Gruvbox Темно-синий
+      Gruvbox Dark Purple: Gruvbox Темно-фиолетовый
+      Gruvbox Dark Aqua: Грувбокс темный аква
+      Gruvbox Light Red: Gruvbox Светло-красный
+      Gruvbox Light Blue: Gruvbox Светло-голубой
+      Gruvbox Light Purple: Gruvbox Светло-фиолетовый
+      Gruvbox Light Orange: Gruvbox Светло-оранжевый
+      Gruvbox Dark Yellow: Gruvbox Темно-желтый
+      Gruvbox Dark Orange: Gruvbox Темно-оранжевый
     Secondary Color Theme: 'Вторичный цвет темы'
         #* Main Color Theme
     UI Scale: Масштаб интерфейса
@@ -375,8 +382,7 @@ Settings:
     Hide Side Bar Labels: Скрыть надписи боковой панели
     Hide FreeTube Header Logo: Скрыть значок FreeTube
   Player Settings:
-    Player Settings: 'Настройки проигрывателя'
-    Remember History: 'Запоминать историю'
+    Player Settings: 'Проигрыватель'
     Play Next Video: 'Воспроизводить следующее видео'
     Turn on Subtitles by Default: 'Субтитры по умолчанию включены'
     Autoplay Videos: 'Автовоспроизведение видео'
@@ -433,46 +439,9 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Подписки'
     Hide Videos on Watch: 'Скрывать видео после просмотра'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Формат экспорта подписок'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Управление подписками'
-    Import Subscriptions: 'Импорт подписок'
-    Export Subscriptions: 'Экспорт подписок'
-    How do I import my subscriptions?: 'Как мне импортировать свои подписки?'
     Fetch Feeds from RSS: Получать ленты из RSS
     Fetch Automatically: Автоматически получать ленту
-    Only Show Latest Video for Each Channel: Показывать только последние видео для
-      каждого канала
     Confirm Before Unsubscribing: Подтвердить, прежде чем отписаться
-  Advanced Settings:
-    Advanced Settings: 'Расширенные настройки'
-    Enable Debug Mode (Prints data to the console): 'Включить режим отладки (выводит
-      данные на консоль)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Прокси-адрес (пример: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Нажатие
-      кнопки "ТЕСТ ПРОКСИ" отправит запрос на https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Использовать Tor / Прокси для вызовов API'
-    TEST PROXY: 'ТЕСТ ПРОКСИ'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'См. общедоступные экземпляры'
-    Clear History:
-      Clear History: 'Очистить историю'
-      # On Click
-      Are you sure you want to delete your history?: 'Вы уверены, что хотите удалить
-        свою историю?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Очистить подписки'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Вы уверены, что хотите
-        удалить все подписки?'
-      #& Yes
-      #& No
 
   Privacy Settings:
     Watch history has been cleared: История просмотров очищена
@@ -521,14 +490,10 @@ Settings:
     Export YouTube: Экспортировать YouTube
     Export FreeTube: Экспортировать FreeTube
     Export Subscriptions: Экспортировать подписки
-    Import NewPipe: Импортировать NewPipe
-    Import YouTube: Импортировать YouTube
-    Import FreeTube: Импортировать FreeTube
     Import Subscriptions: Импортировать подписки
     Select Export Type: Выбрать тип экспорта
     Select Import Type: Выбрать тип импорта
     Data Settings: Данные
-    Check for Legacy Subscriptions: Проверить устаревшие подписки
     Manage Subscriptions: Управление подписками
     Import Playlists: Импортировать подборки
     All playlists has been successfully exported: Все подборки успешно экспортированы
@@ -552,7 +517,7 @@ Settings:
     Hide Popular Videos: Скрыть популярные видео
     Hide Trending Videos: Скрыть видео в тренде
     Hide Recommended Videos: Скрыть рекомендуемые видео
-    Distraction Free Settings: Отвлекающие части интерфейса
+    Distraction Free Settings: Отвлекающие элементы
     Hide Comment Likes: Скрыть лайки в комментариях
     Hide Channel Subscribers: Скрыть подписчиков канала
     Hide Video Likes And Dislikes: Скрыть лайки и дизлайки к видео
@@ -570,19 +535,19 @@ Settings:
     Display Titles Without Excessive Capitalisation: Отображать заголовки без сплошных
       заглавных букв и знаков препинания
     Hide Featured Channels: Скрыть избранные каналы
-    Hide Channel Playlists: Скрыть подборки канала
-    Hide Channel Community: Скрыть сообщество канала
-    Hide Channel Shorts: Скрыть короткие видео канала
+    Hide Channel Playlists: Скрыть вкладку "Списки воспроизведения" канала
+    Hide Channel Community: Скрыть вкладку "Сообщество" канала
+    Hide Channel Shorts: Скрыть вкладку "Шорты" канала
     Sections:
       Side Bar: Боковая полоса
       Channel Page: Страница канала
       Watch Page: Страница просмотра
       General: Основные
       Subscriptions Page: Страница подписок
-    Hide Channel Releases: Скрыть выпуски канала
+    Hide Channel Releases: Скрыть вкладку "Релизы" канала
     Hide Subscriptions Videos: Скрыть видео из подписок
     Hide Subscriptions Live: Скрыть трансляции из подписок
-    Hide Channel Podcasts: Скрыть звукопередачи канала
+    Hide Channel Podcasts: Скрыть вкладку "Подкасты" канала
     Hide Subscriptions Shorts: Скрыть короткие видео из подписок
     Hide Profile Pictures in Comments: Скрыть изображения профилей в комментариях
     Hide Channels Invalid: Указанный идентификатор канала недействителен
@@ -596,6 +561,7 @@ Settings:
       текст
     Hide Videos and Playlists Containing Text Placeholder: Слово, часть слова, или
       выражение
+    Hide Channel Home: Скрыть вкладку "Главная" канала
   The app needs to restart for changes to take effect. Restart and apply change?: Чтобы
     изменения вступили в силу, необходимо перезапустить приложение. Перезапустить
     и применить изменения?
@@ -615,12 +581,16 @@ Settings:
     Ip: Ip
     Enable Tor / Proxy: Включить Tor/Прокси
     Proxy Settings: Прокси
+    Proxy Warning: FreeTube не имеет встроенного прокси, но может подключаться к внешнему
+      прокси, например, к запущенному на вашей машине Tor или к внешнему прокси, например,
+      SOCKS5, предоставляемому некоторыми VPN. Если прокси включен, убедитесь, что
+      ваш прокси/Tor настроен правильно, иначе FreeTube не сможет получать данные.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Уведомлять о пропущенном сегменте
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Сетевой адрес SponsorBlock
       API (По умолчанию https://sponsor.ajay.app)
     Enable SponsorBlock: Включить
-    SponsorBlock Settings: Настройки SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Опция пропуска
       Prompt To Skip: Предлагать пропустить
@@ -652,11 +622,11 @@ Settings:
     Open in web browser: Открыть в браузере
   Parental Control Settings:
     Show Family Friendly Only: Показать только семейный контент
-    Parental Control Settings: Настройки родительского контроля
+    Parental Control Settings: Родительский Контроль
     Hide Unsubscribe Button: Скрыть кнопку отписки
     Hide Search Bar: Скрыть строку поиска
   Experimental Settings:
-    Experimental Settings: Пробные настройки
+    Experimental Settings: Эксперементы
     Replace HTTP Cache: Заменить HTTP-кэш
     Warning: Эти настройки являются пробными, они могут привести к вылетам приложения
       при включении. Желательно сделать резервные копии. Используйте на своё усмотрение!
@@ -666,44 +636,17 @@ Settings:
     Unlock: Разблокировать
     Enter Password To Unlock: Введите пароль для разблокировки настроек
   Password Settings:
-    Password Settings: Настройка пароля
+    Password Settings: Пароль
     Set Password To Prevent Access: Установите пароль для предотвращения доступа к
       настройкам
     Set Password: Установить пароль
     Remove Password: Удалить пароль
-  Expand All Settings Sections: Расширить все разделы настроек
   Sort Settings Sections (A-Z): Сортировка разделов настроек (A-Z)
+  Return to Settings Menu: Вернуться в Настройки
 About:
   #On About page
   About: 'О приложении'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Это
-    программное обеспечение с авторским левом распространяется под свободной лицензией
-    AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Нашли ошибку? Хотите предложить функцию? Хотите помочь? Посетите нашу страницу
-    GitHub. Запросы на объединение приветствуются.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Большое
-    спасибо людям и проектам, которые сделали FreeTube возможным!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Хотите
-    пообщаться? Присоединяйтесь к нашему серверу Element / Matrix. Пожалуйста, ознакомьтесь
-    с правилами перед тем, как присоединиться.'
-
-  'Looking for help? Check out our Wiki page.': 'Нужна помощь? Посетите нашу вики-страницу.'
-
-  Check out our Firefox extension!: 'Ознакомьтесь с нашим расширением для Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Если
-    вам нравится использовать FreeTube, рассмотрите возможность пожертвования через
-    Liberapay или через наш биткойн-адрес.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Последние новости FreeTube'
-
 #On Channel Page
   Donate: Пожертвовать
   these people and projects: этим людям и проектам
@@ -723,8 +666,6 @@ About:
   Help: Помощь
   GitHub releases: Выпуски на GitHub
   Downloads / Changelog: Скачать / Список изменений
-  View License: Посмотреть лицензию
-  Licensed under the AGPLv3: Лицензия AGPLv3
   Source code: Исходный код
   Beta: Бета
   Please check for duplicates before posting: Перед публикацией проблемы, проверьте
@@ -734,8 +675,6 @@ About:
   Licensed under the: Лицензия выдана под
   AGPLv3: AGPLv3
 Channel:
-  Subscriber: 'Подписчик'
-  Subscribers: 'Подписчиков'
   Subscribe: 'Подписаться'
   Unsubscribe: 'Отписаться'
   Search Channel: 'Поиск на канале'
@@ -802,6 +741,9 @@ Channel:
     Releases: Выпуски
     This channel does not currently have any releases: На этом канале пока нет ни
       одного выпуска
+  Home:
+    Home: Дом
+    View Playlist: Просмотреть плейлист
 Video:
   Mark As Watched: 'Отметить как просмотренное'
   Remove From History: 'Удалить из истории'
@@ -831,38 +773,8 @@ Video:
     трансляции в настоящее время не поддерживается Invidious API. Требуется прямое
     подключение к YouTube.'
   Published:
-    Jan: 'Янв'
-    Feb: 'Фев'
-    Mar: 'Мар'
-    Apr: 'Апр'
-    May: 'Май'
-    Jun: 'Июн'
-    Jul: 'Июл'
-    Aug: 'Авг'
-    Sep: 'Сен'
-    Oct: 'Окт'
-    Nov: 'Ноя'
-    Dec: 'Дек'
-    Second: 'Секунда'
-    Seconds: 'Секунд'
-    Hour: 'Час'
-    Hours: 'Часов'
-    Day: 'День'
-    Days: 'Дней'
-    Week: 'Неделя'
-    Weeks: 'Недель'
-    Month: 'Месяц'
-    Months: 'Месяцев'
-    Year: 'Год'
-    Years: 'Лет'
-    Ago: 'Назад'
-    Upcoming: 'Премьера'
-    Minutes: Минут
-    Minute: Минута
-    Less than a minute: Менее минуты
     In less than a minute: Меньше чем через минуту
   Published on: 'Размещено'
-  Publicationtemplate: '{number} {unit} назад'
 #& Videos
   Autoplay: Автовоспроизведение
   Play Previous Video: Воспроизвести предыдущее видео
@@ -949,6 +861,18 @@ Video:
     Take Screenshot: Сделать Снимок Экрана
     Show Stats: Показать Статистику
     Hide Stats: Скрыть Статистику
+  IP block: YouTube заблокировал ваш IP-адрес для просмотра видео. Пожалуйста, попробуйте
+    переключиться на другой VPN или прокси.
+  MembersOnly: Видео только для подписчиков нельзя смотреть на FreeTube, так как для
+    них требуется вход в Google и платное членство на канале пользователя, загрузившего
+    подписку.
+  Unlisted: Отсутствует в списках
+  AgeRestricted: Видео с возрастными ограничениями нельзя смотреть через FreeTube,
+    так как для этого требуется вход в Google и использование подтвержденной учетной
+    записи YouTube.
+  DeArrow:
+    Show Original Details: Показать стандартные свойства
+    Show Modified Details: Показать модифицированные свойства
 Videos:
   #& Sort By
   Sort By:
@@ -959,9 +883,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Посмотреть всю подборку'
-  Videos: 'Видео'
-  View: 'Вид'
-  Views: 'Просмотров'
   Last Updated On: 'Последнее обновление'
 
 # On Video Watch Page
@@ -977,7 +898,8 @@ Playlist:
     VideoTitleAscending: Название (от А до Я)
     VideoTitleDescending: Название (Z-A)
     Custom: Пользовательский
-Toggle Theatre Mode: 'Переключить режим широкого экрана'
+    VideoDurationAscending: Продолжительность (Сначала кратчайшие)
+    VideoDurationDescending: Продолжительность (Сначала длиннейшие)
 Change Format:
   Change Media Formats: 'Изменить форматы видео'
   Use Dash Formats: 'Использовать форматы DASH'
@@ -1047,7 +969,6 @@ Invidious API Error (Click to copy): 'Ошибка набора функций I
   скопировать)'
 Falling back to Invidious API: 'Возврат к набору функций Invidious'
 Falling back to Local API: 'Возврат к локальному набору функций'
-Subscriptions have not yet been implemented: 'Подписки еще не реализованы'
 Loop is now disabled: 'Повторение теперь отключено'
 Loop is now enabled: 'Повторение теперь включено'
 Shuffle is now disabled: 'Перемешивание теперь отключено'
@@ -1102,7 +1023,7 @@ Profile:
   Other Channels: Другие каналы
   Subscription List: Список подписок
   Profile Filter: Фильтр профилей
-  Profile Settings: Настройки профиля
+  Profile Settings: Профиль
   Toggle Profile List: Переключить список профилей
   Create Profile Name: Создать название учётки
   Profile Name: Название учётки
@@ -1137,9 +1058,10 @@ Tooltips:
       по умолчанию.\n"
   Subscription Settings:
     Fetch Feeds from RSS: Если эта настройка включена, FreeTube будет получать вашу
-      ленту подписок с помощью RSS, а не как обычно. RSS работает быстрее и предотвращает
-      блокировку IP, но не предоставляет определённую информацию, такую как продолжительность
-      видео или сведения о том, транслируется ли видео в настоящем времени
+      ленту подписок с помощью RSS, вместо метода по умолчанию. RSS работает быстрее
+      и предотвращает блокировку IP, но не предоставляет определённую информацию,
+      такую как продолжительность видео или сведения о том, транслируется ли видео
+      в настоящем времени
     Fetch Automatically: Если эта функция включена, FreeTube автоматически будет получать
       ленту ваших подписок как при открытии нового окна, так при переключении профиля.
   Player Settings:
@@ -1148,7 +1070,7 @@ Tooltips:
       ограничены пределом в 720p, но используют меньшую пропускную способность. Звуковые
       форматы — только звуковые потоки.
     Proxy Videos Through Invidious: Будет подключаться к Invidious для показа видео
-      вместо прямого подключения к YouTube. Переопределяет предпочтения набора функций.
+      вместо прямого подключения к YouTube.
     Scroll Playback Rate Over Video Player: Пока указатель мыши находится над видео,
       нажмите и удерживайте клавишу Control (клавиша Command на Mac) и прокрутите
       колесо мыши вперед или назад, чтобы изменять скорость воспроизведения. Нажмите
@@ -1159,7 +1081,7 @@ Tooltips:
       видео в стиле MPV.
   External Player Settings:
     Custom External Player Arguments: Любые пользовательские аргументы командной строки,
-      разделенные точкой с запятой (';'), которые вы хотите передать внешнему проигрывателю.
+      которые вы хотите передать внешнему проигрывателю.
     Ignore Warnings: Скрыть предупреждения, когда текущий внешний проигрыватель не
       поддерживает текущее действие (например, обратный порядок подборок и другие).
     Custom External Player Executable: По умолчанию FreeTube будет считать, что выбранный
@@ -1194,8 +1116,6 @@ Playing Next Video Interval: Воспроизведение следующего
   для отмены. | Воспроизведение следующего видео через {nextVideoInterval} сек. Нажмите
   для отмены. | Воспроизведение следующего видео через {nextVideoInterval} сек. Нажмите
   для отмены.
-Hashtags have not yet been implemented, try again later: Распределительные метки ещё
-  не сделаны, попробуйте позже
 Unknown YouTube url type, cannot be opened in app: Неизвестный тип адреса YouTube,
   невозможно открыть в приложении
 Open New Window: Открыть новое окно
@@ -1219,8 +1139,6 @@ Channels:
   Empty: Список каналов пуст.
   Channels: Каналы
   Search bar placeholder: Поиск каналов
-  Unsubscribe: Отписаться
-  Unsubscribed: '{channelName} был удалён из ваших подписок'
   Unsubscribe Prompt: Вы уверены, что хотите отписаться от «{channelName}»?
 Clipboard:
   Copy failed: Не удалось скопировать в буфер обмена
@@ -1232,6 +1150,7 @@ Chapters:
     текущий раздел: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Список разделов скрыт,
     текущий раздел: {chapterName}'
+  Key Moments: Основные моменты
 Preferences: Настройки
 Ok: Хорошо
 Hashtag:
@@ -1268,5 +1187,20 @@ Search Listing:
     4K: 4K
     Subtitles: Субтитры
     Closed Captions: Субтитры
+    8K: 8К
+    VR180: VR180
+    360 Video: 360°
+    New: Новинка
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Заблокировано открытие потенциально небезопасного
   URL: "{url}".'
+KeyboardShortcutTemplate: '{метка} ({короткое нажатие})'
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Стрелка вниз
+  arrowleft: Стрелка влево
+  arrowright: Стрелка вправо
+  arrowup: Стрелка вверх
+Right-click or hold to see history: ПКМ или зажми для просмотра истории
diff --git a/static/locales/si.yaml b/static/locales/si.yaml
index c6edfc65bd4ab..03a504e13fe93 100644
--- a/static/locales/si.yaml
+++ b/static/locales/si.yaml
@@ -73,7 +73,6 @@ Settings:
       Black: 'කළු'
       Dark: 'අඳුරු'
   Player Settings: {}
-  Advanced Settings: {}
 Channel:
   Playlists: {}
 More: තව
diff --git a/static/locales/sk.yaml b/static/locales/sk.yaml
index 3f9c5004650a9..8d546bedb3c47 100644
--- a/static/locales/sk.yaml
+++ b/static/locales/sk.yaml
@@ -126,11 +126,6 @@ Most Popular: 'Populárne'
 Playlists: 'Playlist'
 User Playlists:
   Your Playlists: 'Tvoj playlist'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Vaše
-    uložené videá sú prázdne. Kliknutím na tlačidlo uložiť v rohu videa ho tu zobrazíte
-  Playlist Message: Zatiaľ tu nie sú plne funkčné playlisty. Sú tu len videá, ktoré
-    ste uložili medzi obľúbené. Keď playlisty plne implementujeme do aplikácie, presunú
-    sa do „Obľúbené“.
   You have no playlists. Click on the create new playlist button to create a new one.: Nemáte
     žiadne playlisty. Kliknutím na tlačidlo playlistu vytvoríte nový.
   Empty Search Message: V tomto playliste nie sú žiadne videá, ktoré by zodpovedali
@@ -183,8 +178,6 @@ Settings:
       Beginning: 'Začiatok'
       Middle: 'Stred'
       End: 'Koniec'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Stránka
-      (Predvolená je https://invidious.snopyta.org)'
     Region for Trending: 'Región pre trendy'
         #! List countries
     Check for Latest Blog Posts: Kontrolovať najnovšie príspevky na blogu
@@ -283,33 +276,7 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Nastavenia Odberov'
     Hide Videos on Watch: 'Skryť videá po zhliadnutí'
-    Manage Subscriptions: 'Spravovať odbery'
     Fetch Feeds from RSS: Natiahnuť kanály z RSS
-  Advanced Settings:
-    Enable Debug Mode (Prints data to the console): 'Povoliť režim ladenia (Zaplní
-      konzolu údajmi)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy adresa (príklad: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Kliknutím
-      na tlačidlo „VYSKÚŠAŤ PROXY“ odošlete žiadosť na adresu https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Používať Tor / Proxy pre volania API'
-    TEST PROXY: 'VYSKÚŠAŤ PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Zobraziť verejné inštancie'
-    Clear History:
-      Clear History: 'Vymazať históriu'
-      # On Click
-      Are you sure you want to delete your history?: 'Naozaj chcete odstrániť svoju
-        históriu?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Vymazať odbery'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Naozaj chcete odstrániť
-        všetky odbery?'
-      #& Yes
-      #& No
 
   Data Settings:
     How do I import my subscriptions?: Ako môžem importovať svoje odbery?
@@ -337,10 +304,6 @@ Settings:
     Export YouTube: Exportovať dáta vo formáte Youtube
     Export FreeTube: Exportovať dáta vo formáte FreeTube
     Export Subscriptions: Exportovať Odbery
-    Check for Legacy Subscriptions: Skontrolovať zastarané odbery
-    Import NewPipe: Importovať dáta z NewPipe
-    Import YouTube: Importovať dáta z Youtube
-    Import FreeTube: Importovať dáta z FreeTube
     Import Subscriptions: Importovať odbery
     Select Export Type: Vybrať typ exportu
     Select Import Type: Vybrať typ importu
@@ -407,40 +370,11 @@ About:
   #On About page
   About: 'O FreeTube'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Tento
-    softvér je voľne licencovaný pod AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Našli ste chybu? Chcete navrhnúť funkciu? Chcete pomôcť? Navštívte našu stránku
-    GitHub. PRka vítané.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Ďakujeme
-    veľmi pekne ľuďom a projektom, ktoré umožňujú, že FreeTube funguje!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Chcete
-    sa porozprávať? Pripojte sa k nášmu serveru Element / Matrix. Pred pripojením
-    si prečítajte pravidlá.'
-
-  'Looking for help? Check out our Wiki page.': 'Hľadáte pomoc? Navštívte našu stránku
-    Wiki.'
-
-  Check out our Firefox extension!: 'Vyskúšajte naše rozšírenie pre Firefox!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ak
-    radi využívate FreeTube, zvážte donate skrz Liberapay alebo prostredníctvom našej
-    bitcoinovej adresy.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Najnovšie správy o FreeTube'
-
 #On Channel Page
   FreeTube Wiki: Wiki FreeTube
   Help: Pomoc
   GitHub releases: Vydania na GitHube
   Downloads / Changelog: Súbory na stiahnutie / Zoznam zmien
-  View License: Zobraziť licenciu
-  Licensed under the AGPLv3: Na základe licencie AGPLv3
   Beta: Testovacia verzia
   Source code: Zdrojový kód
   GitHub issues: Problémy z GitHubu
@@ -461,8 +395,6 @@ About:
   Please check for duplicates before posting: Pred odoslaním prosím skontrolujte duplicitné
     otázky
 Channel:
-  Subscriber: 'Odberateľ'
-  Subscribers: 'Odberateľov'
   Subscribe: 'Odberať'
   Unsubscribe: 'Zrušiť odber'
   Search Channel: 'Vyhľadať v kanáli'
@@ -519,37 +451,7 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Live
     Chat momentálne nie je podporovaný pomocou API Invidious. Vyžaduje sa priame pripojenie
     k službe YouTube.'
-  Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Máj'
-    Jun: 'Jún'
-    Jul: 'Júl'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Dec'
-    Second: 'Sekunda'
-    Seconds: 'Sekúnd'
-    Hour: 'Hodina'
-    Hours: 'Hodín'
-    Day: 'Deň'
-    Days: 'Dni'
-    Week: 'Týždeň'
-    Weeks: 'Týždne'
-    Month: 'Mesiac'
-    Months: 'Mesiace'
-    Year: 'Rok'
-    Years: 'Rokov'
-    Ago: 'Pred'
-    Upcoming: 'Premiéra o'
-    Minute: Minúta
-    Minutes: Minút
   Published on: 'Publikované dňa'
-  Publicationtemplate: 'pred {number} {unit}'
 #& Videos
   Autoplay: Automatické prehrávanie
   Starting soon, please refresh the page to check again: Čoskoro začína, obnovte stránku
@@ -604,16 +506,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Zobraziť celý zoznam videí'
-  Videos: 'Videá'
-  View: 'Pozrieť'
-  Views: 'Zhliadnutí'
   Last Updated On: 'Posledná aktualizácia'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Zoznam videí
-Toggle Theatre Mode: 'Prepnúť na režim kino'
 Change Format:
   Change Media Formats: 'Zmena formátov videa'
   Use Dash Formats: 'Použitie formátov DASH'
@@ -674,7 +572,6 @@ Local API Error (Click to copy): 'Local API chyba (kliknutím skopírujete)'
 Invidious API Error (Click to copy): 'Invidious API chyba (kliknutím skopírujete)'
 Falling back to Invidious API: 'Návrat k Invidious API'
 Falling back to Local API: 'Návrat k local API'
-Subscriptions have not yet been implemented: 'Odbery ešte nie sú implementované'
 Loop is now disabled: 'Opakovanie je teraz deaktivované'
 Loop is now enabled: 'Opakovanie je teraz povolené'
 Shuffle is now disabled: 'Náhodné prehrávanie je teraz zakázané'
@@ -787,8 +684,6 @@ Playing Next Video Interval: Prehrávanie ďalšieho videa za chvíľu. Kliknut
   | Prehráva sa ďalšie video o {nextVideoInterval} sekundu. Kliknutím zrušíte. | Prehráva
   sa ďalšie video o {nextVideoInterval} sekúnd. Kliknutím zrušíte.
 More: Viac
-Hashtags have not yet been implemented, try again later: Neznámy typ adresy URL YouTube,
-  v aplikácii sa nedá otvoriť
 Unknown YouTube url type, cannot be opened in app: Neznámy typ adresy URL YouTube,
   v aplikácii sa nedá otvoriť
 Open New Window: Otvoriť nové okno
@@ -806,9 +701,7 @@ Channels:
   Title: Zoznam kanálov
   Count: 'Nájdených {number} kanálov.'
   Search bar placeholder: Vyhľadať kanály
-  Unsubscribed: '{channelName} bol odstránený z vašich odberov'
   Empty: Váš zoznam kanálov je momentálne prázdny.
-  Unsubscribe: Zrušiť odber
   Unsubscribe Prompt: Určite sa chcete odhlásiť z odberu "{channelName}"?
 Preferences: Predvoľby
 Close Banner: Zavrieť banner
diff --git a/static/locales/sl.yaml b/static/locales/sl.yaml
index bbf549da3c2c6..b468c4f5f5728 100644
--- a/static/locales/sl.yaml
+++ b/static/locales/sl.yaml
@@ -105,13 +105,6 @@ Most Popular: 'Najbolj popularno'
 Playlists: 'Seznami predvajanja'
 User Playlists:
   Your Playlists: 'Vaši seznami predvajanja'
-  Playlist Message: Ta stran ne odraža stanja popolnoma delujočih seznamov predvajanja.
-    Na njej so prikazani zgolj videoposnetki, ki ste jih shranili ali označili kot
-    priljubljene. Ko bo delo končano, bodo ti videoposnetki preseljeni v Seznam priljubljenih
-    videoposnetkov.
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nimate
-    shranjenih videoposnetkov. Kliknite na gumb Shrani v kotu videoposnetka, da bo
-    ta dodan tukaj
   Search bar placeholder: Iskanje v seznamu predvajanja
   Empty Search Message: Na tem seznamu predvajanja ni videoposnetkov, ki bi ustrezali
     vašemu iskanju
@@ -150,8 +143,6 @@ Settings:
       Beginning: 'Začetek'
       Middle: 'Sredina'
       End: 'Konec'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious instanca
-      (prevzeta je https://invidious.snopyta.org)'
     Region for Trending: 'Regija za priljubljene videoposnetke'
         #! List countries
     View all Invidious instance information: Prikaži vse podatke o Invidious domeni
@@ -297,15 +288,11 @@ Settings:
     Subscription Settings: 'Nastavitve naročnin'
     Hide Videos on Watch: 'Skrij gledane videoposnetke'
     Fetch Feeds from RSS: 'Pridobi vire iz RSS'
-    Manage Subscriptions: 'Upravljanje z naročninami'
   Data Settings:
     Data Settings: 'Podatkovne nastavitve'
     Select Import Type: 'Izberi uvozno obliko'
     Select Export Type: 'Izberi izvozno obliko'
     Import Subscriptions: 'Uvozi naročnine'
-    Import FreeTube: 'Uvozi iz FreeTube'
-    Import YouTube: 'Uvozi iz YouTube'
-    Import NewPipe: 'Uvozi iz NewPipe'
     Export Subscriptions: 'Izvozi naročnine'
     Export FreeTube: 'Izvozi za FreeTube'
     Export YouTube: 'Izvozi za YouTube'
@@ -333,33 +320,7 @@ Settings:
     Unable to write file: 'Datoteke ni možno prebrati'
     Unknown data key: 'Neznan podatkovni ključ'
     How do I import my subscriptions?: 'Kako lahko uvozim moje naročnine?'
-    Check for Legacy Subscriptions: Poišči zapuščinske naročnine
     Manage Subscriptions: Upravljaj z naročninami
-  Advanced Settings:
-    Advanced Settings: 'Napredne nastavitve'
-    Enable Debug Mode (Prints data to the console): 'Vklopi razhroščevalni način (podatke
-      prikaže v konzoli)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy naslov (primer: SOCKS5://127.0.0.1:9050)'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Če
-      kliknete gumb "Preizkusi Proxy", bo poslana zahteva na https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Uporabi Tor/Proxy za API klice'
-    TEST PROXY: 'Preizkusi Proxy'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Prikaži javne domene'
-    Clear History:
-      Clear History: 'Izbriši zgodovino'
-      # On Click
-      Are you sure you want to delete your history?: 'Ste prepričani, da želite izbrisati
-        vašo zgodovino?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Izbriši naročnine'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Ste prepričani, da želite
-        izbrisati vse naročnine?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Skrij klepet v živo
@@ -411,33 +372,6 @@ About:
   #On About page
   About: 'O programu'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ta
-    programska oprema je objavljena pod odprto licenco AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Ste našli napako? Želite prelagati novo funkcijo? Želite priskočiti na pomoč?
-    Pojdite na našo GitHub stran. Pull request-i so dobrodošli.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Najlepša
-    hvala projektom in osebam, zaradi katerih je FreeTube mogoč!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Si
-    želite pogovora? Pridružite se našemu Element/Matrix strežniku. Prosimo, pred
-    včlanitvijo preberite pravila.'
-
-  'Looking for help? Check out our Wiki page.': 'Potrebujete pomoč? Oglejte si našo
-    Wiki stran.'
-
-  Check out our Firefox extension!: 'Preizkusite naš Firefox dodatek!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Če
-    radi uporabljate FreeTube, bi bili zelo veseli donacije preko LiberaPay ali našega
-    Bitcoin naslova.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Najnovejše FreeTube novice'
-
   Donate: Doniraj
   these people and projects: teh ljudi in projektov
   FreeTube is made possible by: FreeTube obstaja zaradi
@@ -459,8 +393,6 @@ About:
   Help: Pomoč
   GitHub releases: Github izdaje
   Downloads / Changelog: Prenosi in dnevnik sprememb
-  View License: Ogled licence
-  Licensed under the AGPLv3: Licencirano pod AGPLv3
   Source code: Izvirna koda
   Beta: Beta
 Profile:
@@ -508,8 +440,6 @@ Profile:
   Profile Filter: Filter profilov
   Profile Settings: Nastavitve profila
 Channel:
-  Subscriber: 'Naročnik'
-  Subscribers: 'Naročnikov'
   Subscribe: 'Naroči se'
   Unsubscribe: 'Prekini naročnino'
   Channel has been removed from your subscriptions: 'Kanal je bil odstranjen iz vaših
@@ -576,37 +506,8 @@ Video:
     v živo trenutno ni podprt v Invidious APV.  Potrebna je neposredna povezava z
     YouTubom.'
   Published:
-    Jan: 'jan.'
-    Feb: 'feb.'
-    Mar: 'mar.'
-    Apr: 'apr.'
-    May: 'maj'
-    Jun: 'jun.'
-    Jul: 'jul.'
-    Aug: 'avg.'
-    Sep: 'sep.'
-    Oct: 'okt.'
-    Nov: 'nov.'
-    Dec: 'dec.'
-    Second: 'sekunda'
-    Seconds: 'sekunde'
-    Minute: 'minuta'
-    Minutes: 'minute'
-    Hour: 'h'
-    Hours: 'h'
-    Day: 'd'
-    Days: 'd'
-    Week: 'ted.'
-    Weeks: 'tedni'
-    Month: 'mesec'
-    Months: 'meseci'
-    Year: 'let.'
-    Years: 'leta'
-    Ago: 'Nazaj'
-    Upcoming: 'Kmalu bo objavljeno'
     In less than a minute: Manj kot minuti
   Published on: 'Objavljeno dne'
-  Publicationtemplate: '{number} {unit} nazaj'
 #& Videos
   audio only: Samo avdio
   video only: Samo video
@@ -631,16 +532,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Pokaži celoten seznam predvajanja'
-  Videos: 'Videoposnetki'
-  View: 'Ogled'
-  Views: 'Ogledi'
   Last Updated On: 'Nazadnje posodobljeno dne'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Seznam predvajanja
-Toggle Theatre Mode: 'Preklopi gledališki način'
 Change Format:
   Change Media Formats: 'Spremeni vrsto videoposnetka'
   Use Dash Formats: 'Uporabi DASH oblike'
@@ -697,7 +594,6 @@ Falling back to Invidious API: 'Začasno bo uporabljen Invidious APV'
 Falling back to Local API: 'Začasno bo uporabljen lokalni APV'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Videoposnetek
   zaradi mankajočih oblik ni dostopen. To se lahko zgodi, ko v vaši državi ni na razpolago.'
-Subscriptions have not yet been implemented: 'Naročnine še niso bile implementirane'
 Loop is now disabled: 'Ponovno predvajanje je izklopljeno'
 Loop is now enabled: 'Ponovno predvajanje je vklopljeno'
 Shuffle is now disabled: 'Mešanje je izklopljeno'
@@ -731,9 +627,7 @@ Channels:
   Title: Seznam kanalov
   Search bar placeholder: Išči kanale
   Empty: Vaš seznam kanalov je trenutno prazen.
-  Unsubscribe: Prekini naročnino
   Count: Najdenih {number} kanalov.
-  Unsubscribed: '{channelName} je bil odstranjen iz vašega seznama kanalov'
   Unsubscribe Prompt: Ali ste prepričani, da želite prekiniti naročnino od "{channelName}"?
 Are you sure you want to open this link?: Ali ste prepričani, da želite odpreti to
   povezavo?
diff --git a/static/locales/sm.yaml b/static/locales/sm.yaml
index e28da2d8b204c..cdc59a9a0c026 100644
--- a/static/locales/sm.yaml
+++ b/static/locales/sm.yaml
@@ -115,8 +115,6 @@ Channels:
   Search bar placeholder: ''
   Count: ''
   Empty: ''
-  Unsubscribe: ''
-  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
   Trending: ''
@@ -129,8 +127,6 @@ Most Popular: ''
 Playlists: ''
 User Playlists:
   Your Playlists: ''
-  Playlist Message: ''
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   Empty Search Message: ''
   Search bar placeholder: ''
 History:
@@ -249,27 +245,25 @@ Settings:
     Proxy Videos Through Invidious: ''
     Autoplay Playlists: ''
     Enable Theatre Mode by Default: ''
-    Scroll Volume Over Video Player: 'Прагортваць гучнасці па-над відэапрайгравальнікам'
-    Scroll Playback Rate Over Video Player: 'Прагортваць хуткасці прайгравання па-над
-      відэапрайгравальнікам'
-    Skip by Scrolling Over Video Player: 'Прапусціць, прагарнуўшы відэапрайгравальнік'
-    Display Play Button In Video Player: 'Адлюстроўваць кнопку прайгравання ў відэапрайгравальніку'
-    Enter Fullscreen on Display Rotate: 'Пераходзіць у поўнаэкранны рэжым пры павароце
-      дысплэя'
-    Next Video Interval: 'Інтэрвал да наступнага відэа'
-    Fast-Forward / Rewind Interval: 'Інтэрвал перамоткі наперад / назад'
-    Default Volume: 'Гучнасць па змаўчанні'
-    Default Playback Rate: 'Хуткасць прайгравання па змаўчанні'
-    Max Video Playback Rate: 'Максімальная хуткасць прайгравання відэа'
-    Video Playback Rate Interval: 'Інтэрвал хуткасці прайгравання відэа'
+    Scroll Volume Over Video Player: ''
+    Scroll Playback Rate Over Video Player: ''
+    Skip by Scrolling Over Video Player: ''
+    Display Play Button In Video Player: ''
+    Enter Fullscreen on Display Rotate: ''
+    Next Video Interval: ''
+    Fast-Forward / Rewind Interval: ''
+    Default Volume: ''
+    Default Playback Rate: ''
+    Max Video Playback Rate: ''
+    Video Playback Rate Interval: ''
     Default Video Format:
-      Default Video Format: 'Фармат відэа па змаўчанні'
-      Dash Formats: 'Фарматы DASH'
-      Legacy Formats: 'Састарэлыя фарматы'
-      Audio Formats: 'Аўдыё фарматы'
+      Default Video Format: ''
+      Dash Formats: ''
+      Legacy Formats: ''
+      Audio Formats: ''
     Default Quality:
-      Default Quality: 'Якасць па змаўчанні'
-      Auto: 'Аўта'
+      Default Quality: ''
+      Auto: ''
       144p: '144p'
       240p: '240p'
       360p: '360p'
@@ -280,32 +274,27 @@ Settings:
       4k: '4k'
       8k: '8k'
     Screenshot:
-      Enable: 'Уключыць здымак экрана'
-      Format Label: 'Фармат здымка'
-      Quality Label: 'Якасць здымка'
-      Ask Path: 'Пытаць папку для захоўвання'
-      Folder Label: 'Папка для здымкаў'
-      Folder Button: 'Выбраць папку'
-      File Name Label: 'Шаблон назвы файла'
-      File Name Tooltip: 'Вы можаце выкарыстоўваць пераменныя ніжэй. %Y Год 4 лічбы.
-        %M Месяц 2 лічбы. %D Дні 2 лічбы. %H Гадзіны 2 лічбы. %N Хвіліны 2 лічбы.
-        %S Секунды 2 лічбы. %T Мілісекунды 3 лічбы. %s Секунды відэа. %t Мілісекунды
-        відэа 3 лічбы. %i Ідэнтыфікатар відэа. Вы таксама можаце выкарыстоўваць "\"
-        або "/" для стварэння падпапак.'
+      Enable: ''
+      Format Label: ''
+      Quality Label: ''
+      Ask Path: ''
+      Folder Label: ''
+      Folder Button: ''
+      File Name Label: ''
+      File Name Tooltip: ''
       Error:
-        Forbidden Characters: 'Забароненыя сімвалы'
-        Empty File Name: 'Пустая назва файла'
+        Forbidden Characters: ''
+        Empty File Name: ''
   External Player Settings:
-    External Player Settings: 'Налады вонкавага прайгравальніка'
-    External Player: 'Вонкавы прайгравальнік'
-    Ignore Unsupported Action Warnings: 'Ігнараваць папярэджанні аб дзеяннях, якія
-      не падтрымліваюцца'
+    External Player Settings: ''
+    External Player: ''
+    Ignore Unsupported Action Warnings: ''
     Custom External Player Executable: ''
     Custom External Player Arguments: ''
     Players:
       None:
         Name: ''
-    Ignore Default Arguments: Ігнараваць аргументы па змаўчанні
+    Ignore Default Arguments: ''
   Privacy Settings:
     Privacy Settings: ''
     Remember History: ''
@@ -319,11 +308,13 @@ Settings:
     Watch history has been cleared: ''
     Remove All Subscriptions / Profiles: ''
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
+    Remove All Playlists: ''
+    All playlists have been removed: ''
+    Are you sure you want to remove all your playlists?: ''
   Subscription Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
-    Manage Subscriptions: ''
     Fetch Automatically: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -333,7 +324,6 @@ Settings:
       Channel Page: ''
       Watch Page: ''
       General: ''
-    Blur Thumbnails: ''
     Hide Video Views: ''
     Hide Video Likes And Dislikes: ''
     Hide Channel Subscribers: ''
@@ -372,7 +362,6 @@ Settings:
     Subscription File: ''
     History File: ''
     Playlist File: ''
-    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: ''
     Export YouTube: ''
@@ -457,8 +446,6 @@ About:
   About: ''
   Beta: ''
   Source code: ''
-  Licensed under the AGPLv3: ''
-  View License: ''
   Downloads / Changelog: ''
   GitHub releases: ''
   Help: ''
@@ -620,39 +607,10 @@ Video:
   video only: ''
   audio only: ''
   Published:
-    Jan: ''
-    Feb: ''
-    Mar: ''
-    Apr: ''
-    May: ''
-    Jun: ''
-    Jul: ''
-    Aug: ''
-    Sep: ''
-    Oct: ''
-    Nov: ''
-    Dec: ''
-    Second: ''
-    Seconds: ''
-    Minute: ''
-    Minutes: ''
-    Hour: ''
-    Hours: ''
-    Day: ''
-    Days: ''
-    Week: ''
-    Weeks: ''
-    Month: ''
-    Months: ''
-    Year: ''
-    Years: ''
-    Ago: ''
-    Upcoming: ''
     In less than a minute: ''
   Published on: ''
   Streamed on: ''
   Started streaming on: ''
-  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -688,15 +646,11 @@ Playlist:
   #& About
   Playlist: ''
   View Full Playlist: ''
-  Videos: ''
-  View: ''
-  Views: ''
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -795,9 +749,7 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
-Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
diff --git a/static/locales/sr.yaml b/static/locales/sr.yaml
index f9bd8cd4a4a61..3d9523dbd9703 100644
--- a/static/locales/sr.yaml
+++ b/static/locales/sr.yaml
@@ -110,8 +110,9 @@ Subscriptions:
     профил има велики број праћења.  Присиљавање RSS-а да се избегне ограничавање
     брзине'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваша
-    листа праћења је тренутно празна. Почните да додајете праћења да бисте их видели
-    овде.'
+    листа праћења је тренутно празна. Ако желите да увезете своја праћења, можете
+    отићи у Подешавања података и изабрати Увоз праћења или можете претражити канал
+    и запратити га.'
   'Getting Subscriptions. Please wait.': 'Набављање праћења. Сачекајте.'
   Refresh Subscriptions: 'Освежи праћења'
   Load More Videos: 'Учитај више видео снимака'
@@ -136,18 +137,9 @@ Most Popular: 'Најпопуларније'
 Playlists: 'Плејлисте'
 User Playlists:
   Your Playlists: 'Ваше плејлисте'
-  Playlist Message: 'Ова страница не одражава потпуно функционалне плејлисте. Наводи
-    само видео снимке које сте сачували или означили као фаворите. Када се посао заврши,
-    сви видео снимци који су тренутно овде биће пребачени на плејлисту „Омиљено“.'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Немате
-    сачуване видео снимке. Кликните на дугме за чување у углу видео снимка да бисте
-    га додали на ову листу'
   Empty Search Message: На овој плејлисти нема видео снимака који одговарају вашој
     претрази
   Search bar placeholder: Претрага плејлиста
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Желите
-    ли заиста да уклоните све одгледане видео снимке са ове плејлисте? Ово се не може
-    поништити.
   AddVideoPrompt:
     Search in Playlists: Претрага у плејлистама
     Save: Сачувај
@@ -192,7 +184,6 @@ User Playlists:
       This video cannot be moved down.: Овај видео снимак се не може померити надоле.
       This playlist is now used for quick bookmark: Ова плејлиста се сада користи
         за брзо обележавање
-      Quick bookmark disabled: Брзо обележавање је онемогућено
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Ова
         плејлиста се сада користи за брзо обележавање, уместо „{oldPlaylistName}“.
         Кликните овде да поништите
@@ -202,6 +193,9 @@ User Playlists:
         користи за брзо обележавање.
       Playlist {playlistName} is the new quick bookmark playlist.: Плејлиста {playlistName}
         је нова плејлиста за брзо обележавање.
+      This playlist has a video with a duration error: Ова плејлиста садржи најмање
+        један видео снимак који нема трајање, биће сортиран као да је његово трајање
+        нула.
     Search for Videos: Претрага видео снимака
   Are you sure you want to delete this playlist? This cannot be undone: Желите ли
     заиста да избришете ову плејлисту? Ово се не може поништити.
@@ -243,7 +237,6 @@ User Playlists:
   Copy Playlist: Копирај плејлисту
   Playlist Description: Опис плејлисте
   Enable Quick Bookmark With This Playlist: Омогући брзо обележавање помоћу ове плејлисте
-  Disable Quick Bookmark: Онемогући брзо обележавање
   Add to Favorites: Додај на плејлисту „{playlistName}“
   Remove from Favorites: Уклони са плејлисте „{playlistName}“
   Playlists with Matching Videos: Плејлисте с подударајућим видео снимцима
@@ -259,6 +252,8 @@ User Playlists:
     ли заиста да уклоните 1 одгледани видео с ове плејлисте? Ово не може бити опозвано.
     | Желите ли заиста да уклоните {playlistItemCount} одледаних видео снимака с ове
     плејлисте? Ово не може бити опозвано.
+  Export Playlist: Извези ову плејлисту
+  The playlist has been successfully exported: Плејлиста је успешно извезена
 History:
   # On History Page
   History: 'Историја'
@@ -274,7 +269,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: 'Апликација
     се мора рестартовати да би се примениле промене. Рестартовати и применити промене?'
   General Settings:
-    General Settings: 'Општа подешавања'
+    General Settings: 'Опште'
     Check for Updates: 'Провера ажурирања'
     Check for Latest Blog Posts: 'Провера најновијих објава на блогу'
     Fallback to Non-Preferred Backend on Failure: 'Повратак на непреферирани бек-енд
@@ -298,8 +293,6 @@ Settings:
       End: 'Крај'
       Hidden: Скривено
       Blur: Замагљено
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious инстанца
-      (Подразумевано је https://invidious.snopyta.org)'
     View all Invidious instance information: 'Погледај све информације о Invidious
       инстанци'
     Region for Trending: 'Регион за „У тренду“'
@@ -321,8 +314,10 @@ Settings:
     Auto Load Next Page:
       Label: Аутоматски учитај следећу страницу
       Tooltip: Аутоматско учитавање додатних страница и коментара.
+    Open Deep Links In New Window: Отворите URL адресе прослеђене FreeTube-у у новом
+      прозору
   Theme Settings:
-    Theme Settings: 'Подешавања теме'
+    Theme Settings: 'Тема'
     Match Top Bar with Main Color: 'Усклади горњу траку са главном бојом'
     Expand Side Bar by Default: 'Подразумевано прошири бочну траку'
     Disable Smooth Scrolling: 'Онемогући глатко прелажење'
@@ -336,10 +331,12 @@ Settings:
       Pastel Pink: Пастелно розе
       Hot Pink: Врућа розе
       Catppuccin Mocha: Catppuccin Mocha
-      System Default: Системски подразумевано
+      System Default: Системски подразумевана
       Nordic: Нордичка
       Solarized Dark: Соларизована тамна
       Solarized Light: Соларизована светла
+      Gruvbox Dark: Gruvbox тамна
+      Gruvbox Light: Gruvbox светла
     Main Color Theme:
       Main Color Theme: 'Главна тема боја'
       Red: 'Црвена'
@@ -387,12 +384,22 @@ Settings:
       Solarized Magenta: Соларизована магента
       Solarized Blue: Соларизована плава
       Solarized Violet: Соларизована љубичаста
+      Gruvbox Dark Green: Gruvbox тамнозелена
+      Gruvbox Dark Purple: Gruvbox тамнољубичаста
+      Gruvbox Dark Yellow: Gruvbox тамножута
+      Gruvbox Dark Blue: Gruvbox тамноплава
+      Gruvbox Dark Aqua: Gruvbox тамноаква
+      Gruvbox Dark Orange: Gruvbox тамнонаранџаста
+      Gruvbox Light Red: Gruvbox светлоцрвена
+      Gruvbox Light Blue: Gruvbox светлоплава
+      Gruvbox Light Purple: Gruvbox светлољубичаста
+      Gruvbox Light Orange: Gruvbox светлонаранџаста
     Secondary Color Theme: 'Секундарна тема боје'
         #* Main Color Theme
     Hide FreeTube Header Logo: Сакриј FreeTube логотип у заглављу
     Hide Side Bar Labels: Сакриј ознаке бочне траке
   Player Settings:
-    Player Settings: 'Подешавања плејера'
+    Player Settings: 'Плејер'
     Play Next Video: 'Пусти следећи видео снимак'
     Turn on Subtitles by Default: 'Подразумевано укључи титлове'
     Autoplay Videos: 'Аутоматски пусти видео снимак'
@@ -444,11 +451,12 @@ Settings:
     Video Playback Rate Interval: Интервал брзине репродукције видео снимка
     Max Video Playback Rate: Максимална брзина репродукције видео снимка
     Enter Fullscreen on Display Rotate: Уђи у цео екран при окретању екрана
-    Next Video Interval: Интервал следећег видео снимка
+    Next Video Interval: Тајмер за одбројавање аутоплеја
     Display Play Button In Video Player: Прикажи дугме за пуштање у плејеру видео
       снимка
+    Autoplay Interruption Timer: Тајмер за прекид аутоплеја
   Privacy Settings:
-    Privacy Settings: 'Подешавања приватности'
+    Privacy Settings: 'Приватност'
     Remember History: 'Запамти историју'
     Save Watched Progress: 'Сачувај напредак одгледаног'
     Clear Search Cache: 'Очисти кеш претраге'
@@ -469,16 +477,16 @@ Settings:
     Are you sure you want to remove all your playlists?: Желите ли заиста да уклоните
       све своје плејлисте?
   Subscription Settings:
-    Subscription Settings: 'Подешавања праћења'
+    Subscription Settings: 'Праћење'
     Hide Videos on Watch: 'Сакриј видео снимке на гледању'
     Fetch Feeds from RSS: 'Прикупи фидове из RSS-а'
-    Manage Subscriptions: 'Управљање праћењима'
     Fetch Automatically: Аутоматски прикупи фид
-    Only Show Latest Video for Each Channel: Прикажи само најновији видео снимак за
-      сваки канал
     Confirm Before Unsubscribing: Избегни случајно отпраћивање
+    To: На
+    'Limit the number of videos displayed for each channel': Ограничи број приказаних
+      видео снимака за сваки канал
   Distraction Free Settings:
-    Distraction Free Settings: 'Подешавања „Без ометања“'
+    Distraction Free Settings: 'Без ометања'
     Hide Video Views: 'Сакриј прегледе видео снимка'
     Hide Video Likes And Dislikes: 'Сакриј свиђања и несвиђања видео снимка'
     Hide Channel Subscribers: 'Сакриј праћења канала'
@@ -489,7 +497,6 @@ Settings:
     Hide Playlists: 'Сакриј плејлисте'
     Hide Live Chat: 'Сакриј ћаскање уживо'
     Hide Active Subscriptions: 'Сакриј активна праћења'
-    Blur Thumbnails: Замагли сличице
     Hide Channels Placeholder: ID канала
     Hide Video Description: Сакриј опис видео снимка
     Hide Chapters: Сакриј поглавља
@@ -499,14 +506,14 @@ Settings:
       Channel Page: Страница канала
       Subscriptions Page: Страница праћења
       General: Опште
-    Hide Channel Community: Сакриј заједницу канала
+    Hide Channel Community: Сакриј картицу „Заједница“ канала
     Hide Subscriptions Videos: Сакриј видео снимке канала које пратите
     Hide Comments: Сакриј коментаре
-    Hide Channel Shorts: Сакриј Shorts снимке канала
+    Hide Channel Shorts: Сакриј картицу „Shorts“ канала
     Hide Sharing Actions: Сакриј радње дељења
-    Hide Channel Podcasts: Сакриј подкасте канала
+    Hide Channel Podcasts: Сакриј картицу „Подкасти“ канала
     Hide Live Streams: Сакриј стримове уживо
-    Hide Channel Playlists: Сакриј плејлисте канала
+    Hide Channel Playlists: Сакриј картицу „Плејлисте“ канала
     Hide Subscriptions Community: Сакриј заједницу канала које пратите
     Hide Channels: Сакриј видео снимке са канала
     Hide Subscriptions Live: Сакриј стримове уживо канала које пратите
@@ -516,7 +523,7 @@ Settings:
     Hide Featured Channels: Сакриј истакнуте канале
     Hide Profile Pictures in Comments: Сакриј слике профила у коментарима
     Hide Upcoming Premieres: Сакриј предстојеће премијере
-    Hide Channel Releases: Сакриј издања канала
+    Hide Channel Releases: Сакриј картицу „Издања“ канала
     Hide Channels Invalid: Наведени ID канала је неважећи
     Hide Channels Disabled Message: Неки канали су блокирани помоћу ID-а и нису обрађени.
       Функција је блокирана док се ти ID-ови ажурирају
@@ -526,15 +533,13 @@ Settings:
     Hide Videos and Playlists Containing Text: Сакриј видео снимке и плејлисте које
       садрже текст
     Hide Videos and Playlists Containing Text Placeholder: Реч, део речи или фраза
+    Hide Channel Home: Сакриј картицу „Почетна“ канала
+    Show Added Items: Прикажи додате предмете
   Data Settings:
-    Data Settings: 'Подешавања података'
+    Data Settings: 'Подаци'
     Select Import Type: 'Избор врсте увоза'
     Select Export Type: 'Избор врсте извоза'
     Import Subscriptions: 'Увоз праћења'
-    Import FreeTube: 'Увоз FreeTube'
-    Import YouTube: 'Увоз YouTube'
-    Import NewPipe: 'Увоз NewPipe'
-    Check for Legacy Subscriptions: 'Провера застарелих праћења'
     Export Subscriptions: 'Извоз праћења'
     Export FreeTube: 'Извоз FreeTube-а'
     Export YouTube: 'Извоз YouTube-а'
@@ -579,7 +584,7 @@ Settings:
         верзију FreeTube-а и увезите извезене плејлисте."
       Label: Извоз плејлиста за старије верзије FreeTube-а
   Proxy Settings:
-    Proxy Settings: 'Подешавања проксија'
+    Proxy Settings: 'Прокси'
     Enable Tor / Proxy: 'Омогући Tor / Прокси'
     Proxy Protocol: 'Протокол проксија'
     Proxy Host: 'Хост проксија'
@@ -594,9 +599,14 @@ Settings:
     City: 'Град'
     Error getting network information. Is your proxy configured properly?: 'Грешка
       при набављању информација о мрежи. Да ли је ваш прокси исправно конфигурисан?'
+    Proxy Warning: FreeTube нема уграђени прокси, али може да се повеже са спољним
+      проксијем, као што је онај који ради на вашој машини као што је Tor или спољни
+      прокси као што је SOCKS5 прокси који пружају неки VPN-ови. Ако је омогућено,
+      уверите се да је ваш прокси/Tor исправно конфигурисан или FreeTube неће моћи
+      да прикупи никакве податке.
   Experimental Settings:
     Replace HTTP Cache: Замени HTTP кеш
-    Experimental Settings: Експериментална подешавања
+    Experimental Settings: Експериментално
     Warning: Ова подешавања су експериментална, могу да доведу до отказивања док су
       омогућена. Прављење резервних копија је веома препоручљиво. Користите на властиту
       одговорност!
@@ -612,52 +622,50 @@ Settings:
       Show In Seek Bar: Приказ у траци за прескакање
     UseDeArrowTitles: Користи DeArrow наслове видео снимака
     Enable SponsorBlock: Омогући SponsorBlock
-    SponsorBlock Settings: Подешавања SponsorBlock-а
+    SponsorBlock Settings: SponsorBlock
     Category Color: Боја категорије
     UseDeArrowThumbnails: Користи DeArrow за сличице
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': URL
       API-ја DeArrow генератора сличица (Подразумевано је https://dearrow-thumb.ajay.app)
   External Player Settings:
     External Player: Спољни плејер
-    External Player Settings: Подешавања спољног плејера
+    External Player Settings: Спољни плејер
     Custom External Player Executable: Прилагођени извршни спољни плејер
-    Ignore Unsupported Action Warnings: Игнориши упозорења о неподржаним радњама
+    Ignore Unsupported Action Warnings: Занемари упозорења о неподржаним радњама
     Custom External Player Arguments: Прилагођени аргументи спољног плејера
     Players:
       None:
         Name: Ниједно
-    Ignore Default Arguments: Игнориши подразумеване аргументе
+    Ignore Default Arguments: Занемари подразумеване аргументе
   Download Settings:
     Choose Path: Избор путање
     Open in web browser: Отвори у прегледачу
     Ask Download Path: Питај за путању за преузимање
     Download Behavior: Понашање преузимања
     Download in app: Преузми у апликацији
-    Download Settings: Подешавања преузимања
+    Download Settings: Преузимање
   Password Settings:
     Remove Password: Уклони лозинку
     Set Password To Prevent Access: Подеси лозинку да спречиш приступ подешавањима
-    Password Settings: Подешавања лозинке
+    Password Settings: Лозинка
     Set Password: Подеси лозинку
   Parental Control Settings:
     Show Family Friendly Only: Прикажи само погодно за породицу
     Hide Unsubscribe Button: Сакриј дугме „Прекини праћење“
     Hide Search Bar: Сакриј траку за претрагу
-    Parental Control Settings: Подешавања родитељске контроле
+    Parental Control Settings: Родитељска контрола
   Password Dialog:
     Password Incorrect: Лозинка нетачна
     Password: Лозинка
     Enter Password To Unlock: Унесите лозинку да бисте откључали подешавања
     Unlock: Откључај
-  Expand All Settings Sections: Прошири све одељке подешавања
   Sort Settings Sections (A-Z): Сортирање одељка подешавања (A-Z)
+  Return to Settings Menu: Врати се у мени подешавања
 About:
   #On About page
   About: 'О апликацији'
   Beta: 'Бета'
   Source code: 'Изворни кôд'
-  Licensed under the AGPLv3: 'Лиценцирано под AGPLv3'
-  View License: 'Погледај лиценцу'
   Downloads / Changelog: 'Преузимања / Евиденција промена'
   GitHub releases: 'GitHub издања'
   Help: 'Помоћ'
@@ -674,7 +682,7 @@ About:
   Please read the: 'Прочитајте'
   room rules: 'правила собе'
   Translate: 'Преведи'
-  Credits: 'Кредити'
+  Credits: 'Заслуге'
   FreeTube is made possible by: 'FreeTube су омогућили'
   these people and projects: 'ови људи и пројекти'
   Donate: 'Донација'
@@ -725,7 +733,7 @@ Profile:
     ли заиста да избришете изабране канале?  Ово неће избрисати канал из било ког
     другог профила.'
 #On Channel Page
-  Profile Settings: Подешавања профила
+  Profile Settings: Профил
   Toggle Profile List: Укључи листу профила
   Open Profile Dropdown: Отвори падајући мени профила
   Close Profile Dropdown: Затвори падајући мени профила
@@ -733,8 +741,6 @@ Profile:
   Edit Profile Name: Измени име профила
   Create Profile Name: Направи име профила
 Channel:
-  Subscriber: 'Пратилац'
-  Subscribers: 'Пратиоци'
   Subscribe: 'Запрати'
   Unsubscribe: 'Прекини праћење'
   Channel has been removed from your subscriptions: 'Канал је уклоњен из ваших праћења'
@@ -800,6 +806,9 @@ Channel:
   This channel is age-restricted and currently cannot be viewed in FreeTube.: Овај
     канал је старосно ограничен и тренутно се не може гледати на FreeTube-у.
   This channel does not exist: Овај канал не постоји
+  Home:
+    Home: Почетна
+    View Playlist: Погледај плејлисту
 Video:
   Mark As Watched: 'Означи као одгледано'
   Remove From History: 'Уклони из историје'
@@ -839,35 +848,7 @@ Video:
   'Chat is disabled or the Live Stream has ended.': 'Ћаскање је онемогућено или је
     стрим уживо завршен.'
   Published:
-    Month: Месец
-    Sep: Сеп.
-    Seconds: Секунди
     In less than a minute: За мање од једног минута
-    Week: Недеља
-    Upcoming: Премијера за
-    Dec: Дец.
-    Jan: Јан.
-    Weeks: Недеља
-    Days: Дана
-    Years: Године
-    May: Мај
-    Mar: Мар.
-    Hours: Сати
-    Oct: Окт.
-    Months: Месеци
-    Apr: Апр.
-    Feb: Феб.
-    Jul: Јул
-    Minutes: Минути
-    Minute: Минут
-    Day: Дан
-    Hour: Сат
-    Jun: Јун
-    Second: Секунда
-    Year: Година
-    Nov: Нов.
-    Ago: Пре
-    Aug: Авг.
   Upcoming: Предстојеће
   Sponsor Block category:
     interaction: Интеракција
@@ -903,7 +884,6 @@ Video:
   Show Super Chat Comment: Прикажи Super Chat коментар
   Scroll to Bottom: Превуци до дна
   Started streaming on: Започето стримовање
-  Publicationtemplate: пре {number} {unit}
   Premieres: Премијера
   Download Video: Преузми видео снимак
   Published on: Објављено
@@ -944,6 +924,17 @@ Video:
     Playback will resume automatically when your connection comes back: Репродукција
       ће се аутоматски наставити када се ваша интернет веза врати.
     Skipped segment: Прескочен сегмент „{segmentCategory}“
+  IP block: YouTube је блокирао вашу IP адресу за гледање видео снимака. Покушајте
+    прећи на други VPN или прокси.
+  Unlisted: По позиву
+  MembersOnly: Видео снимци само за чланове не могу да се гледају на FreeTube-у јер
+    захтевају пријављивање на Google налог и плаћено чланство на каналу.
+  AgeRestricted: Видео снимци са старосним ограничењемне могу се гледати на FreeTube-у
+    јер захтевају пријаву на Google налог и коришћење YouTube налога који је старосно
+    верификован.
+  DeArrow:
+    Show Modified Details: Прикажи измењене детаље
+    Show Original Details: Прикажи оригиналне детаље
 Tooltips:
   Subscription Settings:
     Fetch Feeds from RSS: 'Када је омогућено, FreeTube ће користити RSS уместо свог
@@ -970,9 +961,12 @@ Tooltips:
       снимке у тренду коју желите да се приказује.
     Invidious Instance: Invidious инстанца на коју ће се FreeTube повезати за API
       позиве.
+    Open Deep Links In New Window: URL адресе прослеђене FreeTube-у, као што су додаци
+      прегледача за преусмеравање или аргументи командне линије, отварају се у новом
+      прозору.
   External Player Settings:
-    Custom External Player Arguments: Сви прилагођени аргументи командне линије, раздвојени
-      тачком и зарезом („;“), желите да буду прослеђени спољном плејеру.
+    Custom External Player Arguments: Сви прилагођени аргументи командне линије, желите
+      да буду прослеђени спољном плејеру.
     External Player: Избором спољног плејера ће приказати иконицу, за отварање видео
       снимка (плејлисте, ако је подржана) у спољном плејеру, на сличици. Упозорење,
       подешавања Invidious-а не утичу на спољне плејере.
@@ -1017,7 +1011,6 @@ Tooltips:
     UseDeArrowTitles: Замена наслова видео снимака насловима које су послали корисници
       DeArrow-a.
     UseDeArrowThumbnails: Замените сличице видео снимака сличицама из DeArrow-а.
-Subscriptions have not yet been implemented: 'Праћења још увек нису имплементирана'
 Open New Window: Отвори нови прозор
 Shuffle is now disabled: Мешање је сада онемогућено
 New Window: Нови прозор
@@ -1028,10 +1021,7 @@ Clipboard:
 Playlist:
   View Full Playlist: Погледај целу плејлисту
   Last Updated On: Последњи пут ажурирано
-  Videos: Видео снимци
-  View: Преглед
   Playlist: Плејлиста
-  Views: Прегледа
   Sort By:
     DateAddedOldest: Најраније додато прво
     AuthorAscending: Аутор (A-Z)
@@ -1041,6 +1031,8 @@ Playlist:
     Sort By: Сортирање по
     AuthorDescending: Аутор (Z-A)
     DateAddedNewest: Најновије додато прво
+    VideoDurationDescending: Трајање (прво најдуже)
+    VideoDurationAscending: Трајање (прво најкраће)
 Falling back to Invidious API: Повратак на Invidious API
 Change Format:
   Dash formats are not available for this video: DASH формати нису доступни за овај
@@ -1080,8 +1072,6 @@ Comments:
   And others: и осталих
   Newest first: Најновије прво
   There are no comments available for this post: Нема доступних коментара за ову објаву
-Hashtags have not yet been implemented, try again later: Хеш-ознаке још увек нису
-  имплементиране, покушајте поново касније
 Share:
   Invidious Embed URL copied to clipboard: Invidious уграђени URL је копиран у привремену
     меморију
@@ -1123,9 +1113,7 @@ Channels:
   Channels: Канали
   Title: Листа канала
   Empty: Ваша листа канала је тренутно празна.
-  Unsubscribe: Прекини праћење
   Count: 'Пронађено канала: {number}.'
-  Unsubscribed: '{channelName} је уклоњен из ваших праћења'
 External link opening has been disabled in the general settings: Отварање спољног
   линка је онемогућено у општим подешавањима
 Screenshot Success: Снимак екрана је сачуван као „{filePath}“
@@ -1143,6 +1131,7 @@ Chapters:
   Chapters: Поглавља
   'Chapters list hidden, current chapter: {chapterName}': 'Листа поглавља је скривена,
     тренутно поглавље: {chapterName}'
+  Key Moments: Кључни тренуци
 Hashtag:
   This hashtag does not currently have any videos: Ова хеш-ознака тренутно нема ниједан
     видео снимак
@@ -1155,7 +1144,6 @@ Preferences: Преференце
 Default Invidious instance has been cleared: Подразумевана инстанца Invidious-а је
   избрисана
 Mini Player: Мини плејер
-Toggle Theatre Mode: Укључи биоскопски режим
 'The playlist has ended. Enable loop to continue playing': Плејлиста је завршена.
   Омогућите понављање да бисте наставили пуштање
 Shuffle is now enabled: Мешање је сада омогућено
@@ -1196,5 +1184,26 @@ Search Listing:
     Closed Captions: Скривени титлови
     4K: 4K
     Subtitles: Титлови
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Ново
+    3D: 3D
 'Blocked opening potentially unsafe URL': 'Блокирано отварање потенцијално небезбедне
   URL адресе: „{url}“.'
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Keys:
+  alt: Alt
+  arrowdown: Стрелица доле
+  arrowleft: Стрелица лево
+  ctrl: Ctrl
+  arrowup: Стрелица горе
+  arrowright: Стрелица десно
+shortcutJoinOperator: +
+Right-click or hold to see history: Кликните десним тастером миша или задржите да
+  бисте видели историју
+Autoplay Interruption Timer: Аутоплеј је отказан због {autoplayInterruptionIntervalHours}
+  сати неактивности
+Description:
+  Expand Description: …више
+  Collapse Description: Прикажи мање
diff --git a/static/locales/sv.yaml b/static/locales/sv.yaml
index 57350eef59d29..9c43c9eed069d 100644
--- a/static/locales/sv.yaml
+++ b/static/locales/sv.yaml
@@ -132,13 +132,6 @@ Most Popular: 'Populäraste'
 Playlists: 'Spellistor'
 User Playlists:
   Your Playlists: 'Dina spellistor'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Dina
-    sparade videor är tomma. Klicka på sparknappen på hörnet av en video för att få
-    den listad här
-  Playlist Message: Den här sidan representerar inte fullt fungerande spellistor.
-    Den listar bara videor som du har sparat eller satt som favorit. När arbetet är
-    färdigt kommer alla videor som för närvarande här här att flyttas till en spellista
-    för 'Favoriter'.
   Search bar placeholder: Sök efter Spellistor
   Empty Search Message: Det finns inga videor i denna spellista som matchar din sökning
   Playlist Name: Spellistenamn
@@ -187,7 +180,6 @@ User Playlists:
         spellistor
   SinglePlaylistView:
     Toast:
-      Quick bookmark disabled: Snabb bokmärke inaktiverat
       Video has been removed: Videon har tagits bort
       "{videoCount} video(s) have been removed": 1 video har tagits bort | {videoCount}
         videor har tagits bort
@@ -217,12 +209,8 @@ User Playlists:
       This video cannot be moved down.: Den här videon kan inte flyttas nedåt.
     Search for Videos: Sök efter videor
   Playlists with Matching Videos: Spellistor med passande videor
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Är
-    du säker på att du vill ta bort alla tittade videor från den här spellistan? Detta
-    kan inte ångras.
   Enable Quick Bookmark With This Playlist: Aktivera snabb bokmärke på den här spellistan
   Remove Watched Videos: Ta bort sedda videor
-  Disable Quick Bookmark: Avaktivera snabb bokmärke
   CreatePlaylistPrompt:
     Create: Skapa
 History:
@@ -260,8 +248,6 @@ Settings:
       End: 'Slutet'
       Hidden: Dold
       Blur: Oskärpa
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
-      (Standard är https://invidious.snopyta.org)'
     Region for Trending: 'Region för Trender'
         #! List countries
     View all Invidious instance information: Visa all Invidious instansinformation
@@ -410,18 +396,12 @@ Settings:
     Subscription Settings: 'Prenumerationsinställningar'
     Hide Videos on Watch: 'Dölj video under visning'
     Fetch Feeds from RSS: 'Hämta prenumerationer från RSS'
-    Manage Subscriptions: 'Hantera prenumerationer'
     Fetch Automatically: Hämta flöde automatiskt
-    Only Show Latest Video for Each Channel: Visa endast den senaste videon för varje
-      kanal
   Data Settings:
     Data Settings: 'Datainställningar'
     Select Import Type: 'Välj import-typen'
     Select Export Type: 'Välj export-typen'
     Import Subscriptions: 'Importera prenumerationer'
-    Import FreeTube: 'Importera FreeTube'
-    Import YouTube: 'Importera YouTube'
-    Import NewPipe: 'Importera NewPipe'
     Export Subscriptions: 'Exportera prenumerationer'
     Export FreeTube: 'Exportera FreeTube'
     Export YouTube: 'Exportera YouTube'
@@ -447,7 +427,6 @@ Settings:
     Unable to write file: 'Kunde inte skriva filen'
     Unknown data key: 'Okänd datanyckel'
     How do I import my subscriptions?: 'Hur importerar jag mina prenumerationer?'
-    Check for Legacy Subscriptions: Sök efter äldre prenumerationer
     Manage Subscriptions: Hantera prenumerationer
     History File: Historikfil
     Subscription File: Prenumerationsfil
@@ -458,32 +437,6 @@ Settings:
     Import Playlists: Importera spellistor
     Playlist insufficient data: Otillräcklig data för "{playlist}" spellista, hoppar
       över objekt
-  Advanced Settings:
-    Advanced Settings: 'Avancerade inställningar'
-    Enable Debug Mode (Prints data to the console): 'Aktivera felsökningsläge (Skriver
-      ut data till konsolen)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxyadress (Exempel: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Om
-      du klickar på knappen "TEST PROXY" skickas en begäran om https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Använd Tor / Proxy för API-anrop'
-    TEST PROXY: 'TESTPROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Se offentliga instanser'
-    Clear History:
-      Clear History: 'Rensa historik'
-      # On Click
-      Are you sure you want to delete your history?: 'Vill du verkligen ta bort din
-        historik?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Rensa prenumerationer'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Vill du verkligen ta bort
-        alla prenumerationer?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Dölj livechatt
@@ -523,7 +476,6 @@ Settings:
     Hide Subscriptions Shorts: Dölj prenumerationsshorts
     Hide Subscriptions Live: Dölj prenumerations Live-sändningar
     Hide Profile Pictures in Comments: Dölj profilbilder i kommentarer
-    Blur Thumbnails: Oskärpa tumnaglar
     Hide Subscriptions Community: Dölj prenumerationsgemenskap
     Hide Channels Invalid: Det angivna kanal-ID var ogiltigt
     Hide Channels Disabled Message: Vissa kanaler blockerades med ID och bearbetades
@@ -602,38 +554,10 @@ Settings:
     Warning: Dessa inställlningar är experimentella, de kan eventuellt orsakar kracher
       om de är aktiverade. Att göra backupfiler rekomenderas. Används på egen risk!
     Replace HTTP Cache: Ersätt HTTP-cache
-  Expand All Settings Sections: Expandera alla inställningssektioner
 About:
   #On About page
   About: 'Om'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Denna
-    copylefted programvara är fritt licensierad AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Hittade ett fel? Vill du föreslå en funktion? Vill du hjälpa till? Kolla in vår
-    GitHub-sida. Dragförfrågningar välkomna.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Tack
-    så mycket till människorna och projekten som gör FreeTube möjligt!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Vill
-    chatta? Gå med i vår Element / Matrix Server. Kontrollera reglerna innan du går
-    med.'
-
-  'Looking for help? Check out our Wiki page.': 'Letar du efter hjälp? Kolla in vår
-    Wiki-sida.'
-
-  Check out our Firefox extension!: 'Kolla in vårt Firefox-tillägg!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Om
-    du gillar att använda FreeTube, överväga att donera via Liberapay eller via vår
-    Bitcoin-adress.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Senaste FreeTube Nyheter'
-
   Donate: Donera
   these people and projects: dessa människor och projekt
   FreeTube is made possible by: FreeTube möjliggörs av
@@ -655,8 +579,6 @@ About:
   Help: Hjälp
   GitHub releases: GitHub-versioner
   Downloads / Changelog: Nedladdningar / Ändringslogg
-  View License: Visa licens
-  Licensed under the AGPLv3: Licensierad under AGPLv3
   Source code: Källkod
   Beta: Beta
   Discussions: Diskussioner
@@ -710,8 +632,6 @@ Profile:
   Edit Profile Name: Redigera profilnamn
   Create Profile Name: Skapa profilnamn
 Channel:
-  Subscriber: 'Prenumerant'
-  Subscribers: 'Prenumeranter'
   Subscribe: 'Prenumerera'
   Unsubscribe: 'Avsluta prenumeration'
   Channel has been removed from your subscriptions: 'Kanalen har tagits bort från
@@ -809,37 +729,8 @@ Video:
     stöds för närvarande inte med Invidious API. En direktanslutning till YouTube
     krävs.'
   Published:
-    Jan: 'Jan'
-    Feb: 'Feb'
-    Mar: 'Mar'
-    Apr: 'Apr'
-    May: 'Maj'
-    Jun: 'Jun'
-    Jul: 'Jul'
-    Aug: 'Aug'
-    Sep: 'Sep'
-    Oct: 'Okt'
-    Nov: 'Nov'
-    Dec: 'Dec'
-    Second: 'Sekund'
-    Seconds: 'Sekunder'
-    Minute: 'Minut'
-    Minutes: 'Minuter'
-    Hour: 'Timme'
-    Hours: 'Timmar'
-    Day: 'Dag'
-    Days: 'Dagar'
-    Week: 'Vecka'
-    Weeks: 'Veckor'
-    Month: 'Månad'
-    Months: 'Månader'
-    Year: 'År'
-    Years: 'År'
-    Ago: 'Sedan'
-    Upcoming: 'Premiärer på'
     In less than a minute: Mindre än en minut
   Published on: 'Publicerad den'
-  Publicationtemplate: 'för {number} {unit} sedan'
 #& Videos
   audio only: endast ljud
   video only: endast video
@@ -898,16 +789,12 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Visa hela spellistan'
-  Videos: 'Videor'
-  View: 'Visning'
-  Views: 'Visningar'
   Last Updated On: 'Senast uppdaterad den'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Spellista
-Toggle Theatre Mode: 'Aktivera Bioläge'
 Change Format:
   Change Media Formats: 'Ändra videoformat'
   Use Dash Formats: 'Använd DASH-format'
@@ -972,7 +859,6 @@ Falling back to Local API: 'Faller tillbaka till lokal API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Den
   här videon är inte tillgänglig på grund av format som saknas. Detta kan hända på
   grund av landets otillgänglighet.'
-Subscriptions have not yet been implemented: 'Prenumerationer har ännu inte implementerats'
 Loop is now disabled: 'Loop är nu inaktiverad'
 Loop is now enabled: 'Loop är nu aktiverad'
 Shuffle is now disabled: 'Blandning är nu inaktiverad'
@@ -1022,8 +908,8 @@ Tooltips:
       kan öppnas i FreeTube är. \nStandard är att FreeTube kommer öppna länken i din
       standardwebbläsare.\n"
   External Player Settings:
-    Custom External Player Arguments: Alla anpassade kommandoradsargument, åtskilda
-      av semikolon (';'), ska skickas till den externa spelaren.
+    Custom External Player Arguments: Alla anpassade kommandoradsargument, ska skickas
+      till den externa spelaren.
     Ignore Warnings: Dämpa varningar för när den aktuella externa spelaren inte stöder
       den aktuella åtgärden (t.ex. backning av spellistor, etc.).
     Custom External Player Executable: Som standard antar FreeTube att den valda externa
@@ -1050,8 +936,6 @@ Open New Window: Öppna nytt fönster
 Playing Next Video Interval: Spelar strax nästa video. Klicka för att stoppa. | Spelar
   nästa video om {nextVideoInterval} sekunder. Klicka för att stoppa. | Spelar nästa
   video om {nextVideoInterval} sekunder. Klicka för att stoppa.
-Hashtags have not yet been implemented, try again later: Hashtaggar har inte implementerats
-  än, försök vid ett senare tillfälle
 Unknown YouTube url type, cannot be opened in app: Okänd YouTube URL, kan inte öppnas
   i programmet
 Default Invidious instance has been cleared: Standard Invidious-instans har rensats
@@ -1068,8 +952,6 @@ Channels:
   Channels: Kanaler
   Title: Kanallista
   Search bar placeholder: Sök Kanaler
-  Unsubscribe: Avprenumerera
-  Unsubscribed: '{channelName} blev bortagen från dina prenumerationer'
   Unsubscribe Prompt: Är du säker på att du vill avprenumerera från "{channelName}"?
   Count: '{number} kanal(er) hittade.'
   Empty: Din kanallista är tom.
diff --git a/static/locales/ta.yaml b/static/locales/ta.yaml
new file mode 100644
index 0000000000000..46518453b4c84
--- /dev/null
+++ b/static/locales/ta.yaml
@@ -0,0 +1,1047 @@
+# Put the name of your locale in the same language
+Locale Name: 'தமிழ்'
+# Currently on Subscriptions, Playlists, and History
+'This part of the app is not ready yet. Come back later when progress has been made.': >-
+  இந்த பகுதி இன்னும் தயாராக இல்லை. சிறிது நேரம் கழித்து மீண்டும் பார்க்கவும்.
+
+# Webkit Menu Bar
+File: 'கோப்பு'
+New Window: 'புதிய விண்டோ'
+Preferences: 'விருப்பத்தேர்வுகள்'
+Quit: 'வெளியேறு'
+Edit: 'திருத்து'
+Undo: 'செயல்தவிர்'
+Redo: 'மீண்டும் செய்'
+Cut: 'வெட்டு'
+Copy: 'நகலெடு'
+Paste: 'ஒட்டு'
+Delete: 'அழி'
+Select all: 'அனைத்தையும் தேர்ந்தெடு'
+Reload: 'மீள் ஏற்று'
+Force Reload: 'வற்புறுத்தி மீள்ஏற்று'
+Toggle Developer Tools: 'டெவலப்பர் கருவிகளை நிலைமாற்று'
+Actual size: 'உண்மை அளவு'
+Zoom in: 'பெரிதாக்கு'
+Zoom out: 'சிறிதாக்கு'
+Toggle fullscreen: ''
+Window: ''
+Minimize: ''
+Close: ''
+Back: ''
+Forward: ''
+Open New Window: ''
+Go to page: ''
+Close Banner: ''
+
+Version {versionNumber} is now available!  Click for more details: ''
+Download From Site: ''
+A new blog is now available, {blogTitle}. Click to view more: ''
+Are you sure you want to open this link?: ''
+
+# Global
+# Anything shared among components / views should be put here
+Global:
+  Videos: ''
+  Shorts: ''
+  Live: ''
+  Community: ''
+  Counts:
+    Video Count: ''
+    Channel Count: ''
+    Subscriber Count: ''
+    View Count: ''
+    Like Count: ''
+    Comment Count: ''
+    Watching Count: ''
+  Input Tags:
+    Length Requirement: ''
+
+# Search Bar
+Search / Go to URL: ''
+Search Bar:
+  Clear Input: ''
+Search character limit: ''
+Search Listing:
+  Label:
+    4K: ''
+    8K: ''
+    VR180: ''
+    360 Video: ''
+    Subtitles: ''
+    New: ''
+    3D: ''
+    # Aria labels
+    Closed Captions: ''
+  # In Filter Button
+Search Filters:
+  Search Filters: ''
+  Sort By:
+    Sort By: ''
+    Most Relevant: ''
+    Rating: ''
+    Upload Date: ''
+    View Count: ''
+  Time:
+    Time: ''
+    Any Time: ''
+    Last Hour: ''
+    Today: ''
+    This Week: ''
+    This Month: ''
+    This Year: ''
+  Type:
+    Type: ''
+    All Types: ''
+    Videos: ''
+    Channels: ''
+    Movies: ''
+    #& Playlists
+  Duration:
+    Duration: ''
+    All Durations: ''
+    Short (< 4 minutes): ''
+    Medium (4 - 20 minutes): ''
+    Long (> 20 minutes): ''
+  Features:
+    Features: ''
+    HD: ''
+    Subtitles: ''
+    Creative Commons: ''
+    3D: ''
+    Live: ''
+    4K: ''
+    360 Video: ''
+    Location: ''
+    HDR: ''
+    VR180: ''
+  # On Search Page
+  Search Results: ''
+  Fetching results. Please wait: ''
+  Fetch more results: ''
+  There are no more results for this search: ''
+# Sidebar
+Subscriptions:
+    # On Subscriptions Page
+  Subscriptions: ''
+  # channels that were likely deleted
+  Error Channels: ''
+  Latest Subscriptions: ''
+  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: ''
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': ''
+  Disabled Automatic Fetching: ''
+  Empty Channels: ''
+  'Getting Subscriptions. Please wait.': ''
+  Empty Posts: ''
+  Load More Videos: ''
+  Load More Posts: ''
+  Subscriptions Tabs: ''
+  All Subscription Tabs Hidden: ''
+More: ''
+Channels:
+  Channels: ''
+  Title: ''
+  Search bar placeholder: ''
+  Count: ''
+  Empty: ''
+  Unsubscribe Prompt: ''
+Trending:
+  Trending: ''
+  Default: ''
+  Music: ''
+  Gaming: ''
+  Movies: ''
+  Trending Tabs: ''
+Most Popular: ''
+Feed:
+  Feed Last Updated: ''
+  Refresh Feed: ''
+Playlists: ''
+User Playlists:
+  Your Playlists: ''
+  You have no playlists. Click on the create new playlist button to create a new one.: ''
+  Empty Search Message: ''
+  Search bar placeholder: ''
+  Playlists with Matching Videos: ''
+
+  This playlist currently has no videos.: ''
+
+  Create New Playlist: ''
+
+  Add to Playlist: ''
+  Add to Favorites: ''
+  Remove from Favorites: ''
+
+  Move Video Up: ''
+  Move Video Down: ''
+  Remove from Playlist: ''
+
+  Playlist Name: ''
+  Playlist Description: ''
+
+  Save Changes: ''
+  Cancel: ''
+  Edit Playlist Info: ''
+  Copy Playlist: ''
+  Remove Duplicate Videos: ''
+  Remove Watched Videos: ''
+  Enable Quick Bookmark With This Playlist: ''
+  Quick Bookmark Enabled: ''
+  Export Playlist: ''
+  The playlist has been successfully exported: ''
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: ''
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: ''
+  Delete Playlist: ''
+  Cannot delete the quick bookmark target playlist.: ''
+  Are you sure you want to delete this playlist? This cannot be undone: ''
+
+  Sort By:
+    Sort By: ''
+
+    NameAscending: ''
+    NameDescending: ''
+
+    LatestCreatedFirst: ''
+    EarliestCreatedFirst: ''
+
+    LatestUpdatedFirst: ''
+    EarliestUpdatedFirst: ''
+
+    LatestPlayedFirst: ''
+    EarliestPlayedFirst: ''
+  SinglePlaylistView:
+    Search for Videos: ''
+
+    Toast:
+      This video cannot be moved up.: ''
+      This video cannot be moved down.: ''
+      Video has been removed: ''
+      There was a problem with removing this video: ''
+
+      This playlist is already being used for quick bookmark.: ''
+      This playlist is now used for quick bookmark: ''
+      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: ''
+      Reverted to use {oldPlaylistName} for quick bookmark: ''
+
+      Some videos in the playlist are not loaded yet. Click here to copy anyway.: ''
+      Playlist name cannot be empty. Please input a name.: ''
+      Playlist has been updated.: ''
+      There was an issue with updating this playlist.: ''
+      "{videoCount} video(s) have been removed": ""
+      There were no videos to remove.: ''
+      This playlist is protected and cannot be removed.: ''
+      Playlist {playlistName} has been deleted.: ''
+      Playlist {playlistName} is the new quick bookmark playlist.: ''
+
+      This playlist does not exist: ''
+
+      This playlist has a video with a duration error: ''
+  AddVideoPrompt:
+    Select a playlist to add your N videos to: ''
+    N playlists selected: ''
+    Search in Playlists: ''
+    Allow Adding Duplicate Video(s): ''
+    Save: ''
+
+    Added {count} Times: ''
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": ''
+    "{videoCount}/{totalVideoCount} Videos Already Added": ''
+
+    Toast:
+      You haven't selected any playlist yet.: ''
+      "{videoCount} video(s) added to 1 playlist": ""
+      "{videoCount} video(s) added to {playlistCount} playlists": ""
+  CreatePlaylistPrompt:
+    New Playlist Name: ''
+    Create: ''
+
+    Toast:
+      There is already a playlist with this name. Please pick a different name.: ''
+      Playlist {playlistName} has been successfully created.: ''
+      There was an issue with creating the playlist.: ''
+History:
+  # On History Page
+  History: ''
+  Watch History: ''
+  Your history list is currently empty.: ''
+  Empty Search Message: ''
+  Search bar placeholder: ""
+  Case Sensitive Search: ''
+Settings:
+  # On Settings Page
+  Settings: ''
+  Sort Settings Sections (A-Z): ''
+  Return to Settings Menu: ''
+  The app needs to restart for changes to take effect. Restart and apply change?: ''
+  General Settings:
+    General Settings: ''
+    Check for Updates: ''
+    Check for Latest Blog Posts: ''
+    Fallback to Non-Preferred Backend on Failure: ''
+    Enable Search Suggestions: ''
+    Auto Load Next Page:
+      Label: ''
+      Tooltip: ''
+    Default Landing Page: ''
+    Locale Preference: ''
+    System Default: ''
+    Preferred API Backend:
+      Preferred API Backend: ''
+      Local API: ''
+      Invidious API: ''
+    Video View Type:
+      Video View Type: ''
+      Grid: ''
+      List: ''
+    Thumbnail Preference:
+      Thumbnail Preference: ''
+      Default: ''
+      Beginning: ''
+      Middle: ''
+      End: ''
+      Hidden: ''
+      Blur: ''
+    Current Invidious Instance: ''
+    The currently set default instance is {instance}: ''
+    No default instance has been set: ''
+    Current instance will be randomized on startup: ''
+    Set Current Instance as Default: ''
+    Clear Default Instance: ''
+    View all Invidious instance information: ''
+    Region for Trending: ''
+    #! List countries
+    External Link Handling:
+      External Link Handling: ''
+      Open Link: ''
+      Ask Before Opening Link: ''
+      No Action: ''
+  Theme Settings:
+    Theme Settings: ''
+    Match Top Bar with Main Color: ''
+    Expand Side Bar by Default: ''
+    Disable Smooth Scrolling: ''
+    UI Scale: ''
+    Hide Side Bar Labels: ''
+    Hide FreeTube Header Logo: ''
+    Base Theme:
+      Base Theme: ''
+      Black: ''
+      Dark: ''
+      System Default: ''
+      Light: ''
+      Dracula: ''
+      Catppuccin Mocha: ''
+      Pastel Pink: ''
+      Hot Pink: ''
+      Nordic: ''
+      Solarized Dark: ''
+      Solarized Light: ''
+    Main Color Theme:
+      Main Color Theme: ''
+      Red: ''
+      Pink: ''
+      Purple: ''
+      Deep Purple: ''
+      Indigo: ''
+      Blue: ''
+      Light Blue: ''
+      Cyan: ''
+      Teal: ''
+      Green: ''
+      Light Green: ''
+      Lime: ''
+      Yellow: ''
+      Amber: ''
+      Orange: ''
+      Deep Orange: ''
+      Dracula Cyan: ''
+      Dracula Green: ''
+      Dracula Orange: ''
+      Dracula Pink: ''
+      Dracula Purple: ''
+      Dracula Red: ''
+      Dracula Yellow: ''
+      Catppuccin Mocha Rosewater: ''
+      Catppuccin Mocha Flamingo: ''
+      Catppuccin Mocha Pink: ''
+      Catppuccin Mocha Mauve: ''
+      Catppuccin Mocha Red: ''
+      Catppuccin Mocha Maroon: ''
+      Catppuccin Mocha Peach: ''
+      Catppuccin Mocha Yellow: ''
+      Catppuccin Mocha Green: ''
+      Catppuccin Mocha Teal: ''
+      Catppuccin Mocha Sky: ''
+      Catppuccin Mocha Sapphire: ''
+      Catppuccin Mocha Blue: ''
+      Catppuccin Mocha Lavender: ''
+      Solarized Yellow: ''
+      Solarized Orange: ''
+      Solarized Red: ''
+      Solarized Magenta: ''
+      Solarized Violet: ''
+      Solarized Blue: ''
+      Solarized Cyan: ''
+      Solarized Green: ''
+    Secondary Color Theme: ''
+        #* Main Color Theme
+  Player Settings:
+    Player Settings: ''
+    Play Next Video: ''
+    Turn on Subtitles by Default: ''
+    Autoplay Videos: ''
+    Proxy Videos Through Invidious: ''
+    Autoplay Playlists: ''
+    Enable Theatre Mode by Default: ''
+    Scroll Volume Over Video Player: ''
+    Scroll Playback Rate Over Video Player: ''
+    Skip by Scrolling Over Video Player: ''
+    Display Play Button In Video Player: ''
+    Enter Fullscreen on Display Rotate: ''
+    Next Video Interval: ''
+    Fast-Forward / Rewind Interval: ''
+    Default Volume: ''
+    Default Playback Rate: ''
+    Max Video Playback Rate: ''
+    Video Playback Rate Interval: ''
+    Default Video Format:
+      Default Video Format: ''
+      Dash Formats: ''
+      Legacy Formats: ''
+      Audio Formats: ''
+    Default Quality:
+      Default Quality: ''
+      Auto: ''
+      144p: ''
+      240p: ''
+      360p: ''
+      480p: ''
+      720p: ''
+      1080p: ''
+      1440p: ''
+      4k: ''
+      8k: ''
+    Screenshot:
+      Enable: ''
+      Format Label: ''
+      Quality Label: ''
+      Ask Path: ''
+      Folder Label: ''
+      Folder Button: ''
+      File Name Label: ''
+      File Name Tooltip: ''
+      Error:
+        Forbidden Characters: ''
+        Empty File Name: ''
+  External Player Settings:
+    External Player Settings: ''
+    External Player: ''
+    Ignore Unsupported Action Warnings: ''
+    Ignore Default Arguments: ''
+    Custom External Player Executable: ''
+    Custom External Player Arguments: ''
+    Players:
+      None:
+        Name: ''
+  Privacy Settings:
+    Privacy Settings: ''
+    Remember History: ''
+    Save Watched Progress: ''
+    Save Watched Videos With Last Viewed Playlist: ''
+    Clear Search Cache: ''
+    Are you sure you want to clear out your search cache?: ''
+    Search cache has been cleared: ''
+    Remove Watch History: ''
+    Are you sure you want to remove your entire watch history?: ''
+    Watch history has been cleared: ''
+    Remove All Subscriptions / Profiles: ''
+    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
+    Remove All Playlists: ''
+    All playlists have been removed: ''
+    Are you sure you want to remove all your playlists?: ''
+  Subscription Settings:
+    Subscription Settings: ''
+    Hide Videos on Watch: ''
+    Fetch Feeds from RSS: ''
+    Fetch Automatically: ''
+    Only Show Latest Video for Each Channel: ''
+    Confirm Before Unsubscribing: ''
+  Distraction Free Settings:
+    Distraction Free Settings: ''
+    Sections:
+      Side Bar: ''
+      Subscriptions Page: ''
+      Channel Page: ''
+      Watch Page: ''
+      General: ''
+    Hide Video Views: ''
+    Hide Video Likes And Dislikes: ''
+    Hide Channel Subscribers: ''
+    Hide Comment Likes: ''
+    Hide Recommended Videos: ''
+    Hide Trending Videos: ''
+    Hide Popular Videos: ''
+    Hide Playlists: ''
+    Hide Live Chat: ''
+    Hide Active Subscriptions: ''
+    Hide Video Description: ''
+    Hide Comments: ''
+    Hide Profile Pictures in Comments: ''
+    Display Titles Without Excessive Capitalisation: ''
+    Hide Live Streams: ''
+    Hide Upcoming Premieres: ''
+    Hide Sharing Actions: ''
+    Hide Chapters: ''
+    Hide Channels: ''
+    Hide Channels Disabled Message: ''
+    Hide Channels Placeholder: ''
+    Hide Channels Invalid: ''
+    Hide Channels API Error: ''
+    Hide Channels Already Exists: ''
+    Hide Featured Channels: ''
+    Hide Channel Playlists: ''
+    Hide Channel Community: ''
+    Hide Channel Shorts: ''
+    Hide Channel Podcasts: ''
+    Hide Channel Releases: ''
+    Hide Videos and Playlists Containing Text: ''
+    Hide Videos and Playlists Containing Text Placeholder: ''
+    Hide Subscriptions Videos: ''
+    Hide Subscriptions Shorts: ''
+    Hide Subscriptions Live: ''
+    Hide Subscriptions Community: ''
+  Data Settings:
+    Data Settings: ''
+    Select Import Type: ''
+    Select Export Type: ''
+    Import Subscriptions: ''
+    Subscription File: ''
+    History File: ''
+    Playlist File: ''
+    Export Subscriptions: ''
+    Export FreeTube: ''
+    Export YouTube: ''
+    Export NewPipe: ''
+    Import History: ''
+    Export History: ''
+    Import Playlists: ''
+    Export Playlists: ''
+    Export Playlists For Older FreeTube Versions:
+      Label: ''
+      # |- = Keep newlines, No newline at end
+      Tooltip: |
+    Profile object has insufficient data, skipping item: ''
+    All subscriptions and profiles have been successfully imported: ''
+    All subscriptions have been successfully imported: ''
+    Invalid subscriptions file: ''
+    Invalid history file: ''
+    Subscriptions have been successfully exported: ''
+    History object has insufficient data, skipping item: ''
+    All watched history has been successfully imported: ''
+    All watched history has been successfully exported: ''
+    Playlist insufficient data: ''
+    All playlists has been successfully imported: ''
+    All playlists has been successfully exported: ''
+    Unable to read file: ''
+    Unable to write file: ''
+    Unknown data key: ''
+    How do I import my subscriptions?: ''
+    Manage Subscriptions: ''
+  Proxy Settings:
+    Proxy Settings: ''
+    Enable Tor / Proxy: ''
+    Proxy Protocol: ''
+    Proxy Host: ''
+    Proxy Port Number: ''
+    Clicking on Test Proxy will send a request to: ''
+    Test Proxy: ''
+    Your Info: ''
+    Ip: ''
+    Country: ''
+    Region: ''
+    City: ''
+    Error getting network information. Is your proxy configured properly?: ''
+  SponsorBlock Settings:
+    SponsorBlock Settings: ''
+    Enable SponsorBlock: ''
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
+    Notify when sponsor segment is skipped: ''
+    UseDeArrowTitles: ''
+    UseDeArrowThumbnails: ''
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': ''
+    Skip Options:
+      Skip Option: ''
+      Auto Skip: ''
+      Show In Seek Bar: ''
+      Prompt To Skip: ''
+      Do Nothing: ''
+    Category Color: ''
+  Parental Control Settings:
+    Parental Control Settings: ''
+    Hide Unsubscribe Button: ''
+    Show Family Friendly Only: ''
+    Hide Search Bar: ''
+  Download Settings:
+    Download Settings: ''
+    Ask Download Path: ''
+    Choose Path: ''
+    Download Behavior: ''
+    Download in app: ''
+    Open in web browser: ''
+  Experimental Settings:
+    Experimental Settings: ''
+    Warning: ''
+    Replace HTTP Cache: ''
+  Password Dialog:
+    Password: ''
+    Enter Password To Unlock: ''
+    Password Incorrect: ''
+    Unlock: ''
+  Password Settings:
+    Password Settings: ''
+    Set Password To Prevent Access: ''
+    Set Password: ''
+    Remove Password: ''
+About:
+  #On About page
+  About: ''
+  Beta: ''
+  Source code: ''
+  Licensed under the: ''
+  AGPLv3: ''
+  Downloads / Changelog: ''
+  GitHub releases: ''
+  Help: ''
+  FreeTube Wiki: ''
+  FAQ: ''
+  Discussions: ''
+  Report a problem: ''
+  GitHub issues: ''
+  Please check for duplicates before posting: ''
+  Website: ''
+  Blog: ''
+  Email: ''
+  Mastodon: ''
+  Chat on Matrix: ''
+  Please read the: ''
+  room rules: ''
+  Translate: ''
+  Credits: ''
+  FreeTube is made possible by: ''
+  these people and projects: ''
+  Donate: ''
+
+Profile:
+  Profile Settings: ''
+  Toggle Profile List: ''
+  Profile Select: ''
+  Profile Filter: ''
+  All Channels: ''
+  Profile Manager: ''
+  Create New Profile: ''
+  Edit Profile: ''
+  Edit Profile Name: ''
+  Create Profile Name: ''
+  Profile Name: ''
+  Color Picker: ''
+  Custom Color: ''
+  Profile Preview: ''
+  Create Profile: ''
+  Update Profile: ''
+  Make Default Profile: ''
+  Delete Profile: ''
+  Are you sure you want to delete this profile?: ''
+  All subscriptions will also be deleted.: ''
+  Profile could not be found: ''
+  Your profile name cannot be empty: ''
+  Profile has been created: ''
+  Profile has been updated: ''
+  Your default profile has been set to {profile}: ''
+  Removed {profile} from your profiles: ''
+  Your default profile has been changed to your primary profile: ''
+  '{profile} is now the active profile': ''
+  Subscription List: ''
+  Other Channels: ''
+  '{number} selected': ''
+  Select All: ''
+  Select None: ''
+  Delete Selected: ''
+  Add Selected To Profile: ''
+  No channel(s) have been selected: ''
+  ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
+    same channels will be deleted in any profile they are found in.
+  : ''
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
+  Close Profile Dropdown: ''
+  Open Profile Dropdown: ''
+#On Channel Page
+Channel:
+  Subscribe: ''
+  Unsubscribe: ''
+  Channel has been removed from your subscriptions: ''
+  Removed subscription from {count} other channel(s): ''
+  Added channel to your subscriptions: ''
+  Search Channel: ''
+  Your search results have returned 0 results: ''
+  Sort By: ''
+  This channel does not exist: ''
+  This channel does not allow searching: ''
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
+  Channel Tabs: ''
+  Videos:
+    Videos: ''
+    This channel does not currently have any videos: ''
+    Sort Types:
+      Newest: ''
+      Oldest: ''
+      Most Popular: ''
+  Shorts:
+    This channel does not currently have any shorts: ''
+  Live:
+    Live: ''
+    This channel does not currently have any live streams: ''
+  Playlists:
+    Playlists: ''
+    This channel does not currently have any playlists: ''
+    Sort Types:
+      Last Video Added: ''
+      Newest: ''
+      Oldest: ''
+  Podcasts:
+    Podcasts: ''
+    This channel does not currently have any podcasts: ''
+  Releases:
+    Releases: ''
+    This channel does not currently have any releases: ''
+  About:
+    About: ''
+    Channel Description: ''
+    Tags:
+      Tags: ''
+      Search for: ''
+    Details: ''
+    Joined: ''
+    Location: ''
+    Featured Channels: ''
+  Community:
+    This channel currently does not have any posts: ''
+    votes: ''
+    View Full Post: ''
+    Reveal Answers: ''
+    Hide Answers: ''
+    Video hidden by FreeTube: ''
+    Viewing Posts Only Supported By Invidious: ''
+Video:
+  IP block: ''
+  MembersOnly: ''
+  AgeRestricted: ''
+  More Options: ''
+  Mark As Watched: ''
+  Remove From History: ''
+  Video has been marked as watched: ''
+  Video has been removed from your history: ''
+  Save Video: ''
+  Video has been saved: ''
+  Video has been removed from your saved list: ''
+  Open in YouTube: ''
+  Copy YouTube Link: ''
+  Open YouTube Embedded Player: ''
+  Copy YouTube Embedded Player Link: ''
+  Open in Invidious: ''
+  Copy Invidious Link: ''
+  Open Channel in YouTube: ''
+  Copy YouTube Channel Link: ''
+  Open Channel in Invidious: ''
+  Copy Invidious Channel Link: ''
+  Hide Channel: ''
+  Unhide Channel: ''
+  Views: ''
+  Loop Playlist: ''
+  Shuffle Playlist: ''
+  Reverse Playlist: ''
+  Play Next Video: ''
+  Play Previous Video: ''
+  Pause on Current Video: ''
+  Watched: ''
+  Autoplay: ''
+  Starting soon, please refresh the page to check again: ''
+  # As in a Live Video
+  Premieres on: ''
+  Premieres: ''
+  Upcoming: ''
+  Unlisted: ''
+  Live: ''
+  Live Now: ''
+  Live Chat: ''
+  Enable Live Chat: ''
+  Live Chat is currently not supported in this build.: ''
+  'Chat is disabled or the Live Stream has ended.': ''
+  Live chat is enabled. Chat messages will appear here once sent.: ''
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
+  Show Super Chat Comment: ''
+  Scroll to Bottom: ''
+  Download Video: ''
+  video only: ''
+  audio only: ''
+  Published:
+    Jan: ''
+    Feb: ''
+    Mar: ''
+    Apr: ''
+    May: ''
+    Jun: ''
+    Jul: ''
+    Aug: ''
+    Sep: ''
+    Oct: ''
+    Nov: ''
+    Dec: ''
+    Second: ''
+    Seconds: ''
+    Minute: ''
+    Minutes: ''
+    Hour: ''
+    Hours: ''
+    Day: ''
+    Days: ''
+    Week: ''
+    Weeks: ''
+    Month: ''
+    Months: ''
+    Year: ''
+    Years: ''
+    Ago: ''
+    Upcoming: ''
+    In less than a minute: ''
+  Published on: ''
+  Streamed on: ''
+  Started streaming on: ''
+  Publicationtemplate: ''
+  Sponsor Block category:
+    sponsor: ''
+    intro: ''
+    outro: ''
+    self-promotion: ''
+    interaction: ''
+    music offtopic: ''
+    recap: ''
+    filler: ''
+  External Player:
+    OpenInTemplate: ''
+    video: ''
+    playlist: ''
+    OpeningTemplate: ''
+    UnsupportedActionTemplate: ''
+    Unsupported Actions:
+      starting video at offset: ''
+      setting a playback rate: ''
+      opening playlists: ''
+      opening specific video in a playlist (falling back to opening the video): ''
+      reversing playlists: ''
+      shuffling playlists: ''
+      looping playlists: ''
+  Player:
+    TranslatedCaptionTemplate: ''
+    Audio Tracks: ''
+    Theatre Mode: ''
+    Exit Theatre Mode: ''
+    Full Window: ''
+    Exit Full Window: ''
+    Take Screenshot: ''
+    Show Stats: ''
+    Hide Stats: ''
+    Stats:
+      Stats: ''
+      Video ID: ''
+      Media Formats: ''
+      Resolution: ''
+      Player Dimensions: ''
+      Bitrate: ''
+      Volume: ''
+      Bandwidth: ''
+      Buffered: ''
+      Dropped Frames / Total Frames: ''
+      CodecAudio: ''
+      CodecsVideoAudio: ''
+      CodecsVideoAudioNoItags: ''
+    You appear to be offline: ''
+    Playback will resume automatically when your connection comes back: ''
+    Skipped segment: ''
+#& Videos
+Videos:
+  #& Sort By
+  Sort By:
+    Newest: ''
+    Oldest: ''
+    #& Most Popular
+#& Playlists
+Playlist:
+  #& About
+  Playlist: ''
+  View Full Playlist: ''
+  Last Updated On: ''
+  Sort By:
+    Sort By: ''
+    DateAddedNewest: ''
+    DateAddedOldest: ''
+    AuthorAscending: ''
+    AuthorDescending: ''
+    VideoTitleAscending: ''
+    VideoTitleDescending: ''
+    VideoDurationAscending: ''
+    VideoDurationDescending: ''
+    Custom: ''
+
+# On Video Watch Page
+#* Published
+#& Views
+Change Format:
+  Change Media Formats: ''
+  Use Dash Formats: ''
+  Use Legacy Formats: ''
+  Use Audio Formats: ''
+  Dash formats are not available for this video: ''
+  Audio formats are not available for this video: ''
+  Legacy formats are not available for this video: ''
+Share:
+  Share Video: ''
+  Share Channel: ''
+  Share Playlist: ''
+  Include Timestamp: ''
+  Copy Link: ''
+  Open Link: ''
+  Copy Embed: ''
+  Open Embed: ''
+  # On Click
+  Invidious URL copied to clipboard: ''
+  Invidious Embed URL copied to clipboard: ''
+  Invidious Channel URL copied to clipboard: ''
+  YouTube URL copied to clipboard: ''
+  YouTube Embed URL copied to clipboard: ''
+  YouTube Channel URL copied to clipboard: ''
+Clipboard:
+  Copy failed: ''
+  Cannot access clipboard without a secure connection: ''
+
+Chapters:
+  Chapters: ''
+  'Chapters list visible, current chapter: {chapterName}': ''
+  'Chapters list hidden, current chapter: {chapterName}': ''
+
+Mini Player: ''
+Comments:
+  Comments: ''
+  Click to View Comments: ''
+  Getting comment replies, please wait: ''
+  There are no more comments for this video: ''
+  Show Comments: ''
+  Hide Comments: ''
+  Sort by: ''
+  Top comments: ''
+  Newest first: ''
+  View {replyCount} replies: ''
+  # Context: View 10 Replies, View 1 Reply, View 1 Reply from Owner, View 2 Replies from Owner and others
+  View: ''
+  Hide: ''
+  Replies: ''
+  Show More Replies: ''
+  Reply: ''
+  From {channelName}: ''
+  And others: ''
+  There are no comments available for this video: ''
+  There are no comments available for this post: ''
+  Load More Comments: ''
+  No more comments available: ''
+  Pinned by: ''
+  Member: ''
+  Subscribed: ''
+  Hearted: ''
+
+Up Next: ''
+
+#Tooltips
+Tooltips:
+  General Settings:
+    Preferred API Backend: ''
+    Fallback to Non-Preferred Backend on Failure: ''
+    Thumbnail Preference: ''
+    Invidious Instance: ''
+    Region for Trending: ''
+    External Link Handling: |
+  Player Settings:
+    Proxy Videos Through Invidious: ''
+    Default Video Format: ''
+    Scroll Playback Rate Over Video Player: ''
+    Skip by Scrolling Over Video Player: ''
+  External Player Settings:
+    External Player: ''
+    Custom External Player Executable: ''
+    Ignore Warnings: ''
+    Ignore Default Arguments: ''
+    Custom External Player Arguments: ''
+    DefaultCustomArgumentsTemplate: ""
+  Distraction Free Settings:
+    Hide Channels: ''
+    Hide Subscriptions Live: ''
+    Hide Videos and Playlists Containing Text: ''
+  Subscription Settings:
+    Fetch Feeds from RSS: ''
+    Fetch Automatically: ''
+  Experimental Settings:
+    Replace HTTP Cache: ''
+  SponsorBlock Settings:
+    UseDeArrowTitles: ''
+    UseDeArrowThumbnails: ''
+
+# Toast Messages
+Local API Error (Click to copy): ''
+Invidious API Error (Click to copy): ''
+Falling back to Invidious API: ''
+Falling back to Local API: ''
+This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Unknown YouTube url type, cannot be opened in app: ''
+Loop is now disabled: ''
+Loop is now enabled: ''
+Shuffle is now disabled: ''
+Shuffle is now enabled: ''
+The playlist has been reversed: ''
+Playing Next Video: ''
+Playing Previous Video: ''
+Playlist will not pause when current video is finished: ''
+Playlist will pause when current video is finished: ''
+Playing Next Video Interval: ''
+Canceled next video autoplay: ''
+
+Default Invidious instance has been set to {instance}: ''
+Default Invidious instance has been cleared: ''
+'The playlist has ended. Enable loop to continue playing': ''
+Age Restricted:
+  This channel is age restricted: ''
+  This video is age restricted: ''
+External link opening has been disabled in the general settings: ''
+'Blocked opening potentially unsafe URL': ''
+Downloading has completed: ''
+Starting download: ''
+Downloading failed: ''
+Screenshot Success: ''
+Screenshot Error: ''
+Channel Hidden: ''
+Channel Unhidden: ''
+Trimmed input must be at least N characters long: ''
+Tag already exists: ''
+
+Hashtag:
+  Hashtag: ''
+  This hashtag does not currently have any videos: ''
+Moments Ago: ''
+Yes: ''
+No: ''
+Ok: ''
+Yes, Delete: ''
+Yes, Restart: ''
+Yes, Open Link: ''
+Cancel: ''
+# symbol used to indicate that an item is correct
+checkmark: ''
+# French is the only language that should change this (they have a space before the colon)
+Display Label: ''
diff --git a/static/locales/tok.yaml b/static/locales/tok.yaml
index b9d4d445df38a..9b5e9774ec5bd 100644
--- a/static/locales/tok.yaml
+++ b/static/locales/tok.yaml
@@ -21,16 +21,16 @@ Actual size: 'suli lon'
 Zoom in: 'lukin suli'
 Zoom out: 'lukin lili'
 Toggle fullscreen: 'ante e sitelin suli'
-Window: 'sitelin'
+Window: 'lupa'
 Minimize: 'kama lili'
 Close: 'pini'
 Back: 'tawa monsi'
 Forward: 'tawa sinpin'
-Open New Window: 'open lon sitelin sin'
+Open New Window: 'open lon lupa sin'
 
 Version {versionNumber} is now available!  Click for more details: 'ilo pi nanpa {versionNumber}
-  li lon! open la, sina ken sona mute.'
-Download From Site: 'poki e sitelin ni'
+  li lon! open la, sina ken sona mute'
+Download From Site: 'kama jo tan lipu'
 A new blog is now available, {blogTitle}. Click to view more: 'lipu sin li lon. ona
   li {blogTitle}. open la, sina ken lukin mute.'
 Are you sure you want to open this link?: 'sina wile ala wile open e ni?'
@@ -46,13 +46,56 @@ Search Filters:
     Sort By: 'nasin li seme?'
     Most Relevant: 'sama e wile sina'
     Rating: 'pona'
+  Duration:
+    All Durations: tenpo ali
+    Duration: tenpo
+  Features:
+    Live: tenpo ni
+    3D: 3D
+    4K: 4K
+    HD: HD
+    HDR: HDR
+    VR180: VR180
+  Time:
+    Any Time: tenpo ali
+    Time: tenpo
 Settings:
   # On Settings Page
   General Settings: {}
   Theme Settings: {}
   Player Settings:
     Screenshot: {}
+    Default Quality:
+      4k: 4K
   SponsorBlock Settings: {}
 Video:
   External Player: {}
+  Live: tenpo ni
 Tooltips: {}
+Global:
+  Community: kulupu
+  Videos: sitelen tawa
+  Shorts: lili
+  Live: tenpo ni
+  Counts:
+    Video Count: 1 sitelen tawa | {count} sitelen tawa
+    Subscriber Count: 1 jan li kama jo | {count} jan li kama jo
+    View Count: 1 lukin | {count} lukin
+    Watching Count: 1 jan li lukin | {count} jan li lukin
+    Channel Count: 1 toki nasin | {count} toki nasin
+    Like Count: 1 musi | {count} musi
+    Comment Count: 1 toki | {count} toki
+Close Banner: pini e sitelen esun
+New Window: lupa sin
+Preferences: wile
+Go to page: tawa lipu
+Search Listing:
+  Label:
+    New: sin
+    4K: 4K
+    8K: 8K
+    360 Video: 360°
+Channel:
+  Live:
+    Live: tenpo ni
+More: mute
diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index be1f28afa91ac..b373f6ec0c028 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -107,7 +107,8 @@ Subscriptions:
   Subscriptions: 'Abonelikler'
   Latest Subscriptions: 'En Yeni'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Abonelik
-    listeniz şu anda boş. Aboneliklerinizi görebilmek için abone olmaya başlayın.'
+    listeniz şu anda boş. Aboneliklerinizi içe aktarmak istiyorsanız Veri Ayarları''na
+    gidip Abonelikleri İçe Aktar''ı seçebilir veya bir kanal arayıp abone olabilirsiniz.'
   'Getting Subscriptions. Please wait.': 'Abonelikler yükleniyor. Lütfen bekleyin.'
   Refresh Subscriptions: 'Abonelikleri Yenile'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Bu
@@ -134,13 +135,6 @@ Most Popular: 'Popüler Olanlar'
 Playlists: 'Oynatma Listeleri'
 User Playlists:
   Your Playlists: 'Oynatma Listelerin'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Kaydedilen
-    videolarınız boş. Kaydedilen videolarınızın burada listelenmesi için videonun
-    köşesindeki kaydet düğmesine tıklayın
-  Playlist Message: Bu sayfa, tam olarak çalışan oynatma listelerini yansıtmamaktadır.
-    Yalnızca kaydettiğiniz veya favorilerinize eklediğiniz videoları listeler. İş
-    bittiğinde, şu anda burada bulunan tüm videolar bir 'Favoriler' oynatma listesine
-    taşınacaktır.
   Search bar placeholder: Oynatma Listesi Ara
   Empty Search Message: Bu oynatma listesinde aramanızla eşleşen video yok
   This playlist currently has no videos.: Bu oynatma listesinde şu anda hiç video
@@ -183,7 +177,6 @@ User Playlists:
         ve kaldırılamaz.
       There were no videos to remove.: Kaldırılacak video yok.
       This playlist does not exist: Bu oynatma listesi yok
-      Quick bookmark disabled: Hızlı yer imi devre dışı bırakıldı
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Bu
         oynatma listesi artık {oldPlaylistName} yerine hızlı yer imi için kullanılıyor.
         Geri almak için buraya tıklayın
@@ -195,6 +188,8 @@ User Playlists:
         oynatma listesi yeni hızlı yer imi oynatma listesi.'
       This playlist is already being used for quick bookmark.: Bu oynatma listesi
         zaten hızlı yer imi için kullanılıyor.
+      This playlist has a video with a duration error: Bu oynatma listesi süresi olmayan
+        en az bir video içeriyor, süreleri sıfırmış gibi sıralanacaktır.
     Search for Videos: Video Ara
   AddVideoPrompt:
     Select a playlist to add your N videos to: Videonuzu eklemek için bir oynatma
@@ -236,15 +231,11 @@ User Playlists:
   Cancel: İptal
   Edit Playlist Info: Oynatma Listesi Bilgilerini Düzenle
   Copy Playlist: Oynatma Listesini Kopyala
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: İzlenen
-    tüm videoları bu oynatma listesinden kaldırmak istediğinizden emin misiniz? Bu
-    işlem geri alınamaz.
   Remove Watched Videos: İzlenen Videoları Kaldır
   Add to Favorites: '{playlistName} oynatma listesine ekle'
   Remove from Favorites: '{playlistName} oynatma listesinden kaldır'
   Enable Quick Bookmark With This Playlist: Bu Oynatma Listesiyle Hızlı Yer İmini
     Etkinleştir
-  Disable Quick Bookmark: Hızlı Yer İşaretini Devre Dışı Bırak
   Playlists with Matching Videos: Eşleşen Videoları İçeren Oynatma Listeleri
   Quick Bookmark Enabled: Hızlı Yer İmi Etkin
   Cannot delete the quick bookmark target playlist.: Hızlı yer imi hedef oynatma listesi
@@ -258,6 +249,9 @@ User Playlists:
     oynatma listesinden 1 yinelenen videoyu kaldırmak istediğinizden emin misiniz?
     Bu geri alınamaz. | Bu oynatma listesinden {playlistItemCount} yinelenen videoyu
     kaldırmak istediğinizden emin misiniz? Bu geri alınamaz.
+  Export Playlist: Bu Oynatma Listesini Dışa Aktar
+  The playlist has been successfully exported: Oynatma listesi başarılı bir şekilde
+    dışa aktarıldı
 History:
   # On History Page
   History: 'Geçmiş'
@@ -270,7 +264,7 @@ Settings:
   # On Settings Page
   Settings: 'Ayarlar'
   General Settings:
-    General Settings: 'Genel Ayarlar'
+    General Settings: 'Genel'
     Check for Updates: 'Güncellemeleri Denetle'
     Check for Latest Blog Posts: 'En Yeni Blog Gönderilerini Denetle'
     Fallback to Non-Preferred Backend on Failure: 'Hata Durumunda Tercih Edilmeyen
@@ -294,8 +288,6 @@ Settings:
       End: 'Bitiş'
       Hidden: Gizli
       Blur: Bulanıklık
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Örneği
-      (Öntanımlı olarak https://invidious.snopyta.org)'
     Region for Trending: 'Öne Çıkanlar İçin Bölge Tercihi'
         #! List countries
     View all Invidious instance information: Tüm Invidious örnek bilgilerini görüntüle
@@ -316,8 +308,9 @@ Settings:
     Auto Load Next Page:
       Label: Sonraki Sayfayı Otomatik Yükle
       Tooltip: Sonraki sayfaları ve yorumları otomatik olarak yükle.
+    Open Deep Links In New Window: FreeTube'a Geçen URL'leri Yeni Pencerede Aç
   Theme Settings:
-    Theme Settings: 'Tema Ayarları'
+    Theme Settings: 'Tema'
     Match Top Bar with Main Color: 'Üst Barı Ana Renk ile Eşleştir'
     Base Theme:
       Base Theme: 'Uygulama Teması'
@@ -332,6 +325,8 @@ Settings:
       Nordic: Nord
       Solarized Light: Solarized Açık
       Solarized Dark: Solarized Koyu
+      Gruvbox Dark: Gruvbox Karanlık
+      Gruvbox Light: Gruvbox Aydınlık
     Main Color Theme:
       Main Color Theme: 'Ana Renk Teması'
       Red: 'Kırmızı'
@@ -379,6 +374,16 @@ Settings:
       Solarized Blue: Solarized Mavi
       Solarized Cyan: Solarized Camgöbeği
       Solarized Green: Solarized Yeşil
+      Gruvbox Dark Green: Gruvbox Koyu Yeşil
+      Gruvbox Dark Yellow: Gruvbox Koyu Sarı
+      Gruvbox Dark Aqua: Gruvbox Koyu Deniz Mavisi
+      Gruvbox Dark Blue: Gruvbox Koyu Mavi
+      Gruvbox Dark Purple: Gruvbox Koyu Mor
+      Gruvbox Dark Orange: Gruvbox Koyu Turuncu
+      Gruvbox Light Purple: Gruvbox Açık Mor
+      Gruvbox Light Orange: Gruvbox Açık Turuncu
+      Gruvbox Light Red: Gruvbox Açık Kırmızı
+      Gruvbox Light Blue: Gruvbox Açık Mavi
     Secondary Color Theme: 'İkincil Renk Teması'
         #* Main Color Theme
     UI Scale: Kullanıcı Arayüzü Ölçeği
@@ -387,7 +392,7 @@ Settings:
     Hide Side Bar Labels: Kenar Çubuğu Etiketlerini Gizle
     Hide FreeTube Header Logo: FreeTube Başlık Logosunu Gizle
   Player Settings:
-    Player Settings: 'Oynatıcı Ayarları'
+    Player Settings: 'Oynatıcı'
     Play Next Video: 'Sonraki Videoyu Oynat'
     Turn on Subtitles by Default: 'Alt Yazıları Öntanımlı Olarak Aç'
     Autoplay Videos: 'Videoları Otomatik Başlat'
@@ -414,7 +419,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Oynatma Listesi Sonraki Video Aralığı
-    Next Video Interval: Sonraki Video Aralığı
+    Next Video Interval: Otomatik Oynatma Geri Sayım Sayacı
     Scroll Volume Over Video Player: Ses Düzeyini Video Oynatıcı Üzerinden Kaydır
     Display Play Button In Video Player: Video Oynatıcıda Oynatma Düğmesini Göster
     Fast-Forward / Rewind Interval: Hızlı İleri / Geri Sarma Aralığı
@@ -440,8 +445,9 @@ Settings:
         veya "/" kullanabilirsiniz.
     Enter Fullscreen on Display Rotate: Ekran Döndürüldüğünde Tam Ekrana Geç
     Skip by Scrolling Over Video Player: Video Oynatıcı Üzerinde Kaydırarak Atla
+    Autoplay Interruption Timer: Otomatik Oynatma Durdurma Sayacı
   Privacy Settings:
-    Privacy Settings: 'Gizlilik Ayarları'
+    Privacy Settings: 'Gizlilik'
     Remember History: 'Geçmişi Hatırla'
     Save Watched Progress: 'Kaldığım Yeri Hatırla'
     Clear Search Cache: 'Arama Önbelleğini Temizle'
@@ -462,22 +468,19 @@ Settings:
     Are you sure you want to remove all your playlists?: Tüm oynatma listelerinizi
       kaldırmak istediğinizden emin misiniz?
   Subscription Settings:
-    Subscription Settings: 'Abonelik Ayarları'
+    Subscription Settings: 'Abonelik'
     Hide Videos on Watch: 'İzlenmiş Videoları Gizle'
     Fetch Feeds from RSS: 'Akışları RSS''den Getir'
-    Manage Subscriptions: 'Abonelikleri Yönet'
     Fetch Automatically: Akışı Otomatik Olarak Getir
-    Only Show Latest Video for Each Channel: Her Kanal için Yalnızca En Son Videoyu
-      Göster
     Confirm Before Unsubscribing: Abonelikten Çıkmadan Önce Onayla
+    'Limit the number of videos displayed for each channel': Her kanal için gösterilen
+      video sayısını sınırlayın
+    To: Kadar
   Data Settings:
-    Data Settings: 'Veri Ayarları'
+    Data Settings: 'Veri'
     Select Import Type: 'İçe Aktarma Türünü Seç'
     Select Export Type: 'Dışa Aktarma Türünü Seç'
     Import Subscriptions: 'Abonelikleri İçe Aktar'
-    Import FreeTube: 'Freetube''dan İçe Aktar'
-    Import YouTube: 'YouTube''dan İçe Aktar'
-    Import NewPipe: 'NewPipe''dan İçe Aktar'
     Export Subscriptions: 'Abonelikleri Dışa Aktar'
     Export FreeTube: 'Freetube Biçiminde Dışa Aktar'
     Export YouTube: 'YouTube Biçiminde Dışa Aktar'
@@ -505,7 +508,6 @@ Settings:
     Unable to write file: 'Dosya yazılamadı'
     Unknown data key: 'Bilinmeyen veri anahtarı'
     How do I import my subscriptions?: 'Aboneliklerimi nasıl içe artarırım?'
-    Check for Legacy Subscriptions: Eski Abonelikleri Denetle
     Manage Subscriptions: Abonelikleri Yönet
     Export Playlists: Oynatma Listelerini Dışa Aktar
     All playlists has been successfully imported: Tüm oynatma listeleri başarıyla
@@ -527,33 +529,6 @@ Settings:
         Listelerini Kaldır seçeneğini kullanarak var olan tüm oynatma listelerinizi
         silin.\n3. FreeTube'un eski sürümünü başlatın ve dışa aktarılan oynatma listelerini
         içe aktarın.\""
-  Advanced Settings:
-    Advanced Settings: 'Gelişmiş Ayarlar'
-    Enable Debug Mode (Prints data to the console): 'Hata Ayıklama Modunu Etkinleştir
-      (Veriyi Konsola Yazdırır)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Vekil Sunucu Adresi (Örneğin:
-      SOCKS5://127.0.0.1:9050)'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '"Vekil
-      Sunucuyu Test Et" Butonuna Tıklamak https://ipinfo.io/json Adresine bir Talep
-      Gönderecek'
-    Use Tor / Proxy for API calls: 'API çağrıları için Tor / Vekil Sunucu Kullan'
-    TEST PROXY: 'Vekil Sunucuyu Test Et'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Genel Oluşumları Göster'
-    Clear History:
-      Clear History: 'Geçmişi Temizle'
-      # On Click
-      Are you sure you want to delete your history?: 'Geçmişi silmek istediğinizden
-        emin misiniz?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Abonelikleri Temizle'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Abonelikleri temizlemek
-        istediğinizden emin misiniz?'
-      #& Yes
-      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Canlı Sohbeti Gizle
@@ -564,7 +539,7 @@ Settings:
     Hide Channel Subscribers: Kanal Abonelerini Gizle
     Hide Video Likes And Dislikes: Video Beğenmeleri Ve Beğenmemelerini Gizle
     Hide Video Views: Video İzlenme Sayılarını Gizle
-    Distraction Free Settings: Dikkat Dağıtmama Ayarları
+    Distraction Free Settings: Dikkat Dağıtmama
     Hide Active Subscriptions: Etkin Abonelikleri Gizle
     Hide Playlists: Oynatma Listelerini Gizle
     Hide Live Streams: Canlı Yayınları Gizle
@@ -578,22 +553,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Başlıkları Aşırı Büyük Harf ve
       Noktalama İşaretleri Kullanmadan Görüntüle
     Hide Featured Channels: Öne Çıkan Kanalları Gizle
-    Hide Channel Playlists: Kanal Oynatma Listelerini Gizle
-    Hide Channel Community: Kanal Topluluğunu Gizle
-    Hide Channel Shorts: Kanal Kısa Videolarını Gizle
+    Hide Channel Playlists: Kanal "Oynatma Listelerini" Gizle Sekmesi
+    Hide Channel Community: Kanal "Topluluğunu" Gizle Sekmesi
+    Hide Channel Shorts: Kanal "Kısa Videolarını" Gizle Sekmesi
     Sections:
       Side Bar: Kenar Çubuğu
       Channel Page: Kanal Sayfası
       Watch Page: İzleme Sayfası
       General: Genel
       Subscriptions Page: Abonelikler Sayfası
-    Hide Channel Releases: Kanal Yayınlarını Gizle
-    Hide Channel Podcasts: Kanal Podcast'lerini Gizle
+    Hide Channel Releases: Kanal "Yayınlarını" Gizle Sekmesi
+    Hide Channel Podcasts: Kanal "Podcast'lerini" Gizle Sekmesi
     Hide Subscriptions Videos: Abonelik Videolarını Gizle
     Hide Subscriptions Shorts: Abonelik Kısa Videolarını Gizle
     Hide Subscriptions Live: Abonelik Canlı Yayınlarını Gizle
     Hide Profile Pictures in Comments: Yorumlardaki Profil Resimlerini Gizle
-    Blur Thumbnails: Küçük Resimleri Bulanıklaştır
     Hide Subscriptions Community: Abonelik Topluluğunu Gizle
     Hide Channels Invalid: Belirtilen kanal kimliği geçersiz
     Hide Channels Disabled Message: Bazı kanallar kimliği kullanılarak engellendi
@@ -605,6 +579,7 @@ Settings:
       Gizle
     Hide Videos and Playlists Containing Text Placeholder: Sözcük, Sözcük Parçası
       veya İfade
+    Hide Channel Home: Kanal "Ana Sayfasını" Gizle Sekmesi
   The app needs to restart for changes to take effect. Restart and apply change?: Değişikliklerin
     etkili olması için uygulamanın yeniden başlatılması gerekiyor. Yeniden başlatılsın
     ve değişiklikler uygulansın mı?
@@ -623,13 +598,17 @@ Settings:
     Proxy Host: Vekil Sunucu Ana Makinesi
     Proxy Protocol: Vekil Sunucu Protokolü
     Enable Tor / Proxy: Tor / Vekil Sunucu Etkinleştir
-    Proxy Settings: Vekil Sunucu Ayarları
+    Proxy Settings: Vekil Sunucu
+    Proxy Warning: FreeTube yerleşik bir proxy'ye sahip değildir, ancak Tor gibi makinenizde
+      çalışan bir proxy veya bazı VPN'ler tarafından sağlanan SOCKS5 proxy gibi harici
+      bir proxy'ye bağlanabilir. Etkinleştirilmişse, proxy/Tor'unuzun düzgün yapılandırıldığından
+      emin olun, aksi takdirde FreeTube herhangi bir veri alamayacaktır.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Sponsor bölümü atlandığında bildir
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       URL'si (Öntanımlı olarak https://sponsor.ajay.app)
     Enable SponsorBlock: SponsorBlock'u Etkinleştir
-    SponsorBlock Settings: SponsorBlock Ayarları
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Atlama Seçeneği
       Auto Skip: Otomatik Atla
@@ -646,7 +625,7 @@ Settings:
     Custom External Player Executable: Özel Harici Oynatıcı Çalıştırılabilir Dosyası
     Ignore Unsupported Action Warnings: Desteklenmeyen Eylem Uyarılarını Yok Say
     External Player: Harici Oynatıcı
-    External Player Settings: Harici Oynatıcı Ayarları
+    External Player Settings: Harici Oynatıcı
     Players:
       None:
         Name: Yok
@@ -654,12 +633,12 @@ Settings:
   Download Settings:
     Choose Path: Yol Seç
     Ask Download Path: İndirme yolu için sor
-    Download Settings: İndirme Ayarları
+    Download Settings: İndirme
     Download Behavior: İndirme Davranışı
     Download in app: Uygulamada indir
     Open in web browser: Web tarayıcısında aç
   Parental Control Settings:
-    Parental Control Settings: Ebeveyn Denetimi Ayarları
+    Parental Control Settings: Ebeveyn Denetimi
     Show Family Friendly Only: Yalnızca Aileye Uygun Olanları Göster
     Hide Unsubscribe Button: Abonelikten Çık Düğmesini Gizle
     Hide Search Bar: Arama Çubuğunu Gizle
@@ -668,66 +647,31 @@ Settings:
     Warning: Bu ayarlar deneyseldir, etkin durumdayken çökmelere neden olabilirler.
       Yedekleme yapılması şiddetle tavsiye edilir. Kullanmanız durumunda risk size
       aittir!
-    Experimental Settings: Deneysel Ayarlar
+    Experimental Settings: Deneysel
   Password Dialog:
     Password Incorrect: Parola Yanlış
     Unlock: Kilidi aç
     Password: Parola
     Enter Password To Unlock: Ayarların kilidini açmak için parolayı girin
   Password Settings:
-    Password Settings: Parola Ayarları
+    Password Settings: Parola
     Set Password To Prevent Access: Ayarlara erişimi engellemek için bir parola belirleyin
     Remove Password: Parolayı Kaldır
     Set Password: Parola Ayarla
-  Expand All Settings Sections: Tüm Ayarlar Bölümlerini Genişlet
   Sort Settings Sections (A-Z): Ayarlar Bölümlerini Sırala (A-Z)
+  Return to Settings Menu: Ayarlar Menüsüne Dön
 About:
   #On About page
   About: 'Hakkında'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Bu
-    copyleft yazılım, özgür bir şekilde AGPL-3.0 altında lisanslanmıştır.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Hata mı buldunuz? Yeni bir özellik mi önermek istiyorsunuz? Yardım etmek mi istiyorsunuz?
-    GitHub sayfamıza bakın. Çekme istekleri kabul edilir.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Freetube''yi
-    yapmamıza olanak veren herkese ve tüm projelere teşekkürler!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Sohbet
-    etmek mi istiyorsunuz? Element / Matrix sunucumuza katılın. Lütfen katılmadan
-    önce kuralları gözden geçirin.'
-
-  'Looking for help? Check out our Wiki page.': 'Yardım mı lazım? Wiki sayfamıza bakın.'
-
-  Check out our Firefox extension!: 'Firefox uzantımıza göz atın!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'FreeTube''u
-    kullanmaktan hoşlanıyorsanız, Liberapay veya Bitcoin adresimiz aracılığıyla bağış
-    yapmayı düşünün.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'En Yeni FreeTube Haberleri'
-
-  Translate via Weblate: Weblate'de Çevir
   Website: İnternet Sitesi
-  Source Code: Kaynak Kodları
-  Release Notes: Sürüm Notları
   Blog: Blog
   Credits: Katkıda Bulunanlar
   FAQ: SSS
-  Wiki: Wiki
-  Report an Issue: Sorun Bildir
-  Channel Rules: Kanal Kuralları
   Email: E-posta
-  License: Lisans
   Beta: Beta
   Donate: Bağış Yap
-  Useful Links: Faydalı Bağlantılar
   Help: Yardım
-  Contact: İletişim
   these people and projects: bu kişiler ve projeler
   FreeTube is made possible by: FreeTube'e katkıda bulunanlar
   Translate: Çevir
@@ -742,8 +686,6 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub yayınları
   Downloads / Changelog: İndirmeler / Değişiklikler
-  View License: Lisansı Görüntüle
-  Licensed under the AGPLv3: AGPLv3 altında lisanslanmıştır
   Source code: Kaynak kodları
   Discussions: Tartışmalar
   Licensed under the: 'Lisans:'
@@ -791,7 +733,7 @@ Profile:
     silmez.'
 #On Channel Page
   Profile Filter: Profil Filtresi
-  Profile Settings: Profil Ayarları
+  Profile Settings: Profil
   Toggle Profile List: Profil Listesini Aç/Kapat
   Profile Name: Profil Adı
   Edit Profile Name: Profil Adını Düzenle
@@ -799,8 +741,6 @@ Profile:
   Open Profile Dropdown: Profil Açılır Menüsünü Aç
   Close Profile Dropdown: Profil Açılır Menüsünü Kapat
 Channel:
-  Subscriber: 'Abone'
-  Subscribers: 'Abone'
   Subscribe: 'Abone ol'
   Unsubscribe: 'Abonelikten çık'
   Channel has been removed from your subscriptions: 'Kanal aboneliklerinizden kaldırıldı'
@@ -867,9 +807,12 @@ Channel:
     This channel does not currently have any releases: Bu kanalda şu anda herhangi
       bir yayın yok
     Releases: Yayınlar
+  Home:
+    Home: Ana Sayfa
+    View Playlist: Oynatma Listesini Gözat
 Video:
   Mark As Watched: 'İzlendi Olarak İşaretle'
-  Remove From History: 'Geçmişden Kaldır'
+  Remove From History: 'Geçmişten Kaldır'
   Video has been marked as watched: 'Video izlendi olarak işaretlendi'
   Video has been removed from your history: 'Video geçmişinizden kaldırıldı'
   Open in YouTube: 'YouTube''da aç'
@@ -902,38 +845,8 @@ Video:
     Sohbet şu anda Invidious API ile desteklenmemektedir. YouTube ile doğrudan bağlantı
     gerekli.'
   Published:
-    Jan: 'Oca'
-    Feb: 'Şub'
-    Mar: 'Mar'
-    Apr: 'Nis'
-    May: 'May'
-    Jun: 'Haz'
-    Jul: 'Tem'
-    Aug: 'Ağu'
-    Sep: 'Eyl'
-    Oct: 'Eki'
-    Nov: 'Kas'
-    Dec: 'Ara'
-    Second: 'Saniye'
-    Seconds: 'Saniye'
-    Minute: 'Dakika'
-    Minutes: 'Dakika'
-    Hour: 'Saat'
-    Hours: 'Saat'
-    Day: 'Gün'
-    Days: 'Gün'
-    Week: 'Hafta'
-    Weeks: 'Hafta'
-    Month: 'Ay'
-    Months: 'Ay'
-    Year: 'Yıl'
-    Years: 'Yıl'
-    Ago: 'Önce'
-    Upcoming: 'İlk gösterim tarihi'
-    Less than a minute: Bir dakikadan az
     In less than a minute: Bir dakikadan kısa sürede
   Published on: 'Yayımlanma tarihi'
-  Publicationtemplate: '{number} {unit} önce'
 #& Videos
   audio only: yalnızca ses
   video only: yalnızca video
@@ -1014,6 +927,17 @@ Video:
     Playback will resume automatically when your connection comes back: Bağlantınız
       geri geldiğinde oynatma otomatik olarak devam edecektir.
     Skipped segment: '{segmentCategory} bölümü atlandı'
+  IP block: YouTube, IP adresinizin video izlemesini engelledi. Lütfen farklı bir
+    VPN veya vekil sunucuya geçmeyi deneyin.
+  Unlisted: Listelenmemiş
+  AgeRestricted: Yaş sınırlamalı videolar, Google hesabına giriş ve yaş doğrulaması
+    yapılmış bir YouTube hesabının kullanımını gerektirdiği için FreeTube üzerinden
+    izlenemez.
+  MembersOnly: Yalnızca üyelere özel videolar, Google girişi ve yükleyicinin kanalına
+    ücretli üyelik gerektirdiğinden FreeTube ile izlenemez.
+  DeArrow:
+    Show Original Details: Düzenlenmemiş Detayları Göster
+    Show Modified Details: Düzenlenmiş Detayları Göster
 Videos:
   #& Sort By
   Sort By:
@@ -1024,9 +948,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Tüm oynatma listesini görüntüle'
-  Videos: 'Videolar'
-  View: 'Görüntüle'
-  Views: 'İzlenme'
   Last Updated On: 'Son güncelleme tarihi'
 
 # On Video Watch Page
@@ -1042,7 +963,8 @@ Playlist:
     Sort By: Sıralama ölçütü
     DateAddedOldest: İlk eklenen önce
     Custom: Özel
-Toggle Theatre Mode: 'Tiyatro Modunu Aç/Kapat'
+    VideoDurationAscending: Süre (Önce en kısa)
+    VideoDurationDescending: Süre (Önce en uzun)
 Change Format:
   Change Media Formats: 'Medya Biçimlerini Değiştir'
   Use Dash Formats: 'DASH Biçimlerini Kullan'
@@ -1107,7 +1029,6 @@ Local API Error (Click to copy): 'Yerel API Hatası (Kopyalamak için tıklayın
 Invidious API Error (Click to copy): 'Invidious API Hatası (Kopyalamak için tıklayın)'
 Falling back to Invidious API: 'Invidious API''ye geri dönülüyor'
 Falling back to Local API: 'Yerel API''ye geri dönülüyor'
-Subscriptions have not yet been implemented: 'Abonelikler henüz uygulanmadı'
 Loop is now disabled: 'Döngü artık devre dışı'
 Loop is now enabled: 'Döngü artık etkin'
 Shuffle is now disabled: 'Karıştır artık devre dışı'
@@ -1161,9 +1082,12 @@ Tooltips:
     External Link Handling: "FreeTube'da açılamayan bir bağlantı tıklandığında öntanımlı
       davranışı seçin.\nÖntanımlı olarak FreeTube, tıklanan bağlantıyı öntanımlı tarayıcınızda
       açacaktır.\n"
+    Open Deep Links In New Window: Yeniden yönlendirilmiş tarayıcı eklentileri veya
+      komut satırı bağımsız değişkenleri gibi FreeTube'a yönlendirilen URL'ler, yeni
+      pencerede açılırlar.
   External Player Settings:
-    Custom External Player Arguments: Harici oynatıcıya iletmek isteyeceğiniz, noktalı
-      virgülle (';') ayrılmış özel komut satırı argümanları.
+    Custom External Player Arguments: Harici oynatıcıya iletmek isteyeceğiniz, herhangi
+      özel komut satırı argümanları.
     Ignore Warnings: Geçerli harici oynatıcının geçerli eylemi desteklemediği durumlar
       için uyarıları bastır (örn. çalma listelerini ters çevirme vb.).
     Custom External Player Executable: Öntanımlı olarak FreeTube, seçilen harici oynatıcının
@@ -1203,8 +1127,6 @@ Playing Next Video Interval: Sonraki video hemen oynatılıyor. İptal etmek iç
   tıklayın. | Sonraki video {nextVideoInterval} saniye içinde oynatılıyor. İptal etmek
   için tıklayın.
 More: Daha Fazla
-Hashtags have not yet been implemented, try again later: Hashtag'ler henüz uygulanmadı,
-  daha sonra tekrar deneyin
 Unknown YouTube url type, cannot be opened in app: Bilinmeyen YouTube URL türü, uygulamada
   açılamıyor
 Open New Window: Yeni Pencere Aç
@@ -1232,8 +1154,6 @@ Channels:
   Title: Kanal Listesi
   Search bar placeholder: Kanalları Ara
   Count: '{number} kanal bulundu.'
-  Unsubscribe: Abonelikten çık
-  Unsubscribed: '{channelName} aboneliklerinizden kaldırıldı'
   Unsubscribe Prompt: '"{channelName}" aboneliğinden çıkmak istediğinizden emin misiniz?'
 Clipboard:
   Copy failed: Panoya kopyalanamadı
@@ -1245,6 +1165,7 @@ Chapters:
     geçerli bölüm: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Bölüm listesi gizli, geçerli
     bölüm: {chapterName}'
+  Key Moments: Kilit Anlar
 Preferences: Tercihler
 Ok: Tamam
 Hashtag:
@@ -1282,5 +1203,26 @@ Search Listing:
     Closed Captions: Kapalı Alt Yazılar
     4K: 4K
     Subtitles: Alt Yazılar
+    VR180: VR180
+    360 Video: 360°
+    New: Yeni
+    3D: 3B
+    8K: 8K
 'Blocked opening potentially unsafe URL': "Güvenli olmayabilir URL'nin açılması engellendi:
   \"{url}\"."
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Keys:
+  arrowdown: Aşağı Ok
+  arrowleft: Sol Ok
+  arrowup: Yukarı Ok
+  ctrl: Ctrl
+  arrowright: Sağ Ok
+  alt: Alt
+shortcutJoinOperator: +
+Right-click or hold to see history: Geçmişi görmek için sağ tıklayın ya da basılı
+  tutun
+Description:
+  Expand Description: '...devamı'
+  Collapse Description: Daha az göster
+Autoplay Interruption Timer: Otomatik oynatma, {autoplayInterruptionIntervalHours}
+  saattir aktif olmadığı için iptal edildi
diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index 1c394b2f79706..e004ced8335e0 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -42,6 +42,8 @@ Global:
     Subscriber Count: 1 підписник | {count} підписників
     View Count: 1 перегляд | {count} переглядів
     Watching Count: 1 глядач | {count} глядачів
+    Like Count: 1 вподобання | {count} вподобань
+    Comment Count: 1 коментар | {count} коментарів
   Input Tags:
     Length Requirement: Тег повинен мати довжину не менше {number} символів
 Version {versionNumber} is now available!  Click for more details: 'Доступна нова
@@ -88,6 +90,18 @@ Search Filters:
   Fetch more results: 'Завантажити більше результатів'
 # Sidebar
   There are no more results for this search: Більше результатів для цього пошуку немає
+  Features:
+    Features: Функції
+    HD: HD
+    Subtitles: Субтитри
+    Live: Наживо
+    4K: 4K
+    360 Video: 360 Відео
+    Location: Розташування
+    HDR: HDR
+    VR180: VR180
+    3D: 3D
+    Creative Commons: Творчі Спільноти
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Підписки'
@@ -96,7 +110,9 @@ Subscriptions:
     профіль має велику кількість підписок. Використайте RSS щоб уникнути обмеження
     швидкості'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваш
-    список Підписок на разі пустий. Почніть додавати підписки щоб побачити їх тут.'
+    список підписок наразі порожній. Якщо ви хочете імпортувати свої підписки, перейдіть
+    до налаштувань даних і виберіть "Імпортувати підписки", або ви можете знайти канал
+    і підписатися на нього.'
   'Getting Subscriptions. Please wait.': 'Отримання Підписок. Будь ласка, зачекайте.'
   Refresh Subscriptions: 'Оновити Підписки'
   Load More Videos: 'Завантажити більше відео'
@@ -117,16 +133,10 @@ Trending:
   Music: Музика
   Default: Типово
 Most Popular: 'Найпопулярніші'
-Playlists: 'Списки відтворення'
+Playlists: 'Добірки'
 User Playlists:
-  Your Playlists: 'Ваші списки відтворення'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Збережені
-    відео порожні. Клацніть на кнопку збереження у куті відео, щоб воно було перелічено
-    тут
-  Playlist Message: Ця сторінка не показує повністю робочих списків відтворення. На
-    ній перелічено лише відео, які ви зберегли або вибрали. Коли робота завершиться,
-    усі відео, які зараз знаходяться тут, буде переміщено до списку відтворення "Вибране".
-  Search bar placeholder: Шукати у добірці
+  Your Playlists: 'Ваші добірки'
+  Search bar placeholder: Шукати добірки
   Empty Search Message: Немає відео в цій добірці, які відповідають вашому запиту
   Create New Playlist: Створити новий список відтворення
   Add to Playlist: Додати список відтворення
@@ -147,13 +157,109 @@ User Playlists:
   Playlist Name: Назва списку відтворення
   Edit Playlist Info: Змінити інформацію списку відтворення
   Remove Watched Videos: Вилучити з переглянутих відео
+  Delete Playlist: Видалити добірку
+  Sort By:
+    Sort By: Сортувати за
+    LatestPlayedFirst: Нещодавно переглянуті
+    EarliestPlayedFirst: Найдавніше переглянуті
+    NameAscending: А-Я
+    LatestCreatedFirst: Нещодавно створено
+    EarliestCreatedFirst: Створено найраніше
+    NameDescending: Я-А
+    EarliestUpdatedFirst: Найстаріші оновлення
+    LatestUpdatedFirst: Останні оновлення
+  SinglePlaylistView:
+    Toast:
+      This playlist is now used for quick bookmark: Ця добірка тепер використовується
+        для швидких закладок
+      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Ця
+        добірка тепер використовується для швидких закладок замість {oldPlaylistName}.
+        Натисніть тут, щоб скасувати
+      This video cannot be moved up.: Це відео не можна перемістити вгору.
+      This video cannot be moved down.: Це відео не можна перемістити вниз.
+      Video has been removed: Відео було видалено
+      This playlist is already being used for quick bookmark.: Ця добірка вже використовується
+        для швидких закладок.
+      There was a problem with removing this video: Сталася помилка під час видалення
+        цього відео
+      Reverted to use {oldPlaylistName} for quick bookmark: Повернуто до використання
+        {oldPlaylistName} для швидких закладок
+      This playlist is protected and cannot be removed.: Цю добірку захищено, тому
+        її не можна видалити.
+      "{videoCount} video(s) have been removed": 1 відео було видалено | {videoCount}
+        відео було видалено
+      Playlist {playlistName} has been deleted.: Добірку {playlistName} було видалено.
+      This playlist does not exist: Ця добірка не існує
+      This playlist has a video with a duration error: Ця добірка містить принаймні
+        одне відео, яке не має тривалості, тому воно буде відсортоване так, ніби його
+        тривалість дорівнює нулю.
+      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Деякі
+        відео в добірці ще не завантажено. Натисніть тут, щоб все одно скопіювати.
+      Playlist name cannot be empty. Please input a name.: Назва добірки не може бути
+        порожньою. Будь ласка, введіть назву.
+      Playlist has been updated.: Добірка була оновлена.
+      There was an issue with updating this playlist.: Сталася помилка при оновленні
+        цієї добірки.
+      There were no videos to remove.: Відео для видалення не знайдено.
+      Playlist {playlistName} is the new quick bookmark playlist.: Добірка {playlistName}
+        тепер є новою швидкою закладкою.
+    Search for Videos: Пошук відео
+  The playlist has been successfully exported: Добірку успішно експортовано
+  Export Playlist: Експортувати цю добірку
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Ви
+    впевнені, що хочете видалити 1 переглянуте відео з цієї добірки? Цю дію не можна
+    скасувати. | Ви впевнені, що хочете видалити {playlistItemCount} переглянутих
+    відео з цієї добірки? Цю дію не можна скасувати.
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Ви
+    впевнені, що хочете видалити 1 дубльоване відео з цієї добірки? Цю дію не можна
+    скасувати. | Ви впевнені, що хочете видалити {playlistItemCount} дубльованих відео
+    з цієї добірки? Цю дію не можна скасувати.
+  Are you sure you want to delete this playlist? This cannot be undone: Ви впевнені,
+    що хочете видалити цю добірку? Це неможливо скасувати.
+  Enable Quick Bookmark With This Playlist: Увімкнути швидке додавання в закладки
+    для цієї добірки
+  Quick Bookmark Enabled: Швидке додавання в закладки увімкнено
+  Cannot delete the quick bookmark target playlist.: Неможливо видалити добірку швидких
+    закладок.
+  Playlists with Matching Videos: Добірки з відповідними відео
+  Remove Duplicate Videos: Видалити дублікати відео
+  AddVideoPrompt:
+    Save: Зберегти
+    Search in Playlists: Пошук в добірках
+    Allow Adding Duplicate Video(s): Дозволити додавати дублікатів відео
+    Added {count} Times: Вже додано | Додано {count} разів
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
+      Відео буде додано'
+    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
+      Відео вже додано'
+    Toast:
+      "{videoCount} video(s) added to 1 playlist": 1 відео додано до 1 добірки | {videoCount}
+        відео додано до 1 добірки
+      "{videoCount} video(s) added to {playlistCount} playlists": 1 відео додано до
+        {playlistCount} добірок | {videoCount} відео додано до {playlistCount} добірок
+      You haven't selected any playlist yet.: Ви ще не вибрали жодної добірки.
+    N playlists selected: '{playlistCount} вибрано'
+    Select a playlist to add your N videos to: Виберіть добірку, до якої ви хочете
+      додати своє відео | Виберіть добірку, до якої ви хочете додати свої {videoCount}
+      відео
+  CreatePlaylistPrompt:
+    Create: Створити
+    Toast:
+      Playlist {playlistName} has been successfully created.: Добірку {playlistName}
+        успішно створено.
+      There was an issue with creating the playlist.: Сталася помилка під час створення
+        добірки.
+      There is already a playlist with this name. Please pick a different name.: Вже
+        існує добірка з такою назвою. Будь ласка, виберіть іншу назву.
+    New Playlist Name: Нова назва добірки
 History:
   # On History Page
   History: 'Історія'
   Watch History: 'Історія переглядів'
   Your history list is currently empty.: 'Ваша історія переглядів на разі порожня.'
   Search bar placeholder: Шукати в історії
-  Empty Search Message: Немає відео в історії, які відповідають вашому запиту
+  Empty Search Message: У вашій історії немає відео, що відповідають вашому пошуку
+  Case Sensitive Search: Пошук з урахуванням регістру
 Settings:
   # On Settings Page
   Settings: 'Налаштування'
@@ -161,7 +267,7 @@ Settings:
     зміни набули чинності, необхідно перезавантижити застосунок. Перезавантажити та
     застосувати зміни?'
   General Settings:
-    General Settings: 'Загальні налаштування'
+    General Settings: 'Загальні'
     Check for Updates: 'Перевірити наявність оновлень'
     Check for Latest Blog Posts: 'Перевірити останні повідомлення в блозі'
     Fallback to Non-Preferred Backend on Failure: 'Коли у вашого головного API виникає
@@ -186,8 +292,6 @@ Settings:
       End: 'У кінці'
       Hidden: Сховано
       Blur: Розмиття
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Екземпляр Invidious
-      (За замовчуванням https://invidious.snopyta.org)'
     Region for Trending: 'Регіон для Популярних'
         #! List countries
     View all Invidious instance information: Перегляд усіх відомостей про екземпляр
@@ -206,8 +310,13 @@ Settings:
       Ask Before Opening Link: Запитувати, перш ніж відкрити посилання
       Open Link: Відкрити посилання
       External Link Handling: Обробка зовнішніх посилань
+    Auto Load Next Page:
+      Label: Автозавантаження наступної сторінки
+      Tooltip: Автоматично завантажувати додаткові сторінки та коментарі.
+    Open Deep Links In New Window: Відкривати URL-адреси, передані в FreeTube, в новому
+      вікні
   Theme Settings:
-    Theme Settings: 'Налаштування теми'
+    Theme Settings: 'Теми'
     Match Top Bar with Main Color: 'Верхня панель основного кольору'
     Expand Side Bar by Default: 'Усталено розгортати бічну панель'
     Disable Smooth Scrolling: 'Відключити плавну прокрутку'
@@ -222,6 +331,11 @@ Settings:
       Catppuccin Mocha: Catppuccin Mocha
       Hot Pink: Гарячий рожевий
       Pastel Pink: Пастельний рожевий
+      Gruvbox Dark: Gruvbox Темний
+      Solarized Light: Solarized Світлий
+      Nordic: Нордичний
+      Gruvbox Light: Gruvbox Світлий
+      Solarized Dark: Solarized Темна
     Main Color Theme:
       Main Color Theme: 'Основна кольорова тема'
       Red: 'Червона'
@@ -261,12 +375,30 @@ Settings:
       Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo
       Catppuccin Mocha Yellow: Catppuccin Mocha Yellow
       Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater
+      Gruvbox Dark Purple: Gruvbox Темно Фіолетовий
+      Gruvbox Light Blue: Gruvbox Світло Голубий
+      Solarized Cyan: Solarized Голубий
+      Solarized Green: Solarized Зелений
+      Gruvbox Light Orange: Gruvbox Світло Оранжевий
+      Solarized Yellow: Solarized Жовтий
+      Gruvbox Dark Green: Gruvbox Темно Зелений
+      Gruvbox Dark Blue: Gruvbox Темно Синій
+      Gruvbox Dark Aqua: Gruvbox Темна Аква
+      Gruvbox Dark Orange: Gruvbox Темно Оранжевий
+      Gruvbox Light Red: Gruvbox Світло Червоний
+      Gruvbox Light Purple: Gruvbox Світло Фіолетовий
+      Solarized Magenta: Solarized Пурпурний
+      Solarized Violet: Solarized Фіолетовий
+      Solarized Orange: Solarized Оранжевий
+      Solarized Red: Solarized Червоний
+      Gruvbox Dark Yellow: Gruvbox Темно Жовтий
+      Solarized Blue: Solarized Голубий
     Secondary Color Theme: 'Другорядна кольорова тема'
         #* Main Color Theme
     Hide Side Bar Labels: Сховати мітки бічної панелі
     Hide FreeTube Header Logo: Сховати логотип FreeTube із заголовка
   Player Settings:
-    Player Settings: 'Налаштування програвача'
+    Player Settings: 'Плеєр'
     Play Next Video: 'Грати наступне відео'
     Turn on Subtitles by Default: 'Увімкнути субтитри за замовченням'
     Autoplay Videos: 'Автоматичне відтворення відео'
@@ -293,7 +425,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Інтервал відтворення наступного відео
-    Next Video Interval: Інтервал до наступного відео
+    Next Video Interval: Таймер автозапуску
     Scroll Volume Over Video Player: Прокручування гучності на відеопрогравачі
     Display Play Button In Video Player: Показувати кнопку відтворення у відеопрогравачі
     Fast-Forward / Rewind Interval: Інтервал перемотування вперед/назад
@@ -320,8 +452,9 @@ Settings:
     Enter Fullscreen on Display Rotate: Переходити в повноекранний режим за обертання
       екрана
     Skip by Scrolling Over Video Player: Пропустити гортанням відеопрогравача
+    Autoplay Interruption Timer: Таймер переривання автозапуску
   Privacy Settings:
-    Privacy Settings: 'Налаштування приватності'
+    Privacy Settings: 'Конфіденційність'
     Remember History: 'Збрігати історію'
     Save Watched Progress: 'Зберігати прогрес перегляду'
     Clear Search Cache: 'Очистити пошуковий кеш'
@@ -337,16 +470,21 @@ Settings:
       хочете вилучити всі підписки та профілі? Цю дію не можна скасувати.'
     Save Watched Videos With Last Viewed Playlist: Зберегти переглянуті відео у список
       відтворення, який ви переглядали останнім часом
+    All playlists have been removed: Усі добірки були видалені
+    Remove All Playlists: Видалити всі добірки
+    Are you sure you want to remove all your playlists?: Ви впевнені, що хочете видалити
+      всі свої добірки?
   Subscription Settings:
-    Subscription Settings: 'Налаштування підписки'
+    Subscription Settings: 'Підписка'
     Hide Videos on Watch: 'Ховати відео при перегляді'
     Fetch Feeds from RSS: 'Отримати канали з RSS'
-    Manage Subscriptions: 'Керування підписками'
     Fetch Automatically: Автоматично отримувати стрічку
-    Only Show Latest Video for Each Channel: Показувати лише останні відео для кожного
-      каналу
+    Confirm Before Unsubscribing: Підтвердити перед скасуванням підписки
+    'Limit the number of videos displayed for each channel': Обмежити кількість відео,
+      що відображаються для кожного каналу
+    To: До
   Distraction Free Settings:
-    Distraction Free Settings: 'Налаштування зосередження'
+    Distraction Free Settings: 'Без відволікань'
     Hide Video Views: 'Сховати перегляди відео'
     Hide Video Likes And Dislikes: 'Приховати вподобайки до відео'
     Hide Channel Subscribers: 'Не показувати підписників каналу'
@@ -356,7 +494,7 @@ Settings:
     Hide Popular Videos: 'Не показувати популярні відео'
     Hide Live Chat: 'Не показувати живий чат'
     Hide Active Subscriptions: Сховати активні підписки
-    Hide Playlists: Сховати списки відтворення
+    Hide Playlists: Сховати добірки
     Hide Video Description: Сховати опис відео
     Hide Comments: Сховати коментарі
     Hide Sharing Actions: Сховати дії поширення
@@ -365,12 +503,12 @@ Settings:
     Hide Upcoming Premieres: Сховати майбутні прем'єри
     Hide Channels: Сховати відео з каналів
     Hide Channels Placeholder: ID каналу
-    Display Titles Without Excessive Capitalisation: Показувати заголовки без надмірно
-      великих літер
+    Display Titles Without Excessive Capitalisation: Відображати заголовки без зайвої
+      капіталізації та пунктуації
     Hide Featured Channels: Сховати пропоновані канали
-    Hide Channel Playlists: Сховати списки відтворення каналу
-    Hide Channel Community: Сховати спільноту каналу
-    Hide Channel Shorts: Сховати Shorts каналу
+    Hide Channel Playlists: Сховати добірки каналу
+    Hide Channel Community: Сховати вкладку "Спільнота" каналу
+    Hide Channel Shorts: Сховати вкладку "Shorts" каналу
     Sections:
       Side Bar: Бічна панель
       Channel Page: Сторінка каналу
@@ -378,12 +516,11 @@ Settings:
       General: Загальні
       Subscriptions Page: Сторінка підписок
     Hide Subscriptions Videos: Сховати відео з підписок
-    Hide Channel Podcasts: Сховати канали подкастів
-    Hide Channel Releases: Сховати канали випусків
+    Hide Channel Podcasts: Сховати вкладку "Подкасти" каналу
+    Hide Channel Releases: Сховати вкладку "Випуски" каналу
     Hide Subscriptions Shorts: Сховати Shorts із підписок
     Hide Subscriptions Live: Сховати трансляції з підписок
     Hide Profile Pictures in Comments: Сховати зображення профілю в коментарях
-    Blur Thumbnails: Розмиті мініатюри
     Hide Subscriptions Community: Сховати спільноту підписників
     Hide Channels Invalid: Вказаний ID каналу недійсний
     Hide Channels Disabled Message: Деякі канали були заблоковані за допомогою ID
@@ -391,15 +528,17 @@ Settings:
     Hide Channels Already Exists: ID каналу вже існує
     Hide Channels API Error: Помилка під час пошуку користувача з наданим ID. Перевірте
       ще раз, чи правильний ID.
+    Hide Channel Home: Сховати вкладку "Головна" каналу
+    Hide Videos and Playlists Containing Text Placeholder: Слово, фрагмент слова або
+      фраза
+    Hide Videos and Playlists Containing Text: Сховати відео та добірки, що містять
+      текст
+    Show Added Items: Показати додані елементи
   Data Settings:
-    Data Settings: 'Налаштування даних'
+    Data Settings: 'Дані'
     Select Import Type: 'Оберіть тип імпорту'
     Select Export Type: 'Оберіть тип експорту'
     Import Subscriptions: 'Імпортувати підписки'
-    Import FreeTube: 'Імпортувати FreeTube'
-    Import YouTube: 'Імпортувати YouTube'
-    Import NewPipe: 'Імпортувати NewPipe'
-    Check for Legacy Subscriptions: 'Перевірка наявності застарілих підписок'
     Export Subscriptions: 'Експортувати підписки'
     Export FreeTube: 'Експортувати FreeTube'
     Export YouTube: 'Експортувати YouTube'
@@ -428,14 +567,21 @@ Settings:
     Manage Subscriptions: Керування підписками
     Playlist insufficient data: Недостатньо даних для списку відтворення "{playlist}",
       пропуск елемента
-    All playlists has been successfully exported: Усі списки відтворення успішно експортовано
+    All playlists has been successfully exported: Усі добірки успішно експортовано
     Import Playlists: Імпорт добірок
     Export Playlists: Експорт добірок
-    All playlists has been successfully imported: Усі списки відтворення успішно імпортовано
+    All playlists has been successfully imported: Усі добірки успішно імпортовано
     Playlist File: Файл списку відтворення
     Subscription File: Файл підписки
     History File: Файл історії
-  Advanced Settings: {}
+    Export Playlists For Older FreeTube Versions:
+      Label: Експортувати добірки для старих версій FreeTube
+      Tooltip: "Ця опція експортує відео з усіх добірок в одну добірку під назвою
+        \"Улюблені\".\nЯк експортувати та імпортувати відео з добірок для старої версії
+        FreeTube:\n1. Експортуйте свої добірки з увімкненою цією опцією.\n2. Видаліть
+        усі свої наявні добірки за допомогою опції \"Видалити всі добірки\" в налаштуваннях
+        конфіденційності.\n3. Запустіть стару версію FreeTube та імпортуйте експортовані
+        добірки."
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: Помилка
       отримання відомостей про мережу. Чи правильно налаштовано ваш проксі?
@@ -451,13 +597,18 @@ Settings:
     Proxy Host: Проксі-вузол
     Proxy Protocol: Проксі-протокол
     Enable Tor / Proxy: Увімкнути Tor / Проксі
-    Proxy Settings: Налаштування проксі
+    Proxy Settings: Проксі
+    Proxy Warning: FreeTube не має вбудованого проксі, але може підключатися до зовнішнього
+      проксі, такого як Tor, що працює на вашому комп'ютері, або зовнішній проксі,
+      наприклад, SOCKS5 проксі, який надають деякі VPN-сервіси. Якщо ця опція увімкнена,
+      переконайтеся, що ваш проксі/Tor налаштовані правильно, інакше FreeTube не зможе
+      завантажувати дані.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Сповіщати про пропуск спонсорованого відтинка
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL-адреса API SponsorBlock
       (типово https://sponsor.ajay.app)
     Enable SponsorBlock: Увімкнути SponsorBlock
-    SponsorBlock Settings: Налаштування SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: Опція пропуску
       Auto Skip: Автопропуск
@@ -466,31 +617,35 @@ Settings:
       Do Nothing: Нічого не робити
     Category Color: Колір категорії
     UseDeArrowTitles: Використовувати назви для відео DeArrow
+    UseDeArrowThumbnails: Використовувати DeArrow для ескізів
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': 'URL
+      API генератора ескізів DeArrow (за замовчуванням: https://dearrow-thumb.ajay.app)'
   External Player Settings:
     Custom External Player Arguments: Власні аргументи зовнішнього програвача
     Custom External Player Executable: Власний виконуваний зовнішній програвач
     Ignore Unsupported Action Warnings: Нехтувати попередженнями про непідтримувані
       дії
     External Player: Зовнішній програвач
-    External Player Settings: Параметри зовнішнього програвача
+    External Player Settings: Зовнішній плеєр
     Players:
       None:
         Name: Немає
+    Ignore Default Arguments: Ігнорувати стандартні аргументи
   Download Settings:
-    Download Settings: Налаштування завантаження
+    Download Settings: Завантаження
     Choose Path: Вибрати шлях
     Ask Download Path: Запитувати шлях завантаження
     Download Behavior: Поведінка завантаження
     Download in app: Завантажити в застосунку
     Open in web browser: Відкрити у переглядачі
   Parental Control Settings:
-    Parental Control Settings: Налаштування батьківського контролю
+    Parental Control Settings: Батьківський контроль
     Hide Unsubscribe Button: Сховати кнопку скасування підписки
     Show Family Friendly Only: Показати лише для сімейного перегляду
     Hide Search Bar: Сховати панель пошуку
   Experimental Settings:
     Replace HTTP Cache: Заміна кешу HTTP
-    Experimental Settings: Експериментальні налаштування
+    Experimental Settings: Експериментальні
     Warning: Ці налаштування експериментальні, їхнє ввімкнення може призводити до
       збоїв. Радимо робити резервні копії. Використовуйте на свій страх і ризик!
   Password Dialog:
@@ -499,14 +654,15 @@ Settings:
     Password Incorrect: Пароль неправильний
     Password: Пароль
   Password Settings:
-    Password Settings: Налаштування пароля
+    Password Settings: Пароль
     Set Password: Установити пароль
     Remove Password: Вилучити пароль
     Set Password To Prevent Access: Встановіть пароль, щоб запобігти доступу до налаштувань
-  Expand All Settings Sections: Розгорнути всі розділи налаштувань
+  Return to Settings Menu: Повернутися до налаштувань
+  Sort Settings Sections (A-Z): Сортувати розділи налаштувань (А-Я)
 About:
   #On About page
-  About: 'Про'
+  About: 'Про додаток'
   #& About
   Donate: Підтримати
   these people and projects: цим людям та проєктам
@@ -529,11 +685,11 @@ About:
   Help: Довідка
   GitHub releases: Випуски GitHub
   Downloads / Changelog: Завантаження / Журнал змін
-  View License: Переглянути ліцензію
-  Licensed under the AGPLv3: Ліцензовано під AGPLv3
   Source code: Джерельний код
   Beta: Бета
   Discussions: Обговорення
+  Licensed under the: Ліцензовано за умовами
+  AGPLv3: AGPLv3
 Profile:
   Profile Select: 'Вибір профілю'
   All Channels: 'Усі канали'
@@ -574,7 +730,7 @@ Profile:
     бажаєте видалити вибрані канали?  Канал не буде видалено з будь-якого іншого профілю.'
 #On Channel Page
   Profile Filter: Фільтр профілю
-  Profile Settings: Налаштування профілю
+  Profile Settings: Профіль
   Toggle Profile List: Перемкнути список профілів
   Profile Name: Назва профілю
   Edit Profile Name: Змінити назву профілю
@@ -582,8 +738,6 @@ Profile:
   Open Profile Dropdown: Відкрити спадне меню профілю
   Close Profile Dropdown: Закрити спадне меню профілю
 Channel:
-  Subscriber: 'Підписник'
-  Subscribers: 'Підписники'
   Subscribe: 'Підписатися'
   Unsubscribe: 'Відписатися'
   Channel has been removed from your subscriptions: 'Канал прибрано з ваших підписок'
@@ -602,14 +756,14 @@ Channel:
       Oldest: 'Найдавніші'
       Most Popular: 'Найпопулярніші'
   Playlists:
-    Playlists: 'Списки відтворення'
+    Playlists: 'Добірки'
     This channel does not currently have any playlists: 'Цей канал наразі не має добірок'
     Sort Types:
       Last Video Added: 'Останнє додане відео'
       Newest: 'Найновіші'
       Oldest: 'Найдавніші'
   About:
-    About: 'Про'
+    About: 'Про канал'
     Channel Description: 'Опис каналу'
     Featured Channels: 'Рекомендовані канали'
     Tags:
@@ -628,6 +782,11 @@ Channel:
     votes: 'Голосів: {votes}'
     Reveal Answers: Розгорнути відповіді
     Hide Answers: Сховати відповіді
+    Video hidden by FreeTube: Відео приховане FreeTube
+    View Full Post: Переглянути повний пост
+    Viewing Posts Only Supported By Invidious: Перегляд постів підтримується лише
+      через Invidious. Перейдіть до вкладки спільноти каналу, щоб переглядати контент
+      без Invidious.
   Live:
     This channel does not currently have any live streams: Наразі на цьому каналі
       немає прямих трансляцій
@@ -642,6 +801,9 @@ Channel:
     This channel does not currently have any releases: Наразі на цьому каналі немає
       випусків
     Releases: Випуски
+  Home:
+    Home: Головна
+    View Playlist: Переглянути добірку
 Video:
   Mark As Watched: 'Позначити переглянутим'
   Remove From History: 'Прибрати з історії'
@@ -685,38 +847,8 @@ Video:
   video only: 'лише відео'
   audio only: 'лише звук'
   Published:
-    Jan: 'Ян'
-    Feb: 'Лют'
-    Mar: 'Бер'
-    Apr: 'Кві'
-    May: 'Тра'
-    Jun: 'Чер'
-    Jul: 'Лип'
-    Aug: 'Сер'
-    Sep: 'Вер'
-    Oct: 'Жов'
-    Nov: 'Лис'
-    Dec: 'Гру'
-    Second: 'Секунда'
-    Seconds: 'Секунд'
-    Minute: 'Хвилина'
-    Minutes: 'Хвилин'
-    Hour: 'Година'
-    Hours: 'Годин'
-    Day: 'День'
-    Days: 'Днів'
-    Week: 'Тиждень'
-    Weeks: 'Тижнів'
-    Month: 'Місяць'
-    Months: 'Місяців'
-    Year: 'Рік'
-    Years: 'Років'
-    Ago: 'Тому'
-    Upcoming: 'Прем''єри'
-    Less than a minute: Менш як за хвилину
     In less than a minute: Менше ніж за хвилину
   Published on: 'Опубліковано'
-  Publicationtemplate: '{number} {unit} тому'
 #& Videos
   Started streaming on: Почато трансляцію
   Streamed on: Потокове передавання
@@ -758,6 +890,48 @@ Video:
   Pause on Current Video: Призупинити на поточному відео
   Unhide Channel: Показати канал
   Hide Channel: Сховати канал
+  Player:
+    TranslatedCaptionTemplate: '{language} (перекладено з "{originalLanguage}")'
+    Stats:
+      Bandwidth: 'Пропускна здатність: {bandwidth} кбіт/с'
+      CodecsVideoAudio: 'Кодеки: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
+      Bitrate: 'Бітрейт: {bitrate} кбіт/с'
+      Volume: 'Гучність: {volumePercentage}%'
+      Buffered: 'Буферизація: {bufferedPercentage}%'
+      Dropped Frames / Total Frames: 'Втрачені кадри: {droppedFrames} / Загальні кадри:
+        {totalFrames}'
+      Player Dimensions: 'Розміри плеєра: {width}x{height}'
+      CodecAudio: 'Кодек: {audioCodec} ({audioItag})'
+      Stats: Статистика
+      Video ID: 'ID відео: {videoId}'
+      Media Formats: 'Медійні формати: {formats}'
+      Resolution: 'Роздільна здатність: {width}x{height}@{frameRate}'
+      CodecsVideoAudioNoItags: 'Кодеки: {videoCodec} / {audioCodec}'
+    Show Stats: Показати статистику
+    Full Window: Повний екран
+    Take Screenshot: Зробити скріншот
+    You appear to be offline: Виглядає, що ви не в мережі.
+    Playback will resume automatically when your connection comes back: Відтворення
+      відновиться автоматично, коли ваше підключення відновиться.
+    Exit Theatre Mode: Вийти з режиму кінотеатру
+    Exit Full Window: Вийти з повного екрану
+    Audio Tracks: Аудіотреки
+    Theatre Mode: Режим кінотеатру
+    Hide Stats: Сховати статистику
+    Skipped segment: Пропущено сегмент {segmentCategory}
+  IP block: YouTube заблокував вашу IP-адресу для перегляду відео. Будь ласка, спробуйте
+    змінити VPN або проксі.
+  Unlisted: Не в списку
+  AgeRestricted: Відео з віковими обмеженнями не можна переглядати за допомогою FreeTube,
+    оскільки вони вимагають входу через Google та використання відео-аккаунту YouTube
+    з підтвердженням віку.
+  More Options: Більше опцій
+  DeArrow:
+    Show Original Details: Показати оригінальні деталі
+    Show Modified Details: Показати змінені деталі
+  MembersOnly: Відео, доступні лише для учасників, не можна переглядати за допомогою
+    FreeTube, оскільки вони вимагають входу через Google та платної підписки на канал
+    завантажувача.
 Videos:
   #& Sort By
   Sort By:
@@ -768,16 +942,23 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Переглянути весь список відтворення'
-  Videos: 'Відео'
-  View: 'Перегляд'
-  Views: 'Переглядів'
   Last Updated On: 'Востаннє оновлено'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Список відтворення
-Toggle Theatre Mode: 'Перемкнути режим театру'
+  Sort By:
+    VideoDurationDescending: Тривалість (спочатку найдовші)
+    Custom: Користувацький
+    VideoTitleDescending: Заголовок (Я-А)
+    VideoTitleAscending: Заголовок (А-Я)
+    DateAddedOldest: Спочатку найстаріші добавлені
+    AuthorAscending: Автор (А-Я)
+    AuthorDescending: Автор (Я-А)
+    VideoDurationAscending: Тривалість (спочатку найкоротші)
+    Sort By: Сортувати за
+    DateAddedNewest: Спочатку новіші добавлені
 Change Format:
   Change Media Formats: 'Зміна форматів відео'
   Use Dash Formats: 'Використовувати формати DASH'
@@ -787,6 +968,8 @@ Change Format:
     відео'
   Audio formats are not available for this video: 'Аудіоформати недоступні для цього
     відео'
+  Legacy formats are not available for this video: Застарілі формати недоступні для
+    цього відео
 Share:
   Share Video: 'Поділитися відео'
   Share Playlist: 'Поділитися списком відтворення'
@@ -835,7 +1018,8 @@ Comments:
   Hearted: З сердечком
   View {replyCount} replies: Переглянути {replyCount} відповідей
   Subscribed: Слідкують
-Up Next: 'Далі вгору'
+  There are no comments available for this post: Коментарі для цього поста відсутні
+Up Next: 'Далі'
 
 #Tooltips
 Tooltips:
@@ -855,6 +1039,9 @@ Tooltips:
     External Link Handling: "Визначте типову поведінку, коли натиснено на посилання,
       яке не можна відкрити у FreeTube.\nТипово FreeTube відкриває натиснуте посилання
       у вашому типовому переглядачі.\n"
+    Open Deep Links In New Window: URL-адреси, передані в FreeTube, наприклад через
+      розширення для браузера або аргументи командного рядка, відкриваються в новому
+      вікні.
   Player Settings:
     Proxy Videos Through Invidious: 'Під’єднається до Invidious, щоб дивитися відео,
       а не встановлювати пряме з’єднання з YouTube.'
@@ -871,17 +1058,17 @@ Tooltips:
     Skip by Scrolling Over Video Player: Використовувати колесо прокрутки для прокручування
       відео в стилі MPV.
   Subscription Settings:
-    Fetch Feeds from RSS: 'Якщо ввімкнено, FreeTube використовуватиме RSS замість
-      стандартного способу захоплення каналу підписки. RSS швидше і запобігає блокуванню
-      ІР, але не надає дані, як-от тривалість відео або стан трансляції'
+    Fetch Feeds from RSS: 'При увімкненні FreeTube буде використовувати RSS замість
+      стандартного методу для отримання підписок. RSS є швидшим і запобігає блокуванню
+      IP-адрес, але не надає певної інформації, такої як тривалість відео, статус
+      в прямому ефірі або пости в спільноті'
 
 # Toast Messages
     Fetch Automatically: Якщо увімкнено, FreeTube автоматично отримуватиме вашу стрічку
       підписок під час відкриття нового вікна та за перемикання профілю.
   External Player Settings:
-    Custom External Player Arguments: Будь-які нетипові аргументи командного рядка
-      розділяються (';') крапкою з комою, ви бажаєте, щоб вас було перенаправлено
-      до зовнішнього програвача.
+    Custom External Player Arguments: Будь-які користувацькі аргументи командного
+      рядка, які ви хочете передати зовнішньому плеєру.
     Ignore Warnings: Заборонити попередження, якщо поточний зовнішній програвач не
       підтримує поточну дію (наприклад, зворотна почерговість відтворення добірок
       тощо).
@@ -892,17 +1079,25 @@ Tooltips:
       відео (список відтворення, якщо підтримується) у зовнішньому програвачі, на
       мініатюрі. Увага, налаштування Invidious не застосовуються до сторонніх програвачів.
     DefaultCustomArgumentsTemplate: "(Типово: '{defaultCustomArguments}')"
+    Ignore Default Arguments: Не надсилати жодних стандартних аргументів зовнішньому
+      плеєру, окрім URL-адреси відео (наприклад, швидкість відтворення, URL-адреса
+      добірки тощо). Користувацькі аргументи все одно будуть передаватися.
   Experimental Settings:
     Replace HTTP Cache: Вимикає дисковий HTTP-кеш Electron і вмикає власний кеш зображень
       у пам'яті. Призведе до збільшення використання оперативної пам'яті.
   Distraction Free Settings:
-    Hide Channels: Введіть ID, щоб сховати всі відео, списки відтворення та сам канал
-      від появи в пошуку, тренді, найпопулярніших і рекомендованих. Введений ID каналу
-      повинен повністю збігатися і чутливий до регістру.
+    Hide Channels: Введіть ID, щоб сховати всі відео, добірки та сам канал від появи
+      в пошуку, тренді, найпопулярніших і рекомендованих. Введений ID каналу повинен
+      повністю збігатися і чутливий до регістру.
     Hide Subscriptions Live: Цей параметр перевизначається загальнодоступним налаштуванням
       "{appWideSetting}" у розділі "{subsection}" "{settingsSection}"
+    Hide Videos and Playlists Containing Text: Введіть слово, фрагмент слова або фразу
+      (незалежно від регістру), щоб приховати всі відео та добірки, у заголовках яких
+      вона міститься, по всьому FreeTube, за винятком Історії, Ваших Добірок і відео
+      в межах добірок.
   SponsorBlock Settings:
     UseDeArrowTitles: Замінити назви відео на надіслані користувачем назви з DeArrow.
+    UseDeArrowThumbnails: Замінити ескізи відео на ескізи з DeArrow.
 Local API Error (Click to copy): 'Помилка локального API (натисніть, щоб скопіювати)'
 Invidious API Error (Click to copy): 'Помилка Invidious API (натисніть, щоб скопіювати)'
 Falling back to Invidious API: 'Повернення до API Invidious'
@@ -910,7 +1105,6 @@ Falling back to Local API: 'Повернення до локального API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Це
   відео недоступне через відсутність форматів. Це може статися через недоступність
   країни.'
-Subscriptions have not yet been implemented: 'Підписки ще не впроваджено'
 Loop is now disabled: 'Цикл вимкнено'
 Loop is now enabled: 'Цикл увімкнено'
 Shuffle is now disabled: 'Випадковий порядок вимкнено'
@@ -929,8 +1123,6 @@ Playing Next Video Interval: Відтворення наступного від
   Клацніть, щоб скасувати. | Відтворення наступного відео через {nextVideoInterval}
   секунд. Клацніть, щоб скасувати.
 More: Докладніше
-Hashtags have not yet been implemented, try again later: Хештеги ще не впроваджені,
-  спробуйте пізніше
 Unknown YouTube url type, cannot be opened in app: Невідомий тип URL-адреси YouTube,
   його не можна відкрити в застосункові
 Open New Window: Відкрити нове вікно
@@ -957,9 +1149,7 @@ Channels:
   Unsubscribe Prompt: Ви впевнені, що хочете відписатися від «{channelName}»?
   Channels: Канали
   Title: Список каналів
-  Unsubscribe: Відписатися
   Search bar placeholder: Пошук каналів
-  Unsubscribed: '{channelName} вилучено з ваших підписок'
 Clipboard:
   Copy failed: Не вдалося скопіювати до буфера обміну
   Cannot access clipboard without a secure connection: Неможливо отримати доступ до
@@ -970,6 +1160,7 @@ Chapters:
     поточний розділ: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Список розділів схований,
     поточний розділ: {chapterName}'
+  Key Moments: Ключові моменти
 Preferences: Налаштування
 Ok: Гаразд
 Hashtag:
@@ -983,3 +1174,47 @@ Channel Hidden: '{channel} додано до фільтра каналу'
 Go to page: Перейти до {page}
 Channel Unhidden: '{channel} вилучено з фільтра каналу'
 Close Banner: Закрити банер
+Search character limit: Запит перевищує ліміт у {searchCharacterLimit} символів
+Feed:
+  Refresh Feed: Оновити {subscriptionName}
+  Feed Last Updated: 'Останнє оновлення фіда {feedName}: {date}'
+Search Listing:
+  Label:
+    4K: 4K
+    Subtitles: Субтитри
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Новинка
+    3D: 3D
+    Closed Captions: Закриті субтитри
+Right-click or hold to see history: ПКМ або утримуйте для перегляду історії
+Display Label: '{label}: {value}'
+Tag already exists: Тег "{tagName}" вже існує
+'Blocked opening potentially unsafe URL': 'Блоковано відкриття потенційно небезпечної
+  URL-адреси: "{url}".'
+shortcutJoinOperator: +
+Keys:
+  arrowright: Стрілка вправо
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Стрілка вниз
+  arrowleft: Стрілка вліво
+  arrowup: Стрілка вгору
+checkmark: ✓
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+Age Restricted:
+  This channel is age restricted: Цей канал має вікові обмеження
+  This video is age restricted: Це відео має вікові обмеження
+Trimmed input must be at least N characters long: Обрізаний ввід повинен бути хоча
+  б 1 символ довжиною | Обрізаний ввід повинен бути хоча б {length} символів довжиною
+Moments Ago: щойно
+Yes, Restart: Так, перезапустити
+Yes, Open Link: Так, відкрити посилання
+Yes, Delete: Так, видалити
+Cancel: Скасувати
+Autoplay Interruption Timer: Автозапуск скасовано через {autoplayInterruptionIntervalHours}
+  годин бездіяльності
+Description:
+  Expand Description: '...докладніше'
+  Collapse Description: Показати менше
diff --git a/static/locales/ur.yaml b/static/locales/ur.yaml
index 18a7637daa28d..39e486cc376b4 100644
--- a/static/locales/ur.yaml
+++ b/static/locales/ur.yaml
@@ -2,97 +2,92 @@
 Locale Name: 'اردو'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  'ایپ کا یہ حصہ ابھی تک تیار نہیں ہے۔ جب پیش رفت ہو جائے تو بعد میں واپس آئیں۔'
+  ایپ کا یہ حصہ ابھی تک تیار نہیں ہے۔ جب پیش رفت ہو جائے تو بعد میں واپس آئیں۔
 
 # Webkit Menu Bar
 File: 'فائل'
-New Window: 'نئی کھڑکی'
-Quit: 'چھوڑو'
+New Window: 'نئی ونڈو'
+Quit: 'چھوڑیں'
 Edit: 'ترمیم'
 Undo: 'کالعدم'
-Redo: 'دوبارہ کریں۔'
+Redo: 'دوبارہ کریں'
 Cut: 'کاٹنا'
 Copy: 'کاپی'
-Paste: 'چسپاں کریں۔'
-Delete: 'حذف کریں۔'
+Paste: 'چسپاں کریں'
+Delete: 'حذف کریں'
 Select all: 'تمام منتخب کریں'
-Reload: 'دوبارہ لوڈ کریں۔'
-Force Reload: 'زبردستی دوبارہ لوڈ کریں۔'
-Toggle Developer Tools: 'ڈویلپر ٹولز کو ٹوگل کریں۔'
+Reload: 'دوبارہ لوڈ کریں'
+Force Reload: 'زبردستی دوبارہ لوڈ کریں'
+Toggle Developer Tools: 'ڈویلپر ٹولز کو ٹوگل کریں'
 Actual size: 'اصل سائز'
-Zoom in: 'زوم ان کریں۔'
-Zoom out: 'دور کرنا'
-Toggle fullscreen: 'پوری اسکرین کو ٹوگل کریں۔'
-Window: 'کھڑکی'
+Zoom in: 'زوم ان'
+Zoom out: 'زوم آؤٹ'
+Toggle fullscreen: 'پوری اسکرین کو ٹوگل کریں'
+Window: 'ونڈو'
 Minimize: 'کم سے کم کرنا'
 Close: 'بند کریں'
 Back: 'پیچھے'
 Forward: 'آگے'
-Open New Window: 'نئی ونڈو کھولیں۔'
+Open New Window: 'نئی ونڈو کھولیں'
 
-Download From Site: 'سائٹ سے ڈاؤن لوڈ کریں۔'
+Download From Site: 'سائٹ سے ڈاؤن لوڈ کریں'
 A new blog is now available, {blogTitle}. Click to view more: 'ایک نیا بلاگ اب دستیاب
-  ہے، {blogTitle}. مزید دیکھنے کے لیے کلک کریں۔'
-Are you sure you want to open this link?: 'کیا آپ واقعی اس لنک کو کھولنا چاہتے ہیں؟'
+  ہے، {blogTitle}۔ مزید دیکھنے کے لیے کلک کریں'
+Are you sure you want to open this link?: 'کیا واقعی آپ اس لنک کو کھولنا چاہتے ہیں؟'
 
 # Search Bar
-Search / Go to URL: 'تلاش کریں / یو آر ایل پر جائیں۔'
+Search / Go to URL: 'تلاش کریں / یو آر ایل پر جائیں'
 Search Bar:
-  Clear Input: 'ان پٹ صاف کریں۔'
+  Clear Input: 'ان پٹ صاف کریں'
   # In Filter Button
 Search Filters:
-  Search Filters: 'فلٹرز تلاش کریں۔'
-  There are no more results for this search: 'اس تلاش کے مزید نتائج نہیں ہیں۔'
+  Search Filters: 'فلٹرز تلاش کریں'
+  There are no more results for this search: 'اس تلاش کے مزید نتائج نہیں ہیں'
 # Sidebar
 Subscriptions:
     # On Subscriptions Page
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'یہ
-    پروفائل میں سبسکرپشنز کی ایک بڑی تعداد ہے۔ شرح کو محدود کرنے سے بچنے کے لیے آر
-    ایس ایس کو مجبور کرنا'
+    پروفائل میں سبسکرپشنز کی ایک بڑی تعداد ہے۔ . .شرح کو محدود کرنے سے بچنے کے لیے
+    آر ایس ایس کو مجبور کر رہے ہیں'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'آپ
-    کا رکنیت کی فہرست فی الحال خالی ہے۔ انہیں یہاں دیکھنے کے لیے سبسکرپشنز شامل کرنا
-    شروع کریں۔'
+    کی سبسکرپشن کی فہرست فی الحال خالی ہے۔ اگر آپ اپنی سبسکرپشنز امپورٹ کرنا چاہتے
+    ہیں تو آپ ڈیٹا سیٹنگز میں جا کر امپورٹ سبسکرپشنز کو منتخب کر سکتے ہیں یا آپ کوئی
+    چینل تلاش کر کے سبسکرائب کر سکتے ہیں۔'
   'Getting Subscriptions. Please wait.': 'سبسکرپشنز حاصل کرنا۔ برائے مہربانی انتظار
     کریں.'
   Refresh Subscriptions: 'سبسکرپشنز کو ریفریش کریں۔'
-  Load More Videos: 'مزید ویڈیوز لوڈ کریں۔'
+  Load More Videos: 'مزید ویڈیوز لوڈ کریں'
 More: 'مزید'
 Channels:
   Channels: 'چینلز'
   Title: 'چینل کی فہرست'
-  Search bar placeholder: 'چینلز تلاش کریں۔'
+  Search bar placeholder: 'چینلز تلاش کریں'
   Count: '{number}چینل ملا۔'
   Empty: 'آپ کے چینل کی فہرست فی الحال خالی ہے۔'
-  Unsubscribe: 'ان سبسکرائب کریں۔'
-  Unsubscribed: '{channelName} کو آپ کی سبسکرپشنز سے ہٹا دیا گیا ہے۔'
 User Playlists:
-  Playlist Message: یہ صفحہ مکمل طور پر کام کرنے والی پلے لسٹس کا عکاس نہیں ہے۔ یہ
-    صرف ان ویڈیوز کی فہرست بناتا ہے جنہیں آپ نے محفوظ کیا ہے یا پسند کیا ہے۔ جب کام
-    ختم ہو جائے تو سب فی الحال یہاں موجود ویڈیوز کو 'پسندیدہ' پلے لسٹ میں منتقل کر
-    دیا جائے گا۔
   Empty Search Message: 'اس پلے لسٹ میں کوئی ایسی ویڈیوز نہیں ہیں جو آپ کی تلاش سے
-    مماثل ہوں۔'
-  Search bar placeholder: 'پلے لسٹ میں تلاش کریں۔'
+    مماثل ہوں'
+  Search bar placeholder: 'پلے لسٹ کی تلاش'
 History:
   # On History Page
   History: 'تاریخ'
   Watch History: 'تاریخ دیکھیں'
   Your history list is currently empty.: 'آپ کی تاریخ کی فہرست فی الحال خالی ہے۔'
   Empty Search Message: 'آپ کی سرگزشت میں کوئی ایسی ویڈیوز نہیں ہیں جو آپ کی تلاش
-    سے مماثل ہوں۔'
-  Search bar placeholder: "تاریخ میں تلاش کریں۔"
+    سے مماثل ہوں'
+  Search bar placeholder: "سرگزشت میں تلاش کریں"
 Settings:
   # On Settings Page
   The app needs to restart for changes to take effect. Restart and apply change?: 'دی
     تبدیلیاں اثر انداز ہونے کے لیے ایپ کو دوبارہ شروع کرنے کی ضرورت ہے۔ دوبارہ شروع
     کریں اور تبدیلی کا اطلاق کریں؟'
   General Settings:
-    General Settings: 'عام ترتیبات'
+    General Settings: 'عام'
     Check for Updates: 'اپ ڈیٹ کے لیے چیک کریں'
-    Check for Latest Blog Posts: 'تازہ ترین بلاگ پوسٹس چیک کریں۔'
+    Check for Latest Blog Posts: 'تازہ ترین بلاگ پوسٹس چیک کریں'
     Fallback to Non-Preferred Backend on Failure: 'غیر ترجیحی بیک اینڈ پر فال بیک
       ناکامی پر'
-    Enable Search Suggestions: 'تلاش کی تجاویز کو فعال کریں۔'
+    Enable Search Suggestions: 'تلاش کی تجاویز کو فعال کریں'
     Default Landing Page: 'ڈیفالٹ لینڈنگ پیج'
   Theme Settings: {}
   Player Settings:
@@ -107,36 +102,36 @@ Settings:
     Profile object has insufficient data, skipping item: 'پروفائل آبجیکٹ ناکافی ہے۔
       ڈیٹا، آئٹم کو چھوڑنا'
     All subscriptions and profiles have been successfully imported: 'تمام سبسکرپشنز
-      اور پروفائلز کو کامیابی کے ساتھ درآمد کیا گیا ہے۔'
-    All subscriptions have been successfully imported: 'تمام سبسکرپشنز ہو چکی ہیں۔
-      کامیابی سے درآمد کیا گیا۔'
+      اور پروفائلز کو کامیابی کے ساتھ درآمد کیا گیا ہے'
+    All subscriptions have been successfully imported: 'تمام سبسکرپشنز کو کامیابی
+      کے ساتھ درآمد کر لیا گیا'
     Subscriptions have been successfully exported: 'سبسکرپشنز کامیابی سے ہو گئی ہیں۔
       برآمد'
     History object has insufficient data, skipping item: 'تاریخ کا اعتراض ناکافی ہے۔
       ڈیٹا، آئٹم کو چھوڑنا'
-    All watched history has been successfully imported: 'تمام دیکھی گئی تاریخ رہی
-      ہے۔ کامیابی سے درآمد کیا گیا۔'
+    All watched history has been successfully imported: 'تمام دیکھی گئی سرگزشت کامیابی
+      سے درآمد کیا گیا'
     All watched history has been successfully exported: 'تمام دیکھی گئی تاریخ رہی
       ہے۔ کامیابی سے برآمد'
     Playlist insufficient data: '"{playlist}" پلے لسٹ کے لیے ناکافی ڈیٹا، آئٹم کو
       چھوڑنا'
-    All playlists has been successfully imported: 'تمام پلے لسٹ ہو چکی ہیں۔ کامیابی
-      سے درآمد کیا گیا۔'
+    All playlists has been successfully imported: 'تمام پلے لسٹ کامیابی سے درآمد کی
+      گئی'
     All playlists has been successfully exported: 'تمام پلے لسٹ ہو چکی ہیں۔ کامیابی
       سے برآمد'
   SponsorBlock Settings: {}
 About:
   #On About page
   Please check for duplicates before posting: 'براہ کرم پوسٹ کرنے سے پہلے ڈپلیکیٹس
-    کی جانچ کریں۔'
+    کی جانچ کریں'
 Profile:
   Are you sure you want to delete this profile?: 'کیا آپ واقعی اسے حذف کرنا چاہتے
     ہیں۔ پروفائل؟'
   All subscriptions will also be deleted.: 'تمام سبسکرپشنز بھی حذف کر دی جائیں گی۔'
   Profile could not be found: 'پروفائل نہیں مل سکا'
   Your profile name cannot be empty: 'آپ کا پروفائل نام خالی نہیں ہو سکتا'
-  Profile has been created: 'پروفائل بن گیا ہے۔'
-  Profile has been updated: 'پروفائل کو اپ ڈیٹ کر دیا گیا ہے۔'
+  Profile has been created: 'پروفائل بن گیا ہے'
+  Profile has been updated: 'پروفائل اپ ڈیٹ کر دیا گیا'
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
   : 'یہ آپ کا بنیادی پروفائل ہے۔ کیا آپ واقعی منتخب چینلز کو حذف کرنا چاہتے ہیں؟ دی
@@ -158,14 +153,13 @@ Tooltips:
       کی کوشش کرے گا۔ فعال ہونے پر طریقہ۔'
     Thumbnail Preference: 'FreeTube کے تمام تھمب نیلز کو اس سے بدل دیا جائے گا۔ پہلے
       سے طے شدہ تھمب نیل کے بجائے ویڈیو کا ایک فریم۔'
-    Invidious Instance: 'Invidious مثال جس سے FreeTube API کے لیے جڑے گا۔ کالز'
+    Invidious Instance: 'Invidious Instance جس سے فری ٹیوب API کالز کے لیے جڑے گا۔'
     External Link Handling: |
       'جب کوئی لنک، جسے FreeTube میں نہیں کھولا جا سکتا، پر کلک کیا جاتا ہے تو پہلے سے طے شدہ طرز عمل کا انتخاب کریں۔
        بطور ڈیفالٹ FreeTube آپ کے ڈیفالٹ براؤزر میں کلک کردہ لنک کو کھول دے گا۔'
   Player Settings:
-    Proxy Videos Through Invidious: 'اس کی بجائے ویڈیوز پیش کرنے کے لیے Invidious
-      سے منسلک ہوں گے۔ یوٹیوب سے براہ راست کنکشن بنانے کا۔ API کی ترجیح کو اوور رائیڈ
-      کرتا ہے۔'
+    Proxy Videos Through Invidious: 'یوٹیوب سے براہ راست کنکشن بنانے کے بجائے ویڈیوز
+      پیش کرنے کے لیے Invidious سے جڑے گا۔'
     Default Video Format: 'ویڈیو چلتے وقت استعمال ہونے والے فارمیٹس کو سیٹ کریں۔ DASH
       فارمیٹس کر سکتے ہیں۔ اعلی خصوصیات کو کھیلیں. لیگیسی فارمیٹس زیادہ سے زیادہ 720p
       تک محدود ہیں لیکن کم استعمال کرتے ہیں۔ بینڈوڈتھ. آڈیو فارمیٹس صرف آڈیو سلسلے
@@ -189,39 +183,54 @@ Tooltips:
       (';') سے الگ کیے گئے ہیں، آپ بیرونی کھلاڑی کو منتقل کرنا چاہتے ہیں۔
     DefaultCustomArgumentsTemplate: '(پہلے سے طے شدہ: ''{defaultCustomArguments}'')'
   Subscription Settings:
-    Fetch Feeds from RSS: 'فعال ہونے پر، FreeTube اپنے ڈیفالٹ کے بجائے RSS کا استعمال
-      کرے گا۔ آپ کی سبسکرپشن فیڈ حاصل کرنے کا طریقہ۔ آر ایس ایس تیز ہے اور آئی پی
-      کو بلاک کرنے سے روکتا ہے، لیکن کچھ معلومات فراہم نہیں کرتا ہے جیسے ویڈیو کا
-      دورانیہ یا لائیو اسٹیٹس'
+    Fetch Feeds from RSS: 'فعال ہونے پر، FreeTube آپ کے سبسکرپشن فیڈ کو حاصل کرنے
+      کے لیے اپنے پہلے سے طے شدہ طریقہ کے بجائے RSS کا استعمال کرے گا۔ RSS تیز ہے
+      اور آئی پی کو بلاک کرنے سے روکتا ہے، لیکن کچھ معلومات فراہم نہیں کرتا ہے جیسے
+      ویڈیو کا دورانیہ، لائیو اسٹیٹس یا کمیونٹی پوسٹس'
 
 # Toast Messages
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'یہ
-  ویڈیو غائب فارمیٹس کی وجہ سے دستیاب نہیں ہے۔ یہ ملک کی وجہ سے ہوسکتا ہے۔ غیر دستیابی'
-Subscriptions have not yet been implemented: 'سبسکرپشنز کو ابھی تک نافذ نہیں کیا گیا
+  ویڈیو غائب فارمیٹس کی وجہ سے دستیاب نہیں ہے۔ یہ ملک کی عدم دستیابی کی وجہ سے ہوسکتا
   ہے۔'
 Unknown YouTube url type, cannot be opened in app: 'نامعلوم YouTube url قسم، ایپ میں
   نہیں کھولی جا سکتی'
-Hashtags have not yet been implemented, try again later: 'ہیش ٹیگز ابھی لاگو نہیں
-  ہوئے، بعد میں دوبارہ کوشش کریں۔'
-Loop is now disabled: 'لوپ اب غیر فعال ہے۔'
-Loop is now enabled: 'لوپ اب فعال ہے۔'
-Shuffle is now disabled: 'شفل اب غیر فعال ہے۔'
-Shuffle is now enabled: 'شفل اب فعال ہے۔'
-The playlist has been reversed: 'پلے لسٹ کو الٹ دیا گیا ہے۔'
-Playing Next Video: 'اگلا ویڈیو چل رہا ہے۔'
-Playing Previous Video: 'پچھلا ویڈیو چل رہا ہے۔'
+Loop is now disabled: 'بار بار چلانا اب غیر فعال ہے'
+Loop is now enabled: 'بار بار چلانا اب فعال ہے'
+Shuffle is now disabled: 'شفل اب غیر فعال ہے'
+Shuffle is now enabled: 'شفل اب فعال ہے'
+The playlist has been reversed: 'پلے لسٹ کو الٹ دیا گیا ہے'
+Playing Next Video: 'اگلا ویڈیو چل رہا ہے'
+Playing Previous Video: 'پچھلا ویڈیو چل رہا ہے'
 Playing Next Video Interval: 'اگلی ویڈیو بغیر کسی وقت چلائی جا رہی ہے۔ منسوخ کرنے
   کے لیے کلک کریں۔ | اگلی ویڈیو {nextVideoInterval} سیکنڈ میں چلائی جا رہی ہے۔ منسوخ
   کرنے کے لیے کلک کریں۔ | اگلی ویڈیو {nextVideoInterval} سیکنڈ میں چلائی جا رہی ہے۔
   منسوخ کرنے کے لیے کلک کریں۔'
-Canceled next video autoplay: 'اگلی ویڈیو آٹو پلے منسوخ کر دی گئی۔'
-Default Invidious instance has been cleared: 'ڈیفالٹ Invidious مثال کو صاف کر دیا
-  گیا ہے۔'
+Canceled next video autoplay: 'اگلا ویڈیو آٹو پلے منسوخ کر دی گئی'
+Default Invidious instance has been cleared: 'طے شدہ Invidious instance کو صاف کر
+  دیا گیا ہے'
 'The playlist has ended. Enable loop to continue playing': 'پلے لسٹ ختم ہو گئی ہے۔
   فعال کھیل جاری رکھنے کے لیے لوپ'
 External link opening has been disabled in the general settings: 'عام ترتیبات میں
-  بیرونی لنک کھولنے کو غیر فعال کر دیا گیا ہے۔'
-Downloading has completed: '"{videoTitle}" نے ڈاؤن لوڈ مکمل کر لیا ہے۔'
+  بیرونی لنک کھولنے کو غیر فعال کر دیا گیا ہے'
+Downloading has completed: '"{videoTitle}" نے ڈاؤن لوڈ مکمل کر لیا ہے'
 Starting download: '"{videoTitle}" کا ڈاؤن لوڈ شروع ہو رہا ہے'
 Downloading failed: '"{videoTitle}" کو ڈاؤن لوڈ کرنے میں ایک مسئلہ تھا'
 Screenshot Error: 'اسکرین شاٹ ناکام ہو گیا۔ {error}'
+Version {versionNumber} is now available!  Click for more details: ورژن {versionNumber}
+  اب دستیاب ہے! . . مزید تفصیلات کے لیے کلک کریں
+Global:
+  Counts:
+    Video Count: 1 ویڈیو | {count} ویڈیوز
+    Channel Count: 1 چینل | {count} چینلز
+    Subscriber Count: 1 سبسکرائبر | {count} سبسکرائبرس
+    Watching Count: 1 دیکھ رہا ہے | {count} دیکھ رہے ہیں
+    View Count: 1 نظر | {count} نظریں
+    Like Count: 1 لائک | {count} لائکس
+    Comment Count: 1 تبصرہ | {count} تبصرے
+  Videos: ویڈیوز
+  Shorts: شورٹس
+  Live: لاؤو
+  Community: کمیونٹی
+Close Banner: بینر بندکریں
+Preferences: ترجیحات
+Go to page: '{page} میں جائیں'
diff --git a/static/locales/vi.yaml b/static/locales/vi.yaml
index 1fcc3b0bd8059..249e059ee78bb 100644
--- a/static/locales/vi.yaml
+++ b/static/locales/vi.yaml
@@ -42,6 +42,8 @@ Global:
     Channel Count: 1 kênh | {count} kênh
     Video Count: 1 video | {count} video
     Watching Count: 1 lượt xem | {count} lượt xem
+    Like Count: '{count} lượt thích'
+    Comment Count: '{count} bình luận'
   Input Tags:
     Length Requirement: 1 đang xem | {number} đang xem
 Search / Go to URL: 'Tìm kiếm / Đi đến URL'
@@ -81,12 +83,26 @@ Search Filters:
   Fetch more results: 'Lấy thêm kết quả'
 # Sidebar
   There are no more results for this search: Không còn kết quả nào cho tìm kiếm này
+  Features:
+    Features: Chức năng
+    Subtitles: Có phụ đề
+    3D: 3D
+    Creative Commons: Creative Commons
+    Location: Địa điểm
+    HD: HD
+    Live: Trực tiếp
+    4K: 4K
+    360 Video: Video 360 độ
+    HDR: HDR
+    VR180: VR180
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Đăng ký'
   Latest Subscriptions: 'Đăng ký mới nhất'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Danh
-    sách Đăng ký đang trống. Bắt đầu thêm đăng ký để xem chúng tại đây.'
+    sách Đăng ký đang trống. Bắt đầu bằng cách tìm kiếm và đăng ký các kênh hoặc nhập
+    các đăng ký hiện có của bạn bằng cách đi đến Cài đặt dữ liệu và nhấn vào Nhập
+    đăng ký.'
   'Getting Subscriptions.  Please wait.': 'Đang lấy Đăng ký. Vui lòng đợi.'
   'Getting Subscriptions. Please wait.': Đang lấy Đăng ký. Vui lòng chờ.
   Load More Videos: Tải thêm video
@@ -113,14 +129,9 @@ Most Popular: 'Phổ biến nhất'
 Playlists: 'Danh sách phát'
 User Playlists:
   Your Playlists: 'Danh sách phát của bạn'
-  Search bar placeholder: Tìm kiếm trong danh sách phát
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Video
-    đã lưu của bạn trống rỗng. Nhấp vào nút lưu ở góc video để được liệt kê tại đây
-  Empty Search Message: Không có video nào trong danh sách này trùng với những gì
-    bạn đang tìm
-  Playlist Message: Trang này không liệt kê tất cả danh sách video bạn đã theo giỏi.
-    Nó chỉ hiển thị các video mà bạn đã lưu hoặc thêm vào mục yêu thích. Khi xong
-    việc, tất cả các video trên trang này sẽ được chuyển vào danh sách 'yêu thích'.
+  Search bar placeholder: Tìm kiếm danh sách phát
+  Empty Search Message: Không có video nào trong danh sách phát này trùng với những
+    gì bạn đang tìm
   Remove from Playlist: Xóa khỏi danh sách phát
   Playlist Name: Tên danh sách phát
   Save Changes: Lưu thay đổi
@@ -142,7 +153,6 @@ User Playlists:
         cập nhập danh sách phát.
       Reverted to use {oldPlaylistName} for quick bookmark: Đã quay lại dùng {oldPlaylistName}
         cho dấu trang nhanh
-      Quick bookmark disabled: Đã tắt dấu trang nhanh
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: Một
         số video trong danh sách phát này chưa được tải, bạn vẫn có thể nhấn vào đây
         để sao chép.
@@ -166,13 +176,21 @@ User Playlists:
       "{videoCount} video(s) have been removed": 1 video đã được xóa | {videoCount}
         video đã được xóa
       There were no videos to remove.: Không có video nào để xóa.
+      This playlist is already being used for quick bookmark.: Danh sách phát này
+        đã được dùng cho dấu trang nhanh rồi.
+      Playlist {playlistName} is the new quick bookmark playlist.: '{playlistName}
+        giờ đã là danh sách phát cho dấu trang nhanh.'
+      This playlist has a video with a duration error: Danh sách phát này có chứa
+        một video trở lên không có thông tin thời lượng và sẽ được coi như thời lượng
+        bằng không.
+    Search for Videos: Tìm kiếm video
   You have no playlists. Click on the create new playlist button to create a new one.: Bạn
     đang không có danh sách phát nào. Nhấn vào nút tạo danh sách phát mới để tạo một
     cái mới.
   This playlist currently has no videos.: Danh sách phát này hiện không có video nào.
   Edit Playlist Info: Chỉnh sửa thông tin danh sách phát
   Are you sure you want to delete this playlist? This cannot be undone: Bạn có chắc
-    muốn xóa danh sách phát này?Việc này không thể hoàn tác.
+    muốn xóa danh sách phát này? Việc này sẽ không thể được hoàn tác.
   CreatePlaylistPrompt:
     Create: Tạo mới
     Toast:
@@ -196,6 +214,12 @@ User Playlists:
       "{videoCount} video(s) added to 1 playlist": Đã thêm 1 video vào 1 danh sách
         phát | Đã thêm {videoCount} vào 1 danh sách phát
     Save: Lưu
+    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
+      đã có trong danh sách phát'
+    Added {count} Times: Đã được thêm | Đã được thêm {count} lần
+    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
+      video sẽ được thêm'
+    Allow Adding Duplicate Video(s): Cho phép thêm video trùng lặp
   Create New Playlist: Tạo danh sách phat mới
   Playlist Description: Mô tả danh sách phát
   Copy Playlist: Sao chép danh sách phát
@@ -207,11 +231,20 @@ User Playlists:
   Remove from Favorites: Xóa khỏi {playlistName}
   Move Video Down: Chuyển video xuống
   Move Video Up: Chuyển video lên
-  Disable Quick Bookmark: Tắt dấu trang nhanh
   Delete Playlist: Xóa danh sách phát
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Bạn
-    có chắc muốn xóa tất cả các video đã xem khỏi danh sách phát này? Việc này không
-    thể được hoàn tác.
+  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Bạn
+    có chắc muốn loại bỏ {playlistItemCount} video trùng lặp khỏi danh sách phát này
+    không? Việc này sẽ không thể được hoàn tác.
+  Cannot delete the quick bookmark target playlist.: Không thể xóa danh sách phát
+    vì nó được dùng cho dấu trang nhanh.
+  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Bạn
+    có chắc muốn loại bỏ {playlistItemCount} video đã xem khỏi danh sách phát này
+    không? Việc này sẽ không thể được hoàn tác.
+  Quick Bookmark Enabled: Dấu trang nhanh đã bật
+  Remove Duplicate Videos: Loại bỏ các video trùng lặp
+  Playlists with Matching Videos: Bao gồm video trong danh sách phát
+  Export Playlist: Xuất danh sách phát này
+  The playlist has been successfully exported: Đã xuất thành công danh sách phát này
 History:
   # On History Page
   History: 'Lịch sử'
@@ -220,11 +253,12 @@ History:
   Search bar placeholder: Tìm trong lịch sử
   Empty Search Message: Không có video nào trong lịch sử của bạn trùng với những gì
     bạn đang tìm kiếm
+  Case Sensitive Search: Phân biệt hoa thường
 Settings:
   # On Settings Page
   Settings: 'Cài đặt'
   General Settings:
-    General Settings: 'Cài đặt chung'
+    General Settings: 'Chung'
     Fallback to Non-Preferred Backend on Failure: 'Trở về Backend không mong muốn
       khi có lỗi'
     Enable Search Suggestions: 'Bật gợi ý tìm kiếm'
@@ -246,8 +280,6 @@ Settings:
       End: 'Cuối'
       Blur: Làm mờ
       Hidden: Ẩn
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Phiên bản Invidious
-      (Mặc định là https://invidious.snopyta.org)'
     Region for Trending: 'Phổ biến theo quốc gia'
         #! List countries
     Check for Latest Blog Posts: Kiểm tra bài đăng mới nhất
@@ -267,8 +299,13 @@ Settings:
       External Link Handling: Xử lý liên kết bên ngoài
     View all Invidious instance information: Xem tất cả thông tin phiên bản Invidious
     System Default: Mặc định hệ thống
+    Auto Load Next Page:
+      Tooltip: Tự động tải các trang video và bình luận.
+      Label: Tự động nhấn tải thêm
+    Open Deep Links In New Window: Mở các URL được truyền đến FreeTube vào cửa sổ
+      mới
   Theme Settings:
-    Theme Settings: 'Cài đặt chủ đề'
+    Theme Settings: 'Chủ đề'
     Match Top Bar with Main Color: 'Khớp thanh trên cùng với màu chính'
     Base Theme:
       Base Theme: 'Chủ đề mặc định'
@@ -281,6 +318,10 @@ Settings:
       Nordic: Nordic
       Pastel Pink: Hồng phấn tiên
       Hot Pink: Hồng nóng bỏng
+      Solarized Dark: Solarized Tối
+      Solarized Light: Solarized Sáng
+      Gruvbox Dark: Gruvbox Tối
+      Gruvbox Light: Gruvbox Sáng
     Main Color Theme:
       Main Color Theme: 'Màu chủ đề chính'
       Red: 'Đỏ'
@@ -320,6 +361,12 @@ Settings:
       Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire màu xanh
       Catppuccin Mocha Lavender: Catppuccin Mocha Lavender Màu tím nhạt
       Catppuccin Mocha Blue: Catppuccin Mocha Blue Màu xanh
+      Solarized Yellow: Solarized Vàng
+      Solarized Orange: Solarized Cam
+      Solarized Red: Solarized Đỏ
+      Gruvbox Dark Yellow: Vàng Tối Cổ Điển
+      Gruvbox Dark Blue: Xanh Biển Tối
+      Gruvbox Dark Green: Xanh Rêu Đậm
     Secondary Color Theme: 'Màu chủ đề phụ'
         #* Main Color Theme
     UI Scale: Tỉ lệ UI
@@ -328,13 +375,12 @@ Settings:
     Hide Side Bar Labels: Ẩn nhãn thanh bên
     Hide FreeTube Header Logo: Ẩn logo FreeTube trên thanh trên
   Player Settings:
-    Player Settings: 'Cài đặt trình phát'
-    Remember History: 'Nhớ lịch sử'
+    Player Settings: 'Trình phát'
     Play Next Video: 'Phát video tiếp theo'
     Turn on Subtitles by Default: 'Bật phụ đề theo mặc định'
     Autoplay Videos: 'Tự phát video'
     Proxy Videos Through Invidious: 'Proxy video qua Invidious'
-    Autoplay Playlists: 'Danh sách tự động phát'
+    Autoplay Playlists: 'Tự phát video trong danh sách phát'
     Enable Theatre Mode by Default: 'Bật chế độ rạp hát theo mặc định'
     Default Volume: 'Âm lượng mặc định'
     Default Playback Rate: 'Tốc độ phát mặc định'
@@ -344,7 +390,7 @@ Settings:
       Legacy Formats: 'Định dạng Legacy'
       Audio Formats: 'Định dạng âm thanh'
     Default Quality:
-      Default Quality: 'Định dạng chất lượng'
+      Default Quality: 'Chất lượng mặc định'
       Auto: 'Tự động'
       144p: '144p'
       240p: '240p'
@@ -358,7 +404,7 @@ Settings:
     Scroll Playback Rate Over Video Player: Con lăn chuột điểu chỉnh tốc độ phát lại
     Scroll Volume Over Video Player: Con lăn chuột điểu chỉnh âm lượng
     Display Play Button In Video Player: Hiển thị nút phát trong trình phát video
-    Next Video Interval: Khoảng thời gian Video Tiếp theo
+    Next Video Interval: Quãng nghỉ giữa các video tự động phát
     Fast-Forward / Rewind Interval: Khoảng thời gian tua đi / tua lại
     Screenshot:
       Enable: Bật chức năng chụp màn hình
@@ -366,7 +412,7 @@ Settings:
       Quality Label: Chất lượng chụp màn hình
       File Name Label: Mẫu tên tệp
       Folder Label: Thư mục ảnh chụp màn hình
-      Ask Path: Yêu cầu thứ mục lưu
+      Ask Path: Yêu cầu thư mục lưu
       Folder Button: Chọn thư mục
       Error:
         Empty File Name: Tên tệp trống
@@ -381,46 +427,14 @@ Settings:
     Enter Fullscreen on Display Rotate: Bật toàn màn hình khi xoay
     Skip by Scrolling Over Video Player: Tua video bằng con lăn chuột
   Subscription Settings:
-    Subscription Settings: 'Cài đặt đăng ký'
+    Subscription Settings: 'Đăng ký'
     Hide Videos on Watch: 'Ẩn video khi đã xem'
-    Subscriptions Export Format:
-      Subscriptions Export Format: 'Xuất định dạng đăng ký'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: 'Quản lý đăng ký'
-    Import Subscriptions: 'Nhập đăng ký'
-    Export Subscriptions: 'Xuất đăng ký'
-    How do I import my subscriptions?: 'Làm sao để nhập đăng ký của tôi?'
     Fetch Feeds from RSS: Cập nhật bảng tin qua RSS
     Fetch Automatically: Tự động làm mới bảng tin
-    Only Show Latest Video for Each Channel: Chỉ hiện video mới nhất cho mỗi kênh
-  Advanced Settings:
-    Advanced Settings: 'Cài đặt nâng cao'
-    Enable Debug Mode (Prints data to the console): 'Bật chế độ Debug (Ghi data ra
-      console)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Địa chỉ Proxy (Ví dụ: SOCKS5://127.0.0.1:9050
-      )'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Nhấn
-      nút "TEST PROXY" sẽ gửi một yêu cầu đến https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Sử dụng Tor / Proxy cho API calls'
-    TEST PROXY: 'TEST PROXY'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: 'Xem Instances công cộng'
-    Clear History:
-      Clear History: 'Xóa lịch sử'
-      # On Click
-      Are you sure you want to delete your history?: 'Bạn có chắc xóa lịch sử không?'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: 'Dọn dẹp đăng ký'
-      # On Click
-      Are you sure you want to remove all subscriptions?: 'Bạn có chắc xóa tất cả
-        đăng ký không?'
-      #& Yes
-      #& No
-
+    Confirm Before Unsubscribing: Nhắc xác nhận trước khi hủy đăng ký
+    'Limit the number of videos displayed for each channel': Giới hạn số video được
+      hiển thị cho mỗi kênh
+    To: Xuống
   Data Settings:
     How do I import my subscriptions?: Làm sao để tôi nhập đăng ký?
     Unknown data key: Key dữ liệu không xác định
@@ -448,14 +462,10 @@ Settings:
     Export YouTube: Xuất YouTube
     Export FreeTube: Xuất FreeTube
     Export Subscriptions: Xuất đăng ký
-    Check for Legacy Subscriptions: Kiểm tra đăng ký cũ
-    Import NewPipe: Nhập NewPipe
-    Import YouTube: Nhập YouTube
-    Import FreeTube: Nhập FreeTube
     Import Subscriptions: Nhập đăng ký
     Select Export Type: Chọn kiểu xuất ra
     Select Import Type: Chọn kiểu nhập vào
-    Data Settings: Cài đặt dữ liệu
+    Data Settings: Dữ liệu
     Manage Subscriptions: Quản lý đăng ký
     Import Playlists: Nhập danh sách phát
     All playlists has been successfully imported: Tất cả các danh sách phát đã được
@@ -485,7 +495,7 @@ Settings:
     Hide Channel Subscribers: Ẩn số người đăng ký
     Hide Video Likes And Dislikes: Ẩn lượt thích và không thích
     Hide Video Views: Ẩn lượt xem
-    Distraction Free Settings: Cài đặt không phân tâm
+    Distraction Free Settings: Giảm phân tâm
     Hide Active Subscriptions: Ẩn đăng ký hiện hoạt
     Hide Playlists: Ẩn danh sách phát
     Hide Comments: Ẩn bình luận
@@ -503,7 +513,7 @@ Settings:
     Hide Channels Placeholder: ID kênh
     Hide Profile Pictures in Comments: Ẩn ảnh đại diện trong bình luận
     Hide Chapters: Ẩn các chương
-    Hide Channels: Ẩn các video khỏi kênh
+    Hide Channels: Ẩn video từ các kênh
     Hide Channel Releases: Ẩn nhạc của kênh
     Hide Videos and Playlists Containing Text: Ẩn các video và danh sách phát có chứa
     Hide Channels Invalid: ID kênh không hợp lệ
@@ -533,7 +543,7 @@ Settings:
     Clear Search Cache: Xóa cache tìm kiếm
     Save Watched Progress: Lưu quá trình xem
     Remember History: Nhớ lịch sử
-    Privacy Settings: Cài đặt quyền riêng tư
+    Privacy Settings: Quyền riêng tư
     Remove All Playlists: Xóa tất cả danh sách phát
     Are you sure you want to remove all your playlists?: Bạn có chắc muốn xóa tất
       cả các danh sách phát không?
@@ -547,7 +557,7 @@ Settings:
     Proxy Host: Máy chủ proxy
     Region: Vùng
     Country: Quốc gia
-    Proxy Settings: Cài đặt proxy
+    Proxy Settings: Proxy
     Enable Tor / Proxy: Bật Tor / Proxy
     Proxy Protocol: Giao thức proxy
     Proxy Port Number: Số cổng proxy
@@ -559,6 +569,11 @@ Settings:
     Clicking on Test Proxy will send a request to: Nhấn vào Thử proxy sẽ gửi yêu cầu
       đến
     Test Proxy: Thử proxy
+    Proxy Warning: FreeTube không bao gồm proxy theo mặc định nhưng có thể kết nối
+      đến một proxy bên ngoài, bao gồm các proxy chạy cục bộ như Tor hoặc các proxy
+      SOCKS5 được cung cấp bởi một số các VPN. Nếu bạn sử dụng tính năng này, hãy
+      đảm bảo proxy/Tor của bạn được cấu hình đúng cách, nếu không FreeTube sẽ không
+      thể tải dữ liệu về được.
   SponsorBlock Settings:
     Enable SponsorBlock: Bật SponsorBlock
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL API SponsorBlock
@@ -571,13 +586,13 @@ Settings:
       Do Nothing: Không làm gì
     Notify when sponsor segment is skipped: Thông báo khi đoạn quảng cáo bị bỏ qua
     Category Color: Bản màu
-    SponsorBlock Settings: Cài đặt SponsorBlock
+    SponsorBlock Settings: SponsorBlock
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': URL
       API ảnh xem trước DeArrow (Mặc định là https://dearrow-thumb.ajay.app)
     UseDeArrowTitles: Dùng tiêu đề video từ DeArrow
     UseDeArrowThumbnails: Dùng ảnh xem trước từ DeArrow
   External Player Settings:
-    External Player Settings: Cài đặt trình phát video bên ngoài
+    External Player Settings: Trình phát ngoại
     External Player: Trình phát video bên ngoài
     Custom External Player Arguments: Tham số trình phát bên ngoài tùy chỉnh
     Ignore Unsupported Action Warnings: Bỏ qua các cảnh bảo tác vụ không được hổ trợ
@@ -587,7 +602,7 @@ Settings:
         Name: Trống
     Ignore Default Arguments: Bỏ qua tham số mặc định
   Parental Control Settings:
-    Parental Control Settings: Cài đặt kiểm soát của phụ huynh
+    Parental Control Settings: Kiểm soát của phụ huynh
     Hide Unsubscribe Button: Ẩn nút huỷ đăng ký
     Show Family Friendly Only: Chỉ hiển thị nội dung thân thiện với gia đình
     Hide Search Bar: Ẩn thanh tìm kiếm
@@ -597,7 +612,7 @@ Settings:
     Open in web browser: Mở trên trình duyệt
     Ask Download Path: Yêu cầu đường dẫn tải xuống
     Choose Path: Chọn đường dẫn
-    Download Settings: Cài đặt tải xuống
+    Download Settings: Tải xuống
   Password Dialog:
     Password: Mật khẩu
     Password Incorrect: Mật khẩu sai
@@ -605,55 +620,27 @@ Settings:
     Unlock: Mở khoá
   Password Settings:
     Set Password To Prevent Access: Đặt mặt khẩu để ngăn truy cập cài đặt
-    Password Settings: Cài đặt mật khẩu
+    Password Settings: Mật khẩu
     Remove Password: Xoá mật khẩu
     Set Password: Đặt mật khẩu
   Experimental Settings:
     Warning: Những cài đặt này đều đang trong quá trình thử nghiệm, bật các tùy chọn
       cài đặt này có thể gây ra hoạt động bất ổn định. Hãy tạo phương án dự phòng
       trước khi bật!
-    Experimental Settings: Cài đặt thử nghiệm
+    Experimental Settings: Thử nghiệm
     Replace HTTP Cache: Thay thế bộ đệm HTTP
-  Expand All Settings Sections: Mở rộng tất cả các mục tùy chọn
+  Return to Settings Menu: Quay lại menu Cài đặt
+  Sort Settings Sections (A-Z): Sắp xếp các mục cài đặt (A-Z)
 About:
   #On About page
   About: 'Giới thiệu'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Phần
-    mềm copylefted này được miễn phí dưới cấp phép AGPL-3.0.'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    Tìm thấy bug (lỗi)? Muốn gợi ý một tính năng? Muốn chung tay giúp đỡ? Hãy xem
-    trang Github của chúng tôi. Pull Requests luôn cảm kích.
-
-  Thank you very much to the People and Projects that make FreeTube possible!: 'Cảm
-    ơn rất nhiều những Người và Dự án đã làm cho FreeTube khả thi!'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Muốn
-    chat? Hãy tham gia Server Element / Matrix của chúng tôi. Vui lòng xem nội quy
-    trước khi tham gia.'
-
-  'Looking for help? Check out our Wiki page.': 'Tìm kiếm sự giúp đỡ? Hãy xem trang
-    Wiki của chúng tôi.'
-
-  Check out our Firefox extension!: 'Hãy xem tiện ích Firefox của chúng tôi!'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Nếu
-    bạn thích sử dụng FreeTube, hãy xem xét đến việc đóng góp thông qua Liberapay
-    hoặc qua địa chỉ Bitcoin của chúng tôi.'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: 'Tin tức mới nhất về FreeTube'
-
 #On Channel Page
   Mastodon: Mastodon
   Email: Email
   Source code: Mã nguồn
   FAQ: Câu hỏi thường gặp
   Report a problem: Báo cáo sự cố
-  Licensed under the AGPLv3: Được cấp phép theo AGPLv3
-  View License: Xem giấy phép
   Help: Trợ giúp
   Translate: Phiên dịch
   Website: Trang web
@@ -673,9 +660,9 @@ About:
   these people and projects: những người và dự án này
   Please read the: Hãy đọc
   Discussions: Thảo luận
+  Licensed under the: Được cấp phép theo
+  AGPLv3: giấy phép AGPLv3
 Channel:
-  Subscriber: 'Người đăng ký'
-  Subscribers: 'Người đăng ký'
   Subscribe: 'Đăng ký'
   Unsubscribe: 'Hủy đăng ký'
   Search Channel: 'Tìm trong kênh'
@@ -726,6 +713,7 @@ Channel:
     Reveal Answers: Hiện Câu trả lời
     Hide Answers: Ẩn Câu trả lời
     Video hidden by FreeTube: FreeTube đã ẩn video này
+    View Full Post: Mở rộng bài đăng
   Releases:
     Releases: Xuất bản
     This channel does not currently have any releases: Kênh này hiện không có bất
@@ -740,6 +728,9 @@ Channel:
     Podcasts: Podcast
     This channel does not currently have any podcasts: Kênh này hiện không có podcast
       nào
+  Home:
+    Home: Trang chủ
+    View Playlist: Xem danh sách phát
 Video:
   Open in YouTube: 'Mở trong Youtube'
   Copy YouTube Link: 'Sao chép liên kết Youtube'
@@ -765,37 +756,8 @@ Video:
     trực tiếp hiện tại không hỗ trợ với Invidious API. Một đường truyền trực tiếp
     đến Youtube là cần thiết.'
   Published:
-    Jan: 'Tháng 1'
-    Feb: 'Tháng 2'
-    Mar: 'Tháng 3'
-    Apr: 'Tháng 4'
-    May: 'Tháng 5'
-    Jun: 'Tháng 6'
-    Jul: 'Tháng 7'
-    Aug: 'Tháng 8'
-    Sep: 'Tháng 9'
-    Oct: 'Tháng 10'
-    Nov: 'Tháng 11'
-    Dec: 'Tháng 12'
-    Second: 'Giây'
-    Seconds: 'Giây'
-    Hour: 'Giờ'
-    Hours: 'Giờ'
-    Day: 'Ngày'
-    Days: 'Ngày'
-    Week: 'Tuần'
-    Weeks: 'Tuần'
-    Month: 'Tháng'
-    Months: 'Tháng'
-    Year: 'Năm'
-    Years: 'Năm'
-    Ago: 'Vừa qua'
-    Upcoming: 'Công chiếu vào'
-    Minutes: Phút
-    Minute: Phút
     In less than a minute: Trong khoảng ít hơn 1 phút
   Published on: 'Phát hành vào'
-  Publicationtemplate: '{number} {unit} trước'
 #& Videos
   Video has been removed from your history: Video đã được xóa khỏi lịch sử của bạn
   Video has been marked as watched: Video đánh dấu đã xem
@@ -858,6 +820,46 @@ Video:
   Upcoming: Sắp ra mắt
   Premieres: Công chiếu
   Unhide Channel: Hiển thị kênh này
+  Player:
+    Show Stats: Hiện thông tin nâng cao
+    Hide Stats: Ẩn thông tin nâng cao
+    Stats:
+      CodecsVideoAudio: 'Codec: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
+      CodecsVideoAudioNoItags: 'Codec: {videoCodec} / {audioCodec}'
+      Bandwidth: 'Băng thông: {bandwidth} kbps'
+      Resolution: 'Độ phân ảnh: {width}x{height}@{frameRate}'
+      Player Dimensions: 'Kích thước trình xem: {width}x{height}'
+      CodecAudio: 'Codec: {audioCodec} ({audioItag})'
+      Bitrate: 'Tốc độ bit: {bitrate} kbps'
+      Volume: 'Âm lượng: {volumePercentage}%'
+      Buffered: 'Đã tải trước: {bufferedPercentage}%'
+      Video ID: 'ID video: {videoId}'
+      Stats: Thông tin nâng cao
+      Media Formats: 'Định dạng: {formats}'
+      Dropped Frames / Total Frames: 'Khung bị bỏ: {droppedFrames} / tổng số khung:
+        {totalFrames}'
+    Skipped segment: Đã bỏ qua phân đoạn {segmentCategory}
+    You appear to be offline: Bạn có vẻ đang offline.
+    Playback will resume automatically when your connection comes back: Trình phát
+      sẽ tự động tiếp tục khi bạn kết nối trở lại.
+    TranslatedCaptionTemplate: '{language} (được dịch từ "{originalLanguage}")'
+    Audio Tracks: Rãnh âm thanh
+    Theatre Mode: Chế độ rạp hát
+    Exit Theatre Mode: Thoát chế độ rạp hát
+    Full Window: Toàn màn hình
+    Exit Full Window: Thoát toàn màn hình
+    Take Screenshot: Chụp ảnh màn hình
+  MembersOnly: Các video trả phí không thể được xem qua FreeTube vì chúng yêu cầu
+    đăng nhập qua một tài khoản Google có đăng kí trả phí với kênh đã đăng các video
+    đó.
+  AgeRestricted: Các video giới hạn độ tuổi không thể được xem qua FreeTube vì chúng
+    yêu cầu đăng nhập qua Google và sử dụng một tài khoản YouTube đã được xác minh
+    độ tuổi.
+  IP block: YouTube đang chặn địa chị IP của bạn khỏi việc xem video. Hãy thử sử dụng
+    một VPN hoặc proxy khác.
+  DeArrow:
+    Show Modified Details: Hiện thông tin đã sửa đổi
+    Show Original Details: Hiện thông tin gốc
 Videos:
   #& Sort By
   Sort By:
@@ -868,16 +870,23 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Xem danh sách phát hoàn chỉnh'
-  Videos: 'Video'
-  View: 'Lượt xem'
-  Views: 'Lượt xem'
   Last Updated On: 'Update lần cuối vào'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Danh sách phát
-Toggle Theatre Mode: 'Chuyển đổi chế độ rạp hát'
+  Sort By:
+    VideoDurationAscending: Thời lượng (Ngắn nhất trước)
+    DateAddedOldest: Thêm vào cũ nhất
+    AuthorDescending: Tác giả (Z-A)
+    VideoTitleAscending: Tiêu đề (A-Z)
+    VideoDurationDescending: Thời lượng (Dài nhất trước)
+    Custom: Tùy chỉnh
+    AuthorAscending: Tác giả (A-Z)
+    Sort By: Sắp xếp theo
+    DateAddedNewest: Thêm vào gần đây nhất
+    VideoTitleDescending: Tiêu đề (Z-A)
 Change Format:
   Change Media Formats: 'Chuyển đổi định dạng video'
   Use Dash Formats: 'Sử dụng định dạng DASH'
@@ -887,6 +896,8 @@ Change Format:
     cho video này
   Dash formats are not available for this video: Định dạng DASH không có sẵn cho video
     này
+  Legacy formats are not available for this video: Định dạng legacy không có sẵn cho
+    video này
 Share:
   Share Video: 'Chia sẻ video'
   Share Playlist: 'Chia sẻ danh sách phát'
@@ -925,12 +936,14 @@ Comments:
   There are no more comments for this video: Không có bình luận cho video này
   Member: Thành viên
   From {channelName}: từ {channelName}
-  And others: Và những thứ khác
+  And others: và những người khác
   Pinned by: Được ghim bởi
   Show More Replies: Hiện thêm câu trả lời
   View {replyCount} replies: Hiển thị {replyCount} câu trả lời
-  Hearted: Thả Tim
+  Hearted: Đã thả tim
   Subscribed: Đã đăng ký
+  There are no comments available for this post: Không có bình luận nào cho bài đăng
+    này
 Up Next: 'Tiếp theo'
 
 # Toast Messages
@@ -938,8 +951,6 @@ Local API Error (Click to copy): 'Local API lỗi (Nhấn để copy)'
 Invidious API Error (Click to copy): 'Invidious API lỗi (Nhấn để copy)'
 Falling back to Invidious API: 'Quay trở về Invidious API'
 Falling back to Local API: 'Quay trở về local API'
-Subscriptions have not yet been implemented: 'Danh sách đăng kí hiện chưa được áp
-  đặt'
 Loop is now disabled: 'Lặp lại hiện đã tắt'
 Loop is now enabled: 'Lặp lại hiện đã bật'
 Shuffle is now disabled: 'Xáo trộn hiện đã tắt'
@@ -996,7 +1007,7 @@ Profile:
   All Channels: Tất cả kênh
   Profile Select: Chọn hồ sơ
   Profile Filter: Bộ lọc hồ sơ
-  Profile Settings: Cài đặt hồ sơ
+  Profile Settings: Hồ sơ
   Toggle Profile List: Mở/đóng danh sách hồ sơ
   Edit Profile Name: Chỉnh sửa tên hồ sơ
   Profile Name: Tên hồ sơ
@@ -1020,9 +1031,7 @@ Channels:
   Title: Danh sách kênh
   Search bar placeholder: Tìm kênh
   Empty: Danh sách kênh của bạn hiện đang trống.
-  Unsubscribed: '{channelName} đã bị xoá khỏi danh sách kênh đã đăng ký của bạn'
   Unsubscribe Prompt: Bạn có chắc răng bạn muốn huỷ đăng ký kênh "{channelName}"?
-  Unsubscribe: Huỷ đăng ký
   Count: '{number} kênh đã tìm được.'
 Tooltips:
   General Settings:
@@ -1041,6 +1050,9 @@ Tooltips:
       lệnh API.
     Region for Trending: Xu hướng khu vực cho phép bạn chọn các video thịnh hành của
       quốc gia mà bạn muốn hiển thị.
+    Open Deep Links In New Window: Các URL được truyền đến FreeTube, chẳng hạn như
+      thông qua các trình mở rộng trình duyệt tự động chuyển hướng hay đối số khị
+      mở qua dòng lệnh, sẽ được mở trên một cửa sổ mới.
   Player Settings:
     Proxy Videos Through Invidious: Sẽ kết nối với Invidious để cung cấp video thay
       vì kết nối trực tiếp với YouTube.
@@ -1056,9 +1068,8 @@ Tooltips:
     Skip by Scrolling Over Video Player: Sử dụng con lăn chuột để bỏ qua video, kiểu
       MPV.
   External Player Settings:
-    Custom External Player Arguments: Bất kỳ tham số dòng lệnh tùy chỉnh nào, được
-      phân tách bằng dấu chấm phẩy (';'), bạn muốn được chuyển đến trình phát bên
-      ngoài.
+    Custom External Player Arguments: Bất kỳ tham số dòng lệnh tùy chỉnh nào, bạn
+      muốn được chuyển đến trình phát bên ngoài.
     Custom External Player Executable: Theo mặc định, FreeTube sẽ giả định rằng trình
       phát bên ngoài đã chọn có thể được tìm thấy thông qua biến môi trường PATH.
       Nếu cần, bạn có thể đặt một đường dẫn tuỳ chọn ở đây.
@@ -1069,11 +1080,14 @@ Tooltips:
       video (danh sách phát nếu được hỗ trợ) trong trình phát bên ngoài, trên hình
       thu nhỏ của video. Cảnh báo, cài đặt Invidious không ảnh hưởng đến trình phát
       bên ngoài.
+    Ignore Default Arguments: Không gửi các tham số mặc định đến trình phát bên ngoài
+      ngoài URL của video (như tốc độ phát, URL danh sách phát, v.v.). Các tham số
+      tùy chỉnh vẫn sẽ được gửi.
   Subscription Settings:
     Fetch Feeds from RSS: Khi được bật lên, FreeTube sẽ sử dụng RSS thay vì phương
       thức mặc định để lấy nguồn cấp dữ liệu đăng ký của bạn. RSS nhanh hơn và tránh
-      việc bị chặn IP, nhưng không cung cấp thông tin nhất định như thời lượng video
-      hoặc trạng thái phát trực tiếp
+      việc bị chặn IP, nhưng không cung cấp thông tin nhất định như thời lượng video,
+      trạng thái phát trực tiếp hoặc các bài đăng cộng đồng
     Fetch Automatically: Khi được bật, FreeTube sẽ tự động tìm nạp nguồn cấp dữ liệu
       đăng ký của bạn khi cửa sổ mới được mở và khi chuyển đổi hồ sơ.
   Distraction Free Settings:
@@ -1082,14 +1096,16 @@ Tooltips:
       đề xuất. Tên kênh đã nhập phải khớp hoàn toàn và có phân biệt chữ hoa chữ thường.
     Hide Subscriptions Live: Cài đặt này bị ghi đè bởi cài đặt "{appWideSetting}"
       trên toàn ứng dụng, trong phần "{subsection}" của "{settingsSection}"
+    Hide Videos and Playlists Containing Text: Nhập một từ khóa hoặc cụm từ (không
+      phân biết hoa thường) để ẩn các video & danh sách phát có tiêu đề gốc chứa các
+      mục đó khỏi FreeTube, ngoại trừ các video trong Lịch sử, các danh sách phát
+      của bạn, và video trong các danh sách phát.
   SponsorBlock Settings:
     UseDeArrowThumbnails: Thay thế thumbnail video bằng thumbnail gửi từ DeArrow.
     UseDeArrowTitles: Thay thế tiêu đề video bằng tiêu đề do người dùng gửi từ DeArrow.
   Experimental Settings:
     Replace HTTP Cache: Tắt bộ nhớ đệm HTTP dựa trên đĩa của Electron và bật bộ nhớ
       đệm hình ảnh trong bộ nhớ tùy chỉnh. Sẽ dẫn đến việc sử dụng RAM tăng lên.
-Hashtags have not yet been implemented, try again later: Thẻ hashtag chưa thể dùng
-  được, hãy thử lại sau
 Playing Next Video Interval: Phát video tiếp theo ngay lập tức. Nhấn vào để hủy. |
   Phát video tiếp theo sau {nextVideoInterval} giây nữa. Nhấn vào để hủy. | Phát video
   tiếp theo sau {nextVideoInterval} giây. Nhấn vào để hủy.
@@ -1118,6 +1134,7 @@ Chapters:
   Chapters: Chương
   'Chapters list hidden, current chapter: {chapterName}': 'Danh sách các chương bị
     ẩn, chương hiện tại: {chapterName}'
+  Key Moments: Khoảnh khắc chính
 Channel Unhidden: '{channel} đã bị xóa khỏi bộ lọc kênh'
 Tag already exists: Thẻ "{tagName}" đã tồn tại
 Hashtag:
@@ -1135,3 +1152,41 @@ Playlist will pause when current video is finished: Danh sách phát sẽ tạm
   video hiện tại kết thúc
 Trimmed input must be at least N characters long: Dữ liệu nhập bị cắt bớt phải dài
   ít nhất 1 ký tự | Dữ liệu nhập bị cắt bớt phải dài ít nhất {length} ký tự
+Feed:
+  Refresh Feed: Tải lại {subscriptionName}
+  Feed Last Updated: 'Lần cuối cập nhật {feedName}: {date}'
+Search Listing:
+  Label:
+    4K: 4K
+    Subtitles: Có phụ đề
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: Mới
+    3D: 3D
+    Closed Captions: Có phụ đề
+'Blocked opening potentially unsafe URL': 'Đã chặn mở URL tiềm ẩn không an toàn: "{url}".'
+Search character limit: Chuỗi tìm kiếm vượt quá độ dài {searchCharacterLimit} ký tự
+  cho phép
+Yes, Open Link: Có, mở liên kết
+Cancel: Hủy bỏ
+Moments Ago: vừa xong
+Yes, Delete: Có, xóa đi
+Display Label: '{label}: {value}'
+checkmark: ✓
+Yes, Restart: Có, khởi đông lại đi
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: Mũi tên xuống
+  arrowleft: Mũi tên trái
+  arrowright: Mũi tên phải
+  arrowup: Mũi tên lên
+Right-click or hold to see history: Giữ hoặc nhấn chuột phải để xem lịch sử
+Autoplay Interruption Timer: Tự động phát bị hủy do không có hành động trong {autoplayInterruptionIntervalHours}
+  giờ
+Description:
+  Expand Description: '...thêm'
+  Collapse Description: Ẩn bớt
diff --git a/static/locales/vls.yaml b/static/locales/vls.yaml
index b80e004668385..157d1c32c1590 100644
--- a/static/locales/vls.yaml
+++ b/static/locales/vls.yaml
@@ -145,8 +145,6 @@ Channels:
   Search bar placeholder: ''
   Count: ''
   Empty: ''
-  Unsubscribe: ''
-  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
   Trending: ''
@@ -162,8 +160,6 @@ Feed:
 Playlists: ''
 User Playlists:
   Your Playlists: ''
-  Playlist Message: ''
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   You have no playlists. Click on the create new playlist button to create a new one.: ''
   Empty Search Message: ''
   Search bar placeholder: ''
@@ -271,7 +267,6 @@ History:
 Settings:
   # On Settings Page
   Settings: ''
-  Expand All Settings Sections: ''
   Sort Settings Sections (A-Z): ''
   The app needs to restart for changes to take effect. Restart and apply change?: ''
   General Settings:
@@ -464,9 +459,7 @@ Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
-    Manage Subscriptions: ''
     Fetch Automatically: ''
-    Only Show Latest Video for Each Channel: ''
     Confirm Before Unsubscribing: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -520,7 +513,6 @@ Settings:
     Subscription File: ''
     History File: ''
     Playlist File: ''
-    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: ''
     Export YouTube: ''
@@ -784,39 +776,10 @@ Video:
   video only: ''
   audio only: ''
   Published:
-    Jan: ''
-    Feb: ''
-    Mar: ''
-    Apr: ''
-    May: ''
-    Jun: ''
-    Jul: ''
-    Aug: ''
-    Sep: ''
-    Oct: ''
-    Nov: ''
-    Dec: ''
-    Second: ''
-    Seconds: ''
-    Minute: ''
-    Minutes: ''
-    Hour: ''
-    Hours: ''
-    Day: ''
-    Days: ''
-    Week: ''
-    Weeks: ''
-    Month: ''
-    Months: ''
-    Year: ''
-    Years: ''
-    Ago: ''
-    Upcoming: ''
     In less than a minute: ''
   Published on: ''
   Streamed on: ''
   Started streaming on: ''
-  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -879,9 +842,6 @@ Playlist:
   #& About
   Playlist: ''
   View Full Playlist: ''
-  Videos: ''
-  View: ''
-  Views: ''
   Last Updated On: ''
   Sort By:
     Sort By: ''
@@ -896,7 +856,6 @@ Playlist:
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -1001,9 +960,7 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
-Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index cd92b76a21a1a..f00d217f4a194 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -98,7 +98,7 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: '订阅'
   Latest Subscriptions: '最新订阅'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的订阅列表目前是空的。在这里开始添加订阅。'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的订阅列表目前是空的。如果想要导入订阅，可以转到“数据设置”并选择“导入订阅”，或者搜索频道并订阅。'
   'Getting Subscriptions.  Please wait.': '获取订阅中。 请稍等。'
   Refresh Subscriptions: 刷新订阅
   Getting Subscriptions. Please wait.: 获取订阅中。 请稍候。
@@ -124,11 +124,8 @@ Most Popular: '最流行'
 Playlists: '播放列表'
 User Playlists:
   Your Playlists: '您的播放列表'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 您未保存视频。点击视频角落的“保存”按钮保存视频
-  Playlist Message: 本页面不代表功能完备的播放列表。它只列举您保存或喜爱的播放列表。当项目完成时，本页面的所有视频将会迁移到“最喜爱”播放列表。
   Search bar placeholder: 搜索播放列表
   Empty Search Message: 此播放列表中没有匹配你搜索的视频
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: 你确定要从此播放列表删除所有已观看的视频吗？此操作无法撤销。
   AddVideoPrompt:
     Search in Playlists: 在播放列表中搜索
     Save: 保存
@@ -163,7 +160,6 @@ User Playlists:
       "{videoCount} video(s) have been removed": 1 则视频已被删除 | {videoCount} 则视频已被删除
       This video cannot be moved down.: 无法下移此视频。
       This playlist is now used for quick bookmark: 此播放列表现用于快速添加书签
-      Quick bookmark disabled: 停用了快速添加书签
       Reverted to use {oldPlaylistName} for quick bookmark: 恢复到使用播放列表 {oldPlaylistName}
         进行快速添加书签操作
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: 此播放列表现用于快速添加书签，而非
@@ -171,6 +167,8 @@ User Playlists:
       This playlist is already being used for quick bookmark.: 此播放列表已被用于快速书签。
       Playlist {playlistName} is the new quick bookmark playlist.: 播放列表 {playlistName}
         是新的快速书签播放列表。
+      This playlist has a video with a duration error: 此播放列表包含至少一个没有持续时间的视频，排序时将按照持续时间为
+        0 对待此视频。
     Search for Videos: 搜索视频
   Are you sure you want to delete this playlist? This cannot be undone: 你确定要删除此播放列表吗？此操作无法撤销。
   Sort By:
@@ -208,7 +206,6 @@ User Playlists:
   Add to Favorites: 添加到播放列表 {playlistName}
   Enable Quick Bookmark With This Playlist: 开启使用此播放列表来快速添加书签
   Remove from Favorites: 从播放列表 {playlistName} 删除
-  Disable Quick Bookmark: 停用快速添加书签
   Playlists with Matching Videos: 有匹配视频的播放列表
   Quick Bookmark Enabled: 启用了快速书签
   Cannot delete the quick bookmark target playlist.: 无法删除快速书签目标播放列表。
@@ -217,6 +214,8 @@ User Playlists:
     1 个已观看视频吗？此操作无法撤销。 | 你确定要从此播放列表删除 {playlistItemCount} 个已观看视频吗？此操作无法撤销。
   Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: 你确定要从此播放列表中删除
     1 个重复视频吗？无法撤销删除。| 你确定要从此播放列表中删除 {playlistItemCount} 个重复视频吗？无法撤销删除。
+  Export Playlist: 导出播放清单
+  The playlist has been successfully exported: 成功导出播放清单
 History:
   # On History Page
   History: '历史记录'
@@ -229,7 +228,7 @@ Settings:
   # On Settings Page
   Settings: '设置'
   General Settings:
-    General Settings: '常规设置'
+    General Settings: '常规'
     Fallback to Non-Preferred Backend on Failure: '失败时回撤到非首选后端'
     Enable Search Suggestions: '允许搜索建议'
     Default Landing Page: '默认加载页面'
@@ -250,7 +249,6 @@ Settings:
       End: '结尾'
       Hidden: 隐藏缩略图
       Blur: 模糊
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious实例（默认https://invidious.snopyta.org）'
     Region for Trending: '热门区域'
         #! List countries
     Check for Updates: 检查更新
@@ -271,8 +269,9 @@ Settings:
     Auto Load Next Page:
       Label: 自动加载下一页
       Tooltip: 自动加载额外页面和评论。
+    Open Deep Links In New Window: 在新窗口打开传递到 FreeTube 的 URL
   Theme Settings:
-    Theme Settings: '主题设置'
+    Theme Settings: '主题'
     Match Top Bar with Main Color: '顶部菜单栏对应主颜色'
     Base Theme:
       Base Theme: '基本主题'
@@ -287,6 +286,8 @@ Settings:
       Nordic: Nordic
       Solarized Light: 日照白
       Solarized Dark: 日照黑
+      Gruvbox Dark: Gruvbox Dark
+      Gruvbox Light: Gruvbox Light
     Main Color Theme:
       Main Color Theme: '主题色'
       Red: '红'
@@ -334,6 +335,16 @@ Settings:
       Solarized Red: 日照红
       Solarized Blue: 日照蓝
       Solarized Violet: 日照紫
+      Gruvbox Dark Aqua: Gruvbox 深蓝绿
+      Gruvbox Light Red: Gruvbox 浅红
+      Gruvbox Light Blue: Gruvbox 浅蓝
+      Gruvbox Light Purple: Gruvbox 浅紫
+      Gruvbox Dark Yellow: Gruvbox 深黄
+      Gruvbox Dark Blue: Gruvbox 深蓝
+      Gruvbox Dark Purple: Gruvbox 深紫
+      Gruvbox Light Orange: Gruvbox 浅橙
+      Gruvbox Dark Green: Gruvbox 深绿
+      Gruvbox Dark Orange: Gruvbox 深橙
     Secondary Color Theme: '次主题色'
         #* Main Color Theme
     UI Scale: UI缩放
@@ -342,8 +353,7 @@ Settings:
     Hide Side Bar Labels: 隐藏侧边栏标签
     Hide FreeTube Header Logo: 隐藏 FreeTube 标题徽标
   Player Settings:
-    Player Settings: '播放器选项'
-    Remember History: '记住历史'
+    Player Settings: '播放器'
     Play Next Video: '播放下一视频'
     Turn on Subtitles by Default: '默认开启字幕'
     Autoplay Videos: '自动播放视频'
@@ -370,7 +380,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: 播放列表 下一个影片时间间隔
-    Next Video Interval: 下个视频的间隔时间
+    Next Video Interval: 自动播放倒计时器
     Display Play Button In Video Player: 在视频播放器上显示播放按钮
     Scroll Volume Over Video Player: 在视频播放器上滑动音量
     Fast-Forward / Rewind Interval: 快进/快退间隔
@@ -392,50 +402,22 @@ Settings:
       Folder Label: 截屏文件夹
     Enter Fullscreen on Display Rotate: 屏幕旋转时进入全屏
     Skip by Scrolling Over Video Player: 从视频播放器一侧滚动到另一侧来跳过视频
+    Autoplay Interruption Timer: 自动播放中断计时器
   Subscription Settings:
-    Subscription Settings: '订阅设置'
+    Subscription Settings: '订阅'
     Hide Videos on Watch: '观看时隐藏视频'
-    Subscriptions Export Format:
-      Subscriptions Export Format: '导出订阅格式'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: '管理订阅'
-    Import Subscriptions: '导入订阅'
-    Export Subscriptions: '导出订阅'
-    How do I import my subscriptions?: '如何导入我的订阅？'
     Fetch Feeds from RSS: 从RSS摘取推送
     Fetch Automatically: 自动抓取订阅源
-    Only Show Latest Video for Each Channel: 只显示每个频道的最新视频
     Confirm Before Unsubscribing: 避免意外取消订阅
-  Advanced Settings:
-    Advanced Settings: '高级设置'
-    Enable Debug Mode (Prints data to the console): '允许调试模式（打印数据在控制板）'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': '代理地址（例如：SOCKS5://127.0.0.1:9050）'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '点击“测试代理”键将发送请求给https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: '用Tor / 代理给API呼叫'
-    TEST PROXY: '测试代理'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: '显示公共实例'
-    Clear History:
-      Clear History: '清除历史记录'
-      # On Click
-      Are you sure you want to delete your history?: '您确认想删除您的历史记录？'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: '清除订阅'
-      # On Click
-      Are you sure you want to remove all subscriptions?: '您确定想移除所有订阅？'
-      #& Yes
-      #& No
 
+    'Limit the number of videos displayed for each channel': 限制每个频道展示的视频数
+    To: 到
   Privacy Settings:
     Are you sure you want to remove your entire watch history?: 您确认想移除您的全部观看历史记录？
     Are you sure you want to clear out your search cache?: 您确定想清除您的搜索缓存？
     Save Watched Progress: 保存观看进度
     Remember History: 记住历史记录
-    Privacy Settings: 隐私设置
+    Privacy Settings: 隐私
     Watch history has been cleared: 观看历史记录已清除
     Remove Watch History: 移除观看历史记录
     Search cache has been cleared: 搜索缓存已清除
@@ -467,14 +449,10 @@ Settings:
     Export YouTube: 导出YouTube
     Export FreeTube: 导出FreeTube
     Export Subscriptions: 导出订阅
-    Import NewPipe: 导入NewPipe
-    Import YouTube: 导入YouTube
-    Import FreeTube: 导入FreeTube
     Import Subscriptions: 导入订阅
     Select Export Type: 选择导出类型
     Select Import Type: 选择导入类型
-    Data Settings: 数据设置
-    Check for Legacy Subscriptions: 检查传统订阅
+    Data Settings: 数据
     Manage Subscriptions: 管理订阅
     Import Playlists: 导入播放列表
     Export Playlists: 导出播放列表
@@ -498,7 +476,7 @@ Settings:
     Hide Channel Subscribers: 隐藏频道订阅者
     Hide Video Likes And Dislikes: 隐藏视频喜欢与不喜欢
     Hide Video Views: 隐藏视频观看数量
-    Distraction Free Settings: 零打扰设置
+    Distraction Free Settings: 零打扰
     Hide Active Subscriptions: 隐藏活跃的订阅
     Hide Playlists: 隐藏播放列表
     Hide Live Streams: 隐藏直播
@@ -511,22 +489,21 @@ Settings:
     Hide Channels Placeholder: 频道ID
     Display Titles Without Excessive Capitalisation: 去除标题中对字母大写和标点符号的过度使用
     Hide Featured Channels: 隐藏精选频道
-    Hide Channel Playlists: 隐藏频道播放列表
-    Hide Channel Community: 隐藏频道社区
-    Hide Channel Shorts: 隐藏频道短视频
+    Hide Channel Playlists: 隐藏频道“播放列表”标签
+    Hide Channel Community: 隐藏频道“社区”标签
+    Hide Channel Shorts: 隐藏频道“短视频”标签
     Sections:
       Side Bar: 侧边栏
       Channel Page: 频道页
       Watch Page: 观看页
       General: 常规
       Subscriptions Page: 订阅页
-    Hide Channel Podcasts: 隐藏频道播客
-    Hide Channel Releases: 隐藏频道发布
+    Hide Channel Podcasts: 隐藏频道“播客”标签
+    Hide Channel Releases: 隐藏频道“发布”标签
     Hide Subscriptions Shorts: 隐藏订阅短视频
     Hide Subscriptions Videos: 隐藏订阅视频
     Hide Subscriptions Live: 隐藏订阅直播
     Hide Profile Pictures in Comments: 在评论中隐藏个人资料图片
-    Blur Thumbnails: 模糊缩略图
     Hide Subscriptions Community: 隐藏订阅社区
     Hide Channels Invalid: 提供的频道 ID 无效
     Hide Channels Disabled Message: 使用 ID 屏蔽了某些频道，这些频道未被处理。当这些 ID 在升级时，功能被停用
@@ -534,11 +511,12 @@ Settings:
     Hide Channels API Error: 获取 ID 为所提供值的用户出错。请再次检查 ID 是否正确。
     Hide Videos and Playlists Containing Text: 隐藏包含文本的视频和播放列表
     Hide Videos and Playlists Containing Text Placeholder: 单词、单词片段或词组
+    Hide Channel Home: 隐藏频道“主页”标签
   The app needs to restart for changes to take effect. Restart and apply change?: 应用需要重启让修改生效。重启以应用修改？
   Proxy Settings:
     Proxy Protocol: 代理协议
     Enable Tor / Proxy: 使用Tor/代理
-    Proxy Settings: 代理设置
+    Proxy Settings: 代理
     Error getting network information. Is your proxy configured properly?: 获取网络信息错误。您的代理配置是否正确？
     City: 城市
     Region: 地区
@@ -549,12 +527,14 @@ Settings:
     Clicking on Test Proxy will send a request to: 点击测试代理将会发送一个请求给
     Proxy Port Number: 代理端口号
     Proxy Host: 代理主机
+    Proxy Warning: FreeTube 没有内置的代理，但可以连接到外部代理，例如像 Tor 这样运行在你机器上的代理，或者如某些 VPN 提供的
+      SOCKS5 代理这样的外部代理。如果开启了代理选项，请确保你的代理/Tor 正确配置，否则 FreeTube 无法获取任何数据。
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: 当赞助商时间被跳过时通知
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 赞助商区域调用的API地址（默认是
       https://sponsor.ajay.app）
     Enable SponsorBlock: 开启赞助商区域
-    SponsorBlock Settings: 赞助商区域设置
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Auto Skip: 自动跳过
       Show In Seek Bar: 显示在查找栏中
@@ -571,25 +551,25 @@ Settings:
     Custom External Player Executable: 自定义外部播放器的可执行文件
     Ignore Unsupported Action Warnings: 忽略不支持的行为的警告
     External Player: 外部播放器
-    External Player Settings: 外部播放器设置
+    External Player Settings: 外部播放器
     Players:
       None:
         Name: 无
     Ignore Default Arguments: 忽略默认变量
   Download Settings:
-    Download Settings: 下载设置
+    Download Settings: 下载
     Ask Download Path: 询问下载路径
     Choose Path: 选择路径
     Download in app: 应用内下载
     Open in web browser: 在网络浏览器内打开
     Download Behavior: 下载行为
   Parental Control Settings:
-    Parental Control Settings: 家长控制设置
+    Parental Control Settings: 家长控制
     Show Family Friendly Only: 仅显示“家庭友好”视频
     Hide Search Bar: 隐藏搜索栏
     Hide Unsubscribe Button: 隐藏“取消订阅”按钮
   Experimental Settings:
-    Experimental Settings: 实验性设置
+    Experimental Settings: 实验性
     Warning: 这些设置是实验性的，启用可能导致崩溃。强烈建议进行备份。使用风险自负！
     Replace HTTP Cache: 替换 HTTP 缓存
   Password Dialog:
@@ -598,36 +578,16 @@ Settings:
     Password Incorrect: 密码不正确
     Unlock: 解锁
   Password Settings:
-    Password Settings: 密码设置
+    Password Settings: 密码
     Set Password To Prevent Access: 设置密码防止访问设置
     Set Password: 设置密码
     Remove Password: 删除密码
-  Expand All Settings Sections: 展开所有设置部分
   Sort Settings Sections (A-Z): 对设置部分进行排序（A-Z）
+  Return to Settings Menu: 返回设置菜单
 About:
   #On About page
   About: '关于'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': '这个自由软件发布在AGPL-3.0自由许可证下。'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    发现bug？想建议新功能？想帮助？查看我们的GitHub页面。 欢迎pull requests。
-
-  Thank you very much to the People and Projects that make FreeTube possible!: '非常感谢让FreeTube变得有可能的人和项目！'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '想聊天？加入我们的Element
-    / Matrix服务器。加入前请检查规则。'
-
-  'Looking for help? Check out our Wiki page.': '寻求帮助？查看我们的Wiki页面。'
-
-  Check out our Firefox extension!: '查看我们的Firefox插件！'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': '如果您喜欢使用FreeTube，考虑通过Liberapay或者Bitcoin地址捐赠。'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: '最新FreeTube新闻'
-
 #On Channel Page
   Source code: 源代码
   Beta: 测试版
@@ -644,8 +604,6 @@ About:
   FreeTube Wiki: FreeTube维基
   Help: 说明
   GitHub releases: GitHub 版本
-  View License: 查看授权
-  Licensed under the AGPLv3: 以 AGPLv3 协议授权
   Please check for duplicates before posting: 请在发布前检查是否与现有问题重复
   GitHub issues: Github 问题
   Report a problem: 报告问题
@@ -657,8 +615,6 @@ About:
   Licensed under the: 许可依据
   AGPLv3: AGPLv3
 Channel:
-  Subscriber: '订阅者'
-  Subscribers: '订阅者'
   Subscribe: '订阅'
   Unsubscribe: '取消订阅'
   Search Channel: '搜索频道'
@@ -716,6 +672,9 @@ Channel:
   Releases:
     Releases: 发布
     This channel does not currently have any releases: 此频道当前无任何发布
+  Home:
+    Home: 主页
+    View Playlist: 查看播放列表
 Video:
   Open in YouTube: '在YouTube中打开'
   Copy YouTube Link: '复制YouTube链接'
@@ -736,38 +695,8 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': '在线聊天目前不被Invidious
     API支持。 需要直接连接YouTube。'
   Published:
-    Jan: '一月'
-    Feb: '二月'
-    Mar: '三月'
-    Apr: '四月'
-    May: '五月'
-    Jun: '六月'
-    Jul: '七月'
-    Aug: '八月'
-    Sep: '九月'
-    Oct: '十月'
-    Nov: '十一月'
-    Dec: '十二月'
-    Second: '秒'
-    Seconds: '秒'
-    Hour: '小时'
-    Hours: '小时'
-    Day: '日'
-    Days: '日'
-    Week: '周'
-    Weeks: '周'
-    Month: '月'
-    Months: '月'
-    Year: '年'
-    Years: '年'
-    Ago: '前'
-    Upcoming: '首映于'
-    Minutes: 分钟
-    Minute: 分钟
-    Less than a minute: 不到一分钟
     In less than a minute: 不到一分钟
   Published on: '发布于'
-  Publicationtemplate: '{number} {unit} 之前'
 #& Videos
   Video has been removed from your history: 视频已从您的历史记录中移除
   Mark As Watched: 标记为已观看
@@ -854,6 +783,13 @@ Video:
     TranslatedCaptionTemplate: '{language} (翻译自 "{originalLanguage}")'
     Exit Theatre Mode: 推出影院模式
     Skipped segment: 跳过了 {segmentCategory} 部分
+  IP block: 你的 IP 地址被 Youtube 禁止观看视频。请试着切换到不同的 VPN 或代理。
+  MembersOnly: 无法用 FreeTube 观看仅供会员的视频，因这些视频需要 Google 登录以及上传者频道的付费会员身份。
+  AgeRestricted: 无法用 FreeTube 观看受限年龄的视频，因这些视频需要 Google 登录并使用验证过年龄的 YouTube 账户。
+  Unlisted: 不公开列出的视频
+  DeArrow:
+    Show Modified Details: 显示修改过的详情
+    Show Original Details: 显示原始详情
 Videos:
   #& Sort By
   Sort By:
@@ -864,9 +800,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '查看完整播放列表'
-  Videos: '视频'
-  View: '观看'
-  Views: '观看'
   Last Updated On: '最后更新于'
 
 # On Video Watch Page
@@ -882,7 +815,8 @@ Playlist:
     VideoTitleDescending: 标题（Z-A)
     Custom: 自定义
     VideoTitleAscending: 标题（A-Z）
-Toggle Theatre Mode: '切换剧场模式'
+    VideoDurationAscending: 持续时间（最短的优先）
+    VideoDurationDescending: 持续时间（最长的优先）
 Change Format:
   Change Media Formats: '更换视频格式'
   Use Dash Formats: '使用Dash格式'
@@ -942,7 +876,6 @@ Local API Error (Click to copy): '本地API错误（点击复制）'
 Invidious API Error (Click to copy): 'Invidious API错误（点击复制）'
 Falling back to Invidious API: '回退到Invidious API'
 Falling back to Local API: '回退到本地API'
-Subscriptions have not yet been implemented: '订阅功能尚未被推行'
 Loop is now disabled: '循环播放现在被禁用'
 Loop is now enabled: '循环播放现在被允许'
 Shuffle is now disabled: '随机播放现在被禁用'
@@ -991,7 +924,7 @@ Profile:
   Select All: 全选
   Other Channels: 其他频道
   Subscription List: 订阅列表
-  Profile Settings: 个人资料设置
+  Profile Settings: 个人资料
   Profile Filter: 个人资料筛选器
   Toggle Profile List: 切换个人资料列表
   Open Profile Dropdown: 打开配置文件下拉菜单
@@ -1023,12 +956,13 @@ Tooltips:
     Preferred API Backend: 选择FreeTube 要用于取得数据的后端。本地API 是内置提取器。Invidious API需要Invidious服务器才能连接。
     Region for Trending: 热门区域让您挑选您想要显示哪个国家的热门视频。
     External Link Handling: "选择单击一个无法在 FreeTube 中打开的链接时触发的默认操作。\n默认情况下，FreeTube 将在您的默认浏览器中打开所点击链接。\n"
+    Open Deep Links In New Window: 在新窗口由浏览器的重定向扩展或命令行变量传递到 FreeTube 的 URL。
   External Player Settings:
     External Player: 选择一个外部播放器将在缩略图上显示一个图标，用于在外部播放器中打开视频(播放列表，如果支持)。警告，Invidious 设置不影响外部播放器。
     Custom External Player Executable: 默认情况下，FreeTube 假设选择的外部播放器可以通过 PATH 环境变量找到。如果需要，可以在这里设置自定义路径。
     Ignore Warnings: 当前外部播放器不支持当前操作时(例如，颠倒播放列表文件顺序)，抑制警告。
     DefaultCustomArgumentsTemplate: "(默认: '{defaultCustomArguments}')"
-    Custom External Player Arguments: 任何你希望传递给外部播放器的用分号(';')分隔的自定义命令行参数。
+    Custom External Player Arguments: 任何你希望传递给外部播放器的自定义命令行参数。
     Ignore Default Arguments: 不要向外部播放器发送除视频 URL 外的任何默认变量（如播放速度、播放列表 URL 等）。自定义变量仍将被传递。
   Experimental Settings:
     Replace HTTP Cache: 禁用 Electron 基于磁盘的 HTTP 缓存，启用自定义内存中图像缓存。会增加内存的使用。
@@ -1047,7 +981,6 @@ Search Bar:
 Are you sure you want to open this link?: 您确定要打开此链接吗？
 Unknown YouTube url type, cannot be opened in app: 未知的 YouTube url 类型，不能在应用程序中打开
 External link opening has been disabled in the general settings: 外部链接打开在常规设置中被禁用
-Hashtags have not yet been implemented, try again later: 话题标签功能尚未实现，请稍后再试
 Default Invidious instance has been set to {instance}: 默认的 Invidious 实例已被设置为 {instance}
 Playing Next Video Interval: 马上播放下一个视频。单击取消。| {nextVideoInterval} 秒内播放下个视频。单击取消。 |
   {nextVideoInterval} 秒内播放下个视频。单击取消。
@@ -1063,11 +996,9 @@ New Window: 新窗口
 Channels:
   Search bar placeholder: 搜索频道
   Count: 找到了 {number} 个频道。
-  Unsubscribe: 取消订阅
   Channels: 频道
   Title: 频道列表
   Empty: 你的频道列表当前为空。
-  Unsubscribed: 从你的订阅里删除了 {channelName}
   Unsubscribe Prompt: 你确定你要取消订阅 "{channelName}" 吗？
 Clipboard:
   Copy failed: 未能复制到剪贴板
@@ -1076,6 +1007,7 @@ Chapters:
   Chapters: 章节
   'Chapters list visible, current chapter: {chapterName}': 章节列表可见，当前章节：{chapterName}
   'Chapters list hidden, current chapter: {chapterName}': 章节列表隐藏，当前章节：{chapterName}
+  Key Moments: 关键时刻
 Preferences: 选项
 Ok: 好
 Hashtag:
@@ -1109,4 +1041,23 @@ Search Listing:
     4K: 4K
     Subtitles: 字幕
     Closed Captions: 隐藏式字幕
+    New: 新的
+    3D: 3D
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
 'Blocked opening potentially unsafe URL': 阻止了打开潜在不安全的 URL： "{url}".
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: 向下箭头 (↓)
+  arrowleft: 向左箭头(←)
+  arrowright: 向右箭头(→)
+  arrowup: 向上箭头 (↑)
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Right-click or hold to see history: 右键单击或静止不动查看历史记录
+Autoplay Interruption Timer: 由于 {autoplayInterruptionIntervalHours} 小时不活跃，自动播放被取消
+Description:
+  Expand Description: '...更多'
+  Collapse Description: 显示较少
diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index e11720beca25d..84ca2cf991a80 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -19,7 +19,7 @@ Toggle Developer Tools: '切換開發者工具'
 Actual size: '實際大小'
 Zoom in: '放大'
 Zoom out: '縮小'
-Toggle fullscreen: '切換至全螢幕'
+Toggle fullscreen: '切換全螢幕'
 Window: '視窗'
 Minimize: '最小化'
 Close: '關閉'
@@ -60,11 +60,11 @@ Search Filters:
     Any Time: '任何時間'
     Last Hour: '最近一小時'
     Today: '今天'
-    This Week: '本周'
+    This Week: '本週'
     This Month: '本月'
     This Year: '今年'
   Type:
-    Type: '類別'
+    Type: '類型'
     All Types: '所有類別'
     Videos: '影片'
     Channels: '頻道'
@@ -98,12 +98,12 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: '訂閱'
   Latest Subscriptions: '最新訂閱'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的訂閱清單目前是空的。在這裡開始新增訂閱。'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的訂閱清單目前是空的。如果您想要匯入您的訂閱，您可以前往「資料設定」，然後選取「匯入訂閱」，或者您也可以搜尋頻道並訂閱。'
   'Getting Subscriptions.  Please wait.': '抓取訂閱中。請稍等。'
   Refresh Subscriptions: 重新整理訂閱內容的影片
   Getting Subscriptions. Please wait.: 正在取得訂閱中，請稍候....
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 這個設定檔有大量訂閱。
-    強制RSS已防止速率限制
+    強制使用 RSS 以防止速率限制
   Load More Videos: 載入更多影片
   Error Channels: 有錯誤的頻道
   Disabled Automatic Fetching: 您已停用自動訂閱擷取。重新整理訂閱以在此處檢視。
@@ -123,8 +123,6 @@ Most Popular: '最受歡迎'
 Playlists: '播放清單'
 User Playlists:
   Your Playlists: '您的播放清單'
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 您播放清單的影片是空的。點擊影片角落的星星按鈕以將其列在此處
-  Playlist Message: 此頁面無法列出完整的播放清單。其僅列出您已儲存或加入最愛的影片。工作完成後，所有目前在此的影片都會轉移到「最愛」播放清單。
   Search bar placeholder: 搜尋播放清單
   Empty Search Message: 此播放清單中沒有與您的搜尋相符的影片
   This playlist currently has no videos.: 此播放清單目前沒有影片。
@@ -166,7 +164,6 @@ User Playlists:
       Playlist {playlistName} has been deleted.: 播放清單 {playlistName} 已刪除。
       This playlist does not exist: 此播放清單不存在
       This playlist is now used for quick bookmark: 此播放清單現在用於快速書籤
-      Quick bookmark disabled: 快速書籤已停用
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: 此播放清單現在用於快速書籤，而非
         {oldPlaylistName}。點擊此處撤銷
       Reverted to use {oldPlaylistName} for quick bookmark: 恢復為使用 {oldPlaylistName}
@@ -174,6 +171,7 @@ User Playlists:
       This playlist is already being used for quick bookmark.: 此播放清單已用於快速書籤。
       Playlist {playlistName} is the new quick bookmark playlist.: 播放清單 {playlistName}
         是新的快速書籤播放清單。
+      This playlist has a video with a duration error: 此播放清單至少包含一個沒有時間長度的影片，則會以時間長度為零的方式排序。
     Search for Videos: 搜尋影片
   AddVideoPrompt:
     Select a playlist to add your N videos to: 選擇要新增影片的播放清單 | 選擇播放清單以將您的 {videoCount}
@@ -203,12 +201,9 @@ User Playlists:
   You have no playlists. Click on the create new playlist button to create a new one.: 您沒有播放清單。按一下建立新播放清單按鈕以建立新的。
   Save Changes: 儲存變更
   Remove Watched Videos: 移除已觀看的影片
-  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: 您確定要從此播放清單中移除所有觀看過的影片嗎？
-    這無法還原。
   Add to Favorites: 新增至 {playlistName}
   Remove from Favorites: 從 {playlistName} 移除
   Enable Quick Bookmark With This Playlist: 啟用此播放清單的快速書籤
-  Disable Quick Bookmark: 停用快速書籤
   Playlists with Matching Videos: 包含相符影片的播放清單
   Quick Bookmark Enabled: 已啟用快速書籤
   Cannot delete the quick bookmark target playlist.: 無法刪除快速書籤目標播放清單。
@@ -217,6 +212,8 @@ User Playlists:
     1 個重複的影片嗎？這無法還原。 | 您確定要從此播放清單中刪除 {playlistItemCount} 個重複影片嗎？這無法還原。
   Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: 您確定要從此播放清單中刪除
     1 個觀看過的影片嗎？這無法還原。 | 您確定要從此播放清單中刪除已觀看的 {playlistItemCount} 個影片嗎？這無法還原。
+  Export Playlist: 匯出此播放清單
+  The playlist has been successfully exported: 播放清單已成功匯出
 History:
   # On History Page
   History: '觀看紀錄'
@@ -229,7 +226,7 @@ Settings:
   # On Settings Page
   Settings: '設定'
   General Settings:
-    General Settings: '一般設定'
+    General Settings: '一般'
     Fallback to Non-Preferred Backend on Failure: '連線失敗時連線到非預設伺服器'
     Enable Search Suggestions: '啟用搜尋建議'
     Default Landing Page: '預設加載頁面'
@@ -250,8 +247,6 @@ Settings:
       End: '片尾'
       Hidden: 隱藏
       Blur: 模糊
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious實例(預設為
-      https://invidious.snopyta.org )'
     Region for Trending: '發燒影片區域'
         #! List countries
     Check for Latest Blog Posts: 檢查最新的部落格貼文
@@ -272,8 +267,9 @@ Settings:
     Auto Load Next Page:
       Tooltip: 自動載入額外頁面與留言。
       Label: 自動載入下一頁
+    Open Deep Links In New Window: 在新視窗中開啟傳遞給 FreeTube 的 URL
   Theme Settings:
-    Theme Settings: '主題設定'
+    Theme Settings: '主題'
     Match Top Bar with Main Color: '頂部功能表欄對應主色彩'
     Base Theme:
       Base Theme: '基本主題'
@@ -288,6 +284,8 @@ Settings:
       Nordic: 北歐
       Solarized Dark: Solarized Dark
       Solarized Light: Solarized Light
+      Gruvbox Dark: Gruvbox 深色
+      Gruvbox Light: Gruvbox 淺色
     Main Color Theme:
       Main Color Theme: '主題色'
       Red: '紅'
@@ -335,6 +333,16 @@ Settings:
       Solarized Blue: Solarized 藍色
       Solarized Cyan: Solarized 青色
       Solarized Green: Solarized 綠色
+      Gruvbox Light Red: Gruvbox 淺紅色
+      Gruvbox Dark Green: Gruvbox 深綠色
+      Gruvbox Dark Yellow: Gruvbox 深黃色
+      Gruvbox Dark Blue: Gruvbox 深藍色
+      Gruvbox Dark Purple: Gruvbox 深紫色
+      Gruvbox Dark Aqua: Gruvbox 深水藍色
+      Gruvbox Dark Orange: Gruvbox 深橘色
+      Gruvbox Light Blue: Gruvbox 淺藍色
+      Gruvbox Light Purple: Gruvbox 淺紫色
+      Gruvbox Light Orange: Gruvbox 淺橘色
     Secondary Color Theme: '次要主題色'
         #* Main Color Theme
     UI Scale: UI縮放
@@ -343,8 +351,7 @@ Settings:
     Hide Side Bar Labels: 隱藏側邊欄標籤
     Hide FreeTube Header Logo: 隱藏 FreeTube 標題圖示
   Player Settings:
-    Player Settings: '播放器選項'
-    Remember History: '記住曆史'
+    Player Settings: '播放器'
     Play Next Video: '播放下一部影片'
     Turn on Subtitles by Default: '預設開啟字幕'
     Autoplay Videos: '自動播放影片'
@@ -371,7 +378,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: 播放清單 下一個影片間隔時間
-    Next Video Interval: 下一個影片區段
+    Next Video Interval: 自動播放倒數計時器
     Scroll Volume Over Video Player: 在影片播放器上捲動以變更音量
     Display Play Button In Video Player: 在影片播放器中顯示播放按鈕
     Fast-Forward / Rewind Interval: 快轉／倒帶間隔
@@ -394,44 +401,16 @@ Settings:
         或 "/" 來建立子資料夾。
     Enter Fullscreen on Display Rotate: 在顯示旋轉時進入全螢幕
     Skip by Scrolling Over Video Player: 捲動影片播放器跳過
+    Autoplay Interruption Timer: 自動播放中斷計時器
   Subscription Settings:
-    Subscription Settings: '訂閱設定'
+    Subscription Settings: '訂閱'
     Hide Videos on Watch: '觀看時隱藏影片'
-    Subscriptions Export Format:
-      Subscriptions Export Format: '導出訂閱格式'
-      #& Freetube
-      Newpipe: 'Newpipe'
-      OPML: 'OPML'
-    Manage Subscriptions: '管理訂閱'
-    Import Subscriptions: '導入訂閱'
-    Export Subscriptions: '導出訂閱'
-    How do I import my subscriptions?: '如何導入我的訂閱？'
     Fetch Feeds from RSS: 從RSS擷取推送
     Fetch Automatically: 自動擷取 Feed
-    Only Show Latest Video for Each Channel: 只顯示每個頻道的最新影片
     Confirm Before Unsubscribing: 避免意外取消訂閱
-  Advanced Settings:
-    Advanced Settings: '進階設定'
-    Enable Debug Mode (Prints data to the console): '允許除錯型態（列印資料在控制板）'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': '代理位址（例如：SOCKS5://127.0.0.1:9050）'
-    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '點擊“測試代理”健將傳送要求給https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: '用Tor / 代理給API呼叫'
-    TEST PROXY: '測試代理'
-    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: '察看公用實例'
-    Clear History:
-      Clear History: '清除曆史紀錄'
-      # On Click
-      Are you sure you want to delete your history?: '您確認想刪除您的曆史紀錄？'
-      #& Yes
-      #& No
-    Clear Subscriptions:
-      Clear Subscriptions: '清除訂閱'
-      # On Click
-      Are you sure you want to remove all subscriptions?: '您確定想移除所有訂閱？'
-      #& Yes
-      #& No
 
+    'Limit the number of videos displayed for each channel': 限制每個頻道顯示的影片數量
+    To: 到
   Privacy Settings:
     Watch history has been cleared: 已刪除觀看紀錄
     Are you sure you want to remove your entire watch history?: 您確定要移除全部的觀看紀錄嗎？
@@ -441,7 +420,7 @@ Settings:
     Clear Search Cache: 清除搜尋快取
     Save Watched Progress: 儲存觀看進度
     Remember History: 儲存觀看紀錄
-    Privacy Settings: 隱私設定
+    Privacy Settings: 隱私
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 您確定要移除所有訂閱與設定檔嗎嗎?  注意:這無法復原。
     Remove All Subscriptions / Profiles: 移除所有訂閱／設定檔
     Save Watched Videos With Last Viewed Playlist: 使用上次觀看的播放清單儲存觀看的影片
@@ -469,14 +448,10 @@ Settings:
     Export YouTube: 匯出YouTube
     Export FreeTube: 匯出FreeTube
     Export Subscriptions: 匯出訂閱
-    Import NewPipe: 匯入NewPipe
-    Import YouTube: 匯入YouTube
-    Import FreeTube: 匯入FreeTube
     Import Subscriptions: 匯入訂閱
     Select Export Type: 選取匯出類型
     Select Import Type: 選取匯入類型
-    Data Settings: 資料設定
-    Check for Legacy Subscriptions: 檢查舊版訂閱
+    Data Settings: 資料
     Manage Subscriptions: 管理訂閱
     Import Playlists: 匯入播放清單
     All playlists has been successfully imported: 所有播放清單都已成功匯入
@@ -492,7 +467,7 @@ Settings:
         啟用此選項後匯出播放清單。\n2. 使用「隱私設定」下的「刪除所有播放清單」選項刪除所有現有播放清單。\n3. 啟動舊版的 FreeTube 並導入匯出的播放清單。”"
   Distraction Free Settings:
     Hide Video Likes And Dislikes: 隱藏影片喜歡與不喜歡
-    Distraction Free Settings: 勿擾設定
+    Distraction Free Settings: 勿擾
     Hide Video Views: 隱藏影片觀看次數
     Hide Popular Videos: 隱藏流行影片
     Hide Trending Videos: 隱藏熱門影片
@@ -512,22 +487,21 @@ Settings:
     Hide Channels: 隱藏頻道中的影片
     Display Titles Without Excessive Capitalisation: 顯示沒有過多大寫與標點符號的標題
     Hide Featured Channels: 隱藏精選頻道
-    Hide Channel Playlists: 隱藏頻道播放清單
-    Hide Channel Community: 隱藏頻道社群
-    Hide Channel Shorts: 隱藏頻道短片
+    Hide Channel Playlists: 隱藏頻道「播放清單」分頁
+    Hide Channel Community: 隱藏頻道「社群」分頁
+    Hide Channel Shorts: 隱藏頻道「短片」分頁
     Sections:
       Side Bar: 側邊欄
       Watch Page: 觀看頁面
       General: 一般
       Channel Page: 頻道頁面
       Subscriptions Page: 訂閱頁面
-    Hide Channel Podcasts: 隱藏頻道 Podcast
-    Hide Channel Releases: 隱藏頻道發布
+    Hide Channel Podcasts: 隱藏頻道「Podcast」分頁
+    Hide Channel Releases: 隱藏頻道「發布」分頁
     Hide Subscriptions Shorts: 隱藏訂閱短片
     Hide Subscriptions Videos: 隱藏訂閱影片
     Hide Subscriptions Live: 隱藏訂閱直播
     Hide Profile Pictures in Comments: 在留言中隱藏個人檔案圖片
-    Blur Thumbnails: 模糊縮圖
     Hide Subscriptions Community: 隱藏訂閱社群
     Hide Channels Invalid: 提供的頻道 ID 無效
     Hide Channels Disabled Message: 某些頻道被使用 ID 封鎖且無法處理。當這些 ID 更新時，功能將會被封鎖
@@ -535,6 +509,8 @@ Settings:
     Hide Channels API Error: 使用提供的 ID 擷取使用者時發生錯誤。請再次檢查 ID 是否正確。
     Hide Videos and Playlists Containing Text: 隱藏包含文字的影片與播放清單
     Hide Videos and Playlists Containing Text Placeholder: 單字、單字片段或片語
+    Hide Channel Home: 隱藏頻道「首頁」分頁
+    Show Added Items: 顯示新增的項目
   The app needs to restart for changes to take effect. Restart and apply change?: 必須重新啟動應用程式以生效。重新啟動並套用變更嗎？
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: 取得網路資訊時發生錯誤。您的代理伺服器設定正確嗎？
@@ -549,13 +525,15 @@ Settings:
     Proxy Host: 代理伺服器主機
     Proxy Protocol: 代理伺服器協定
     Enable Tor / Proxy: 啟用 Tor 或代理伺服器
-    Proxy Settings: 代理伺服器設定
+    Proxy Settings: 代理伺服器
+    Proxy Warning: FreeTube 沒有內建代理伺服器，但可以連線至外部代理伺服器，例如在您的機器上執行的代理伺服器，如 Tor 或外部代理伺服器，如某些
+      VPN 提供的 SOCKS5 代理伺服器。如果啟用，請確定您的代理伺服器/Tor 已經正確設定，否則 FreeTube 將無法取得任何資料。
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: 當贊助商片段被跳過時通知
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       網址（預設為 https://sponsor.ajay.app）
     Enable SponsorBlock: 啟用 SponsorBlock
-    SponsorBlock Settings: SponsorBlock 設定
+    SponsorBlock Settings: SponsorBlock
     Skip Options:
       Skip Option: 略過選項
       Auto Skip: 自動略過
@@ -572,13 +550,13 @@ Settings:
     Custom External Player Executable: 自訂外部播放程式可執行檔
     Ignore Unsupported Action Warnings: 忽略不支援的動作警告
     External Player: 外部播放程式
-    External Player Settings: 外部播放程式設定
+    External Player Settings: 外部播放程式
     Players:
       None:
         Name: 無
     Ignore Default Arguments: 忽略預設引數
   Download Settings:
-    Download Settings: 下載設定
+    Download Settings: 下載
     Ask Download Path: 詢問下載路徑
     Choose Path: 選擇路徑
     Download in app: 在應用程式中下載
@@ -588,65 +566,36 @@ Settings:
     Hide Unsubscribe Button: 隱藏取消訂閱按鈕
     Show Family Friendly Only: 僅顯示適合家庭觀看
     Hide Search Bar: 隱藏搜尋列
-    Parental Control Settings: 家長控制設定
+    Parental Control Settings: 家長控制
   Experimental Settings:
     Replace HTTP Cache: 取代 HTTP 快取
     Warning: 這些設定是實驗性的，它們啟用時可能會導致當機。強烈建議做好備份。使用時風險自負！
-    Experimental Settings: 實驗設定
+    Experimental Settings: 實驗
   Password Settings:
     Set Password To Prevent Access: 設定密碼以防止存取設定
     Remove Password: 移除密碼
-    Password Settings: 密碼設定
+    Password Settings: 密碼
     Set Password: 設定密碼
   Password Dialog:
     Password: 密碼
     Enter Password To Unlock: 輸入密碼以解鎖設定
     Password Incorrect: 密碼不正確
     Unlock: 解鎖
-  Expand All Settings Sections: 展開所有設定
   Sort Settings Sections (A-Z): 對設定區塊進行排序 (A-Z)
+  Return to Settings Menu: 回到設定選單
 About:
   #On About page
   About: '關於'
   #& About
-  'This software is FOSS and released under the GNU Affero General Public License v3.0.': '這個自由軟體發布在AGPL-3.0自由許可證下。'
-
-  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
-    發現bug？想建議新功能？想輔助說明？檢視我們的GitHub頁面。 歡迎pull requests。
-
-  Thank you very much to the People and Projects that make FreeTube possible!: '非常感謝讓FreeTube變得有可能的人和項目！'
-
-  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '想聊天？加入我們的Element
-    / Matrix伺服器。加入前請檢查規則。'
-
-  'Looking for help? Check out our Wiki page.': '尋求輔助說明？檢視我們的Wiki頁面。'
-
-  Check out our Firefox extension!: '檢視我們的Firefox插件！'
-
-  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': '如果您喜歡使用FreeTube，考慮通過Liberapay或者Bitcoin位址捐贈。'
-
-  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
-
-  Latest FreeTube News: '最新FreeTube新聞'
-
 #On Channel Page
-  Translate via Weblate: 透過 Weblate 翻譯
   Website: 網站
-  Source Code: 原始碼
-  Release Notes: 版本註記
   Blog: 部落格
   Credits: 貢獻者
   FAQ: 常見問題
-  Wiki: Wiki
-  Report an Issue: 回報問題
-  Channel Rules: 頻道規則
   Email: 電子郵件
-  License: 授權條款
   Beta: 測試版
   Donate: 捐款
-  Useful Links: 有用連結
   Help: 說明
-  Contact: 聯絡
   these people and projects: 這些人與專案
   FreeTube is made possible by: FreeTube 誕生都要感謝這些人
   Translate: 翻譯
@@ -660,15 +609,11 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub 版本
   Downloads / Changelog: 下載 / 變更紀錄
-  View License: 檢視授權條款
-  Licensed under the AGPLv3: 以 AGPLv3 授權
   Source code: 原始碼
   Discussions: 討論
   Licensed under the: 授權以
   AGPLv3: AGPLv3
 Channel:
-  Subscriber: '訂閱者'
-  Subscribers: '訂閱者'
   Subscribe: '訂閱'
   Unsubscribe: '取消訂閱'
   Search Channel: '搜尋頻道'
@@ -726,6 +671,9 @@ Channel:
   Releases:
     Releases: 發布
     This channel does not currently have any releases: 此頻道目前沒有任何發布
+  Home:
+    Home: 首頁
+    View Playlist: 檢視播放清單
 Video:
   Open in YouTube: '在 YouTube 中開啟'
   Copy YouTube Link: '複製 YouTube 連結'
@@ -746,38 +694,8 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': '直播聊天室目前不被Invidious
     API支援。 需要直接連線YouTube。'
   Published:
-    Jan: '一月'
-    Feb: '二月'
-    Mar: '三月'
-    Apr: '四月'
-    May: '五月'
-    Jun: '六月'
-    Jul: '七月'
-    Aug: '八月'
-    Sep: '九月'
-    Oct: '十月'
-    Nov: '十一月'
-    Dec: '十二月'
-    Second: '秒'
-    Seconds: '秒'
-    Hour: '小時'
-    Hours: '小時'
-    Day: '日'
-    Days: '日'
-    Week: '周'
-    Weeks: '周'
-    Month: '月'
-    Months: '月'
-    Year: '年'
-    Years: '年'
-    Ago: '前'
-    Upcoming: '首播於'
-    Minutes: 分鐘
-    Minute: 分鐘
-    Less than a minute: 少於一分鐘
     In less than a minute: 不到一分鐘內
   Published on: '發布於'
-  Publicationtemplate: '{number} {unit} 前'
 #& Videos
   Video has been removed from your history: 影片已從您的觀看紀錄中移除
   Video has been marked as watched: 影片標記為已觀看
@@ -863,6 +781,13 @@ Video:
     You appear to be offline: 您似乎已離線。
     Playback will resume automatically when your connection comes back: 當您的連線恢復時，將會自動繼續播放。
     Skipped segment: 已跳過 {segmentCategory} 段
+  IP block: YouTube 已封鎖您的 IP 位址，因此無法觀看影片。請嘗試切換到其他 VPN 或代理伺服器。
+  MembersOnly: 會員專屬影片無法使用 FreeTube 觀看，因為這些影片需要 Google 登入並且必須訂閱上傳者的付費頻道。
+  AgeRestricted: 由於需要 Google 登入並使用經過年齡驗證的 YouTube 帳戶，FreeTube 無法觀看有限制年齡的影片。
+  Unlisted: 未公開
+  DeArrow:
+    Show Original Details: 顯示原始詳細資訊
+    Show Modified Details: 顯示修改後的詳細資訊
 Videos:
   #& Sort By
   Sort By:
@@ -873,9 +798,6 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '觀看完整播放清單'
-  Videos: '影片'
-  View: '觀看'
-  Views: '觀看'
   Last Updated On: '最後更新於'
 
 # On Video Watch Page
@@ -891,7 +813,8 @@ Playlist:
     VideoTitleAscending: 標題 (A-Z)
     VideoTitleDescending: 標題 (Z-A)
     Custom: 自訂
-Toggle Theatre Mode: '切換為劇院模式'
+    VideoDurationDescending: 持續時間（最長優先）
+    VideoDurationAscending: 持續時間（最短優先）
 Change Format:
   Change Media Formats: '變更影片格式'
   Use Dash Formats: '使用 DASH 格式'
@@ -910,7 +833,7 @@ Share:
   # On Click
   Invidious URL copied to clipboard: '複製Invidious URL到剪貼簿'
   Invidious Embed URL copied to clipboard: '複製Invidious內嵌URL到剪貼簿'
-  YouTube URL copied to clipboard: '複製YouTube URL到剪下板'
+  YouTube URL copied to clipboard: '複製 YouTube 連結到剪貼簿'
   YouTube Embed URL copied to clipboard: '複製YouTube內嵌URL到剪貼簿'
   Include Timestamp: 包含時間戳
   YouTube Channel URL copied to clipboard: YouTube頻道URL已複製到剪貼簿
@@ -951,7 +874,6 @@ Local API Error (Click to copy): '區域API錯誤（點擊複製）'
 Invidious API Error (Click to copy): 'Invidious API錯誤（點擊複製）'
 Falling back to Invidious API: '回退到Invidious API'
 Falling back to Local API: '回退到區域API'
-Subscriptions have not yet been implemented: '訂閱功能尚未被推行'
 Loop is now disabled: '循環播放現在被停用'
 Loop is now enabled: '循環播放現在被啟用'
 Shuffle is now disabled: '隨機播放現在被停用'
@@ -1001,7 +923,7 @@ Profile:
   Other Channels: 其他頻道
   Subscription List: 訂閱清單
   Profile Filter: 設定檔篩選器
-  Profile Settings: 設定檔設定
+  Profile Settings: 設定檔
   Toggle Profile List: 切換個人檔案清單
   Open Profile Dropdown: 開啟個人資料下拉式選單
   Close Profile Dropdown: 關閉個人資料下拉式選單
@@ -1011,8 +933,8 @@ Profile:
 The playlist has been reversed: 播放清單已反轉
 A new blog is now available, {blogTitle}. Click to view more: 已有新的部落格文章，{blogTitle}。點擊以檢視更多
 Download From Site: 從網站下載
-Version {versionNumber} is now available!  Click for more details: 版本更新囉! 最新版本 {versionNumber}
-  ! 點擊以取得更多資訊
+Version {versionNumber} is now available!  Click for more details: 有新版本！最新版本是 {versionNumber}
+  ！按此取得更多資訊
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 沒有這個影片因為缺少格式。這個可能發生由於國家不可用。
 Tooltips:
   Subscription Settings:
@@ -1034,8 +956,9 @@ Tooltips:
       API 需要 Invidious 伺服器才能連線。
     Region for Trending: 熱門影片區域可以讓您選擇想要顯示哪個國家的熱門影片。
     External Link Handling: "選擇點擊後無法在 FreeTube 中開啟連結時的預設行為。\n預設情況下 FreeTube 將會在您的預設瀏覽器中開啟點擊的連結。\n"
+    Open Deep Links In New Window: 傳遞給 FreeTube 的 URL，例如透過重定向瀏覽器擴充套件或命令列引數，會在新視窗中開啟。
   External Player Settings:
-    Custom External Player Arguments: 任何您想要傳遞給外部播放程式的自訂命令列參數，以半形冒號分隔 (';')。
+    Custom External Player Arguments: 要傳給外部播放器的任何自訂命令列引數。
     Ignore Warnings: 當目前的外部播放程式不支援目前動作時（例如反向播放清單等等），消除警告。
     Custom External Player Executable: 預設情況下，FreeTube 會假設選定的外部播放程式可以透過 PATH 環境變數找到。如果需要的話，請在此設定自訂路徑。
     External Player: 選擇外部播放程式將會在縮圖上顯示圖示，用來在外部播放程式中開啟影片（若支援的話，播放清單也可以）。警告：Invidious
@@ -1055,9 +978,8 @@ Tooltips:
 Playing Next Video Interval: 馬上播放下一個影片。點擊取消。| 播放下一個影片的時間為{nextVideoInterval}秒。點擊取消。|
   播放下一個影片的時間為{nextVideoInterval}秒。點擊取消。
 More: 更多
-Hashtags have not yet been implemented, try again later: 尚未實作主題標籤，請稍後再試
 Unknown YouTube url type, cannot be opened in app: 未知的 YouTube url 類型，無法在應用程式開啟
-Open New Window: 開啟新視窗
+Open New Window: 開新視窗
 Default Invidious instance has been cleared: 預設 Invidious 站台已被清除
 Default Invidious instance has been set to {instance}: 預設 Invidious 站台已被設定為 {instance}
 Search Bar:
@@ -1074,11 +996,9 @@ Channels:
   Channels: 頻道
   Title: 頻道清單
   Search bar placeholder: 搜尋頻道
-  Unsubscribe: 取消訂閱
   Count: 找到 {number} 個頻道。
   Empty: 您的頻道清單目前為空。
   Unsubscribe Prompt: 您確定您想要從「{channelName}」取消訂閱嗎？
-  Unsubscribed: '{channelName} 已從您的訂閱移除'
 Clipboard:
   Copy failed: 複製到剪貼簿失敗
   Cannot access clipboard without a secure connection: 無法在沒有安全連線的情況下存取剪貼簿
@@ -1086,6 +1006,7 @@ Chapters:
   Chapters: 章節
   'Chapters list visible, current chapter: {chapterName}': 章節清單可見，目前章節：{chapterName}
   'Chapters list hidden, current chapter: {chapterName}': 章節清單已隱藏，目前章節：{chapterName}
+  Key Moments: 重要時刻
 Preferences: 偏好設定
 Ok: 確定
 Hashtag:
@@ -1119,4 +1040,23 @@ Search Listing:
     4K: 4K
     Subtitles: 字幕
     Closed Captions: 隱藏式字幕
+    8K: 8K
+    VR180: VR180
+    360 Video: 360°
+    New: 新
+    3D: 3D
 'Blocked opening potentially unsafe URL': 已阻止開啟可能不安全的 URL：「{url}」。
+KeyboardShortcutTemplate: '{label} ({shortcut})'
+shortcutJoinOperator: +
+Keys:
+  alt: Alt
+  ctrl: Ctrl
+  arrowdown: 向下方向鍵
+  arrowleft: 向左方向鍵
+  arrowright: 向右方向鍵
+  arrowup: 向上方向鍵
+Right-click or hold to see history: 右鍵點選或按住不放可以檢視歷史紀錄
+Autoplay Interruption Timer: 自動播放因 {autoplayInterruptionIntervalHours} 小時未活動而取消
+Description:
+  Collapse Description: 顯示較少
+  Expand Description: ……更多
diff --git a/yarn.lock b/yarn.lock
index f82c8083e6e85..ef7cb998d9b7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,68 +20,51 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
-  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.0.tgz#9374b5cd068d128dac0b94ff482594273b1c2815"
+  integrity sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==
   dependencies:
-    "@babel/highlight" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.25.9"
+    js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2", "@babel/compat-data@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb"
-  integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.9", "@babel/compat-data@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.0.tgz#f02ba6d34e88fadd5e8861e8b38902f43cc1c819"
+  integrity sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==
 
-"@babel/core@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
-  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
+"@babel/core@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40"
+  integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.24.7"
-    "@babel/generator" "^7.25.0"
-    "@babel/helper-compilation-targets" "^7.25.2"
-    "@babel/helper-module-transforms" "^7.25.2"
-    "@babel/helpers" "^7.25.0"
-    "@babel/parser" "^7.25.0"
-    "@babel/template" "^7.25.0"
-    "@babel/traverse" "^7.25.2"
-    "@babel/types" "^7.25.2"
+    "@babel/code-frame" "^7.26.0"
+    "@babel/generator" "^7.26.0"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.26.0"
+    "@babel/helpers" "^7.26.0"
+    "@babel/parser" "^7.26.0"
+    "@babel/template" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.26.0"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/eslint-parser@^7.25.1":
-  version "7.25.1"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz#469cee4bd18a88ff3edbdfbd227bd20e82aa9b82"
-  integrity sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==
-  dependencies:
-    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
-    eslint-visitor-keys "^2.1.0"
-    semver "^6.3.1"
-
-"@babel/generator@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e"
-  integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==
-  dependencies:
-    "@babel/types" "^7.25.0"
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.25"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.25.4":
-  version "7.25.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.5.tgz#b31cf05b3fe8c32d206b6dad03bb0aacbde73450"
-  integrity sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==
+"@babel/generator@^7.25.9", "@babel/generator@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.0.tgz#505cc7c90d92513f458a477e5ef0703e7c91b8d7"
+  integrity sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==
   dependencies:
-    "@babel/types" "^7.25.4"
+    "@babel/parser" "^7.26.0"
+    "@babel/types" "^7.26.0"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
-    jsesc "^2.5.1"
+    jsesc "^3.0.2"
 
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
@@ -90,43 +73,43 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-annotate-as-pure@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
-  integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
+"@babel/helper-annotate-as-pure@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
+  integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
   dependencies:
-    "@babel/types" "^7.24.7"
+    "@babel/types" "^7.25.9"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3"
-  integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz#f41752fe772a578e67286e6779a68a5a92de1ee9"
+  integrity sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==
   dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8", "@babel/helper-compilation-targets@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
-  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
+"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
+  integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==
   dependencies:
-    "@babel/compat-data" "^7.25.2"
-    "@babel/helper-validator-option" "^7.24.8"
-    browserslist "^4.23.1"
+    "@babel/compat-data" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.24.7", "@babel/helper-create-class-features-plugin@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz#57eaf1af38be4224a9d9dd01ddde05b741f50e14"
-  integrity sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    "@babel/helper-member-expression-to-functions" "^7.24.8"
-    "@babel/helper-optimise-call-expression" "^7.24.7"
-    "@babel/helper-replace-supers" "^7.25.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
-    "@babel/traverse" "^7.25.4"
+"@babel/helper-create-class-features-plugin@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83"
+  integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-member-expression-to-functions" "^7.25.9"
+    "@babel/helper-optimise-call-expression" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
     semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6":
@@ -137,31 +120,13 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz#be4f435a80dc2b053c76eeb4b7d16dd22cfc89da"
-  integrity sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==
+"@babel/helper-create-regexp-features-plugin@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26"
+  integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    regexpu-core "^5.3.1"
-    semver "^6.3.1"
-
-"@babel/helper-create-regexp-features-plugin@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.0.tgz#17afe5d23b3a833a90f0fab9c2ae69fea192de5c"
-  integrity sha512-q0T+dknZS+L5LDazIP+02gEZITG5unzvb6yIjcmj5i0eFrs5ToBV2m2JGH4EsE/gtP8ygEGLGApBgRIZkTm7zg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    regexpu-core "^5.3.1"
-    semver "^6.3.1"
-
-"@babel/helper-create-regexp-features-plugin@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz#24c75974ed74183797ffd5f134169316cd1808d9"
-  integrity sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    regexpu-core "^5.3.1"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    regexpu-core "^6.1.1"
     semver "^6.3.1"
 
 "@babel/helper-define-polyfill-provider@^0.6.1":
@@ -186,836 +151,644 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
-"@babel/helper-environment-visitor@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
-  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
-  dependencies:
-    "@babel/types" "^7.24.7"
+"@babel/helper-member-expression-to-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3"
+  integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==
+  dependencies:
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
+"@babel/helper-module-imports@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
+  integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
+  dependencies:
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
+"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae"
+  integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/helper-function-name@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
-  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
+"@babel/helper-optimise-call-expression@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e"
+  integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==
   dependencies:
-    "@babel/template" "^7.24.7"
-    "@babel/types" "^7.24.7"
+    "@babel/types" "^7.25.9"
 
-"@babel/helper-member-expression-to-functions@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f"
-  integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==
-  dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46"
+  integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==
 
-"@babel/helper-member-expression-to-functions@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6"
-  integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==
+"@babel/helper-remap-async-to-generator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92"
+  integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==
   dependencies:
-    "@babel/traverse" "^7.24.8"
-    "@babel/types" "^7.24.8"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-wrap-function" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/helper-module-imports@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
-  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
+"@babel/helper-replace-supers@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5"
+  integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==
   dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.25.9"
+    "@babel/helper-optimise-call-expression" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.0", "@babel/helper-module-transforms@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
-  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
+"@babel/helper-simple-access@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739"
+  integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==
   dependencies:
-    "@babel/helper-module-imports" "^7.24.7"
-    "@babel/helper-simple-access" "^7.24.7"
-    "@babel/helper-validator-identifier" "^7.24.7"
-    "@babel/traverse" "^7.25.2"
-
-"@babel/helper-optimise-call-expression@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"
-  integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==
-  dependencies:
-    "@babel/types" "^7.24.7"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
-  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
-
-"@babel/helper-remap-async-to-generator@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz#b3f0f203628522713849d49403f1a414468be4c7"
-  integrity sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    "@babel/helper-environment-visitor" "^7.24.7"
-    "@babel/helper-wrap-function" "^7.24.7"
-
-"@babel/helper-remap-async-to-generator@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz#d2f0fbba059a42d68e5e378feaf181ef6055365e"
-  integrity sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    "@babel/helper-wrap-function" "^7.25.0"
-    "@babel/traverse" "^7.25.0"
-
-"@babel/helper-replace-supers@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765"
-  integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.24.7"
-    "@babel/helper-member-expression-to-functions" "^7.24.7"
-    "@babel/helper-optimise-call-expression" "^7.24.7"
-
-"@babel/helper-replace-supers@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz#ff44deac1c9f619523fe2ca1fd650773792000a9"
-  integrity sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.24.8"
-    "@babel/helper-optimise-call-expression" "^7.24.7"
-    "@babel/traverse" "^7.25.0"
-
-"@babel/helper-simple-access@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
-  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
-  dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
-  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
-  dependencies:
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
-
-"@babel/helper-string-parser@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
-  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
-
-"@babel/helper-validator-identifier@^7.24.5", "@babel/helper-validator-identifier@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
-  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
-
-"@babel/helper-validator-option@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
-  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
-
-"@babel/helper-wrap-function@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz#52d893af7e42edca7c6d2c6764549826336aae1f"
-  integrity sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==
-  dependencies:
-    "@babel/helper-function-name" "^7.24.7"
-    "@babel/template" "^7.24.7"
-    "@babel/traverse" "^7.24.7"
-    "@babel/types" "^7.24.7"
-
-"@babel/helper-wrap-function@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz#dab12f0f593d6ca48c0062c28bcfb14ebe812f81"
-  integrity sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==
-  dependencies:
-    "@babel/template" "^7.25.0"
-    "@babel/traverse" "^7.25.0"
-    "@babel/types" "^7.25.0"
-
-"@babel/helpers@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a"
-  integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==
-  dependencies:
-    "@babel/template" "^7.25.0"
-    "@babel/types" "^7.25.0"
-
-"@babel/highlight@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
-  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.24.7"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
-
-"@babel/parser@^7.23.5", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3":
-  version "7.25.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065"
-  integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==
-  dependencies:
-    "@babel/types" "^7.25.2"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/parser@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.4.tgz#af4f2df7d02440286b7de57b1c21acfb2a6f257a"
-  integrity sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==
+"@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
+  integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
   dependencies:
-    "@babel/types" "^7.25.4"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
-  version "7.25.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f"
-  integrity sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/traverse" "^7.25.3"
+"@babel/helper-string-parser@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
+  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
 
-"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz#cd0c583e01369ef51676bdb3d7b603e17d2b3f73"
-  integrity sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
+"@babel/helper-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
+  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz#749bde80356b295390954643de7635e0dffabe73"
-  integrity sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
+"@babel/helper-validator-option@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
+  integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89"
-  integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==
+"@babel/helper-wrap-function@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0"
+  integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
-    "@babel/plugin-transform-optional-chaining" "^7.24.7"
+    "@babel/template" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz#3a82a70e7cb7294ad2559465ebcb871dfbf078fb"
-  integrity sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==
+"@babel/helpers@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4"
+  integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/traverse" "^7.25.0"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.26.0"
 
-"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
-  version "7.21.0-placeholder-for-preset-env.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
-  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+"@babel/parser@^7.23.5", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0":
+  version "7.26.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.1.tgz#44e02499960df2cdce2c456372a3e8e0c3c5c975"
+  integrity sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+    "@babel/types" "^7.26.0"
+
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
+  integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
+
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30"
+  integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137"
+  integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1"
+  integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/plugin-transform-optional-chaining" "^7.25.9"
 
-"@babel/plugin-syntax-import-assertions@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778"
-  integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e"
+  integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-syntax-import-attributes@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca"
-  integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-syntax-import-meta@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+"@babel/plugin-syntax-import-assertions@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f"
+  integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+"@babel/plugin-syntax-import-attributes@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7"
+  integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+"@babel/plugin-transform-arrow-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845"
+  integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+"@babel/plugin-transform-async-generator-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz#1b18530b077d18a407c494eb3d1d72da505283a2"
+  integrity sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-remap-async-to-generator" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+"@babel/plugin-transform-async-to-generator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71"
+  integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@babel/helper-module-imports" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-remap-async-to-generator" "^7.25.9"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+"@babel/plugin-transform-block-scoped-functions@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz#5700691dbd7abb93de300ca7be94203764fce458"
+  integrity sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+"@babel/plugin-transform-block-scoping@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1"
+  integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+"@babel/plugin-transform-class-properties@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f"
+  integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-top-level-await@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+"@babel/plugin-transform-class-static-block@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0"
+  integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
-  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
+"@babel/plugin-transform-classes@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52"
+  integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-arrow-functions@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514"
-  integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-
-"@babel/plugin-transform-async-generator-functions@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz#2afd4e639e2d055776c9f091b6c0c180ed8cf083"
-  integrity sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/helper-remap-async-to-generator" "^7.25.0"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/traverse" "^7.25.4"
-
-"@babel/plugin-transform-async-to-generator@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc"
-  integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/helper-remap-async-to-generator" "^7.24.7"
-
-"@babel/plugin-transform-block-scoped-functions@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f"
-  integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-
-"@babel/plugin-transform-block-scoping@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz#23a6ed92e6b006d26b1869b1c91d1b917c2ea2ac"
-  integrity sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
-
-"@babel/plugin-transform-class-properties@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz#bae7dbfcdcc2e8667355cd1fb5eda298f05189fd"
-  integrity sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.4"
-    "@babel/helper-plugin-utils" "^7.24.8"
-
-"@babel/plugin-transform-class-static-block@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d"
-  integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-transform-classes@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz#d29dbb6a72d79f359952ad0b66d88518d65ef89a"
-  integrity sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    "@babel/helper-compilation-targets" "^7.25.2"
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/helper-replace-supers" "^7.25.0"
-    "@babel/traverse" "^7.25.4"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707"
-  integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==
+"@babel/plugin-transform-computed-properties@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b"
+  integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/template" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/template" "^7.25.9"
 
-"@babel/plugin-transform-destructuring@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550"
-  integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==
+"@babel/plugin-transform-destructuring@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1"
+  integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-dotall-regex@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0"
-  integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==
+"@babel/plugin-transform-dotall-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a"
+  integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-duplicate-keys@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee"
-  integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==
+"@babel/plugin-transform-duplicate-keys@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d"
+  integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz#809af7e3339466b49c034c683964ee8afb3e2604"
-  integrity sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31"
+  integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.0"
-    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-dynamic-import@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4"
-  integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==
+"@babel/plugin-transform-dynamic-import@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8"
+  integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d"
-  integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==
+"@babel/plugin-transform-exponentiation-operator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz#ece47b70d236c1d99c263a1e22b62dc20a4c8b0f"
+  integrity sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-export-namespace-from@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197"
-  integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==
+"@babel/plugin-transform-export-namespace-from@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2"
+  integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-for-of@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70"
-  integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==
+"@babel/plugin-transform-for-of@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz#4bdc7d42a213397905d89f02350c5267866d5755"
+  integrity sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
 
-"@babel/plugin-transform-function-name@^7.25.1":
-  version "7.25.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz#b85e773097526c1a4fc4ba27322748643f26fc37"
-  integrity sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==
+"@babel/plugin-transform-function-name@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97"
+  integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.24.8"
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/traverse" "^7.25.1"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-transform-json-strings@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a"
-  integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==
+"@babel/plugin-transform-json-strings@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660"
+  integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-literals@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz#deb1ad14fc5490b9a65ed830e025bca849d8b5f3"
-  integrity sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==
+"@babel/plugin-transform-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de"
+  integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0"
-  integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==
+"@babel/plugin-transform-logical-assignment-operators@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7"
+  integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df"
-  integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==
+"@babel/plugin-transform-member-expression-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de"
+  integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-modules-amd@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7"
-  integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==
+"@babel/plugin-transform-modules-amd@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5"
+  integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-modules-commonjs@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c"
-  integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==
+"@babel/plugin-transform-modules-commonjs@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz#d165c8c569a080baf5467bda88df6425fc060686"
+  integrity sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.24.8"
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-simple-access" "^7.25.9"
 
-"@babel/plugin-transform-modules-systemjs@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz#8f46cdc5f9e5af74f3bd019485a6cbe59685ea33"
-  integrity sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==
+"@babel/plugin-transform-modules-systemjs@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8"
+  integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.0"
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/helper-validator-identifier" "^7.24.7"
-    "@babel/traverse" "^7.25.0"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/traverse" "^7.25.9"
 
-"@babel/plugin-transform-modules-umd@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8"
-  integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==
+"@babel/plugin-transform-modules-umd@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9"
+  integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-module-transforms" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923"
-  integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a"
+  integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-new-target@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00"
-  integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==
+"@babel/plugin-transform-new-target@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd"
+  integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120"
-  integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz#bcb1b0d9e948168102d5f7104375ca21c3266949"
+  integrity sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-numeric-separator@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63"
-  integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==
+"@babel/plugin-transform-numeric-separator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1"
+  integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-object-rest-spread@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6"
-  integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==
+"@babel/plugin-transform-object-rest-spread@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18"
+  integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/plugin-transform-parameters" "^7.25.9"
 
-"@babel/plugin-transform-object-super@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be"
-  integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==
+"@babel/plugin-transform-object-super@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03"
+  integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/helper-replace-supers" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-replace-supers" "^7.25.9"
 
-"@babel/plugin-transform-optional-catch-binding@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4"
-  integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==
+"@babel/plugin-transform-optional-catch-binding@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3"
+  integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d"
-  integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==
+"@babel/plugin-transform-optional-chaining@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd"
+  integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
 
-"@babel/plugin-transform-parameters@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68"
-  integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==
+"@babel/plugin-transform-parameters@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257"
+  integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-private-methods@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz#9bbefbe3649f470d681997e0b64a4b254d877242"
-  integrity sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==
+"@babel/plugin-transform-private-methods@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57"
+  integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.4"
-    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-private-property-in-object@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061"
-  integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==
+"@babel/plugin-transform-private-property-in-object@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33"
+  integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.24.7"
-    "@babel/helper-create-class-features-plugin" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/helper-annotate-as-pure" "^7.25.9"
+    "@babel/helper-create-class-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-property-literals@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc"
-  integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==
+"@babel/plugin-transform-property-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f"
+  integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-regenerator@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8"
-  integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==
+"@babel/plugin-transform-regenerator@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b"
+  integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
     regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-reserved-words@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4"
-  integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==
+"@babel/plugin-transform-regexp-modifiers@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850"
+  integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-shorthand-properties@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73"
-  integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==
+"@babel/plugin-transform-reserved-words@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce"
+  integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-spread@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3"
-  integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==
+"@babel/plugin-transform-shorthand-properties@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2"
+  integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-sticky-regex@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb"
-  integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==
+"@babel/plugin-transform-spread@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9"
+  integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
 
-"@babel/plugin-transform-template-literals@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8"
-  integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==
+"@babel/plugin-transform-sticky-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32"
+  integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c"
-  integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==
+"@babel/plugin-transform-template-literals@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz#6dbd4a24e8fad024df76d1fac6a03cf413f60fe1"
+  integrity sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e"
-  integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==
+"@babel/plugin-transform-typeof-symbol@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz#224ba48a92869ddbf81f9b4a5f1204bbf5a2bc4b"
+  integrity sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-unicode-property-regex@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd"
-  integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==
+"@babel/plugin-transform-unicode-escapes@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82"
+  integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-unicode-regex@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f"
-  integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==
+"@babel/plugin-transform-unicode-property-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3"
+  integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
-    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/plugin-transform-unicode-sets-regex@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz#be664c2a0697ffacd3423595d5edef6049e8946c"
-  integrity sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==
+"@babel/plugin-transform-unicode-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1"
+  integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.2"
-    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
 
-"@babel/preset-env@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.25.4.tgz#be23043d43a34a2721cd0f676c7ba6f1481f6af6"
-  integrity sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==
+"@babel/plugin-transform-unicode-sets-regex@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe"
+  integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==
   dependencies:
-    "@babel/compat-data" "^7.25.4"
-    "@babel/helper-compilation-targets" "^7.25.2"
-    "@babel/helper-plugin-utils" "^7.24.8"
-    "@babel/helper-validator-option" "^7.24.8"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.3"
-    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.0"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.0"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+
+"@babel/preset-env@^7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.0.tgz#30e5c6bc1bcc54865bff0c5a30f6d4ccdc7fa8b1"
+  integrity sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==
+  dependencies:
+    "@babel/compat-data" "^7.26.0"
+    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-validator-option" "^7.25.9"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.24.7"
-    "@babel/plugin-syntax-import-attributes" "^7.24.7"
-    "@babel/plugin-syntax-import-meta" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-syntax-import-assertions" "^7.26.0"
+    "@babel/plugin-syntax-import-attributes" "^7.26.0"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.24.7"
-    "@babel/plugin-transform-async-generator-functions" "^7.25.4"
-    "@babel/plugin-transform-async-to-generator" "^7.24.7"
-    "@babel/plugin-transform-block-scoped-functions" "^7.24.7"
-    "@babel/plugin-transform-block-scoping" "^7.25.0"
-    "@babel/plugin-transform-class-properties" "^7.25.4"
-    "@babel/plugin-transform-class-static-block" "^7.24.7"
-    "@babel/plugin-transform-classes" "^7.25.4"
-    "@babel/plugin-transform-computed-properties" "^7.24.7"
-    "@babel/plugin-transform-destructuring" "^7.24.8"
-    "@babel/plugin-transform-dotall-regex" "^7.24.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.24.7"
-    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.0"
-    "@babel/plugin-transform-dynamic-import" "^7.24.7"
-    "@babel/plugin-transform-exponentiation-operator" "^7.24.7"
-    "@babel/plugin-transform-export-namespace-from" "^7.24.7"
-    "@babel/plugin-transform-for-of" "^7.24.7"
-    "@babel/plugin-transform-function-name" "^7.25.1"
-    "@babel/plugin-transform-json-strings" "^7.24.7"
-    "@babel/plugin-transform-literals" "^7.25.2"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.24.7"
-    "@babel/plugin-transform-member-expression-literals" "^7.24.7"
-    "@babel/plugin-transform-modules-amd" "^7.24.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.24.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.25.0"
-    "@babel/plugin-transform-modules-umd" "^7.24.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7"
-    "@babel/plugin-transform-new-target" "^7.24.7"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7"
-    "@babel/plugin-transform-numeric-separator" "^7.24.7"
-    "@babel/plugin-transform-object-rest-spread" "^7.24.7"
-    "@babel/plugin-transform-object-super" "^7.24.7"
-    "@babel/plugin-transform-optional-catch-binding" "^7.24.7"
-    "@babel/plugin-transform-optional-chaining" "^7.24.8"
-    "@babel/plugin-transform-parameters" "^7.24.7"
-    "@babel/plugin-transform-private-methods" "^7.25.4"
-    "@babel/plugin-transform-private-property-in-object" "^7.24.7"
-    "@babel/plugin-transform-property-literals" "^7.24.7"
-    "@babel/plugin-transform-regenerator" "^7.24.7"
-    "@babel/plugin-transform-reserved-words" "^7.24.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.24.7"
-    "@babel/plugin-transform-spread" "^7.24.7"
-    "@babel/plugin-transform-sticky-regex" "^7.24.7"
-    "@babel/plugin-transform-template-literals" "^7.24.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.24.8"
-    "@babel/plugin-transform-unicode-escapes" "^7.24.7"
-    "@babel/plugin-transform-unicode-property-regex" "^7.24.7"
-    "@babel/plugin-transform-unicode-regex" "^7.24.7"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.25.4"
+    "@babel/plugin-transform-arrow-functions" "^7.25.9"
+    "@babel/plugin-transform-async-generator-functions" "^7.25.9"
+    "@babel/plugin-transform-async-to-generator" "^7.25.9"
+    "@babel/plugin-transform-block-scoped-functions" "^7.25.9"
+    "@babel/plugin-transform-block-scoping" "^7.25.9"
+    "@babel/plugin-transform-class-properties" "^7.25.9"
+    "@babel/plugin-transform-class-static-block" "^7.26.0"
+    "@babel/plugin-transform-classes" "^7.25.9"
+    "@babel/plugin-transform-computed-properties" "^7.25.9"
+    "@babel/plugin-transform-destructuring" "^7.25.9"
+    "@babel/plugin-transform-dotall-regex" "^7.25.9"
+    "@babel/plugin-transform-duplicate-keys" "^7.25.9"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9"
+    "@babel/plugin-transform-dynamic-import" "^7.25.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.25.9"
+    "@babel/plugin-transform-export-namespace-from" "^7.25.9"
+    "@babel/plugin-transform-for-of" "^7.25.9"
+    "@babel/plugin-transform-function-name" "^7.25.9"
+    "@babel/plugin-transform-json-strings" "^7.25.9"
+    "@babel/plugin-transform-literals" "^7.25.9"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.25.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.25.9"
+    "@babel/plugin-transform-modules-amd" "^7.25.9"
+    "@babel/plugin-transform-modules-commonjs" "^7.25.9"
+    "@babel/plugin-transform-modules-systemjs" "^7.25.9"
+    "@babel/plugin-transform-modules-umd" "^7.25.9"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9"
+    "@babel/plugin-transform-new-target" "^7.25.9"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.25.9"
+    "@babel/plugin-transform-numeric-separator" "^7.25.9"
+    "@babel/plugin-transform-object-rest-spread" "^7.25.9"
+    "@babel/plugin-transform-object-super" "^7.25.9"
+    "@babel/plugin-transform-optional-catch-binding" "^7.25.9"
+    "@babel/plugin-transform-optional-chaining" "^7.25.9"
+    "@babel/plugin-transform-parameters" "^7.25.9"
+    "@babel/plugin-transform-private-methods" "^7.25.9"
+    "@babel/plugin-transform-private-property-in-object" "^7.25.9"
+    "@babel/plugin-transform-property-literals" "^7.25.9"
+    "@babel/plugin-transform-regenerator" "^7.25.9"
+    "@babel/plugin-transform-regexp-modifiers" "^7.26.0"
+    "@babel/plugin-transform-reserved-words" "^7.25.9"
+    "@babel/plugin-transform-shorthand-properties" "^7.25.9"
+    "@babel/plugin-transform-spread" "^7.25.9"
+    "@babel/plugin-transform-sticky-regex" "^7.25.9"
+    "@babel/plugin-transform-template-literals" "^7.25.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.25.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.25.9"
+    "@babel/plugin-transform-unicode-property-regex" "^7.25.9"
+    "@babel/plugin-transform-unicode-regex" "^7.25.9"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.25.9"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2 "^0.4.10"
     babel-plugin-polyfill-corejs3 "^0.10.6"
     babel-plugin-polyfill-regenerator "^0.6.1"
-    core-js-compat "^3.37.1"
+    core-js-compat "^3.38.1"
     semver "^6.3.1"
 
 "@babel/preset-modules@0.1.6-no-external-plugins":
@@ -1027,11 +800,6 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-
 "@babel/runtime@^7.14.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
@@ -1046,83 +814,65 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.24.7", "@babel/template@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
-  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
-  dependencies:
-    "@babel/code-frame" "^7.24.7"
-    "@babel/parser" "^7.25.0"
-    "@babel/types" "^7.25.0"
-
-"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3":
-  version "7.25.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490"
-  integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==
-  dependencies:
-    "@babel/code-frame" "^7.24.7"
-    "@babel/generator" "^7.25.0"
-    "@babel/parser" "^7.25.3"
-    "@babel/template" "^7.25.0"
-    "@babel/types" "^7.25.2"
-    debug "^4.3.1"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.4.tgz#648678046990f2957407e3086e97044f13c3e18e"
-  integrity sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==
-  dependencies:
-    "@babel/code-frame" "^7.24.7"
-    "@babel/generator" "^7.25.4"
-    "@babel/parser" "^7.25.4"
-    "@babel/template" "^7.25.0"
-    "@babel/types" "^7.25.4"
+"@babel/template@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
+  integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==
+  dependencies:
+    "@babel/code-frame" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/types" "^7.25.9"
+
+"@babel/traverse@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
+  integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==
+  dependencies:
+    "@babel/code-frame" "^7.25.9"
+    "@babel/generator" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.25.9"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.18.6", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.4.4":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
-  integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==
+"@babel/types@^7.18.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.4.4":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff"
+  integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==
   dependencies:
-    "@babel/helper-string-parser" "^7.24.8"
-    "@babel/helper-validator-identifier" "^7.24.7"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.25.4":
-  version "7.25.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.4.tgz#6bcb46c72fdf1012a209d016c07f769e10adcb5f"
-  integrity sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==
-  dependencies:
-    "@babel/helper-string-parser" "^7.24.8"
-    "@babel/helper-validator-identifier" "^7.24.7"
-    to-fast-properties "^2.0.0"
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
 
 "@bufbuild/protobuf@^2.0.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-2.1.0.tgz#6925f30c25789b4f74d7c505e731c96f79fb48a7"
   integrity sha512-+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A==
 
-"@csstools/css-parser-algorithms@^3.0.0", "@csstools/css-parser-algorithms@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.1.tgz#f14ade63bae5f6025ac85c7d03fe47a7ca0e58af"
-  integrity sha512-lSquqZCHxDfuTg/Sk2hiS0mcSFCEBuj49JfzPHJogDBT0mGCyY5A1AQzBWngitrp7i1/HAZpIgzF/VjhOEIJIg==
+"@csstools/css-parser-algorithms@^3.0.0", "@csstools/css-parser-algorithms@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
+  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
 
-"@csstools/css-tokenizer@^3.0.0", "@csstools/css-tokenizer@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.1.tgz#9dd9b10084f3011290f96789598091e5bcb3c29a"
-  integrity sha512-UBqaiu7kU0lfvaP982/o3khfXccVlHPWp0/vwwiIgDF0GmqqqxoiXC/6FCjlS9u92f7CoEz6nXKQnrn1kIAkOw==
+"@csstools/css-tokenizer@^3.0.0", "@csstools/css-tokenizer@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
+  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
 
-"@csstools/media-query-list-parser@^3.0.0", "@csstools/media-query-list-parser@^3.0.1":
+"@csstools/media-query-list-parser@^3.0.0":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz#9474e08e6d7767cf68c56bf1581b59d203360cb0"
   integrity sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==
 
-"@csstools/selector-specificity@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz#7dfccb9df5499e627e7bfdbb4021a06813a45dba"
-  integrity sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==
+"@csstools/media-query-list-parser@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz#e80e17eba1693fceafb8d6f2cfc68c0e7a9ab78a"
+  integrity sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==
+
+"@csstools/selector-specificity@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz#037817b574262134cabd68fc4ec1a454f168407b"
+  integrity sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==
 
 "@develar/schema-utils@~2.6.5":
   version "2.6.5"
@@ -1149,7 +899,7 @@
   resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b"
   integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==
 
-"@electron/asar@^3.2.1":
+"@electron/asar@^3.2.7":
   version "3.2.13"
   resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.13.tgz#56565ea423ead184465adfa72663b2c70d9835f2"
   integrity sha512-pY5z2qQSwbFzJsBdgfJIzXf5ElHTVMutC2dxh0FD60njknMu3n1NnTABOcQwbb5/v5soqE79m9UjaJryBf3epg==
@@ -1174,19 +924,19 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/notarize@2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.1.tgz#d0aa6bc43cba830c41bfd840b85dbe0e273f59fe"
-  integrity sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==
+"@electron/notarize@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e"
+  integrity sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==
   dependencies:
     debug "^4.1.1"
     fs-extra "^9.0.1"
     promise-retry "^2.0.1"
 
-"@electron/osx-sign@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8"
-  integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==
+"@electron/osx-sign@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.1.tgz#faf7eeca7ca004a6be541dc4cf7a1bd59ec59b1c"
+  integrity sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==
   dependencies:
     compare-version "^0.1.2"
     debug "^4.3.4"
@@ -1195,50 +945,80 @@
     minimist "^1.2.6"
     plist "^3.0.5"
 
-"@electron/universal@1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.5.1.tgz#f338bc5bcefef88573cf0ab1d5920fac10d06ee5"
-  integrity sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==
+"@electron/rebuild@3.6.1":
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.1.tgz#59e8e36c3f6e6b94a699425dfb61f0394c3dd4df"
+  integrity sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==
   dependencies:
-    "@electron/asar" "^3.2.1"
-    "@malept/cross-spawn-promise" "^1.1.0"
+    "@malept/cross-spawn-promise" "^2.0.0"
+    chalk "^4.0.0"
+    debug "^4.1.1"
+    detect-libc "^2.0.1"
+    fs-extra "^10.0.0"
+    got "^11.7.0"
+    node-abi "^3.45.0"
+    node-api-version "^0.2.0"
+    node-gyp "^9.0.0"
+    ora "^5.1.0"
+    read-binary-file-arch "^1.0.6"
+    semver "^7.3.5"
+    tar "^6.0.5"
+    yargs "^17.0.1"
+
+"@electron/universal@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-2.0.1.tgz#7b070ab355e02957388f3dbd68e2c3cd08c448ae"
+  integrity sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==
+  dependencies:
+    "@electron/asar" "^3.2.7"
+    "@malept/cross-spawn-promise" "^2.0.0"
     debug "^4.3.1"
-    dir-compare "^3.0.0"
-    fs-extra "^9.0.1"
-    minimatch "^3.0.4"
-    plist "^3.0.4"
+    dir-compare "^4.2.0"
+    fs-extra "^11.1.1"
+    minimatch "^9.0.3"
+    plist "^3.1.0"
 
-"@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+"@es-joy/jsdoccomment@~0.49.0":
+  version "0.49.0"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz#e5ec1eda837c802eca67d3b29e577197f14ba1db"
+  integrity sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==
   dependencies:
-    eslint-visitor-keys "^3.3.0"
+    comment-parser "1.4.1"
+    esquery "^1.6.0"
+    jsdoc-type-pratt-parser "~4.1.0"
+
+"@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0", "@eslint-community/eslint-utils@^4.4.1":
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56"
+  integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
 
-"@eslint-community/regexpp@^4.6.0", "@eslint-community/regexpp@^4.6.1":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
-  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0", "@eslint-community/regexpp@^4.12.1":
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/config-array@^0.19.0":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.1.tgz#734aaea2c40be22bbb1f2a9dac687c57a6a4c984"
+  integrity sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==
   dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
+    "@eslint/object-schema" "^2.1.5"
+    debug "^4.3.1"
     minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
 
-"@eslint/eslintrc@^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
-  integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
+"@eslint/core@^0.9.0":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.1.tgz#31763847308ef6b7084a4505573ac9402c51f9d1"
+  integrity sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
+"@eslint/eslintrc@^3.0.0", "@eslint/eslintrc@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c"
+  integrity sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1250,94 +1030,125 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.1":
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
-  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
+"@eslint/js@9.17.0", "@eslint/js@^9.17.0":
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.17.0.tgz#1523e586791f80376a6f8398a3964455ecc651ec"
+  integrity sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==
+
+"@eslint/object-schema@^2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.5.tgz#8670a8f6258a2be5b2c620ff314a1d984c23eb2e"
+  integrity sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==
+
+"@eslint/plugin-kit@^0.2.3":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz#2b78e7bb3755784bb13faa8932a1d994d6537792"
+  integrity sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==
+  dependencies:
+    levn "^0.4.1"
 
 "@fastify/busboy@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
   integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
 
-"@fortawesome/fontawesome-common-types@6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.6.0.tgz#31ab07ca6a06358c5de4d295d4711b675006163f"
-  integrity sha512-xyX0X9mc0kyz9plIyryrRbl7ngsA9jz77mCZJsUkLl+ZKs0KWObgaEBoSgQiYWAsSmjz/yjl0F++Got0Mdp4Rw==
+"@fortawesome/fontawesome-common-types@6.7.1":
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.1.tgz#6201640f39fdcf8e41cd9d1a92b2da3a96817fa4"
+  integrity sha512-gbDz3TwRrIPT3i0cDfujhshnXO9z03IT1UKRIVi/VEjpNHtSBIP2o5XSm+e816FzzCFEzAxPw09Z13n20PaQJQ==
 
-"@fortawesome/fontawesome-svg-core@^6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.6.0.tgz#2a24c32ef92136e98eae2ff334a27145188295ff"
-  integrity sha512-KHwPkCk6oRT4HADE7smhfsKudt9N/9lm6EJ5BVg0tD1yPA5hht837fB87F8pn15D8JfTqQOjhKTktwmLMiD7Kg==
+"@fortawesome/fontawesome-svg-core@^6.7.1":
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.1.tgz#1f8ebb6f35cf02f89c110198514e848de17ac99e"
+  integrity sha512-8dBIHbfsKlCk2jHQ9PoRBg2Z+4TwyE3vZICSnoDlnsHA6SiMlTwfmW6yX0lHsRmWJugkeb92sA0hZdkXJhuz+g==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.6.0"
+    "@fortawesome/fontawesome-common-types" "6.7.1"
 
-"@fortawesome/free-brands-svg-icons@^6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.6.0.tgz#2797f2cc66d21e7e47fa64e680b8835e8d30e825"
-  integrity sha512-1MPD8lMNW/earme4OQi1IFHtmHUwAKgghXlNwWi9GO7QkTfD+IIaYpIai4m2YJEzqfEji3jFHX1DZI5pbY/biQ==
+"@fortawesome/free-brands-svg-icons@^6.7.1":
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.7.1.tgz#1c1bbbac3ab897d02322b18fbbdf4d9b67ec1619"
+  integrity sha512-nJR76eqPzCnMyhbiGf6X0aclDirZriTPRcFm1YFvuupyJOGwlNF022w3YBqu+yrHRhnKRpzFX+8wJKqiIjWZkA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.6.0"
+    "@fortawesome/fontawesome-common-types" "6.7.1"
 
-"@fortawesome/free-regular-svg-icons@^6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.6.0.tgz#fc49a947ac8dfd20403c9ea5f37f0919425bdf04"
-  integrity sha512-Yv9hDzL4aI73BEwSEh20clrY8q/uLxawaQ98lekBx6t9dQKDHcDzzV1p2YtBGTtolYtNqcWdniOnhzB+JPnQEQ==
+"@fortawesome/free-regular-svg-icons@^6.7.1":
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.1.tgz#d7ec06f896ee91116a388a5a234cd26420ccdfe4"
+  integrity sha512-e13cp+bAx716RZOTQ59DhqikAgETA9u1qTBHO3e3jMQQ+4H/N1NC1ZVeFYt1V0m+Th68BrEL1/X6XplISutbXg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.6.0"
+    "@fortawesome/fontawesome-common-types" "6.7.1"
 
-"@fortawesome/free-solid-svg-icons@^6.6.0":
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.6.0.tgz#061751ca43be4c4d814f0adbda8f006164ec9f3b"
-  integrity sha512-IYv/2skhEDFc2WGUcqvFJkeK39Q+HyPf5GHUrT/l2pKbtgEIv1al1TKd6qStR5OIwQdN1GZP54ci3y4mroJWjA==
+"@fortawesome/free-solid-svg-icons@^6.7.1":
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.1.tgz#c1f9a6c25562a12c283e87e284f9d82a5b0dbcc0"
+  integrity sha512-BTKc0b0mgjWZ2UDKVgmwaE0qt0cZs6ITcDgjrti5f/ki7aF5zs+N91V6hitGo3TItCFtnKg6cUVGdTmBFICFRg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.6.0"
+    "@fortawesome/fontawesome-common-types" "6.7.1"
 
 "@fortawesome/vue-fontawesome@^2.0.10":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.10.tgz#b10721425d7efdee6d83fba21c64cad86fa51904"
   integrity sha512-OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg==
 
-"@humanwhocodes/config-array@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
-  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
+"@gar/promisify@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
+
+"@humanfs/core@^0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
+  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+
+"@humanfs/node@^0.16.6":
+  version "0.16.6"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
+  integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.3"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
+    "@humanfs/core" "^0.19.1"
+    "@humanwhocodes/retry" "^0.3.0"
+
+"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
+  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@humanwhocodes/retry@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
+  integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==
+
+"@humanwhocodes/retry@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b"
+  integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==
 
 "@intlify/core-base@^9.12.0":
-  version "9.13.1"
-  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.13.1.tgz#bd1f38e665095993ef9b67aeeb794f3cabcb515d"
-  integrity sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.14.2.tgz#2c074506ea72425e937f911c95c0d845b43f7fdf"
+  integrity sha512-DZyQ4Hk22sC81MP4qiCDuU+LdaYW91A6lCjq8AWPvY3+mGMzhGDfOCzvyR6YBQxtlPjFqMoFk9ylnNYRAQwXtQ==
   dependencies:
-    "@intlify/message-compiler" "9.13.1"
-    "@intlify/shared" "9.13.1"
+    "@intlify/message-compiler" "9.14.2"
+    "@intlify/shared" "9.14.2"
 
-"@intlify/eslint-plugin-vue-i18n@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@intlify/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-3.0.0.tgz#3714d15038b805e3755ef2180e0129ce09cb64ad"
-  integrity sha512-s4fe+VOiqMZGhDrXWnL1xLyHbcFWBcEBeD/KpVrkOtL+utH2LPTi7uZ8RvWSthMS0mUL/7L74hFJ//OUU7AYww==
+"@intlify/eslint-plugin-vue-i18n@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@intlify/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-3.2.0.tgz#5213e9eda3c4b1391630ee31b654f9ff705918fb"
+  integrity sha512-TOIrD4tJE48WMyVIB8bNeQJJPYo1Prpqnm9Xpn1UZmcqlELhm8hmP8QyJnkgesfbG7hyiX/kvo63W7ClEQmhpg==
   dependencies:
     "@eslint/eslintrc" "^3.0.0"
     "@intlify/core-base" "^9.12.0"
     "@intlify/message-compiler" "^9.12.0"
     debug "^4.3.4"
-    eslint-compat-utils "^0.5.0"
+    eslint-compat-utils "^0.6.0"
     glob "^10.3.3"
     globals "^15.0.0"
-    ignore "^5.2.4"
+    ignore "^6.0.0"
     import-fresh "^3.3.0"
     is-language-code "^3.1.0"
     js-yaml "^4.1.0"
@@ -1350,18 +1161,18 @@
     vue-eslint-parser "^9.3.1"
     yaml-eslint-parser "^1.2.2"
 
-"@intlify/message-compiler@9.13.1", "@intlify/message-compiler@^9.12.0":
-  version "9.13.1"
-  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.13.1.tgz#ff8129badf77db3fb648b8d3cceee87c8033ed0a"
-  integrity sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==
+"@intlify/message-compiler@9.14.2", "@intlify/message-compiler@^9.12.0":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.14.2.tgz#7217842ea1875d80bbf0f708e9b3ef5ad7c57a03"
+  integrity sha512-YsKKuV4Qv4wrLNsvgWbTf0E40uRv+Qiw1BeLQ0LAxifQuhiMe+hfTIzOMdWj/ZpnTDj4RSZtkXjJM7JDiiB5LQ==
   dependencies:
-    "@intlify/shared" "9.13.1"
+    "@intlify/shared" "9.14.2"
     source-map-js "^1.0.2"
 
-"@intlify/shared@9.13.1":
-  version "9.13.1"
-  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.13.1.tgz#202741d11ece1a9c7480bfd3f27afcf9cb8f72e4"
-  integrity sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==
+"@intlify/shared@9.14.2":
+  version "9.14.2"
+  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.14.2.tgz#f7dceea32db44c9253e3f965745a42a5cb3a1883"
+  integrity sha512-uRAHAxYPeF+G5DBIboKpPgC/Waecd4Jz8ihtkpJQD5ycb5PwXp0k/+hBGl5dAjwF7w+l74kz/PKA8r8OK//RUw==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
@@ -1479,10 +1290,10 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@malept/cross-spawn-promise@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
-  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
+"@malept/cross-spawn-promise@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d"
+  integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==
   dependencies:
     cross-spawn "^7.0.1"
 
@@ -1496,13 +1307,6 @@
     lodash "^4.17.15"
     tmp-promise "^3.0.2"
 
-"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
-  version "5.1.1-v1"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
-  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
-  dependencies:
-    eslint-scope "5.1.1"
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1516,7 +1320,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+"@nodelib/fs.walk@^1.2.3":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1524,6 +1328,110 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@nolyfill/is-core-module@1.0.39":
+  version "1.0.39"
+  resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e"
+  integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==
+
+"@npmcli/fs@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
+  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
+  dependencies:
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
+
+"@npmcli/move-file@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
+  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
+"@parcel/watcher-android-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
+  integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==
+
+"@parcel/watcher-darwin-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34"
+  integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==
+
+"@parcel/watcher-darwin-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020"
+  integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==
+
+"@parcel/watcher-freebsd-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8"
+  integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==
+
+"@parcel/watcher-linux-arm-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d"
+  integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==
+
+"@parcel/watcher-linux-arm64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7"
+  integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==
+
+"@parcel/watcher-linux-arm64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635"
+  integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==
+
+"@parcel/watcher-linux-x64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39"
+  integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==
+
+"@parcel/watcher-linux-x64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16"
+  integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==
+
+"@parcel/watcher-win32-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc"
+  integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==
+
+"@parcel/watcher-win32-ia32@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7"
+  integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==
+
+"@parcel/watcher-win32-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf"
+  integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==
+
+"@parcel/watcher@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8"
+  integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.4.1"
+    "@parcel/watcher-darwin-arm64" "2.4.1"
+    "@parcel/watcher-darwin-x64" "2.4.1"
+    "@parcel/watcher-freebsd-x64" "2.4.1"
+    "@parcel/watcher-linux-arm-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-musl" "2.4.1"
+    "@parcel/watcher-linux-x64-glibc" "2.4.1"
+    "@parcel/watcher-linux-x64-musl" "2.4.1"
+    "@parcel/watcher-win32-arm64" "2.4.1"
+    "@parcel/watcher-win32-ia32" "2.4.1"
+    "@parcel/watcher-win32-x64" "2.4.1"
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -1534,11 +1442,6 @@
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
   integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
 
-"@rtsao/scc@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
-  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
-
 "@seald-io/binary-search-tree@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz#165a9a456eaa30d15885b25db83861bcce2c6a74"
@@ -1568,6 +1471,17 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz#9cd84cc15bc865a5ca35fcaae198eb899f7b5c90"
   integrity sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==
 
+"@stylistic/eslint-plugin@2.11.0":
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-2.11.0.tgz#50d0289f36f7201055b7fa1729fdc1d8c46e93fa"
+  integrity sha512-PNRHbydNG5EH8NK4c+izdJlxajIR6GxcUhzsYNRsn6Myep4dsZt0qFCz3rCPnkvgO5FYibDcMqgNHUT+zvjYZw==
+  dependencies:
+    "@typescript-eslint/utils" "^8.13.0"
+    eslint-visitor-keys "^4.2.0"
+    espree "^10.3.0"
+    estraverse "^5.3.0"
+    picomatch "^4.0.2"
+
 "@stylistic/stylelint-plugin@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@stylistic/stylelint-plugin/-/stylelint-plugin-3.0.1.tgz#3521534c545808ebf9870c074d42579cc6bd9c67"
@@ -1646,10 +1560,26 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/estree@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+"@types/eslint-scope@^3.7.7":
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
+  integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
 "@types/express-serve-static-core@*":
   version "4.17.28"
@@ -1736,15 +1666,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json5@^0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/keyv@^3.1.4":
   version "3.1.4"
@@ -1884,10 +1809,131 @@
   dependencies:
     "@types/node" "*"
 
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+"@typescript-eslint/eslint-plugin@8.18.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.0.tgz#0901933326aea4443b81df3f740ca7dfc45c7bea"
+  integrity sha512-NR2yS7qUqCL7AIxdJUQf2MKKNDVNaig/dEB0GBLU7D+ZdHgK1NoH/3wsgO3OnPVipn51tG3MAwaODEGil70WEw==
+  dependencies:
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "8.18.0"
+    "@typescript-eslint/type-utils" "8.18.0"
+    "@typescript-eslint/utils" "8.18.0"
+    "@typescript-eslint/visitor-keys" "8.18.0"
+    graphemer "^1.4.0"
+    ignore "^5.3.1"
+    natural-compare "^1.4.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@8.18.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.18.0.tgz#a1c9456cbb6a089730bf1d3fc47946c5fb5fe67b"
+  integrity sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==
+  dependencies:
+    "@typescript-eslint/scope-manager" "8.18.0"
+    "@typescript-eslint/types" "8.18.0"
+    "@typescript-eslint/typescript-estree" "8.18.0"
+    "@typescript-eslint/visitor-keys" "8.18.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.17.0.tgz#a3f49bf3d4d27ff8d6b2ea099ba465ef4dbcaa3a"
+  integrity sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==
+  dependencies:
+    "@typescript-eslint/types" "8.17.0"
+    "@typescript-eslint/visitor-keys" "8.17.0"
+
+"@typescript-eslint/scope-manager@8.18.0", "@typescript-eslint/scope-manager@^8.1.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz#30b040cb4557804a7e2bcc65cf8fdb630c96546f"
+  integrity sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==
+  dependencies:
+    "@typescript-eslint/types" "8.18.0"
+    "@typescript-eslint/visitor-keys" "8.18.0"
+
+"@typescript-eslint/type-utils@8.18.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.18.0.tgz#6f0d12cf923b6fd95ae4d877708c0adaad93c471"
+  integrity sha512-er224jRepVAVLnMF2Q7MZJCq5CsdH2oqjP4dT7K6ij09Kyd+R21r7UVJrF0buMVdZS5QRhDzpvzAxHxabQadow==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "8.18.0"
+    "@typescript-eslint/utils" "8.18.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/types@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.17.0.tgz#ef84c709ef8324e766878834970bea9a7e3b72cf"
+  integrity sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==
+
+"@typescript-eslint/types@8.18.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.18.0.tgz#3afcd30def8756bc78541268ea819a043221d5f3"
+  integrity sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==
+
+"@typescript-eslint/typescript-estree@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.17.0.tgz#40b5903bc929b1e8dd9c77db3cb52cfb199a2a34"
+  integrity sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==
+  dependencies:
+    "@typescript-eslint/types" "8.17.0"
+    "@typescript-eslint/visitor-keys" "8.17.0"
+    debug "^4.3.4"
+    fast-glob "^3.3.2"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/typescript-estree@8.18.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz#d8ca785799fbb9c700cdff1a79c046c3e633c7f9"
+  integrity sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==
+  dependencies:
+    "@typescript-eslint/types" "8.18.0"
+    "@typescript-eslint/visitor-keys" "8.18.0"
+    debug "^4.3.4"
+    fast-glob "^3.3.2"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/utils@8.18.0", "@typescript-eslint/utils@^8.1.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.18.0.tgz#48f67205d42b65d895797bb7349d1be5c39a62f7"
+  integrity sha512-p6GLdY383i7h5b0Qrfbix3Vc3+J2k6QWw6UMUeY5JGfm3C5LbZ4QIZzJNoNOfgyRe0uuYKjvVOsO/jD4SJO+xg==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "8.18.0"
+    "@typescript-eslint/types" "8.18.0"
+    "@typescript-eslint/typescript-estree" "8.18.0"
+
+"@typescript-eslint/utils@^8.13.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.17.0.tgz#41c05105a2b6ab7592f513d2eeb2c2c0236d8908"
+  integrity sha512-bQC8BnEkxqG8HBGKwG9wXlZqg37RKSMY7v/X8VEWD8JG2JuTHuNK0VFvMPMUKQcbk6B+tf05k+4AShAEtCtJ/w==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "8.17.0"
+    "@typescript-eslint/types" "8.17.0"
+    "@typescript-eslint/typescript-estree" "8.17.0"
+
+"@typescript-eslint/visitor-keys@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.17.0.tgz#4dbcd0e28b9bf951f4293805bf34f98df45e1aa8"
+  integrity sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==
+  dependencies:
+    "@typescript-eslint/types" "8.17.0"
+    eslint-visitor-keys "^4.2.0"
+
+"@typescript-eslint/visitor-keys@8.18.0":
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz#7b6d33534fa808e33a19951907231ad2ea5c36dd"
+  integrity sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==
+  dependencies:
+    "@typescript-eslint/types" "8.18.0"
+    eslint-visitor-keys "^4.2.0"
 
 "@vue/compiler-sfc@2.7.16":
   version "2.7.16"
@@ -1916,125 +1962,125 @@
   optionalDependencies:
     prettier "^1.18.2 || ^2.0.0"
 
-"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
-  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
+"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6"
+  integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-numbers" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
+"@webassemblyjs/floating-point-hex-parser@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb"
+  integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==
 
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
+"@webassemblyjs/helper-api-error@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7"
+  integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==
 
-"@webassemblyjs/helper-buffer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
-  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
+"@webassemblyjs/helper-buffer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b"
+  integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==
 
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
+"@webassemblyjs/helper-numbers@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d"
+  integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/floating-point-hex-parser" "1.13.2"
+    "@webassemblyjs/helper-api-error" "1.13.2"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
+"@webassemblyjs/helper-wasm-bytecode@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b"
+  integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==
 
-"@webassemblyjs/helper-wasm-section@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
-  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
+"@webassemblyjs/helper-wasm-section@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348"
+  integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==
   dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/wasm-gen" "1.14.1"
 
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
+"@webassemblyjs/ieee754@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba"
+  integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
+"@webassemblyjs/leb128@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0"
+  integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
-
-"@webassemblyjs/wasm-edit@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
-  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-opt" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-    "@webassemblyjs/wast-printer" "1.12.1"
-
-"@webassemblyjs/wasm-gen@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
-  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wasm-opt@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
-  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.12.1"
-
-"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
-  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wast-printer@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
-  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
-  dependencies:
-    "@webassemblyjs/ast" "1.12.1"
+"@webassemblyjs/utf8@1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1"
+  integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==
+
+"@webassemblyjs/wasm-edit@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597"
+  integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/helper-wasm-section" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-opt" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
+    "@webassemblyjs/wast-printer" "1.14.1"
+
+"@webassemblyjs/wasm-gen@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570"
+  integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
+
+"@webassemblyjs/wasm-opt@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b"
+  integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-buffer" "1.14.1"
+    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/wasm-parser" "1.14.1"
+
+"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb"
+  integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
+    "@webassemblyjs/helper-api-error" "1.13.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/ieee754" "1.13.2"
+    "@webassemblyjs/leb128" "1.13.2"
+    "@webassemblyjs/utf8" "1.13.2"
+
+"@webassemblyjs/wast-printer@1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07"
+  integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==
+  dependencies:
+    "@webassemblyjs/ast" "1.14.1"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^2.1.1":
@@ -2067,6 +2113,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+abbrev@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -2075,28 +2126,45 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-import-attributes@^1.9.5:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
-  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
-
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.11.3, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.11.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+acorn@^8.14.0, acorn@^8.5.0, acorn@^8.8.0, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
+  dependencies:
+    debug "^4.3.4"
+
+agentkeepalive@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
+  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
+  dependencies:
+    humanize-ms "^1.2.1"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -2151,13 +2219,6 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -2178,44 +2239,67 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-builder-bin@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
-  integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
+app-builder-bin@5.0.0-alpha.10:
+  version "5.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz#cf12e593b6b847fb9d04027fa755c6c6610d778b"
+  integrity sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==
 
-app-builder-lib@24.13.3:
-  version "24.13.3"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.13.3.tgz#36e47b65fecb8780bb73bff0fee4e0480c28274b"
-  integrity sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==
+app-builder-lib@25.1.8:
+  version "25.1.8"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.1.8.tgz#ae376039c5f269c7d562af494a087e5bc6310f1b"
+  integrity sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==
   dependencies:
     "@develar/schema-utils" "~2.6.5"
-    "@electron/notarize" "2.2.1"
-    "@electron/osx-sign" "1.0.5"
-    "@electron/universal" "1.5.1"
+    "@electron/notarize" "2.5.0"
+    "@electron/osx-sign" "1.3.1"
+    "@electron/rebuild" "3.6.1"
+    "@electron/universal" "2.0.1"
     "@malept/flatpak-bundler" "^0.4.0"
     "@types/fs-extra" "9.0.13"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "24.13.1"
-    builder-util-runtime "9.2.4"
+    builder-util "25.1.7"
+    builder-util-runtime "9.2.10"
     chromium-pickle-js "^0.2.0"
+    config-file-ts "0.2.8-rc1"
     debug "^4.3.4"
+    dotenv "^16.4.5"
+    dotenv-expand "^11.0.6"
     ejs "^3.1.8"
-    electron-publish "24.13.1"
+    electron-publish "25.1.7"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
     is-ci "^3.0.0"
     isbinaryfile "^5.0.0"
     js-yaml "^4.1.0"
+    json5 "^2.2.3"
     lazy-val "^1.0.5"
-    minimatch "^5.1.1"
-    read-config-file "6.3.2"
+    minimatch "^10.0.0"
+    resedit "^1.7.0"
     sanitize-filename "^1.6.3"
     semver "^7.3.8"
     tar "^6.1.12"
     temp-file "^3.4.0"
 
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
+are-we-there-yet@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2249,7 +2333,7 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-array-includes@^3.1.8:
+array-includes@^3.1.6, array-includes@^3.1.8:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
   integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
@@ -2266,10 +2350,10 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.findlastindex@^1.2.5:
+array.prototype.findlast@^1.2.5:
   version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
-  integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
+  resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
+  integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
   dependencies:
     call-bind "^1.0.7"
     define-properties "^1.2.1"
@@ -2278,7 +2362,7 @@ array.prototype.findlastindex@^1.2.5:
     es-object-atoms "^1.0.0"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.flat@^1.3.2:
+array.prototype.flat@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
   integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
@@ -2298,6 +2382,17 @@ array.prototype.flatmap@^1.3.2:
     es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.tosorted@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
+  integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
+    es-errors "^1.3.0"
+    es-shim-unscopables "^1.0.2"
+
 arraybuffer.prototype.slice@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
@@ -2436,6 +2531,15 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
+bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 bluebird-lst@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c"
@@ -2506,13 +2610,13 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.23.0, browserslist@^4.23.1, browserslist@^4.23.3:
-  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
-  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
+browserslist@^4.0.0, browserslist@^4.23.0, browserslist@^4.23.3, browserslist@^4.24.0:
+  version "4.24.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4"
+  integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==
   dependencies:
-    caniuse-lite "^1.0.30001646"
-    electron-to-chromium "^1.5.4"
+    caniuse-lite "^1.0.30001663"
+    electron-to-chromium "^1.5.28"
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.0"
 
@@ -2521,17 +2625,12 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-buffer-equal@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
-  integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
-
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.1.0:
+buffer@^5.1.0, buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2539,30 +2638,30 @@ buffer@^5.1.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builder-util-runtime@9.2.4:
-  version "9.2.4"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a"
-  integrity sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==
+builder-util-runtime@9.2.10:
+  version "9.2.10"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz#a0f7d9e214158402e78b74a745c8d9f870c604bc"
+  integrity sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@24.13.1:
-  version "24.13.1"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.13.1.tgz#4a4c4f9466b016b85c6990a0ea15aa14edec6816"
-  integrity sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==
+builder-util@25.1.7:
+  version "25.1.7"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-25.1.7.tgz#a07b404f0cb1a635aa165902be65297d58932ff8"
+  integrity sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==
   dependencies:
     "7zip-bin" "~5.2.0"
     "@types/debug" "^4.1.6"
-    app-builder-bin "4.0.0"
+    app-builder-bin "5.0.0-alpha.10"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "9.2.4"
+    builder-util-runtime "9.2.10"
     chalk "^4.1.2"
     cross-spawn "^7.0.3"
     debug "^4.3.4"
     fs-extra "^10.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.1"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.0"
     is-ci "^3.0.0"
     js-yaml "^4.1.0"
     source-map-support "^0.5.19"
@@ -2591,6 +2690,30 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+cacache@^16.1.0:
+  version "16.1.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
+  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^2.0.0"
+
 cacheable-lookup@^5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
@@ -2665,21 +2788,12 @@ caniuse-lite@^1.0.0:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz"
   integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==
 
-caniuse-lite@^1.0.30001646:
-  version "1.0.30001653"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56"
-  integrity sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==
+caniuse-lite@^1.0.30001663:
+  version "1.0.30001667"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz#99fc5ea0d9c6e96897a104a8352604378377f949"
+  integrity sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==
 
-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2748,6 +2862,23 @@ clean-regexp@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.5.0:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
+  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
+
 cli-truncate@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
@@ -2789,12 +2920,10 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
+clone@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
 color-convert@^2.0.1:
   version "2.0.1"
@@ -2803,16 +2932,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
 color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
@@ -2855,6 +2984,11 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+comment-parser@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
+  integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
+
 common-path-prefix@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
@@ -2890,19 +3024,24 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-config-file-ts@^0.2.4:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.6.tgz#b424ff74612fb37f626d6528f08f92ddf5d22027"
-  integrity sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==
+config-file-ts@0.2.8-rc1:
+  version "0.2.8-rc1"
+  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz#fb7fc6ccb2e313f69dbeb78f1db0b00038049de0"
+  integrity sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==
   dependencies:
-    glob "^10.3.10"
-    typescript "^5.3.3"
+    glob "^10.3.12"
+    typescript "^5.4.3"
 
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
   integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
+console-control-strings@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -2937,10 +3076,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
-  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+cookie@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
+  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
 copy-webpack-plugin@^12.0.2:
   version "12.0.2"
@@ -2954,7 +3093,7 @@ copy-webpack-plugin@^12.0.2:
     schema-utils "^4.2.0"
     serialize-javascript "^6.0.2"
 
-core-js-compat@^3.37.0, core-js-compat@^3.37.1, core-js-compat@^3.38.0:
+core-js-compat@^3.38.0, core-js-compat@^3.38.1:
   version "3.38.1"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.38.1.tgz#2bc7a298746ca5a7bcb9c164bcb120f2ebc09a09"
   integrity sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==
@@ -2988,10 +3127,10 @@ crc@^3.8.0:
   dependencies:
     buffer "^5.1.0"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -3002,10 +3141,10 @@ css-declaration-sorter@^7.2.0:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024"
   integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==
 
-css-functions-list@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.2.tgz#9a54c6dd8416ed25c1079cd88234e927526c1922"
-  integrity sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==
+css-functions-list@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.3.tgz#95652b0c24f0f59b291a9fc386041a19d4f40dbe"
+  integrity sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==
 
 css-loader@^7.1.2:
   version "7.1.2"
@@ -3063,6 +3202,14 @@ css-tree@^2.3.1:
     mdn-data "2.0.30"
     source-map-js "^1.0.1"
 
+css-tree@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-3.0.1.tgz#bea6deaea60bb5bcf416adfb1ecf607a8d9471f6"
+  integrity sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==
+  dependencies:
+    mdn-data "2.12.1"
+    source-map-js "^1.0.1"
+
 css-tree@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
@@ -3176,12 +3323,12 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.6:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
-  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.6, debug@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 debug@^3.2.7:
   version "3.2.7"
@@ -3215,6 +3362,13 @@ default-browser@^5.2.1:
     bundle-name "^4.1.0"
     default-browser-id "^5.0.0"
 
+defaults@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
+  dependencies:
+    clone "^1.0.2"
+
 defer-to-connect@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
@@ -3273,6 +3427,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
+
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -3293,18 +3452,28 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
+detect-libc@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
+  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-dir-compare@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416"
-  integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==
+dir-compare@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-4.2.0.tgz#d1d4999c14fbf55281071fdae4293b3b9ce86f19"
+  integrity sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==
   dependencies:
-    buffer-equal "^1.0.0"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+    p-limit "^3.1.0 "
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -3313,14 +3482,14 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@24.13.3:
-  version "24.13.3"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.13.3.tgz#95d5b99c587c592f90d168a616d7ec55907c7e55"
-  integrity sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==
+dmg-builder@25.1.8:
+  version "25.1.8"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.1.8.tgz#41f3b725edd896156e891016a44129e1bd580430"
+  integrity sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==
   dependencies:
-    app-builder-lib "24.13.3"
-    builder-util "24.13.1"
-    builder-util-runtime "9.2.4"
+    app-builder-lib "25.1.8"
+    builder-util "25.1.7"
+    builder-util-runtime "9.2.10"
     fs-extra "^10.1.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -3432,15 +3601,17 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dotenv-expand@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
-  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
+dotenv-expand@^11.0.6:
+  version "11.0.6"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-11.0.6.tgz#f2c840fd924d7c77a94eff98f153331d876882d3"
+  integrity sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==
+  dependencies:
+    dotenv "^16.4.4"
 
-dotenv@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
-  integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
+dotenv@^16.4.4, dotenv@^16.4.5:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
 
 eastasianwidth@^0.2.0:
   version "0.2.0"
@@ -3459,20 +3630,19 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^24.13.3:
-  version "24.13.3"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.13.3.tgz#c506dfebd36d9a50a83ee8aa32d803d83dbe4616"
-  integrity sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==
+electron-builder@^25.1.8:
+  version "25.1.8"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.1.8.tgz#b0e310f1600787610bb84c3f39bc7aadb2548486"
+  integrity sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==
   dependencies:
-    app-builder-lib "24.13.3"
-    builder-util "24.13.1"
-    builder-util-runtime "9.2.4"
+    app-builder-lib "25.1.8"
+    builder-util "25.1.7"
+    builder-util-runtime "9.2.10"
     chalk "^4.1.2"
-    dmg-builder "24.13.3"
+    dmg-builder "25.1.8"
     fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
-    read-config-file "6.3.2"
     simple-update-notifier "2.0.0"
     yargs "^17.6.2"
 
@@ -3499,37 +3669,37 @@ electron-is-dev@^3.0.1:
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-3.0.1.tgz#1cbc79b1dd046787903acd357efdfab6549dc17a"
   integrity sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q==
 
-electron-publish@24.13.1:
-  version "24.13.1"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.13.1.tgz#57289b2f7af18737dc2ad134668cdd4a1b574a0c"
-  integrity sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==
+electron-publish@25.1.7:
+  version "25.1.7"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.1.7.tgz#14e50c2a3fafdc1c454eadbbc47ead89a48bb554"
+  integrity sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "24.13.1"
-    builder-util-runtime "9.2.4"
+    builder-util "25.1.7"
+    builder-util-runtime "9.2.10"
     chalk "^4.1.2"
     fs-extra "^10.1.0"
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
-electron-to-chromium@^1.5.4:
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6"
-  integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==
+electron-to-chromium@^1.5.28:
+  version "1.5.32"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz#4a05ee78e29e240aabaf73a67ce9fe73f52e1bc7"
+  integrity sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==
 
-electron@^32.1.2:
-  version "32.1.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-32.1.2.tgz#84d1efd95d41224e58a6a9bbd1db4ba80154fc02"
-  integrity sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==
+electron@^33.2.1:
+  version "33.2.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-33.2.1.tgz#d0d7bba7a7abf4f14881d0a6e03c498b301a2d5f"
+  integrity sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"
     extract-zip "^2.0.1"
 
-eme-encryption-scheme-polyfill@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.5.tgz#86338bdd3b13f04ba02fa36758501c7c6c122efe"
-  integrity sha512-z9BKXV4TCYjmar0wiZLObZ0J8HE13VIg7Zq/iyPWdbEfROtxVXEJalknWKtBR5XNezzy15/zWS964TGbcAWlPg==
+eme-encryption-scheme-polyfill@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.6.tgz#7a0df1d3b64f7a5486ea1af2e1483e483a20d547"
+  integrity sha512-SmQ8UxDkH/8hrjLo6ASo452hIe4dSJzqKmJyrNsvUciEJNxf4z9hewIwF1k/c7A5uRk4GApavPZ6dgqXqfvegw==
 
 emoji-regex@^10.0.0, emoji-regex@^10.3.0:
   version "10.3.0"
@@ -3561,6 +3731,13 @@ encodeurl@~2.0.0:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
   integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
 
+encoding@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -3568,7 +3745,7 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.17.0, enhanced-resolve@^5.17.1:
+enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -3613,6 +3790,58 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+es-abstract@^1.17.5, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-set-tostringtag "^2.0.3"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
+    has-symbols "^1.0.3"
+    hasown "^2.0.2"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
+    is-callable "^1.2.7"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.3"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.13"
+    is-weakref "^1.0.2"
+    object-inspect "^1.13.1"
+    object-keys "^1.1.1"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.6"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.15"
+
 es-abstract@^1.19.0, es-abstract@^1.19.5:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.0.tgz#b2d526489cceca004588296334726329e0a6bfb6"
@@ -3717,58 +3946,6 @@ es-abstract@^1.22.1:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.13"
 
-es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
-  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    arraybuffer.prototype.slice "^1.0.3"
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    data-view-buffer "^1.0.1"
-    data-view-byte-length "^1.0.1"
-    data-view-byte-offset "^1.0.0"
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    es-set-tostringtag "^2.0.3"
-    es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.6"
-    get-intrinsic "^1.2.4"
-    get-symbol-description "^1.0.2"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-    has-proto "^1.0.3"
-    has-symbols "^1.0.3"
-    hasown "^2.0.2"
-    internal-slot "^1.0.7"
-    is-array-buffer "^3.0.4"
-    is-callable "^1.2.7"
-    is-data-view "^1.0.1"
-    is-negative-zero "^2.0.3"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.3"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.13"
-    is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
-    object-keys "^1.1.1"
-    object.assign "^4.1.5"
-    regexp.prototype.flags "^1.5.2"
-    safe-array-concat "^1.1.2"
-    safe-regex-test "^1.0.3"
-    string.prototype.trim "^1.2.9"
-    string.prototype.trimend "^1.0.8"
-    string.prototype.trimstart "^1.0.8"
-    typed-array-buffer "^1.0.2"
-    typed-array-byte-length "^1.0.1"
-    typed-array-byte-offset "^1.0.2"
-    typed-array-length "^1.0.6"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.15"
-
 es-define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
@@ -3781,10 +3958,31 @@ es-errors@^1.2.1, es-errors@^1.3.0:
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-module-lexer@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527"
-  integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==
+es-iterator-helpers@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz#2f1a3ab998b30cb2d10b195b587c6d9ebdebf152"
+  integrity sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
+    es-errors "^1.3.0"
+    es-set-tostringtag "^2.0.3"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    globalthis "^1.0.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.7"
+    iterator.prototype "^1.1.3"
+    safe-array-concat "^1.1.2"
+
+es-module-lexer@^1.2.1, es-module-lexer@^1.5.3:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
+  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
 
 es-object-atoms@^1.0.0:
   version "1.0.0"
@@ -3874,27 +4072,19 @@ escape-string-regexp@^5.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
   integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
 
-eslint-compat-utils@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz#f45e3b5ced4c746c127cf724fb074cd4e730d653"
-  integrity sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==
-
-eslint-compat-utils@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.0.tgz#f7b2eb2befec25a370fac76934d3f9189f312a65"
-  integrity sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==
+eslint-compat-utils@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz#7fc92b776d185a70c4070d03fd26fde3d59652e4"
+  integrity sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==
   dependencies:
     semver "^7.5.4"
 
-eslint-config-prettier@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
-  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
-
-eslint-config-standard@^17.1.0:
-  version "17.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975"
-  integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==
+eslint-compat-utils@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.6.0.tgz#d7beb1bdefd91c3753bf2fa050575d8b755d6845"
+  integrity sha512-1vVBdI/HLS6HTHVQCJGlN+LOF0w1Rs/WB9se23mQr84cRM0iMM8PulMFFhQdQ1BvS0cGwjpis4xziI91Rk0l6g==
+  dependencies:
+    semver "^7.5.4"
 
 eslint-import-resolver-node@^0.3.9:
   version "0.3.9"
@@ -3905,98 +4095,141 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-module-utils@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz#b99b211ca4318243f09661fae088f373ad5243c4"
-  integrity sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==
+eslint-import-resolver-typescript@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.7.0.tgz#e69925936a771a9cb2de418ccebc4cdf6c0818aa"
+  integrity sha512-Vrwyi8HHxY97K5ebydMtffsWAn1SCR9eol49eCd5fJS4O1WV7PaAjbcjmbfJJSMz/t4Mal212Uz/fQZrOB8mow==
   dependencies:
-    debug "^3.2.7"
+    "@nolyfill/is-core-module" "1.0.39"
+    debug "^4.3.7"
+    enhanced-resolve "^5.15.0"
+    fast-glob "^3.3.2"
+    get-tsconfig "^4.7.5"
+    is-bun-module "^1.0.2"
+    is-glob "^4.0.3"
+    stable-hash "^0.0.4"
+
+eslint-json-compat-utils@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz#32931d42c723da383712f25177a2c57b9ef5f079"
+  integrity sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==
+  dependencies:
+    esquery "^1.6.0"
 
-eslint-plugin-es-x@^7.5.0:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz#d08d9cd155383e35156c48f736eb06561d07ba92"
-  integrity sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==
+eslint-plugin-es-x@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz#a207aa08da37a7923f2a9599e6d3eb73f3f92b74"
+  integrity sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.1.2"
-    "@eslint-community/regexpp" "^4.6.0"
-    eslint-compat-utils "^0.1.2"
+    "@eslint-community/regexpp" "^4.11.0"
+    eslint-compat-utils "^0.5.1"
 
-eslint-plugin-import@^2.30.0:
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz#21ceea0fc462657195989dd780e50c92fe95f449"
-  integrity sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==
+eslint-plugin-import-x@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import-x/-/eslint-plugin-import-x-4.5.0.tgz#a2e65113513c4ee44bec13ed600389558b041cf0"
+  integrity sha512-l0OTfnPF8RwmSXfjT75N8d6ZYLVrVYWpaGlgvVkVqFERCI5SyBfDP7QEMr3kt0zWi2sOa9EQ47clbdFsHkF83Q==
   dependencies:
-    "@rtsao/scc" "^1.1.0"
-    array-includes "^3.1.8"
-    array.prototype.findlastindex "^1.2.5"
-    array.prototype.flat "^1.3.2"
-    array.prototype.flatmap "^1.3.2"
-    debug "^3.2.7"
-    doctrine "^2.1.0"
+    "@typescript-eslint/scope-manager" "^8.1.0"
+    "@typescript-eslint/utils" "^8.1.0"
+    debug "^4.3.4"
+    doctrine "^3.0.0"
     eslint-import-resolver-node "^0.3.9"
-    eslint-module-utils "^2.9.0"
-    hasown "^2.0.2"
-    is-core-module "^2.15.1"
+    get-tsconfig "^4.7.3"
     is-glob "^4.0.3"
-    minimatch "^3.1.2"
-    object.fromentries "^2.0.8"
-    object.groupby "^1.0.3"
-    object.values "^1.2.0"
-    semver "^6.3.1"
-    tsconfig-paths "^3.15.0"
+    minimatch "^9.0.3"
+    semver "^7.6.3"
+    stable-hash "^0.0.4"
+    tslib "^2.6.3"
+
+eslint-plugin-jsdoc@^50.6.1:
+  version "50.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.1.tgz#791a668fd4b0700a759e9a16a741a6a805f5b95c"
+  integrity sha512-UWyaYi6iURdSfdVVqvfOs2vdCVz0J40O/z/HTsv2sFjdjmdlUI/qlKLOTmwbPQ2tAfQnE5F9vqx+B+poF71DBQ==
+  dependencies:
+    "@es-joy/jsdoccomment" "~0.49.0"
+    are-docs-informative "^0.0.2"
+    comment-parser "1.4.1"
+    debug "^4.3.6"
+    escape-string-regexp "^4.0.0"
+    espree "^10.1.0"
+    esquery "^1.6.0"
+    parse-imports "^2.1.1"
+    semver "^7.6.3"
+    spdx-expression-parse "^4.0.0"
+    synckit "^0.9.1"
 
-eslint-plugin-jsonc@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz#e90eca15aa2e172f5aca52a77fc8c819f52862d7"
-  integrity sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==
+eslint-plugin-jsonc@^2.18.2:
+  version "2.18.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.18.2.tgz#893520feb35d343e7438e2fb57fad179ef3ff6aa"
+  integrity sha512-SDhJiSsWt3nItl/UuIv+ti4g3m4gpGkmnUJS9UWR3TrpyNsIcnJoBRD7Kof6cM4Rk3L0wrmY5Tm3z7ZPjR2uGg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    eslint-compat-utils "^0.5.0"
+    eslint-compat-utils "^0.6.0"
+    eslint-json-compat-utils "^0.2.1"
     espree "^9.6.1"
     graphemer "^1.4.0"
     jsonc-eslint-parser "^2.0.4"
     natural-compare "^1.4.0"
     synckit "^0.6.0"
 
-eslint-plugin-n@^17.10.3:
-  version "17.10.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-17.10.3.tgz#6c8bae69b4d3354fe25c3c844afb3f83b83a3942"
-  integrity sha512-ySZBfKe49nQZWR1yFaA0v/GsH6Fgp8ah6XV0WDz6CN8WO0ek4McMzb7A2xnf4DCYV43frjCygvb9f/wx7UUxRw==
+eslint-plugin-n@^17.14.0:
+  version "17.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-17.14.0.tgz#162a7c17a7ce7e3834af537bca68ab8b6aa26edc"
+  integrity sha512-maxPLMEA0rPmRpoOlxEclKng4UpDe+N5BJS4t24I3UKnN109Qcivnfs37KMy84G0af3bxjog5lKctP5ObsvcTA==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    enhanced-resolve "^5.17.0"
-    eslint-plugin-es-x "^7.5.0"
-    get-tsconfig "^4.7.0"
-    globals "^15.8.0"
-    ignore "^5.2.4"
+    "@eslint-community/eslint-utils" "^4.4.1"
+    enhanced-resolve "^5.17.1"
+    eslint-plugin-es-x "^7.8.0"
+    get-tsconfig "^4.8.1"
+    globals "^15.11.0"
+    ignore "^5.3.2"
     minimatch "^9.0.5"
-    semver "^7.5.3"
+    semver "^7.6.3"
 
-eslint-plugin-prettier@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz#d1c8f972d8f60e414c25465c163d16f209411f95"
-  integrity sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==
+eslint-plugin-promise@^7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-7.2.1.tgz#a0652195700aea40b926dc3c74b38e373377bfb0"
+  integrity sha512-SWKjd+EuvWkYaS+uN2csvj0KoP43YTu7+phKQ5v+xw6+A0gutVX2yqCeCkC3uLCJFiPfR2dD8Es5L7yUsmvEaA==
   dependencies:
-    prettier-linter-helpers "^1.0.0"
-    synckit "^0.9.1"
+    "@eslint-community/eslint-utils" "^4.4.0"
 
-eslint-plugin-promise@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-7.1.0.tgz#06b3ad6d36b3c3ef3ec201c8a8d97049cf5dbb20"
-  integrity sha512-8trNmPxdAy3W620WKDpaS65NlM5yAumod6XeC4LOb+jxlkG4IVcp68c6dXY2ev+uT4U1PtG57YDV6EGAXN0GbQ==
+eslint-plugin-react@^7.37.2:
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz#cd0935987876ba2900df2f58339f6d92305acc7a"
+  integrity sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==
+  dependencies:
+    array-includes "^3.1.8"
+    array.prototype.findlast "^1.2.5"
+    array.prototype.flatmap "^1.3.2"
+    array.prototype.tosorted "^1.1.4"
+    doctrine "^2.1.0"
+    es-iterator-helpers "^1.1.0"
+    estraverse "^5.3.0"
+    hasown "^2.0.2"
+    jsx-ast-utils "^2.4.1 || ^3.0.0"
+    minimatch "^3.1.2"
+    object.entries "^1.1.8"
+    object.fromentries "^2.0.8"
+    object.values "^1.2.0"
+    prop-types "^15.8.1"
+    resolve "^2.0.0-next.5"
+    semver "^6.3.1"
+    string.prototype.matchall "^4.0.11"
+    string.prototype.repeat "^1.0.0"
 
-eslint-plugin-unicorn@^55.0.0:
-  version "55.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-55.0.0.tgz#e2aeb397914799895702480970e7d148df5bcc7b"
-  integrity sha512-n3AKiVpY2/uDcGrS3+QsYDkjPfaOrNrsfQxU9nt5nitd9KuvVXrfAvgCO9DYPSfap+Gqjw9EOrXIsBp5tlHZjA==
+eslint-plugin-unicorn@^56.0.1:
+  version "56.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-56.0.1.tgz#d10a3df69ba885939075bdc95a65a0c872e940d4"
+  integrity sha512-FwVV0Uwf8XPfVnKSGpMg7NtlZh0G0gBarCaFcMUOoqPxXryxdYxTRRv4kH6B9TFCVIrjRXG+emcxIk2ayZilog==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.24.5"
+    "@babel/helper-validator-identifier" "^7.24.7"
     "@eslint-community/eslint-utils" "^4.4.0"
     ci-info "^4.0.0"
     clean-regexp "^1.0.0"
-    core-js-compat "^3.37.0"
-    esquery "^1.5.0"
-    globals "^15.7.0"
+    core-js-compat "^3.38.1"
+    esquery "^1.6.0"
+    globals "^15.9.0"
     indent-string "^4.0.0"
     is-builtin-module "^3.2.1"
     jsesc "^3.0.2"
@@ -4004,13 +4237,13 @@ eslint-plugin-unicorn@^55.0.0:
     read-pkg-up "^7.0.1"
     regexp-tree "^0.1.27"
     regjsparser "^0.10.0"
-    semver "^7.6.1"
+    semver "^7.6.3"
     strip-indent "^3.0.0"
 
-eslint-plugin-vue@^9.28.0:
-  version "9.28.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz#e4412f0c1024bafd15ffeaa6f76f4c99152e2765"
-  integrity sha512-ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==
+eslint-plugin-vue@^9.32.0:
+  version "9.32.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.32.0.tgz#2b558e827886b567dfaa156cc1cad0f596461fab"
+  integrity sha512-b/Y05HYmnB/32wqVcjxjHZzNpwxj1onBOvqW89W+V+XNG1dRuaFbNd3vT9CLbr2LXjEoq+3vn8DanWf7XU22Ug==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     globals "^13.24.0"
@@ -4030,13 +4263,13 @@ eslint-plugin-vuejs-accessibility@^2.4.1:
     emoji-regex "^10.0.0"
     vue-eslint-parser "^9.0.1"
 
-eslint-plugin-yml@^1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-1.14.0.tgz#98a019dfe4eb6837f881fb80d564df79cb05d8d9"
-  integrity sha512-ESUpgYPOcAYQO9czugcX5OqRvn/ydDVwGCPXY4YjPqc09rHaUVUA6IE6HLQys4rXk/S+qx3EwTd1wHCwam/OWQ==
+eslint-plugin-yml@^1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-1.16.0.tgz#1dc7d24d1dc40912db2e70fcab79312cdfb70875"
+  integrity sha512-t4MNCetPjTn18/fUDlQ/wKkcYjnuLYKChBrZ0qUaNqRigVqChHWzTP8SrfFi5s4keX3vdlkWRSu8zHJMdKwxWQ==
   dependencies:
     debug "^4.3.2"
-    eslint-compat-utils "^0.5.0"
+    eslint-compat-utils "^0.6.0"
     lodash "^4.17.21"
     natural-compare "^1.4.0"
     yaml-eslint-parser "^1.2.1"
@@ -4049,7 +4282,7 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1, eslint-scope@^7.2.2:
+eslint-scope@^7.1.1:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
   integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
@@ -4057,75 +4290,74 @@ eslint-scope@^7.1.1, eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+eslint-scope@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.2.0.tgz#377aa6f1cb5dc7592cfd0b7f892fd0cf352ce442"
+  integrity sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint-visitor-keys@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
-  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+eslint-visitor-keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
+  integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
-eslint@^8.57.1:
-  version "8.57.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
-  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
+eslint@^9.17.0:
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.17.0.tgz#faa1facb5dd042172fdc520106984b5c2421bb0c"
+  integrity sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.1"
-    "@humanwhocodes/config-array" "^0.13.0"
+    "@eslint-community/regexpp" "^4.12.1"
+    "@eslint/config-array" "^0.19.0"
+    "@eslint/core" "^0.9.0"
+    "@eslint/eslintrc" "^3.2.0"
+    "@eslint/js" "9.17.0"
+    "@eslint/plugin-kit" "^0.2.3"
+    "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
-    "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
+    "@humanwhocodes/retry" "^0.4.1"
+    "@types/estree" "^1.0.6"
+    "@types/json-schema" "^7.0.15"
     ajv "^6.12.4"
     chalk "^4.0.0"
-    cross-spawn "^7.0.2"
+    cross-spawn "^7.0.6"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
-    esquery "^1.4.2"
+    eslint-scope "^8.2.0"
+    eslint-visitor-keys "^4.2.0"
+    espree "^10.3.0"
+    esquery "^1.5.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
 
-espree@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
-  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
+espree@^10.0.1, espree@^10.1.0, espree@^10.3.0:
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a"
+  integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==
   dependencies:
-    acorn "^8.11.3"
+    acorn "^8.14.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^4.0.0"
+    eslint-visitor-keys "^4.2.0"
 
-espree@^9.0.0, espree@^9.3.1, espree@^9.6.0, espree@^9.6.1:
+espree@^9.0.0, espree@^9.3.1, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -4134,10 +4366,10 @@ espree@^9.0.0, espree@^9.3.1, espree@^9.6.0, espree@^9.6.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esquery@^1.4.0, esquery@^1.4.2, esquery@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+esquery@^1.4.0, esquery@^1.5.0, esquery@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -4153,7 +4385,7 @@ estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -4178,37 +4410,42 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-express@^4.19.2:
-  version "4.20.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
-  integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
+express@^4.21.2:
+  version "4.21.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
+  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
     body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.6.0"
+    cookie "0.7.1"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
     encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.2.0"
+    finalhandler "1.3.1"
     fresh "0.5.2"
     http-errors "2.0.0"
     merge-descriptors "1.0.3"
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.10"
+    path-to-regexp "0.1.12"
     proxy-addr "~2.0.7"
-    qs "6.11.0"
+    qs "6.13.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.19.0"
-    serve-static "1.16.0"
+    serve-static "1.16.2"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -4251,11 +4488,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
 fast-glob@^3.2.9, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
@@ -4303,17 +4535,17 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
-file-entry-cache@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.0.0.tgz#4478e7ceaa5191fa9676a2daa7030211c31b1e7e"
-  integrity sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==
+file-entry-cache@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.1.0.tgz#2e66ad98ce93f49aed1b178c57b0b5741591e075"
+  integrity sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==
   dependencies:
     flat-cache "^5.0.0"
 
@@ -4331,13 +4563,13 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
-  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
+finalhandler@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
+  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     on-finished "2.4.1"
     parseurl "~1.3.3"
@@ -4376,13 +4608,13 @@ find-up@^6.3.0:
     locate-path "^7.1.0"
     path-exists "^5.0.0"
 
-flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
-    flatted "^3.1.0"
-    rimraf "^3.0.2"
+    flatted "^3.2.9"
+    keyv "^4.5.4"
 
 flat-cache@^5.0.0:
   version "5.0.0"
@@ -4392,12 +4624,7 @@ flat-cache@^5.0.0:
     flatted "^3.3.1"
     keyv "^4.5.4"
 
-flatted@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
-
-flatted@^3.3.1:
+flatted@^3.2.9, flatted@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
@@ -4450,6 +4677,15 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^11.1.1:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -4469,7 +4705,7 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^2.0.0:
+fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -4521,6 +4757,20 @@ functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4609,10 +4859,10 @@ get-symbol-description@^1.0.2:
     es-errors "^1.3.0"
     get-intrinsic "^1.2.4"
 
-get-tsconfig@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.0.tgz#06ce112a1463e93196aa90320c35df5039147e34"
-  integrity sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==
+get-tsconfig@^4.7.3, get-tsconfig@^4.7.5, get-tsconfig@^4.8.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471"
+  integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -4635,7 +4885,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.10:
+glob@^10.3.12, glob@^10.3.3:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -4647,17 +4897,6 @@ glob@^10.3.10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^10.3.3:
-  version "10.4.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
-  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^3.1.2"
-    minimatch "^9.0.4"
-    minipass "^7.1.2"
-    path-scurry "^1.11.1"
-
 glob@^11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.0.tgz#6031df0d7b65eaa1ccb9b29b5ced16cea658e77e"
@@ -4670,7 +4909,7 @@ glob@^11.0.0:
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
 
-glob@^7.1.3, glob@^7.1.6:
+glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4682,6 +4921,17 @@ glob@^7.1.3, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -4715,7 +4965,7 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.19.0, globals@^13.24.0:
+globals@^13.24.0:
   version "13.24.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
   integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
@@ -4727,10 +4977,10 @@ globals@^14.0.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
   integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
-globals@^15.0.0, globals@^15.7.0, globals@^15.8.0:
-  version "15.8.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-15.8.0.tgz#e64bb47b619dd8cbf32b3c1a0a61714e33cbbb41"
-  integrity sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw==
+globals@^15.0.0, globals@^15.11.0, globals@^15.13.0, globals@^15.9.0:
+  version "15.13.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.13.0.tgz#bbec719d69aafef188ecd67954aae76a696010fc"
+  integrity sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==
 
 globalthis@^1.0.1, globalthis@^1.0.3:
   version "1.0.3"
@@ -4739,6 +4989,14 @@ globalthis@^1.0.1, globalthis@^1.0.3:
   dependencies:
     define-properties "^1.1.3"
 
+globalthis@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
+  dependencies:
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
+
 globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
@@ -4775,6 +5033,23 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
+got@^11.7.0:
+  version "11.8.6"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
+
 got@^11.8.5:
   version "11.8.5"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
@@ -4812,11 +5087,6 @@ has-bigints@^1.0.1, has-bigints@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@ -4865,6 +5135,11 @@ has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
+has-unicode@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
+
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -4911,11 +5186,6 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
-  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
-
 html-minifier-terser@^6.0.2:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
@@ -4934,10 +5204,10 @@ html-tags@^3.3.1:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-html-webpack-plugin@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
-  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
+html-webpack-plugin@^5.6.3:
+  version "5.6.3"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz#a31145f0fee4184d53a794f9513147df1e653685"
+  integrity sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==
   dependencies:
     "@types/html-minifier-terser" "^6.0.0"
     html-minifier-terser "^6.0.2"
@@ -4955,7 +5225,7 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
-http-cache-semantics@^4.0.0:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -5000,10 +5270,18 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-http-proxy-middleware@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
-  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
+http-proxy-middleware@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
+  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -5028,7 +5306,7 @@ http2-wrapper@^1.0.0-beta.5.2:
     quick-lru "^5.1.1"
     resolve-alpn "^1.0.0"
 
-https-proxy-agent@^5.0.1:
+https-proxy-agent@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -5036,6 +5314,21 @@ https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^7.0.0:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
+  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
+  dependencies:
+    ms "^2.0.0"
+
 iconv-corefoundation@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a"
@@ -5068,20 +5361,25 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.2:
+ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1, ignore@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
+ignore@^6.0.0, ignore@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-6.0.2.tgz#77cccb72a55796af1b6d2f9eb14fa326d24f4283"
+  integrity sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
-  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+immutable@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.2.tgz#bb8a987349a73efbe6b3b292a9cbaf1b530d296b"
+  integrity sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
@@ -5109,6 +5407,11 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
+infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -5117,7 +5420,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5164,6 +5467,14 @@ interpret@^3.1.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
   integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
+ip-address@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
+  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
+  dependencies:
+    jsbn "1.1.0"
+    sprintf-js "^1.1.3"
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -5213,6 +5524,13 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-async-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
+  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -5242,6 +5560,13 @@ is-builtin-module@^3.2.1:
   dependencies:
     builtin-modules "^3.3.0"
 
+is-bun-module@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/is-bun-module/-/is-bun-module-1.3.0.tgz#ea4d24fdebfcecc98e81bcbcb506827fee288760"
+  integrity sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==
+  dependencies:
+    semver "^7.6.3"
+
 is-callable@^1.1.3, is-callable@^1.2.6, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
@@ -5259,7 +5584,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.13.0, is-core-module@^2.15.1:
+is-core-module@^2.13.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
   integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
@@ -5273,7 +5598,7 @@ is-data-view@^1.0.1:
   dependencies:
     is-typed-array "^1.1.13"
 
-is-date-object@^1.0.1:
+is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
@@ -5290,6 +5615,13 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-finalizationregistry@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
+  integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -5300,7 +5632,7 @@ is-fullwidth-code-point@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
   integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
 
-is-generator-function@^1.0.7:
+is-generator-function@^1.0.10, is-generator-function@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
   integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
@@ -5321,6 +5653,16 @@ is-inside-container@^1.0.0:
   dependencies:
     is-docker "^3.0.0"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
+
 is-language-code@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-3.1.0.tgz#b2386b49227e7010636f16d0c2c681ca40136ab5"
@@ -5328,6 +5670,11 @@ is-language-code@^3.1.0:
   dependencies:
     "@babel/runtime" "^7.14.0"
 
+is-map@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
+  integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
+
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -5355,11 +5702,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-path-inside@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
-  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
-
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -5390,6 +5732,11 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-set@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
+  integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -5454,6 +5801,16 @@ is-typed-array@^1.1.3, is-typed-array@^1.1.9:
     for-each "^0.3.3"
     has-tostringtag "^1.0.0"
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-weakmap@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
+  integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
+
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -5461,6 +5818,14 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-weakset@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007"
+  integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==
+  dependencies:
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
+
 is-wsl@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2"
@@ -5493,11 +5858,27 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+isexe@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
+  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
+
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
+iterator.prototype@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.3.tgz#016c2abe0be3bbdb8319852884f60908ac62bf9c"
+  integrity sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==
+  dependencies:
+    define-properties "^1.2.1"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    reflect.getprototypeof "^1.0.4"
+    set-function-name "^2.0.1"
+
 jackspeak@^3.1.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a"
@@ -5557,14 +5938,14 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-2.1.1.tgz#84d555df06d26128c2a1d0e1eebd6fecdf8eb280"
-  integrity sha512-89cwX4ouogeDGOBsEVsVYsnWWvWjchmwXBB4kiBhmjOKw19FiOKhNhMhpxhTlK2ctl7DS+d/ethfmuBpzoNNgA==
+jintr@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.2.0.tgz#38bfc2311c7ed4412ebe0bfc5c2e700f8f433921"
+  integrity sha512-psD1yf05kMKDNsUdW1l5YhO59pHScQ6OIHHb8W5SKSM2dCOFPsqolmIuSHgVA8+3Dc47NJR181CXZ4alCAPTkA==
   dependencies:
     acorn "^8.8.0"
 
-js-tokens@^4.0.0:
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -5576,12 +5957,17 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+jsbn@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
+  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
 
-jsesc@^3.0.2:
+jsdoc-type-pratt-parser@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz#ff6b4a3f339c34a6c188cbf50a16087858d22113"
+  integrity sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==
+
+jsesc@^3.0.2, jsesc@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
   integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
@@ -5608,10 +5994,10 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json-parse-even-better-errors@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
-  integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
+json-parse-even-better-errors@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz#d3f67bd5925e81d3e31aa466acc821c8375cec43"
+  integrity sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -5633,14 +6019,14 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^1.0.1, json5@^1.0.2:
+json5@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
   integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.2.0, json5@^2.2.3:
+json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -5671,6 +6057,16 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+"jsx-ast-utils@^2.4.1 || ^3.0.0":
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
+  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
+  dependencies:
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    object.assign "^4.1.4"
+    object.values "^1.1.6"
+
 keyv@^4.0.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
@@ -5695,10 +6091,10 @@ known-css-properties@^0.29.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
   integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==
 
-known-css-properties@^0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.34.0.tgz#ccd7e9f4388302231b3f174a8b1d5b1f7b576cea"
-  integrity sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==
+known-css-properties@^0.35.0:
+  version "0.35.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.35.0.tgz#f6f8e40ab4e5700fa32f5b2ef5218a56bc853bd6"
+  integrity sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==
 
 launch-editor@^2.6.1:
   version "2.6.1"
@@ -5708,76 +6104,76 @@ launch-editor@^2.6.1:
     picocolors "^1.0.0"
     shell-quote "^1.8.1"
 
-lazy-val@^1.0.4, lazy-val@^1.0.5:
+lazy-val@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"
   integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==
 
-lefthook-darwin-arm64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.7.17.tgz#e3ad332b977e78529cfcaf2ee127592527f3df51"
-  integrity sha512-SR9nbYydecL1OMqZCFNbr0L0RXSJXlNbYK6QBJGlGiOuhnliRHJ45wrmnOY/LLYfcc7g9S2QGvMF4X42qmpSnQ==
-
-lefthook-darwin-x64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.7.17.tgz#166c341fe77ff5f3ca794659c283530eff118abb"
-  integrity sha512-hGhqKxuFEcI9nHM2maR6cn/VmTp1OtkkN/GKYxEJ6xmo5Qz5GeeSbG0oJ7AhdGNAuEgj8JN/z0qeir6l7jAaZg==
-
-lefthook-freebsd-arm64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.7.17.tgz#39973535f5b4f39e2d28fcb13c125dd42528dded"
-  integrity sha512-ZTKDb1GIsaZn4guUMcohQSfpWQClt3o2oOjGPoqxHm9Sq5+K7EMzETdjtV+hz528UI6j/oaKoNnw7U6mx/BiVA==
-
-lefthook-freebsd-x64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.7.17.tgz#378b646c72a78b279636b30ea4438eb57bf2b6c5"
-  integrity sha512-4Hn7cceYCm1e9oB0St0OAiQ/r4u2w1wvcoMyNPlynJiD/xL/N5vd9gpSzgGp07zoHrBiz9UaT2xyg9O4RNaQ/g==
-
-lefthook-linux-arm64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.7.17.tgz#ae72037b59ec950b7f0f470a223214e5632f75d5"
-  integrity sha512-Y3YuvWpaWd7vUG11bTAdEVAeCZxW3EDzKxGkpUPeITSRLKpf/G3n1MCUSv+IqstVYq6T+idBizEDj0ZCfVESMQ==
-
-lefthook-linux-x64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.7.17.tgz#b4e534bf482a046b478ef619aa393f2cfeb9ddf5"
-  integrity sha512-UaT6jARLx1vCeNe+S9/NsOJd5jRuU3JPkIvDD3QZQ1Yy1p0C+LbqeNjAYCkvYs9Gr2yvHNsPVvCBWej7/1EO8A==
-
-lefthook-openbsd-arm64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-openbsd-arm64/-/lefthook-openbsd-arm64-1.7.17.tgz#5250a897ff51925f723272d27de30a955ad810c7"
-  integrity sha512-QeEIDXHUQm7eoIEcUACNVfIW/5oUw2Mia7RXs5tBUJHxdWumtnMi9P/gpZZyeNkiN5EGI1MNNm3UD88f/Cz0SA==
-
-lefthook-openbsd-x64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-openbsd-x64/-/lefthook-openbsd-x64-1.7.17.tgz#29be6699e5de662e19af9bf163249a714b985616"
-  integrity sha512-lFXWh/5m+OlY+Uk/YB7y2wKTVPu6CQi3Gr4+m+nbhK07JR3gUI1+0jXvDLO9Y8U1n8RMJxM41R3Fspitf+MFUQ==
-
-lefthook-windows-arm64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.7.17.tgz#9b335d730f4a4df9496412289056069fe380104b"
-  integrity sha512-xsDZhzFUdd0ScAjx9dvnyge5QUELNPpk8dTT2QeS04SiAPRIFpiNMJYVTEns7UI78x3HDeTduiYwF0WoPtKgTg==
-
-lefthook-windows-x64@1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.7.17.tgz#632edc4249bfb11324d93b49680f0b5e5f2f412d"
-  integrity sha512-gMEJn5xabAJoXPDRfzcIbNz5WrVzmLrRc7X+b6MmUYFiPCYvs4ZpausZPq0qQ/8kdwkZVXuunrwWgCtXXBosZw==
-
-lefthook@^1.7.17:
-  version "1.7.17"
-  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.7.17.tgz#a274c24a5c8d3e926c32cf1b444ecb68b0a76476"
-  integrity sha512-1oQO4wqTB1kEWRxImGCqzp+nqIhV8CRxdAj3AMvSOkrNVkUZHLyB8o4EGl7Os+6+2iRKY94WaBXZDaTi210DXA==
+lefthook-darwin-arm64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.9.2.tgz#7d280fe30b184e1cf209052df4497723ea34a412"
+  integrity sha512-kWcSqAdGu5MAtxdLBpxg8H+p4d/pO7tA7+3Q1Cj9NM+c0L3R2ZefGNStGF6Ftbu8grkpz9/jCD588O9PHjsVfw==
+
+lefthook-darwin-x64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.9.2.tgz#837ee47ecb53eed1b3906d1e58194f7ec9c0354c"
+  integrity sha512-M4zspEhp0uXaIEVkcPFYayxElFzFhhSfEk29FMhxZOfbmZYPUSYaSsTHgb7oeR0O0/zcMTVDk4nNWsBp2Jpx5A==
+
+lefthook-freebsd-arm64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.9.2.tgz#a80f4409e6ce9a9e05ccd19519d8f9569a817758"
+  integrity sha512-7Grb+wdY99Iuorw9aUu+zYKdkEaQs6OVGn4jgav+AyBSxJA0WZmXgdmZqd6+LuRVYn8JRO8bER8Tu4QUa1fSxg==
+
+lefthook-freebsd-x64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.9.2.tgz#f28ab005b95e6bbe3b065e0644d107eef1df9b6b"
+  integrity sha512-tMBN//hqHMUJ9v7k9W3l9aMEBw//enEX+2eQLcvDJSuEE+J3AUbNg9YA5kTpVsDuafg10ziJXAuGD0kYh2ubww==
+
+lefthook-linux-arm64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.9.2.tgz#847d28b7498cd8720488b292e0eb6c104987c56f"
+  integrity sha512-U16CUCaQSRQTbjqvrsJrwppCK4d/IQjMimfC/SwAEreXr7WkBiekV+Gv+fytEnVHJTCSb5MajJTV+WpBsg6jGg==
+
+lefthook-linux-x64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.9.2.tgz#2707cfd6e4cac4fa1fbec3f8bbd81632355d4fb6"
+  integrity sha512-lkEes30MquDhiIrNQ61CfNvGLCN39d8PZ2S/dwLMJBtTH7qfVqXu8UR3KhKEDD1h43cEb4pnIeO2BJUZyn/FNw==
+
+lefthook-openbsd-arm64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-openbsd-arm64/-/lefthook-openbsd-arm64-1.9.2.tgz#998f579495d2dd5ab04b8583db2e4cd2d278a93f"
+  integrity sha512-UJKcL8Iiga8GetYqXqGXy6OeIhtNGim8PHQZH4nfR70s6TPvTvBEGvf48mvfwRyXt8t6aUvz1oyVvRQSdXETug==
+
+lefthook-openbsd-x64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-openbsd-x64/-/lefthook-openbsd-x64-1.9.2.tgz#c538554d6fed779395501cbd21a2b732c5500cfc"
+  integrity sha512-CLS119Fn91mZ2U7ug3fjYMfM7rvwB7gwpDUbuQlEPnVsHJOtaIpu+cmhnKKtU6b4B6r5ETMwhc5dDt/tS5curQ==
+
+lefthook-windows-arm64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.9.2.tgz#b7e6d552295167edbcbc2ce6b04b56a86acc7e4d"
+  integrity sha512-MlN2EnYNF6RUMTGX4csJnHq/J+werlerQsUcYfZrs+TruXCm4MLjwO9Q7vShTws3bsCoeDZnacNTVESQpZG6Lg==
+
+lefthook-windows-x64@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.9.2.tgz#459904fe083a78402fe5f50c387fd0e95c1c4ed8"
+  integrity sha512-7gl1L3qj6xWsqsYJ/ACRDUJruMWLqIRGcI66RiAEnQ3aSnnk0FLCVxIyMwecgW3IWY1O2C69EXV4Og7/0l9JVQ==
+
+lefthook@^1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.9.2.tgz#0cac904e048f5e48a5157ae59df048e8cf72729e"
+  integrity sha512-boUWdXdT6MUPghZuuX64xXbG7u69fcgkD6vNEjoxh3Gll6o6MfY/ITpj/HrRAUVym1jWXB0Z298qL789OD+dZw==
   optionalDependencies:
-    lefthook-darwin-arm64 "1.7.17"
-    lefthook-darwin-x64 "1.7.17"
-    lefthook-freebsd-arm64 "1.7.17"
-    lefthook-freebsd-x64 "1.7.17"
-    lefthook-linux-arm64 "1.7.17"
-    lefthook-linux-x64 "1.7.17"
-    lefthook-openbsd-arm64 "1.7.17"
-    lefthook-openbsd-x64 "1.7.17"
-    lefthook-windows-arm64 "1.7.17"
-    lefthook-windows-x64 "1.7.17"
+    lefthook-darwin-arm64 "1.9.2"
+    lefthook-darwin-x64 "1.9.2"
+    lefthook-freebsd-arm64 "1.9.2"
+    lefthook-freebsd-x64 "1.9.2"
+    lefthook-linux-arm64 "1.9.2"
+    lefthook-linux-x64 "1.9.2"
+    lefthook-openbsd-arm64 "1.9.2"
+    lefthook-openbsd-x64 "1.9.2"
+    lefthook-windows-arm64 "1.9.2"
+    lefthook-windows-x64 "1.9.2"
 
 levn@^0.4.1:
   version "0.4.1"
@@ -5876,6 +6272,21 @@ lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+loose-envify@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
 lower-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
@@ -5920,10 +6331,37 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-marked@^14.1.2:
-  version "14.1.2"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-14.1.2.tgz#3cbc26b2d6832be32b75ae0746e0968c781b6156"
-  integrity sha512-f3r0yqpz31VXiDB/wj9GaOB0a2PRLQl6vJmXiFrniNwjkKdvakqJRULhjFKJpxOchlCRiG5fcacoUZY5Xa6PEQ==
+lru-cache@^7.7.1:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
+make-fetch-happen@^10.0.3:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
+  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^16.1.0"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^2.0.3"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^9.0.0"
+
+marked@^15.0.4:
+  version "15.0.4"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.4.tgz#864dbf50227b6507646c771c2ef5f0de2924833e"
+  integrity sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==
 
 matcher@^3.0.0:
   version "3.0.0"
@@ -5947,6 +6385,11 @@ mdn-data@2.0.30:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
   integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
 
+mdn-data@2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.12.1.tgz#10cb462215c13d95c92ff60d0fb3becac1bbb924"
+  integrity sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -5996,7 +6439,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.8:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -6026,6 +6469,11 @@ mime@^2.5.2:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -6041,10 +6489,10 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-css-extract-plugin@^2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz#4d184f12ce90582e983ccef0f6f9db637b4be758"
-  integrity sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==
+mini-css-extract-plugin@^2.9.2:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz#966031b468917a5446f4c24a80854b2947503c5b"
+  integrity sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==
   dependencies:
     schema-utils "^4.0.0"
     tapable "^2.2.1"
@@ -6068,24 +6516,63 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.1:
+minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.0, minimatch@^9.0.4, minimatch@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4, minimatch@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-fetch@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
+  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+  dependencies:
+    minipass "^3.1.6"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
-    brace-expansion "^2.0.1"
+    minipass "^3.0.0"
 
-minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
 
 minipass@^3.0.0:
   version "3.3.4"
@@ -6094,6 +6581,13 @@ minipass@^3.0.0:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^3.1.1, minipass@^3.1.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
+  dependencies:
+    yallist "^4.0.0"
+
 minipass@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
@@ -6109,7 +6603,7 @@ minipass@^7.1.2:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-minizlib@^2.1.1:
+minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -6117,7 +6611,7 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^1.0.3:
+mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -6127,12 +6621,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -6146,16 +6635,16 @@ multicast-dns@^7.2.5:
     thunky "^1.0.2"
 
 nanoid@^3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.3:
+negotiator@0.6.3, negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -6165,6 +6654,23 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+neostandard@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/neostandard/-/neostandard-0.12.0.tgz#780b32014483c9a2daf749e0766c07dffff37934"
+  integrity sha512-MvtiRhevDzE+oqQUxFvDsEmipzy3erNmnz5q5TG9M8xZ30n86rt4PxGP9jgocGIZr1105OgPZNlK2FQEtb2Vng==
+  dependencies:
+    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
+    "@stylistic/eslint-plugin" "2.11.0"
+    eslint-import-resolver-typescript "^3.7.0"
+    eslint-plugin-import-x "^4.5.0"
+    eslint-plugin-n "^17.14.0"
+    eslint-plugin-promise "^7.2.1"
+    eslint-plugin-react "^7.37.2"
+    find-up "^5.0.0"
+    globals "^15.13.0"
+    peowly "^1.3.2"
+    typescript-eslint "^8.17.0"
+
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -6173,21 +6679,64 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
+node-abi@^3.45.0:
+  version "3.68.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.68.0.tgz#8f37fb02ecf4f43ebe694090dcb52e0c4cc4ba25"
+  integrity sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==
+  dependencies:
+    semver "^7.3.5"
+
 node-addon-api@^1.6.3:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
+node-addon-api@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
+  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
+
+node-api-version@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d"
+  integrity sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==
+  dependencies:
+    semver "^7.3.5"
+
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
+node-gyp@^9.0.0:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
+  integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
+  dependencies:
+    env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
 node-releases@^2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6208,23 +6757,34 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-normalize-package-bin@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
-  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
+npm-normalize-package-bin@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz#df79e70cd0a113b77c02d1fe243c96b8e618acb1"
+  integrity sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==
 
-npm-run-all2@^6.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/npm-run-all2/-/npm-run-all2-6.2.3.tgz#ea0c0987337b828eaa78c2f5488e70de0969917b"
-  integrity sha512-5RsxC7jEc/RjxOYBVdEfrJf5FsJ0pHA7jr2/OxrThXknajETCTYjigOCG3iaGjdYIKEQlDuCG0ir0T1HTva8pg==
+npm-run-all2@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-all2/-/npm-run-all2-7.0.1.tgz#7a20f65d072db4a880802d4ba5cd19566daef752"
+  integrity sha512-Adbv+bJQ8UTAM03rRODqrO5cx0YU5KCG2CvHtSURiadvdTjjgGJXdbc1oQ9CXBh9dnGfHSoSB1Web/0Dzp6kOQ==
   dependencies:
     ansi-styles "^6.2.1"
     cross-spawn "^7.0.3"
     memorystream "^0.3.1"
     minimatch "^9.0.0"
     pidtree "^0.6.0"
-    read-package-json-fast "^3.0.2"
+    read-package-json-fast "^4.0.0"
     shell-quote "^1.7.3"
+    which "^5.0.0"
+
+npmlog@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
 
 nth-check@^2.0.1, nth-check@^2.1.1:
   version "2.1.1"
@@ -6233,6 +6793,11 @@ nth-check@^2.0.1, nth-check@^2.1.1:
   dependencies:
     boolbase "^1.0.0"
 
+object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
 object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
@@ -6283,26 +6848,26 @@ object.assign@^4.1.5:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.fromentries@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
-  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
+object.entries@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41"
+  integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==
   dependencies:
     call-bind "^1.0.7"
     define-properties "^1.2.1"
-    es-abstract "^1.23.2"
     es-object-atoms "^1.0.0"
 
-object.groupby@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
-  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
+object.fromentries@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
   dependencies:
     call-bind "^1.0.7"
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
 
-object.values@^1.2.0:
+object.values@^1.1.6, object.values@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
   integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
@@ -6335,6 +6900,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 open@^10.0.3:
   version "10.0.3"
   resolved "https://registry.yarnpkg.com/open/-/open-10.0.3.tgz#f60d8db49fa126c50aec751957fb5d7de3308d4f"
@@ -6357,6 +6929,21 @@ optionator@^0.9.3:
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
 
+ora@^5.1.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 p-cancelable@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
@@ -6369,7 +6956,7 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.2, "p-limit@^3.1.0 ":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -6404,6 +6991,13 @@ p-locate@^6.0.0:
   dependencies:
     p-limit "^4.0.0"
 
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
 p-retry@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd"
@@ -6438,6 +7032,14 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parse-imports@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/parse-imports/-/parse-imports-2.2.1.tgz#0a6e8b5316beb5c9905f50eb2bbb8c64a4805642"
+  integrity sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==
+  dependencies:
+    es-module-lexer "^1.5.3"
+    slashes "^3.0.12"
+
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -6514,10 +7116,10 @@ path-scurry@^2.0.0:
     lru-cache "^11.0.0"
     minipass "^7.1.2"
 
-path-to-regexp@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
-  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
+path-to-regexp@0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -6529,26 +7131,41 @@ path-type@^5.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
   integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==
 
+pe-library@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-0.4.1.tgz#e269be0340dcb13aa6949d743da7d658c3e2fbea"
+  integrity sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
+peowly@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/peowly/-/peowly-1.3.2.tgz#98dad1df75dfb2d6b1e2d6b848de633bf573d7a4"
+  integrity sha512-BYIrwr8JCXY49jUZscgw311w9oGEKo7ux/s+BxrhKTQbiQ0iYNdZNJ5LgagaeercQdFHwnR7Z5IxxFWVQ+BasQ==
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
-  integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
+picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+picomatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
+  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
+
 pidtree@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
@@ -6576,7 +7193,7 @@ plist@^3.0.4:
     base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
 
-plist@^3.0.5:
+plist@^3.0.5, plist@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
   integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
@@ -6819,10 +7436,10 @@ postcss-resolve-nested-selector@^0.1.1, postcss-resolve-nested-selector@^0.1.6:
   resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz#3d84dec809f34de020372c41b039956966896686"
   integrity sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==
 
-postcss-safe-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz#6273d4e5149e286db5a45bc6cf6eafcad464014a"
-  integrity sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==
+postcss-safe-parser@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz#36e4f7e608111a0ca940fd9712ce034718c40ec0"
+  integrity sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==
 
 postcss-scss@^4.0.9:
   version "4.0.9"
@@ -6837,6 +7454,14 @@ postcss-selector-parser@^6.0.15, postcss-selector-parser@^6.0.16, postcss-select
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
+postcss-selector-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c"
+  integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
 postcss-svgo@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-7.0.0.tgz#2f11b45c6fa42da155fd7c16c44e69bf086c5992"
@@ -6865,13 +7490,13 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4.14, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.41, postcss@^8.4.47:
-  version "8.4.47"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
-  integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
+postcss@^8.4.14, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.49:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.1.0"
+    picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
 prelude-ls@^1.2.1:
@@ -6879,14 +7504,7 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier-linter-helpers@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
-  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
-  dependencies:
-    fast-diff "^1.1.2"
-
-"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.8:
+"prettier@^1.18.2 || ^2.0.0":
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
@@ -6914,6 +7532,11 @@ progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
+
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -6922,6 +7545,15 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
+prop-types@^15.8.1:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.1"
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -6955,13 +7587,6 @@ pupa@^3.1.0:
   dependencies:
     escape-goat "^4.0.0"
 
-qs@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
-  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
-  dependencies:
-    side-channel "^1.0.4"
-
 qs@6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
@@ -7001,25 +7626,25 @@ raw-body@2.5.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-read-config-file@6.3.2:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411"
-  integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==
+react-is@^16.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
+
+read-binary-file-arch@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz#959c4637daa932280a9b911b1a6766a7e44288fc"
+  integrity sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==
   dependencies:
-    config-file-ts "^0.2.4"
-    dotenv "^9.0.2"
-    dotenv-expand "^5.1.0"
-    js-yaml "^4.1.0"
-    json5 "^2.2.0"
-    lazy-val "^1.0.4"
+    debug "^4.3.4"
 
-read-package-json-fast@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
-  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
+read-package-json-fast@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz#8ccbc05740bb9f58264f400acc0b4b4eee8d1b39"
+  integrity sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==
   dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
+    json-parse-even-better-errors "^4.0.0"
+    npm-normalize-package-bin "^4.0.0"
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
@@ -7062,6 +7687,15 @@ readable-stream@^3.0.6:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@^3.4.0, readable-stream@^3.6.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.1.tgz#b2fe35f8dca63183cd3b86883ecc8f720ea96ae6"
@@ -7081,6 +7715,19 @@ rechoir@^0.8.0:
   dependencies:
     resolve "^1.20.0"
 
+reflect.getprototypeof@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859"
+  integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.1"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    globalthis "^1.0.3"
+    which-builtin-type "^1.1.3"
+
 regenerate-unicode-properties@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
@@ -7088,10 +7735,10 @@ regenerate-unicode-properties@^10.0.1:
   dependencies:
     regenerate "^1.4.2"
 
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
-  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+regenerate-unicode-properties@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
+  integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==
   dependencies:
     regenerate "^1.4.2"
 
@@ -7162,15 +7809,15 @@ regexpu-core@^5.1.0:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-regexpu-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
-  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
+regexpu-core@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.1.1.tgz#b469b245594cb2d088ceebc6369dceb8c00becac"
+  integrity sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==
   dependencies:
-    "@babel/regjsgen" "^0.8.0"
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
+    regenerate-unicode-properties "^10.2.0"
+    regjsgen "^0.8.0"
+    regjsparser "^0.11.0"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
@@ -7179,6 +7826,11 @@ regjsgen@^0.6.0:
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
   integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
 
+regjsgen@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab"
+  integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==
+
 regjsparser@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.10.0.tgz#b1ed26051736b436f22fdec1c8f72635f9f44892"
@@ -7186,6 +7838,13 @@ regjsparser@^0.10.0:
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.11.1.tgz#ae55c74f646db0c8fcb922d4da635e33da405149"
+  integrity sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==
+  dependencies:
+    jsesc "~3.0.2"
+
 regjsparser@^0.8.2:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
@@ -7193,13 +7852,6 @@ regjsparser@^0.8.2:
   dependencies:
     jsesc "~0.5.0"
 
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
-  dependencies:
-    jsesc "~0.5.0"
-
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -7231,6 +7883,13 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+resedit@^1.7.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resedit/-/resedit-1.7.1.tgz#150c101000210968730141ae2eb504ca0aead165"
+  integrity sha512-/FJ6/gKAXbcHtivannhecWsa43kGVFK3aHHv9Jm3x0eFiM31MoGihkAOWbm3UsvjYLRVw0zTkfARy2dI96JL1Q==
+  dependencies:
+    pe-library "^0.4.1"
+
 resolve-alpn@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
@@ -7267,6 +7926,15 @@ resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^2.0.0-next.5:
+  version "2.0.0-next.5"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
+  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -7274,6 +7942,14 @@ responselike@^2.0.0:
   dependencies:
     lowercase-keys "^2.0.0"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
@@ -7388,21 +8064,23 @@ sanitize-filename@^1.6.3:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sass-loader@^16.0.2:
-  version "16.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.2.tgz#e581bc13d7cb5090e27f155c6aa2855c08cafe86"
-  integrity sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw==
+sass-loader@^16.0.4:
+  version "16.0.4"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.4.tgz#5c2afb755fbc0a45a004369efa11579518a39a45"
+  integrity sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==
   dependencies:
     neo-async "^2.6.2"
 
-sass@^1.79.4:
-  version "1.79.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.4.tgz#f9c45af35fbeb53d2c386850ec842098d9935267"
-  integrity sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==
+sass@^1.83.0:
+  version "1.83.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.0.tgz#e36842c0b88a94ed336fd16249b878a0541d536f"
+  integrity sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==
   dependencies:
     chokidar "^4.0.0"
-    immutable "^4.0.0"
+    immutable "^5.0.2"
     source-map-js ">=0.6.2 <2.0.0"
+  optionalDependencies:
+    "@parcel/watcher" "^2.4.1"
 
 sax@^1.2.4:
   version "1.2.4"
@@ -7456,30 +8134,11 @@ semver@^6.2.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.1, semver@^7.6.3:
+semver@^7.3.2, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-send@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
-  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
-  dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
-
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -7526,15 +8185,20 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
-  integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
+serve-static@1.16.2:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
+  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
   dependencies:
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.18.0"
+    send "0.19.0"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-function-length@^1.1.1:
   version "1.1.1"
@@ -7567,7 +8231,7 @@ set-function-name@^2.0.0:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.0"
 
-set-function-name@^2.0.1:
+set-function-name@^2.0.1, set-function-name@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
   integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
@@ -7587,12 +8251,12 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-shaka-player@^4.11.7:
-  version "4.11.7"
-  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.11.7.tgz#da49dc6c3c0e4cc0281b677b4580b162b3bbcf10"
-  integrity sha512-jNsdQd4pa24w2QwXHGNBs8MQ33YajYiZclWaSuGt+dLJ7/D9+NG1LJQGnTrGd0G1aDdbEzmEpppG3ic4OsGpyw==
+shaka-player@^4.12.5:
+  version "4.12.5"
+  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.12.5.tgz#8de74e5ecf659faa14766f80205164998c28d274"
+  integrity sha512-jJEkASLivZ0Eqg+sIfBJWCWFDzo2l4rfG1e2y5apqphKbDZaMrSCX0Z/B14epJCfStSAwGqKyuC1D+K3e4xBEg==
   dependencies:
-    eme-encryption-scheme-polyfill "^2.1.5"
+    eme-encryption-scheme-polyfill "^2.1.6"
 
 shallow-clone@^3.0.0:
   version "3.0.1"
@@ -7637,6 +8301,11 @@ side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
+signal-exit@^3.0.2, signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
 signal-exit@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
@@ -7659,6 +8328,11 @@ slash@^5.1.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce"
   integrity sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==
 
+slashes@^3.0.12:
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/slashes/-/slashes-3.0.12.tgz#3d664c877ad542dc1509eaf2c50f38d483a6435a"
+  integrity sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==
+
 slice-ansi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
@@ -7685,7 +8359,7 @@ slice-ansi@^5.0.0:
     ansi-styles "^6.0.0"
     is-fullwidth-code-point "^4.0.0"
 
-smart-buffer@^4.0.2:
+smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
@@ -7699,6 +8373,23 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.3"
+    socks "^2.6.2"
+
+socks@^2.6.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
+  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
+  dependencies:
+    ip-address "^9.0.5"
+    smart-buffer "^4.2.0"
+
 sort-keys-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
@@ -7752,6 +8443,14 @@ spdx-expression-parse@^3.0.0:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
+spdx-expression-parse@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz#a23af9f3132115465dac215c099303e4ceac5794"
+  integrity sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
 spdx-license-ids@^3.0.0:
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
@@ -7785,6 +8484,23 @@ sprintf-js@^1.1.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
+sprintf-js@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
+
+ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+  dependencies:
+    minipass "^3.1.1"
+
+stable-hash@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.4.tgz#55ae7dadc13e4b3faed13601587cec41859b42f7"
+  integrity sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==
+
 stat-mode@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
@@ -7809,7 +8525,7 @@ statuses@2.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -7836,6 +8552,32 @@ string-width@^7.0.0:
     get-east-asian-width "^1.0.0"
     strip-ansi "^7.1.0"
 
+string.prototype.matchall@^4.0.11:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a"
+  integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.7"
+    regexp.prototype.flags "^1.5.2"
+    set-function-name "^2.0.2"
+    side-channel "^1.0.6"
+
+string.prototype.repeat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"
+  integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
 string.prototype.trim@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
@@ -7855,25 +8597,7 @@ string.prototype.trim@^1.2.9:
     es-abstract "^1.23.0"
     es-object-atoms "^1.0.0"
 
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-
-string.prototype.trimend@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
-  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-
-string.prototype.trimend@^1.0.8:
+string.prototype.trimend@^1.0.5, string.prototype.trimend@^1.0.7, string.prototype.trimend@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
   integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
@@ -7944,11 +8668,6 @@ strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   dependencies:
     ansi-regex "^6.0.1"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -8018,49 +8737,48 @@ stylelint-use-logical-spec@^5.0.1:
   resolved "https://registry.yarnpkg.com/stylelint-use-logical-spec/-/stylelint-use-logical-spec-5.0.1.tgz#d5aa254d615d373f18214297c0b49a03a6ca5980"
   integrity sha512-UfLB4LW6iG4r3cXxjxkiHQrFyhWFqt8FpNNngD+TyvgMWSokk5TYwTvBHS3atUvZhOogllTOe/PUrGE+4z84AA==
 
-stylelint@^16.8.2, stylelint@^16.9.0:
-  version "16.9.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.9.0.tgz#81615c0608b9dc645486e08e35c6c9206e1ba132"
-  integrity sha512-31Nm3WjxGOBGpQqF43o3wO9L5AC36TPIe6030Lnm13H3vDMTcS21DrLh69bMX+DBilKqMMVLian4iG6ybBoNRQ==
+stylelint@^16.12.0, stylelint@^16.8.2:
+  version "16.12.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.12.0.tgz#13532dcbaed21348da0e9e0fb9a4e1e7f6dab2b8"
+  integrity sha512-F8zZ3L/rBpuoBZRvI4JVT20ZanPLXfQLzMOZg1tzPflRVh9mKpOZ8qcSIhh1my3FjAjZWG4T2POwGnmn6a6hbg==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.1"
-    "@csstools/css-tokenizer" "^3.0.1"
-    "@csstools/media-query-list-parser" "^3.0.1"
-    "@csstools/selector-specificity" "^4.0.0"
+    "@csstools/css-parser-algorithms" "^3.0.4"
+    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/selector-specificity" "^5.0.0"
     "@dual-bundle/import-meta-resolve" "^4.1.0"
     balanced-match "^2.0.0"
     colord "^2.9.3"
     cosmiconfig "^9.0.0"
-    css-functions-list "^3.2.2"
-    css-tree "^2.3.1"
-    debug "^4.3.6"
+    css-functions-list "^3.2.3"
+    css-tree "^3.0.1"
+    debug "^4.3.7"
     fast-glob "^3.3.2"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^9.0.0"
+    file-entry-cache "^9.1.0"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
     html-tags "^3.3.1"
-    ignore "^5.3.2"
+    ignore "^6.0.2"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.34.0"
+    known-css-properties "^0.35.0"
     mathml-tag-names "^2.1.3"
     meow "^13.2.0"
     micromatch "^4.0.8"
     normalize-path "^3.0.0"
-    picocolors "^1.0.1"
-    postcss "^8.4.41"
+    picocolors "^1.1.1"
+    postcss "^8.4.49"
     postcss-resolve-nested-selector "^0.1.6"
-    postcss-safe-parser "^7.0.0"
-    postcss-selector-parser "^6.1.2"
+    postcss-safe-parser "^7.0.1"
+    postcss-selector-parser "^7.0.0"
     postcss-value-parser "^4.2.0"
     resolve-from "^5.0.0"
     string-width "^4.2.3"
-    strip-ansi "^7.1.0"
     supports-hyperlinks "^3.1.0"
     svg-tags "^1.0.0"
-    table "^6.8.2"
+    table "^6.9.0"
     write-file-atomic "^5.0.1"
 
 sumchecker@^3.0.1:
@@ -8070,13 +8788,6 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
@@ -8122,10 +8833,10 @@ svgo@^3.2.0:
     csso "^5.0.5"
     picocolors "^1.0.0"
 
-swiper@^11.1.14:
-  version "11.1.14"
-  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.14.tgz#7901b4955c46dd0ad76fac1e9de2a69f04f34abb"
-  integrity sha512-VbQLQXC04io6AoAjIUWuZwW4MSYozkcP9KjLdrsG/00Q/yiwvhz9RQyt0nHXV10hi9NVnDNy1/wv7Dzq1lkOCQ==
+swiper@^11.1.15:
+  version "11.1.15"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.15.tgz#e2258c8d38282e2f115ca463d6e8c5b84cdcf1ca"
+  integrity sha512-IzWeU34WwC7gbhjKsjkImTuCRf+lRbO6cnxMGs88iVNKDwV+xQpBCJxZ4bNH6gSrIbbyVJ1kuGzo3JTtz//CBw==
 
 synckit@^0.6.0:
   version "0.6.2"
@@ -8135,17 +8846,17 @@ synckit@^0.6.0:
     tslib "^2.3.1"
 
 synckit@^0.9.0, synckit@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.1.tgz#febbfbb6649979450131f64735aa3f6c14575c88"
-  integrity sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.2.tgz#a3a935eca7922d48b9e7d6c61822ee6c3ae4ec62"
+  integrity sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==
   dependencies:
     "@pkgr/core" "^0.1.0"
     tslib "^2.6.2"
 
-table@^6.8.2:
-  version "6.8.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58"
-  integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==
+table@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.9.0.tgz#50040afa6264141c7566b3b81d4d82c47a8668f5"
+  integrity sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -8158,7 +8869,7 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.1.12:
+tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
   integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
@@ -8209,11 +8920,6 @@ terser@^5.26.0:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -8233,11 +8939,6 @@ tmp@^0.2.0:
   dependencies:
     rimraf "^3.0.0"
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -8262,21 +8963,21 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-tsconfig-paths@^3.15.0:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
-  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
-  dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.2"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
 tslib@^2.0.0, tslib@^2.0.3, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tslib@^2.6.3:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -8395,7 +9096,16 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typescript@^5.3.3:
+typescript-eslint@^8.17.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.18.0.tgz#41026f27a3481185f3239d817ae5b960572145a0"
+  integrity sha512-Xq2rRjn6tzVpAyHr3+nmSg1/9k9aIHnJ2iZeOH7cfGOWqTkXTm3kwpQglEuLGdNrYvPF+2gtAs+/KF5rjVo+WQ==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.18.0"
+    "@typescript-eslint/parser" "8.18.0"
+    "@typescript-eslint/utils" "8.18.0"
+
+typescript@^5.4.3:
   version "5.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
   integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
@@ -8455,6 +9165,20 @@ unicorn-magic@^0.1.0:
   resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4"
   integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==
 
+unique-filename@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
+  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
+  dependencies:
+    unique-slug "^3.0.0"
+
+unique-slug@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
+  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -8642,6 +9366,13 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
+wcwidth@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
+  dependencies:
+    defaults "^1.0.3"
+
 webpack-cli@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
@@ -8673,10 +9404,10 @@ webpack-dev-middleware@^7.4.2:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz#8f44147402b4d8ab99bfeb9b6880daa1411064e5"
-  integrity sha512-aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==
+webpack-dev-server@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.0.tgz#68043886edaa3fd875ad20e01589990a79612f9c"
+  integrity sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==
   dependencies:
     "@types/bonjour" "^3.5.13"
     "@types/connect-history-api-fallback" "^1.5.4"
@@ -8691,10 +9422,9 @@ webpack-dev-server@^5.1.0:
     colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^2.0.0"
-    express "^4.19.2"
+    express "^4.21.2"
     graceful-fs "^4.2.6"
-    html-entities "^2.4.0"
-    http-proxy-middleware "^2.0.3"
+    http-proxy-middleware "^2.0.7"
     ipaddr.js "^2.1.0"
     launch-editor "^2.6.1"
     open "^10.0.3"
@@ -8720,18 +9450,18 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.95.0:
-  version "5.95.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
-  integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
-  dependencies:
-    "@types/estree" "^1.0.5"
-    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.12.1"
-    acorn "^8.7.1"
-    acorn-import-attributes "^1.9.5"
-    browserslist "^4.21.10"
+webpack@^5.97.1:
+  version "5.97.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.97.1.tgz#972a8320a438b56ff0f1d94ade9e82eac155fa58"
+  integrity sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==
+  dependencies:
+    "@types/eslint-scope" "^3.7.7"
+    "@types/estree" "^1.0.6"
+    "@webassemblyjs/ast" "^1.14.1"
+    "@webassemblyjs/wasm-edit" "^1.14.1"
+    "@webassemblyjs/wasm-parser" "^1.14.1"
+    acorn "^8.14.0"
+    browserslist "^4.24.0"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
@@ -8774,6 +9504,34 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which-builtin-type@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3"
+  integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==
+  dependencies:
+    function.prototype.name "^1.1.6"
+    has-tostringtag "^1.0.2"
+    is-async-function "^2.0.0"
+    is-date-object "^1.0.5"
+    is-finalizationregistry "^1.0.2"
+    is-generator-function "^1.0.10"
+    is-regex "^1.1.4"
+    is-weakref "^1.0.2"
+    isarray "^2.0.5"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.2"
+    which-typed-array "^1.1.15"
+
+which-collection@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
+  integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
+  dependencies:
+    is-map "^2.0.3"
+    is-set "^2.0.3"
+    is-weakmap "^2.0.2"
+    is-weakset "^2.0.3"
+
 which-typed-array@^1.1.11, which-typed-array@^1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
@@ -8815,13 +9573,27 @@ which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1:
+which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
+which@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6"
+  integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==
+  dependencies:
+    isexe "^3.1.1"
+
+wide-align@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
+
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
@@ -8926,7 +9698,7 @@ yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@^17.6.2:
+yargs@^17.0.1, yargs@^17.6.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -8957,12 +9729,12 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^10.5.0:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-10.5.0.tgz#3cf0c79cf73fb26e13d167f37dec7d65419e91b8"
-  integrity sha512-iyA+VF28c15tCCKH9ExM2RKC3zYiHzA/eixGlJ3vERANkuI+xYKzAZ4vtOhmyqwrAddu88R/DkzEsmpph5NWjg==
+youtubei.js@^12.2.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-12.2.0.tgz#54f058b5d0892b5c7e35019e2be6a2a7f7ba4447"
+  integrity sha512-G+50qrbJCToMYhu8jbaHiS3Vf+RRul+CcDbz3hEGwHkGPh+zLiWwD6SS+YhYF+2/op4ZU5zDYQJrGqJ+wKh7Gw==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
-    jintr "^2.1.1"
+    jintr "^3.2.0"
     tslib "^2.5.0"
     undici "^5.19.1"

From 18cbb185b2cebf6348492a0b4cc51e677ee8b4b2 Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Sun, 22 Dec 2024 22:57:30 +0000
Subject: [PATCH 17/18] Revert "Merge development branch"

This reverts commit bfde2673b6b358826c84e58c4d32234419c542ee.
---
 .babelrc                                      |    2 +-
 .eslintignore                                 |    3 +
 .eslintrc.js                                  |  127 +
 .github/ISSUE_TEMPLATE/config.yml             |    4 +-
 .github/ISSUE_TEMPLATE/feature_request.yaml   |    2 +-
 .github/dependabot.yml                        |    2 -
 .github/workflows/build.yml                   |   55 +-
 .github/workflows/codeql.yml                  |    5 +-
 .github/workflows/conflicts.yml               |    1 +
 .github/workflows/flatpak.yml                 |    8 +-
 .github/workflows/linter.yml                  |    2 +-
 .github/workflows/no-response.yml             |   48 +-
 .github/workflows/release.yml                 |  137 +-
 .github/workflows/remove-outdated-labels.yml  |  122 +-
 .github/workflows/stale.yml                   |    6 +-
 .prettierrc                                   |    7 +
 README.md                                     |   25 +-
 _icons/iconGruvboxDarkSmall.svg               |    1 -
 _icons/iconGruvboxLightSmall.svg              |    1 -
 _icons/textGruvboxDarkSmall.svg               |    1 -
 _icons/textGruvboxLightSmall.svg              |    1 -
 _scripts/ProcessLocalesPlugin.js              |    9 +-
 _scripts/build.js                             |    2 +-
 _scripts/dev-runner.js                        |    2 +-
 _scripts/ebuilder.config.js                   |   24 +-
 _scripts/eslint-rules/plugin.mjs              |   11 -
 .../prefer-use-i18n-polyfill-rule.mjs         |   62 -
 _scripts/getRegions.mjs                       |    7 +-
 _scripts/getShakaLocales.js                   |    4 +-
 _scripts/injectAllowedPaths.mjs               |   12 +-
 _scripts/mime-db-shrinking-loader.js          |    1 +
 _scripts/patchShaka.mjs                       |    5 +-
 _scripts/webpack.main.config.js               |   16 +-
 _scripts/webpack.renderer.config.js           |   24 +-
 _scripts/webpack.web.config.js                |   23 +-
 eslint.config.mjs                             |  247 -
 package.json                                  |   80 +-
 src/constants.js                              |   46 -
 src/datastores/handlers/base.js               |   27 +-
 src/datastores/handlers/electron.js           |   12 +-
 src/datastores/handlers/web.js                |   43 +-
 src/main/index.js                             |   90 +-
 src/renderer/App.js                           |   38 +-
 .../ChannelDetails/ChannelDetails.vue         |   26 +-
 .../components/ChannelHome/ChannelHome.css    |   35 -
 .../components/ChannelHome/ChannelHome.vue    |   77 -
 .../CommentSection/CommentSection.vue         |  795 ---
 .../ExperimentalSettings.vue                  |   78 -
 .../FtAgeRestricted/FtAgeRestricted.vue       |   38 -
 .../FtCommunityPost/FtCommunityPost.vue       |  347 --
 .../FtElementList/FtElementList.vue           |    2 -
 .../FtListChannel/FtListChannel.vue           |  191 -
 .../FtListLazyWrapper/FtListLazyWrapper.vue   |   11 +-
 .../FtProgressBar/FtProgressBar.vue           |   18 -
 .../FtSearchFilters/FtSearchFilters.vue       |  294 --
 .../FtSettingsMenu/FtSettingsMenu.css         |  125 -
 .../FtSettingsMenu/FtSettingsMenu.vue         |   51 -
 .../FtSettingsSection/FtSettingsSection.vue   |   23 -
 .../FtSponsorBlockCategory.vue                |  175 -
 .../components/FtTimestampCatcher.vue         |   48 -
 .../components/ParentalControlSettings.vue    |   72 -
 .../PasswordDialog/PasswordDialog.vue         |   45 -
 .../PasswordSettings/PasswordSettings.vue     |   67 -
 src/renderer/components/ThemeSettings.vue     |  309 --
 .../WatchVideoChapters/WatchVideoChapters.vue |    8 +-
 .../WatchVideoDescription.css                 |   48 +-
 .../WatchVideoDescription.vue                 |   71 +-
 .../WatchVideoRecommendations.vue             |    1 -
 .../components/data-settings/data-settings.js |  440 +-
 .../distraction-settings.js                   |   20 +-
 .../distraction-settings.vue                  |   10 -
 .../download-settings/download-settings.js    |    2 +-
 .../experimental-settings.css}                |    0
 .../experimental-settings.js                  |   51 +
 .../experimental-settings.vue                 |   30 +
 .../external-player-settings.js               |   12 +-
 .../external-player-settings.vue              |   15 +-
 .../ft-age-restricted.css}                    |    0
 .../ft-age-restricted/ft-age-restricted.js    |   29 +
 .../ft-age-restricted/ft-age-restricted.vue   |   13 +
 .../ft-checkbox-list/ft-checkbox-list.vue     |    1 +
 .../ft-community-poll.css}                    |    0
 .../ft-community-poll/ft-community-poll.js    |   28 +
 .../ft-community-poll.vue}                    |   35 +-
 .../ft-community-post/ft-community-post.js    |  170 +
 .../ft-community-post.scss}                   |    0
 .../ft-community-post/ft-community-post.vue   |  163 +
 .../ft-icon-button/ft-icon-button.js          |   62 +-
 .../ft-icon-button/ft-icon-button.scss        |   47 +-
 .../ft-icon-button/ft-icon-button.vue         |   34 +-
 .../ft-input-tags/ft-input-tags.css           |    7 -
 .../components/ft-input-tags/ft-input-tags.js |   17 +-
 .../ft-input-tags/ft-input-tags.vue           |   19 +-
 src/renderer/components/ft-input/ft-input.js  |    4 +
 src/renderer/components/ft-input/ft-input.vue |    2 +
 .../ft-list-channel/ft-list-channel.js        |  100 +
 .../ft-list-channel.scss}                     |    0
 .../ft-list-channel/ft-list-channel.vue       |   74 +
 .../ft-list-hashtag/ft-list-hashtag.js        |   44 +
 .../ft-list-hashtag.scss}                     |    0
 .../ft-list-hashtag.vue}                      |   51 +-
 .../ft-list-playlist/ft-list-playlist.js      |    3 +-
 .../components/ft-list-video/ft-list-video.js |   55 +-
 .../ft-list-video/ft-list-video.scss          |   27 -
 .../ft-list-video/ft-list-video.vue           |   78 +-
 .../ft-logo-full.css}                         |    0
 .../ft-logo-full.vue}                         |    3 +-
 .../ft-playlist-selector.js                   |    3 +-
 .../ft-progress-bar.css}                      |    3 +-
 .../ft-progress-bar/ft-progress-bar.js        |   10 +
 .../ft-progress-bar/ft-progress-bar.vue       |    9 +
 .../ft-radio-button/ft-radio-button.vue       |    1 +
 .../ft-refresh-widget/ft-refresh-widget.js    |   10 -
 .../ft-refresh-widget/ft-refresh-widget.vue   |    2 +-
 .../ft-search-filters.css}                    |    0
 .../ft-search-filters/ft-search-filters.js    |  221 +
 .../ft-search-filters/ft-search-filters.vue   |   74 +
 .../ft-settings-section.js                    |   16 +
 .../ft-settings-section.scss}                 |   31 +-
 .../ft-settings-section.vue                   |   17 +
 .../ft-shaka-video-player.css                 |   73 -
 .../ft-shaka-video-player.js                  |  287 +-
 .../ft-shaka-video-player.vue                 |    4 +-
 .../player-components/AudioTrackSelection.js  |    2 +-
 .../player-components/FullWindowButton.js     |   12 +-
 .../LegacyQualitySelection.js                 |   11 +-
 .../player-components/ScreenshotButton.js     |   10 +-
 .../player-components/StatsButton.js          |   13 +-
 .../player-components/TheatreModeButton.js    |   11 +-
 .../ft-share-button/ft-share-button.css       |   76 -
 .../ft-share-button/ft-share-button.js        |    2 +-
 .../ft-share-button/ft-share-button.scss      |  117 +
 .../ft-share-button/ft-share-button.vue       |    2 +-
 .../ft-sponsor-block-category.css}            |    0
 .../ft-sponsor-block-category.js              |  163 +
 .../ft-sponsor-block-category.vue             |   34 +
 .../ft-timestamp-catcher.js                   |   38 +
 .../ft-timestamp-catcher.vue                  |    8 +
 .../general-settings/general-settings.js      |    7 +-
 .../general-settings/general-settings.vue     |    7 -
 .../parental-control-settings.js              |   30 +
 .../parental-control-settings.vue             |   32 +
 .../password-dialog.css}                      |    0
 .../password-dialog/password-dialog.js        |   27 +
 .../password-dialog/password-dialog.vue       |   19 +
 .../password-settings.css}                    |    0
 .../password-settings/password-settings.js    |   42 +
 .../password-settings/password-settings.vue   |   37 +
 .../player-settings/player-settings.js        |   13 +-
 .../player-settings/player-settings.vue       |   29 +-
 .../components/playlist-info/playlist-info.js |   44 +-
 .../playlist-info/playlist-info.vue           |    7 -
 .../privacy-settings/privacy-settings.js      |    2 +-
 .../proxy-settings/proxy-settings.css         |   12 -
 .../proxy-settings/proxy-settings.js          |    2 +-
 .../proxy-settings/proxy-settings.vue         |   13 +-
 .../side-nav-more-options.css}                |    0
 .../side-nav-more-options.js                  |   32 +
 .../side-nav-more-options.vue}                |   52 +-
 .../SideNav.css => side-nav/side-nav.css}     |    0
 src/renderer/components/side-nav/side-nav.js  |   85 +
 .../SideNav.vue => side-nav/side-nav.vue}     |  154 +-
 .../sponsor-block-settings.js                 |    4 +-
 .../subscription-settings.css                 |    4 -
 .../subscription-settings.js                  |   10 +-
 .../subscription-settings.vue                 |   28 +-
 .../subscriptions-community.js                |   13 +-
 .../subscriptions-live/subscriptions-live.js  |   22 +-
 .../subscriptions-shorts.js                   |    6 +-
 .../subscriptions-tab-ui.js                   |    8 +-
 .../subscriptions-videos.js                   |   19 +-
 .../theme-settings/theme-settings.js          |  184 +
 .../theme-settings/theme-settings.vue         |   94 +
 src/renderer/components/top-nav/top-nav.js    |   98 +-
 src/renderer/components/top-nav/top-nav.scss  |   43 +-
 src/renderer/components/top-nav/top-nav.vue   |   32 +-
 .../watch-video-comments.css}                 |    0
 .../watch-video-comments.js                   |  459 ++
 .../watch-video-comments.vue                  |  305 ++
 .../watch-video-info/watch-video-info.js      |    4 -
 .../watch-video-info/watch-video-info.scss    |   11 -
 .../watch-video-info/watch-video-info.vue     |    6 -
 .../watch-video-live-chat.css                 |    1 -
 .../watch-video-playlist.js                   |    3 +-
 src/renderer/composables/colors.js            |   64 -
 src/renderer/composables/use-i18n-polyfill.js |   95 -
 src/renderer/helpers/accessibility.js         |    4 -
 src/renderer/helpers/api/invidious.js         |  557 +-
 src/renderer/helpers/api/local.js             |  460 +-
 src/renderer/helpers/channels.js              |   20 +-
 src/renderer/helpers/colors.js                |   63 +-
 src/renderer/helpers/player/utils.js          |   23 +-
 src/renderer/helpers/playlists.js             |   25 +-
 src/renderer/helpers/strings.js               |    5 +-
 src/renderer/helpers/subscriptions.js         |   17 +-
 src/renderer/helpers/utils.js                 |  485 +-
 src/renderer/main.js                          |   43 +-
 src/renderer/router/index.js                  |    2 +-
 src/renderer/scss-partials/_ft-list-item.scss |   10 +-
 src/renderer/store/modules/playlists.js       |    6 +-
 src/renderer/store/modules/settings.js        |   23 +-
 .../store/modules/subscription-cache.js       |   29 +-
 src/renderer/store/modules/utils.js           |   31 +-
 src/renderer/themes.css                       |  947 ++--
 src/renderer/views/About/About.css            |    2 +-
 src/renderer/views/About/About.js             |   84 +
 src/renderer/views/About/About.vue            |   88 +-
 src/renderer/views/Channel/Channel.js         |  394 +-
 src/renderer/views/Channel/Channel.vue        |   14 +-
 src/renderer/views/Hashtag/Hashtag.js         |  173 +
 src/renderer/views/Hashtag/Hashtag.vue        |  193 +-
 src/renderer/views/History/History.js         |   87 +-
 src/renderer/views/History/History.vue        |    5 +-
 src/renderer/views/Playlist/Playlist.js       |   93 +-
 src/renderer/views/Playlist/Playlist.vue      |    2 +-
 src/renderer/views/Popular/Popular.js         |  108 +
 src/renderer/views/Popular/Popular.vue        |   84 +-
 src/renderer/views/Post.vue                   |  104 -
 src/renderer/views/Post/Post.js               |   62 +
 src/renderer/views/Post/Post.vue              |   31 +
 src/renderer/views/Search/Search.js           |   83 +-
 src/renderer/views/Settings/Settings.css      |   76 +-
 src/renderer/views/Settings/Settings.js       |  225 +-
 src/renderer/views/Settings/Settings.vue      |   69 +-
 .../SubscribedChannels/SubscribedChannels.js  |  172 +
 .../SubscribedChannels/SubscribedChannels.vue |  217 +-
 .../views/Subscriptions/Subscriptions.js      |    6 +-
 src/renderer/views/Trending/Trending.css      |    6 +-
 src/renderer/views/Trending/Trending.js       |  211 +
 src/renderer/views/Trending/Trending.vue      |  295 +-
 .../views/UserPlaylists/UserPlaylists.js      |   79 +-
 .../views/UserPlaylists/UserPlaylists.vue     |    5 +-
 src/renderer/views/Watch/Watch.js             |  258 +-
 src/renderer/views/Watch/Watch.vue            |    8 +-
 static/external-player-map.json               |    2 +-
 static/geolocations/be.json                   |    1 -
 static/geolocations/fa.json                   |    2 +-
 static/geolocations/pt-PT.json                |    2 +-
 static/geolocations/zh-TW.json                |    2 +-
 static/locales/activeLocales.json             |    1 -
 static/locales/af.yaml                        |  954 ++--
 static/locales/ar.yaml                        |  227 +-
 static/locales/az.yaml                        |   20 +-
 static/locales/be.yaml                        | 1061 ++--
 static/locales/bg.yaml                        |  246 +-
 static/locales/bn.yaml                        |    8 +
 static/locales/br.yaml                        | 1239 -----
 static/locales/bs.yaml                        |    3 +
 static/locales/ca.yaml                        |   51 +
 static/locales/ckb.yaml                       |   96 +-
 static/locales/cs.yaml                        |  242 +-
 static/locales/cy.yaml                        |  885 ++--
 static/locales/da.yaml                        |  172 +-
 static/locales/de-DE.yaml                     |  297 +-
 static/locales/el.yaml                        |  118 +-
 static/locales/en-GB.yaml                     |  217 +-
 static/locales/en-US.yaml                     |  151 +-
 static/locales/eo.yaml                        |    1 +
 static/locales/es-AR.yaml                     |   18 +
 static/locales/es-MX.yaml                     |  127 +-
 static/locales/es.yaml                        |  237 +-
 static/locales/et.yaml                        |  185 +-
 static/locales/eu.yaml                        |  185 +-
 static/locales/fa.yaml                        |  431 +-
 static/locales/fi.yaml                        |  119 +-
 static/locales/fil.yaml                       |    2 +
 static/locales/fr-FR.yaml                     |  271 +-
 static/locales/gl.yaml                        |  108 +-
 static/locales/he.yaml                        |  239 +-
 static/locales/hi.yaml                        |   10 +
 static/locales/hr.yaml                        |  300 +-
 static/locales/hu.yaml                        |  289 +-
 static/locales/id.yaml                        |  112 +-
 static/locales/is.yaml                        |  224 +-
 static/locales/it.yaml                        |  293 +-
 static/locales/ja.yaml                        |  220 +-
 static/locales/ka.yaml                        |    9 +
 static/locales/ko.yaml                        |   54 +
 static/locales/ku.yaml                        |    8 +
 static/locales/la.yaml                        |    6 +
 static/locales/lt.yaml                        |   59 +-
 static/locales/lv.yaml                        |  394 +-
 static/locales/nb-NO.yaml                     |  361 +-
 static/locales/ne.yaml                        |    3 +
 static/locales/nl.yaml                        |  122 +-
 static/locales/nn.yaml                        |   76 +-
 static/locales/pl.yaml                        |  256 +-
 static/locales/pt-BR.yaml                     |  247 +-
 static/locales/pt-PT.yaml                     |   71 +-
 static/locales/pt.yaml                        |  230 +-
 static/locales/ro.yaml                        |   67 +-
 static/locales/ru.yaml                        |  246 +-
 static/locales/si.yaml                        |    1 +
 static/locales/sk.yaml                        |  107 +
 static/locales/sl.yaml                        |  106 +
 static/locales/sm.yaml                        |  116 +-
 static/locales/sr.yaml                        |  195 +-
 static/locales/sv.yaml                        |  122 +-
 static/locales/ta.yaml                        | 1047 ----
 static/locales/tok.yaml                       |   51 +-
 static/locales/tr.yaml                        |  248 +-
 static/locales/uk.yaml                        |  445 +-
 static/locales/ur.yaml                        |  157 +-
 static/locales/vi.yaml                        |  367 +-
 static/locales/vls.yaml                       |   43 +
 static/locales/zh-CN.yaml                     |  209 +-
 static/locales/zh-TW.yaml                     |  236 +-
 yarn.lock                                     | 4572 +++++++----------
 308 files changed, 14938 insertions(+), 20010 deletions(-)
 create mode 100644 .eslintignore
 create mode 100644 .eslintrc.js
 create mode 100644 .prettierrc
 delete mode 100644 _icons/iconGruvboxDarkSmall.svg
 delete mode 100644 _icons/iconGruvboxLightSmall.svg
 delete mode 100644 _icons/textGruvboxDarkSmall.svg
 delete mode 100644 _icons/textGruvboxLightSmall.svg
 delete mode 100644 _scripts/eslint-rules/plugin.mjs
 delete mode 100644 _scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs
 delete mode 100644 eslint.config.mjs
 delete mode 100644 src/renderer/components/ChannelHome/ChannelHome.css
 delete mode 100644 src/renderer/components/ChannelHome/ChannelHome.vue
 delete mode 100644 src/renderer/components/CommentSection/CommentSection.vue
 delete mode 100644 src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue
 delete mode 100644 src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue
 delete mode 100644 src/renderer/components/FtCommunityPost/FtCommunityPost.vue
 delete mode 100644 src/renderer/components/FtListChannel/FtListChannel.vue
 delete mode 100644 src/renderer/components/FtProgressBar/FtProgressBar.vue
 delete mode 100644 src/renderer/components/FtSearchFilters/FtSearchFilters.vue
 delete mode 100644 src/renderer/components/FtSettingsMenu/FtSettingsMenu.css
 delete mode 100644 src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue
 delete mode 100644 src/renderer/components/FtSettingsSection/FtSettingsSection.vue
 delete mode 100644 src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue
 delete mode 100644 src/renderer/components/FtTimestampCatcher.vue
 delete mode 100644 src/renderer/components/ParentalControlSettings.vue
 delete mode 100644 src/renderer/components/PasswordDialog/PasswordDialog.vue
 delete mode 100644 src/renderer/components/PasswordSettings/PasswordSettings.vue
 delete mode 100644 src/renderer/components/ThemeSettings.vue
 rename src/renderer/components/{ExperimentalSettings/ExperimentalSettings.css => experimental-settings/experimental-settings.css} (100%)
 create mode 100644 src/renderer/components/experimental-settings/experimental-settings.js
 create mode 100644 src/renderer/components/experimental-settings/experimental-settings.vue
 rename src/renderer/components/{FtAgeRestricted/FtAgeRestricted.css => ft-age-restricted/ft-age-restricted.css} (100%)
 create mode 100644 src/renderer/components/ft-age-restricted/ft-age-restricted.js
 create mode 100644 src/renderer/components/ft-age-restricted/ft-age-restricted.vue
 rename src/renderer/components/{FtCommunityPoll/FtCommunityPoll.css => ft-community-poll/ft-community-poll.css} (100%)
 create mode 100644 src/renderer/components/ft-community-poll/ft-community-poll.js
 rename src/renderer/components/{FtCommunityPoll/FtCommunityPoll.vue => ft-community-poll/ft-community-poll.vue} (62%)
 create mode 100644 src/renderer/components/ft-community-post/ft-community-post.js
 rename src/renderer/components/{FtCommunityPost/FtCommunityPost.scss => ft-community-post/ft-community-post.scss} (100%)
 create mode 100644 src/renderer/components/ft-community-post/ft-community-post.vue
 create mode 100644 src/renderer/components/ft-list-channel/ft-list-channel.js
 rename src/renderer/components/{FtListChannel/FtListChannel.scss => ft-list-channel/ft-list-channel.scss} (100%)
 create mode 100644 src/renderer/components/ft-list-channel/ft-list-channel.vue
 create mode 100644 src/renderer/components/ft-list-hashtag/ft-list-hashtag.js
 rename src/renderer/components/{FtListHashtag/FtListHashtag.scss => ft-list-hashtag/ft-list-hashtag.scss} (100%)
 rename src/renderer/components/{FtListHashtag/FtListHashtag.vue => ft-list-hashtag/ft-list-hashtag.vue} (50%)
 rename src/renderer/components/{FtLogoFull/FtLogoFull.css => ft-logo-full/ft-logo-full.css} (100%)
 rename src/renderer/components/{FtLogoFull/FtLogoFull.vue => ft-logo-full/ft-logo-full.vue} (99%)
 rename src/renderer/components/{FtProgressBar/FtProgressBar.css => ft-progress-bar/ft-progress-bar.css} (75%)
 create mode 100644 src/renderer/components/ft-progress-bar/ft-progress-bar.js
 create mode 100644 src/renderer/components/ft-progress-bar/ft-progress-bar.vue
 rename src/renderer/components/{FtSearchFilters/FtSearchFilters.css => ft-search-filters/ft-search-filters.css} (100%)
 create mode 100644 src/renderer/components/ft-search-filters/ft-search-filters.js
 create mode 100644 src/renderer/components/ft-search-filters/ft-search-filters.vue
 create mode 100644 src/renderer/components/ft-settings-section/ft-settings-section.js
 rename src/renderer/components/{FtSettingsSection/FtSettingsSection.scss => ft-settings-section/ft-settings-section.scss} (89%)
 create mode 100644 src/renderer/components/ft-settings-section/ft-settings-section.vue
 delete mode 100644 src/renderer/components/ft-share-button/ft-share-button.css
 create mode 100644 src/renderer/components/ft-share-button/ft-share-button.scss
 rename src/renderer/components/{FtSponsorBlockCategory/FtSponsorBlockCategory.css => ft-sponsor-block-category/ft-sponsor-block-category.css} (100%)
 create mode 100644 src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
 create mode 100644 src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
 create mode 100644 src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
 create mode 100644 src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue
 create mode 100644 src/renderer/components/parental-control-settings/parental-control-settings.js
 create mode 100644 src/renderer/components/parental-control-settings/parental-control-settings.vue
 rename src/renderer/components/{PasswordDialog/PasswordDialog.css => password-dialog/password-dialog.css} (100%)
 create mode 100644 src/renderer/components/password-dialog/password-dialog.js
 create mode 100644 src/renderer/components/password-dialog/password-dialog.vue
 rename src/renderer/components/{PasswordSettings/PasswordSettings.css => password-settings/password-settings.css} (100%)
 create mode 100644 src/renderer/components/password-settings/password-settings.js
 create mode 100644 src/renderer/components/password-settings/password-settings.vue
 rename src/renderer/components/{SideNavMoreOptions/SideNavMoreOptions.css => side-nav-more-options/side-nav-more-options.css} (100%)
 create mode 100644 src/renderer/components/side-nav-more-options/side-nav-more-options.js
 rename src/renderer/components/{SideNavMoreOptions/SideNavMoreOptions.vue => side-nav-more-options/side-nav-more-options.vue} (79%)
 rename src/renderer/components/{SideNav/SideNav.css => side-nav/side-nav.css} (100%)
 create mode 100644 src/renderer/components/side-nav/side-nav.js
 rename src/renderer/components/{SideNav/SideNav.vue => side-nav/side-nav.vue} (58%)
 delete mode 100644 src/renderer/components/subscription-settings/subscription-settings.css
 create mode 100644 src/renderer/components/theme-settings/theme-settings.js
 create mode 100644 src/renderer/components/theme-settings/theme-settings.vue
 rename src/renderer/components/{CommentSection/CommentSection.css => watch-video-comments/watch-video-comments.css} (100%)
 create mode 100644 src/renderer/components/watch-video-comments/watch-video-comments.js
 create mode 100644 src/renderer/components/watch-video-comments/watch-video-comments.vue
 delete mode 100644 src/renderer/composables/colors.js
 delete mode 100644 src/renderer/composables/use-i18n-polyfill.js
 create mode 100644 src/renderer/views/About/About.js
 create mode 100644 src/renderer/views/Hashtag/Hashtag.js
 create mode 100644 src/renderer/views/Popular/Popular.js
 delete mode 100644 src/renderer/views/Post.vue
 create mode 100644 src/renderer/views/Post/Post.js
 create mode 100644 src/renderer/views/Post/Post.vue
 create mode 100644 src/renderer/views/SubscribedChannels/SubscribedChannels.js
 create mode 100644 src/renderer/views/Trending/Trending.js
 delete mode 100644 static/geolocations/be.json
 delete mode 100644 static/locales/br.yaml
 delete mode 100644 static/locales/ta.yaml

diff --git a/.babelrc b/.babelrc
index 5b381b9ea33a8..c13cff889347b 100644
--- a/.babelrc
+++ b/.babelrc
@@ -4,7 +4,7 @@
       "@babel/env",
       {
         "targets": {
-          "chrome": "130",
+          "chrome": "122",
           "node": "20.9.0"
         }
       }
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000000..0cc5b81014008
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,3 @@
+node_modules
+_scripts
+dist
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000000000..a0c8c79b28a3a
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,127 @@
+const path = require('path')
+const { readFileSync } = require('fs')
+
+const activeLocales = JSON.parse(readFileSync(path.join(__dirname, './static/locales/activeLocales.json')))
+
+module.exports = {
+  // https://eslint.org/docs/user-guide/configuring#using-configuration-files-1
+  root: true,
+
+  // https://eslint.org/docs/user-guide/configuring#specifying-environments
+  env: {
+    browser: true,
+    node: true
+  },
+
+  // https://eslint.org/docs/user-guide/configuring#specifying-parser
+  parser: 'vue-eslint-parser',
+
+  // https://eslint.vuejs.org/user-guide/#faq
+  parserOptions: {
+    parser: '@babel/eslint-parser',
+    ecmaVersion: 2022,
+    sourceType: 'module'
+  },
+
+  overrides: [
+    {
+      files: ['*.json'],
+      parser: 'jsonc-eslint-parser',
+      extends: ['plugin:jsonc/base'],
+      rules: {
+        'no-tabs': 'off',
+        'comma-spacing': 'off'
+      }
+    },
+    {
+      files: ['*.yaml', '*.yml'],
+      parser: 'yaml-eslint-parser',
+      extends: ['plugin:yml/recommended'],
+      rules: {
+        'yml/no-irregular-whitespace': 'off'
+      }
+    }
+  ],
+
+  // https://eslint.org/docs/user-guide/configuring#extending-configuration-files
+  // order matters: from least important to most important in terms of overriding
+  // Prettier + Vue: https://medium.com/@gogl.alex/how-to-properly-set-up-eslint-with-prettier-for-vue-or-nuxt-in-vscode-e42532099a9c
+  extends: [
+    'prettier',
+    'eslint:recommended',
+    'plugin:vue/recommended',
+    'standard',
+    'plugin:jsonc/recommended-with-json',
+    'plugin:vuejs-accessibility/recommended',
+    'plugin:@intlify/vue-i18n/recommended'
+  ],
+
+  // https://eslint.org/docs/user-guide/configuring#configuring-plugins
+  plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn', '@intlify/vue-i18n'],
+
+  rules: {
+    'space-before-function-paren': 'off',
+    'comma-dangle': ['error', 'only-multiline'],
+    'vue/no-v-html': 'off',
+    'no-console': ['error', { allow: ['warn', 'error'] }],
+    'no-unused-vars': 'warn',
+    'no-undef': 'warn',
+    'object-shorthand': 'off',
+    'vue/no-template-key': 'warn',
+    'vue/no-useless-template-attributes': 'off',
+    'vue/multi-word-component-names': 'off',
+    'vuejs-accessibility/no-onchange': 'off',
+    'vuejs-accessibility/label-has-for': ['error', {
+      required: {
+        some: ['nesting', 'id']
+      }
+    }],
+    'vuejs-accessibility/no-static-element-interactions': 'off',
+    'n/no-callback-literal': 'warn',
+    'n/no-path-concat': 'warn',
+    'unicorn/better-regex': 'error',
+    'unicorn/no-array-push-push': 'error',
+    'unicorn/prefer-keyboard-event-key': 'error',
+    'unicorn/prefer-regexp-test': 'error',
+    'unicorn/prefer-string-replace-all': 'error',
+    '@intlify/vue-i18n/no-dynamic-keys': 'error',
+    // TODO: enable at a later date. currently disabled to prevent massive conflicts for initial PR
+    // '@intlify/vue-i18n/no-unused-keys': [
+    //   'error',
+    //   {
+    //     extensions: ['.js', '.vue', 'yaml']
+    //   }
+    // ],
+    '@intlify/vue-i18n/no-duplicate-keys-in-locale': 'error',
+    '@intlify/vue-i18n/no-raw-text': [
+      'error',
+      {
+        attributes: {
+          '/.+/': [
+            'title',
+            'aria-label',
+            'aria-placeholder',
+            'aria-roledescription',
+            'aria-valuetext',
+            'tooltip',
+            'message'
+          ],
+          input: ['placeholder', 'value'],
+          img: ['alt']
+        },
+        ignoreText: ['-', '•', '/', 'YouTube', 'Invidious', 'FreeTube']
+      }
+    ],
+    // Only applicable when we upgrade to Vue 3 and vue-i18n 9+
+    '@intlify/vue-i18n/no-deprecated-tc': 'off',
+
+    'vue/require-explicit-emits': 'error',
+    'vue/no-unused-emit-declarations': 'error',
+  },
+  settings: {
+    'vue-i18n': {
+      localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
+      messageSyntaxVersion: '^8.0.0'
+    }
+  }
+}
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 9819ec7de35f8..65a5c0f0ce04e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,10 +1,10 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discussions
-    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
+    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/general
     about: View discussions or start one yourself
   - name: Questions
-    url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
+    url:  https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
     about: Ask and answer questions
   - name: Matrix Community
     url: https://matrix.to/#/+freetube:matrix.org
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 0bbf74c851074..6b83338919247 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -34,7 +34,7 @@ body:
   - type: textarea
     attributes:
       label: Alternatives Considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
+      description: A clear and concise description of any alternative solutions or features you've considered. 
     validations:
       required: true
   - type: dropdown
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 248241a93065d..cb49b32397ef2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,10 +17,8 @@ updates:
         patterns:
           - "eslint"
           - "eslint-*"
-          - "@eslint/*"
           - "yaml-eslint-parser"
           - "vue-eslint-parser"
-          - "neostandard"
       stylelint:
         patterns:
           - "stylelint"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5d34902f607ac..f726d5aaff36a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,9 @@ jobs:
           - win-x64
           - win-arm64
           - osx-x64
-          - osx-arm64
+          # `osx-arm64` disabled due to "macOS gatekeeper"
+          # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
+          # - osx-arm64
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -34,8 +36,8 @@ jobs:
         - runtime: osx-x64
           os: macOS-latest
 
-        - runtime: osx-arm64
-          os: macOS-latest
+#        - runtime: osx-arm64
+#          os: macOS-latest
 
         - runtime: win-x64
           os: windows-latest
@@ -84,9 +86,10 @@ jobs:
       with:
         version: ${{ steps.versionNumber.outputs.result }}
 
+
     - name: Install libarchive-tools
       if: startsWith(matrix.os, 'ubuntu')
-      run: sudo apt update; sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
+      run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
 
     - name: Build x64 with Node.js ${{ matrix.node-version}}
       if: contains(matrix.runtime, 'x64')
@@ -100,19 +103,6 @@ jobs:
       if: contains(matrix.runtime, 'arm64')
       run: yarn run build:arm64
 
-    - name: Convert X64 AppImage to static runtime
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      run: |
-        sudo apt install desktop-file-utils
-        cd build
-        appimage="FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage"
-        wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O ./appimagetool.AppImage
-        chmod +x ./"$appimage" ./appimagetool.AppImage
-        ./"$appimage" --appimage-extract && rm -f ./"$appimage"
-        ./appimagetool.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
-          -n ./squashfs-root ./"$appimage"
-        rm -rf ./squashfs-root ./appimagetool.AppImage
-
     - name: Upload Linux .zip x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -311,12 +301,12 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
 
-    - name: Upload Mac arm64 .dmg Artifact
-      uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
+#    - name: Upload Mac arm64 .dmg Artifact
+#      uses: actions/upload-artifact@v4
+#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+#      with:
+#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
+#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
 
     - name: Upload Mac x64 .zip Artifact
       uses: actions/upload-artifact@v4
@@ -332,16 +322,9 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
 
-    - name: Upload Mac arm64 .zip Artifact
-      uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
-
-    - name: Upload Mac arm64 .7z Artifact
-      uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.7z
+#    - name: Upload Mac arm64 .zip Artifact
+#      uses: actions/upload-artifact@v4
+#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+#      with:
+#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
+#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 9e9ce6803c6dd..521082d630464 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -37,10 +37,11 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-
+        
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
+        
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -49,7 +50,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
index 3cb403dc42ed9..b65794cbb1647 100644
--- a/.github/workflows/conflicts.yml
+++ b/.github/workflows/conflicts.yml
@@ -20,3 +20,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
+
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 217f4c926cc43..abee92197ac42 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -77,22 +77,22 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
     - name: Update ARM File Location in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.44.3
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index e0ec42ea8ed80..962a5f55de4c6 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -6,7 +6,7 @@ name: Linter
 # events but only for the master branch
 on:
   pull_request:
-    branches: [ master, development, '**-RC' ]
+    branches: [ master, development ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
index b430c13ed588d..a0a8bf8fc13a8 100644
--- a/.github/workflows/no-response.yml
+++ b/.github/workflows/no-response.yml
@@ -1,24 +1,24 @@
-name: No Response
-
-# Both `issue_comment` and `scheduled` event types are required for this Action
-# to work properly.
-on:
-  issue_comment:
-    types: [created]
-  schedule:
-    # Run daily at midnight.
-    - cron: '0 0 * * *'
-
-jobs:
-  noResponse:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: lee-dohm/no-response@v0.5.0
-        with:
-          token: ${{ github.token }}
-          closeComment: >
-            This issue has been automatically closed because there has been no response to our request for more information from the original author.
-            With only the information that is currently in the issue, we don't have enough information to take action.
-            Please reach out if you have or find the answers we need so that we can investigate further.
-          daysUntilClose: 7
-          responseRequiredLabel: "U: Waiting for Response from Author"
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action
+# to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    # Run daily at midnight.
+    - cron: '0 0 * * *'
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          closeComment: >
+            This issue has been automatically closed because there has been no response to our request for more information from the original author. 
+            With only the information that is currently in the issue, we don't have enough information to take action. 
+            Please reach out if you have or find the answers we need so that we can investigate further.
+          daysUntilClose: 14
+          responseRequiredLabel: "U: Waiting for Response from Author"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9ec4bdab83db0..eee0f8a462700 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,9 @@ jobs:
           - win-x64
           - win-arm64
           - osx-x64
-          - osx-arm64
+          # `osx-arm64` disabled due to "macOS gatekeeper"
+          # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
+          # - osx-arm64
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -34,8 +36,8 @@ jobs:
         - runtime: osx-x64
           os: macOS-latest
 
-        - runtime: osx-arm64
-          os: macOS-latest
+#        - runtime: osx-arm64
+#          os: macOS-latest
 
         - runtime: win-x64
           os: windows-latest
@@ -71,19 +73,6 @@ jobs:
       if: contains(matrix.runtime, 'arm64')
       run: yarn run build:arm64
 
-    - name: Convert X64 AppImage to static runtime
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      run: |
-        sudo apt install desktop-file-utils
-        cd build
-        appimage="FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage"
-        wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -O ./appimagetool.AppImage
-        chmod +x ./"$appimage" ./appimagetool.AppImage
-        ./"$appimage" --appimage-extract && rm -f ./"$appimage"
-        ./appimagetool.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
-          -n ./squashfs-root ./"$appimage"
-        rm -rf ./squashfs-root ./appimagetool.AppImage
-
     - name: Upload AppImage x64 Release
       uses: actions/upload-release-asset@v1
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -95,28 +84,6 @@ jobs:
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}.AppImage
         asset_content_type: application/vnd.appimage
 
-    - name: Upload AppImage ARMv7l Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
-        asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
-        asset_content_type: application/vnd.appimage
-
-    - name: Upload AppImage ARM64 Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
-        asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
-        asset_content_type: application/vnd.appimage
-
     - name: Upload Linux .zip x64 Release
       uses: actions/upload-release-asset@v1
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
@@ -339,16 +306,16 @@ jobs:
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.dmg
         asset_content_type: application/x-apple-diskimage
 
-    - name: Upload Mac arm64 .dmg Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
-        asset_content_type: application/x-apple-diskimage
+#    - name: Upload Mac arm64 .dmg Release
+#      uses: actions/upload-release-asset@v1
+#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+#      env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      with:
+#        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+#        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
+#        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
+#        asset_content_type: application/x-apple-diskimage
 
     - name: Upload Mac x64 .zip Release
       uses: actions/upload-release-asset@v1
@@ -372,68 +339,14 @@ jobs:
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.7z
         asset_content_type: application/x-7z-compressed
 
-    - name: Upload Mac arm64 .zip Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
-        asset_content_type: application/x-apple-diskimage
-
-    - name: Upload Mac arm64 .7z Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.7z
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.7z
-        asset_content_type: application/x-7z-compressed
-
-    - name: Upload Alpine .apk x64 Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-amd64.apk
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.apk
-        asset_content_type: application/octet-stream
-
-    - name: Upload Alpine .apk ARMv7l Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-armv7l.apk
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.apk
-        asset_content_type: application/octet-stream
-
-    - name: Upload Alpine .apk ARM64 Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-arm64.apk
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.apk
-        asset_content_type: application/octet-stream
+#    - name: Upload Mac arm64 .zip Release
+#      uses: actions/upload-release-asset@v1
+#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+#      env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      with:
+#        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+#        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
+#        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
+#        asset_content_type: application/x-apple-diskimage
 
-    - name: Upload Pacman .pacman x64 Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-amd64.pacman
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.pacman
-        asset_content_type: application/x-zstd-compressed-tar
diff --git a/.github/workflows/remove-outdated-labels.yml b/.github/workflows/remove-outdated-labels.yml
index 1341ad028821b..8ea7ee1d48d40 100644
--- a/.github/workflows/remove-outdated-labels.yml
+++ b/.github/workflows/remove-outdated-labels.yml
@@ -1,61 +1,61 @@
-name: Remove outdated labels
-on:
-  pull_request_target:
-    types:
-      - closed
-      - converted_to_draft
-      - ready_for_review
-jobs:
-  remove-merged-pr-labels:
-    name: Remove merged pull request labels
-    if: github.event.pull_request.merged
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            PR: WIP
-            PR: changes requested
-            PR: merge conflicts / rebase needed
-            PR/Issue: dependent
-            PR: stale
-
-  remove-closed-pr-labels:
-    name: Remove closed pull request labels
-    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-            PR: WIP
-            PR: changes requested
-            PR: merge conflicts / rebase needed
-            PR/Issue: dependent
-            PR: stale
-
-  remove-draft-pr-labels:
-    name: Remove labels from draft pull requests
-    if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: waiting for review
-
-  remove-ready-pr-labels:
-    name: Remove labels when draft pr is marked ready for review
-    if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: mondeja/remove-labels-gh-action@v2.0.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: |
-            PR: WIP
+name: Remove outdated labels
+on:
+  pull_request_target:
+    types:
+      - closed
+      - converted_to_draft
+      - ready_for_review
+jobs:
+  remove-merged-pr-labels:
+    name: Remove merged pull request labels
+    if: github.event.pull_request.merged
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent
+            PR: stale
+
+  remove-closed-pr-labels:
+    name: Remove closed pull request labels
+    if: github.event_name == 'pull_request_target' && (! github.event.pull_request.merged) && (github.event.action != 'converted_to_draft') && (github.event.action != 'ready_for_review')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            PR: WIP
+            PR: changes requested
+            PR: merge conflicts / rebase needed
+            PR/Issue: dependent
+            PR: stale
+
+  remove-draft-pr-labels:
+    name: Remove labels from draft pull requests
+    if: github.event_name == 'pull_request_target' && github.event.action == 'converted_to_draft'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: waiting for review
+            
+  remove-ready-pr-labels:
+    name: Remove labels when draft pr is marked ready for review
+    if: github.event_name == 'pull_request_target' && github.event.action == 'ready_for_review'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v2.0.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            PR: WIP
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 354408edee5ef..6945419318d9a 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -14,14 +14,14 @@ jobs:
       - uses: actions/stale@v9
         with:
           stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
-          stale-pr-message: 'This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          stale-pr-message: 'This PR is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
           close-pr-message: 'This PR was closed because it has been stalled for 14 days with no activity.'
           days-before-issue-stale: 28
-          days-before-pr-stale: 14
+          days-before-pr-stale: 28
           days-before-issue-close: 7
           days-before-pr-close: 14
           stale-issue-label: 'U: stale'
           stale-pr-label: 'PR: stale'
           exempt-pr-labels: 'PR: WIP'
-          exempt-issue-labels: 'enhancement, U: reproduced'
+          exempt-issue-labels: 'enhancement'
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000000000..b96994ddd09ab
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,7 @@
+{
+    "semi": false,
+    "singleQuote": true,
+    "tabWidth": 2,
+    "trailingComma": false,
+    "useTabs": false
+}
diff --git a/README.md b/README.md
index 839d78b3fba4f..5a42b6c49d877 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 FreeTube is an open source desktop YouTube player built with privacy in mind.
 Use YouTube without advertisements and prevent Google from tracking you with their cookies and JavaScript.
-Available for Windows (10 and later), Mac (macOS 11 and later) & Linux thanks to Electron.
+Available for Windows (10 and later), Mac (macOS 10.15 and later) & Linux thanks to Electron.
 
 <p align="center"><a href="https://github.com/FreeTubeApp/FreeTube/releases">Download FreeTube</a></p>
 <p align="center">
@@ -59,25 +59,20 @@ longer track you using cookies or JavaScript. Your subscriptions and history are
 * Option to show only family friendly content
 * Show/hide functionality or elements within the app using the distraction free settings
 * View channel community posts
+* View most age restricted videos
 
-### Browser Extensions
-The following extensions open YouTube links directly in FreeTube:
+### Browser Extension
+FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. 
 
-- [LibRedirect](https://libredirect.github.io/)
-- [RedirectTube](https://github.com/MStankiewiczOfficial/RedirectTube)
-
-LibRedirect automatically redirect YouTube links to FreeTube.
-> [!IMPORTANT]
-> To ensure proper functionality, select FreeTube as Frontend in the Services settings of the extension.
-
-RedirectTube, doesn’t automatically open YouTube links in FreeTube. Instead, it adds buttons to the toolbar and context menu, which you can click to open videos in FreeTube manually.
+> [!IMPORTANT]  
+> You must enable the option within the advanced settings of the extension for it to work.
 
-- Download LibRedirect from [Mozilla Add-ons](https://addons.mozilla.org/firefox/addon/libredirect/) (for Firefox based-browsers) or [developer's website](https://libredirect.github.io/download_chromium.html) (for Chrome and Chromium-based browsers).
+* Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).
 
-- Download RedirectTube from [Mozilla Add-ons](https://addons.mozilla.org/firefox/addon/redirecttube/) (for Firefox based-browsers).
+* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://libredirect.github.io/download_chromium.html).
 
 > [!NOTE]
-> These extensions do not work on Linux portable builds!
+> This extension does not work on Linux portable builds!
 >
 > If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository.
 
@@ -85,7 +80,7 @@ RedirectTube, doesn’t automatically open YouTube links in FreeTube. Instead, i
 ### Official Downloads
 
 > [!CAUTION]
-> FreeTube is only supported on Windows 10 and later, macOS 11 and above, and various Linux distributions. Installing it on unsupported systems may result in unexpected issues.
+> FreeTube is only supported on Windows 10 and later, macOS 10.15 and above, and various Linux distributions. Installing it on unsupported systems may result in unexpected issues.
 
 * [GitHub Releases](https://github.com/FreeTubeApp/FreeTube/releases)
 
diff --git a/_icons/iconGruvboxDarkSmall.svg b/_icons/iconGruvboxDarkSmall.svg
deleted file mode 100644
index e6dd6ad1595cf..0000000000000
--- a/_icons/iconGruvboxDarkSmall.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="25" height="25" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M4.903 0C5.84 0 6.6.76 6.6 1.697V25H4.27A4.268 4.268 0 0 1 0 20.73V1.697C0 .76.76 0 1.697 0h3.206zM25 0v2.022A4.577 4.577 0 0 1 20.422 6.6H9.38A1.68 1.68 0 0 1 7.7 4.92V1.68C7.7.752 8.452 0 9.38 0H25zm-7.064 12.223a.645.645 0 0 1 0 1.154l-9.273 4.596a.668.668 0 0 1-.963-.597V8.224a.667.667 0 0 1 .963-.597l9.273 4.596z" style="fill-opacity:1;fill:#282828"/></svg>
\ No newline at end of file
diff --git a/_icons/iconGruvboxLightSmall.svg b/_icons/iconGruvboxLightSmall.svg
deleted file mode 100644
index a08e5c34f9830..0000000000000
--- a/_icons/iconGruvboxLightSmall.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="25" height="25" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M4.903 0C5.84 0 6.6.76 6.6 1.697V25H4.27A4.268 4.268 0 0 1 0 20.73V1.697C0 .76.76 0 1.697 0h3.206zM25 0v2.022A4.577 4.577 0 0 1 20.422 6.6H9.38A1.68 1.68 0 0 1 7.7 4.92V1.68C7.7.752 8.452 0 9.38 0H25zm-7.064 12.223a.645.645 0 0 1 0 1.154l-9.273 4.596a.668.668 0 0 1-.963-.597V8.224a.667.667 0 0 1 .963-.597l9.273 4.596z" style="fill-opacity:1;fill:#ebdbb2"/></svg>
\ No newline at end of file
diff --git a/_icons/textGruvboxDarkSmall.svg b/_icons/textGruvboxDarkSmall.svg
deleted file mode 100644
index 00e3080e7268f..0000000000000
--- a/_icons/textGruvboxDarkSmall.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="100" height="49" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M3.029 33.471c-.452 0-.815-.141-1.088-.422-.272-.282-.409-.65-.409-1.104V18.21c0-.454.129-.806.386-1.057.257-.25.612-.376 1.064-.376h8.204c.951 0 1.426.407 1.426 1.221 0 .799-.475 1.198-1.426 1.198H4.501v4.508h6.218c.95 0 1.425.407 1.425 1.221 0 .798-.475 1.197-1.425 1.197H4.501v5.823c0 .454-.132.822-.397 1.104-.265.281-.624.422-1.075.422zm16.403-11.857c.367-.031.656.055.868.258.211.204.317.509.317.916 0 .423-.092.736-.275.939-.183.204-.515.337-.994.399l-.635.071c-.832.094-1.441.407-1.829.939-.388.532-.582 1.197-.582 1.996v4.93c0 .454-.127.803-.381 1.045-.253.243-.571.364-.951.364-.381 0-.695-.121-.941-.364-.247-.242-.37-.591-.37-1.045v-9.086c0-.438.123-.775.37-1.01.246-.234.553-.352.92-.352.366 0 .662.114.888.34.226.228.338.552.338.975v.939c.268-.689.667-1.221 1.195-1.597a3.419 3.419 0 0 1 1.766-.633l.296-.024zm12.444 8.57c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716 8.06 8.06 0 0 1-2.004.27c-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.244-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.097 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.795 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.457-.493-1.092-.74-1.907-.74zm17.487 6.551c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716c-.7.18-1.369.27-2.004.27-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.245-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.098 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.794 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.456-.493-1.092-.74-1.907-.74zm13.402 9.838c-.521 0-1.186-.164-1.506-.494-.32-.329-.48-.768-.48-1.316V19.763h-3.374c-1.102 0-1.652-.501-1.652-1.504 0-.988.55-1.482 1.652-1.482h10.719c1.102 0 1.653.494 1.653 1.482 0 1.003-.551 1.504-1.653 1.504h-3.374v11.898c0 .548-.156.987-.468 1.316-.313.33-.981.494-1.517.494zM69.693 21.69c.545 0 .978.148 1.297.446.32.297.479.704.479 1.221v8.616c0 .486-.167.877-.502 1.175-.335.297-.768.446-1.297.446-.499 0-.896-.141-1.192-.423-.297-.282-.445-.658-.445-1.127v-.235a3.63 3.63 0 0 1-1.414 1.362c-.584.313-1.242.469-1.975.469-1.449 0-2.528-.403-3.237-1.209-.709-.806-1.064-2.023-1.064-3.651v-5.423c0-.517.16-.924.479-1.221.32-.298.752-.446 1.298-.446.545 0 .974.148 1.285.446.312.297.468.704.468 1.221v5.494c0 .688.144 1.197.432 1.526.288.329.729.493 1.321.493.685 0 1.243-.235 1.671-.704.429-.47.643-1.088.643-1.855v-4.954c0-.517.156-.924.467-1.221.312-.298.741-.446 1.286-.446zm11.736-.047c1.017 0 1.915.242 2.694.727.779.486 1.387 1.178 1.824 2.079.437.899.655 1.944.655 3.134s-.218 2.242-.655 3.158c-.437.915-1.049 1.628-1.836 2.137-.787.508-1.681.762-2.682.762-.811 0-1.542-.168-2.194-.504a3.633 3.633 0 0 1-1.502-1.397v.187c0 .501-.159.904-.477 1.21-.317.305-.747.458-1.287.458-.54 0-.974-.153-1.299-.458-.326-.306-.489-.709-.489-1.21V18.402c0-.485.171-.876.512-1.173.342-.298.791-.447 1.347-.447.525 0 .946.141 1.264.423.318.282.477.657.477 1.127v5.142a3.534 3.534 0 0 1 1.49-1.35c.644-.321 1.363-.481 2.158-.481zm-1.049 9.298c.842 0 1.494-.294 1.955-.881.461-.587.691-1.412.691-2.477 0-1.049-.23-1.851-.691-2.407-.461-.555-1.113-.833-1.955-.833-.843 0-1.494.286-1.955.857-.461.571-.692 1.381-.692 2.43 0 1.064.231 1.882.692 2.454.461.571 1.112.857 1.955.857zm18.404-.916c.337 0 .612.125.823.375.211.251.317.572.317.963 0 .266-.084.513-.254.74a2.005 2.005 0 0 1-.709.575 9.445 9.445 0 0 1-2.002.692c-.76.181-1.461.27-2.103.27-1.351 0-2.53-.242-3.535-.727-1.005-.486-1.778-1.178-2.318-2.078-.541-.9-.811-1.961-.811-3.182 0-1.174.262-2.214.786-3.122a5.526 5.526 0 0 1 2.179-2.125c.929-.509 1.984-.763 3.167-.763 1.132 0 2.124.231 2.977.692a4.895 4.895 0 0 1 1.989 1.973c.473.853.71 1.85.71 2.993 0 .345-.089.607-.266.787-.177.18-.427.27-.748.27h-7.095c.119.923.423 1.593.913 2.007.49.415 1.191.622 2.103.622.49 0 .929-.054 1.317-.164.389-.11.82-.258 1.293-.446.236-.094.464-.176.684-.247.219-.07.414-.105.583-.105zm-4.359-5.941c-.726 0-1.309.216-1.748.646-.439.431-.701 1.053-.786 1.867h4.891c-.051-.83-.275-1.456-.672-1.878-.397-.423-.958-.635-1.685-.635z" style="fill-rule:nonzero;fill-opacity:1;fill:#282828"/></svg>
\ No newline at end of file
diff --git a/_icons/textGruvboxLightSmall.svg b/_icons/textGruvboxLightSmall.svg
deleted file mode 100644
index 434c116ddd900..0000000000000
--- a/_icons/textGruvboxLightSmall.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="100" height="49" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" xmlns="http://www.w3.org/2000/svg"><path d="M3.029 33.471c-.452 0-.815-.141-1.088-.422-.272-.282-.409-.65-.409-1.104V18.21c0-.454.129-.806.386-1.057.257-.25.612-.376 1.064-.376h8.204c.951 0 1.426.407 1.426 1.221 0 .799-.475 1.198-1.426 1.198H4.501v4.508h6.218c.95 0 1.425.407 1.425 1.221 0 .798-.475 1.197-1.425 1.197H4.501v5.823c0 .454-.132.822-.397 1.104-.265.281-.624.422-1.075.422zm16.403-11.857c.367-.031.656.055.868.258.211.204.317.509.317.916 0 .423-.092.736-.275.939-.183.204-.515.337-.994.399l-.635.071c-.832.094-1.441.407-1.829.939-.388.532-.582 1.197-.582 1.996v4.93c0 .454-.127.803-.381 1.045-.253.243-.571.364-.951.364-.381 0-.695-.121-.941-.364-.247-.242-.37-.591-.37-1.045v-9.086c0-.438.123-.775.37-1.01.246-.234.553-.352.92-.352.366 0 .662.114.888.34.226.228.338.552.338.975v.939c.268-.689.667-1.221 1.195-1.597a3.419 3.419 0 0 1 1.766-.633l.296-.024zm12.444 8.57c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716 8.06 8.06 0 0 1-2.004.27c-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.244-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.097 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.795 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.457-.493-1.092-.74-1.907-.74zm17.487 6.551c.277 0 .501.102.672.305.171.204.257.478.257.822 0 .485-.302.892-.905 1.221a8.382 8.382 0 0 1-1.882.716c-.7.18-1.369.27-2.004.27-1.923 0-3.447-.532-4.571-1.596-1.125-1.065-1.687-2.521-1.687-4.368 0-1.174.245-2.215.734-3.122a5.2 5.2 0 0 1 2.065-2.113c.888-.502 1.894-.752 3.019-.752 1.075 0 2.012.227 2.811.681a4.7 4.7 0 0 1 1.857 1.925c.44.83.66 1.808.66 2.935 0 .673-.309 1.01-.928 1.01h-7.211c.098 1.08.415 1.874.953 2.383.538.509 1.32.763 2.347.763.521 0 .981-.063 1.381-.188.399-.125.851-.297 1.356-.516.489-.251.848-.376 1.076-.376zm-4.229-6.551c-.831 0-1.495.251-1.992.752-.497.501-.794 1.22-.892 2.16h5.524c-.033-.955-.277-1.679-.733-2.172-.456-.493-1.092-.74-1.907-.74zm13.402 9.838c-.521 0-1.186-.164-1.506-.494-.32-.329-.48-.768-.48-1.316V19.763h-3.374c-1.102 0-1.652-.501-1.652-1.504 0-.988.55-1.482 1.652-1.482h10.719c1.102 0 1.653.494 1.653 1.482 0 1.003-.551 1.504-1.653 1.504h-3.374v11.898c0 .548-.156.987-.468 1.316-.313.33-.981.494-1.517.494zM69.693 21.69c.545 0 .978.148 1.297.446.32.297.479.704.479 1.221v8.616c0 .486-.167.877-.502 1.175-.335.297-.768.446-1.297.446-.499 0-.896-.141-1.192-.423-.297-.282-.445-.658-.445-1.127v-.235a3.63 3.63 0 0 1-1.414 1.362c-.584.313-1.242.469-1.975.469-1.449 0-2.528-.403-3.237-1.209-.709-.806-1.064-2.023-1.064-3.651v-5.423c0-.517.16-.924.479-1.221.32-.298.752-.446 1.298-.446.545 0 .974.148 1.285.446.312.297.468.704.468 1.221v5.494c0 .688.144 1.197.432 1.526.288.329.729.493 1.321.493.685 0 1.243-.235 1.671-.704.429-.47.643-1.088.643-1.855v-4.954c0-.517.156-.924.467-1.221.312-.298.741-.446 1.286-.446zm11.736-.047c1.017 0 1.915.242 2.694.727.779.486 1.387 1.178 1.824 2.079.437.899.655 1.944.655 3.134s-.218 2.242-.655 3.158c-.437.915-1.049 1.628-1.836 2.137-.787.508-1.681.762-2.682.762-.811 0-1.542-.168-2.194-.504a3.633 3.633 0 0 1-1.502-1.397v.187c0 .501-.159.904-.477 1.21-.317.305-.747.458-1.287.458-.54 0-.974-.153-1.299-.458-.326-.306-.489-.709-.489-1.21V18.402c0-.485.171-.876.512-1.173.342-.298.791-.447 1.347-.447.525 0 .946.141 1.264.423.318.282.477.657.477 1.127v5.142a3.534 3.534 0 0 1 1.49-1.35c.644-.321 1.363-.481 2.158-.481zm-1.049 9.298c.842 0 1.494-.294 1.955-.881.461-.587.691-1.412.691-2.477 0-1.049-.23-1.851-.691-2.407-.461-.555-1.113-.833-1.955-.833-.843 0-1.494.286-1.955.857-.461.571-.692 1.381-.692 2.43 0 1.064.231 1.882.692 2.454.461.571 1.112.857 1.955.857zm18.404-.916c.337 0 .612.125.823.375.211.251.317.572.317.963 0 .266-.084.513-.254.74a2.005 2.005 0 0 1-.709.575 9.445 9.445 0 0 1-2.002.692c-.76.181-1.461.27-2.103.27-1.351 0-2.53-.242-3.535-.727-1.005-.486-1.778-1.178-2.318-2.078-.541-.9-.811-1.961-.811-3.182 0-1.174.262-2.214.786-3.122a5.526 5.526 0 0 1 2.179-2.125c.929-.509 1.984-.763 3.167-.763 1.132 0 2.124.231 2.977.692a4.895 4.895 0 0 1 1.989 1.973c.473.853.71 1.85.71 2.993 0 .345-.089.607-.266.787-.177.18-.427.27-.748.27h-7.095c.119.923.423 1.593.913 2.007.49.415 1.191.622 2.103.622.49 0 .929-.054 1.317-.164.389-.11.82-.258 1.293-.446.236-.094.464-.176.684-.247.219-.07.414-.105.583-.105zm-4.359-5.941c-.726 0-1.309.216-1.748.646-.439.431-.701 1.053-.786 1.867h4.891c-.051-.83-.275-1.456-.672-1.878-.397-.423-.958-.635-1.685-.635z" style="fill-rule:nonzero;fill-opacity:1;fill:#ebdbb2"/></svg>
\ No newline at end of file
diff --git a/_scripts/ProcessLocalesPlugin.js b/_scripts/ProcessLocalesPlugin.js
index d08bb3734f833..51ff870c698f3 100644
--- a/_scripts/ProcessLocalesPlugin.js
+++ b/_scripts/ProcessLocalesPlugin.js
@@ -26,11 +26,11 @@ class ProcessLocalesPlugin {
     }
     this.outputDir = options.outputDir
 
-    /** @type {Map<string, any>} */
+    /** @type {Map<str, any>} */
     this.locales = new Map()
     this.localeNames = []
 
-    /** @type {Map<string, any>} */
+    /** @type {Map<str, any>} */
     this.cache = new Map()
 
     this.filePaths = []
@@ -45,7 +45,7 @@ class ProcessLocalesPlugin {
 
   /** @param {import('webpack').Compiler} compiler  */
   apply(compiler) {
-    const { CachedSource, RawSource } = compiler.webpack.sources
+    const { CachedSource, RawSource } = compiler.webpack.sources;
     const { Compilation, DefinePlugin } = compiler.webpack
 
     new DefinePlugin({
@@ -59,6 +59,7 @@ class ProcessLocalesPlugin {
         name: PLUGIN_NAME,
         stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
       }, async (_assets) => {
+
         // While running in the webpack dev server, this hook gets called for every incremental build.
         // For incremental builds we can return the already processed versions, which saves time
         // and makes webpack treat them as cached
@@ -71,7 +72,6 @@ class ProcessLocalesPlugin {
         }
 
         for (let [locale, data] of this.locales) {
-          // eslint-disable-next-line no-async-promise-executor
           promises.push(new Promise(async (resolve) => {
             if (IS_DEV_SERVER && compiler.fileTimestamps) {
               const filePath = join(this.inputDir, `${locale}.yaml`)
@@ -131,7 +131,6 @@ class ProcessLocalesPlugin {
     })
 
     compiler.hooks.afterCompile.tap(PLUGIN_NAME, (compilation) => {
-      // eslint-disable-next-line no-extra-boolean-cast
       if (!!compiler.watching) {
         // watch locale files for changes
         compilation.fileDependencies.addAll(this.filePaths)
diff --git a/_scripts/build.js b/_scripts/build.js
index de43f6f7e681b..bee33667fbeae 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -16,7 +16,7 @@ if (platform === 'darwin') {
     arch = Arch.arm64
   }
 
-  targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch)
+  targets = Platform.MAC.createTarget(['DMG','zip', '7z'], arch)
 } else if (platform === 'win32') {
   let arch = Arch.x64
 
diff --git a/_scripts/dev-runner.js b/_scripts/dev-runner.js
index fa5d16db56c0d..6b083cb6cc9ed 100644
--- a/_scripts/dev-runner.js
+++ b/_scripts/dev-runner.js
@@ -88,7 +88,7 @@ async function restartElectron() {
  */
 function setupNotifyLocaleUpdate(compiler, devServer) {
   const notifyLocaleChange = (updatedLocales) => {
-    devServer.sendMessage(devServer.webSocketServer.clients, 'freetube-locale-update', updatedLocales)
+    devServer.sendMessage(devServer.webSocketServer.clients, "freetube-locale-update", updatedLocales)
   }
 
   compiler.options.plugins
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
index 51e2afaf7b9c2..5b79d96185685 100644
--- a/_scripts/ebuilder.config.js
+++ b/_scripts/ebuilder.config.js
@@ -11,9 +11,9 @@ const config = {
   },
   protocols: [
     {
-      name: 'FreeTube',
+      name: "FreeTube",
       schemes: [
-        'freetube'
+        "freetube"
       ]
     }
   ],
@@ -52,19 +52,19 @@ const config = {
   // https://github.com/jordansissel/fpm/issues/1503
   // https://github.com/jgraph/drawio-desktop/issues/259
   rpm: {
-    fpm: ['--rpm-rpmbuild-define=_build_id_links none']
+    fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
   },
   deb: {
     depends: [
-      'libgtk-3-0',
-      'libnotify4',
-      'libnss3',
-      'libxss1',
-      'libxtst6',
-      'xdg-utils',
-      'libatspi2.0-0',
-      'libuuid1',
-      'libsecret-1-0'
+      "libgtk-3-0",
+      "libnotify4",
+      "libnss3",
+      "libxss1",
+      "libxtst6",
+      "xdg-utils",
+      "libatspi2.0-0",
+      "libuuid1",
+      "libsecret-1-0"
     ]
   },
   mac: {
diff --git a/_scripts/eslint-rules/plugin.mjs b/_scripts/eslint-rules/plugin.mjs
deleted file mode 100644
index 451cd50836ac7..0000000000000
--- a/_scripts/eslint-rules/plugin.mjs
+++ /dev/null
@@ -1,11 +0,0 @@
-import preferUseI18nPolyfillRule from './prefer-use-i18n-polyfill-rule.mjs'
-
-export default {
-  meta: {
-    name: 'eslint-plugin-freetube',
-    version: '1.0'
-  },
-  rules: {
-    'prefer-use-i18n-polyfill': preferUseI18nPolyfillRule
-  }
-}
diff --git a/_scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs b/_scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs
deleted file mode 100644
index 1d27f74f0f9d1..0000000000000
--- a/_scripts/eslint-rules/prefer-use-i18n-polyfill-rule.mjs
+++ /dev/null
@@ -1,62 +0,0 @@
-import { dirname, relative, resolve } from 'path'
-
-const polyfillPath = resolve(import.meta.dirname, '../../src/renderer/composables/use-i18n-polyfill')
-
-function getRelativePolyfillPath(filePath) {
-  const relativePath = relative(dirname(filePath), polyfillPath).replaceAll('\\', '/')
-
-  if (relativePath[0] !== '.') {
-    return `./${relativePath}`
-  }
-
-  return relativePath
-}
-
-/** @type {import('eslint').Rule.RuleModule} */
-export default {
-  meta: {
-    type: 'problem',
-    fixable: 'code'
-  },
-  create(context) {
-    return {
-      'ImportDeclaration[source.value="vue-i18n"]'(node) {
-        const specifierIndex = node.specifiers.findIndex(specifier => specifier.type === 'ImportSpecifier' && specifier.imported.name === 'useI18n')
-
-        if (specifierIndex !== -1) {
-          context.report({
-            node: node.specifiers.length === 1 ? node : node.specifiers[specifierIndex],
-            message: "Please use FreeTube's useI18n polyfill, as vue-i18n's useI18n composable does not work when the vue-i18n is in legacy mode, which is needed for components using the Options API.",
-            fix: context.physicalFilename === '<text>'
-              ? undefined
-              : (fixer) => {
-                  const relativePath = getRelativePolyfillPath(context.physicalFilename)
-
-                  // If the import only imports `useI18n`, we can just update the source/from text
-                  // Else we need to create a new import for `useI18n` and remove useI18n from the original one
-                  if (node.specifiers.length === 1) {
-                    return fixer.replaceText(node.source, `'${relativePath}'`)
-                  } else {
-                    const specifier = node.specifiers[specifierIndex]
-
-                    let specifierText = 'useI18n'
-
-                    if (specifier.imported.name !== specifier.local.name) {
-                      specifierText += ` as ${specifier.local.name}`
-                    }
-
-                    return [
-                      fixer.removeRange([
-                        specifierIndex === 0 ? specifier.start : node.specifiers[specifierIndex - 1].end,
-                        specifierIndex === node.specifiers.length - 1 ? specifier.end : node.specifiers[specifierIndex + 1].start
-                      ]),
-                      fixer.insertTextAfter(node, `\nimport { ${specifierText} } from '${relativePath}'`)
-                    ]
-                  }
-                }
-          })
-        }
-      }
-    }
-  }
-}
diff --git a/_scripts/getRegions.mjs b/_scripts/getRegions.mjs
index 5b36a05fbcd81..842bd7cb16efa 100644
--- a/_scripts/getRegions.mjs
+++ b/_scripts/getRegions.mjs
@@ -12,9 +12,11 @@
  */
 
 import { mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs'
+import { dirname } from 'path'
+import { fileURLToPath } from 'url'
 import { Innertube, Misc } from 'youtubei.js'
 
-const STATIC_DIRECTORY = `${import.meta.dirname}/../static`
+const STATIC_DIRECTORY = `${dirname(fileURLToPath(import.meta.url))}/../static`
 
 const activeLanguagesPath = `${STATIC_DIRECTORY}/locales/activeLocales.json`
 /** @type {string[]} */
@@ -44,7 +46,6 @@ for (const language of youTubeLanguages) {
       youTube: language,
       freeTube: language
     })
-  // eslint-disable-next-line @stylistic/brace-style
   }
   // special cases
   else if (language === 'de') {
@@ -119,6 +120,8 @@ for (const { youTube, freeTube } of languagesToScrape) {
   processGeolocations(freeTube, youTube, response)
 }
 
+
+
 async function scrapeLanguage(youTubeLanguageCode) {
   const session = await Innertube.create({
     retrieve_player: false,
diff --git a/_scripts/getShakaLocales.js b/_scripts/getShakaLocales.js
index 644a13a8ef6a1..5beb42407840d 100644
--- a/_scripts/getShakaLocales.js
+++ b/_scripts/getShakaLocales.js
@@ -3,7 +3,7 @@ const { readFileSync, readdirSync } = require('fs')
 function getPreloadedLocales() {
   const localesFile = readFileSync(`${__dirname}/../node_modules/shaka-player/dist/locales.js`, 'utf-8')
 
-  const localesLine = localesFile.match(/^\/\/ LOCALES: ([\w ,-]+)$/m)
+  const localesLine = localesFile.match(/^\/\/ LOCALES: ([\w, -]+)$/m)
 
   if (!localesLine) {
     throw new Error("Failed to parse shaka-player's preloaded locales")
@@ -32,7 +32,7 @@ function getMappings(shakaLocales, freeTubeLocales) {
    * @type {[string, string][]}
    * Using this structure as it gets passed to `new Map()` in the player component
    * The first element is the FreeTube locale, the second one is the shaka-player one
-   */
+   **/
   const mappings = []
 
   for (const locale of freeTubeLocales) {
diff --git a/_scripts/injectAllowedPaths.mjs b/_scripts/injectAllowedPaths.mjs
index 2310bf49839b1..bf1eae9962410 100644
--- a/_scripts/injectAllowedPaths.mjs
+++ b/_scripts/injectAllowedPaths.mjs
@@ -6,9 +6,12 @@
  * to ensure that it cannot access other files on the disk, without the users permission (e.g. file picker).
  */
 import { closeSync, ftruncateSync, openSync, readFileSync, readdirSync, writeSync } from 'fs'
-import { join, relative, resolve } from 'path'
+import { dirname, join, relative, resolve } from 'path'
+import { fileURLToPath } from 'url'
 
-const distDirectory = resolve(import.meta.dirname, '..', 'dist')
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+const distDirectory = resolve(__dirname, '..', 'dist')
 const webDirectory = join(distDirectory, 'web')
 
 const paths = readdirSync(distDirectory, {
@@ -22,13 +25,14 @@ const paths = readdirSync(distDirectory, {
       dirent.name !== 'main.js' &&
       dirent.name !== 'main.js.LICENSE.txt' &&
       // filter out any web build files, in case the dist directory contains a web build
-      !dirent.parentPath.startsWith(webDirectory)
+      !dirent.path.startsWith(webDirectory);
   })
   .map(dirent => {
-    const joined = join(dirent.parentPath, dirent.name)
+    const joined = join(dirent.path, dirent.name)
     return '/' + relative(distDirectory, joined).replaceAll('\\', '/')
   })
 
+
 let fileHandle
 try {
   fileHandle = openSync(join(distDirectory, 'main.js'), 'r+')
diff --git a/_scripts/mime-db-shrinking-loader.js b/_scripts/mime-db-shrinking-loader.js
index c3aba020875a8..547858c648edc 100644
--- a/_scripts/mime-db-shrinking-loader.js
+++ b/_scripts/mime-db-shrinking-loader.js
@@ -14,6 +14,7 @@ module.exports = function (source) {
     if (mimeType.startsWith('image/') && original[mimeType].extensions &&
       (!mimeType.startsWith('image/x-') || mimeType === 'image/x-icon' || mimeType === 'image/x-ms-bmp') &&
       (!mimeType.startsWith('image/vnd.') || mimeType === 'image/vnd.microsoft.icon')) {
+
       // Only the extensions field is needed, see: https://github.com/kevva/ext-list/blob/v2.2.2/index.js
       reduced[mimeType] = {
         extensions: original[mimeType].extensions
diff --git a/_scripts/patchShaka.mjs b/_scripts/patchShaka.mjs
index c5582880d4c60..b497a0e89cf5c 100644
--- a/_scripts/patchShaka.mjs
+++ b/_scripts/patchShaka.mjs
@@ -63,7 +63,7 @@ async function removeRobotoFont() {
     let cssContents = readFileSync(cssFileHandle, 'utf-8')
 
     const beforeReplacement = cssContents.length
-    cssContents = cssContents.replace(/@font-face{font-family:Roboto;[^}]+}/, '')
+    cssContents = cssContents.replace(/@font-face\{font-family:Roboto;[^}]+\}/, '')
 
     if (cssContents.length !== beforeReplacement) {
       ftruncateSync(cssFileHandle)
@@ -99,7 +99,8 @@ async function replaceAndDownloadMaterialIconsFont() {
 
       let newFontCSS = text.match(/(@font-face\s*{[^}]+})/)[1].replaceAll('\n', '')
 
-      const urlMatch = newFontCSS.match(/https:\/\/fonts\.gstatic\.com\/s\/materialiconsround\/(?<version>[^/]+)\/[^.]+\.(?<extension>\w+)/)
+
+      const urlMatch = newFontCSS.match(/https:\/\/fonts\.gstatic\.com\/s\/materialiconsround\/(?<version>[^\/]+)\/[^.]+\.(?<extension>[\w]+)/)
 
       const url = urlMatch[0]
       const { version, extension } = urlMatch.groups
diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
index d0c9effe02219..1bb102105840c 100644
--- a/_scripts/webpack.main.config.js
+++ b/_scripts/webpack.main.config.js
@@ -54,15 +54,15 @@ const config = {
 if (!isDevMode) {
   config.plugins.push(
     new CopyWebpackPlugin({
-      patterns: [
-        {
-          from: path.join(__dirname, '../static'),
-          to: path.join(__dirname, '../dist/static'),
-          globOptions: {
-            dot: true,
-            ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/manifest.json', '**/dashFiles/**', '**/storyboards/**'],
+        patterns: [
+          {
+            from: path.join(__dirname, '../static'),
+            to: path.join(__dirname, '../dist/static'),
+            globOptions: {
+              dot: true,
+              ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/manifest.json', '**/dashFiles/**', '**/storyboards/**'],
+            },
           },
-        },
       ]
     })
   )
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 11f1cf828711c..c1b813816b867 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -153,20 +153,18 @@ const config = {
         },
         // Don't need to copy them in dev mode,
         // as we configure WebpackDevServer to serve them
-        ...(isDevMode
-          ? []
-          : [
-              {
-                from: path.join(__dirname, '../node_modules/shaka-player/ui/locales', `{${SHAKA_LOCALES_TO_BE_BUNDLED.join(',')}}.json`).replaceAll('\\', '/'),
-                to: path.join(__dirname, '../dist/static/shaka-player-locales'),
-                context: path.join(__dirname, '../node_modules/shaka-player/ui/locales'),
-                transform: {
-                  transformer: (input) => {
-                    return JSON.stringify(JSON.parse(input.toString('utf-8')))
-                  }
-                }
+        ...(isDevMode ? [] : [
+          {
+            from: path.join(__dirname, '../node_modules/shaka-player/ui/locales', `{${SHAKA_LOCALES_TO_BE_BUNDLED.join(',')}}.json`).replaceAll('\\', '/'),
+            to: path.join(__dirname, '../dist/static/shaka-player-locales'),
+            context: path.join(__dirname, '../node_modules/shaka-player/ui/locales'),
+            transform: {
+              transformer: (input) => {
+                return JSON.stringify(JSON.parse(input.toString('utf-8')))
               }
-            ])
+            }
+          }
+        ])
       ]
     })
   ],
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 0df7ff510f550..75f2ccd846c8b 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -184,18 +184,18 @@ config.plugins.push(
     'process.env.SHAKA_LOCALES_PREBUNDLED': JSON.stringify(SHAKA_LOCALES_PREBUNDLED)
   }),
   new CopyWebpackPlugin({
-    patterns: [
-      {
-        from: path.join(__dirname, '../static/pwabuilder-sw.js'),
-        to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
-      },
-      {
-        from: path.join(__dirname, '../static'),
-        to: path.join(__dirname, '../dist/web/static'),
-        globOptions: {
-          dot: true,
-          ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
+      patterns: [
+        {
+          from: path.join(__dirname, '../static/pwabuilder-sw.js'),
+          to: path.join(__dirname, '../dist/web/pwabuilder-sw.js'),
         },
+        {
+          from: path.join(__dirname, '../static'),
+          to: path.join(__dirname, '../dist/web/static'),
+          globOptions: {
+            dot: true,
+            ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
+          },
       },
       {
         from: path.join(__dirname, '../node_modules/shaka-player/ui/locales', `{${SHAKA_LOCALES_TO_BE_BUNDLED.join(',')}}.json`).replaceAll('\\', '/'),
@@ -206,4 +206,5 @@ config.plugins.push(
   })
 )
 
+
 module.exports = config
diff --git a/eslint.config.mjs b/eslint.config.mjs
deleted file mode 100644
index aac8173ccf395..0000000000000
--- a/eslint.config.mjs
+++ /dev/null
@@ -1,247 +0,0 @@
-import eslintPluginVue from 'eslint-plugin-vue'
-import vuejsAccessibility from 'eslint-plugin-vuejs-accessibility'
-import eslintPluginUnicorn from 'eslint-plugin-unicorn'
-import intlifyVueI18N from '@intlify/eslint-plugin-vue-i18n'
-import globals from 'globals'
-import vueEslintParser from 'vue-eslint-parser'
-import js from '@eslint/js'
-import jsoncEslintParser from 'jsonc-eslint-parser'
-import eslintPluginJsonc from 'eslint-plugin-jsonc'
-import eslintPluginYml from 'eslint-plugin-yml'
-import yamlEslintParser from 'yaml-eslint-parser'
-// Faster than importing the default import,
-// because the default import imports a lot of other dependencies
-// for the `resolveIgnoresFromGitignore` function that we don't use
-import { neostandard } from 'neostandard/lib/main.js'
-import jsdoc from 'eslint-plugin-jsdoc'
-import freetube from './_scripts/eslint-rules/plugin.mjs'
-
-import activeLocales from './static/locales/activeLocales.json' with { type: 'json' }
-
-export default [
-  {
-    ignores: [
-      'build/',
-      'dist/',
-      'eslint.config.mjs',
-      // The JSON files inside this directory are auto-generated, so they don't follow the code style rules
-      'static/geolocations/'
-    ]
-  },
-  ...neostandard({
-    noJsx: true,
-    ts: false,
-  }),
-  js.configs.recommended,
-  ...eslintPluginVue.configs['flat/vue2-recommended'],
-  ...vuejsAccessibility.configs["flat/recommended"],
-  ...intlifyVueI18N.configs['flat/recommended'],
-  {
-    files: [
-      '**/*.{js,vue}',
-    ],
-    ignores: [
-      '_scripts/',
-    ],
-    plugins: {
-      unicorn: eslintPluginUnicorn,
-      jsdoc,
-      freetube,
-    },
-
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-      },
-
-      parser: vueEslintParser,
-      ecmaVersion: 2022,
-      sourceType: 'module',
-    },
-
-    settings: {
-      'vue-i18n': {
-        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
-        messageSyntaxVersion: '^8.0.0',
-      },
-    },
-
-    rules: {
-      '@stylistic/space-before-function-paren': 'off',
-      '@stylistic/comma-dangle': ['error', 'only-multiline'],
-      'vue/no-v-html': 'off',
-
-      'no-console': ['error', {
-        allow: ['warn', 'error'],
-      }],
-
-      'no-unused-vars': 'warn',
-      'no-undef': 'warn',
-      'object-shorthand': 'off',
-      'vue/no-template-key': 'warn',
-      'vue/multi-word-component-names': 'off',
-
-      'vuejs-accessibility/label-has-for': ['error', {
-        required: {
-          some: ['nesting', 'id'],
-        },
-      }],
-
-      'vuejs-accessibility/no-static-element-interactions': 'off',
-      'n/no-callback-literal': 'warn',
-      'n/no-path-concat': 'warn',
-      'unicorn/better-regex': 'error',
-      'unicorn/no-array-push-push': 'error',
-      'unicorn/prefer-keyboard-event-key': 'error',
-      'unicorn/prefer-regexp-test': 'error',
-      'unicorn/prefer-string-replace-all': 'error',
-      '@intlify/vue-i18n/no-dynamic-keys': 'error',
-      '@intlify/vue-i18n/no-duplicate-keys-in-locale': 'error',
-
-      '@intlify/vue-i18n/no-raw-text': ['error', {
-        attributes: {
-          '/.+/': [
-            'title',
-            'aria-label',
-            'aria-placeholder',
-            'aria-roledescription',
-            'aria-valuetext',
-            'tooltip',
-            'message',
-          ],
-
-          input: ['placeholder', 'value'],
-          img: ['alt'],
-        },
-
-        ignoreText: ['-', '•', '/', 'YouTube', 'Invidious', 'FreeTube'],
-      }],
-
-      '@intlify/vue-i18n/no-deprecated-tc': 'off',
-      'vue/require-explicit-emits': 'error',
-      'vue/no-unused-emit-declarations': 'error',
-
-      'jsdoc/check-alignment': 'error',
-      'jsdoc/check-property-names': 'error',
-      'jsdoc/check-param-names': 'error',
-      'jsdoc/check-syntax': 'error',
-      'jsdoc/check-template-names': 'error',
-      'jsdoc/check-types': 'error',
-      'jsdoc/no-bad-blocks': 'error',
-      'jsdoc/no-multi-asterisks': 'error',
-
-      'freetube/prefer-use-i18n-polyfill': 'error',
-    },
-  },
-
-  ...eslintPluginJsonc.configs['flat/base'],
-  {
-    files: ['**/*.json'],
-    ignores: [
-      '_scripts/',
-    ],
-
-    languageOptions: {
-      parser: jsoncEslintParser,
-    },
-
-    rules: {
-      '@stylistic/no-tabs': 'off',
-      '@stylistic/comma-spacing': 'off',
-      '@stylistic/eol-last': 'off',
-      'no-irregular-whitespace': 'off',
-    },
-
-    settings: {
-      'vue-i18n': {
-        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
-        messageSyntaxVersion: '^8.0.0',
-      },
-    },
-  },
-
-  ...eslintPluginYml.configs['flat/recommended'],
-  {
-    files: ['**/*.{yml,yaml}'],
-    ignores: [
-      '.github/',
-      '_scripts/'
-    ],
-
-    languageOptions: {
-      parser: yamlEslintParser,
-    },
-
-    rules: {
-      'yml/no-irregular-whitespace': 'off',
-      '@stylistic/spaced-comment': 'off',
-    },
-
-    settings: {
-      'vue-i18n': {
-        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
-        messageSyntaxVersion: '^8.0.0',
-      },
-    },
-  },
-  {
-    files: ['.github/**/*.{yml,yaml}'],
-
-    languageOptions: {
-      parser: yamlEslintParser,
-    },
-
-    rules: {
-      'yml/no-empty-mapping-value': 'off',
-      'yml/no-irregular-whitespace': 'off',
-    },
-
-    settings: {
-      'vue-i18n': {
-        localeDir: `./static/locales/{${activeLocales.join(',')}}.yaml`,
-        messageSyntaxVersion: '^8.0.0',
-      },
-    },
-  },
-  {
-    files: ['_scripts/*.js'],
-    languageOptions: {
-      globals: globals.node,
-      ecmaVersion: 'latest',
-      sourceType: 'commonjs'
-    },
-
-    plugins: {
-      unicorn: eslintPluginUnicorn,
-    },
-
-    rules: {
-      '@stylistic/space-before-function-paren': 'off',
-      '@stylistic/comma-dangle': ['error', 'only-multiline'],
-      'no-console': 'off',
-      'n/no-path-concat': 'off',
-      'unicorn/better-regex': 'error',
-    }
-  },
-  {
-    files: ['_scripts/**/*.mjs'],
-    languageOptions: {
-      globals: globals.node,
-      ecmaVersion: 'latest',
-      sourceType: 'module',
-    },
-
-    plugins: {
-      unicorn: eslintPluginUnicorn,
-    },
-
-    rules: {
-      'no-console': 'off',
-      '@stylistic/space-before-function-paren': 'off',
-      '@stylistic/comma-dangle': ['error', 'only-multiline'],
-      'n/no-path-concat': 'off',
-      'unicorn/better-regex': 'error',
-    }
-  }
-]
diff --git a/package.json b/package.json
index ad4f7970f7ab8..f097ac7068db3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.22.1",
+  "version": "0.21.3",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,
@@ -37,12 +37,12 @@
     "lint-all": "run-p lint lint-json",
     "lint": "run-p eslint-lint lint-style",
     "lint-fix": "run-p eslint-lint-fix lint-style-fix",
-    "eslint-lint": "eslint --config eslint.config.mjs \"src/**/*.js\" \"src/renderer/**/*.vue\" \"static/*.js\" \"_scripts/*.js\" \"_scripts/**/*.mjs\"",
-    "eslint-lint-fix": "eslint --config eslint.config.mjs --fix \"src/**/*.js\" \"src/renderer/**/*.vue\" \"static/*.js\" \"_scripts/*.js\" \"_scripts/**/*.mjs\"",
-    "lint-json": "eslint --config eslint.config.mjs \"static/**/*.json\"",
+    "eslint-lint": "eslint --ext .js,.vue ./",
+    "eslint-lint-fix": "eslint --fix --ext .js,.vue ./",
+    "lint-json": "eslint --ext .json ./",
     "lint-style": "stylelint \"**/*.{css,scss}\"",
     "lint-style-fix": "stylelint --fix \"**/*.{css,scss}\"",
-    "lint-yml": "eslint --config eslint.config.mjs \"**/*.yml\" \"**/*.yaml\"",
+    "lint-yml": "eslint --ext .yml,.yaml ./",
     "pack": "run-p pack:main pack:renderer && node _scripts/injectAllowedPaths.mjs",
     "pack:main": "webpack --mode=production --node-env=production --config _scripts/webpack.main.config.js",
     "pack:renderer": "webpack --mode=production --node-env=production --config _scripts/webpack.renderer.config.js",
@@ -54,62 +54,66 @@
     "ci": "yarn install --silent --frozen-lockfile"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.7.1",
-    "@fortawesome/free-brands-svg-icons": "^6.7.1",
-    "@fortawesome/free-regular-svg-icons": "^6.7.1",
-    "@fortawesome/free-solid-svg-icons": "^6.7.1",
+    "@fortawesome/fontawesome-svg-core": "^6.6.0",
+    "@fortawesome/free-brands-svg-icons": "^6.6.0",
+    "@fortawesome/free-regular-svg-icons": "^6.6.0",
+    "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/vue-fontawesome": "^2.0.10",
     "@seald-io/nedb": "^4.0.4",
     "autolinker": "^4.0.0",
     "electron-context-menu": "^4.0.4",
     "lodash.debounce": "^4.0.8",
-    "marked": "^15.0.4",
+    "marked": "^14.1.2",
     "path-browserify": "^1.0.1",
     "portal-vue": "^2.1.7",
     "process": "^0.11.10",
-    "shaka-player": "^4.12.5",
-    "swiper": "^11.1.15",
+    "shaka-player": "^4.11.7",
+    "swiper": "^11.1.14",
     "vue": "^2.7.16",
     "vue-i18n": "^8.28.2",
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^12.2.0"
+    "youtubei.js": "^10.5.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
-    "@babel/plugin-transform-class-properties": "^7.25.9",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/core": "^7.25.2",
+    "@babel/eslint-parser": "^7.25.1",
+    "@babel/plugin-transform-class-properties": "^7.25.4",
+    "@babel/preset-env": "^7.25.4",
     "@double-great/stylelint-a11y": "^3.0.2",
-    "@eslint/js": "^9.17.0",
-    "@intlify/eslint-plugin-vue-i18n": "^3.2.0",
+    "@intlify/eslint-plugin-vue-i18n": "^3.0.0",
     "babel-loader": "^9.2.1",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "electron": "^33.2.1",
-    "electron-builder": "^25.1.8",
-    "eslint": "^9.17.0",
-    "eslint-plugin-jsdoc": "^50.6.1",
-    "eslint-plugin-jsonc": "^2.18.2",
-    "eslint-plugin-unicorn": "^56.0.1",
-    "eslint-plugin-vue": "^9.32.0",
+    "electron": "^32.1.2",
+    "electron-builder": "^24.13.3",
+    "eslint": "^8.57.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-jsonc": "^2.16.0",
+    "eslint-plugin-n": "^17.10.3",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-promise": "^7.1.0",
+    "eslint-plugin-unicorn": "^55.0.0",
+    "eslint-plugin-vue": "^9.28.0",
     "eslint-plugin-vuejs-accessibility": "^2.4.1",
-    "eslint-plugin-yml": "^1.16.0",
-    "globals": "^15.13.0",
-    "html-webpack-plugin": "^5.6.3",
+    "eslint-plugin-yml": "^1.14.0",
+    "html-webpack-plugin": "^5.6.0",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^5.0.0",
-    "lefthook": "^1.9.2",
-    "mini-css-extract-plugin": "^2.9.2",
-    "neostandard": "^0.12.0",
-    "npm-run-all2": "^7.0.1",
-    "postcss": "^8.4.49",
+    "lefthook": "^1.7.17",
+    "mini-css-extract-plugin": "^2.9.1",
+    "npm-run-all2": "^6.2.3",
+    "postcss": "^8.4.47",
     "postcss-scss": "^4.0.9",
+    "prettier": "^2.8.8",
     "rimraf": "^6.0.1",
-    "sass": "^1.83.0",
-    "sass-loader": "^16.0.4",
-    "stylelint": "^16.12.0",
+    "sass": "^1.79.4",
+    "sass-loader": "^16.0.2",
+    "stylelint": "^16.9.0",
     "stylelint-config-sass-guidelines": "^12.1.0",
     "stylelint-config-standard": "^36.0.1",
     "stylelint-high-performance-animation": "^1.10.0",
@@ -118,9 +122,9 @@
     "vue-devtools": "^5.1.4",
     "vue-eslint-parser": "^9.4.3",
     "vue-loader": "^15.10.0",
-    "webpack": "^5.97.1",
+    "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.2.0",
+    "webpack-dev-server": "^5.1.0",
     "yaml-eslint-parser": "^1.2.3"
   }
 }
diff --git a/src/constants.js b/src/constants.js
index 97be9daf6fe9f..f45e30fb8211d 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -5,7 +5,6 @@ const IpcChannels = {
   OPEN_EXTERNAL_LINK: 'open-external-link',
   GET_SYSTEM_LOCALE: 'get-system-locale',
   GET_PICTURES_PATH: 'get-pictures-path',
-  GET_NAVIGATION_HISTORY: 'get-navigation-history',
   SHOW_OPEN_DIALOG: 'show-open-dialog',
   SHOW_SAVE_DIALOG: 'show-save-dialog',
   STOP_POWER_SAVE_BLOCKER: 'stop-power-save-blocker',
@@ -114,50 +113,6 @@ const SyncEvents = {
   },
 }
 
-// note: the multi-key shortcut values are currently just for display use in action titles
-const KeyboardShortcuts = {
-  APP: {
-    GENERAL: {
-      HISTORY_BACKWARD: 'alt+arrowleft',
-      HISTORY_FORWARD: 'alt+arrowright',
-      NEW_WINDOW: 'ctrl+N',
-      NAVIGATE_TO_SETTINGS: 'ctrl+,',
-      NAVIGATE_TO_HISTORY: 'ctrl+H',
-      NAVIGATE_TO_HISTORY_MAC: 'cmd+Y',
-    },
-    SITUATIONAL: {
-      REFRESH: 'r'
-    },
-  },
-  VIDEO_PLAYER: {
-    GENERAL: {
-      CAPTIONS: 'c',
-      THEATRE_MODE: 't',
-      FULLSCREEN: 'f',
-      FULLWINDOW: 's',
-      PICTURE_IN_PICTURE: 'i',
-      MUTE: 'm',
-      VOLUME_UP: 'arrowup',
-      VOLUME_DOWN: 'arrowdown',
-      STATS: 'd',
-      TAKE_SCREENSHOT: 'u',
-    },
-    PLAYBACK: {
-      PLAY: 'k',
-      LARGE_REWIND: 'j',
-      LARGE_FAST_FORWARD: 'l',
-      SMALL_REWIND: 'arrowleft',
-      SMALL_FAST_FORWARD: 'arrowright',
-      DECREASE_VIDEO_SPEED: 'o',
-      INCREASE_VIDEO_SPEED: 'p',
-      LAST_FRAME: ',',
-      NEXT_FRAME: '.',
-      LAST_CHAPTER: 'ctrl+arrowleft',
-      NEXT_CHAPTER: 'ctrl+arrowright',
-    }
-  },
-}
-
 // Utils
 const MAIN_PROFILE_ID = 'allChannels'
 
@@ -177,7 +132,6 @@ export {
   IpcChannels,
   DBActions,
   SyncEvents,
-  KeyboardShortcuts,
   MAIN_PROFILE_ID,
   MOBILE_WIDTH_THRESHOLD,
   PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD,
diff --git a/src/datastores/handlers/base.js b/src/datastores/handlers/base.js
index a0f620925b6a9..614b21cd290e6 100644
--- a/src/datastores/handlers/base.js
+++ b/src/datastores/handlers/base.js
@@ -10,21 +10,6 @@ class Settings {
       await this.upsert('currentLocale', currentLocale.value.replace('_', '-'))
     }
 
-    // In FreeTube 0.22.0 and earlier the external player arguments were displayed in a text box,
-    // with the user manually entering `;` to separate the different arguments.
-    // This is a one time migration that converts the old string to a JSON array
-    const externalPlayerCustomArgs = await db.settings.findOneAsync({ _id: 'externalPlayerCustomArgs' })
-
-    if (externalPlayerCustomArgs && !externalPlayerCustomArgs.value.startsWith('[')) {
-      let newValue = '[]'
-
-      if (externalPlayerCustomArgs.value.length > 0) {
-        newValue = JSON.stringify(externalPlayerCustomArgs.value.split(';'))
-      }
-
-      await this.upsert('externalPlayerCustomArgs', newValue)
-    }
-
     return db.settings.findAsync({ _id: { $ne: 'bounds' } })
   }
 
@@ -183,7 +168,7 @@ class Playlists {
     return db.playlists.removeAsync({ _id, protected: { $ne: true } })
   }
 
-  static deleteVideoIdByPlaylistId(_id, videoId, playlistItemId) {
+  static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
     if (playlistItemId != null) {
       return db.playlists.updateAsync(
         { _id },
@@ -231,7 +216,7 @@ class SubscriptionCache {
     return db.subscriptionCache.findAsync({})
   }
 
-  static updateVideosByChannelId(channelId, entries, timestamp) {
+  static updateVideosByChannelId({ channelId, entries, timestamp }) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { videos: entries, videosTimestamp: timestamp } },
@@ -239,7 +224,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateLiveStreamsByChannelId(channelId, entries, timestamp) {
+  static updateLiveStreamsByChannelId({ channelId, entries, timestamp }) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { liveStreams: entries, liveStreamsTimestamp: timestamp } },
@@ -247,7 +232,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsByChannelId(channelId, entries, timestamp) {
+  static updateShortsByChannelId({ channelId, entries, timestamp }) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { shorts: entries, shortsTimestamp: timestamp } },
@@ -255,7 +240,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsWithChannelPageShortsByChannelId(channelId, entries) {
+  static updateShortsWithChannelPageShortsByChannelId({ channelId, entries }) {
     return db.subscriptionCache.findOneAsync({ _id: channelId }, { shorts: 1 }).then((doc) => {
       if (doc == null) { return }
 
@@ -288,7 +273,7 @@ class SubscriptionCache {
     })
   }
 
-  static updateCommunityPostsByChannelId(channelId, entries, timestamp) {
+  static updateCommunityPostsByChannelId({ channelId, entries, timestamp }) {
     return db.subscriptionCache.updateAsync(
       { _id: channelId },
       { $set: { communityPosts: entries, communityPostsTimestamp: timestamp } },
diff --git a/src/datastores/handlers/electron.js b/src/datastores/handlers/electron.js
index b18706ec8ee5d..889c91d4f060c 100644
--- a/src/datastores/handlers/electron.js
+++ b/src/datastores/handlers/electron.js
@@ -173,7 +173,7 @@ class Playlists {
     )
   }
 
-  static deleteVideoIdByPlaylistId(_id, videoId, playlistItemId) {
+  static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
     return ipcRenderer.invoke(
       IpcChannels.DB_PLAYLISTS,
       {
@@ -226,7 +226,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateVideosByChannelId(channelId, entries, timestamp) {
+  static updateVideosByChannelId({ channelId, entries, timestamp }) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -236,7 +236,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateLiveStreamsByChannelId(channelId, entries, timestamp) {
+  static updateLiveStreamsByChannelId({ channelId, entries, timestamp }) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -246,7 +246,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsByChannelId(channelId, entries, timestamp) {
+  static updateShortsByChannelId({ channelId, entries, timestamp }) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -256,7 +256,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateShortsWithChannelPageShortsByChannelId(channelId, entries) {
+  static updateShortsWithChannelPageShortsByChannelId({ channelId, entries }) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
@@ -266,7 +266,7 @@ class SubscriptionCache {
     )
   }
 
-  static updateCommunityPostsByChannelId(channelId, entries, timestamp) {
+  static updateCommunityPostsByChannelId({ channelId, entries, timestamp }) {
     return ipcRenderer.invoke(
       IpcChannels.DB_SUBSCRIPTION_CACHE,
       {
diff --git a/src/datastores/handlers/web.js b/src/datastores/handlers/web.js
index 8491ca3d66872..d68e24f042615 100644
--- a/src/datastores/handlers/web.js
+++ b/src/datastores/handlers/web.js
@@ -101,8 +101,8 @@ class Playlists {
     return baseHandlers.playlists.delete(_id)
   }
 
-  static deleteVideoIdByPlaylistId(_id, videoId, playlistItemId) {
-    return baseHandlers.playlists.deleteVideoIdByPlaylistId(_id, videoId, playlistItemId)
+  static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
+    return baseHandlers.playlists.deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId })
   }
 
   static deleteVideoIdsByPlaylistId(_id, videoIds) {
@@ -127,24 +127,43 @@ class SubscriptionCache {
     return baseHandlers.subscriptionCache.find()
   }
 
-  static updateVideosByChannelId(channelId, entries, timestamp) {
-    return baseHandlers.subscriptionCache.updateVideosByChannelId(channelId, entries, timestamp)
+  static updateVideosByChannelId({ channelId, entries, timestamp }) {
+    return baseHandlers.subscriptionCache.updateVideosByChannelId({
+      channelId,
+      entries,
+      timestamp,
+    })
   }
 
-  static updateLiveStreamsByChannelId(channelId, entries, timestamp) {
-    return baseHandlers.subscriptionCache.updateLiveStreamsByChannelId(channelId, entries, timestamp)
+  static updateLiveStreamsByChannelId({ channelId, entries, timestamp }) {
+    return baseHandlers.subscriptionCache.updateLiveStreamsByChannelId({
+      channelId,
+      entries,
+      timestamp,
+    })
   }
 
-  static updateShortsByChannelId(channelId, entries, timestamp) {
-    return baseHandlers.subscriptionCache.updateShortsByChannelId(channelId, entries, timestamp)
+  static updateShortsByChannelId({ channelId, entries, timestamp }) {
+    return baseHandlers.subscriptionCache.updateShortsByChannelId({
+      channelId,
+      entries,
+      timestamp,
+    })
   }
 
-  static updateShortsWithChannelPageShortsByChannelId(channelId, entries) {
-    return baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId(channelId, entries)
+  static updateShortsWithChannelPageShortsByChannelId({ channelId, entries }) {
+    return baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId({
+      channelId,
+      entries,
+    })
   }
 
-  static updateCommunityPostsByChannelId(channelId, entries, timestamp) {
-    return baseHandlers.subscriptionCache.updateCommunityPostsByChannelId(channelId, entries, timestamp)
+  static updateCommunityPostsByChannelId({ channelId, entries, timestamp }) {
+    return baseHandlers.subscriptionCache.updateCommunityPostsByChannelId({
+      channelId,
+      entries,
+      timestamp,
+    })
   }
 
   static deleteMultipleChannels(channelIds) {
diff --git a/src/main/index.js b/src/main/index.js
index 806a99f0feef8..92ce4f9ae01cc 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -254,16 +254,13 @@ function runApp() {
 
     app.on('second-instance', (_, commandLine, __) => {
       // Someone tried to run a second instance, we should focus our window
-      if (typeof commandLine !== 'undefined') {
-        const url = getLinkUrl(commandLine)
-        if (mainWindow && mainWindow.webContents) {
-          if (mainWindow.isMinimized()) mainWindow.restore()
-          mainWindow.focus()
+      if (mainWindow && typeof commandLine !== 'undefined') {
+        if (mainWindow.isMinimized()) mainWindow.restore()
+        mainWindow.focus()
 
-          if (url) mainWindow.webContents.send(IpcChannels.OPEN_URL, url)
-        } else {
-          if (url) startupUrl = url
-          createWindow()
+        const url = getLinkUrl(commandLine)
+        if (url) {
+          mainWindow.webContents.send(IpcChannels.OPEN_URL, url)
         }
       }
     })
@@ -458,7 +455,7 @@ function runApp() {
           requestHeaders.Authorization = invidiousAuthorization.authorization
         }
       }
-
+      // eslint-disable-next-line n/no-callback-literal
       callback({ requestHeaders })
     })
 
@@ -469,7 +466,7 @@ function runApp() {
       if (responseHeaders) {
         delete responseHeaders['set-cookie']
       }
-
+      // eslint-disable-next-line n/no-callback-literal
       callback({ responseHeaders })
     })
 
@@ -642,8 +639,6 @@ function runApp() {
         return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
       }
 
-      // Determine window color to be shown (shown most prominently during initial app load)
-      // Uses the --bg-color for each corresponding theme
       switch (setting.value) {
         case 'dark':
           return '#212121'
@@ -665,10 +660,6 @@ function runApp() {
           return '#002B36'
         case 'solarized-light':
           return '#fdf6e3'
-        case 'gruvbox-dark':
-          return '#282828'
-        case 'gruvbox-light':
-          return '#fbf1c7'
         case 'system':
         default:
           return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
@@ -697,9 +688,7 @@ function runApp() {
         webSecurity: false,
         backgroundThrottling: false,
         contextIsolation: false
-      },
-      minWidth: 340,
-      minHeight: 380
+      }
     }
 
     const newWindow = new BrowserWindow(
@@ -766,6 +755,7 @@ function runApp() {
     // If called multiple times
     // Duplicate menu items will be added
     if (replaceMainWindow) {
+      // eslint-disable-next-line
       setMenu()
     }
 
@@ -832,11 +822,10 @@ function runApp() {
     })
   }
 
-  ipcMain.on(IpcChannels.APP_READY, () => {
+  ipcMain.once(IpcChannels.APP_READY, () => {
     if (startupUrl) {
-      mainWindow.webContents.send(IpcChannels.OPEN_URL, startupUrl, { isLaunchLink: true })
+      mainWindow.webContents.send(IpcChannels.OPEN_URL, startupUrl)
     }
-    startupUrl = null
   })
 
   function relaunch() {
@@ -896,43 +885,6 @@ function runApp() {
     session.defaultSession.closeAllConnections()
   })
 
-  // #region navigation history
-
-  const NAV_HISTORY_DISPLAY_LIMIT = 15
-  // Math.trunc but with a bitwise OR so that it can be calcuated at build time and the number inlined
-  const HALF_OF_NAV_HISTORY_DISPLAY_LIMIT = (NAV_HISTORY_DISPLAY_LIMIT / 2) | 0
-
-  ipcMain.handle(IpcChannels.GET_NAVIGATION_HISTORY, ({ sender }) => {
-    const activeIndex = sender.navigationHistory.getActiveIndex()
-    const length = sender.navigationHistory.length()
-
-    let end
-
-    if (activeIndex < HALF_OF_NAV_HISTORY_DISPLAY_LIMIT) {
-      end = Math.min(length - 1, NAV_HISTORY_DISPLAY_LIMIT - 1)
-    } else if (length - activeIndex < HALF_OF_NAV_HISTORY_DISPLAY_LIMIT + 1) {
-      end = length - 1
-    } else {
-      end = activeIndex + HALF_OF_NAV_HISTORY_DISPLAY_LIMIT
-    }
-
-    const dropdownOptions = []
-
-    for (let index = end; index >= Math.max(0, end + 1 - NAV_HISTORY_DISPLAY_LIMIT); --index) {
-      const routeLabel = sender.navigationHistory.getEntryAtIndex(index)?.title
-
-      dropdownOptions.push({
-        label: routeLabel,
-        value: index - activeIndex,
-        active: index === activeIndex
-      })
-    }
-
-    return dropdownOptions
-  })
-
-  // #endregion navigation history
-
   ipcMain.handle(IpcChannels.OPEN_EXTERNAL_LINK, (_, url) => {
     if (typeof url === 'string') {
       let parsedURL
@@ -1315,7 +1267,11 @@ function runApp() {
           return null
 
         case DBActions.PLAYLISTS.DELETE_VIDEO_ID:
-          await baseHandlers.playlists.deleteVideoIdByPlaylistId(data._id, data.videoId, data.playlistItemId)
+          await baseHandlers.playlists.deleteVideoIdByPlaylistId({
+            _id: data._id,
+            videoId: data.videoId,
+            playlistItemId: data.playlistItemId,
+          })
           syncOtherWindows(
             IpcChannels.SYNC_PLAYLISTS,
             event,
@@ -1368,7 +1324,7 @@ function runApp() {
           return await baseHandlers.subscriptionCache.find()
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_VIDEOS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateVideosByChannelId(data.channelId, data.entries, data.timestamp)
+          await baseHandlers.subscriptionCache.updateVideosByChannelId(data)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1377,7 +1333,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_LIVE_STREAMS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateLiveStreamsByChannelId(data.channelId, data.entries, data.timestamp)
+          await baseHandlers.subscriptionCache.updateLiveStreamsByChannelId(data)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1386,7 +1342,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_SHORTS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateShortsByChannelId(data.channelId, data.entries, data.timestamp)
+          await baseHandlers.subscriptionCache.updateShortsByChannelId(data)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1395,7 +1351,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_SHORTS_WITH_CHANNEL_PAGE_SHORTS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId(data.channelId, data.entries)
+          await baseHandlers.subscriptionCache.updateShortsWithChannelPageShortsByChannelId(data)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1404,7 +1360,7 @@ function runApp() {
           return null
 
         case DBActions.SUBSCRIPTION_CACHE.UPDATE_COMMUNITY_POSTS_BY_CHANNEL:
-          await baseHandlers.subscriptionCache.updateCommunityPostsByChannelId(data.channelId, data.entries, data.timestamp)
+          await baseHandlers.subscriptionCache.updateCommunityPostsByChannelId(data)
           syncOtherWindows(
             IpcChannels.SYNC_SUBSCRIPTION_CACHE,
             event,
@@ -1459,7 +1415,6 @@ function runApp() {
   app.on('window-all-closed', () => {
     // Clean up resources (datastores' compaction + Electron cache and storage data clearing)
     cleanUpResources().finally(() => {
-      mainWindow = null
       if (process.platform !== 'darwin') {
         app.quit()
       }
@@ -1529,7 +1484,6 @@ function runApp() {
       mainWindow.webContents.send(IpcChannels.OPEN_URL, baseUrl(url))
     } else {
       startupUrl = baseUrl(url)
-      if (app.isReady()) createWindow()
     }
   })
 
diff --git a/src/renderer/App.js b/src/renderer/App.js
index aac7cbd983015..6f29f4e2a7c42 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -1,16 +1,16 @@
 import { defineComponent } from 'vue'
-import { mapActions, mapMutations } from 'vuex'
+import { mapActions } from 'vuex'
 import FtFlexBox from './components/ft-flex-box/ft-flex-box.vue'
 import TopNav from './components/top-nav/top-nav.vue'
-import SideNav from './components/SideNav/SideNav.vue'
+import SideNav from './components/side-nav/side-nav.vue'
 import FtNotificationBanner from './components/ft-notification-banner/ft-notification-banner.vue'
 import FtPrompt from './components/ft-prompt/ft-prompt.vue'
 import FtButton from './components/ft-button/ft-button.vue'
 import FtToast from './components/ft-toast/ft-toast.vue'
-import FtProgressBar from './components/FtProgressBar/FtProgressBar.vue'
+import FtProgressBar from './components/ft-progress-bar/ft-progress-bar.vue'
 import FtPlaylistAddVideoPrompt from './components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue'
 import FtCreatePlaylistPrompt from './components/ft-create-playlist-prompt/ft-create-playlist-prompt.vue'
-import FtSearchFilters from './components/FtSearchFilters/FtSearchFilters.vue'
+import FtSearchFilters from './components/ft-search-filters/ft-search-filters.vue'
 import { marked } from 'marked'
 import { IpcChannels } from '../constants'
 import packageDetails from '../../package.json'
@@ -82,7 +82,7 @@ export default defineComponent({
     },
     windowTitle: function () {
       const routePath = this.$route.path
-      if (!routePath.startsWith('/channel/') && !routePath.startsWith('/watch/') && !routePath.startsWith('/hashtag/') && !routePath.startsWith('/playlist/') && !routePath.startsWith('/search/')) {
+      if (!routePath.startsWith('/channel/') && !routePath.startsWith('/watch/') && !routePath.startsWith('/hashtag/') && !routePath.startsWith('/playlist/')) {
         let title = translateWindowTitle(this.$route.meta.title)
         if (!title) {
           title = packageDetails.productName
@@ -97,7 +97,6 @@ export default defineComponent({
     externalPlayer: function () {
       return this.$store.getters.getExternalPlayer
     },
-
     defaultInvidiousInstance: function () {
       return this.$store.getters.getDefaultInvidiousInstance
     },
@@ -143,14 +142,6 @@ export default defineComponent({
 
     externalLinkHandling: function () {
       return this.$store.getters.getExternalLinkHandling
-    },
-
-    appTitle: function () {
-      return this.$store.getters.getAppTitle
-    },
-
-    openDeepLinksInNewWindow: function () {
-      return this.$store.getters.getOpenDeepLinksInNewWindow
     }
   },
   watch: {
@@ -163,11 +154,10 @@ export default defineComponent({
     secColor: 'checkThemeSettings',
 
     locale: 'setLocale',
-
-    appTitle: 'setDocumentTitle'
   },
   created () {
     this.checkThemeSettings()
+    this.setWindowTitle()
     this.setLocale()
   },
   mounted: function () {
@@ -213,16 +203,10 @@ export default defineComponent({
         if (this.$router.currentRoute.path === '/') {
           this.$router.replace({ path: this.landingPage })
         }
-
-        this.setWindowTitle()
       })
     })
   },
   methods: {
-    setDocumentTitle: function(value) {
-      document.title = value
-      this.$nextTick(() => this.$refs.topNav?.setActiveNavigationHistoryEntryTitle(value))
-    },
     checkThemeSettings: function () {
       const theme = {
         baseTheme: this.baseTheme || 'dark',
@@ -528,9 +512,9 @@ export default defineComponent({
     },
 
     enableOpenUrl: function () {
-      ipcRenderer.on(IpcChannels.OPEN_URL, (event, url, { isLaunchLink = false } = { }) => {
+      ipcRenderer.on(IpcChannels.OPEN_URL, (event, url) => {
         if (url) {
-          this.handleYoutubeLink(url, { doCreateNewWindow: this.openDeepLinksInNewWindow && !isLaunchLink })
+          this.handleYoutubeLink(url)
         }
       })
 
@@ -551,7 +535,7 @@ export default defineComponent({
 
     setWindowTitle: function() {
       if (this.windowTitle !== null) {
-        this.setAppTitle(this.windowTitle)
+        document.title = this.windowTitle
       }
     },
 
@@ -581,10 +565,6 @@ export default defineComponent({
       'updateSecColor',
       'showOutlines',
       'hideOutlines',
-    ]),
-
-    ...mapMutations([
-      'setAppTitle'
     ])
   }
 })
diff --git a/src/renderer/components/ChannelDetails/ChannelDetails.vue b/src/renderer/components/ChannelDetails/ChannelDetails.vue
index 49d6fef6c887e..296457569d381 100644
--- a/src/renderer/components/ChannelDetails/ChannelDetails.vue
+++ b/src/renderer/components/ChannelDetails/ChannelDetails.vue
@@ -74,22 +74,6 @@
           role="tablist"
           :aria-label="$t('Channel.Channel Tabs')"
         >
-          <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
-          <div
-            v-if="visibleTabs.includes('home')"
-            id="homeTab"
-            class="tab"
-            :class="{ selectedTab: currentTab === 'home' }"
-            role="tab"
-            :aria-selected="String(currentTab === 'home')"
-            aria-controls="homePanel"
-            :tabindex="(currentTab === 'home' || currentTab === 'search') ? 0 : -1"
-            @click="changeTab('home')"
-            @keydown.left.right="focusTab('home', $event)"
-            @keydown.enter.space.prevent="changeTab('home')"
-          >
-            {{ $t("Channel.Home.Home").toUpperCase() }}
-          </div>
           <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
           <div
             v-if="visibleTabs.includes('videos')"
@@ -223,7 +207,6 @@
           v-if="showSearchBar"
           ref="searchBar"
           :placeholder="$t('Channel.Search Channel')"
-          :value="query"
           :show-clear-text-button="true"
           class="channelSearch"
           :maxlength="255"
@@ -292,26 +275,19 @@ const props = defineProps({
   currentTab: {
     type: String,
     default: 'videos'
-  },
-  query: {
-    type: String,
-    default: ''
-  },
+  }
 })
 
 const emit = defineEmits(['change-tab', 'search', 'subscribed'])
 
-/** @type {import('vue').ComputedRef<boolean>} */
 const hideChannelSubscriptions = computed(() => {
   return store.getters.getHideChannelSubscriptions
 })
 
-/** @type {import('vue').ComputedRef<boolean>} */
 const hideSharingActions = computed(() => {
   return store.getters.getHideSharingActions
 })
 
-/** @type {import('vue').ComputedRef<boolean>} */
 const hideUnsubscribeButton = computed(() => {
   return store.getters.getHideUnsubscribeButton
 })
diff --git a/src/renderer/components/ChannelHome/ChannelHome.css b/src/renderer/components/ChannelHome/ChannelHome.css
deleted file mode 100644
index 8c7bb1eb40b0b..0000000000000
--- a/src/renderer/components/ChannelHome/ChannelHome.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.shelfTitle {
-  font-size: 24px;
-  cursor: pointer;
-}
-
-.shelfTitle::marker {
-  font-size: 20px;
-  color: var(--accent-color);
-}
-
-.shelfUnderline {
-  border-color: var(--primary-color);
-}
-
-.playAllSpan {
-  font-size: 18px;
-  margin-inline-start: 10px;
-}
-
-.playAllLink {
-  font-style: italic;
-  padding-block: 5px;
-  padding-inline: 7px;
-  border-radius: 10px;
-  text-decoration: none;
-}
-
-.playAllLink:hover {
-  background-color: var(--bg-color);
-}
-
-.shelfSubtitle {
-  font-style: italic;
-  color: var(--tertiary-text-color);
-}
diff --git a/src/renderer/components/ChannelHome/ChannelHome.vue b/src/renderer/components/ChannelHome/ChannelHome.vue
deleted file mode 100644
index 2e23da23cddc8..0000000000000
--- a/src/renderer/components/ChannelHome/ChannelHome.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <div>
-    <div
-      v-for="(shelf, index) in filteredShelves"
-      :key="index"
-    >
-      <details
-        open
-      >
-        <summary
-          class="shelfTitle"
-        >
-          {{ shelf.title }}
-          <span
-            v-if="shelf.playlistId"
-            class="playAllSpan"
-          >
-            <router-link
-              class="playAllLink"
-              :to="{
-                path: `/playlist/${shelf.playlistId}`
-              }"
-            >
-              <FontAwesomeIcon
-                class="thumbnail"
-                :icon="['fas', 'list']"
-              />
-              {{ $t('Channel.Home.View Playlist') }}
-            </router-link>
-          </span>
-          <hr class="shelfUnderline">
-        </summary>
-        <p
-          v-if="shelf.subtitle"
-          class="shelfSubtitle"
-        >
-          {{ shelf.subtitle }}
-        </p>
-        <FtElementList
-          :data="shelf.content"
-          :use-channels-hidden-preference="false"
-          :display="shelf.isCommunity ? 'list' : ''"
-        />
-      </details>
-    </div>
-  </div>
-</template>
-
-<script setup>
-
-import { computed } from 'vue'
-import FtElementList from '../FtElementList/FtElementList.vue'
-import store from '../../store/index'
-
-const props = defineProps({
-  shelves: {
-    type: Array,
-    default: () => []
-  }
-})
-
-/** @type {import('vue').ComputedRef<bool>} */
-const hideFeaturedChannels = computed(() => {
-  return store.getters.getHideFeaturedChannels
-})
-
-const filteredShelves = computed(() => {
-  let shelves = props.shelves
-  if (hideFeaturedChannels.value) {
-    shelves = shelves.filter(shelf => shelf.content[0].type !== 'channel')
-  }
-
-  return shelves.filter(shelf => shelf.content.length > 0)
-})
-</script>
-
-<style scoped src="./ChannelHome.css" />
diff --git a/src/renderer/components/CommentSection/CommentSection.vue b/src/renderer/components/CommentSection/CommentSection.vue
deleted file mode 100644
index 2810ae0993b55..0000000000000
--- a/src/renderer/components/CommentSection/CommentSection.vue
+++ /dev/null
@@ -1,795 +0,0 @@
-<template>
-  <FtCard
-    class="card"
-  >
-    <h3
-      v-if="commentData.length > 0 && !isLoading && showComments"
-      class="commentsTitle"
-    >
-      {{ $t("Comments.Comments") }}
-      <span
-        class="hideComments"
-        role="button"
-        tabindex="0"
-        @click="showComments = false"
-        @keydown.space.prevent="showComments = false"
-        @keydown.enter.prevent="showComments = false"
-      >
-        {{ $t("Comments.Hide Comments") }}
-      </span>
-    </h3>
-    <h4
-      v-if="canPerformInitialCommentLoading"
-      class="getCommentsTitle"
-      role="button"
-      tabindex="0"
-      @click="getCommentData"
-      @keydown.space.prevent="getCommentData"
-      @keydown.enter.prevent="getCommentData"
-    >
-      {{ $t("Comments.Click to View Comments") }}
-    </h4>
-    <h4
-      v-if="commentData.length > 0 && !isLoading && !showComments"
-      class="getCommentsTitle"
-      role="button"
-      tabindex="0"
-      @click="showComments = true"
-      @keydown.space.prevent="showComments = true"
-      @keydown.enter.prevent="showComments = true"
-    >
-      {{ $t("Comments.Click to View Comments") }}
-    </h4>
-    <FtSelect
-      v-if="commentData.length > 0 && !isLoading && showComments && showSortBy"
-      class="commentSort"
-      :placeholder="$t('Comments.Sort by')"
-      :value="currentSortValue"
-      :select-names="sortNames"
-      :select-values="sortValues"
-      :icon="['fas', 'arrow-down-short-wide']"
-      @change="handleSortChange"
-    />
-    <div
-      v-if="commentData.length > 0 && showComments"
-    >
-      <div
-        v-for="(comment, index) in commentData"
-        :id="'comment' + index"
-        :key="comment.id"
-        class="comment"
-      >
-        <router-link
-          :to="`/channel/${comment.authorLink}`"
-          tabindex="-1"
-        >
-          <!-- Hide comment photo only if it isn't the video uploader -->
-          <div
-            v-if="hideCommentPhotos && !comment.isOwner"
-            class="commentThumbnailHidden"
-          >
-            {{ comment.author.substring(1, 2) }}
-          </div>
-          <img
-            v-else
-            :src="comment.authorThumb"
-            alt=""
-            class="commentThumbnail"
-          >
-        </router-link>
-        <p
-          v-if="comment.isPinned"
-          class="commentPinned"
-        >
-          <FontAwesomeIcon
-            :icon="['fas', 'thumbtack']"
-          />
-          {{ $t("Comments.Pinned by") }} {{ channelName }}
-        </p>
-        <p
-          class="commentAuthorWrapper"
-        >
-          <router-link
-            class="commentAuthor"
-            :class="{
-              commentOwner: comment.isOwner
-            }"
-            :to="`/channel/${comment.authorLink}`"
-          >
-            {{ comment.author }}
-          </router-link>
-          <img
-            v-if="comment.isMember"
-            :src="comment.memberIconUrl"
-            :title="$t('Comments.Member')"
-            :aria-label="$t('Comments.Member')"
-            class="commentMemberIcon"
-            alt=""
-          >
-          <img
-            v-if="isSubscribedToChannel(comment.authorId)"
-            :title="$t('Comments.Subscribed')"
-            :aria-label="$t('Comments.Subscribed')"
-            class="commentSubscribedIcon"
-            alt=""
-          >
-          <span class="commentDate">
-            {{ comment.time }}
-          </span>
-        </p>
-        <FtTimestampCatcher
-          class="commentText"
-          :input-html="comment.text"
-          @timestamp-event="onTimestamp"
-        />
-        <p class="commentLikeCount">
-          <template
-            v-if="!hideCommentLikes"
-          >
-            <FontAwesomeIcon
-              :icon="['fas', 'thumbs-up']"
-            />
-            {{ comment.likes }}
-          </template>
-          <span
-            v-if="comment.isHearted"
-            class="commentHeartBadge"
-          >
-            <img
-              :src="channelThumbnail"
-              :title="$t('Comments.Hearted')"
-              :aria-label="$t('Comments.Hearted')"
-              class="commentHeartBadgeImg"
-              alt=""
-            >
-            <FontAwesomeIcon
-              :icon="['fas', 'heart']"
-              class="commentHeartBadgeWhite"
-            />
-            <FontAwesomeIcon
-              :icon="['fas', 'heart']"
-              class="commentHeartBadgeRed"
-            />
-          </span>
-          <span
-            v-if="comment.numReplies > 0"
-            class="commentMoreReplies"
-            role="button"
-            tabindex="0"
-            @click="toggleCommentReplies(index)"
-            @keydown.space.prevent="toggleCommentReplies(index)"
-            @keydown.enter.prevent="toggleCommentReplies(index)"
-          >
-            <span v-if="!comment.showReplies">{{ $t("Comments.View") }}</span>
-            <span v-else>{{ $t("Comments.Hide") }}</span>
-            {{ comment.numReplies }}
-            <span v-if="comment.numReplies === 1">{{ $t("Comments.Reply").toLowerCase() }}</span>
-            <span v-else>{{ $t("Comments.Replies").toLowerCase() }}</span>
-            <span v-if="comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.From {channelName}", { channelName }) }}</span>
-            <span v-if="comment.numReplies > 1 && comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.And others") }}</span>
-          </span>
-        </p>
-        <div
-          v-if="comment.showReplies"
-          class="commentReplies"
-        >
-          <div
-            v-for="(reply, replyIndex) in comment.replies"
-            :id="'comment' + index + '-' + replyIndex"
-            :key="replyIndex"
-            class="comment"
-          >
-            <router-link
-              :to="`/channel/${reply.authorLink}`"
-              tabindex="-1"
-            >
-              <!-- Hide comment photo only if it isn't the video uploader -->
-              <div
-                v-if="hideCommentPhotos && !reply.isOwner"
-                class="commentThumbnailHidden"
-              >
-                {{ reply.author.substring(1, 2) }}
-              </div>
-              <img
-                v-else
-                :src="reply.authorThumb"
-                alt=""
-                class="commentThumbnail"
-              >
-            </router-link>
-            <p class="commentAuthorWrapper">
-              <router-link
-                class="commentAuthor"
-                :class="{
-                  commentOwner: reply.isOwner
-                }"
-                :to="`/channel/${reply.authorLink}`"
-              >
-                {{ reply.author }}
-              </router-link>
-              <img
-                v-if="reply.isMember"
-                :src="reply.memberIconUrl"
-                class="commentMemberIcon"
-                alt=""
-              >
-              <img
-                v-if="isSubscribedToChannel(reply.authorId)"
-                :title="$t('Comments.Subscribed')"
-                :aria-label="$t('Comments.Subscribed')"
-                class="commentSubscribedIcon"
-                alt=""
-              >
-              <span class="commentDate">
-                {{ reply.time }}
-              </span>
-            </p>
-            <FtTimestampCatcher
-              class="commentText"
-              :input-html="reply.text"
-              @timestamp-event="onTimestamp"
-            />
-            <p class="commentLikeCount">
-              <template
-                v-if="!hideCommentLikes"
-              >
-                <FontAwesomeIcon
-                  v-if="!hideCommentLikes"
-                  :icon="['fas', 'thumbs-up']"
-                />
-                {{ reply.likes }}
-              </template>
-            </p>
-            <p
-              v-if="reply.numReplies > 0"
-              class="commentMoreReplies"
-            >
-              {{ $t('Comments.View {replyCount} replies', { replyCount: reply.numReplies }) }}
-            </p>
-          </div>
-          <div
-            v-if="comment.hasReplyToken"
-            class="showMoreReplies"
-            role="button"
-            tabindex="0"
-            @click="getCommentReplies(index)"
-            @keydown.space.prevent="getCommentReplies(index)"
-            @keydown.enter.prevent="getCommentReplies(index)"
-          >
-            <span>{{ $t("Comments.Show More Replies") }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      v-else-if="showComments && !isLoading"
-    >
-      <h3
-        v-if="isPostComments"
-        class="noCommentMsg"
-      >
-        {{ $t("Comments.There are no comments available for this post") }}
-      </h3>
-      <h3
-        v-else
-        class="noCommentMsg"
-      >
-        {{ $t("Comments.There are no comments available for this video") }}
-      </h3>
-    </div>
-    <h4
-      v-if="canPerformMoreCommentLoading"
-      class="getMoreComments"
-      role="button"
-      tabindex="0"
-      @click="getMoreComments"
-      @keydown.space.prevent="getMoreComments"
-      @keydown.enter.prevent="getMoreComments"
-    >
-      {{ $t("Comments.Load More Comments") }}
-    </h4>
-    <FtLoader
-      v-if="isLoading"
-    />
-    <div
-      v-observe-visibility="observeVisibilityOptions"
-    >
-      <!--
-        Dummy element to be observed by Intersection Observer
-      -->
-    </div>
-  </FtCard>
-</template>
-
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { computed, ref, shallowRef } from 'vue'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-
-import FtCard from '../ft-card/ft-card.vue'
-import FtLoader from '../ft-loader/ft-loader.vue'
-import FtSelect from '../ft-select/ft-select.vue'
-import FtTimestampCatcher from '../FtTimestampCatcher.vue'
-
-import store from '../../store/index'
-
-import { copyToClipboard, showToast } from '../../helpers/utils'
-import { getLocalComments, parseLocalComment } from '../../helpers/api/local'
-import {
-  getInvidiousCommunityPostCommentReplies,
-  getInvidiousCommunityPostComments,
-  invidiousGetCommentReplies,
-  invidiousGetComments
-} from '../../helpers/api/invidious'
-
-const { t } = useI18n()
-
-const props = defineProps({
-  id: {
-    type: String,
-    required: true
-  },
-  channelName: {
-    type: String,
-    required: true
-  },
-  channelThumbnail: {
-    type: String,
-    required: true
-  },
-  videoPlayerReady: {
-    type: Boolean,
-    required: true
-  },
-  isPostComments: {
-    type: Boolean,
-    default: false,
-  },
-  postAuthorId: {
-    type: String,
-    default: null
-  },
-  showSortBy: {
-    type: Boolean,
-    default: true,
-  }
-})
-
-const isLoading = ref(false)
-const showComments = ref(false)
-const nextPageToken = shallowRef(null)
-
-// Has to be ref not shallowRef, as the replies are stored in a property on the comments
-// we need to react to new replies and showReplies being toggled
-const commentData = ref([])
-
-/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
-const backendPreference = computed(() => {
-  return store.getters.getBackendPreference
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const backendFallback = computed(() => {
-  return store.getters.getBackendFallback
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideCommentLikes = computed(() => {
-  return store.getters.getHideCommentLikes
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideCommentPhotos = computed(() => {
-  return store.getters.getHideCommentPhotos
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const generalAutoLoadMorePaginatedItemsEnabled = computed(() => {
-  return store.getters.getGeneralAutoLoadMorePaginatedItemsEnabled
-})
-
-const canPerformInitialCommentLoading = computed(() => {
-  return commentData.value.length === 0 && !isLoading.value && !showComments.value
-})
-
-const canPerformMoreCommentLoading = computed(() => {
-  return commentData.value.length > 0 && !isLoading.value && showComments.value && !!nextPageToken.value
-})
-
-const observeVisibilityOptions = computed(() => {
-  if (!generalAutoLoadMorePaginatedItemsEnabled.value) {
-    return false
-  }
-  if (!props.videoPlayerReady && !props.isPostComments) { return false }
-
-  return {
-    /**
-     * @param {boolean} isVisible
-     */
-    callback: (isVisible) => {
-      // This is also fired when **hidden**
-      // No point doing anything if not visible
-      if (!isVisible) { return }
-      // It's possible the comments are being loaded/already loaded
-      if (canPerformInitialCommentLoading.value) {
-        getCommentData()
-      } else if (canPerformMoreCommentLoading.value) {
-        getMoreComments()
-      }
-    },
-    intersection: {
-      // Only when it intersects with N% above bottom
-      rootMargin: '0% 0% 0% 0%',
-    },
-    // Callback responsible for loading multiple comment pages
-    once: false,
-  }
-})
-
-const sortNames = computed(() => [
-  t('Comments.Top comments'),
-  t('Comments.Newest first')
-])
-
-const sortValues = [
-  'top',
-  'newest'
-]
-
-const sortNewest = ref(false)
-
-const currentSortValue = computed(() => sortNewest.value ? 'newest' : 'top')
-
-function handleSortChange() {
-  sortNewest.value = !sortNewest.value
-  commentData.value = []
-  nextPageToken.value = null
-  getCommentData()
-}
-
-const emit = defineEmits(['timestamp-event'])
-
-/**
- * @param {number} timestamp
- */
-function onTimestamp(timestamp) {
-  emit('timestamp-event', timestamp)
-}
-
-/** @type {import('vue').ComputedRef<Set<string>>} */
-const subscribedChannelIds = computed(() => {
-  return store.getters.getActiveProfile.subscriptions.reduce((set, channel) => {
-    return set.add(channel.id)
-  }, new Set())
-})
-
-/**
- * @param {string} channelId
- */
-function isSubscribedToChannel(channelId) {
-  return subscribedChannelIds.value.has(channelId)
-}
-
-function getCommentData() {
-  isLoading.value = true
-
-  if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious' || props.isPostComments) {
-    if (!props.isPostComments) {
-      getCommentDataInvidious()
-    } else {
-      getPostCommentsInvidious()
-    }
-  } else {
-    getCommentDataLocal()
-  }
-}
-
-function getMoreComments() {
-  if (commentData.value.length === 0 || nextPageToken.value == null) {
-    showToast(t('Comments.There are no more comments for this video'))
-  } else {
-    if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious' || props.isPostComments) {
-      if (!props.isPostComments) {
-        getCommentDataInvidious()
-      } else {
-        getPostCommentsInvidious()
-      }
-    } else {
-      getCommentDataLocal(true)
-    }
-  }
-}
-
-/**
- * @param {number} index
- */
-function toggleCommentReplies(index) {
-  if (commentData.value[index].showReplies || commentData.value[index].replies.length > 0) {
-    commentData.value[index].showReplies = !commentData.value[index].showReplies
-  } else {
-    getCommentReplies(index)
-  }
-}
-
-/**
- * @param {number} index
- */
-function getCommentReplies(index) {
-  if (!process.env.SUPPORTS_LOCAL_API || commentData.value[index].dataType === 'invidious' || props.isPostComments) {
-    if (!props.isPostComments) {
-      getCommentRepliesInvidious(index)
-    } else {
-      getPostCommentRepliesInvidious(index)
-    }
-  } else {
-    getCommentRepliesLocal(index)
-  }
-}
-
-/** @type {Map<string, (import('youtubei.js').YTNodes.CommentThread | string)>} */
-const replyTokens = new Map()
-
-/**
- * @param {boolean | undefined} more
- */
-async function getCommentDataLocal(more = false) {
-  try {
-    /** @type {import('youtubei.js').YT.Comments} */
-    let comments
-    if (more) {
-      comments = await nextPageToken.value.getContinuation()
-    } else {
-      comments = await getLocalComments(props.id, sortNewest.value)
-    }
-
-    const parsedComments = comments.contents
-      .map(commentThread => {
-        // Use destructuring to create a new object without the replyToken
-        const { replyToken, ...comment } = parseLocalComment(commentThread.comment, commentThread)
-
-        if (comment.hasReplyToken) {
-          replyTokens.set(comment.id, replyToken)
-        } else {
-          replyTokens.delete(comment.id)
-        }
-
-        return comment
-      })
-
-    if (more) {
-      commentData.value = commentData.value.concat(parsedComments)
-    } else {
-      commentData.value = parsedComments
-    }
-
-    nextPageToken.value = comments.has_continuation ? comments : null
-    isLoading.value = false
-    showComments.value = true
-  } catch (err) {
-    // region No comment detection
-    // No comment related info when video info requested earlier in parent component
-    if (err.message.includes('Comments page did not have any content')) {
-      // For videos without any comment (comment disabled?)
-      // e.g. https://youtu.be/8NBSwDEf8a8
-      commentData.value = []
-      nextPageToken.value = null
-      isLoading.value = false
-      showComments.value = true
-      return
-    }
-    // endregion No comment detection
-
-    console.error(err)
-    const errorMessage = t('Local API Error (Click to copy)')
-    showToast(`${errorMessage}: ${err}`, 10000, () => {
-      copyToClipboard(err)
-    })
-    if (backendFallback.value && backendPreference.value === 'local') {
-      showToast(t('Falling back to Invidious API'))
-      getCommentDataInvidious()
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
-/**
- * @param {number} index
- */
-async function getCommentRepliesLocal(index) {
-  showToast(t('Comments.Getting comment replies, please wait'))
-
-  try {
-    const comment = commentData.value[index]
-    /** @type {import('youtubei.js').YTNodes.CommentThread} */
-    const commentThread = replyTokens.get(comment.id)
-
-    if (commentThread == null) {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-      return
-    }
-
-    if (comment.replies.length > 0) {
-      await commentThread.getContinuation()
-      comment.replies = comment.replies.concat(commentThread.replies.map(reply => parseLocalComment(reply)))
-    } else {
-      await commentThread.getReplies()
-      comment.replies = commentThread.replies.map(reply => parseLocalComment(reply))
-    }
-
-    if (commentThread.has_continuation) {
-      replyTokens.set(comment.id, commentThread)
-      comment.hasReplyToken = true
-    } else {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-    }
-
-    comment.showReplies = true
-  } catch (err) {
-    console.error(err)
-    const errorMessage = t('Local API Error (Click to copy)')
-    showToast(`${errorMessage}: ${err}`, 10000, () => {
-      copyToClipboard(err)
-    })
-    if (backendFallback.value && backendPreference.value === 'local') {
-      showToast(t('Falling back to Invidious API'))
-      getCommentDataInvidious()
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
-async function getCommentDataInvidious() {
-  try {
-    let { response, commentData: comments } = await invidiousGetComments({
-      id: props.id,
-      nextPageToken: nextPageToken.value,
-      sortNewest: sortNewest.value
-    })
-
-    comments = comments.map(({ replyToken, ...comment }) => {
-      if (comment.hasReplyToken) {
-        replyTokens.set(comment.id, replyToken)
-      } else {
-        replyTokens.delete(comment.id)
-      }
-
-      return comment
-    })
-
-    commentData.value = commentData.value.concat(comments)
-    nextPageToken.value = response.continuation
-    isLoading.value = false
-    showComments.value = true
-  } catch (err) {
-    // region No comment detection
-    // No comment related info when video info requested earlier in parent component
-    if (err.message.includes('Comments not found')) {
-      // For videos without any comment (comment disabled?)
-      // e.g. https://youtu.be/8NBSwDEf8a8
-      commentData.value = []
-      nextPageToken.value = null
-      isLoading.value = false
-      showComments.value = true
-      return
-    }
-    // endregion No comment detection
-
-    console.error(err)
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${err}`, 10000, () => {
-      copyToClipboard(err)
-    })
-
-    if (process.env.SUPPORTS_LOCAL_API && backendFallback.value && backendPreference.value === 'invidious') {
-      showToast(t('Falling back to Local API'))
-      getCommentDataLocal()
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
-/**
- * @param {number} index
- */
-async function getCommentRepliesInvidious(index) {
-  showToast(t('Comments.Getting comment replies, please wait'))
-
-  const comment = commentData.value[index]
-  const replyToken = replyTokens.get(comment.id)
-
-  try {
-    const { commentData, continuation } = await invidiousGetCommentReplies({ id: props.id, replyToken })
-
-    comment.replies = comment.replies.concat(commentData)
-    comment.showReplies = true
-
-    if (continuation) {
-      replyTokens.set(comment.id, continuation)
-      comment.hasReplyToken = true
-    } else {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-    }
-
-    isLoading.value = false
-  } catch (error) {
-    console.error(error)
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${error}`, 10000, () => {
-      copyToClipboard(error)
-    })
-    isLoading.value = false
-  }
-}
-
-function getPostCommentsInvidious() {
-  const fetchComments = nextPageToken.value == null
-    ? getInvidiousCommunityPostComments({ postId: props.id, authorId: props.postAuthorId })
-    : getInvidiousCommunityPostCommentReplies({ postId: props.id, replyToken: nextPageToken.value, authorId: props.postAuthorId })
-
-  fetchComments.then(({ response, commentData: comments, continuation }) => {
-    comments = comments.map(({ replyToken, ...comment }) => {
-      if (comment.hasReplyToken) {
-        replyTokens.set(comment.id, replyToken)
-      } else {
-        replyTokens.delete(comment.id)
-      }
-
-      return comment
-    })
-
-    commentData.value = commentData.value.concat(comments)
-    nextPageToken.value = response?.continuation ?? continuation
-    isLoading.value = false
-    showComments.value = true
-  }).catch((err) => {
-    console.error(err)
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${err}`, 10000, () => {
-      copyToClipboard(err)
-    })
-    isLoading.value = false
-  })
-}
-
-async function getPostCommentRepliesInvidious(index) {
-  showToast(t('Comments.Getting comment replies, please wait'))
-
-  const comment = commentData.value[index]
-  const replyToken = replyTokens.get(comment.id)
-
-  try {
-    const { commentData: comments, continuation } = await getInvidiousCommunityPostCommentReplies({
-      postId: props.id,
-      replyToken: replyToken,
-      authorId: props.postAuthorId
-    })
-    comment.replies = comment.replies.concat(comments)
-    comment.showReplies = true
-
-    if (continuation) {
-      replyTokens.set(comment.id, continuation)
-      comment.hasReplyToken = true
-    } else {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-    }
-
-    isLoading.value = false
-  } catch (error) {
-    console.error(error)
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${error}`, 10000, () => {
-      copyToClipboard(error)
-    })
-    isLoading.value = false
-  }
-}
-</script>
-
-<style scoped src="./CommentSection.css" />
diff --git a/src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue b/src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue
deleted file mode 100644
index bec628ef17322..0000000000000
--- a/src/renderer/components/ExperimentalSettings/ExperimentalSettings.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <FtSettingsSection
-    :title="$t('Settings.Experimental Settings.Experimental Settings')"
-  >
-    <p class="experimental-warning">
-      {{ $t('Settings.Experimental Settings.Warning') }}
-    </p>
-    <FtFlexBox>
-      <FtToggleSwitch
-        tooltip-position="top"
-        :label="$t('Settings.Experimental Settings.Replace HTTP Cache')"
-        compact
-        :default-value="replaceHttpCache"
-        :disabled="replaceHttpCacheLoading"
-        :tooltip="$t('Tooltips.Experimental Settings.Replace HTTP Cache')"
-        @change="handleRestartPrompt"
-      />
-    </FtFlexBox>
-    <FtPrompt
-      v-if="showRestartPrompt"
-      :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
-      :option-names="[$t('Yes, Restart'), $t('Cancel')]"
-      :option-values="['restart', 'cancel']"
-      @click="handleReplaceHttpCache"
-    />
-  </FtSettingsSection>
-</template>
-
-<script setup>
-import { onMounted, ref } from 'vue'
-
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
-import FtPrompt from '../ft-prompt/ft-prompt.vue'
-
-import { IpcChannels } from '../../../constants'
-
-const replaceHttpCacheLoading = ref(true)
-const replaceHttpCache = ref(false)
-const showRestartPrompt = ref(false)
-
-onMounted(async () => {
-  if (process.env.IS_ELECTRON) {
-    const { ipcRenderer } = require('electron')
-    replaceHttpCache.value = await ipcRenderer.invoke(IpcChannels.GET_REPLACE_HTTP_CACHE)
-  }
-
-  replaceHttpCacheLoading.value = false
-})
-
-/**
- * @param {boolean} value
- */
-function handleRestartPrompt(value) {
-  replaceHttpCache.value = value
-  showRestartPrompt.value = true
-}
-
-/**
- * @param {'restart' | 'cancel' | null} value
- */
-function handleReplaceHttpCache(value) {
-  showRestartPrompt.value = false
-
-  if (value === null || value === 'cancel') {
-    replaceHttpCache.value = !replaceHttpCache.value
-    return
-  }
-
-  if (process.env.IS_ELECTRON) {
-    const { ipcRenderer } = require('electron')
-    ipcRenderer.send(IpcChannels.TOGGLE_REPLACE_HTTP_CACHE)
-  }
-}
-</script>
-
-<style scoped src="./ExperimentalSettings.css" />
diff --git a/src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue b/src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue
deleted file mode 100644
index be4d0d47ad5f0..0000000000000
--- a/src/renderer/components/FtAgeRestricted/FtAgeRestricted.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <div>
-    <h2 class="message">
-      {{ restrictedMessage }}
-    </h2>
-    <div class="frown">
-      {{ emoji }}
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-
-import { randomArrayItem } from '../../helpers/utils'
-
-const { t } = useI18n()
-
-const props = defineProps({
-  isChannel: {
-    type: Boolean,
-    default: false,
-  }
-})
-
-const emoji = randomArrayItem(['😵', '😦', '🙁', '☹️', '😦', '🤫', '😕'])
-
-const restrictedMessage = computed(() => {
-  if (props.isChannel) {
-    return t('Age Restricted.This channel is age restricted')
-  }
-
-  return t('Age Restricted.This video is age restricted')
-})
-</script>
-
-<style scoped src="./FtAgeRestricted.css" />
diff --git a/src/renderer/components/FtCommunityPost/FtCommunityPost.vue b/src/renderer/components/FtCommunityPost/FtCommunityPost.vue
deleted file mode 100644
index c3292e2fb91f8..0000000000000
--- a/src/renderer/components/FtCommunityPost/FtCommunityPost.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <div
-    class="ft-list-post ft-list-item outside"
-    :appearance="appearance"
-    :class="{ list: listType === 'list', grid: listType === 'grid' }"
-  >
-    <div
-      class="author-div"
-    >
-      <template
-        v-if="authorThumbnails.length > 0"
-      >
-        <router-link
-          v-if="authorId"
-          :to="`/channel/${authorId}`"
-          tabindex="-1"
-          aria-hidden="true"
-        >
-          <img
-            :src="getBestQualityImage(authorThumbnails)"
-            class="communityThumbnail"
-            alt=""
-          >
-        </router-link>
-        <img
-          v-else
-          :src="getBestQualityImage(authorThumbnails)"
-          class="communityThumbnail"
-          alt=""
-        >
-      </template>
-      <p
-        class="authorName"
-      >
-        <router-link
-          v-if="authorId"
-          :to="`/channel/${authorId}`"
-          class="authorNameLink"
-        >
-          {{ author }}
-        </router-link>
-        <template
-          v-else
-        >
-          {{ author }}
-        </template>
-      </p>
-      <p
-        class="publishedText"
-      >
-        {{ publishedText }}
-      </p>
-    </div>
-    <p
-      class="postText"
-      v-html="postText"
-    />
-    <swiper-container
-      v-if="postType === 'multiImage' && postContent.content.length > 0"
-      ref="swiperContainerRef"
-      init="false"
-      class="sliderContainer"
-    >
-      <swiper-slide
-        v-for="(img, index) in postContent.content"
-        :key="index"
-        lazy="true"
-      >
-        <img
-          :src="getBestQualityImage(img)"
-          class="communityImage"
-          alt=""
-          loading="lazy"
-        >
-      </swiper-slide>
-    </swiper-container>
-    <div
-      v-if="postType === 'image' && postContent.content.length > 0"
-    >
-      <img
-        :src="getBestQualityImage(postContent.content)"
-        class="communityImage"
-        alt=""
-      >
-    </div>
-    <div
-      v-if="postType === 'video'"
-    >
-      <FtListVideo
-        v-if="!hideVideo"
-        :data="data.postContent.content"
-        appearance=""
-      />
-      <p
-        v-else
-        class="hiddenVideo"
-      >
-        {{ '[' + $t('Channel.Community.Video hidden by FreeTube') + ']' }}
-      </p>
-    </div>
-    <div
-      v-if="postType === 'poll' || postType === 'quiz'"
-    >
-      <FtCommunityPoll :data="postContent" />
-    </div>
-    <div
-      v-if="postType === 'playlist'"
-      class="playlistWrapper"
-    >
-      <FtListPlaylist
-        :data="postContent.content"
-        :appearance="appearance"
-      />
-    </div>
-    <div
-      class="bottomSection"
-    >
-      <span
-        class="likeCount"
-        :title="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
-        :aria-label="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
-      >
-        <FontAwesomeIcon
-          class="thumbs-up-icon"
-          :icon="['fas', 'thumbs-up']"
-          aria-hidden="true"
-        /> {{ formattedVoteCount }}</span>
-      <router-link
-        v-if="isInvidiousAllowed && !singlePost"
-        :to="{
-          path: `/post/${postId}`,
-          query: authorId ? { authorId } : undefined
-        }"
-        class="commentsLink"
-        :aria-label="$t('Channel.Community.View Full Post')"
-      >
-        <span
-          class="commentCount"
-          :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-          :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-        >
-          <FontAwesomeIcon
-            class="comment-count-icon"
-            :icon="['fas', 'comment']"
-            aria-hidden="true"
-          /> {{ formattedCommentCount }}</span>
-      </router-link>
-      <span
-        v-else-if="commentCount != null"
-        class="commentCount"
-        :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-        :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
-      >
-        <FontAwesomeIcon
-          class="comment-count-icon"
-          :icon="['fas', 'comment']"
-        /> {{ commentCount }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import autolinker from 'autolinker'
-import { A11y, Navigation, Pagination } from 'swiper/modules'
-import { computed, onMounted, ref } from 'vue'
-
-import FtListVideo from '../ft-list-video/ft-list-video.vue'
-import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
-import FtCommunityPoll from '../FtCommunityPoll/FtCommunityPoll.vue'
-
-import store from '../../store/index'
-
-import {
-  createWebURL,
-  deepCopy,
-  formatNumber,
-  getRelativeTimeFromDate,
-} from '../../helpers/utils'
-import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-
-const props = defineProps({
-  data: {
-    type: Object,
-    required: true
-  },
-  appearance: {
-    type: String,
-    required: true
-  },
-  hideForbiddenTitles: {
-    type: Boolean,
-    default: true
-  },
-  singlePost: {
-    type: Boolean,
-    default: false
-  },
-})
-
-/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
-const listType = computed(() => {
-  return store.getters.getListType
-})
-
-/** @type {import('vue').ComputedRef<string[]>} */
-const forbiddenTitles = computed(() => {
-  if (!props.hideForbiddenTitles) { return [] }
-  return JSON.parse(store.getters.getForbiddenTitles)
-})
-
-const hideVideo = computed(() => {
-  return forbiddenTitles.value.some((text) => props.data.postContent.content.title?.toLowerCase().includes(text.toLowerCase()))
-})
-
-/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
-const backendPreference = computed(() => {
-  return store.getters.getBackendPreference
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const backendFallback = computed(() => {
-  return store.getters.getBackendFallback
-})
-
-const isInvidiousAllowed = computed(() => {
-  return backendPreference.value === 'invidious' || backendFallback.value
-})
-
-let postType = ''
-let postText = ''
-let postId = ''
-/** @type {string[]?} */
-let authorThumbnails = null
-let postContent = ''
-let author = ''
-let authorId = ''
-let voteCount = 0
-/** @type {number?} */
-let commentCount = null
-
-parseCommunityData()
-
-const formattedCommentCount = computed(() => {
-  if (commentCount != null) {
-    return formatNumber(commentCount)
-  }
-
-  return ''
-})
-
-const formattedVoteCount = computed(() => {
-  return formatNumber(voteCount)
-})
-
-const publishedText = computed(() => {
-  if (props.data.publishedTime) {
-    return getRelativeTimeFromDate(props.data.publishedTime)
-  }
-
-  return ''
-})
-
-function parseCommunityData() {
-  if ('backstagePostThreadRenderer' in props.data) {
-    postText = 'Shared post'
-    postType = 'text'
-
-    authorThumbnails = ['', 'https://yt3.ggpht.com/ytc/AAUvwnjm-0qglHJkAHqLFsCQQO97G7cCNDuDLldsrn25Lg=s88-c-k-c0x00ffffff-no-rj']
-
-    if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious') {
-      authorThumbnails.forEach(thumbnail => {
-        thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
-      })
-    }
-
-    return
-  }
-
-  postText = autolinker.link(props.data.postText)
-  postContent = props.data.postContent
-  postId = props.data.postId
-  voteCount = props.data.voteCount
-  commentCount = props.data.commentCount
-  postType = props.data.postContent?.type ?? 'text'
-  author = props.data.author
-  authorId = props.data.authorId
-
-  authorThumbnails = deepCopy(props.data.authorThumbnails)
-
-  if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious') {
-    authorThumbnails.forEach(thumbnail => {
-      thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
-    })
-  } else {
-    authorThumbnails.forEach(thumbnail => {
-      if (thumbnail.url.startsWith('//')) {
-        thumbnail.url = 'https:' + thumbnail.url
-      }
-    })
-  }
-}
-
-/**
- * @param {{ width: number, height: number, url: string }[]} imageArray
- */
-function getBestQualityImage(imageArray) {
-  const imageArrayCopy = Array.from(imageArray)
-  imageArrayCopy.sort((a, b) => {
-    return Number.parseInt(b.width) - Number.parseInt(a.width)
-  })
-
-  // Remove cropping directives when applicable
-  return imageArrayCopy[0]?.url?.replace(/-c-fcrop64=[^-]+/i, '') ?? ''
-}
-
-const swiperContainerRef = ref(null)
-
-if (postType === 'multiImage' && postContent.content.length > 0) {
-  onMounted(() => {
-    /** @type {import('swiper/element').SwiperContainer} */
-    const swiperOptions = {
-      modules: [A11y, Navigation, Pagination],
-
-      injectStylesUrls: [
-        // This file is created with the copy webpack plugin in the web and renderer webpack configs.
-        // If you add more modules, please remember to add their CSS files to the list in webpack config files.
-        createWebURL(`/swiper-${process.env.SWIPER_VERSION}.css`)
-      ],
-
-      a11y: true,
-      navigation: true,
-      pagination: {
-        enabled: true,
-        clickable: true
-      },
-      slidesPerView: 1
-    }
-
-    Object.assign(swiperContainerRef.value, swiperOptions)
-
-    swiperContainerRef.value.initialize()
-  })
-}
-</script>
-
-<style scoped src="./FtCommunityPost.scss" lang="scss" />
diff --git a/src/renderer/components/FtElementList/FtElementList.vue b/src/renderer/components/FtElementList/FtElementList.vue
index 13204b53a51e9..e6f8f3feed11a 100644
--- a/src/renderer/components/FtElementList/FtElementList.vue
+++ b/src/renderer/components/FtElementList/FtElementList.vue
@@ -104,12 +104,10 @@ const props = defineProps({
 
 const emit = defineEmits(['move-video-down', 'move-video-up', 'remove-from-playlist'])
 
-/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
 const listType = computed(() => {
   return store.getters.getListType
 })
 
-/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
 const displayValue = computed(() => {
   return props.display === '' ? listType.value : props.display
 })
diff --git a/src/renderer/components/FtListChannel/FtListChannel.vue b/src/renderer/components/FtListChannel/FtListChannel.vue
deleted file mode 100644
index 1c0594cf9a146..0000000000000
--- a/src/renderer/components/FtListChannel/FtListChannel.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-  <div
-    class="ft-list-channel ft-list-item"
-    :class="{
-      list: listType === 'list',
-      grid: listType === 'grid',
-      [appearance]: true
-    }"
-  >
-    <div class="channelThumbnail">
-      <router-link
-        :to="`/channel/${id}`"
-        class="channelThumbnailLink"
-        tabindex="-1"
-        aria-hidden="true"
-      >
-        <img
-          :src="thumbnail"
-          :class="!isGame ? 'channelImage' : 'gameImage'"
-          alt=""
-        >
-      </router-link>
-    </div>
-    <div class="infoAndSubscribe">
-      <div class="info">
-        <router-link
-          class="title"
-          :to="`/channel/${id}`"
-        >
-          <h3 class="h3Title">
-            {{ name }}
-          </h3>
-        </router-link>
-        <div class="infoLine">
-          <router-link
-            v-if="handle !== null"
-            class="handle"
-            :to="`/channel/${id}`"
-          >
-            {{ handle }}
-          </router-link>
-          <span
-            v-if="subscriberCount !== null && !hideChannelSubscriptions"
-            class="subscriberCount"
-          >
-            <template v-if="handle !== null"> • </template>
-            {{ $tc('Global.Counts.Subscriber Count', subscriberCount, {count: formattedSubscriberCount}) }}
-          </span>
-          <span
-            v-if="handle == null && videoCount != null"
-            class="videoCount"
-          >
-            <template v-if="subscriberCount !== null && !hideChannelSubscriptions"> • </template>
-            {{ $tc('Global.Counts.Video Count', videoCount, {count: formattedVideoCount}) }}
-          </span>
-        </div>
-        <p
-          v-if="listType !== 'grid'"
-          class="description"
-          v-html="description"
-        />
-      </div>
-      <FtSubscribeButton
-        v-if="!hideUnsubscribeButton"
-        class="channelSubscribeButton"
-        :channel-id="id"
-        :channel-name="name"
-        :channel-thumbnail="thumbnail"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-
-import FtSubscribeButton from '../ft-subscribe-button/ft-subscribe-button.vue'
-
-import store from '../../store/index'
-
-import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-import { formatNumber } from '../../helpers/utils'
-
-const props = defineProps({
-  data: {
-    type: Object,
-    required: true
-  },
-  appearance: {
-    type: String,
-    required: true
-  }
-})
-
-/** @type {import('vue').ComputedRef<string>} */
-const currentInvidiousInstanceUrl = computed(() => {
-  return store.getters.getCurrentInvidiousInstanceUrl
-})
-
-/** @type {import('vue').ComputedRef<'grid' | 'list'>} */
-const listType = computed(() => {
-  return store.getters.getListType
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideChannelSubscriptions = computed(() => {
-  return store.getters.getHideChannelSubscriptions
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideUnsubscribeButton = computed(() => {
-  return store.getters.getHideUnsubscribeButton
-})
-
-let id = ''
-let thumbnail = ''
-let name = ''
-/** @type {number?} */
-let subscriberCount = null
-/** @type {number?} */
-let videoCount = null
-/** @type {string?} */
-let handle = null
-let description = ''
-let isGame = null
-
-if (process.env.SUPPORTS_LOCAL_API && props.data.dataSource === 'local') {
-  parseLocalData()
-} else {
-  parseInvidiousData()
-}
-
-const formattedSubscriberCount = computed(() => {
-  if (subscriberCount != null) {
-    return formatNumber(subscriberCount)
-  }
-
-  return ''
-})
-
-const formattedVideoCount = computed(() => {
-  if (videoCount != null) {
-    return formatNumber(videoCount)
-  }
-
-  return ''
-})
-
-function parseLocalData() {
-  thumbnail = props.data.thumbnail
-  name = props.data.name
-  id = props.data.id
-
-  if (props.data.subscribers != null) {
-    subscriberCount = props.data.subscribers
-  }
-
-  if (props.data.videoCount != null) {
-    videoCount = props.data.videos
-  }
-
-  if (props.data.handle) {
-    handle = props.data.handle
-  }
-
-  description = props.data.descriptionShort
-  isGame = props.data.isGame
-}
-
-function parseInvidiousData() {
-  // Can be prefixed with `https://` or `//` (protocol relative)
-  /** @type {string} */
-  const thumbnailUrl = props.data.authorThumbnails[2].url
-
-  thumbnail = youtubeImageUrlToInvidious(thumbnailUrl, currentInvidiousInstanceUrl.value)
-
-  name = props.data.author
-  id = props.data.authorId
-  subscriberCount = props.data.subCount
-
-  if (props.data.channelHandle != null) {
-    handle = props.data.channelHandle
-  } else {
-    videoCount = props.data.videoCount
-  }
-
-  description = props.data.description
-}
-</script>
-
-<style scoped lang="scss" src="./FtListChannel.scss" />
diff --git a/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue b/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue
index 786054dfbea6e..abaf49d6de3f7 100644
--- a/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue
+++ b/src/renderer/components/FtListLazyWrapper/FtListLazyWrapper.vue
@@ -60,10 +60,10 @@
 import { computed, ref } from 'vue'
 
 import FtListVideo from '../ft-list-video/ft-list-video.vue'
-import FtListChannel from '../FtListChannel/FtListChannel.vue'
+import FtListChannel from '../ft-list-channel/ft-list-channel.vue'
 import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
-import FtCommunityPost from '../FtCommunityPost/FtCommunityPost.vue'
-import FtListHashtag from '../FtListHashtag/FtListHashtag.vue'
+import FtCommunityPost from '../ft-community-post/ft-community-post.vue'
+import FtListHashtag from '../ft-list-hashtag/ft-list-hashtag.vue'
 
 import store from '../../store/index'
 
@@ -141,22 +141,18 @@ const props = defineProps({
 
 const emit = defineEmits(['move-video-down', 'move-video-up', 'remove-from-playlist'])
 
-/** @type {import('vue').ComputedRef<'video' | 'shortVideo' | 'channel' | 'playlist' | 'community'>} */
 const finalDataType = computed(() => {
   return props.data.type ?? props.dataType
 })
 
-/** @type {import('vue').ComputedRef<boolean>} */
 const hideLiveStreams = computed(() => {
   return store.getters.getHideLiveStreams
 })
 
-/** @type {import('vue').ComputedRef<boolean>} */
 const hideUpcomingPremieres = computed(() => {
   return store.getters.getHideUpcomingPremieres
 })
 
-/** @type {import('vue').ComputedRef<{name : string, preferredName: string, icon: string}[]>} */
 const channelsHidden = computed(() => {
   // Some component users like channel view will have this disabled
   if (!props.useChannelsHiddenPreference) { return [] }
@@ -170,7 +166,6 @@ const channelsHidden = computed(() => {
   })
 })
 
-/** @type {string[]} */
 const forbiddenTitles = computed(() => {
   if (!props.hideForbiddenTitles) { return [] }
   return JSON.parse(store.getters.getForbiddenTitles)
diff --git a/src/renderer/components/FtProgressBar/FtProgressBar.vue b/src/renderer/components/FtProgressBar/FtProgressBar.vue
deleted file mode 100644
index 36aed9f58989c..0000000000000
--- a/src/renderer/components/FtProgressBar/FtProgressBar.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <div
-    class="progressBar"
-    :style="{ inlineSize: progressBarPercentage + '%' }"
-  />
-</template>
-
-<script setup>
-import { computed } from 'vue'
-
-import store from '../../store/index'
-
-const progressBarPercentage = computed(() => {
-  return store.getters.getProgressBarPercentage
-})
-</script>
-
-<style scoped src="./FtProgressBar.css" />
diff --git a/src/renderer/components/FtSearchFilters/FtSearchFilters.vue b/src/renderer/components/FtSearchFilters/FtSearchFilters.vue
deleted file mode 100644
index 5c6c207ce30d1..0000000000000
--- a/src/renderer/components/FtSearchFilters/FtSearchFilters.vue
+++ /dev/null
@@ -1,294 +0,0 @@
-<template>
-  <FtPrompt
-    theme="slim"
-    :label="title"
-    @click="hideSearchFilters"
-  >
-    <div>
-      <h2
-        class="center"
-        name="title"
-      >
-        {{ title }}
-      </h2>
-      <FtFlexBox class="radioFlexBox">
-        <FtRadioButton
-          ref="sortByRadio"
-          :title="$t('Search Filters.Sort By.Sort By')"
-          :labels="sortByLabels"
-          :values="SORT_BY_VALUES"
-          :initial-value-index="searchSortByStartIndex"
-          class="searchRadio"
-          @change="updateSortBy"
-        />
-        <FtRadioButton
-          ref="timeRadio"
-          :title="$t('Search Filters.Time.Time')"
-          :labels="timeLabels"
-          :values="TIME_VALUES"
-          :initial-value-index="searchTimeStartIndex"
-          class="searchRadio"
-          @change="updateTime"
-        />
-        <FtRadioButton
-          ref="typeRadio"
-          :title="$t('Search Filters.Type.Type')"
-          :labels="typeLabels"
-          :values="TYPE_VALUES"
-          :initial-value-index="searchTypeStartIndex"
-          class="searchRadio"
-          @change="updateType"
-        />
-        <FtRadioButton
-          ref="durationRadio"
-          :title="$t('Search Filters.Duration.Duration')"
-          :labels="durationLabels"
-          :values="DURATION_VALUES"
-          :initial-value-index="searchDurationStartIndex"
-          class="searchRadio"
-          @change="updateDuration"
-        />
-        <FtCheckboxList
-          ref="featuresCheck"
-          :title="$t('Search Filters.Features.Features')"
-          :labels="featureLabels"
-          :values="FEATURE_VALUES"
-          :initial-values="searchDefaultFeatures"
-          class="searchRadio"
-          @change="updateFeatures"
-        />
-      </FtFlexBox>
-      <div class="searchFilterCloseButtonContainer">
-        <FtButton
-          :label="$t('Close')"
-          background-color="var(--primary-color)"
-          text-color="var(--text-with-main-color)"
-          @click="hideSearchFilters"
-        />
-      </div>
-    </div>
-  </FtPrompt>
-</template>
-
-<script setup>
-import { computed, ref } from 'vue'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtRadioButton from '../ft-radio-button/ft-radio-button.vue'
-import FtPrompt from '../ft-prompt/ft-prompt.vue'
-import FtButton from '../ft-button/ft-button.vue'
-import FtCheckboxList from '../ft-checkbox-list/ft-checkbox-list.vue'
-
-import store from '../../store/index'
-
-const { t } = useI18n()
-
-const SORT_BY_VALUES = [
-  'relevance',
-  'rating',
-  'upload_date',
-  'view_count'
-]
-
-const TIME_VALUES = [
-  '',
-  'hour',
-  'today',
-  'week',
-  'month',
-  'year'
-]
-
-const TYPE_VALUES = [
-  'all',
-  'video',
-  'channel',
-  'playlist',
-  'movie'
-]
-
-const DURATION_VALUES = [
-  '',
-  'short',
-  'medium',
-  'long'
-]
-
-const FEATURE_VALUES = [
-  'hd',
-  'subtitles',
-  'creative_commons',
-  '3d',
-  'live',
-  '4k',
-  '360',
-  'location',
-  'hdr',
-  'vr180'
-]
-
-const NOT_ALLOWED_FOR_MOVIES_FEATURES = [
-  'live',
-  'subtitles',
-  '3d',
-  'creative_commons'
-]
-
-const title = computed(() => t('Search Filters.Search Filters'))
-
-const sortByLabels = computed(() => [
-  t('Search Filters.Sort By.Most Relevant'),
-  t('Search Filters.Sort By.Rating'),
-  t('Search Filters.Sort By.Upload Date'),
-  t('Search Filters.Sort By.View Count')
-])
-
-const timeLabels = computed(() => [
-  t('Search Filters.Time.Any Time'),
-  t('Search Filters.Time.Last Hour'),
-  t('Search Filters.Time.Today'),
-  t('Search Filters.Time.This Week'),
-  t('Search Filters.Time.This Month'),
-  t('Search Filters.Time.This Year')
-])
-
-const typeLabels = computed(() => [
-  t('Search Filters.Type.All Types'),
-  t('Search Filters.Type.Videos'),
-  t('Search Filters.Type.Channels'),
-  t('Playlists'),
-  t('Search Filters.Type.Movies')
-])
-
-const durationLabels = computed(() => [
-  t('Search Filters.Duration.All Durations'),
-  t('Search Filters.Duration.Short (< 4 minutes)'),
-  t('Search Filters.Duration.Medium (4 - 20 minutes)'),
-  t('Search Filters.Duration.Long (> 20 minutes)')
-])
-
-const featureLabels = computed(() => [
-  t('Search Filters.Features.HD'),
-  t('Search Filters.Features.Subtitles'),
-  t('Search Filters.Features.Creative Commons'),
-  t('Search Filters.Features.3D'),
-  t('Search Filters.Features.Live'),
-  t('Search Filters.Features.4K'),
-  t('Search Filters.Features.360 Video'),
-  t('Search Filters.Features.Location'),
-  t('Search Filters.Features.HDR'),
-  t('Search Filters.Features.VR180')
-])
-
-const sortByRadio = ref(null)
-const timeRadio = ref(null)
-const typeRadio = ref(null)
-const durationRadio = ref(null)
-const featuresCheck = ref(null)
-
-const searchFilterValueChanged = computed(() => {
-  if (sortByRadio.value == null || timeRadio.value == null || typeRadio.value == null || durationRadio.value == null || featuresCheck.value == null) {
-    return false
-  }
-
-  return sortByRadio.value.selectedValue !== SORT_BY_VALUES[0] ||
-    timeRadio.value.selectedValue !== TIME_VALUES[0] ||
-    typeRadio.value.selectedValue !== TYPE_VALUES[0] ||
-    durationRadio.value.selectedValue !== DURATION_VALUES[0] ||
-    featuresCheck.value.selectedValues.length > 0
-})
-
-const searchSettings = computed(() => store.getters.getSearchSettings)
-
-const searchSortByStartIndex = SORT_BY_VALUES.indexOf(searchSettings.value.sortBy)
-const searchTimeStartIndex = TIME_VALUES.indexOf(searchSettings.value.time)
-const searchTypeStartIndex = TYPE_VALUES.indexOf(searchSettings.value.type)
-const searchDurationStartIndex = DURATION_VALUES.indexOf(searchSettings.value.duration)
-const searchDefaultFeatures = [...searchSettings.value.features]
-
-function hideSearchFilters() {
-  store.dispatch('hideSearchFilters')
-}
-
-/**
- * @param {'all' | 'video' | 'channel' | 'playlist' | 'movie'} type
- */
-function isVideoOrMovieOrAll(type) {
-  return type === 'video' | type === 'movie' || type === 'all'
-}
-
-/**
- * @param {'relevance' | 'rating' | 'upload_date' | 'view_count'} value
- */
-function updateSortBy(value) {
-  store.commit('setSearchSortBy', value)
-  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
-}
-
-/**
- * @param {'' | 'hour' | 'today' | 'week' | 'month' | 'year'} value
- */
-function updateTime(value) {
-  if (!isVideoOrMovieOrAll(searchSettings.value.type)) {
-    typeRadio.value.updateSelectedValue('all')
-    store.commit('setSearchType', 'all')
-  }
-
-  store.commit('setSearchTime', value)
-  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
-}
-
-/**
- * @param {('hd' | 'subtitles' | 'creative_commons' | '3d' | 'live' | '4k' | '360' | 'location' | 'hdr' | 'vr180')[]} values
- */
-function updateFeatures(values) {
-  if (!isVideoOrMovieOrAll(searchSettings.value.type) || NOT_ALLOWED_FOR_MOVIES_FEATURES.some(item => values.includes(item))) {
-    typeRadio.value.updateSelectedValue('all')
-    store.commit('setSearchType', 'all')
-  }
-
-  store.commit('setSearchFeatures', values)
-  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
-}
-
-/**
- * @param {'all' | 'video' | 'channel' | 'playlist' | 'movie'} value
- */
-function updateType(value) {
-  if (value === 'channel' || value === 'playlist') {
-    timeRadio.value.updateSelectedValue('')
-    durationRadio.value.updateSelectedValue('')
-    sortByRadio.value.updateSelectedValue(SORT_BY_VALUES[0])
-    featuresCheck.value.setSelectedValues([])
-
-    store.commit('setSearchTime', '')
-    store.commit('setSearchDuration', '')
-    store.commit('setSearchFeatures', [])
-    store.commit('setSearchSortBy', SORT_BY_VALUES[0])
-  } else if (value === 'movie') {
-    const filteredFeatures = searchSettings.value.features.filter(e => !NOT_ALLOWED_FOR_MOVIES_FEATURES.includes(e))
-
-    featuresCheck.value.setSelectedValues([...filteredFeatures])
-    store.commit('setSearchFeatures', filteredFeatures)
-  }
-
-  store.commit('setSearchType', value)
-  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
-}
-
-/**
- * @param {'' | 'short' | 'medium' | 'long'} value
- */
-function updateDuration(value) {
-  if (value !== '' && !isVideoOrMovieOrAll(searchSettings.value.type)) {
-    typeRadio.value.updateSelectedValue('all')
-    updateType('all')
-  }
-
-  store.commit('setSearchDuration', value)
-  store.commit('setSearchFilterValueChanged', searchFilterValueChanged.value)
-}
-</script>
-
-<style scoped src="./FtSearchFilters.css" />
diff --git a/src/renderer/components/FtSettingsMenu/FtSettingsMenu.css b/src/renderer/components/FtSettingsMenu/FtSettingsMenu.css
deleted file mode 100644
index b6d613a3e0729..0000000000000
--- a/src/renderer/components/FtSettingsMenu/FtSettingsMenu.css
+++ /dev/null
@@ -1,125 +0,0 @@
-.settingsMenu {
-  /* top nav + margin */
-  inset-block-start: 96px;
-  position: sticky;
-  display: flex;
-  flex-direction: column;
-  padding-inline-start: 0;
-  block-size: calc(85vh - 96px);
-  max-block-size: 600px;
-}
-
-.header {
-  inline-size: fit-content;
-  margin-block: 0 10px;
-}
-
-.title {
-  text-decoration: none;
-  color: var(--tertiary-text-color);
-  inline-size: 220px;
-  flex: 1 1 auto;
-  display: flex;
-  align-items: center;
-}
-
-/* prevent hover styling from showing on title click for mobile */
-@media (hover: hover) {
-  .title:hover {
-    color: var(--primary-text-color);
-  }
-}
-
-.titleContent {
-  inline-size: fit-content;
-  max-inline-size: 100%;
-}
-
-
-.iconAndTitleText {
-  overflow-x: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-
-  /* needed to have underline poke out */
-  margin-inline-start: 3px;
-}
-
-.titleUnderline {
-  /* have underline poke out */
-  inline-size: calc(100% + 6px);
-
-  /* prevent "active" border from visibly pushing the content up */
-  border-block-end: 4px solid transparent;
-}
-
-@media only screen and (width >= 1015px) {
-  .settingsMenu {
-    margin-block: 0;
-    font-size: 16px;
-  }
-
-  .header {
-    margin-block-start: 10px;
-    font-size: 26px;
-  }
-
-  .titleIcon {
-    inline-size: 16px;
-    block-size: 16px;
-  }
-
-  .title.active {
-    color: var(--primary-text-color);
-    font-weight: 600;
-  }
-
-  .title.active .titleUnderline {
-    border-block-end: 4px solid var(--primary-color);
-  }
-}
-
-/* overall mobile breakpoint; large text */
-@media only screen and (width <= 1015px) {
-  .settingsMenu {
-    inline-size: fit-content;
-    margin-inline: auto;
-    position: relative;
-    inset-block-start: 0;
-    font-size: 30px;
-    max-block-size: 1100px;
-  }
-
-  .titleIcon {
-    inline-size: 30px;
-    block-size: 30px;
-    margin-inline-end: 10px;
-  }
-
-  .title {
-    inline-size: fit-content;
-    max-inline-size: 90vw;
-  }
-
-  .header {
-    font-size: 32px;
-  }
-}
-
-/* small height or width mobile breakpoint; intermediary text */
-@media only screen and (width <= 1015px) and (height <= 830px),
-  only screen and (width <= 500px) {
-  .settingsMenu {
-    font-size: 25px;
-  }
-
-  .titleIcon {
-    inline-size: 25px;
-    block-size: 25px;
-    margin-inline-end: 5px;
-  }
-
-  .header {
-    font-size: 25px;
-  }
-}
diff --git a/src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue b/src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue
deleted file mode 100644
index 2965d3388c356..0000000000000
--- a/src/renderer/components/FtSettingsMenu/FtSettingsMenu.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <menu
-    class="settingsMenu"
-  >
-    <h2 class="header">
-      {{ $t('Settings.Settings') }}
-    </h2>
-    <a
-      v-for="settingsSection in settingsSections"
-      :id="settingsSection.type"
-      :key="settingsSection.type"
-      class="title"
-      href="javascript:;"
-      @click.stop="goToSettingsSection(settingsSection.type)"
-      @keydown.enter.stop="goToSettingsSection(settingsSection.type)"
-    >
-      <div class="titleContent">
-        <div class="iconAndTitleText">
-          <FontAwesomeIcon
-            :icon="['fas', settingsSection.icon]"
-            class="titleIcon"
-          />
-          {{ settingsSection.title }}
-        </div>
-        <div class="titleUnderline" />
-      </div>
-    </a>
-  </menu>
-</template>
-
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-
-defineProps({
-  settingsSections: {
-    type: Array,
-    required: true
-  }
-})
-
-const emit = defineEmits(['navigate-to-section'])
-
-/**
- * @param {string} sectionType
- */
-function goToSettingsSection(sectionType) {
-  emit('navigate-to-section', sectionType)
-}
-</script>
-
-<style scoped src="./FtSettingsMenu.css" />
diff --git a/src/renderer/components/FtSettingsSection/FtSettingsSection.vue b/src/renderer/components/FtSettingsSection/FtSettingsSection.vue
deleted file mode 100644
index 28120f65cd5c3..0000000000000
--- a/src/renderer/components/FtSettingsSection/FtSettingsSection.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <div
-    class="settingsSection"
-  >
-    <div class="sectionBody">
-      <h3 class="sectionTitle">
-        {{ title }}
-      </h3>
-      <slot />
-    </div>
-  </div>
-</template>
-
-<script setup>
-defineProps({
-  title: {
-    type: String,
-    required: true
-  }
-})
-</script>
-
-<style scoped src="./FtSettingsSection.scss" lang="scss" />
diff --git a/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue b/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue
deleted file mode 100644
index 0ee493c3547c7..0000000000000
--- a/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-<template>
-  <div class="sponsorBlockCategory">
-    <div
-      :id="sanitizedId"
-      class="sponsorTitle"
-    >
-      {{ translatedCategoryName }}
-    </div>
-    <FtSelect
-      :sanitized-id="sanitizedId + 'categoryColor'"
-      :describe-by-id="sanitizedId"
-      :placeholder="$t('Settings.SponsorBlock Settings.Category Color')"
-      :value="sponsorBlockValues.color"
-      :select-names="colorNames"
-      :select-values="COLOR_VALUES"
-      :icon="['fas', 'palette']"
-      :class="'sec' + sponsorBlockValues.color"
-      icon-color="var(--accent-color)"
-      @change="updateColor"
-    />
-    <FtSelect
-      :sanitized-id="sanitizedId + 'skipOption'"
-      :describe-by-id="sanitizedId"
-      :placeholder="$t('Settings.SponsorBlock Settings.Skip Options.Skip Option')"
-      :value="sponsorBlockValues.skip"
-      :select-names="skipNames"
-      :select-values="SKIP_VALUES"
-      :icon="['fas', 'forward']"
-      @change="updateSkipOption"
-    />
-  </div>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-
-import FtSelect from '../ft-select/ft-select.vue'
-
-import store from '../../store/index'
-
-import { colors } from '../../helpers/colors'
-import { sanitizeForHtmlId } from '../../helpers/accessibility'
-import { useColorTranslations } from '../../composables/colors'
-
-const props = defineProps({
-  categoryName: {
-    type: String,
-    required: true
-  }
-})
-
-const { t } = useI18n()
-
-const SKIP_VALUES = [
-  'autoSkip',
-  // 'promptToSkip',
-  'showInSeekBar',
-  'doNothing'
-]
-
-const skipNames = computed(() => [
-  t('Settings.SponsorBlock Settings.Skip Options.Auto Skip'),
-  // t('Settings.SponsorBlock Settings.Skip Options.Prompt To Skip'),
-  t('Settings.SponsorBlock Settings.Skip Options.Show In Seek Bar'),
-  t('Settings.SponsorBlock Settings.Skip Options.Do Nothing')
-])
-
-const COLOR_VALUES = colors.map(color => color.name)
-const colorNames = useColorTranslations()
-
-// TODO: Replace with `useId()` in Vue 3
-const sanitizedId = sanitizeForHtmlId(props.categoryName)
-
-/** @type {import('vue').ComputedRef<{ color: string, skip: string }>} */
-const sponsorBlockValues = computed(() => {
-  switch (props.categoryName) {
-    case 'sponsor':
-      return store.getters.getSponsorBlockSponsor
-    case 'self-promotion':
-      return store.getters.getSponsorBlockSelfPromo
-    case 'interaction':
-      return store.getters.getSponsorBlockInteraction
-    case 'intro':
-      return store.getters.getSponsorBlockIntro
-    case 'outro':
-      return store.getters.getSponsorBlockOutro
-    case 'recap':
-      return store.getters.getSponsorBlockRecap
-    case 'music offtopic':
-      return store.getters.getSponsorBlockMusicOffTopic
-    case 'filler':
-      return store.getters.getSponsorBlockFiller
-    default:
-      return ''
-  }
-})
-
-const translatedCategoryName = computed(() => {
-  switch (props.categoryName) {
-    case 'sponsor':
-      return t('Video.Sponsor Block category.sponsor')
-    case 'self-promotion':
-      return t('Video.Sponsor Block category.self-promotion')
-    case 'interaction':
-      return t('Video.Sponsor Block category.interaction')
-    case 'intro':
-      return t('Video.Sponsor Block category.intro')
-    case 'outro':
-      return t('Video.Sponsor Block category.outro')
-    case 'recap':
-      return t('Video.Sponsor Block category.recap')
-    case 'music offtopic':
-      return t('Video.Sponsor Block category.music offtopic')
-    case 'filler':
-      return t('Video.Sponsor Block category.filler')
-    default:
-      return ''
-  }
-})
-
-/**
- * @param {string} color
- */
-function updateColor(color) {
-  updateSponsorCategory({
-    color,
-    skip: sponsorBlockValues.value.skip
-  })
-}
-
-/**
- * @param {string} skipOption
- */
-function updateSkipOption(skipOption) {
-  updateSponsorCategory({
-    color: sponsorBlockValues.value.color,
-    skip: skipOption
-  })
-}
-
-/**
- * @param {{ color: string, skip: string }} payload
- */
-function updateSponsorCategory(payload) {
-  switch (props.categoryName) {
-    case 'sponsor':
-      store.dispatch('updateSponsorBlockSponsor', payload)
-      break
-    case 'self-promotion':
-      store.dispatch('updateSponsorBlockSelfPromo', payload)
-      break
-    case 'interaction':
-      store.dispatch('updateSponsorBlockInteraction', payload)
-      break
-    case 'intro':
-      store.dispatch('updateSponsorBlockIntro', payload)
-      break
-    case 'outro':
-      store.dispatch('updateSponsorBlockOutro', payload)
-      break
-    case 'recap':
-      store.dispatch('updateSponsorBlockRecap', payload)
-      break
-    case 'music offtopic':
-      store.dispatch('updateSponsorBlockMusicOffTopic', payload)
-      break
-    case 'filler':
-      store.dispatch('updateSponsorBlockFiller', payload)
-      break
-  }
-}
-</script>
-
-<style scoped src="./FtSponsorBlockCategory.css" />
diff --git a/src/renderer/components/FtTimestampCatcher.vue b/src/renderer/components/FtTimestampCatcher.vue
deleted file mode 100644
index 84bbf96e71eb1..0000000000000
--- a/src/renderer/components/FtTimestampCatcher.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-  <p
-    @timestamp-clicked="catchTimestampClick"
-    v-html="displayText"
-  />
-</template>
-
-<script setup>
-import { useRouter } from 'vue-router/composables'
-
-const props = defineProps({
-  inputHtml: {
-    type: String,
-    default: ''
-  }
-})
-
-const router = useRouter()
-const videoId = router.currentRoute.params.id
-
-/** @type {string} */
-const displayText = props.inputHtml.replaceAll(/(?:(\d+):)?(\d+):(\d+)/g, (timestamp, hours, minutes, seconds) => {
-  let time = 60 * Number(minutes) + Number(seconds)
-
-  if (hours) {
-    time += 3600 * Number(hours)
-  }
-
-  const url = router.resolve({
-    path: `/watch/${videoId}`,
-    query: {
-      timestamp: time
-    }
-  }).href
-
-  // Adding the URL lets the user open the video in a new window at this timestamp
-  return `<a href="${url}" onclick="event.preventDefault();this.dispatchEvent(new CustomEvent('timestamp-clicked',{bubbles:true,detail:${time}}));window.scrollTo(0,0)">${timestamp}</a>`
-})
-
-const emit = defineEmits(['timestamp-event'])
-
-/**
- * @param {CustomEvent} event
- */
-function catchTimestampClick(event) {
-  emit('timestamp-event', event.detail)
-}
-</script>
diff --git a/src/renderer/components/ParentalControlSettings.vue b/src/renderer/components/ParentalControlSettings.vue
deleted file mode 100644
index 433b3e4927d08..0000000000000
--- a/src/renderer/components/ParentalControlSettings.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <FtSettingsSection
-    :title="$t('Settings.Parental Control Settings.Parental Control Settings')"
-  >
-    <div class="switchColumnGrid">
-      <div class="switchColumn">
-        <FtToggleSwitch
-          :label="$t('Settings.Parental Control Settings.Hide Unsubscribe Button')"
-          compact
-          :default-value="hideUnsubscribeButton"
-          @change="updateHideUnsubscribeButton"
-        />
-        <FtToggleSwitch
-          :label="$t('Settings.Parental Control Settings.Show Family Friendly Only')"
-          compact
-          :default-value="showFamilyFriendlyOnly"
-          @change="updateShowFamilyFriendlyOnly"
-        />
-      </div>
-      <div class="switchColumn">
-        <FtToggleSwitch
-          :label="$t('Settings.Parental Control Settings.Hide Search Bar')"
-          compact
-          :default-value="hideSearchBar"
-          @change="updateHideSearchBar"
-        />
-      </div>
-    </div>
-  </FtSettingsSection>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-
-import FtSettingsSection from './FtSettingsSection/FtSettingsSection.vue'
-import FtToggleSwitch from './ft-toggle-switch/ft-toggle-switch.vue'
-
-import store from '../store/index'
-
-const hideSearchBar = computed(() => {
-  return store.getters.getHideSearchBar
-})
-
-const hideUnsubscribeButton = computed(() => {
-  return store.getters.getHideUnsubscribeButton
-})
-
-const showFamilyFriendlyOnly = computed(() => {
-  return store.getters.getShowFamilyFriendlyOnly
-})
-
-/**
- * @param {boolean} value
- */
-function updateHideSearchBar(value) {
-  store.dispatch('updateHideSearchBar', value)
-}
-
-/**
- * @param {boolean} value
- */
-function updateHideUnsubscribeButton(value) {
-  store.dispatch('updateHideUnsubscribeButton', value)
-}
-
-/**
- * @param {boolean} value
- */
-function updateShowFamilyFriendlyOnly(value) {
-  store.dispatch('updateShowFamilyFriendlyOnly', value)
-}
-</script>
diff --git a/src/renderer/components/PasswordDialog/PasswordDialog.vue b/src/renderer/components/PasswordDialog/PasswordDialog.vue
deleted file mode 100644
index c7e7fcbbf9093..0000000000000
--- a/src/renderer/components/PasswordDialog/PasswordDialog.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <FtCard
-    class="card"
-  >
-    <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
-
-    <FtInput
-      ref="password"
-      :placeholder="$t('Settings.Password Dialog.Password')"
-      :show-action-button="false"
-      input-type="password"
-      class="passwordInput"
-      @input="handlePasswordInput"
-    />
-  </FtCard>
-</template>
-
-<script setup>
-import { computed, onMounted, ref } from 'vue'
-
-import FtCard from '../ft-card/ft-card.vue'
-import FtInput from '../ft-input/ft-input.vue'
-
-import store from '../../store/index'
-
-const emit = defineEmits(['unlocked'])
-
-const password = ref(null)
-
-onMounted(() => {
-  password.value.focus()
-})
-
-const settingsPassword = computed(() => {
-  return store.getters.getSettingsPassword
-})
-
-function handlePasswordInput(input) {
-  if (input === settingsPassword.value) {
-    emit('unlocked')
-  }
-}
-</script>
-
-<style scoped src="./PasswordDialog.css" />
diff --git a/src/renderer/components/PasswordSettings/PasswordSettings.vue b/src/renderer/components/PasswordSettings/PasswordSettings.vue
deleted file mode 100644
index a385c25b64919..0000000000000
--- a/src/renderer/components/PasswordSettings/PasswordSettings.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <FtSettingsSection
-    :title="$t('Settings.Password Settings.Password Settings')"
-  >
-    <FtFlexBox
-      v-if="hasStoredPassword"
-      class="settingsFlexStart460px"
-    >
-      <FtButton
-        :label="$t('Settings.Password Settings.Remove Password')"
-        @click="handleRemovePassword"
-      />
-    </FtFlexBox>
-    <FtFlexBox
-      v-else
-      class="settingsFlexStart460px"
-    >
-      <FtInput
-        :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
-        :show-action-button="false"
-        show-label
-        input-type="password"
-        :value="password"
-        @input="e => password = e"
-        @keydown.enter.native="handleSetPassword"
-      />
-      <FtButton
-        class="centerButton"
-        :label="$t('Settings.Password Settings.Set Password')"
-        @click="handleSetPassword"
-      />
-    </FtFlexBox>
-  </FtSettingsSection>
-</template>
-
-<script setup>
-import { computed, ref } from 'vue'
-
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
-import FtInput from '../ft-input/ft-input.vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtButton from '../ft-button/ft-button.vue'
-
-import store from '../../store/index'
-
-const settingsPassword = computed(() => {
-  return store.getters.getSettingsPassword
-})
-
-const hasStoredPassword = computed(() => {
-  return settingsPassword.value !== ''
-})
-
-const password = ref('')
-
-function handleSetPassword() {
-  store.dispatch('updateSettingsPassword', password.value)
-  password.value = ''
-}
-
-function handleRemovePassword() {
-  store.dispatch('updateSettingsPassword', '')
-  password.value = ''
-}
-</script>
-
-<style scoped src="./PasswordSettings.css" />
diff --git a/src/renderer/components/ThemeSettings.vue b/src/renderer/components/ThemeSettings.vue
deleted file mode 100644
index 9815a2b0a4f23..0000000000000
--- a/src/renderer/components/ThemeSettings.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-  <FtSettingsSection
-    :title="$t('Settings.Theme Settings.Theme Settings')"
-  >
-    <div class="switchColumnGrid">
-      <div class="switchColumn">
-        <FtToggleSwitch
-          :label="$t('Settings.Theme Settings.Match Top Bar with Main Color')"
-          compact
-          :default-value="barColor"
-          @change="updateBarColor"
-        />
-        <FtToggleSwitch
-          :label="$t('Settings.Theme Settings.Expand Side Bar by Default')"
-          compact
-          :default-value="expandSideBar"
-          @change="handleExpandSideBar"
-        />
-        <FtToggleSwitch
-          v-if="usingElectron"
-          :label="$t('Settings.Theme Settings.Disable Smooth Scrolling')"
-          compact
-          :default-value="disableSmoothScrollingToggleValue"
-          @change="handleRestartPrompt"
-        />
-      </div>
-      <div class="switchColumn">
-        <FtToggleSwitch
-          :label="$t('Settings.Theme Settings.Hide Side Bar Labels')"
-          compact
-          :default-value="hideLabelsSideBar"
-          @change="updateHideLabelsSideBar"
-        />
-        <FtToggleSwitch
-          :label="$t('Settings.Theme Settings.Hide FreeTube Header Logo')"
-          compact
-          :default-value="hideHeaderLogo"
-          @change="updateHideHeaderLogo"
-        />
-      </div>
-    </div>
-    <FtFlexBox>
-      <FtSlider
-        :label="$t('Settings.Theme Settings.UI Scale')"
-        :default-value="uiScale"
-        :min-value="50"
-        :max-value="300"
-        :step="5"
-        value-extension="%"
-        @change="updateUiScale(parseInt($event))"
-      />
-    </FtFlexBox>
-    <br>
-    <FtFlexBox>
-      <FtSelect
-        :placeholder="$t('Settings.Theme Settings.Base Theme.Base Theme')"
-        :value="baseTheme"
-        :select-names="baseThemeNames"
-        :select-values="BASE_THEME_VALUES"
-        :icon="['fas', 'palette']"
-        @change="updateBaseTheme"
-      />
-      <FtSelect
-        :placeholder="$t('Settings.Theme Settings.Main Color Theme.Main Color Theme')"
-        :value="mainColor"
-        :select-names="colorNames"
-        :select-values="COLOR_VALUES"
-        :disabled="!areColorThemesEnabled"
-        :icon="['fas', 'palette']"
-        icon-color="var(--primary-color)"
-        @change="updateMainColor"
-      />
-      <FtSelect
-        :placeholder="$t('Settings.Theme Settings.Secondary Color Theme')"
-        :value="secColor"
-        :select-names="colorNames"
-        :select-values="COLOR_VALUES"
-        :disabled="!areColorThemesEnabled"
-        :icon="['fas', 'palette']"
-        icon-color="var(--accent-color)"
-        @change="updateSecColor"
-      />
-    </FtFlexBox>
-    <FtPrompt
-      v-if="showRestartPrompt"
-      :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
-      :option-names="restartPromptNames"
-      :option-values="RESTART_PROMPT_VALUES"
-      @click="handleSmoothScrolling"
-    />
-  </FtSettingsSection>
-</template>
-
-<script setup>
-import { computed, ref } from 'vue'
-import { useI18n } from '../composables/use-i18n-polyfill'
-
-import FtSettingsSection from './FtSettingsSection/FtSettingsSection.vue'
-import FtSelect from './ft-select/ft-select.vue'
-import FtToggleSwitch from './ft-toggle-switch/ft-toggle-switch.vue'
-import FtSlider from './ft-slider/ft-slider.vue'
-import FtFlexBox from './ft-flex-box/ft-flex-box.vue'
-import FtPrompt from './ft-prompt/ft-prompt.vue'
-
-import store from '../store/index'
-
-import { colors } from '../helpers/colors'
-import { IpcChannels } from '../../constants'
-import { useColorTranslations } from '../composables/colors'
-
-const { t } = useI18n()
-
-// Themes are devided into 3 groups.
-// The first group contains the default themes.
-// The second group are themes that don't have specific primary and secondary colors.
-// The third group are themes that do have specific primary and secondary colors available.
-
-const BASE_THEME_VALUES = [
-  // First group
-  'system',
-  'light',
-  'dark',
-  'black',
-  // Second group
-  'nordic',
-  'hotPink',
-  'pastelPink',
-  // Third group
-  'catppuccinMocha',
-  'dracula',
-  'gruvboxDark',
-  'gruvboxLight',
-  'solarizedDark',
-  'solarizedLight'
-]
-
-const baseThemeNames = computed(() => [
-  // First group
-  t('Settings.Theme Settings.Base Theme.System Default'),
-  t('Settings.Theme Settings.Base Theme.Light'),
-  t('Settings.Theme Settings.Base Theme.Dark'),
-  t('Settings.Theme Settings.Base Theme.Black'),
-  // Second group
-  t('Settings.Theme Settings.Base Theme.Nordic'),
-  t('Settings.Theme Settings.Base Theme.Hot Pink'),
-  t('Settings.Theme Settings.Base Theme.Pastel Pink'),
-  // Third group
-  t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'),
-  t('Settings.Theme Settings.Base Theme.Dracula'),
-  t('Settings.Theme Settings.Base Theme.Gruvbox Dark'),
-  t('Settings.Theme Settings.Base Theme.Gruvbox Light'),
-  t('Settings.Theme Settings.Base Theme.Solarized Dark'),
-  t('Settings.Theme Settings.Base Theme.Solarized Light')
-])
-
-const COLOR_VALUES = colors.map(color => color.name)
-const colorNames = useColorTranslations()
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const barColor = computed(() => {
-  return store.getters.getBarColor
-})
-
-/**
- * @param {boolean} value
- */
-function updateBarColor(value) {
-  store.dispatch('updateBarColor', value)
-}
-
-/** @type {import('vue').ComputedRef<string>} */
-const baseTheme = computed(() => {
-  return store.getters.getBaseTheme
-})
-
-/**
- * @param {string} value
- */
-function updateBaseTheme(value) {
-  store.dispatch('updateBaseTheme', value)
-}
-
-const areColorThemesEnabled = computed(() => baseTheme.value !== 'hotPink')
-
-/** @type {import('vue').ComputedRef<string>} */
-const mainColor = computed(() => {
-  return store.getters.getMainColor
-})
-
-/**
- * @param {string} value
- */
-function updateMainColor(value) {
-  store.dispatch('updateMainColor', value)
-}
-
-/** @type {import('vue').ComputedRef<string>} */
-const secColor = computed(() => {
-  return store.getters.getSecColor
-})
-
-/**
- * @param {string} value
- */
-function updateSecColor(value) {
-  store.dispatch('updateSecColor', value)
-}
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const expandSideBar = computed(() => {
-  return store.getters.getexpandSideBar
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const isSideNavOpen = computed(() => {
-  return store.getters.getIsSideNavOpen
-})
-
-/**
- * @param {boolean} value
- */
-function handleExpandSideBar(value) {
-  if (isSideNavOpen.value !== value) {
-    store.commit('toggleSideNav')
-  }
-
-  store.dispatch('updateExpandSideBar', value)
-}
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideLabelsSideBar = computed(() => {
-  return store.getters.getHideLabelsSideBar
-})
-
-/**
- * @param {boolean} value
- */
-function updateHideLabelsSideBar(value) {
-  store.dispatch('updateHideLabelsSideBar', value)
-}
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideHeaderLogo = computed(() => {
-  return store.getters.getHideHeaderLogo
-})
-
-/**
- * @param {boolean} value
- */
-function updateHideHeaderLogo(value) {
-  store.dispatch('updateHideHeaderLogo', value)
-}
-
-/** @type {import('vue').ComputedRef<number>} */
-const uiScale = computed(() => store.getters.getUiScale)
-
-/**
- * @param {number} value
- */
-function updateUiScale(value) {
-  store.dispatch('updateUiScale', value)
-}
-
-/** @type {boolean} */
-const usingElectron = process.env.IS_ELECTRON
-
-const RESTART_PROMPT_VALUES = [
-  'restart',
-  'cancel'
-]
-
-const restartPromptNames = computed(() => [
-  t('Yes, Restart'),
-  t('Cancel')
-])
-
-/** @type {import('vue').Ref<boolean>} */
-const disableSmoothScrollingToggleValue = ref(store.getters.getDisableSmoothScrolling)
-const showRestartPrompt = ref(false)
-
-/**
- * @param {boolean} value
- */
-function handleRestartPrompt(value) {
-  disableSmoothScrollingToggleValue.value = value
-  showRestartPrompt.value = true
-}
-
-/**
- * @param {'restart' | 'cancel' | null} value
- */
-function handleSmoothScrolling(value) {
-  showRestartPrompt.value = false
-
-  if (value === null || value === 'cancel') {
-    disableSmoothScrollingToggleValue.value = !disableSmoothScrollingToggleValue.value
-    return
-  }
-
-  if (process.env.IS_ELECTRON) {
-    store.dispatch('updateDisableSmoothScrolling',
-      disableSmoothScrollingToggleValue.value
-    ).then(() => {
-      const { ipcRenderer } = require('electron')
-      ipcRenderer.send(IpcChannels.RELAUNCH_REQUEST)
-    })
-  }
-}
-</script>
diff --git a/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue b/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue
index 9e3ad355cf1ac..ac27a48059e7d 100644
--- a/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue
+++ b/src/renderer/components/WatchVideoChapters/WatchVideoChapters.vue
@@ -12,7 +12,7 @@
       @keydown.space.stop.prevent="toggleShowChapters"
       @keydown.enter.stop.prevent="toggleShowChapters"
     >
-      {{ kind === 'keyMoments' ? $t('Chapters.Key Moments') : $t("Chapters.Chapters") }}
+      {{ $t("Chapters.Chapters") }}
 
       <span class="currentChapter">
         • {{ currentTitle }}
@@ -82,10 +82,6 @@ const props = defineProps({
   currentChapterIndex: {
     type: Number,
     required: true
-  },
-  kind: {
-    type: String,
-    default: 'chapters'
   }
 })
 
@@ -110,12 +106,10 @@ const currentChapter = computed(() => {
   return props.chapters[currentIndex.value]
 })
 
-/** @type {import('vue').ComputedRef<string>} */
 const currentTitle = computed(() => {
   return currentChapter.value.title
 })
 
-/** @type {import('vue').ComputedRef<boolean>} */
 const compact = computed(() => {
   return !props.chapters[0].thumbnail
 })
diff --git a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css
index ae0da75e3b2db..c7b2a437e55d8 100644
--- a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css
+++ b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.css
@@ -1,9 +1,6 @@
 .videoDescription {
-  position: relative;
-  display: flex;
-  flex-direction: column-reverse;
   overflow-y: auto;
-  max-block-size: 20lh;
+  max-block-size: 300px;
 }
 
 .description {
@@ -12,46 +9,3 @@
   white-space: pre-wrap;
   overflow-wrap: anywhere;
 }
-
-.descriptionStatus {
-  margin: 0;
-  text-decoration: underline;
-  cursor: pointer;
-  color: var(--title-color);
-}
-
-.videoDescription.short .descriptionStatus {
-  position: absolute;
-  inset-block-end: calc(1lh + 12px);
-  padding-block: 2px;
-  inset-inline-end: 16px;
-  padding-inline-start: 40px;
-  background: linear-gradient(270deg, var(--card-bg-color) 75%, transparent 100%);
-  text-decoration: none;
-}
-
-.videoDescription:not(.short) .descriptionStatus {
-  position: relative;
-  order: 0;
-  margin-block-start: 1em;
-}
-
-.videoDescription.short .description {
-  max-block-size: 4lh;
-  overflow: hidden;
-}
-
-.videoDescription:not(.short) .description {
-  order: 1;
-}
-
-.videoDescription .overlay {
-  position: absolute;
-  cursor: pointer;
-  inset: 0;
-  transition: background-color 200ms ease;
-}
-
-.videoDescription .overlay:hover {
-  background-color: var(--accent-color-opacity1);
-}
diff --git a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
index a2534db231c5e..37a12ea6eafca 100644
--- a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
+++ b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
@@ -1,40 +1,9 @@
 <template>
   <FtCard
     v-if="shownDescription.length > 0"
-    :class="{ videoDescription: true, short: !showFullDescription }"
+    class="videoDescription"
   >
-    <template v-if="showControls">
-      <span
-        v-if="showFullDescription"
-        class="descriptionStatus"
-        role="button"
-        tabindex="0"
-        @click="collapseDescription"
-        @keydown.space.prevent="collapseDescription"
-        @keydown.enter.prevent="collapseDescription"
-      >
-        {{ $t("Description.Collapse Description") }}
-      </span>
-      <span
-        v-else
-        class="descriptionStatus"
-        role="button"
-        tabindex="0"
-        @keydown.space.prevent="expandDescription"
-        @keydown.enter.prevent="expandDescription"
-      >
-        {{ $t("Description.Expand Description") }}
-      </span>
-      <div
-        v-if="!showFullDescription"
-        class="overlay"
-        @click="expandDescription"
-        @keydown.space.prevent="expandDescription"
-        @keydown.enter.prevent="expandDescription"
-      />
-    </template>
     <FtTimestampCatcher
-      ref="descriptionContainer"
       class="description"
       :input-html="shownDescription"
       @timestamp-event="onTimestamp"
@@ -45,9 +14,8 @@
 <script setup>
 import autolinker from 'autolinker'
 
-import { onMounted, ref } from 'vue'
 import FtCard from '../ft-card/ft-card.vue'
-import FtTimestampCatcher from '../FtTimestampCatcher.vue'
+import FtTimestampCatcher from '../ft-timestamp-catcher/ft-timestamp-catcher.vue'
 
 const props = defineProps({
   description: {
@@ -63,9 +31,6 @@ const props = defineProps({
 const emit = defineEmits(['timestamp-event'])
 
 let shownDescription = ''
-const descriptionContainer = ref()
-const showFullDescription = ref(false)
-const showControls = ref(false)
 
 if (props.descriptionHtml !== '') {
   const parsed = parseDescriptionHtml(props.descriptionHtml)
@@ -93,40 +58,8 @@ function onTimestamp(timestamp) {
   emit('timestamp-event', timestamp)
 }
 
-/**
- * Enables user to view entire contents of description
- */
-function expandDescription() {
-  showFullDescription.value = true
-}
-
-/**
- * Enables user to collapse contents of description
- */
-function collapseDescription() {
-  showFullDescription.value = false
-}
-
-/**
- * Returns true when description content does not overflow description container
- * Useful for hiding description expansion/contraction controls
- */
-function isShortDescription() {
-  const descriptionElem = descriptionContainer.value?.$el
-  return descriptionElem?.clientHeight >= descriptionElem?.scrollHeight
-}
-
-onMounted(() => {
-  // To verify whether or not the description is too short for displaying
-  // description controls, we need to check the description's dimensions.
-  // The only way to make this work is to check on mount.
-  showFullDescription.value = isShortDescription()
-  showControls.value = !showFullDescription.value
-})
-
 /**
  * @param {string} descriptionText
- * @returns {string}
  */
 function parseDescriptionHtml(descriptionText) {
   return descriptionText
diff --git a/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue b/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue
index 44e5ffe3c4e1f..103422236a555 100644
--- a/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue
+++ b/src/renderer/components/WatchVideoRecommendations/WatchVideoRecommendations.vue
@@ -46,7 +46,6 @@ defineProps({
   }
 })
 
-/** @type {import('vue').ComputedRef<boolean>} */
 const playNextVideo = computed(() => {
   return store.getters.getPlayNextVideo
 })
diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index e479793ca255a..7c950732ebb5e 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import { mapActions, mapMutations } from 'vuex'
 import FtButton from '../ft-button/ft-button.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
@@ -12,14 +12,13 @@ import {
   deepCopy,
   escapeHTML,
   getTodayDateStrLocalTimezone,
-  readFileWithPicker,
+  readFileFromDialog,
+  showOpenDialog,
+  showSaveDialog,
   showToast,
-  writeFileWithPicker,
+  writeFileFromDialog,
 } from '../../helpers/utils'
 
-const IMPORT_DIRECTORY_ID = 'data-settings-import'
-const START_IN_DIRECTORY = 'downloads'
-
 export default defineComponent({
   name: 'DataSettings',
   components: {
@@ -82,45 +81,44 @@ export default defineComponent({
     },
 
     importSubscriptions: async function () {
-      let response
-      try {
-        response = await readFileWithPicker(
-          this.$t('Settings.Data Settings.Subscription File'),
+      const options = {
+        properties: ['openFile'],
+        filters: [
           {
-            'application/x-freetube-db': '.db',
-            'text/csv': '.csv',
-            'application/json': '.json',
-            'application/xml': ['.xml', '.opml']
-          },
-          IMPORT_DIRECTORY_ID,
-          START_IN_DIRECTORY
-        )
+            name: this.$t('Settings.Data Settings.Subscription File'),
+            extensions: ['db', 'csv', 'json', 'opml', 'xml']
+          }
+        ]
+      }
+
+      const response = await showOpenDialog(options)
+      if (response.canceled || response.filePaths?.length === 0) {
+        return
+      }
+      let textDecode
+      try {
+        textDecode = await readFileFromDialog(response)
       } catch (err) {
         const message = this.$t('Settings.Data Settings.Unable to read file')
         showToast(`${message}: ${err}`)
         return
       }
-
-      if (response === null) {
-        return
-      }
-
-      const { filename, content } = response
-
-      if (filename.endsWith('.csv')) {
-        this.importCsvYouTubeSubscriptions(content)
-      } else if (filename.endsWith('.db')) {
-        this.importFreeTubeSubscriptions(content)
-      } else if (filename.endsWith('.opml') || filename.endsWith('.xml')) {
-        this.importOpmlYouTubeSubscriptions(content)
-      } else if (filename.endsWith('.json')) {
-        const jsonContent = JSON.parse(content)
-        if (jsonContent.subscriptions) {
-          this.importNewPipeSubscriptions(jsonContent)
-        } else {
-          this.importYouTubeSubscriptions(jsonContent)
+      response.filePaths.forEach(filePath => {
+        if (filePath.endsWith('.csv')) {
+          this.importCsvYouTubeSubscriptions(textDecode)
+        } else if (filePath.endsWith('.db')) {
+          this.importFreeTubeSubscriptions(textDecode)
+        } else if (filePath.endsWith('.opml') || filePath.endsWith('.xml')) {
+          this.importOpmlYouTubeSubscriptions(textDecode)
+        } else if (filePath.endsWith('.json')) {
+          textDecode = JSON.parse(textDecode)
+          if (textDecode.subscriptions) {
+            this.importNewPipeSubscriptions(textDecode)
+          } else {
+            this.importYouTubeSubscriptions(textDecode)
+          }
         }
-      }
+      })
     },
 
     importFreeTubeSubscriptions: function (textDecode) {
@@ -222,7 +220,7 @@ export default defineComponent({
         return [...yt.matchAll(splitCSVRegex)].map(s => {
           let newVal = s[1]
           if (newVal.startsWith('"')) {
-            newVal = newVal.substring(1, newVal.length - 1).replaceAll('""', '"')
+            newVal = newVal.substring(1, newVal.length - 2).replaceAll('""', '"')
           }
           return newVal
         })
@@ -434,20 +432,33 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-subscriptions-' + dateStr + '.db'
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        subscriptionsDb,
-        this.$t('Settings.Data Settings.Subscription File'),
-        'application/x-freetube-db',
-        '.db',
-        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
-      )
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: this.$t('Settings.Data Settings.Subscription File'),
+            extensions: ['db']
+          }
+        ]
+      }
+
+      await this.promptAndWriteToFile(options, subscriptionsDb, this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
     },
 
     exportYouTubeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'youtube-subscriptions-' + dateStr + '.json'
 
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: this.$t('Settings.Data Settings.Subscription File'),
+            extensions: ['json']
+          }
+        ]
+      }
+
       const subscriptionsObject = this.profileList[0].subscriptions.map((channel) => {
         const object = {
           contentDetails: {
@@ -484,20 +495,23 @@ export default defineComponent({
         return object
       })
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        JSON.stringify(subscriptionsObject),
-        this.$t('Settings.Data Settings.Subscription File'),
-        'application/json',
-        '.json',
-        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
-      )
+      await this.promptAndWriteToFile(options, JSON.stringify(subscriptionsObject), this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
     },
 
     exportOpmlYouTubeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'youtube-subscriptions-' + dateStr + '.opml'
 
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: this.$t('Settings.Data Settings.Subscription File'),
+            extensions: ['opml']
+          }
+        ]
+      }
+
       let opmlData = '<opml version="1.1"><body><outline text="YouTube Subscriptions" title="YouTube Subscriptions">'
 
       this.profileList[0].subscriptions.forEach((channel) => {
@@ -509,20 +523,22 @@ export default defineComponent({
 
       opmlData += '</outline></body></opml>'
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        opmlData,
-        this.$t('Settings.Data Settings.Subscription File'),
-        'application/xml',
-        '.opml',
-        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
-      )
+      await this.promptAndWriteToFile(options, opmlData, this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
     },
 
     exportCsvYouTubeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'youtube-subscriptions-' + dateStr + '.csv'
 
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: this.$t('Settings.Data Settings.Subscription File'),
+            extensions: ['csv']
+          }
+        ]
+      }
       let exportText = 'Channel ID,Channel URL,Channel title\n'
       this.profileList[0].subscriptions.forEach((channel) => {
         const channelUrl = `https://www.youtube.com/channel/${channel.id}`
@@ -533,20 +549,23 @@ export default defineComponent({
       })
       exportText += '\n'
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        exportText,
-        this.$t('Settings.Data Settings.Subscription File'),
-        'text/csv',
-        '.csv',
-        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
-      )
+      await this.promptAndWriteToFile(options, exportText, this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
     },
 
     exportNewPipeSubscriptions: async function () {
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'newpipe-subscriptions-' + dateStr + '.json'
 
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: this.$t('Settings.Data Settings.Subscription File'),
+            extensions: ['json']
+          }
+        ]
+      }
+
       const newPipeObject = {
         app_version: '0.19.8',
         app_version_int: 953,
@@ -564,45 +583,40 @@ export default defineComponent({
         newPipeObject.subscriptions.push(subscription)
       })
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        JSON.stringify(newPipeObject),
-        this.$t('Settings.Data Settings.Subscription File'),
-        'application/json',
-        '.json',
-        this.$t('Settings.Data Settings.Subscriptions have been successfully exported')
-      )
+      await this.promptAndWriteToFile(options, JSON.stringify(newPipeObject), this.$t('Settings.Data Settings.Subscriptions have been successfully exported'))
     },
 
     importHistory: async function () {
-      let response
-      try {
-        response = await readFileWithPicker(
-          this.$t('Settings.Data Settings.History File'),
+      const options = {
+        properties: ['openFile'],
+        filters: [
           {
-            'application/x-freetube-db': '.db',
-            'application/json': '.json'
-          },
-          IMPORT_DIRECTORY_ID,
-          START_IN_DIRECTORY
-        )
+            name: this.$t('Settings.Data Settings.History File'),
+            extensions: ['db', 'json']
+          }
+        ]
+      }
+
+      const response = await showOpenDialog(options)
+      if (response.canceled || response.filePaths?.length === 0) {
+        return
+      }
+      let textDecode
+      try {
+        textDecode = await readFileFromDialog(response)
       } catch (err) {
         const message = this.$t('Settings.Data Settings.Unable to read file')
         showToast(`${message}: ${err}`)
         return
       }
 
-      if (response === null) {
-        return
-      }
-
-      const { filename, content } = response
-
-      if (filename.endsWith('.db')) {
-        this.importFreeTubeHistory(content.split('\n'))
-      } else if (filename.endsWith('.json')) {
-        this.importYouTubeHistory(JSON.parse(content))
-      }
+      response.filePaths.forEach(filePath => {
+        if (filePath.endsWith('.db')) {
+          this.importFreeTubeHistory(textDecode.split('\n'))
+        } else if (filePath.endsWith('.json')) {
+          this.importYouTubeHistory(JSON.parse(textDecode))
+        }
+      })
     },
 
     async importFreeTubeHistory(textDecode) {
@@ -763,39 +777,42 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-history-' + dateStr + '.db'
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        historyDb,
-        this.$t('Settings.Data Settings.History File'),
-        'application/x-freetube-db',
-        '.db',
-        this.$t('Settings.Data Settings.All watched history has been successfully exported')
-      )
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: this.$t('Settings.Data Settings.Playlist File'),
+            extensions: ['db']
+          }
+        ]
+      }
+
+      await this.promptAndWriteToFile(options, historyDb, this.$t('Settings.Data Settings.All watched history has been successfully exported'))
     },
 
     importPlaylists: async function () {
-      let response
-      try {
-        response = await readFileWithPicker(
-          this.$t('Settings.Data Settings.Playlist File'),
+      const options = {
+        properties: ['openFile'],
+        filters: [
           {
-            'application/x-freetube-db': '.db'
-          },
-          IMPORT_DIRECTORY_ID,
-          START_IN_DIRECTORY
-        )
+            name: this.$t('Settings.Data Settings.Playlist File'),
+            extensions: ['db']
+          }
+        ]
+      }
+
+      const response = await showOpenDialog(options)
+      if (response.canceled || response.filePaths?.length === 0) {
+        return
+      }
+      let data
+      try {
+        data = await readFileFromDialog(response)
       } catch (err) {
         const message = this.$t('Settings.Data Settings.Unable to read file')
         showToast(`${message}: ${err}`)
         return
       }
-
-      if (response === null) {
-        return
-      }
-
-      let data = response.content
-
       let playlists = null
 
       // for the sake of backwards compatibility,
@@ -820,12 +837,12 @@ export default defineComponent({
       ]
 
       const optionalKeys = [
-        '_id',
         'description',
         'createdAt',
       ]
 
       const ignoredKeys = [
+        '_id',
         'title',
         'type',
         'protected',
@@ -858,7 +875,6 @@ export default defineComponent({
         // to the app, so we'll only grab the data we need here.
 
         const playlistObject = {}
-        const videoIdToBeAddedSet = new Set()
 
         Object.keys(playlistData).forEach((key) => {
           if ([requiredKeys, optionalKeys, ignoredKeys].every((ks) => !ks.includes(key))) {
@@ -872,7 +888,6 @@ export default defineComponent({
 
               if (videoObjectHasAllRequiredKeys) {
                 videoArray.push(video)
-                videoIdToBeAddedSet.add(video.videoId)
               }
             })
 
@@ -886,71 +901,48 @@ export default defineComponent({
         const playlistObjectKeys = Object.keys(playlistObject)
         const playlistObjectHasAllRequiredKeys = requiredKeys.every((k) => playlistObjectKeys.includes(k))
 
-        if (!playlistObjectHasAllRequiredKeys) {
-          const message = this.$t('Settings.Data Settings.Playlist insufficient data', { playlist: playlistData.playlistName })
-          showToast(message)
-          return
-        }
-
-        const existingPlaylist = this.allPlaylists.find((playlist) => {
-          if (playlistObject._id != null && playlist._id === playlistObject._id) {
-            return true
-          }
+        if (playlistObjectHasAllRequiredKeys) {
+          const existingPlaylist = this.allPlaylists.find((playlist) => {
+            return playlist.playlistName === playlistObject.playlistName
+          })
 
-          return playlist.playlistName === playlistObject.playlistName
-        })
+          if (existingPlaylist !== undefined) {
+            playlistObject.videos.forEach((video) => {
+              let videoExists = false
+              if (video.playlistItemId != null) {
+                // Find by `playlistItemId` if present
+                videoExists = existingPlaylist.videos.some((x) => {
+                  // Allow duplicate (by videoId) videos to be added
+                  return x.videoId === video.videoId && x.playlistItemId === video.playlistItemId
+                })
+              } else {
+                // Older playlist exports have no `playlistItemId` but have `timeAdded`
+                // Which might be duplicate for copied playlists with duplicate `videoId`
+                videoExists = existingPlaylist.videos.some((x) => {
+                  // Allow duplicate (by videoId) videos to be added
+                  return x.videoId === video.videoId && x.timeAdded === video.timeAdded
+                })
+              }
 
-        if (existingPlaylist === undefined) {
-          this.addPlaylist(playlistObject)
-          return
-        }
+              if (!videoExists) {
+                // Keep original `timeAdded` value
+                const payload = {
+                  _id: existingPlaylist._id,
+                  videoData: video,
+                }
 
-        const duplicateVideoPresentInToBeAdded = playlistObject.videos.length > videoIdToBeAddedSet.size
-        const existingVideoIdSet = existingPlaylist.videos.reduce((video) => videoIdToBeAddedSet.add(video.videoId), new Set())
-        const duplicateVideoPresentInExistingPlaylist = existingPlaylist.videos.length > existingVideoIdSet.size
-        const shouldAddDuplicateVideos = duplicateVideoPresentInToBeAdded || duplicateVideoPresentInExistingPlaylist
-
-        playlistObject.videos.forEach((video) => {
-          let videoExists = false
-          if (shouldAddDuplicateVideos) {
-            if (video.playlistItemId != null) {
-              // Find by `playlistItemId` if present
-              videoExists = existingPlaylist.videos.some((x) => {
-                // Allow duplicate (by videoId) videos to be added
-                return x.videoId === video.videoId && x.playlistItemId === video.playlistItemId
-              })
-            } else {
-              // Older playlist exports have no `playlistItemId` but have `timeAdded`
-              // Which might be duplicate for copied playlists with duplicate `videoId`
-              videoExists = existingPlaylist.videos.some((x) => {
-                // Allow duplicate (by videoId) videos to be added
-                return x.videoId === video.videoId && x.timeAdded === video.timeAdded
-              })
-            }
-          } else {
-            videoExists = existingPlaylist.videos.some((x) => {
-              // Disallow duplicate (by videoId) videos to be added
-              return x.videoId === video.videoId
+                this.addVideo(payload)
+              }
             })
+            // Update playlist's `lastUpdatedAt`
+            this.updatePlaylist({ _id: existingPlaylist._id })
+          } else {
+            this.addPlaylist(playlistObject)
           }
-
-          if (!videoExists) {
-            // Keep original `timeAdded` value
-            const payload = {
-              _id: existingPlaylist._id,
-              videoData: video,
-            }
-
-            this.addVideo(payload)
-          }
-        })
-        // Update playlist's `lastUpdatedAt` & other attributes
-        this.updatePlaylist({
-          _id: existingPlaylist._id,
-          // Only these attributes would be updated (besides videos)
-          playlistName: playlistObject.playlistName,
-          description: playlistObject.description,
-        })
+        } else {
+          const message = this.$t('Settings.Data Settings.Playlist insufficient data', { playlist: playlistData.playlistName })
+          showToast(message)
+        }
       })
 
       showToast(this.$t('Settings.Data Settings.All playlists has been successfully imported'))
@@ -960,18 +952,21 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-playlists-' + dateStr + '.db'
 
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: 'Database File',
+            extensions: ['db']
+          }
+        ]
+      }
+
       const playlistsDb = this.allPlaylists.map(playlist => {
         return JSON.stringify(playlist)
       }).join('\n') + '\n'// a trailing line is expected
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        playlistsDb,
-        this.$t('Settings.Data Settings.Playlist File'),
-        'application/x-freetube-db',
-        '.db',
-        this.$t('Settings.Data Settings.All playlists has been successfully exported')
-      )
+      await this.promptAndWriteToFile(options, playlistsDb, this.$t('Settings.Data Settings.All playlists has been successfully exported'))
     },
 
     exportPlaylistsForOlderVersionsSometimes: function () {
@@ -986,6 +981,16 @@ export default defineComponent({
       const dateStr = getTodayDateStrLocalTimezone()
       const exportFileName = 'freetube-playlists-as-single-favorites-playlist-' + dateStr + '.db'
 
+      const options = {
+        defaultPath: exportFileName,
+        filters: [
+          {
+            name: 'Database File',
+            extensions: ['db']
+          }
+        ]
+      }
+
       const favoritesPlaylistData = {
         playlistName: 'Favorites',
         protected: true,
@@ -1010,14 +1015,7 @@ export default defineComponent({
         })
       })
 
-      await this.promptAndWriteToFile(
-        exportFileName,
-        JSON.stringify([favoritesPlaylistData]),
-        this.$t('Settings.Data Settings.Playlist File'),
-        'application/x-freetube-db',
-        '.db',
-        this.$t('Settings.Data Settings.All playlists has been successfully exported')
-      )
+      await this.promptAndWriteToFile(options, JSON.stringify([favoritesPlaylistData]), this.$t('Settings.Data Settings.All playlists has been successfully exported'))
     },
 
     convertOldFreeTubeFormatToNew(oldData) {
@@ -1051,32 +1049,22 @@ export default defineComponent({
       return convertedData
     },
 
-    promptAndWriteToFile: async function (
-      fileName,
-      content,
-      fileTypeDescription,
-      mimeType,
-      fileExtension,
-      successMessage
-    ) {
+    promptAndWriteToFile: async function (saveOptions, content, successMessage) {
+      const response = await showSaveDialog(saveOptions)
+      if (response.canceled || response.filePath === '') {
+        // User canceled the save dialog
+        return
+      }
+
       try {
-        const response = await writeFileWithPicker(
-          fileName,
-          content,
-          fileTypeDescription,
-          mimeType,
-          fileExtension,
-          'data-settings-export',
-          START_IN_DIRECTORY
-        )
-
-        if (response) {
-          showToast(successMessage)
-        }
-      } catch (error) {
+        await writeFileFromDialog(response, content)
+      } catch (writeErr) {
         const message = this.$t('Settings.Data Settings.Unable to write file')
-        showToast(`${message}: ${error}`)
+        showToast(`${message}: ${writeErr}`)
+        return
       }
+
+      showToast(successMessage)
     },
 
     isChannelSubscribed(channelId, subscriptions) {
diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index c0e8ca8a03c5b..cdb0f4f0159b6 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/src/renderer/components/distraction-settings/distraction-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtInputTags from '../../components/ft-input-tags/ft-input-tags.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
@@ -96,9 +96,6 @@ export default defineComponent({
     hideChannelCommunity: function () {
       return this.$store.getters.getHideChannelCommunity
     },
-    hideChannelHome: function () {
-      return this.$store.getters.getHideChannelHome
-    },
     hideSubscriptionsVideos: function () {
       return this.$store.getters.getHideSubscriptionsVideos
     },
@@ -114,12 +111,6 @@ export default defineComponent({
     showDistractionFreeTitles: function () {
       return this.$store.getters.getShowDistractionFreeTitles
     },
-    showAddedChannelsHidden: function () {
-      return this.$store.getters.getShowAddedChannelsHidden
-    },
-    showAddedForbiddenTitles: function () {
-      return this.$store.getters.getShowAddedForbiddenTitles
-    },
     channelsHidden: function () {
       return JSON.parse(this.$store.getters.getChannelsHidden).map((ch) => {
         // Legacy support
@@ -166,12 +157,6 @@ export default defineComponent({
     handleChannelsExists: function () {
       showToast(this.$t('Settings.Distraction Free Settings.Hide Channels Already Exists'))
     },
-    handleAddedChannelsHidden: function () {
-      this.updateShowAddedChannelsHidden(!this.showAddedChannelsHidden)
-    },
-    handleAddedForbiddenTitles: function () {
-      this.updateShowAddedForbiddenTitles(!this.showAddedForbiddenTitles)
-    },
     validateChannelId: function (text) {
       return checkYoutubeChannelId(text)
     },
@@ -233,15 +218,12 @@ export default defineComponent({
       'updateHideChannelShorts',
       'updateHideChannelPlaylists',
       'updateHideChannelCommunity',
-      'updateHideChannelHome',
       'updateHideChannelPodcasts',
       'updateHideChannelReleases',
       'updateHideSubscriptionsVideos',
       'updateHideSubscriptionsShorts',
       'updateHideSubscriptionsLive',
       'updateHideSubscriptionsCommunity',
-      'updateShowAddedChannelsHidden',
-      'updateShowAddedForbiddenTitles',
     ])
   }
 })
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 84321ed152e5e..40fc7a6e7e494 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -81,12 +81,6 @@
     </h4>
     <div class="switchColumnGrid">
       <div class="switchColumn">
-        <ft-toggle-switch
-          :label="$t('Settings.Distraction Free Settings.Hide Channel Home')"
-          :compact="true"
-          :default-value="hideChannelHome"
-          @change="updateHideChannelHome"
-        />
         <ft-toggle-switch
           :label="$t('Settings.Distraction Free Settings.Hide Channel Shorts')"
           :compact="true"
@@ -246,12 +240,10 @@
         :validate-tag-name="validateChannelId"
         :find-tag-info="findChannelTagInfo"
         :are-channel-tags="true"
-        :show-tags="showAddedChannelsHidden"
         @invalid-name="handleInvalidChannel"
         @error-find-tag-info="handleChannelAPIError"
         @change="handleChannelsHidden"
         @already-exists="handleChannelsExists"
-        @toggle-show-tags="handleAddedChannelsHidden"
       />
     </ft-flex-box>
     <ft-flex-box>
@@ -259,12 +251,10 @@
         :label="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
         :tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text Placeholder')"
         :show-action-button="true"
-        :show-tags="showAddedForbiddenTitles"
         :tag-list="forbiddenTitles"
         :min-input-length="3"
         :tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
         @change="handleForbiddenTitles"
-        @toggle-show-tags="handleAddedForbiddenTitles"
       />
     </ft-flex-box>
   </ft-settings-section>
diff --git a/src/renderer/components/download-settings/download-settings.js b/src/renderer/components/download-settings/download-settings.js
index 9755d672e3450..a0ad9efa067da 100644
--- a/src/renderer/components/download-settings/download-settings.js
+++ b/src/renderer/components/download-settings/download-settings.js
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtSelect from '../ft-select/ft-select.vue'
diff --git a/src/renderer/components/ExperimentalSettings/ExperimentalSettings.css b/src/renderer/components/experimental-settings/experimental-settings.css
similarity index 100%
rename from src/renderer/components/ExperimentalSettings/ExperimentalSettings.css
rename to src/renderer/components/experimental-settings/experimental-settings.css
diff --git a/src/renderer/components/experimental-settings/experimental-settings.js b/src/renderer/components/experimental-settings/experimental-settings.js
new file mode 100644
index 0000000000000..652c94f752b18
--- /dev/null
+++ b/src/renderer/components/experimental-settings/experimental-settings.js
@@ -0,0 +1,51 @@
+import { defineComponent } from 'vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+import FtPrompt from '../ft-prompt/ft-prompt.vue'
+import { IpcChannels } from '../../../constants'
+
+export default defineComponent({
+  name: 'ExperimentalSettings',
+  components: {
+    'ft-settings-section': FtSettingsSection,
+    'ft-flex-box': FtFlexBox,
+    'ft-toggle-switch': FtToggleSwitch,
+    'ft-prompt': FtPrompt
+  },
+  data: function () {
+    return {
+      replaceHttpCacheLoading: true,
+      replaceHttpCache: false,
+      showRestartPrompt: false
+    }
+  },
+  mounted: async function () {
+    if (process.env.IS_ELECTRON) {
+      const { ipcRenderer } = require('electron')
+      this.replaceHttpCache = await ipcRenderer.invoke(IpcChannels.GET_REPLACE_HTTP_CACHE)
+    }
+
+    this.replaceHttpCacheLoading = false
+  },
+  methods: {
+    handleRestartPrompt: function (value) {
+      this.replaceHttpCache = value
+      this.showRestartPrompt = true
+    },
+
+    handleReplaceHttpCache: function (value) {
+      this.showRestartPrompt = false
+
+      if (value === null || value === 'cancel') {
+        this.replaceHttpCache = !this.replaceHttpCache
+        return
+      }
+
+      if (process.env.IS_ELECTRON) {
+        const { ipcRenderer } = require('electron')
+        ipcRenderer.send(IpcChannels.TOGGLE_REPLACE_HTTP_CACHE)
+      }
+    }
+  }
+})
diff --git a/src/renderer/components/experimental-settings/experimental-settings.vue b/src/renderer/components/experimental-settings/experimental-settings.vue
new file mode 100644
index 0000000000000..1f0d61f64ebbe
--- /dev/null
+++ b/src/renderer/components/experimental-settings/experimental-settings.vue
@@ -0,0 +1,30 @@
+<template>
+  <ft-settings-section
+    :title="$t('Settings.Experimental Settings.Experimental Settings')"
+  >
+    <p class="experimental-warning">
+      {{ $t('Settings.Experimental Settings.Warning') }}
+    </p>
+    <ft-flex-box>
+      <ft-toggle-switch
+        tooltip-position="top"
+        :label="$t('Settings.Experimental Settings.Replace HTTP Cache')"
+        :compact="true"
+        :default-value="replaceHttpCache"
+        :disabled="replaceHttpCacheLoading"
+        :tooltip="$t('Tooltips.Experimental Settings.Replace HTTP Cache')"
+        @change="handleRestartPrompt"
+      />
+    </ft-flex-box>
+    <ft-prompt
+      v-if="showRestartPrompt"
+      :label="$t('Settings[\'The app needs to restart for changes to take effect. Restart and apply change?\']')"
+      :option-names="[$t('Yes, Restart'), $t('Cancel')]"
+      :option-values="['restart', 'cancel']"
+      @click="handleReplaceHttpCache"
+    />
+  </ft-settings-section>
+</template>
+
+<script src="./experimental-settings.js" />
+<style scoped src="./experimental-settings.css" />
diff --git a/src/renderer/components/external-player-settings/external-player-settings.js b/src/renderer/components/external-player-settings/external-player-settings.js
index 4722596b4003e..8805556d4ab4b 100644
--- a/src/renderer/components/external-player-settings/external-player-settings.js
+++ b/src/renderer/components/external-player-settings/external-player-settings.js
@@ -1,11 +1,10 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtSelect from '../ft-select/ft-select.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtInputTags from '../ft-input-tags/ft-input-tags.vue'
 
 export default defineComponent({
   name: 'ExternalPlayerSettings',
@@ -14,8 +13,7 @@ export default defineComponent({
     'ft-select': FtSelect,
     'ft-input': FtInput,
     'ft-toggle-switch': FtToggleSwitch,
-    'ft-flex-box': FtFlexBox,
-    'ft-input-tags': FtInputTags
+    'ft-flex-box': FtFlexBox
   },
   computed: {
     externalPlayerNames: function () {
@@ -46,7 +44,7 @@ export default defineComponent({
       return this.$store.getters.getExternalPlayerIgnoreDefaultArgs
     },
     externalPlayerCustomArgs: function () {
-      return JSON.parse(this.$store.getters.getExternalPlayerCustomArgs)
+      return this.$store.getters.getExternalPlayerCustomArgs
     },
     externalPlayerCustomArgsTooltip: function () {
       const tooltip = this.$t('Tooltips.External Player Settings.Custom External Player Arguments')
@@ -62,10 +60,6 @@ export default defineComponent({
     }
   },
   methods: {
-    handleExternalPlayerCustomArgs(value) {
-      this.updateExternalPlayerCustomArgs(JSON.stringify(value))
-    },
-
     ...mapActions([
       'updateExternalPlayer',
       'updateExternalPlayerExecutable',
diff --git a/src/renderer/components/external-player-settings/external-player-settings.vue b/src/renderer/components/external-player-settings/external-player-settings.vue
index 39f14ca6a7597..5f86b8befe6ed 100644
--- a/src/renderer/components/external-player-settings/external-player-settings.vue
+++ b/src/renderer/components/external-player-settings/external-player-settings.vue
@@ -43,16 +43,13 @@
         :tooltip="$t('Tooltips.External Player Settings.Custom External Player Executable')"
         @input="updateExternalPlayerExecutable"
       />
-    </ft-flex-box>
-    <ft-flex-box
-      v-if="externalPlayer !== ''"
-    >
-      <ft-input-tags
-        :label="$t('Settings.External Player Settings.Custom External Player Arguments')"
-        :tag-name-placeholder="$t('Settings.External Player Settings.Custom External Player Arguments')"
-        :tag-list="externalPlayerCustomArgs"
+      <ft-input
+        :placeholder="$t('Settings.External Player Settings.Custom External Player Arguments')"
+        :show-action-button="false"
+        :show-label="true"
+        :value="externalPlayerCustomArgs"
         :tooltip="externalPlayerCustomArgsTooltip"
-        @change="handleExternalPlayerCustomArgs"
+        @input="updateExternalPlayerCustomArgs"
       />
     </ft-flex-box>
   </ft-settings-section>
diff --git a/src/renderer/components/FtAgeRestricted/FtAgeRestricted.css b/src/renderer/components/ft-age-restricted/ft-age-restricted.css
similarity index 100%
rename from src/renderer/components/FtAgeRestricted/FtAgeRestricted.css
rename to src/renderer/components/ft-age-restricted/ft-age-restricted.css
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.js b/src/renderer/components/ft-age-restricted/ft-age-restricted.js
new file mode 100644
index 0000000000000..571c1b7112e44
--- /dev/null
+++ b/src/renderer/components/ft-age-restricted/ft-age-restricted.js
@@ -0,0 +1,29 @@
+import { defineComponent } from 'vue'
+import { randomArrayItem } from '../../helpers/utils'
+
+export default defineComponent({
+  name: 'FtAgeRestricted',
+  props: {
+    isChannel: {
+      type: Boolean,
+      default: false,
+    },
+    isVideo: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    emoji: function () {
+      return randomArrayItem(['😵', '😦', '🙁', '☹️', '😦', '🤫', '😕'])
+    },
+
+    restrictedMessage: function () {
+      if (this.isChannel) {
+        return this.$t('Age Restricted.This channel is age restricted')
+      }
+
+      return this.$t('Age Restricted.This video is age restricted')
+    }
+  }
+})
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.vue b/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
new file mode 100644
index 0000000000000..ff53178df9b82
--- /dev/null
+++ b/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>
+    <h2 class="message">
+      {{ restrictedMessage }}
+    </h2>
+    <div class="frown">
+      {{ emoji }}
+    </div>
+  </div>
+</template>
+
+<script src="./ft-age-restricted.js" />
+<style scoped src="./ft-age-restricted.css" />
diff --git a/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue b/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue
index f020b35b64119..313bd91a73160 100644
--- a/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue
+++ b/src/renderer/components/ft-checkbox-list/ft-checkbox-list.vue
@@ -6,6 +6,7 @@
     <!--  eslint-disable vue/no-template-key -->
     <template
       v-for="(label, index) in labels"
+      class="checkboxContainer"
     >
       <input
         :id="values[index] + id"
diff --git a/src/renderer/components/FtCommunityPoll/FtCommunityPoll.css b/src/renderer/components/ft-community-poll/ft-community-poll.css
similarity index 100%
rename from src/renderer/components/FtCommunityPoll/FtCommunityPoll.css
rename to src/renderer/components/ft-community-poll/ft-community-poll.css
diff --git a/src/renderer/components/ft-community-poll/ft-community-poll.js b/src/renderer/components/ft-community-poll/ft-community-poll.js
new file mode 100644
index 0000000000000..fb44894cd9eb5
--- /dev/null
+++ b/src/renderer/components/ft-community-poll/ft-community-poll.js
@@ -0,0 +1,28 @@
+import { defineComponent } from 'vue'
+import { formatNumber } from '../../helpers/utils'
+
+export default defineComponent({
+  name: 'FtCommunityPoll',
+  props: {
+    data: {
+      type: Object,
+      required: true
+    }
+  },
+  data: function () {
+    return {
+      revealAnswer: false
+    }
+  },
+  computed: {
+    formattedVotes: function () {
+      return formatNumber(this.data.totalVotes)
+    },
+  },
+  methods: {
+    // Use smallest as it's resized to 125px anyways and they're usually all larger than that
+    findSmallestPollImage: function (images) {
+      return images.reduce((prev, img) => (img.height < prev.height) ? img : prev, images[0]).url
+    }
+  }
+})
diff --git a/src/renderer/components/FtCommunityPoll/FtCommunityPoll.vue b/src/renderer/components/ft-community-poll/ft-community-poll.vue
similarity index 62%
rename from src/renderer/components/FtCommunityPoll/FtCommunityPoll.vue
rename to src/renderer/components/ft-community-poll/ft-community-poll.vue
index 186ae0048d8c3..0f3151a8fa56c 100644
--- a/src/renderer/components/FtCommunityPoll/FtCommunityPoll.vue
+++ b/src/renderer/components/ft-community-poll/ft-community-poll.vue
@@ -52,44 +52,17 @@
         v-if="!revealAnswer"
         class="option-text"
       >
-        <FontAwesomeIcon :icon="['fas', 'eye']" /> {{ $t('Channel.Community.Reveal Answers') }}
+        <font-awesome-icon :icon="['fas', 'eye']" /> {{ $t('Channel.Community.Reveal Answers') }}
       </div>
       <div
         v-else
         class="option-text"
       >
-        <FontAwesomeIcon :icon="['fas', 'eye-slash']" /> {{ $t('Channel.Community.Hide Answers') }}
+        <font-awesome-icon :icon="['fas', 'eye-slash']" /> {{ $t('Channel.Community.Hide Answers') }}
       </div>
     </div>
   </div>
 </template>
 
-<script setup>
-import { computed, ref } from 'vue'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-
-import { formatNumber } from '../../helpers/utils'
-
-const props = defineProps({
-  data: {
-    type: Object,
-    required: true
-  }
-})
-
-const formattedVotes = computed(() => {
-  return formatNumber(props.data.totalVotes)
-})
-
-const revealAnswer = ref(false)
-
-/**
- * Use smallest as it's resized to 125px anyways and they're usually all larger than that
- * @param {{ height: number, width: number, url: string }[]} images
- */
-function findSmallestPollImage(images) {
-  return images.reduce((prev, img) => (img.height < prev.height) ? img : prev, images[0]).url
-}
-</script>
-
-<style scoped src="./FtCommunityPoll.css" />
+<script src="./ft-community-poll.js" />
+<style scoped src="./ft-community-poll.css" />
diff --git a/src/renderer/components/ft-community-post/ft-community-post.js b/src/renderer/components/ft-community-post/ft-community-post.js
new file mode 100644
index 0000000000000..617d1c889873f
--- /dev/null
+++ b/src/renderer/components/ft-community-post/ft-community-post.js
@@ -0,0 +1,170 @@
+import { defineComponent } from 'vue'
+import FtListVideo from '../ft-list-video/ft-list-video.vue'
+import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
+import FtCommunityPoll from '../ft-community-poll/ft-community-poll.vue'
+
+import autolinker from 'autolinker'
+
+import { A11y, Navigation, Pagination } from 'swiper/modules'
+
+import {
+  createWebURL,
+  deepCopy,
+  formatNumber,
+  getRelativeTimeFromDate,
+  toLocalePublicationString,
+} from '../../helpers/utils'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
+
+export default defineComponent({
+  name: 'FtCommunityPost',
+  components: {
+    'ft-list-playlist': FtListPlaylist,
+    'ft-list-video': FtListVideo,
+    'ft-community-poll': FtCommunityPoll
+  },
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    appearance: {
+      type: String,
+      required: true
+    },
+    hideForbiddenTitles: {
+      type: Boolean,
+      default: true
+    },
+    singlePost: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data: function () {
+    return {
+      postText: '',
+      postId: '',
+      authorThumbnails: null,
+      publishedText: '',
+      voteCount: 0,
+      formattedVoteCount: '',
+      postContent: '',
+      commentCount: null,
+      formattedCommentCount: '',
+      author: '',
+      authorId: '',
+    }
+  },
+  computed: {
+    listType: function () {
+      return this.$store.getters.getListType
+    },
+
+    forbiddenTitles() {
+      if (!this.hideForbiddenTitles) { return [] }
+      return JSON.parse(this.$store.getters.getForbiddenTitles)
+    },
+
+    hideVideo() {
+      return this.forbiddenTitles.some((text) => this.data.postContent.content.title?.toLowerCase().includes(text.toLowerCase()))
+    },
+
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+    backendFallback: function () {
+      return this.$store.getters.getBackendFallback
+    },
+    isInvidiousAllowed: function() {
+      return this.backendPreference === 'invidious' || this.backendFallback
+    }
+  },
+  created: function () {
+    this.parseCommunityData()
+  },
+  mounted: function () {
+    if (this.type === 'multiImage' && this.postContent.content.length > 0) {
+      const swiperContainer = this.$refs.swiperContainer
+
+      /** @type {import('swiper/element').SwiperContainer} */
+      const swiperOptions = {
+        modules: [A11y, Navigation, Pagination],
+
+        injectStylesUrls: [
+          // This file is created with the copy webpack plugin in the web and renderer webpack configs.
+          // If you add more modules, please remember to add their CSS files to the list in webpack config files.
+          createWebURL(`/swiper-${process.env.SWIPER_VERSION}.css`)
+        ],
+
+        a11y: true,
+        navigation: true,
+        pagination: {
+          enabled: true,
+          clickable: true
+        },
+        slidesPerView: 1
+      }
+
+      Object.assign(swiperContainer, swiperOptions)
+
+      swiperContainer.initialize()
+    }
+  },
+  methods: {
+    parseCommunityData: function () {
+      if ('backstagePostThreadRenderer' in this.data) {
+        this.postText = 'Shared post'
+        this.type = 'text'
+        let authorThumbnails = ['', 'https://yt3.ggpht.com/ytc/AAUvwnjm-0qglHJkAHqLFsCQQO97G7cCNDuDLldsrn25Lg=s88-c-k-c0x00ffffff-no-rj']
+        if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
+          authorThumbnails = authorThumbnails.map(thumbnail => {
+            thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
+            return thumbnail
+          })
+        }
+        this.authorThumbnails = authorThumbnails
+        return
+      }
+      this.postText = autolinker.link(this.data.postText)
+      const authorThumbnails = deepCopy(this.data.authorThumbnails)
+      if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
+        authorThumbnails.forEach(thumbnail => {
+          thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url)
+        })
+      } else {
+        authorThumbnails.forEach(thumbnail => {
+          if (thumbnail.url.startsWith('//')) {
+            thumbnail.url = 'https:' + thumbnail.url
+          }
+        })
+      }
+      this.authorThumbnails = authorThumbnails
+      this.postContent = this.data.postContent
+      this.postId = this.data.postId
+      this.publishedText = toLocalePublicationString({
+        publishText: getRelativeTimeFromDate(this.data.publishedTime),
+        isLive: this.isLive,
+        isUpcoming: this.isUpcoming,
+        isRSS: this.data.isRSS
+      })
+      this.voteCount = this.data.voteCount
+      this.formattedVoteCount = formatNumber(this.voteCount)
+      this.commentCount = this.data.commentCount
+      this.formattedCommentCount = formatNumber(this.commentCount)
+      this.type = (this.data.postContent !== null && this.data.postContent !== undefined) ? this.data.postContent.type : 'text'
+      this.author = this.data.author
+      this.authorId = this.data.authorId
+    },
+
+    getBestQualityImage(imageArray) {
+      const imageArrayCopy = Array.from(imageArray)
+      imageArrayCopy.sort((a, b) => {
+        return Number.parseInt(b.width) - Number.parseInt(a.width)
+      })
+
+      // Remove cropping directives when applicable
+      return imageArrayCopy.at(0)?.url?.replace(/-c-fcrop64=.*/i, '') ?? ''
+    }
+  }
+})
diff --git a/src/renderer/components/FtCommunityPost/FtCommunityPost.scss b/src/renderer/components/ft-community-post/ft-community-post.scss
similarity index 100%
rename from src/renderer/components/FtCommunityPost/FtCommunityPost.scss
rename to src/renderer/components/ft-community-post/ft-community-post.scss
diff --git a/src/renderer/components/ft-community-post/ft-community-post.vue b/src/renderer/components/ft-community-post/ft-community-post.vue
new file mode 100644
index 0000000000000..b7f864efde2da
--- /dev/null
+++ b/src/renderer/components/ft-community-post/ft-community-post.vue
@@ -0,0 +1,163 @@
+<template>
+  <div
+    class="ft-list-post ft-list-item outside"
+    :appearance="appearance"
+    :class="{ list: listType === 'list', grid: listType === 'grid' }"
+  >
+    <div
+      class="author-div"
+    >
+      <template
+        v-if="authorThumbnails.length > 0"
+      >
+        <router-link
+          v-if="authorId"
+          :to="`/channel/${authorId}`"
+          tabindex="-1"
+          aria-hidden="true"
+        >
+          <img
+            :src="getBestQualityImage(authorThumbnails)"
+            class="communityThumbnail"
+            alt=""
+          >
+        </router-link>
+        <img
+          v-else
+          :src="getBestQualityImage(authorThumbnails)"
+          class="communityThumbnail"
+          alt=""
+        >
+      </template>
+      <p
+        class="authorName"
+      >
+        <router-link
+          v-if="authorId"
+          :to="`/channel/${authorId}`"
+          class="authorNameLink"
+        >
+          {{ author }}
+        </router-link>
+        <template
+          v-else
+        >
+          {{ author }}
+        </template>
+      </p>
+      <p
+        class="publishedText"
+      >
+        {{ publishedText }}
+      </p>
+    </div>
+    <p
+      class="postText"
+      v-html="postText"
+    />
+    <swiper-container
+      v-if="type === 'multiImage' && postContent.content.length > 0"
+      ref="swiperContainer"
+      init="false"
+      class="sliderContainer"
+    >
+      <swiper-slide
+        v-for="(img, index) in postContent.content"
+        :key="index"
+        lazy="true"
+      >
+        <img
+          :src="getBestQualityImage(img)"
+          class="communityImage"
+          alt=""
+          loading="lazy"
+        >
+      </swiper-slide>
+    </swiper-container>
+    <div
+      v-if="type === 'image' && postContent.content.length > 0"
+    >
+      <img
+        :src="getBestQualityImage(postContent.content)"
+        class="communityImage"
+        alt=""
+      >
+    </div>
+    <div
+      v-if="type === 'video'"
+    >
+      <ft-list-video
+        v-if="!hideVideo"
+        :data="data.postContent.content"
+        appearance=""
+      />
+      <p
+        v-else
+        class="hiddenVideo"
+      >
+        {{ '[' + $t('Channel.Community.Video hidden by FreeTube') + ']' }}
+      </p>
+    </div>
+    <div
+      v-if="type === 'poll' || type === 'quiz'"
+    >
+      <ft-community-poll :data="postContent" />
+    </div>
+    <div
+      v-if="type === 'playlist'"
+      class="playlistWrapper"
+    >
+      <ft-list-playlist
+        :data="postContent.content"
+        :appearance="appearance"
+      />
+    </div>
+    <div
+      class="bottomSection"
+    >
+      <span
+        class="likeCount"
+        :title="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
+        :aria-label="$tc('Global.Counts.Like Count', voteCount, {count: formattedVoteCount})"
+      >
+        <font-awesome-icon
+          class="thumbs-up-icon"
+          :icon="['fas', 'thumbs-up']"
+          aria-hidden="true"
+        /> {{ formattedVoteCount }}</span>
+      <router-link
+        v-if="isInvidiousAllowed && !singlePost"
+        :to="{
+          path: `/post/${postId}`,
+          query: authorId ? { authorId } : undefined
+        }"
+        class="commentsLink"
+        :aria-label="$t('Channel.Community.View Full Post')"
+      >
+        <span
+          class="commentCount"
+          :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+          :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+        >
+          <font-awesome-icon
+            class="comment-count-icon"
+            :icon="['fas', 'comment']"
+            aria-hidden="true"
+          /> {{ formattedCommentCount }}</span>
+      </router-link>
+      <span
+        v-else-if="commentCount != null"
+        class="commentCount"
+        :title="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+        :aria-label="$tc('Global.Counts.Comment Count', commentCount, {count: formattedCommentCount})"
+      >
+        <font-awesome-icon
+          class="comment-count-icon"
+          :icon="['fas', 'comment']"
+        /> {{ commentCount }}</span>
+    </div>
+  </div>
+</template>
+
+<script src="./ft-community-post.js" />
+<style scoped src="./ft-community-post.scss" lang="scss" />
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.js b/src/renderer/components/ft-icon-button/ft-icon-button.js
index 89defc78efe93..6c12092874425 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.js
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.js
@@ -2,8 +2,6 @@ import { defineComponent, nextTick } from 'vue'
 import FtPrompt from '../ft-prompt/ft-prompt.vue'
 import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
-const LONG_CLICK_BOUNDARY_MS = 500
-
 export default defineComponent({
   name: 'FtIconButton',
   components: {
@@ -57,27 +55,21 @@ export default defineComponent({
     dropdownOptions: {
       // Array of objects with these properties
       // - type: ('labelValue'|'divider', default to 'labelValue' for less typing)
-      // - label: String (if type === 'labelValue')
-      // - value: String (if type === 'labelValue')
-      // - (OPTIONAL) active: Number (if type === 'labelValue')
+      // - label: String (if type == 'labelValue')
+      // - value: String (if type == 'labelValue')
       type: Array,
       default: () => { return [] }
     },
     dropdownModalOnMobile: {
       type: Boolean,
       default: false
-    },
-    openOnRightOrLongClick: {
-      type: Boolean,
-      default: false
     }
   },
   emits: ['click', 'disabled-click'],
   data: function () {
     return {
       dropdownShown: false,
-      blockLeftClick: false,
-      longPressTimer: null,
+      mouseDownOnIcon: false,
       useModal: false
     }
   },
@@ -99,24 +91,14 @@ export default defineComponent({
       this.dropdownShown = false
     },
 
-    handleIconClick: function (e, isRightOrLongClick = false) {
+    handleIconClick: function () {
       if (this.disabled) {
         this.$emit('disabled-click')
         return
       }
-
-      if (this.blockLeftClick) {
-        return
-      }
-
-      if (this.longPressTimer != null) {
-        clearTimeout(this.longPressTimer)
-        this.longPressTimer = null
-      }
-
-      if ((!this.openOnRightOrLongClick || (this.openOnRightOrLongClick && isRightOrLongClick)) &&
-       (this.forceDropdown || this.dropdownOptions.length > 0)) {
+      if (this.forceDropdown || (this.dropdownOptions.length > 0)) {
         this.dropdownShown = !this.dropdownShown
+
         if (this.dropdownShown && !this.useModal) {
           // wait until the dropdown is visible
           // then focus it so we can hide it automatically when it loses focus
@@ -129,38 +111,24 @@ export default defineComponent({
       }
     },
 
-    handleIconPointerDown: function (event) {
-      if (!this.openOnRightOrLongClick) { return }
-      if (event.button === 2) { // right button click
-        this.handleIconClick(null, true)
-      } else if (event.button === 0) { // left button click
-        this.longPressTimer = setTimeout(() => {
-          this.handleIconClick(null, true)
-
-          // prevent a long press that ends on the icon button from firing the handleIconClick handler
-          window.addEventListener('pointerup', this.preventButtonClickAfterLongPress, { once: true })
-          window.addEventListener('pointercancel', () => {
-            window.removeEventListener('pointerup', this.preventButtonClickAfterLongPress)
-          }, { once: true })
-        }, LONG_CLICK_BOUNDARY_MS)
+    handleIconMouseDown: function () {
+      if (this.disabled) { return }
+      if (this.dropdownShown) {
+        this.mouseDownOnIcon = true
       }
     },
 
-    // prevent the handleIconClick handler from firing for an instant
-    preventButtonClickAfterLongPress: function () {
-      this.blockLeftClick = true
-      setTimeout(() => { this.blockLeftClick = false }, 0)
-    },
-
     handleDropdownFocusOut: function () {
-      if (this.dropdownShown && !this.$refs.ftIconButton.matches(':focus-within')) {
+      if (this.mouseDownOnIcon) {
+        this.mouseDownOnIcon = false
+      } else if (!this.$refs.dropdown.matches(':focus-within')) {
         this.dropdownShown = false
       }
     },
 
     handleDropdownEscape: function () {
-      this.dropdownShown = false
-      this.$refs.ftIconButton.firstElementChild.focus()
+      this.$refs.iconButton.focus()
+      // handleDropdownFocusOut will hide the dropdown for us
     },
 
     handleDropdownClick: function ({ url, index }) {
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.scss b/src/renderer/components/ft-icon-button/ft-icon-button.scss
index e1fc416dfbb21..c01f70573b490 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.scss
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.scss
@@ -4,7 +4,6 @@
   flex-flow: row wrap;
   justify-content: space-evenly;
   position: relative;
-  line-height: normal;
   user-select: none;
 }
 
@@ -25,13 +24,12 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible,
-      &.pressed {
+      &:focus-visible {
         background-color: var(--side-nav-hover-color);
         color: var(--side-nav-hover-text-color);
       }
 
-      &.active {
+      &:active {
         background-color: var(--side-nav-active-color);
         color: var(--side-nav-active-text-color);
       }
@@ -40,13 +38,12 @@
 
   &.base-no-default:not(.disabled) {
     &:hover,
-    &:focus-visible,
-    &.pressed {
+    &:focus-visible {
       background-color: var(--side-nav-hover-color);
       color: var(--side-nav-hover-text-color);
     }
 
-    &.active {
+    &:active {
       background-color: var(--side-nav-active-color);
       color: var(--side-nav-active-text-color);
     }
@@ -58,12 +55,11 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible,
-      &.pressed {
+      &:focus-visible {
         background-color: var(--primary-color-hover);
       }
 
-      &.active {
+      &:active {
         background-color: var(--primary-color-active);
       }
     }
@@ -76,12 +72,11 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible,
-      &.pressed {
+      &:focus-visible {
         background-color: var(--accent-color-hover);
       }
 
-      &.active {
+      &:active {
         background-color: var(--accent-color-active);
       }
     }
@@ -93,12 +88,11 @@
 
     &:not(.disabled) {
       &:hover,
-      &:focus-visible,
-      &.pressed {
+      &:focus-visible {
         background-color: var(--destructive-hover-color);
       }
 
-      &.active {
+      &:active {
         background-color: var(--destructive-active-color);
       }
     }
@@ -156,17 +150,6 @@
     padding: 0;
   }
 
-  :has(.active) {
-    .checkmarkColumn {
-      min-inline-size: 12px;
-    }
-
-    .listItem {
-      display: flex;
-      gap: 6px;
-    }
-  }
-
   .listItem {
     cursor: pointer;
     margin: 0;
@@ -176,20 +159,12 @@
     white-space: nowrap;
 
     &:hover,
-    &:focus-visible,
-    &.pressed,
-    &.active {
+    &:focus-visible {
       background-color: var(--side-nav-hover-color);
       color: var(--side-nav-hover-text-color);
       transition: background 0.2s ease-in;
     }
 
-    &.active {
-      font-weight: 600;
-      display: flex;
-      gap: 6px;
-    }
-
     &:active {
       background-color: var(--side-nav-active-color);
       color: var(--side-nav-active-text-color);
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.vue b/src/renderer/components/ft-icon-button/ft-icon-button.vue
index f31aa5afdd099..4c6af4f0e3d4d 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.vue
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.vue
@@ -1,17 +1,13 @@
 <template>
-  <div
-    ref="ftIconButton"
-    class="ftIconButton"
-    @focusout="handleDropdownFocusOut"
-  >
+  <div class="ftIconButton">
     <font-awesome-icon
+      ref="iconButton"
       class="iconButton"
       :title="title"
       :icon="icon"
       :class="{
         [theme]: true,
         shadow: useShadow,
-        pressed: openOnRightOrLongClick && dropdownShown,
         disabled
       }"
       :style="{
@@ -22,9 +18,8 @@
       role="button"
       :aria-disabled="disabled"
       :aria-expanded="dropdownShown"
-      @pointerdown="handleIconPointerDown"
-      @contextmenu.prevent=""
       @click="handleIconClick"
+      @mousedown="handleIconMouseDown"
       @keydown.enter.prevent="handleIconClick"
       @keydown.space.prevent="handleIconClick"
     />
@@ -48,13 +43,9 @@
               :id="sanitizeForHtmlId(title + '-' + index)"
               :key="index"
               role="option"
-              :aria-selected="option.active"
+              aria-selected="false"
               tabindex="-1"
-              :class="{
-                listItemDivider: option.type === 'divider',
-                listItem: option.type !== 'divider',
-                active: option.active
-              }"
+              :class="option.type === 'divider' ? 'listItemDivider' : 'listItem'"
               @click="handleDropdownClick({url: option.value, index: index})"
               @keydown.enter="handleDropdownClick({url: option.value, index: index})"
               @keydown.space="handleDropdownClick({url: option.value, index: index})"
@@ -76,6 +67,7 @@
           bottom: dropdownPositionY === 'bottom',
           top: dropdownPositionY === 'top'
         }"
+        @focusout="handleDropdownFocusOut"
         @keydown.esc.stop="handleDropdownEscape"
       >
         <slot>
@@ -89,23 +81,13 @@
               :id="sanitizeForHtmlId(title + '-' + index)"
               :key="index"
               :role="option.type === 'divider' ? 'separator' : 'option'"
-              :aria-selected="option.active"
+              aria-selected="false"
               :tabindex="option.type === 'divider' ? '-1' : '0'"
-              :class="{
-                listItemDivider: option.type === 'divider',
-                listItem: option.type !== 'divider',
-                active: option.active
-              }"
+              :class="option.type === 'divider' ? 'listItemDivider' : 'listItem'"
               @click="handleDropdownClick({url: option.value, index: index}, $event)"
               @keydown.enter="handleDropdownClick({url: option.value, index: index}, $event)"
               @keydown.space="handleDropdownClick({url: option.value, index: index}, $event)"
             >
-              <div class="checkmarkColumn">
-                <font-awesome-icon
-                  v-if="option.active"
-                  :icon="['fas', 'check']"
-                />
-              </div>
               {{ option.type === 'divider' ? '' : option.label }}
             </li>
           </ul>
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.css b/src/renderer/components/ft-input-tags/ft-input-tags.css
index 9a26873ceb021..6d8a667689a33 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.css
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.css
@@ -38,13 +38,6 @@
   user-select: text;
 }
 
-.checkbox-container {
-  display: flex;
-  align-items: center;
-  font-size: 12px;
-  accent-color: var(--accent-color);
-}
-
 .tag-icon {
   border-radius: 50%;
   vertical-align: middle;
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.js b/src/renderer/components/ft-input-tags/ft-input-tags.js
index 2f3225ac81499..281b3517171e8 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.js
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.js
@@ -1,7 +1,6 @@
 import { defineComponent } from 'vue'
 import FtInput from '../ft-input/ft-input.vue'
 import { showToast } from '../../helpers/utils'
-import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
 export default defineComponent({
   name: 'FtInputTags',
@@ -37,10 +36,6 @@ export default defineComponent({
       type: Boolean,
       default: true
     },
-    showTags: {
-      type: Boolean,
-      default: true
-    },
     tagList: {
       type: Array,
       default: () => { return [] }
@@ -58,12 +53,7 @@ export default defineComponent({
       default: (_) => ({ preferredName: '', icon: '' }),
     }
   },
-  emits: ['already-exists', 'change', 'error-find-tag-info', 'invalid-name', 'toggle-show-tags'],
-  computed: {
-    sanitizedId: function() {
-      return sanitizeForHtmlId(`checkbox-${this.label}`)
-    },
-  },
+  emits: ['already-exists', 'change', 'error-find-tag-info', 'invalid-name'],
   methods: {
     updateTags: async function (text, _e) {
       if (this.areChannelTags) {
@@ -136,9 +126,6 @@ export default defineComponent({
         const newList = this.tagList.filter((tmpTag) => tmpTag.name !== tag.name)
         this.$emit('change', newList)
       }
-    },
-    toggleShowTags: function () {
-      this.$emit('toggle-show-tags')
-    },
+    }
   }
 })
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.vue b/src/renderer/components/ft-input-tags/ft-input-tags.vue
index d27eecf18e640..4c387589e189f 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.vue
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.vue
@@ -21,24 +21,7 @@
       :force-action-button-icon-name="['fas', 'arrow-right']"
       @click="updateTags"
     />
-    <div
-      v-if="tagList.length >= 1"
-      class="checkbox-container"
-    >
-      <input
-        :id="sanitizedId"
-        type="checkbox"
-        :checked="showTags"
-        @change="toggleShowTags"
-      >
-      <label :for="sanitizedId">
-        {{ $t('Settings.Distraction Free Settings.Show Added Items') }}
-      </label>
-    </div>
-    <div
-      v-if="showTags"
-      class="ft-tag-box"
-    >
+    <div class="ft-tag-box">
       <ul>
         <li
           v-for="tag in tagList"
diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 7a3aa07150fe7..4df5666757fc7 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -100,6 +100,10 @@ export default defineComponent({
       return this.isSearch && this.barColor
     },
 
+    idDataList: function () {
+      return `${this.id}_datalist`
+    },
+
     inputDataPresent: function () {
       return this.inputData.length > 0
     },
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index ea5f5c80d56a0..cdc0dee0fb833 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -43,6 +43,7 @@
         :id="id"
         ref="input"
         :value="inputDataDisplayed"
+        :list="idDataList"
         class="ft-input"
         :maxlength="maxlength"
         :type="inputType"
@@ -69,6 +70,7 @@
     <div class="options">
       <ul
         v-if="inputData !== '' && visibleDataList.length > 0 && searchState.showOptions"
+        :id="idDataList"
         class="list"
         @mouseenter="searchState.isPointerInList = true"
         @mouseleave="searchState.isPointerInList = false"
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.js b/src/renderer/components/ft-list-channel/ft-list-channel.js
new file mode 100644
index 0000000000000..709c34cf149c4
--- /dev/null
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.js
@@ -0,0 +1,100 @@
+import { defineComponent } from 'vue'
+import FtSubscribeButton from '../../components/ft-subscribe-button/ft-subscribe-button.vue'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
+import { formatNumber } from '../../helpers/utils'
+import { parseLocalSubscriberCount } from '../../helpers/api/local'
+
+export default defineComponent({
+  name: 'FtListChannel',
+  components: {
+    'ft-subscribe-button': FtSubscribeButton
+  },
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    appearance: {
+      type: String,
+      required: true
+    }
+  },
+  data: function () {
+    return {
+      id: '',
+      thumbnail: '',
+      channelName: '',
+      subscriberCount: 0,
+      videoCount: 0,
+      formattedSubscriberCount: '',
+      formattedVideoCount: '',
+      handle: null,
+      description: ''
+    }
+  },
+  computed: {
+    currentInvidiousInstanceUrl: function () {
+      return this.$store.getters.getCurrentInvidiousInstanceUrl
+    },
+    listType: function () {
+      return this.$store.getters.getListType
+    },
+    hideChannelSubscriptions: function () {
+      return this.$store.getters.getHideChannelSubscriptions
+    }
+  },
+  created: function () {
+    if (this.data.dataSource === 'local') {
+      this.parseLocalData()
+    } else {
+      this.parseInvidiousData()
+    }
+  },
+  methods: {
+    parseLocalData: function () {
+      this.thumbnail = this.data.thumbnail
+
+      if (!this.thumbnail.includes('https:')) {
+        this.thumbnail = `https:${this.thumbnail}`
+      }
+
+      this.channelName = this.data.name
+      this.id = this.data.id
+      if (this.data.subscribers != null) {
+        this.subscriberCount = parseLocalSubscriberCount(this.data.subscribers.replace(/ subscriber(s)?/, ''))
+        this.formattedSubscriberCount = formatNumber(this.subscriberCount)
+      } else {
+        this.subscriberCount = null
+      }
+
+      this.videoCount = this.data.videos ?? 0
+      this.formattedVideoCount = formatNumber(this.videoCount)
+
+      if (this.data.handle) {
+        this.handle = this.data.handle
+      }
+
+      this.description = this.data.descriptionShort
+    },
+
+    parseInvidiousData: function () {
+      // Can be prefixed with `https://` or `//` (protocol relative)
+      const thumbnailUrl = this.data.authorThumbnails[2].url
+
+      this.thumbnail = youtubeImageUrlToInvidious(thumbnailUrl, this.currentInvidiousInstanceUrl)
+
+      this.channelName = this.data.author
+      this.id = this.data.authorId
+      this.subscriberCount = this.data.subCount
+      this.formattedSubscriberCount = formatNumber(this.data.subCount)
+      this.handle = this.data.channelHandle
+      if (this.handle != null) {
+        this.videoCount = null
+      } else {
+        this.videoCount = this.data.videoCount
+        this.formattedVideoCount = formatNumber(this.data.videoCount)
+      }
+      this.description = this.data.description
+    }
+  }
+})
diff --git a/src/renderer/components/FtListChannel/FtListChannel.scss b/src/renderer/components/ft-list-channel/ft-list-channel.scss
similarity index 100%
rename from src/renderer/components/FtListChannel/FtListChannel.scss
rename to src/renderer/components/ft-list-channel/ft-list-channel.scss
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.vue b/src/renderer/components/ft-list-channel/ft-list-channel.vue
new file mode 100644
index 0000000000000..e73eaf6289dfc
--- /dev/null
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.vue
@@ -0,0 +1,74 @@
+<template>
+  <div
+    class="ft-list-channel ft-list-item"
+    :class="{
+      list: listType === 'list',
+      grid: listType === 'grid',
+      [appearance]: true
+    }"
+  >
+    <div class="channelThumbnail">
+      <router-link
+        :to="`/channel/${id}`"
+        class="channelThumbnailLink"
+        tabindex="-1"
+        aria-hidden="true"
+      >
+        <img
+          :src="thumbnail"
+          class="channelImage"
+          alt=""
+        >
+      </router-link>
+    </div>
+    <div class="infoAndSubscribe">
+      <div class="info">
+        <router-link
+          class="title"
+          :to="`/channel/${id}`"
+        >
+          <h3 class="h3Title">
+            {{ channelName }}
+          </h3>
+        </router-link>
+        <div class="infoLine">
+          <router-link
+            v-if="handle !== null"
+            class="handle"
+            :to="`/channel/${id}`"
+          >
+            {{ handle }}
+          </router-link>
+          <span
+            v-if="subscriberCount !== null && !hideChannelSubscriptions"
+            class="subscriberCount"
+          >
+            <template v-if="handle !== null"> • </template>
+            {{ $tc('Global.Counts.Subscriber Count', subscriberCount, {count: formattedSubscriberCount}) }}
+          </span>
+          <span
+            v-if="handle == null && videoCount != null"
+            class="videoCount"
+          >
+            <template v-if="subscriberCount !== null && !hideChannelSubscriptions"> • </template>
+            {{ $tc('Global.Counts.Video Count', videoCount, {count: formattedVideoCount}) }}
+          </span>
+        </div>
+        <p
+          v-if="listType !== 'grid'"
+          class="description"
+          v-html="description"
+        />
+      </div>
+      <ft-subscribe-button
+        class="channelSubscribeButton"
+        :channel-id="id"
+        :channel-name="channelName"
+        :channel-thumbnail="thumbnail"
+      />
+    </div>
+  </div>
+</template>
+
+<script src="./ft-list-channel.js" />
+<style scoped lang="scss" src="./ft-list-channel.scss" />
diff --git a/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js
new file mode 100644
index 0000000000000..a8890f62751d0
--- /dev/null
+++ b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.js
@@ -0,0 +1,44 @@
+import { defineComponent } from 'vue'
+import { formatNumber } from '../../helpers/utils'
+
+export default defineComponent({
+  name: 'FtListHashtag',
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    appearance: {
+      type: String,
+      required: true
+    }
+  },
+  data: function () {
+    return {
+      title: '',
+      url: '',
+      channelCount: 0,
+      parsedChannelCount: '',
+      videoCount: 0,
+      parsedVideosCount: ''
+    }
+  },
+  computed: {
+    listType: function () {
+      return this.$store.getters.getListType
+    }
+  },
+  created: function () {
+    this.parseData()
+  },
+  methods: {
+    parseData: function () {
+      this.title = this.data.title
+      this.channelCount = this.data.channelCount
+      this.parsedChannelCount = formatNumber(this.channelCount)
+      this.videoCount = this.data.videoCount
+      this.parsedVideosCount = formatNumber(this.videoCount)
+      this.url = `/hashtag/${encodeURIComponent(this.data.title.substring(1))}`
+    }
+  }
+})
diff --git a/src/renderer/components/FtListHashtag/FtListHashtag.scss b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.scss
similarity index 100%
rename from src/renderer/components/FtListHashtag/FtListHashtag.scss
rename to src/renderer/components/ft-list-hashtag/ft-list-hashtag.scss
diff --git a/src/renderer/components/FtListHashtag/FtListHashtag.vue b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue
similarity index 50%
rename from src/renderer/components/FtListHashtag/FtListHashtag.vue
rename to src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue
index 21ad3a36573f7..5db6fe4ab20e0 100644
--- a/src/renderer/components/FtListHashtag/FtListHashtag.vue
+++ b/src/renderer/components/ft-list-hashtag/ft-list-hashtag.vue
@@ -14,7 +14,7 @@
         aria-hidden="true"
         :to="url"
       >
-        <FontAwesomeIcon
+        <font-awesome-icon
           class="hashtagImage"
           :icon="['fas', 'hashtag']"
         />
@@ -34,60 +34,19 @@
           v-if="channelCount"
           class="channelCount"
         >
-          {{ $tc('Global.Counts.Channel Count', channelCount, {count: formattedChannelCount}) }}
+          {{ $tc('Global.Counts.Channel Count', channelCount, {count: parsedChannelCount}) }}
         </span>
         <span
           v-if="videoCount"
           class="videoCount"
         >
           <template v-if="channelCount"> • </template>
-          {{ $tc('Global.Counts.Video Count', videoCount, {count: formattedVideosCount}) }}
+          {{ $tc('Global.Counts.Video Count', videoCount, {count: parsedVideosCount}) }}
         </span>
       </div>
     </div>
   </div>
 </template>
 
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { computed } from 'vue'
-
-import store from '../../store/index'
-
-import { formatNumber } from '../../helpers/utils'
-
-const props = defineProps({
-  data: {
-    type: Object,
-    required: true
-  },
-  appearance: {
-    type: String,
-    required: true
-  }
-})
-
-/** @type {import('vue').ComputedRef<'list'| 'grid'>} */
-const listType = computed(() => {
-  return store.getters.getListType
-})
-
-/** @type {string} */
-const title = props.data.title
-/** @type {number} */
-const channelCount = props.data.channelCount
-/** @type {number} */
-const videoCount = props.data.videoCount
-/** @type {string} */
-const url = `/hashtag/${encodeURIComponent(title.substring(1))}`
-
-const formattedChannelCount = computed(() => {
-  return formatNumber(channelCount)
-})
-
-const formattedVideosCount = computed(() => {
-  return formatNumber(videoCount)
-})
-</script>
-
-<style scoped lang="scss" src="./FtListHashtag.scss" />
+<script src="./ft-list-hashtag.js" />
+<style scoped lang="scss" src="./ft-list-hashtag.scss" />
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.js b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
index e36d6e63ff993..98747cef34c23 100644
--- a/src/renderer/components/ft-list-playlist/ft-list-playlist.js
+++ b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
@@ -2,7 +2,6 @@ import { defineComponent } from 'vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import { mapActions } from 'vuex'
 import { showToast } from '../../helpers/utils'
-import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'FtListPlaylist',
@@ -29,7 +28,7 @@ export default defineComponent({
       playlistId: '',
       channelId: '',
       title: 'Pop Music Playlist - Timeless Pop Songs (Updated Weekly 2020)',
-      thumbnail: thumbnailPlaceholder,
+      thumbnail: require('../../assets/img/thumbnail_placeholder.svg'),
       channelName: '#RedMusic: Just Hits',
       videoCount: 200,
     }
diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 599595a839cbc..cffc195fa16b3 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -13,7 +13,6 @@ import {
 } from '../../helpers/utils'
 import { deArrowData, deArrowThumbnail } from '../../helpers/sponsorblock'
 import debounce from 'lodash.debounce'
-import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'FtListVideo',
@@ -102,20 +101,12 @@ export default defineComponent({
       published: undefined,
       isLive: false,
       is4k: false,
-      is8k: false,
-      isNew: false,
-      isVr180: false,
-      isVr360: false,
-      is3D: false,
       hasCaptions: false,
       isUpcoming: false,
       isPremium: false,
       hideViews: false,
       addToPlaylistPromptCloseCallback: null,
       debounceGetDeArrowThumbnail: null,
-      deArrowTogglePinned: false,
-      showDeArrowTitle: false,
-      showDeArrowThumbnail: false,
     }
   },
   computed: {
@@ -338,10 +329,10 @@ export default defineComponent({
 
     thumbnail: function () {
       if (this.thumbnailPreference === 'hidden') {
-        return thumbnailPlaceholder
+        return require('../../assets/img/thumbnail_placeholder.svg')
       }
 
-      if (this.showDeArrowThumbnail && this.deArrowCache?.thumbnail != null) {
+      if (this.useDeArrowThumbnails && this.deArrowCache?.thumbnail != null) {
         return this.deArrowCache.thumbnail
       }
 
@@ -398,7 +389,7 @@ export default defineComponent({
 
     displayTitle: function () {
       let title
-      if (this.showDeArrowTitle && this.deArrowCache?.title) {
+      if (this.useDeArrowTitles && this.deArrowCache?.title) {
         title = this.deArrowCache.title
       } else {
         title = this.title
@@ -500,20 +491,10 @@ export default defineComponent({
     useDeArrowTitles: function () {
       return this.$store.getters.getUseDeArrowTitles
     },
+
     useDeArrowThumbnails: function () {
       return this.$store.getters.getUseDeArrowThumbnails
     },
-    deArrowChangedContent: function () {
-      return (this.useDeArrowThumbnails && this.deArrowCache?.thumbnail) ||
-        (this.useDeArrowTitles && this.deArrowCache?.title &&
-          this.data.title.localeCompare(this.deArrowCache.title, undefined, { sensitivity: 'accent' }) !== 0)
-    },
-
-    deArrowToggleTitle: function() {
-      return this.deArrowTogglePinned
-        ? this.$t('Video.DeArrow.Show Modified Details')
-        : this.$t('Video.DeArrow.Show Original Details')
-    },
 
     deArrowCache: function () {
       return this.$store.getters.getDeArrowCache[this.id]
@@ -531,14 +512,11 @@ export default defineComponent({
   created: function () {
     this.parseVideoData()
 
-    this.showDeArrowTitle = this.useDeArrowTitles
-    this.showDeArrowThumbnail = this.useDeArrowThumbnails
-
-    if ((this.showDeArrowTitle || this.showDeArrowThumbnail) && !this.deArrowCache) {
+    if ((this.useDeArrowTitles || this.useDeArrowThumbnails) && !this.deArrowCache) {
       this.fetchDeArrowData()
     }
 
-    if (this.showDeArrowThumbnail && this.deArrowCache && this.deArrowCache.thumbnail == null) {
+    if (this.useDeArrowThumbnails && this.deArrowCache && this.deArrowCache.thumbnail == null) {
       if (this.debounceGetDeArrowThumbnail == null) {
         this.debounceGetDeArrowThumbnail = debounce(this.fetchDeArrowThumbnail, 1000)
       }
@@ -576,7 +554,7 @@ export default defineComponent({
       this.$store.commit('addVideoToDeArrowCache', cacheData)
 
       // fetch dearrow thumbnails if enabled
-      if (this.showDeArrowThumbnail && this.deArrowCache?.thumbnail === null) {
+      if (this.useDeArrowThumbnails && this.deArrowCache?.thumbnail === null) {
         if (this.debounceGetDeArrowThumbnail == null) {
           this.debounceGetDeArrowThumbnail = debounce(this.fetchDeArrowThumbnail, 1000)
         }
@@ -584,20 +562,6 @@ export default defineComponent({
         this.debounceGetDeArrowThumbnail()
       }
     },
-    toggleDeArrow() {
-      if (!this.deArrowChangedContent) {
-        return
-      }
-
-      this.deArrowTogglePinned = !this.deArrowTogglePinned
-
-      if (this.useDeArrowTitles) {
-        this.showDeArrowTitle = !this.showDeArrowTitle
-      }
-      if (this.useDeArrowThumbnails) {
-        this.showDeArrowThumbnail = !this.showDeArrowThumbnail
-      }
-    },
 
     handleExternalPlayer: function () {
       this.$emit('pause-player')
@@ -698,11 +662,6 @@ export default defineComponent({
       this.isLive = this.data.liveNow || this.data.lengthSeconds === 'undefined'
       this.isUpcoming = this.data.isUpcoming || this.data.premiere
       this.is4k = this.data.is4k
-      this.is8k = this.data.is8k
-      this.isNew = this.data.isNew
-      this.isVr180 = this.data.isVr180
-      this.isVr360 = this.data.isVr360
-      this.is3D = this.data.is3d
       this.hasCaptions = this.data.hasCaptions
       this.isPremium = this.data.premium || false
       this.viewCount = this.data.viewCount
diff --git a/src/renderer/components/ft-list-video/ft-list-video.scss b/src/renderer/components/ft-list-video/ft-list-video.scss
index eb3c52df7a9c9..b8856f1151021 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.scss
+++ b/src/renderer/components/ft-list-video/ft-list-video.scss
@@ -27,30 +27,3 @@
 .videoTagLine .videoTag:first-child {
   margin-inline-start: 0;
 }
-
-.deArrowToggleButton {
-  border-radius: 50%;
-  cursor: pointer;
-  block-size: 1em;
-  inline-size: 1em;
-  padding: 10px;
-  font-size: 16px;
-  transition: background 0.15s ease-out;
-  color: var(--primary-color);
-
-  &:not(.disabled) {
-    &:hover,
-    &:focus-visible {
-      background-color: var(--side-nav-hover-color);
-    }
-
-    &:active {
-      background-color: var(--side-nav-active-color);
-    }
-
-    &.alwaysVisible {
-      opacity: 1;
-      filter: grayscale(1);
-    }
-  }
-}
diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue
index e53bbf3a5a4f3..8504b3683d92b 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.vue
+++ b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -146,17 +146,9 @@
         > • {{ $tc('Global.Counts.Watching Count', viewCount, {count: parsedViewCount}) }}</span>
       </div>
       <div
-        v-if="is4k || hasCaptions || is8k || isNew || isVr180 || isVr360 || is3D"
+        v-if="is4k || hasCaptions"
         class="videoTagLine"
       >
-        <div
-          v-if="isNew"
-          class="videoTag"
-          :aria-label="$t('Search Listing.Label.New')"
-          role="img"
-        >
-          {{ $t('Search Listing.Label.New') }}
-        </div>
         <div
           v-if="is4k"
           class="videoTag"
@@ -165,38 +157,6 @@
         >
           {{ $t('Search Listing.Label.4K') }}
         </div>
-        <div
-          v-if="is8k"
-          class="videoTag"
-          :aria-label="$t('Search Listing.Label.8K')"
-          role="img"
-        >
-          {{ $t('Search Listing.Label.8K') }}
-        </div>
-        <div
-          v-if="isVr180"
-          class="videoTag"
-          :aria-label="$t('Search Listing.Label.VR180')"
-          role="img"
-        >
-          {{ $t('Search Listing.Label.VR180') }}
-        </div>
-        <div
-          v-if="isVr360"
-          class="videoTag"
-          :aria-label="$t('Search Listing.Label.360 Video')"
-          role="img"
-        >
-          {{ $t('Search Listing.Label.360 Video') }}
-        </div>
-        <div
-          v-if="is3D"
-          class="videoTag"
-          :aria-label="$t('Search Listing.Label.3D')"
-          role="img"
-        >
-          {{ $t('Search Listing.Label.3D') }}
-        </div>
         <div
           v-if="hasCaptions"
           class="videoTag"
@@ -206,31 +166,17 @@
           {{ $t('Search Listing.Label.Subtitles') }}
         </div>
       </div>
-      <div class="buttonStack">
-        <ft-icon-button
-          class="optionsButton"
-          :icon="['fas', 'ellipsis-v']"
-          :title="$t('Video.More Options')"
-          theme="base-no-default"
-          :size="16"
-          :use-shadow="false"
-          dropdown-position-x="left"
-          :dropdown-options="dropdownOptions"
-          @click="handleOptionsClick"
-        />
-        <font-awesome-icon
-          v-if="deArrowChangedContent || deArrowTogglePinned"
-          :title="deArrowToggleTitle"
-          :icon="['far', 'dot-circle']"
-          class="optionsButton deArrowToggleButton"
-          :class="{ alwaysVisible: deArrowTogglePinned }"
-          tabindex="0"
-          role="button"
-          @click="toggleDeArrow"
-          @keydown.enter.prevent="toggleDeArrow"
-          @keydown.space.prevent="toggleDeArrow"
-        />
-      </div>
+      <ft-icon-button
+        class="optionsButton"
+        :icon="['fas', 'ellipsis-v']"
+        :title="$t('Video.More Options')"
+        theme="base-no-default"
+        :size="16"
+        :use-shadow="false"
+        dropdown-position-x="left"
+        :dropdown-options="dropdownOptions"
+        @click="handleOptionsClick"
+      />
       <p
         v-if="description && effectiveListTypeIsList && appearance === 'result'"
         class="description"
diff --git a/src/renderer/components/FtLogoFull/FtLogoFull.css b/src/renderer/components/ft-logo-full/ft-logo-full.css
similarity index 100%
rename from src/renderer/components/FtLogoFull/FtLogoFull.css
rename to src/renderer/components/ft-logo-full/ft-logo-full.css
diff --git a/src/renderer/components/FtLogoFull/FtLogoFull.vue b/src/renderer/components/ft-logo-full/ft-logo-full.vue
similarity index 99%
rename from src/renderer/components/FtLogoFull/FtLogoFull.vue
rename to src/renderer/components/ft-logo-full/ft-logo-full.vue
index 1450d4aceb946..d73063727f3ef 100644
--- a/src/renderer/components/FtLogoFull/FtLogoFull.vue
+++ b/src/renderer/components/ft-logo-full/ft-logo-full.vue
@@ -1,5 +1,6 @@
 <template>
   <svg
+    class="ft-logo-full"
     viewBox="0 0 640 200"
     version="1.1"
     xmlns="http://www.w3.org/2000/svg"
@@ -62,4 +63,4 @@
   </svg>
 </template>
 
-<style scoped src="./FtLogoFull.css" />
+<style scoped src="./ft-logo-full.css" />
diff --git a/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js b/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js
index fe276181a88c5..825ddc1119abb 100644
--- a/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js
+++ b/src/renderer/components/ft-playlist-selector/ft-playlist-selector.js
@@ -1,7 +1,6 @@
 import { defineComponent } from 'vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import { mapActions } from 'vuex'
-import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'FtPlaylistSelector',
@@ -38,7 +37,7 @@ export default defineComponent({
   data: function () {
     return {
       title: '',
-      thumbnail: thumbnailPlaceholder,
+      thumbnail: require('../../assets/img/thumbnail_placeholder.svg'),
       videoCount: 0,
 
       videoPresenceCountInPlaylistTextShouldBeVisible: false,
diff --git a/src/renderer/components/FtProgressBar/FtProgressBar.css b/src/renderer/components/ft-progress-bar/ft-progress-bar.css
similarity index 75%
rename from src/renderer/components/FtProgressBar/FtProgressBar.css
rename to src/renderer/components/ft-progress-bar/ft-progress-bar.css
index 94d45d244cb73..c7ebd6f3ca871 100644
--- a/src/renderer/components/FtProgressBar/FtProgressBar.css
+++ b/src/renderer/components/ft-progress-bar/ft-progress-bar.css
@@ -4,5 +4,6 @@
   inset-block-end: 0;
   inset-inline-start: 0;
   background-color: var(--primary-color);
-  z-index: 4;
+  z-index: 1;
+  transition: inline-size 0.5s;
 }
diff --git a/src/renderer/components/ft-progress-bar/ft-progress-bar.js b/src/renderer/components/ft-progress-bar/ft-progress-bar.js
new file mode 100644
index 0000000000000..14b91aa2cbcb6
--- /dev/null
+++ b/src/renderer/components/ft-progress-bar/ft-progress-bar.js
@@ -0,0 +1,10 @@
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'FtProgressBar',
+  computed: {
+    progressBarPercentage: function () {
+      return this.$store.getters.getProgressBarPercentage
+    }
+  }
+})
diff --git a/src/renderer/components/ft-progress-bar/ft-progress-bar.vue b/src/renderer/components/ft-progress-bar/ft-progress-bar.vue
new file mode 100644
index 0000000000000..28d835b2f3652
--- /dev/null
+++ b/src/renderer/components/ft-progress-bar/ft-progress-bar.vue
@@ -0,0 +1,9 @@
+<template>
+  <div
+    class="progressBar"
+    :style="{ inlineSize: progressBarPercentage + '%' }"
+  />
+</template>
+
+<script src="./ft-progress-bar.js" />
+<style scoped src="./ft-progress-bar.css" />
diff --git a/src/renderer/components/ft-radio-button/ft-radio-button.vue b/src/renderer/components/ft-radio-button/ft-radio-button.vue
index 46fcc3b1e7d5b..e7974f9f94e11 100644
--- a/src/renderer/components/ft-radio-button/ft-radio-button.vue
+++ b/src/renderer/components/ft-radio-button/ft-radio-button.vue
@@ -6,6 +6,7 @@
     <!--  eslint-disable vue/no-template-key -->
     <template
       v-for="(label, index) in labels"
+      class="radioButtonContainer"
     >
       <input
         :id="values[index] + id"
diff --git a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js
index c0c6ccb6700bd..f73e7585ab3e2 100644
--- a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js
+++ b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.js
@@ -1,8 +1,6 @@
 import { defineComponent } from 'vue'
 
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
-import { KeyboardShortcuts } from '../../../constants'
-import { addKeyboardShortcutToActionTitle } from '../../helpers/utils'
 
 export default defineComponent({
   name: 'FtRefreshWidget',
@@ -24,14 +22,6 @@ export default defineComponent({
     }
   },
   emits: ['click'],
-  computed: {
-    refreshFeedButtonTitle: function() {
-      return addKeyboardShortcutToActionTitle(
-        this.$t('Feed.Refresh Feed', { subscriptionName: this.title }),
-        KeyboardShortcuts.APP.SITUATIONAL.REFRESH
-      )
-    }
-  },
   methods: {
     click: function() {
       this.$emit('click')
diff --git a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue
index 18dadae7709cb..8224711566915 100644
--- a/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue
+++ b/src/renderer/components/ft-refresh-widget/ft-refresh-widget.vue
@@ -12,7 +12,7 @@
       :disabled="disableRefresh"
       :icon="['fas', 'sync']"
       class="refreshButton"
-      :title="refreshFeedButtonTitle"
+      :title="$t('Feed.Refresh Feed', { subscriptionName: title })"
       :size="12"
       theme="primary"
       @click="click"
diff --git a/src/renderer/components/FtSearchFilters/FtSearchFilters.css b/src/renderer/components/ft-search-filters/ft-search-filters.css
similarity index 100%
rename from src/renderer/components/FtSearchFilters/FtSearchFilters.css
rename to src/renderer/components/ft-search-filters/ft-search-filters.css
diff --git a/src/renderer/components/ft-search-filters/ft-search-filters.js b/src/renderer/components/ft-search-filters/ft-search-filters.js
new file mode 100644
index 0000000000000..cd869d750085a
--- /dev/null
+++ b/src/renderer/components/ft-search-filters/ft-search-filters.js
@@ -0,0 +1,221 @@
+import { defineComponent } from 'vue'
+import { mapActions } from 'vuex'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtRadioButton from '../ft-radio-button/ft-radio-button.vue'
+import FtPrompt from '../ft-prompt/ft-prompt.vue'
+import FtButton from '../ft-button/ft-button.vue'
+import FtCheckboxList from '../ft-checkbox-list/ft-checkbox-list.vue'
+
+export default defineComponent({
+  name: 'FtSearchFilters',
+  components: {
+    'ft-flex-box': FtFlexBox,
+    'ft-radio-button': FtRadioButton,
+    'ft-prompt': FtPrompt,
+    'ft-button': FtButton,
+    'ft-checkbox-list': FtCheckboxList
+  },
+  data: function () {
+    return {
+      searchSortByStartIndex: 0,
+      searchTimeStartIndex: 0,
+      searchTypeStartIndex: 0,
+      searchDurationStartIndex: 0,
+      searchDefaultFeatures: [],
+      sortByValues: [
+        'relevance',
+        'rating',
+        'upload_date',
+        'view_count'
+      ],
+      timeValues: [
+        '',
+        'hour',
+        'today',
+        'week',
+        'month',
+        'year'
+      ],
+      typeValues: [
+        'all',
+        'video',
+        'channel',
+        'playlist',
+        'movie'
+      ],
+      durationValues: [
+        '',
+        'short',
+        'medium',
+        'long'
+      ],
+      featureValues: [
+        'hd',
+        'subtitles',
+        'creative_commons',
+        '3d',
+        'live',
+        '4k',
+        '360',
+        'location',
+        'hdr',
+        'vr180'
+      ],
+      notAllowedForMoviesFeatures: [
+        'live',
+        'subtitles',
+        '3d',
+        'creative_commons'
+      ]
+    }
+  },
+  computed: {
+    title: function () {
+      return this.$t('Search Filters.Search Filters')
+    },
+
+    searchSettings: function () {
+      return this.$store.getters.getSearchSettings
+    },
+
+    searchFilterValueChanged: function() {
+      return [
+        this.$refs.sortByRadio.selectedValue !== this.sortByValues[0],
+        this.$refs.timeRadio.selectedValue !== this.timeValues[0],
+        this.$refs.typeRadio.selectedValue !== this.typeValues[0],
+        this.$refs.durationRadio.selectedValue !== this.durationValues[0],
+        this.$refs.featuresCheck.selectedValues.length !== 0
+      ].some((bool) => bool === true)
+    },
+
+    sortByLabels: function () {
+      return [
+        this.$t('Search Filters.Sort By.Most Relevant'),
+        this.$t('Search Filters.Sort By.Rating'),
+        this.$t('Search Filters.Sort By.Upload Date'),
+        this.$t('Search Filters.Sort By.View Count')
+      ]
+    },
+
+    timeLabels: function () {
+      return [
+        this.$t('Search Filters.Time.Any Time'),
+        this.$t('Search Filters.Time.Last Hour'),
+        this.$t('Search Filters.Time.Today'),
+        this.$t('Search Filters.Time.This Week'),
+        this.$t('Search Filters.Time.This Month'),
+        this.$t('Search Filters.Time.This Year')
+      ]
+    },
+
+    typeLabels: function () {
+      return [
+        this.$t('Search Filters.Type.All Types'),
+        this.$t('Search Filters.Type.Videos'),
+        this.$t('Search Filters.Type.Channels'),
+        this.$t('Playlists'),
+        this.$t('Search Filters.Type.Movies')
+      ]
+    },
+
+    durationLabels: function () {
+      return [
+        this.$t('Search Filters.Duration.All Durations'),
+        this.$t('Search Filters.Duration.Short (< 4 minutes)'),
+        this.$t('Search Filters.Duration.Medium (4 - 20 minutes)'),
+        this.$t('Search Filters.Duration.Long (> 20 minutes)')
+      ]
+    },
+
+    featureLabels: function() {
+      return [
+        this.$t('Search Filters.Features.HD'),
+        this.$t('Search Filters.Features.Subtitles'),
+        this.$t('Search Filters.Features.Creative Commons'),
+        this.$t('Search Filters.Features.3D'),
+        this.$t('Search Filters.Features.Live'),
+        this.$t('Search Filters.Features.4K'),
+        this.$t('Search Filters.Features.360 Video'),
+        this.$t('Search Filters.Features.Location'),
+        this.$t('Search Filters.Features.HDR'),
+        this.$t('Search Filters.Features.VR180')
+      ]
+    },
+  },
+  created: function () {
+    this.searchSortByStartIndex = this.sortByValues.indexOf(this.searchSettings.sortBy)
+    this.searchTimeStartIndex = this.timeValues.indexOf(this.searchSettings.time)
+    this.searchTypeStartIndex = this.typeValues.indexOf(this.searchSettings.type)
+    this.searchDurationStartIndex = this.durationValues.indexOf(this.searchSettings.duration)
+    this.searchDefaultFeatures = [...this.searchSettings.features]
+  },
+  methods: {
+    isVideoOrMovieOrAll(type) {
+      return type === 'video' || type === 'movie' || type === 'all'
+    },
+
+    updateSortBy: function (value) {
+      this.$store.commit('setSearchSortBy', value)
+      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
+    },
+
+    updateTime: function (value) {
+      if (!this.isVideoOrMovieOrAll(this.searchSettings.type)) {
+        const typeRadio = this.$refs.typeRadio
+        typeRadio.updateSelectedValue('all')
+        this.$store.commit('setSearchType', 'all')
+      }
+      this.$store.commit('setSearchTime', value)
+      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
+    },
+
+    updateFeatures: function(value) {
+      if (!this.isVideoOrMovieOrAll(this.searchSettings.type) || this.notAllowedForMoviesFeatures.some(item => value.includes(item))) {
+        const typeRadio = this.$refs.typeRadio
+        typeRadio.updateSelectedValue('all')
+        this.$store.commit('setSearchType', 'all')
+      }
+
+      this.$store.commit('setSearchFeatures', value)
+      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
+    },
+
+    updateType: function (value) {
+      if (value === 'channel' || value === 'playlist') {
+        const timeRadio = this.$refs.timeRadio
+        const durationRadio = this.$refs.durationRadio
+        const sortByRadio = this.$refs.sortByRadio
+        const featuresCheck = this.$refs.featuresCheck
+        timeRadio.updateSelectedValue('')
+        durationRadio.updateSelectedValue('')
+        sortByRadio.updateSelectedValue(this.sortByValues[0])
+        featuresCheck.setSelectedValues([])
+        this.$store.commit('setSearchTime', '')
+        this.$store.commit('setSearchDuration', '')
+        this.$store.commit('setSearchFeatures', [])
+        this.$store.commit('setSearchSortBy', this.sortByValues[0])
+      } else if (value === 'movie') {
+        const featuresCheck = this.$refs.featuresCheck
+        const filteredFeatures = this.searchSettings.features.filter(e => !this.notAllowedForMoviesFeatures.includes(e))
+        featuresCheck.setSelectedValues([...filteredFeatures])
+        this.$store.commit('setSearchFeatures', filteredFeatures)
+      }
+      this.$store.commit('setSearchType', value)
+      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
+    },
+
+    updateDuration: function (value) {
+      if (value !== '' && !this.isVideoOrMovieOrAll(this.searchSettings.type)) {
+        const typeRadio = this.$refs.typeRadio
+        typeRadio.updateSelectedValue('all')
+        this.updateType('all')
+      }
+      this.$store.commit('setSearchDuration', value)
+      this.$store.commit('setSearchFilterValueChanged', this.searchFilterValueChanged)
+    },
+
+    ...mapActions([
+      'hideSearchFilters'
+    ])
+  }
+})
diff --git a/src/renderer/components/ft-search-filters/ft-search-filters.vue b/src/renderer/components/ft-search-filters/ft-search-filters.vue
new file mode 100644
index 0000000000000..ebe67a1742107
--- /dev/null
+++ b/src/renderer/components/ft-search-filters/ft-search-filters.vue
@@ -0,0 +1,74 @@
+<template>
+  <ft-prompt
+    theme="slim"
+    :label="title"
+    @click="hideSearchFilters"
+  >
+    <div>
+      <h2
+        class="center"
+        name="title"
+      >
+        {{ title }}
+      </h2>
+      <ft-flex-box class="radioFlexBox">
+        <ft-radio-button
+          ref="sortByRadio"
+          :title="$t('Search Filters.Sort By.Sort By')"
+          :labels="sortByLabels"
+          :values="sortByValues"
+          :initial-value-index="searchSortByStartIndex"
+          class="searchRadio"
+          @change="updateSortBy"
+        />
+        <ft-radio-button
+          ref="timeRadio"
+          :title="$t('Search Filters.Time.Time')"
+          :labels="timeLabels"
+          :values="timeValues"
+          :initial-value-index="searchTimeStartIndex"
+          class="searchRadio"
+          @change="updateTime"
+        />
+        <ft-radio-button
+          ref="typeRadio"
+          :title="$t('Search Filters.Type.Type')"
+          :labels="typeLabels"
+          :values="typeValues"
+          :initial-value-index="searchTypeStartIndex"
+          class="searchRadio"
+          @change="updateType"
+        />
+        <ft-radio-button
+          ref="durationRadio"
+          :title="$t('Search Filters.Duration.Duration')"
+          :labels="durationLabels"
+          :values="durationValues"
+          :initial-value-index="searchDurationStartIndex"
+          class="searchRadio"
+          @change="updateDuration"
+        />
+        <ft-checkbox-list
+          ref="featuresCheck"
+          :title="$t('Search Filters.Features.Features')"
+          :labels="featureLabels"
+          :values="featureValues"
+          :initial-values="searchDefaultFeatures"
+          class="searchRadio"
+          @change="updateFeatures"
+        />
+      </ft-flex-box>
+      <div class="searchFilterCloseButtonContainer">
+        <ft-button
+          :label="$t('Close')"
+          background-color="var(--primary-color)"
+          text-color="var(--text-with-main-color)"
+          @click="hideSearchFilters"
+        />
+      </div>
+    </div>
+  </ft-prompt>
+</template>
+
+<script src="./ft-search-filters.js" />
+<style scoped src="./ft-search-filters.css" />
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.js b/src/renderer/components/ft-settings-section/ft-settings-section.js
new file mode 100644
index 0000000000000..b161a08066996
--- /dev/null
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.js
@@ -0,0 +1,16 @@
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'FtSettingsSection',
+  props: {
+    title: {
+      type: String,
+      required: true
+    },
+  },
+  computed: {
+    allSettingsSectionsExpandedByDefault: function () {
+      return this.$store.getters.getAllSettingsSectionsExpandedByDefault
+    }
+  }
+})
diff --git a/src/renderer/components/FtSettingsSection/FtSettingsSection.scss b/src/renderer/components/ft-settings-section/ft-settings-section.scss
similarity index 89%
rename from src/renderer/components/FtSettingsSection/FtSettingsSection.scss
rename to src/renderer/components/ft-settings-section/ft-settings-section.scss
index 50764ae348911..cdf50ffd3296e 100644
--- a/src/renderer/components/FtSettingsSection/FtSettingsSection.scss
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.scss
@@ -1,20 +1,16 @@
 .settingsSection {
+  background-color: var(--card-bg-color);
   margin-block: 0;
+  margin-inline: auto;
+  inline-size: 85%;
 
   @media only screen and (width <= 800px) {
     inline-size: 100%;
   }
-}
 
-.sectionHeader {
-  cursor: pointer;
-  display: block;
-  padding: 1px;
-}
-
-.sectionBody {
-  background-color: var(--card-bg-color);
-  padding-block: 10px;
+  &[open] {
+    padding-block-end: 15px;
+  }
 
   > div {
     box-sizing: border-box;
@@ -30,9 +26,22 @@
   }
 }
 
+.sectionLine {
+  border: 0;
+  border-block-start: 2px solid var(--primary-color);
+  margin-block-start: -1px;
+  inline-size: 100%;
+}
+
+.sectionHeader {
+  cursor: pointer;
+  display: block;
+  padding: 1px;
+}
+
 .sectionTitle {
   user-select: none;
-  margin-inline-start: 20px;
+  margin-inline-start: 2%;
   margin-block: 0.5em;
 }
 
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.vue b/src/renderer/components/ft-settings-section/ft-settings-section.vue
new file mode 100644
index 0000000000000..5bcae70f1a1d7
--- /dev/null
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.vue
@@ -0,0 +1,17 @@
+<template>
+  <details
+    :open="allSettingsSectionsExpandedByDefault"
+    class="settingsSection"
+  >
+    <summary class="sectionHeader">
+      <h3 class="sectionTitle">
+        {{ title }}
+      </h3>
+    </summary>
+    <hr class="sectionLine">
+    <slot />
+  </details>
+</template>
+
+<script src="./ft-settings-section.js" />
+<style scoped src="./ft-settings-section.scss" lang="scss" />
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css
index 7fc603f68c940..f6afe74816f02 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.css
@@ -8,13 +8,6 @@
     so we want to make it black as it defaults to transparent
    */
   background-color: #000;
-
-  /*
-    Fixes the seek bar thumbnails causing a horizontal scroll bar
-    to appear after exiting full screen and full window.
-    But also vertically in case context menu overflows.
-  */
-  overflow: hidden;
 }
 
 .player {
@@ -44,35 +37,6 @@
   flex-direction: column-reverse;
 }
 
-/*
-  Apply the active FreeTube base theme to shaka-player's menus.
-  Usually we go for classes and not element names,
-  however as we need to override shaka-player's CSS
-  we need to use the same selectors that they do.
-*/
-
-:deep(.shaka-overflow-menu),
-:deep(.shaka-settings-menu) {
-  background: var(--card-bg-color) !important;
-}
-
-:deep(.shaka-overflow-menu button),
-:deep(.shaka-settings-menu button) {
-  color: var(--primary-text-color) !important;
-}
-
-:deep(.shaka-overflow-menu button:hover),
-:deep(.shaka-settings-menu button:hover) {
-  background: var(--side-nav-hover-color) !important;
-  color: var(--side-nav-hover-text-color) !important;
-}
-
-:deep(.shaka-overflow-menu-only .shaka-current-selection-span) {
-  color: var(--tertiary-text-color) !important;
-}
-
-/* End of theming code */
-
 .sixteenByNine {
   aspect-ratio: 16 / 9;
 }
@@ -201,10 +165,6 @@
   opacity: 1;
 }
 
-:deep(.shaka-controls-container > .shaka-play-button-container > .shaka-play-button) {
-  padding: min(calc(15% / 2), 55px);
-}
-
 .ftVideoPlayer:fullscreen :deep(.theatre-button),
 .ftVideoPlayer:fullscreen :deep(.full-window-button),
 .fullWindow :deep(.theatre-button) {
@@ -243,32 +203,6 @@
   }
 }
 
-@media only screen and (width >= 1000px) {
-  :deep(.shaka-bottom-controls) {
-    /* remove some bottom padding since the seek bar is above */
-    padding-bottom: 0;
-
-    /* make seekbar take full width on non-mobile devices */
-    width: 100%;
-  }
-
-  /* increase height of captions area since we remove the padding-bottom below the seekbar */
-  :deep(.shaka-controls-container[shown='true']~.shaka-text-container) {
-    bottom: 12.5%;
-  }
-
-  :deep(.shaka-controls-button-panel>button) {
-    height: 40px;
-    line-height: 0.5;
-  }
-
-  :deep(.shaka-tooltips-on button:active::after),
-  :deep(.shaka-tooltips-on button:focus-visible::after),
-  :deep(.shaka-tooltips-on button:hover::after) {
-    margin-bottom: 8px;
-  }
-}
-
 @media only screen and (width <=1350px) {
   :deep(.theatre-button) {
     display: none;
@@ -282,11 +216,4 @@
   }
 }
 
-@media (prefers-reduced-transparency:no-preference) {
-  /* add transparency to big play button */
-  :deep(.shaka-controls-container[shown='true'] > .shaka-play-button-container > .shaka-play-button) {
-    opacity: 0.75 !important;
-  }
-}
-
 /* stylelint-enable liberty/use-logical-spec */
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
index bf53f9182a2a9..e0afeb6c37627 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
@@ -3,10 +3,11 @@ import path from 'path'
 
 import { computed, defineComponent, onBeforeUnmount, onMounted, reactive, ref, shallowRef, watch } from 'vue'
 import shaka from 'shaka-player'
-import { useI18n } from '../../composables/use-i18n-polyfill'
 
 import store from '../../store/index'
-import { IpcChannels, KeyboardShortcuts } from '../../../constants'
+import i18n from '../../i18n/index'
+
+import { IpcChannels } from '../../../constants'
 import { AudioTrackSelection } from './player-components/AudioTrackSelection'
 import { FullWindowButton } from './player-components/FullWindowButton'
 import { LegacyQualitySelection } from './player-components/LegacyQualitySelection'
@@ -17,12 +18,12 @@ import {
   findMostSimilarAudioBandwidth,
   getSponsorBlockSegments,
   logShakaError,
+  qualityLabelToDimension,
   repairInvidiousManifest,
   sortCaptions,
   translateSponsorBlockCategory
 } from '../../helpers/player/utils'
 import {
-  addKeyboardShortcutToActionTitle,
   getPicturesPath,
   showSaveDialog,
   showToast
@@ -40,23 +41,6 @@ const RequestType = shaka.net.NetworkingEngine.RequestType
 const AdvancedRequestType = shaka.net.NetworkingEngine.AdvancedRequestType
 const TrackLabelFormat = shaka.ui.Overlay.TrackLabelFormat
 
-/*
-  Mapping of Shaka localization keys for control labels to FreeTube shortcuts.
-  See: https://github.com/shaka-project/shaka-player/blob/main/ui/locales/en.json
-*/
-const shakaControlKeysToShortcuts = {
-  MUTE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE,
-  UNMUTE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE,
-  PLAY: KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.PLAY,
-  PAUSE: KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.PLAY,
-  PICTURE_IN_PICTURE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE,
-  ENTER_PICTURE_IN_PICTURE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE,
-  EXIT_PICTURE_IN_PICTURE: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE,
-  CAPTIONS: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.CAPTIONS,
-  FULL_SCREEN: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN,
-  EXIT_FULL_SCREEN: KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN
-}
-
 /** @type {Map<string, string>} */
 const LOCALE_MAPPINGS = new Map(process.env.SHAKA_LOCALE_MAPPINGS)
 
@@ -122,7 +106,7 @@ export default defineComponent({
     vrProjection: {
       type: String,
       default: null
-    },
+    }
   },
   emits: [
     'error',
@@ -132,8 +116,6 @@ export default defineComponent({
     'toggle-theatre-mode'
   ],
   setup: function (props, { emit, expose }) {
-    const { locale, t } = useI18n()
-
     /** @type {shaka.Player|null} */
     let player = null
 
@@ -245,12 +227,6 @@ export default defineComponent({
       return store.getters.getDefaultSkipInterval
     })
 
-    watch(defaultSkipInterval, (newValue) => {
-      ui.configure({
-        tapSeekDistance: newValue
-      })
-    })
-
     /** @type {import('vue').ComputedRef<number | 'auto'>} */
     const defaultQuality = computed(() => {
       const value = store.getters.getDefaultQuality
@@ -380,7 +356,7 @@ export default defineComponent({
        *     color: string,
        *     skip: 'autoSkip' | 'promptToSkip' | 'showInSeekBar' | 'doNothing'
        *   }
-        }} */
+       * }} */
       const categoryData = {}
 
       sponsorCategories.forEach(x => {
@@ -562,7 +538,7 @@ export default defineComponent({
      * @param {'dash'|'audio'|'legacy'} format
      * @param {boolean} useAutoQuality
      * @returns {shaka.extern.PlayerConfiguration}
-     */
+     **/
     function getPlayerConfig(format, useAutoQuality = false) {
       return {
         // YouTube uses these values and they seem to work well in FreeTube too,
@@ -580,6 +556,7 @@ export default defineComponent({
           dash: {
             manifestPreprocessorTXml: manifestPreprocessorTXml
           },
+          availabilityWindowOverride: seekingIsPossible.value ? NaN : 0
         },
         abr: {
           enabled: useAutoQuality,
@@ -589,11 +566,9 @@ export default defineComponent({
         },
         autoShowText: shaka.config.AutoShowText.NEVER,
 
-        // Prioritise variants that are predicted to play:
-        // - `smooth`: without dropping frames
-        // - `powerEfficient` the spec is quite vague but in Chromium it should prioritise hardware decoding when available
+        // Only use variants that are predicted to play smoothly
         // https://developer.mozilla.org/en-US/docs/Web/API/MediaCapabilities/decodingInfo
-        preferredDecodingAttributes: format === 'dash' ? ['smooth', 'powerEfficient'] : [],
+        preferredDecodingAttributes: format === 'dash' ? ['smooth'] : [],
 
         // Electron doesn't like YouTube's vp9 VR video streams and throws:
         // "CHUNK_DEMUXER_ERROR_APPEND_FAILED: Projection element is incomplete; ProjectionPoseYaw required."
@@ -845,7 +820,6 @@ export default defineComponent({
           addBigPlayButton: displayVideoPlayButton.value,
           enableFullscreenOnRotation: enterFullscreenOnDisplayRotate.value,
           playbackRates: playbackRates.value,
-          tapSeekDistance: defaultSkipInterval.value,
 
           // we have our own ones (shaka-player's ones are quite limited)
           enableKeyboardPlaybackControls: false,
@@ -994,7 +968,7 @@ export default defineComponent({
      * @param {string} locale
      */
     async function setLocale(locale) {
-      // For most of FreeTube's locales, there is an equivalent one in shaka-player,
+      // For most of FreeTube's locales their is an equivalent one in shaka-player,
       // however if there isn't one we should fall back to US English.
       // At the time of writing "et", "eu", "gl", "is" don't have any translations
       const shakaLocale = LOCALE_MAPPINGS.get(locale) ?? 'en'
@@ -1015,31 +989,10 @@ export default defineComponent({
 
       localization.changeLocale([shakaLocale])
 
-      // Add the keyboard shortcut to the label for the default Shaka controls
-
-      const shakaControlKeysToShortcutLocalizations = new Map()
-      Object.entries(shakaControlKeysToShortcuts).forEach(([shakaControlKey, shortcut]) => {
-        const originalLocalization = localization.resolve(shakaControlKey)
-        if (originalLocalization === '') {
-          // e.g., A Shaka localization key in shakaControlKeysToShortcuts has fallen out of date and need to be updated
-          console.error('Mising Shaka localization key "%s"', shakaControlKey)
-          return
-        }
-
-        const localizationWithShortcut = addKeyboardShortcutToActionTitle(
-          originalLocalization,
-          shortcut
-        )
-
-        shakaControlKeysToShortcutLocalizations.set(shakaControlKey, localizationWithShortcut)
-      })
-
-      localization.insert(shakaLocale, shakaControlKeysToShortcutLocalizations)
-
       events.dispatchEvent(new CustomEvent('localeChanged'))
     }
 
-    watch(locale, setLocale)
+    watch(() => i18n.locale, setLocale)
 
     // #endregion player locales
 
@@ -1186,8 +1139,7 @@ export default defineComponent({
           if (url.hostname.endsWith('.youtube.com') && url.pathname === '/api/timedtext' &&
             url.searchParams.get('caps') === 'asr' && url.searchParams.get('kind') === 'asr' && url.searchParams.get('fmt') === 'vtt') {
             const stringBody = new TextDecoder().decode(response.data)
-            // position:0% for LTR text and position:100% for RTL text
-            const cleaned = stringBody.replaceAll(/ align:start position:(?:10)?0%$/gm, '')
+            const cleaned = stringBody.replaceAll(/ align:start position:0%$/gm, '')
 
             response.data = new TextEncoder().encode(cleaned).buffer
           }
@@ -1299,30 +1251,33 @@ export default defineComponent({
     }
 
     /**
+     * @param {'dash'|'audio'|null} previousFormat
      * @param {number|null} playbackPosition
-     * @param {number|undefined} previousQuality
      */
-    async function setLegacyQuality(playbackPosition = null, previousQuality = undefined) {
-      if (typeof previousQuality === 'undefined') {
-        if (defaultQuality.value === 'auto') {
-          previousQuality = Infinity
-        } else {
-          previousQuality = defaultQuality.value
-        }
-      }
-
+    async function setLegacyQuality(previousFormat = null, playbackPosition = null) {
       /** @type {object[]} */
       const legacyFormats = props.legacyFormats
 
-      const isPortrait = legacyFormats[0].height > legacyFormats[0].width
+      // TODO: switch to using height and width when Invidious starts returning them, instead of parsing the quality label
+
+      let previousQuality
+      if (previousFormat === 'dash') {
+        const previousTrack = player.getVariantTracks().find(track => track.active)
+
+        previousQuality = previousTrack.height > previousTrack.width ? previousTrack.width : previousTrack.height
+      } else if (defaultQuality.value === 'auto') {
+        previousQuality = Infinity
+      } else {
+        previousQuality = defaultQuality.value
+      }
 
       let matches = legacyFormats.filter(variant => {
-        return previousQuality === isPortrait ? variant.width : variant.height
+        return previousQuality === qualityLabelToDimension(variant.qualityLabel)
       })
 
       if (matches.length === 0) {
         matches = legacyFormats.filter(variant => {
-          return previousQuality > isPortrait ? variant.width : variant.height
+          return previousQuality > qualityLabelToDimension(variant.qualityLabel)
         })
 
         if (matches.length > 0) {
@@ -1452,8 +1407,26 @@ export default defineComponent({
 
       stats.bitrate = (bitrate / 1000).toFixed(2)
 
-      stats.resolution.width = width
-      stats.resolution.height = height
+      if (typeof width === 'undefined' || typeof height === 'undefined') {
+        // Invidious doesn't provide any height or width information for their legacy formats, so lets read it from the video instead
+        // they have a size property but it's hard-coded, so it reports false information for shorts for example
+        const video_ = video.value
+
+        if (hasLoaded.value) {
+          stats.resolution.width = video_.videoWidth
+          stats.resolution.height = video_.videoHeight
+        } else {
+          video_.addEventListener('loadeddata', () => {
+            stats.resolution.width = video_.videoWidth
+            stats.resolution.height = video_.videoHeight
+          }, {
+            once: true
+          })
+        }
+      } else {
+        stats.resolution.width = width
+        stats.resolution.height = height
+      }
     }
 
     function updateStats() {
@@ -1535,8 +1508,7 @@ export default defineComponent({
 
       const format = screenshotFormat.value
       const mimeType = `image/${format === 'jpg' ? 'jpeg' : format}`
-      // imageQuality is ignored for pngs, so it is still okay to pass the quality value
-      const imageQuality = screenshotQuality.value / 100
+      const imageQuality = format === 'jpg' ? screenshotQuality.value / 100 : 1
 
       let filename
       try {
@@ -1547,7 +1519,7 @@ export default defineComponent({
         })
       } catch (err) {
         console.error(`Parse failed: ${err.message}`)
-        showToast(t('Screenshot Error', { error: err.message }))
+        showToast(i18n.t('Screenshot Error', { error: err.message }))
         canvas.remove()
         return
       }
@@ -1612,7 +1584,7 @@ export default defineComponent({
             await fs.mkdir(dirPath, { recursive: true })
           } catch (err) {
             console.error(err)
-            showToast(t('Screenshot Error', { error: err }))
+            showToast(i18n.t('Screenshot Error', { error: err }))
             canvas.remove()
             return
           }
@@ -1626,11 +1598,11 @@ export default defineComponent({
 
           fs.writeFile(filePath, arr)
             .then(() => {
-              showToast(t('Screenshot Success', { filePath }))
+              showToast(i18n.t('Screenshot Success', { filePath }))
             })
             .catch((err) => {
               console.error(err)
-              showToast(t('Screenshot Error', { error: err }))
+              showToast(i18n.t('Screenshot Error', { error: err }))
             })
         })
       }, mimeType, imageQuality)
@@ -1847,7 +1819,7 @@ export default defineComponent({
       const seekRange = player.seekRange()
 
       // Seeking not possible e.g. with HLS
-      if (seekRange.start === seekRange.end || !seekingIsPossible.value) {
+      if (seekRange.start === seekRange.end) {
         return false
       }
 
@@ -1917,7 +1889,7 @@ export default defineComponent({
 
     /**
      * @param {WheelEvent} event
-     */
+     * */
     function mouseScrollVolume(event) {
       if (!event.ctrlKey && !event.metaKey) {
         event.preventDefault()
@@ -2007,47 +1979,53 @@ export default defineComponent({
 
       const video_ = video.value
 
-      switch (event.key.toLowerCase()) {
+      switch (event.key) {
         case ' ':
-        case 'spacebar': // older browsers might return spacebar instead of a space character
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.PLAY:
+        case 'Spacebar': // older browsers might return spacebar instead of a space character
+        case 'K':
+        case 'k':
           // Toggle Play/Pause
           event.preventDefault()
           video_.paused ? video_.play() : video_.pause()
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.LARGE_REWIND:
+        case 'J':
+        case 'j':
           // Rewind by 2x the time-skip interval (in seconds)
           event.preventDefault()
           seekBySeconds(-defaultSkipInterval.value * video_.playbackRate * 2)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.LARGE_FAST_FORWARD:
+        case 'L':
+        case 'l':
           // Fast-Forward by 2x the time-skip interval (in seconds)
           event.preventDefault()
           seekBySeconds(defaultSkipInterval.value * video_.playbackRate * 2)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.DECREASE_VIDEO_SPEED:
+        case 'O':
+        case 'o':
           // Decrease playback rate by user configured interval
           event.preventDefault()
           changePlayBackRate(-videoPlaybackRateInterval.value)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.INCREASE_VIDEO_SPEED:
+        case 'P':
+        case 'p':
           // Increase playback rate by user configured interval
           event.preventDefault()
           changePlayBackRate(videoPlaybackRateInterval.value)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN:
+        case 'F':
+        case 'f':
           // Toggle full screen
           event.preventDefault()
           ui.getControls().toggleFullScreen()
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE:
-          // Toggle mute only if metakey is not pressed
-          if (!event.metaKey) {
-            event.preventDefault()
-            video_.muted = !video_.muted
-          }
+        case 'M':
+        case 'm':
+          // Toggle mute
+          event.preventDefault()
+          video_.muted = !video_.muted
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.CAPTIONS:
+        case 'C':
+        case 'c':
           // Toggle caption/subtitles
           if (player.getTextTracks().length > 0) {
             event.preventDefault()
@@ -2056,17 +2034,17 @@ export default defineComponent({
             player.setTextTrackVisibility(!currentlyVisible)
           }
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.VOLUME_UP:
+        case 'ArrowUp':
           // Increase volume
           event.preventDefault()
           changeVolume(0.05)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.VOLUME_DOWN:
+        case 'ArrowDown':
           // Decrease Volume
           event.preventDefault()
           changeVolume(-0.05)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.SMALL_REWIND:
+        case 'ArrowLeft':
           event.preventDefault()
           if (canChapterJump(event, 'previous')) {
             // Jump to the previous chapter
@@ -2076,7 +2054,7 @@ export default defineComponent({
             seekBySeconds(-defaultSkipInterval.value * video_.playbackRate)
           }
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.SMALL_FAST_FORWARD:
+        case 'ArrowRight':
           event.preventDefault()
           if (canChapterJump(event, 'next')) {
             // Jump to the next chapter
@@ -2086,7 +2064,8 @@ export default defineComponent({
             seekBySeconds(defaultSkipInterval.value * video_.playbackRate)
           }
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.PICTURE_IN_PICTURE:
+        case 'I':
+        case 'i':
           // Toggle picture in picture
           if (props.format !== 'audio') {
             const controls = ui.getControls()
@@ -2119,20 +2098,18 @@ export default defineComponent({
           }
           break
         }
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.LAST_FRAME:
-          // `⌘+,` is for settings in MacOS
-          if (!event.metaKey) {
-            event.preventDefault()
-            // Return to previous frame
-            frameByFrame(-1)
-          }
+        case ',':
+          event.preventDefault()
+          // Return to previous frame
+          frameByFrame(-1)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.PLAYBACK.NEXT_FRAME:
+        case '.':
           event.preventDefault()
           // Advance to next frame
           frameByFrame(1)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.STATS:
+        case 'D':
+        case 'd':
           // Toggle stats display
           event.preventDefault()
 
@@ -2140,7 +2117,7 @@ export default defineComponent({
             detail: !showStats.value
           }))
           break
-        case 'escape':
+        case 'Escape':
           // Exit full window
           if (fullWindowEnabled.value) {
             event.preventDefault()
@@ -2150,14 +2127,16 @@ export default defineComponent({
             }))
           }
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLWINDOW:
+        case 'S':
+        case 's':
           // Toggle full window mode
           event.preventDefault()
           events.dispatchEvent(new CustomEvent('setFullWindow', {
             detail: !fullWindowEnabled.value
           }))
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.THEATRE_MODE:
+        case 'T':
+        case 't':
           // Toggle theatre mode
           if (props.theatrePossible) {
             event.preventDefault()
@@ -2167,7 +2146,8 @@ export default defineComponent({
             }))
           }
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.TAKE_SCREENSHOT:
+        case 'U':
+        case 'u':
           if (process.env.IS_ELECTRON && enableScreenshot.value && props.format !== 'audio') {
             event.preventDefault()
             // Take screenshot
@@ -2179,28 +2159,17 @@ export default defineComponent({
 
     // #endregion keyboard shortcuts
 
-    let ignoreErrors = false
-
     /**
      * @param {shaka.util.Error} error
      * @param {string} context
-     * @param {object?} details
+     * @param {object=} details
      */
     function handleError(error, context, details) {
-      // These two errors are just wrappers around another error, so use the original error instead
-      // As they can be nested (e.g. multiple googlevideo redirects because the Invidious server was far away from the user) we should pick the inner most one
-      while (error.code === shaka.util.Error.Code.REQUEST_FILTER_ERROR || error.code === shaka.util.Error.Code.RESPONSE_FILTER_ERROR) {
-        error = error.data[0]
-      }
-
       logShakaError(error, context, props.videoId, details)
 
       // text related errors aren't serious (captions and seek bar thumbnails), so we should just log them
       // TODO: consider only emitting when the severity is crititcal?
-      if (!ignoreErrors && error.category !== shaka.util.Error.Category.TEXT) {
-        // don't react to multiple consecutive errors, otherwise we don't give the format fallback from the previous error a chance to work
-        ignoreErrors = true
-
+      if (error.category !== shaka.util.Error.Category.TEXT) {
         emit('error', error)
 
         stopPowerSaveBlocker()
@@ -2362,7 +2331,7 @@ export default defineComponent({
         player.getNetworkingEngine().registerResponseFilter(responseFilter)
       }
 
-      await setLocale(locale.value)
+      await setLocale(i18n.locale)
 
       // check if the component is already getting destroyed
       // which is possible because this function runs asynchronously
@@ -2414,8 +2383,19 @@ export default defineComponent({
       } else {
         // force the player aspect ratio to 16:9 to avoid overflowing the layout, when the video is too tall
 
+        // Invidious doesn't provide any height or width information for their legacy formats, so lets read it from the video instead
+        // they have a size property but it's hard-coded, so it reports false information for shorts for example
+
         const firstFormat = props.legacyFormats[0]
-        forceAspectRatio.value = firstFormat.width / firstFormat.height < 1.5
+        if (typeof firstFormat.width === 'undefined' || typeof firstFormat.height === 'undefined') {
+          videoElement.addEventListener('loadeddata', () => {
+            forceAspectRatio.value = videoElement.videoWidth / videoElement.videoHeight < 1.5
+          }, {
+            once: true
+          })
+        } else {
+          forceAspectRatio.value = firstFormat.width / firstFormat.height < 1.5
+        }
       }
 
       if (useSponsorBlock.value && sponsorSkips.value.seekBar.length > 0) {
@@ -2424,10 +2404,6 @@ export default defineComponent({
 
       window.addEventListener('beforeunload', stopPowerSaveBlocker)
 
-      // shaka-player doesn't start with the cursor hidden, so hide it here for instances in which the
-      // cursor is in the video player area when the video first loads
-      container.value.classList.add('no-cursor')
-
       await performFirstLoad()
     })
 
@@ -2457,7 +2433,7 @@ export default defineComponent({
           handleError(error, 'loading dash/audio manifest and setting default quality in mounted')
         }
       } else {
-        await setLegacyQuality(props.startTime)
+        await setLegacyQuality(null, props.startTime)
       }
     }
 
@@ -2485,8 +2461,7 @@ export default defineComponent({
                 const response = await fetch(caption.url)
                 let text = await response.text()
 
-                // position:0% for LTR text and position:100% for RTL text
-                text = text.replaceAll(/ align:start position:(?:10)?0%$/gm, '')
+                text = text.replaceAll(/ align:start position:0%$/gm, '')
 
                 const url = `data:${caption.mimeType};charset=utf-8,${encodeURIComponent(text)}`
 
@@ -2576,17 +2551,9 @@ export default defineComponent({
        * @param {'dash'|'audio'|'legacy'} oldFormat
        */
       async (newFormat, oldFormat) => {
-        ignoreErrors = true
-
         // format switch happened before the player loaded, probably because of an error
         // as there are no previous player settings to restore, we should treat it like this was the original format
         if (!hasLoaded.value) {
-          try {
-            await player.unload()
-          } catch { }
-
-          ignoreErrors = false
-
           player.configure(getPlayerConfig(newFormat, defaultQuality.value === 'auto'))
 
           await performFirstLoad()
@@ -2626,7 +2593,7 @@ export default defineComponent({
             const legacyFormat = activeLegacyFormat.value
 
             if (!useAutoQuality) {
-              dimension = legacyFormat.height > legacyFormat.width ? legacyFormat.width : legacyFormat.height
+              dimension = qualityLabelToDimension(legacyFormat.qualityLabel)
             }
           } else if (oldFormat !== 'legacy') {
             const track = player.getVariantTracks().find(track => track.active)
@@ -2649,12 +2616,6 @@ export default defineComponent({
             }
           }
 
-          try {
-            await player.unload()
-          } catch { }
-
-          ignoreErrors = false
-
           player.configure(getPlayerConfig(newFormat, useAutoQuality))
 
           try {
@@ -2692,21 +2653,7 @@ export default defineComponent({
           }
           activeLegacyFormat.value = null
         } else {
-          let previousQuality
-
-          if (oldFormat === 'dash') {
-            const previousTrack = player.getVariantTracks().find(track => track.active)
-
-            previousQuality = previousTrack.height > previousTrack.width ? previousTrack.width : previousTrack.height
-          }
-
-          try {
-            await player.unload()
-          } catch { }
-
-          ignoreErrors = false
-
-          await setLegacyQuality(playbackPosition, previousQuality)
+          await setLegacyQuality(oldFormat, playbackPosition)
         }
 
         if (wasPaused) {
@@ -2774,8 +2721,6 @@ export default defineComponent({
      * To workaround that we destroy the player first and wait for it to finish before we unmount this component.
      */
     async function destroyPlayer() {
-      ignoreErrors = true
-
       if (ui) {
         // destroying the ui also destroys the player
         await ui.destroy()
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue
index 6b2762e4e69c4..4b9519c772718 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.vue
@@ -1,10 +1,10 @@
 <template>
   <div
     ref="container"
-    class="ftVideoPlayer shaka-video-container"
+    class="ftVideoPlayer"
     :class="{
       fullWindow: fullWindowEnabled,
-      sixteenByNine: forceAspectRatio && !fullWindowEnabled
+      sixteenByNine: forceAspectRatio
     }"
   >
     <!-- eslint-disable-next-line vuejs-accessibility/media-has-caption -->
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js b/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js
index 6a1ea8435dc76..66cb393db3107 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/AudioTrackSelection.js
@@ -42,7 +42,7 @@ export class AudioTrackSelection extends shaka.ui.SettingsMenu {
 
   /**
    * @private
-   * @param {shaka.extern.TrackList?} tracks
+   * @param {shaka.extern.TrackList=} tracks
    */
   updateAudioTracks_(tracks) {
     if (!tracks) {
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js b/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
index 008c515b37468..2f0db723e3faf 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/FullWindowButton.js
@@ -1,8 +1,6 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
-import { KeyboardShortcuts } from '../../../../constants'
-import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class FullWindowButton extends shaka.ui.Element {
   /**
@@ -69,14 +67,12 @@ export class FullWindowButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
+    this.nameSpan_.textContent = i18n.t('Video.Player.Full Window')
+
     this.icon_.textContent = this.fullWindowEnabled_ ? 'close_fullscreen' : 'open_in_full'
+
     this.currentState_.textContent = this.localization.resolve(this.fullWindowEnabled_ ? 'ON' : 'OFF')
 
-    const baseAriaLabel = this.fullWindowEnabled_ ? i18n.t('Video.Player.Exit Full Window') : i18n.t('Video.Player.Full Window')
-    const newLabel = addKeyboardShortcutToActionTitle(
-      baseAriaLabel,
-      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLWINDOW
-    )
-    this.nameSpan_.textContent = this.button_.ariaLabel = newLabel
+    this.button_.ariaLabel = this.fullWindowEnabled_ ? i18n.t('Video.Player.Exit Full Window') : i18n.t('Video.Player.Full Window')
   }
 }
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
index a11e5a19ed35c..980dfe16fa4b0 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
@@ -22,8 +22,15 @@ export class LegacyQualitySelection extends shaka.ui.SettingsMenu {
 
     const sortedLegacyFormats = [...legacyFormats]
 
-    const isPortrait = legacyFormats[0].height > legacyFormats[0].width
-    sortedLegacyFormats.sort((a, b) => isPortrait ? b.width - a.width : b.height - a.height)
+    // Invidious doesn't return the height or width for the legacy formats, so we have to use the bitrate instead
+    if (typeof legacyFormats[0].width === 'undefined' || typeof legacyFormats[0].height === 'undefined') {
+      sortedLegacyFormats.sort((a, b) => {
+        return b.bitrate - a.bitrate
+      })
+    } else {
+      const isPortrait = legacyFormats[0].height > legacyFormats[0].width
+      sortedLegacyFormats.sort((a, b) => isPortrait ? b.width - a.width : b.height - a.height)
+    }
 
     /** @private */
     this.legacyFormats_ = sortedLegacyFormats
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js b/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
index 9398c1573b317..f9b187cef056e 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/ScreenshotButton.js
@@ -1,8 +1,6 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
-import { KeyboardShortcuts } from '../../../../constants'
-import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class ScreenshotButton extends shaka.ui.Element {
   /**
@@ -51,10 +49,8 @@ export class ScreenshotButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
-    const label = addKeyboardShortcutToActionTitle(
-      i18n.t('Video.Player.Take Screenshot'),
-      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.TAKE_SCREENSHOT
-    )
-    this.nameSpan_.textContent = this.button_.ariaLabel = label
+    this.nameSpan_.textContent = i18n.t('Video.Player.Take Screenshot')
+
+    this.button_.ariaLabel = i18n.t('Video.Player.Take Screenshot')
   }
 }
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js b/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js
index 5f6dccc818e3e..b6f6e8eb7a560 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/StatsButton.js
@@ -1,8 +1,6 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
-import { KeyboardShortcuts } from '../../../../constants'
-import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class StatsButton extends shaka.ui.Element {
   /**
@@ -67,15 +65,12 @@ export class StatsButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
+    this.nameSpan_.textContent = i18n.t('Video.Player.Stats.Stats')
+
     this.icon_.textContent = this.showStats_ ? 'insert_chart' : 'insert_chart_outlined'
 
-    const baseLabel = this.showStats_ ? i18n.t('Video.Player.Hide Stats') : i18n.t('Video.Player.Show Stats')
-    const label = addKeyboardShortcutToActionTitle(
-      baseLabel,
-      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.STATS
-    )
+    this.currentState_.textContent = this.localization.resolve(this.showStats_ ? 'ON' : 'OFF')
 
-    this.currentState_.textContent = label
-    this.button_.ariaLabel = label
+    this.button_.ariaLabel = this.showStats_ ? i18n.t('Video.Player.Hide Stats') : i18n.t('Video.Player.Show Stats')
   }
 }
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js b/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
index b7e1c0299e6f3..043e75b4e9d62 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/TheatreModeButton.js
@@ -1,8 +1,6 @@
 import shaka from 'shaka-player'
 
 import i18n from '../../../i18n/index'
-import { KeyboardShortcuts } from '../../../../constants'
-import { addKeyboardShortcutToActionTitle } from '../../../helpers/utils'
 
 export class TheatreModeButton extends shaka.ui.Element {
   /**
@@ -69,15 +67,12 @@ export class TheatreModeButton extends shaka.ui.Element {
 
   /** @private */
   updateLocalisedStrings_() {
+    this.nameSpan_.textContent = i18n.t('Video.Player.Theatre Mode')
+
     this.icon_.textContent = this.theatreModeEnabled_ ? 'monitor' : 'tv'
 
     this.currentState_.textContent = this.localization.resolve(this.theatreModeEnabled_ ? 'ON' : 'OFF')
 
-    const baseAriaLabel = this.theatreModeEnabled_ ? i18n.t('Video.Player.Exit Theatre Mode') : i18n.t('Video.Player.Theatre Mode')
-
-    this.nameSpan_.textContent = this.button_.ariaLabel = addKeyboardShortcutToActionTitle(
-      baseAriaLabel,
-      KeyboardShortcuts.VIDEO_PLAYER.GENERAL.THEATRE_MODE
-    )
+    this.button_.ariaLabel = this.theatreModeEnabled_ ? i18n.t('Video.Player.Exit Theatre Mode') : i18n.t('Video.Player.Theatre Mode')
   }
 }
diff --git a/src/renderer/components/ft-share-button/ft-share-button.css b/src/renderer/components/ft-share-button/ft-share-button.css
deleted file mode 100644
index e755f74c15c7b..0000000000000
--- a/src/renderer/components/ft-share-button/ft-share-button.css
+++ /dev/null
@@ -1,76 +0,0 @@
-.shareLinks {
-  display: grid;
-  grid-auto-flow: column;
-  grid-template-rows: auto auto;
-  padding: 12px;
-  inline-size: max-content;
-}
-
-.header {
-  color: var(--primary-text-color);
-  font-size: 18px;
-  font-weight: bold;
-  margin-block: 4px 8px;
-  margin-inline: 0;
-  display: flex;
-  justify-content: center;
-}
-
-.buttons {
-  display: flex;
-  flex-direction: column;
-  max-inline-size: min-content;
-  min-inline-size: 150px;
-}
-
-.action {
-  padding: 6px;
-  white-space: initial;
-}
-
-.divider {
-  background: var(--tertiary-text-color);
-  grid-row: span 3;
-  margin-block: 0;
-  margin-inline: 12px;
-  inline-size: 1px;
-}
-
-.youtubeLogo {
-  block-size: 18px;
-  inline-size: auto;
-}
-
-.invidious {
-  letter-spacing: -0.4px;
-}
-
-.invidiousLogo {
-  background-size: cover;
-  display: inline-block;
-  block-size: 20px;
-  margin-inline-end: 2px;
-  inline-size: 20px;
-}
-
-@media only screen and (width <= 450px) {
-  .shareLinks {
-    grid-auto-flow: row;
-    margin-inline: auto;
-    justify-items: center;
-    max-inline-size: max-content;
-  }
-
-  .header.invidious {
-    margin-block-start: 20px;
-  }
-
-  .buttons {
-    max-inline-size: min-content;
-    min-inline-size: 180px;
-  }
-
-  .divider {
-    display: none;
-  }
-}
diff --git a/src/renderer/components/ft-share-button/ft-share-button.js b/src/renderer/components/ft-share-button/ft-share-button.js
index 9130a6355620e..6d9eb6f73f149 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.js
+++ b/src/renderer/components/ft-share-button/ft-share-button.js
@@ -19,7 +19,7 @@ export default defineComponent({
        * Allows to render the dropdown conditionally
        * 'Channel' will exclude embed links
        * 'Video' (default) keeps the original behaviour
-       */
+       **/
       type: String,
       default: 'Video'
     },
diff --git a/src/renderer/components/ft-share-button/ft-share-button.scss b/src/renderer/components/ft-share-button/ft-share-button.scss
new file mode 100644
index 0000000000000..dc3515db90ba6
--- /dev/null
+++ b/src/renderer/components/ft-share-button/ft-share-button.scss
@@ -0,0 +1,117 @@
+/* stylelint-disable no-descending-specificity */
+.shareLinks {
+  display: grid;
+  grid-auto-flow: column;
+  grid-template-rows: auto auto;
+  padding: 12px;
+  inline-size: max-content;
+
+  .header {
+    color: var(--primary-text-color);
+    font-size: 18px;
+    font-weight: bold;
+    margin-block: 4px 8px;
+    margin-inline: 0;
+    display: flex;
+    justify-content: center;
+  }
+
+  .buttons {
+    display: flex;
+    flex-direction: column;
+    max-inline-size: min-content;
+    min-inline-size: 150px;
+
+    .action {
+      padding: 6px;
+      white-space: initial;
+    }
+  }
+
+  .divider {
+    background: var(--tertiary-text-color);
+    grid-row: span 3;
+    margin-block: 0;
+    margin-inline: 12px;
+    inline-size: 1px;
+  }
+
+  .youtubeLogo {
+    block-size: 18px;
+    inline-size: auto;
+
+    @at-root {
+      .dark &,
+      .system[data-system-theme*='dark'] & {
+        filter: brightness(0.868);
+      }
+
+      .black &,
+      .solarizedDark & {
+        filter: brightness(0.933);
+      }
+
+      /* no changes for the dracula theme */
+
+      .pastelPink &,
+      .light &,
+      .solarizedLight &,
+      .system[data-system-theme*='light'] & {
+        filter: invert(0.87);
+      }
+    }
+  }
+
+  .invidious {
+    letter-spacing: -0.4px;
+
+    .invidiousLogo {
+      background-size: cover;
+      display: inline-block;
+      block-size: 20px;
+      margin-inline-end: 2px;
+      inline-size: 20px;
+
+      @at-root {
+        .dark &,
+        .black &,
+        .dracula &,
+        .CatppuccinMocha &,
+        .hotPink &,
+        .solarizedDark &,
+        .system[data-system-theme*='dark'] & {
+          background-image: url('../../assets/img/invidious-logo-dark.svg');
+        }
+
+        .pastelPink &,
+        .light &,
+        .solarizedLight &,
+        .system[data-system-theme*='light'] & {
+          background-image: url('../../assets/img/invidious-logo-light.svg');
+        }
+      }
+    }
+  }
+}
+
+@media only screen and (width <= 450px) {
+  .shareLinks {
+    grid-auto-flow: row;
+    margin-inline: auto;
+    justify-items: center;
+    max-inline-size: max-content;
+
+    .header.invidious {
+      margin-block-start: 20px;
+    }
+
+    .buttons {
+      max-inline-size: min-content;
+      min-inline-size: 180px;
+    }
+
+    .divider {
+      display: none;
+    }
+  }
+}
diff --git a/src/renderer/components/ft-share-button/ft-share-button.vue b/src/renderer/components/ft-share-button/ft-share-button.vue
index f44ac34262a65..b72380c90ce1c 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.vue
+++ b/src/renderer/components/ft-share-button/ft-share-button.vue
@@ -121,4 +121,4 @@
 </template>
 
 <script src="./ft-share-button.js" />
-<style scoped src="./ft-share-button.css" />
+<style scoped lang="scss" src="./ft-share-button.scss" />
diff --git a/src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.css b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.css
similarity index 100%
rename from src/renderer/components/FtSponsorBlockCategory/FtSponsorBlockCategory.css
rename to src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.css
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
new file mode 100644
index 0000000000000..479752c148116
--- /dev/null
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
@@ -0,0 +1,163 @@
+import { defineComponent } from 'vue'
+import { mapActions } from 'vuex'
+import { colors, getColorTranslations } from '../../helpers/colors'
+import FtSelect from '../ft-select/ft-select.vue'
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
+
+export default defineComponent({
+  name: 'FtSponsorBlockCategory',
+  components: {
+    'ft-select': FtSelect
+  },
+  props: {
+    categoryName: {
+      type: String,
+      required: true
+    }
+  },
+  data: function () {
+    return {
+      skipValues: [
+        'autoSkip',
+        // 'promptToSkip',
+        'showInSeekBar',
+        'doNothing'
+      ]
+    }
+  },
+  computed: {
+    colorValues: function () {
+      return colors.map(color => color.name)
+    },
+
+    colorNames: function () {
+      return getColorTranslations()
+    },
+
+    sponsorBlockValues: function() {
+      let sponsorVal = ''
+      switch (this.categoryName.toLowerCase()) {
+        case 'sponsor':
+          sponsorVal = this.$store.getters.getSponsorBlockSponsor
+          break
+        case 'self-promotion':
+          sponsorVal = this.$store.getters.getSponsorBlockSelfPromo
+          break
+        case 'interaction':
+          sponsorVal = this.$store.getters.getSponsorBlockInteraction
+          break
+        case 'intro':
+          sponsorVal = this.$store.getters.getSponsorBlockIntro
+          break
+        case 'outro':
+          sponsorVal = this.$store.getters.getSponsorBlockOutro
+          break
+        case 'recap':
+          sponsorVal = this.$store.getters.getSponsorBlockRecap
+          break
+        case 'music offtopic':
+          sponsorVal = this.$store.getters.getSponsorBlockMusicOffTopic
+          break
+        case 'filler':
+          sponsorVal = this.$store.getters.getSponsorBlockFiller
+          break
+      }
+      return sponsorVal
+    },
+
+    sanitizedId: function() {
+      return sanitizeForHtmlId(this.categoryName)
+    },
+
+    skipNames: function() {
+      return [
+        this.$t('Settings.SponsorBlock Settings.Skip Options.Auto Skip'),
+        // this.$t('Settings.SponsorBlock Settings.Skip Options.Prompt To Skip'),
+        this.$t('Settings.SponsorBlock Settings.Skip Options.Show In Seek Bar'),
+        this.$t('Settings.SponsorBlock Settings.Skip Options.Do Nothing')
+      ]
+    },
+
+    translatedCategoryName: function() {
+      switch (this.categoryName.toLowerCase()) {
+        case 'sponsor':
+          return this.$t('Video.Sponsor Block category.sponsor')
+        case 'self-promotion':
+          return this.$t('Video.Sponsor Block category.self-promotion')
+        case 'interaction':
+          return this.$t('Video.Sponsor Block category.interaction')
+        case 'intro':
+          return this.$t('Video.Sponsor Block category.intro')
+        case 'outro':
+          return this.$t('Video.Sponsor Block category.outro')
+        case 'recap':
+          return this.$t('Video.Sponsor Block category.recap')
+        case 'music offtopic':
+          return this.$t('Video.Sponsor Block category.music offtopic')
+        case 'filler':
+          return this.$t('Video.Sponsor Block category.filler')
+        default:
+          return ''
+      }
+    }
+  },
+
+  methods: {
+    updateColor: function (color) {
+      const payload = {
+        color: color,
+        skip: this.sponsorBlockValues.skip
+      }
+      this.updateSponsorCategory(payload)
+    },
+
+    updateSkipOption: function (skipOption) {
+      const payload = {
+        color: this.sponsorBlockValues.color,
+        skip: skipOption
+      }
+
+      this.updateSponsorCategory(payload)
+    },
+
+    updateSponsorCategory: function (payload) {
+      switch (this.categoryName.toLowerCase()) {
+        case 'sponsor':
+          this.updateSponsorBlockSponsor(payload)
+          break
+        case 'self-promotion':
+          this.updateSponsorBlockSelfPromo(payload)
+          break
+        case 'interaction':
+          this.updateSponsorBlockInteraction(payload)
+          break
+        case 'intro':
+          this.updateSponsorBlockIntro(payload)
+          break
+        case 'outro':
+          this.updateSponsorBlockOutro(payload)
+          break
+        case 'recap':
+          this.updateSponsorBlockRecap(payload)
+          break
+        case 'music offtopic':
+          this.updateSponsorBlockMusicOffTopic(payload)
+          break
+        case 'filler':
+          this.updateSponsorBlockFiller(payload)
+          break
+      }
+    },
+
+    ...mapActions([
+      'updateSponsorBlockSponsor',
+      'updateSponsorBlockSelfPromo',
+      'updateSponsorBlockInteraction',
+      'updateSponsorBlockIntro',
+      'updateSponsorBlockOutro',
+      'updateSponsorBlockRecap',
+      'updateSponsorBlockMusicOffTopic',
+      'updateSponsorBlockFiller'
+    ])
+  }
+})
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
new file mode 100644
index 0000000000000..28c073a8c5d0a
--- /dev/null
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="sponsorBlockCategory">
+    <div
+      :id="sanitizedId"
+      class="sponsorTitle"
+    >
+      {{ translatedCategoryName }}
+    </div>
+    <ft-select
+      :sanitized-id="sanitizedId + 'categoryColor'"
+      :describe-by-id="sanitizedId"
+      :placeholder="$t('Settings.SponsorBlock Settings.Category Color')"
+      :value="sponsorBlockValues.color"
+      :select-names="colorNames"
+      :select-values="colorValues"
+      :icon="['fas', 'palette']"
+      :class="'sec' + sponsorBlockValues.color"
+      icon-color="var(--accent-color)"
+      @change="updateColor"
+    />
+    <ft-select
+      :sanitized-id="sanitizedId + 'skipOption'"
+      :describe-by-id="sanitizedId"
+      :placeholder="$t('Settings.SponsorBlock Settings.Skip Options.Skip Option')"
+      :value="sponsorBlockValues.skip"
+      :select-names="skipNames"
+      :select-values="skipValues"
+      :icon="['fas', 'forward']"
+      @change="updateSkipOption"
+    />
+  </div>
+</template>
+<script src="./ft-sponsor-block-category.js" />
+<style scoped src="./ft-sponsor-block-category.css" />
diff --git a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
new file mode 100644
index 0000000000000..fb60e08a229ab
--- /dev/null
+++ b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
@@ -0,0 +1,38 @@
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'FtTimestampCatcher',
+  props: {
+    inputHtml: {
+      type: String,
+      default: ''
+    }
+  },
+  emits: ['timestamp-event'],
+  methods: {
+    catchTimestampClick: function (event) {
+      this.$emit('timestamp-event', event.detail)
+    },
+    detectTimestamps: function (input) {
+      const videoId = this.$route.params.id
+
+      return input.replaceAll(/(?:(\d+):)?(\d+):(\d+)/g, (timestamp, hours, minutes, seconds) => {
+        let time = 60 * Number(minutes) + Number(seconds)
+
+        if (hours) {
+          time += 3600 * Number(hours)
+        }
+
+        const url = this.$router.resolve({
+          path: `/watch/${videoId}`,
+          query: {
+            timestamp: time
+          }
+        }).href
+
+        // Adding the URL lets the user open the video in a new window at this timestamp
+        return `<a href="${url}" onclick="event.preventDefault();this.dispatchEvent(new CustomEvent('timestamp-clicked',{bubbles:true,detail:${time}}));window.scrollTo(0,0)">${timestamp}</a>`
+      })
+    }
+  }
+})
diff --git a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue
new file mode 100644
index 0000000000000..831dc3936239c
--- /dev/null
+++ b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.vue
@@ -0,0 +1,8 @@
+<template>
+  <p
+    @timestamp-clicked="catchTimestampClick"
+    v-html="detectTimestamps(inputHtml)"
+  />
+</template>
+
+<script src="./ft-timestamp-catcher.js" />
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
index c8e089f3967ac..b7d0f60bd7b10 100644
--- a/src/renderer/components/general-settings/general-settings.js
+++ b/src/renderer/components/general-settings/general-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions, mapMutations } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtSelect from '../ft-select/ft-select.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
@@ -200,10 +200,6 @@ export default defineComponent({
         this.$t('Settings.General Settings.External Link Handling.Ask Before Opening Link'),
         this.$t('Settings.General Settings.External Link Handling.No Action')
       ]
-    },
-
-    openDeepLinksInNewWindow: function () {
-      return this.$store.getters.getOpenDeepLinksInNewWindow
     }
   },
   created: function () {
@@ -273,7 +269,6 @@ export default defineComponent({
       'updateCurrentLocale',
       'updateExternalLinkHandling',
       'updateGeneralAutoLoadMorePaginatedItemsEnabled',
-      'updateOpenDeepLinksInNewWindow',
     ])
   }
 })
diff --git a/src/renderer/components/general-settings/general-settings.vue b/src/renderer/components/general-settings/general-settings.vue
index a2e1d76003326..2a77422f45959 100644
--- a/src/renderer/components/general-settings/general-settings.vue
+++ b/src/renderer/components/general-settings/general-settings.vue
@@ -38,13 +38,6 @@
           :compact="true"
           @change="updateEnableSearchSuggestions"
         />
-        <ft-toggle-switch
-          :label="$t('Settings.General Settings.Open Deep Links In New Window')"
-          :default-value="openDeepLinksInNewWindow"
-          :compact="true"
-          :tooltip="$t('Tooltips.General Settings.Open Deep Links In New Window')"
-          @change="updateOpenDeepLinksInNewWindow"
-        />
       </div>
     </div>
     <div class="switchGrid">
diff --git a/src/renderer/components/parental-control-settings/parental-control-settings.js b/src/renderer/components/parental-control-settings/parental-control-settings.js
new file mode 100644
index 0000000000000..fd064ae635dae
--- /dev/null
+++ b/src/renderer/components/parental-control-settings/parental-control-settings.js
@@ -0,0 +1,30 @@
+import { defineComponent } from 'vue'
+import { mapActions } from 'vuex'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+
+export default defineComponent({
+  name: 'ParentalControlSettings',
+  components: {
+    'ft-settings-section': FtSettingsSection,
+    'ft-toggle-switch': FtToggleSwitch
+  },
+  computed: {
+    hideSearchBar: function () {
+      return this.$store.getters.getHideSearchBar
+    },
+    hideUnsubscribeButton: function() {
+      return this.$store.getters.getHideUnsubscribeButton
+    },
+    showFamilyFriendlyOnly: function() {
+      return this.$store.getters.getShowFamilyFriendlyOnly
+    }
+  },
+  methods: {
+    ...mapActions([
+      'updateHideSearchBar',
+      'updateHideUnsubscribeButton',
+      'updateShowFamilyFriendlyOnly'
+    ])
+  }
+})
diff --git a/src/renderer/components/parental-control-settings/parental-control-settings.vue b/src/renderer/components/parental-control-settings/parental-control-settings.vue
new file mode 100644
index 0000000000000..2d5485c48e982
--- /dev/null
+++ b/src/renderer/components/parental-control-settings/parental-control-settings.vue
@@ -0,0 +1,32 @@
+<template>
+  <ft-settings-section
+    :title="$t('Settings.Parental Control Settings.Parental Control Settings')"
+  >
+    <div class="switchColumnGrid">
+      <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Parental Control Settings.Hide Unsubscribe Button')"
+          :compact="true"
+          :default-value="hideUnsubscribeButton"
+          @change="updateHideUnsubscribeButton"
+        />
+        <ft-toggle-switch
+          :label="$t('Settings.Parental Control Settings.Show Family Friendly Only')"
+          :compact="true"
+          :default-value="showFamilyFriendlyOnly"
+          @change="updateShowFamilyFriendlyOnly"
+        />
+      </div>
+      <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Parental Control Settings.Hide Search Bar')"
+          :compact="true"
+          :default-value="hideSearchBar"
+          @change="updateHideSearchBar"
+        />
+      </div>
+    </div>
+  </ft-settings-section>
+</template>
+
+<script src="./parental-control-settings.js" />
diff --git a/src/renderer/components/PasswordDialog/PasswordDialog.css b/src/renderer/components/password-dialog/password-dialog.css
similarity index 100%
rename from src/renderer/components/PasswordDialog/PasswordDialog.css
rename to src/renderer/components/password-dialog/password-dialog.css
diff --git a/src/renderer/components/password-dialog/password-dialog.js b/src/renderer/components/password-dialog/password-dialog.js
new file mode 100644
index 0000000000000..ed4b5e99cafe3
--- /dev/null
+++ b/src/renderer/components/password-dialog/password-dialog.js
@@ -0,0 +1,27 @@
+import { defineComponent } from 'vue'
+import FtCard from '../ft-card/ft-card.vue'
+import FtInput from '../ft-input/ft-input.vue'
+
+export default defineComponent({
+  name: 'PasswordDialog',
+  components: {
+    'ft-input': FtInput,
+    'ft-card': FtCard
+  },
+  emits: ['unlocked'],
+  computed: {
+    settingsPassword: function () {
+      return this.$store.getters.getSettingsPassword
+    }
+  },
+  mounted: function () {
+    this.$refs.password.focus()
+  },
+  methods: {
+    handlePasswordInput: function (input) {
+      if (input === this.settingsPassword) {
+        this.$emit('unlocked')
+      }
+    }
+  }
+})
diff --git a/src/renderer/components/password-dialog/password-dialog.vue b/src/renderer/components/password-dialog/password-dialog.vue
new file mode 100644
index 0000000000000..89858f2106e8a
--- /dev/null
+++ b/src/renderer/components/password-dialog/password-dialog.vue
@@ -0,0 +1,19 @@
+<template>
+  <ft-card
+    class="card"
+  >
+    <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
+
+    <ft-input
+      ref="password"
+      :placeholder="$t('Settings.Password Dialog.Password')"
+      :show-action-button="false"
+      input-type="password"
+      class="passwordInput"
+      @input="handlePasswordInput"
+    />
+  </ft-card>
+</template>
+
+<script src="./password-dialog.js" />
+<style scoped src="./password-dialog.css" />
diff --git a/src/renderer/components/PasswordSettings/PasswordSettings.css b/src/renderer/components/password-settings/password-settings.css
similarity index 100%
rename from src/renderer/components/PasswordSettings/PasswordSettings.css
rename to src/renderer/components/password-settings/password-settings.css
diff --git a/src/renderer/components/password-settings/password-settings.js b/src/renderer/components/password-settings/password-settings.js
new file mode 100644
index 0000000000000..079bbbf480378
--- /dev/null
+++ b/src/renderer/components/password-settings/password-settings.js
@@ -0,0 +1,42 @@
+import { defineComponent } from 'vue'
+import { mapActions } from 'vuex'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtInput from '../ft-input/ft-input.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtButton from '../ft-button/ft-button.vue'
+
+export default defineComponent({
+  name: 'PasswordSettings',
+  components: {
+    'ft-settings-section': FtSettingsSection,
+    'ft-input': FtInput,
+    'ft-flex-box': FtFlexBox,
+    'ft-button': FtButton,
+  },
+  data: function() {
+    return {
+      password: '',
+    }
+  },
+  computed: {
+    settingsPassword: function() {
+      return this.$store.getters.getSettingsPassword
+    },
+    hasStoredPassword: function() {
+      return this.settingsPassword !== ''
+    }
+  },
+  methods: {
+    handleSetPassword: function () {
+      this.updateSettingsPassword(this.password)
+      this.password = ''
+    },
+    handleRemovePassword: function () {
+      this.updateSettingsPassword('')
+      this.password = ''
+    },
+    ...mapActions([
+      'updateSettingsPassword'
+    ])
+  }
+})
diff --git a/src/renderer/components/password-settings/password-settings.vue b/src/renderer/components/password-settings/password-settings.vue
new file mode 100644
index 0000000000000..42c1745faef61
--- /dev/null
+++ b/src/renderer/components/password-settings/password-settings.vue
@@ -0,0 +1,37 @@
+<template>
+  <ft-settings-section
+    :title="$t('Settings.Password Settings.Password Settings')"
+  >
+    <ft-flex-box
+      v-if="hasStoredPassword"
+      class="settingsFlexStart460px"
+    >
+      <ft-button
+        :label="$t('Settings.Password Settings.Remove Password')"
+        @click="handleRemovePassword"
+      />
+    </ft-flex-box>
+    <ft-flex-box
+      v-else
+      class="settingsFlexStart460px"
+    >
+      <ft-input
+        :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
+        :show-action-button="false"
+        :show-label="true"
+        input-type="password"
+        :value="password"
+        @input="e => password = e"
+        @keydown.enter.native="handleSetPassword"
+      />
+      <ft-button
+        class="centerButton"
+        :label="$t('Settings.Password Settings.Set Password')"
+        @click="handleSetPassword"
+      />
+    </ft-flex-box>
+  </ft-settings-section>
+</template>
+
+<script src="./password-settings.js" />
+<style scoped src="./password-settings.css" />
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
index a2afa7e5dbad9..4705f5ec3a612 100644
--- a/src/renderer/components/player-settings/player-settings.js
+++ b/src/renderer/components/player-settings/player-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtSelect from '../ft-select/ft-select.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtSlider from '../ft-slider/ft-slider.vue'
@@ -51,13 +51,11 @@ export default defineComponent({
       ],
       screenshotFormatNames: [
         'PNG',
-        'JPEG',
-        'WebP'
+        'JPEG'
       ],
       screenshotFormatValues: [
         'png',
-        'jpg',
-        'webp'
+        'jpg'
       ],
       screenshotFolderPlaceholder: '',
       screenshotFilenameExample: '',
@@ -97,10 +95,6 @@ export default defineComponent({
       return this.backendPreference !== 'invidious' && !this.backendFallback
     },
 
-    defaultAutoplayInterruptionIntervalHours: function () {
-      return parseInt(this.$store.getters.getDefaultAutoplayInterruptionIntervalHours)
-    },
-
     defaultSkipInterval: function () {
       return parseInt(this.$store.getters.getDefaultSkipInterval)
     },
@@ -292,7 +286,6 @@ export default defineComponent({
     ...mapActions([
       'updateAutoplayVideos',
       'updateAutoplayPlaylists',
-      'updateDefaultAutoplayInterruptionIntervalHours',
       'updatePlayNextVideo',
       'updateEnableSubtitlesByDefault',
       'updateProxyVideos',
diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
index 77677a0591ab3..0c736a398c539 100644
--- a/src/renderer/components/player-settings/player-settings.vue
+++ b/src/renderer/components/player-settings/player-settings.vue
@@ -82,24 +82,6 @@
       </div>
     </div>
     <ft-flex-box>
-      <ft-slider
-        :label="$t('Settings.Player Settings.Next Video Interval')"
-        :default-value="defaultInterval"
-        :min-value="0"
-        :max-value="60"
-        :step="1"
-        value-extension="s"
-        @change="updateDefaultInterval"
-      />
-      <ft-slider
-        :label="$t('Settings.Player Settings.Autoplay Interruption Timer')"
-        :default-value="defaultAutoplayInterruptionIntervalHours"
-        :min-value="1"
-        :max-value="12"
-        :step="1"
-        value-extension="h"
-        @change="updateDefaultAutoplayInterruptionIntervalHours"
-      />
       <ft-slider
         :label="$t('Settings.Player Settings.Fast-Forward / Rewind Interval')"
         :default-value="defaultSkipInterval"
@@ -109,6 +91,15 @@
         value-extension="s"
         @change="updateDefaultSkipInterval"
       />
+      <ft-slider
+        :label="$t('Settings.Player Settings.Next Video Interval')"
+        :default-value="defaultInterval"
+        :min-value="0"
+        :max-value="60"
+        :step="1"
+        value-extension="s"
+        @change="updateDefaultInterval"
+      />
       <ft-slider
         :label="$t('Settings.Player Settings.Default Volume')"
         :default-value="defaultVolume"
@@ -191,7 +182,7 @@
           :max-value="100"
           :step="1"
           value-extension="%"
-          :disabled="screenshotFormat === 'png'"
+          :disabled="screenshotFormat !== 'jpg'"
           @change="updateScreenshotQuality"
         />
       </ft-flex-box>
diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index 51348d3e9256e..6f9ff99bcfd99 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -10,11 +10,8 @@ import {
   ctrlFHandler,
   formatNumber,
   showToast,
-  getTodayDateStrLocalTimezone,
-  writeFileWithPicker,
 } from '../../helpers/utils'
 import debounce from 'lodash.debounce'
-import thumbnailPlaceholder from '../../assets/img/thumbnail_placeholder.svg'
 
 export default defineComponent({
   name: 'PlaylistInfo',
@@ -202,7 +199,7 @@ export default defineComponent({
 
     thumbnail: function () {
       if (this.thumbnailPreference === 'hidden' || !this.firstVideoIdExists) {
-        return thumbnailPlaceholder
+        return require('../../assets/img/thumbnail_placeholder.svg')
       }
 
       let baseUrl = 'https://i.ytimg.com'
@@ -265,15 +262,6 @@ export default defineComponent({
       return this.selectedUserPlaylist.videos.length - this.userPlaylistUniqueVideoIds.size
     },
 
-    exportPlaylistButtonVisible: function() {
-      // Most UI should be invisible in edit mode
-      if (this.editMode) { return false }
-      // Only online playlists can be shared
-      if (!this.isUserPlaylist) { return false }
-
-      return this.videoCount > 0
-    },
-
     deletePlaylistButtonVisible: function() {
       if (!this.isUserPlaylist) { return false }
       // Cannot delete during edit
@@ -287,6 +275,7 @@ export default defineComponent({
       // Only online playlists can be shared
       if (this.isUserPlaylist) { return false }
 
+      // Cannot delete protected playlist
       return !this.hideSharingActions
     },
 
@@ -423,35 +412,6 @@ export default defineComponent({
       showToast(this.playlistDeletionDisabledLabel)
     },
 
-    handlePlaylistExport: async function () {
-      const dateStr = getTodayDateStrLocalTimezone()
-      const title = this.selectedUserPlaylist.playlistName.replaceAll(' ', '_').replaceAll(/["%*/:<>?\\|]/g, '_')
-      const exportFileName = 'freetube-playlist-' + title + '-' + dateStr + '.db'
-
-      const data = JSON.stringify(this.selectedUserPlaylist) + '\n'
-
-      // See data-settings.js `promptAndWriteToFile`
-
-      try {
-        const response = await writeFileWithPicker(
-          exportFileName,
-          data,
-          this.$t('Settings.Data Settings.Playlist File'),
-          'application/x-freetube-db',
-          '.db',
-          'single-playlist-export',
-          'downloads'
-        )
-
-        if (response) {
-          showToast(this.$t('User Playlists.The playlist has been successfully exported'))
-        }
-      } catch (error) {
-        const message = this.$t('Settings.Data Settings.Unable to write file')
-        showToast(`${message}: ${error}`)
-      }
-    },
-
     exitEditMode: function () {
       this.editMode = false
 
diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue
index 3b594f1606ee8..4c8c0cfcf9959 100644
--- a/src/renderer/components/playlist-info/playlist-info.vue
+++ b/src/renderer/components/playlist-info/playlist-info.vue
@@ -169,13 +169,6 @@
             theme="secondary"
             @click="toggleCopyVideosPrompt"
           />
-          <ft-icon-button
-            v-if="exportPlaylistButtonVisible"
-            :title="$t('User Playlists.Export Playlist')"
-            :icon="['fas', 'file-arrow-down']"
-            theme="secondary"
-            @click="handlePlaylistExport"
-          />
           <ft-icon-button
             v-if="!editMode && userPlaylistDuplicateItemCount > 0"
             :title="$t('User Playlists.Remove Duplicate Videos')"
diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js
index f9855341ef80d..98b9a266ced9d 100644
--- a/src/renderer/components/privacy-settings/privacy-settings.js
+++ b/src/renderer/components/privacy-settings/privacy-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtButton from '../ft-button/ft-button.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
diff --git a/src/renderer/components/proxy-settings/proxy-settings.css b/src/renderer/components/proxy-settings/proxy-settings.css
index 813faefc36de0..4798186b5b717 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.css
+++ b/src/renderer/components/proxy-settings/proxy-settings.css
@@ -1,15 +1,3 @@
 .protocol-dropdown {
   margin-block-end: 1rem;
 }
-
-.proxy-warning {
-  padding-block: 12px;
-  padding-inline: 4%;
-  background-color: var(--accent-color);
-  color: var(--text-with-accent-color);
-  font-weight: bold;
-}
-
-.warning-icon {
-  font-size: large;
-}
diff --git a/src/renderer/components/proxy-settings/proxy-settings.js b/src/renderer/components/proxy-settings/proxy-settings.js
index dcd560f92a454..901ca21d88bf0 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.js
+++ b/src/renderer/components/proxy-settings/proxy-settings.js
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtButton from '../ft-button/ft-button.vue'
 import FtSelect from '../ft-select/ft-select.vue'
diff --git a/src/renderer/components/proxy-settings/proxy-settings.vue b/src/renderer/components/proxy-settings/proxy-settings.vue
index 4916e106826b6..3245e0f3c5f14 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.vue
+++ b/src/renderer/components/proxy-settings/proxy-settings.vue
@@ -3,17 +3,6 @@
     :title="$t('Settings.Proxy Settings.Proxy Settings')"
   >
     <ft-flex-box class="settingsFlexStart500px">
-      <p
-        v-if="useProxy"
-        class="proxy-warning"
-      >
-        <font-awesome-icon
-          :icon="['fas', 'circle-exclamation']"
-          class="warning-icon"
-          fixed-width
-        />
-        {{ $t('Settings.Proxy Settings.Proxy Warning') }}
-      </p>
       <ft-toggle-switch
         :label="$t('Settings.Proxy Settings.Enable Tor / Proxy')"
         :default-value="useProxy"
@@ -30,7 +19,7 @@
           :select-names="protocolNames"
           :select-values="protocolValues"
           class="protocol-dropdown"
-          :icon="['fas', 'network-wired']"
+          :icon="['fas', 'microchip']"
           @change="handleUpdateProxyProtocol"
         />
       </ft-flex-box>
diff --git a/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css b/src/renderer/components/side-nav-more-options/side-nav-more-options.css
similarity index 100%
rename from src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css
rename to src/renderer/components/side-nav-more-options/side-nav-more-options.css
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.js b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
new file mode 100644
index 0000000000000..83bae2a4de7ff
--- /dev/null
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
@@ -0,0 +1,32 @@
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'SideNav',
+  data: function () {
+    return {
+      openMoreOptions: false
+    }
+  },
+  computed: {
+    backendFallback: function () {
+      return this.$store.getters.getBackendFallback
+    },
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+    hidePopularVideos: function () {
+      return this.$store.getters.getHidePopularVideos
+    },
+    hideTrendingVideos: function () {
+      return this.$store.getters.getHideTrendingVideos
+    },
+    hideLabelsSideBar: function () {
+      return this.$store.getters.getHideLabelsSideBar
+    },
+    applyNavIconExpand: function() {
+      return {
+        navIconExpand: this.hideLabelsSideBar
+      }
+    }
+  }
+})
diff --git a/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
similarity index 79%
rename from src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
rename to src/renderer/components/side-nav-more-options/side-nav-more-options.vue
index 6fd3b27f043b5..127082d686fe4 100644
--- a/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
@@ -10,7 +10,7 @@
       @keydown.space.prevent="openMoreOptions = !openMoreOptions"
       @keydown.enter.prevent="openMoreOptions = !openMoreOptions"
     >
-      <FontAwesomeIcon
+      <font-awesome-icon
         :icon="['fas', 'ellipsis-h']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -36,7 +36,7 @@
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'user-check']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -58,7 +58,7 @@
         :aria-label="hideLabelsSideBar ? $t('Trending.Trending') : null"
         to="/trending"
       >
-        <FontAwesomeIcon
+        <font-awesome-icon
           :icon="['fas', 'fire']"
           class="navIcon"
           :class="applyNavIconExpand"
@@ -72,13 +72,13 @@
         </p>
       </router-link>
       <router-link
-        v-if="popularVisible"
+        v-if="!hidePopularVideos && (backendFallback || backendPreference === 'invidious')"
         class="navOption"
         :title="$t('Most Popular')"
         :aria-label="hideLabelsSideBar ? $t('Most Popular') : null"
         to="/popular"
       >
-        <FontAwesomeIcon
+        <font-awesome-icon
           :icon="['fas', 'users']"
           class="navIcon"
           :class="applyNavIconExpand"
@@ -97,7 +97,7 @@
         :aria-label="hideLabelsSideBar ? $t('About.About') : null"
         to="/about"
       >
-        <FontAwesomeIcon
+        <font-awesome-icon
           :icon="['fas', 'info-circle']"
           class="navIcon"
           :class="applyNavIconExpand"
@@ -117,7 +117,7 @@
       :aria-label="hideLabelsSideBar ? $t('History.History'): null"
       to="/history"
     >
-      <FontAwesomeIcon
+      <font-awesome-icon
         :icon="['fas', 'history']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -136,7 +136,7 @@
       :aria-label="hideLabelsSideBar ? $t('Settings.Settings') : null"
       to="/settings"
     >
-      <FontAwesomeIcon
+      <font-awesome-icon
         :icon="['fas', 'sliders-h']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -154,7 +154,7 @@
       to="/about"
       :aria-label="hideLabelsSideBar ? $t('About.About') : null"
     >
-      <FontAwesomeIcon
+      <font-awesome-icon
         :icon="['fas', 'info-circle']"
         class="navIcon"
         :class="applyNavIconExpand"
@@ -169,35 +169,5 @@
   </div>
 </template>
 
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { computed, ref } from 'vue'
-
-import store from '../../store/index'
-
-const openMoreOptions = ref(false)
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideTrendingVideos = computed(() => {
-  return store.getters.getHideTrendingVideos
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideLabelsSideBar = computed(() => {
-  return store.getters.getHideLabelsSideBar
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const popularVisible = computed(() => {
-  return !store.getters.getHidePopularVideos &&
-    (store.getters.getBackendFallback || store.getters.getBackendPreference === 'invidious')
-})
-
-const applyNavIconExpand = computed(() => {
-  return {
-    navIconExpand: hideLabelsSideBar.value
-  }
-})
-</script>
-
-<style scoped src="./SideNavMoreOptions.css" />
+<script src="./side-nav-more-options.js" />
+<style scoped src="./side-nav-more-options.css" />
diff --git a/src/renderer/components/SideNav/SideNav.css b/src/renderer/components/side-nav/side-nav.css
similarity index 100%
rename from src/renderer/components/SideNav/SideNav.css
rename to src/renderer/components/side-nav/side-nav.css
diff --git a/src/renderer/components/side-nav/side-nav.js b/src/renderer/components/side-nav/side-nav.js
new file mode 100644
index 0000000000000..45db9ef8e5ca5
--- /dev/null
+++ b/src/renderer/components/side-nav/side-nav.js
@@ -0,0 +1,85 @@
+import { defineComponent } from 'vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import SideNavMoreOptions from '../side-nav-more-options/side-nav-more-options.vue'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
+import { deepCopy } from '../../helpers/utils'
+
+export default defineComponent({
+  name: 'SideNav',
+  components: {
+    'ft-flex-box': FtFlexBox,
+    'side-nav-more-options': SideNavMoreOptions
+  },
+  computed: {
+    isOpen: function () {
+      return this.$store.getters.getIsSideNavOpen
+    },
+    backendFallback: function () {
+      return this.$store.getters.getBackendFallback
+    },
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+    currentInvidiousInstanceUrl: function () {
+      return this.$store.getters.getCurrentInvidiousInstanceUrl
+    },
+    profileList: function () {
+      return this.$store.getters.getProfileList
+    },
+    activeProfile: function () {
+      return this.$store.getters.getActiveProfile
+    },
+    locale: function () {
+      return this.$i18n.locale
+    },
+    activeSubscriptions: function () {
+      const subscriptions = deepCopy(this.activeProfile.subscriptions)
+
+      subscriptions.forEach(channel => {
+        // Change thumbnail size to 35x35, as that's the size we display it
+        // so we don't need to download a bigger image (the default is 176x176)
+        channel.thumbnail = channel.thumbnail?.replace(/=s\d+/, '=s35')
+      })
+
+      subscriptions.sort((a, b) => {
+        return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), this.locale)
+      })
+
+      if (this.backendPreference === 'invidious') {
+        subscriptions.forEach((channel) => {
+          channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, this.currentInvidiousInstanceUrl)
+        })
+      }
+
+      return subscriptions
+    },
+    hidePopularVideos: function () {
+      return this.$store.getters.getHidePopularVideos
+    },
+    hidePlaylists: function () {
+      return this.$store.getters.getHidePlaylists
+    },
+    hideTrendingVideos: function () {
+      return this.$store.getters.getHideTrendingVideos
+    },
+    hideActiveSubscriptions: function () {
+      return this.$store.getters.getHideActiveSubscriptions
+    },
+    hideLabelsSideBar: function () {
+      return this.$store.getters.getHideLabelsSideBar
+    },
+    hideText: function () {
+      return !this.isOpen && this.hideLabelsSideBar
+    },
+    applyNavIconExpand: function() {
+      return {
+        navIconExpand: this.hideText
+      }
+    },
+    applyHiddenLabels: function() {
+      return {
+        hiddenLabels: this.hideText
+      }
+    }
+  }
+})
diff --git a/src/renderer/components/SideNav/SideNav.vue b/src/renderer/components/side-nav/side-nav.vue
similarity index 58%
rename from src/renderer/components/SideNav/SideNav.vue
rename to src/renderer/components/side-nav/side-nav.vue
index 47530d3da2aa3..ebfb8d44169eb 100644
--- a/src/renderer/components/SideNav/SideNav.vue
+++ b/src/renderer/components/side-nav/side-nav.vue
@@ -1,5 +1,5 @@
 <template>
-  <FtFlexBox
+  <ft-flex-box
     ref="sideNav"
     class="sideNav"
     :class="[{closed: !isOpen}, applyHiddenLabels]"
@@ -18,7 +18,7 @@
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'rss']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -41,7 +41,7 @@
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'user-check']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -65,7 +65,7 @@
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'fire']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -89,7 +89,7 @@
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'users']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -113,7 +113,7 @@
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'bookmark']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -127,17 +127,17 @@
           {{ $t("Playlists") }}
         </p>
       </router-link>
-      <SideNavMoreOptions />
+      <side-nav-more-options />
       <router-link
         class="navOption mobileShow"
         role="button"
         to="/history"
-        :title="historyTitle"
+        :title="$t('History.History')"
       >
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'history']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -156,12 +156,12 @@
         class="navOption mobileShow"
         role="button"
         to="/settings"
-        :title="settingsTitle"
+        :title="$t('Settings.Settings')"
       >
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'sliders-h']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -184,7 +184,7 @@
         <div
           class="thumbnailContainer"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             :icon="['fas', 'info-circle']"
             class="navIcon"
             :class="applyNavIconExpand"
@@ -222,7 +222,7 @@
               :src="channel.thumbnail"
               :alt="isOpen ? '' : channel.name"
             >
-            <FontAwesomeIcon
+            <font-awesome-icon
               v-else
               class="channelThumbnail noThumbnail"
               :icon="['fas', 'circle-user']"
@@ -237,130 +237,8 @@
         </router-link>
       </div>
     </div>
-  </FtFlexBox>
+  </ft-flex-box>
 </template>
 
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { computed } from 'vue'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import SideNavMoreOptions from '../SideNavMoreOptions/SideNavMoreOptions.vue'
-
-import store from '../../store/index'
-
-import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-import { deepCopy, localizeAndAddKeyboardShortcutToActionTitle } from '../../helpers/utils'
-import { KeyboardShortcuts } from '../../../constants'
-
-const { locale, t } = useI18n()
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const isOpen = computed(() => {
-  return store.getters.getIsSideNavOpen
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const backendFallback = computed(() => {
-  return store.getters.getBackendFallback
-})
-
-/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
-const backendPreference = computed(() => {
-  return store.getters.getBackendPreference
-})
-
-/** @type {import('vue').ComputedRef<string>} */
-const currentInvidiousInstanceUrl = computed(() => {
-  return store.getters.getCurrentInvidiousInstanceUrl
-})
-
-/** @type {import('vue').ComputedRef<object>} */
-const activeProfile = computed(() => {
-  return store.getters.getActiveProfile
-})
-
-const activeSubscriptions = computed(() => {
-  /** @type {any[]} */
-  const subscriptions = deepCopy(activeProfile.value.subscriptions)
-
-  subscriptions.forEach(channel => {
-    // Change thumbnail size to 35x35, as that's the size we display it
-    // so we don't need to download a bigger image (the default is 176x176)
-    channel.thumbnail = channel.thumbnail?.replace(/=s\d+/, '=s35')
-  })
-
-  const locale_ = locale.value
-  subscriptions.sort((a, b) => {
-    return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), locale_)
-  })
-
-  if (backendPreference.value === 'invidious') {
-    const instanceUrl = currentInvidiousInstanceUrl.value
-
-    subscriptions.forEach((channel) => {
-      channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, instanceUrl)
-    })
-  }
-
-  return subscriptions
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hidePopularVideos = computed(() => {
-  return store.getters.getHidePopularVideos
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hidePlaylists = computed(() => {
-  return store.getters.getHidePlaylists
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideTrendingVideos = computed(() => {
-  return store.getters.getHideTrendingVideos
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideActiveSubscriptions = computed(() => {
-  return store.getters.getHideActiveSubscriptions
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideText = computed(() => {
-  return !isOpen.value && store.getters.getHideLabelsSideBar
-})
-
-const applyNavIconExpand = computed(() => {
-  return {
-    navIconExpand: hideText.value
-  }
-})
-
-const applyHiddenLabels = computed(() => {
-  return {
-    hiddenLabels: hideText.value
-  }
-})
-
-const historyTitle = computed(() => {
-  const shortcut = process.platform === 'darwin'
-    ? KeyboardShortcuts.APP.GENERAL.NAVIGATE_TO_HISTORY_MAC
-    : KeyboardShortcuts.APP.GENERAL.NAVIGATE_TO_HISTORY
-
-  return localizeAndAddKeyboardShortcutToActionTitle(
-    t('History.History'),
-    shortcut
-  )
-})
-
-const settingsTitle = computed(() => {
-  return localizeAndAddKeyboardShortcutToActionTitle(
-    t('Settings.Settings'),
-    KeyboardShortcuts.APP.GENERAL.NAVIGATE_TO_SETTINGS
-  )
-})
-</script>
-
-<style scoped src="./SideNav.css" />
+<script src="./side-nav.js" />
+<style scoped src="./side-nav.css" />
diff --git a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
index 2917131b72551..ca1fb50d31fb6 100644
--- a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
+++ b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
@@ -1,10 +1,10 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtSponsorBlockCategory from '../FtSponsorBlockCategory/FtSponsorBlockCategory.vue'
+import FtSponsorBlockCategory from '../ft-sponsor-block-category/ft-sponsor-block-category.vue'
 
 export default defineComponent({
   name: 'SponsorBlockSettings',
diff --git a/src/renderer/components/subscription-settings/subscription-settings.css b/src/renderer/components/subscription-settings/subscription-settings.css
deleted file mode 100644
index a4ffb52b032a4..0000000000000
--- a/src/renderer/components/subscription-settings/subscription-settings.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.onlyShowLatestFromChannelNumber {
-  inline-size: calc(100% - 44px);
-  padding-inline-start: 44px;
-}
diff --git a/src/renderer/components/subscription-settings/subscription-settings.js b/src/renderer/components/subscription-settings/subscription-settings.js
index 9d455bbf6b2ce..231658a1f0126 100644
--- a/src/renderer/components/subscription-settings/subscription-settings.js
+++ b/src/renderer/components/subscription-settings/subscription-settings.js
@@ -1,15 +1,13 @@
 import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
-import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
-import FtSlider from '../ft-slider/ft-slider.vue'
 
 export default defineComponent({
   name: 'SubscriptionSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
-    'ft-toggle-switch': FtToggleSwitch,
-    'ft-slider': FtSlider,
+    'ft-toggle-switch': FtToggleSwitch
   },
   computed: {
     hideWatchedSubs: function () {
@@ -18,9 +16,6 @@ export default defineComponent({
     onlyShowLatestFromChannel: function () {
       return this.$store.getters.getOnlyShowLatestFromChannel
     },
-    onlyShowLatestFromChannelNumber: function () {
-      return this.$store.getters.getOnlyShowLatestFromChannelNumber
-    },
     useRssFeeds: function () {
       return this.$store.getters.getUseRssFeeds
     },
@@ -37,7 +32,6 @@ export default defineComponent({
       'updateUseRssFeeds',
       'updateFetchSubscriptionsAutomatically',
       'updateOnlyShowLatestFromChannel',
-      'updateOnlyShowLatestFromChannelNumber',
       'updateUnsubscriptionPopupStatus'
     ])
   }
diff --git a/src/renderer/components/subscription-settings/subscription-settings.vue b/src/renderer/components/subscription-settings/subscription-settings.vue
index 906fc1aa4b9e9..9ae067ef5da55 100644
--- a/src/renderer/components/subscription-settings/subscription-settings.vue
+++ b/src/renderer/components/subscription-settings/subscription-settings.vue
@@ -18,12 +18,6 @@
           :compact="true"
           @change="updateUseRssFeeds"
         />
-        <ft-toggle-switch
-          :label="$t('Settings.Subscription Settings.Confirm Before Unsubscribing')"
-          :default-value="unsubscriptionPopupStatus"
-          :compact="true"
-          @change="updateUnsubscriptionPopupStatus"
-        />
       </div>
       <div class="switchColumn">
         <ft-toggle-switch
@@ -33,26 +27,22 @@
           @change="updateHideWatchedSubs"
         />
         <ft-toggle-switch
-          :label="$t('Settings.Subscription Settings.Limit the number of videos displayed for each channel')"
+          :label="$t('Settings.Subscription Settings.Only Show Latest Video for Each Channel')"
           :default-value="onlyShowLatestFromChannel"
           :compact="true"
           @change="updateOnlyShowLatestFromChannel"
         />
-        <div class="onlyShowLatestFromChannelNumber">
-          <ft-slider
-            :label="$t('Settings.Subscription Settings.To')"
-            :default-value="onlyShowLatestFromChannelNumber"
-            :disabled="!onlyShowLatestFromChannel"
-            :min-value="1"
-            :max-value="30"
-            :step="1"
-            @change="updateOnlyShowLatestFromChannelNumber"
-          />
-        </div>
+      </div>
+      <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Subscription Settings.Confirm Before Unsubscribing')"
+          :default-value="unsubscriptionPopupStatus"
+          :compact="true"
+          @change="updateUnsubscriptionPopupStatus"
+        />
       </div>
     </div>
   </ft-settings-section>
 </template>
 
 <script src="./subscription-settings.js" />
-<style src="./subscription-settings.css" scoped />
diff --git a/src/renderer/components/subscriptions-community/subscriptions-community.js b/src/renderer/components/subscriptions-community/subscriptions-community.js
index c4f044bf153b0..79408b65f89d6 100644
--- a/src/renderer/components/subscriptions-community/subscriptions-community.js
+++ b/src/renderer/components/subscriptions-community/subscriptions-community.js
@@ -14,7 +14,6 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
-      alreadyLoadedRemotely: false,
       postList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -98,9 +97,7 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      if (!this.alreadyLoadedRemotely) {
-        this.loadPostsFromCacheSometimes()
-      }
+      this.loadPostsFromCacheSometimes()
     },
   },
   mounted: async function () {
@@ -118,7 +115,6 @@ export default defineComponent({
         return
       }
 
-      this.alreadyLoadedRemotely = true
       this.loadPostsForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForCommunityPostsFirstAutoFetchRun')
     },
@@ -235,7 +231,9 @@ export default defineComponent({
           this.errorChannels.push(channel)
           return []
         }
-
+        entries.forEach(post => {
+          post.authorId = channel.id
+        })
         return entries
       } catch (err) {
         console.error(err)
@@ -254,6 +252,9 @@ export default defineComponent({
     getChannelPostsInvidious: function (channel) {
       return new Promise((resolve, reject) => {
         invidiousGetCommunityPosts(channel.id).then(result => {
+          result.posts.forEach(post => {
+            post.authorId = channel.id
+          })
           resolve(result.posts)
         }).catch((err) => {
           console.error(err)
diff --git a/src/renderer/components/subscriptions-live/subscriptions-live.js b/src/renderer/components/subscriptions-live/subscriptions-live.js
index 1a83a39785122..b8d182621fbdc 100644
--- a/src/renderer/components/subscriptions-live/subscriptions-live.js
+++ b/src/renderer/components/subscriptions-live/subscriptions-live.js
@@ -4,11 +4,12 @@ import SubscriptionsTabUI from '../subscriptions-tab-ui/subscriptions-tab-ui.vue
 
 import {
   getChannelPlaylistId,
+  setPublishedTimestampsInvidious,
   copyToClipboard,
   getRelativeTimeFromDate,
   showToast
 } from '../../helpers/utils'
-import { getInvidiousChannelLive, invidiousFetch } from '../../helpers/api/invidious'
+import { invidiousAPICall, invidiousFetch } from '../../helpers/api/invidious'
 import { getLocalChannelLiveStreams } from '../../helpers/api/local'
 import { parseYouTubeRSSFeed, updateVideoListAfterProcessing } from '../../helpers/subscriptions'
 
@@ -20,7 +21,6 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
-      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -107,9 +107,7 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      if (!this.alreadyLoadedRemotely) {
-        this.loadVideosFromCacheSometimes()
-      }
+      this.loadVideosFromCacheSometimes()
     },
   },
   mounted: async function () {
@@ -127,7 +125,6 @@ export default defineComponent({
         return
       }
 
-      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForLiveStreamsFirstAutoFetchRun')
     },
@@ -337,8 +334,17 @@ export default defineComponent({
 
     getChannelLiveInvidious: function (channel, failedAttempts = 0) {
       return new Promise((resolve, reject) => {
-        getInvidiousChannelLive(channel.id).then((result) => {
-          const videos = result.videos
+        const subscriptionsPayload = {
+          resource: 'channels',
+          id: channel.id,
+          subResource: 'streams',
+          params: {}
+        }
+
+        invidiousAPICall(subscriptionsPayload).then((result) => {
+          const videos = result.videos.filter(e => e.type === 'video')
+
+          setPublishedTimestampsInvidious(videos)
 
           let name
 
diff --git a/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js b/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js
index 635284e73b79a..a3e24e4aae133 100644
--- a/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js
+++ b/src/renderer/components/subscriptions-shorts/subscriptions-shorts.js
@@ -19,7 +19,6 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
-      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -102,9 +101,7 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      if (!this.alreadyLoadedRemotely) {
-        this.loadVideosFromCacheSometimes()
-      }
+      this.loadVideosFromCacheSometimes()
     },
   },
   mounted: async function () {
@@ -122,7 +119,6 @@ export default defineComponent({
         return
       }
 
-      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForShortsFirstAutoFetchRun')
     },
diff --git a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js
index e6d9fb8cf7a70..489d928f383e0 100644
--- a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js
+++ b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js
@@ -7,7 +7,6 @@ import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtElementList from '../FtElementList/FtElementList.vue'
 import FtChannelBubble from '../ft-channel-bubble/ft-channel-bubble.vue'
 import FtAutoLoadNextPageWrapper from '../ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
-import { KeyboardShortcuts } from '../../../constants'
 
 export default defineComponent({
   name: 'SubscriptionsTabUI',
@@ -114,9 +113,10 @@ export default defineComponent({
       // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
       if (event.repeat) { return }
 
-      switch (event.key.toLowerCase()) {
-        case 'f5':
-        case KeyboardShortcuts.APP.SITUATIONAL.REFRESH:
+      switch (event.key) {
+        case 'r':
+        case 'R':
+        case 'F5':
           if (!this.isLoading && this.activeSubscriptionList.length > 0) {
             this.$emit('refresh')
           }
diff --git a/src/renderer/components/subscriptions-videos/subscriptions-videos.js b/src/renderer/components/subscriptions-videos/subscriptions-videos.js
index 87050f1b88148..e05e2422277ad 100644
--- a/src/renderer/components/subscriptions-videos/subscriptions-videos.js
+++ b/src/renderer/components/subscriptions-videos/subscriptions-videos.js
@@ -3,12 +3,13 @@ import { mapActions, mapMutations } from 'vuex'
 import SubscriptionsTabUI from '../subscriptions-tab-ui/subscriptions-tab-ui.vue'
 
 import {
+  setPublishedTimestampsInvidious,
   copyToClipboard,
   getRelativeTimeFromDate,
   showToast,
   getChannelPlaylistId
 } from '../../helpers/utils'
-import { getInvidiousChannelVideos, invidiousFetch } from '../../helpers/api/invidious'
+import { invidiousAPICall, invidiousFetch } from '../../helpers/api/invidious'
 import { getLocalChannelVideos } from '../../helpers/api/local'
 import { parseYouTubeRSSFeed, updateVideoListAfterProcessing } from '../../helpers/subscriptions'
 
@@ -20,7 +21,6 @@ export default defineComponent({
   data: function () {
     return {
       isLoading: true,
-      alreadyLoadedRemotely: false,
       videoList: [],
       errorChannels: [],
       attemptedFetch: false,
@@ -111,9 +111,7 @@ export default defineComponent({
     },
 
     subscriptionCacheReady() {
-      if (!this.alreadyLoadedRemotely) {
-        this.loadVideosFromCacheSometimes()
-      }
+      this.loadVideosFromCacheSometimes()
     },
   },
   mounted: async function () {
@@ -131,7 +129,6 @@ export default defineComponent({
         return
       }
 
-      this.alreadyLoadedRemotely = true
       this.loadVideosForSubscriptionsFromRemote()
       this.$store.commit('setSubscriptionForVideosFirstAutoFetchRun')
     },
@@ -341,7 +338,15 @@ export default defineComponent({
 
     getChannelVideosInvidiousScraper: function (channel, failedAttempts = 0) {
       return new Promise((resolve, reject) => {
-        getInvidiousChannelVideos(channel.id).then((result) => {
+        const subscriptionsPayload = {
+          resource: 'channels/latest',
+          id: channel.id,
+          params: {}
+        }
+
+        invidiousAPICall(subscriptionsPayload).then((result) => {
+          setPublishedTimestampsInvidious(result.videos)
+
           let name
 
           if (result.videos.length > 0) {
diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js
new file mode 100644
index 0000000000000..fc018ab45bcb4
--- /dev/null
+++ b/src/renderer/components/theme-settings/theme-settings.js
@@ -0,0 +1,184 @@
+import { defineComponent } from 'vue'
+import { mapActions } from 'vuex'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtSelect from '../ft-select/ft-select.vue'
+import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+import FtSlider from '../ft-slider/ft-slider.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtPrompt from '../ft-prompt/ft-prompt.vue'
+import { colors, getColorTranslations } from '../../helpers/colors'
+import { IpcChannels } from '../../../constants'
+
+export default defineComponent({
+  name: 'ThemeSettings',
+  components: {
+    'ft-settings-section': FtSettingsSection,
+    'ft-select': FtSelect,
+    'ft-toggle-switch': FtToggleSwitch,
+    'ft-slider': FtSlider,
+    'ft-flex-box': FtFlexBox,
+    'ft-prompt': FtPrompt
+  },
+  data: function () {
+    return {
+      usingElectron: process.env.IS_ELECTRON,
+      minUiScale: 50,
+      maxUiScale: 300,
+      uiScaleStep: 5,
+      disableSmoothScrollingToggleValue: false,
+      showRestartPrompt: false,
+      restartPromptValues: [
+        'restart',
+        'cancel'
+      ],
+      /* Themes are devided into 3 groups. The first group contains the default themes. The second group are themes that don't have specific primary and secondary colors. The third group are themes that do have specific primary and secondary colors available. */
+      baseThemeValues: [
+        // First group
+        'system',
+        'light',
+        'dark',
+        'black',
+        // Second group
+        'nordic',
+        'hotPink',
+        'pastelPink',
+        // Third group
+        'catppuccinMocha',
+        'dracula',
+        'solarizedDark',
+        'solarizedLight'
+      ]
+    }
+  },
+  computed: {
+    barColor: function () {
+      return this.$store.getters.getBarColor
+    },
+
+    baseTheme: function () {
+      return this.$store.getters.getBaseTheme
+    },
+
+    mainColor: function () {
+      return this.$store.getters.getMainColor
+    },
+
+    secColor: function () {
+      return this.$store.getters.getSecColor
+    },
+
+    isSideNavOpen: function () {
+      return this.$store.getters.getIsSideNavOpen
+    },
+
+    uiScale: function () {
+      return this.$store.getters.getUiScale
+    },
+
+    disableSmoothScrolling: function () {
+      return this.$store.getters.getDisableSmoothScrolling
+    },
+
+    expandSideBar: function () {
+      return this.$store.getters.getExpandSideBar
+    },
+
+    hideLabelsSideBar: function () {
+      return this.$store.getters.getHideLabelsSideBar
+    },
+
+    hideHeaderLogo: function () {
+      return this.$store.getters.getHideHeaderLogo
+    },
+
+    restartPromptMessage: function () {
+      return this.$t('Settings["The app needs to restart for changes to take effect. Restart and apply change?"]')
+    },
+
+    restartPromptNames: function () {
+      return [
+        this.$t('Yes, Restart'),
+        this.$t('Cancel')
+      ]
+    },
+
+    /* Themes are devided into 3 groups. The first group contains the default themes. The second group are themes that don't have specific primary and secondary colors. The third group are themes that do have specific primary and secondary colors available. */
+    baseThemeNames: function () {
+      return [
+        // First group
+        this.$t('Settings.Theme Settings.Base Theme.System Default'),
+        this.$t('Settings.Theme Settings.Base Theme.Light'),
+        this.$t('Settings.Theme Settings.Base Theme.Dark'),
+        this.$t('Settings.Theme Settings.Base Theme.Black'),
+        // Second group
+        this.$t('Settings.Theme Settings.Base Theme.Nordic'),
+        this.$t('Settings.Theme Settings.Base Theme.Hot Pink'),
+        this.$t('Settings.Theme Settings.Base Theme.Pastel Pink'),
+        // Third group
+        this.$t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'),
+        this.$t('Settings.Theme Settings.Base Theme.Dracula'),
+        this.$t('Settings.Theme Settings.Base Theme.Solarized Dark'),
+        this.$t('Settings.Theme Settings.Base Theme.Solarized Light')
+      ]
+    },
+
+    colorValues: function () {
+      return colors.map(color => color.name)
+    },
+
+    colorNames: function () {
+      return getColorTranslations()
+    },
+
+    areColorThemesEnabled: function() {
+      return this.baseTheme !== 'hotPink'
+    }
+  },
+  created: function () {
+    this.disableSmoothScrollingToggleValue = this.disableSmoothScrolling
+  },
+  methods: {
+    handleExpandSideBar: function (value) {
+      if (this.isSideNavOpen !== value) {
+        this.$store.commit('toggleSideNav')
+      }
+
+      this.updateExpandSideBar(value)
+    },
+
+    handleRestartPrompt: function (value) {
+      this.disableSmoothScrollingToggleValue = value
+      this.showRestartPrompt = true
+    },
+
+    handleSmoothScrolling: function (value) {
+      this.showRestartPrompt = false
+
+      if (value === null || value === 'cancel') {
+        this.disableSmoothScrollingToggleValue = !this.disableSmoothScrollingToggleValue
+        return
+      }
+
+      if (process.env.IS_ELECTRON) {
+        this.updateDisableSmoothScrolling(
+          this.disableSmoothScrollingToggleValue
+        ).then(() => {
+          const { ipcRenderer } = require('electron')
+          ipcRenderer.send(IpcChannels.RELAUNCH_REQUEST)
+        })
+      }
+    },
+
+    ...mapActions([
+      'updateBarColor',
+      'updateBaseTheme',
+      'updateMainColor',
+      'updateSecColor',
+      'updateExpandSideBar',
+      'updateUiScale',
+      'updateDisableSmoothScrolling',
+      'updateHideLabelsSideBar',
+      'updateHideHeaderLogo'
+    ])
+  }
+})
diff --git a/src/renderer/components/theme-settings/theme-settings.vue b/src/renderer/components/theme-settings/theme-settings.vue
new file mode 100644
index 0000000000000..1d0b1e3d6b4d9
--- /dev/null
+++ b/src/renderer/components/theme-settings/theme-settings.vue
@@ -0,0 +1,94 @@
+<template>
+  <ft-settings-section
+    :title="$t('Settings.Theme Settings.Theme Settings')"
+  >
+    <div class="switchColumnGrid">
+      <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Match Top Bar with Main Color')"
+          :compact="true"
+          :default-value="barColor"
+          @change="updateBarColor"
+        />
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Expand Side Bar by Default')"
+          :compact="true"
+          :default-value="expandSideBar"
+          @change="handleExpandSideBar"
+        />
+        <ft-toggle-switch
+          v-if="usingElectron"
+          :label="$t('Settings.Theme Settings.Disable Smooth Scrolling')"
+          :compact="true"
+          :default-value="disableSmoothScrollingToggleValue"
+          @change="handleRestartPrompt"
+        />
+      </div>
+      <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Hide Side Bar Labels')"
+          :compact="true"
+          :default-value="hideLabelsSideBar"
+          @change="updateHideLabelsSideBar"
+        />
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Hide FreeTube Header Logo')"
+          :compact="true"
+          :default-value="hideHeaderLogo"
+          @change="updateHideHeaderLogo"
+        />
+      </div>
+    </div>
+    <ft-flex-box>
+      <ft-slider
+        :label="$t('Settings.Theme Settings.UI Scale')"
+        :default-value="uiScale"
+        :min-value="minUiScale"
+        :max-value="maxUiScale"
+        :step="uiScaleStep"
+        value-extension="%"
+        @change="updateUiScale(parseInt($event))"
+      />
+    </ft-flex-box>
+    <br>
+    <ft-flex-box>
+      <ft-select
+        :placeholder="$t('Settings.Theme Settings.Base Theme.Base Theme')"
+        :value="baseTheme"
+        :select-names="baseThemeNames"
+        :select-values="baseThemeValues"
+        :icon="['fas', 'palette']"
+        @change="updateBaseTheme"
+      />
+      <ft-select
+        :placeholder="$t('Settings.Theme Settings.Main Color Theme.Main Color Theme')"
+        :value="mainColor"
+        :select-names="colorNames"
+        :select-values="colorValues"
+        :disabled="!areColorThemesEnabled"
+        :icon="['fas', 'palette']"
+        icon-color="var(--primary-color)"
+        @change="updateMainColor"
+      />
+      <ft-select
+        :placeholder="$t('Settings.Theme Settings.Secondary Color Theme')"
+        :value="secColor"
+        :select-names="colorNames"
+        :select-values="colorValues"
+        :disabled="!areColorThemesEnabled"
+        :icon="['fas', 'palette']"
+        icon-color="var(--accent-color)"
+        @change="updateSecColor"
+      />
+    </ft-flex-box>
+    <ft-prompt
+      v-if="showRestartPrompt"
+      :label="restartPromptMessage"
+      :option-names="restartPromptNames"
+      :option-values="restartPromptValues"
+      @click="handleSmoothScrolling"
+    />
+  </ft-settings-section>
+</template>
+
+<script src="./theme-settings.js" />
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index f86c1dd2fa5fa..f5aef0c0b669e 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -2,19 +2,17 @@ import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtInput from '../ft-input/ft-input.vue'
 import FtProfileSelector from '../ft-profile-selector/ft-profile-selector.vue'
-import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import debounce from 'lodash.debounce'
 
-import { IpcChannels, KeyboardShortcuts, MOBILE_WIDTH_THRESHOLD } from '../../../constants'
-import { localizeAndAddKeyboardShortcutToActionTitle, openInternalPath } from '../../helpers/utils'
+import { IpcChannels, MOBILE_WIDTH_THRESHOLD } from '../../../constants'
+import { openInternalPath } from '../../helpers/utils'
 import { translateWindowTitle } from '../../helpers/strings'
 import { clearLocalSearchSuggestionsSession, getLocalSearchSuggestions } from '../../helpers/api/local'
-import { getInvidiousSearchSuggestions } from '../../helpers/api/invidious'
+import { invidiousAPICall } from '../../helpers/api/invidious'
 
 export default defineComponent({
   name: 'TopNav',
   components: {
-    FtIconButton,
     FtInput,
     FtProfileSelector
   },
@@ -33,10 +31,6 @@ export default defineComponent({
       showSearchContainer: true,
       isArrowBackwardDisabled,
       isArrowForwardDisabled,
-      navigationHistoryDropdownActiveEntry: null,
-      navigationHistoryDropdownOptions: [],
-      isLoadingNavigationHistory: false,
-      pendingNavigationHistoryLabel: null,
       searchSuggestionsDataList: [],
       lastSuggestionQuery: ''
     }
@@ -92,43 +86,25 @@ export default defineComponent({
       return this.$store.getters.getSearchFilterValueChanged
     },
 
-    navigationHistoryAddendum: function () {
-      if (this.navigationHistoryDropdownOptions.length === 0) {
-        return ''
-      }
-
-      return '\n' + this.$t('Right-click or hold to see history')
-    },
-
     forwardText: function () {
-      return localizeAndAddKeyboardShortcutToActionTitle(
-        this.$t('Forward'),
-        KeyboardShortcuts.APP.GENERAL.HISTORY_FORWARD
-      ) + this.navigationHistoryAddendum
+      return this.$t('Forward')
     },
 
     backwardText: function () {
-      return localizeAndAddKeyboardShortcutToActionTitle(
-        this.$t('Back'),
-        KeyboardShortcuts.APP.GENERAL.HISTORY_BACKWARD
-      ) + this.navigationHistoryAddendum
+      return this.$t('Back')
     },
 
     newWindowText: function () {
-      return localizeAndAddKeyboardShortcutToActionTitle(
-        this.$t('Open New Window'),
-        KeyboardShortcuts.APP.GENERAL.NEW_WINDOW
-      )
+      return this.$t('Open New Window')
     }
   },
   watch: {
     $route: function () {
-      this.setNavigationHistoryDropdownOptions()
       if ('navigation' in window) {
         this.isArrowForwardDisabled = !window.navigation.canGoForward
         this.isArrowBackwardDisabled = !window.navigation.canGoBack
       }
-    },
+    }
   },
   mounted: function () {
     let previousWidth = window.innerWidth
@@ -325,7 +301,15 @@ export default defineComponent({
         return
       }
 
-      getInvidiousSearchSuggestions(query).then((results) => {
+      const searchPayload = {
+        resource: 'search/suggestions',
+        id: '',
+        params: {
+          q: query
+        }
+      }
+
+      invidiousAPICall(searchPayload).then((results) => {
         this.searchSuggestionsDataList = results.suggestions
       }).catch((err) => {
         console.error(err)
@@ -342,46 +326,12 @@ export default defineComponent({
       this.showSearchContainer = !this.showSearchContainer
     },
 
-    setNavigationHistoryDropdownOptions: async function() {
-      if (process.env.IS_ELECTRON) {
-        this.isLoadingNavigationHistory = true
-        const { ipcRenderer } = require('electron')
-
-        const dropdownOptions = await ipcRenderer.invoke(IpcChannels.GET_NAVIGATION_HISTORY)
-
-        const activeEntry = dropdownOptions.find(option => option.active)
-
-        if (this.pendingNavigationHistoryLabel) {
-          activeEntry.label = this.pendingNavigationHistoryLabel
-        }
-
-        this.navigationHistoryDropdownOptions = dropdownOptions
-        this.navigationHistoryDropdownActiveEntry = activeEntry
-        this.isLoadingNavigationHistory = false
-      }
-    },
-
-    goToOffset: function (offset) {
-      // no point navigating to the current route
-      if (offset !== 0) {
-        this.$router.go(offset)
-      }
-    },
-
-    historyBack: function (offset) {
-      if (offset != null) {
-        this.goToOffset(offset)
-      } else {
-        this.$router.back()
-      }
+    historyBack: function () {
+      this.$router.back()
     },
 
-    historyForward: function (offset) {
-      if (offset != null) {
-        this.goToOffset(offset)
-      } else {
-        this.$router.forward()
-      }
+    historyForward: function () {
+      this.$router.forward()
     },
 
     toggleSideNav: function () {
@@ -402,14 +352,6 @@ export default defineComponent({
     updateSearchInputText: function (text) {
       this.$refs.searchInput.updateInputData(text)
     },
-    setActiveNavigationHistoryEntryTitle(value) {
-      if (this.isLoadingNavigationHistory) {
-        this.pendingNavigationHistoryLabel = value
-      } else if (this.navigationHistoryDropdownActiveEntry) {
-        this.navigationHistoryDropdownActiveEntry.label = value
-      }
-    },
-
     ...mapActions([
       'getYoutubeUrlInfo',
       'showSearchFilters'
diff --git a/src/renderer/components/top-nav/top-nav.scss b/src/renderer/components/top-nav/top-nav.scss
index cc346df5d73cf..c5917b0a70705 100644
--- a/src/renderer/components/top-nav/top-nav.scss
+++ b/src/renderer/components/top-nav/top-nav.scss
@@ -45,17 +45,7 @@
   }
 }
 
-.arrowDisabled :deep(.iconButton) {
-  filter: grayscale(1);
-  background-color: inherit;
-  opacity: 0.4;
-  pointer-events: auto;
-  cursor: default;
-  user-select: none;
-}
-
-.navIcon,
-:deep(.ftIconButton:not(.arrowDisabled) .iconButton) {
+.navIcon {
   border-radius: 50%;
   color: var(--primary-text-color);
   cursor: pointer;
@@ -65,34 +55,39 @@
   transition: background 0.2s ease-out;
   inline-size: 1em;
 
+  @include top-nav-is-colored {
+    color: var(--text-with-main-color);
+  }
+
+  &.arrowBackwardDisabled,
+  &.arrowForwardDisabled {
+    color: #808080;
+    opacity: 0.5;
+    pointer-events: none;
+    user-select: none;
+  }
+
   &:hover {
     background-color: var(--side-nav-hover-color);
     color: var(--side-nav-hover-text-color);
     transition: background 0.2s ease-in;
 
+    @include top-nav-is-colored {
+      background-color: var(--primary-color-hover);
+    }
   }
 
   &:active {
     background-color: var(--tertiary-text-color);
     color: var(--side-nav-active-text-color);
     transition: background 0.2s ease-in;
-  }
-}
-
-.topNavBarColor .navIcon,
-.topNavBarColor :deep(.ftIconButton:not(.arrowDisabled) .iconButton) {
-  color: var(--text-with-main-color);
-
-  &:hover {
-    background-color: var(--primary-color-hover);
-  }
 
-  &:active {
-    background-color: var(--primary-color-active);
+    @include top-nav-is-colored {
+      background-color: var(--primary-color-active);
+    }
   }
 }
 
-
 .navFilterIcon {
   $effect-distance: 20px;
 
diff --git a/src/renderer/components/top-nav/top-nav.vue b/src/renderer/components/top-nav/top-nav.vue
index d156e02968541..ca023d47795b1 100644
--- a/src/renderer/components/top-nav/top-nav.vue
+++ b/src/renderer/components/top-nav/top-nav.vue
@@ -13,32 +13,24 @@
         @click="toggleSideNav"
         @keydown.enter.prevent="toggleSideNav"
       />
-      <ft-icon-button
-        class="navIconButton"
-        :disabled="isArrowBackwardDisabled"
-        :class="{ arrowDisabled: isArrowBackwardDisabled }"
+      <font-awesome-icon
+        :aria-disabled="isArrowBackwardDisabled"
+        class="navIcon"
+        :class="{ arrowBackwardDisabled: isArrowBackwardDisabled}"
         :icon="['fas', 'arrow-left']"
-        :theme="null"
-        :size="20"
-        :use-shadow="false"
-        dropdown-position-x="right"
-        :dropdown-options="navigationHistoryDropdownOptions"
-        :open-on-right-or-long-click="true"
+        role="button"
+        tabindex="0"
         :title="backwardText"
         @click="historyBack"
         @keydown.enter.prevent="historyBack"
       />
-      <ft-icon-button
-        class="navIconButton"
-        :disabled="isArrowForwardDisabled"
-        :class="{ arrowDisabled: isArrowForwardDisabled }"
+      <font-awesome-icon
+        :aria-disabled="isArrowForwardDisabled"
+        class="navIcon"
+        :class="{ arrowForwardDisabled: isArrowForwardDisabled}"
         :icon="['fas', 'arrow-right']"
-        :theme="null"
-        :size="20"
-        :use-shadow="false"
-        dropdown-position-x="right"
-        :dropdown-options="navigationHistoryDropdownOptions"
-        :open-on-right-or-long-click="true"
+        role="button"
+        tabindex="0"
         :title="forwardText"
         @click="historyForward"
         @keydown.enter.prevent="historyForward"
diff --git a/src/renderer/components/CommentSection/CommentSection.css b/src/renderer/components/watch-video-comments/watch-video-comments.css
similarity index 100%
rename from src/renderer/components/CommentSection/CommentSection.css
rename to src/renderer/components/watch-video-comments/watch-video-comments.css
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
new file mode 100644
index 0000000000000..c7d5a8f6639cf
--- /dev/null
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -0,0 +1,459 @@
+import { defineComponent } from 'vue'
+import FtCard from '../ft-card/ft-card.vue'
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import FtSelect from '../../components/ft-select/ft-select.vue'
+import FtTimestampCatcher from '../../components/ft-timestamp-catcher/ft-timestamp-catcher.vue'
+import { copyToClipboard, showToast } from '../../helpers/utils'
+import { getInvidiousCommunityPostCommentReplies, getInvidiousCommunityPostComments, invidiousGetCommentReplies, invidiousGetComments } from '../../helpers/api/invidious'
+import { getLocalComments, parseLocalComment } from '../../helpers/api/local'
+
+export default defineComponent({
+  name: 'WatchVideoComments',
+  components: {
+    'ft-card': FtCard,
+    'ft-loader': FtLoader,
+    'ft-select': FtSelect,
+    'ft-timestamp-catcher': FtTimestampCatcher
+  },
+  props: {
+    id: {
+      type: String,
+      required: true
+    },
+    channelName: {
+      type: String,
+      required: true
+    },
+    channelThumbnail: {
+      type: String,
+      required: true
+    },
+    videoPlayerReady: {
+      type: Boolean,
+      required: true
+    },
+    forceState: {
+      type: String,
+      default: null,
+    },
+    isPostComments: {
+      type: Boolean,
+      default: false,
+    },
+    postAuthorId: {
+      type: String,
+      default: null
+    },
+    showSortBy: {
+      type: Boolean,
+      default: true,
+    }
+  },
+  emits: ['timestamp-event'],
+  setup: function () {
+    // As we don't need or even want reactivity here,
+    // we can use a Map.
+    const replyTokens = new Map()
+
+    return {
+      replyTokens
+    }
+  },
+  data: function () {
+    return {
+      isLoading: false,
+      showComments: false,
+      nextPageToken: null,
+      commentData: [],
+      sortNewest: false,
+    }
+  },
+  computed: {
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+
+    backendFallback: function () {
+      return this.$store.getters.getBackendFallback
+    },
+
+    hideCommentLikes: function () {
+      return this.$store.getters.getHideCommentLikes
+    },
+
+    hideCommentPhotos: function () {
+      return this.$store.getters.getHideCommentPhotos
+    },
+
+    sortNames: function () {
+      return [
+        this.$t('Comments.Top comments'),
+        this.$t('Comments.Newest first')
+      ]
+    },
+
+    sortValues: function () {
+      return [
+        'top',
+        'newest'
+      ]
+    },
+
+    currentSortValue: function () {
+      return (this.sortNewest) ? 'newest' : 'top'
+    },
+
+    generalAutoLoadMorePaginatedItemsEnabled() {
+      return this.$store.getters.getGeneralAutoLoadMorePaginatedItemsEnabled
+    },
+    observeVisibilityOptions: function () {
+      if (!this.generalAutoLoadMorePaginatedItemsEnabled) {
+        return false
+      }
+      if (!this.videoPlayerReady && !this.isPostComments) { return false }
+
+      return {
+        callback: (isVisible, _entry) => {
+          // This is also fired when **hidden**
+          // No point doing anything if not visible
+          if (!isVisible) { return }
+          // It's possible the comments are being loaded/already loaded
+          if (this.canPerformInitialCommentLoading) {
+            this.getCommentData()
+          } else if (this.canPerformMoreCommentLoading) {
+            this.getMoreComments()
+          }
+        },
+        intersection: {
+          // Only when it intersects with N% above bottom
+          rootMargin: '0% 0% 0% 0%',
+        },
+        // Callback responsible for loading multiple comment pages
+        once: false,
+      }
+    },
+
+    canPerformInitialCommentLoading: function () {
+      return this.commentData.length === 0 && !this.isLoading && !this.showComments
+    },
+
+    canPerformMoreCommentLoading: function () {
+      return this.commentData.length > 0 && !this.isLoading && this.showComments && this.nextPageToken
+    },
+
+    subscriptions: function() {
+      return this.$store.getters.getActiveProfile.subscriptions
+    }
+  },
+  created: function () {
+    // region No comment detection
+    // For videos without any comment (comment disabled?)
+    // e.g. https://youtu.be/8NBSwDEf8a8
+    //
+    // `comments_entry_point_header` is null probably when comment disabled
+    if (this.forceState === 'noComment') {
+      this.commentData = []
+      this.nextPageToken = null
+      this.isLoading = false
+      this.showComments = true
+    }
+    // endregion No comment detection
+  },
+  methods: {
+    onTimestamp: function (timestamp) {
+      this.$emit('timestamp-event', timestamp)
+    },
+
+    handleSortChange: function () {
+      this.sortNewest = !this.sortNewest
+      this.commentData = []
+      // nextPageToken is reset to ensure first page is get
+      this.nextPageToken = null
+      this.getCommentData()
+    },
+
+    getCommentData: function () {
+      this.isLoading = true
+      if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious' || this.isPostComments) {
+        if (!this.isPostComments) {
+          this.getCommentDataInvidious()
+        } else {
+          this.getPostCommentsInvidious()
+        }
+      } else {
+        this.getCommentDataLocal()
+      }
+    },
+
+    getMoreComments: function () {
+      if (this.commentData.length === 0 || this.nextPageToken === null || typeof this.nextPageToken === 'undefined') {
+        showToast(this.$t('Comments.There are no more comments for this video'))
+      } else {
+        if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious' || this.isPostComments) {
+          if (!this.isPostComments) {
+            this.getCommentDataInvidious()
+          } else {
+            this.getPostCommentsInvidious()
+          }
+        } else {
+          this.getCommentDataLocal(true)
+        }
+      }
+    },
+
+    toggleCommentReplies: function (index) {
+      if (this.commentData[index].showReplies || this.commentData[index].replies.length > 0) {
+        this.commentData[index].showReplies = !this.commentData[index].showReplies
+      } else {
+        this.getCommentReplies(index)
+      }
+    },
+
+    getCommentReplies: function (index) {
+      if (!process.env.SUPPORTS_LOCAL_API || this.commentData[index].dataType === 'invidious' || this.isPostComments) {
+        if (!this.isPostComments) {
+          this.getCommentRepliesInvidious(index)
+        } else {
+          this.getPostCommentRepliesInvidious(index)
+        }
+      } else {
+        this.getCommentRepliesLocal(index)
+      }
+    },
+
+    getCommentDataLocal: async function (more) {
+      try {
+        /** @type {import('youtubei.js').YT.Comments} */
+        let comments
+        if (more) {
+          comments = await this.nextPageToken.getContinuation()
+        } else {
+          comments = await getLocalComments(this.id, this.sortNewest)
+        }
+
+        const parsedComments = comments.contents
+          .map(commentThread => {
+            // Use destructuring to create a new object without the replyToken
+            const { replyToken, ...comment } = parseLocalComment(commentThread.comment, commentThread)
+
+            if (comment.hasReplyToken) {
+              this.replyTokens.set(comment.id, replyToken)
+            } else {
+              this.replyTokens.delete(comment.id)
+            }
+
+            return comment
+          })
+
+        if (more) {
+          this.commentData = this.commentData.concat(parsedComments)
+        } else {
+          this.commentData = parsedComments
+        }
+
+        this.nextPageToken = comments.has_continuation ? comments : null
+        this.isLoading = false
+        this.showComments = true
+      } catch (err) {
+        console.error(err)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
+        })
+        if (this.backendFallback && this.backendPreference === 'local') {
+          showToast(this.$t('Falling back to Invidious API'))
+          this.getCommentDataInvidious()
+        } else {
+          this.isLoading = false
+        }
+      }
+    },
+
+    getCommentRepliesLocal: async function (index) {
+      showToast(this.$t('Comments.Getting comment replies, please wait'))
+
+      try {
+        const comment = this.commentData[index]
+        /** @type {import('youtubei.js').YTNodes.CommentThread} */
+        const commentThread = this.replyTokens.get(comment.id)
+
+        if (commentThread == null) {
+          this.replyTokens.delete(comment.id)
+          comment.hasReplyToken = false
+          return
+        }
+
+        if (comment.replies.length > 0) {
+          await commentThread.getContinuation()
+          comment.replies = comment.replies.concat(commentThread.replies.map(reply => parseLocalComment(reply)))
+        } else {
+          await commentThread.getReplies()
+          comment.replies = commentThread.replies.map(reply => parseLocalComment(reply))
+        }
+
+        if (commentThread.has_continuation) {
+          this.replyTokens.set(comment.id, commentThread)
+          comment.hasReplyToken = true
+        } else {
+          this.replyTokens.delete(comment.id)
+          comment.hasReplyToken = false
+        }
+
+        comment.showReplies = true
+      } catch (err) {
+        console.error(err)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
+        })
+        if (this.backendFallback && this.backendPreference === 'local') {
+          showToast(this.$t('Falling back to Invidious API'))
+          this.getCommentDataInvidious()
+        } else {
+          this.isLoading = false
+        }
+      }
+    },
+
+    getCommentDataInvidious: function () {
+      invidiousGetComments({
+        id: this.id,
+        nextPageToken: this.nextPageToken,
+        sortNewest: this.sortNewest
+      }).then(({ response, commentData }) => {
+        commentData = commentData.map(({ replyToken, ...comment }) => {
+          if (comment.hasReplyToken) {
+            this.replyTokens.set(comment.id, replyToken)
+          } else {
+            this.replyTokens.delete(comment.id)
+          }
+
+          return comment
+        })
+
+        this.commentData = this.commentData.concat(commentData)
+        this.nextPageToken = response.continuation
+        this.isLoading = false
+        this.showComments = true
+      }).catch((err) => {
+        // region No comment detection
+        // No comment related info when video info requested earlier in parent component
+        if (err.message.includes('Comments not found')) {
+          // For videos without any comment (comment disabled?)
+          // e.g. https://youtu.be/8NBSwDEf8a8
+          this.commentData = []
+          this.nextPageToken = null
+          this.isLoading = false
+          this.showComments = true
+          return
+        }
+        // endregion No comment detection
+
+        console.error(err)
+        const errorMessage = this.$t('Invidious API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
+        })
+        if (process.env.SUPPORTS_LOCAL_API && this.backendFallback && this.backendPreference === 'invidious') {
+          showToast(this.$t('Falling back to Local API'))
+          this.getCommentDataLocal()
+        } else {
+          this.isLoading = false
+        }
+      })
+    },
+
+    getCommentRepliesInvidious: function (index) {
+      showToast(this.$t('Comments.Getting comment replies, please wait'))
+
+      const comment = this.commentData[index]
+      const replyToken = this.replyTokens.get(comment.id)
+
+      invidiousGetCommentReplies({ id: this.id, replyToken: replyToken })
+        .then(({ commentData, continuation }) => {
+          comment.replies = comment.replies.concat(commentData)
+          comment.showReplies = true
+
+          if (continuation) {
+            this.replyTokens.set(comment.id, continuation)
+            comment.hasReplyToken = true
+          } else {
+            this.replyTokens.delete(comment.id)
+            comment.hasReplyToken = false
+          }
+
+          this.isLoading = false
+        }).catch((error) => {
+          console.error(error)
+          const errorMessage = this.$t('Invidious API Error (Click to copy)')
+          showToast(`${errorMessage}: ${error}`, 10000, () => {
+            copyToClipboard(error)
+          })
+          this.isLoading = false
+        })
+    },
+
+    getPostCommentsInvidious: function() {
+      const nextPageToken = this.nextPageToken
+
+      const fetchComments = nextPageToken == null
+        ? getInvidiousCommunityPostComments({ postId: this.id, authorId: this.postAuthorId })
+        : getInvidiousCommunityPostCommentReplies({ postId: this.id, replyToken: this.nextPageToken, authorId: this.postAuthorId })
+
+      fetchComments.then(({ response, commentData, continuation }) => {
+        commentData = commentData.map(({ replyToken, ...comment }) => {
+          if (comment.hasReplyToken) {
+            this.replyTokens.set(comment.id, replyToken)
+          } else {
+            this.replyTokens.delete(comment.id)
+          }
+
+          return comment
+        })
+
+        this.commentData = this.commentData.concat(commentData)
+        this.nextPageToken = response?.continuation ?? continuation
+        this.isLoading = false
+        this.showComments = true
+      }).catch((err) => {
+        console.error(err)
+        const errorMessage = this.$t('Invidious API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
+        })
+        this.isLoading = false
+      })
+    },
+
+    getPostCommentRepliesInvidious: function(index) {
+      showToast(this.$t('Comments.Getting comment replies, please wait'))
+
+      const comment = this.commentData[index]
+      const replyToken = this.replyTokens.get(comment.id)
+      const id = this.id
+
+      getInvidiousCommunityPostCommentReplies({ postId: id, replyToken: replyToken, authorId: this.postAuthorId })
+        .then(({ commentData, continuation }) => {
+          comment.replies = comment.replies.concat(commentData)
+          comment.showReplies = true
+
+          if (continuation) {
+            this.replyTokens.set(comment.id, continuation)
+            comment.hasReplyToken = true
+          } else {
+            this.replyTokens.delete(comment.id)
+            comment.hasReplyToken = false
+          }
+
+          this.isLoading = false
+        }).catch((error) => {
+          console.error(error)
+          const errorMessage = this.$t('Invidious API Error (Click to copy)')
+          showToast(`${errorMessage}: ${error}`, 10000, () => {
+            copyToClipboard(error)
+          })
+          this.isLoading = false
+        })
+    }
+  }
+})
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
new file mode 100644
index 0000000000000..d39df77213606
--- /dev/null
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue
@@ -0,0 +1,305 @@
+<template>
+  <ft-card
+    class="card"
+  >
+    <h3
+      v-if="commentData.length > 0 && !isLoading && showComments"
+      class="commentsTitle"
+    >
+      {{ $t("Comments.Comments") }}
+      <span
+        class="hideComments"
+        role="button"
+        tabindex="0"
+        @click="showComments = false"
+        @keydown.space.prevent="showComments = false"
+        @keydown.enter.prevent="showComments = false"
+      >
+        {{ $t("Comments.Hide Comments") }}
+      </span>
+    </h3>
+    <h4
+      v-if="canPerformInitialCommentLoading"
+      class="getCommentsTitle"
+      role="button"
+      tabindex="0"
+      @click="getCommentData"
+      @keydown.space.prevent="getCommentData"
+      @keydown.enter.prevent="getCommentData"
+    >
+      {{ $t("Comments.Click to View Comments") }}
+    </h4>
+    <h4
+      v-if="commentData.length > 0 && !isLoading && !showComments"
+      class="getCommentsTitle"
+      role="button"
+      tabindex="0"
+      @click="showComments = true"
+      @keydown.space.prevent="showComments = true"
+      @keydown.enter.prevent="showComments = true"
+    >
+      {{ $t("Comments.Click to View Comments") }}
+    </h4>
+    <ft-select
+      v-if="commentData.length > 0 && !isLoading && showComments && showSortBy"
+      class="commentSort"
+      :placeholder="$t('Comments.Sort by')"
+      :value="currentSortValue"
+      :select-names="sortNames"
+      :select-values="sortValues"
+      :icon="['fas', 'arrow-down-short-wide']"
+      @change="handleSortChange"
+    />
+    <div
+      v-if="commentData.length > 0 && showComments"
+    >
+      <div
+        v-for="(comment, index) in commentData"
+        :id="'comment' + index"
+        :key="index"
+        class="comment"
+      >
+        <router-link
+          :to="`/channel/${comment.authorLink}`"
+          tabindex="-1"
+        >
+          <!-- Hide comment photo only if it isn't the video uploader -->
+          <div
+            v-if="hideCommentPhotos && !comment.isOwner"
+            class="commentThumbnailHidden"
+          >
+            {{ comment.author.substring(1, 2) }}
+          </div>
+          <img
+            v-else
+            :src="comment.authorThumb"
+            alt=""
+            class="commentThumbnail"
+          >
+        </router-link>
+        <p
+          v-if="comment.isPinned"
+          class="commentPinned"
+        >
+          <font-awesome-icon
+            :icon="['fas', 'thumbtack']"
+          />
+          {{ $t("Comments.Pinned by") }} {{ channelName }}
+        </p>
+        <p
+          class="commentAuthorWrapper"
+        >
+          <router-link
+            class="commentAuthor"
+            :class="{
+              commentOwner: comment.isOwner
+            }"
+            :to="`/channel/${comment.authorLink}`"
+          >
+            {{ comment.author }}
+          </router-link>
+          <img
+            v-if="comment.isMember"
+            :src="comment.memberIconUrl"
+            :title="$t('Comments.Member')"
+            :aria-label="$t('Comments.Member')"
+            class="commentMemberIcon"
+            alt=""
+          >
+          <img
+            v-if="subscriptions.find((channel) => channel.id === comment.authorId)"
+            :title="$t('Comments.Subscribed')"
+            :aria-label="$t('Comments.Subscribed')"
+            class="commentSubscribedIcon"
+            alt=""
+          >
+          <span class="commentDate">
+            {{ comment.time }}
+          </span>
+        </p>
+        <ft-timestamp-catcher
+          class="commentText"
+          :input-html="comment.text"
+          @timestamp-event="onTimestamp"
+        />
+        <p class="commentLikeCount">
+          <template
+            v-if="!hideCommentLikes"
+          >
+            <font-awesome-icon
+              :icon="['fas', 'thumbs-up']"
+            />
+            {{ comment.likes }}
+          </template>
+          <span
+            v-if="comment.isHearted"
+            class="commentHeartBadge"
+          >
+            <img
+              :src="channelThumbnail"
+              :title="$t('Comments.Hearted')"
+              :aria-label="$t('Comments.Hearted')"
+              class="commentHeartBadgeImg"
+              alt=""
+            >
+            <font-awesome-icon
+              :icon="['fas', 'heart']"
+              class="commentHeartBadgeWhite"
+            />
+            <font-awesome-icon
+              :icon="['fas', 'heart']"
+              class="commentHeartBadgeRed"
+            />
+          </span>
+          <span
+            v-if="comment.numReplies > 0"
+            class="commentMoreReplies"
+            role="button"
+            tabindex="0"
+            @click="toggleCommentReplies(index)"
+            @keydown.space.prevent="toggleCommentReplies(index)"
+            @keydown.enter.prevent="toggleCommentReplies(index)"
+          >
+            <span v-if="!comment.showReplies">{{ $t("Comments.View") }}</span>
+            <span v-else>{{ $t("Comments.Hide") }}</span>
+            {{ comment.numReplies }}
+            <span v-if="comment.numReplies === 1">{{ $t("Comments.Reply").toLowerCase() }}</span>
+            <span v-else>{{ $t("Comments.Replies").toLowerCase() }}</span>
+            <span v-if="comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.From {channelName}", { channelName }) }}</span>
+            <span v-if="comment.numReplies > 1 && comment.hasOwnerReplied && !comment.showReplies"> {{ $t("Comments.And others") }}</span>
+          </span>
+        </p>
+        <div
+          v-if="comment.showReplies"
+          class="commentReplies"
+        >
+          <div
+            v-for="(reply, replyIndex) in comment.replies"
+            :id="'comment' + index + '-' + replyIndex"
+            :key="replyIndex"
+            class="comment"
+          >
+            <router-link
+              :to="`/channel/${reply.authorLink}`"
+              tabindex="-1"
+            >
+              <!-- Hide comment photo only if it isn't the video uploader -->
+              <div
+                v-if="hideCommentPhotos && !reply.isOwner"
+                class="commentThumbnailHidden"
+              >
+                {{ reply.author.substring(1, 2) }}
+              </div>
+              <img
+                v-else
+                :src="reply.authorThumb"
+                alt=""
+                class="commentThumbnail"
+              >
+            </router-link>
+            <p class="commentAuthorWrapper">
+              <router-link
+                class="commentAuthor"
+                :class="{
+                  commentOwner: reply.isOwner
+                }"
+                :to="`/channel/${reply.authorLink}`"
+              >
+                {{ reply.author }}
+              </router-link>
+              <img
+                v-if="reply.isMember"
+                :src="reply.memberIconUrl"
+                class="commentMemberIcon"
+                alt=""
+              >
+              <img
+                v-if="subscriptions.find((channel) => channel.id === reply.authorId)"
+                :title="$t('Comments.Subscribed')"
+                :aria-label="$t('Comments.Subscribed')"
+                class="commentSubscribedIcon"
+                alt=""
+              >
+              <span class="commentDate">
+                {{ reply.time }}
+              </span>
+            </p>
+            <ft-timestamp-catcher
+              class="commentText"
+              :input-html="reply.text"
+              @timestamp-event="onTimestamp"
+            />
+            <p class="commentLikeCount">
+              <template
+                v-if="!hideCommentLikes"
+              >
+                <font-awesome-icon
+                  v-if="!hideCommentLikes"
+                  :icon="['fas', 'thumbs-up']"
+                />
+                {{ reply.likes }}
+              </template>
+            </p>
+            <p
+              v-if="reply.numReplies > 0"
+              class="commentMoreReplies"
+            >
+              {{ $t('Comments.View {replyCount} replies', { replyCount: reply.numReplies }) }}
+            </p>
+          </div>
+          <div
+            v-if="comment.hasReplyToken"
+            class="showMoreReplies"
+            role="button"
+            tabindex="0"
+            @click="getCommentReplies(index)"
+            @keydown.space.prevent="getCommentReplies(index)"
+            @keydown.enter.prevent="getCommentReplies(index)"
+          >
+            <span>{{ $t("Comments.Show More Replies") }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      v-else-if="showComments && !isLoading"
+    >
+      <h3
+        v-if="isPostComments"
+        class="noCommentMsg"
+      >
+        {{ $t("Comments.There are no comments available for this post") }}
+      </h3>
+      <h3
+        v-else
+        class="noCommentMsg"
+      >
+        {{ $t("Comments.There are no comments available for this video") }}
+      </h3>
+    </div>
+    <h4
+      v-if="canPerformMoreCommentLoading"
+      class="getMoreComments"
+      role="button"
+      tabindex="0"
+      @click="getMoreComments"
+      @keydown.space.prevent="getMoreComments"
+      @keydown.enter.prevent="getMoreComments"
+    >
+      {{ $t("Comments.Load More Comments") }}
+    </h4>
+    <ft-loader
+      v-if="isLoading"
+    />
+    <div
+      v-observe-visibility="observeVisibilityOptions"
+    >
+      <!--
+        Dummy element to be observed by Intersection Observer
+      -->
+    </div>
+  </ft-card>
+</template>
+
+<script src="./watch-video-comments.js" />
+<style scoped src="./watch-video-comments.css" />
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index 1076ef9be94dd..ef5cf85c6f7d0 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -106,10 +106,6 @@ export default defineComponent({
     inUserPlaylist: {
       type: Boolean,
       required: true
-    },
-    isUnlisted: {
-      type: Boolean,
-      required: false
     }
   },
   emits: ['change-format', 'pause-player', 'set-info-area-sticky', 'scroll-to-info-area'],
diff --git a/src/renderer/components/watch-video-info/watch-video-info.scss b/src/renderer/components/watch-video-info/watch-video-info.scss
index a35aa7aa2934d..00a79fba8d7b7 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.scss
+++ b/src/renderer/components/watch-video-info/watch-video-info.scss
@@ -22,17 +22,6 @@
   gap: 10px;
 }
 
-.unlistedBadge {
-  background-color: var(--secondary-card-bg-color);
-  border-radius: 5px;
-  display: inline;
-  padding-inline: 5px;
-  padding-block: 2px;
-  white-space: nowrap;
-  font-size: 13px;
-  font-weight: 500;
-}
-
 .videoButtons {
   .profileRow {
     display: flex;
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index 165f9c33e59d1..c49c3a1f65446 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -6,12 +6,6 @@
       >
         {{ title }}
       </h1>
-      <div
-        v-if="isUnlisted"
-        class="unlistedBadge"
-      >
-        {{ $t('Video.Unlisted') }}
-      </div>
     </div>
     <div class="videoMetrics">
       <div class="datePublishedAndViewCount">
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
index 3cf66a8ddf110..307ed79a68bee 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
@@ -34,7 +34,6 @@
   color: var(--tertiary-text-color);
   padding: 0;
   margin: 0;
-  word-break: break-word;
 }
 
 :deep(.liveChatEmoji) {
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index e0d424bad8b62..bfe449b6eb0ec 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -3,7 +3,7 @@ import { mapMutations } from 'vuex'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtListVideoNumbered from '../ft-list-video-numbered/ft-list-video-numbered.vue'
-import { copyToClipboard, showToast } from '../../helpers/utils'
+import { copyToClipboard, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
 import {
   getLocalPlaylist,
   parseLocalPlaylistVideo,
@@ -471,6 +471,7 @@ export default defineComponent({
         this.channelName = result.author
         this.channelId = result.authorId
 
+        setPublishedTimestampsInvidious(result.videos)
         this.playlistItems = this.playlistItems.concat(result.videos)
 
         this.isLoading = false
diff --git a/src/renderer/composables/colors.js b/src/renderer/composables/colors.js
deleted file mode 100644
index aad2b43511b9c..0000000000000
--- a/src/renderer/composables/colors.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { computed } from 'vue'
-import { useI18n } from './use-i18n-polyfill'
-
-export function useColorTranslations() {
-  const { t } = useI18n()
-
-  return computed(() => [
-    t('Settings.Theme Settings.Main Color Theme.Red'),
-    t('Settings.Theme Settings.Main Color Theme.Pink'),
-    t('Settings.Theme Settings.Main Color Theme.Purple'),
-    t('Settings.Theme Settings.Main Color Theme.Deep Purple'),
-    t('Settings.Theme Settings.Main Color Theme.Indigo'),
-    t('Settings.Theme Settings.Main Color Theme.Blue'),
-    t('Settings.Theme Settings.Main Color Theme.Light Blue'),
-    t('Settings.Theme Settings.Main Color Theme.Cyan'),
-    t('Settings.Theme Settings.Main Color Theme.Teal'),
-    t('Settings.Theme Settings.Main Color Theme.Green'),
-    t('Settings.Theme Settings.Main Color Theme.Light Green'),
-    t('Settings.Theme Settings.Main Color Theme.Lime'),
-    t('Settings.Theme Settings.Main Color Theme.Yellow'),
-    t('Settings.Theme Settings.Main Color Theme.Amber'),
-    t('Settings.Theme Settings.Main Color Theme.Orange'),
-    t('Settings.Theme Settings.Main Color Theme.Deep Orange'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Rosewater'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Flamingo'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Pink'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Mauve'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Red'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Maroon'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Peach'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Yellow'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Green'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Teal'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sky'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sapphire'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Blue'),
-    t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Lavender'),
-    t('Settings.Theme Settings.Main Color Theme.Dracula Cyan'),
-    t('Settings.Theme Settings.Main Color Theme.Dracula Green'),
-    t('Settings.Theme Settings.Main Color Theme.Dracula Orange'),
-    t('Settings.Theme Settings.Main Color Theme.Dracula Pink'),
-    t('Settings.Theme Settings.Main Color Theme.Dracula Purple'),
-    t('Settings.Theme Settings.Main Color Theme.Dracula Red'),
-    t('Settings.Theme Settings.Main Color Theme.Dracula Yellow'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Green'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Yellow'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Blue'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Purple'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Aqua'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Dark Orange'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Red'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Blue'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Purple'),
-    t('Settings.Theme Settings.Main Color Theme.Gruvbox Light Orange'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Yellow'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Orange'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Red'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Magenta'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Violet'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Blue'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Cyan'),
-    t('Settings.Theme Settings.Main Color Theme.Solarized Green'),
-  ])
-}
diff --git a/src/renderer/composables/use-i18n-polyfill.js b/src/renderer/composables/use-i18n-polyfill.js
deleted file mode 100644
index a8b7fa871dc82..0000000000000
--- a/src/renderer/composables/use-i18n-polyfill.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/* eslint-disable @intlify/vue-i18n/no-dynamic-keys */
-import { computed } from 'vue'
-
-import i18n from '../i18n/index'
-
-/**
- * Polyfill for vue-i18n's useI18n composable, as it is not available in Vue 2
- * and doesn't work when vue-i18n 9+ (used for Vue 3) is set to `legacy: true`,
- * which is needed for Options API components.
- *
- * Yes, vue-i18n 9 has an `allowComposition` option,
- * but it comes with limitations that this polyfill doesn't have and was removed in vue-i18n 10.
- *
- * @see https://vue-i18n.intlify.dev/guide/migration/vue3#limitations
- * @see https://vue-i18n.intlify.dev/guide/migration/breaking10.html#drop-allowcomposition-option
- */
-export function useI18n() {
-  const locale = computed({
-    get() {
-      return i18n.locale
-    },
-    set(locale) {
-      i18n.locale = locale
-    }
-  })
-
-  return {
-    locale,
-    t
-  }
-}
-
-/**
- * @overload
- * @param {string} key
- * @returns {string}
- */
-
-/**
- * @overload
- * @param {string} key
- * @param {number} plural
- * @returns {string}
- */
-
-/**
- * @overload
- * @param {string} key
- * @param {unknown[]} list
- * @returns {string}
- */
-
-/**
- * @overload
- * @param {string} key
- * @param {unknown[]} list
- * @param {number} plural
- * @returns {string}
- */
-
-/**
- * @overload
- * @param {string} key
- * @param {Record<string, unknown>} named
- * @returns {string}
- */
-
-/**
- * @overload
- * @param {string} key
- * @param {Record<string, unknown>} named
- * @param {number} plural
- * @returns {string}
- */
-
-/**
- * @param {string} key
- * @param {number | unknown[] | Record<string, unknown> | undefined} arg1
- * @param {number | undefined} arg2
- * @returns {string}
- */
-function t(key, arg1, arg2) {
-  // Remove these lines in the Vue 3 migration and pass all args to the `.t()` call
-  if (typeof arg1 === 'number') {
-    return i18n.tc(key, arg1)
-  } else if (typeof arg2 === 'number') {
-    return i18n.tc(key, arg2, arg1)
-  }
-
-  if (arg1 != null) {
-    return i18n.t(key, arg1)
-  }
-
-  return i18n.t(key)
-}
diff --git a/src/renderer/helpers/accessibility.js b/src/renderer/helpers/accessibility.js
index 48f06552b7938..880bf0ac45373 100644
--- a/src/renderer/helpers/accessibility.js
+++ b/src/renderer/helpers/accessibility.js
@@ -1,7 +1,3 @@
-/**
- * @param {string} attribute
- * @returns {string}
- */
 export function sanitizeForHtmlId(attribute) {
   return attribute.replaceAll(/\s+/g, '')
 }
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index e1ec96761cf9d..ee15c722431c6 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -1,30 +1,17 @@
 import store from '../../store/index'
 import {
   calculatePublishedDate,
-  getRelativeTimeFromDate,
   stripHTML,
+  toLocalePublicationString,
 } from '../utils'
 import { isNullOrEmpty } from '../strings'
 import autolinker from 'autolinker'
 import { FormatUtils, Misc, Player } from 'youtubei.js'
 
-/** @typedef {{url: string, width: number, height: number}} InvidiousImageObject */
-/** @typedef {{quality: string, url: string, width: number, height: number}} InvidiousThumbnailObject */
-/** @typedef {{type: 'video', title: string, videoId: string, author: string, authorId: string, authorUrl: string, authorVerified: boolean, videoThumbnails: InvidiousThumbnailObject[], description: string?, descriptionHtml: string?, viewCount: number, viewCountText: string, lengthSeconds: number, published: number, publishedText: string, premiereTimestamp: number, liveNow: boolean, premium: boolean, isUpcoming: boolean, hasCaptions: boolean, is3d: boolean, is4k: boolean, is8k: boolean, isNew: boolean, isVr180: boolean, isVr360: boolean}} InvidiousVideoType */
-/** @typedef {{type: 'channel', author: string, authorId: string, authorUrl: string, authorVerified: boolean, authorThumbnails: InvidiousThumbnailObject[], autoGenerated: boolean, subCount: number, videoCount: number, description: string, descriptionHtml: string}} InvidiousChannelObject */
-/** @typedef {{type: 'playlist', title: string, playlistId: string, playlistThumbnail: string, author: string, authorId: string, authorUrl: string, authorVerified: boolean, videoCount: number, videos: {title: string, videoId: string, lengthSeconds: number, videoThumbnails: InvidiousThumbnailObject[]}[]}} InvidiousPlaylistObject */
-/** @typedef {{type: 'hashtag', title: string, url: string, channelCount: number, videoCount: number}} InvidiousHashtagObject */
-
-/**
- * @returns {string}
- */
 function getCurrentInstanceUrl() {
   return store.getters.getCurrentInvidiousInstanceUrl
 }
 
-/**
- * @param {string} uri
- */
 export function getProxyUrl(uri) {
   const currentInstance = getCurrentInstanceUrl()
 
@@ -37,9 +24,6 @@ export function getProxyUrl(uri) {
   return url.toString().replace(origin, currentInstance)
 }
 
-/**
- * @param {string | URL} url
- */
 export function invidiousFetch(url) {
   const authorization = store.getters.getCurrentInvidiousInstanceAuthorization
 
@@ -54,7 +38,7 @@ export function invidiousFetch(url) {
   }
 }
 
-function invidiousAPICall({ resource, id = '', params = {}, doLogError = true, subResource = '' }) {
+export function invidiousAPICall({ resource, id = '', params = {}, doLogError = true, subResource = '' }) {
   return new Promise((resolve, reject) => {
     const requestUrl = getCurrentInstanceUrl() + '/api/v1/' + resource + '/' + id + (!isNullOrEmpty(subResource) ? `/${subResource}` : '') + '?' + new URLSearchParams(params).toString()
     invidiousFetch(requestUrl)
@@ -94,7 +78,6 @@ async function resolveUrl(url) {
  * Gets the channel ID for a channel URL
  * used to get the ID for channel usernames and handles
  * @param {string} url
- * @returns {Promise<string?>} channel ID
  */
 export async function invidiousGetChannelId(url) {
   try {
@@ -110,28 +93,6 @@ export async function invidiousGetChannelId(url) {
   }
 }
 
-/**
- * @param {string} channelId
- * @returns {Promise<{
- *  author: string,
- *  authorId: string,
- *  authorUrl: string,
- *  authorVerified: boolean,
- *  authorBanners: InvidiousImageObject[],
- *  authorThumbnails: InvidiousImageObject[],
- *  subCount: number,
- *  totalViews: number,
- *  joined: number,
- *  autoGenerated: boolean,
- *  isFamilyFriendly: boolean,
- *  description: string,
- *  descriptionHtml: string,
- *  allowedRegions: string[],
- *  tabs: ('home' | 'videos' | 'shorts' | 'streams' | 'podcasts' | 'releases' | 'playlists' | 'community')[],
- *  latestVideos: InvidiousVideoType[],
- *  relatedChannels: InvidiousChannelObject[]
- * }>}
- */
 export async function invidiousGetChannelInfo(channelId) {
   return await invidiousAPICall({
     resource: 'channels',
@@ -139,277 +100,19 @@ export async function invidiousGetChannelInfo(channelId) {
   })
 }
 
-/**
- * @param {string} tab
- * @param {string} channelId
- * @param {string | undefined | null} continuation
- * @param {string | undefined} sortBy
- */
-async function getInvidiousChannelTab(tab, channelId, continuation, sortBy) {
-  const params = {}
-
-  if (continuation) {
-    params.continuation = continuation
-  }
-
-  if (sortBy) {
-    params.sort_by = sortBy
-  }
-
-  return await invidiousAPICall({
-    resource: 'channels',
-    id: channelId,
-    subResource: tab,
-    params
-  })
-}
-
-/**
- * @param {string} channelId
- * @param {string | undefined} sortBy
- * @param {string | undefined | null} continuation
- */
-export async function getInvidiousChannelVideos(channelId, sortBy, continuation) {
-  /** @type {{continuation: string?, videos: InvidiousVideoType[]}}  */
-  const response = await getInvidiousChannelTab('videos', channelId, continuation, sortBy)
-
-  setMultiplePublishedTimestamps(response.videos)
-
-  return response
-}
-
-/**
- * @param {string} channelId
- * @param {string | undefined} sortBy
- * @param {string | undefined | null} continuation
- */
-export async function getInvidiousChannelShorts(channelId, sortBy, continuation) {
-  /** @type {{continuation: string?, videos: InvidiousVideoType[]}}  */
-  const response = await getInvidiousChannelTab('shorts', channelId, continuation, sortBy)
-
-  // workaround for Invidious sending incorrect information
-  // https://github.com/iv-org/invidious/issues/3801
-  response.videos.forEach(video => {
-    video.isUpcoming = false
-    delete video.published
-    delete video.premiereTimestamp
-  })
-
-  return response
-}
-
-/**
- * @param {string} channelId
- * @param {string | undefined} sortBy
- * @param {string | undefined | null} continuation
- */
-export async function getInvidiousChannelLive(channelId, sortBy, continuation) {
-  /** @type {{continuation: string?, videos: InvidiousVideoType[]}}  */
-  const response = await getInvidiousChannelTab('streams', channelId, continuation, sortBy)
-
-  setMultiplePublishedTimestamps(response.videos)
-
-  return response
-}
-
-/**
- * @param {string} channelId
- * @param {string | undefined} sortBy
- * @param {string | undefined | null} continuation
- */
-export async function getInvidiousChannelPlaylists(channelId, sortBy, continuation) {
-  /** @type {{continuation: string?, playlists: InvidiousPlaylistObject[]}} */
-  return await getInvidiousChannelTab('playlists', channelId, continuation, sortBy)
-}
-
-/**
- * @param {string} channelId
- * @param {string | undefined | null} continuation
- */
-export async function getInvidiousChannelReleases(channelId, continuation) {
-  /** @type {{continuation: string?, playlists: InvidiousPlaylistObject[]}} */
-  return await getInvidiousChannelTab('releases', channelId, continuation)
-}
-
-/**
- * @param {string} channelId
- * @param {string | undefined | null} continuation
- */
-export async function getInvidiousChannelPodcasts(channelId, continuation) {
-  /** @type {{continuation: string?, playlists: InvidiousPlaylistObject[]}} */
-  return await getInvidiousChannelTab('podcasts', channelId, continuation)
-}
-
-/**
- * @param {string} channelId
- * @param {string} query
- * @param {number} page
- */
-export async function searchInvidiousChannel(channelId, query, page) {
-  /** @type {(InvidiousVideoType | InvidiousPlaylistObject)[]} */
-  const response = await invidiousAPICall({
-    resource: 'channels',
-    id: channelId,
-    subResource: 'search',
-    params: {
-      q: query,
-      page
-    }
-  })
-
-  response.forEach((item) => {
-    if (item.type === 'video') {
-      setPublishedTimestamp(item)
-    }
-  })
-
-  return response
-}
-
-/**
- * @param {string} playlistId
- * @returns {{
- *  title: string,
- *  playlistId: string,
- *  author: string,
- *  authorId: string,
- *  authorThumbnails: InvidiousImageObject[],
- *  description: string,
- *  descriptionHtml: string,
- *  videoCount: number,
- *  viewCount: number,
- *  updated: number,
- *  videos: {
- *    title: string,
- *    videoId: string,
- *    author: string,
- *    authorId: string,
- *    authorUrl: string,
- *    videoThumbnails: InvidiousThumbnailObject[],
- *    index: number,
- *    lengthSeconds: number
- *  }[]
- * }}
- */
 export async function invidiousGetPlaylistInfo(playlistId) {
-  const playlist = await invidiousAPICall({
+  return await invidiousAPICall({
     resource: 'playlists',
     id: playlistId,
   })
-
-  setMultiplePublishedTimestamps(playlist.videos)
-
-  return playlist
 }
 
-/**
- * @param {string} videoId
- * @returns {Promise<{
- *  error: string,
- *  type: 'video' | 'published',
- *  title: string,
- *  videoId: string,
- *  videoThumbnails: InvidiousThumbnailObject[],
- *  storyboards: {
- *    url: string,
- *    templateUrl: string,
- *    width: number,
- *    height: number,
- *    count: number,
- *    interval: number,
- *    storyboardWidth: number,
- *    storyboardHeight: number,
- *    storyboardCount: number
- *  }[],
- *  description: string,
- *  descriptionHtml: string,
- *  published: number,
- *  publishedText: string,
- *  keywords: string[],
- *  viewCount: number,
- *  likeCount: number,
- *  dislikeCount: number,
- *  paid: boolean,
- *  premium: boolean,
- *  isFamilyFriendly: boolean,
- *  allowedRegions: string[],
- *  genre: string,
- *  genreUrl: string,
- *  author: string,
- *  authorId: string
- *  authorUrl: string,
- *  authorThumbnails: InvidiousImageObject[],
- *  subCountText: string,
- *  lengthSeconds: number,
- *  allowRatings: boolean,
- *  rating: number,
- *  isListed: boolean,
- *  liveNow: boolean,
- *  isPostLiveDvr: boolean,
- *  isUpcoming: boolean,
- *  dashUrl: string,
- *  premiereTimestamp: number?,
- *  hlsUrl: string?,
- *  adaptiveFormats: {
- *    index: string,
- *    bitrate: string,
- *    init: string,
- *    url: string,
- *    itag: string,
- *    type; string,
- *    clen: string,
- *    lmt: string,
- *    projectionType: string,
- *    container: string,
- *    encoding: string,
- *    qualityLabel: string?,
- *    fps: number?,
- *    size: string?,
- *    resolution: string?,
- *    targetDurationSec: int?,
- *    maxDvrDurationSec: int?,
- *    audioQuality: string?,
- *    audioSampleRate: string?,
- *    audioChannels: string?,
- *    colorInfo: string?,
- *    captionTrack: string?
- *  }[],
- *  formatStreams: {
- *    url: string,
- *    itag: string,
- *    type: string,
- *    quality: string,
- *    bitrate: string?,
- *    fps: int?,
- *    container: string,
- *    encoding: string,
- *    qualityLabel: string,
- *    resolution: string,
- *    size: string
- *  }[],
- *  captions: {
- *    label: string,
- *    language_code: string,
- *    url: string
- *  }[],
- *  musicTracks: {
- *    song: string,
- *    artist: string,
- *    album: string,
- *    license: string
- *  }[]?,
- *  recommendedVideos: InvidiousVideoType[]
- * }>}
- */
 export async function invidiousGetVideoInformation(videoId) {
   return await invidiousAPICall({
     resource: 'videos',
     id: videoId,
   })
 }
-
-/** @typedef {{commentCount: number, videoId: string, continuation: string?, comments: {author: string, authorThumbnails: InvidiousImageObject[], authorId: string, authorUrl: string, isEdited: boolean, isPinned: boolean, content: string, contentHtml: string, published: number, publishedText: string, likeCount: number, commentId: string, authorIsChannelOwner: boolean, creatorHeart: { creatorThumbnail: string, creatorName: string}?, isSponsor: boolean, sponsorIconUrl: string, replies: {replyCount: number, continuation: string}}[]}} InvidiousCommentResponse */
-
 export async function invidiousGetComments({ id, nextPageToken = '', sortNewest = true }) {
   const payload = {
     resource: 'comments',
@@ -419,8 +122,6 @@ export async function invidiousGetComments({ id, nextPageToken = '', sortNewest
       sort_by: sortNewest ? 'new' : 'top'
     }
   }
-
-  /** @type {InvidiousCommentResponse} */
   const response = await invidiousAPICall(payload)
 
   const commentData = parseInvidiousCommentData(response)
@@ -441,135 +142,6 @@ export async function invidiousGetCommentReplies({ id, replyToken }) {
   return { commentData: parseInvidiousCommentData(response), continuation: response.continuation ?? null }
 }
 
-/**
- * @param {string} query
- * @returns {Promise<{ query: string, suggestions: string[]}>}
- */
-export async function getInvidiousSearchSuggestions(query) {
-  return await invidiousAPICall({
-    resource: 'search/suggestions',
-    id: '',
-    params: {
-      q: query
-    }
-  })
-}
-
-/**
- * @returns {Promise<{
- *  type: 'shortVideo',
- *  title: string,
- *  videoId: string,
- *  videoThumbnails: InvidiousThumbnailObject[],
- *  lengthSeconds: number,
- *  viewCount: number,
- *  author: string,
- *  authorId: string,
- *  authorUrl: string,
- *  published: number,
- *  publishedText: string
- * }[]>}
- */
-export async function getInvidiousPopularFeed() {
-  const response = await invidiousAPICall({
-    resource: 'popular',
-    id: '',
-    params: {}
-  })
-
-  const items = response.filter((item) => {
-    return item.type === 'video' || item.type === 'shortVideo' || item.type === 'channel' || item.type === 'playlist'
-  })
-
-  items.forEach((item) => {
-    if (item.type === 'video' || item.type === 'shortVideo') {
-      setPublishedTimestamp(item)
-    }
-  })
-
-  return items
-}
-
-/**
- * @param {'default' | 'music' | 'gaming' | 'movies'} tab
- * @param {string} region
- * @returns {Promise<InvidiousVideoType[] | null>}
- */
-export async function getInvidiousTrending(tab, region) {
-  const params = {
-    resource: 'trending',
-    id: '',
-    params: {
-      region
-    }
-  }
-
-  if (tab !== 'default') {
-    params.params.type = tab.charAt(0).toUpperCase() + tab.substring(1)
-  }
-
-  const response = await invidiousAPICall(params)
-
-  if (!response) {
-    return null
-  }
-
-  const items = response.filter((item) => {
-    return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
-  })
-
-  items.forEach((item) => {
-    if (item.type === 'video') {
-      setPublishedTimestamp(item)
-    }
-  })
-
-  return items
-}
-
-/**
- * @param {string} query
- * @param {number} page
- * @param {any} searchSettings
- */
-export async function getInvidiousSearchResults(query, page, searchSettings) {
-  /** @type {Promise<(InvidiousChannelObject | InvidiousPlaylistObject | InvidiousVideoType | InvidiousHashtagObject)[] | null>} */
-  let results = await invidiousAPICall({
-    resource: 'search',
-    id: '',
-    params: {
-      q: query,
-      page,
-      sort_by: searchSettings.sortBy,
-      date: searchSettings.time,
-      duration: searchSettings.duration,
-      type: searchSettings.type,
-      features: searchSettings.features.join(',')
-    }
-  })
-
-  if (!results) {
-    return null
-  }
-
-  results = results.filter((item) => {
-    return item.type === 'video' || item.type === 'channel' || item.type === 'playlist' || item.type === 'hashtag'
-  })
-
-  results.forEach((item) => {
-    if (item.type === 'video') {
-      setPublishedTimestamp(item)
-    }
-  })
-
-  return results
-}
-
-/**
- * @param {string} url
- * @param {string?} currentInstance
- * @returns {string?}
- */
 export function youtubeImageUrlToInvidious(url, currentInstance = null) {
   if (url == null) {
     return null
@@ -588,40 +160,32 @@ export function youtubeImageUrlToInvidious(url, currentInstance = null) {
     .replace(/https:\/\/i\d*\.ytimg\.com/, newUrl)
 }
 
-/**
- * @param {string} url
- * @param {string?} currentInstance
- * @returns {string}
- */
 export function invidiousImageUrlToInvidious(url, currentInstance = null) {
   return url.replaceAll(/(\/ggpht\/)/g, `${currentInstance}/ggpht/`)
 }
 
-/**
- * @param {InvidiousCommentResponse} response
- */
 function parseInvidiousCommentData(response) {
   return response.comments.map((comment) => {
-    return {
-      id: comment.commentId,
-      showReplies: false,
-      authorLink: comment.authorId,
-      authorThumb: youtubeImageUrlToInvidious(comment.authorThumbnails.at(-1).url),
-      author: comment.author,
-      likes: comment.likeCount,
-      text: autolinker.link(stripHTML(invidiousImageUrlToInvidious(comment.contentHtml, getCurrentInstanceUrl()))),
-      dataType: 'invidious',
-      isOwner: comment.authorIsChannelOwner,
-      isPinned: comment.isPinned,
-      numReplies: comment.replies?.replyCount ?? 0,
-      hasReplyToken: !!comment.replies?.continuation,
-      replyToken: comment.replies?.continuation ?? '',
-      isHearted: comment.creatorHeart !== undefined,
-      isMember: comment.isSponsor,
-      memberIconUrl: youtubeImageUrlToInvidious(comment.sponsorIconUrl),
-      replies: [],
-      time: getRelativeTimeFromDate(comment.published * 1000, false)
-    }
+    comment.id = comment.commentId
+    comment.showReplies = false
+    comment.authorLink = comment.authorId
+    comment.authorThumb = youtubeImageUrlToInvidious(comment.authorThumbnails.at(-1).url)
+    comment.likes = comment.likeCount
+    comment.text = autolinker.link(stripHTML(invidiousImageUrlToInvidious(comment.contentHtml, getCurrentInstanceUrl())))
+    comment.dataType = 'invidious'
+    comment.isOwner = comment.authorIsChannelOwner
+    comment.numReplies = comment.replies?.replyCount ?? 0
+    comment.hasReplyToken = !!comment.replies?.continuation
+    comment.replyToken = comment.replies?.continuation ?? ''
+    comment.isHearted = comment.creatorHeart !== undefined
+    comment.isMember = comment.isSponsor
+    comment.memberIconUrl = youtubeImageUrlToInvidious(comment.sponsorIconUrl)
+    comment.replies = []
+    comment.time = toLocalePublicationString({
+      publishText: comment.publishedText
+    })
+
+    return comment
   })
 }
 
@@ -710,7 +274,6 @@ function parseInvidiousCommunityData(data) {
     voteCount: data.likeCount,
     postContent: parseInvidiousCommunityAttachments(data.attachment),
     commentCount: data?.replyCount ?? 0, // https://github.com/iv-org/invidious/pull/3635/
-    authorId: data.authorId,
     author: data.author,
     type: 'community'
   }
@@ -810,21 +373,30 @@ function parseInvidiousCommunityAttachments(data) {
 }
 
 /**
- * @param {string} hashtag
- * @param {number} page
+ * Invidious doesn't include the correct height or width for all formats in their API response and are also missing the fps and qualityLabel for the AV1 formats.
+ * When the local API is supported we generate our own manifest with the local API manifest generator, based on the Invidious API response and the height, width and fps extracted from Invidious' DASH manifest.
+ * As Invidious only includes h264 and AV1 in their DASH manifest, we have to always filter out the VP9 formats, due to missing information.
+ * @param {any[]} formats
  */
-export async function getHashtagInvidious(hashtag, page = 1) {
-  /** @type {{results: InvidiousVideoType[]}} */
-  const response = await invidiousAPICall({
+export function filterInvidiousFormats(formats) {
+  return formats.filter(format => {
+    const mimeType = format.type
+
+    return mimeType.startsWith('audio/') ||
+      mimeType.startsWith('video/mp4; codecs="avc') ||
+      mimeType.startsWith('video/mp4; codecs="av01')
+  })
+}
+
+export async function getHashtagInvidious(hashtag, page) {
+  const payload = {
     resource: 'hashtag',
     id: hashtag,
     params: {
       page
     }
-  })
-
-  setMultiplePublishedTimestamps(response.results)
-
+  }
+  const response = await invidiousAPICall(payload)
   return response.results
 }
 
@@ -901,9 +473,18 @@ export function convertInvidiousToLocalFormat(format) {
 
 /**
  * @param {any} format
+ * @param {boolean} trustApiResponse
  */
-export function mapInvidiousLegacyFormat(format) {
-  const [stringWidth, stringHeight] = format.size.split('x')
+export function mapInvidiousLegacyFormat(format, trustApiResponse) {
+  let width
+  let height
+
+  if (trustApiResponse) {
+    const [stringWidth, stringHeight] = format.size.split('x')
+
+    width = parseInt(stringWidth)
+    height = parseInt(stringHeight)
+  }
 
   return {
     itag: format.itag,
@@ -911,38 +492,8 @@ export function mapInvidiousLegacyFormat(format) {
     fps: format.fps,
     bitrate: parseInt(format.bitrate),
     mimeType: format.type,
-    height: parseInt(stringHeight),
-    width: parseInt(stringWidth),
+    height,
+    width,
     url: format.url
   }
 }
-
-/**
- * @param {{
- *  liveNow: boolean,
- *  isUpcoming: boolean,
- *  premiereTimestamp: number,
- *  published: number
- * }[]} videos
- */
-function setMultiplePublishedTimestamps(videos) {
-  videos.forEach(setPublishedTimestamp)
-}
-
-/**
- * @param {{
- *  liveNow: boolean,
- *  isUpcoming: boolean,
- *  premiereTimestamp: number,
- *  published: number
- * }} video
- */
-function setPublishedTimestamp(video) {
-  if (video.liveNow) {
-    video.published = new Date().getTime()
-  } else if (video.isUpcoming) {
-    video.published = video.premiereTimestamp * 1000
-  } else if (typeof video.published === 'number') {
-    video.published *= 1000
-  }
-}
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index d5ad4aeb1bf76..cc982b6fb48a4 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,4 +1,4 @@
-import { ClientType, Innertube, Misc, Parser, UniversalCache, Utils, YT, YTNodes } from 'youtubei.js'
+import { ClientType, Endpoints, Innertube, Misc, Parser, UniversalCache, Utils, YT } from 'youtubei.js'
 import Autolinker from 'autolinker'
 import { SEARCH_CHAR_LIMIT } from '../../../constants'
 
@@ -9,8 +9,8 @@ import {
   escapeHTML,
   extractNumberFromString,
   getChannelPlaylistId,
-  getRelativeTimeFromDate,
   randomArrayItem,
+  toLocalePublicationString
 } from '../utils'
 
 const TRACKING_PARAM_NAMES = [
@@ -178,7 +178,7 @@ export async function untilEndOfLocalPlayList(playlist, callback, options = { ru
 /**
  * @param {string} location
  * @param {'default'|'music'|'gaming'|'movies'} tab
- * @param {import('youtubei.js').Mixins.TabbedFeed<import('youtubei.js').IBrowseResponse> | null} instance
+ * @param {import('youtubei.js').Mixins.TabbedFeed|null} instance
  */
 export async function getLocalTrending(location, tab, instance) {
   if (instance === null) {
@@ -253,44 +253,54 @@ export async function getLocalVideoInfo(id) {
     id = trailerScreen.video_id
   }
 
-  if ((info.playability_status.status === 'UNPLAYABLE' && (!hasTrailer || trailerIsAgeRestricted)) ||
-    info.playability_status.status === 'LOGIN_REQUIRED') {
-    return info
-  }
+  // try to bypass the age restriction
+  if (info.playability_status.status === 'LOGIN_REQUIRED' || (hasTrailer && trailerIsAgeRestricted)) {
+    const tvInnertube = await createInnertube({ withPlayer: true, clientType: ClientType.TV_EMBEDDED, generateSessionLocally: false })
 
-  const iosInnertube = await createInnertube({ clientType: ClientType.IOS })
+    const tvInfo = await tvInnertube.getBasicInfo(id, 'TV_EMBEDDED')
 
-  const iosInfo = await iosInnertube.getBasicInfo(id, 'iOS')
+    if (tvInfo.streaming_data) {
+      decipherFormats(tvInfo.streaming_data.adaptive_formats, tvInnertube.actions.session.player)
+      decipherFormats(tvInfo.streaming_data.formats, tvInnertube.actions.session.player)
+    }
 
-  if (hasTrailer) {
-    info.playability_status = iosInfo.playability_status
-    info.streaming_data = iosInfo.streaming_data
-    info.basic_info.start_timestamp = iosInfo.basic_info.start_timestamp
-    info.basic_info.duration = iosInfo.basic_info.duration
-    info.captions = iosInfo.captions
-    info.storyboards = iosInfo.storyboards
-  } else if (iosInfo.streaming_data) {
-    info.streaming_data.adaptive_formats = iosInfo.streaming_data.adaptive_formats
-    info.streaming_data.hls_manifest_url = iosInfo.streaming_data.hls_manifest_url
-
-    // Use the legacy formats from the original web response as the iOS client doesn't have any legacy formats
-
-    for (const format of info.streaming_data.adaptive_formats) {
-      format.freeTubeUrl = format.url
+    info.playability_status = tvInfo.playability_status
+    info.streaming_data = tvInfo.streaming_data
+    info.basic_info.start_timestamp = tvInfo.basic_info.start_timestamp
+    info.basic_info.duration = tvInfo.basic_info.duration
+    info.captions = tvInfo.captions
+    info.storyboards = tvInfo.storyboards
+  } else {
+    const iosInnertube = await createInnertube({ clientType: ClientType.IOS })
+
+    const iosInfo = await iosInnertube.getBasicInfo(id, 'iOS')
+
+    if (hasTrailer) {
+      info.playability_status = iosInfo.playability_status
+      info.streaming_data = iosInfo.streaming_data
+      info.basic_info.start_timestamp = iosInfo.basic_info.start_timestamp
+      info.basic_info.duration = iosInfo.basic_info.duration
+      info.captions = iosInfo.captions
+      info.storyboards = iosInfo.storyboards
+    } else if (iosInfo.streaming_data) {
+      info.streaming_data.adaptive_formats = iosInfo.streaming_data.adaptive_formats
+      info.streaming_data.hls_manifest_url = iosInfo.streaming_data.hls_manifest_url
+
+      // Use the legacy formats from the original web response as the iOS client doesn't have any legacy formats
+
+      for (const format of info.streaming_data.adaptive_formats) {
+        format.freeTubeUrl = format.url
+      }
     }
-  }
 
-  if (info.streaming_data) {
-    decipherFormats(info.streaming_data.formats, webInnertube.actions.session.player)
+    if (info.streaming_data) {
+      decipherFormats(info.streaming_data.formats, webInnertube.actions.session.player)
+    }
   }
 
   return info
 }
 
-/**
- * @param {string} id
- * @param {boolean | undefined} sortByNewest
- */
 export async function getLocalComments(id, sortByNewest = false) {
   const innertube = await createInnertube()
   return innertube.getComments(id, sortByNewest ? 'NEWEST_FIRST' : 'TOP_COMMENTS')
@@ -369,12 +379,12 @@ export async function getLocalChannelVideos(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute('/browse', {
-      browseId: id,
+    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
+      browse_id: id,
       params: 'EgZ2aWRlb3PyBgQKAjoA'
       // protobuf for the videos tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    })
+    }))
 
     const videosTab = new YT.Channel(null, response)
     const { id: channelId = id, name, thumbnailUrl } = parseLocalChannelHeader(videosTab, true)
@@ -426,12 +436,12 @@ export async function getLocalChannelLiveStreams(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute('/browse', {
-      browseId: id,
+    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
+      browse_id: id,
       params: 'EgdzdHJlYW1z8gYECgJ6AA%3D%3D'
       // protobuf for the live tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    })
+    }))
 
     let liveStreamsTab = new YT.Channel(innertube.actions, response)
     const { id: channelId = id, name, thumbnailUrl } = parseLocalChannelHeader(liveStreamsTab, true)
@@ -474,12 +484,12 @@ export async function getLocalChannelCommunity(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute('/browse', {
-      browseId: id,
+    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
+      browse_id: id,
       params: 'Egljb21tdW5pdHnyBgQKAkoA'
       // protobuf for the community tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    })
+    }))
 
     const communityTab = new YT.Channel(null, response)
 
@@ -554,15 +564,15 @@ export async function getLocalArtistTopicChannelReleasesContinuation(channel, co
  * @param {boolean} onlyIdNameThumbnail
  */
 export function parseLocalChannelHeader(channel, onlyIdNameThumbnail = false) {
-  /** @type {string?} */
+  /** @type {string=} */
   let id
   /** @type {string} */
   let name
-  /** @type {string?} */
+  /** @type {string=} */
   let thumbnailUrl
-  /** @type {string?} */
+  /** @type {string=} */
   let bannerUrl
-  /** @type {string?} */
+  /** @type {string=} */
   let subscriberText
   /** @type {string[]} */
   const tags = []
@@ -658,8 +668,6 @@ export function parseLocalChannelHeader(channel, onlyIdNameThumbnail = false) {
           const image = header.content.image
           thumbnailUrl = image.avatar?.image[0].url
         }
-      } else if (header.content.animated_image) {
-        thumbnailUrl = header.content.animated_image.image[0].url
       }
 
       if (!thumbnailUrl && channel.metadata.thumbnail) {
@@ -732,78 +740,66 @@ export function parseLocalChannelVideos(videos, channelId, channelName) {
   return parsedVideos
 }
 
-export function parseShort(short, channelId, channelName) {
-  if (short.type === 'ReelItem') {
-    /** @type {import('youtubei.js').YTNodes.ReelItem} */
-    const reelItem = short
-
-    return {
-      type: 'video',
-      videoId: reelItem.id,
-      title: reelItem.title.text,
-      author: channelName,
-      authorId: channelId,
-      viewCount: reelItem.views.isEmpty() ? null : parseLocalSubscriberCount(reelItem.views.text),
-      lengthSeconds: ''
-    }
-  } else {
-    /** @type {import('youtubei.js').YTNodes.ShortsLockupView} */
-    const shortsLockupView = short
-
-    return {
-      type: 'video',
-      videoId: shortsLockupView.on_tap_endpoint.payload.videoId,
-      title: shortsLockupView.overlay_metadata.primary_text.text,
-      author: channelName,
-      authorId: channelId,
-      viewCount: shortsLockupView.overlay_metadata.secondary_text ? parseLocalSubscriberCount(shortsLockupView.overlay_metadata.secondary_text.text) : null,
-      lengthSeconds: ''
-    }
-  }
-}
-
 /**
  * @param {(import('youtubei.js').YTNodes.ReelItem | import('youtubei.js').YTNodes.ShortsLockupView)[]} shorts
  * @param {string} channelId
  * @param {string} channelName
  */
 export function parseLocalChannelShorts(shorts, channelId, channelName) {
-  return shorts.map(short => parseShort(short, channelId, channelName))
+  return shorts.map(short => {
+    if (short.type === 'ReelItem') {
+      /** @type {import('youtubei.js').YTNodes.ReelItem} */
+      const reelItem = short
+
+      return {
+        type: 'video',
+        videoId: reelItem.id,
+        title: reelItem.title.text,
+        author: channelName,
+        authorId: channelId,
+        viewCount: reelItem.views.isEmpty() ? null : parseLocalSubscriberCount(reelItem.views.text),
+        lengthSeconds: ''
+      }
+    } else {
+      /** @type {import('youtubei.js').YTNodes.ShortsLockupView} */
+      const shortsLockupView = short
+
+      return {
+        type: 'video',
+        videoId: shortsLockupView.on_tap_endpoint.payload.videoId,
+        title: shortsLockupView.overlay_metadata.primary_text.text,
+        author: channelName,
+        authorId: channelId,
+        viewCount: shortsLockupView.overlay_metadata.secondary_text ? parseLocalSubscriberCount(shortsLockupView.overlay_metadata.secondary_text.text) : null,
+        lengthSeconds: ''
+      }
+    }
+  })
 }
 
 /**
  * @param {import('youtubei.js').YTNodes.Playlist|import('youtubei.js').YTNodes.GridPlaylist|import('youtubei.js').YTNodes.LockupView} playlist
  * @param {string} channelId
- * @param {string} channelName
+ * @param {string} chanelName
  */
 export function parseLocalListPlaylist(playlist, channelId = undefined, channelName = undefined) {
   if (playlist.type === 'LockupView') {
-    return parseLockupView(playlist, channelId, channelName)
-  } else if (playlist.type === 'CompactStation') {
-    /** @type {import('youtubei.js').YTNodes.CompactStation} */
-    const compactStation = playlist
+    /** @type {import('youtubei.js').YTNodes.LockupView} */
+    const lockupView = playlist
 
-    return {
-      type: 'playlist',
-      dataSource: 'local',
-      title: compactStation.title.text,
-      thumbnail: compactStation.thumbnail[1].url,
-      playlistId: compactStation.endpoint.payload.playlistId,
-      videoCount: extractNumberFromString(compactStation.video_count.text)
-    }
-  } else if (playlist.type === 'GridPlaylist') {
-    /** @type {import('youtubei.js').YTNodes.GridPlaylist} */
-    const gridPlaylist = playlist
+    /** @type {import('youtubei.js').YTNodes.ThumbnailOverlayBadgeView} */
+    const thumbnailOverlayBadgeView = lockupView.content_image.primary_thumbnail.overlays
+      .find(overlay => overlay.type === 'ThumbnailOverlayBadgeView')
 
     return {
       type: 'playlist',
       dataSource: 'local',
-      title: gridPlaylist.title.text,
-      thumbnail: gridPlaylist.thumbnails.at(0).url,
-      playlistId: gridPlaylist.id,
-      channelName: gridPlaylist.author?.name,
-      channelId: gridPlaylist.author?.id,
-      videoCount: extractNumberFromString(gridPlaylist.video_count.text)
+      title: lockupView.metadata.title.text,
+      thumbnail: lockupView.content_image.primary_thumbnail.image[0].url,
+      channelName,
+      channelId,
+      playlistId: lockupView.content_id,
+      videoCount: extractNumberFromString(thumbnailOverlayBadgeView.badges[0].text)
     }
   } else {
     let internalChannelName
@@ -845,6 +841,24 @@ export function parseLocalListPlaylist(playlist, channelId = undefined, channelN
   }
 }
 
+/**
+ * @param {import('youtubei.js').YTNodes.CompactStation} compactStation
+ * @param {string} channelId
+ * @param {string} channelName
+ */
+export function parseLocalCompactStation(compactStation, channelId, channelName) {
+  return {
+    type: 'playlist',
+    dataSource: 'local',
+    title: compactStation.title.text,
+    thumbnail: compactStation.thumbnail[1].url,
+    channelName,
+    channelId,
+    playlistId: compactStation.endpoint.payload.playlistId,
+    videoCount: extractNumberFromString(compactStation.video_count.text)
+  }
+}
+
 /**
  * @param {YT.Search} response
  */
@@ -858,10 +872,9 @@ function handleSearchResponse(response) {
 
   const results = response.results
     .filter((item) => {
-      return item.type === 'Video' || item.type === 'Channel' || item.type === 'Playlist' || item.type === 'HashtagTile' || item.type === 'Movie' || item.type === 'LockupView'
+      return item.type === 'Video' || item.type === 'Channel' || item.type === 'Playlist' || item.type === 'HashtagTile' || item.type === 'Movie'
     })
     .map((item) => parseListItem(item))
-    .filter((item) => item)
 
   return {
     results,
@@ -870,65 +883,6 @@ function handleSearchResponse(response) {
   }
 }
 
-/**
- * @param {import('youtubei.js').YT.Channel} homeTab
- */
-export function parseChannelHomeTab(homeTab) {
-  /**
-   * @type {import('youtubei.js').YTNodes.ItemSection | import('youtubei.js').YTNodes.RichSection}
-   */
-  let section
-  const shelves = []
-  for (section of homeTab.current_tab.content.contents) {
-    if (section.type === 'ItemSection') {
-      /**
-       * @type {import('youtubei.js').YTNodes.ItemSection}
-       */
-      const itemSection = section
-      if (itemSection.contents.at(0).type === 'Shelf') {
-        /** @type {import('youtubei.js').YTNodes.Shelf} */
-        const shelf = itemSection.contents.at(0)
-        shelves.push({
-          title: shelf.title.text,
-          content: shelf.content.items.map(parseListItem).filter(_ => _),
-          playlistId: shelf.play_all_button?.endpoint.payload.playlistId,
-          subtitle: shelf.subtitle?.text
-        })
-      } else if (itemSection.contents.at(0).type === 'ReelShelf') {
-        /** @type {import('youtubei.js').YTNodes.ReelShelf} */
-        const shelf = itemSection.contents.at(0)
-        shelves.push({
-          title: shelf.title.text,
-          content: shelf.items.map(parseListItem).filter(_ => _)
-        })
-      } else if (itemSection.contents.at(0).type === 'HorizontalCardList') {
-        /** @type {import('youtubei.js').YTNodes.HorizontalCardList} */
-        const shelf = itemSection.contents.at(0)
-        shelves.push({
-          title: shelf.header.title.text,
-          content: shelf.cards.map(parseListItem).filter(_ => _),
-          subtitle: shelf.header.subtitle.text
-        })
-      }
-    } else if (section.type === 'RichSection') {
-      if (section.content.type === 'RichShelf') {
-        /** @type {import('youtubei.js').YTNodes.RichShelf} */
-        const shelf = section.content
-        shelves.push({
-          title: shelf.title?.text,
-          content: shelf.contents.map(e => parseListItem(e.content)),
-          subtitle: shelf.subtitle?.text,
-          playlistId: shelf.endpoint?.metadata.url.includes('/playlist') ? shelf.endpoint?.metadata.url.replace('/playlist?list=', '') : null
-        })
-      }
-    }
-  }
-
-  shelves.forEach(e => {
-    e['isCommunity'] = e.content.at(0)?.type === 'community'
-  })
-  return shelves
-}
 /**
  * @param {import('youtubei.js').YTNodes.PlaylistVideo|import('youtubei.js').YTNodes.ReelItem|import('youtubei.js').YTNodes.ShortsLockupView} video
  */
@@ -1068,48 +1022,8 @@ export function parseLocalListVideo(item) {
       lengthSeconds: isNaN(movie.duration.seconds) ? '' : movie.duration.seconds,
       liveNow: false,
       isUpcoming: false,
-    }
-  } else if (item.type === 'GridVideo') {
-    /** @type {import('youtubei.js').YTNodes.GridVideo} */
-    const video = item
-
-    let publishedText
-
-    if (video.published != null && !video.published.isEmpty()) {
-      publishedText = video.published.text
-    }
-
-    const published = calculatePublishedDate(
-      publishedText,
-      video.is_live,
-      video.is_upcoming || video.is_premiere,
-      video.upcoming
-    )
-
-    return {
-      type: 'video',
-      videoId: video.id,
-      title: video.title.text,
-      author: video.author?.name,
-      authorId: video.author?.id,
-      viewCount: video.views.text == null ? null : extractNumberFromString(video.views.text),
-      published,
-      lengthSeconds: Utils.timeToSeconds(video.duration.text),
-      isUpcoming: video.is_upcoming,
-      premiereDate: video.upcoming
-    }
-  } else if (item.type === 'GridMovie') {
-    /** @type {import('youtubei.js').YTNodes.GridMovie} */
-    const movie = item
-    return {
-      type: 'video',
-      videoId: movie.id,
-      title: movie.title.text,
-      author: movie.author.name,
-      authorId: movie.author.id !== 'N/A' ? movie.author.id : null,
-      lengthSeconds: isNaN(movie.duration.seconds) ? '' : movie.duration.seconds,
-      isUpcoming: movie.is_upcoming,
-      premiereDate: movie.upcoming
+      is4k: movie.is_4k,
+      hasCaptions: movie.has_captions
     }
   } else {
     /** @type {import('youtubei.js').YTNodes.Video} */
@@ -1135,68 +1049,18 @@ export function parseLocalListVideo(item) {
       author: video.author.name,
       authorId: video.author.id,
       description: video.description,
-      viewCount: video.view_count?.text == null ? (video.short_view_count.text == null ? null : parseLocalSubscriberCount(video.short_view_count.text)) : extractNumberFromString(video.view_count.text),
+      viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),
       published,
       lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
       liveNow: video.is_live,
       isUpcoming: video.is_upcoming || video.is_premiere,
       premiereDate: video.upcoming,
       is4k: video.is_4k,
-      is8k: video.badges.some(badge => badge.label === '8K'),
-      isNew: video.badges.some(badge => badge.label === 'New'),
-      isVr180: video.badges.some(badge => badge.label === 'VR180'),
-      isVr360: video.badges.some(badge => badge.label === '360°'),
-      is3d: video.badges.some(badge => badge.label === '3D'),
       hasCaptions: video.has_captions
     }
   }
 }
 
-/**
- * @param {import('youtubei.js').YTNodes.LockupView} lockupView
- * @param {string | undefined} channelId
- * @param {string | undefined} channelName
- */
-function parseLockupView(lockupView, channelId = undefined, channelName = undefined) {
-  switch (lockupView.content_type) {
-    case 'ALBUM':
-    case 'PLAYLIST':
-    case 'PODCAST': {
-      const thumbnailOverlayBadgeView = lockupView.content_image.primary_thumbnail.overlays
-        .find(overlay => overlay.is(YTNodes.ThumbnailOverlayBadgeView))
-
-      const playlistId = lockupView.content_id
-
-      // Filter out mixes without playlist pages (we don't support watch page-only mixes)
-      // https://wiki.archiveteam.org/index.php/YouTube/Technical_details#Playlists
-      if (playlistId.startsWith('RD') && !playlistId.startsWith('RDCL')) {
-        return null
-      }
-
-      const maybeChannelText = lockupView.metadata?.metadata?.metadata_rows?.[0]?.metadata_parts?.[0]?.text
-
-      if (maybeChannelText && maybeChannelText.endpoint?.metadata.page_type === 'WEB_PAGE_TYPE_CHANNEL') {
-        channelName = maybeChannelText.text
-        channelId = maybeChannelText.endpoint.payload.browseId
-      }
-
-      return {
-        type: 'playlist',
-        dataSource: 'local',
-        playlistId,
-        title: lockupView.metadata.title.text,
-        thumbnail: lockupView.content_image.primary_thumbnail.image[0].url,
-        channelName,
-        channelId,
-        videoCount: extractNumberFromString(thumbnailOverlayBadgeView.badges[0].text)
-      }
-    }
-    default:
-      console.warn(`Unknown lockup content type: ${lockupView.content_type}`, lockupView)
-      return null
-  }
-}
-
 /**
  * @param {import('youtubei.js').Helpers.YTNode} item
  */
@@ -1204,45 +1068,7 @@ function parseListItem(item) {
   switch (item.type) {
     case 'Movie':
     case 'Video':
-    case 'GridVideo':
-    case 'GridMovie':
-    case 'VideoCard':
       return parseLocalListVideo(item)
-    case 'GameCard': {
-      /** @type {import('youtubei.js').YTNodes.GameCard} */
-      const channel = item
-      /** @type {import('youtubei.js').YTNodes.GameDetails} */
-      const game = channel.game
-      return {
-        type: 'channel',
-        dataSource: 'local',
-        thumbnail: game.box_art.at(0).url.replace(/^\/\//, 'https://'),
-        name: game.title.text,
-        id: game.endpoint.payload.browseId,
-        isGame: true
-      }
-    }
-    case 'GridChannel': {
-      /** @type {import('youtubei.js').YTNodes.GridChannel} */
-      const channel = item
-      let subscribers = null
-      let videos = null
-
-      subscribers = parseLocalSubscriberCount(channel.subscribers.text)
-      videos = extractNumberFromString(channel.video_count.text)
-
-      return {
-        type: 'channel',
-        dataSource: 'local',
-        thumbnail: channel.author.best_thumbnail?.url.replace(/^\/\//, 'https://'),
-        name: channel.author.name,
-        id: channel.author.id,
-        subscribers,
-        videos,
-        handle: null,
-        descriptionShort: channel.description_snippet?.text
-      }
-    }
     case 'Channel': {
       /** @type {import('youtubei.js').YTNodes.Channel} */
       const channel = item
@@ -1258,20 +1084,20 @@ function parseListItem(item) {
         handle = channel.subscriber_count.text
 
         if (!channel.video_count.isEmpty()) {
-          subscribers = parseLocalSubscriberCount(channel.video_count.text)
+          subscribers = channel.video_count.text
         }
       } else {
         videos = extractNumberFromString(channel.video_count.text)
 
         if (!channel.subscriber_count.isEmpty()) {
-          subscribers = parseLocalSubscriberCount(channel.subscriber_count.text)
+          subscribers = channel.subscriber_count.text
         }
       }
 
       return {
         type: 'channel',
         dataSource: 'local',
-        thumbnail: channel.author.best_thumbnail?.url.replace(/^\/\//, 'https://'),
+        thumbnail: channel.author.best_thumbnail?.url,
         name: channel.author.name,
         id: channel.author.id,
         subscribers,
@@ -1291,20 +1117,9 @@ function parseListItem(item) {
         channelCount: hashtag.hashtag_channel_count.isEmpty() ? null : parseLocalSubscriberCount(hashtag.hashtag_channel_count.text)
       }
     }
-    case 'ReelItem':
-    case 'ShortsLockupView': {
-      return parseShort(item)
-    }
-    case 'CompactStation':
-    case 'GridPlaylist':
     case 'Playlist': {
       return parseLocalListPlaylist(item)
     }
-    case 'Post': {
-      return parseLocalCommunityPost(item)
-    }
-    case 'LockupView':
-      return parseLockupView(item)
   }
 }
 
@@ -1507,7 +1322,7 @@ export function mapLocalLegacyFormat(format) {
 }
 
 /**
- * @param {import('youtubei.js').YTNodes.CommentView} comment
+ * @param {import('youtubei.js').YTNodes.Comment|import('youtubei.js').YTNodes.CommentView} comment
  * @param {import('youtubei.js').YTNodes.CommentThread} commentThread
  */
 export function parseLocalComment(comment, commentThread = undefined) {
@@ -1521,7 +1336,7 @@ export function parseLocalComment(comment, commentThread = undefined) {
     hasReplyToken = true
   }
 
-  return {
+  const parsed = {
     id: comment.comment_id,
     dataType: 'local',
     authorLink: comment.author.id,
@@ -1538,11 +1353,33 @@ export function parseLocalComment(comment, commentThread = undefined) {
     replyToken,
     showReplies: false,
     replies: [],
-    memberIconUrl: comment.is_member ? comment.member_badge.url : '',
-    time: getRelativeTimeFromDate(calculatePublishedDate(comment.published_time.replace('(edited)', '').trim()), false),
-    likes: comment.like_count,
-    numReplies: parseLocalSubscriberCount(comment.reply_count)
+
+    // default values for the properties set below
+    memberIconUrl: '',
+    time: '',
+    likes: 0,
+    numReplies: 0
   }
+
+  if (comment.type === 'Comment') {
+    /** @type {import('youtubei.js').YTNodes.Comment} */
+    const comment_ = comment
+
+    parsed.memberIconUrl = comment_.is_member ? comment_.sponsor_comment_badge.custom_badge[0].url : ''
+    parsed.time = toLocalePublicationString({ publishText: comment_.published.text.replace('(edited)', '').trim() })
+    parsed.likes = comment_.vote_count
+    parsed.numReplies = comment_.reply_count
+  } else {
+    /** @type {import('youtubei.js').YTNodes.CommentView} */
+    const commentView = comment
+
+    parsed.memberIconUrl = commentView.is_member ? commentView.member_badge.url : ''
+    parsed.time = toLocalePublicationString({ publishText: commentView.published_time.replace('(edited)', '').trim() })
+    parsed.likes = commentView.like_count
+    parsed.numReplies = parseLocalSubscriberCount(commentView.reply_count)
+  }
+
+  return parsed
 }
 
 /**
@@ -1652,7 +1489,6 @@ function parseLocalCommunityPost(post) {
     voteCount: post.vote_count ? parseLocalSubscriberCount(post.vote_count.text) : 0,
     postContent: parseLocalAttachment(post.attachment),
     commentCount: replyCount,
-    authorId: post.author.id,
     author: post.author.name,
     type: 'community'
   }
diff --git a/src/renderer/helpers/channels.js b/src/renderer/helpers/channels.js
index 39c32089336f6..3161e5f8dcec8 100644
--- a/src/renderer/helpers/channels.js
+++ b/src/renderer/helpers/channels.js
@@ -4,11 +4,11 @@ import { getLocalChannel, parseLocalChannelHeader } from './api/local'
 /**
  * @param {string} id
  * @param {{
- *   preference: string,
- *   fallback: boolean,
- *   invalid: boolean,
- * }} backendOptions
- */
+*   preference: string,
+*   fallback: boolean,
+*   invalid: boolean,
+* }} backendOptions
+*/
 async function findChannelById(id, backendOptions) {
   try {
     if (!process.env.SUPPORTS_LOCAL_API || backendOptions.preference === 'invidious') {
@@ -37,11 +37,11 @@ async function findChannelById(id, backendOptions) {
 /**
  * @param {string} id
  * @param {{
- *   preference: string,
- *   fallback: boolean,
- * }} backendOptions
- * @returns {Promise<{icon: string, iconHref: string, preferredName: string} | { invalidId: boolean }>}
- */
+*   preference: string,
+*   fallback: boolean,
+* }} backendOptions
+* @returns {Promise<{icon: string, iconHref: string, preferredName: string} | { invalidId: boolean }>}
+*/
 export async function findChannelTagInfo(id, backendOptions) {
   if (!checkYoutubeChannelId(id)) return { invalidId: true }
   try {
diff --git a/src/renderer/helpers/colors.js b/src/renderer/helpers/colors.js
index c98bc7856de7d..cd1e1d4aebc1f 100644
--- a/src/renderer/helpers/colors.js
+++ b/src/renderer/helpers/colors.js
@@ -1,7 +1,6 @@
+import i18n from '../i18n/index'
 import { randomArrayItem } from './utils'
 
-// When adding new colors here,
-// remember to update the name translations in `src/renderer/composables/colors.js`
 export const colors = [
   { name: 'Red', value: '#d50000' },
   { name: 'Pink', value: '#C51162' },
@@ -40,16 +39,6 @@ export const colors = [
   { name: 'DraculaPurple', value: '#BD93F9' },
   { name: 'DraculaRed', value: '#FF5555' },
   { name: 'DraculaYellow', value: '#F1FA8C' },
-  { name: 'GruvboxDarkGreen', value: '#b8bb26' },
-  { name: 'GruvboxDarkYellow', value: '#fabd2f' },
-  { name: 'GruvboxDarkBlue', value: '#83a593' },
-  { name: 'GruvboxDarkPurple', value: '#d3869b' },
-  { name: 'GruvboxDarkAqua', value: '#8ec07c' },
-  { name: 'GruvboxDarkOrange', value: '#fe8019' },
-  { name: 'GruvboxLightRed', value: '#9d0006' },
-  { name: 'GruvboxLightBlue', value: '#076678' },
-  { name: 'GruvboxLightPurple', value: '#8f3f71' },
-  { name: 'GruvboxLightOrange', value: '#af3a03' },
   { name: 'SolarizedYellow', value: '#b58900' },
   { name: 'SolarizedOrange', value: '#cb4b16' },
   { name: 'SolarizedRed', value: '#dc322f' },
@@ -60,6 +49,56 @@ export const colors = [
   { name: 'SolarizedGreen', value: '#859900' },
 ]
 
+export function getColorTranslations() {
+  return [
+    i18n.t('Settings.Theme Settings.Main Color Theme.Red'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Pink'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Purple'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Deep Purple'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Indigo'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Blue'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Light Blue'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Cyan'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Teal'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Green'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Light Green'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Lime'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Yellow'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Amber'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Orange'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Deep Orange'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Rosewater'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Flamingo'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Pink'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Mauve'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Red'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Maroon'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Peach'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Yellow'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Green'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Teal'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sky'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sapphire'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Blue'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Lavender'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Cyan'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Green'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Orange'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Pink'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Purple'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Red'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Yellow'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Yellow'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Orange'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Red'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Magenta'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Violet'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Blue'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Cyan'),
+    i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Green'),
+  ]
+}
+
 export function getRandomColorClass() {
   return 'main' + getRandomColor().name
 }
diff --git a/src/renderer/helpers/player/utils.js b/src/renderer/helpers/player/utils.js
index 0c68dcae097e0..939423d16dc98 100644
--- a/src/renderer/helpers/player/utils.js
+++ b/src/renderer/helpers/player/utils.js
@@ -9,7 +9,7 @@ import { sponsorBlockSkipSegments } from '../sponsorblock'
  * @param {shaka.util.Error} error
  * @param {string} context
  * @param {string} videoId
- * @param {object?} details
+ * @param {object=} details
  */
 export function logShakaError(error, context, videoId, details) {
   const { Severity, Category, Code } = shaka.util.Error
@@ -119,6 +119,14 @@ export function translateSponsorBlockCategory(category) {
   }
 }
 
+/**
+ * @param {string} qualityLabel
+ * @returns {number}
+ */
+export function qualityLabelToDimension(qualityLabel) {
+  return parseInt(qualityLabel.split('p')[0])
+}
+
 /**
  * Moves the captions that are the most similar to the display language to the top
  * and sorts the remaining ones alphabetically.
@@ -189,13 +197,13 @@ export function sortCaptions(captions) {
  * This function cleans it up, so that we can use it.
  *
  * Here is a list of things this function does:
- * - Removes bogus roles and labels
- * - Extracts the languages from the audio URLs if available and adds it to the adapation sets
- * - Adds roles and labels when possible to add support for multiple audio tracks
+ * * Removes bogus roles and labels
+ * * Extracts the languages from the audio URLs if available and adds it to the adapation sets
+ * * Adds roles and labels when possible to add support for multiple audio tracks
  *
  * Things this function does not do:
- * - Separate DRC (Stable Volume) from their original counterparts
- * - Tag HDR video streams (Invidious puts all video streams in the same adaptation set,
+ * * Separate DRC (Stable Volume) from their original counterparts
+ * * Tag HDR video streams (Invidious puts all video streams in the same adaptation set,
  * to tag HDR and SDR streams we would have to separate them out into multiple adaptation sets)
  * @param {shaka.extern.xml.Node[]} periods
  */
@@ -214,7 +222,7 @@ export function repairInvidiousManifest(periods) {
   }
 
   // match YouTube's local API response with English
-  const languageNames = new Intl.DisplayNames('en-US', { type: 'language', languageDisplay: 'standard' })
+  const languageNames = new Intl.DisplayNames('en-US', { type: 'language' })
 
   for (const audioAdaptationSet of audioAdaptationSets) {
     // Invidious adds a label to every audio stream with it's bitrate
@@ -273,7 +281,6 @@ export function repairInvidiousManifest(periods) {
                   labelParts.push('original')
                   break
                 case 'dubbed':
-                case 'dubbed-auto':
                   role = 'dub'
                   break
                 case 'descriptive':
diff --git a/src/renderer/helpers/playlists.js b/src/renderer/helpers/playlists.js
index 6d8e2ed565bd4..5f53972f4b43d 100644
--- a/src/renderer/helpers/playlists.js
+++ b/src/renderer/helpers/playlists.js
@@ -5,8 +5,6 @@ export const SORT_BY_VALUES = {
   AuthorDescending: 'author_descending',
   VideoTitleAscending: 'video_title_ascending',
   VideoTitleDescending: 'video_title_descending',
-  VideoDurationAscending: 'video_duration_ascending',
-  VideoDurationDescending: 'video_duration_descending',
   Custom: 'custom'
 }
 
@@ -21,9 +19,7 @@ export function getSortedPlaylistItems(playlistItems, sortOrder, locale, reverse
     sortOrder === SORT_BY_VALUES.VideoTitleAscending ||
     sortOrder === SORT_BY_VALUES.VideoTitleDescending ||
     sortOrder === SORT_BY_VALUES.AuthorAscending ||
-    sortOrder === SORT_BY_VALUES.AuthorDescending ||
-    sortOrder === SORT_BY_VALUES.VideoDurationAscending ||
-    sortOrder === SORT_BY_VALUES.VideoDurationDescending
+    sortOrder === SORT_BY_VALUES.AuthorDescending
   ) {
     collator = new Intl.Collator([locale, 'en'])
   }
@@ -35,19 +31,6 @@ export function getSortedPlaylistItems(playlistItems, sortOrder, locale, reverse
   })
 }
 
-export function videoDurationPresent(video) {
-  if (typeof video.lengthSeconds !== 'number') { return false }
-
-  return !(isNaN(video.lengthSeconds) || video.lengthSeconds === 0)
-}
-
-export function videoDurationWithFallback(video) {
-  if (videoDurationPresent(video)) { return video.lengthSeconds }
-
-  // Fallback
-  return 0
-}
-
 function compareTwoPlaylistItems(a, b, sortOrder, collator) {
   switch (sortOrder) {
     case SORT_BY_VALUES.DateAddedNewest:
@@ -62,12 +45,6 @@ function compareTwoPlaylistItems(a, b, sortOrder, collator) {
       return collator.compare(a.author, b.author)
     case SORT_BY_VALUES.AuthorDescending:
       return collator.compare(b.author, a.author)
-    case SORT_BY_VALUES.VideoDurationAscending: {
-      return videoDurationWithFallback(a) - videoDurationWithFallback(b)
-    }
-    case SORT_BY_VALUES.VideoDurationDescending: {
-      return videoDurationWithFallback(b) - videoDurationWithFallback(a)
-    }
     default:
       console.error(`Unknown sortOrder: ${sortOrder}`)
       return 0
diff --git a/src/renderer/helpers/strings.js b/src/renderer/helpers/strings.js
index 29f9f9b41ac47..6c9e79465b8e0 100644
--- a/src/renderer/helpers/strings.js
+++ b/src/renderer/helpers/strings.js
@@ -26,9 +26,6 @@ export function isKeyboardEventKeyPrintableChar(eventKey) {
   return false
 }
 
-/**
- * @param {string} title
- */
 export function translateWindowTitle(title) {
   switch (title) {
     case 'Subscriptions':
@@ -49,6 +46,8 @@ export function translateWindowTitle(title) {
       return i18n.t('About.About')
     case 'Profile Settings':
       return i18n.t('Profile.Profile Settings')
+    case 'Search Results':
+      return i18n.t('Search Filters.Search Results')
     case 'Playlist':
       return i18n.t('Playlist.Playlist')
     default:
diff --git a/src/renderer/helpers/subscriptions.js b/src/renderer/helpers/subscriptions.js
index 50e422d643ab6..f41205244d3aa 100644
--- a/src/renderer/helpers/subscriptions.js
+++ b/src/renderer/helpers/subscriptions.js
@@ -42,22 +42,13 @@ export function updateVideoListAfterProcessing(videos) {
   // ordered last to show first eligible video from channel
   // if the first one incidentally failed one of the above checks
   if (store.getters.getOnlyShowLatestFromChannel) {
-    const authors = new Map()
+    const authors = new Set()
     videoList = videoList.filter((video) => {
       if (!video.authorId) {
         return true
-      }
-
-      if (!authors.has(video.authorId)) {
-        authors.set(video.authorId, 1)
+      } else if (!authors.has(video.authorId)) {
+        authors.add(video.authorId)
         return true
-      } else {
-        const currentVideos = authors.get(video.authorId)
-
-        if (currentVideos < store.getters.getOnlyShowLatestFromChannelNumber) {
-          authors.set(video.authorId, currentVideos + 1)
-          return true
-        }
       }
 
       return false
@@ -74,7 +65,7 @@ export function updateVideoListAfterProcessing(videos) {
 /**
  * @param {string} rssString
  * @param {string} channelId
- */
+*/
 export async function parseYouTubeRSSFeed(rssString, channelId) {
   // doesn't need to be asynchronous, but doing it allows us to do the relatively slow DOM querying in parallel
   try {
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 0739a6e0122c3..79c8369302484 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -1,3 +1,5 @@
+import fs from 'fs/promises'
+
 import { IpcChannels } from '../../constants'
 import FtToastEvents from '../components/ft-toast/ft-toast-events'
 import i18n from '../i18n/index'
@@ -10,10 +12,6 @@ export const CHANNEL_HANDLE_REGEX = /^@[\w.-]{3,30}$/
 
 const PUBLISHED_TEXT_REGEX = /(\d+)\s?([a-z]+)/i
 
-/**
- * @param {string} sortPreference
- * @returns {string[]}
- */
 export function getIconForSortPreference(sortPreference) {
   switch (sortPreference) {
     case 'name_descending':
@@ -99,10 +97,101 @@ export function calculatePublishedDate(publishedText, isLive = false, isUpcoming
 }
 
 /**
- * @param {import('youtubei.js/dist/src/parser/classes/PlayerStoryboardSpec').StoryboardData} storyboard
- * @param {number} videoLengthSeconds
- * @returns {string}
+ * @param {{
+ *  liveNow: boolean,
+ *  isUpcoming: boolean,
+ *  premiereTimestamp: number,
+ *  published: number
+ * }[]} videos
  */
+export function setPublishedTimestampsInvidious(videos) {
+  videos.forEach(video => {
+    if (video.liveNow) {
+      video.published = new Date().getTime()
+    } else if (video.isUpcoming) {
+      video.published = video.premiereTimestamp * 1000
+    } else if (typeof video.published === 'number') {
+      video.published *= 1000
+    }
+  })
+}
+
+export function toLocalePublicationString ({ publishText, isLive = false, isUpcoming = false, isRSS = false }) {
+  if (isLive) {
+    return i18n.tc('Global.Counts.Watching Count', 0, { count: 0 })
+  } else if (isUpcoming || publishText === null) {
+    // the check for null is currently just an inferring of knowledge, because there is no other possibility left
+    return `${i18n.t('Video.Published.Upcoming')}: ${publishText}`
+  } else if (isRSS) {
+    return publishText
+  }
+
+  const match = publishText.match(PUBLISHED_TEXT_REGEX)
+  const singular = (match[1] === '1')
+  let unit = ''
+  switch (match[2].substring(0, 2)) {
+    case 'se':
+    case 's':
+      if (singular) {
+        unit = i18n.t('Video.Published.Second')
+      } else {
+        unit = i18n.t('Video.Published.Seconds')
+      }
+      break
+    case 'mi':
+    case 'm':
+      if (singular) {
+        unit = i18n.t('Video.Published.Minute')
+      } else {
+        unit = i18n.t('Video.Published.Minutes')
+      }
+      break
+    case 'ho':
+    case 'h':
+      if (singular) {
+        unit = i18n.t('Video.Published.Hour')
+      } else {
+        unit = i18n.t('Video.Published.Hours')
+      }
+      break
+    case 'da':
+    case 'd':
+      if (singular) {
+        unit = i18n.t('Video.Published.Day')
+      } else {
+        unit = i18n.t('Video.Published.Days')
+      }
+      break
+    case 'we':
+    case 'w':
+      if (singular) {
+        unit = i18n.t('Video.Published.Week')
+      } else {
+        unit = i18n.t('Video.Published.Weeks')
+      }
+      break
+    case 'mo':
+      if (singular) {
+        unit = i18n.t('Video.Published.Month')
+      } else {
+        unit = i18n.t('Video.Published.Months')
+      }
+      break
+    case 'ye':
+    case 'y':
+      if (singular) {
+        unit = i18n.t('Video.Published.Year')
+      } else {
+        unit = i18n.t('Video.Published.Years')
+      }
+      break
+    default:
+      return publishText
+  }
+
+  return i18n.t('Video.Publicationtemplate', { number: match[1], unit })
+}
+
 export function buildVTTFileLocally(storyboard, videoLengthSeconds) {
   let vttString = 'WEBVTT\n\n'
   // how many images are in one image
@@ -160,11 +249,6 @@ export function buildVTTFileLocally(storyboard, videoLengthSeconds) {
   return vttString
 }
 
-/**
- * @param {string} message
- * @param {number} time
- * @param {Function} action
- */
 export function showToast(message, time = null, action = null) {
   FtToastEvents.dispatchEvent(new CustomEvent('toast-open', {
     detail: {
@@ -176,14 +260,13 @@ export function showToast(message, time = null, action = null) {
 }
 
 /**
- * This writes to the clipboard. If an error occurs during the copy,
- * a toast with the error is shown. If the copy is successful and
- * there is a success message, a toast with that message is shown.
- * @param {string} content the content to be copied to the clipboard
- * @param {object} [options] - Optional settings for the copy operation.
- * @param {null|string} options.messageOnSuccess the message to be displayed as a toast when the copy succeeds (optional)
- * @param {null|string} options.messageOnError the message to be displayed as a toast when the copy fails (optional)
- */
+   * This writes to the clipboard. If an error occurs during the copy,
+   * a toast with the error is shown. If the copy is successful and
+   * there is a success message, a toast with that message is shown.
+   * @param {string} content the content to be copied to the clipboard
+   * @param {null|string} messageOnSuccess the message to be displayed as a toast when the copy succeeds (optional)
+   * @param {null|string} messageOnError the message to be displayed as a toast when the copy fails (optional)
+   */
 export async function copyToClipboard(content, { messageOnSuccess = null, messageOnError = null } = {}) {
   if (navigator.clipboard !== undefined && window.isSecureContext) {
     try {
@@ -250,173 +333,69 @@ export function openInternalPath({ path, query = {}, doCreateNewWindow, searchQu
   }
 }
 
-/**
- * @param {string} fileTypeDescription
- * @param {{[key: string]: string | string[]}} acceptedTypes
- * @param {string} [rememberDirectoryId]
- * @param {'desktop' | 'documents' | 'downloads' | 'music' | 'pictures' | 'videos'} [startInDirectory]
- * @returns {Promise<{ content: string, filename: string } | null>}
- */
-export async function readFileWithPicker(
-  fileTypeDescription,
-  acceptedTypes,
-  rememberDirectoryId,
-  startInDirectory
-) {
-  let file
-
-  // Only supported in Electron and desktop Chromium browsers
-  // https://developer.mozilla.org/en-US/docs/Web/API/Window/showOpenFilePicker#browser_compatibility
-  // As we know it is supported in Electron, adding the build flag means we can skip the runtime check in Electron
-  // and allow terser to remove the unused else block
-  if (process.env.IS_ELECTRON || 'showOpenFilePicker' in window) {
-    try {
-      /** @type {FileSystemFileHandle[]} */
-      const [handle] = await window.showOpenFilePicker({
-        excludeAcceptAllOption: true,
-        multiple: false,
-        id: rememberDirectoryId,
-        startIn: startInDirectory,
-        types: [{
-          description: fileTypeDescription,
-          accept: acceptedTypes
-        }],
-      })
-
-      file = await handle.getFile()
-    } catch (error) {
-      // user pressed cancel in the file picker
-      if (error.name === 'AbortError') {
-        return null
-      }
-
-      throw error
-    }
+export async function showOpenDialog (options) {
+  if (process.env.IS_ELECTRON) {
+    const { ipcRenderer } = require('electron')
+    return await ipcRenderer.invoke(IpcChannels.SHOW_OPEN_DIALOG, options)
   } else {
-    /** @type {File|null} */
-    const fallbackFile = await new Promise((resolve) => {
-      const joinedExtensions = Object.values(acceptedTypes)
-        .flat()
-        .join(',')
-
+    return await new Promise((resolve) => {
       const fileInput = document.createElement('input')
       fileInput.setAttribute('type', 'file')
-      fileInput.setAttribute('accept', joinedExtensions)
+      if (options?.filters[0]?.extensions !== undefined) {
+        // this will map the given extensions from the options to the accept attribute of the input
+        fileInput.setAttribute('accept', options.filters[0].extensions.map((extension) => { return `.${extension}` }).join(', '))
+      }
       fileInput.onchange = () => {
-        resolve(fileInput.files[0])
-        fileInput.onchange = null
+        const files = Array.from(fileInput.files)
+        resolve({ canceled: false, files, filePaths: files.map(({ name }) => { return name }) })
+        delete fileInput.onchange
       }
-
       const listenForEnd = () => {
+        window.removeEventListener('focus', listenForEnd)
         // 1 second timeout on the response from the file picker to prevent awaiting forever
         setTimeout(() => {
           if (fileInput.files.length === 0 && typeof fileInput.onchange === 'function') {
             // if there are no files and the onchange has not been triggered, the file-picker was canceled
-            resolve(null)
-            fileInput.onchange = null
+            resolve({ canceled: true })
+            delete fileInput.onchange
           }
         }, 1000)
       }
-      window.addEventListener('focus', listenForEnd, { once: true })
+      window.addEventListener('focus', listenForEnd)
       fileInput.click()
     })
-
-    if (fallbackFile === null) {
-      return null
-    }
-
-    file = fallbackFile
-  }
-
-  return {
-    content: await file.text(),
-    filename: file.name
   }
 }
 
 /**
- * @param {string} fileName
- * @param {string | Blob} content
- * @param {string} fileTypeDescription
- * @param {string} mimeType
- * @param {string} fileExtension
- * @param {string} [rememberDirectoryId]
- * @param {'desktop' | 'documents' | 'downloads' | 'music' | 'pictures' | 'videos'} [startInDirectory]
- * @returns {Promise<boolean>}
+ * @param {object} response the response from `showOpenDialog`
+ * @param {number} index which file to read (defaults to the first in the response)
+ * @returns the text contents of the selected file
  */
-export async function writeFileWithPicker(
-  fileName,
-  content,
-  fileTypeDescription,
-  mimeType,
-  fileExtension,
-  rememberDirectoryId,
-  startInDirectory
-) {
-  // Only supported in Electron and desktop Chromium browsers
-  // https://developer.mozilla.org/en-US/docs/Web/API/Window/showOpenFilePicker#browser_compatibility
-  // As we know it is supported in Electron, adding the build flag means we can skip the runtime check in Electron
-  // and allow terser to remove the unused else block
-  if (process.env.IS_ELECTRON || 'showSaveFilePicker' in window) {
-    let writableFileStream
-
-    try {
-      /** @type {FileSystemFileHandle} */
-      const handle = await window.showSaveFilePicker({
-        suggestedName: fileName,
-        excludeAcceptAllOption: true,
-        multiple: false,
-        id: rememberDirectoryId,
-        startIn: startInDirectory,
-        types: [{
-          description: fileTypeDescription,
-          accept: {
-            [mimeType]: [fileExtension]
-          }
-        }],
-      })
-
-      writableFileStream = await handle.createWritable()
-      await writableFileStream.write(content)
-    } catch (error) {
-      // user pressed cancel in the file picker
-      if (error.name === 'AbortError') {
-        return false
-      }
-
-      throw error
-    } finally {
-      if (writableFileStream) {
-        await writableFileStream.close()
+export function readFileFromDialog(response, index = 0) {
+  return new Promise((resolve, reject) => {
+    if (process.env.IS_ELECTRON) {
+      // if this is Electron, use fs
+      fs.readFile(response.filePaths[index])
+        .then(data => {
+          resolve(new TextDecoder('utf-8').decode(data))
+        })
+        .catch(reject)
+    } else {
+      // if this is web, use FileReader
+      try {
+        const reader = new FileReader()
+        reader.onload = function (file) {
+          resolve(file.currentTarget.result)
+        }
+        reader.readAsText(response.files[index])
+      } catch (exception) {
+        reject(exception)
       }
     }
-
-    return true
-  } else {
-    if (typeof content === 'string') {
-      content = new Blob([content], { type: mimeType })
-    }
-
-    const url = URL.createObjectURL(content)
-
-    const downloadLink = document.createElement('a')
-    downloadLink.setAttribute('download', encodeURIComponent(fileName))
-    downloadLink.setAttribute('href', url)
-    downloadLink.click()
-
-    // Small timeout to give the browser time to react to the click on the link
-    setTimeout(() => {
-      URL.revokeObjectURL(url)
-    }, 1000)
-
-    return true
-  }
+  })
 }
 
-/**
- * @param {{defaultPath: string, filters: {name: string, extensions: string[]}[]}} options
- * @returns { Promise<import('electron').SaveDialogReturnValue> | {canceled: boolean?, filePath: string } | { canceled: boolean?, handle?: Promise<FileSystemFileHandle> }}
- */
 export async function showSaveDialog (options) {
   if (process.env.IS_ELECTRON) {
     const { ipcRenderer } = require('electron')
@@ -443,6 +422,34 @@ export async function showSaveDialog (options) {
   }
 }
 
+/**
+* Write to a file picked out from the `showSaveDialog` picker
+* @param {object} response the response from `showSaveDialog`
+* @param {string} content the content to be written to the file selected by the dialog
+*/
+export async function writeFileFromDialog (response, content) {
+  if (process.env.IS_ELECTRON) {
+    const { filePath } = response
+    return await fs.writeFile(filePath, content)
+  } else {
+    if ('showOpenFilePicker' in window) {
+      const { handle } = response
+      const writableStream = await handle.createWritable()
+      await writableStream.write(content)
+      await writableStream.close()
+    } else {
+      // If the native filesystem api is not available,
+      const { filePath } = response
+      const filename = filePath.split('/').at(-1)
+      const a = document.createElement('a')
+      const url = URL.createObjectURL(new Blob([content], { type: 'application/octet-stream' }))
+      a.setAttribute('href', url)
+      a.setAttribute('download', encodeURI(filename))
+      a.click()
+    }
+  }
+}
+
 /**
  * This creates an absolute web url from a given path.
  * It will assume all given paths are relative to the current window location.
@@ -468,11 +475,7 @@ export function createWebURL(path) {
   return `${origin}${windowPath}/${path}`
 }
 
-/**
- * strip html tags but keep <br>, <b>, </b> <s>, </s>, <i>, </i>
- * @param {string} value
- * @returns {string}
- */
+// strip html tags but keep <br>, <b>, </b> <s>, </s>, <i>, </i>
 export function stripHTML(value) {
   return value.replaceAll(/(<(?!br|\/?[abis]|img>)([^>]+)>)/gi, '')
 }
@@ -519,11 +522,6 @@ export function formatDurationAsTimestamp(lengthSeconds) {
   return timestamp
 }
 
-/**
- * @param {{sortBy? : string, time?: string, duration?: string, features: string[]}?} filtersA
- * @param {{sortBy? : string, time?: string, duration?: string, features: string[]}?} filtersB
- * @returns {boolean}
- */
 export function searchFiltersMatch(filtersA, filtersB) {
   return filtersA?.sortBy === filtersB?.sortBy &&
     filtersA?.time === filtersB?.time &&
@@ -532,10 +530,6 @@ export function searchFiltersMatch(filtersA, filtersB) {
     filtersA?.features?.length === filtersB?.features?.length && filtersA?.features?.every((val, index) => val === filtersB?.features[index])
 }
 
-/**
- * @param {string} filenameOriginal
- * @returns {string}
- */
 export function replaceFilenameForbiddenChars(filenameOriginal) {
   let filenameNew = filenameOriginal
   let forbiddenChars = {}
@@ -569,9 +563,6 @@ export function replaceFilenameForbiddenChars(filenameOriginal) {
   return filenameNew
 }
 
-/**
- * @returns {Promise<string>}
- */
 export async function getSystemLocale() {
   let locale
   if (process.env.IS_ELECTRON) {
@@ -620,26 +611,7 @@ export function getVideoParamsFromUrl(url) {
 
   function extractParams(videoId) {
     paramsObject.videoId = videoId
-    let timestamp = urlObject.searchParams.get('t')
-    if (timestamp && (timestamp.includes('h') || timestamp.includes('m') || timestamp.includes('s'))) {
-      const { seconds, minutes, hours } = timestamp.match(/(?:(?<hours>(\d+))h)?(?:(?<minutes>(\d+))m)?(?:(?<seconds>(\d+))s)?/).groups
-      let time = 0
-
-      if (seconds) {
-        time += Number(seconds)
-      }
-
-      if (minutes) {
-        time += 60 * Number(minutes)
-      }
-
-      if (hours) {
-        time += 3600 * Number(hours)
-      }
-
-      timestamp = time
-    }
-    paramsObject.timestamp = timestamp
+    paramsObject.timestamp = urlObject.searchParams.get('t')
   }
 
   const extractors = [
@@ -724,11 +696,6 @@ export function toDistractionFreeTitle(title, minUpperCase = 3) {
     .replace(reg, x => capitalizedWord(x.toLowerCase()))
 }
 
-/**
- * @param {number} number
- * @param {Intl.NumberFormatOptions?} options
- * @returns {string}
- */
 export function formatNumber(number, options = undefined) {
   return Intl.NumberFormat([i18n.locale, 'en'], options).format(number)
 }
@@ -744,13 +711,6 @@ export function getTodayDateStrLocalTimezone() {
   return timeNowStr.split('T')[0]
 }
 
-/**
- *
- * @param {number} date
- * @param {boolean} hideSeconds
- * @param {boolean} useThirtyDayMonths
- * @returns {string}
- */
 export function getRelativeTimeFromDate(date, hideSeconds = false, useThirtyDayMonths = true) {
   if (!date) {
     return ''
@@ -821,9 +781,8 @@ export function escapeHTML(untrusted) {
 
 /**
  * Performs a deep copy of a javascript object
- * @template T
- * @param {T} obj
- * @returns {T}
+ * @param {Object} obj
+ * @returns {Object}
  */
 export function deepCopy(obj) {
   return JSON.parse(JSON.stringify(obj))
@@ -833,8 +792,7 @@ export function deepCopy(obj) {
  * Check if the `name` of the error is `TimeoutError` to know if the error was caused by a timeout or something else.
  * @param {number} timeoutMs
  * @param {RequestInfo|URL} input
- * @param {RequestInit?} init
- * @returns {Promise<Response>}
+ * @param {RequestInit=} init
  */
 export async function fetchWithTimeout(timeoutMs, input, init) {
   const timeoutSignal = AbortSignal.timeout(timeoutMs)
@@ -862,10 +820,6 @@ export async function fetchWithTimeout(timeoutMs, input, init) {
   }
 }
 
-/**
- * @param {KeyboardEvent} event
- * @param {HTMLInputElement} inputElement
- */
 export function ctrlFHandler(event, inputElement) {
   switch (event.key) {
     case 'F':
@@ -906,13 +860,11 @@ export function base64EncodeUtf8(text) {
  * @param {string} channelId
  * @param {'all'} type
  * @returns {string}
- *
+*
  * @param {string} channelId
  * @param {'all' | 'videos' | 'live' | 'shorts'} type
- * @param {('newest' | 'popular')?} [sortBy]
- * @returns {string}
+ * @param {'newest' | 'popular'} sortBy
  */
-
 export function getChannelPlaylistId(channelId, type, sortBy) {
   switch (type) {
     case 'videos':
@@ -923,9 +875,9 @@ export function getChannelPlaylistId(channelId, type, sortBy) {
       }
     case 'live':
       if (sortBy === 'popular') {
-        return channelId.replace(/^UC/, 'UUPV')
-      } else {
         return channelId.replace(/^UC/, 'UULV')
+      } else {
+        return channelId.replace(/^UC/, 'UUPV')
       }
     case 'shorts':
       if (sortBy === 'popular') {
@@ -937,82 +889,3 @@ export function getChannelPlaylistId(channelId, type, sortBy) {
       return channelId.replace(/^UC/, 'UU')
   }
 }
-
-function getIndividualLocalizedShortcut(shortcut) {
-  switch (shortcut) {
-    case 'alt':
-      return i18n.t('Keys.alt')
-    case 'ctrl':
-      return i18n.t('Keys.ctrl')
-    case 'arrowleft':
-      return i18n.t('Keys.arrowleft')
-    case 'arrowright':
-      return i18n.t('Keys.arrowright')
-    case 'arrowup':
-      return i18n.t('Keys.arrowup')
-    case 'arrowdown':
-      return i18n.t('Keys.arrowdown')
-    default:
-      return shortcut
-  }
-}
-
-function getMacIconForShortcut(shortcut) {
-  switch (shortcut) {
-    case 'option':
-    case 'alt':
-      return '⌥'
-    case 'cmd':
-    case 'ctrl':
-      return '⌘'
-    case 'arrowleft':
-      return '←'
-    case 'arrowright':
-      return '→'
-    case 'arrowup':
-      return '↑'
-    case 'arrowdown':
-      return '↓'
-    default:
-      return shortcut
-  }
-}
-
-/**
- * @param {string} shortcut
- * @returns {string} the localized and recombined shortcut
- */
-function getLocalizedShortcut(shortcut) {
-  const shortcuts = shortcut.split('+')
-
-  if (process.platform === 'darwin') {
-    const shortcutsAsIcons = shortcuts.map(shortCut => getMacIconForShortcut(shortCut))
-    return shortcutsAsIcons.join('')
-  } else {
-    const localizedShortcuts = shortcuts.map((shortcut) => getIndividualLocalizedShortcut(shortcut))
-    const shortcutJoinOperator = i18n.t('shortcutJoinOperator')
-    return localizedShortcuts.join(shortcutJoinOperator)
-  }
-}
-
-/**
- * @param {string} actionTitle
- * @param {string} shortcut
- * @returns {string} the localized action title with keyboard shortcut
- */
-export function addKeyboardShortcutToActionTitle(actionTitle, shortcut) {
-  return i18n.t('KeyboardShortcutTemplate', {
-    label: actionTitle,
-    shortcut
-  })
-}
-
-/**
- * @param {string} localizedActionTitle
- * @param {string} unlocalizedShortcut
- * @returns {string} the localized action title with keyboard shortcut
- */
-export function localizeAndAddKeyboardShortcutToActionTitle(localizedActionTitle, unlocalizedShortcut) {
-  const localizedShortcut = getLocalizedShortcut(unlocalizedShortcut)
-  return addKeyboardShortcutToActionTitle(localizedActionTitle, localizedShortcut)
-}
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 7d7d1708c87a4..cfd35f888fa46 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -15,7 +15,6 @@ import { ObserveVisibility } from 'vue-observe-visibility'
 // to avoid code conflict and duplicate entries
 import {
   faAngleDown,
-  faAngleLeft,
   faAngleUp,
   faArrowDown,
   faArrowDownShortWide,
@@ -24,21 +23,15 @@ import {
   faArrowRight,
   faArrowUp,
   faBars,
-  faBorderAll,
   faBookmark,
   faCheck,
   faChevronRight,
-  faCircleExclamation,
-  faCirclePlay,
   faCircleUser,
-  faClapperboard,
   faClock,
   faClone,
   faComment,
   faCommentDots,
   faCopy,
-  faDatabase,
-  faDisplay,
   faDownload,
   faEdit,
   faEllipsisH,
@@ -52,12 +45,9 @@ import {
   faFileDownload,
   faFileImage,
   faFileVideo,
-  faFilm,
   faFilter,
-  faFlask,
   faFire,
   faForward,
-  faGamepad,
   faGauge,
   faGlobe,
   faGrip,
@@ -66,16 +56,12 @@ import {
   faHistory,
   faImages,
   faInfoCircle,
-  faKey,
   faLanguage,
   faLink,
   faLinkSlash,
   faList,
   faLocationDot,
-  faLock,
-  faMoneyCheckDollar,
-  faMusic,
-  faNetworkWired,
+  faMicrochip,
   faNewspaper,
   faPalette,
   faPause,
@@ -91,7 +77,6 @@ import {
   faSearch,
   faServer,
   faShareAlt,
-  faShield,
   faSlash,
   faSlidersH,
   faSortAlphaDown,
@@ -107,14 +92,12 @@ import {
   faTimesCircle,
   faTrash,
   faUserCheck,
-  faUserLock,
   faUsers,
   faUsersSlash,
-  faWifi
+  faWifi,
 } from '@fortawesome/free-solid-svg-icons'
 import {
-  faBookmark as farBookmark,
-  faDotCircle as farDotCircle
+  faBookmark as farBookmark
 } from '@fortawesome/free-regular-svg-icons'
 import {
   faBitcoin,
@@ -133,7 +116,6 @@ Vue.config.productionTip = process.env.NODE_ENV === 'development'
 library.add(
   // solid icons
   faAngleDown,
-  faAngleLeft,
   faAngleUp,
   faArrowDown,
   faArrowDownShortWide,
@@ -142,21 +124,15 @@ library.add(
   faArrowRight,
   faArrowUp,
   faBars,
-  faBorderAll,
   faBookmark,
   faCheck,
   faChevronRight,
-  faCircleExclamation,
-  faCirclePlay,
   faCircleUser,
-  faClapperboard,
   faClock,
   faClone,
   faComment,
   faCommentDots,
   faCopy,
-  faDatabase,
-  faDisplay,
   faDownload,
   faEdit,
   faEllipsisH,
@@ -170,12 +146,9 @@ library.add(
   faFileDownload,
   faFileImage,
   faFileVideo,
-  faFilm,
   faFilter,
-  faFlask,
   faFire,
   faForward,
-  faGamepad,
   faGauge,
   faGlobe,
   faGrip,
@@ -184,22 +157,19 @@ library.add(
   faHistory,
   faImages,
   faInfoCircle,
-  faKey,
   faLanguage,
   faLink,
   faLinkSlash,
   faList,
   faLocationDot,
-  faLock,
-  faMoneyCheckDollar,
-  faMusic,
-  faNetworkWired,
+  faMicrochip,
   faNewspaper,
   faPalette,
   faPause,
   faPhotoFilm,
   faPlay,
   faPlus,
+  faPhotoFilm,
   faQuestionCircle,
   faRandom,
   faRetweet,
@@ -209,7 +179,6 @@ library.add(
   faSearch,
   faServer,
   faShareAlt,
-  faShield,
   faSlash,
   faSlidersH,
   faSortAlphaDown,
@@ -225,14 +194,12 @@ library.add(
   faTimesCircle,
   faTrash,
   faUserCheck,
-  faUserLock,
   faUsers,
   faUsersSlash,
   faWifi,
 
   // solid icons
   farBookmark,
-  farDotCircle,
 
   // brand icons
   faGithub,
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index 207f80b78904a..f0a0a2ec4cb60 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -14,7 +14,7 @@ import Playlist from '../views/Playlist/Playlist.vue'
 import Channel from '../views/Channel/Channel.vue'
 import Watch from '../views/Watch/Watch.vue'
 import Hashtag from '../views/Hashtag/Hashtag.vue'
-import Post from '../views/Post.vue'
+import Post from '../views/Post/Post.vue'
 
 Vue.use(Router)
 
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
index 95a368c5dc5ff..4f9935d71fdbb 100644
--- a/src/renderer/scss-partials/_ft-list-item.scss
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -205,10 +205,6 @@ $watched-transition-duration: 0.5s;
         border-radius: 50%;
         block-size: 130px;
       }
-
-      .gameImage {
-        block-size: 130px;
-      }
     }
   }
 
@@ -220,11 +216,7 @@ $watched-transition-duration: 0.5s;
     grid-template:
       'title optionsExternalButton' auto
       'infoLine optionsExternalButton' auto
-      'description optionsExternalButton' auto / 1fr auto;
-
-    .buttonStack {
-      grid-area: optionsExternalButton;
-    }
+      'description description' auto / 1fr auto;
 
     .optionsButton {
       grid-area: optionsExternalButton;
diff --git a/src/renderer/store/modules/playlists.js b/src/renderer/store/modules/playlists.js
index 82b06f2ad607a..22df83be63659 100644
--- a/src/renderer/store/modules/playlists.js
+++ b/src/renderer/store/modules/playlists.js
@@ -210,11 +210,7 @@ const actions = {
         }
         // Undesired attributes, even with `null` values
         [
-          'authorUrl',
           'description',
-          'index',
-          'liveNow',
-          'videoThumbnails',
           'viewCount',
         ].forEach(attrName => {
           if (typeof videoData[attrName] !== 'undefined') {
@@ -408,7 +404,7 @@ const actions = {
   async removeVideo({ commit }, payload) {
     try {
       const { _id, videoId, playlistItemId } = payload
-      await DBPlaylistHandlers.deleteVideoIdByPlaylistId(_id, videoId, playlistItemId)
+      await DBPlaylistHandlers.deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId })
       commit('removeVideo', payload)
     } catch (errMessage) {
       console.error(errMessage)
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index e479bfed506b0..1c657507afa0f 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -162,6 +162,7 @@ const defaultSideEffectsTriggerId = settingId =>
 /*****/
 
 const state = {
+  allSettingsSectionsExpandedByDefault: false,
   autoplayPlaylists: true,
   autoplayVideos: true,
   backendFallback: process.env.SUPPORTS_LOCAL_API,
@@ -172,7 +173,6 @@ const state = {
   baseTheme: 'system',
   mainColor: 'Red',
   secColor: 'Blue',
-  defaultAutoplayInterruptionIntervalHours: 3,
   defaultCaptionSettings: '{}',
   defaultInterval: 5,
   defaultPlayback: 1,
@@ -182,7 +182,7 @@ const state = {
   defaultTheatreMode: false,
   defaultVideoFormat: 'dash',
   disableSmoothScrolling: false,
-  displayVideoPlayButton: false,
+  displayVideoPlayButton: true,
   enableSearchSuggestions: true,
   enableSubtitlesByDefault: false,
   enterFullscreenOnDisplayRotate: false,
@@ -191,11 +191,10 @@ const state = {
   externalPlayerExecutable: '',
   externalPlayerIgnoreWarnings: false,
   externalPlayerIgnoreDefaultArgs: false,
-  externalPlayerCustomArgs: '[]',
+  externalPlayerCustomArgs: '',
   expandSideBar: false,
   hideActiveSubscriptions: false,
   hideChannelCommunity: false,
-  hideChannelHome: false,
   hideChannelPlaylists: false,
   hideChannelReleases: false,
   hideChannelPodcasts: false,
@@ -207,8 +206,6 @@ const state = {
   hideFeaturedChannels: false,
   channelsHidden: '[]',
   forbiddenTitles: '[]',
-  showAddedChannelsHidden: true,
-  showAddedForbiddenTitles: true,
   hideVideoDescription: false,
   hideLiveChat: false,
   hideLiveStreams: false,
@@ -236,8 +233,6 @@ const state = {
   listType: 'grid',
   maxVideoPlaybackRate: 3,
   onlyShowLatestFromChannel: false,
-  onlyShowLatestFromChannelNumber: 1,
-  openDeepLinksInNewWindow: false,
   playNextVideo: false,
   proxyHostname: '127.0.0.1',
   proxyPort: '9050',
@@ -315,9 +310,9 @@ const state = {
 
 const stateWithSideEffects = {
   currentLocale: {
-    defaultValue: 'system',
+    defaultValue: 'en-US',
     sideEffectsHandler: async function ({ dispatch }, value) {
-      const fallbackLocale = 'en-US'
+      const defaultLocale = 'en-US'
 
       let targetLocale = value
       if (value === 'system') {
@@ -348,20 +343,20 @@ const stateWithSideEffects = {
           targetLocale = targetLocaleOptions[0]
         } else {
           // Go back to default value if locale is unavailable
-          targetLocale = fallbackLocale
+          targetLocale = defaultLocale
           // Translating this string isn't necessary
           // because the user will always see it in the default locale
           // (in this case, English (US))
-          showToast(`Locale not found, defaulting to ${fallbackLocale}`)
+          showToast(`Locale not found, defaulting to ${defaultLocale}`)
         }
       }
 
       const loadPromises = []
 
-      if (targetLocale !== fallbackLocale) {
+      if (targetLocale !== defaultLocale) {
         // "en-US" is used as a fallback for missing strings in other locales
         loadPromises.push(
-          loadLocale(fallbackLocale)
+          loadLocale(defaultLocale)
         )
       }
 
diff --git a/src/renderer/store/modules/subscription-cache.js b/src/renderer/store/modules/subscription-cache.js
index 1fb1c6370961b..d8ad6ff32cf04 100644
--- a/src/renderer/store/modules/subscription-cache.js
+++ b/src/renderer/store/modules/subscription-cache.js
@@ -88,7 +88,11 @@ const actions = {
 
   async updateSubscriptionVideosCacheByChannel({ commit }, { channelId, videos, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateVideosByChannelId(channelId, videos, timestamp)
+      await DBSubscriptionCacheHandlers.updateVideosByChannelId({
+        channelId,
+        entries: videos,
+        timestamp,
+      })
       commit('updateVideoCacheByChannel', { channelId, entries: videos, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
@@ -97,7 +101,11 @@ const actions = {
 
   async updateSubscriptionShortsCacheByChannel({ commit }, { channelId, videos, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateShortsByChannelId(channelId, videos, timestamp)
+      await DBSubscriptionCacheHandlers.updateShortsByChannelId({
+        channelId,
+        entries: videos,
+        timestamp,
+      })
       commit('updateShortsCacheByChannel', { channelId, entries: videos, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
@@ -106,7 +114,10 @@ const actions = {
 
   async updateSubscriptionShortsCacheWithChannelPageShorts({ commit }, { channelId, videos }) {
     try {
-      await DBSubscriptionCacheHandlers.updateShortsWithChannelPageShortsByChannelId(channelId, videos)
+      await DBSubscriptionCacheHandlers.updateShortsWithChannelPageShortsByChannelId({
+        channelId,
+        entries: videos,
+      })
       commit('updateShortsCacheWithChannelPageShorts', { channelId, entries: videos })
     } catch (errMessage) {
       console.error(errMessage)
@@ -115,7 +126,11 @@ const actions = {
 
   async updateSubscriptionLiveCacheByChannel({ commit }, { channelId, videos, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateLiveStreamsByChannelId(channelId, videos, timestamp)
+      await DBSubscriptionCacheHandlers.updateLiveStreamsByChannelId({
+        channelId,
+        entries: videos,
+        timestamp,
+      })
       commit('updateLiveCacheByChannel', { channelId, entries: videos, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
@@ -124,7 +139,11 @@ const actions = {
 
   async updateSubscriptionPostsCacheByChannel({ commit }, { channelId, posts, timestamp = new Date() }) {
     try {
-      await DBSubscriptionCacheHandlers.updateCommunityPostsByChannelId(channelId, posts, timestamp)
+      await DBSubscriptionCacheHandlers.updateCommunityPostsByChannelId({
+        channelId,
+        entries: posts,
+        timestamp,
+      })
       commit('updatePostsCacheByChannel', { channelId, entries: posts, timestamp })
     } catch (errMessage) {
       console.error(errMessage)
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 5313249eaea46..53385c9c22a61 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -60,7 +60,6 @@ const state = {
     shorts: false,
     communityPosts: false,
   },
-  appTitle: ''
 }
 
 const getters = {
@@ -176,9 +175,6 @@ const getters = {
   getSubscriptionForCommunityPostsFirstAutoFetchRun (state) {
     return state.subscriptionFirstAutoFetchRunData.communityPosts === true
   },
-  getAppTitle (state) {
-    return state.appTitle
-  }
 }
 
 const actions = {
@@ -414,7 +410,7 @@ const actions = {
     commit('setRegionValues', regionValues)
   },
 
-  async getYoutubeUrlInfo({ rootState, state }, urlStr) {
+  async getYoutubeUrlInfo({ state }, urlStr) {
     // Returns
     // - urlType [String] `video`, `playlist`
     //
@@ -634,11 +630,8 @@ const actions = {
             }
             subPath = 'community'
             break
-          case 'videos':
-            subPath = 'videos'
-            break
           default:
-            subPath = rootState.settings.backendPreference === 'local' && !rootState.settings.hideChannelHome ? 'home' : 'videos'
+            subPath = 'videos'
             break
         }
         return {
@@ -696,19 +689,20 @@ const actions = {
     const customArgs = rootState.settings.externalPlayerCustomArgs
 
     if (ignoreDefaultArgs) {
-      if (typeof customArgs === 'string' && customArgs !== '[]') {
-        const custom = JSON.parse(customArgs)
+      if (typeof customArgs === 'string' && customArgs !== '') {
+        const custom = customArgs.split(';')
         args.push(...custom)
       }
       if (payload.videoId != null) args.push(`${cmdArgs.videoUrl}https://www.youtube.com/watch?v=${payload.videoId}`)
     } else {
       // Append custom user-defined arguments,
       // or use the default ones specified for the external player.
-      if (typeof customArgs === 'string' && customArgs !== '[]') {
-        const custom = JSON.parse(customArgs)
+      if (typeof customArgs === 'string' && customArgs !== '') {
+        const custom = customArgs.split(';')
         args.push(...custom)
-      } else if (Array.isArray(cmdArgs.defaultCustomArguments)) {
-        args.push(...cmdArgs.defaultCustomArguments)
+      } else if (typeof cmdArgs.defaultCustomArguments === 'string' && cmdArgs.defaultCustomArguments !== '') {
+        const defaultCustomArguments = cmdArgs.defaultCustomArguments.split(';')
+        args.push(...defaultCustomArguments)
       }
 
       if (payload.watchProgress > 0 && payload.watchProgress < payload.videoLength - 10) {
@@ -963,11 +957,6 @@ const mutations = {
     state.externalPlayerCmdArguments = value
   },
 
-  // Use this to set the app title / document.title
-  setAppTitle (state, value) {
-    state.appTitle = value
-  },
-
   setSubscriptionForVideosFirstAutoFetchRun (state) {
     state.subscriptionFirstAutoFetchRunData.videos = true
   },
@@ -979,7 +968,7 @@ const mutations = {
   },
   setSubscriptionForCommunityPostsFirstAutoFetchRun (state) {
     state.subscriptionFirstAutoFetchRunData.communityPosts = true
-  }
+  },
 }
 
 export default {
diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index a977cbc8510c5..b21cad820139e 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -1,14 +1,17 @@
-body {
-  margin: 0;
-  min-block-size: 100vh;
-  color: var(--primary-text-color);
-  background-color: var(--bg-color);
-
+.system[data-system-theme*='light'],
+.light,
+.system[data-system-theme*='dark'],
+.dark,
+.black,
+.gray,
+.dracula,
+.catppuccinMocha,
+.pastelPink,
+.hotPink,
+.nordic,
+.solarizedDark,
+.solarizedLight {
   --primary-input-color: rgb(0 0 0 / 50%);
-  --link-color: var(--accent-color);
-  --link-visited-color: var(--accent-color-visited);
-  --instance-menu-color: var(--search-bar-color);
-  --red-500: #f44336;
   --top-bar-push-down-adjustment-default: -35px;
 
   /* Value of 0 without 'px' does not work inside calc() */
@@ -17,34 +20,73 @@ body {
   --top-bar-push-down-adjustment-edit-mode: 0px;
   --top-bar-push-down-adjustment-one-or-fewer: 0px;
   /* stylelint-enable length-zero-no-unit */
-
   --destructive-color: #f44336;
   --destructive-text-color: #000;
   --destructive-hover-color: #e53935;
   --destructive-active-color: #c62828;
-
-  /* For the 'About' page, show the logo with the primary text color by default */
-  --logo-primary-color: var(--primary-text-color);
-  --logo-secondary-color: var(--primary-text-color);
-  --logo-tertiary-color: var(--primary-text-color);
 }
 
+.system[data-system-theme*='light'],
+.light,
+.system[data-system-theme*='dark'],
+.dark,
+.black,
+.dracula,
+.catppuccinMocha,
+.pastelPink,
+.hotPink,
+.nordic,
+.solarizedDark,
+.solarizedLight {
+  --link-color: var(--accent-color);
+  --link-visited-color: var(--accent-color-visited);
+  --instance-menu-color: var(--search-bar-color);
+}
 
-/*************** RULE TWEAKS ***************/
-
-/* Default sidenav hover text color and primary input color not needed to be changed for most themes */
-body:not(.hotPink) {
+.system[data-system-theme*='light'],
+.light,
+.system[data-system-theme*='dark'],
+.dark,
+.black,
+.gray,
+.dracula,
+.catppuccinMocha,
+.pastelPink,
+.nordic,
+.solarizedDark,
+.solarizedLight {
   --primary-input-color: rgb(0 0 0 / 50%);
   --side-nav-hover-text-color: var(--primary-text-color);
 }
 
-/* Default side nav active text color and scrollbar text color hover not needed to be changed for most themes */
-body:not(.hotPink, .pastelPink) {
+.system[data-system-theme*='light'],
+.light,
+.system[data-system-theme*='dark'],
+.dark,
+.black,
+.gray,
+.dracula,
+.catppuccinMocha,
+.nordic,
+.solarizedDark,
+.solarizedLight {
   --side-nav-active-text-color: var(--primary-text-color);
   --scrollbar-text-color-hover: var(--primary-text-color);
+
+}
+
+.catppuccinMocha,
+.dracula,
+.hotPink,
+.nordic,
+.pastelPink,
+.solarizedDark,
+.solarizedLight {
+  --logo-primary-color: var(--primary-text-color);
+  --logo-secondary-color: var(--primary-text-color);
+  --logo-tertiary-color: var(--primary-text-color);
 }
 
-/* Themes that use the main FreeTube logo */
 .system[data-system-theme*='light'],
 .light,
 .system[data-system-theme*='dark'],
@@ -58,80 +100,19 @@ body:not(.hotPink, .pastelPink) {
   --logo-tertiary-color: #000;
 }
 
-/* Given that the Hot Pink theme does not need link underlining due to meeting
-WCAG 2 Level AA (https://webaim.org/resources/linkcontrastchecker/?fcolor=FFFFFF&bcolor=DE1C85&lcolor=000000),
-it can be safely elided. This looks quite pleasant on this theme. */
-.hotPink a:not(:hover, :focus),
-.hotPink .navOption:hover,
-.hotPink .navOption:focus,
-.hotPink *:not(:hover, :focus) {
-  text-decoration: none;
-}
-
-.hotPink a:hover,
-.hotPink a:focus {
-  text-decoration: underline;
-}
-
-.hotPink .shaka-range-container {
-  --primary-color: #fff;
-}
-
-
-/*************** DARK THEME ADJUSTMENTS ***************/
-
-/* stylelint-disable no-descending-specificity */
-
-/* Dark theme Youtube and Invidious logo styling (in ft-share-button) */
 .system[data-system-theme*='dark'],
 .dark,
+.black,
+.gray,
 .dracula,
 .catppuccinMocha,
 .hotPink,
 .nordic,
 .solarizedDark,
-.gruvboxDark {
+.solarizedLight {
   --primary-shadow-color: rgb(0 0 0 / 75%);
-
-  .invidiousLogo {
-    background-image: url('./assets/img/invidious-logo-dark.svg');
-  }
-
-  .youtubeLogo {
-    filter: brightness(0.868);
-  }
-}
-
-.black .youtubeLogo {
-  filter: brightness(0.933);
-}
-
-.black .invidiousLogo {
-  background-image: url('./assets/img/invidious-logo-dark.svg');
 }
 
-
-/*************** LIGHT THEME ADJUSTMENTS ***************/
-
-/* Light theme Youtube and Invidious logo styling (in ft-share-button) */
-.invidiousLogo {
-  background-image: url('./assets/img/invidious-logo-light.svg');
-}
-
-.youtubeLogo {
-  filter: invert(0.87);
-}
-
-/* stylelint-enable no-descending-specificity */
-
-
-/*************** MAIN THEME DEFINITIONS ***************/
-
-/*
-  IMPLEMENTATION NOTE:
-  When adding a new base theme, add that --bg-color to src/main/index.js.
-*/
-
 .system[data-system-theme*='light'],
 .light {
   --primary-text-color: #212121;
@@ -200,6 +181,66 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --search-bar-color: #212121;
 }
 
+.dracula {
+  --primary-text-color: #f8f8f2;
+  --secondary-text-color: #c6cee6;
+  --tertiary-text-color: #e5e8f3;
+  --title-color: #bd93f9;
+  --bg-color: #282a36;
+  --favorite-icon-color: #0f0;
+  --card-bg-color: #33353f;
+  --secondary-card-bg-color: #282a36;
+  --scrollbar-color: #44475a;
+  --scrollbar-color-hover: #3d4051;
+  --side-nav-color: #44475a;
+  --side-nav-hover-color: #57596b;
+  --side-nav-active-color: #3d4051;
+  --search-bar-color: #3e3f4a;
+  --logo-icon: url('../../_icons/iconDraculaLightSmall.svg');
+  --logo-text: url('../../_icons/textDraculaLightSmall.svg');
+}
+
+.catppuccinMocha {
+  --primary-text-color: #cdd6f4;
+  --secondary-text-color: #bac2de;
+  --tertiary-text-color: #a6adc8;
+  --title-color: var(--accent-color);
+  --bg-color: #1e1e2e;
+  --favorite-icon-color: #0f0;
+  --card-bg-color: #181825;
+  --secondary-card-bg-color: #1e1e2e;
+  --scrollbar-color: #313244;
+  --scrollbar-color-hover: #3d4051;
+  --side-nav-color: #181825;
+  --side-nav-hover-color: #11111b;
+  --side-nav-active-color: #11111b;
+  --search-bar-color: #313244;
+  --logo-icon: url('../../_icons/iconCatppuccinMochaLightSmall.svg');
+  --logo-text: url('../../_icons/textCatppuccinMochaLightSmall.svg');
+}
+
+.pastelPink {
+  --primary-text-color: #1f002b;
+  --secondary-text-color: #361836;
+  --tertiary-text-color: #5a285a;
+  --primary-shadow-color: rgb(255 240 240 / 50%);
+  --title-color: #185eb4;
+  --bg-color: #ffeadd;
+  --favorite-icon-color: #760278;
+  --card-bg-color: #ffd1dc;
+  --secondary-card-bg-color: #fff;
+  --scrollbar-color: #f5c8d3;
+  --scrollbar-color-hover: #760278;
+  --scrollbar-text-color-hover: var(--scrollbar-color);
+  --side-nav-color: #ffd1dc;
+  --side-nav-hover-color: #cef4f1;
+  --side-nav-active-color: #3124e7;
+  --side-nav-active-text-color: #ffff;
+  --search-bar-color: #fff0dd;
+  --logo-icon: url('../../_icons/iconBlackSmall.svg');
+  --logo-text: url('../../_icons/textBlackSmall.svg');
+}
+
 .nordic {
   --primary-text-color: #eee;
   --secondary-text-color: #ddd;
@@ -260,64 +301,19 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --accent-color-opacity4: rgb(255 255 255 / 24%) !important;
 }
 
-.pastelPink {
-  --primary-text-color: #1f002b;
-  --secondary-text-color: #361836;
-  --tertiary-text-color: #5a285a;
-  --primary-shadow-color: rgb(255 240 240 / 50%);
-  --title-color: #185eb4;
-  --bg-color: #ffeadd;
-  --favorite-icon-color: #760278;
-  --card-bg-color: #ffd1dc;
-  --secondary-card-bg-color: #fff;
-  --scrollbar-color: #f5c8d3;
-  --scrollbar-color-hover: #760278;
-  --scrollbar-text-color-hover: var(--scrollbar-color);
-  --side-nav-color: #ffd1dc;
-  --side-nav-hover-color: #cef4f1;
-  --side-nav-active-color: #3124e7;
-  --side-nav-active-text-color: #ffff;
-  --search-bar-color: #fff0dd;
-  --logo-icon: url('../../_icons/iconBlackSmall.svg');
-  --logo-text: url('../../_icons/textBlackSmall.svg');
-}
-
-.catppuccinMocha {
-  --primary-text-color: #cdd6f4;
-  --secondary-text-color: #bac2de;
-  --tertiary-text-color: #a6adc8;
-  --title-color: var(--accent-color);
-  --bg-color: #1e1e2e;
-  --favorite-icon-color: #0f0;
-  --card-bg-color: #181825;
-  --secondary-card-bg-color: #1e1e2e;
-  --scrollbar-color: #313244;
-  --scrollbar-color-hover: #3d4051;
-  --side-nav-color: #181825;
-  --side-nav-hover-color: #11111b;
-  --side-nav-active-color: #11111b;
-  --search-bar-color: #313244;
-  --logo-icon: url('../../_icons/iconCatppuccinMochaLightSmall.svg');
-  --logo-text: url('../../_icons/textCatppuccinMochaLightSmall.svg');
+/* Given that the Hot Pink theme does not need link underlining due to meeting
+WCAG 2 Level AA (https://webaim.org/resources/linkcontrastchecker/?fcolor=FFFFFF&bcolor=DE1C85&lcolor=000000),
+it can be safely elided. This looks quite pleasant on this theme. */
+.hotPink a:not(:hover, :focus),
+.hotPink .navOption:hover,
+.hotPink .navOption:focus,
+.hotPink *:not(:hover, :focus) {
+  text-decoration: none;
 }
 
-.dracula {
-  --primary-text-color: #f8f8f2;
-  --secondary-text-color: #c6cee6;
-  --tertiary-text-color: #e5e8f3;
-  --title-color: #bd93f9;
-  --bg-color: #282a36;
-  --favorite-icon-color: #0f0;
-  --card-bg-color: #33353f;
-  --secondary-card-bg-color: #282a36;
-  --scrollbar-color: #44475a;
-  --scrollbar-color-hover: #3d4051;
-  --side-nav-color: #44475a;
-  --side-nav-hover-color: #57596b;
-  --side-nav-active-color: #3d4051;
-  --search-bar-color: #3e3f4a;
-  --logo-icon: url('../../_icons/iconDraculaLightSmall.svg');
-  --logo-text: url('../../_icons/textDraculaLightSmall.svg');
+.hotPink a:hover,
+.hotPink a:focus {
+  text-decoration: underline;
 }
 
 .solarizedDark {
@@ -358,48 +354,6 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --logo-text: url('../../_icons/textSolarizedDarkSmall.svg');
 }
 
-.gruvboxDark {
-  --primary-text-color: #ebdbb2;
-  --secondary-text-color: #d5c4a1;
-  --tertiary-text-color: #d5c4a1;
-  --title-color: #ebdbb2;
-  --bg-color: #282828;
-  --favorite-icon-color: #0f0;
-  --card-bg-color: #504945;
-  --secondary-card-bg-color: #3c3836;
-  --scrollbar-color: #665c54;
-  --scrollbar-color-hover: #282828;
-  --side-nav-color: #504945;
-  --side-nav-hover-color: #665c54;
-  --side-nav-active-color: #504945;
-  --search-bar-color: #1d2021;
-  --logo-icon: url('../../_icons/iconGruvboxLightSmall.svg');
-  --logo-text: url('../../_icons/textGruvboxLightSmall.svg');
-}
-
-.gruvboxLight {
-  --primary-shadow-color: rgb(255 241 199 / 100%);
-  --primary-text-color: #3c3836;
-  --secondary-text-color: #282828;
-  --tertiary-text-color: #282828;
-  --title-color: #3c3836;
-  --bg-color: #fbf1c7;
-  --favorite-icon-color: #0f0;
-  --card-bg-color: #ebdbb2;
-  --secondary-card-bg-color: #d5c4a1;
-  --scrollbar-color: #bdae93;
-  --scrollbar-color-hover: #fbf1c7;
-  --side-nav-color: #ebdbb2;
-  --side-nav-hover-color: #bdae93;
-  --side-nav-active-color: #ebdbb2;
-  --search-bar-color: #a89984;
-  --logo-icon: url('../../_icons/iconGruvboxDarkSmall.svg');
-  --logo-text: url('../../_icons/textGruvboxDarkSmall.svg');
-}
-
-
-/*************** PRIMARY THEME COLOR DEFINTIONS ***************/
-
 .mainRed,
 .mainPink,
 .mainPurple,
@@ -415,7 +369,6 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --logo-text-bar-color: url('../../_icons/textWhiteSmall.svg');
 }
 
-/* light primary theme colors */
 .mainLightGreen,
 .mainLime,
 .mainYellow,
@@ -523,8 +476,64 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --primary-color-active: #d84315;
 }
 
+.mainDraculaCyan,
+.mainDraculaGreen,
+.mainDraculaOrange,
+.mainDraculaRed,
+.mainDraculaYellow {
+  --text-with-main-color: #282a36;
+  --logo-icon-bar-color: url('../../_icons/iconDraculaDarkSmall.svg');
+  --logo-text-bar-color: url('../../_icons/textDraculaDarkSmall.svg');
+}
+
+.mainDraculaPink,
+.mainDraculaPurple {
+  --text-with-main-color: #f8f8f2;
+  --logo-icon-bar-color: url('../../_icons/iconDraculaLightSmall.svg');
+  --logo-text-bar-color: url('../../_icons/textDraculaLightSmall.svg');
+}
+
+.mainDraculaCyan {
+  --primary-color: #8be9fd;
+  --primary-color-hover: #97ebfd;
+  --primary-color-active: #7dd2e4;
+}
+
+.mainDraculaGreen {
+  --primary-color: #50fa7b;
+  --primary-color-hover: #62fb88;
+  --primary-color-active: #48e16f;
+}
+
+.mainDraculaOrange {
+  --primary-color: #ffb86c;
+  --primary-color-hover: #ffbf7b;
+  --primary-color-active: #e6a661;
+}
+
+.mainDraculaPink {
+  --primary-color: #ff79c6;
+  --primary-color-hover: #ff86cc;
+  --primary-color-active: #e66db2;
+}
+
+.mainDraculaPurple {
+  --primary-color: #bd93f9;
+  --primary-color-hover: #c49efa;
+  --primary-color-active: #aa84e0;
+}
+
+.mainDraculaRed {
+  --primary-color: #f55;
+  --primary-color-hover: #f66;
+  --primary-color-active: #e64d4d;
+}
 
-/* PRIMARY THEME COLORS CORRESPONDING TO BASE THEMES */
+.mainDraculaYellow {
+  --primary-color: #f1fa8c;
+  --primary-color-hover: #f2fb98;
+  --primary-color-active: #d9e17e;
+}
 
 .mainCatppuccinMochaRosewater,
 .mainCatppuccinMochaFlamingo,
@@ -589,103 +598,44 @@ it can be safely elided. This looks quite pleasant on this theme. */
 
 .mainCatppuccinMochaYellow {
   --primary-color: #f9e2af;
-  --primary-color-hover: #feeecd;
-  --primary-color-active: #dec48d;
-}
-
-.mainCatppuccinMochaGreen {
-  --primary-color: #a6e3a1;
-  --primary-color-hover: #bfebbb;
-  --primary-color-active: #86c780;
-}
-
-.mainCatppuccinMochaTeal {
-  --primary-color: #94e2d5;
-  --primary-color-hover: #aceae0;
-  --primary-color-active: #6fc5b7;
-}
-
-.mainCatppuccinMochaSky {
-  --primary-color: #89dceb;
-  --primary-color-hover: #a3e4f0;
-  --primary-color-active: #68bcca;
-}
-
-.mainCatppuccinMochaSapphire {
-  --primary-color: #74c7ec;
-  --primary-color-hover: #93d1ed;
-  --primary-color-active: #59a9cf;
-}
-
-.mainCatppuccinMochaBlue {
-  --primary-color: #89b4fa;
-  --primary-color-hover: #a6c8ff;
-  --primary-color-active: #6593df;
-}
-
-.mainCatppuccinMochaLavender {
-  --primary-color: #b4befe;
-  --primary-color-hover: #c9d0ff;
-  --primary-color-active: #8d98e4;
-}
-
-.mainDraculaCyan,
-.mainDraculaGreen,
-.mainDraculaOrange,
-.mainDraculaRed,
-.mainDraculaYellow {
-  --text-with-main-color: #282a36;
-  --logo-icon-bar-color: url('../../_icons/iconDraculaDarkSmall.svg');
-  --logo-text-bar-color: url('../../_icons/textDraculaDarkSmall.svg');
-}
-
-.mainDraculaPink,
-.mainDraculaPurple {
-  --text-with-main-color: #f8f8f2;
-  --logo-icon-bar-color: url('../../_icons/iconDraculaLightSmall.svg');
-  --logo-text-bar-color: url('../../_icons/textDraculaLightSmall.svg');
-}
-
-.mainDraculaCyan {
-  --primary-color: #8be9fd;
-  --primary-color-hover: #97ebfd;
-  --primary-color-active: #7dd2e4;
+  --primary-color-hover: #feeecd;
+  --primary-color-active: #dec48d;
 }
 
-.mainDraculaGreen {
-  --primary-color: #50fa7b;
-  --primary-color-hover: #62fb88;
-  --primary-color-active: #48e16f;
+.mainCatppuccinMochaGreen {
+  --primary-color: #a6e3a1;
+  --primary-color-hover: #bfebbb;
+  --primary-color-active: #86c780;
 }
 
-.mainDraculaOrange {
-  --primary-color: #ffb86c;
-  --primary-color-hover: #ffbf7b;
-  --primary-color-active: #e6a661;
+.mainCatppuccinMochaTeal {
+  --primary-color: #94e2d5;
+  --primary-color-hover: #aceae0;
+  --primary-color-active: #6fc5b7;
 }
 
-.mainDraculaPink {
-  --primary-color: #ff79c6;
-  --primary-color-hover: #ff86cc;
-  --primary-color-active: #e66db2;
+.mainCatppuccinMochaSky {
+  --primary-color: #89dceb;
+  --primary-color-hover: #a3e4f0;
+  --primary-color-active: #68bcca;
 }
 
-.mainDraculaPurple {
-  --primary-color: #bd93f9;
-  --primary-color-hover: #c49efa;
-  --primary-color-active: #aa84e0;
+.mainCatppuccinMochaSapphire {
+  --primary-color: #74c7ec;
+  --primary-color-hover: #93d1ed;
+  --primary-color-active: #59a9cf;
 }
 
-.mainDraculaRed {
-  --primary-color: #f55;
-  --primary-color-hover: #f66;
-  --primary-color-active: #e64d4d;
+.mainCatppuccinMochaBlue {
+  --primary-color: #89b4fa;
+  --primary-color-hover: #a6c8ff;
+  --primary-color-active: #6593df;
 }
 
-.mainDraculaYellow {
-  --primary-color: #f1fa8c;
-  --primary-color-hover: #f2fb98;
-  --primary-color-active: #d9e17e;
+.mainCatppuccinMochaLavender {
+  --primary-color: #b4befe;
+  --primary-color-hover: #c9d0ff;
+  --primary-color-active: #8d98e4;
 }
 
 .mainSolarizedYellow,
@@ -754,96 +704,6 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --primary-color-active: #c5d940;
 }
 
-.mainGruvboxDarkGreen {
-  --primary-color: #b8bb26;
-  --primary-color-hover: #d8db46;
-  --primary-color-active: #f8fb66;
-}
-
-.mainGruvboxDarkYellow {
-  --primary-color: #fabd2f;
-  --primary-color-hover: #fcd54f;
-  --primary-color-active: #fed76f;
-}
-
-.mainGruvboxDarkBlue {
-  --primary-color: #83a598;
-  --primary-color-hover: #a3c5b8;
-  --primary-color-active: #c3e2d8;
-}
-
-.mainGruvboxDarkPurple {
-  --primary-color: #d3869b;
-  --primary-color-hover: #f3a6b8;
-  --primary-color-active: #f3a6b8;
-}
-
-.mainGruvboxDarkAqua {
-  --primary-color: #8ec07c;
-  --primary-color-hover: #aec29c;
-  --primary-color-active: #cec59c;
-}
-
-.mainGruvboxDarkOrange {
-  --primary-color: #fe8019;
-  --primary-color-hover: #fe9a39;
-  --primary-color-active: #feb259;
-}
-
-.mainGruvboxLightRed {
-  --primary-color: #9d0006;
-  --primary-color-hover: #bd2026;
-  --primary-color-active: #dd4046;
-}
-
-.mainGruvboxLightBlue {
-  --primary-color: #076678;
-  --primary-color-hover: #276898;
-  --primary-color-active: #476ab8;
-}
-
-.mainGruvboxLightPurple {
-  --primary-color: #8f3f71;
-  --primary-color-hover: #af5f91;
-  --primary-color-active: #cf7fb1;
-}
-
-.mainGruvboxLightOrange {
-  --primary-color: #af3a03;
-  --primary-color-hover: #cf5a23;
-  --primary-color-active: #ef7a43;
-}
-
-.mainGruvboxLightOrange,
-.mainGruvboxLightRed,
-.mainGruvboxLightBlue,
-.mainGruvboxLightPurple {
-  --text-with-main-color: #fbf1c7;
-  --logo-icon-bar-color: url('../../_icons/iconGruvboxLightSmall.svg');
-  --logo-text-bar-color: url('../../_icons/textGruvboxLightSmall.svg');
-}
-
-
-.mainGruvboxDarkGreen,
-.mainGruvboxDarkYellow,
-.mainGruvboxDarkAqua,
-.mainGruvboxDarkOrange {
-  --text-with-main-color: #3c3836;
-  --logo-icon-bar-color: url('../../_icons/iconGruvboxDarkSmall.svg');
-  --logo-text-bar-color: url('../../_icons/textGruvboxDarkSmall.svg');
-}
-
-.mainGruvboxDarkBlue,
-.mainGruvboxDarkPurple {
-  --text-with-main-color: #1d2021;
-  --logo-icon-bar-color: url('../../_icons/iconGruvboxDarkSmall.svg');
-  --logo-text-bar-color: url('../../_icons/textGruvboxDarkSmall.svg');
-}
-
-
-/*************** SECONDARY THEME COLOR DEFINTIONS ***************/
-
-/* dark secondary theme colors */
 .secRed,
 .secPink,
 .secPurple,
@@ -857,7 +717,6 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --text-with-accent-color: #fff;
 }
 
-/* light secondary theme colors */
 .secLightGreen,
 .secLime,
 .secYellow,
@@ -1059,8 +918,88 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --accent-color-opacity4: rgb(255 87 34 / 24%);
 }
 
+.secDraculaCyan,
+.secDraculaGreen,
+.secDraculaOrange,
+.secDraculaRed,
+.secDraculaYellow {
+  --text-with-accent-color: #212121;
+}
+
+.secDraculaPink,
+.secDraculaPurple {
+  --text-with-accent-color: #f8f8f2;
+}
+
+.secDraculaCyan,
+.secDraculaGreen,
+.secDraculaOrange,
+.secDraculaPink,
+.secDraculaPurple,
+.secDraculaRed,
+.secDraculaYellow {
+  --accent-color-opacity1: rgb(98 114 164 / 4%);
+  --accent-color-opacity2: rgb(98 114 164 / 12%);
+  --accent-color-opacity3: rgb(98 114 164 / 16%);
+  --accent-color-opacity4: rgb(98 114 164 / 24%);
+}
+
+.secDraculaCyan {
+  --accent-color: #8be9fd;
+  --accent-color-hover: #97ebfd;
+  --accent-color-active: #7dd2e4;
+  --accent-color-light: #a2edfd;
+  --accent-color-visited: #6fbaca;
+
+}
+
+.secDraculaGreen {
+  --accent-color: #50fa7b;
+  --accent-color-hover: #62fb88;
+  --accent-color-active: #48e16f;
+  --accent-color-light: #73fb95;
+  --accent-color-visited: #40c862;
+}
+
+.secDraculaOrange {
+  --accent-color: #ffb86c;
+  --accent-color-hover: #ffbf7b;
+  --accent-color-active: #e6a661;
+  --accent-color-light: #ffc689;
+  --accent-color-visited: #cc9356;
+}
+
+.secDraculaPink {
+  --accent-color: #ff79c6;
+  --accent-color-hover: #ff86cc;
+  --accent-color-active: #e66db2;
+  --accent-color-light: #ff94d1;
+  --accent-color-visited: #cc619e;
+}
+
+.secDraculaPurple {
+  --accent-color: #bd93f9;
+  --accent-color-hover: #c49efa;
+  --accent-color-active: #aa84e0;
+  --accent-color-light: #caa9fa;
+  --accent-color-visited: #9776c7;
+}
+
+.secDraculaRed {
+  --accent-color: #f55;
+  --accent-color-hover: #f66;
+  --accent-color-active: #e64d4d;
+  --accent-color-light: #f77;
+  --accent-color-visited: #c44;
+}
 
-/* SECONDARY THEME COLORS CORRESPONDING TO BASE THEMES */
+.secDraculaYellow {
+  --accent-color: #f1fa8c;
+  --accent-color-hover: #f2fb98;
+  --accent-color-active: #d9e17e;
+  --accent-color-light: #f4fba3;
+  --accent-color-visited: #c1c870;
+}
 
 .secCatppuccinMochaRosewater,
 .secCatppuccinMochaFlamingo,
@@ -1247,89 +1186,6 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --accent-color-opacity4: rgb(180 190 254 / 24%);
 }
 
-.secDraculaCyan,
-.secDraculaGreen,
-.secDraculaOrange,
-.secDraculaRed,
-.secDraculaYellow {
-  --text-with-accent-color: #212121;
-}
-
-.secDraculaPink,
-.secDraculaPurple {
-  --text-with-accent-color: #f8f8f2;
-}
-
-.secDraculaCyan,
-.secDraculaGreen,
-.secDraculaOrange,
-.secDraculaPink,
-.secDraculaPurple,
-.secDraculaRed,
-.secDraculaYellow {
-  --accent-color-opacity1: rgb(98 114 164 / 4%);
-  --accent-color-opacity2: rgb(98 114 164 / 12%);
-  --accent-color-opacity3: rgb(98 114 164 / 16%);
-  --accent-color-opacity4: rgb(98 114 164 / 24%);
-}
-
-.secDraculaCyan {
-  --accent-color: #8be9fd;
-  --accent-color-hover: #97ebfd;
-  --accent-color-active: #7dd2e4;
-  --accent-color-light: #a2edfd;
-  --accent-color-visited: #6fbaca;
-
-}
-
-.secDraculaGreen {
-  --accent-color: #50fa7b;
-  --accent-color-hover: #62fb88;
-  --accent-color-active: #48e16f;
-  --accent-color-light: #73fb95;
-  --accent-color-visited: #40c862;
-}
-
-.secDraculaOrange {
-  --accent-color: #ffb86c;
-  --accent-color-hover: #ffbf7b;
-  --accent-color-active: #e6a661;
-  --accent-color-light: #ffc689;
-  --accent-color-visited: #cc9356;
-}
-
-.secDraculaPink {
-  --accent-color: #ff79c6;
-  --accent-color-hover: #ff86cc;
-  --accent-color-active: #e66db2;
-  --accent-color-light: #ff94d1;
-  --accent-color-visited: #cc619e;
-}
-
-.secDraculaPurple {
-  --accent-color: #bd93f9;
-  --accent-color-hover: #c49efa;
-  --accent-color-active: #aa84e0;
-  --accent-color-light: #caa9fa;
-  --accent-color-visited: #9776c7;
-}
-
-.secDraculaRed {
-  --accent-color: #f55;
-  --accent-color-hover: #f66;
-  --accent-color-active: #e64d4d;
-  --accent-color-light: #f77;
-  --accent-color-visited: #c44;
-}
-
-.secDraculaYellow {
-  --accent-color: #f1fa8c;
-  --accent-color-hover: #f2fb98;
-  --accent-color-active: #d9e17e;
-  --accent-color-light: #f4fba3;
-  --accent-color-visited: #c1c870;
-}
-
 .secSolarizedYellow,
 .secSolarizedOrange,
 .secSolarizedRed,
@@ -1448,176 +1304,42 @@ it can be safely elided. This looks quite pleasant on this theme. */
   --accent-color-opacity4: rgb(101 119 0 / 24%);
 }
 
-.secGruvboxDarkGreen {
-  --accent-color: #98971a;
-  --accent-color-hover: #b9b93a;
-  --accent-color-active: #d9d95a;
-  --accent-color-light: #b8bb26;
-  --accent-color-visited: #98971a;
-  --accent-color-opacity1: rgb(152 151 26 / 4%);
-  --accent-color-opacity2: rgb(152 151 26 / 12%);
-  --accent-color-opacity3: rgb(152 151 26 / 16%);
-  --accent-color-opacity4: rgb(152 151 26 / 24%);
-}
-
-.secGruvboxDarkYellow {
-  --accent-color: #d79921;
-  --accent-color-hover: #f0b839;
-  --accent-color-active: #f0b839;
-  --accent-color-light: #fabd2f;
-  --accent-color-visited: #d79921;
-  --accent-color-opacity1: rgb(215 153 33 / 4%);
-  --accent-color-opacity2: rgb(215 153 33 / 12%);
-  --accent-color-opacity3: rgb(215 153 33 / 16%);
-  --accent-color-opacity4: rgb(215 153 33 / 24%);
-}
-
-.secGruvboxDarkBlue {
-  --accent-color: #458588;
-  --accent-color-hover: #68948a;
-  --accent-color-active: #68948a;
-  --accent-color-light: #83a598;
-  --accent-color-visited: #458588;
-  --accent-color-opacity1: rgb(69 133 136 / 4%);
-  --accent-color-opacity2: rgb(69 133 136 / 12%);
-  --accent-color-opacity3: rgb(69 133 136 / 16%);
-  --accent-color-opacity4: rgb(69 133 136 / 24%);
-}
-
-.secGruvboxDarkPurple {
-  --accent-color: #b16286;
-  --accent-color-hover: #d3869b;
-  --accent-color-active: #d3869b;
-  --accent-color-light: #d3869b;
-  --accent-color-visited: #b16286;
-  --accent-color-opacity1: rgb(177 98 134 / 4%);
-  --accent-color-opacity2: rgb(177 98 134 / 12%);
-  --accent-color-opacity3: rgb(177 98 134 / 16%);
-  --accent-color-opacity4: rgb(177 98 134 / 24%);
-}
-
-.secGruvboxDarkAqua {
-  --accent-color: #689d6a;
-  --accent-color-hover: #8ec07c;
-  --accent-color-active: #8ec07c;
-  --accent-color-light: #8ec07c;
-  --accent-color-visited: #689d6a;
-  --accent-color-opacity1: rgb(104 157 106 / 4%);
-  --accent-color-opacity2: rgb(104 157 106 / 12%);
-  --accent-color-opacity3: rgb(104 157 106 / 16%);
-  --accent-color-opacity4: rgb(104 157 106 / 24%);
-}
-
-.secGruvboxDarkOrange {
-  --accent-color: #d65d0e;
-  --accent-color-hover: #f2804f;
-  --accent-color-active: #f2804f;
-  --accent-color-light: #fe8019;
-  --accent-color-visited: #d65d0e;
-  --accent-color-opacity1: rgb(214 93 14 / 4%);
-  --accent-color-opacity2: rgb(214 93 14 / 12%);
-  --accent-color-opacity3: rgb(214 93 14 / 16%);
-  --accent-color-opacity4: rgb(214 93 14 / 24%);
-}
-
-.secGruvboxLightRed {
-  --text-with-accent-color: #fbf1c7;
-  --accent-color: #cc241d;
-  --accent-color-hover: #d23c2a;
-  --accent-color-active: #a61f1f;
-  --accent-color-light: #fb4934;
-  --accent-color-visited: #a61f1f;
-  --accent-color-opacity1: rgb(204 36 29 / 4%);
-  --accent-color-opacity2: rgb(204 36 29 / 12%);
-  --accent-color-opacity3: rgb(204 36 29 / 16%);
-  --accent-color-opacity4: rgb(204 36 29 / 24%);
-}
-
-.secGruvboxLightBlue {
-  --accent-color: #458588;
-  --accent-color-hover: #68948a;
-  --accent-color-active: #68948a;
-  --accent-color-light: #83a598;
-  --accent-color-visited: #458588;
-  --accent-color-opacity1: rgb(69 133 136 / 4%);
-  --accent-color-opacity2: rgb(69 133 136 / 12%);
-  --accent-color-opacity3: rgb(69 133 136 / 16%);
-  --accent-color-opacity4: rgb(69 133 136 / 24%);
-}
-
-.secGruvboxLightPurple {
-  --accent-color: #b16286;
-  --accent-color-hover: #d3869b;
-  --accent-color-active: #d3869b;
-  --accent-color-light: #d3869b;
-  --accent-color-visited: #b16286;
-  --accent-color-opacity1: rgb(177 98 134 / 4%);
-  --accent-color-opacity2: rgb(177 98 134 / 12%);
-  --accent-color-opacity3: rgb(177 98 134 / 16%);
-  --accent-color-opacity4: rgb(177 98 134 / 24%);
-}
-
-.secGruvboxLightOrange {
-  --accent-color: #d65d0e;
-  --accent-color-hover: #f2804f;
-  --accent-color-active: #f2804f;
-  --accent-color-light: #fe8019;
-  --accent-color-visited: #d65d0e;
-  --accent-color-opacity1: rgb(214 93 14 / 4%);
-  --accent-color-opacity2: rgb(214 93 14 / 12%);
-  --accent-color-opacity3: rgb(214 93 14 / 16%);
-  --accent-color-opacity4: rgb(214 93 14 / 24%);
-}
-
-.secGruvboxLightOrange,
-.secGruvboxLightRed,
-.secGruvboxLightBlue,
-.secGruvboxLightPurple {
-  --text-with-accent-color: #fbf1c7;
-}
-
-.secGruvboxDarkGreen,
-.secGruvboxDarkYellow,
-.secGruvboxDarkAqua,
-.secGruvboxDarkOrange {
-  --text-with-accent-color: #3c3836;
-}
-
-.secGruvboxDarkBlue,
-.secGruvboxDarkPurple {
-  --text-with-accent-color: #1d2021;
-}
-
-
-/*************** DESTRUCTIVE THEME COLOR OVERRIDES ***************/
-
-/* stylelint-disable no-descending-specificity */
-
-/* destructive color in case of conflict with red color themes (sets new destructive color to purple)
-  NOTE: RED COLORS MUST CONTAIN 'Red' IN CLASSNAME.
-*/
-body[class*='Red'] * {
+/* region destructive color for red color themes
+  using :has(.app) to increase specificity */
+.mainRed:has(.app),
+.secRed:has(.app),
+.mainDraculaRed:has(.app),
+.secDraculaRed:has(.app),
+.mainSolarizedRed:has(.app),
+.secSolarizedRed:has(.app) {
   --destructive-color: #9c27b0;
   --destructive-text-color: #fff;
   --destructive-hover-color: #8e24aa;
   --destructive-active-color: #6a1b9a;
 }
 
-/* destructive color in case of conflict with red and purple color themes (sets new destructive color to yellow)
-  NOTE: PURPLE COLORS MUST CONTAIN 'Purple' IN CLASSNAME.
-*/
-body[class*='Red'][class*='Purple'] * {
+/* Deal with theme conflict on destructive colors */
+.mainRed.secPurple,
+.mainRed.secDeepPurple,
+.mainRed.secDraculaPurple,
+.mainDraculaRed.secPurple,
+.mainDraculaRed.secDeepPurple,
+.mainDraculaRed.secDraculaPurple,
+.mainSolarizedRed.secPurple,
+.mainSolarizedRed.secDeepPurple,
+.mainSolarizedRed.secDraculaPurple,
+.mainPurple.secRed,
+.mainPurple.secDraculaRed,
+.mainDeepPurple.secRed,
+.mainDeepPurple.secDraculaRed,
+.mainDraculaPurple.secRed,
+.mainDraculaPurple.secDraculaRed {
   --destructive-color: #ff9800;
   --destructive-text-color: #fff;
   --destructive-hover-color: #fb8c00;
   --destructive-active-color: #ef6c00;
 }
 
-/* stylelint-enable no-descending-specificity */
-
-
-/*************** LEFT-TO-RIGHT AND RIGHT-TO-LEFT RULES ***************/
-
 body[dir='ltr'] {
   --ltr-or-rtl: ltr;
   --float-left-ltr-rtl-value: left;
@@ -1644,32 +1366,35 @@ html[lang='ur'] [data-prefix='fas'][data-icon='circle-question'] {
   transform: scale(-1, 1);
 }
 
+body {
+  margin: 0;
+  min-block-size: 100vh;
+  color: var(--primary-text-color);
+  background-color: var(--bg-color);
 
-/*************** MAIN APP STYLING RULES ***************/
+  --red-500: #f44336;
+}
 
 .app {
   color: var(--primary-text-color);
   background-color: var(--bg-color);
 }
 
-
-/* stylelint-disable no-descending-specificity */
-
 /* stylelint-disable-next-line a11y/no-outline-none */
 .hideOutlines *:focus {
   outline: none;
 }
 
+/* stylelint-disable-next-line no-descending-specificity */
 a:link {
   color: var(--link-color);
 }
 
+/* stylelint-disable-next-line no-descending-specificity */
 a:visited {
   color: var(--link-visited-color);
 }
 
-/* stylelint-enable no-descending-specificity */
-
 @media (prefers-reduced-motion) {
   * {
     transition: none !important;
diff --git a/src/renderer/views/About/About.css b/src/renderer/views/About/About.css
index c86b3a95a438d..bd9c5da185d22 100644
--- a/src/renderer/views/About/About.css
+++ b/src/renderer/views/About/About.css
@@ -7,7 +7,7 @@
   text-align: center;
 }
 
-.logo {
+.ft-logo-full {
   max-inline-size: 100%;
   inline-size: 500px;
 }
diff --git a/src/renderer/views/About/About.js b/src/renderer/views/About/About.js
new file mode 100644
index 0000000000000..d47e65713089e
--- /dev/null
+++ b/src/renderer/views/About/About.js
@@ -0,0 +1,84 @@
+import { defineComponent } from 'vue'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import packageDetails from '../../../../package.json'
+import { ABOUT_BITCOIN_ADDRESS } from '../../../constants'
+import FtLogoFull from '../../components/ft-logo-full/ft-logo-full.vue'
+
+export default defineComponent({
+  name: 'About',
+  components: {
+    'ft-card': FtCard,
+    'ft-logo-full': FtLogoFull,
+  },
+  data: function () {
+    return {
+      versionNumber: `v${packageDetails.version}`
+    }
+  },
+  computed: {
+    chunks: function () {
+      return [
+        {
+          icon: ['fab', 'github'],
+          title: this.$t('About.Source code'),
+          content: `<a href="https://github.com/FreeTubeApp/FreeTube" lang="en">GitHub: FreeTubeApp/FreeTube</a><br>${this.$t('About.Licensed under the')} <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">${this.$t('About.AGPLv3')}</a>`
+        },
+        {
+          icon: ['fas', 'file-download'],
+          title: this.$t('About.Downloads / Changelog'),
+          content: `<a href="https://github.com/FreeTubeApp/FreeTube/releases">${this.$t('About.GitHub releases')}</a>`
+        },
+        {
+          icon: ['fas', 'question-circle'],
+          title: this.$t('About.Help'),
+          content: `<a href="https://docs.freetubeapp.io/">${this.$t('About.FreeTube Wiki')}</a> / <a href="https://docs.freetubeapp.io/faq/">${this.$t('About.FAQ')}</a> / <a href="https://github.com/FreeTubeApp/FreeTube/discussions/">${this.$t('About.Discussions')}</a>`
+        },
+        {
+          icon: ['fas', 'exclamation-circle'],
+          title: this.$t('About.Report a problem'),
+          content: `<a href="https://github.com/FreeTubeApp/FreeTube/issues">${this.$t('About.GitHub issues')}</a><br>${this.$t('About.Please check for duplicates before posting')}`
+        },
+        {
+          icon: ['fas', 'globe'],
+          title: this.$t('About.Website'),
+          content: '<a href="https://freetubeapp.io/">https://freetubeapp.io/</a>'
+        },
+        {
+          icon: ['fas', 'newspaper'],
+          title: this.$t('About.Blog'),
+          content: '<a href="https://blog.freetubeapp.io">https://blog.freetubeapp.io</a>'
+        },
+        {
+          icon: ['fas', 'envelope'],
+          title: this.$t('About.Email'),
+          content: '<a href="mailto:FreeTubeApp@protonmail.com">FreeTubeApp@protonmail.com</a>'
+        },
+        {
+          icon: ['fab', 'mastodon'],
+          title: this.$t('About.Mastodon'),
+          content: '<a href="https://fosstodon.org/@FreeTube">@FreeTube@fosstodon.org</a>'
+        },
+        {
+          icon: ['fas', 'comment-dots'],
+          title: this.$t('About.Chat on Matrix'),
+          content: `<a href="https://matrix.to/#/#freetube:matrix.org?via=matrix.org&via=privacytools.io&via=tchncs.de">#freetube:matrix.org</a><br>${this.$t('About.Please read the')} <a href="https://docs.freetubeapp.io/community/matrix/">${this.$t('About.room rules')}</a>`
+        },
+        {
+          icon: ['fas', 'language'],
+          title: this.$t('About.Translate'),
+          content: '<a href="https://hosted.weblate.org/engage/free-tube/">https://hosted.weblate.org/engage/free-tube/</a>'
+        },
+        {
+          icon: ['fas', 'users'],
+          title: this.$t('About.Credits'),
+          content: `${this.$t('About.FreeTube is made possible by')} <a href="https://docs.freetubeapp.io/credits/">${this.$t('About.these people and projects')}</a>`
+        },
+        {
+          icon: ['fab', 'bitcoin'],
+          title: `${this.$t('About.Donate')} - BTC`,
+          content: `<a href="bitcoin:${ABOUT_BITCOIN_ADDRESS}">${ABOUT_BITCOIN_ADDRESS}</a>`
+        }
+      ]
+    }
+  }
+})
diff --git a/src/renderer/views/About/About.vue b/src/renderer/views/About/About.vue
index c56b167753be5..6aec14edadf3a 100644
--- a/src/renderer/views/About/About.vue
+++ b/src/renderer/views/About/About.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <FtCard class="card">
+    <ft-card class="card">
       <h1>
         {{ $t("About.About") }}
       </h1>
       <section class="brand">
-        <FtLogoFull class="logo" />
+        <ft-logo-full />
         <div class="version">
           {{ versionNumber }} {{ $t("About.Beta") }}
         </div>
@@ -16,7 +16,7 @@
           :key="chunk.title"
           class="chunk"
         >
-          <FontAwesomeIcon
+          <font-awesome-icon
             class="icon"
             :icon="chunk.icon"
           />
@@ -29,87 +29,9 @@
           />
         </figure>
       </section>
-    </FtCard>
+    </ft-card>
   </div>
 </template>
 
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { computed } from 'vue'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtLogoFull from '../../components/FtLogoFull/FtLogoFull.vue'
-
-import { ABOUT_BITCOIN_ADDRESS } from '../../../constants'
-import packageDetails from '../../../../package.json'
-
-const { t } = useI18n()
-
-const versionNumber = `v${packageDetails.version}`
-
-const chunks = computed(() => [
-  {
-    icon: ['fab', 'github'],
-    title: t('About.Source code'),
-    content: `<a href="https://github.com/FreeTubeApp/FreeTube" lang="en">GitHub: FreeTubeApp/FreeTube</a><br>${t('About.Licensed under the')} <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">${t('About.AGPLv3')}</a>`
-  },
-  {
-    icon: ['fas', 'file-download'],
-    title: t('About.Downloads / Changelog'),
-    content: `<a href="https://github.com/FreeTubeApp/FreeTube/releases">${t('About.GitHub releases')}</a>`
-  },
-  {
-    icon: ['fas', 'question-circle'],
-    title: t('About.Help'),
-    content: `<a href="https://docs.freetubeapp.io/">${t('About.FreeTube Wiki')}</a> / <a href="https://docs.freetubeapp.io/faq/">${t('About.FAQ')}</a> / <a href="https://github.com/FreeTubeApp/FreeTube/discussions/">${t('About.Discussions')}</a>`
-  },
-  {
-    icon: ['fas', 'exclamation-circle'],
-    title: t('About.Report a problem'),
-    content: `<a href="https://github.com/FreeTubeApp/FreeTube/issues">${t('About.GitHub issues')}</a><br>${t('About.Please check for duplicates before posting')}`
-  },
-  {
-    icon: ['fas', 'globe'],
-    title: t('About.Website'),
-    content: '<a href="https://freetubeapp.io/">https://freetubeapp.io/</a>'
-  },
-  {
-    icon: ['fas', 'newspaper'],
-    title: t('About.Blog'),
-    content: '<a href="https://blog.freetubeapp.io">https://blog.freetubeapp.io</a>'
-  },
-  {
-    icon: ['fas', 'envelope'],
-    title: t('About.Email'),
-    content: '<a href="mailto:FreeTubeApp@protonmail.com">FreeTubeApp@protonmail.com</a>'
-  },
-  {
-    icon: ['fab', 'mastodon'],
-    title: t('About.Mastodon'),
-    content: '<a href="https://fosstodon.org/@FreeTube">@FreeTube@fosstodon.org</a>'
-  },
-  {
-    icon: ['fas', 'comment-dots'],
-    title: t('About.Chat on Matrix'),
-    content: `<a href="https://matrix.to/#/#freetube:matrix.org?via=matrix.org&via=privacytools.io&via=tchncs.de">#freetube:matrix.org</a><br>${t('About.Please read the')} <a href="https://docs.freetubeapp.io/community/matrix/">${t('About.room rules')}</a>`
-  },
-  {
-    icon: ['fas', 'language'],
-    title: t('About.Translate'),
-    content: '<a href="https://hosted.weblate.org/engage/free-tube/">https://hosted.weblate.org/engage/free-tube/</a>'
-  },
-  {
-    icon: ['fas', 'users'],
-    title: t('About.Credits'),
-    content: `${t('About.FreeTube is made possible by')} <a href="https://docs.freetubeapp.io/credits/">${t('About.these people and projects')}</a>`
-  },
-  {
-    icon: ['fab', 'bitcoin'],
-    title: `${t('About.Donate')} - BTC`,
-    content: `<a href="bitcoin:${ABOUT_BITCOIN_ADDRESS}">${ABOUT_BITCOIN_ADDRESS}</a>`
-  }
-])
-</script>
-
+<script src="./About.js" />
 <style scoped src="./About.css" />
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 8223de6907586..d384e55adebe0 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -1,18 +1,18 @@
 import { defineComponent } from 'vue'
-import { mapActions, mapMutations } from 'vuex'
+import { mapActions } from 'vuex'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtSelect from '../../components/ft-select/ft-select.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtAgeRestricted from '../../components/FtAgeRestricted/FtAgeRestricted.vue'
+import FtAgeRestricted from '../../components/ft-age-restricted/ft-age-restricted.vue'
 import ChannelAbout from '../../components/channel-about/channel-about.vue'
 import ChannelDetails from '../../components/ChannelDetails/ChannelDetails.vue'
 import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
-import ChannelHome from '../../components/ChannelHome/ChannelHome.vue'
 
 import autolinker from 'autolinker'
 import {
+  setPublishedTimestampsInvidious,
   copyToClipboard,
   extractNumberFromString,
   showToast,
@@ -22,16 +22,10 @@ import {
 import { isNullOrEmpty } from '../../helpers/strings'
 import packageDetails from '../../../../package.json'
 import {
-  getInvidiousChannelLive,
-  getInvidiousChannelPlaylists,
-  getInvidiousChannelPodcasts,
-  getInvidiousChannelReleases,
-  getInvidiousChannelShorts,
-  getInvidiousChannelVideos,
+  invidiousAPICall,
   invidiousGetChannelId,
   invidiousGetChannelInfo,
   invidiousGetCommunityPosts,
-  searchInvidiousChannel,
   youtubeImageUrlToInvidious
 } from '../../helpers/api/invidious'
 import {
@@ -42,15 +36,14 @@ import {
   parseLocalChannelShorts,
   parseLocalChannelVideos,
   parseLocalCommunityPosts,
+  parseLocalCompactStation,
   parseLocalListPlaylist,
   parseLocalListVideo,
   parseLocalSubscriberCount,
   getLocalArtistTopicChannelReleasesContinuation,
   getLocalPlaylist,
-  parseLocalPlaylistVideo,
-  parseChannelHomeTab
+  parseLocalPlaylistVideo
 } from '../../helpers/api/local'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 
 export default defineComponent({
   name: 'Channel',
@@ -63,15 +56,12 @@ export default defineComponent({
     'ft-age-restricted': FtAgeRestricted,
     'channel-about': ChannelAbout,
     'ft-auto-load-next-page-wrapper': FtAutoLoadNextPageWrapper,
-    ChannelDetails,
-    ChannelHome
+    ChannelDetails
   },
   data: function () {
     return {
-      skipRouteChangeWatcherOnce: false,
       isLoading: true,
       isElementListLoading: false,
-      isSearchTabLoading: false,
       currentTab: 'videos',
       id: '',
       /** @type {import('youtubei.js').YT.Channel|null} */
@@ -106,7 +96,6 @@ export default defineComponent({
       showPlaylistSortBy: true,
       lastSearchQuery: '',
       relatedChannels: [],
-      homeData: [],
       latestVideos: [],
       latestShorts: [],
       latestLive: [],
@@ -128,7 +117,6 @@ export default defineComponent({
 
       autoRefreshOnSortByChangeEnabled: false,
       supportedChannelTabs: [
-        'home',
         'videos',
         'shorts',
         'live',
@@ -182,7 +170,10 @@ export default defineComponent({
     },
 
     isSubscribedInAnyProfile: function () {
-      return this.$store.getters.getSubscribedChannelIdSet.has(this.id)
+      const profileList = this.$store.getters.getProfileList
+
+      // check the all channels profile
+      return profileList[0].subscriptions.some((channel) => channel.id === this.id)
     },
 
     videoLiveShortSelectValues: function () {
@@ -269,10 +260,6 @@ export default defineComponent({
       return this.$store.getters.getHideChannelCommunity
     },
 
-    hideChannelHome: function() {
-      return this.$store.getters.getHideChannelHome
-    },
-
     tabInfoValues: function () {
       const values = [...this.channelTabs]
 
@@ -302,10 +289,6 @@ export default defineComponent({
         indexToRemove.push(values.indexOf('releases'))
       }
 
-      if (this.hideChannelHome) {
-        indexToRemove.push(values.indexOf('home'))
-      }
-
       indexToRemove.forEach(index => {
         if (index !== -1) {
           values.splice(index, 1)
@@ -314,22 +297,10 @@ export default defineComponent({
 
       return values
     },
-
-    isCurrentTabLoading() {
-      if (this.currentTab === 'search') {
-        return this.isSearchTabLoading
-      }
-
-      return this.isElementListLoading
-    },
   },
   watch: {
     $route() {
       // react to route changes...
-      if (this.skipRouteChangeWatcherOnce) {
-        this.skipRouteChangeWatcherOnce = false
-        return
-      }
       this.isLoading = true
 
       if (this.$route.query.url) {
@@ -386,9 +357,8 @@ export default defineComponent({
 
       // Re-enable auto refresh on sort value change AFTER update done
       if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
-        this.getChannelInfoInvidious().finally(() => {
-          this.autoRefreshOnSortByChangeEnabled = true
-        })
+        this.getChannelInfoInvidious()
+        this.autoRefreshOnSortByChangeEnabled = true
       } else {
         this.getChannelLocal().finally(() => {
           this.autoRefreshOnSortByChangeEnabled = true
@@ -465,9 +435,9 @@ export default defineComponent({
       }
     }
   },
-  mounted: async function () {
+  mounted: function () {
     if (this.$route.query.url) {
-      await this.resolveChannelUrl(this.$route.query.url, this.$route.params.currentTab)
+      this.resolveChannelUrl(this.$route.query.url, this.$route.params.currentTab)
       return
     }
 
@@ -483,19 +453,13 @@ export default defineComponent({
 
     // Enable auto refresh on sort value change AFTER initial update done
     if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
-      await this.getChannelInfoInvidious().finally(() => {
-        this.autoRefreshOnSortByChangeEnabled = true
-      })
+      this.getChannelInfoInvidious()
+      this.autoRefreshOnSortByChangeEnabled = true
     } else {
-      await this.getChannelLocal().finally(() => {
+      this.getChannelLocal().finally(() => {
         this.autoRefreshOnSortByChangeEnabled = true
       })
     }
-
-    const oldQuery = this.$route.query.searchQueryText ?? ''
-    if (oldQuery !== null && oldQuery !== '') {
-      this.newSearch(oldQuery)
-    }
   },
   methods: {
     resolveChannelUrl: async function (url, tab = undefined) {
@@ -561,7 +525,7 @@ export default defineComponent({
           this.channelName = channelName
           this.thumbnailUrl = channelThumbnailUrl
 
-          this.setAppTitle(`${channelName} - ${packageDetails.productName}`)
+          document.title = `${channelName} - ${packageDetails.productName}`
 
           this.updateSubscriptionDetails({ channelThumbnailUrl, channelName, channelId: this.id })
 
@@ -605,7 +569,7 @@ export default defineComponent({
         }
         this.tags = tags
 
-        this.setAppTitle(`${channelName} - ${packageDetails.productName}`)
+        document.title = `${channelName} - ${packageDetails.productName}`
 
         if (subscriberText) {
           const subCount = parseLocalSubscriberCount(subscriberText)
@@ -621,6 +585,45 @@ export default defineComponent({
 
         this.updateSubscriptionDetails({ channelThumbnailUrl, channelName, channelId })
 
+        let relatedChannels = channel.channels.map(({ author }) => ({
+          name: author.name,
+          id: author.id,
+          thumbnailUrl: author.best_thumbnail.url
+        }))
+
+        if (channel.memo.has('GameDetails')) {
+          /** @type {import('youtubei.js').YTNodes.GameDetails[]} */
+          const games = channel.memo.get('GameDetails')
+
+          relatedChannels.push(...games.map(game => ({
+            id: game.endpoint.payload.browseId,
+            name: game.title.text,
+            thumbnailUrl: game.box_art[0].url
+          })))
+        }
+
+        if (relatedChannels.length > 0) {
+          /** @type {Set<string>} */
+          const knownChannelIds = new Set()
+
+          relatedChannels = relatedChannels.filter(channel => {
+            if (!knownChannelIds.has(channel.id)) {
+              knownChannelIds.add(channel.id)
+              return true
+            }
+
+            return false
+          })
+
+          relatedChannels.forEach(channel => {
+            if (channel.thumbnailUrl.startsWith('//')) {
+              channel.thumbnailUrl = `https:${channel.thumbnailUrl}`
+            }
+          })
+        }
+
+        this.relatedChannels = relatedChannels
+
         this.channelInstance = channel
 
         if (channel.has_about) {
@@ -634,15 +637,6 @@ export default defineComponent({
         }
         const tabs = ['about']
 
-        // we'll count it as home page if it's not video. This will help us support some special channels
-        if ((channel.has_home === 'home' || channel.tabs[0] !== 'Videos')) {
-          if (!this.hideChannelHome) {
-            tabs.push('home')
-          }
-          // we still parse the home page so we can set related channels
-          this.getChannelHomeLocal()
-        }
-
         if (channel.has_videos || this.isArtistTopicChannel) {
           tabs.push('videos')
           this.getChannelVideosLocal()
@@ -672,6 +666,20 @@ export default defineComponent({
           if (channel.has_playlists) {
             tabs.push('playlists')
             this.getChannelPlaylistsLocal()
+          } else if (channelId === 'UC-9-kyTW8ZkZNDHQJ6FgpwQ') {
+            // Special handling for "The Music Channel" (https://youtube.com/music)
+            tabs.push('playlists')
+            const playlists = channel.playlists.map(playlist => parseLocalListPlaylist(playlist))
+
+            const compactStations = channel.memo.get('CompactStation')
+            if (compactStations) {
+              for (const compactStation of compactStations) {
+                playlists.push(parseLocalCompactStation(compactStation, channelId, channelName))
+              }
+            }
+
+            this.showPlaylistSortBy = false
+            this.latestPlaylists = playlists
           }
         }
 
@@ -707,7 +715,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-         */
+        */
         const channel = this.channelInstance
         const about = await channel.getAbout()
 
@@ -756,55 +764,6 @@ export default defineComponent({
       }
     },
 
-    getChannelHomeLocal: function () {
-      this.isElementListLoading = true
-      const expectedId = this.id
-
-      try {
-        /**
-         * @type {import('youtubei.js').YT.Channel}
-         */
-        const channel = this.channelInstance
-        const homeTab = channel //  await channel.getHome()
-
-        if (expectedId !== this.id) {
-          return
-        }
-
-        const homeData = parseChannelHomeTab(homeTab)
-        if (!this.hideChannelHome) {
-          this.homeData = homeData
-        }
-
-        // parse related channels from home page data
-        const relatedChannels = []
-        /** @type {Set<string>} */
-        const knownChannelIds = new Set()
-
-        for (const shelf of homeData) {
-          for (const item of shelf.content) {
-            if (item.type === 'channel' && !knownChannelIds.has(item.id)) {
-              knownChannelIds.add(item)
-              relatedChannels.push({
-                name: item.name,
-                id: item.id,
-                thumbnailUrl: item.thumbnail
-              })
-            }
-          }
-        }
-        this.relatedChannels = relatedChannels
-
-        this.isElementListLoading = false
-      } catch (err) {
-        console.error(err)
-        const errorMessage = this.$t('Local API Error (Click to copy)')
-        showToast(`${errorMessage}: ${err}`, 10000, () => {
-          copyToClipboard(err)
-        })
-      }
-    },
-
     getChannelVideosLocal: async function () {
       this.isElementListLoading = true
       const expectedId = this.id
@@ -828,7 +787,7 @@ export default defineComponent({
         } else {
           /**
            * @type {import('youtubei.js').YT.Channel}
-           */
+          */
           const channel = this.channelInstance
           let videosTab = await channel.getVideos()
 
@@ -978,7 +937,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-         */
+        */
         const channel = this.channelInstance
         let liveTab = await channel.getLiveStreams()
 
@@ -1054,7 +1013,7 @@ export default defineComponent({
       this.channelInstance = null
 
       const expectedId = this.id
-      return invidiousGetChannelInfo(this.id).then((response) => {
+      invidiousGetChannelInfo(this.id).then((response) => {
         if (expectedId !== this.id) {
           return
         }
@@ -1062,7 +1021,7 @@ export default defineComponent({
         const channelName = response.author
         const channelId = response.authorId
         this.channelName = channelName
-        this.setAppTitle(`${this.channelName} - ${packageDetails.productName}`)
+        document.title = `${this.channelName} - ${packageDetails.productName}`
         this.id = channelId
         this.isFamilyFriendly = response.isFamilyFriendly
         this.subCount = response.subCount
@@ -1101,7 +1060,7 @@ export default defineComponent({
         })
 
         this.channelTabs = this.supportedChannelTabs.filter(tab => {
-          return tabs.includes(tab) && tab !== 'home'
+          return tabs.includes(tab)
         })
 
         this.currentTab = this.currentOrFirstTab(this.$route.params.currentTab)
@@ -1152,18 +1111,32 @@ export default defineComponent({
     },
 
     channelInvidiousVideos: function (sortByChanged) {
+      const payload = {
+        resource: 'channels',
+        id: this.id,
+        subResource: 'videos',
+        params: {
+          sort_by: this.videoSortBy,
+        }
+      }
+
       if (sortByChanged) {
         this.videoContinuationData = null
       }
 
       let more = false
       if (this.videoContinuationData) {
+        payload.params.continuation = this.videoContinuationData
         more = true
-      } else {
+      }
+
+      if (!more) {
         this.isElementListLoading = true
       }
 
-      getInvidiousChannelVideos(this.id, this.videoSortBy, this.videoContinuationData).then((response) => {
+      invidiousAPICall(payload).then((response) => {
+        setPublishedTimestampsInvidious(response.videos)
+
         if (more) {
           this.latestVideos = this.latestVideos.concat(response.videos)
         } else {
@@ -1190,18 +1163,38 @@ export default defineComponent({
     },
 
     channelInvidiousShorts: function (sortByChanged) {
+      const payload = {
+        resource: 'channels',
+        id: this.id,
+        subResource: 'shorts',
+        params: {
+          sort_by: this.shortSortBy,
+        }
+      }
+
       if (sortByChanged) {
         this.shortContinuationData = null
       }
 
       let more = false
       if (this.shortContinuationData) {
+        payload.params.continuation = this.shortContinuationData
         more = true
-      } else {
+      }
+
+      if (!more) {
         this.isElementListLoading = true
       }
 
-      getInvidiousChannelShorts(this.id, this.shortSortBy, this.shortContinuationData).then((response) => {
+      invidiousAPICall(payload).then((response) => {
+        // workaround for Invidious sending incorrect information
+        // https://github.com/iv-org/invidious/issues/3801
+        response.videos.forEach(video => {
+          video.isUpcoming = false
+          delete video.published
+          delete video.premiereTimestamp
+        })
+
         if (more) {
           this.latestShorts.push(...response.videos)
         } else {
@@ -1230,18 +1223,32 @@ export default defineComponent({
     },
 
     channelInvidiousLive: function (sortByChanged) {
+      const payload = {
+        resource: 'channels',
+        id: this.id,
+        subResource: 'streams',
+        params: {
+          sort_by: this.liveSortBy,
+        }
+      }
+
       if (sortByChanged) {
         this.liveContinuationData = null
       }
 
       let more = false
       if (this.liveContinuationData) {
+        payload.params.continuation = this.liveContinuationData
         more = true
-      } else {
+      }
+
+      if (!more) {
         this.isElementListLoading = true
       }
 
-      getInvidiousChannelLive(this.id, this.liveSortBy, this.liveContinuationData).then((response) => {
+      invidiousAPICall(payload).then((response) => {
+        setPublishedTimestampsInvidious(response.videos)
+
         if (more) {
           this.latestLive.push(...response.videos)
         } else {
@@ -1346,8 +1353,16 @@ export default defineComponent({
 
     getPlaylistsInvidious: function () {
       this.isElementListLoading = true
+      const payload = {
+        resource: 'channels',
+        subResource: 'playlists',
+        id: this.id,
+        params: {
+          sort_by: this.playlistSortBy
+        }
+      }
 
-      getInvidiousChannelPlaylists(this.id, this.playlistSortBy).then((response) => {
+      invidiousAPICall(payload).then((response) => {
         this.playlistContinuationData = response.continuation || null
         this.latestPlaylists = response.playlists
         this.isElementListLoading = false
@@ -1375,7 +1390,20 @@ export default defineComponent({
         return
       }
 
-      getInvidiousChannelPlaylists(this.id, this.playlistSortBy, this.playlistContinuationData).then((response) => {
+      const payload = {
+        resource: 'channels',
+        subResource: 'playlists',
+        id: this.id,
+        params: {
+          sort_by: this.playlistSortBy
+        }
+      }
+
+      if (this.playlistContinuationData) {
+        payload.params.continuation = this.playlistContinuationData
+      }
+
+      invidiousAPICall(payload).then((response) => {
         this.playlistContinuationData = response.continuation || null
         this.latestPlaylists = this.latestPlaylists.concat(response.playlists)
         this.isElementListLoading = false
@@ -1401,7 +1429,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-         */
+        */
         const channel = this.channelInstance
 
         if (this.isArtistTopicChannel) {
@@ -1470,8 +1498,13 @@ export default defineComponent({
 
     channelInvidiousReleases: function() {
       this.isElementListLoading = true
+      const payload = {
+        resource: 'channels',
+        subResource: 'releases',
+        id: this.id,
+      }
 
-      getInvidiousChannelReleases(this.id).then((response) => {
+      invidiousAPICall(payload).then((response) => {
         this.releaseContinuationData = response.continuation || null
         this.latestReleases = response.playlists
         this.isElementListLoading = false
@@ -1495,11 +1528,17 @@ export default defineComponent({
 
     channelInvidiousReleasesMore: function () {
       if (this.releaseContinuationData === null) {
-        console.warn('There are no more releases available for this channel')
+        console.warn('There are no more podcasts available for this channel')
         return
       }
 
-      getInvidiousChannelReleases(this.id, this.releaseContinuationData).then((response) => {
+      const payload = {
+        resource: 'channels',
+        subResource: 'releases',
+        id: this.id
+      }
+
+      invidiousAPICall(payload).then((response) => {
         this.releaseContinuationData = response.continuation || null
         this.latestReleases = this.latestReleases.concat(response.playlists)
         this.isElementListLoading = false
@@ -1525,7 +1564,7 @@ export default defineComponent({
       try {
         /**
          * @type {import('youtubei.js').YT.Channel}
-         */
+        */
         const channel = this.channelInstance
         const podcastTab = await channel.getPodcasts()
 
@@ -1572,8 +1611,13 @@ export default defineComponent({
 
     channelInvidiousPodcasts: function() {
       this.isElementListLoading = true
+      const payload = {
+        resource: 'channels',
+        subResource: 'podcasts',
+        id: this.id,
+      }
 
-      getInvidiousChannelPodcasts(this.id).then((response) => {
+      invidiousAPICall(payload).then((response) => {
         this.podcastContinuationData = response.continuation || null
         this.latestPodcasts = response.playlists
         this.isElementListLoading = false
@@ -1601,7 +1645,13 @@ export default defineComponent({
         return
       }
 
-      getInvidiousChannelPodcasts(this.id, this.podcastContinuationData).then((response) => {
+      const payload = {
+        resource: 'channels',
+        subResource: 'podcasts',
+        id: this.id
+      }
+
+      invidiousAPICall(payload).then((response) => {
         this.podcastContinuationData = response.continuation || null
         this.latestPodcasts = this.latestPodcasts.concat(response.playlists)
         this.isElementListLoading = false
@@ -1650,6 +1700,9 @@ export default defineComponent({
         this.communityContinuationData = communityTab.has_continuation ? communityTab : null
 
         if (this.latestCommunityPosts.length > 0) {
+          this.latestCommunityPosts.forEach(post => {
+            post.authorId = this.id
+          })
           this.updateSubscriptionPostsCacheByChannel({
             channelId: this.id,
             // create a copy so that we only cache the first page
@@ -1711,6 +1764,9 @@ export default defineComponent({
         this.communityContinuationData = continuation
 
         if (this.isSubscribedInAnyProfile && !more && this.latestCommunityPosts.length > 0) {
+          this.latestCommunityPosts.forEach(post => {
+            post.authorId = this.id
+          })
           this.updateSubscriptionPostsCacheByChannel({
             channelId: this.id,
             // create a copy so that we only cache the first page
@@ -1825,14 +1881,13 @@ export default defineComponent({
       const newTabNode = document.getElementById(`${tab}Tab`)
       this.currentTab = tab
       newTabNode?.focus()
-      // Prevents outline shown in strange places
-      if (newTabNode != null) { this.showOutlines() }
+      this.showOutlines()
     },
 
     newSearch: function (query) {
       this.lastSearchQuery = query
       this.searchContinuationData = null
-      this.isSearchTabLoading = true
+      this.isElementListLoading = true
       this.searchPage = 1
       this.searchResults = []
       this.changeTab('search')
@@ -1845,10 +1900,6 @@ export default defineComponent({
           break
       }
     },
-    newSearchWithStatePersist(query) {
-      this.saveStateInRouter(query)
-      this.newSearch(query)
-    },
 
     searchChannelLocal: async function () {
       const isNewSearch = this.searchContinuationData === null
@@ -1887,7 +1938,7 @@ export default defineComponent({
         }
 
         this.searchContinuationData = result.has_continuation ? result : null
-        this.isSearchTabLoading = false
+        this.isElementListLoading = false
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -1906,13 +1957,24 @@ export default defineComponent({
     },
 
     searchChannelInvidious: function () {
-      searchInvidiousChannel(this.id, this.lastSearchQuery, this.searchPage).then((response) => {
+      const payload = {
+        resource: 'channels',
+        id: this.id,
+        subResource: 'search',
+        params: {
+          q: this.lastSearchQuery,
+          page: this.searchPage
+        }
+      }
+
+      invidiousAPICall(payload).then((response) => {
+        setPublishedTimestampsInvidious(response.filter(item => item.type === 'video'))
         if (this.hideChannelPlaylists) {
           this.searchResults = this.searchResults.concat(response.filter(item => item.type !== 'playlist'))
         } else {
           this.searchResults = this.searchResults.concat(response)
         }
-        this.isSearchTabLoading = false
+        this.isElementListLoading = false
         this.searchPage++
       }).catch((err) => {
         console.error(err)
@@ -1950,47 +2012,15 @@ export default defineComponent({
         })
       }
 
+      this.latestCommunityPosts.forEach(post => {
+        post.authorId = this.id
+      })
       this.updateSubscriptionPostsCacheByChannel({
         channelId: this.id,
         posts: [...this.latestCommunityPosts]
       })
     },
 
-    async saveStateInRouter(query) {
-      this.skipRouteChangeWatcherOnce = true
-      if (query === '') {
-        try {
-          await this.$router.replace({ path: `/channel/${this.id}` })
-        } catch (failure) {
-          if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-            return
-          }
-
-          throw failure
-        }
-        return
-      }
-
-      try {
-        await this.$router.replace({
-          path: `/channel/${this.id}`,
-          params: {
-            currentTab: 'search',
-          },
-          query: {
-            searchQueryText: query,
-          },
-        })
-      } catch (failure) {
-        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-          return
-        }
-
-        throw failure
-      }
-      this.skipRouteChangeWatcherOnce = false
-    },
-
     getIconForSortPreference: (s) => getIconForSortPreference(s),
 
     ...mapActions([
@@ -2000,10 +2030,6 @@ export default defineComponent({
       'updateSubscriptionLiveCacheByChannel',
       'updateSubscriptionShortsCacheWithChannelPageShorts',
       'updateSubscriptionPostsCacheByChannel'
-    ]),
-
-    ...mapMutations([
-      'setAppTitle'
     ])
   }
 })
diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index d8507169525dc..dc2099bf77b44 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -17,10 +17,9 @@
       :is-subscribed="isSubscribed"
       :visible-tabs="tabInfoValues"
       :current-tab="currentTab"
-      :query="lastSearchQuery"
       class="card channelDetails"
       @change-tab="changeTab"
-      @search="newSearchWithStatePersist"
+      @search="newSearch"
       @subscribed="handleSubscription"
     />
     <ft-card
@@ -81,19 +80,12 @@
         />
       </div>
       <ft-loader
-        v-if="isCurrentTabLoading"
+        v-if="isElementListLoading"
       />
       <div
         v-if="currentTab !== 'about' && !isElementListLoading"
         class="elementList"
       >
-        <ChannelHome
-          v-show="currentTab === 'home'"
-          id="homePanel"
-          :shelves="homeData"
-          role="tabpanel"
-          aria-labelledby="homeTab"
-        />
         <ft-element-list
           v-show="currentTab === 'videos'"
           id="videoPanel"
@@ -208,7 +200,7 @@
           :use-channels-hidden-preference="false"
         />
         <ft-flex-box
-          v-if="currentTab === 'search' && !isSearchTabLoading && searchResults.length === 0"
+          v-if="currentTab === 'search' && searchResults.length === 0"
         >
           <p class="message">
             {{ $t("Channel.Your search results have returned 0 results") }}
diff --git a/src/renderer/views/Hashtag/Hashtag.js b/src/renderer/views/Hashtag/Hashtag.js
new file mode 100644
index 0000000000000..27e65e4a28986
--- /dev/null
+++ b/src/renderer/views/Hashtag/Hashtag.js
@@ -0,0 +1,173 @@
+import { defineComponent } from 'vue'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtElementList from '../../components/FtElementList/FtElementList.vue'
+import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
+import packageDetails from '../../../../package.json'
+import { getHashtagLocal, parseLocalListVideo } from '../../helpers/api/local'
+import { copyToClipboard, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
+import { isNullOrEmpty } from '../../helpers/strings'
+import { getHashtagInvidious } from '../../helpers/api/invidious'
+
+export default defineComponent({
+  name: 'Hashtag',
+  components: {
+    'ft-card': FtCard,
+    'ft-element-list': FtElementList,
+    'ft-flex-box': FtFlexBox,
+    'ft-loader': FtLoader,
+    'ft-auto-load-next-page-wrapper': FtAutoLoadNextPageWrapper,
+  },
+  data: function() {
+    return {
+      hashtag: '',
+      hashtagContinuationData: null,
+      videos: [],
+      apiUsed: 'local',
+      pageNumber: 1,
+      isLoading: true
+    }
+  },
+  computed: {
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+
+    backendFallback: function () {
+      return this.$store.getters.getBackendFallback
+    },
+
+    showFetchMoreButton() {
+      return !isNullOrEmpty(this.hashtagContinuationData) || this.apiUsed === 'invidious'
+    },
+  },
+  watch: {
+    $route() {
+      this.resetData()
+      this.getHashtag()
+    }
+  },
+  mounted: function() {
+    this.resetData()
+    this.getHashtag()
+  },
+  methods: {
+    resetData: function() {
+      this.isLoading = true
+      this.hashtag = ''
+      this.hashtagContinuationData = null
+      this.videos = []
+      this.apiUsed = 'local'
+      this.pageNumber = 1
+    },
+
+    getHashtag: async function() {
+      const hashtag = decodeURIComponent(this.$route.params.hashtag)
+      if (this.backendFallback || this.backendPreference === 'local') {
+        await this.getLocalHashtag(hashtag)
+      } else {
+        await this.getInvidiousHashtag(hashtag)
+      }
+      document.title = `${this.hashtag} - ${packageDetails.productName}`
+    },
+
+    getInvidiousHashtag: async function(hashtag, page) {
+      try {
+        const videos = await getHashtagInvidious(hashtag, page)
+        setPublishedTimestampsInvidious(videos)
+        this.hashtag = '#' + hashtag
+        this.isLoading = false
+        this.apiUsed = 'invidious'
+        this.videos = this.videos.concat(videos)
+        this.pageNumber += 1
+      } catch (error) {
+        console.error(error)
+        const errorMessage = this.$t('Invidious API Error (Click to copy)')
+        showToast(`${errorMessage}: ${error}`, 10000, () => {
+          copyToClipboard(error)
+        })
+        if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
+          showToast(this.$t('Falling back to Local API'))
+          this.resetData()
+          this.getLocalHashtag(hashtag)
+        } else {
+          this.isLoading = false
+        }
+      }
+    },
+
+    getLocalHashtag: async function(hashtag) {
+      try {
+        const hashtagData = await getHashtagLocal(hashtag)
+
+        const header = hashtagData.header
+        if (header) {
+          switch (header.type) {
+            case 'HashtagHeader':
+              this.hashtag = header.hashtag.toString()
+              break
+            case 'PageHeader':
+              this.hashtag = header.content.title.text
+              break
+            default:
+              console.error(`Unknown hashtag header type: ${header.type}, falling back to query parameter.`)
+              this.hashtag = `#${hashtag}`
+          }
+        } else {
+          console.error(' Hashtag header missing, probably a layout change, falling back to query parameter.')
+          this.hashtag = `#${hashtag}`
+        }
+
+        this.videos = hashtagData.videos.map(parseLocalListVideo)
+        this.apiUsed = 'local'
+        this.hashtagContinuationData = hashtagData.has_continuation ? hashtagData : null
+        this.isLoading = false
+      } catch (error) {
+        console.error(error)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${error}`, 10000, () => {
+          copyToClipboard(error)
+        })
+        if (this.backendPreference === 'local' && this.backendFallback) {
+          showToast(this.$t('Falling back to Invidious API'))
+          this.resetData()
+          this.getInvidiousHashtag(hashtag)
+        } else {
+          this.isLoading = false
+        }
+      }
+    },
+
+    getLocalHashtagMore: async function() {
+      try {
+        const continuation = await this.hashtagContinuationData.getContinuation()
+        const newVideos = continuation.videos.map(parseLocalListVideo)
+        this.hashtagContinuationData = continuation.has_continuation ? continuation : null
+        this.videos = this.videos.concat(newVideos)
+      } catch (error) {
+        console.error(error)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${error}`, 10000, () => {
+          copyToClipboard(error)
+        })
+        if (this.backendPreference === 'local' && this.backendFallback) {
+          showToast(this.$t('Falling back to Invidious API'))
+          const hashtag = this.hashtag.substring(1)
+          this.resetData()
+          this.getLocalHashtag(hashtag)
+        } else {
+          this.isLoading = false
+        }
+      }
+    },
+
+    handleFetchMore: function() {
+      if (this.apiUsed === 'local') {
+        this.getLocalHashtagMore()
+      } else if (this.apiUsed === 'invidious') {
+        this.getInvidiousHashtag(this.hashtag.substring(1), this.pageNumber)
+      }
+    }
+  }
+})
diff --git a/src/renderer/views/Hashtag/Hashtag.vue b/src/renderer/views/Hashtag/Hashtag.vue
index af275fe5a6c73..4376320cc5ae2 100644
--- a/src/renderer/views/Hashtag/Hashtag.vue
+++ b/src/renderer/views/Hashtag/Hashtag.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
-    <FtLoader
+    <ft-loader
       v-if="isLoading"
       :fullscreen="true"
     />
-    <FtCard
+    <ft-card
       v-else
       class="card"
     >
       <h2>{{ hashtag }}</h2>
-      <FtElementList
+      <ft-element-list
         v-if="videos.length > 0"
         :data="videos"
       />
-      <FtFlexBox
+      <ft-flex-box
         v-else
       >
         <p
@@ -21,9 +21,9 @@
         >
           {{ $t("Hashtag.This hashtag does not currently have any videos") }}
         </p>
-      </FtFlexBox>
+      </ft-flex-box>
 
-      <FtAutoLoadNextPageWrapper
+      <ft-auto-load-next-page-wrapper
         v-if="showFetchMoreButton"
         @load-next-page="handleFetchMore"
       >
@@ -35,184 +35,11 @@
           @keydown.space.prevent="handleFetchMore"
           @keydown.enter.prevent="handleFetchMore"
         >
-          <FontAwesomeIcon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
+          <font-awesome-icon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
         </div>
-      </FtAutoLoadNextPageWrapper>
-    </FtCard>
+      </ft-auto-load-next-page-wrapper>
+    </ft-card>
   </div>
 </template>
-<script setup>
-import { computed, onMounted, ref, shallowRef, watch } from 'vue'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
-import store from '../../store/index'
-import { useRoute } from 'vue-router/composables'
-import packageDetails from '../../../../package.json'
-import { getHashtagLocal, parseLocalListVideo } from '../../helpers/api/local'
-import { copyToClipboard, showToast } from '../../helpers/utils'
-import { isNullOrEmpty } from '../../helpers/strings'
-import { getHashtagInvidious } from '../../helpers/api/invidious'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-const { t } = useI18n()
-
-const route = useRoute()
-
-const hashtag = ref('')
-const hashtagContinuationData = shallowRef(null)
-const videos = shallowRef([])
-/** @type {import('vue').Ref<'local' | 'invidious'>} */
-const apiUsed = ref('local')
-const pageNumber = ref(1)
-const isLoading = ref(true)
-
-/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
-const backendPreference = computed(() => {
-  return store.getters.getBackendPreference
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const backendFallback = computed(() => {
-  return store.getters.getBackendFallback
-})
-
-const showFetchMoreButton = computed(() => {
-  return !isNullOrEmpty(hashtagContinuationData.value) || apiUsed.value === 'invidious'
-})
-
-onMounted(() => {
-  getHashtag()
-})
-
-watch(() => route.params.hashtag, () => {
-  resetData()
-  getHashtag()
-})
-
-function resetData() {
-  isLoading.value = true
-  hashtag.value = ''
-  hashtagContinuationData.value = null
-  videos.value = []
-  apiUsed.value = 'local'
-  pageNumber.value = 1
-}
-
-async function getHashtag() {
-  const hashtagInRoute = decodeURIComponent(route.params.hashtag)
-  if (process.env.SUPPORTS_LOCAL_API && backendPreference.value === 'local') {
-    await getLocalHashtag(hashtagInRoute)
-  } else {
-    await getInvidiousHashtag(hashtagInRoute)
-  }
-  store.commit('setAppTitle', `${hashtag.value} - ${packageDetails.productName}`)
-}
-
-/**
- * @param {string} hashtagInRoute
- * @param {number} page
- */
-async function getInvidiousHashtag(hashtagInRoute, page) {
-  try {
-    const fetchedVideos = await getHashtagInvidious(hashtagInRoute, page)
-    hashtag.value = '#' + hashtagInRoute
-    isLoading.value = false
-    apiUsed.value = 'invidious'
-    videos.value = videos.value.concat(fetchedVideos)
-    pageNumber.value += 1
-  } catch (error) {
-    console.error(error)
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${error}`, 10000, () => {
-      copyToClipboard(error)
-    })
-    if (process.env.SUPPORTS_LOCAL_API && backendPreference.value === 'invidious' && backendFallback.value) {
-      showToast(t('Falling back to Local API'))
-      resetData()
-      getLocalHashtag(hashtag)
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
-/**
- * @param {string} hashtagInRoute
- */
-async function getLocalHashtag(hashtagInRoute) {
-  try {
-    const hashtagData = await getHashtagLocal(hashtagInRoute)
-
-    const header = hashtagData.header
-    if (header) {
-      switch (header.type) {
-        case 'HashtagHeader':
-          hashtag.value = header.hashtag.toString()
-          break
-        case 'PageHeader':
-          hashtag.value = header.content.title.text
-          break
-        default:
-          console.error(`Unknown hashtag header type: ${header.type}, falling back to query parameter.`)
-          hashtag.value = `#${hashtagInRoute}`
-      }
-    } else {
-      console.error(' Hashtag header missing, probably a layout change, falling back to query parameter.')
-      hashtag.value = `#${hashtagInRoute}`
-    }
-
-    videos.value = hashtagData.videos.map(parseLocalListVideo)
-    apiUsed.value = 'local'
-    hashtagContinuationData.value = hashtagData.has_continuation ? hashtagData : null
-    isLoading.value = false
-  } catch (error) {
-    console.error(error)
-    const errorMessage = t('Local API Error (Click to copy)')
-    showToast(`${errorMessage}: ${error}`, 10000, () => {
-      copyToClipboard(error)
-    })
-    if (backendPreference.value === 'local' && backendFallback.value) {
-      showToast(t('Falling back to Invidious API'))
-      resetData()
-      getInvidiousHashtag(hashtag)
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
-async function getLocalHashtagMore() {
-  try {
-    const continuation = await hashtagContinuationData.value.getContinuation()
-    const newVideos = continuation.videos.map(parseLocalListVideo)
-    hashtagContinuationData.value = continuation.has_continuation ? continuation : null
-    videos.value = videos.value.concat(newVideos)
-  } catch (error) {
-    console.error(error)
-    const errorMessage = t('Local API Error (Click to copy)')
-    showToast(`${errorMessage}: ${error}`, 10000, () => {
-      copyToClipboard(error)
-    })
-    if (backendPreference.value === 'local' && backendFallback.value) {
-      showToast(t('Falling back to Invidious API'))
-      const hashtagWithoutSymbol = hashtag.value.substring(1)
-      resetData()
-      getInvidiousHashtag(hashtagWithoutSymbol)
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
-function handleFetchMore() {
-  if (process.env.SUPPORTS_LOCAL_API && apiUsed.value === 'local') {
-    getLocalHashtagMore()
-  } else if (apiUsed.value === 'invidious') {
-    getInvidiousHashtag(hashtag.value.substring(1), pageNumber.value)
-  }
-}
-</script>
+<script src="./Hashtag.js" />
 <style scoped src="./Hashtag.css" />
diff --git a/src/renderer/views/History/History.js b/src/renderer/views/History/History.js
index 1613eb1998f15..9432541a141de 100644
--- a/src/renderer/views/History/History.js
+++ b/src/renderer/views/History/History.js
@@ -1,5 +1,4 @@
 import { defineComponent } from 'vue'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 import debounce from 'lodash.debounce'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
@@ -64,68 +63,42 @@ export default defineComponent({
     },
   },
   watch: {
+    query() {
+      this.searchDataLimit = 100
+      this.filterHistoryAsync()
+    },
     fullData() {
       this.filterHistory()
     },
     doCaseSensitiveSearch() {
       this.filterHistory()
-      this.saveStateInRouter()
     },
   },
-  created: function () {
+  mounted: function () {
     document.addEventListener('keydown', this.keyboardShortcutHandler)
+    const limit = sessionStorage.getItem('historyLimit')
 
-    const oldDataLimit = sessionStorage.getItem('History/dataLimit')
-    if (oldDataLimit !== null) {
-      this.dataLimit = oldDataLimit
+    if (limit !== null) {
+      this.dataLimit = limit
     }
 
-    this.filterHistoryDebounce = debounce(this.filterHistory, 500)
+    this.activeData = this.fullData
 
-    const oldQuery = this.$route.query.searchQueryText ?? ''
-    if (oldQuery !== null && oldQuery !== '') {
-      // `handleQueryChange` must be called after `filterHistoryDebounce` assigned
-      this.handleQueryChange(
-        oldQuery,
-        {
-          limit: this.$route.query.searchDataLimit,
-          doCaseSensitiveSearch: this.$route.query.doCaseSensitiveSearch === 'true',
-          filterNow: true,
-        },
-      )
-    } else {
-      // Only display unfiltered data when no query used last time
-      this.filterHistory()
-    }
+    this.showLoadMoreButton = this.activeData.length < this.historyCacheSorted.length
+
+    this.filterHistoryDebounce = debounce(this.filterHistory, 500)
   },
   beforeDestroy: function () {
     document.removeEventListener('keydown', this.keyboardShortcutHandler)
   },
   methods: {
-    handleQueryChange(query, { limit = null, doCaseSensitiveSearch = null, filterNow = false } = {}) {
-      this.query = query
-
-      const newLimit = limit ?? 100
-      this.searchDataLimit = newLimit
-      const newDoCaseSensitiveSearch = doCaseSensitiveSearch ?? this.doCaseSensitiveSearch
-      this.doCaseSensitiveSearch = newDoCaseSensitiveSearch
-
-      this.saveStateInRouter({
-        query: query,
-        searchDataLimit: newLimit,
-        doCaseSensitiveSearch: newDoCaseSensitiveSearch,
-      })
-
-      filterNow ? this.filterHistory() : this.filterHistoryAsync()
-    },
-
     increaseLimit: function () {
       if (this.query !== '') {
         this.searchDataLimit += 100
         this.filterHistory()
       } else {
         this.dataLimit += 100
-        sessionStorage.setItem('History/dataLimit', this.dataLimit)
+        sessionStorage.setItem('historyLimit', this.dataLimit)
       }
     },
     filterHistoryAsync: function() {
@@ -149,40 +122,6 @@ export default defineComponent({
       this.activeData = filteredQuery.length < this.searchDataLimit ? filteredQuery : filteredQuery.slice(0, this.searchDataLimit)
       this.showLoadMoreButton = this.activeData.length > this.searchDataLimit
     },
-
-    async saveStateInRouter({ query = this.query, searchDataLimit = this.searchDataLimit, doCaseSensitiveSearch = this.doCaseSensitiveSearch } = {}) {
-      if (query === '') {
-        try {
-          await this.$router.replace({ name: 'history' })
-        } catch (failure) {
-          if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-            return
-          }
-
-          throw failure
-        }
-        return
-      }
-
-      const routerQuery = {
-        searchQueryText: query,
-        searchDataLimit: searchDataLimit,
-      }
-      if (doCaseSensitiveSearch) { routerQuery.doCaseSensitiveSearch = 'true' }
-      try {
-        await this.$router.replace({
-          name: 'history',
-          query: routerQuery,
-        })
-      } catch (failure) {
-        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-          return
-        }
-
-        throw failure
-      }
-    },
-
     keyboardShortcutHandler: function (event) {
       ctrlFHandler(event, this.$refs.searchBar)
     },
diff --git a/src/renderer/views/History/History.vue b/src/renderer/views/History/History.vue
index 27d2949165142..5167a0ff67d5c 100644
--- a/src/renderer/views/History/History.vue
+++ b/src/renderer/views/History/History.vue
@@ -15,9 +15,8 @@
         :placeholder="$t('History.Search bar placeholder')"
         :show-clear-text-button="true"
         :show-action-button="false"
-        :value="query"
-        @input="(input) => handleQueryChange(input)"
-        @clear="() => handleQueryChange('')"
+        @input="(input) => query = input"
+        @clear="query = ''"
       />
       <div
         class="optionsRow"
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index de97d22d1724e..8121a626f09b6 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -18,14 +18,13 @@ import {
 import {
   extractNumberFromString,
   getIconForSortPreference,
+  setPublishedTimestampsInvidious,
   showToast,
-  deepCopy,
 } from '../../helpers/utils'
 import { invidiousGetPlaylistInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
-import { getSortedPlaylistItems, videoDurationPresent, videoDurationWithFallback, SORT_BY_VALUES } from '../../helpers/playlists'
+import { getSortedPlaylistItems, SORT_BY_VALUES } from '../../helpers/playlists'
 import packageDetails from '../../../../package.json'
 import { MOBILE_WIDTH_THRESHOLD, PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD } from '../../../constants'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 
 export default defineComponent({
   name: 'Playlist',
@@ -75,7 +74,6 @@ export default defineComponent({
       getPlaylistInfoDebounce: function() {},
       playlistInEditMode: false,
       forceListView: false,
-      alreadyShownNotice: false,
 
       videoSearchQuery: '',
 
@@ -182,13 +180,6 @@ export default defineComponent({
       return this.sortOrder === SORT_BY_VALUES.Custom
     },
     sortedPlaylistItems: function () {
-      if (
-        this.sortOrder === SORT_BY_VALUES.VideoDurationAscending ||
-        this.sortOrder === SORT_BY_VALUES.VideoDurationDescending
-      ) {
-        const playlistItems = this.getPlaylistItemsWithDuration()
-        return getSortedPlaylistItems(playlistItems, this.sortOrder, this.currentLocale)
-      }
       return getSortedPlaylistItems(this.playlistItems, this.sortOrder, this.currentLocale)
     },
     visiblePlaylistItems: function () {
@@ -223,10 +214,6 @@ export default defineComponent({
             return this.$t('Playlist.Sort By.AuthorAscending')
           case SORT_BY_VALUES.AuthorDescending:
             return this.$t('Playlist.Sort By.AuthorDescending')
-          case SORT_BY_VALUES.VideoDurationAscending:
-            return this.$t('Playlist.Sort By.VideoDurationAscending')
-          case SORT_BY_VALUES.VideoDurationDescending:
-            return this.$t('Playlist.Sort By.VideoDurationDescending')
           default:
             console.error(`Unknown sort: ${k}`)
             return k
@@ -270,7 +257,7 @@ export default defineComponent({
     this.getPlaylistInfoDebounce = debounce(this.getPlaylistInfo, 100)
 
     if (this.isUserPlaylistRequested && this.searchQueryTextPresent) {
-      this.handleVideoSearchQueryChange(this.searchQueryTextRequested)
+      this.videoSearchQuery = this.searchQueryTextRequested
     }
   },
   mounted: function () {
@@ -312,13 +299,10 @@ export default defineComponent({
         if (result.info.author) {
           channelName = result.info.author.name
         } else {
-          const subtitle = result.info.subtitle?.toString()
-          if (subtitle) {
-            const index = subtitle.lastIndexOf('•')
-            channelName = subtitle.substring(0, index).trim()
-          } else {
-            channelName = ''
-          }
+          const subtitle = result.info.subtitle.toString()
+
+          const index = subtitle.lastIndexOf('•')
+          channelName = subtitle.substring(0, index).trim()
         }
 
         const playlistItems = result.items.map(parseLocalPlaylistVideo)
@@ -387,6 +371,8 @@ export default defineComponent({
         const dateString = new Date(result.updated * 1000)
         this.lastUpdated = dateString.toLocaleDateString(this.currentLocale, { year: 'numeric', month: 'short', day: 'numeric' })
 
+        setPublishedTimestampsInvidious(result.videos)
+
         this.playlistItems = result.videos
 
         this.updatePageTitle()
@@ -430,40 +416,10 @@ export default defineComponent({
 
       this.isLoading = false
     },
-
     showUserPlaylistNotFound() {
       showToast(this.$t('User Playlists.SinglePlaylistView.Toast.This playlist does not exist'))
     },
 
-    getPlaylistItemsWithDuration() {
-      const modifiedPlaylistItems = deepCopy(this.playlistItems)
-      let anyVideoMissingDuration = false
-      modifiedPlaylistItems.forEach(video => {
-        if (videoDurationPresent(video)) { return }
-
-        const videoHistory = this.$store.getters.getHistoryCacheById[video.videoId]
-        if (typeof videoHistory !== 'undefined') {
-          const fetchedLengthSeconds = videoDurationWithFallback(videoHistory)
-          video.lengthSeconds = fetchedLengthSeconds
-          // if the video duration is 0, it will be the fallback value, so mark it as missing a duration
-          if (fetchedLengthSeconds === 0) { anyVideoMissingDuration = true }
-        } else {
-          // Mark at least one video have no duration, show notice later
-          // Also assign fallback duration here
-          anyVideoMissingDuration = true
-          video.lengthSeconds = 0
-        }
-      })
-
-      // Show notice if not already shown before returning playlist items
-      if (anyVideoMissingDuration && !this.alreadyShownNotice) {
-        showToast(this.$t('User Playlists.SinglePlaylistView.Toast.This playlist has a video with a duration error'), 5000)
-        this.alreadyShownNotice = true
-      }
-
-      return modifiedPlaylistItems
-    },
-
     getNextPage: function () {
       switch (this.infoSource) {
         case 'local':
@@ -603,41 +559,13 @@ export default defineComponent({
         playlistTitle,
         channelName,
       ].filter(v => v).join(' | ')
-      this.setAppTitle(`${titleText} - ${packageDetails.productName}`)
+      document.title = `${titleText} - ${packageDetails.productName}`
     },
 
     handleResize: function () {
       this.forceListView = window.innerWidth <= MOBILE_WIDTH_THRESHOLD || window.innerHeight <= PLAYLIST_HEIGHT_FORCE_LIST_THRESHOLD
     },
 
-    handleVideoSearchQueryChange(val) {
-      this.videoSearchQuery = val
-
-      this.saveStateInRouter(val)
-    },
-
-    async saveStateInRouter(query) {
-      const routeQuery = {
-        playlistType: this.$route.query.playlistType,
-      }
-      if (query !== '') {
-        routeQuery.searchQueryText = query
-      }
-
-      try {
-        await this.$router.replace({
-          path: `/playlist/${this.playlistId}`,
-          query: routeQuery,
-        })
-      } catch (failure) {
-        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-          return
-        }
-
-        throw failure
-      }
-    },
-
     getIconForSortPreference: (s) => getIconForSortPreference(s),
 
     ...mapActions([
@@ -648,7 +576,6 @@ export default defineComponent({
     ]),
 
     ...mapMutations([
-      'setAppTitle',
       'setCachedPlaylist'
     ])
   }
diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
index d3639f266486e..68a734065b748 100644
--- a/src/renderer/views/Playlist/Playlist.vue
+++ b/src/renderer/views/Playlist/Playlist.vue
@@ -37,7 +37,7 @@
         class="playlistInfo"
         @enter-edit-mode="playlistInEditMode = true"
         @exit-edit-mode="playlistInEditMode = false"
-        @search-video-query-change="(v) => handleVideoSearchQueryChange(v)"
+        @search-video-query-change="(v) => videoSearchQuery = v"
         @prompt-open="promptOpen = true"
         @prompt-close="promptOpen = false"
       />
diff --git a/src/renderer/views/Popular/Popular.js b/src/renderer/views/Popular/Popular.js
new file mode 100644
index 0000000000000..2a35f9d8cb68d
--- /dev/null
+++ b/src/renderer/views/Popular/Popular.js
@@ -0,0 +1,108 @@
+import { defineComponent } from 'vue'
+import { mapMutations } from 'vuex'
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtElementList from '../../components/FtElementList/FtElementList.vue'
+import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
+import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
+
+import { invidiousAPICall } from '../../helpers/api/invidious'
+import { copyToClipboard, getRelativeTimeFromDate, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
+
+export default defineComponent({
+  name: 'Popular',
+  components: {
+    'ft-loader': FtLoader,
+    'ft-card': FtCard,
+    'ft-element-list': FtElementList,
+    'ft-icon-button': FtIconButton,
+    'ft-refresh-widget': FtRefreshWidget,
+  },
+  data: function () {
+    return {
+      isLoading: false,
+      shownResults: []
+    }
+  },
+  computed: {
+    lastPopularRefreshTimestamp: function () {
+      return getRelativeTimeFromDate(this.$store.getters.getLastPopularRefreshTimestamp, true)
+    },
+    popularCache: function () {
+      return this.$store.getters.getPopularCache
+    }
+  },
+  mounted: function () {
+    document.addEventListener('keydown', this.keyboardShortcutHandler)
+
+    this.shownResults = this.popularCache || []
+    if (!this.shownResults || this.shownResults.length < 1) {
+      this.fetchPopularInfo()
+    }
+  },
+  beforeDestroy: function () {
+    document.removeEventListener('keydown', this.keyboardShortcutHandler)
+  },
+  methods: {
+    fetchPopularInfo: async function () {
+      const searchPayload = {
+        resource: 'popular',
+        id: '',
+        params: {}
+      }
+
+      this.isLoading = true
+      const result = await invidiousAPICall(searchPayload)
+        .catch((err) => {
+          const errorMessage = this.$t('Invidious API Error (Click to copy)')
+          showToast(`${errorMessage}: ${err}`, 10000, () => {
+            copyToClipboard(err)
+          })
+          return undefined
+        })
+
+      if (!result) {
+        this.isLoading = false
+        return
+      }
+
+      const items = result.filter((item) => {
+        return item.type === 'video' || item.type === 'shortVideo' || item.type === 'channel' || item.type === 'playlist'
+      })
+      setPublishedTimestampsInvidious(items.filter(item => item.type === 'video' || item.type === 'shortVideo'))
+      this.setLastPopularRefreshTimestamp(new Date())
+
+      this.shownResults = items
+
+      this.isLoading = false
+      this.$store.commit('setPopularCache', items)
+    },
+
+    /**
+     * This function `keyboardShortcutHandler` should always be at the bottom of this file
+     * @param {KeyboardEvent} event the keyboard event
+     */
+    keyboardShortcutHandler: function (event) {
+      if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
+        return
+      }
+      // Avoid handling events due to user holding a key (not released)
+      // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
+      if (event.repeat) { return }
+
+      switch (event.key) {
+        case 'r':
+        case 'R':
+        case 'F5':
+          if (!this.isLoading) {
+            this.fetchPopularInfo()
+          }
+          break
+      }
+    },
+
+    ...mapMutations([
+      'setLastPopularRefreshTimestamp'
+    ])
+  }
+})
diff --git a/src/renderer/views/Popular/Popular.vue b/src/renderer/views/Popular/Popular.vue
index 491a5a99e7c86..c3f001f3415b8 100644
--- a/src/renderer/views/Popular/Popular.vue
+++ b/src/renderer/views/Popular/Popular.vue
@@ -22,87 +22,5 @@
   </div>
 </template>
 
-<script setup>
-
-import { computed, onBeforeUnmount, onMounted, ref, shallowRef } from 'vue'
-
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
-import store from '../../store/index'
-
-import { getInvidiousPopularFeed } from '../../helpers/api/invidious'
-import { copyToClipboard, getRelativeTimeFromDate, showToast } from '../../helpers/utils'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-import { KeyboardShortcuts } from '../../../constants'
-
-const { t } = useI18n()
-
-const isLoading = ref(false)
-
-const lastPopularRefreshTimestamp = computed(() => {
-  return getRelativeTimeFromDate(store.getters.getLastPopularRefreshTimestamp, true)
-})
-
-/** @type {import('vue').ComputedRef<Array | null>} */
-const popularCache = computed(() => {
-  return store.getters.getPopularCache
-})
-
-const shownResults = shallowRef(popularCache.value || [])
-
-onMounted(() => {
-  document.addEventListener('keydown', keyboardShortcutHandler)
-
-  if (shownResults.value.length === 0) {
-    fetchPopularInfo()
-  }
-})
-
-onBeforeUnmount(() => {
-  document.removeEventListener('keydown', keyboardShortcutHandler)
-})
-
-async function fetchPopularInfo() {
-  isLoading.value = true
-
-  try {
-    const items = await getInvidiousPopularFeed()
-
-    store.commit('setLastPopularRefreshTimestamp', new Date())
-    shownResults.value = items
-    isLoading.value = false
-    store.commit('setPopularCache', items)
-  } catch (err) {
-    isLoading.value = false
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${err}`, 10000, () => {
-      copyToClipboard(err)
-    })
-  }
-}
-
-/**
- * @param {KeyboardEvent} event the keyboard event
- */
-function keyboardShortcutHandler(event) {
-  if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
-    return
-  }
-  // Avoid handling events due to user holding a key (not released)
-  // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
-  if (event.repeat) { return }
-
-  switch (event.key.toLowerCase()) {
-    case 'f5':
-    case KeyboardShortcuts.APP.SITUATIONAL.REFRESH:
-      if (!isLoading.value) {
-        fetchPopularInfo()
-      }
-      break
-  }
-}
-
-</script>
+<script src="./Popular.js" />
 <style scoped src="./Popular.css" />
diff --git a/src/renderer/views/Post.vue b/src/renderer/views/Post.vue
deleted file mode 100644
index 1a53b4411809e..0000000000000
--- a/src/renderer/views/Post.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div>
-    <div v-if="!isInvidiousAllowed">
-      {{ $t('Channel.Community.Viewing Posts Only Supported By Invidious') }}
-    </div>
-    <FtLoader v-else-if="isLoading" />
-    <template
-      v-else
-    >
-      <FtCard>
-        <FtCommunityPost
-          :data="post"
-          :single-post="true"
-          appearance="result"
-        />
-      </FtCard>
-      <CommentSection
-        :id="post.postId"
-        :channel-name="post.author"
-        :post-author-id="authorId"
-        :video-player-ready="false"
-        :force-state="null"
-        :is-post-comments="true"
-        :channel-thumbnail="post.authorThumbnails[0].url"
-        :show-sort-by="false"
-      />
-    </template>
-  </div>
-</template>
-
-<script setup>
-import { computed, onMounted, ref, shallowRef, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router/composables'
-import packageDetails from '../../../package.json'
-
-import FtCard from '../components/ft-card/ft-card.vue'
-import FtCommunityPost from '../components/FtCommunityPost/FtCommunityPost.vue'
-import FtLoader from '../components/ft-loader/ft-loader.vue'
-import CommentSection from '../components/CommentSection/CommentSection.vue'
-
-import store from '../store/index'
-
-import { getInvidiousCommunityPost } from '../helpers/api/invidious'
-
-const router = useRouter()
-const route = useRoute()
-
-const id = ref('')
-const authorId = ref('')
-const post = shallowRef(null)
-const isLoading = ref(true)
-
-/** @type {import('vue').ComputedRef<'invidious' | 'local'>} */
-const backendPreference = computed(() => {
-  return store.getters.getBackendPreference
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const backendFallback = computed(() => {
-  return store.getters.getBackendFallback
-})
-
-const isInvidiousAllowed = computed(() => {
-  return backendPreference.value === 'invidious' || backendFallback.value
-})
-
-onMounted(async () => {
-  if (isInvidiousAllowed.value) {
-    id.value = route.params.id
-    authorId.value = route.query.authorId
-    await loadDataInvidiousAsync()
-  }
-})
-
-async function loadDataInvidiousAsync() {
-  post.value = await getInvidiousCommunityPost(id.value, authorId.value)
-  authorId.value = post.value.authorId
-
-  store.commit('setAppTitle', `${post.value.author} - ${packageDetails.productName}`)
-  isLoading.value = false
-
-  // If the authorId is missing from the URL we should add it,
-  // that way if the user comes back to this page by pressing the back button
-  // we don't have to resolve the authorId again
-  if (authorId.value !== route.query.authorId) {
-    router.replace({
-      path: `/post/${id.value}`,
-      query: {
-        authorId: authorId.value
-      }
-    })
-  }
-}
-
-watch(() => route.params.id, async () => {
-  // react to route changes...
-  isLoading.value = true
-  if (isInvidiousAllowed.value) {
-    id.value = route.params.id
-    authorId.value = route.query.authorId
-    await loadDataInvidiousAsync()
-  }
-})
-</script>
diff --git a/src/renderer/views/Post/Post.js b/src/renderer/views/Post/Post.js
new file mode 100644
index 0000000000000..d13bb906bbf95
--- /dev/null
+++ b/src/renderer/views/Post/Post.js
@@ -0,0 +1,62 @@
+import { defineComponent } from 'vue'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtCommunityPost from '../../components/ft-community-post/ft-community-post.vue'
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import WatchVideoComments from '../../components/watch-video-comments/watch-video-comments.vue'
+
+import { getInvidiousCommunityPost } from '../../helpers/api/invidious'
+
+export default defineComponent({
+  name: 'Post',
+  components: {
+    FtCard,
+    FtCommunityPost,
+    FtLoader,
+    WatchVideoComments
+  },
+  data: function () {
+    return {
+      id: '',
+      authorId: '',
+      post: null,
+      comments: null,
+      isLoading: true,
+    }
+  },
+  computed: {
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+    backendFallback: function () {
+      return this.$store.getters.getBackendFallback
+    },
+    isInvidiousAllowed: function() {
+      return this.backendPreference === 'invidious' || this.backendFallback
+    }
+  },
+  watch: {
+    async $route() {
+      // react to route changes...
+      this.isLoading = true
+      if (this.isInvidiousAllowed) {
+        this.id = this.$route.params.id
+        this.authorId = this.$route.query.authorId
+        await this.loadDataInvidiousAsync()
+      }
+    }
+  },
+  mounted: async function () {
+    if (this.isInvidiousAllowed) {
+      this.id = this.$route.params.id
+      this.authorId = this.$route.query.authorId
+      await this.loadDataInvidiousAsync()
+    }
+  },
+  methods: {
+    loadDataInvidiousAsync: async function() {
+      this.post = await getInvidiousCommunityPost(this.id, this.authorId)
+      this.authorId = this.post.authorId
+      this.isLoading = false
+    }
+  }
+})
diff --git a/src/renderer/views/Post/Post.vue b/src/renderer/views/Post/Post.vue
new file mode 100644
index 0000000000000..22b316ebaeaa7
--- /dev/null
+++ b/src/renderer/views/Post/Post.vue
@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <div v-if="!isInvidiousAllowed">
+      {{ $t('Channel.Community.Viewing Posts Only Supported By Invidious') }}
+    </div>
+    <FtLoader v-else-if="isLoading" />
+    <template
+      v-else
+    >
+      <FtCard>
+        <FtCommunityPost
+          :data="post"
+          :single-post="true"
+          appearance="result"
+        />
+      </FtCard>
+      <WatchVideoComments
+        :id="post.postId"
+        :channel-name="post.author"
+        :post-author-id="authorId"
+        :video-player-ready="false"
+        :force-state="null"
+        :is-post-comments="true"
+        :channel-thumbnail="post.authorThumbnails[0].url"
+        :show-sort-by="false"
+      />
+    </template>
+  </div>
+</template>
+
+<script src="./Post.js" />
diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 1ba41d14a3332..0e06460b22a40 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -1,5 +1,4 @@
 import { defineComponent } from 'vue'
-import { mapMutations } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/FtElementList/FtElementList.vue'
@@ -7,11 +6,11 @@ import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-w
 import {
   copyToClipboard,
   searchFiltersMatch,
+  setPublishedTimestampsInvidious,
   showToast,
 } from '../../helpers/utils'
 import { getLocalSearchContinuation, getLocalSearchResults } from '../../helpers/api/local'
-import { getInvidiousSearchResults } from '../../helpers/api/invidious'
-import packageDetails from '../../../../package.json'
+import { invidiousAPICall } from '../../helpers/api/invidious'
 import { SEARCH_CHAR_LIMIT } from '../../../constants'
 
 export default defineComponent({
@@ -77,13 +76,11 @@ export default defineComponent({
 
       this.query = query
 
-      this.setAppTitle(`${this.query} - ${packageDetails.productName}`)
       this.checkSearchCache(payload)
     }
   },
   mounted: function () {
     this.query = this.$route.params.query
-    this.setAppTitle(`${this.query} - ${packageDetails.productName}`)
 
     let features = this.$route.query.features
     // if page gets refreshed and there's only one feature then it will be a string
@@ -160,8 +157,6 @@ export default defineComponent({
         }
 
         this.$store.commit('addToSessionSearchHistory', historyPayload)
-
-        this.updateSubscriptionDetails(results)
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -199,8 +194,6 @@ export default defineComponent({
         }
 
         this.$store.commit('addToSessionSearchHistory', historyPayload)
-
-        this.updateSubscriptionDetails(results)
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -224,17 +217,37 @@ export default defineComponent({
         this.isLoading = true
       }
 
-      getInvidiousSearchResults(payload.query, this.searchPage, payload.searchSettings).then((results) => {
-        if (!results) {
+      const searchPayload = {
+        resource: 'search',
+        id: '',
+        params: {
+          q: payload.query,
+          page: this.searchPage,
+          sort_by: payload.searchSettings.sortBy,
+          date: payload.searchSettings.time,
+          duration: payload.searchSettings.duration,
+          type: payload.searchSettings.type,
+          features: payload.searchSettings.features.join(',')
+        }
+      }
+
+      invidiousAPICall(searchPayload).then((result) => {
+        if (!result) {
           return
         }
 
         this.apiUsed = 'invidious'
 
+        const returnData = result.filter((item) => {
+          return item.type === 'video' || item.type === 'channel' || item.type === 'playlist' || item.type === 'hashtag'
+        })
+
+        setPublishedTimestampsInvidious(returnData.filter(item => item.type === 'video'))
+
         if (this.searchPage !== 1) {
-          this.shownResults = this.shownResults.concat(results)
+          this.shownResults = this.shownResults.concat(returnData)
         } else {
-          this.shownResults = results
+          this.shownResults = returnData
         }
 
         this.isLoading = false
@@ -250,8 +263,6 @@ export default defineComponent({
         }
 
         this.$store.commit('addToSessionSearchHistory', historyPayload)
-
-        this.updateSubscriptionDetails(results)
       }).catch((err) => {
         console.error(err)
         const errorMessage = this.$t('Invidious API Error (Click to copy)')
@@ -307,46 +318,6 @@ export default defineComponent({
 
       // This is kept in case there is some race condition
       this.isLoading = false
-    },
-
-    /**
-     * @param {any[]} results
-     */
-    updateSubscriptionDetails: function (results) {
-      /** @type {Set<string>} */
-      const subscribedChannelIds = this.$store.getters.getSubscribedChannelIdSet
-
-      const channels = []
-
-      for (const result of results) {
-        if (result.type !== 'channel' || !subscribedChannelIds.has(result.id ?? result.authorId)) {
-          continue
-        }
-
-        if (result.dataSource === 'local') {
-          channels.push({
-            channelId: result.id,
-            channelName: result.name,
-            channelThumbnailUrl: result.thumbnail.replace(/^\/\//, 'https://')
-          })
-        } else {
-          channels.push({
-            channelId: result.authorId,
-            channelName: result.author,
-            channelThumbnailUrl: result.authorThumbnails[0].url.replace(/^\/\//, 'https://')
-          })
-        }
-      }
-
-      if (channels.length === 1) {
-        this.$store.dispatch('updateSubscriptionDetails', channels[0])
-      } else if (channels.length > 1) {
-        this.$store.dispatch('batchUpdateSubscriptionDetails', channels)
-      }
-    },
-
-    ...mapMutations([
-      'setAppTitle',
-    ]),
+    }
   }
 })
diff --git a/src/renderer/views/Settings/Settings.css b/src/renderer/views/Settings/Settings.css
index 52eeea4b52a10..a796ede907471 100644
--- a/src/renderer/views/Settings/Settings.css
+++ b/src/renderer/views/Settings/Settings.css
@@ -1,74 +1,24 @@
-.settingsPage {
-  display: flex;
-  gap: 20px;
+hr {
+  inline-size: 85%;
+  margin-block: 0;
+  margin-inline: auto;
+  border: 0;
+  border-block-start: 2px solid var(--scrollbar-color-hover);
 }
 
-.settingsSections {
-  overflow-x: hidden;
-  max-inline-size: 90%;
+@media only screen and (width <= 800px) {
+  hr {
+    inline-size: 100%;
+  }
 }
 
 .switchRow {
+  inline-size: 85%;
+  margin-inline: auto;
   display: flex;
-  margin-inline-end: auto;
 }
 
 .settingsToggle {
   padding-block: 0;
-  margin-block: 0;
-}
-
-.section {
-  /* enables anchor link clicks to land with the section title in the top quarter of the page */
-  scroll-margin-top: 24vh;
-}
-
-@media only screen and (width >= 1015px) {
-  .section + .section {
-    padding-block-start: 20px;
-  }
-
-  .settingsSections:last-child {
-    /* Add enough blank space to have the last setting section be active on the FtSettingsMenu when scrolled to */
-    margin-block-end: calc(76vh - 150px);
-  }
-}
-
-@media only screen and (width <= 1200px) {
-  .settingsSections {
-    max-inline-size: 100%;
-  }
-}
-
-@media only screen and (width <= 1015px) {
-  /* Needed to overcome routerView styling for margin-block */
-  .settingsPage.settingsPage {
-    margin-block: 0;
-    flex-direction: column;
-    gap: 10px;
-  }
-
-  .switchRow,
-  .settingsSections {
-    margin-inline: auto;
-  }
-
-  .switchRow {
-    display: none;
-  }
-
-  .settingsSections {
-    overflow-y: hidden;
-    margin-block-end: 80px;
-  }
-
-  .hideOnMobile {
-    display: none;
-  }
-
-  .returnToMenuMobileIcon {
-    margin-block-start: 20px;
-    block-size: 30px;
-    font-size: 30px;
-  }
+  margin-block: 10px 5px;
 }
diff --git a/src/renderer/views/Settings/Settings.js b/src/renderer/views/Settings/Settings.js
index 5d3d4c92f5c8c..722e37bba22dc 100644
--- a/src/renderer/views/Settings/Settings.js
+++ b/src/renderer/views/Settings/Settings.js
@@ -1,7 +1,7 @@
-import { defineComponent, nextTick } from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import GeneralSettings from '../../components/general-settings/general-settings.vue'
-import ThemeSettings from '../../components/ThemeSettings.vue'
+import ThemeSettings from '../../components/theme-settings/theme-settings.vue'
 import PlayerSettings from '../../components/player-settings/player-settings.vue'
 import ExternalPlayerSettings from '../../components/external-player-settings/external-player-settings.vue'
 import SubscriptionSettings from '../../components/subscription-settings/subscription-settings.vue'
@@ -11,15 +11,11 @@ import DataSettings from '../../components/data-settings/data-settings.vue'
 import DistractionSettings from '../../components/distraction-settings/distraction-settings.vue'
 import ProxySettings from '../../components/proxy-settings/proxy-settings.vue'
 import SponsorBlockSettings from '../../components/sponsor-block-settings/sponsor-block-settings.vue'
-import ParentalControlSettings from '../../components/ParentalControlSettings.vue'
-import ExperimentalSettings from '../../components/ExperimentalSettings/ExperimentalSettings.vue'
-import PasswordSettings from '../../components/PasswordSettings/PasswordSettings.vue'
-import PasswordDialog from '../../components/PasswordDialog/PasswordDialog.vue'
+import ParentControlSettings from '../../components/parental-control-settings/parental-control-settings.vue'
+import ExperimentalSettings from '../../components/experimental-settings/experimental-settings.vue'
+import PasswordSettings from '../../components/password-settings/password-settings.vue'
+import PasswordDialog from '../../components/password-dialog/password-dialog.vue'
 import FtToggleSwitch from '../../components/ft-toggle-switch/ft-toggle-switch.vue'
-import FtSettingsMenu from '../../components/FtSettingsMenu/FtSettingsMenu.vue'
-
-const ACTIVE_CLASS_NAME = 'active'
-const SETTINGS_MOBILE_WIDTH_THRESHOLD = 1015
 
 export default defineComponent({
   name: 'Settings',
@@ -32,11 +28,11 @@ export default defineComponent({
     'data-settings': DataSettings,
     'distraction-settings': DistractionSettings,
     'sponsor-block-settings': SponsorBlockSettings,
-    'parental-control-settings': ParentalControlSettings,
+    'parental-control-settings': ParentControlSettings,
     'password-settings': PasswordSettings,
     'password-dialog': PasswordDialog,
     'ft-toggle-switch': FtToggleSwitch,
-    'ft-settings-menu': FtSettingsMenu,
+
     ...(process.env.IS_ELECTRON
       ? {
           'proxy-settings': ProxySettings,
@@ -48,120 +44,104 @@ export default defineComponent({
   },
   data: function () {
     return {
-      isInDesktopView: true,
-      settingsSectionTypeOpenInMobile: null,
-      unlocked: false
-    }
-  },
-  computed: {
-    locale: function() {
-      return this.$i18n.locale
-    },
-
-    settingsPassword: function () {
-      return this.$store.getters.getSettingsPassword
-    },
-
-    settingsSectionSortEnabled: function () {
-      return this.$store.getters.getSettingsSectionSortEnabled
-    },
-
-    settingsComponentsData: function () {
-      const settingsComponentsData = [
+      unlocked: false,
+      settingsComponentsData: [
+        {
+          type: 'general-settings',
+          title: this.$t('Settings.General Settings.General Settings')
+        },
         {
           type: 'theme-settings',
-          title: this.$t('Settings.Theme Settings.Theme Settings'),
-          icon: 'display'
+          title: this.$t('Settings.Theme Settings.Theme Settings')
         },
         {
           type: 'player-settings',
-          title: this.$t('Settings.Player Settings.Player Settings'),
-          icon: 'circle-play'
+          title: this.$t('Settings.Player Settings.Player Settings')
         },
         ...(process.env.IS_ELECTRON
-          ? [{
-              type: 'external-player-settings',
-              title: this.$t('Settings.External Player Settings.External Player Settings'),
-              icon: 'clapperboard'
-            }]
+          ? [
+              {
+                type: 'external-player-settings',
+                title: this.$t('Settings.External Player Settings.External Player Settings')
+              }
+            ]
           : []),
         {
           type: 'subscription-settings',
-          title: this.$t('Settings.Subscription Settings.Subscription Settings'),
-          icon: 'play'
+          title: this.$t('Settings.Subscription Settings.Subscription Settings')
         },
         {
           type: 'distraction-settings',
-          title: this.$t('Settings.Distraction Free Settings.Distraction Free Settings'),
-          icon: 'eye-slash'
+          title: this.$t('Settings.Distraction Free Settings.Distraction Free Settings')
         },
         {
           type: 'privacy-settings',
-          title: this.$t('Settings.Privacy Settings.Privacy Settings'),
-          icon: 'lock'
+          title: this.$t('Settings.Privacy Settings.Privacy Settings')
         },
         {
           type: 'data-settings',
-          title: this.$t('Settings.Data Settings.Data Settings'),
-          icon: 'database'
+          title: this.$t('Settings.Data Settings.Data Settings')
         },
         ...(process.env.IS_ELECTRON
           ? [
               {
                 type: 'proxy-settings',
-                title: this.$t('Settings.Proxy Settings.Proxy Settings'),
-                icon: 'network-wired',
+                title: this.$t('Settings.Proxy Settings.Proxy Settings')
               },
               {
                 type: 'download-settings',
-                title: this.$t('Settings.Download Settings.Download Settings'),
-                icon: 'download',
+                title: this.$t('Settings.Download Settings.Download Settings')
               }
             ]
           : []),
         {
           type: 'parental-control-settings',
-          title: this.$t('Settings.Parental Control Settings.Parental Control Settings'),
-          icon: 'user-lock'
+          title: this.$t('Settings.Parental Control Settings.Parental Control Settings')
         },
         {
           type: 'sponsor-block-settings',
           title: this.$t('Settings.SponsorBlock Settings.SponsorBlock Settings'),
-          // TODO: replace with SponsorBlock icon
-          icon: 'shield'
         },
         ...(process.env.IS_ELECTRON
-          ? [{
-              type: 'experimental-settings',
-              title: this.$t('Settings.Experimental Settings.Experimental Settings'),
-              icon: 'flask'
-            }]
+          ? [
+              {
+                type: 'experimental-settings',
+                title: this.$t('Settings.Experimental Settings.Experimental Settings')
+              },
+            ]
           : []),
         {
           type: 'password-settings',
-          title: this.$t('Settings.Password Settings.Password Settings'),
-          icon: 'key'
+          title: this.$t('Settings.Password Settings.Password Settings')
         },
       ]
-      return settingsComponentsData
+    }
+  },
+  computed: {
+    locale: function() {
+      return this.$i18n.locale
+    },
+
+    settingsPassword: function () {
+      return this.$store.getters.getSettingsPassword
+    },
+
+    allSettingsSectionsExpandedByDefault: function () {
+      return this.$store.getters.getAllSettingsSectionsExpandedByDefault
+    },
+
+    settingsSectionSortEnabled: function () {
+      return this.$store.getters.getSettingsSectionSortEnabled
     },
 
     settingsSectionComponents: function () {
-      let settingsSections = this.settingsComponentsData
       if (this.settingsSectionSortEnabled) {
-        settingsSections = settingsSections.toSorted((a, b) => {
-          return a.title.toLowerCase().localeCompare(b.title.toLowerCase(), this.locale)
-        })
-      }
-
-      // ensure General Settings is placed first regardless of sorting
-      const generalSettingsEntry = {
-        type: 'general-settings',
-        title: this.$t('Settings.General Settings.General Settings'),
-        icon: 'border-all'
+        return this.settingsComponentsData.toSorted((a, b) =>
+          a.title.toLowerCase().localeCompare(b.title.toLowerCase(), this.locale)
+        )
       }
 
-      return [generalSettingsEntry, ...settingsSections]
+      return this.settingsComponentsData
     },
   },
   created: function () {
@@ -169,98 +149,9 @@ export default defineComponent({
       this.unlocked = true
     }
   },
-  mounted: function () {
-    if (this.unlocked) {
-      this.handleMounted()
-    }
-  },
-  beforeDestroy: function () {
-    document.removeEventListener('scroll', this.markScrolledToSectionAsActive)
-    window.removeEventListener('resize', this.handleResize)
-  },
   methods: {
-    handleMounted: function () {
-      this.handleResize()
-      window.addEventListener('resize', this.handleResize)
-      document.addEventListener('scroll', this.markScrolledToSectionAsActive)
-
-      // mark first section as active before any scrolling has taken place
-      if (this.settingsSectionComponents.length > 0) {
-        const firstSection = document.getElementById(this.settingsSectionComponents[0].type)
-        firstSection.classList.add(ACTIVE_CLASS_NAME)
-      }
-    },
-
-    handleUnlock: function () {
-      this.unlocked = true
-
-      nextTick(() => {
-        this.handleMounted()
-      })
-    },
-
-    navigateToSection: function(sectionType) {
-      if (this.isInDesktopView) {
-        nextTick(() => {
-          const sectionElement = this.$refs[sectionType][0].$el
-          sectionElement.scrollIntoView()
-
-          const sectionHeading = sectionElement.firstChild.firstChild
-          sectionHeading.tabIndex = 0
-          sectionHeading.focus()
-          sectionHeading.tabIndex = -1
-        })
-      } else {
-        this.settingsSectionTypeOpenInMobile = sectionType
-      }
-    },
-
-    returnToSettingsMenu: function () {
-      const openSection = this.settingsSectionTypeOpenInMobile
-      this.settingsSectionTypeOpenInMobile = null
-
-      // focus the corresponding Settings Menu title
-      nextTick(() => document.getElementById(openSection)?.focus())
-    },
-
-    /* Set the current section to be shown as active in the Settings Menu
-    * if it is the lowest section within the top quarter of the viewport (25vh) */
-    markScrolledToSectionAsActive: function() {
-      const scrollY = window.scrollY + innerHeight / 4
-      this.settingsSectionComponents.forEach((section) => {
-        const sectionElement = this.$refs[section.type][0].$el
-        const sectionHeight = sectionElement.offsetHeight
-        const sectionTop = sectionElement.offsetTop
-        const correspondingMenuLink = document.getElementById(section.type)
-
-        if (this.isInDesktopView && scrollY > sectionTop && scrollY <= sectionTop + sectionHeight) {
-          correspondingMenuLink.classList.add(ACTIVE_CLASS_NAME)
-        } else {
-          correspondingMenuLink.classList.remove(ACTIVE_CLASS_NAME)
-        }
-      })
-    },
-
-    handleResize: function () {
-      const wasNotInDesktopView = !this.isInDesktopView
-      this.isInDesktopView = window.innerWidth > SETTINGS_MOBILE_WIDTH_THRESHOLD
-
-      // navigate to section that was open in mobile or desktop view, if any
-      if (this.isInDesktopView && wasNotInDesktopView && this.settingsSectionTypeOpenInMobile != null) {
-        this.navigateToSection(this.settingsSectionTypeOpenInMobile)
-        this.settingsSectionTypeOpenInMobile = null
-      } else if (!this.isInDesktopView && !wasNotInDesktopView) {
-        const activeMenuLink = document.querySelector(`.settingsMenu .title.${ACTIVE_CLASS_NAME}`)
-        if (!activeMenuLink) {
-          return
-        }
-
-        const sectionType = activeMenuLink.id
-        this.navigateToSection(sectionType)
-      }
-    },
-
     ...mapActions([
+      'updateAllSettingsSectionsExpandedByDefault',
       'updateSettingsSectionSortEnabled'
     ])
   }
diff --git a/src/renderer/views/Settings/Settings.vue b/src/renderer/views/Settings/Settings.vue
index 8829059645c00..fd4931d038293 100644
--- a/src/renderer/views/Settings/Settings.vue
+++ b/src/renderer/views/Settings/Settings.vue
@@ -1,53 +1,38 @@
 <template>
-  <div class="settingsPage">
+  <div>
     <template v-if="unlocked">
-      <div v-show="settingsSectionTypeOpenInMobile != null">
-        <font-awesome-icon
-          :icon="['fas', 'angle-left']"
-          class="returnToMenuMobileIcon"
-          role="button"
-          :title="$t('Settings.Return to Settings Menu')"
-          tabindex="0"
-          @click="returnToSettingsMenu"
-          @keydown.space.enter="returnToSettingsMenu"
+      <div class="switchRow">
+        <ft-toggle-switch
+          class="settingsToggle"
+          :label="$t('Settings.Expand All Settings Sections')"
+          :default-value="allSettingsSectionsExpandedByDefault"
+          :compact="false"
+          @change="updateAllSettingsSectionsExpandedByDefault"
+        />
+        <ft-toggle-switch
+          class="settingsToggle"
+          :label="$t('Settings.Sort Settings Sections (A-Z)')"
+          :default-value="settingsSectionSortEnabled"
+          :compact="false"
+          @change="updateSettingsSectionSortEnabled"
         />
       </div>
-      <ft-settings-menu
-        v-show="isInDesktopView || settingsSectionTypeOpenInMobile == null"
-        :settings-sections="settingsSectionComponents"
-        @navigate-to-section="navigateToSection"
-      />
-      <div
-        v-show="isInDesktopView || settingsSectionTypeOpenInMobile != null"
-        class="settingsContent"
+      <template
+        v-for="(settingsComponent, i) in settingsSectionComponents"
       >
-        <div class="switchRow">
-          <ft-toggle-switch
-            class="settingsToggle"
-            :label="$t('Settings.Sort Settings Sections (A-Z)')"
-            :default-value="settingsSectionSortEnabled"
-            :compact="false"
-            @change="updateSettingsSectionSortEnabled"
-          />
-        </div>
-        <div class="settingsSections">
-          <template
-            v-for="(settingsComponent) in settingsSectionComponents"
-          >
-            <component
-              :is="settingsComponent.type"
-              :ref="settingsComponent.type"
-              :key="settingsComponent.type"
-              :class="{ hideOnMobile: settingsSectionTypeOpenInMobile !== settingsComponent.type }"
-              class="section"
-            />
-          </template>
-        </div>
-      </div>
+        <hr
+          v-if="i !== 0"
+          :key="settingsComponent.type + 'hr'"
+        >
+        <component
+          :is="settingsComponent.type"
+          :key="settingsComponent.type + 'component'"
+        />
+      </template>
     </template>
     <password-dialog
       v-else
-      @unlocked="handleUnlock"
+      @unlocked="unlocked = true"
     />
   </div>
 </template>
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.js b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
new file mode 100644
index 0000000000000..b4410831dd8cf
--- /dev/null
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
@@ -0,0 +1,172 @@
+import { defineComponent } from 'vue'
+import { mapActions } from 'vuex'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
+import FtInput from '../../components/ft-input/ft-input.vue'
+import FtSubscribeButton from '../../components/ft-subscribe-button/ft-subscribe-button.vue'
+import { invidiousGetChannelInfo, youtubeImageUrlToInvidious, invidiousImageUrlToInvidious } from '../../helpers/api/invidious'
+import { getLocalChannel, parseLocalChannelHeader } from '../../helpers/api/local'
+import { ctrlFHandler } from '../../helpers/utils'
+
+export default defineComponent({
+  name: 'SubscribedChannels',
+  components: {
+    'ft-card': FtCard,
+    'ft-flex-box': FtFlexBox,
+    'ft-input': FtInput,
+    'ft-subscribe-button': FtSubscribeButton
+  },
+  data: function () {
+    return {
+      query: '',
+      subscribedChannels: [],
+      filteredChannels: [],
+      re: {
+        url: /(.+=\w)\d+(.+)/,
+        ivToYt: /^.+ggpht\/(.+)/
+      },
+      thumbnailSize: 176,
+      ytBaseURL: 'https://yt3.ggpht.com',
+      errorCount: 0,
+    }
+  },
+  computed: {
+    activeProfile: function () {
+      return this.$store.getters.getActiveProfile
+    },
+
+    activeProfileId: function () {
+      return this.activeProfile._id
+    },
+
+    activeSubscriptionList: function () {
+      return this.activeProfile.subscriptions
+    },
+
+    channelList: function () {
+      if (this.query !== '') {
+        return this.filteredChannels
+      } else {
+        return this.subscribedChannels
+      }
+    },
+
+    hideUnsubscribeButton: function() {
+      return this.$store.getters.getHideUnsubscribeButton
+    },
+
+    locale: function () {
+      return this.$i18n.locale
+    },
+
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+
+    currentInvidiousInstanceUrl: function () {
+      return this.$store.getters.getCurrentInvidiousInstanceUrl
+    }
+  },
+  watch: {
+    activeProfileId: function() {
+      this.query = ''
+      this.getSubscription()
+    },
+
+    activeSubscriptionList: function() {
+      this.getSubscription()
+      this.filterChannels()
+    }
+  },
+  mounted: function () {
+    document.addEventListener('keydown', this.keyboardShortcutHandler)
+    this.getSubscription()
+  },
+  beforeDestroy: function () {
+    document.removeEventListener('keydown', this.keyboardShortcutHandler)
+  },
+  methods: {
+    getSubscription: function () {
+      this.subscribedChannels = this.activeSubscriptionList.slice().sort((a, b) => {
+        return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), this.locale)
+      })
+    },
+
+    handleInput: function(input) {
+      this.query = input
+      this.filterChannels()
+    },
+
+    filterChannels: function () {
+      if (this.query === '') {
+        this.filteredChannels = []
+        return
+      }
+
+      const escapedQuery = this.query.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&')
+      const re = new RegExp(escapedQuery, 'i')
+      this.filteredChannels = this.subscribedChannels.filter(channel => {
+        return re.test(channel.name)
+      })
+    },
+
+    thumbnailURL: function(originalURL) {
+      if (originalURL == null) { return null }
+      let newURL = originalURL
+      // Sometimes relative protocol URLs are passed in
+      if (originalURL.startsWith('//')) {
+        newURL = `https:${originalURL}`
+      }
+      const hostname = new URL(newURL).hostname
+      if (hostname === 'yt3.ggpht.com' || hostname === 'yt3.googleusercontent.com') {
+        if (this.backendPreference === 'invidious') { // YT to IV
+          newURL = youtubeImageUrlToInvidious(newURL, this.currentInvidiousInstanceUrl)
+        }
+      } else {
+        if (this.backendPreference === 'local') { // IV to YT
+          newURL = newURL.replace(this.re.ivToYt, `${this.ytBaseURL}/$1`)
+        } else { // IV to IV
+          newURL = invidiousImageUrlToInvidious(newURL, this.currentInvidiousInstanceUrl)
+        }
+      }
+
+      return newURL.replace(this.re.url, `$1${this.thumbnailSize}$2`)
+    },
+
+    updateThumbnail: function(channel) {
+      this.errorCount += 1
+      if (this.backendPreference === 'local') {
+        // avoid too many concurrent requests
+        setTimeout(() => {
+          getLocalChannel(channel.id).then(response => {
+            if (!response.alert) {
+              this.updateSubscriptionDetails({
+                channelThumbnailUrl: this.thumbnailURL(parseLocalChannelHeader(response).thumbnailUrl),
+                channelName: channel.name,
+                channelId: channel.id
+              })
+            }
+          })
+        }, this.errorCount * 500)
+      } else {
+        setTimeout(() => {
+          invidiousGetChannelInfo(channel.id).then(response => {
+            this.updateSubscriptionDetails({
+              channelThumbnailUrl: this.thumbnailURL(response.authorThumbnails[0].url),
+              channelName: channel.name,
+              channelId: channel.id
+            })
+          })
+        }, this.errorCount * 500)
+      }
+    },
+
+    keyboardShortcutHandler: function (event) {
+      ctrlFHandler(event, this.$refs.searchBarChannels)
+    },
+
+    ...mapActions([
+      'updateSubscriptionDetails'
+    ])
+  }
+})
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
index 742eb469e86ab..034c414091508 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
@@ -6,13 +6,12 @@
         v-show="subscribedChannels.length > 0"
         ref="searchBarChannels"
         :placeholder="$t('Channels.Search bar placeholder')"
-        :value="query"
         :show-clear-text-button="true"
         :show-action-button="false"
         :spellcheck="false"
         :maxlength="255"
-        @input="(input) => handleQueryChange(input)"
-        @clear="() => handleQueryChange('')"
+        @input="handleInput"
+        @clear="query = ''"
       />
       <ft-flex-box
         v-if="activeSubscriptionList.length === 0"
@@ -74,215 +73,5 @@
   </div>
 </template>
 
-<script setup>
-import { computed, onMounted, onBeforeUnmount, ref, watch } from 'vue'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
-import { useRoute, useRouter } from 'vue-router/composables'
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
-import FtInput from '../../components/ft-input/ft-input.vue'
-import FtSubscribeButton from '../../components/ft-subscribe-button/ft-subscribe-button.vue'
-import { invidiousGetChannelInfo, youtubeImageUrlToInvidious, invidiousImageUrlToInvidious } from '../../helpers/api/invidious'
-import { getLocalChannel, parseLocalChannelHeader } from '../../helpers/api/local'
-import { ctrlFHandler } from '../../helpers/utils'
-import { useI18n } from '../../composables/use-i18n-polyfill.js'
-import store from '../../store/index'
-import debounce from 'lodash.debounce'
-
-const route = useRoute()
-const router = useRouter()
-const { locale } = useI18n()
-
-const re = {
-  url: /(.+=\w)\d+(.+)/,
-  ivToYt: /^.+ggpht\/(.+)/
-}
-const ytBaseURL = 'https://yt3.ggpht.com'
-const thumbnailSize = 176
-let errorCount = 0
-
-const query = ref('')
-const subscribedChannels = ref([])
-const filteredChannels = ref([])
-
-/** @type {import('vue').Ref<HTMLInputElement | null>} */
-const searchBarChannels = ref(null)
-
-/** @type {import('vue').ComputedRef<object>} */
-const activeProfile = computed(() => {
-  return store.getters.getActiveProfile
-})
-
-/** @type {import('vue').ComputedRef<string>} */
-const activeProfileId = computed(() => {
-  return activeProfile.value._id
-})
-
-/** @type {import('vue').ComputedRef<Array>} */
-const activeSubscriptionList = computed(() => {
-  return activeProfile.value.subscriptions
-})
-
-/** @type {import('vue').ComputedRef<Array>} */
-const channelList = computed(() => {
-  if (query.value !== '') {
-    return filteredChannels.value
-  } else {
-    return subscribedChannels.value
-  }
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideUnsubscribeButton = computed(() => {
-  return store.getters.getHideUnsubscribeButton
-})
-
-/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
-const backendPreference = computed(() => {
-  return store.getters.getBackendPreference
-})
-
-/** @type {import('vue').ComputedRef<string>} */
-const currentInvidiousInstanceUrl = computed(() => {
-  return store.getters.getCurrentInvidiousInstanceUrl
-})
-
-function getSubscription() {
-  subscribedChannels.value = activeSubscriptionList.value.slice().sort((a, b) => {
-    return a.name?.toLowerCase().localeCompare(b.name?.toLowerCase(), locale.value)
-  })
-}
-
-function filterChannels() {
-  if (query.value === '') {
-    filteredChannels.value = []
-    return
-  }
-
-  const escapedQuery = query.value.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&')
-  const re = new RegExp(escapedQuery, 'i')
-  filteredChannels.value = subscribedChannels.value.filter(channel => {
-    return re.test(channel.name)
-  })
-}
-
-const filterChannelsDebounce = debounce(filterChannels, 500)
-
-function thumbnailURL(originalURL) {
-  if (originalURL == null) { return null }
-  let newURL = originalURL
-  // Sometimes relative protocol URLs are passed in
-  if (originalURL.startsWith('//')) {
-    newURL = `https:${originalURL}`
-  }
-  const hostname = new URL(newURL).hostname
-  if (hostname === 'yt3.ggpht.com' || hostname === 'yt3.googleusercontent.com') {
-    if (backendPreference.value === 'invidious') { // YT to IV
-      newURL = youtubeImageUrlToInvidious(newURL, currentInvidiousInstanceUrl.value)
-    }
-  } else {
-    if (backendPreference.value === 'local') { // IV to YT
-      newURL = newURL.replace(re.ivToYt, `${ytBaseURL}/$1`)
-    } else { // IV to IV
-      newURL = invidiousImageUrlToInvidious(newURL, currentInvidiousInstanceUrl.value)
-    }
-  }
-
-  return newURL.replace(re.url, `$1${thumbnailSize}$2`)
-}
-
-function updateThumbnail(channel) {
-  errorCount += 1
-  if (backendPreference.value === 'local') {
-    // avoid too many concurrent requests
-    setTimeout(() => {
-      getLocalChannel(channel.id).then(response => {
-        if (!response.alert) {
-          store.dispatch('updateSubscriptionDetails', {
-            channelThumbnailUrl: thumbnailURL(parseLocalChannelHeader(response).thumbnailUrl),
-            channelName: channel.name,
-            channelId: channel.id
-          })
-        }
-      })
-    }, errorCount * 500)
-  } else {
-    setTimeout(() => {
-      invidiousGetChannelInfo(channel.id).then(response => {
-        store.dispatch('updateSubscriptionDetails', {
-          channelThumbnailUrl: thumbnailURL(response.authorThumbnails[0].url),
-          channelName: channel.name,
-          channelId: channel.id
-        })
-      })
-    }, errorCount * 500)
-  }
-}
-
-function handleQueryChange(val, filterNow = false) {
-  query.value = val
-
-  saveStateInRouter(val)
-
-  filterNow ? filterChannels() : filterChannelsDebounce()
-}
-
-async function saveStateInRouter(query) {
-  if (query.value === '') {
-    await router.replace({ name: 'subscribedChannels' }).catch(failure => {
-      if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-        return
-      }
-
-      throw failure
-    })
-    return
-  }
-
-  await router.replace({
-    name: 'subscribedChannels',
-    query: { searchQueryText: query },
-  }).catch(failure => {
-    if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-      return
-    }
-
-    throw failure
-  })
-}
-
-function keyboardShortcutHandler(event) {
-  ctrlFHandler(event, searchBarChannels.value)
-}
-
-watch(activeProfileId, () => {
-  query.value = ''
-  getSubscription()
-})
-
-watch(activeSubscriptionList, () => {
-  getSubscription()
-  filterChannels()
-})
-
-// region created
-
-getSubscription()
-
-const oldQuery = route.query.searchQueryText ?? ''
-if (oldQuery !== null && oldQuery !== '') {
-  // `handleQueryChange` must be called after `filterHistoryDebounce` assigned
-  handleQueryChange(oldQuery, true)
-}
-
-// endregion created
-
-onMounted(() => {
-  document.addEventListener('keydown', keyboardShortcutHandler)
-})
-
-onBeforeUnmount(() => {
-  document.removeEventListener('keydown', keyboardShortcutHandler)
-})
-</script>
+<script src="./SubscribedChannels.js" />
 <style scoped src="./SubscribedChannels.css" />
diff --git a/src/renderer/views/Subscriptions/Subscriptions.js b/src/renderer/views/Subscriptions/Subscriptions.js
index 7cd6e5895f3cf..c36ff32cda7a5 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.js
+++ b/src/renderer/views/Subscriptions/Subscriptions.js
@@ -96,11 +96,7 @@ export default defineComponent({
     } else {
       // Restore currentTab
       const lastCurrentTabId = sessionStorage.getItem('Subscriptions/currentTab')
-      if (lastCurrentTabId !== null) {
-        this.changeTab(lastCurrentTabId)
-      } else if (!this.visibleTabs.includes(this.currentTab)) {
-        this.currentTab = this.visibleTabs[0]
-      }
+      if (lastCurrentTabId !== null) { this.changeTab(lastCurrentTabId) }
     }
   },
   methods: {
diff --git a/src/renderer/views/Trending/Trending.css b/src/renderer/views/Trending/Trending.css
index e9a00bd010f69..59e6387b80040 100644
--- a/src/renderer/views/Trending/Trending.css
+++ b/src/renderer/views/Trending/Trending.css
@@ -22,7 +22,7 @@
 .tab {
   text-align: center;
   padding: 15px;
-  font-size: 1.1em;
+  font-size: 15px;
   cursor: pointer;
   align-self: flex-end;
 }
@@ -30,7 +30,3 @@
 .tab:hover {
   font-weight: bold;
 }
-
-.trendingIcon {
-  color: var(--primary-color);
-}
diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
new file mode 100644
index 0000000000000..533f9cf8b56e5
--- /dev/null
+++ b/src/renderer/views/Trending/Trending.js
@@ -0,0 +1,211 @@
+import { defineComponent, nextTick } from 'vue'
+import { mapActions, mapMutations } from 'vuex'
+import FtCard from '../../components/ft-card/ft-card.vue'
+import FtLoader from '../../components/ft-loader/ft-loader.vue'
+import FtElementList from '../../components/FtElementList/FtElementList.vue'
+import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
+import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
+import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
+
+import { copyToClipboard, getRelativeTimeFromDate, setPublishedTimestampsInvidious, showToast } from '../../helpers/utils'
+import { getLocalTrending } from '../../helpers/api/local'
+import { invidiousAPICall } from '../../helpers/api/invidious'
+
+export default defineComponent({
+  name: 'Trending',
+  components: {
+    'ft-card': FtCard,
+    'ft-loader': FtLoader,
+    'ft-element-list': FtElementList,
+    'ft-icon-button': FtIconButton,
+    'ft-flex-box': FtFlexBox,
+    'ft-refresh-widget': FtRefreshWidget,
+  },
+  data: function () {
+    return {
+      isLoading: false,
+      shownResults: [],
+      currentTab: 'default',
+      trendingInstance: null
+    }
+  },
+  computed: {
+    backendPreference: function () {
+      return this.$store.getters.getBackendPreference
+    },
+    backendFallback: function () {
+      return this.$store.getters.getBackendFallback
+    },
+    lastTrendingRefreshTimestamp: function () {
+      return getRelativeTimeFromDate(this.$store.getters.getLastTrendingRefreshTimestamp, true)
+    },
+    region: function () {
+      return this.$store.getters.getRegion.toUpperCase()
+    },
+    trendingCache () {
+      return this.$store.getters.getTrendingCache
+    }
+  },
+  mounted: function () {
+    document.addEventListener('keydown', this.keyboardShortcutHandler)
+
+    if (this.trendingCache[this.currentTab] && this.trendingCache[this.currentTab].length > 0) {
+      this.getTrendingInfoCache()
+    } else {
+      this.getTrendingInfo()
+    }
+  },
+  beforeDestroy: function () {
+    document.removeEventListener('keydown', this.keyboardShortcutHandler)
+  },
+  methods: {
+    changeTab: function (tab) {
+      if (tab === this.currentTab) {
+        return
+      }
+
+      this.currentTab = tab
+      if (this.trendingCache[this.currentTab] && this.trendingCache[this.currentTab].length > 0) {
+        this.getTrendingInfoCache()
+      } else {
+        this.getTrendingInfo()
+      }
+    },
+
+    /**
+     * @param {KeyboardEvent} event
+     * @param {string} tab
+     */
+    focusTab: function (event, tab) {
+      if (!event.altKey) {
+        event.preventDefault()
+        this.$refs[tab].focus()
+        this.showOutlines()
+      }
+    },
+
+    getTrendingInfo: function (refresh = false) {
+      if (refresh) {
+        this.trendingInstance = null
+        this.$store.commit('clearTrendingCache')
+      }
+
+      if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
+        this.getTrendingInfoInvidious()
+      } else {
+        this.getTrendingInfoLocal()
+      }
+
+      this.setLastTrendingRefreshTimestamp(new Date())
+    },
+
+    getTrendingInfoLocal: async function () {
+      this.isLoading = true
+
+      try {
+        const { results, instance } = await getLocalTrending(this.region, this.currentTab, this.trendingInstance)
+
+        this.shownResults = results
+        this.isLoading = false
+        this.trendingInstance = instance
+
+        this.$store.commit('setTrendingCache', { value: results, page: this.currentTab })
+        nextTick(() => {
+          this.$refs[this.currentTab]?.focus()
+        })
+      } catch (err) {
+        console.error(err)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
+        })
+        if (this.backendPreference === 'local' && this.backendFallback) {
+          showToast(this.$t('Falling back to Invidious API'))
+          this.getTrendingInfoInvidious()
+        } else {
+          this.isLoading = false
+        }
+      }
+    },
+
+    getTrendingInfoCache: function () {
+      this.shownResults = this.trendingCache[this.currentTab]
+    },
+    getTrendingInfoInvidious: function () {
+      this.isLoading = true
+
+      const trendingPayload = {
+        resource: 'trending',
+        id: '',
+        params: { region: this.region }
+      }
+
+      if (this.currentTab !== 'default') {
+        trendingPayload.params.type = this.currentTab.charAt(0).toUpperCase() + this.currentTab.slice(1)
+      }
+
+      invidiousAPICall(trendingPayload).then((result) => {
+        if (!result) {
+          return
+        }
+
+        const returnData = result.filter((item) => {
+          return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
+        })
+
+        setPublishedTimestampsInvidious(returnData.filter(item => item.type === 'video'))
+
+        this.shownResults = returnData
+        this.isLoading = false
+        this.$store.commit('setTrendingCache', { value: returnData, page: this.currentTab })
+        nextTick(() => {
+          this.$refs[this.currentTab]?.focus()
+        })
+      }).catch((err) => {
+        console.error(err)
+        const errorMessage = this.$t('Invidious API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
+        })
+
+        if (process.env.SUPPORTS_LOCAL_API && (this.backendPreference === 'invidious' && this.backendFallback)) {
+          showToast(this.$t('Falling back to Local API'))
+          this.getTrendingInfoLocal()
+        } else {
+          this.isLoading = false
+        }
+      })
+    },
+
+    /**
+     * This function `keyboardShortcutHandler` should always be at the bottom of this file
+     * @param {KeyboardEvent} event the keyboard event
+     */
+    keyboardShortcutHandler: function (event) {
+      if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
+        return
+      }
+      // Avoid handling events due to user holding a key (not released)
+      // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
+      if (event.repeat) { return }
+
+      switch (event.key) {
+        case 'r':
+        case 'R':
+        case 'F5':
+          if (!this.isLoading) {
+            this.getTrendingInfo(true)
+          }
+          break
+      }
+    },
+
+    ...mapActions([
+      'showOutlines'
+    ]),
+
+    ...mapMutations([
+      'setLastTrendingRefreshTimestamp'
+    ])
+  }
+})
diff --git a/src/renderer/views/Trending/Trending.vue b/src/renderer/views/Trending/Trending.vue
index f8f91c7ed52eb..5e03565500e18 100644
--- a/src/renderer/views/Trending/Trending.vue
+++ b/src/renderer/views/Trending/Trending.vue
@@ -1,29 +1,22 @@
 <template>
   <div>
-    <FtLoader
+    <ft-loader
       v-if="isLoading"
       :fullscreen="true"
     />
-    <FtCard
+    <ft-card
       v-else
       class="card"
     >
-      <h2>
-        <FontAwesomeIcon
-          :icon="['fas', 'fire']"
-          class="trendingIcon"
-          fixed-width
-        />
-        {{ $t("Trending.Trending") }}
-      </h2>
-      <FtFlexBox
+      <h2>{{ $t("Trending.Trending") }}</h2>
+      <ft-flex-box
         class="trendingInfoTabs"
         role="tablist"
         :aria-label="$t('Trending.Trending Tabs')"
       >
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="defaultTab"
+          ref="default"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'default')"
@@ -32,19 +25,14 @@
           :class="{ selectedTab: currentTab === 'default' }"
           @click="changeTab('default')"
           @keydown.space.enter.prevent="changeTab('default')"
-          @keydown.left="focusTab('movies', $event)"
-          @keydown.right="focusTab('music', $event)"
+          @keydown.left="focusTab($event, 'movies')"
+          @keydown.right="focusTab($event, 'music')"
         >
-          <FontAwesomeIcon
-            :icon="['fas', 'fire']"
-            class="trendingIcon"
-            fixed-width
-          />
           {{ $t("Trending.Default").toUpperCase() }}
         </div>
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="musicTab"
+          ref="music"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'music')"
@@ -53,19 +41,14 @@
           :class="{ selectedTab: currentTab === 'music' }"
           @click="changeTab('music')"
           @keydown.space.enter.prevent="changeTab('music')"
-          @keydown.left="focusTab('default', $event)"
-          @keydown.right="focusTab('gaming', $event)"
+          @keydown.left="focusTab($event, 'default')"
+          @keydown.right="focusTab($event, 'gaming')"
         >
-          <FontAwesomeIcon
-            :icon="['fas', 'music']"
-            class="trendingIcon"
-            fixed-width
-          />
           {{ $t("Trending.Music").toUpperCase() }}
         </div>
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="gamingTab"
+          ref="gaming"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'gaming')"
@@ -74,19 +57,14 @@
           :class="{ selectedTab: currentTab === 'gaming' }"
           @click="changeTab('gaming')"
           @keydown.space.enter.prevent="changeTab('gaming')"
-          @keydown.left="focusTab('music', $event)"
-          @keydown.right="focusTab('movies', $event)"
+          @keydown.left="focusTab($event, 'music')"
+          @keydown.right="focusTab($event, 'movies')"
         >
-          <FontAwesomeIcon
-            :icon="['fas', 'gamepad']"
-            class="trendingIcon"
-            fixed-width
-          />
           {{ $t("Trending.Gaming").toUpperCase() }}
         </div>
         <!-- eslint-disable-next-line vuejs-accessibility/interactive-supports-focus -->
         <div
-          ref="moviesTab"
+          ref="movies"
           class="tab"
           role="tab"
           :aria-selected="String(currentTab === 'movies')"
@@ -95,24 +73,19 @@
           :class="{ selectedTab: currentTab === 'movies' }"
           @click="changeTab('movies')"
           @keydown.space.enter.prevent="changeTab('movies')"
-          @keydown.left="focusTab('gaming', $event)"
-          @keydown.right="focusTab('default', $event)"
+          @keydown.left="focusTab($event, 'gaming')"
+          @keydown.right="focusTab($event, 'default')"
         >
-          <FontAwesomeIcon
-            :icon="['fas', 'film']"
-            class="trendingIcon"
-            fixed-width
-          />
           {{ $t("Trending.Movies").toUpperCase() }}
         </div>
-      </FtFlexBox>
-      <FtElementList
+      </ft-flex-box>
+      <ft-element-list
         id="trendingPanel"
         role="tabpanel"
         :data="shownResults"
       />
-    </FtCard>
-    <FtRefreshWidget
+    </ft-card>
+    <ft-refresh-widget
       :disable-refresh="isLoading"
       :last-refresh-timestamp="lastTrendingRefreshTimestamp"
       :title="$t('Trending.Trending')"
@@ -121,231 +94,5 @@
   </div>
 </template>
 
-<script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, shallowRef } from 'vue'
-import { useI18n } from '../../composables/use-i18n-polyfill'
-
-import FtCard from '../../components/ft-card/ft-card.vue'
-import FtLoader from '../../components/ft-loader/ft-loader.vue'
-import FtElementList from '../../components/FtElementList/FtElementList.vue'
-import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
-import FtRefreshWidget from '../../components/ft-refresh-widget/ft-refresh-widget.vue'
-
-import store from '../../store/index'
-
-import { copyToClipboard, getRelativeTimeFromDate, showToast } from '../../helpers/utils'
-import { getLocalTrending } from '../../helpers/api/local'
-import { getInvidiousTrending } from '../../helpers/api/invidious'
-import { KeyboardShortcuts } from '../../../constants'
-
-const { t } = useI18n()
-
-/** @type {import('vue').ComputedRef<'local' | 'invidious'>} */
-const backendPreference = computed(() => {
-  return store.getters.getBackendPreference
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const backendFallback = computed(() => {
-  return store.getters.getBackendFallback
-})
-
-const lastTrendingRefreshTimestamp = computed(() => {
-  return getRelativeTimeFromDate(store.getters.getLastTrendingRefreshTimestamp, true)
-})
-
-/** @type {import('vue').ComputedRef<string>} */
-const region = computed(() => {
-  return store.getters.getRegion.toUpperCase()
-})
-
-/** @type {import('vue').ComputedRef<{ default: any[] | null, music: any[] | null, gaming: any[] | null, movies: any[] | null }>} */
-const trendingCache = computed(() => {
-  return store.getters.getTrendingCache
-})
-
-const isLoading = ref(false)
-const shownResults = shallowRef([])
-
-/** @type {import('vue').Ref<'default' | 'music' | 'gaming' | 'movies'>} */
-const currentTab = ref('default')
-
-const cacheEntry = trendingCache.value[currentTab.value]
-
-if (cacheEntry && cacheEntry.length > 0) {
-  shownResults.value = cacheEntry
-} else {
-  onMounted(() => {
-    getTrendingInfo()
-  })
-}
-
-/** @type {import('youtubei.js').Mixins.TabbedFeed<import('youtubei.js').IBrowseResponse> | null} */
-let trendingInstance = null
-
-function getTrendingInfo(refresh = false) {
-  if (refresh) {
-    if (process.env.SUPPORTS_LOCAL_API) {
-      trendingInstance = null
-    }
-
-    store.commit('clearTrendingCache')
-  }
-
-  if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious') {
-    getTrendingInfoInvidious()
-  } else {
-    getTrendingInfoLocal()
-  }
-
-  store.commit('setLastTrendingRefreshTimestamp', new Date())
-}
-
-async function getTrendingInfoLocal() {
-  isLoading.value = true
-
-  try {
-    const { results, instance } = await getLocalTrending(region.value, currentTab.value, trendingInstance)
-
-    shownResults.value = results
-    isLoading.value = false
-    trendingInstance = instance
-
-    store.commit('setTrendingCache', { value: results, page: currentTab.value })
-    nextTick(() => {
-      focusTab(currentTab.value)
-    })
-  } catch (error) {
-    console.error(error)
-    const errorMessage = t('Local API Error (Click to copy)')
-    showToast(`${errorMessage}: ${error}`, 10000, () => {
-      copyToClipboard(error)
-    })
-    if (backendPreference.value === 'local' && backendFallback.value) {
-      showToast(t('Falling back to Invidious API'))
-      getTrendingInfoInvidious()
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
-function getTrendingInfoInvidious() {
-  isLoading.value = true
-
-  getInvidiousTrending(currentTab.value, region.value).then((items) => {
-    if (!items) {
-      return
-    }
-
-    shownResults.value = items
-    isLoading.value = false
-    store.commit('setTrendingCache', { value: items, page: currentTab.value })
-    nextTick(() => {
-      focusTab(currentTab.value)
-    })
-  }).catch((err) => {
-    console.error(err)
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${err}`, 10000, () => {
-      copyToClipboard(err)
-    })
-
-    if (process.env.SUPPORTS_LOCAL_API && backendPreference.value === 'invidious' && backendFallback.value) {
-      showToast(t('Falling back to Local API'))
-      getTrendingInfoLocal()
-    } else {
-      isLoading.value = false
-    }
-  })
-}
-
-/** @type {import('vue').Ref<HTMLDivElement | null>} */
-const defaultTab = ref(null)
-/** @type {import('vue').Ref<HTMLDivElement | null>} */
-const musicTab = ref(null)
-/** @type {import('vue').Ref<HTMLDivElement | null>} */
-const gamingTab = ref(null)
-/** @type {import('vue').Ref<HTMLDivElement | null>} */
-const moviesTab = ref(null)
-
-/**
- * @param {'default' | 'music' | 'gaming' | 'movies'} tab
- * @param {KeyboardEvent | undefined} event
- */
-function focusTab(tab, event = undefined) {
-  if (event) {
-    if (event.altKey) { return }
-
-    event.preventDefault()
-    store.dispatch('showOutlines')
-  }
-
-  switch (tab) {
-    case 'default':
-      defaultTab.value?.focus()
-      break
-    case 'music':
-      musicTab.value?.focus()
-      break
-    case 'gaming':
-      gamingTab.value?.focus()
-      break
-    case 'movies':
-      moviesTab.value?.focus()
-      break
-  }
-}
-
-/**
- * @param {'default' | 'music' | 'gaming' | 'movies'} tab
- */
-function changeTab(tab) {
-  if (tab === currentTab.value) {
-    return
-  }
-
-  currentTab.value = tab
-
-  const cacheEntry = trendingCache.value[currentTab.value]
-
-  if (cacheEntry && cacheEntry.length > 0) {
-    shownResults.value = cacheEntry
-  } else {
-    getTrendingInfo()
-  }
-}
-
-/**
- * @param {KeyboardEvent} event the keyboard event
- */
-function keyboardShortcutHandler(event) {
-  if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
-    return
-  }
-
-  // Avoid handling events due to user holding a key (not released)
-  // https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat
-  if (event.repeat) { return }
-
-  switch (event.key.toLowerCase()) {
-    case 'f5':
-    case KeyboardShortcuts.APP.SITUATIONAL.REFRESH:
-      if (!isLoading.value) {
-        getTrendingInfo(true)
-      }
-      break
-  }
-}
-
-onMounted(() => {
-  document.addEventListener('keydown', keyboardShortcutHandler)
-})
-
-onBeforeUnmount(() => {
-  document.removeEventListener('keydown', keyboardShortcutHandler)
-})
-</script>
-
+<script src="./Trending.js" />
 <style scoped src="./Trending.css" />
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.js b/src/renderer/views/UserPlaylists/UserPlaylists.js
index 25deadd856017..053d0b50421b2 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.js
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.js
@@ -13,7 +13,6 @@ import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 import FtToggleSwitch from '../../components/ft-toggle-switch/ft-toggle-switch.vue'
 import FtAutoLoadNextPageWrapper from '../../components/ft-auto-load-next-page-wrapper/ft-auto-load-next-page-wrapper.vue'
 import { ctrlFHandler, getIconForSortPreference } from '../../helpers/utils'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 
 const SORT_BY_VALUES = {
   NameAscending: 'name_ascending',
@@ -175,7 +174,6 @@ export default defineComponent({
     doSearchPlaylistsWithMatchingVideos() {
       this.searchDataLimit = 100
       this.filterPlaylistAsync()
-      this.saveStateInRouter()
     },
     fullData() {
       this.activeData = this.fullData
@@ -185,9 +183,9 @@ export default defineComponent({
       sessionStorage.setItem('UserPlaylists/sortBy', this.sortBy)
     },
   },
-  created: function () {
+  mounted: function () {
     document.addEventListener('keydown', this.keyboardShortcutHandler)
-    const limit = sessionStorage.getItem('UserPlaylists/dataLimit')
+    const limit = sessionStorage.getItem('favoritesLimit')
     if (limit !== null) {
       this.dataLimit = limit
     }
@@ -197,53 +195,23 @@ export default defineComponent({
       this.sortBy = sortBy
     }
 
-    this.filterPlaylistDebounce = debounce(this.filterPlaylist, 500)
+    this.activeData = this.fullData
 
-    const oldQuery = this.$route.query.searchQueryText ?? ''
-    if (oldQuery !== null && oldQuery !== '') {
-      // `handleQueryChange` must be called after `filterHistoryDebounce` assigned
-      this.handleQueryChange(
-        oldQuery,
-        {
-          limit: this.$route.query.searchDataLimit,
-          doSearchPlaylistsWithMatchingVideos: this.$route.query.doSearchPlaylistsWithMatchingVideos === 'true',
-          filterNow: true,
-        },
-      )
-    } else {
-      // Only display unfiltered data when no query used last time
-      this.filterPlaylist()
-    }
+    this.showLoadMoreButton = this.activeData.length < this.allPlaylists.length
+
+    this.filterPlaylistDebounce = debounce(this.filterPlaylist, 500)
   },
   beforeDestroy: function () {
     document.removeEventListener('keydown', this.keyboardShortcutHandler)
   },
   methods: {
-    handleQueryChange(query, { limit = null, doSearchPlaylistsWithMatchingVideos = null, filterNow = false } = {}) {
-      this.query = query
-
-      const newLimit = limit ?? 100
-      this.searchDataLimit = newLimit
-      const newDoSearchPlaylistsWithMatchingVideos = doSearchPlaylistsWithMatchingVideos ?? this.doSearchPlaylistsWithMatchingVideos
-      this.doSearchPlaylistsWithMatchingVideos = newDoSearchPlaylistsWithMatchingVideos
-
-      this.saveStateInRouter({
-        query: query,
-        searchDataLimit: newLimit,
-        doSearchPlaylistsWithMatchingVideos: newDoSearchPlaylistsWithMatchingVideos,
-      })
-
-      filterNow ? this.filterPlaylist() : this.filterPlaylistAsync()
-    },
-
     increaseLimit: function () {
       if (this.query !== '') {
         this.searchDataLimit += 100
-        this.saveStateInRouter()
         this.filterPlaylist()
       } else {
         this.dataLimit += 100
-        sessionStorage.setItem('UserPlaylists/dataLimit', this.dataLimit)
+        sessionStorage.setItem('favoritesLimit', this.dataLimit)
       }
     },
     filterPlaylistAsync: function() {
@@ -279,39 +247,6 @@ export default defineComponent({
       })
     },
 
-    async saveStateInRouter({ query = this.query, searchDataLimit = this.searchDataLimit, doSearchPlaylistsWithMatchingVideos = this.doSearchPlaylistsWithMatchingVideos } = {}) {
-      if (this.query === '') {
-        try {
-          await this.$router.replace({ name: 'userPlaylists' })
-        } catch (failure) {
-          if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-            return
-          }
-
-          throw failure
-        }
-        return
-      }
-
-      const routerQuery = {
-        searchQueryText: query,
-        searchDataLimit: searchDataLimit,
-      }
-      if (doSearchPlaylistsWithMatchingVideos) { routerQuery.doSearchPlaylistsWithMatchingVideos = 'true' }
-      try {
-        await this.$router.replace({
-          name: 'userPlaylists',
-          query: routerQuery,
-        })
-      } catch (failure) {
-        if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-          return
-        }
-
-        throw failure
-      }
-    },
-
     keyboardShortcutHandler: function (event) {
       ctrlFHandler(event, this.$refs.searchBar)
     },
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.vue b/src/renderer/views/UserPlaylists/UserPlaylists.vue
index b5930b207375f..5f455651d12c5 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.vue
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.vue
@@ -26,12 +26,11 @@
           <ft-input
             ref="searchBar"
             :placeholder="$t('User Playlists.Search bar placeholder')"
-            :value="query"
             :show-clear-text-button="true"
             :show-action-button="false"
             :maxlength="255"
-            @input="(input) => handleQueryChange(input)"
-            @clear="() => handleQueryChange('')"
+            @input="(input) => query = input"
+            @clear="query = ''"
           />
         </div>
         <div
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 91e7017ce42b0..944886d5e4256 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -1,22 +1,20 @@
 import { defineComponent } from 'vue'
-import { mapActions, mapMutations } from 'vuex'
+import { mapActions } from 'vuex'
 import shaka from 'shaka-player'
-import { Utils, YTNodes } from 'youtubei.js'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtShakaVideoPlayer from '../../components/ft-shaka-video-player/ft-shaka-video-player.vue'
 import WatchVideoInfo from '../../components/watch-video-info/watch-video-info.vue'
 import WatchVideoChapters from '../../components/WatchVideoChapters/WatchVideoChapters.vue'
 import WatchVideoDescription from '../../components/WatchVideoDescription/WatchVideoDescription.vue'
-import CommentSection from '../../components/CommentSection/CommentSection.vue'
+import WatchVideoComments from '../../components/watch-video-comments/watch-video-comments.vue'
 import WatchVideoLiveChat from '../../components/watch-video-live-chat/watch-video-live-chat.vue'
 import WatchVideoPlaylist from '../../components/watch-video-playlist/watch-video-playlist.vue'
 import WatchVideoRecommendations from '../../components/WatchVideoRecommendations/WatchVideoRecommendations.vue'
-import FtAgeRestricted from '../../components/FtAgeRestricted/FtAgeRestricted.vue'
+import FtAgeRestricted from '../../components/ft-age-restricted/ft-age-restricted.vue'
 import packageDetails from '../../../../package.json'
 import {
   buildVTTFileLocally,
   copyToClipboard,
-  extractNumberFromString,
   formatDurationAsTimestamp,
   formatNumber,
   showToast
@@ -30,8 +28,10 @@ import {
 } from '../../helpers/api/local'
 import {
   convertInvidiousToLocalFormat,
+  filterInvidiousFormats,
   generateInvidiousDashManifestLocally,
   getProxyUrl,
+  invidiousFetch,
   invidiousGetVideoInformation,
   mapInvidiousLegacyFormat,
   youtubeImageUrlToInvidious
@@ -48,7 +48,7 @@ export default defineComponent({
     'watch-video-info': WatchVideoInfo,
     'watch-video-chapters': WatchVideoChapters,
     'watch-video-description': WatchVideoDescription,
-    CommentSection,
+    'watch-video-comments': WatchVideoComments,
     'watch-video-live-chat': WatchVideoLiveChat,
     'watch-video-playlist': WatchVideoPlaylist,
     'watch-video-recommendations': WatchVideoRecommendations,
@@ -57,8 +57,6 @@ export default defineComponent({
   beforeRouteLeave: async function (to, from, next) {
     this.handleRouteChange()
     window.removeEventListener('beforeunload', this.handleWatchProgress)
-    document.removeEventListener('keydown', this.resetAutoplayInterruptionTimeout)
-    document.removeEventListener('click', this.resetAutoplayInterruptionTimeout)
 
     if (this.$refs.player) {
       await this.$refs.player.destroyPlayer()
@@ -78,7 +76,6 @@ export default defineComponent({
       isLiveContent: false,
       isUpcoming: false,
       isPostLiveDvr: false,
-      isUnlisted: false,
       upcomingTimestamp: null,
       upcomingTimeLeft: null,
       /** @type {'dash' | 'audio' | 'legacy'} */
@@ -94,8 +91,6 @@ export default defineComponent({
       videoLengthSeconds: 0,
       videoChapters: [],
       videoCurrentChapterIndex: 0,
-      /** @type {'chapters' | 'keyMoments'} */
-      videoChaptersKind: 'chapters',
       channelName: '',
       channelThumbnail: '',
       channelId: '',
@@ -121,8 +116,7 @@ export default defineComponent({
       playNextTimeout: null,
       playNextCountDownIntervalId: null,
       infoAreaSticky: true,
-      blockVideoAutoplay: false,
-      autoplayInterruptionTimeout: null,
+      commentsEnabled: true,
 
       onMountedRun: false,
 
@@ -164,9 +158,6 @@ export default defineComponent({
     proxyVideos: function () {
       return this.$store.getters.getProxyVideos
     },
-    defaultAutoplayInterruptionIntervalHours: function () {
-      return this.$store.getters.getDefaultAutoplayInterruptionIntervalHours
-    },
     defaultInterval: function () {
       return this.$store.getters.getDefaultInterval
     },
@@ -328,13 +319,7 @@ export default defineComponent({
         this.getVideoInformationLocal()
       }
 
-      document.removeEventListener('keydown', this.resetAutoplayInterruptionTimeout)
-      document.removeEventListener('click', this.resetAutoplayInterruptionTimeout)
-      document.addEventListener('keydown', this.resetAutoplayInterruptionTimeout)
-      document.addEventListener('click', this.resetAutoplayInterruptionTimeout)
-
       window.addEventListener('beforeunload', this.handleWatchProgress)
-      this.resetAutoplayInterruptionTimeout()
     },
 
     changeTimestamp: function (timestamp) {
@@ -371,12 +356,22 @@ export default defineComponent({
           return
         }
 
+        const playabilityStatus = result.playability_status
+
+        if (playabilityStatus.status === 'UNPLAYABLE') {
+          /**
+           * @type {import ('youtubei.js').YTNodes.PlayerErrorMessage}
+           */
+          const errorScreen = playabilityStatus.error_screen
+          throw new Error(`[${playabilityStatus.status}] ${errorScreen.reason.text}: ${errorScreen.subreason.text}`)
+        }
+
         // extract localised title first and fall back to the not localised one
         this.videoTitle = result.primary_info?.title.text ?? result.basic_info.title
-        this.videoViewCount = result.basic_info.view_count ?? extractNumberFromString(result.primary_info.view_count.text)
+        this.videoViewCount = result.basic_info.view_count
 
-        this.channelId = result.basic_info.channel_id ?? result.secondary_info.owner?.author.id
-        this.channelName = result.basic_info.author ?? result.secondary_info.owner?.author.name
+        this.channelId = result.basic_info.channel_id
+        this.channelName = result.basic_info.author
 
         if (result.secondary_info.owner?.author) {
           this.channelThumbnail = result.secondary_info.owner.author.best_thumbnail?.url ?? ''
@@ -392,13 +387,8 @@ export default defineComponent({
           channelId: this.channelId
         })
 
-        if (result.page[0].microformat?.publish_date) {
-          // `result.page[0].microformat.publish_date` example value: `2023-08-12T08:59:59-07:00`
-          this.videoPublished = new Date(result.page[0].microformat.publish_date).getTime()
-        } else {
-          // text date Jan 1, 2000, not as accurate but better than nothing
-          this.videoPublished = new Date(result.primary_info.published).getTime()
-        }
+        // `result.page[0].microformat.publish_date` example value: `2023-08-12T08:59:59-07:00`
+        this.videoPublished = new Date(result.page[0].microformat.publish_date).getTime()
 
         if (result.secondary_info?.description.runs) {
           try {
@@ -422,7 +412,7 @@ export default defineComponent({
             this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres3.jpg`
             break
           default:
-            this.thumbnail = result.basic_info.thumbnail?.[0].url ?? `https://i.ytimg.com/vi/${this.videoId}/maxresdefault.jpg`
+            this.thumbnail = result.basic_info.thumbnail[0].url
             break
         }
 
@@ -440,7 +430,6 @@ export default defineComponent({
         this.isUpcoming = !!result.basic_info.is_upcoming
         this.isLiveContent = !!result.basic_info.is_live_content
         this.isPostLiveDvr = !!result.basic_info.is_post_live_dvr
-        this.isUnlisted = !!result.basic_info.is_unlisted
 
         const subCount = !result.secondary_info.owner.subscriber_count.isEmpty() ? parseLocalSubscriberCount(result.secondary_info.owner.subscriber_count.text) : NaN
 
@@ -466,26 +455,7 @@ export default defineComponent({
               })
             }
           } else {
-            /** @type {import('youtubei.js').YTNodes.MacroMarkersList | null | undefined} */
-            const macroMarkersList = result.page[1]?.engagement_panels
-              ?.find(pannel => pannel.panel_identifier === 'engagement-panel-macro-markers-auto-chapters')?.content
-
-            if (macroMarkersList) {
-              for (const item of macroMarkersList.contents) {
-                if (item instanceof YTNodes.MacroMarkersListItem) {
-                  chapters.push({
-                    title: item.title.text,
-                    timestamp: item.time_description.text,
-                    startSeconds: Utils.timeToSeconds(item.time_description.text),
-                    endSeconds: 0,
-                    thumbnail: item.thumbnail[0]
-                  })
-                }
-              }
-              this.videoChaptersKind = 'keyMoments'
-            } else {
-              chapters = this.extractChaptersFromDescription(result.basic_info.short_description ?? result.secondary_info.description.text)
-            }
+            chapters = this.extractChaptersFromDescription(result.basic_info.short_description)
           }
 
           if (chapters.length > 0) {
@@ -501,57 +471,23 @@ export default defineComponent({
 
         this.videoChapters = chapters
 
-        const playabilityStatus = result.playability_status
-
-        // The apostrophe is intentionally that one (char code 8217), because that is the one YouTube uses
-        const BOT_MESSAGE = 'Sign in to confirm you’re not a bot'
-
-        if (playabilityStatus.status === 'UNPLAYABLE' || playabilityStatus.status === 'LOGIN_REQUIRED') {
-          if (playabilityStatus.error_screen?.offer_id === 'sponsors_only_video') {
-            // Members-only videos can only be watched while logged into a Google account that is a paid channel member
-            // so there is no point trying any other backends as it will always fail
-            this.errorMessage = this.$t('Video.MembersOnly')
-            this.customErrorIcon = ['fas', 'money-check-dollar']
-            this.isLoading = false
-            this.updateTitle()
-            return
-          } else if (playabilityStatus.reason === 'Sign in to confirm your age' || (result.has_trailer && result.getTrailerInfo() === null)) {
-            // Age-restricted videos can only be watched while logged into a Google account that is age-verified
-            // so there is no point trying any other backends as it will always fail
-            this.errorMessage = this.$t('Video.AgeRestricted')
-            this.isLoading = false
-            this.updateTitle()
-            return
-          }
-
-          let errorText
-
-          if (playabilityStatus.reason === BOT_MESSAGE || playabilityStatus.reason === 'Please sign in') {
-            errorText = this.$t('Video.IP block')
-          } else {
-            errorText = `[${playabilityStatus.status}] ${playabilityStatus.reason}`
-
-            if (playabilityStatus.error_screen?.subreason) {
-              errorText += `: ${playabilityStatus.error_screen.subreason.text}`
-            }
-          }
-
-          if (this.backendFallback) {
-            throw new Error(errorText)
-          } else {
-            this.errorMessage = errorText
-            this.isLoading = false
-            this.updateTitle()
-            return
-          }
-        }
-
-        if (!this.hideLiveChat && (this.isLive || this.isUpcoming) && result.livechat) {
+        if (!this.hideLiveChat && this.isLive && result.livechat) {
           this.liveChat = result.getLiveChat()
         } else {
           this.liveChat = null
         }
 
+        // region No comment detection
+        // For videos without any comment (comment disabled?)
+        // e.g. https://youtu.be/8NBSwDEf8a8
+        //
+        // `comments_entry_point_header` is null probably when comment disabled
+        // e.g. https://youtu.be/8NBSwDEf8a8
+        // However videos with comments enabled but have no comment
+        // are different (which is not detected here)
+        this.commentsEnabled = result.comments_entry_point_header != null
+        // endregion No comment detection
+
         if ((this.isLive || this.isPostLiveDvr) && !this.isUpcoming) {
           let useRemoteManifest = true
 
@@ -728,8 +664,9 @@ export default defineComponent({
               })
 
               downloadLinks.push(...captionLinks)
+
+              this.downloadLinks = downloadLinks
             }
-            this.downloadLinks = downloadLinks
           } else {
             // video might be region locked or something else. This leads to no formats being available
             showToast(
@@ -757,7 +694,6 @@ export default defineComponent({
           }
 
           if (result.storyboards?.type === 'PlayerStoryboardSpec') {
-            /** @type {import('youtubei.js/dist/src/parser/classes/PlayerStoryboardSpec').StoryboardData[]} */
             let source = result.storyboards.boards
             if (window.innerWidth < 500) {
               source = source.filter((board) => board.thumbnail_height <= 90)
@@ -766,6 +702,7 @@ export default defineComponent({
           }
         }
 
+        // this.errorMessage = 'Test error message'
         this.isLoading = false
         this.updateTitle()
       } catch (err) {
@@ -828,7 +765,6 @@ export default defineComponent({
           this.isLive = result.liveNow
           this.isFamilyFriendly = result.isFamilyFriendly
           this.isPostLiveDvr = !!result.isPostLiveDvr
-          this.isUnlisted = !result.isListed
 
           this.captions = result.captions.map(caption => {
             return {
@@ -884,8 +820,6 @@ export default defineComponent({
             // // https://github.com/iv-org/invidious/pull/4589
             // if (this.proxyVideos) {
 
-            this.streamingDataExpiryDate = this.extractExpiryDateFromStreamingUrl(result.adaptiveFormats[0].url)
-
             let hlsManifestUrl = result.hlsUrl
 
             if (this.proxyVideos) {
@@ -914,9 +848,12 @@ export default defineComponent({
           } else {
             this.videoLengthSeconds = result.lengthSeconds
 
-            this.streamingDataExpiryDate = this.extractExpiryDateFromStreamingUrl(result.adaptiveFormats[0].url)
+            // Detect if the Invidious server is running a new enough version of Invidious
+            // to include this pull request: https://github.com/iv-org/invidious/pull/4586
+            // which fixed the API returning incorrect height, width and fps information
+            const trustApiResponse = result.adaptiveFormats.some(stream => typeof stream.size === 'string')
 
-            this.legacyFormats = result.formatStreams.map(mapInvidiousLegacyFormat)
+            this.legacyFormats = result.formatStreams.map(format => mapInvidiousLegacyFormat(format, trustApiResponse))
 
             if (!process.env.SUPPORTS_LOCAL_API || this.proxyVideos) {
               this.legacyFormats.forEach(format => {
@@ -961,7 +898,7 @@ export default defineComponent({
               return object
             }))
 
-            this.manifestSrc = await this.createInvidiousDashManifest(result)
+            this.manifestSrc = await this.createInvidiousDashManifest(result, trustApiResponse)
             this.manifestMimeType = MANIFEST_TYPE_DASH
           }
 
@@ -985,12 +922,6 @@ export default defineComponent({
         })
     },
 
-    extractExpiryDateFromStreamingUrl: function (url) {
-      const expireString = new URL(url).searchParams.get('expire')
-
-      return new Date(parseInt(expireString) * 1000)
-    },
-
     /**
      * @param {string} description
      */
@@ -1246,18 +1177,6 @@ export default defineComponent({
         return
       }
 
-      if (this.blockVideoAutoplay) {
-        showToast(this.$t('Autoplay Interruption Timer',
-          this.defaultAutoplayInterruptionIntervalHours,
-          {
-            autoplayInterruptionIntervalHours: this.defaultAutoplayInterruptionIntervalHours
-          }),
-        3_600_000
-        )
-        this.resetAutoplayInterruptionTimeout()
-        return
-      }
-
       if (this.watchingPlaylist && this.getPlaylistPauseOnCurrent()) {
         this.disablePlaylistPauseOnCurrent()
         return
@@ -1327,7 +1246,6 @@ export default defineComponent({
       clearTimeout(this.playNextTimeout)
       clearInterval(this.playNextCountDownIntervalId)
       this.videoChapters = []
-      this.videoChaptersKind = 'chapters'
 
       this.handleWatchProgress()
     },
@@ -1423,14 +1341,25 @@ export default defineComponent({
       return `data:application/dash+xml;charset=UTF-8,${encodeURIComponent(xmlData)}`
     },
 
-    createInvidiousDashManifest: async function (result) {
+    createInvidiousDashManifest: async function (result, trustApiResponse = false) {
       let url = `${this.currentInvidiousInstanceUrl}/api/manifest/dash/id/${this.videoId}`
 
       // If we are in Electron,
       // we can use YouTube.js' DASH manifest generator to generate the manifest.
       // Using YouTube.js' gives us support for multiple audio tracks (currently not supported by Invidious)
       if (process.env.SUPPORTS_LOCAL_API) {
-        const adaptiveFormats = await this.getAdaptiveFormatsInvidious(result)
+        const adaptiveFormats = await this.getAdaptiveFormatsInvidious(result, trustApiResponse)
+
+        let parsedManifest
+
+        if (!trustApiResponse) {
+          // Invidious' API response doesn't include the height and width (and fps and qualityLabel for AV1) of video streams
+          // so we need to extract them from Invidious' manifest
+          const response = await invidiousFetch(url)
+          const originalText = await response.text()
+
+          parsedManifest = new DOMParser().parseFromString(originalText, 'application/xml')
+        }
 
         /** @type {import('youtubei.js').Misc.Format[]} */
         const formats = []
@@ -1441,12 +1370,25 @@ export default defineComponent({
         let hasMultipleAudioTracks = false
 
         for (const format of adaptiveFormats) {
+          if (!trustApiResponse && format.type.startsWith('video/')) {
+            const representation = parsedManifest.querySelector(`Representation[id="${format.itag}"][bandwidth="${format.bitrate}"]`)
+
+            format.height = parseInt(representation.getAttribute('height'))
+            format.width = parseInt(representation.getAttribute('width'))
+            format.fps = parseInt(representation.getAttribute('frameRate'))
+
+            // the quality label is missing for AV1 formats
+            if (!format.qualityLabel) {
+              format.qualityLabel = format.width > format.height ? `${format.height}p` : `${format.width}p`
+            }
+          }
+
           const localFormat = convertInvidiousToLocalFormat(format)
 
           if (localFormat.has_audio) {
             audioFormats.push(localFormat)
 
-            if (localFormat.is_dubbed || localFormat.is_descriptive || localFormat.is_secondary || localFormat.is_auto_dubbed) {
+            if (localFormat.is_dubbed || localFormat.is_descriptive || localFormat.is_secondary) {
               hasMultipleAudioTracks = true
             }
           }
@@ -1456,7 +1398,7 @@ export default defineComponent({
 
         if (hasMultipleAudioTracks) {
           // match YouTube's local API response with English
-          const languageNames = new Intl.DisplayNames('en-US', { type: 'language', languageDisplay: 'standard' })
+          const languageNames = new Intl.DisplayNames('en-US', { type: 'language' })
           for (const format of audioFormats) {
             this.generateAudioTrackFieldInvidious(format, languageNames)
           }
@@ -1494,9 +1436,6 @@ export default defineComponent({
       } else if (format.is_secondary) {
         type = ' secondary'
         idNumber = 6
-      } else if (format.is_auto_dubbed) {
-        type = ''
-        idNumber = 10
       } else {
         type = ' alternative'
         idNumber = -1
@@ -1511,7 +1450,7 @@ export default defineComponent({
       }
     },
 
-    getAdaptiveFormatsInvidious: async function (existingInfoResult = null) {
+    getAdaptiveFormatsInvidious: async function (existingInfoResult = null, trustApiResponse = false) {
       let result
       if (existingInfoResult) {
         result = existingInfoResult
@@ -1519,25 +1458,32 @@ export default defineComponent({
         result = await invidiousGetVideoInformation(this.videoId)
       }
 
-      result.adaptiveFormats.forEach((format) => {
-        format.bitrate = parseInt(format.bitrate)
+      if (trustApiResponse) {
+        result.adaptiveFormats.forEach((format) => {
+          format.bitrate = parseInt(format.bitrate)
 
-        // audio streams don't have a size property
-        if (typeof format.size === 'string') {
-          const [stringWidth, stringHeight] = format.size.split('x')
+          // audio streams don't have a size property
+          if (typeof format.size === 'string') {
+            const [stringWidth, stringHeight] = format.size.split('x')
 
-          format.width = parseInt(stringWidth)
-          format.height = parseInt(stringHeight)
-        }
-      })
+            format.width = parseInt(stringWidth)
+            format.height = parseInt(stringHeight)
+          }
+        })
 
-      return result.adaptiveFormats
+        return result.adaptiveFormats
+      } else {
+        return filterInvidiousFormats(result.adaptiveFormats)
+          .map((format) => {
+            format.bitrate = parseInt(format.bitrate)
+            if (typeof format.resolution === 'string') {
+              format.height = parseInt(format.resolution.replace('p', ''))
+            }
+            return format
+          })
+      }
     },
 
-    /**
-     * @param {import('youtubei.js/dist/src/parser/classes/PlayerStoryboardSpec').StoryboardData} storyboardInfo
-     * @returns {string}
-     */
     createLocalStoryboardUrls: function (storyboardInfo) {
       const results = buildVTTFileLocally(storyboardInfo, this.videoLengthSeconds)
 
@@ -1557,7 +1503,7 @@ export default defineComponent({
       // otherwise just fallback to the FreeTube display language and hope that YouTube will be able to handle it
       if (!translationLanguage) {
         translationName = this.$t('Locale Name')
-        translationCode = userLanguages.values().next().value
+        translationCode = userLanguages.values().next()
       } else {
         translationName = translationLanguage.language_name.text
         translationCode = translationLanguage.language_code
@@ -1648,7 +1594,7 @@ export default defineComponent({
     },
 
     updateTitle: function () {
-      this.setAppTitle(`${this.videoTitle} - ${packageDetails.productName}`)
+      document.title = `${this.videoTitle} - ${packageDetails.productName}`
     },
 
     isHiddenVideo: function (forbiddenTitles, channelsHidden, video) {
@@ -1664,22 +1610,12 @@ export default defineComponent({
       this.updatePlaylistLastPlayedAt({ _id: playlist._id })
     },
 
-    resetAutoplayInterruptionTimeout() {
-      clearTimeout(this.autoplayInterruptionTimeout)
-      this.autoplayInterruptionTimeout = setTimeout(() => { this.blockVideoAutoplay = true }, this.defaultAutoplayInterruptionIntervalHours * 3_600_000)
-      this.blockVideoAutoplay = false
-    },
-
     ...mapActions([
       'updateHistory',
       'updateWatchProgress',
       'updateLastViewedPlaylist',
       'updatePlaylistLastPlayedAt',
       'updateSubscriptionDetails',
-    ]),
-
-    ...mapMutations([
-      'setAppTitle'
     ])
   }
 })
diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
index 42e2fd3d55bbf..e9c60192c8322 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -106,6 +106,7 @@
     <ft-age-restricted
       v-if="(!isLoading && !isFamilyFriendly && showFamilyFriendlyOnly)"
       class="ageRestricted"
+      :is-video="true"
     />
     <div
       v-if="(isFamilyFriendly || !showFamilyFriendlyOnly)"
@@ -116,7 +117,6 @@
       <watch-video-info
         v-if="!isLoading"
         :id="videoId"
-        :is-unlisted="isUnlisted"
         :title="videoTitle"
         :channel-id="channelId"
         :channel-name="channelName"
@@ -150,7 +150,6 @@
         v-if="!hideChapters && !isLoading && videoChapters.length > 0"
         :chapters="videoChapters"
         :current-chapter-index="videoCurrentChapterIndex"
-        :kind="videoChaptersKind"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
         @timestamp-event="changeTimestamp"
@@ -163,7 +162,7 @@
         :class="{ theatreWatchVideo: useTheatreMode }"
         @timestamp-event="changeTimestamp"
       />
-      <CommentSection
+      <watch-video-comments
         v-if="!isLoading && !isLive && !hideComments"
         :id="videoId"
         class="watchVideo"
@@ -171,6 +170,7 @@
         :channel-thumbnail="channelThumbnail"
         :channel-name="channelName"
         :video-player-ready="videoPlayerLoaded"
+        :force-state="commentsEnabled ? null : 'noComment'"
         @timestamp-event="changeTimestamp"
       />
     </div>
@@ -179,7 +179,7 @@
       class="sidebarArea"
     >
       <watch-video-live-chat
-        v-if="!isLoading && !hideLiveChat && (isLive || isUpcoming)"
+        v-if="!isLoading && !hideLiveChat && isLive"
         :live-chat="liveChat"
         :video-id="videoId"
         :channel-id="channelId"
diff --git a/static/external-player-map.json b/static/external-player-map.json
index 1941d315a73b9..81a976ece2421 100644
--- a/static/external-player-map.json
+++ b/static/external-player-map.json
@@ -43,7 +43,7 @@
         "value": "iina",
         "cmdArguments": {
             "defaultExecutable": "iina",
-            "defaultCustomArguments": ["--no-stdin"],
+            "defaultCustomArguments": "--no-stdin",
             "supportsYtdlProtocol": true,
             "videoUrl": "",
             "playlistUrl": "",
diff --git a/static/geolocations/be.json b/static/geolocations/be.json
deleted file mode 100644
index 2ef170a09cce5..0000000000000
--- a/static/geolocations/be.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"name":"Аб’ядн. Арабскія Эміраты","code":"AE"},{"name":"Азербайджан","code":"AZ"},{"name":"Алжыр","code":"DZ"},{"name":"Аман","code":"OM"},{"name":"Аргенціна","code":"AR"},{"name":"Аўстралія","code":"AU"},{"name":"Аўстрыя","code":"AT"},{"name":"Балгарыя","code":"BG"},{"name":"Балівія","code":"BO"},{"name":"Бангладэш","code":"BD"},{"name":"Бахрэйн","code":"BH"},{"name":"Беларусь","code":"BY"},{"name":"Бельгія","code":"BE"},{"name":"Боснія і Герцагавіна","code":"BA"},{"name":"Бразілія","code":"BR"},{"name":"В’етнам","code":"VN"},{"name":"Венгрыя","code":"HU"},{"name":"Венесуэла","code":"VE"},{"name":"Вялікабрытанія","code":"GB"},{"name":"Гана","code":"GH"},{"name":"Гандурас","code":"HN"},{"name":"Ганконг","code":"HK"},{"name":"Гватэмала","code":"GT"},{"name":"Германія","code":"DE"},{"name":"Грузія","code":"GE"},{"name":"Грэцыя","code":"GR"},{"name":"Дамініканская Рэспубліка","code":"DO"},{"name":"Данія","code":"DK"},{"name":"Егіпет","code":"EG"},{"name":"Емен","code":"YE"},{"name":"Зімбабвэ","code":"ZW"},{"name":"Злучаныя Штаты Амерыкі","code":"US"},{"name":"Іарданія","code":"JO"},{"name":"Ізраіль","code":"IL"},{"name":"Інданезія","code":"ID"},{"name":"Індыя","code":"IN"},{"name":"Ірак","code":"IQ"},{"name":"Ірландыя","code":"IE"},{"name":"Ісландыя","code":"IS"},{"name":"Іспанія","code":"ES"},{"name":"Італія","code":"IT"},{"name":"Казахстан","code":"KZ"},{"name":"Калумбія","code":"CO"},{"name":"Камбоджа","code":"KH"},{"name":"Канада","code":"CA"},{"name":"Катар","code":"QA"},{"name":"Кенія","code":"KE"},{"name":"Кіпр","code":"CY"},{"name":"Коста-Рыка","code":"CR"},{"name":"Кувейт","code":"KW"},{"name":"Лаос","code":"LA"},{"name":"Латвія","code":"LV"},{"name":"Ліван","code":"LB"},{"name":"Лівія","code":"LY"},{"name":"Літва","code":"LT"},{"name":"Ліхтэнштэйн","code":"LI"},{"name":"Люксембург","code":"LU"},{"name":"Малайзія","code":"MY"},{"name":"Малдова","code":"MD"},{"name":"Мальта","code":"MT"},{"name":"Марока","code":"MA"},{"name":"Мексіка","code":"MX"},{"name":"Нарвегія","code":"NO"},{"name":"Непал","code":"NP"},{"name":"Нігерыя","code":"NG"},{"name":"Нідэрланды","code":"NL"},{"name":"Нікарагуа","code":"NI"},{"name":"Новая Зеландыя","code":"NZ"},{"name":"Пакістан","code":"PK"},{"name":"Панама","code":"PA"},{"name":"Папуа – Новая Гвінея","code":"PG"},{"name":"Парагвай","code":"PY"},{"name":"Партугалія","code":"PT"},{"name":"Паўднёвая Афрыка","code":"ZA"},{"name":"Паўднёвая Карэя","code":"KR"},{"name":"Паўночная Македонія","code":"MK"},{"name":"Перу","code":"PE"},{"name":"Польшча","code":"PL"},{"name":"Пуэрта-Рыка","code":"PR"},{"name":"Расія","code":"RU"},{"name":"Румынія","code":"RO"},{"name":"Саудаўская Аравія","code":"SA"},{"name":"Сенегал","code":"SN"},{"name":"Сербія","code":"RS"},{"name":"Сінгапур","code":"SG"},{"name":"Славакія","code":"SK"},{"name":"Славенія","code":"SI"},{"name":"Тайвань","code":"TW"},{"name":"Тайланд","code":"TH"},{"name":"Танзанія","code":"TZ"},{"name":"Туніс","code":"TN"},{"name":"Турцыя","code":"TR"},{"name":"Уганда","code":"UG"},{"name":"Украіна","code":"UA"},{"name":"Уругвай","code":"UY"},{"name":"Філіпіны","code":"PH"},{"name":"Фінляндыя","code":"FI"},{"name":"Францыя","code":"FR"},{"name":"Харватыя","code":"HR"},{"name":"Чарнагорыя","code":"ME"},{"name":"Чылі","code":"CL"},{"name":"Чэхія","code":"CZ"},{"name":"Швейцарыя","code":"CH"},{"name":"Швецыя","code":"SE"},{"name":"Шры-Ланка","code":"LK"},{"name":"Эквадор","code":"EC"},{"name":"Эль-Сальвадор","code":"SV"},{"name":"Эстонія","code":"EE"},{"name":"Ямайка","code":"JM"},{"name":"Японія","code":"JP"}]
\ No newline at end of file
diff --git a/static/geolocations/fa.json b/static/geolocations/fa.json
index 1318b2381cddd..bdf1994d95680 100644
--- a/static/geolocations/fa.json
+++ b/static/geolocations/fa.json
@@ -1 +1 @@
-[{"name":"آذربایجان","code":"AZ"},{"name":"آرژانتین","code":"AR"},{"name":"آلمان","code":"DE"},{"name":"اتریش","code":"AT"},{"name":"اردن","code":"JO"},{"name":"اسپانیا","code":"ES"},{"name":"استرالیا","code":"AU"},{"name":"استونی","code":"EE"},{"name":"اسرائیل","code":"IL"},{"name":"اسلواکی","code":"SK"},{"name":"اسلوونی","code":"SI"},{"name":"افریقای جنوبی","code":"ZA"},{"name":"اکراین","code":"UA"},{"name":"اکوادور","code":"EC"},{"name":"الجزایر","code":"DZ"},{"name":"السالوادور","code":"SV"},{"name":"امارات متحدهٔ عربی","code":"AE"},{"name":"اندونزی","code":"ID"},{"name":"انگلستان","code":"GB"},{"name":"اوروگوئه","code":"UY"},{"name":"اوگاندا","code":"UG"},{"name":"ایالات متحده","code":"US"},{"name":"ایتالیا","code":"IT"},{"name":"ایرلند","code":"IE"},{"name":"ایسلند","code":"IS"},{"name":"بحرین","code":"BH"},{"name":"برزیل","code":"BR"},{"name":"بلاروس","code":"BY"},{"name":"بلژیک","code":"BE"},{"name":"بلغارستان","code":"BG"},{"name":"بنگلادش","code":"BD"},{"name":"بوسنی و هرزگوین","code":"BA"},{"name":"بولیوی","code":"BO"},{"name":"پاپوآ گینه نو","code":"PG"},{"name":"پاراگوئه","code":"PY"},{"name":"پاکستان","code":"PK"},{"name":"پاناما","code":"PA"},{"name":"پرتغالی","code":"PT"},{"name":"پرو","code":"PE"},{"name":"پورتوریکو","code":"PR"},{"name":"تانزانیا","code":"TZ"},{"name":"تایلند","code":"TH"},{"name":"تایوان","code":"TW"},{"name":"ترکیه","code":"TR"},{"name":"تونس","code":"TN"},{"name":"جامائیکا","code":"JM"},{"name":"جمهوری چک","code":"CZ"},{"name":"جمهوری دومینیکن","code":"DO"},{"name":"دانمارک","code":"DK"},{"name":"روسیه","code":"RU"},{"name":"رومانی","code":"RO"},{"name":"زیمبابوه","code":"ZW"},{"name":"ژاپن","code":"JP"},{"name":"سری لانکا","code":"LK"},{"name":"سنگاپور","code":"SG"},{"name":"سنگال","code":"SN"},{"name":"سوئد","code":"SE"},{"name":"سوئیس","code":"CH"},{"name":"شیلی","code":"CL"},{"name":"صربستان","code":"RS"},{"name":"عراق","code":"IQ"},{"name":"عربستان سعودی","code":"SA"},{"name":"عمان","code":"OM"},{"name":"غنا","code":"GH"},{"name":"فرانسه","code":"FR"},{"name":"فنلاند","code":"FI"},{"name":"فیلیپین","code":"PH"},{"name":"قبرس","code":"CY"},{"name":"قزاقستان","code":"KZ"},{"name":"قطر","code":"QA"},{"name":"کاستاریکا","code":"CR"},{"name":"کانادا","code":"CA"},{"name":"کرواسی","code":"HR"},{"name":"کرهٔ جنوبی","code":"KR"},{"name":"کلمبیا","code":"CO"},{"name":"کمبوجیه","code":"KH"},{"name":"کنیا","code":"KE"},{"name":"کویت","code":"KW"},{"name":"گرجستان","code":"GE"},{"name":"گواتمالا","code":"GT"},{"name":"لائوس","code":"LA"},{"name":"لبنان","code":"LB"},{"name":"لتونی","code":"LV"},{"name":"لوکزامبورگ","code":"LU"},{"name":"لهستان","code":"PL"},{"name":"لیبی","code":"LY"},{"name":"لیتوانی","code":"LT"},{"name":"لیختن اشتاین","code":"LI"},{"name":"مالت","code":"MT"},{"name":"مالزی","code":"MY"},{"name":"مجارستان","code":"HU"},{"name":"مراکش","code":"MA"},{"name":"مصر","code":"EG"},{"name":"مقدونیه شمالی","code":"MK"},{"name":"مکزیک","code":"MX"},{"name":"مولداوی","code":"MD"},{"name":"مونته‌نگرو","code":"ME"},{"name":"نپال","code":"NP"},{"name":"نروژ","code":"NO"},{"name":"نیجریه","code":"NG"},{"name":"نیکاراگوئه","code":"NI"},{"name":"نیوزلند","code":"NZ"},{"name":"ونزوئلا","code":"VE"},{"name":"ویتنام","code":"VN"},{"name":"هلند","code":"NL"},{"name":"هند","code":"IN"},{"name":"هندوراس","code":"HN"},{"name":"هنگ کنگ","code":"HK"},{"name":"یمن","code":"YE"},{"name":"یونان","code":"GR"}]
\ No newline at end of file
+[{"name":"آذربایجان","code":"AZ"},{"name":"آرژانتین","code":"AR"},{"name":"آفریقای جنوبی","code":"ZA"},{"name":"آلمان","code":"DE"},{"name":"اتریش","code":"AT"},{"name":"اردن","code":"JO"},{"name":"اسپانیا","code":"ES"},{"name":"استرالیا","code":"AU"},{"name":"استونی","code":"EE"},{"name":"اسرائیل","code":"IL"},{"name":"اسلواکی","code":"SK"},{"name":"اسلوونی","code":"SI"},{"name":"اکراین","code":"UA"},{"name":"اکوادور","code":"EC"},{"name":"الجزایر","code":"DZ"},{"name":"السالوادور","code":"SV"},{"name":"امارات متحدهٔ عربی","code":"AE"},{"name":"اندونزی","code":"ID"},{"name":"انگلستان","code":"GB"},{"name":"اوروگوئه","code":"UY"},{"name":"اوگاندا","code":"UG"},{"name":"ایالات متحده","code":"US"},{"name":"ایتالیا","code":"IT"},{"name":"ایرلند","code":"IE"},{"name":"ایسلند","code":"IS"},{"name":"بحرین","code":"BH"},{"name":"برزیل","code":"BR"},{"name":"بلاروس","code":"BY"},{"name":"بلژیک","code":"BE"},{"name":"بلغارستان","code":"BG"},{"name":"بنگلادش","code":"BD"},{"name":"بوسنی و هرزگوین","code":"BA"},{"name":"بولیوی","code":"BO"},{"name":"پاپوآ گینه نو","code":"PG"},{"name":"پاراگوئه","code":"PY"},{"name":"پاکستان","code":"PK"},{"name":"پاناما","code":"PA"},{"name":"پرتغالی","code":"PT"},{"name":"پرو","code":"PE"},{"name":"پورتوریکو","code":"PR"},{"name":"تانزانیا","code":"TZ"},{"name":"تایلند","code":"TH"},{"name":"تایوان","code":"TW"},{"name":"ترکیه","code":"TR"},{"name":"تونس","code":"TN"},{"name":"جامائیکا","code":"JM"},{"name":"جمهوری چک","code":"CZ"},{"name":"جمهوری دومینیکن","code":"DO"},{"name":"دانمارک","code":"DK"},{"name":"روسیه","code":"RU"},{"name":"رومانی","code":"RO"},{"name":"زیمبابوه","code":"ZW"},{"name":"ژاپن","code":"JP"},{"name":"سری لانکا","code":"LK"},{"name":"سنگاپور","code":"SG"},{"name":"سنگال","code":"SN"},{"name":"سوئد","code":"SE"},{"name":"سوئیس","code":"CH"},{"name":"شیلی","code":"CL"},{"name":"صربستان","code":"RS"},{"name":"عراق","code":"IQ"},{"name":"عربستان سعودی","code":"SA"},{"name":"عمان","code":"OM"},{"name":"غنا","code":"GH"},{"name":"فرانسه","code":"FR"},{"name":"فنلاند","code":"FI"},{"name":"فیلیپین","code":"PH"},{"name":"قبرس","code":"CY"},{"name":"قزاقستان","code":"KZ"},{"name":"قطر","code":"QA"},{"name":"کاستاریکا","code":"CR"},{"name":"کانادا","code":"CA"},{"name":"کرواسی","code":"HR"},{"name":"کرهٔ جنوبی","code":"KR"},{"name":"کلمبیا","code":"CO"},{"name":"کمبوجیه","code":"KH"},{"name":"کنیا","code":"KE"},{"name":"کویت","code":"KW"},{"name":"گرجستان","code":"GE"},{"name":"گواتمالا","code":"GT"},{"name":"لائوس","code":"LA"},{"name":"لبنان","code":"LB"},{"name":"لتونی","code":"LV"},{"name":"لوکزامبورگ","code":"LU"},{"name":"لهستان","code":"PL"},{"name":"لیبی","code":"LY"},{"name":"لیتوانی","code":"LT"},{"name":"لیختن اشتاین","code":"LI"},{"name":"مالت","code":"MT"},{"name":"مالزی","code":"MY"},{"name":"مجارستان","code":"HU"},{"name":"مراکش","code":"MA"},{"name":"مصر","code":"EG"},{"name":"مقدونیه شمالی","code":"MK"},{"name":"مکزیک","code":"MX"},{"name":"مولداوی","code":"MD"},{"name":"مونته‌نگرو","code":"ME"},{"name":"نپال","code":"NP"},{"name":"نروژ","code":"NO"},{"name":"نیجریه","code":"NG"},{"name":"نیکاراگوئه","code":"NI"},{"name":"نیوزلند","code":"NZ"},{"name":"ونزوئلا","code":"VE"},{"name":"ویتنام","code":"VN"},{"name":"هلند","code":"NL"},{"name":"هند","code":"IN"},{"name":"هندوراس","code":"HN"},{"name":"هنگ کنگ","code":"HK"},{"name":"یمن","code":"YE"},{"name":"یونان","code":"GR"}]
\ No newline at end of file
diff --git a/static/geolocations/pt-PT.json b/static/geolocations/pt-PT.json
index f1fcb9486180b..bbf84f1af9695 100644
--- a/static/geolocations/pt-PT.json
+++ b/static/geolocations/pt-PT.json
@@ -1 +1 @@
-[{"name":"África do Sul","code":"ZA"},{"name":"Alemanha","code":"DE"},{"name":"Arábia Saudita","code":"SA"},{"name":"Argélia","code":"DZ"},{"name":"Argentina","code":"AR"},{"name":"Austrália","code":"AU"},{"name":"Áustria","code":"AT"},{"name":"Azerbaijão","code":"AZ"},{"name":"Bangladexe","code":"BD"},{"name":"Barém","code":"BH"},{"name":"Bélgica","code":"BE"},{"name":"Bielorrússia","code":"BY"},{"name":"Bolívia","code":"BO"},{"name":"Bósnia-Herzegovina","code":"BA"},{"name":"Brasil","code":"BR"},{"name":"Bulgária","code":"BG"},{"name":"Camboja","code":"KH"},{"name":"Canadá","code":"CA"},{"name":"Catar","code":"QA"},{"name":"Cazaquistão","code":"KZ"},{"name":"Chéquia","code":"CZ"},{"name":"Chile","code":"CL"},{"name":"Chipre","code":"CY"},{"name":"Colômbia","code":"CO"},{"name":"Coreia do Sul","code":"KR"},{"name":"Costa Rica","code":"CR"},{"name":"Croácia","code":"HR"},{"name":"Dinamarca","code":"DK"},{"name":"Egito","code":"EG"},{"name":"El Salvador","code":"SV"},{"name":"Emirados Árabes Unidos","code":"AE"},{"name":"Equador","code":"EC"},{"name":"Eslováquia","code":"SK"},{"name":"Eslovénia","code":"SI"},{"name":"Espanha","code":"ES"},{"name":"Estados Unidos","code":"US"},{"name":"Estónia","code":"EE"},{"name":"Filipinas","code":"PH"},{"name":"Finlândia","code":"FI"},{"name":"França","code":"FR"},{"name":"Gana","code":"GH"},{"name":"Geórgia","code":"GE"},{"name":"Grécia","code":"GR"},{"name":"Guatemala","code":"GT"},{"name":"Holanda","code":"NL"},{"name":"Honduras","code":"HN"},{"name":"Hong Kong","code":"HK"},{"name":"Hungria","code":"HU"},{"name":"Iémen","code":"YE"},{"name":"Índia","code":"IN"},{"name":"Indonésia","code":"ID"},{"name":"Iraque","code":"IQ"},{"name":"Irlanda","code":"IE"},{"name":"Islândia","code":"IS"},{"name":"Israel","code":"IL"},{"name":"Itália","code":"IT"},{"name":"Jamaica","code":"JM"},{"name":"Japão","code":"JP"},{"name":"Jordânia","code":"JO"},{"name":"Kuwait","code":"KW"},{"name":"Laos","code":"LA"},{"name":"Letónia","code":"LV"},{"name":"Líbano","code":"LB"},{"name":"Líbia","code":"LY"},{"name":"Lienchtenstein","code":"LI"},{"name":"Lituânia","code":"LT"},{"name":"Luxemburgo","code":"LU"},{"name":"Macedónia do Norte","code":"MK"},{"name":"Malásia","code":"MY"},{"name":"Malta","code":"MT"},{"name":"Marrocos","code":"MA"},{"name":"México","code":"MX"},{"name":"Moldávia","code":"MD"},{"name":"Montenegro","code":"ME"},{"name":"Nepal","code":"NP"},{"name":"Nicarágua","code":"NI"},{"name":"Nigéria","code":"NG"},{"name":"Noruega","code":"NO"},{"name":"Nova Zelândia","code":"NZ"},{"name":"Omã","code":"OM"},{"name":"Panamá","code":"PA"},{"name":"Papuásia-Nova Guiné","code":"PG"},{"name":"Paquistão","code":"PK"},{"name":"Paraguai","code":"PY"},{"name":"Peru","code":"PE"},{"name":"Polónia","code":"PL"},{"name":"Porto Rico","code":"PR"},{"name":"Portugal","code":"PT"},{"name":"Quénia","code":"KE"},{"name":"Reino Unido","code":"GB"},{"name":"República Dominicana","code":"DO"},{"name":"Roménia","code":"RO"},{"name":"Rússia","code":"RU"},{"name":"Senegal","code":"SN"},{"name":"Sérvia","code":"RS"},{"name":"Singapura","code":"SG"},{"name":"Sri Lanka","code":"LK"},{"name":"Suécia","code":"SE"},{"name":"Suíça","code":"CH"},{"name":"Tailândia","code":"TH"},{"name":"Taiwan","code":"TW"},{"name":"Tanzânia","code":"TZ"},{"name":"Tunísia","code":"TN"},{"name":"Turquia","code":"TR"},{"name":"Ucrânia","code":"UA"},{"name":"Uganda","code":"UG"},{"name":"Uruguai","code":"UY"},{"name":"Venezuela","code":"VE"},{"name":"Vietname","code":"VN"},{"name":"Zimbabué","code":"ZW"}]
\ No newline at end of file
+[{"name":"África do Sul","code":"ZA"},{"name":"Alemanha","code":"DE"},{"name":"Arábia Saudita","code":"SA"},{"name":"Argélia","code":"DZ"},{"name":"Argentina","code":"AR"},{"name":"Austrália","code":"AU"},{"name":"Áustria","code":"AT"},{"name":"Azerbaijão","code":"AZ"},{"name":"Bangladeche","code":"BD"},{"name":"Barém","code":"BH"},{"name":"Bélgica","code":"BE"},{"name":"Bielorrússia","code":"BY"},{"name":"Bolívia","code":"BO"},{"name":"Bósnia-Herzegovina","code":"BA"},{"name":"Brasil","code":"BR"},{"name":"Bulgária","code":"BG"},{"name":"Camboja","code":"KH"},{"name":"Canadá","code":"CA"},{"name":"Catar","code":"QA"},{"name":"Cazaquistão","code":"KZ"},{"name":"Chéquia","code":"CZ"},{"name":"Chile","code":"CL"},{"name":"Chipre","code":"CY"},{"name":"Colômbia","code":"CO"},{"name":"Coreia do Sul","code":"KR"},{"name":"Costa Rica","code":"CR"},{"name":"Croácia","code":"HR"},{"name":"Dinamarca","code":"DK"},{"name":"Egito","code":"EG"},{"name":"El Salvador","code":"SV"},{"name":"Emirados Árabes Unidos","code":"AE"},{"name":"Equador","code":"EC"},{"name":"Eslováquia","code":"SK"},{"name":"Eslovénia","code":"SI"},{"name":"Espanha","code":"ES"},{"name":"Estados Unidos","code":"US"},{"name":"Estónia","code":"EE"},{"name":"Filipinas","code":"PH"},{"name":"Finlândia","code":"FI"},{"name":"França","code":"FR"},{"name":"Gana","code":"GH"},{"name":"Geórgia","code":"GE"},{"name":"Grécia","code":"GR"},{"name":"Guatemala","code":"GT"},{"name":"Holanda","code":"NL"},{"name":"Honduras","code":"HN"},{"name":"Hong Kong","code":"HK"},{"name":"Hungria","code":"HU"},{"name":"Iémen","code":"YE"},{"name":"Índia","code":"IN"},{"name":"Indonésia","code":"ID"},{"name":"Iraque","code":"IQ"},{"name":"Irlanda","code":"IE"},{"name":"Islândia","code":"IS"},{"name":"Israel","code":"IL"},{"name":"Itália","code":"IT"},{"name":"Jamaica","code":"JM"},{"name":"Japão","code":"JP"},{"name":"Jordânia","code":"JO"},{"name":"Kuwait","code":"KW"},{"name":"Laos","code":"LA"},{"name":"Letónia","code":"LV"},{"name":"Líbano","code":"LB"},{"name":"Líbia","code":"LY"},{"name":"Lienchtenstein","code":"LI"},{"name":"Lituânia","code":"LT"},{"name":"Luxemburgo","code":"LU"},{"name":"Macedónia do Norte","code":"MK"},{"name":"Malásia","code":"MY"},{"name":"Malta","code":"MT"},{"name":"Marrocos","code":"MA"},{"name":"México","code":"MX"},{"name":"Moldávia","code":"MD"},{"name":"Montenegro","code":"ME"},{"name":"Nepal","code":"NP"},{"name":"Nicarágua","code":"NI"},{"name":"Nigéria","code":"NG"},{"name":"Noruega","code":"NO"},{"name":"Nova Zelândia","code":"NZ"},{"name":"Omã","code":"OM"},{"name":"Panamá","code":"PA"},{"name":"Papuásia-Nova Guiné","code":"PG"},{"name":"Paquistão","code":"PK"},{"name":"Paraguai","code":"PY"},{"name":"Peru","code":"PE"},{"name":"Polónia","code":"PL"},{"name":"Porto Rico","code":"PR"},{"name":"Portugal","code":"PT"},{"name":"Quénia","code":"KE"},{"name":"Reino Unido","code":"GB"},{"name":"República Dominicana","code":"DO"},{"name":"Roménia","code":"RO"},{"name":"Rússia","code":"RU"},{"name":"Senegal","code":"SN"},{"name":"Sérvia","code":"RS"},{"name":"Singapura","code":"SG"},{"name":"Sri Lanka","code":"LK"},{"name":"Suécia","code":"SE"},{"name":"Suíça","code":"CH"},{"name":"Tailândia","code":"TH"},{"name":"Taiwan","code":"TW"},{"name":"Tanzânia","code":"TZ"},{"name":"Tunísia","code":"TN"},{"name":"Turquia","code":"TR"},{"name":"Ucrânia","code":"UA"},{"name":"Uganda","code":"UG"},{"name":"Uruguai","code":"UY"},{"name":"Venezuela","code":"VE"},{"name":"Vietname","code":"VN"},{"name":"Zimbabué","code":"ZW"}]
\ No newline at end of file
diff --git a/static/geolocations/zh-TW.json b/static/geolocations/zh-TW.json
index 34c2d9b01f9ba..72c4510db36c5 100644
--- a/static/geolocations/zh-TW.json
+++ b/static/geolocations/zh-TW.json
@@ -1 +1 @@
-[{"name":"土耳其","code":"TR"},{"name":"丹麥","code":"DK"},{"name":"厄瓜多","code":"EC"},{"name":"巴布亞紐幾內亞","code":"PG"},{"name":"巴西","code":"BR"},{"name":"巴拉圭","code":"PY"},{"name":"巴林","code":"BH"},{"name":"巴拿馬","code":"PA"},{"name":"巴基斯坦","code":"PK"},{"name":"日本","code":"JP"},{"name":"比利時","code":"BE"},{"name":"牙買加","code":"JM"},{"name":"以色列","code":"IL"},{"name":"加拿大","code":"CA"},{"name":"北馬其頓","code":"MK"},{"name":"卡達","code":"QA"},{"name":"台灣","code":"TW"},{"name":"尼加拉瓜","code":"NI"},{"name":"尼泊爾","code":"NP"},{"name":"瓜地馬拉","code":"GT"},{"name":"白俄羅斯","code":"BY"},{"name":"立陶宛","code":"LT"},{"name":"伊拉克","code":"IQ"},{"name":"冰島","code":"IS"},{"name":"列支敦士登","code":"LI"},{"name":"匈牙利","code":"HU"},{"name":"印尼","code":"ID"},{"name":"印度","code":"IN"},{"name":"多明尼加共和國","code":"DO"},{"name":"西班牙","code":"ES"},{"name":"克羅埃西亞","code":"HR"},{"name":"利比亞","code":"LY"},{"name":"宏都拉斯","code":"HN"},{"name":"希臘","code":"GR"},{"name":"沙烏地阿拉伯","code":"SA"},{"name":"辛巴威","code":"ZW"},{"name":"亞賽拜然","code":"AZ"},{"name":"坦尚尼亞","code":"TZ"},{"name":"奈及利亞","code":"NG"},{"name":"委內瑞拉","code":"VE"},{"name":"孟加拉","code":"BD"},{"name":"拉脫維亞","code":"LV"},{"name":"法國","code":"FR"},{"name":"波士尼亞-赫塞哥維納","code":"BA"},{"name":"波多黎克","code":"PR"},{"name":"波蘭","code":"PL"},{"name":"肯亞","code":"KE"},{"name":"芬蘭","code":"FI"},{"name":"阿拉伯聯合大公國","code":"AE"},{"name":"阿根廷","code":"AR"},{"name":"阿曼","code":"OM"},{"name":"阿爾及利亞","code":"DZ"},{"name":"俄羅斯","code":"RU"},{"name":"保加利亞","code":"BG"},{"name":"南非","code":"ZA"},{"name":"南韓","code":"KR"},{"name":"哈薩克","code":"KZ"},{"name":"柬埔寨","code":"KH"},{"name":"玻利維亞","code":"BO"},{"name":"科威特","code":"KW"},{"name":"突尼西亞","code":"TN"},{"name":"約旦","code":"JO"},{"name":"美國","code":"US"},{"name":"英國","code":"GB"},{"name":"迦納","code":"GH"},{"name":"香港","code":"HK"},{"name":"哥倫比亞","code":"CO"},{"name":"哥斯大黎加","code":"CR"},{"name":"埃及","code":"EG"},{"name":"挪威","code":"NO"},{"name":"泰國","code":"TH"},{"name":"烏干達","code":"UG"},{"name":"烏克蘭","code":"UA"},{"name":"烏拉圭","code":"UY"},{"name":"秘魯","code":"PE"},{"name":"紐西蘭","code":"NZ"},{"name":"馬來西亞","code":"MY"},{"name":"馬爾他","code":"MT"},{"name":"捷克","code":"CZ"},{"name":"荷蘭","code":"NL"},{"name":"喬治亞","code":"GE"},{"name":"斯里蘭卡","code":"LK"},{"name":"斯洛伐克","code":"SK"},{"name":"斯洛維尼亞","code":"SI"},{"name":"智利","code":"CL"},{"name":"菲律賓","code":"PH"},{"name":"越南","code":"VN"},{"name":"塞內加爾","code":"SN"},{"name":"塞爾維亞","code":"RS"},{"name":"奧地利","code":"AT"},{"name":"愛沙尼亞","code":"EE"},{"name":"愛爾蘭","code":"IE"},{"name":"新加坡","code":"SG"},{"name":"瑞士","code":"CH"},{"name":"瑞典","code":"SE"},{"name":"義大利","code":"IT"},{"name":"葉門","code":"YE"},{"name":"葡萄牙","code":"PT"},{"name":"蒙特內哥羅","code":"ME"},{"name":"寮國","code":"LA"},{"name":"德國","code":"DE"},{"name":"摩洛哥","code":"MA"},{"name":"摩爾多瓦","code":"MD"},{"name":"黎巴嫩","code":"LB"},{"name":"墨西哥","code":"MX"},{"name":"澳洲","code":"AU"},{"name":"盧森堡","code":"LU"},{"name":"賽普勒斯","code":"CY"},{"name":"薩爾瓦多","code":"SV"},{"name":"羅馬尼亞","code":"RO"}]
\ No newline at end of file
+[{"name":"土耳其","code":"TR"},{"name":"丹麥","code":"DK"},{"name":"厄瓜多","code":"EC"},{"name":"巴布亞紐幾內亞","code":"PG"},{"name":"巴西","code":"BR"},{"name":"巴拉圭","code":"PY"},{"name":"巴林","code":"BH"},{"name":"巴拿馬","code":"PA"},{"name":"巴基斯坦","code":"PK"},{"name":"日本","code":"JP"},{"name":"比利時","code":"BE"},{"name":"牙買加","code":"JM"},{"name":"以色列","code":"IL"},{"name":"加拿大","code":"CA"},{"name":"北馬其頓","code":"MK"},{"name":"卡達","code":"QA"},{"name":"台灣","code":"TW"},{"name":"尼加拉瓜","code":"NI"},{"name":"尼泊爾","code":"NP"},{"name":"瓜地馬拉","code":"GT"},{"name":"白俄羅斯","code":"BY"},{"name":"立陶宛","code":"LT"},{"name":"伊拉克","code":"IQ"},{"name":"冰島","code":"IS"},{"name":"列支敦士登","code":"LI"},{"name":"匈牙利","code":"HU"},{"name":"印尼","code":"ID"},{"name":"印度","code":"IN"},{"name":"多明尼加共和國","code":"DO"},{"name":"西班牙","code":"ES"},{"name":"克羅埃西亞","code":"HR"},{"name":"利比亞","code":"LY"},{"name":"宏都拉斯","code":"HN"},{"name":"希臘","code":"GR"},{"name":"沙烏地阿拉伯","code":"SA"},{"name":"辛巴威","code":"ZW"},{"name":"亞賽拜然","code":"AZ"},{"name":"坦尚尼亞","code":"TZ"},{"name":"奈及利亞","code":"NG"},{"name":"委內瑞拉","code":"VE"},{"name":"孟加拉","code":"BD"},{"name":"拉脫維亞","code":"LV"},{"name":"法國","code":"FR"},{"name":"波士尼亞-赫塞哥維納","code":"BA"},{"name":"波多黎克","code":"PR"},{"name":"波蘭","code":"PL"},{"name":"肯亞","code":"KE"},{"name":"芬蘭","code":"FI"},{"name":"阿拉伯聯合大公國","code":"AE"},{"name":"阿根廷","code":"AR"},{"name":"阿曼","code":"OM"},{"name":"阿爾及利亞","code":"DZ"},{"name":"俄羅斯","code":"RU"},{"name":"保加利亞","code":"BG"},{"name":"南非","code":"ZA"},{"name":"南韓","code":"KR"},{"name":"哈薩克","code":"KZ"},{"name":"柬埔寨","code":"KH"},{"name":"玻利維亞","code":"BO"},{"name":"科威特","code":"KW"},{"name":"突尼西亞","code":"TN"},{"name":"約旦","code":"JO"},{"name":"美國","code":"US"},{"name":"英國","code":"GB"},{"name":"迦納","code":"GH"},{"name":"香港","code":"HK"},{"name":"哥倫比亞","code":"CO"},{"name":"哥斯大黎加","code":"CR"},{"name":"埃及","code":"EG"},{"name":"挪威","code":"NO"},{"name":"泰國","code":"TH"},{"name":"烏干達","code":"UG"},{"name":"烏克蘭","code":"UA"},{"name":"烏拉圭","code":"UY"},{"name":"祕魯","code":"PE"},{"name":"紐西蘭","code":"NZ"},{"name":"馬來西亞","code":"MY"},{"name":"馬爾他","code":"MT"},{"name":"捷克","code":"CZ"},{"name":"荷蘭","code":"NL"},{"name":"喬治亞","code":"GE"},{"name":"斯里蘭卡","code":"LK"},{"name":"斯洛伐克","code":"SK"},{"name":"斯洛維尼亞","code":"SI"},{"name":"智利","code":"CL"},{"name":"菲律賓","code":"PH"},{"name":"越南","code":"VN"},{"name":"塞內加爾","code":"SN"},{"name":"塞爾維亞","code":"RS"},{"name":"奧地利","code":"AT"},{"name":"愛沙尼亞","code":"EE"},{"name":"愛爾蘭","code":"IE"},{"name":"新加坡","code":"SG"},{"name":"瑞士","code":"CH"},{"name":"瑞典","code":"SE"},{"name":"義大利","code":"IT"},{"name":"葉門","code":"YE"},{"name":"葡萄牙","code":"PT"},{"name":"蒙特內哥羅","code":"ME"},{"name":"寮國","code":"LA"},{"name":"德國","code":"DE"},{"name":"摩洛哥","code":"MA"},{"name":"摩爾多瓦","code":"MD"},{"name":"黎巴嫩","code":"LB"},{"name":"墨西哥","code":"MX"},{"name":"澳洲","code":"AU"},{"name":"盧森堡","code":"LU"},{"name":"賽普勒斯","code":"CY"},{"name":"薩爾瓦多","code":"SV"},{"name":"羅馬尼亞","code":"RO"}]
\ No newline at end of file
diff --git a/static/locales/activeLocales.json b/static/locales/activeLocales.json
index 4e1768c3febb2..0a0357af8031d 100644
--- a/static/locales/activeLocales.json
+++ b/static/locales/activeLocales.json
@@ -2,7 +2,6 @@
   "en-US",
   "en-GB",
   "ar",
-  "be",
   "bg",
   "ca",
   "cs",
diff --git a/static/locales/af.yaml b/static/locales/af.yaml
index 4eac48c2a7a28..363ddb7dd0051 100644
--- a/static/locales/af.yaml
+++ b/static/locales/af.yaml
@@ -1,17 +1,15 @@
 # Put the name of your locale in the same language
-Locale Name: 'Afrikaans'
+Locale Name: ''
 # Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Hierdie gedeelte van die toep is nog nie gereed nie. Kom later terug wanneer vordering
-  gemaak is.
+'This part of the app is not ready yet. Come back later when progress has been made.': >
 
 # Webkit Menu Bar
-File: 'Lêer'
-New Window: 'Nuwe venster'
-Preferences: 'Voorkeure'
-Quit: 'Sluit'
-Edit: 'Wysig'
-Undo: 'Ontdoen'
+File: ''
+New Window: ''
+Preferences: ''
+Quit: ''
+Edit: ''
+Undo: ''
 Redo: ''
 Cut: ''
 Copy: ''
@@ -137,6 +135,8 @@ Channels:
   Search bar placeholder: ''
   Count: ''
   Empty: ''
+  Unsubscribe: ''
+  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
   Trending: ''
@@ -152,6 +152,8 @@ Feed:
 Playlists: ''
 User Playlists:
   Your Playlists: ''
+  Playlist Message: ''
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   You have no playlists. Click on the create new playlist button to create a new one.: ''
   Empty Search Message: ''
   Search bar placeholder: ''
@@ -259,6 +261,7 @@ History:
 Settings:
   # On Settings Page
   Settings: ''
+  Expand All Settings Sections: ''
   Sort Settings Sections (A-Z): ''
   The app needs to restart for changes to take effect. Restart and apply change?: ''
   General Settings:
@@ -451,7 +454,9 @@ Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
+    Manage Subscriptions: ''
     Fetch Automatically: ''
+    Only Show Latest Video for Each Channel: ''
     Confirm Before Unsubscribing: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -505,6 +510,7 @@ Settings:
     Subscription File: ''
     History File: ''
     Playlist File: ''
+    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: ''
     Export YouTube: ''
@@ -538,590 +544,494 @@ Settings:
     Proxy Settings: ''
     Enable Tor / Proxy: ''
     Proxy Protocol: ''
-    Proxy Host: 'Instaangasheer'
-    Proxy Port Number: 'Instaanpoortnommer'
-    Clicking on Test Proxy will send a request to: 'Deur op Toets instaanbediener
-      te klik word ’n versoek verstuur na'
-    Test Proxy: 'Toets instaanbediener'
-    Your Info: 'U inligting'
-    Ip: 'IP'
-    Country: 'Land'
-    Region: 'Streek'
-    City: 'Stad'
-    Error getting network information. Is your proxy configured properly?: 'Fout by
-      ophaal van netwerkinligting. Is u instaanbediener korrek opgestel?'
+    Proxy Host: ''
+    Proxy Port Number: ''
+    Clicking on Test Proxy will send a request to: ''
+    Test Proxy: ''
+    Your Info: ''
+    Ip: ''
+    Country: ''
+    Region: ''
+    City: ''
+    Error getting network information. Is your proxy configured properly?: ''
   SponsorBlock Settings:
-    SponsorBlock Settings: 'SponsorBlock'
-    Enable SponsorBlock: 'Aktiveer SponsorBlock'
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'SponsorBlock API-bronadres
-      (verstek is https://sponsor.ajay.app)'
-    Notify when sponsor segment is skipped: 'Stel my in kennis wanneer geborgde segment
-      oorgeslaan is'
-    UseDeArrowTitles: 'Gebruik DeArrow-videotitels'
-    UseDeArrowThumbnails: 'Gebruik DeArrow vir duimnaels'
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': 'DeArrow-duinmaelgenereerder
-      API-bronadres (verstek is https://dearrow-thumb.ajay.app)'
+    SponsorBlock Settings: ''
+    Enable SponsorBlock: ''
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
+    Notify when sponsor segment is skipped: ''
+    UseDeArrowTitles: ''
+    UseDeArrowThumbnails: ''
+    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': ''
     Skip Options:
-      Skip Option: 'Slaan opsie oor'
-      Auto Skip: 'Slaan outomaties oor'
-      Show In Seek Bar: 'Toon in soekbalk'
-      Prompt To Skip: 'Vra om oor te slaan'
-      Do Nothing: 'Doen niks'
-    Category Color: 'Kategoriekleur'
+      Skip Option: ''
+      Auto Skip: ''
+      Show In Seek Bar: ''
+      Prompt To Skip: ''
+      Do Nothing: ''
+    Category Color: ''
   Parental Control Settings:
-    Parental Control Settings: 'Ouerbeheer'
-    Hide Unsubscribe Button: 'Versteek uittekenknop'
-    Show Family Friendly Only: 'Toon slegs gesinsvriendelike inhoud'
-    Hide Search Bar: 'Versteek soekbalk'
+    Parental Control Settings: ''
+    Hide Unsubscribe Button: ''
+    Show Family Friendly Only: ''
+    Hide Search Bar: ''
   Download Settings:
-    Download Settings: 'Laai af'
-    Ask Download Path: 'Vra vir aflaaipad'
-    Choose Path: 'Kies pad'
-    Download Behavior: 'Aflaaigedrag'
-    Download in app: 'Laai in toep af'
-    Open in web browser: 'Open in webblaaier'
+    Download Settings: ''
+    Ask Download Path: ''
+    Choose Path: ''
+    Download Behavior: ''
+    Download in app: ''
+    Open in web browser: ''
   Experimental Settings:
-    Experimental Settings: 'Eksperimenteel'
-    Warning: 'Dit is eksperimentele instellings wat die toep kan laat uitbom indien
-      geaktiveer. Dit word aanbeveel om rugsteune te maak. Gebruik op eie risiko!'
-    Replace HTTP Cache: 'Vervang HTTP-kasgeheue'
+    Experimental Settings: ''
+    Warning: ''
+    Replace HTTP Cache: ''
   Password Dialog:
-    Password: 'Wagwoord'
-    Enter Password To Unlock: 'Voer wagwoord in om instellings te ontgrendel'
-    Password Incorrect: 'Verkeerde wagwoord'
-    Unlock: 'Ontgrendel'
+    Password: ''
+    Enter Password To Unlock: ''
+    Password Incorrect: ''
+    Unlock: ''
   Password Settings:
-    Password Settings: 'Wagwoord'
-    Set Password To Prevent Access: 'Stel ’n wagwoord in om toegang tot instellings
-      te voorkom'
-    Set Password: 'Stel wagwoord in'
-    Remove Password: 'Verwyder wagwoord'
+    Password Settings: ''
+    Set Password To Prevent Access: ''
+    Set Password: ''
+    Remove Password: ''
 About:
   #On About page
-  About: 'Oor'
-  Beta: 'Beta'
-  Source code: 'Bronkode'
-  Licensed under the: 'Gelisensieer onder die'
-  AGPLv3: 'AGPLv3'
-  Downloads / Changelog: 'Aflaaie / Veranderingslogboek'
-  GitHub releases: 'GitHub-vrystellings'
-  Help: 'Hulp'
-  FreeTube Wiki: 'FreeTube Wiki'
-  FAQ: 'Gereelde vrae'
-  Discussions: 'Besprekings'
-  Report a problem: 'Rapporteer ’n probleem'
-  GitHub issues: 'GitHub-probleme'
-  Please check for duplicates before posting: 'Gaan na vir duplikate voor u dit plaas'
-  Website: 'Webwerf'
-  Blog: 'Woernaal'
-  Email: 'E-pos'
-  Mastodon: 'Mastodon'
-  Chat on Matrix: 'Klets op Matrix'
-  Please read the: 'Lees asb. die'
-  room rules: 'kamerreëls'
-  Translate: 'Vertaal'
-  Credits: 'Danksegging'
-  FreeTube is made possible by: 'FreeTube is moontlik gemaak deur'
-  these people and projects: 'hierdie mense en projekte'
-  Donate: 'Skenk'
+  About: ''
+  Beta: ''
+  Source code: ''
+  Licensed under the: ''
+  AGPLv3: ''
+  Downloads / Changelog: ''
+  GitHub releases: ''
+  Help: ''
+  FreeTube Wiki: ''
+  FAQ: ''
+  Discussions: ''
+  Report a problem: ''
+  GitHub issues: ''
+  Please check for duplicates before posting: ''
+  Website: ''
+  Blog: ''
+  Email: ''
+  Mastodon: ''
+  Chat on Matrix: ''
+  Please read the: ''
+  room rules: ''
+  Translate: ''
+  Credits: ''
+  FreeTube is made possible by: ''
+  these people and projects: ''
+  Donate: ''
 
 Profile:
-  Profile Settings: 'Profiel'
-  Toggle Profile List: 'Tokkel profiellys'
-  Profile Select: 'Profielseleksie'
-  Profile Filter: 'Profielfilter'
-  All Channels: 'Alle kanale'
-  Profile Manager: 'Profielbestuurder'
-  Create New Profile: 'Skep nuwe profiel'
-  Edit Profile: 'Wysig profiel'
-  Edit Profile Name: 'Wysig profielnaam'
-  Create Profile Name: 'Skep profielnaam'
-  Profile Name: 'Profielnaam'
-  Color Picker: 'Kleurkieser'
-  Custom Color: 'Pasgemaakte kleur'
-  Profile Preview: 'Profielvoorskou'
-  Create Profile: 'Skep profiel'
-  Update Profile: 'Werk profiel by'
-  Make Default Profile: 'Maak verstekprofiel'
-  Delete Profile: 'Skrap profiel'
-  Are you sure you want to delete this profile?: 'Is u seker u wil hierdie profiel
-    skrap?'
-  All subscriptions will also be deleted.: 'Alle intekeninge sal ook geskrap word.'
-  Profile could not be found: 'Profiel kon nie gevind word nie'
-  Your profile name cannot be empty: 'U profielnaam kan nie leeg wees nie'
-  Profile has been created: 'Profiel is geskep'
-  Profile has been updated: 'Profiel is bygewerk'
-  Your default profile has been set to {profile}: 'U verstekprofiel is ingestel op
-    {profile}'
-  Removed {profile} from your profiles: 'Verwyder {profile} uit u profiele'
-  Your default profile has been changed to your primary profile: 'U verstekprofiel
-    is na u hoofprofiel verander'
-  '{profile} is now the active profile': '{profile} is nou die aktiewe profiel'
-  Subscription List: 'Intekenlys'
-  Other Channels: 'Ander kanale'
-  '{number} selected': '{number} gekies'
-  Select All: 'Kies alles'
-  Select None: 'Kies geen'
-  Delete Selected: 'Skrap gekose'
-  Add Selected To Profile: 'Voeg gekose toe tot profiel'
-  No channel(s) have been selected: 'Geen kanaal(e) is gekies nie'
+  Profile Settings: ''
+  Toggle Profile List: ''
+  Profile Select: ''
+  Profile Filter: ''
+  All Channels: ''
+  Profile Manager: ''
+  Create New Profile: ''
+  Edit Profile: ''
+  Edit Profile Name: ''
+  Create Profile Name: ''
+  Profile Name: ''
+  Color Picker: ''
+  Custom Color: ''
+  Profile Preview: ''
+  Create Profile: ''
+  Update Profile: ''
+  Make Default Profile: ''
+  Delete Profile: ''
+  Are you sure you want to delete this profile?: ''
+  All subscriptions will also be deleted.: ''
+  Profile could not be found: ''
+  Your profile name cannot be empty: ''
+  Profile has been created: ''
+  Profile has been updated: ''
+  Your default profile has been set to {profile}: ''
+  Removed {profile} from your profiles: ''
+  Your default profile has been changed to your primary profile: ''
+  '{profile} is now the active profile': ''
+  Subscription List: ''
+  Other Channels: ''
+  '{number} selected': ''
+  Select All: ''
+  Select None: ''
+  Delete Selected: ''
+  Add Selected To Profile: ''
+  No channel(s) have been selected: ''
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
-  : 'Dit is u primêre profiel.  Is u seker u wil die gekose kanale skrap?  Dieselfde
-    kanale sal geskrap word in enige ander profiel waarin dit voorkom.'
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Is
-    u seker u wil die gekose kanale skrap?  Dit sal nie die kanaal uit enige ander
-    profiel skrap nie.'
-  Close Profile Dropdown: 'Sluit profielkieslys'
-  Open Profile Dropdown: 'Open profielkieslys'
+  : ''
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
+  Close Profile Dropdown: ''
+  Open Profile Dropdown: ''
 #On Channel Page
 Channel:
-  Subscribe: 'Teken in'
-  Unsubscribe: 'Teken uit'
-  Channel has been removed from your subscriptions: 'Kanaal is uit u intekeninge verwyder'
-  Removed subscription from {count} other channel(s): 'Intekening van {count} ander
-    kanaal(e) is verwyder'
-  Added channel to your subscriptions: 'Kanaal is tot u intekeninge toegevoeg'
-  Search Channel: 'Deursoek kanaal'
-  Your search results have returned 0 results: 'U soekaksie het 0 resultate gelewer'
-  Sort By: 'Sorteer volgens'
-  This channel does not exist: 'Hierdie kanaal bestaan nie'
-  This channel does not allow searching: 'Hierdie kanaal laat nie soektogte toe nie'
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Hierdie
-    kanaal is ouderdomsbeperk en kan nie tans in FreeTube bekyk word nie.'
-  Channel Tabs: 'Kanaaloortjies'
+  Subscribe: ''
+  Unsubscribe: ''
+  Channel has been removed from your subscriptions: ''
+  Removed subscription from {count} other channel(s): ''
+  Added channel to your subscriptions: ''
+  Search Channel: ''
+  Your search results have returned 0 results: ''
+  Sort By: ''
+  This channel does not exist: ''
+  This channel does not allow searching: ''
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
+  Channel Tabs: ''
   Videos:
-    Videos: 'Video’s'
-    This channel does not currently have any videos: 'Hierdie kanaal het tans geen
-      video’s'
+    Videos: ''
+    This channel does not currently have any videos: ''
     Sort Types:
-      Newest: 'Nuutste'
-      Oldest: 'Oudste'
-      Most Popular: 'Gewildste'
+      Newest: ''
+      Oldest: ''
+      Most Popular: ''
   Shorts:
-    This channel does not currently have any shorts: 'Hierdie kanaal het tans geen
-      kortvideo’s nie'
+    This channel does not currently have any shorts: ''
   Live:
-    Live: 'Regstreeks'
-    This channel does not currently have any live streams: 'Hierdie kanaal het tans
-      geen rekstreekse stromings nie'
+    Live: ''
+    This channel does not currently have any live streams: ''
   Playlists:
-    Playlists: 'Afspeellyste'
-    This channel does not currently have any playlists: 'Hierdie kanaal het tans geen
-      afspeellyste nie'
+    Playlists: ''
+    This channel does not currently have any playlists: ''
     Sort Types:
-      Last Video Added: 'Laaste toegevoegde video'
-      Newest: 'Nuutste'
-      Oldest: 'Oudste'
+      Last Video Added: ''
+      Newest: ''
+      Oldest: ''
   Podcasts:
-    Podcasts: 'Podsendings'
-    This channel does not currently have any podcasts: 'Hierdie kanaal het tans geen
-      podsendings nie'
+    Podcasts: ''
+    This channel does not currently have any podcasts: ''
   Releases:
-    Releases: 'Vrystellings'
-    This channel does not currently have any releases: 'Hierdie kanaal het nie tans
-      enige vrystellings nie'
+    Releases: ''
+    This channel does not currently have any releases: ''
   About:
-    About: 'Oor'
-    Channel Description: 'Kanaalbeskrywing'
+    About: ''
+    Channel Description: ''
     Tags:
-      Tags: 'Etikette'
-      Search for: 'Soek na ‘{tag}’'
-    Details: 'Details'
-    Joined: 'Lid sedert'
-    Location: 'Ligging'
-    Featured Channels: 'Uitgeligte kanale'
+      Tags: ''
+      Search for: ''
+    Details: ''
+    Joined: ''
+    Location: ''
+    Featured Channels: ''
   Community:
-    This channel currently does not have any posts: 'Hierdie kanaal het nie tans enige
-      plasings nie'
-    votes: '{votes} stemme'
-    Reveal Answers: 'Onthul antwoorde'
-    Hide Answers: 'Versteek antwoorde'
-    Video hidden by FreeTube: 'Video is deur FreeTube versteek'
-    View Full Post: Bekyk volle plasing
-    Viewing Posts Only Supported By Invidious: Bekyk van plasings word slegs vir Invidious
-      ondersteun. Gaan na ’n kanaal se gemeenskapsblad om inhoud te sien sonder Invidious.
-  Home:
-    Home: Tuis
-    View Playlist: Bekyk afspeellys
+    This channel currently does not have any posts: ''
+    votes: ''
+    Reveal Answers: ''
+    Hide Answers: ''
+    Video hidden by FreeTube: ''
 Video:
-  More Options: 'Nog opsies'
-  Mark As Watched: 'Markeer as gekyk'
-  Remove From History: 'Verwyder uit geskiedenis'
-  Video has been marked as watched: 'Video is gemarkeer as gekyk'
-  Video has been removed from your history: 'Video is uit u geskiedenis verwyder'
-  Save Video: 'Bewaar video'
-  Video has been saved: 'Video is bewaar'
-  Video has been removed from your saved list: 'Video is verwyder uit u lys van bewaarde
-    video’s'
-  Open in YouTube: 'Open in YouTube'
-  Copy YouTube Link: 'Kopieer YouTube-skakel'
-  Open YouTube Embedded Player: 'Open YouTube- ingebedde skakel'
-  Copy YouTube Embedded Player Link: 'Kopieer YouTube-inbedspelerskakel'
-  Open in Invidious: 'Open in Invidious'
-  Copy Invidious Link: 'Kopieer Invidious-skakel'
-  Open Channel in YouTube: 'Open kanaal in YouTube'
-  Copy YouTube Channel Link: 'Kopieer YouTube-kanaalskakel'
-  Open Channel in Invidious: 'Open kanaal in Invidious'
-  Copy Invidious Channel Link: 'Kopieer Invidious-kanaalskakel'
-  Hide Channel: 'Versteek kanaal'
-  Unhide Channel: 'Toon kanaal'
-  Views: 'Kyke'
-  Loop Playlist: 'Herhaal afspeellys'
-  Shuffle Playlist: 'Skommel afspeellys'
-  Reverse Playlist: 'Keer afspeellys om'
-  Play Next Video: 'Speel volgende video af'
-  Play Previous Video: 'Speel vorige video af'
-  Pause on Current Video: 'Laat wag by huidige video'
-  Watched: 'Gekyk'
-  Autoplay: 'Outo-afspeel'
-  Starting soon, please refresh the page to check again: 'Begin binnekort, verfris
-    asb. die blad om weer na te gaan'
+  More Options: ''
+  Mark As Watched: ''
+  Remove From History: ''
+  Video has been marked as watched: ''
+  Video has been removed from your history: ''
+  Save Video: ''
+  Video has been saved: ''
+  Video has been removed from your saved list: ''
+  Open in YouTube: ''
+  Copy YouTube Link: ''
+  Open YouTube Embedded Player: ''
+  Copy YouTube Embedded Player Link: ''
+  Open in Invidious: ''
+  Copy Invidious Link: ''
+  Open Channel in YouTube: ''
+  Copy YouTube Channel Link: ''
+  Open Channel in Invidious: ''
+  Copy Invidious Channel Link: ''
+  Hide Channel: ''
+  Unhide Channel: ''
+  Views: ''
+  Loop Playlist: ''
+  Shuffle Playlist: ''
+  Reverse Playlist: ''
+  Play Next Video: ''
+  Play Previous Video: ''
+  Pause on Current Video: ''
+  Watched: ''
+  Autoplay: ''
+  Starting soon, please refresh the page to check again: ''
   # As in a Live Video
-  Premieres on: 'Première op'
-  Premieres: 'Première'
-  Upcoming: 'Komend'
-  Live: 'Regstreeks'
-  Live Now: 'Nou regstreeks'
-  Live Chat: 'Regstreekse klets'
-  Enable Live Chat: 'Aktiveer regstreekse klets'
-  Live Chat is currently not supported in this build.: 'Regstreekse klets word nie
-    in hierdie bou gesteun nie.'
-  'Chat is disabled or the Live Stream has ended.': 'Klets is gedeaktiveer of die
-    regstreekse klets is beëindig.'
-  Live chat is enabled. Chat messages will appear here once sent.: 'Regstreekse klets
-    is geaktiveer.  Kletsboodskappe sal hier verskyn.'
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Regstreekse
-    klets word nie met die Invidious-API ondersteun nie.  ’n Direkte verbinding na
-    YouTube word vereis.'
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Regstreekse
-    klets is nie vir hierdie stroom beskikbaar nie. Die oplaaier het dit gedeaktiveer.'
-  Show Super Chat Comment: 'Toon superkletskommentaar'
-  Scroll to Bottom: 'Rol na onderent'
-  Download Video: 'Laai video af'
-  video only: 'slegs video'
-  audio only: 'slegs oudio'
+  Premieres on: ''
+  Premieres: ''
+  Upcoming: ''
+  Live: ''
+  Live Now: ''
+  Live Chat: ''
+  Enable Live Chat: ''
+  Live Chat is currently not supported in this build.: ''
+  'Chat is disabled or the Live Stream has ended.': ''
+  Live chat is enabled. Chat messages will appear here once sent.: ''
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
+  Show Super Chat Comment: ''
+  Scroll to Bottom: ''
+  Download Video: ''
+  video only: ''
+  audio only: ''
   Published:
-    In less than a minute: 'Oor minder as een minuut'
-  Published on: 'Gepubliseer op'
-  Streamed on: 'Gestroom op'
-  Started streaming on: 'Het begin met stroming op'
+    Jan: ''
+    Feb: ''
+    Mar: ''
+    Apr: ''
+    May: ''
+    Jun: ''
+    Jul: ''
+    Aug: ''
+    Sep: ''
+    Oct: ''
+    Nov: ''
+    Dec: ''
+    Second: ''
+    Seconds: ''
+    Minute: ''
+    Minutes: ''
+    Hour: ''
+    Hours: ''
+    Day: ''
+    Days: ''
+    Week: ''
+    Weeks: ''
+    Month: ''
+    Months: ''
+    Year: ''
+    Years: ''
+    Ago: ''
+    Upcoming: ''
+    In less than a minute: ''
+  Published on: ''
+  Streamed on: ''
+  Started streaming on: ''
+  Publicationtemplate: ''
   Sponsor Block category:
-    sponsor: 'Borg'
-    intro: 'Inleiding'
-    outro: 'Uitleiding'
-    self-promotion: 'Selfbevordering'
-    interaction: 'Interaksie'
-    music offtopic: 'Musiek ongepas'
-    recap: 'Opsomming'
-    filler: 'Vulsel'
+    sponsor: ''
+    intro: ''
+    outro: ''
+    self-promotion: ''
+    interaction: ''
+    music offtopic: ''
+    recap: ''
+    filler: ''
   External Player:
-    OpenInTemplate: 'Open in {externalPlayer}'
-    video: 'video'
-    playlist: 'afspeellys'
-    OpeningTemplate: 'Open tans {videoOrPlaylist} in {externalPlayer}…'
-    UnsupportedActionTemplate: '{externalPlayer} ondersteun nie: {action}'
+    OpenInTemplate: ''
+    video: ''
+    playlist: ''
+    OpeningTemplate: ''
+    UnsupportedActionTemplate: ''
     Unsupported Actions:
-      starting video at offset: 'begin video met verrekening'
-      setting a playback rate: 'stel afspeelsnelheid in'
-      opening playlists: 'open afspeellyste'
-      opening specific video in a playlist (falling back to opening the video): 'open
-        spesifieke video in ’n afspeellys (val terug tot die open van die video)'
-      reversing playlists: 'keer afspeellyste om'
-      shuffling playlists: 'skommel afspeellyste'
-      looping playlists: 'herhalende afspeellyste'
+      starting video at offset: ''
+      setting a playback rate: ''
+      opening playlists: ''
+      opening specific video in a playlist (falling back to opening the video): ''
+      reversing playlists: ''
+      shuffling playlists: ''
+      looping playlists: ''
   Player:
-    TranslatedCaptionTemplate: '{language} (vertaal vanaf “{originalLanguage}”)'
-    Audio Tracks: 'Oudiosnitte'
-    Theatre Mode: 'Teatermodus'
-    Exit Theatre Mode: 'Verlaat teatermodus'
-    Full Window: 'Volle venster'
-    Exit Full Window: 'Verlaat volle venster'
-    Take Screenshot: 'Maak skermkiekie'
-    Show Stats: 'Toon statistiek'
-    Hide Stats: 'Versteek statistiek'
+    TranslatedCaptionTemplate: ''
+    Audio Tracks: ''
+    Theatre Mode: ''
+    Exit Theatre Mode: ''
+    Full Window: ''
+    Exit Full Window: ''
+    Take Screenshot: ''
+    Show Stats: ''
+    Hide Stats: ''
     Stats:
-      Stats: 'Statistieke'
-      Video ID: 'Video ID: {videoId}'
-      Media Formats: 'Mediaformate: {formats}'
-      Resolution: 'Resolusie: {width}x{height}@{frameRate}'
-      Player Dimensions: 'Spelerdimensies: {width}x{height}'
-      Bitrate: 'Bistempo: {bitrate} kbps'
-      Volume: 'Volume: {volumePercentage}%'
-      Bandwidth: 'Bandwydte: {bandwidth} kbps'
-      Buffered: 'Gebuffer: {bufferedPercentage}%'
-      Dropped Frames / Total Frames: 'Verlore rame: {droppedFrames} / Totale rame:
-        {totalFrames}'
-      CodecAudio: 'Kodek: {audioCodec} ({audioItag})'
-      CodecsVideoAudio: 'Kodeks: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
-      CodecsVideoAudioNoItags: 'Kodeks: {videoCodec} / {audioCodec}'
-    You appear to be offline: 'U blyk vanlyn te wees.'
-    Playback will resume automatically when your connection comes back: 'Afspeel sal
-      outomaties hervat wanneer u verbinding terug kom.'
-    Skipped segment: 'Segment {segmentCategory} oorgeslaan'
+      Stats: ''
+      Video ID: ''
+      Media Formats: ''
+      Resolution: ''
+      Player Dimensions: ''
+      Bitrate: ''
+      Volume: ''
+      Bandwidth: ''
+      Buffered: ''
+      Dropped Frames / Total Frames: ''
+      CodecAudio: ''
+      CodecsVideoAudio: ''
+      CodecsVideoAudioNoItags: ''
+    You appear to be offline: ''
+    Playback will resume automatically when your connection comes back: ''
+    Skipped segment: ''
 #& Videos
-  Unlisted: Ongelys
-  IP block: YouTube het u IP-adres versper en u kan nie video’s kyk nie. Verander
-    u VPN of instaanbediener.
-  MembersOnly: Videos slegs vir lede kan nie met FreeTube gekyk word nie omdat dit
-    ’n Google-aantekening en betaalde lidmaatskap op die oplaaier se kanaal vereis.
-  AgeRestricted: Video’s met ’n ouderdomsperk kan nie met FreeTube gekyk word nie
-    omdat dit ’n Google-aantekening en ouderdomvebestigde YouTube-rekening vereis.
-  DeArrow:
-    Show Original Details: Toon oorspronklike details
-    Show Modified Details: Toon gewysigde details
 Videos:
   #& Sort By
   Sort By:
-    Newest: 'Nuutste'
-    Oldest: 'Oudste'
+    Newest: ''
+    Oldest: ''
     #& Most Popular
 #& Playlists
 Playlist:
   #& About
-  Playlist: 'Afspeellys'
-  View Full Playlist: 'Bekyk volledige afspeellys'
-  Last Updated On: 'Laas bygewerk op'
+  Playlist: ''
+  View Full Playlist: ''
+  Videos: ''
+  View: ''
+  Views: ''
+  Last Updated On: ''
   Sort By:
-    Sort By: 'Sorteer volgens'
-    DateAddedNewest: 'Laaste toegevoeg boaan'
-    DateAddedOldest: 'Eerste toegevoeg boaan'
-    AuthorAscending: 'Outeur (A-Z)'
-    AuthorDescending: 'Outeur (Z-A)'
-    VideoTitleAscending: 'Titel (A-Z)'
-    VideoTitleDescending: 'Titel (Z-A)'
-    Custom: 'Pasgemaak'
+    Sort By: ''
+    DateAddedNewest: ''
+    DateAddedOldest: ''
+    AuthorAscending: ''
+    AuthorDescending: ''
+    VideoTitleAscending: ''
+    VideoTitleDescending: ''
+    Custom: ''
 
 # On Video Watch Page
 #* Published
 #& Views
-    VideoDurationAscending: Duur (korste eerste)
-    VideoDurationDescending: Duur (langste eerste)
+Toggle Theatre Mode: ''
 Change Format:
-  Change Media Formats: 'Verander mediaformate'
-  Use Dash Formats: 'Gebruik DASH-formate'
-  Use Legacy Formats: 'Gebruik legaatformate'
-  Use Audio Formats: 'Gebruik oudioformate'
-  Dash formats are not available for this video: 'DASH-formate is nie beskikbaar vir
-    hierdie video nie'
-  Audio formats are not available for this video: 'Oudioformate is nie beskikbaar
-    vir hierdie video nie'
-  Legacy formats are not available for this video: 'Legaatformate is nie beskikbaar
-    vir hierdie video nie'
+  Change Media Formats: ''
+  Use Dash Formats: ''
+  Use Legacy Formats: ''
+  Use Audio Formats: ''
+  Dash formats are not available for this video: ''
+  Audio formats are not available for this video: ''
+  Legacy formats are not available for this video: ''
 Share:
-  Share Video: 'Deel video'
-  Share Channel: 'Deel kanaal'
-  Share Playlist: 'Deel afspeellys'
-  Include Timestamp: 'Sluit tydstempel in'
-  Copy Link: 'Kopieer skakel'
-  Open Link: 'Open skakel'
-  Copy Embed: 'Kopieer inbedskakel'
-  Open Embed: 'Open inbedskakel'
+  Share Video: ''
+  Share Channel: ''
+  Share Playlist: ''
+  Include Timestamp: ''
+  Copy Link: ''
+  Open Link: ''
+  Copy Embed: ''
+  Open Embed: ''
   # On Click
-  Invidious URL copied to clipboard: 'Invidious-URL is na knipbod gekopieer'
-  Invidious Embed URL copied to clipboard: 'Invidious-inbedskakel is na knipbord gekopieer'
-  Invidious Channel URL copied to clipboard: 'Invidious-kanaalskakel is na knipbord
-    gekopieer'
-  YouTube URL copied to clipboard: 'YouTube-skakel is na knipbord gekopieer'
-  YouTube Embed URL copied to clipboard: 'YouTube-inbedskakel is na knipbord gekopieer'
-  YouTube Channel URL copied to clipboard: 'YouTube-kanaalskakel is na knipbord gekopieer'
+  Invidious URL copied to clipboard: ''
+  Invidious Embed URL copied to clipboard: ''
+  Invidious Channel URL copied to clipboard: ''
+  YouTube URL copied to clipboard: ''
+  YouTube Embed URL copied to clipboard: ''
+  YouTube Channel URL copied to clipboard: ''
 Clipboard:
-  Copy failed: 'Kopiëring na knipbord het misluk'
-  Cannot access clipboard without a secure connection: 'Geen toegang tot knipbord
-    sonder ’n beveiligde verbinding'
+  Copy failed: ''
+  Cannot access clipboard without a secure connection: ''
 
 Chapters:
-  Chapters: 'Hoofstukke'
-  'Chapters list visible, current chapter: {chapterName}': 'Hoofstukke lys sigbare,
-    huidige hoofstuk: {chapterName}'
-  'Chapters list hidden, current chapter: {chapterName}': 'Hoofstukke lys versteekte,
-    huidige hoofstuk: {chapterName}'
+  Chapters: ''
+  'Chapters list visible, current chapter: {chapterName}': ''
+  'Chapters list hidden, current chapter: {chapterName}': ''
 
-  Key Moments: Sleuteloomblikke
-Mini Player: 'Mini-speler'
+Mini Player: ''
 Comments:
-  Comments: 'Kommentare'
-  Click to View Comments: 'Klik om kommentare te sien'
-  Getting comment replies, please wait: 'Kommentare word opgehaal, wag asb.'
-  There are no more comments for this video: 'Daar is geen verdere kommentare vir
-    hierdie video nie'
-  Show Comments: 'Toon kommentare'
-  Hide Comments: 'Versteek kommentare'
-  Sort by: 'Sorteer volgens'
-  Top comments: 'Topkommentare'
-  Newest first: 'Nuutste eerste'
-  View {replyCount} replies: 'Sien {replyCount} antwoorde'
+  Comments: ''
+  Click to View Comments: ''
+  Getting comment replies, please wait: ''
+  There are no more comments for this video: ''
+  Show Comments: ''
+  Hide Comments: ''
+  Sort by: ''
+  Top comments: ''
+  Newest first: ''
+  View {replyCount} replies: ''
   # Context: View 10 Replies, View 1 Reply, View 1 Reply from Owner, View 2 Replies from Owner and others
-  View: 'Sien'
-  Hide: 'Versteek'
-  Replies: 'Antwoorde'
-  Show More Replies: 'Toon nog antwoorde'
-  Reply: 'Antwoord'
-  From {channelName}: 'van {channelName}'
-  And others: 'en ander'
-  There are no comments available for this video: 'Daar is geen reaksies beskikbaar
-    vir hierdie video nie'
-  Load More Comments: 'Laai nog kommentare'
-  No more comments available: 'Geen kommentare meer beskikbaar'
-  Pinned by: 'Vasgemaak deur'
-  Member: 'Lid'
-  Subscribed: 'Ingeteken'
-  Hearted: 'Met hart'
-  There are no comments available for this post: Daar is geen kommentare beskikbaar
-    vir hierdie plasing nie
-Up Next: 'Volgende'
+  View: ''
+  Hide: ''
+  Replies: ''
+  Show More Replies: ''
+  Reply: ''
+  From {channelName}: ''
+  And others: ''
+  There are no comments available for this video: ''
+  Load More Comments: ''
+  No more comments available: ''
+  Pinned by: ''
+  Member: ''
+  Subscribed: ''
+  Hearted: ''
+Up Next: ''
 
 #Tooltips
 Tooltips:
   General Settings:
-    Preferred API Backend: 'Kies die agterpunt wat FreeTube gebruik om data te versamel.
-      Die lokale API is ’n ingeboude uithaler. Die Invidious API moet met ’n Invidious-bediener
-      gekoppel word.'
-    Fallback to Non-Preferred Backend on Failure: 'Wanneer u voorkeur-API probleme
-      gee sal FreeTube outomaties terugval op die alternatiewe nie-voorkeur-API wanneer
-      hierdie instelling geaktiveer is.'
-    Thumbnail Preference: 'Alle duimnaels in FreeTube sal vervang word met ’n beeld
-      uit die video i.p.v. die verstek duimnael.'
-    Invidious Instance: 'Die Invidious-instansie waarmee FreeTube sal verbind om API-oproepe
-      te maak.'
-    Region for Trending: 'Met streek van neigings kan u kies welke land se gewilde
-      videos aan u vertoon moet word.'
+    Preferred API Backend: ''
+    Fallback to Non-Preferred Backend on Failure: ''
+    Thumbnail Preference: ''
+    Invidious Instance: ''
+    Region for Trending: ''
     External Link Handling: |
-      Kies die verstek gedrag vir wanneer ’n skakel geklik word wat nie in FreeTube geopen kan word nie.
-      FreeTube sal die geklikte skakel by verstek in u verstek blaaier open.
-    Open Deep Links In New Window: Bronadresse wat aan FreeTube gegee word, soos wat
-      deur blaaieruitbreidings of bevellynargumente gestuur word, word in ’n nuwe
-      venster geopen.
   Player Settings:
-    Proxy Videos Through Invidious: 'FreeTube sal verbind met Invidious en die video’s
-      van daar aflaai eerder as om ’n direkte verbinding met YouTube te maak.'
-    Default Video Format: 'Kies die formate wat gebruik word wanneer ’n video afspeel.
-      DASH-formate kan hoër kwaliteit afspeel. Legaat formate word beperk tot ’n maks
-      van 720p maar gebruik minder bandwydte. Oudio formate is slegs oudio strome.'
-    Scroll Playback Rate Over Video Player: 'Terwyl die muis oor die video is, druk
-      en hou die Control-toets (Command-toets op Mac) en rol met die muis om die afspeelsnelheid
-      te beheer. Druk en hou die Control-toets (Command-toets op Mac) en klik met
-      die linker muisknop om vinnig terug te keer na die verstek afspeelsnelheid (1x
-      tensy aangepas in die instellings).'
-    Skip by Scrolling Over Video Player: 'Gebruik die rolwiel om deur die video te
-      spoel, soos by MPV.'
+    Proxy Videos Through Invidious: ''
+    Default Video Format: ''
+    Scroll Playback Rate Over Video Player: ''
+    Skip by Scrolling Over Video Player: ''
   External Player Settings:
-    External Player: 'Deur die kies van ’n eksterne videospeler sal daar ’n ikoone
-      op die video se duimnael verskyn waarmee dit (of afspeellys indien ondersteun)
-      in die gekose eksterne videospeler geopen kan word. Let op: Invidious-instellings
-      beïnvloed nie eksterne videospelers nie.'
-    Custom External Player Executable: 'FreeTube neem by verstek aan dat die gekose
-      eksterne videospeler d.m.v. die PATH-omgewingsveranderlike gevind kan word.
-      Indien nodig kan ’n pasgemaakte pad hier ingevoer word.'
-    Ignore Warnings: 'Onderdruk waarskuwings wanneer die huidige eksterne videospeler
-      nie die huidige aksie ondersteun nie (bv. afspeellyste omkeer, ens.).'
-    Ignore Default Arguments: 'Moet geen verstek argumente na die eksterne videospeler
-      stuur buiten die video-URL nie (bv. afspeelsnelheid, afspeellys-URL, ens.).
-      Pasgemaakte argumente word steeds deurgestuur.'
-    Custom External Player Arguments: 'Enige pasgemaakte bevellynrgumente, wat u aan
-      die eksterne videospeler vir deurgee.'
-    DefaultCustomArgumentsTemplate: "(verstek: ‘{defaultCustomArguments}’)"
+    External Player: ''
+    Custom External Player Executable: ''
+    Ignore Warnings: ''
+    Ignore Default Arguments: ''
+    Custom External Player Arguments: ''
+    DefaultCustomArgumentsTemplate: ""
   Distraction Free Settings:
-    Hide Channels: 'Voer ’n kanaal-ID in om alle video’s, afspeellyste en die kanaal
-      self te versteek sodat dit nie in soek, tendense, gewildste, en aanbeveel weergegee
-      word nie. Die ingevoerde kanaal-ID moet volledig ooreenstem en is hooflettergevoelig.'
-    Hide Subscriptions Live: 'Hierdie instelling woord oorheers deur die toepwye “{appWideSetting}”-instelling
-      in die “{subsection}” gedeelte van “{settingsSection}”'
-    Hide Videos and Playlists Containing Text: 'Voer ’n woord, woordfragment of woordgroep
-      in (nie hooflettergevoelig) om alle video’s en afspeellyste waarvan die oorspronklike
-      titel dit bevat, regoor FreeTube te versteek, met uitsondering van net geskiedenis,
-      u afspeellyste en video’s in afspeellyste.'
+    Hide Channels: ''
+    Hide Subscriptions Live: ''
+    Hide Videos and Playlists Containing Text: ''
   Subscription Settings:
-    Fetch Feeds from RSS: 'Wanneer geaktiveer, sal FreeTube RSS i.p.v. sy verstek
-      metode gebruik om u intekenvoer op te haal. RSS is vinniger en voorkom IP-versperring,
-      maar bied nie sekere inligting soos videoduud, status of gemeenskapsplasings
-      nie'
-    Fetch Automatically: 'Wanneer geaktiveer, sal FreeTube u intekenvoer outomaties
-      ophaal wanneer ’n nuwe venster geopen word en u van profiel wissel.'
+    Fetch Feeds from RSS: ''
+    Fetch Automatically: ''
   Experimental Settings:
-    Replace HTTP Cache: 'Deaktiveer die skyfgebaseerde HTTP-kas van Electron en aktiveer
-      ’n aangepaste afbeeldingskas in die geheue in. Sal lei tot ’n verhoogde RAM-gebruik.'
+    Replace HTTP Cache: ''
   SponsorBlock Settings:
-    UseDeArrowTitles: 'Vervang videotitels met gebruiker ingediende titels vanaf DeArrow.'
-    UseDeArrowThumbnails: 'Vervang videoduimnaels met duimnaels vanaf DeArrow.'
+    UseDeArrowTitles: ''
+    UseDeArrowThumbnails: ''
 
 # Toast Messages
-Local API Error (Click to copy): 'Lokale API-fout (Klik om te kopieer)'
-Invidious API Error (Click to copy): 'Invidious API-fout (Klik om te kopieer)'
-Falling back to Invidious API: 'Val terug op Invidious API'
-Falling back to Local API: 'Val terug op lokale API'
-This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Hierdie
-  video is onbeskikbaar vanweë ontbrekende formate. Dit kan gebeur weens video-onbeskikbaarheid
-  in u land.'
-Unknown YouTube url type, cannot be opened in app: 'Onbekende YouTube-URL; die URL
-  kan nie in die toep geopen word nie'
-Loop is now disabled: 'Herhaling is nou gedeaktiveer'
-Loop is now enabled: 'Herhaling is nou geaktiveer'
-Shuffle is now disabled: 'Skommel is nou gedeaktiveer'
-Shuffle is now enabled: 'Skommel is nou geaktiveer'
-The playlist has been reversed: 'Die afspeellys speel van agter af'
-Playing Next Video: 'Speel volgende video af'
-Playing Previous Video: 'Speel vorige video af'
-Playlist will not pause when current video is finished: 'Afspeellys sal nie wag wanneer
-  huidige video klaar is nie'
-Playlist will pause when current video is finished: 'Afspeellys sal wag wanneer huidige
-  video klaar is'
-Playing Next Video Interval: 'Volgende video word afgespeel. Klik om te kanselleer.
-  | Volgende video word oor {nextVideoInterval} sekond afgespeel. Klik om te kanselleer.
-  | Volgende video word oor {nextVideoInterval} sekondes afgespeel. Klik om te kanselleer.'
-Canceled next video autoplay: 'Outomatiese afspeel is gekanselleer'
+Local API Error (Click to copy): ''
+Invidious API Error (Click to copy): ''
+Falling back to Invidious API: ''
+Falling back to Local API: ''
+This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Subscriptions have not yet been implemented: ''
+Unknown YouTube url type, cannot be opened in app: ''
+Hashtags have not yet been implemented, try again later: ''
+Loop is now disabled: ''
+Loop is now enabled: ''
+Shuffle is now disabled: ''
+Shuffle is now enabled: ''
+The playlist has been reversed: ''
+Playing Next Video: ''
+Playing Previous Video: ''
+Playlist will not pause when current video is finished: ''
+Playlist will pause when current video is finished: ''
+Playing Next Video Interval: ''
+Canceled next video autoplay: ''
 
-Default Invidious instance has been set to {instance}: 'Verstek Invidious-instansie
-  is ingestel op {instance}'
-Default Invidious instance has been cleared: 'Verstek Invidious-instansie is gewis'
-'The playlist has ended. Enable loop to continue playing': 'Die afspeellys is klaar.  Aktiveer
-  lusafspeel in te bly afspeel'
+Default Invidious instance has been set to {instance}: ''
+Default Invidious instance has been cleared: ''
+'The playlist has ended. Enable loop to continue playing': ''
 Age Restricted:
-  This channel is age restricted: 'Hierdie kanaal het ’n ouderdomsperk'
-  This video is age restricted: 'Hierdie video het ’n ouderdomsperk'
-External link opening has been disabled in the general settings: 'Die open van eksterne
-  skakels is gedeaktiveer in die algemene instellings'
-'Blocked opening potentially unsafe URL': 'Open van potensiële onveilige URL is versper:
-  “{url}”.'
-Downloading has completed: '“{videoTitle}” is afgelaai'
-Starting download: 'Begin aflaai van “{videoTitle}”'
-Downloading failed: 'Daar was ’n probleem by die aflaai van “{videoTitle}”'
-Screenshot Success: 'Skermkiekie bewaar as “{filePath}”'
-Screenshot Error: 'Skermkiekie het misluk. {error}'
-Channel Hidden: '{channel} tot kanaalfilter toegevoeg'
-Channel Unhidden: '{channel} verwyder uit kanaalfilter'
-Trimmed input must be at least N characters long: 'Bygesnyde invoer moet ten minste
-  1 karakter lank wees | Bygesnyde invoer moet ten minste {lentgh} karakters lank
-  wees'
-Tag already exists: 'Etiket “{tagName}” bestaan reeds'
+  This channel is age restricted: ''
+  This video is age restricted: ''
+External link opening has been disabled in the general settings: ''
+'Blocked opening potentially unsafe URL': ''
+Downloading has completed: ''
+Starting download: ''
+Downloading failed: ''
+Screenshot Success: ''
+Screenshot Error: ''
+Channel Hidden: ''
+Channel Unhidden: ''
+Trimmed input must be at least N characters long: ''
+Tag already exists: ''
 
 Hashtag:
-  Hashtag: 'Hutsmerk'
-  This hashtag does not currently have any videos: 'Hierdie hutsmerk het tans geen
-    video’s'
-Moments Ago: 'oomblikke gelede'
-Yes: 'Ja'
-No: 'Nee'
-Ok: 'Goed'
-Yes, Delete: 'Ja, skrap'
-Yes, Restart: 'Ja, herbegin'
-Yes, Open Link: 'Ja, open skakel'
-Cancel: 'Kanselleer'
+  Hashtag: ''
+  This hashtag does not currently have any videos: ''
+Moments Ago: ''
+Yes: ''
+No: ''
+Ok: ''
+Yes, Delete: ''
+Yes, Restart: ''
+Yes, Open Link: ''
+Cancel: ''
 # symbol used to indicate that an item is correct
-checkmark: '✓'
+checkmark: ''
 # French is the only language that should change this (they have a space before the colon)
-Display Label: '{label}: {value}'
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Keys:
-  arrowright: Regspyltjie
-  arrowup: Oppyltjie
-  alt: Alt
-  arrowdown: Afpyltjie
-  ctrl: Ctrl
-  arrowleft: Linkspyltjie
-Description:
-  Collapse Description: Toon minder
-  Expand Description: …nog
-Autoplay Interruption Timer: Outo-afspeel is gekanselleer weens {autoplayInterruptionIntervalHours}
-  uur van onaktiwiteit
+Display Label: ''
diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index 6ecad4ae9071a..8bfed56ff13e1 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -43,8 +43,6 @@ Global:
     Subscriber Count: 1 مشترك | {count} مشتركين
     View Count: 1 مشاهدة | {count} مشاهدات
     Watching Count: 1 مشاهد | {count} مشاهدون
-    Like Count: إعجاب واحد |{count} إعجاب
-    Comment Count: تعليق واحد | {count} تعليقًا
   Input Tags:
     Length Requirement: يجب أن يبلغ طول العلامة {number} حرفًا على الأقل
 Search / Go to URL: 'ابحث / اذهب إلى رابط'
@@ -101,8 +99,7 @@ Subscriptions:
   Subscriptions: 'الاشتراكات'
   Latest Subscriptions: 'أحدث الاشتراكات'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'قائمة
-    اشتراكك فارغة حاليًا. إذا كنت ترغب في استيراد اشتراكاتك، فيمكنك الانتقال إلى إعدادات
-    البيانات وتحديد استيراد الاشتراكات أو يمكنك البحث عن قناة والاشتراك فيها.'
+    اشتراكاتك فارغة حالياً. ابدأ بإضافة الاشتراكات لتراهم هنا.'
   'Getting Subscriptions. Please wait.': 'جاري تحميل الاشتراكات. يرجى الانتظار.'
   Refresh Subscriptions: 'تحديث الاشتراكات'
   Load More Videos: حمّل المزيد من الفيديوهات
@@ -128,6 +125,11 @@ Most Popular: 'الأكثر شعبية'
 Playlists: 'قوائم التشغيل'
 User Playlists:
   Your Playlists: 'قوائم التشغيل الخاصة بك'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ليس
+    لديك أي فيديو محتفظ عليه. إضغط على زر "إحفظ" في زاوية الفيديو لكي يحفظ هنا
+  Playlist Message: هذه الصفحة لا تظهر قائمات التشغيل بشكل كامل, وإنما تظهر فيديوات
+    إحتفضت عليها أو فضّلتها. عندما يكمل العمل بالكامل على هذه الصفحة, سترى كل فيديواتك
+    هنا تنتقل إلى قائمة تشغيل تسمى "المفضلة".
   Search bar placeholder: بحث عن قوائم التشغيل
   Empty Search Message: لا توجد مقاطع فيديو في قائمة التشغيل هذه تتطابق مع بحثك
   This playlist currently has no videos.: لا تحتوي قائمة التشغيل هذه حاليًا على مقاطع
@@ -181,12 +183,11 @@ User Playlists:
         انقر هنا للتراجع
       Reverted to use {oldPlaylistName} for quick bookmark: تمت العودة لاستخدام {oldPlaylistName}
         للإشارة المرجعية السريعة
+      Quick bookmark disabled: تم تعطيل الإشارة المرجعية السريعة
       This playlist is already being used for quick bookmark.: يتم استخدام قائمة التشغيل
         هذه بالفعل لوضع إشارة مرجعية سريعة.
       Playlist {playlistName} is the new quick bookmark playlist.: قائمة التشغيل {playlistName}
         هي قائمة تشغيل الإشارات المرجعية السريعة الجديدة.
-      This playlist has a video with a duration error: تحتوي قائمة التشغيل هذه على
-        مقطع فيديو واحد على الأقل ليس له مدة، وسيتم فرزه كما لو كانت مدته صفرًا.
     Search for Videos: ‬البحث عن مقاطع الفيديو
   AddVideoPrompt:
     Select a playlist to add your N videos to: حدد قائمة تشغيل لإضافة الفيديو الخاص
@@ -218,6 +219,9 @@ User Playlists:
     New Playlist Name: اسم قائمة تشغيل جديد
     Create: انشئ
   Remove Watched Videos: إزالة مقاطع الفيديو التي تمت مشاهدتها
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: هل
+    أنت متأكد أنك تريد إزالة جميع مقاطع الفيديو التي تمت مشاهدتها من قائمة التشغيل
+    هذه؟ هذا لا يمكن التراجع عنها.
   You have no playlists. Click on the create new playlist button to create a new one.: ليس
     لديك قوائم تشغيل. انقر على زر إنشاء قائمة تشغيل جديدة لإنشاء قائمة تشغيل جديدة.
   Are you sure you want to delete this playlist? This cannot be undone: هل أنت متأكد
@@ -226,6 +230,7 @@ User Playlists:
   Remove from Favorites: إزالة من {playlistName}
   Enable Quick Bookmark With This Playlist: تمكين الإشارة المرجعية السريعة مع قائمة
     التشغيل هذه
+  Disable Quick Bookmark: تعطيل الإشارة المرجعية السريعة
   Playlists with Matching Videos: قوائم التشغيل مع مقاطع الفيديو المطابقة
   Quick Bookmark Enabled: تم تمكين الإشارة المرجعية السريعة
   Cannot delete the quick bookmark target playlist.: لا يمكن حذف قائمة التشغيل المستهدفة
@@ -239,8 +244,6 @@ User Playlists:
     أنت متأكد أنك تريد إزالة مقطع فيديو مكرر واحد من قائمة التشغيل هذه؟ هذا لا يمكن
     التراجع عنها. | هل أنت متأكد أنك تريد إزالة {playlistItemCount} من مقاطع الفيديو
     المكررة من قائمة التشغيل هذه؟ هذا لا يمكن التراجع عنها.
-  Export Playlist: تصدير قائمة التشغيل هذه
-  The playlist has been successfully exported: تم تصدير قائمة التشغيل بنجاح
 History:
   # On History Page
   History: 'السجلّ'
@@ -253,7 +256,7 @@ Settings:
   # On Settings Page
   Settings: 'الإعدادات'
   General Settings:
-    General Settings: 'العامة'
+    General Settings: 'الإعدادات العامة'
     Fallback to Non-Preferred Backend on Failure: 'الرجوع إلى الواجهة الخلفية الغير
       مفضلة عند الفشل'
     Enable Search Suggestions: 'تفعيل الإقتراحات عند البحث'
@@ -275,6 +278,8 @@ Settings:
       End: 'نهاية'
       Hidden: مخفي
       Blur: الضبابية
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'حالة Invidious
+      (الافتراضية هي https://invidious.snopyta.org)'
     Region for Trending: 'المنطقة للأكثر شيوعاً'
         #! List countries
     Check for Latest Blog Posts: تحقق من أحدث منشورات المدونة
@@ -298,7 +303,7 @@ Settings:
       Label: تحميل تلقائي للصفحة التالية
       Tooltip: قم بتحميل الصفحات والتعليقات الإضافية تلقائيًا.
   Theme Settings:
-    Theme Settings: 'السِمة'
+    Theme Settings: 'إعدادات السِمة'
     Match Top Bar with Main Color: 'طابق الشريط العلوي مع اللون الأساسي'
     Base Theme:
       Base Theme: 'السِمة الأساسية'
@@ -368,7 +373,7 @@ Settings:
     Hide Side Bar Labels: إخفاء تسميات الشريط الجانبي
     Hide FreeTube Header Logo: إخفاء شعار رأس FreeTube
   Player Settings:
-    Player Settings: 'المشغل'
+    Player Settings: 'إعدادات المشغل'
     Play Next Video: 'شغل الفيديو التالي'
     Turn on Subtitles by Default: 'شغّل الترجمات بشكل افتراضي'
     Autoplay Videos: 'شغًل الفيديوهات تلقائياً'
@@ -420,7 +425,7 @@ Settings:
     Enter Fullscreen on Display Rotate: وضع ملء الشاشة عند تدوير الشاشة
     Skip by Scrolling Over Video Player: تخطي بالتمرير فوق مشغل الفيديو
   Privacy Settings:
-    Privacy Settings: 'الخصوصية'
+    Privacy Settings: 'إعدادات الخصوصية'
     Remember History: 'تذّكر سجلّ المشاهدة'
     Save Watched Progress: 'حفظ نسبة المشاهدة'
     Clear Search Cache: 'مسح ذاكرة التخزين المؤقت للبحث'
@@ -442,11 +447,47 @@ Settings:
     Are you sure you want to remove all your playlists?: هل أنت متأكد أنك تريد إزالة
       جميع قوائم التشغيل الخاصة بك؟
   Subscription Settings:
-    Subscription Settings: 'الاشتراك'
+    Subscription Settings: 'إعدادات الاشتراك'
     Hide Videos on Watch: 'أخفِ الفيديوهات عند مشاهدتها'
     Fetch Feeds from RSS: 'جلب المحتوى عن طريق RSS'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'صيغة تصدير الاشتراكات'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'إدارة الاشتراكات'
+    Import Subscriptions: 'استيراد الاشتراكات'
+    Export Subscriptions: 'تصدير الاشتراكات'
+    How do I import my subscriptions?: 'كيف استورد اشتراكاتي؟'
     Fetch Automatically: جلب الخلاصة تلقائيا
+    Only Show Latest Video for Each Channel: عرض أحدث فيديو فقط لكل قناة
     Confirm Before Unsubscribing: تجنب إلغاء الاشتراك عن طريق الخطأ
+  Advanced Settings:
+    Advanced Settings: 'الإعدادات المتقدمة'
+    Enable Debug Mode (Prints data to the console): 'تمكين وضع التنقيح (يطبع البيانات
+      على الكونسول)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'عنوان البروكسي ( مثال :
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'يؤدي
+      النقر فوق زر"اختبار Proxy" إلى إرسال طلب إلى https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'استخدم Tor / Proxy لطلبات ال API'
+    TEST PROXY: 'اختبار Proxy'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'اطّلع على الحالات العامة'
+    Clear History:
+      Clear History: 'محو السجلّ'
+      # On Click
+      Are you sure you want to delete your history?: 'هل أنت متأكد أنك تريد حذف السجلّ
+        الخاص بك؟'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'محو الاشتراكات'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'هل أنت متأكد أنك تريد إزالة
+        كافة الاشتراكات؟'
+      #& Yes
+      #& No
 
   Data Settings:
     How do I import my subscriptions?: كيف استورد اشتراكاتي؟
@@ -473,10 +514,14 @@ Settings:
     Export YouTube: تصدير Youtube
     Export FreeTube: تصدير FreeTube
     Export Subscriptions: تصدير الاشتراكات
+    Import NewPipe: استيراد NewPipe
+    Import YouTube: استيراد YouTube
+    Import FreeTube: استيراد FreeTube
     Import Subscriptions: استيراد الاشتراكات
     Select Export Type: حدّد نوع التصدير
     Select Import Type: حدّد نوع الاستيراد
-    Data Settings: البيانات
+    Data Settings: إعدادات البيانات
+    Check for Legacy Subscriptions: تحقق من وجود اشتراكات بالصيغة القديمة
     Manage Subscriptions: إدارة الإشتراكات
     All playlists has been successfully imported: تم استيراد جميع قوائم التشغيل بنجاح
     Playlist insufficient data: 'بيانات غير كافية لقائمة التشغيل "{playlist}" ، تخطي
@@ -504,7 +549,7 @@ Settings:
     Hide Channel Subscribers: اخف عدد اشتراكات القناة
     Hide Video Views: اخف عدد مشاهدات الفيديو
     Hide Video Likes And Dislikes: إخفاء الإعجاب وعدم الإعجاب للفيديو
-    Distraction Free Settings: عدم الإزعاج
+    Distraction Free Settings: إعدادات عدم الإزعاج
     Hide Active Subscriptions: اخفي الإشتراكات الناشطة
     Hide Playlists: إخفاء قوائم التشغيل
     Hide Video Description: إخفاء وصف الفيديو
@@ -533,6 +578,7 @@ Settings:
     Hide Subscriptions Shorts: إخفاء الاشتراكات الفيدوهات القصيرة
     Hide Subscriptions Videos: إخفاء مقاطع فيديو الاشتراكات
     Hide Profile Pictures in Comments: إخفاء صور الملف الشخصي في التعليقات
+    Blur Thumbnails: اخفاء الصور المصغرة
     Hide Subscriptions Community: إخفاء مجتمع الاشتراكات
     Hide Channels Invalid: معرف القناة المقدم غير صالح
     Hide Channels Disabled Message: تم حظر بعض القنوات باستخدام المعرّف ولم تتم معالجتها.
@@ -556,21 +602,17 @@ Settings:
     Proxy Host: خادوم البروكسي
     Proxy Protocol: بروتوكول البروكسي
     Enable Tor / Proxy: تفعيل تور / البروكسي
-    Proxy Settings: البروكسي
+    Proxy Settings: خيارات البروكسي
     Error getting network information. Is your proxy configured properly?: هنالك خطأ
       في جلب معلومات الشبكة. هل ضبطت إعدادات وكيلك بصورة صحيحة؟
     Clicking on Test Proxy will send a request to: النقر على اختبار البروكسي سيؤدي
       إلى إرسال طلب إلى
-    Proxy Warning: لا يحتوي FreeTube على وكيل مدمج ولكن يمكنه الاتصال بوكيل خارجي،
-      مثل وكيل يعمل على جهازك مثل Tor أو وكيل خارجي مثل وكيل SOCKS5 الذي توفره بعض
-      شبكات VPN. إذا تم التمكين، فتأكد من تكوين الوكيل/الاختصاص الخاص بك بشكل صحيح،
-      وإلا فلن يتمكن FreeTube من جلب أي بيانات.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: تنبيه عندما يتم تخطي شريحة الراعي
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       عنوان (الافتراضي هو https://sponsor.ajay.app)
     Enable SponsorBlock: تفعيل حجب الرعاة
-    SponsorBlock Settings: حظر الرعاة
+    SponsorBlock Settings: إعدادات حظر الرعاة
     Category Color: لون الفئة
     Skip Options:
       Auto Skip: تخطي تلقائي
@@ -587,13 +629,13 @@ Settings:
     Custom External Player Arguments: وسيطات المشغل الخارجي المخصصة
     Custom External Player Executable: مشغل خارجي مخصص قابل للتنفيذ
     Ignore Unsupported Action Warnings: تجاهل تحذيرات الإجراءات غير المدعومة
-    External Player Settings: المشغل الخارجي
+    External Player Settings: إعدادات المشغل الخارجي
     Players:
       None:
         Name: لاشيء
     Ignore Default Arguments: تجاهل الحجج الافتراضية
   Download Settings:
-    Download Settings: التنزيل
+    Download Settings: إعدادات التنزيل
     Choose Path: اختر المسار
     Ask Download Path: اطلب مسار التنزيل
     Download Behavior: سلوك التحميل
@@ -601,30 +643,57 @@ Settings:
     Download in app: تحميل في التطبيق
   Parental Control Settings:
     Hide Search Bar: إخفاء شريط البحث
-    Parental Control Settings: الرقابة الأبوية
+    Parental Control Settings: إعدادات الرقابة الأبوية
     Hide Unsubscribe Button: إخفاء زر إلغاء الاشتراك
     Show Family Friendly Only: عرض مناسب للعائلة فقط
   Experimental Settings:
     Replace HTTP Cache: استبدال ذاكرة التخزين المؤقت HTTP
-    Experimental Settings: الاختبارية
+    Experimental Settings: الإعدادات التجريبية
     Warning: هذه الإعدادات تجريبية ، فهي تسبب أعطال أثناء تمكينها. يوصى بشدة بعمل
       نسخ احتياطية. استخدمها على مسؤوليتك الخاصة!
   Password Settings:
     Set Password To Prevent Access: تعيين كلمة مرور لمنع الوصول إلى الإعدادات
     Remove Password: إزالة كلمة المرور
-    Password Settings: كلمة المرور
+    Password Settings: إعدادات كلمة المرور
     Set Password: ضبط كلمة السر
   Password Dialog:
     Password Incorrect: كلمة المرور غير صحيحة
     Password: كلمة السر
     Enter Password To Unlock: أدخل كلمة المرور لإلغاء قفل الإعدادات
     Unlock: الغاء القفل
+  Expand All Settings Sections: توسيع كافة أقسام الإعدادات
   Sort Settings Sections (A-Z): أقسام إعدادات الفرز (من الألف إلى الياء)
-  Return to Settings Menu: العودة إلى قائمة الإعدادات
 About:
   #On About page
   About: 'حول'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'هذا
+    البرنامج متروك الحقوق مرخّص بحرية AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    وجدت خطأ؟ تريد اقتراح ميزة؟ تريد المساعدة؟ تحقق من صفحة GitHub الخاصة بنا. طلبات
+    الإضافة مرحب بها.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'شكراً
+    جزيلاً للأشخاص والمشاريع التي جعلت FreeTube ممكنًا!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'هل
+    تريد الدردشة؟ انضم إلى سيرفرنا على Element / Matrix. يرجى التحقق من القواعد قبل
+    الانضمام.'
+
+  'Looking for help? Check out our Wiki page.': 'هل تبحث عن المساعدة؟ اطّلع على صفحة
+    الويكي الخاصة بنا.'
+
+  Check out our Firefox extension!: 'تفقّد إضافتنا على فايرفوكس!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'إذا
+    كنت تستمتع باستخدام FreeTube، ففكر في التبرع عبر Liberapay أو من خلال عنوان Bitcoin
+    الخاص بنا.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'آخر أخبار FreeTube'
+
   Donate: التبرع
   Translate: ساعدنا في ترجمة Freetube
   Chat on Matrix: الدردشة على ماتريكس
@@ -635,6 +704,7 @@ About:
   Report a problem: الإبلاغ عن مشكلة
   FAQ: الأسئلة المتداولة
   Help: المساعدة
+  View License: اعرض الرخصة
   Source code: الشفرة المصدرية
   Beta: تجريبي
   these people and projects: هؤلاء الناس والمشاريع
@@ -647,6 +717,7 @@ About:
   FreeTube Wiki: ويكي Freetube
   GitHub releases: إصدارات GitHub
   Downloads / Changelog: التحميلات\التغييرات
+  Licensed under the AGPLv3: مرخّص تحت رخصة أفيرو جيبيإل النسخة الثالثة
   Discussions: المناقشات
   Licensed under the: مرخص تحت
   AGPLv3: رخصة أفيرو العمومية الإصدار ٣
@@ -693,7 +764,7 @@ Profile:
   Other Channels: قنوات أُخرى
   Subscription List: قائمة الاشتراكات
   Profile Filter: مرشح الملف الشخصي
-  Profile Settings: الملف الشخصي
+  Profile Settings: إعدادات الملف الشخصي
   Toggle Profile List: تبديل قائمة الملف الشخصي
   Open Profile Dropdown: فتح القائمة المنسدلة للملف الشخصي
   Close Profile Dropdown: إغلاق القائمة المنسدلة للملف الشخصي
@@ -748,9 +819,6 @@ Channel:
     votes: '{votes} أصوات'
     Reveal Answers: كشف الإجابات
     Video hidden by FreeTube: تم إخفاء الفيديو بواسطة FreeTube
-    Viewing Posts Only Supported By Invidious: عرض المنشورات مدعوم فقط من قبل Invidious.
-      توجه إلى علامة التبويب مجتمع القناة لعرض المحتوى هناك دون Invidious.
-    View Full Post: عرض المنشور كاملا
   Live:
     Live: مباشر
     This channel does not currently have any live streams: لا يوجد حاليا أي بث مباشر
@@ -793,8 +861,38 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'المحادثة
     المباشرة غير مدعومة حالياً مع Invidious API. يلزم الاتصال المباشر بيوتيوب.'
   Published:
+    Jan: 'يناير'
+    Feb: 'فبراير'
+    Mar: 'مارس'
+    Apr: 'أبريل'
+    May: 'مايو'
+    Jun: 'يونيو'
+    Jul: 'يوليو'
+    Aug: 'أغسطس'
+    Sep: 'سبتمبر'
+    Oct: 'أكتوبر'
+    Nov: 'نوفمبر'
+    Dec: 'ديسمبر'
+    Second: 'ثانية'
+    Seconds: 'ثواني'
+    Minute: 'دقيقة'
+    Minutes: 'دقائق'
+    Hour: 'ساعة'
+    Hours: 'ساعات'
+    Day: 'يوم'
+    Days: 'أيام'
+    Week: 'أسبوع'
+    Weeks: 'أسابيع'
+    Month: 'شهر'
+    Months: 'شهور'
+    Year: 'سنة'
+    Years: 'سنوات'
+    Ago: 'منذ'
+    Upcoming: 'يبدأ العرض'
+    Less than a minute: أقل من دقيقة
     In less than a minute: في أقل من دقيقة
   Published on: 'نُشر في'
+  Publicationtemplate: 'قبل {number} {unit}'
 #& Videos
   Autoplay: تشغيل تلقائي
   Play Previous Video: شغل الفيديو السابق
@@ -852,43 +950,6 @@ Video:
   Unhide Channel: عرض القناة
   Hide Channel: إخفاء القناة
   More Options: المزيد من الخيارات
-  Player:
-    TranslatedCaptionTemplate: '{language} (مترجمة من "{originalLanguage}")'
-    Stats:
-      Volume: 'الحجم: {volumePercentage}%'
-      CodecAudio: 'برنامج الترميز: {audioCodec} ({audioItag})'
-      Media Formats: 'تنسيقات الوسائط: {formats}'
-      Player Dimensions: 'أبعاد المشغل: {width}×{height}'
-      Bitrate: 'معدل البت: {bitrate} كيلوبت في الثانية'
-      CodecsVideoAudioNoItags: 'برامج الترميز: {videoCodec} / {audioCodec}'
-      Buffered: 'المخزن المؤقت: {bufferedPercentage}%'
-      Dropped Frames / Total Frames: 'الإطارات المسقطة: {droppedFrames} / إجمالي الإطارات:
-        {totalFrames}'
-      CodecsVideoAudio: 'برامج الترميز: {videoCodec} ({videoItag}) / {audioCodec}
-        ({audioItag})'
-      Stats: الاحصائيات
-      Video ID: 'معرف الفيديو: {videoId}'
-      Resolution: 'الدقة: {width}x{height}@{frameRate}'
-      Bandwidth: 'عرض النطاق الترددي: {bandwidth} كيلوبت في الثانية'
-    Skipped segment: تم تخطي شريحة {segmentCategory}
-    Theatre Mode: وضع المسرح
-    Exit Theatre Mode: الخروج من وضع المسرح
-    Show Stats: عرض الاحصائيات
-    You appear to be offline: يبدو أنك غير متصل بالإنترنت.
-    Playback will resume automatically when your connection comes back: سيتم استئناف
-      التشغيل تلقائيًا عندما يعود اتصالك.
-    Audio Tracks: المسارات الصوتية
-    Full Window: الشاشة كاملة
-    Exit Full Window: الخروج من وضع الشاشة الكاملة
-    Take Screenshot: اخذ لقطة الشاشة
-    Hide Stats: اخفاء الاحصائيات
-  IP block: حظر YouTube عنوان IP الخاص بك من مشاهدة مقاطع الفيديو. يرجى محاولة التبديل
-    إلى VPN أو وكيل مختلف.
-  Unlisted: غير مدرج
-  AgeRestricted: لا يمكن مشاهدة مقاطع الفيديو المقيدة حسب العمر مع FreeTube لأنها
-    تتطلب تسجيل الدخول إلى Google واستخدام حساب YouTube تم التحقق من عمره.
-  MembersOnly: لا يمكن مشاهدة مقاطع الفيديو الخاصة بالأعضاء فقط مع FreeTube لأنها
-    تتطلب تسجيل الدخول إلى Google والعضوية المدفوعة لقناة القائم بالتحميل.
 Videos:
   #& Sort By
   Sort By:
@@ -899,6 +960,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'عرض قائمة التشغيل بالكامل'
+  Videos: 'الفيديوهات'
+  View: 'عرض'
+  Views: 'مشاهدات'
   Last Updated On: 'تم إجراء التعديل الأخير في'
 
 # On Video Watch Page
@@ -914,8 +978,7 @@ Playlist:
     VideoTitleAscending: العنوان (A-Z)
     VideoTitleDescending: العنوان (Z-A)
     Custom: مُخصّص
-    VideoDurationDescending: المدة (الاطول أولاً)
-    VideoDurationAscending: المدة (الأقصر أولاً)
+Toggle Theatre Mode: 'تمكين وضع المسرح'
 Change Format:
   Change Media Formats: 'تغيير تنسيقات الفيديو'
   Use Dash Formats: 'استخدم تنسيقات DASH'
@@ -923,8 +986,6 @@ Change Format:
   Use Audio Formats: 'استخدم تنسيقات الصوت'
   Audio formats are not available for this video: تنسيقات الصوت غير متوفرة لهذا الفيديو
   Dash formats are not available for this video: تنسيقات DASH غير متوفرة لهذا الفيديو
-  Legacy formats are not available for this video: لا تتوفر التنسيقات القديمة لهذا
-    الفيديو
 Share:
   Share Video: 'شارك الفيديو'
   Share Playlist: 'مشاركة قائمة التشغيل'
@@ -968,7 +1029,6 @@ Comments:
   View {replyCount} replies: عرض {replyCount} ردود
   Hearted: القلب
   Subscribed: مشترك
-  There are no comments available for this post: لا توجد تعليقات متاحة لهذا المنشور
 Up Next: 'التالي'
 
 # Toast Messages
@@ -976,6 +1036,7 @@ Local API Error (Click to copy): 'خطأ API المحلي (انقر للنسخ)'
 Invidious API Error (Click to copy): 'خطأ Invidious API ( انقر للنسخ)'
 Falling back to Invidious API: 'التراجع إلى Invidious API'
 Falling back to Local API: 'التراجع إلى API المحلي'
+Subscriptions have not yet been implemented: 'لم يتم تنفيذ الاشتراكات بعد'
 Loop is now disabled: 'تم تعطيل التكرار'
 Loop is now enabled: 'تم تمكين التكرار'
 Shuffle is now disabled: 'تم تعطيل التبديل العشوائي'
@@ -1011,8 +1072,8 @@ Tooltips:
     Region for Trending: الانتشار المحلي (Trend) يسمح لك بأن تشاهد الفيديوهات الأكثر
       انتشارا حسب الدولة. ليست كل الدول المعروضة في هذه القائمة مدعومة من طرف يوتيوب.
   Player Settings:
-    Proxy Videos Through Invidious: سيتم الاتصال بـ Invidious لعرض مقاطع الفيديو بدلاً
-      من إجراء اتصال مباشر بـ YouTube.
+    Proxy Videos Through Invidious: سيتم الاتصال ب Invidious لتقديم مقاطع الفيديو
+      بدلاً من إجراء اتصال مباشر مع يوتيوب. يلغي تفضيل الواجهة البرمجية.
     Default Video Format: حدّد التنسيقات المستخدمة عند تشغيل الفيديو. تنسيق داش (التدفق
       الميكانيكي المتكيّف عبر بروتوكول نقل النص التشعبي) يمكنها أن تُشغِّل جودات أعلى.
       التنسيقات القديمة محدودة بجودة 720p كحدّ أقصى لكنها تستخدم عرضًا أقل للنطاق.
@@ -1024,9 +1085,9 @@ Tooltips:
       يتم تغييره في الإعدادات).
     Skip by Scrolling Over Video Player: استخدم عجلة التمرير لتخطي الفيديو بنمط MPV.
   Subscription Settings:
-    Fetch Feeds from RSS: عند تمكينه، سيستخدم FreeTube RSS بدلاً من طريقته الافتراضية
-      للحصول على خلاصة اشتراكك. RSS أسرع ويمنع حظر IP، لكنه لا يوفر معلومات معينة
-      مثل مدة الفيديو أو الحالة المباشرة أو مشاركات المجتمع
+    Fetch Feeds from RSS: عند تفعيلها، سوف يستخدم فريتيوب طريقة RSS بدلًا من طريقته
+      المعتادة لجلب صفحة اشتراكاتك. طريقة RSS أسرع وتتخطى حجب الآي بي IP، لكنها لا
+      تقدّم معلومات معينة مثل مدّة الفيديو أو حالة البث المباشر
     Fetch Automatically: عند التمكين ، سيقوم FreeTube تلقائيا بجلب خلاصة الاشتراك
       الخاصة بك عند فتح نافذة جديدة وعند تبديل ملف التعريف.
   External Player Settings:
@@ -1067,6 +1128,8 @@ This video is unavailable because of missing formats. This can happen due to cou
 More: المزيد
 Playing Next Video Interval: سيتم تشغيل الفيديو التالي على الفور.| إضغط للإلغاء.|
   سيبدأ الفيديو التالي في {nextVideoInterval} ثانية.| إضغط للإلغاء.
+Hashtags have not yet been implemented, try again later: لم يتم تنفيذ علامات التصنيف
+  بعد، حاول مرة أخرى لاحقا
 Unknown YouTube url type, cannot be opened in app: نوع URL غير معروف على YouTube،
   لا يمكن فتحه في التطبيق
 Open New Window: افتح نافذة جديدة
@@ -1087,10 +1150,12 @@ Screenshot Error: فشل أخذ لقطة للشاشة. {error}
 New Window: نافذة جديدة
 Channels:
   Count: تم العثور على قناة (قنوات) {number}.
+  Unsubscribed: 'تمت إزالة {channelName} من اشتراكاتك'
   Channels: القنوات
   Title: قائمة القنوات
   Search bar placeholder: البحث في القنوات
   Empty: قائمة قنواتك فارغة حاليا.
+  Unsubscribe: إلغاء الاشتراك
   Unsubscribe Prompt: 'هل أنت متأكد من أنك تريد إلغاء الاشتراك من "{channelName}"؟'
 Clipboard:
   Cannot access clipboard without a secure connection: لا يمكن الوصول إلى الحافظة
@@ -1102,7 +1167,6 @@ Chapters:
     الحالي: {chapterName}'
   'Chapters list visible, current chapter: {chapterName}': 'قائمة الفصول المرئية ،
     الفصل الحالي: {chapterName}'
-  Key Moments: ‌العناصر الرئيسية
 Preferences: التفضيلات
 Ok: موافق
 Hashtag:
@@ -1140,10 +1204,5 @@ Search Listing:
     4K: 4K
     Closed Captions: التعاليق مغلقة
     Subtitles: التسميات التوضيحية
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: جديد
-    3D: ثلاثي الابعاد
 'Blocked opening potentially unsafe URL': 'تم حظر فتح الرابط الذي يحتمل أن يكون غير
   آمن: "{url}".'
diff --git a/static/locales/az.yaml b/static/locales/az.yaml
index 5fcddb2d28cad..86539cbbce30b 100644
--- a/static/locales/az.yaml
+++ b/static/locales/az.yaml
@@ -97,9 +97,7 @@ Subscriptions:
     profilin çoxlu sayda abunəsi var. Sürət məhdudiyyətinin qarşısını almaq üçün RSS-i
     zorlanır'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Abunəlik
-    siyahınız hazırda boşdur. Abunəliklərinizi idxal etmək istəyirsinizsə, Məlumat
-    Parametrlərinə gedib ''Abunəlikləri İdxal Et'' seçimini edə bilərsiniz və ya bir
-    kanal axtarıb abunə ola bilərsiniz.'
+    siyahınız hazırda boşdur. Abunəlikləri burada görmək üçün əlavə etməyə başlayın.'
   'Getting Subscriptions. Please wait.': 'Abunəliklərin əldə edilməsi. Zəhmət olmasa,
     gözləyin.'
   Refresh Subscriptions: 'Abunəlikləri Yeniləyin'
@@ -125,6 +123,12 @@ Most Popular: 'Ən Tanınmış'
 Playlists: 'Pleylistlər'
 User Playlists:
   Your Playlists: 'Pleylistləriniz'
+  Playlist Message: 'Bu səhifə tam işləyən pleylistləri əks etdirmir. O, yalnız saxladığınız
+    və ya sevimli seçdiyiniz videoları sadalayır. İş bitəndə, hazırda buradakı bütün
+    videolar "Sevimlilər" pleylistinə köçürüləcək.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Saxladığınız
+    videolar yoxdur. Videonun burada qeyd edilməsi üçün video küncündəki "saxla" düyməsin
+    klikləyin'
   Empty Search Message: 'Bu pleylistdə axtarışınıza uyğun video yoxdur'
   Search bar placeholder: 'Pleylist Axtar'
   Playlists with Matching Videos: Uyğun videolar olan pleylistlər
@@ -331,6 +335,7 @@ Settings:
   Player Settings:
     Screenshot: {}
   SponsorBlock Settings: {}
+  Expand All Settings Sections: Bütün Tənzimlər Bölmələrin Genişlət
   Sort Settings Sections (A-Z): Tənzimləmələr Bölmələrin Çeşidlə (AZ)
 Channel:
   Videos: {}
@@ -347,8 +352,6 @@ Global:
     Video Count: 1 video | {count} video
     Watching Count: 1 baxır | {count} baxır
     Channel Count: 1 kanal | {count} kanal
-    Like Count: 1 bəyəni | {sayı} bəyənmələr
-    Comment Count: 1 şərh | {sayı} şərhlər
   Videos: Videolar
   Live: Canlı
   Input Tags:
@@ -360,13 +363,10 @@ Search Listing:
     Closed Captions: Titrlər Bağlandı
     4K: 4K
     Subtitles: Titrlər
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Yeni
-    3D: 3D
 Channels:
   Empty: Kanal siyahınız hazırda boşdur.
+  Unsubscribe: Abunə olma
+  Unsubscribed: '{channelName} abunəliyinizdən silindi'
   Unsubscribe Prompt: '"{channelName}" / abunəliyi ləğv etmək istədiyinizə əminsiniz?'
   Channels: Kanallar
   Count: '{number} kanal tapıldı.'
diff --git a/static/locales/be.yaml b/static/locales/be.yaml
index 78f5f1a8dc80f..de0224d27cce1 100644
--- a/static/locales/be.yaml
+++ b/static/locales/be.yaml
@@ -42,7 +42,7 @@ Are you sure you want to open this link?: 'Вы ўпэўнены, што хоч
 # Anything shared among components / views should be put here
 Global:
   Videos: 'Відэа'
-  Shorts: 'Кароткія відэа'
+  Shorts: 'Shorts'
   Live: 'Ужывую'
   Community: 'Супольнасць'
   Counts:
@@ -55,8 +55,6 @@ Global:
 # Search Bar
     Like Count: 1 лайк | {count} лайкаў
     Comment Count: 1 каментарый | {count} каментарыяў
-  Input Tags:
-    Length Requirement: Даўжыня цэтліка павінна быць не менш за {number} сімвалаў
 Search / Go to URL: 'Пошук / Перайсці да URL'
 Search Bar:
   Clear Input: 'Ачысціць увод'
@@ -118,9 +116,7 @@ Subscriptions:
     гэтага профілю вялікая колькасць падпісак.  Прымусовае выкарыстанне RSS, каб пазбегнуць
     абмежавання хуткасці'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваш
-    спіс падпісак зараз пусты. Калі вы хочаце імпартаваць свае падпіскі, вы можаце
-    перайсці ў Налады даных і выбраць Імпартаваць падпіскі або вы можаце знайсці каналы
-    і падпісацца на іх.'
+    спіс падпісак зараз пусты. Пачніце дадаваць падпіскі, каб убачыць іх тут.'
   Disabled Automatic Fetching: 'Вы адключылі аўтаматычнае загрузку падпісак. Каб убачыць
     іх тут, абнавіце падпіскі.'
   Empty Channels: 'На каналах, на якія вы падпісаны, зараз няма відэа.'
@@ -139,6 +135,8 @@ Channels:
   Search bar placeholder: 'Пошук каналаў'
   Count: '{number} каналы(аў) знойдзена.'
   Empty: 'Ваш спіс каналаў зараз пусты.'
+  Unsubscribe: 'Адпісацца'
+  Unsubscribed: '{channelName} быў выдалены з вашых падпісак'
   Unsubscribe Prompt: 'Вы сапраўды хочаце адпісацца ад "{channelName}"?'
 Trending:
   Trending: 'У трэндзе'
@@ -151,6 +149,12 @@ Most Popular: 'Папулярныя'
 Playlists: 'Плэй-лісты'
 User Playlists:
   Your Playlists: 'Вашы плэй-лісты'
+  Playlist Message: 'Гэтая старонка не адлюстроўвае цалкам працоўныя плэй-лісты. Тут
+    пералічаны толькі відэа, якія вы захавалі або дадалі ў абранае. Калі праца будзе
+    завершана, усе відэа, якія знаходзяцца тут, будуць перанесены ў плэй-ліст «Выбранае».'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Вашы
+    захаваныя відэа пустыя. Націсніце на кнопку захавання ў куце відэа, каб яно з''явілася
+    тут'
   Empty Search Message: 'У гэтым плэй-лісце няма відэа, якія б адпавядалі вашаму пошуку'
   Search bar placeholder: 'Пошук плэй-лістоў'
   Create New Playlist: Стварыць новы плэй-ліст
@@ -219,9 +223,6 @@ User Playlists:
         гэтага відэа
       This playlist is already being used for quick bookmark.: Гэты плэй-ліст ужо
         выкарыстоўваецца для хуткай закладкі.
-      This playlist has a video with a duration error: Гэты плэй-ліст змяшчае прынамсі
-        адно відэа без працягласці. Яно будзе адсартаваны так, як быццам іх працягласць
-        роўная нулю.
     Search for Videos: Пошук відэа
   You have no playlists. Click on the create new playlist button to create a new one.: У
     вас няма плэй-лістоў. Націсніце на кнопку стварыць новы плэй-ліст, каб стварыць
@@ -277,7 +278,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: 'Праграму
     трэба перазапусціць, каб змены ўступілі ў сілу. Перазапусціць і прымяніць змены?'
   General Settings:
-    General Settings: 'Агульныя'
+    General Settings: 'Агульныя налады'
     Check for Updates: 'Праверыць наяўнасць абнаўленняў'
     Check for Latest Blog Posts: 'Праверыць апошнія паведамленні ў блогу'
     Fallback to Non-Preferred Backend on Failure: 'Вяртанне да непераважнага бэкэнда
@@ -288,7 +289,7 @@ Settings:
     System Default: 'Налада сістэмы'
     Preferred API Backend:
       Preferred API Backend: 'Пераважны бэкэнд API'
-      Local API: 'Лакальны API'
+      Local API: 'Мясцовы API'
       Invidious API: 'Invidious API'
     Video View Type:
       Video View Type: 'Тып прагляду відэа'
@@ -315,7 +316,7 @@ Settings:
     Region for Trending: 'Рэгіён для Трэндаў'
     #! List countries
     External Link Handling:
-      External Link Handling: 'Апрацоўка вонкавых спасылак'
+      External Link Handling: 'Апрацоўка знешніх спасылак'
       Open Link: 'Адкрыць спасылку'
       Ask Before Opening Link: 'Спытаць, перш чым адкрываць спасылку'
       No Action: 'Без дзеянняў'
@@ -323,7 +324,7 @@ Settings:
       Label: Аўтаматычная загрузка наступнай старонкі
       Tooltip: Аўтаматычна загружаць дадатковыя старонкі і каментарыі.
   Theme Settings:
-    Theme Settings: 'Тэма'
+    Theme Settings: 'Налады тэмы'
     Match Top Bar with Main Color: 'Выкарыстоўваць асноўны колер да верхняй панэлі'
     Expand Side Bar by Default: 'Разгарнуць бакавую панэль па змаўчанні'
     Disable Smooth Scrolling: 'Адключыць плыўную пракрутку'
@@ -341,8 +342,8 @@ Settings:
       Pastel Pink: 'Пастэльна-ружовая'
       Hot Pink: 'Ярка-ружовая'
       Nordic: Nordic
-      Solarized Dark: Solarized Цёмная
-      Solarized Light: Solarized Светлая
+      Solarized Dark: Solarized Dark
+      Solarized Light: Solarized Light
     Main Color Theme:
       Main Color Theme: 'Асноўны колер тэмы'
       Red: 'Чырвоны'
@@ -393,34 +394,32 @@ Settings:
     Secondary Color Theme: 'Другасны колер тэмы'
         #* Main Color Theme
   Player Settings:
-    Player Settings: 'Прайгравальнік'
+    Player Settings: 'Налады плэера'
     Play Next Video: 'Прайграваць наступнае відэа'
     Turn on Subtitles by Default: 'Уключыць субцітры па змаўчанні'
     Autoplay Videos: 'Аўтапрайграванне відэа'
     Proxy Videos Through Invidious: 'Глядзець відэа праз проксі Invidious'
     Autoplay Playlists: 'Аўтапрайграванне плэй-лістоў'
     Enable Theatre Mode by Default: 'Уключыць рэжым тэатра па змаўчанні'
-    Scroll Volume Over Video Player: 'Прагортваць гучнасці па-над відэапрайгравальнікам'
-    Scroll Playback Rate Over Video Player: 'Прагортваць хуткасць прайгравання па-над
-      відэапрайгравальнікам'
-    Skip by Scrolling Over Video Player: 'Прапусціць, прагарнуўшы відэапрайгравальнік'
-    Display Play Button In Video Player: 'Адлюстроўваць кнопку прайгравання ў відэапрайгравальніку'
-    Enter Fullscreen on Display Rotate: 'Пераходзіць у поўнаэкранны рэжым пры павароце
-      дысплэя'
-    Next Video Interval: 'Інтэрвал да наступнага відэа'
-    Fast-Forward / Rewind Interval: 'Інтэрвал перамоткі наперад / назад'
-    Default Volume: 'Гучнасць па змаўчанні'
-    Default Playback Rate: 'Хуткасць прайгравання па змаўчанні'
-    Max Video Playback Rate: 'Максімальная хуткасць прайгравання відэа'
-    Video Playback Rate Interval: 'Інтэрвал хуткасці прайгравання відэа'
+    Scroll Volume Over Video Player: ''
+    Scroll Playback Rate Over Video Player: ''
+    Skip by Scrolling Over Video Player: ''
+    Display Play Button In Video Player: ''
+    Enter Fullscreen on Display Rotate: ''
+    Next Video Interval: ''
+    Fast-Forward / Rewind Interval: ''
+    Default Volume: ''
+    Default Playback Rate: ''
+    Max Video Playback Rate: ''
+    Video Playback Rate Interval: ''
     Default Video Format:
-      Default Video Format: 'Фармат відэа па змаўчанні'
-      Dash Formats: 'Фарматы DASH'
-      Legacy Formats: 'Састарэлыя фарматы'
-      Audio Formats: 'Аўдыё фарматы'
+      Default Video Format: ''
+      Dash Formats: ''
+      Legacy Formats: ''
+      Audio Formats: ''
     Default Quality:
-      Default Quality: 'Якасць па змаўчанні'
-      Auto: 'Аўта'
+      Default Quality: ''
+      Auto: ''
       144p: '144p'
       240p: '240p'
       360p: '360p'
@@ -431,484 +430,400 @@ Settings:
       4k: '4k'
       8k: '8k'
     Screenshot:
-      Enable: 'Уключыць здымак экрана'
-      Format Label: 'Фармат здымка'
-      Quality Label: 'Якасць здымка'
-      Ask Path: 'Пытаць папку для захоўвання'
-      Folder Label: 'Папка для здымкаў'
-      Folder Button: 'Выбраць папку'
-      File Name Label: 'Шаблон назвы файла'
-      File Name Tooltip: 'Вы можаце выкарыстоўваць пераменныя ніжэй. %Y Год 4 лічбы.
-        %M Месяц 2 лічбы. %D Дні 2 лічбы. %H Гадзіны 2 лічбы. %N Хвіліны 2 лічбы.
-        %S Секунды 2 лічбы. %T Мілісекунды 3 лічбы. %s Секунды відэа. %t Мілісекунды
-        відэа 3 лічбы. %i Ідэнтыфікатар відэа. Вы таксама можаце выкарыстоўваць "\"
-        або "/" для стварэння падпапак.'
+      Enable: ''
+      Format Label: ''
+      Quality Label: ''
+      Ask Path: ''
+      Folder Label: ''
+      Folder Button: ''
+      File Name Label: ''
+      File Name Tooltip: ''
       Error:
-        Forbidden Characters: 'Забароненыя сімвалы'
-        Empty File Name: 'Пустая назва файла'
+        Forbidden Characters: ''
+        Empty File Name: ''
   External Player Settings:
-    External Player Settings: 'Вонкавы прайгравальнік'
-    External Player: 'Вонкавы прайгравальнік'
-    Ignore Unsupported Action Warnings: 'Ігнараваць папярэджанні аб дзеяннях, якія
-      не падтрымліваюцца'
-    Custom External Player Executable: 'Шлях да ўласнага вонкавага прайгравальніка'
-    Custom External Player Arguments: 'Аргументы вонкавага прайгравальніка'
+    External Player Settings: ''
+    External Player: ''
+    Ignore Unsupported Action Warnings: ''
+    Custom External Player Executable: ''
+    Custom External Player Arguments: ''
     Players:
       None:
-        Name: 'Ніякі'
-    Ignore Default Arguments: Ігнараваць аргументы па змаўчанні
+        Name: ''
   Privacy Settings:
-    Privacy Settings: 'Прыватнасць'
-    Remember History: 'Памятаць гісторыю'
-    Save Watched Progress: 'Захоўваць прагрэс прагляду'
-    Save Watched Videos With Last Viewed Playlist: 'Захоўваць прагледжаныя відэа з
-      апошнім прагледжаным плэй-лістам'
-    Clear Search Cache: 'Ачысціць кэш пошуку'
-    Are you sure you want to clear out your search cache?: 'Вы ўпэўнены, што хочаце
-      ачысціць кэш пошуку?'
-    Search cache has been cleared: 'Кэш пошуку ачышчаны'
-    Remove Watch History: 'Выдаліць гісторыю праглядаў'
-    Are you sure you want to remove your entire watch history?: 'Вы ўпэўнены, што
-      хочаце выдаліць усю гісторыю праглядаў?'
-    Watch history has been cleared: 'Гісторыя праглядаў ачышчана'
-    Remove All Subscriptions / Profiles: 'Выдаліць усе падпіскі / профілі'
-    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'Вы
-      ўпэўнены, што хочаце выдаліць усе падпіскі і профілі?  Гэта нельга адмяніць.'
-    Are you sure you want to remove all your playlists?: Вы ўпэўнены, што хочаце выдаліць
-      усе свае плэй-лісты?
-    Remove All Playlists: Выдаліць усе плэй-лісты
-    All playlists have been removed: Усе плэй-лісты былі выдалены
+    Privacy Settings: ''
+    Remember History: ''
+    Save Watched Progress: ''
+    Save Watched Videos With Last Viewed Playlist: ''
+    Clear Search Cache: ''
+    Are you sure you want to clear out your search cache?: ''
+    Search cache has been cleared: ''
+    Remove Watch History: ''
+    Are you sure you want to remove your entire watch history?: ''
+    Watch history has been cleared: ''
+    Remove All Subscriptions / Profiles: ''
+    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
   Subscription Settings:
-    Subscription Settings: 'Падпіскі'
-    Hide Videos on Watch: 'Хаваць відэа пасля прагляду'
-    Fetch Feeds from RSS: 'Атрымліваць стужкі з RSS'
-    Fetch Automatically: 'Аўтаматычна атрымліваць стужку'
-    Confirm Before Unsubscribing: Пацвердзіце перад тым як адпісацца
+    Subscription Settings: ''
+    Hide Videos on Watch: ''
+    Fetch Feeds from RSS: ''
+    Manage Subscriptions: ''
+    Fetch Automatically: ''
   Distraction Free Settings:
-    Distraction Free Settings: 'Адцягненне ўвагі'
+    Distraction Free Settings: ''
     Sections:
-      Side Bar: 'Бакавая панэль'
-      Subscriptions Page: 'Старонка падпісак'
-      Channel Page: 'Старонка каналу'
-      Watch Page: 'Старонка прагляду'
-      General: 'Агульныя'
-    Hide Video Views: 'Хаваць прагляды відэа'
-    Hide Video Likes And Dislikes: 'Хаваць лайкі і дызлайкі да відэа'
-    Hide Channel Subscribers: 'Хаваць падпісчыкаў каналу'
-    Hide Comment Likes: 'Хаваць лайкі да каментарыяў'
-    Hide Recommended Videos: 'Хаваць рэкамендаваныя відэа'
-    Hide Trending Videos: 'Схаваць трэндавыя відэа'
-    Hide Popular Videos: 'Хаваць папулярныя відэа'
-    Hide Playlists: 'Хаваць плэй-лісты'
-    Hide Live Chat: 'Хаваць жывы чат'
-    Hide Active Subscriptions: 'Хаваць актыўныя падпіскі'
-    Hide Video Description: 'Хаваць апісанне відэа'
-    Hide Comments: 'Хаваць каментарыі'
-    Hide Profile Pictures in Comments: 'Хаваць фатаграфіі профіляў у каментарыях'
-    Display Titles Without Excessive Capitalisation: 'Адлюстроўвайце загалоўкі без
-      празмерных вялікіх літар і знакаў прыпынку'
-    Hide Live Streams: 'Хаваць жывыя трансляцыі'
-    Hide Upcoming Premieres: 'Хаваць будучыя прэм''еры'
-    Hide Sharing Actions: 'Хаваць дзеянні абагульвання'
-    Hide Chapters: 'Хаваць раздзелы'
-    Hide Channels: 'Хаваць відэа з каналаў'
-    Hide Channels Placeholder: 'Ідэнтыфікатар канала'
-    Hide Featured Channels: 'Хаваць прапанаваныя каналы'
-    Hide Channel Playlists: 'Хаваць плэй-лісты канала'
-    Hide Channel Community: 'Хаваць супольнасць канала'
-    Hide Channel Shorts: 'Хаваць кароткія відэа канала'
-    Hide Channel Podcasts: 'Хаваць падкасты канала'
-    Hide Channel Releases: 'Хаваць выпускі канала'
-    Hide Subscriptions Videos: 'Хаваць відэа з падпісак'
-    Hide Subscriptions Shorts: 'Хаваць кароткія відэа з падпісак'
-    Hide Subscriptions Live: 'Хаваць жывыя трансляцыі з падпісак'
-    Hide Subscriptions Community: 'Хаваць супольнасць падпісак'
-    Hide Channels Already Exists: Ідэнтыфікатар канала ўжо існуе
-    Hide Videos and Playlists Containing Text: Хаваць відэа і плэй-лісты, якія змяшчаюць
-      тэкст
-    Hide Videos and Playlists Containing Text Placeholder: Слова, фрагмент слова або
-      фраза
-    Hide Channels Disabled Message: Некаторыя каналы былі заблакіраваны з дапамогай
-      ідэнтыфікатара і не былі апрацаваны. Функцыя заблакіравана, пакуль гэтыя ідэнтыфікатары
-      абнаўляюцца
-    Hide Channels Invalid: Памылковы ідэнтыфікатар канала
-    Hide Channels API Error: Памылка атрымання карыстальніка з указаным ідэнтыфікатарам.
-      Праверце яшчэ раз, ці правільны ідэнтыфікатар.
+      Side Bar: ''
+      Subscriptions Page: ''
+      Channel Page: ''
+      Watch Page: ''
+      General: ''
+    Blur Thumbnails: ''
+    Hide Video Views: ''
+    Hide Video Likes And Dislikes: ''
+    Hide Channel Subscribers: ''
+    Hide Comment Likes: ''
+    Hide Recommended Videos: ''
+    Hide Trending Videos: ''
+    Hide Popular Videos: ''
+    Hide Playlists: ''
+    Hide Live Chat: ''
+    Hide Active Subscriptions: ''
+    Hide Video Description: ''
+    Hide Comments: ''
+    Hide Profile Pictures in Comments: ''
+    Display Titles Without Excessive Capitalisation: ''
+    Hide Live Streams: ''
+    Hide Upcoming Premieres: ''
+    Hide Sharing Actions: ''
+    Hide Chapters: ''
+    Hide Channels: ''
+    Hide Channels Placeholder: ''
+    Hide Featured Channels: ''
+    Hide Channel Playlists: ''
+    Hide Channel Community: ''
+    Hide Channel Shorts: ''
+    Hide Channel Podcasts: ''
+    Hide Channel Releases: ''
+    Hide Subscriptions Videos: ''
+    Hide Subscriptions Shorts: ''
+    Hide Subscriptions Live: ''
+    Hide Subscriptions Community: ''
   Data Settings:
-    Data Settings: 'Даныя'
-    Select Import Type: 'Выбраць тып імпарту'
-    Select Export Type: 'Выбраць тып экспарту'
-    Import Subscriptions: 'Імпарт падпісак'
-    Subscription File: 'Файл падпіскі'
-    History File: 'Файл гісторыі'
-    Playlist File: 'Файл плэй-лісту'
-    Export Subscriptions: 'Экспарт падпісак'
-    Export FreeTube: 'Экспарт FreeTube'
-    Export YouTube: 'Экспарт YouTube'
-    Export NewPipe: 'Экспарт NewPipe'
-    Import History: 'Імпарт гісторыі'
-    Export History: 'Экспарт гісторыі'
-    Import Playlists: 'Імпарт плэй-лістоў'
-    Export Playlists: 'Экспарт плэй-лістоў'
-    Profile object has insufficient data, skipping item: 'Аб''ект профілю мае недастаткова
-      даных, пропуск элемента'
-    All subscriptions and profiles have been successfully imported: 'Усе падпіскі
-      і профілі былі паспяхова імпартаваны'
-    All subscriptions have been successfully imported: 'Усе падпіскі былі паспяхова
-      імпартаваны'
-    Invalid subscriptions file: 'Няправільны файл падпісак'
+    Data Settings: ''
+    Select Import Type: ''
+    Select Export Type: ''
+    Import Subscriptions: ''
+    Subscription File: ''
+    History File: ''
+    Playlist File: ''
+    Check for Legacy Subscriptions: ''
+    Export Subscriptions: ''
+    Export FreeTube: ''
+    Export YouTube: ''
+    Export NewPipe: ''
+    Import History: ''
+    Export History: ''
+    Import Playlists: ''
+    Export Playlists: ''
+    Profile object has insufficient data, skipping item: ''
+    All subscriptions and profiles have been successfully imported: ''
+    All subscriptions have been successfully imported: ''
+    Invalid subscriptions file: ''
     This might take a while, please wait: ''
-    Invalid history file: 'Няправільны файл гісторыі'
-    Subscriptions have been successfully exported: 'Падпіскі былі паспяхова экспартаваныя'
-    History object has insufficient data, skipping item: 'Аб''ект гісторыі мае недастаткова
-      даных, пропуск элемента'
-    All watched history has been successfully imported: 'Уся гісторыя праглядаў была
-      паспяхова імпартавана'
-    All watched history has been successfully exported: 'Уся гісторыя праглядаў была
-      паспяхова экспартавана'
-    Playlist insufficient data: 'Недастаткова даных для плэй-ліста "{playlist}", пропуск
-      элемента'
-    All playlists has been successfully imported: 'Усе плэй-лісты былі паспяхова імпартаваны'
-    All playlists has been successfully exported: 'Усе плэй-лісты былі паспяхова экспартаваны'
-    Unable to read file: 'Немагчыма прачытаць файл'
-    Unable to write file: 'Немагчыма запісаць файл'
-    Unknown data key: 'Невядомы ключ даных'
-    How do I import my subscriptions?: 'Як мне імпартаваць свае падпіскі?'
-    Manage Subscriptions: 'Кіраванне падпіскамі'
-    Export Playlists For Older FreeTube Versions:
-      Label: Экспарт плэй-лістоў для старых версій FreeTube
-      Tooltip: "Гэты параметр экспартуе відэа з усіх плэй-лістоў у адзін плэй-ліст
-        пад назвай «Выбранае».\nЯк экспартаваць і імпартаваць відэа ў плэй-лісты для
-        старой версіі FreeTube:\n1. Экспартуйце свае плэй-лісты з уключанай опцыяй.\n
-        2. Выдаліце ўсе існуючыя плэй-лісты, выкарыстоўваючы опцыю «Выдаліць усе плэй-лісты»
-        ў раздзеле «Налады прыватнасці».\n3. Запусціце старую версію FreeTube і імпартуйце
-        экспартаваныя плэй-лісты.\""
+    Invalid history file: ''
+    Subscriptions have been successfully exported: ''
+    History object has insufficient data, skipping item: ''
+    All watched history has been successfully imported: ''
+    All watched history has been successfully exported: ''
+    Playlist insufficient data: ''
+    All playlists has been successfully imported: ''
+    All playlists has been successfully exported: ''
+    Unable to read file: ''
+    Unable to write file: ''
+    Unknown data key: ''
+    How do I import my subscriptions?: ''
+    Manage Subscriptions: ''
   Proxy Settings:
-    Proxy Settings: 'Проксі'
-    Enable Tor / Proxy: 'Уключыць Tor / Проксі'
-    Proxy Protocol: 'Пратакол проксі'
-    Proxy Host: 'Адрас проксі'
-    Proxy Port Number: 'Нумар порта проксі'
-    Clicking on Test Proxy will send a request to: 'Пры націску на "Тэст проксі" будзе
-      адпраўлены запыт на'
-    Test Proxy: 'Тэст проксі'
-    Your Info: 'Ваша інфармацыя'
-    Ip: 'IP'
-    Country: 'Краіна'
-    Region: 'Рэгіён'
-    City: 'Горад'
-    Error getting network information. Is your proxy configured properly?: 'Памылка
-      атрымання інфармацыі аб сетцы. Ці правільна наладжаны ваш проксі?'
+    Proxy Settings: ''
+    Enable Tor / Proxy: ''
+    Proxy Protocol: ''
+    Proxy Host: ''
+    Proxy Port Number: ''
+    Clicking on Test Proxy will send a request to: ''
+    Test Proxy: ''
+    Your Info: ''
+    Ip: ''
+    Country: ''
+    Region: ''
+    City: ''
+    Error getting network information. Is your proxy configured properly?: ''
   SponsorBlock Settings:
-    SponsorBlock Settings: 'SponsorBlock'
-    Enable SponsorBlock: 'Уключыць SponsorBlock'
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'URL-адрас SponsorBlock
-      API (па змаўчанні https://sponsor.ajay.app)'
-    Notify when sponsor segment is skipped: 'Апавяшчаць, калі сегмент спонсара прапушчаны'
-    UseDeArrowTitles: 'Выкарыстоўваць загалоўкі відэа DeArrow'
+    SponsorBlock Settings: ''
+    Enable SponsorBlock: ''
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
+    Notify when sponsor segment is skipped: ''
+    UseDeArrowTitles: ''
     Skip Options:
-      Skip Option: 'Прапусціць варыянт'
-      Auto Skip: 'Аўтаматычны пропуск'
-      Show In Seek Bar: 'Паказваць на панэлі перамоткі'
-      Prompt To Skip: 'Прапаноўваць прапусціць'
-      Do Nothing: 'Нічога не рабіць'
-    Category Color: 'Колер катэгорыі'
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': URL-адрас
-      API генератара мініяцюр DeArrow (па змаўчанні https://dearrow-thumb.ajay.app)
-    UseDeArrowThumbnails: Выкарыстоўваць DeArrow для мініяцюр
+      Skip Option: ''
+      Auto Skip: ''
+      Show In Seek Bar: ''
+      Prompt To Skip: ''
+      Do Nothing: ''
+    Category Color: ''
   Parental Control Settings:
-    Parental Control Settings: 'Бацькоўскі кантроль'
-    Hide Unsubscribe Button: 'Хаваць кнопку адпіскі'
-    Show Family Friendly Only: 'Паказаць толькі для сямейнага прагляду'
-    Hide Search Bar: 'Хаваць панэль пошуку'
+    Parental Control Settings: ''
+    Hide Unsubscribe Button: ''
+    Show Family Friendly Only: ''
+    Hide Search Bar: ''
   Download Settings:
-    Download Settings: 'Спампоўка'
-    Ask Download Path: 'Пытаць шлях спампоўкі'
-    Choose Path: 'Выберыце шлях'
-    Download Behavior: 'Паводзіны спампоўкі'
-    Download in app: 'Спампоўваць у праграме'
-    Open in web browser: 'Адкрываць у вэб-браўзеры'
+    Download Settings: ''
+    Ask Download Path: ''
+    Choose Path: ''
+    Download Behavior: ''
+    Download in app: ''
+    Open in web browser: ''
   Experimental Settings:
-    Experimental Settings: 'Эксперыменты'
-    Warning: 'Гэтыя налады з''яўляюцца эксперыментальнымі, яны могуць выклікаць збоі,
-      пакуль уключаны. Настойліва рэкамендуецца рабіць рэзервовыя копіі. Выкарыстоўвайце
-      на свой страх і рызыку!'
-    Replace HTTP Cache: 'Замяніць кэш HTTP'
+    Experimental Settings: ''
+    Warning: ''
+    Replace HTTP Cache: ''
   Password Dialog:
-    Password: 'Пароль'
-    Enter Password To Unlock: 'Каб разблакіраваць налады, увядзіце пароль'
-    Password Incorrect: 'Пароль няправільны'
-    Unlock: 'Разблакіраваць'
+    Password: ''
+    Enter Password To Unlock: ''
+    Password Incorrect: ''
+    Unlock: ''
   Password Settings:
-    Password Settings: 'Пароль'
-    Set Password To Prevent Access: 'Задайце пароль, каб забараніць доступ да налад'
-    Set Password: 'Задаць пароль'
-    Remove Password: 'Выдаліць пароль'
+    Password Settings: ''
+    Set Password To Prevent Access: ''
+    Set Password: ''
+    Remove Password: ''
   Sort Settings Sections (A-Z): Сартаваць раздзелы налад (А-Я)
-  Return to Settings Menu: Вярнуцца ў меню налад
+  Expand All Settings Sections: Разгарнуць усе раздзелы налад
 About:
   #On About page
   About: 'Пра FreeTube'
-  Beta: 'Бэта-версія'
-  Source code: 'Зыходны код'
-  Downloads / Changelog: 'Спампоўкі / Журнал змяненняў'
-  GitHub releases: 'Выпускі GitHub'
+  Beta: ''
+  Source code: ''
+  Licensed under the AGPLv3: ''
+  View License: ''
+  Downloads / Changelog: ''
+  GitHub releases: ''
   Help: 'Даведка'
   FreeTube Wiki: 'FreeTube Вікі'
-  FAQ: 'Частыя пытанні'
-  Discussions: 'Абмеркаванні'
-  Report a problem: 'Паведаміць пра праблему'
-  GitHub issues: 'Праблемы на GitHub'
-  Please check for duplicates before posting: 'Перад публікацыяй праверце наяўнасць
-    дублікатаў'
+  FAQ: ''
+  Discussions: ''
+  Report a problem: ''
+  GitHub issues: ''
+  Please check for duplicates before posting: ''
   Website: 'Вэб-сайт'
   Blog: 'Блог'
   Email: 'Электронная пошта'
-  Mastodon: 'Mastodon'
-  Chat on Matrix: 'Чат у Matrix'
-  Please read the: 'Прачытайце'
-  room rules: 'правілы пакоя'
-  Translate: 'Перакласці'
-  Credits: 'Удзельнікі'
-  FreeTube is made possible by: 'FreeTube стаў магчымым дзякуючы'
-  these people and projects: 'гэтым людзям і праектам'
-  Donate: 'Ахвяраваць'
+  Mastodon: ''
+  Chat on Matrix: ''
+  Please read the: ''
+  room rules: ''
+  Translate: ''
+  Credits: ''
+  FreeTube is made possible by: ''
+  these people and projects: ''
+  Donate: ''
 
   AGPLv3: AGPLv3
-  Licensed under the: Пад ліцэнзіяй
 Profile:
-  Profile Settings: 'Профіль'
-  Toggle Profile List: 'Пераключыць спіс профіляў'
-  Profile Select: 'Выбар профілю'
-  Profile Filter: 'Фільтр профілю'
+  Profile Settings: ''
+  Toggle Profile List: ''
+  Profile Select: ''
+  Profile Filter: ''
   All Channels: 'Усе каналы'
-  Profile Manager: 'Кіраванне профілямі'
-  Create New Profile: 'Стварыць новы профіль'
-  Edit Profile: 'Рэдагаваць профіль'
-  Color Picker: 'Выбар колеру'
-  Custom Color: 'Нестандартны колер'
-  Profile Preview: 'Папярэдні прагляд профілю'
-  Create Profile: 'Стварыць профіль'
-  Update Profile: 'Абнавіць профіль'
-  Make Default Profile: 'Зрабіць профілем па змаўчанні'
-  Delete Profile: 'Выдаліць профіль'
-  Are you sure you want to delete this profile?: 'Вы ўпэўнены, што хочаце выдаліць
-    гэты профіль?'
-  All subscriptions will also be deleted.: 'Усе падпіскі таксама будуць выдалены.'
-  Profile could not be found: 'Профіль не знойдзены'
-  Your profile name cannot be empty: 'Назва вашага профілю не можа быць пустой'
-  Profile has been created: 'Профіль створаны'
-  Profile has been updated: 'Профіль абноўлены'
-  Your default profile has been set to {profile}: 'Профілем па змаўчанню заданы {profile}'
-  Removed {profile} from your profiles: '{profile} выдалены з вашых профіляў'
-  Your default profile has been changed to your primary profile: 'Ваш профіль па змаўчанні
-    быў зменены на асноўны'
-  '{profile} is now the active profile': '{profile} цяпер актыўны профіль'
-  Subscription List: 'Спіс падпісак'
-  Other Channels: 'Іншыя каналы'
-  '{number} selected': '{number} выбрана'
-  Select All: 'Выбраць усе'
-  Select None: 'Ачысціць'
-  Delete Selected: 'Выдаліць выбранае'
-  Add Selected To Profile: 'Дадаць выбранае ў профіль'
-  No channel(s) have been selected: 'Канал(-ы) не выбраны'
+  Profile Manager: ''
+  Create New Profile: ''
+  Edit Profile: ''
+  Color Picker: ''
+  Custom Color: ''
+  Profile Preview: ''
+  Create Profile: ''
+  Update Profile: ''
+  Make Default Profile: ''
+  Delete Profile: ''
+  Are you sure you want to delete this profile?: ''
+  All subscriptions will also be deleted.: ''
+  Profile could not be found: ''
+  Your profile name cannot be empty: ''
+  Profile has been created: ''
+  Profile has been updated: ''
+  Your default profile has been set to {profile}: ''
+  Removed {profile} from your profiles: ''
+  Your default profile has been changed to your primary profile: ''
+  '{profile} is now the active profile': ''
+  Subscription List: ''
+  Other Channels: ''
+  '{number} selected': ''
+  Select All: ''
+  Select None: ''
+  Delete Selected: ''
+  Add Selected To Profile: ''
+  No channel(s) have been selected: ''
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
-  : 'Гэта ваш асноўны профіль.  Вы ўпэўнены, што хочаце выдаліць выбраныя каналы?  Тыя
-    ж каналы будуць выдалены ў любым профілі, у якім яны знаходзяцца.'
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Вы
-    ўпэўнены, што хочаце выдаліць выбраныя каналы?  Канал не будзе выдалены з іншых
-    профіляў.'
+  : ''
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
 #On Channel Page
-  Edit Profile Name: Рэдагаваць назву профілю
-  Create Profile Name: Стварыце назву профілю
-  Profile Name: Назва профілю
-  Close Profile Dropdown: Зачыніць выпадное меню профілю
-  Open Profile Dropdown: Адкрыць выпадное меню профілю
 Channel:
-  Subscribe: 'Падпісацца'
-  Unsubscribe: 'Адпісацца'
-  Channel has been removed from your subscriptions: 'Канал быў выдалены з вашых падпісак'
-  Removed subscription from {count} other channel(s): 'Выдалена падпіска з {count}
-    іншых каналаў'
-  Added channel to your subscriptions: 'Канал дададзены да вашых падпісак'
-  Search Channel: 'Шукаць на канале'
-  Your search results have returned 0 results: 'Пошук даў 0 вынікаў'
-  Sort By: 'Сартаваць'
-  This channel does not exist: 'Гэты канал не існуе'
-  This channel does not allow searching: 'Гэты канал не дазваляе шукаць'
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Гэты
-    канал абмежаваны па ўзросце, і зараз яго нельга праглядаць у FreeTube.'
-  Channel Tabs: 'Укладкі каналу'
+  Subscribe: ''
+  Unsubscribe: ''
+  Channel has been removed from your subscriptions: ''
+  Removed subscription from {count} other channel(s): ''
+  Added channel to your subscriptions: ''
+  Search Channel: ''
+  Your search results have returned 0 results: ''
+  Sort By: ''
+  This channel does not exist: ''
+  This channel does not allow searching: ''
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
+  Channel Tabs: ''
   Videos:
-    Videos: 'Відэа'
-    This channel does not currently have any videos: 'Зараз на гэтым канале няма відэа'
+    Videos: ''
+    This channel does not currently have any videos: ''
     Sort Types:
-      Newest: 'Самае новае'
-      Oldest: 'Самае старое'
-      Most Popular: 'Самае папулярнае'
+      Newest: ''
+      Oldest: ''
+      Most Popular: ''
   Shorts:
-    This channel does not currently have any shorts: 'Зараз на гэтым канале няма кароткіх
-      відэа'
+    This channel does not currently have any shorts: ''
   Live:
-    Live: 'Ужывую'
-    This channel does not currently have any live streams: 'Зараз на гэтым канале
-      няма жывых трансляцый'
+    Live: ''
+    This channel does not currently have any live streams: ''
   Playlists:
-    Playlists: 'Плэй-лісты'
-    This channel does not currently have any playlists: 'Зараз на гэтым канале няма
-      плэй-лістоў'
+    Playlists: ''
+    This channel does not currently have any playlists: ''
     Sort Types:
-      Last Video Added: 'Апошняе дададзенае відэа'
-      Newest: 'Самае новае'
-      Oldest: 'Самае старое'
+      Last Video Added: ''
+      Newest: ''
+      Oldest: ''
   Podcasts:
-    Podcasts: 'Падкасты'
-    This channel does not currently have any podcasts: 'Зараз на гэтым канале няма
-      падкастаў'
+    Podcasts: ''
+    This channel does not currently have any podcasts: ''
   Releases:
-    Releases: 'Выпускі'
-    This channel does not currently have any releases: 'Зараз на гэтым канале няма
-      выпускаў'
+    Releases: ''
+    This channel does not currently have any releases: ''
   About:
-    About: 'Пра канал'
-    Channel Description: 'Апісанне канала'
+    About: ''
+    Channel Description: ''
     Tags:
-      Tags: 'Цэтлікі'
-      Search for: 'Шукаць "{tag}"'
-    Details: 'Падрабязнасці'
-    Joined: 'Далучыўся'
-    Location: 'Месцазнаходжанне'
-    Featured Channels: 'Рэкамендаваныя каналы'
+      Tags: ''
+      Search for: ''
+    Details: ''
+    Joined: ''
+    Location: ''
+    Featured Channels: ''
   Community:
-    This channel currently does not have any posts: 'Зараз на гэтым канале няма паведамленняў'
-    votes: '{votes} галасоў'
-    Reveal Answers: 'Адкрыць адказы'
-    Hide Answers: 'Схаваць адказы'
-    Video hidden by FreeTube: Відэа схавана FreeTube'ам
-    View Full Post: Глядзець поўны пост
-    Viewing Posts Only Supported By Invidious: Прагляд паведамленняў падтрымліваецца
-      толькі ў Invidious. Перайдзіце на ўкладку супольнасці канала, каб праглядзець
-      там змесціва без Invidious.
+    This channel currently does not have any posts: ''
+    votes: ''
+    Reveal Answers: ''
+    Hide Answers: ''
 Video:
-  Mark As Watched: 'Пазначыць як прагледжанае'
-  Remove From History: 'Выдаліць з гісторыі'
-  Video has been marked as watched: 'Відэа было пазначана як прагледжанае'
-  Video has been removed from your history: 'Відэа было выдалена з вашай гісторыі'
-  Save Video: 'Захаваць відэа'
-  Video has been saved: 'Відэа захавана'
-  Video has been removed from your saved list: 'Відэа было выдалена з вашага спісу
-    захаваных'
-  Open in YouTube: 'Адкрыць у YouTube'
-  Copy YouTube Link: 'Скапіяваць спасылку YouTube'
-  Open YouTube Embedded Player: 'Адкрыць убудаваны прайгравальнік YouTube'
-  Copy YouTube Embedded Player Link: 'Скапіяваць спасылку на ўбудаваны прайгравальнік
-    YouTube'
-  Open in Invidious: 'Адкрыць у Invidious'
-  Copy Invidious Link: 'Скапіяваць спасылку Invidious'
-  Open Channel in YouTube: 'Адкрыць канал у YouTube'
-  Copy YouTube Channel Link: 'Скапіяваць спасылку на канал YouTube'
-  Open Channel in Invidious: 'Адкрыць канал у Invidious'
-  Copy Invidious Channel Link: 'Скапіяваць спасылку на канал Invidious'
-  Views: 'Прагляды'
-  Loop Playlist: 'Зацыкліць плэй-ліст'
-  Shuffle Playlist: 'Перамяшаць плэй-ліст'
-  Reverse Playlist: 'Перавернуць плэй-ліст'
-  Play Next Video: 'Прайграць наступнае відэа'
-  Play Previous Video: 'Прайграць папярэдняе відэа'
-  Pause on Current Video: 'Прыпыніць на бягучым відэа'
-  Watched: 'Прагледжанае'
-  Autoplay: 'Аўтапрайграванне'
-  Starting soon, please refresh the page to check again: 'Хутка пачнецца, абнавіце
-    старонку, каб праверыць яшчэ раз'
+  Mark As Watched: ''
+  Remove From History: ''
+  Video has been marked as watched: ''
+  Video has been removed from your history: ''
+  Save Video: ''
+  Video has been saved: ''
+  Video has been removed from your saved list: ''
+  Open in YouTube: ''
+  Copy YouTube Link: ''
+  Open YouTube Embedded Player: ''
+  Copy YouTube Embedded Player Link: ''
+  Open in Invidious: ''
+  Copy Invidious Link: ''
+  Open Channel in YouTube: ''
+  Copy YouTube Channel Link: ''
+  Open Channel in Invidious: ''
+  Copy Invidious Channel Link: ''
+  Views: ''
+  Loop Playlist: ''
+  Shuffle Playlist: ''
+  Reverse Playlist: ''
+  Play Next Video: ''
+  Play Previous Video: ''
+  Pause on Current Video: ''
+  Watched: ''
+  Autoplay: ''
+  Starting soon, please refresh the page to check again: ''
   # As in a Live Video
-  Premieres on: 'Прэм''еры на'
-  Premieres: 'Прэм''еры'
-  Upcoming: 'Хутка'
-  Live: 'Ужывую'
-  Live Now: 'Зараз у эфіры'
-  Live Chat: 'Жывы чат'
-  Enable Live Chat: 'Уключыць жывы чат'
-  Live Chat is currently not supported in this build.: 'Жывы чат зараз не падтрымліваецца
-    ў гэтай зборцы.'
-  'Chat is disabled or the Live Stream has ended.': 'Чат адключаны або жывая трансляцыя
-    скончылася.'
-  Live chat is enabled. Chat messages will appear here once sent.: 'Жывы чат уключаны.  Паведамленні
-    чата з''явяцца тут пасля адпраўкі.'
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Жывы
-    чат зараз не падтрымліваецца Invidious API.  Патрабуецца прамое падключэнне да
-    YouTube.'
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Жывы
-    чат недаступны для гэтай трансляцыі. Магчыма, ён быў адключаны запампавальнікам.'
-  Show Super Chat Comment: 'Паказаць каментарый Суперчата'
-  Scroll to Bottom: 'Пракруціць уніз'
-  Download Video: 'Спампаваць відэа'
-  video only: 'толькі відэа'
-  audio only: 'толькі аўдыё'
+  Premieres on: ''
+  Premieres: ''
+  Upcoming: ''
+  Live: ''
+  Live Now: ''
+  Live Chat: ''
+  Enable Live Chat: ''
+  Live Chat is currently not supported in this build.: ''
+  'Chat is disabled or the Live Stream has ended.': ''
+  Live chat is enabled. Chat messages will appear here once sent.: ''
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
+  Show Super Chat Comment: ''
+  Scroll to Bottom: ''
+  Download Video: ''
+  video only: ''
+  audio only: ''
   Published:
-    In less than a minute: 'Менш чым праз хвіліну'
-  Published on: 'Апублікавана'
-  Streamed on: 'Транслявалася'
-  Started streaming on: 'Трансляцыя пачалася'
+    Jan: ''
+    Feb: ''
+    Mar: ''
+    Apr: ''
+    May: ''
+    Jun: ''
+    Jul: ''
+    Aug: ''
+    Sep: ''
+    Oct: ''
+    Nov: ''
+    Dec: ''
+    Second: ''
+    Seconds: ''
+    Minute: ''
+    Minutes: ''
+    Hour: ''
+    Hours: ''
+    Day: ''
+    Days: ''
+    Week: ''
+    Weeks: ''
+    Month: ''
+    Months: ''
+    Year: ''
+    Years: ''
+    Ago: ''
+    Upcoming: ''
+    In less than a minute: ''
+  Published on: ''
+  Streamed on: ''
+  Started streaming on: ''
+  Publicationtemplate: ''
   Sponsor Block category:
-    sponsor: 'Спонсар'
-    intro: 'Увядзенне'
-    outro: 'Канцоўка'
-    self-promotion: 'Самарэклама'
-    interaction: 'Узаемадзеянне'
-    music offtopic: 'Музыка не па тэме'
-    recap: 'Падвядзенне вынікаў'
-    filler: 'Напаўняльнік'
+    sponsor: ''
+    intro: ''
+    outro: ''
+    self-promotion: ''
+    interaction: ''
+    music offtopic: ''
+    recap: ''
+    filler: ''
   External Player:
-    OpenInTemplate: 'Адкрыць у {externalPlayer}'
-    video: 'відэа'
-    playlist: 'плэй-ліст'
-    OpeningTemplate: 'Адкрыццё {videoOrPlaylist} у {externalPlayer}...'
-    UnsupportedActionTemplate: '{externalPlayer} не падтрымлівае: {action}'
+    OpenInTemplate: ''
+    video: ''
+    playlist: ''
+    OpeningTemplate: ''
+    UnsupportedActionTemplate: ''
     Unsupported Actions:
-      starting video at offset: 'пачатак відэа са зрушэннем'
-      setting a playback rate: 'налада хуткасці прайгравання'
-      opening playlists: 'адкрыццё плэй-лістоў'
-      opening specific video in a playlist (falling back to opening the video): 'адкрыццё
-        пэўнага відэа ў плэй-лісце (вяртанне да адкрыцця відэа)'
-      reversing playlists: 'пераварочванне плэй-ліста'
-      shuffling playlists: 'перамешванне плэй-лістоў'
-      looping playlists: 'зацыкліванне плэй-лістоў'
+      starting video at offset: ''
+      setting a playback rate: ''
+      opening playlists: ''
+      opening specific video in a playlist (falling back to opening the video): ''
+      reversing playlists: ''
+      shuffling playlists: ''
+      looping playlists: ''
 #& Videos
-  Hide Channel: Схаваць канал
-  Unhide Channel: Паказаць канал
-  More Options: Іншыя параметры
-  IP block: YouTube заблакіраваў ваш IP-адрас для прагляду відэа. Паспрабуйце пераключыцца
-    на іншы VPN або проксі.
-  Player:
-    Audio Tracks: Гукавыя дарожкі
-    Full Window: Поўнаэкранны рэжым
-    Stats:
-      Stats: Статыстыка
-      Video ID: 'Ідэнтыфікатар відэа: {videoId}'
-      Media Formats: 'Фарматы медыя: {formats}'
-      Player Dimensions: 'Памеры прайгравальніка: {width}x{height}'
-      Bitrate: 'Бітрэйт: {bitrate} кбіт/с'
-      Buffered: 'Буферызавана: {bufferedPercentage}%'
-      Resolution: 'Раздзяляльнасць: {width}x{height}@{frameRate}'
-      Dropped Frames / Total Frames: 'Прапушчаныя кадры: {droppedFrames} / Усяго кадраў:
-        {totalFrames}'
-      CodecsVideoAudio: 'Кодэкі: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
-      CodecsVideoAudioNoItags: 'Кодэкі: {videoCodec} / {audioCodec}'
-      Volume: 'Гучнасць: {volumePercentage}%'
-      Bandwidth: 'Паласа прапускання: {bandwidth} кбіт/с'
-      CodecAudio: 'Кодэк: {audioCodec} ({audioItag})'
-    Skipped segment: Прапушчаны сегмент {segmentCategory}
-    TranslatedCaptionTemplate: '{language} (пераклад з "{originalLanguage}")'
-    Theatre Mode: Рэжым тэатра
-    Exit Full Window: Выйсці з поўнаэкраннага рэжыму
-    Hide Stats: Схаваць статыстыку
-    Take Screenshot: Зрабіць здымак
-    Show Stats: Паказаць статыстыку
-    Exit Theatre Mode: Выйдзіце з рэжыму тэатра
-    You appear to be offline: Здаецца, вы па-за сеткай.
-    Playback will resume automatically when your connection comes back: Прайграванне
-      ўзновіцца аўтаматычна, калі падключэнне адновіцца.
 Videos:
   #& Sort By
   Sort By:
@@ -920,6 +835,9 @@ Playlist:
   #& About
   Playlist: 'Плэй-ліст'
   View Full Playlist: 'Праглядзець увесь плэй-ліст'
+  Videos: 'Відэа'
+  View: ''
+  Views: 'Прагляды'
   Last Updated On: 'Апошняе абнаўленне'
 
 # On Video Watch Page
@@ -934,19 +852,14 @@ Playlist:
     DateAddedOldest: Старыя спачатку
     VideoTitleAscending: Назва (А-Я)
     VideoTitleDescending: Назва (Я-А)
-    VideoDurationAscending: Працягласць (спачатку кароткія)
-    VideoDurationDescending: Працягласць (спачатку доўгія)
+Toggle Theatre Mode: 'Пераключыць рэжым тэатра'
 Change Format:
-  Change Media Formats: 'Змяніць фарматы медыя'
-  Use Dash Formats: 'Выкарыстоўваць фарматы DASH'
-  Use Legacy Formats: 'Выкарыстоўваць старыя фарматы'
-  Use Audio Formats: 'Выкарыстоўваць аўдыяфарматы'
-  Dash formats are not available for this video: 'Фарматы DASH недаступныя для гэтага
-    відэа'
-  Audio formats are not available for this video: 'Аўдыяфарматы недаступныя для гэтага
-    відэа'
-  Legacy formats are not available for this video: Састарэлыя фарматы недаступныя
-    для гэтага відэа
+  Change Media Formats: ''
+  Use Dash Formats: ''
+  Use Legacy Formats: ''
+  Use Audio Formats: ''
+  Dash formats are not available for this video: ''
+  Audio formats are not available for this video: ''
 Share:
   Share Video: 'Падзяліцца відэа'
   Share Channel: 'Падзяліцца каналам'
@@ -954,30 +867,23 @@ Share:
   Include Timestamp: 'Дадаць метку часу'
   Copy Link: 'Скапіяваць спасылку'
   Open Link: 'Адкрыць спасылку'
-  Copy Embed: 'Капіяваць для ўбудавання'
-  Open Embed: 'Адкрыць убудаванае'
+  Copy Embed: ''
+  Open Embed: ''
   # On Click
-  Invidious URL copied to clipboard: 'URL-адрас Invidious скапіяваны ў буфер абмену'
-  Invidious Embed URL copied to clipboard: 'Invidious URL-адрас для ўбудавання скапіяваны
-    ў буфер абмену'
-  Invidious Channel URL copied to clipboard: 'URL-адрас канала Invidious скапіяваны
-    ў буфер абмену'
-  YouTube URL copied to clipboard: 'URL-адрас YouTube скапіяваны ў буфер абмену'
-  YouTube Embed URL copied to clipboard: 'URL-адрас YouTube для ўбудавання скапіяваны
-    ў буфер абмену'
-  YouTube Channel URL copied to clipboard: 'URL-адрас канала YouTube скапіяваны ў
-    буфер абмену'
+  Invidious URL copied to clipboard: ''
+  Invidious Embed URL copied to clipboard: ''
+  Invidious Channel URL copied to clipboard: ''
+  YouTube URL copied to clipboard: ''
+  YouTube Embed URL copied to clipboard: ''
+  YouTube Channel URL copied to clipboard: ''
 Clipboard:
-  Copy failed: 'Не атрымалася скапіяваць у буфер абмену'
-  Cannot access clipboard without a secure connection: 'Немагчыма атрымаць доступ
-    да буфера абмену без бяспечнага злучэння'
+  Copy failed: ''
+  Cannot access clipboard without a secure connection: ''
 
 Chapters:
   Chapters: 'Раздзелы'
-  'Chapters list visible, current chapter: {chapterName}': 'Бачны спіс раздзелаў,
-    бягучы раздзел: {chapterName}'
-  'Chapters list hidden, current chapter: {chapterName}': 'Спіс раздзелаў схаваны,
-    бягучы раздзел: {chapterName}'
+  'Chapters list visible, current chapter: {chapterName}': ''
+  'Chapters list hidden, current chapter: {chapterName}': ''
 
 Mini Player: 'Міні плэер'
 Comments:
@@ -1005,127 +911,75 @@ Comments:
   Pinned by: 'Замацавана'
   Member: 'Член'
   Subscribed: 'Падпісан'
-  Hearted: 'З сэрцам'
+  Hearted: ''
   There are no comments available for this post: Да гэтай публікацыі няма каментарыяў
 Up Next: 'Далей'
 
 #Tooltips
 Tooltips:
   General Settings:
-    Preferred API Backend: 'Выберыце бэкэнд, які FreeTube выкарыстоўвае для атрымання
-      даных. Лакальны API - гэта ўбудаваны экстрактар. Для падключэння Invidious API
-      патрабуецца сервер Invidious.'
-    Fallback to Non-Preferred Backend on Failure: 'Калі ў вашым абраным API ўзнікае
-      праблема, FreeTube аўтаматычна паспрабуе выкарыстаць непрыярытэтны API у якасці
-      рэзервовага метаду, калі ён уключаны.'
-    Thumbnail Preference: 'Усе мініяцюры FreeTube будуць заменены кадрам відэа замест
-      мініяцюры па змаўчанні.'
-    Invidious Instance: 'Экземпляр Invidious, да якога FreeTube будзе падключацца
-      для выклікаў API.'
-    Region for Trending: 'Рэгіён трэндаў дазваляе вам выбраць папулярныя відэа краіны,
-      якія вы жадаеце паказваць.'
+    Preferred API Backend: ''
+    Fallback to Non-Preferred Backend on Failure: ''
+    Thumbnail Preference: ''
+    Invidious Instance: ''
+    Region for Trending: ''
     External Link Handling: |
-      Выберыце паводзіны па змаўчанні, калі націскаецца спасылка, якую нельга адкрыць у FreeTube..
-      Па змаўчанні FreeTube адкрые націснутую спасылку ў браўзеры па змаўчанні.
   Player Settings:
-    Proxy Videos Through Invidious: 'Будзе падключацца да Invidious для прагляду відэа
-      замест прамога падключэння да YouTube.'
-    Default Video Format: 'Задайце фарматы, якія выкарыстоўваюцца пры прайграванні
-      відэа. Фарматы DASH могуць прайграваць больш высокія якасці. Састарэлыя фарматы
-      абмежаваныя максімумам 720p, але выкарыстоўваюць меншую паласу прапускання.
-      Аўдыяфарматы - гэта толькі аўдыяпатокі.'
-    Scroll Playback Rate Over Video Player: 'Калі курсор знаходзіцца над відэа, націсніце
-      і ўтрымлівайце клавішу Control (клавіша Command на Mac) і пракручвайце кола
-      мышы наперад або назад, каб кіраваць хуткасцю прайгравання. Націсніце і ўтрымлівайце
-      клавішу Control (клавіша Command на Mac) і пстрыкніце левай кнопкай мышы, каб
-      хутка вярнуцца да хуткасці прайгравання па змаўчанні (1x, калі яна не была зменена
-      ў наладах).'
-    Skip by Scrolling Over Video Player: 'Выкарыстоўвайце кола прагорткі, каб прапускаць
-      відэа ў стылі MPV.'
+    Proxy Videos Through Invidious: ''
+    Default Video Format: ''
+    Scroll Playback Rate Over Video Player: ''
+    Skip by Scrolling Over Video Player: ''
   External Player Settings:
-    External Player: 'Пры выбары вонкавага прайгравальніка на мініяцюры будзе адлюстроўвацца
-      значок для адкрыцця відэа (плэй-ліста, калі падтрымліваецца) у вонкавым прайгравальніку.
-      Увага, налады Invidious не ўплываюць на вонкавыя прайгравальнікі.'
-    Custom External Player Executable: 'Па змаўчанні FreeTube мяркуе, што абраны вонкавы
-      прайгравальнік можна знайсці праз пераменную асяроддзя PATH. Пры неабходнасці
-      тут можна задаць уласны шлях.'
-    Ignore Warnings: 'Адключыць папярэджанні, калі бягучы вонкавы прайгравальнік не
-      падтрымлівае бягучае дзеянне (напрыклад, пераварочванне плэй-ліста і г.д.).'
-    Custom External Player Arguments: 'Любыя карыстальніцкія аргументы каманднага
-      радка, якія вы хочаце перадаць вонкаваму прайгравальніку.'
-    DefaultCustomArgumentsTemplate: "(Па змаўчанні: '{defaultCustomArguments}')"
-    Ignore Default Arguments: Не адпраўляйце ніякіх аргументаў па змаўчанні на вонкавы
-      прайгравальнік, акрамя URL-адраса відэа (напрыклад, частата прайгравання, URL-адрас
-      плэй-ліста і г.д.). Карыстальніцкія аргументы ўсё роўна будуць перадавацца.
+    External Player: ''
+    Custom External Player Executable: ''
+    Ignore Warnings: ''
+    Custom External Player Arguments: ''
+    DefaultCustomArgumentsTemplate: ""
   Distraction Free Settings:
-    Hide Channels: 'Увядзіце ідэнтыфікатар канала, каб схаваць усе відэа, плэй-лісты
-      і сам канал ад з''яўлення ў пошукавых, трэндавых, самых папулярных і рэкамендаваных.
-      Уведзены ідэнтыфікатар канала павінен цалкам супадаць і ўлічваць рэгістр.'
-    Hide Subscriptions Live: 'Гэта налада перавызначаецца наладай "{appWideSetting}"
-      для ўсёй праграмы ў раздзеле "{subsection}" у "{settingsSection}"'
-    Hide Videos and Playlists Containing Text: Увядзіце слова, фрагмент слова або
-      фразу (без уліку рэгістра), каб схаваць усе відэа і плэй-лісты, арыгінальныя
-      назвы якіх утрымліваюць гэта, ва ўсім FreeTube, за выключэннем толькі Гісторыі,
-      Вашых плэй-лістоў і відэа ў плэй-лістах.
+    Hide Channels: ''
+    Hide Subscriptions Live: ''
   Subscription Settings:
-    Fetch Feeds from RSS: 'Пры ўключэнні FreeTube будзе выкарыстоўваць RSS замест
-      метаду па змаўчанні для атрымання вашай стужкі падпіскі. RSS працуе хутчэй і
-      прадухіляе блакіроўку IP-адрасоў, але не дае пэўнай інфармацыі, такой як працягласць
-      відэа, стан у прамым эфіры або паведамленняў у супольнасці'
-    Fetch Automatically: 'Калі ўключана, FreeTube будзе аўтаматычна атрымліваць стужку
-      вашай падпіскі пры адкрыцці новага акна і пры пераключэнні профілю.'
+    Fetch Feeds from RSS: ''
+    Fetch Automatically: ''
   Experimental Settings:
-    Replace HTTP Cache: 'Адключае HTTP кэш Electron''у на дыску і ўключае карыстальніцкі
-      кэш малюнкаў у памяці. Прывядзе да павелічэння выкарыстання аператыўнай памяці.'
+    Replace HTTP Cache: ''
   SponsorBlock Settings:
-    UseDeArrowTitles: 'Заменіце загалоўкі відэа на загалоўкі, прадстаўленыя карыстальнікамі
-      з DeArrow.'
+    UseDeArrowTitles: ''
 
 # Toast Messages
-    UseDeArrowThumbnails: Заменіце мініяцюры відэа на мініяцюры ад DeArrow.
-Local API Error (Click to copy): 'Памылка лакальнага API (націсніце, каб скапіяваць)'
-Invidious API Error (Click to copy): 'Памылка API Invidious (Націсніце, каб скапіяваць)'
-Falling back to Invidious API: 'Вяртанне да Invidious API'
-Falling back to Local API: 'Вяртанне да лакальнага API'
-This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Гэта
-  відэа недаступнае з-за адсутнасці фарматаў. Гэта можа адбыцца з-за недаступнасці
-  краіны.'
-Unknown YouTube url type, cannot be opened in app: 'Невядомы тып URL-адраса YouTube,
-  немагчыма адкрыць у праграме'
-Loop is now disabled: 'Цыкл адключаны'
-Loop is now enabled: 'Цыкл уключаны'
-Shuffle is now disabled: 'Перамешванне выключана'
-Shuffle is now enabled: 'Перамешванне ўключана'
-The playlist has been reversed: 'Плэй-ліст перавернуты'
-Playing Next Video: 'Прайграванне наступнага відэа'
-Playing Previous Video: 'Прайграванне папярэдняга відэа'
-Playlist will not pause when current video is finished: 'Плэй-ліст не будзе прыпынены,
-  калі бягучае відэа будзе завершана'
-Playlist will pause when current video is finished: 'Плэй-ліст будзе прыпынены, калі
-  бягучае відэа будзе завершана'
-Playing Next Video Interval: 'Прайграванне наступнага відэа ў самыя кароткія тэрміны.
-  Націсніце, каб адмяніць. | Прайграванне наступнага відэа праз {nextVideoInterval}
-  секунды. Націсніце, каб адмяніць. | Прайграванне наступнага відэа праз {nextVideoInterval}
-  секунд. Націсніце, каб адмяніць.'
-Canceled next video autoplay: 'Аўтапрайграванне наступнага відэа адменена'
+Local API Error (Click to copy): ''
+Invidious API Error (Click to copy): ''
+Falling back to Invidious API: ''
+Falling back to Local API: ''
+This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Subscriptions have not yet been implemented: ''
+Unknown YouTube url type, cannot be opened in app: ''
+Hashtags have not yet been implemented, try again later: ''
+Loop is now disabled: ''
+Loop is now enabled: ''
+Shuffle is now disabled: ''
+Shuffle is now enabled: ''
+The playlist has been reversed: ''
+Playing Next Video: ''
+Playing Previous Video: ''
+Playlist will not pause when current video is finished: ''
+Playlist will pause when current video is finished: ''
+Playing Next Video Interval: ''
+Canceled next video autoplay: ''
 
-Default Invidious instance has been set to {instance}: 'Экземпляр Invidious па змаўчанні
-  быў усталяваны ў {instance}'
-Default Invidious instance has been cleared: 'Экземпляр Invidious па змаўчанні быў
-  выдалены'
-'The playlist has ended. Enable loop to continue playing': 'Плэй-ліст скончыўся.  Каб
-  працягнуць прайграванне, уключыце цыкл'
-External link opening has been disabled in the general settings: 'Адкрыццё вонкавых
-  спасылак было адключана ў агульных наладах'
-Downloading has completed: 'Спампоўка "{videoTitle}" скончана'
-Starting download: 'Пачатак спампоўкі "{videoTitle}"'
-Downloading failed: 'Узнікла праблема спампоўкі "{videoTitle}"'
-Screenshot Success: 'Здымак захаваны як "{filePath}"'
-Screenshot Error: 'Здымак не ўдаўся. {error}'
+Default Invidious instance has been set to {instance}: ''
+Default Invidious instance has been cleared: ''
+'The playlist has ended. Enable loop to continue playing': ''
+External link opening has been disabled in the general settings: ''
+Downloading has completed: ''
+Starting download: ''
+Downloading failed: ''
+Screenshot Success: ''
+Screenshot Error: ''
 
 Hashtag:
-  Hashtag: 'Цэтлік'
-  This hashtag does not currently have any videos: 'Гэты цэтлік зараз не змяшчае відэа'
+  Hashtag: ''
+  This hashtag does not currently have any videos: ''
 Yes: 'Так'
 No: 'Не'
 Ok: 'Ок'
@@ -1133,16 +987,10 @@ Search Listing:
   Label:
     Subtitles: Субцітры
     4K: 4K
-    Closed Captions: Субцітры
-    360 Video: 360°
-    8K: 8K
-    VR180: VR180
-    New: Новае
-    3D: 3D
 Yes, Delete: Так, выдаліць
 Feed:
   Refresh Feed: Абнавіць {subscriptionName}
-  Feed Last Updated: 'Апошняе абнаўленне стужкі {feedName}: {date}'
+  Feed Last Updated: 'Апошняе абнаўленне каналу {feedName}: {date}'
 Display Label: '{label}: {value}'
 Cancel: Адмена
 checkmark: ✓
@@ -1151,14 +999,3 @@ Go to page: Перайсці да {page}
 Moments Ago: хвіліны таму
 Yes, Restart: Так, перазапусціць
 Yes, Open Link: Так, адкрыць спасылку
-Tag already exists: Цэтлік "{tagName}" ужо існуе
-Search character limit: Пошукавы запыт перавышае ліміт сімвалаў у {searchCharacterLimit}
-Trimmed input must be at least N characters long: Скарочаны ўвод павінен змяшчаць
-  не менш за 1 сімвал | Скарочаны ўвод павінен змяшчаць не менш за {length} сімвалаў
-Channel Hidden: '{channel} дададзены ў фільтр каналаў'
-Age Restricted:
-  This channel is age restricted: Гэты канал мае ўзроставыя абмежаванні
-  This video is age restricted: Гэты відэа мае ўзроставыя абмежаванні
-'Blocked opening potentially unsafe URL': 'Заблакіравана адкрыццё патэнцыйна небяспечнага
-  URL: "{url}".'
-Channel Unhidden: '{channel} выдалены з фільтра каналаў'
diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index 95fe4c5fa8081..a904b4df57b07 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -43,8 +43,6 @@ Global:
     Subscriber Count: 1 абонат | {count} абоната
     View Count: 1 преглед | {count} прегледа
     Watching Count: 1 гледане | {count} гледания
-    Like Count: 1 харесване | {count} харесвания
-    Comment Count: 1 коментар | {count} коментара
   Input Tags:
     Length Requirement: Дължината на етикета трябва да бъде поне {number} знака
 Version {versionNumber} is now available!  Click for more details: 'Версия {versionNumber}
@@ -108,9 +106,7 @@ Subscriptions:
   Subscriptions: 'Абонаменти'
   Latest Subscriptions: 'Последни абонаменти'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Списъкът
-    с абонаменти е празен. Ако искате да внесете абонаментите си, отидете в "Настройки
-    на данни" и изберете "Внасяне на абонаменти" или можете да потърсите канал и да
-    се абонирате за него.'
+    с абонаменти е празен. Започнете да добавяте, за да ги видите тук.'
   'Getting Subscriptions. Please wait.': 'Получаване на абонаменти. Моля, изчакайте.'
   Refresh Subscriptions: 'Опресняване на абонаментите'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Този
@@ -138,11 +134,20 @@ Most Popular: 'Най-популярни'
 Playlists: 'Плейлисти'
 User Playlists:
   Your Playlists: 'Вашите плейлисти'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Няма
+    запазени видеа. За запазване щракнете в ъгъла на видеото
+  Playlist Message: Тази страница не отразява напълно работещи плейлисти. В него са
+    изброени само видеа, които сте запазили или избрали за предпочитани. Когато работата
+    приключи, всички видеа, които в момента са тук, ще бъдат преместени в плейлист
+    „Предпочитани“.
   Search bar placeholder: Търсене за плейлисти
   Empty Search Message: В този плейлист няма видеа, които да отговарят на търсенето
     ви
   This playlist currently has no videos.: В този плейлист в момента няма видеа.
   Add to Favorites: Добавяне към {playlistName}
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Сигурни
+    ли сте, че искате да премахнете всички гледани видеа от този плейлист? Това не
+    може да бъде отменено.
   Are you sure you want to delete this playlist? This cannot be undone: Сигурни ли
     сте, че искате да изтриете този плейлист? Това не може да бъде отменено.
   SinglePlaylistView:
@@ -156,6 +161,7 @@ User Playlists:
       This video cannot be moved up.: Това видео не може да бъде преместено нагоре.
       This video cannot be moved down.: Това видео не може да бъде преместено надолу.
       Video has been removed: Видеото е премахнато
+      Quick bookmark disabled: Бързите отметки са деактивирани
       There was a problem with removing this video: Имаше проблем с премахването на
         това видео
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Този
@@ -177,9 +183,6 @@ User Playlists:
         се използва за бързи отметки.
       Playlist {playlistName} is the new quick bookmark playlist.: Плейлиста {playlistName}
         е новият списък за бързи отметки.
-      This playlist has a video with a duration error: Този плейлист съдържа поне
-        едно видео, което няма продължителност, той ще бъде подреден така, сякаш продължителността
-        му е нула.
     Search for Videos: Търсене за видеа
   CreatePlaylistPrompt:
     Toast:
@@ -235,6 +238,7 @@ User Playlists:
   Copy Playlist: Копиране на плейлиста
   Remove Watched Videos: Премахване на гледаните видеа
   Enable Quick Bookmark With This Playlist: Активиране на бърза отметка с този плейлист
+  Disable Quick Bookmark: Деактивиране на бърза отметка
   Delete Playlist: Изтриване на плейлиста
   Remove from Favorites: Премахване от {playlistName}
   Move Video Down: Преместване надолу
@@ -251,8 +255,6 @@ User Playlists:
     ли сте, че искате да премахнете 1 гледано видео от този плейлист? Това не може
     да бъде отменено. | Сигурни ли сте, че искате да премахнете {playlistItemCount}
     гледани видеа от този плейлист? Това не може да бъде отменено.
-  Export Playlist: Изнасяне на плейлиста
-  The playlist has been successfully exported: Плейлистът е изнесен успешно
 History:
   # On History Page
   History: 'История'
@@ -265,7 +267,7 @@ Settings:
   # On Settings Page
   Settings: 'Настройки'
   General Settings:
-    General Settings: 'Общи'
+    General Settings: 'Общи настройки'
     Check for Updates: 'Проверка за актуализации'
     Check for Latest Blog Posts: 'Проверка за нови публикации в блога'
     Fallback to Non-Preferred Backend on Failure: 'При грешка, връщане към непредпочитан
@@ -289,6 +291,8 @@ Settings:
       End: 'Край на видео'
       Hidden: Скриване
       Blur: Размазано
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Излед на Invidious
+      (по подразбиране е https://invidious.snopyta.org)'
     Region for Trending: 'Регион за набиращи популярност'
         #! List countries
     View all Invidious instance information: Преглед на пълна информация за Invidious
@@ -310,10 +314,8 @@ Settings:
     Auto Load Next Page:
       Label: Автоматично зареждане на следващата страница
       Tooltip: Автоматично зареждане на допълнителни страници и коментари.
-    Open Deep Links In New Window: Отваряне в нов прозорец на URL адреси, преминаващи
-      през FreeTube
   Theme Settings:
-    Theme Settings: 'Тема'
+    Theme Settings: 'Настройки на изгледа на приложението'
     Match Top Bar with Main Color: 'Съвпадане на горната лента с основната цветова
       тема'
     Base Theme:
@@ -329,8 +331,6 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarized тъмна
       Solarized Light: Solarized светла
-      Gruvbox Dark: Gruvbox тъмна
-      Gruvbox Light: Gruvbox светла
     Main Color Theme:
       Main Color Theme: 'Основна цветова тема'
       Red: 'Червено'
@@ -378,16 +378,6 @@ Settings:
       Solarized Blue: Solarized Синьо
       Solarized Cyan: Solarized Синьозелено
       Solarized Green: Solarized Зелено
-      Gruvbox Dark Yellow: Gruvbox тъмножълто
-      Gruvbox Dark Blue: Gruvbox Тъмносиньо
-      Gruvbox Dark Purple: Gruvbox Тъмнолилаво
-      Gruvbox Dark Aqua: Gruvbox Тъмна вода
-      Gruvbox Light Blue: Gruvbox Светлосиньо
-      Gruvbox Light Purple: Gruvbox Светлолилаво
-      Gruvbox Light Orange: Gruvbox Светлооранжево
-      Gruvbox Dark Green: Gruvbox тъмнозелено
-      Gruvbox Dark Orange: Gruvbox Тъмнооранжево
-      Gruvbox Light Red: Gruvbox Светлочервено
     Secondary Color Theme: 'Вторична цветова тема'
         #* Main Color Theme
     UI Scale: Мащаб на интерфейса
@@ -396,7 +386,7 @@ Settings:
     Hide Side Bar Labels: Скриване етикетите на страничната лента
     Hide FreeTube Header Logo: Скриване логото на FreeTube
   Player Settings:
-    Player Settings: 'Плейър'
+    Player Settings: 'Настройки на плейъра'
     Play Next Video: 'Пускане на следващото видео'
     Turn on Subtitles by Default: 'Включване на субтитрите по подразбиране'
     Autoplay Videos: 'Автоматично пускане на видеата'
@@ -423,7 +413,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Интервал за следващо видео в плейлист
-    Next Video Interval: Таймер за обратно броене при автоматично възпроизвеждане
+    Next Video Interval: Интервал за следващо видео
     Display Play Button In Video Player: Показване на бутона за възпроизвеждане във
       видео плейъра
     Scroll Volume Over Video Player: Промяна на звука при превъртане над видео плейъра
@@ -450,9 +440,8 @@ Settings:
       Folder Button: Избор на папка
     Enter Fullscreen on Display Rotate: Режим на цял екран при завъртане на дисплея
     Skip by Scrolling Over Video Player: Превъртане над видео плейъра
-    Autoplay Interruption Timer: Таймер за прекъсване на автоматичното възпроизвеждане
   Privacy Settings:
-    Privacy Settings: 'Поверителност'
+    Privacy Settings: 'Настройки за поверителност'
     Remember History: 'Запазване на историята'
     Save Watched Progress: 'Запазване напредъка на гледането'
     Clear Search Cache: 'Изчистване кеша на търсенията'
@@ -474,19 +463,22 @@ Settings:
     Are you sure you want to remove all your playlists?: Сигурни ли сте, че искате
       да премахнете всичките си плейлисти?
   Subscription Settings:
-    Subscription Settings: 'Абонаменти'
+    Subscription Settings: 'Настройки на абонаменти'
     Hide Videos on Watch: 'Скриване на видеата при гледане'
     Fetch Feeds from RSS: 'Извличане на съдържания през RSS'
+    Manage Subscriptions: 'Управление на абонаменти'
     Fetch Automatically: Автоматично извличане на съдържание
+    Only Show Latest Video for Each Channel: Показване само най-новите видеа за всеки
+      канал
     Confirm Before Unsubscribing: Избягване на случайно отписване
-    'Limit the number of videos displayed for each channel': Ограничаване на броя
-      на показваните видеа за всеки канал
-    To: на
   Data Settings:
-    Data Settings: 'Данни'
+    Data Settings: 'Настройки на данни'
     Select Import Type: 'Избор на тип за внасяне'
     Select Export Type: 'Избор на тип за изнасяне'
     Import Subscriptions: 'Внасяне на абонаменти'
+    Import FreeTube: 'Внасяне от FreeTube формат'
+    Import YouTube: 'Внасяне от YouTube формат'
+    Import NewPipe: 'Внасяне от NewPipe формат'
     Export Subscriptions: 'Изнасяне на абонаменти'
     Export FreeTube: 'Изнасяне във FreeTube формат'
     Export YouTube: 'Изнасяне в YouTube формат'
@@ -514,6 +506,7 @@ Settings:
     Unable to write file: 'Файлът не се записа'
     Unknown data key: 'Непознат ключ данни'
     How do I import my subscriptions?: 'Как да внеса абонаментите си?'
+    Check for Legacy Subscriptions: Проверка за стари абонаменти
     Manage Subscriptions: Управление на абонаменти
     Export Playlists: Изнасяне на плейлисти
     All playlists has been successfully imported: Всички плейлисти са внесени успешно
@@ -532,6 +525,32 @@ Settings:
         на всички плейлисти\" в Настройки за поверителност.\n3. Стартирайте по-старата
         версия на FreeTube и внесете изнесените плейлисти.\""
       Label: Изнасяне на плейлисти за по-стари версии на FreeTube
+  Advanced Settings:
+    Advanced Settings: 'Разширени настройки'
+    Enable Debug Mode (Prints data to the console): 'Активиране на режим за дебъгване
+      (извежда данни в конзолата)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Адрес на прокси (пример:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Щракането
+      на бутон "Тест прокси" ще изпрати искане към https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Използване на TOR / прокси за интерфейсни запитвания'
+    TEST PROXY: 'Тест на прокси'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Преглед на публични инстанции'
+    Clear History:
+      Clear History: 'Изчистване на историята'
+      # On Click
+      Are you sure you want to delete your history?: 'Сигурни ли сте, че искате да
+        изтриете историята си?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Изтриване на абонаменти'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Сигурни ли сте, че искате
+        да премахнете всички абонаменти?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Скриване на чата на живо
@@ -542,7 +561,7 @@ Settings:
     Hide Channel Subscribers: Скриване броя на абонатите на канали
     Hide Video Likes And Dislikes: Скриване оценките на видеата
     Hide Video Views: Скриване броя показвания на видеата
-    Distraction Free Settings: Без разсейване
+    Distraction Free Settings: Настройки за неразсейване
     Hide Active Subscriptions: Скриване на активните абонаменти
     Hide Playlists: Скриване на плейлисти
     Hide Video Description: Скриване описанието на видеото
@@ -556,20 +575,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Показване на заглавията без излишни
       главни букви и препинателни знаци
     Hide Featured Channels: Скриване на препоръчаните канали
-    Hide Channel Playlists: Скриване на раздел "Плейлисти" на канала
-    Hide Channel Community: Скриване на раздел "Общност" на канала
-    Hide Channel Shorts: Скриване на раздел "Кратки видеа" на канала
+    Hide Channel Playlists: Скриване на плейлистите на каналите
+    Hide Channel Community: Скриване на общността на каналите
+    Hide Channel Shorts: Скриване кратките видеа на канала
     Sections:
       Channel Page: Страница на канала
       Side Bar: Странична лента
       Watch Page: Страница за гледане
       General: Общи
       Subscriptions Page: Страница с абонаменти
-    Hide Channel Releases: Скриване на раздел "Издания" на канала
+    Hide Channel Releases: Скриване на изданията на канала
     Hide Subscriptions Videos: Скриване на видеата в абонаментите
     Hide Subscriptions Shorts: Скриване на кратките видеа в абонаментите
     Hide Subscriptions Live: Скриване на абонаментите на живо
-    Hide Channel Podcasts: Скриване на раздел "Подкасти" на канала
+    Hide Channel Podcasts: Скриване на подкастите на канала
+    Blur Thumbnails: Размазване на миниатюрите
     Hide Profile Pictures in Comments: Скриване на профилните снимки в коментарите
     Hide Subscriptions Community: Скриване на абонаментите Общност
     Hide Channels Disabled Message: Някои канали бяха блокирани с чрез идентификатор
@@ -582,7 +602,6 @@ Settings:
       текст
     Hide Videos and Playlists Containing Text Placeholder: Дума, част от дума или
       фраза
-    Hide Channel Home: Скриване на раздел "Начало" на канала
   The app needs to restart for changes to take effect. Restart and apply change?: Приложението
     трябва да се рестартира за да се приложат промените. Рестартиране?
   Proxy Settings:
@@ -601,17 +620,12 @@ Settings:
     Proxy Host: Прокси хост
     Proxy Protocol: Прокси протокол
     Enable Tor / Proxy: Активиране на Tor / Proxy
-    Proxy Settings: Прокси
-    Proxy Warning: FreeTube не разполага с вграден прокси сървър, но може да се свърже
-      с външен, например такъв, който работи на вашата машина, като Tor или SOCKS5
-      прокси сървър, предоставян от някои VPN услуги. Ако е активирано, уверете се,
-      че прокси сървърът/Tor е конфигуриран правилно, тъй като FreeTube няма да може
-      да извлича данни.
+    Proxy Settings: Настройки на прокси
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Известие при пропускане на спонсориран
       сегмент
     Enable SponsorBlock: Активиране на SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: SponsorBlock настройки
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       адрес (по подразбиране е https://sponsor.ajay.app)
     Skip Options:
@@ -631,31 +645,31 @@ Settings:
     Ignore Unsupported Action Warnings: Игнориране на предупрежденията за неподдържани
       действия
     External Player: Външен плейър
-    External Player Settings: Външен плейър
+    External Player Settings: Настройки за външен плейър
     Players:
       None:
         Name: Няма
     Ignore Default Arguments: Игнориране на аргументите по подразбиране
   Download Settings:
-    Download Settings: Изтегляне
+    Download Settings: Настройки за изтегляне
     Choose Path: Избор на път
     Ask Download Path: Питане за пътя за изтегляне
     Download Behavior: Поведение при изтегляне
     Download in app: Изтегляне в приложението
     Open in web browser: Отваряне в уеб браузър
   Parental Control Settings:
-    Parental Control Settings: Родителски контрол
+    Parental Control Settings: Настройки за родителски контрол
     Hide Unsubscribe Button: Скриване на бутона за отписване
     Show Family Friendly Only: Показване само за семейства
     Hide Search Bar: Скриване на лентата за търсене
   Experimental Settings:
-    Experimental Settings: Експериментални
+    Experimental Settings: Експериментални настройки
     Replace HTTP Cache: Замяна на HTTP кеша
     Warning: Тези настройки са експериментални и може да причинят сривове, докато
       са разрешени. Силно се препоръчва създаването на резервни копия. Използвайте
       на свой риск!
   Password Settings:
-    Password Settings: Парола
+    Password Settings: Настройки на парола
     Set Password To Prevent Access: Задаване на парола, за предотвратяване на достъпа
       до настройките
     Set Password: Задаване на парола
@@ -665,12 +679,39 @@ Settings:
     Password Incorrect: Грешна парола
     Unlock: Отключване
     Password: Парола
+  Expand All Settings Sections: Разширяване на всички раздели с настройки
   Sort Settings Sections (A-Z): Сортиране на секциите на настройките (A-Z)
-  Return to Settings Menu: Връщане към менюто с настройки
 About:
   #On About page
   About: 'Относно'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Този
+    софтуер се разпространява свободно под AGPL-3.0 лиценз.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Откривате грешка? Искате да предложите нова функционалност? Или искате да помагате?
+    Проверете нашата GitHub страница. Добре дошли сте с готови предложения.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Благодарим
+    на хората и проектите, които правят възможен FreeTube!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Искате
+    да чатите? Включете се на нашия Element / Matrix сървър. Моля, преди да се присъедините
+    първо прочетете правилата.'
+
+  'Looking for help? Check out our Wiki page.': 'Нуждаете се от помощ? Погледнете
+    в нашата Wiki страница.'
+
+  Check out our Firefox extension!: 'Потърсете нашето разширение за Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ако
+    ползването на FreeTube ви харесва, помислете за дарение през Liberapay или през
+    Bitcoin адреса ни.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Последни FreeTube новини'
+
   Donate: Дарение
   these people and projects: тези хора и проекти
   FreeTube is made possible by: FreeTube благодарение на
@@ -690,6 +731,8 @@ About:
   Help: Помощ
   GitHub releases: GitHub издания
   Downloads / Changelog: Изтегляния / Дневник с промени
+  View License: Преглед на лиценза
+  Licensed under the AGPLv3: Лицензиран съгласно AGPLv3
   Source code: Програмен код
   Beta: Бета
   Credits: Заслуги
@@ -739,7 +782,7 @@ Profile:
     от другите профили.'
 #On Channel Page
   Profile Filter: Профилен филтър
-  Profile Settings: Профил
+  Profile Settings: Настройки на профил
   Toggle Profile List: Превключване на списъка с профили
   Profile Name: Име на профила
   Open Profile Dropdown: Отваряне на падащото меню на профила
@@ -790,10 +833,6 @@ Channel:
     Reveal Answers: Разкриване на отговорите
     Hide Answers: Скриване на отговорите
     Video hidden by FreeTube: Видео, скрито от FreeTube
-    Viewing Posts Only Supported By Invidious: Преглеждането на публикации се поддържа
-      само от Invidious. Отидете в раздела на общността на канала, за да видите съдържанието
-      там без Invidious.
-    View Full Post: Преглед на цялата публикация
   This channel does not exist: Каналът не съществува
   This channel does not allow searching: Каналът не позволява търсене
   This channel is age-restricted and currently cannot be viewed in FreeTube.: Каналът
@@ -814,9 +853,6 @@ Channel:
     Releases: Издания
     This channel does not currently have any releases: В момента този канал няма никакви
       издания
-  Home:
-    Home: Начало
-    View Playlist: Преглед на плейлиста
 Video:
   Mark As Watched: 'Отбелязване като гледано'
   Remove From History: 'Премахване от историята'
@@ -853,8 +889,38 @@ Video:
     на живо не се поддържа от интерфейса на Invidious. Изисква се директна връзка
     с YouTube.'
   Published:
+    Jan: 'Ян.'
+    Feb: 'Фев.'
+    Mar: 'Март'
+    Apr: 'Апр.'
+    May: 'Май'
+    Jun: 'Юни'
+    Jul: 'Юли'
+    Aug: 'Авг.'
+    Sep: 'Септ.'
+    Oct: 'Окт.'
+    Nov: 'Ное.'
+    Dec: 'Дек.'
+    Second: 'секунда'
+    Seconds: 'секунди'
+    Minute: 'минута'
+    Minutes: 'минути'
+    Hour: 'час'
+    Hours: 'часа'
+    Day: 'ден'
+    Days: 'дни'
+    Week: 'седмица'
+    Weeks: 'седмици'
+    Month: 'месец'
+    Months: 'месеца'
+    Year: 'година'
+    Years: 'години'
+    Ago: 'преди'
+    Upcoming: 'Премиера на'
+    Less than a minute: По-малко от минута
     In less than a minute: След по-малко от минута
   Published on: 'Публикувано на'
+  Publicationtemplate: 'Преди {number} {unit}'
 #& Videos
   audio only: само аудио
   video only: само видео
@@ -934,16 +1000,6 @@ Video:
     Theatre Mode: Широкоекранен режим
     Full Window: Цял прозорец
     Hide Stats: Скриване на статистиката
-  IP block: YouTube е блокирал вашия IP адрес за гледане на видеа. Опитайте да преминете
-    към друга VPN услуга или прокси сървър.
-  AgeRestricted: Видеата с възрастови ограничения не могат да се гледат с FreeTube,
-    тъй като изискват вход в Google и използване на проверен по възраст акаунт в YouTube.
-  Unlisted: Непосочен в списъка
-  MembersOnly: Видеата, предназначени само за членове, не могат да се гледат с FreeTube,
-    тъй като изискват вход в Google и платено членство в канала на качващия.
-  DeArrow:
-    Show Original Details: Показване на оригинални данни
-    Show Modified Details: Показване на променени данни
 Videos:
   #& Sort By
   Sort By:
@@ -954,6 +1010,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Преглед на пълен плейлист'
+  Videos: 'Видеа'
+  View: 'показване'
+  Views: 'Показвания'
   Last Updated On: 'Последна актуализиция на'
 
 # On Video Watch Page
@@ -969,8 +1028,7 @@ Playlist:
     VideoTitleAscending: Заглавие (A-Z)
     Custom: Потребителски
     VideoTitleDescending: Заглавие (Z-A)
-    VideoDurationAscending: Първо най-кратките
-    VideoDurationDescending: Първо най-дългите
+Toggle Theatre Mode: 'Режим "Широк екран"'
 Change Format:
   Change Media Formats: 'Смяна видео формати'
   Use Dash Formats: 'Използване на DASH формати'
@@ -1026,7 +1084,6 @@ Comments:
   View {replyCount} replies: Преглед на {replyCount} отговора
   Hearted: Сърдечно
   Subscribed: Абониран
-  There are no comments available for this post: За тази публикация няма налични коментари
 Up Next: 'Следващ'
 
 # Toast Messages
@@ -1037,6 +1094,7 @@ Falling back to Local API: 'Връщане към локалния интерф
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Видеото
   не е достъпно поради липсващи формати. Това може да се дължи на ограничен достъп
   за страната.'
+Subscriptions have not yet been implemented: 'Абонаментите все още не са завършени'
 Loop is now disabled: 'Повтарянето е изключено'
 Loop is now enabled: 'Повтарянето е включено'
 Shuffle is now disabled: 'Разбъркването е изключено'
@@ -1054,8 +1112,8 @@ Tooltips:
   Subscription Settings:
     Fetch Feeds from RSS: FreeTube ще използва RSS вместо метода по подразбиране за
       получаване на абонаментите. RSS е по-бърз метод и преодолява блокиранията на
-      IP адреса, но не получава някои съпътстващи данни, като продължителност на видеото,
-      дали е на живо или публикации в общността
+      IP адреса, но не получава някои съпътстващи данни, като продължителност на видеото
+      или дали е на живо
     Fetch Automatically: FreeTube автоматично ще извлича абонаментите при отваряне
       на нов прозорец и при смяна на профила.
   Player Settings:
@@ -1087,12 +1145,10 @@ Tooltips:
     External Link Handling: "Избор на поведението по подразбиране, когато щракнете
       върху връзка, която не може да бъде отворена във FreeTube.\nПо подразбиране
       FreeTube ще отвори връзката в браузъра по подразбиране.\n"
-    Open Deep Links In New Window: URL адресите, преминаващи през FreeTube, например
-      чрез разширения на браузъра или аргументи от командния ред, се отварят в нов
-      прозорец.
   External Player Settings:
     Custom External Player Arguments: Всички персонализирани аргументи от командния
-      ред, които искате да бъдат предадени на външния плейър.
+      ред, разделени с точка и запетая (";"), които искате да бъдат предадени на външния
+      плейър.
     Ignore Warnings: Премахване на предупрежденията, когато текущият външен плейър
       не поддържа текущото действие (напр. обръщане на плейлисти и др.).
     Custom External Player Executable: По подразбиране FreeTube предполага, че избраният
@@ -1129,6 +1185,8 @@ More: Още
 Playing Next Video Interval: Пускане на следващото видео веднага. Щракнете за отказ.
   | Пускане на следващото видео след {nextVideoInterval} секунда. Щракнете за отказ.
   | Пускане на следващото видео след {nextVideoInterval} секунди. Щракнете за отказ.
+Hashtags have not yet been implemented, try again later: Хаштаговете все още не са
+  завършени, опитайте отново по-късно
 Unknown YouTube url type, cannot be opened in app: Неизвестен тип URL адрес за YouTube,
   не може да се отвори в приложението
 Open New Window: Отваряне на нов прозорец
@@ -1150,6 +1208,8 @@ Screenshot Success: Запазена снимка на екрана като "{f
 New Window: Нов прозорец
 Channels:
   Count: Намерени са {number} канала.
+  Unsubscribe: Отписване
+  Unsubscribed: '{channelName} е премахнат от абонаментите'
   Unsubscribe Prompt: Сигурни ли сте, че искате да се отпишете от "{channelName}"?
   Search bar placeholder: Търсене на канали
   Channels: Канали
@@ -1165,7 +1225,6 @@ Chapters:
     текуща глава: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Списъкът с глави е скрит,
     текуща глава: {chapterName}'
-  Key Moments: Основни моменти
 Preferences: Предпочитания
 Ok: Добре
 Hashtag:
@@ -1202,26 +1261,5 @@ Search Listing:
     4K: 4K
     Subtitles: Субтитри
     Closed Captions: Затворени субтитри
-    VR180: VR180
-    3D: 3D
-    8K: 8K
-    360 Video: 360°
-    New: Нов
 'Blocked opening potentially unsafe URL': 'Блокирано отваряне на потенциално опасен
   URL адрес: "{url}".'
-Description:
-  Collapse Description: По-малко
-  Expand Description: '...още'
-Keys:
-  arrowleft: Стрелка наляво
-  arrowright: Стрелка надясно
-  arrowup: Стрелка нагоре
-  alt: Alt
-  arrowdown: Стрелка надолу
-  ctrl: Ctrl
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Right-click or hold to see history: Щракнете с десния бутон на мишката или задръжте,
-  за да видите историята
-Autoplay Interruption Timer: Автоматичното възпроизвеждане е отменено поради {autoplayInterruptionIntervalHours}
-  час(а) неактивност
diff --git a/static/locales/bn.yaml b/static/locales/bn.yaml
index 9edb9828ee1fc..26612f6b121fb 100644
--- a/static/locales/bn.yaml
+++ b/static/locales/bn.yaml
@@ -141,7 +141,9 @@ Channels:
   Channels: চ্যানেলসমূহ
   Title: চ্যানেল সুচি
   Empty: আপনার চ্যানেল সুচি এখন খালি ।
+  Unsubscribe: আনসাবস্ক্রাইব
   Count: '{number}চ্যানেল পাওয়া গিয়েছে ।'
+  Unsubscribed: '{channelName} সরিয়ে দেয়া হয়েছে আপনার সাবস্ক্রিপশন থেকে'
 Playlists: প্লে লিস্ট
 User Playlists:
   Your Playlists: আপনার প্লেলিস্ট
@@ -157,6 +159,12 @@ User Playlists:
   Save Changes: পরিবর্তন সংরক্ষণ করুন
   Cancel: বাতিল
   Edit Playlist Info: নির্বাচিত তালিকার তথ্য পরিবর্তন
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: আপনার
+    কোন সংরক্ষিত ভিডিও নেই, ভিডিও সংরক্ষণ করার জন্য ভিডিওর কোনায় যে বাটন আছে সেটিতে
+    চাপ দিলে সংরক্ষণ সম্পূর্ণ হবে।
+  Playlist Message: এই পেইজ এ সব গুলো প্লেলিস্ট নেই। এখানে শুধু যে ভিডিও গুলো সেইভ
+    করেছেন বা প্রিয় তালিকায় ছিল সেগুলো আছে। যখন কাজ শেষ হয়ে যাবে তখন, এখানকার সব ভিডিও
+    গুলো প্রিয় তালিকাতে নিয়ে যাওয়া হবে।
   Empty Search Message: এই তালিকাতে আপনার কাংখিত ভিডিও নেই যেটি আপনি খুঁজছেন
   You have no playlists. Click on the create new playlist button to create a new one.: নির্বাচিত
     তালিকা নেই। নতুন তালিকা তৈরির জন্য নিউ প্লে-লিস্ট বাটন এ চাপ দিয়ে অগ্রসর হতে পারেন।
diff --git a/static/locales/br.yaml b/static/locales/br.yaml
deleted file mode 100644
index b3de25df2e8a6..0000000000000
--- a/static/locales/br.yaml
+++ /dev/null
@@ -1,1239 +0,0 @@
-# Put the name of your locale in the same language
-Locale Name: 'Brezhoneg'
-# Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  N'eo ket prest lodenn-mañ an arload. Deuit en-dro diwezhatoc'h pa vo aet war-raok
-  an traoù.
-
-# Webkit Menu Bar
-File: 'Restr'
-New Window: 'Prenestr nevez'
-Preferences: 'Gwellvezioù'
-Quit: 'Kuitaat'
-Edit: 'Kemmañ'
-Undo: 'Dizober'
-Redo: 'Adober'
-Cut: 'Troc''hañ'
-Copy: 'Eilañ'
-Paste: 'Pegañ'
-Delete: 'Dilemel'
-Select all: 'Diuzañ pep tra'
-Reload: 'Adkargañ'
-Force Reload: 'Rediañ an adkargañ'
-Toggle Developer Tools: 'Enaouiñ/Lazhañ Ostilhoù diorren'
-Actual size: 'Ment a-vremañ'
-Zoom in: 'Zoum brassat'
-Zoom out: 'Zoum bihanaat'
-Toggle fullscreen: 'Tremen e skramm leun'
-Window: 'Prenestr'
-Minimize: 'Izekaat'
-Close: 'Seriñ'
-Back: 'Distreiñ'
-Forward: 'War-raok'
-Open New Window: 'Digeriñ ur prenestr nevez'
-Go to page: 'Mont d''ar bajenn {page}'
-Close Banner: 'Serriñ ar Giton'
-
-Version {versionNumber} is now available!  Click for more details: 'Stumm {versionNumber}
-  a zo hegerz !  Klikit amañ evit gouzout hiroc''h'
-Download From Site: 'Pellgargañ diwar al lec''hienn'
-A new blog is now available, {blogTitle}. Click to view more: 'Embannet ez eus bet
-  ur pennad nevez, {blogTitle}. Klikit amañ evit gouzout hiroc''h'
-Are you sure you want to open this link?: 'Ha sur oc''h e faot deoc''h digeriñ al
-  liamm-mañ ?'
-
-# Global
-# Anything shared among components / views should be put here
-Global:
-  Videos: 'Videoioù'
-  Shorts: 'Videoioù berr (Shorts)'
-  Live: 'War-eeun'
-  Community: 'Kumuniezh'
-  Counts:
-    Video Count: '1 video | {count} video'
-    Channel Count: '1 chadenn | {count} chadenn'
-    Subscriber Count: '1 den koumanantet | {count} den koumanantet'
-    View Count: '1 sell | {count} sell'
-    Like Count: '1 like | {count} like'
-    Comment Count: '1 evezhiadenn | {count} evezhiadenn'
-    Watching Count: '1 den o sellet | {count} den o sellet'
-  Input Tags:
-    Length Requirement: 'An dikedenn a rank bezañ {number} arouezenn enni da nebeutañ'
-
-# Search Bar
-Search / Go to URL: 'Klask / Mont betek un URL'
-Search Bar:
-  Clear Input: 'Skarzhañ an enankad'
-Search character limit: 'Ar c''hlask a ya dreist an hirder brasañ aotreet : {searchCharacterLimit}
-  arouezenn'
-Search Listing:
-  Label:
-    4K: '4K'
-    8K: '8K'
-    VR180: 'VR180'
-    360 Video: '360°'
-    Subtitles: 'Istitloù'
-    New: 'Nevez'
-    3D: '3D'
-    # Aria labels
-    Closed Captions: 'Teleteks'
-  # In Filter Button
-Search Filters:
-  Search Filters: 'Siloù evit Klask'
-  Sort By:
-    Sort By: 'Rummañ dre'
-    Most Relevant: 'Ar re wellañ'
-    Rating: 'Notenn'
-    Upload Date: 'Deiziad kargañ'
-    View Count: 'Niver a selloù'
-  Time:
-    Time: 'Padelezh'
-    Any Time: 'A-holl-viskoaz'
-    Last Hour: 'Eur diwezhañ'
-    Today: 'Hiziv'
-    This Week: 'Ar sizhun-mañ'
-    This Month: 'Ar miz-mañ'
-    This Year: 'Ar bloaz-mañ'
-  Type:
-    Type: 'Doare'
-    All Types: 'Holl zoareoù'
-    Videos: 'Videoioù'
-    Channels: 'Chadennoù'
-    Movies: 'Filmoù'
-    #& Playlists
-  Duration:
-    Duration: 'Padelezh'
-    All Durations: 'An holl badelezhioù'
-    Short (< 4 minutes): 'Berr (< 4 munud)'
-    Medium (4 - 20 minutes): 'Etre (4 - 20 munud)'
-    Long (> 20 minutes): 'Hir (> 20 munud)'
-  Features:
-    Features: 'Perzhioù'
-    HD: 'HD'
-    Subtitles: 'Istitloù'
-    Creative Commons: 'Creative Commons'
-    3D: '3D'
-    Live: 'War-eeun'
-    4K: '4K'
-    360 Video: 'Video 360'
-    Location: 'Lec’h'
-    HDR: 'HDR'
-    VR180: 'VR180'
-  # On Search Page
-  Search Results: 'Disoc''hoù ar c''hlask'
-  Fetching results. Please wait: 'O klask emañ. Gortozit mar-plij'
-  Fetch more results: 'Diskouez muioc''h a zisoc''hoù'
-  There are no more results for this search: 'N''eus ket mui netra da ziskouez evit
-    ar c''hlask-mañ'
-# Sidebar
-Subscriptions:
-    # On Subscriptions Page
-  Subscriptions: 'Koumanantoù'
-  # channels that were likely deleted
-  Error Channels: 'Chadennoù gant fazioù'
-  Latest Subscriptions: 'Koumanantoù diwezhañ'
-  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Ur
-    bochad koumanantoù en deus ar profil-mañ. Ar wazh RSS a yelo en tu all d''ar vevenn
-    lakaet'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Goullo
-    eo ho roll koumanantoù. Ma faot deoc''h enporzhiañ ho koumanantoù, e c''hellit
-    mont da Arventennoù ar Roadennoù ha choaz Enporzhiañ ho koumanantoù, mod all e
-    c''hellit klask chadennoù da goumanantiñ dezho.'
-  Disabled Automatic Fetching: 'Diweredekaet ho peus an adtapout koumanantoù ent emgefreek.
-    Hizivaat ar c''houmanantoù evit gwelet anezho.'
-  Empty Channels: 'N''eus video ebet gant ar chadennoù heuliet ganeoc''h evit poent.'
-  'Getting Subscriptions. Please wait.': 'O kerc''hat ar c''houmanantoù. Gortozit
-    mar plij.'
-  Empty Posts: 'N''eus kemennadenn ebet gant ar chadennoù heuliet ganeoc''h evit poent.'
-  Load More Videos: 'Kargañ muioc''h a videoioù'
-  Load More Posts: 'Kargañ muioc''h a bennadoù'
-  Subscriptions Tabs: 'Ivinelloù ar c''houmanantoù'
-  All Subscription Tabs Hidden: 'Kuzhet eo holl ivinelloù ar c''houmanantoù. Evit
-    gwelet traoù amañ, diguzhit un nebeud ivinelloù e lodenn "{subsection}" e-barzh
-    "{settingsSection}".'
-More: 'Muioc''h'
-Channels:
-  Channels: 'Chadennoù'
-  Title: 'Roll ar chadennoù'
-  Search bar placeholder: 'Klask chadennoù'
-  Count: '{number} chadenn kavet.'
-  Empty: 'Goullo eo ho roll chadennoù.'
-  Unsubscribe: ''
-  Unsubscribed: ''
-  Unsubscribe Prompt: 'Ha sur oc''h e faot deoc''h digoumanantiñ deus "{channelName}" ?'
-Trending:
-  Trending: 'Diouzh ar cʼhiz'
-  Default: 'Dre ziouer'
-  Music: 'Sonerezh'
-  Gaming: 'C''hoarioù video'
-  Movies: 'Filmoù'
-  Trending Tabs: 'Ivinelloù ar re diouzh ar c''hiz'
-Most Popular: 'Ar muiañ a verzh ganto'
-Feed:
-  Feed Last Updated: '{feedName} hizivadenn diwezhañ ar wazh : {date}'
-  Refresh Feed: 'Adkargañ {subscriptionName}'
-Playlists: 'Rolloù videoioù'
-User Playlists:
-  Your Playlists: 'Ho rolloù videoioù'
-  Playlist Message: ''
-  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
-  You have no playlists. Click on the create new playlist button to create a new one.: 'N''ho
-    peus ket a roll videoioù. Klikit war ar bouton krouiñ ur roll-videoioù nevez evit
-    krouiñ unan.'
-  Empty Search Message: 'N''eus video ebet e-barzh ar roll-vidoeioù-mañ a glotfe gant
-    ho klask'
-  Search bar placeholder: 'Klask rolloù-videoioù'
-  Playlists with Matching Videos: 'Rolloù-videoioù gant videoioù a glot'
-
-  This playlist currently has no videos.: 'Ar roll-videoioù-mañ n''en deus video ebet
-    evit poent.'
-
-  Create New Playlist: 'Krouiñ ur roll-videoioù nevez'
-
-  Add to Playlist: 'Ouzhpennañ d''ar roll-videoioù'
-  Add to Favorites: 'Ouzhpennañ da {playlistName}'
-  Remove from Favorites: 'Dilemel diwar {playlistName}'
-
-  Move Video Up: 'Kas ar video uheloc''h'
-  Move Video Down: 'Kas ar video izeloc’h'
-  Remove from Playlist: 'Tennañ kuit eus ar roll-videoioù'
-
-  Playlist Name: 'Anv ar roll-videoioù'
-  Playlist Description: 'Deskrivadur ar roll-videoioù'
-
-  Save Changes: 'Enrollañ ar c''hemmoù'
-  Cancel: 'Nullañ'
-  Edit Playlist Info: 'Kemmañ titouroù ar roll-videoioù'
-  Copy Playlist: 'Eilañ ar roll-videoioù'
-  Remove Duplicate Videos: 'Dilemel doublennoù ar videoioù'
-  Remove Watched Videos: 'Dilemel ar videoioù bet lennet'
-  Enable Quick Bookmark With This Playlist: 'Gweredekaat ar sined prim evit ar roll-videoioù-mañ'
-  Quick Bookmark Enabled: 'Sined prim gweredekaet'
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: 'Ha
-    sur oc''h e faot deoc''h dilemel 1 doublenn video diouzh ar roll-videoioù-mañ ?
-    Ne c''hall ket bezañ nullet. | Ha sur oc''h e faot deoc''h dilemel {playlistItemCount}
-    doublenn video diouzh ar roll-videoioù-mañ ? Ne c''hall ket bezañ nullet.'
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: 'Ha
-    sur oc''h e faot deoc''h dilemel 1 video bet lennet diouzh ar roll-videoioù-mañ ?
-    Ne c''hall ket bezañ nullet. | Ha sur oc''h e faot deoc''h dilemel {playlistItemCount}
-    video bet lennet diouzh ar roll-videoioù-mañ ? Ne c''hall ket bezañ nullet.'
-  Delete Playlist: 'Dilemel roll-videoioù'
-  Cannot delete the quick bookmark target playlist.: 'N''eo ket posupl dilemel ar
-    roll-videoioù e-lec''h ma vez enrollet ar sinedoù prim.'
-  Are you sure you want to delete this playlist? This cannot be undone: 'Ha sur oc''h
-    e faot deoc''h dilemel ar roll-videoioù-mañ ? Ne vo ket moaien da nullañ war-lerc''h.'
-
-  Sort By:
-    Sort By: 'Rummañ dre'
-
-    NameAscending: 'A-Z'
-    NameDescending: 'Z-A'
-
-    LatestCreatedFirst: 'Krouet nevez ''zo'
-    EarliestCreatedFirst: 'Krouet pell ''zo'
-
-    LatestUpdatedFirst: 'Kemmet nevez ''zo'
-    EarliestUpdatedFirst: 'Kemmet pell ''zo'
-
-    LatestPlayedFirst: 'Lennet nevez ''zo'
-    EarliestPlayedFirst: 'Lennet pell ''zo'
-  SinglePlaylistView:
-    Search for Videos: 'Klask Videoioù'
-
-    Toast:
-      This video cannot be moved up.: 'Ar video-mañ n''hall ket pignat er roll.'
-      This video cannot be moved down.: 'Ar video-mañ n''hall ket diskenn er roll.'
-      Video has been removed: 'Dilamet eo bet ar video'
-      There was a problem with removing this video: 'Ur gudenn a oa en ur glask dilemel
-        ar video-mañ'
-
-      This playlist is already being used for quick bookmark.: 'Implijet e vez dija
-        ar roll-videoioù-mañ evit enrollañ ar sinedoù prim.'
-      This playlist is now used for quick bookmark: 'Implijet e vo ar roll-videoioù-mañ
-        evit enrollañ ar sinedoù prim'
-      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: 'Implijet
-        e vo ar roll-videoioù-mañ evit enrollañ ar sinedoù prim e-lec''h {oldPlaylistName}.
-        Klikit amañ evit nullañ'
-      Reverted to use {oldPlaylistName} for quick bookmark: 'Adlakaat ar roll-videoioù
-        {oldPlaylistName} evit enrollañ ar sinedoù prim'
-
-      Some videos in the playlist are not loaded yet. Click here to copy anyway.: 'Videoioù
-        ''zo e-barzh ar roll-videoioù n''int ket karget c''hoazh. Klikit amañ evit
-        eilañ anezho memestra.'
-      Playlist name cannot be empty. Please input a name.: 'N''hall ket anv ar roll-videoioù
-        bezañ goullo. Lakait unan mar-plij.'
-      Playlist has been updated.: 'Kemmet eo bet ar roll-videoioù.'
-      There was an issue with updating this playlist.: 'C''hoarvezet ez eus ur gudenn
-        en ur cheñch ar roll-videoioù-mañ.'
-      "{videoCount} video(s) have been removed": "Dilamet ez eus bet 1 video | Dilamet
-        ez eus bet {videoCount} video"
-      There were no videos to remove.: 'Ne oa video ebet da zilemel.'
-      This playlist is protected and cannot be removed.: 'Gwarezet eo ar roll-videoioù-mañ
-        ha ne c''hall ket bezañ dilamet.'
-      Playlist {playlistName} has been deleted.: 'Dilamet eo bet ar roll-videoioù
-        {playlistName}.'
-      Playlist {playlistName} is the new quick bookmark playlist.: 'Ar roll-videoioù
-        {playlistName} a zo bremañ roll-videoioù nevez ar sinedoù prim.'
-
-      This playlist does not exist: 'N''eus ket eus ar roll-videoioù-mañ'
-
-      This playlist has a video with a duration error: 'Bez ez eus ur video d''an
-        nebeutañ hep padelezh e-barzh ar roll-videoioù, rummet e vo evel ma vije goullo
-        ar padelezh.'
-  AddVideoPrompt:
-    Select a playlist to add your N videos to: 'Choazit ur roll-videoioù evit ouzhpennañ
-      ho video e-barzh | Choazit ur roll-videoioù evit ouzhpennañ ho {videoCount}
-      video e-barzh'
-    N playlists selected: '{playlistCount} Diuzet'
-    Search in Playlists: 'Klask e-barzh ar rolloù-videoioù'
-    Allow Adding Duplicate Video(s): 'Aotren ouzhpennañ doublennoù videoioù'
-    Save: 'Enrollañ'
-
-    Added {count} Times: 'Ouzhpennet dija | Ouzhpennet {count} gwech'
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
-      video a vo ouzhpennet'
-    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
-      video bet ouzhpennet dija'
-
-    Toast:
-      You haven't selected any playlist yet.: 'N''ho peus diuzet ur roll-videoioù
-        c''hoazh.'
-      "{videoCount} video(s) added to 1 playlist": "1 video ouzhpennet d'1 roll-videoioù
-        | {videoCount} video ouzhpennet d'1 roll-videoioù"
-      "{videoCount} video(s) added to {playlistCount} playlists": "1 video ouzhpennet
-        da {playlistCount} roll-videoioù | {videoCount} video ouzhpennet da  {playlistCount}
-        roll-videoioù"
-  CreatePlaylistPrompt:
-    New Playlist Name: 'Anv nevez ar roll-videoioù'
-    Create: 'Krouiñ'
-
-    Toast:
-      There is already a playlist with this name. Please pick a different name.: 'Bez
-        ez eus dija ur roll-videoioù gant an anv-mañ. Choazit un anv disheñvel mar-plij.'
-      Playlist {playlistName} has been successfully created.: 'Krouet eo bet ar roll-videoioù
-        {playlistName} gant berzh.'
-      There was an issue with creating the playlist.: 'C''hoarvezet ez eus ur gudenn
-        en ur grouiñ ar roll-videoioù.'
-  Export Playlist: Ezporzhiañ ar Roll-videoioù
-  The playlist has been successfully exported: Ezporzhiet eo bet ar roll-videoioù
-    gant berzh
-History:
-  # On History Page
-  History: 'Roll istor'
-  Watch History: 'Roll istor ar videoioù lennet'
-  Your history list is currently empty.: 'Goullo eo ho roll istor.'
-  Empty Search Message: 'N''eus video ebet e-barzh ho roll istor o klotañ gant ho
-    klask'
-  Search bar placeholder: "Klask e-barzh ar roll istor"
-  Case Sensitive Search: 'Klask o toujañ d''ar pennlizherennoù'
-Settings:
-  # On Settings Page
-  Settings: 'Arventennoù'
-  Expand All Settings Sections: ''
-  Sort Settings Sections (A-Z): 'Rummañ lodennoù an arventennoù (A-Z)'
-  Return to Settings Menu: 'Distreiñ d''al lañser arventennoù'
-  The app needs to restart for changes to take effect. Restart and apply change?: 'Ezhomm
-    en deus an arload da vezañ adloc''het bremañ evit arloañ ar c''hemmoù. Adloc''hañ
-    hag arloañ ar c''hemmoù ?'
-  General Settings:
-    General Settings: 'Hollek'
-    Check for Updates: 'Klask Hizivadurioù'
-    Check for Latest Blog Posts: 'Diskouez pennadoù diwezhañ ar Blog'
-    Fallback to Non-Preferred Backend on Failure: 'Distreiñ d''ar Backend ha n''eo
-      ket hoc''h hini karetañ ma c''hoarvez ur gudenn'
-    Enable Search Suggestions: 'Gweredekaat Kinnigoù klask'
-    Auto Load Next Page:
-      Label: 'Kargañ ar bajenn da heul ent emgefreek'
-      Tooltip: 'Kargañ ar pajennoù hag an evezhiadennoù all ent emgefreek.'
-    Default Landing Page: 'Pajenn degemer dre ziouer'
-    Locale Preference: 'Yezh'
-    System Default: 'Reizhiad dre ziouer'
-    Preferred API Backend:
-      Preferred API Backend: 'API Backend muiañ karet'
-      Local API: 'API lec''hel'
-      Invidious API: 'API Invidious'
-    Video View Type:
-      Video View Type: 'Doare da ziskouez ar videoioù'
-      Grid: 'Kael'
-      List: 'Roll'
-    Thumbnail Preference:
-      Thumbnail Preference: 'Gwellvezioù ar skeudennoùigoù'
-      Default: 'Dre ziouer'
-      Beginning: 'Derou'
-      Middle: 'Kreiz'
-      End: 'Fin'
-      Hidden: 'Kuzhet'
-      Blur: 'Ruzed'
-    Current Invidious Instance: 'Istañs Invidious bremanel'
-    The currently set default instance is {instance}: 'An istañs dre ziouer a zo {instance}'
-    No default instance has been set: 'N''eus istañs dre ziouer ebet choazet'
-    Current instance will be randomized on startup: 'Dargouezheket e vo un istañs
-      dre ziouer pa vo adloc''het'
-    Set Current Instance as Default: 'Lakaat an istañs implijet bremañ evel an hini
-      dre ziouer'
-    Clear Default Instance: 'Diverkañ an istañs dre ziouer'
-    View all Invidious instance information: 'Gwelet titouroù an holl istañsoù Invidious'
-    Region for Trending: 'Bro evit ar videoioù diouzh ar c''hiz'
-    #! List countries
-    External Link Handling:
-      External Link Handling: 'Merañ al liammoù diavaez'
-      Open Link: 'Digeriñ an ere'
-      Ask Before Opening Link: 'Goulenn a-raok digeriñ ul liamm'
-      No Action: 'Netra'
-  Theme Settings:
-    Theme Settings: 'Tem'
-    Match Top Bar with Main Color: 'Lakaat da glotañ liv ar varenn e-krec''h gant
-      al liv pennañ'
-    Expand Side Bar by Default: 'Astenn ar varenn gostez dre ziouer'
-    Disable Smooth Scrolling: 'Diweredekaat an dibunañ flour'
-    UI Scale: 'Skeul an UI'
-    Hide Side Bar Labels: 'Kuzhat tikedennoù ar varrenn gostez'
-    Hide FreeTube Header Logo: 'Kuzhat logo FreeTube an talbenn'
-    Base Theme:
-      Base Theme: 'Tem diazez'
-      Black: 'Du'
-      Dark: 'Teñval'
-      System Default: 'Yezh ar reizhiad'
-      Light: 'Sklaer'
-      Dracula: 'Drakula'
-      Catppuccin Mocha: 'Catppuccin Mocha'
-      Pastel Pink: 'Roz pastel'
-      Hot Pink: 'Roz flamm'
-      Nordic: 'Nordik'
-      Solarized Dark: 'Du luc''hahelet'
-      Solarized Light: 'Sklaer luc''hahelet'
-    Main Color Theme:
-      Main Color Theme: 'Liv pennañ an tem'
-      Red: 'Ruz'
-      Pink: 'Roz'
-      Purple: 'Mouk'
-      Deep Purple: 'Mouk teñval'
-      Indigo: 'Indigo'
-      Blue: 'Glas'
-      Light Blue: 'Glas sklaer'
-      Cyan: 'Siañ'
-      Teal: 'Glas-gwer'
-      Green: 'Gwer'
-      Light Green: 'Gwer sklaer'
-      Lime: 'Liv sitroñs'
-      Yellow: 'Melen'
-      Amber: 'Goularz'
-      Orange: 'Orañjez'
-      Deep Orange: 'Orañjez teñval'
-      Dracula Cyan: 'Drakula Siañ'
-      Dracula Green: 'Drakula Gwer'
-      Dracula Orange: 'Drakula Orañjez'
-      Dracula Pink: 'Drakula Roz'
-      Dracula Purple: 'Drakula Mouk'
-      Dracula Red: 'Drakula Ruz'
-      Dracula Yellow: 'Drakula Melen'
-      Catppuccin Mocha Rosewater: 'Catppuccin Moka Roz sklaer'
-      Catppuccin Mocha Flamingo: 'Catppuccin Moka Flammeg boutin'
-      Catppuccin Mocha Pink: 'Catppuccin Moka Roz'
-      Catppuccin Mocha Mauve: 'Catppuccin Moka Mouk'
-      Catppuccin Mocha Red: 'Catppuccin Moka Ruz'
-      Catppuccin Mocha Maroon: 'Catppuccin Moka Gell'
-      Catppuccin Mocha Peach: 'Catppuccin Moka Pechez'
-      Catppuccin Mocha Yellow: 'Catppuccin Moka Melen'
-      Catppuccin Mocha Green: 'Catppuccin Moka Gwer'
-      Catppuccin Mocha Teal: 'Catppuccin Moka Glas-gwer'
-      Catppuccin Mocha Sky: 'Catppuccin Moka Glas oabl'
-      Catppuccin Mocha Sapphire: 'Catppuccin Moka Safir'
-      Catppuccin Mocha Blue: 'Catppuccin Moka Glas'
-      Catppuccin Mocha Lavender: 'Catppuccin Moka Lavand'
-      Solarized Yellow: 'Melen luc''hahelet'
-      Solarized Orange: 'Orañjez luc''hahelet'
-      Solarized Red: 'Ruz luc''hahelet'
-      Solarized Magenta: 'Majenta luc''hahelet'
-      Solarized Violet: 'Mouk luc''hahelet'
-      Solarized Blue: 'Glas luc''hahelet'
-      Solarized Cyan: 'Siañ luc''hahelet'
-      Solarized Green: 'Gwer luc''hahelet'
-    Secondary Color Theme: 'Liv eilvedel an tem'
-        #* Main Color Theme
-  Player Settings:
-    Player Settings: 'Lenner'
-    Play Next Video: 'Lenn ar video da-heul'
-    Turn on Subtitles by Default: 'Enaouiñ an istitloù dre ziouer'
-    Autoplay Videos: 'Lenn emgefreek ar videoioù'
-    Proxy Videos Through Invidious: 'Proksi video dre Invidious'
-    Autoplay Playlists: 'Lenn emgefreek ar rolloù-videoioù'
-    Enable Theatre Mode by Default: 'Gweredekaat ar mod sinema dre ziouer'
-    Scroll Volume Over Video Player: 'Kontrol al live-son en ur zibunañ rodellig al
-      logodenn war al lenner video'
-    Scroll Playback Rate Over Video Player: 'Kontrol ar feur lenn en ur zibunañ rodellig
-      al logodenn war al lenner video'
-    Skip by Scrolling Over Video Player: 'Tremen en ur zibunañ rodellig al logodenn
-      war al lenner video'
-    Display Play Button In Video Player: 'Diskouez ar bouton Lenn e-barzh al lenner
-      video'
-    Enter Fullscreen on Display Rotate: 'Tremen e skramm leun pa vez troet ar skramm'
-    Next Video Interval: 'Esaouenn a-raok ar video da heul'
-    Fast-Forward / Rewind Interval: 'Esaouenn evit mont War-raok / War-gil'
-    Default Volume: 'Ment ar son dre ziouer'
-    Default Playback Rate: 'Feur lenn dre ziouer'
-    Max Video Playback Rate: 'Feur lenn uhelañ ar videoioù'
-    Video Playback Rate Interval: 'Esaouenn feur lenn ar videoioù'
-    Default Video Format:
-      Default Video Format: 'Furmad video dre ziouer'
-      Dash Formats: 'Furmad DASH'
-      Legacy Formats: 'Furmad Legacy'
-      Audio Formats: 'Furmadoù son'
-    Default Quality:
-      Default Quality: 'Kalite dre ziouer'
-      Auto: 'Emgefreek'
-      144p: '144p'
-      240p: '240p'
-      360p: '360p'
-      480p: '480p'
-      720p: '720p'
-      1080p: '1080p'
-      1440p: '1440p'
-      4k: '4k'
-      8k: '8k'
-    Screenshot:
-      Enable: 'Gweredekaat Tapadennoù-skramm'
-      Format Label: 'Furmad an tapadennoù-skramm'
-      Quality Label: 'Kalite an tapadennoù-skramm'
-      Ask Path: 'Goulenn war-lerc''h an teuliad enrollañ'
-      Folder Label: 'Teuliad an tapadennoù-skramm'
-      Folder Button: 'Diuzañ un teuliad'
-      File Name Label: 'Patrom anv restr'
-      File Name Tooltip: 'Gallout a rit implijout an argemmennoù da-heul. %Y Bloavezh
-        4 sifr. %M Miz 2 sifr. %D Devezh 2 sifr. %H Eur 2 sifr. %N Munutennoù 2 sifr.
-        %S Eilennoù 2 sifr. %T Mili-eilennoù 3 sifr. %s Eilennoù ar video. %t Mili-eilennoù
-        ar video 3 sifr. %i ID ar video. Gallout a rit implijout ivez \ pe / evit
-        krouiñ teuliadoù.'
-      Error:
-        Forbidden Characters: 'Arouezennoù difennet'
-        Empty File Name: 'Goullo eo anv ar restr'
-  External Player Settings:
-    External Player Settings: 'Lenner diavaez'
-    External Player: 'Lenner diavaez'
-    Ignore Unsupported Action Warnings: 'Lezel a-gostez ar c''hemennadennoù evit an
-      obererezhioù nann skoret'
-    Ignore Default Arguments: 'Leuskel arguzennoù dre ziouer a-gostez'
-    Custom External Player Executable: 'Lenner diavaez personelaet'
-    Custom External Player Arguments: 'Arguzennoù al lenner diavaez personelaet'
-    Players:
-      None:
-        Name: 'Hini ebet'
-  Privacy Settings:
-    Privacy Settings: 'Prevezded'
-    Remember History: 'Derc''hel soñj ar roll istor'
-    Save Watched Progress: 'Mirout araokadur al lenn'
-    Save Watched Videos With Last Viewed Playlist: 'Enrollañ ar videoioù lennet e-barzh
-      roll-videoioù diwezhañ sellet'
-    Clear Search Cache: 'Skarzhañ roll-istor an enklaskoù'
-    Are you sure you want to clear out your search cache?: 'Ha sur oc''h e faot deoc''h
-      skarzhañ roll-istor an enklaskoù ?'
-    Search cache has been cleared: 'Skarzhet eo bet roll-istor an enklaskoù'
-    Remove Watch History: 'Dilemel ar roll istor'
-    Are you sure you want to remove your entire watch history?: 'Ha sur oc''h e faot
-      deoc''h dilemel ho roll istor a-bezh ?'
-    Watch history has been cleared: 'Dilamet eo bet roll istor ar videoioù lennet'
-    Remove All Subscriptions / Profiles: 'Dilemel an holl goumanantoù / profiloù'
-    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'Ha
-      sur oc''h e faot deoc''h dilemel an holl goumanantoù ha profiloù ? Ne c''hall
-      ket bezañ nullet.'
-    Remove All Playlists: 'Dilemel an holl rolloù-videoioù'
-    All playlists have been removed: 'Lamet eo bet an holl rolloù-videoioù'
-    Are you sure you want to remove all your playlists?: 'Ha sur oc''h e faot deoc''h
-      dilemel hoc''h holl rolloù-videoioù ?'
-  Subscription Settings:
-    Subscription Settings: 'Koumanant'
-    Hide Videos on Watch: 'Kuzhat ar videoioù lennet'
-    Fetch Feeds from RSS: 'Adtapout ar gwazhioù RSS'
-    Manage Subscriptions: ''
-    Fetch Automatically: 'Adtapout ar wazh ent emgefreek'
-    Only Show Latest Video for Each Channel: 'Diskouez ar video-diwezhañ hepken evit
-      pep chadenn'
-    Confirm Before Unsubscribing: 'Kadarnaat a-raok Digoumanantiñ'
-  Distraction Free Settings:
-    Distraction Free Settings: 'Disoursi'
-    Sections:
-      Side Bar: 'Barrenn gostez'
-      Subscriptions Page: 'Pajenn ar c''houmanantoù'
-      Channel Page: 'Pajenn ar chadenn'
-      Watch Page: 'Pajenn evit lenn'
-      General: 'Hollek'
-    Hide Video Views: 'Kuzhat an niver a selloù'
-    Hide Video Likes And Dislikes: 'Kuzhat bizied-meud ar videoioù'
-    Hide Channel Subscribers: 'Kuzhat an niver a dud koumanantet d''ar chadennoù'
-    Hide Comment Likes: 'Kuzhat an niver a vizied-meud evit an evezhiadennoù'
-    Hide Recommended Videos: 'Kuzhat ar videoioù aliet'
-    Hide Trending Videos: 'Kuzhat ar videoioù diouzh ar c''hiz'
-    Hide Popular Videos: 'Kuzhat ar videoioù muian karet'
-    Hide Playlists: 'Kuzhat ar rolloù-videoioù'
-    Hide Live Chat: 'Kuzhat ar flapiñ war-eeun'
-    Hide Active Subscriptions: 'Kuzhat ar c''houmanantoù oberiant'
-    Hide Video Description: 'Kuzhat deskrivadur ar video'
-    Hide Comments: 'Kuzhat an evezhiadennoù'
-    Hide Profile Pictures in Comments: 'Kuzhat ar skeudennoù profil e-barzh an evezhiadennoù'
-    Display Titles Without Excessive Capitalisation: 'Diskouez an titloù hep lizherennoù
-      bras hag hep re a boentadurioù'
-    Hide Live Streams: 'Kuzhat ar skignañ war-eeun'
-    Hide Upcoming Premieres: 'Kuzhat rakskignañ da zont'
-    Hide Sharing Actions: 'Kuzhat an doareoù da rannañ'
-    Hide Chapters: 'Kuzhat ar chabistroù'
-    Hide Channels: 'Kuzhat videoioù ar chadennoù'
-    Hide Channels Disabled Message: 'Stanket eo bet chadennadoù zo gant an ID ha n''int
-      ket evit bezañ diskouezet. Stanket eo an obererezh-mañ keit ma vez hizivaet
-      an IDoù-se'
-    Hide Channels Placeholder: 'ID ar chadenn'
-    Hide Channels Invalid: 'Direizh eo ID ar chadenn roet'
-    Hide Channels API Error: 'Fazi en ur adtapout an implijer gant an ID bet roet.
-      Gwiriit en-dro hag-eñ eo reizh an ID mar plij.'
-    Hide Channels Already Exists: 'ID ar chadenn a zo anezhañ dija'
-    Hide Featured Channels: 'Kuzhat ar chadennoù lakaet war-wel'
-    Hide Channel Playlists: 'Kuzhat rolloù-videoioù ar chadennoù'
-    Hide Channel Community: 'Kuzhat ivinell kumuniezh ar chadenn'
-    Hide Channel Shorts: 'Kuzhat Shortoù ar chadenn'
-    Hide Channel Podcasts: 'Kuzhat Podskignañ at chadenn'
-    Hide Channel Releases: 'Kuzhat ermaeziadennoù ar chadenn'
-    Hide Videos and Playlists Containing Text: 'Kuzhat ar videoioù hag ar rolloù-videoioù
-      gant testennoù'
-    Hide Videos and Playlists Containing Text Placeholder: 'Ger, lodenn deus ur ger,
-      pe frazenn'
-    Hide Subscriptions Videos: 'Kuzhat videoioù ar c''houmanantoù'
-    Hide Subscriptions Shorts: 'Kuzhat Shortoù ar c''houmanantoù'
-    Hide Subscriptions Live: 'Kuzhat ar skignañ war-eeun deus ar c''houmanantoù'
-    Hide Subscriptions Community: 'Kuzhat Kumuniezh ar c''houmanantoù'
-  Data Settings:
-    Data Settings: 'Roadennoù'
-    Select Import Type: 'Choaz doare enporzhiañ'
-    Select Export Type: 'Choaz doare ezporzhiañ'
-    Import Subscriptions: 'Enporzhiañ ho koumanantoù'
-    Subscription File: 'Restr ar c''houmanant'
-    History File: 'Rest ar roll istor'
-    Playlist File: 'Restr ar roll-videoioù'
-    Check for Legacy Subscriptions: ''
-    Export Subscriptions: 'Ezporzhiañ ar c''houmanantoù'
-    Export FreeTube: 'Ezporzhiañ FreeTube'
-    Export YouTube: 'Ezporzhiañ YouTube'
-    Export NewPipe: 'Ezporzhiañ NewPipe'
-    Import History: 'Enporzhiañ ar roll istor'
-    Export History: 'Ezporzhiañ ar roll istor'
-    Import Playlists: 'Enporzhiañ rolloù-videoioù'
-    Export Playlists: 'Ezporzhiañ rolloù-videoioù'
-    Export Playlists For Older FreeTube Versions:
-      Label: 'Ezporzhiañ rolloù-videoioù evit stummoù kozh FreeTube'
-      # |- = Keep newlines, No newline at end
-      Tooltip: |-
-        An dibarzh-mañ a ezporzh videoioù an holl rolloù-videoioù e-barzh ur roll-videoioù anvet « Favorites ».
-        Penaos ezporzhiañ & enporzhiañ videoioù e-barzh rolloù-videoioù gant stummoù kozh FreeTube :
-        1. Ezporzhiañ ho rolloù-videoioù gant an dibarzh-mañ gweredekaet.
-        2. Dilemel an holl rolloù-videoioù en ur implijout an dibarzh Dilemel an holl rolloù-videoioù dindan Prevezded.
-        3. Loc'hañ stumm kozh FreeTube hag enporzhiañ ar rolloù-videoioù ezporzhiet."
-    Profile object has insufficient data, skipping item: 'Diouer a roadennoù evit
-      profil an elfenn-mañ, o leuskel an elfenn a-gostez'
-    All subscriptions and profiles have been successfully imported: 'Enporzhiet eo
-      bet an holl goumanantoù ha profiloù gant berzh'
-    All subscriptions have been successfully imported: 'Enporzhiet eo bet an holl
-      goumanantoù gant berzh'
-    Invalid subscriptions file: 'Direizh eo restr ar c''houmanantoù'
-    Invalid history file: 'Restr ar roll istor direizh'
-    Subscriptions have been successfully exported: 'Ezporzhiet eo bet ar c''houmanantoù
-      gant berzh'
-    History object has insufficient data, skipping item: 'Lezel a-gostez an elfenn-mañ
-      peogwir e vank titouroù e-barzh ar roll istor'
-    All watched history has been successfully imported: 'Enporzhiet eo bet roll istor
-      ar videoioù lennet gant berzh'
-    All watched history has been successfully exported: 'Ezporzhiet eo bet roll istor
-      ar videoioù lennet gant berzh'
-    Playlist insufficient data: 'Diouer a roadennoù evit ar roll-videoioù "{playlist}",
-      o leuskel an elfenn a-gostez'
-    All playlists has been successfully imported: 'Enporzhiet eo bet an holl rolloù-videoioù
-      gant berzh'
-    All playlists has been successfully exported: 'Ezporzhiet eo bet an holl rolloù-videoioù
-      gant berzh'
-    Unable to read file: 'Ne c''haller ket lenn ar restr'
-    Unable to write file: 'N''haller ket skrivañ ar restr'
-    Unknown data key: 'Alc''hwez ar roadennoù dianav'
-    How do I import my subscriptions?: 'Penaos enporzhiañ ma c''houmanantoù ?'
-    Manage Subscriptions: 'Merañ ar c''houmanantoù'
-  Proxy Settings:
-    Proxy Settings: 'Proksi'
-    Enable Tor / Proxy: 'Gweredekaat Tor / Proksi'
-    Proxy Protocol: 'Komenad ar Proksi'
-    Proxy Host: 'Komenad Servijer'
-    Proxy Port Number: 'Niverenn borzh ar Proksi'
-    Clicking on Test Proxy will send a request to: 'En ur glikañ war Taol-esae Proksi
-      e vo kaset ur goulenn da'
-    Test Proxy: 'Taol-esae Proksi'
-    Your Info: 'Ho titouroù'
-    Ip: 'IP'
-    Country: 'Bro'
-    Region: 'Rannvro'
-    City: 'Kêr'
-    Error getting network information. Is your proxy configured properly?: 'C''hoarvezet
-      ez eus bet ur gudenn en ur glask war-lerc''h titouroù ar rouedad. Ha kefluniet
-      mat eo ho proksi ?'
-  SponsorBlock Settings:
-    SponsorBlock Settings: 'SponsorBlock'
-    Enable SponsorBlock: 'Gweredekaat SponsorBlock'
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'URL API SponsorBlock
-      (Dre ziouer https://sponsor.ajay.app)'
-    Notify when sponsor segment is skipped: 'Kelaouiñ pa vez tremenet ul lodenn paeroniet'
-    UseDeArrowTitles: 'Implijout titloù video DeArrow'
-    UseDeArrowThumbnails: 'Implijout DeArrow evit ar skeudennoùigoù'
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': 'URL
-      API DeArrow evit krouiñ skeudennoùigoù (Dre ziouer https://dearrow-thumb.ajay.app)'
-    Skip Options:
-      Skip Option: 'Laoskel a-gostez an dibarzh'
-      Auto Skip: 'Lamm emgefreek'
-      Show In Seek Bar: 'Diskouez er varenn glask'
-      Prompt To Skip: 'Kinnig da laoskel a-gostez'
-      Do Nothing: 'Ober netra'
-    Category Color: 'Liv ar rummad'
-  Parental Control Settings:
-    Parental Control Settings: 'Kontroll ar gerent'
-    Hide Unsubscribe Button: 'Kuzhat ar bouton digoumanantiñ'
-    Show Family Friendly Only: 'Diskouez videoioù evit ar familh hepken'
-    Hide Search Bar: 'Kuzhat ar varenn glask'
-  Download Settings:
-    Download Settings: 'Pellgargañ'
-    Ask Download Path: 'Goulenn war-lerc''h an hent pellgargañ'
-    Choose Path: 'Dibab an hent'
-    Download Behavior: 'Emzalc''h ar pellgargañ'
-    Download in app: 'Pellgargañ en arload'
-    Open in web browser: 'Digeriñ er merdeer web'
-  Experimental Settings:
-    Experimental Settings: 'Arnodel'
-    Warning: 'Arventennoù arnodel eo, gallout a ra ar sistem chom bout pa vezont gweredekaet.
-      Aliet-tre eo ober enrolladennoù. Kendalc’hit en ho riskl hoc’h-unan !'
-    Replace HTTP Cache: 'Erlec''hiañ ar grubuilh HTTP'
-  Password Dialog:
-    Password: 'Ger-tremen'
-    Enter Password To Unlock: 'Enankit ar ger-tremen evit dibrennañ an arventennoù'
-    Password Incorrect: 'Ger-tremen direizh'
-    Unlock: 'Dibrennañ'
-  Password Settings:
-    Password Settings: 'Ger-tremen'
-    Set Password To Prevent Access: 'Lakaat ur ger-tremen evit gwareziñ an arventennoù'
-    Set Password: 'Termeniñ ur ger-termen'
-    Remove Password: 'Dilemel ar ger-tremen'
-About:
-  #On About page
-  About: 'A-zivout'
-  Beta: 'Beta'
-  Source code: 'Kod mammenn'
-  Licensed under the: 'Dindan an aotre-implijout'
-  AGPLv3: 'AGPLv3'
-  Downloads / Changelog: 'Pellgargañ / Deizlevr ar cheñchamantoù'
-  GitHub releases: 'Ermaeziadennoù GitHub'
-  Help: 'Skoazell'
-  FreeTube Wiki: 'Wiki FreeTube'
-  FAQ: 'FAG'
-  Discussions: 'Kaozeadennoù'
-  Report a problem: 'Menegiñ ur gudenn'
-  GitHub issues: 'Kudennoù renablet war GitHub'
-  Please check for duplicates before posting: 'Gwiriekait an doublennoù a-raok embann,
-    mar-plij'
-  Website: 'Lec''hienn web'
-  Blog: 'Blog'
-  Email: 'Chomlec’h postel'
-  Mastodon: 'Mastodon'
-  Chat on Matrix: 'Flapañ war Matrix'
-  Please read the: 'Par-plij, lennit'
-  room rules: 'reolennoù ar sal'
-  Translate: 'Treiñ'
-  Credits: 'Kreditoù'
-  FreeTube is made possible by: 'Bez ez eus deus FreeTube a-drugarez da'
-  these people and projects: 'an dud-se hag ar raktresoù-se'
-  Donate: 'Ober un donezon'
-
-Profile:
-  Profile Settings: 'Profil'
-  Toggle Profile List: 'Diskouez roll ar profiloù'
-  Profile Select: 'Dibab ar profil'
-  Profile Filter: 'Silañ ar profil'
-  All Channels: 'An holl chadennoù'
-  Profile Manager: 'Merañ ar profil'
-  Create New Profile: 'Krouiñ ur profil nevez'
-  Edit Profile: 'Kemmañ ar profil'
-  Edit Profile Name: 'Kemmañ anv ar profil'
-  Create Profile Name: 'Krouiñ anv ar profil'
-  Profile Name: 'Anv ar profil'
-  Color Picker: 'Garrennig livioù'
-  Custom Color: 'Liv personelaet'
-  Profile Preview: 'Rakwelet ar profil'
-  Create Profile: 'Krouiñ ur profil'
-  Update Profile: 'Hizivaat ar profil'
-  Make Default Profile: 'Lakaat evel Profil dre ziouer'
-  Delete Profile: 'Dilemel ar profil'
-  Are you sure you want to delete this profile?: 'Ha sur oc''h e faot deoc''h dilemel
-    ar profil-mañ ?'
-  All subscriptions will also be deleted.: 'An holl goumanantoù a vo ivez dilamet.'
-  Profile could not be found: 'N''eus ket bet gallet kavout ar profil'
-  Your profile name cannot be empty: 'Ne c''hall ket anv ar profil bezañ goullo'
-  Profile has been created: 'Krouet eo bet ar profil'
-  Profile has been updated: 'Hizivaet eo bet ar profil'
-  Your default profile has been set to {profile}: 'Ho profil dre ziouer ''zo bet lakaet
-    da {profile}'
-  Removed {profile} from your profiles: 'Dilamet eo bet {profile} deus ho profiloù'
-  Your default profile has been changed to your primary profile: 'Kemmet eo bet ho
-    profil dre ziouer d''ho profil pennañ'
-  '{profile} is now the active profile': '{profile} a zo bremañ ar profil oberiant'
-  Subscription List: 'Roll ar c''houmanantoù'
-  Other Channels: 'Chadennoù all'
-  '{number} selected': '{number} diuzet'
-  Select All: 'Diuzañ an holl'
-  Select None: 'Diuzañ hini ebet'
-  Delete Selected: 'Dilemel ar re ziuzet'
-  Add Selected To Profile: 'Ouzhpennañ ar re ziuzet d’ar profil'
-  No channel(s) have been selected: 'Chadenn ebet diuzet'
-  ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
-    same channels will be deleted in any profile they are found in.
-  : 'Ho profil pennañ eo. Ha sur oc''h e faot deoc''h dilemel ar chadennoù diuzet ?
-    Ar memes chadennoù a vo dilamet deus ho profiloù all.'
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Ha
-    sur oc''h hoc''h e faot deoc''h dilemel ar chadennoù diuzet ?  Gant-se ne vo ket
-    dilamet ar chadenn diouzh profil ebet all.'
-  Close Profile Dropdown: 'Serriñ roll ar profil'
-  Open Profile Dropdown: 'Digeriñ roll ar profil'
-#On Channel Page
-Channel:
-  Subscribe: 'Koumanantiñ'
-  Unsubscribe: 'Digoumanantiñ'
-  Channel has been removed from your subscriptions: 'Dilamet eo bet ar chadenn diouzh
-    ho koumanantoù'
-  Removed subscription from {count} other channel(s): 'Dilamet eo bet ar c''houmanant
-    diouzh {count} chadenn all'
-  Added channel to your subscriptions: 'Chadenn ouzhpennet d''ho koumanantoù'
-  Search Channel: 'Klask e-barzh ar chadenn'
-  Your search results have returned 0 results: 'N''eus disoc''h ebet gant ho klask'
-  Sort By: 'Rummañ dre'
-  This channel does not exist: 'N''eus ket deus ar chadenn-mañ'
-  This channel does not allow searching: 'Ne vez ket aotreet klask gant ar chadenn-mañ'
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Ur
-    vevenn oad a zo d''ar chadenn-mañ ha ne c''hall ket bezañ gwelet war FreeTube
-    evit poent.'
-  Channel Tabs: 'Ivinelloù ar chadenn'
-  Videos:
-    Videos: 'Videoioù'
-    This channel does not currently have any videos: 'N''eus ket a video evit poent
-      gant ar chadenn-mañ'
-    Sort Types:
-      Newest: 'Nevesañ'
-      Oldest: 'Koshañ'
-      Most Popular: 'Ar muiañ a verzh ganto'
-  Shorts:
-    This channel does not currently have any shorts: 'N''eus ket a video short evit
-      poent gant ar chadenn-mañ'
-  Live:
-    Live: 'End-eeun'
-    This channel does not currently have any live streams: 'Ne vez ket skignet war-eeun
-      gant ar chadenn-mañ evit poent'
-  Playlists:
-    Playlists: 'Rolloù-videoioù'
-    This channel does not currently have any playlists: 'N''eus ket a roll-videoioù
-      evit poent gant ar chadenn-mañ'
-    Sort Types:
-      Last Video Added: 'Video diwezhañ ouzhpennet'
-      Newest: 'Nevesañ'
-      Oldest: 'Koshañ'
-  Podcasts:
-    Podcasts: 'Podskignañ'
-    This channel does not currently have any podcasts: 'N''eus ket a bodskignañ evit
-      poent gant ar chadenn-mañ'
-  Releases:
-    Releases: 'Ermaeziadennoù'
-    This channel does not currently have any releases: 'N''eus ket a ermaeziadenn
-      evit poent gant ar chadenn-mañ'
-  About:
-    About: 'A-zivout'
-    Channel Description: 'Deskrivadur ar chadenn'
-    Tags:
-      Tags: 'Tikedennoù'
-      Search for: 'Klask evit "{tag}"'
-    Details: 'Munudoù'
-    Joined: 'Enskrivet'
-    Location: 'Lec''hiadur'
-    Featured Channels: 'Chadennoù lakaet war-wel'
-  Community:
-    This channel currently does not have any posts: 'N''eus ket a gaozeadenn evit
-      poent gant ar chadenn-mañ'
-    votes: '{votes} a vouezhioù'
-    View Full Post: 'Gwelet ar pennad a-bezh'
-    Reveal Answers: 'Diskouez ar respontoù'
-    Hide Answers: 'Kuzhat ar respontoù'
-    Video hidden by FreeTube: 'Video kuzhet gant FreeTube'
-    Viewing Posts Only Supported By Invidious: 'Posupl eo gwelet ar pennadoù gant
-      Invidious hepken. Kit war ivinell kumuniezh ur chadenn evit gwelet he fennadoù
-      hep Invidious.'
-Video:
-  IP block: 'Stanket eo bet ho chomlec''h IP gant YouTube. Klaskit cheñch VPN pe proksi
-    evit lenn ar videoioù.'
-  More Options: 'Muioc''h a zibarzhioù'
-  Mark As Watched: 'Lakaat evel lennet'
-  Remove From History: 'Skarzhañ deus ar roll istor'
-  Video has been marked as watched: 'Lakaet eo bet ar video evel lennet'
-  Video has been removed from your history: 'Skarzhet eo bet ar video deus ho roll
-    istor'
-  Save Video: 'Enrollañ ar video'
-  Video has been saved: 'Enrollet eo bet ar video'
-  Video has been removed from your saved list: 'Dilamet eo bet ar video diouzh ho
-    roll-videoioù enrollet'
-  Open in YouTube: 'Digeriñ gant YouTube'
-  Copy YouTube Link: 'Eilañ liamm YouTube'
-  Open YouTube Embedded Player: 'Digeriñ lenner enkorfet YouTube'
-  Copy YouTube Embedded Player Link: 'Eilañ liamm lenner enkorfet YouTube'
-  Open in Invidious: 'Digeriñ gant Invidious'
-  Copy Invidious Link: 'Eilañ liamm Invidious'
-  Open Channel in YouTube: 'Digeriñ ar chadenn war YouTube'
-  Copy YouTube Channel Link: 'Eilañ liamm YouTube ar chadenn'
-  Open Channel in Invidious: 'Digeriñ ar chadenn war Invidious'
-  Copy Invidious Channel Link: 'Eilañ liamm Invidious ar chadenn'
-  Hide Channel: 'Kuzhat ar chadenn'
-  Unhide Channel: 'Diskouez ar chadenn'
-  Views: 'Sell'
-  Loop Playlist: 'Rodell roll-videoioù'
-  Shuffle Playlist: 'Meskañ ar roll-videoioù'
-  Reverse Playlist: 'Cheñch tu ar roll-videoioù'
-  Play Next Video: 'Lenn ar video da heul'
-  Play Previous Video: 'Lenn ar video a-raok'
-  Pause on Current Video: 'Ehan war ar video bremanel'
-  Watched: 'Lennet'
-  Autoplay: 'Lenn emgefreek'
-  Starting soon, please refresh the page to check again: 'Kregiñ a raio a-benn nebeut,
-    freskait ar bajenn evit gwiriañ en-dro'
-  # As in a Live Video
-  Premieres on: 'Rakskignañ war'
-  Premieres: 'Rakskignañ'
-  Upcoming: 'A-benn nebeut'
-  Live: 'End-eeun'
-  Live Now: 'War-eeun bremañ'
-  Live Chat: 'Flapañ war-eeun'
-  Enable Live Chat: 'Gweredekaat ar flapañ war-eeun'
-  Live Chat is currently not supported in this build.: 'N''eo ket skoret ar flapañ
-    war-eeun gant ar stumm-añ evit poent.'
-  'Chat is disabled or the Live Stream has ended.': 'Dihegerz eo ar flapañ war-eeun
-    pe ez eo echu ar skignañ war-eeun.'
-  Live chat is enabled. Chat messages will appear here once sent.: 'Gweredekaet eo
-    ar flapañ war-eeun.  Diskouezet e vo ar c''hemennadennoù amañ ur wech kaset.'
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'N''eo
-    ket skoret ar flapañ war-eeun gant API Invidious evit poent.  Ret eo bezañ kennasket
-    war-eeun ouzh YouTube.'
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Dihegerz
-    eo ar flapañ war-eeun evit ar skignañ-mañ. Marteze eo bet diweredekaet gant perc''henn
-    ar chadenn.'
-  Show Super Chat Comment: 'Diskouez evezhiadennoù ar flapañ-meur'
-  Scroll to Bottom: 'Dibunañ d''an traoñ'
-  Download Video: 'Pellgargañ ar video'
-  video only: 'video hepken'
-  audio only: 'aodio hepken'
-  Published:
-    In less than a minute: 'Nebeutoc''h eget ur vunutenn zo'
-  Published on: 'Embannet war'
-  Streamed on: 'Skignet d''ar'
-  Started streaming on: 'Kroget da skignañ'
-  Sponsor Block category:
-    sponsor: 'Sponsor'
-    intro: 'Rakskrid'
-    outro: 'Klozañ'
-    self-promotion: 'Emvrudañ'
-    interaction: 'Etregwered'
-    music offtopic: 'Sonerezh na glot ket gant an tem'
-    recap: 'Berrzastum'
-    filler: 'Serrdoull'
-  External Player:
-    OpenInTemplate: 'Digeriñ gant {externalPlayer}'
-    video: 'video'
-    playlist: 'roll-videoioù'
-    OpeningTemplate: 'Digeriñ {videoOrPlaylist} gant {externalPlayer}…'
-    UnsupportedActionTemplate: '{externalPlayer} ne skor ket : {action}'
-    Unsupported Actions:
-      starting video at offset: 'kregiñ gant ar video gant dale'
-      setting a playback rate: 'termenañ ur feur lenn'
-      opening playlists: 'digeriñ rolloù-videoioù'
-      opening specific video in a playlist (falling back to opening the video): 'digeriñ
-        ur video resis en ur roll-videoioù (distreiñ da zigeriñ ar video)'
-      reversing playlists: 'cheñch tu ar rolloù-videoioù'
-      shuffling playlists: 'meskañ ar rolloù-videoioù'
-      looping playlists: 'rodell rolloù-videoioù'
-  Player:
-    TranslatedCaptionTemplate: '{language} (troet diwar ar "{originalLanguage}")'
-    Audio Tracks: 'Tonioù aodio'
-    Theatre Mode: 'Mod c''hoariva'
-    Exit Theatre Mode: 'Kuitaat ar mod c''hoariva'
-    Full Window: 'Skramm a-bezh'
-    Exit Full Window: 'Kuitaat ar skramm a-bezh'
-    Take Screenshot: 'Kemer un dapadenn-skramm'
-    Show Stats: 'Diskouez Stadegoù'
-    Hide Stats: 'Kuzhat stadegoù'
-    Stats:
-      Stats: 'Stadegoù'
-      Video ID: 'ID ar Video : {videoId}'
-      Media Formats: 'Furmadoù ar media : {formats}'
-      Resolution: 'Spisder : {width}x{height}@{frameRate}'
-      Player Dimensions: 'Ment al lenner : {width}x{height}'
-      Bitrate: 'Fonnder bit : {bitrate} kbps'
-      Volume: 'Live-son : {volumePercentage}%'
-      Bandwidth: 'Bann drafet : {bandwidth} kbps'
-      Buffered: 'Karget e memor : {bufferedPercentage}%'
-      Dropped Frames / Total Frames: 'Frammadoù dilamet : {droppedFrames} / Frammadoù
-        hollek : {totalFrames}'
-      CodecAudio: 'Enboneger-ezvoneger : {audioCodec} ({audioItag})'
-      CodecsVideoAudio: 'Enboneger-ezvoneger : {videoCodec} ({videoItag}) / {audioCodec}
-        ({audioItag})'
-      CodecsVideoAudioNoItags: 'Enboneger-ezvoneger : {videoCodec} / {audioCodec}'
-    You appear to be offline: 'Emaoc''h ezlinenn war a seblant.'
-    Playback will resume automatically when your connection comes back: 'Kendalc''het
-      e vo da lenn ent emgefreek pa viot kennasket endro.'
-    Skipped segment: 'Lodenn {segmentCategory} tremenet'
-#& Videos
-  Unlisted: Anlistennet
-  MembersOnly: N'haller ket sellet ouzh ar videoioù miret d'an izili hepken gant FreeTube,
-    peogwir eo ret bezañ luget gant ur gont Google ha paeañ ur c'houmanant d'ar chadenn.
-  AgeRestricted: N'haller ket sellet ouzh ar videoioù gant ur vevenn oad war FreeTube,
-    peogwir eo ret bezañ luget gant ur gont Google kadarnaet gant hoc'h oad.
-Videos:
-  #& Sort By
-  Sort By:
-    Newest: 'Nevesañ'
-    Oldest: 'Koshañ'
-    #& Most Popular
-#& Playlists
-Playlist:
-  #& About
-  Playlist: 'Roll-videoioù'
-  View Full Playlist: 'Gwelet ar roll-videoioù a-bezh'
-  Videos: ''
-  View: ''
-  Views: ''
-  Last Updated On: 'Hizivadenn ziwezhañ'
-  Sort By:
-    Sort By: 'Rummañ dre'
-    DateAddedNewest: 'Ouzhpennet diwezhañ da gentañ'
-    DateAddedOldest: 'Ouzhpennet abretañ da gentañ'
-    AuthorAscending: 'Aozer (A-Z)'
-    AuthorDescending: 'Aozer (Z-A)'
-    VideoTitleAscending: 'Titl (A-Z)'
-    VideoTitleDescending: 'Titl (Z-A)'
-    VideoDurationAscending: 'Padelezh (Berrañ da gentañ)'
-    VideoDurationDescending: 'Padelezh (Hirañ da gentañ)'
-    Custom: 'Personelaat'
-
-# On Video Watch Page
-#* Published
-#& Views
-Toggle Theatre Mode: ''
-Change Format:
-  Change Media Formats: 'Cheñch furmad ar video'
-  Use Dash Formats: 'Implijout ar furmad DASH'
-  Use Legacy Formats: 'Implijout ar furmad Legacy'
-  Use Audio Formats: 'Implijout ar furmad aodio'
-  Dash formats are not available for this video: 'N''haller ket implijout ar furmad
-    DASH evit ar video-mañ'
-  Audio formats are not available for this video: 'N''haller ket implijout ar furmad
-    aodio evit ar video-mañ'
-  Legacy formats are not available for this video: 'N''haller ket implijout ar furmad
-    Legacy evit ar video-mañ'
-Share:
-  Share Video: 'Rannañ ar video'
-  Share Channel: 'Rannañ ar chadenn'
-  Share Playlist: 'Rannañ ar roll-videoioù'
-  Include Timestamp: 'Adalek ar mare resis'
-  Copy Link: 'Eilañ al liamm'
-  Open Link: 'Digeriñ an ere'
-  Copy Embed: 'Eilañ kod al lenner video enkorfet'
-  Open Embed: 'Digeriñ kod al lenner video enkorfet'
-  # On Click
-  Invidious URL copied to clipboard: 'Liamm Invidious eilet er golver'
-  Invidious Embed URL copied to clipboard: 'Liamm lenner enkorfet Invidious eilet
-    er golver'
-  Invidious Channel URL copied to clipboard: 'Liamm Invidious ar chadenn eilet er
-    golver'
-  YouTube URL copied to clipboard: 'Liamm YouTube eilet er golver'
-  YouTube Embed URL copied to clipboard: 'Liamm lenner enkorfet YouTube eilet er golver'
-  YouTube Channel URL copied to clipboard: 'Liamm YouTube ar chadenn eilet er golver'
-Clipboard:
-  Copy failed: 'Eilañ er golver c''hwitet'
-  Cannot access clipboard without a secure connection: 'Ne c''haller ket adtapout
-    ar golver hep ur c''hennask suraet'
-
-Chapters:
-  Chapters: 'Chabistroù'
-  'Chapters list visible, current chapter: {chapterName}': 'Roll ar chabistroù diskouezet,
-    chabistr bremanel : {chapterName}'
-  'Chapters list hidden, current chapter: {chapterName}': 'Roll ar chabistroù kuzhet,
-    chabistr bremanel : {chapterName}'
-
-Mini Player: 'Lenner bihan'
-Comments:
-  Comments: 'Evezhiadennoù'
-  Click to View Comments: 'Klikit amañ evit gwelet an evezhiadennoù'
-  Getting comment replies, please wait: 'O kerc''hat respontoù an evezhiadennoù, gortozit
-    mar plij'
-  There are no more comments for this video: 'Evezhiadenn ouzhpenn ebet evit ar video-mañ'
-  Show Comments: 'Diskouez an evezhiadennoù'
-  Hide Comments: 'Kuzhat an evezhiadennoù'
-  Sort by: 'Rummañ dre'
-  Top comments: 'Evezhiadennoù gwellañ'
-  Newest first: 'Nevesañ da gentañ'
-  View {replyCount} replies: 'Diskouez {replyCount} respont'
-  # Context: View 10 Replies, View 1 Reply, View 1 Reply from Owner, View 2 Replies from Owner and others
-  View: 'Gwelet'
-  Hide: 'Kuzhat'
-  Replies: 'Respontoù'
-  Show More Replies: 'Diskouez respontoù all'
-  Reply: 'Respont'
-  From {channelName}: 'deus {channelName}'
-  And others: 'ha reoù all'
-  There are no comments available for this video: 'N''eus evezhiadenn ebet evit ar
-    video-mañ'
-  There are no comments available for this post: 'N''eus evezhiadenn ebet evit ar
-    gemennadenn-mañ'
-  Load More Comments: 'Kargañ muioc''h a evezhiadennoù'
-  No more comments available: 'Evezhiadenn ouzhpenn ebet'
-  Pinned by: 'Spilhennet gant'
-  Member: 'Ezel'
-  Subscribed: 'Koumanantet'
-  Hearted: 'Karet'
-
-Up Next: 'Da-heul'
-
-#Tooltips
-Tooltips:
-  General Settings:
-    Preferred API Backend: 'Choazit ar backend implijet gant FreeTube evit tapout
-      ar roadennoù. Un eztenner enkorfet eo an API lec''hel. Ezhomm en deus an API
-      Invidious da gaout ur servijer Invidious evit kevreañ outañ.'
-    Fallback to Non-Preferred Backend on Failure: 'Pa c''hoarvezo ur gudenn gant hoc''h
-      API karetañ, e klasko FreeTube implijout an API ha n''eo ket hoc''h hini karetañ
-      evel doare sikour ma vez gweredekaet.'
-    Thumbnail Preference: 'Erlec''hiet e vo an holl skeudennoùigoù war FreeTube gant
-      ur skeudenn tennet eus ar video e-lec''h ar skeudennig dre ziouer.'
-    Invidious Instance: 'Istañs Invidious implijet gant FreeTube evit galvoù API.'
-    Region for Trending: 'Gant an dra-se e c''hallit dibab ar vro evit ar videoioù
-      diouzh ar c''hiz a faot deoc''h gwelet.'
-    External Link Handling: |
-      Choazit an emzalc'h dre ziouer pa vo kliket war ul liamm ha n'hall ket bezañ digoret gant FreeTube.
-      Dre ziouer, e vo digoret al liamm e-barzh ho merdeer web.
-  Player Settings:
-    Proxy Videos Through Invidious: 'Kevreañ a raio ouzh Invidious evit mont da gerc''hat
-      ar videoioù e-lec''h kevreañ war-eeun ouzh YouTube.'
-    Default Video Format: 'Arventennañ ar furmadoù implijet pa vez lennet ur video.
-      Ar furmadoù DASH a c''hell bezañ lennet gant ur c''halite uheloc''h. Bevennet
-      eo ar furmadoù Legacy da 720p d''ar muiañ met nebeutoc''h a vann- drafet a vez
-      implijet. Ar furmadoù aodio zo lanvioù aodio hepken.'
-    Scroll Playback Rate Over Video Player: 'Pa vez ar biz-red war ar video, dalc''hit
-      pouezet war an douchenn Ctrl (Command war Mac) ha dibunit rodellig al logodenn
-      war-raok pe war-gil evit cheñch ar feur lenn. Dalc''hit pouezet war an douchenn
-      Ctrl (Command war Mac) ha klikit war bouton kleiz al logodenn a-benn distreiñ
-      buan d''ar feur lenn dre ziouer (1x, nemet ma ''z eo bet kemmet en arventennoù).'
-    Skip by Scrolling Over Video Player: 'Tremen d''ur video d''egile en ur zibunañ
-      rodellig al logodenn war al lenner video, doare MPV.'
-  External Player Settings:
-    External Player: 'Dibab ul lenner diavaez a ziskouezo un ikon war ar skeudennig,
-      evit digeriñ ar video (pe ar roll-videoioù ma vez skoret) el lenner diavaez.
-      Diwallit, arventennoù Invidious n''o deus ket efed ebet war al lenner diavaez.'
-    Custom External Player Executable: 'Dre ziouer e soñjo FreeTube e c''hall mont
-      da glask al lenner diavaez choazet dre an argemmenn endro PATH. Mar bez ezhomm
-      e c''haller lakaat un hent personelaet amañ.'
-    Ignore Warnings: 'Diweredekaat ar c''hemennadennoù pa ne vez ket skoret un obererezh
-      bennak gant al lenner diavaez (da sk. cheñch tu ar rolloù-videoioù, etc.).'
-    Ignore Default Arguments: 'Arabat kas arguzennoù dre ziouer d''al lenner diavaez
-      nemet URL ar video (d.s. feur lenn, URL ar roll-videoioù, etc.). Treuzkaset
-      e vo an arguzennoù personelaet.'
-    Custom External Player Arguments: 'An holl arguzennoù personelaet el linennoù
-      urzhiañ, a faot deoc''h e vefe treuzkaset d''al lenner diavaez.'
-    DefaultCustomArgumentsTemplate: "(Dre ziouer : '{defaultCustomArguments}')"
-  Distraction Free Settings:
-    Hide Channels: 'Lakait ID ur chadenn evit mirout ouzh an holl videoioù, rolloù-videoioù
-      hag ar chadenn hec''h-unan da vezañ gwelet en enklaskoù, e roll ar videoioù
-      brudetañ, ar re vuiañ karet, hag ar re aliet. Ret eo d''an ID bezañ klot ha
-      ret eo doujañ d''ar pennlizherennoù.'
-    Hide Subscriptions Live: 'Erlec''hiet eo an arventenn-mañ gant an arventenn "{appWideSetting}"
-      evit an arload a-bezh, e lodenn "{subsection}" e-barzh "{settingsSection}"'
-    Hide Videos and Playlists Containing Text: 'Ebarzhit ur ger, lodenn ur ger pe
-      ur frazenn (o toujañ d''ar pennlizherennoù) evit kuzhat an holl videoioù & rolloù-videoioù
-      gant ar ger pe ar frazenn-mañ en titl orin war FreeTube, nemet er roll-istor,
-      e-barzh ho rolloù-videoioù hag ar videoioù e-barzh ar rolloù-videoioù.'
-  Subscription Settings:
-    Fetch Feeds from RSS: 'Pa vez gweredekaet e vez implijet RSS gant FreeTube e-lec''h
-      e zoare dre ziouer evit adtapout ho kwazh koumanantiñ. Buanoc''h ez an traoù
-      gant an RSS ha ne vo ket stanket ar chomlec''h IP, met ne ginnig ket titouroù
-      ''zo evel padelezh ar video, statud ar video war-eeun, pe c''hoazh an evezhiadennoù'
-    Fetch Automatically: 'Pa vo gweredekaet e vo adtapet ho kwazh koumanantiñ gant
-      FreeTube ent emgefre pa vo digoret ur prenestr nevez ha pa vo cheñchet profil.'
-  Experimental Settings:
-    Replace HTTP Cache: 'Diweredekaat ar grubuilh HTTP diazezet war ar bladenn Electron
-      ha gweredekaat krubuilh personelaet ar skeudennoù e-barzh ar memor. Implijet
-      e vo muioc''h a vemor RAM.'
-  SponsorBlock Settings:
-    UseDeArrowTitles: 'Erlec''hiañ titloù ar videoioù gant titloù kinniget gant implijerien
-      DeArrow.'
-    UseDeArrowThumbnails: 'Erlec''hiañ skeudennoùigoù ar videoioù gant skeudennoùigoù
-      DeArrow.'
-
-# Toast Messages
-Local API Error (Click to copy): 'Fazi un API lec''hel (Klikit evit eilañ)'
-Invidious API Error (Click to copy): 'Fazi gant API Invidious (Klikit evit eilañ)'
-Falling back to Invidious API: 'Distreiñ da API Invidious'
-Falling back to Local API: 'Distreiñ d''an API lec''hel'
-This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Dihegerz
-  eo ar video-mañ abalamour da furmadoù a vank. Gallout a ra c''hoarvezout e-barzh
-  broioù ''zo.'
-Subscriptions have not yet been implemented: ''
-Unknown YouTube url type, cannot be opened in app: 'Seurt url YouTube dianav, n''hall
-  ket bezañ digoret en arload'
-Hashtags have not yet been implemented, try again later: ''
-Loop is now disabled: 'Diweredekaet eo ar rodell bremañ'
-Loop is now enabled: 'Gweredekaet eo ar rodell bremañ'
-Shuffle is now disabled: 'Diweredekaet eo ar Mesk-ha-mesk bremañ'
-Shuffle is now enabled: 'Gweredekaet eo ar Mesk-ha-mesk bremañ'
-The playlist has been reversed: 'Eilpennet eo bet ar roll-videoioù'
-Playing Next Video: 'Lenn ar video da-heul'
-Playing Previous Video: 'Lenn ar video a-raok'
-Playlist will not pause when current video is finished: 'Ne vo ket ehanet ar roll-videoioù
-  pa vo echu da lenn ar video-mañ'
-Playlist will pause when current video is finished: 'Ehanet e vo ar roll-videoioù
-  pa vo echu da lenn ar video-mañ'
-Playing Next Video Interval: 'Lenn ar video da-heul a-benn nebeud-tre. Klikit evit
-  nullañ. | Lenn ar video da-heul a-benn {nextVideoInterval} eilenn. Klikit evit nullañ.
-  | Lenn ar video da-heul a-benn {nextVideoInterval} eilenn. Klikit evit nullañ.'
-Canceled next video autoplay: 'Nullañ al lenn emgefreek da-heul'
-
-Default Invidious instance has been set to {instance}: 'Istañs Invidious dre ziouer
-  a zo bet lakaet da {instance}'
-Default Invidious instance has been cleared: 'Diverket eo bet Istañs Invidious dre
-  ziouer'
-'The playlist has ended. Enable loop to continue playing': 'Echu eo ar roll-videoioù.  Gweredekaat
-  ar rodell evit kenderc''hel da lenn'
-Age Restricted:
-  This channel is age restricted: 'Ur vevenn oad a zo d''ar chadenn-mañ'
-  This video is age restricted: 'Ur vevenn oad a zo d''ar video-mañ'
-External link opening has been disabled in the general settings: 'Diweredekaet eo
-  al liammoù diavaez en arventennoù hollek'
-'Blocked opening potentially unsafe URL': 'Stanket eo an URL a c''hell bezañ arvarus :
-  "{url}".'
-Downloading has completed: '"{videoTitle}" a zo bet pellgarget'
-Starting download: 'Kregiñ da bellgargañ "{videoTitle}"'
-Downloading failed: 'C''hoarvezet ez eus ur gudenn en ur bellgargañ "{videoTitle}"'
-Screenshot Success: 'Enrollet eo bet an dapadenn-skramm evel "{filePath}"'
-Screenshot Error: 'Tapadenn skramm c''hwitet. {error}'
-Channel Hidden: '{channel} ouzhpennet da sil ar chadennoù'
-Channel Unhidden: '{channel} dilamet deus sil ar chadennoù'
-Trimmed input must be at least N characters long: 'An destenn bevennet a rank bezañ
-  1 arouezenn enni da nebeutañ | An destenn bevennet a rank bezañ {number} arouezenn
-  enni da nebeutañ'
-Tag already exists: 'Bez ez eus dija deus an dikedenn "{tagName}"'
-
-Hashtag:
-  Hashtag: 'Ger-klik'
-  This hashtag does not currently have any videos: 'N''eus ket a video evit poent
-    gant ar ger-klik-mañ'
-Moments Ago: 'nevez ''zo'
-Yes: 'Ya'
-No: 'Ket'
-Ok: 'Mat eo'
-Yes, Delete: 'Ya, Dilemel'
-Yes, Restart: 'Ya, Adloc''hañ'
-Yes, Open Link: 'Ya, digeriñ al liamm'
-Cancel: 'Nullañ'
-# symbol used to indicate that an item is correct
-checkmark: '✓'
-# French is the only language that should change this (they have a space before the colon)
-Display Label: '{label} : {value}'
diff --git a/static/locales/bs.yaml b/static/locales/bs.yaml
index 5dadb9d75e566..f9d3f065e1ae4 100644
--- a/static/locales/bs.yaml
+++ b/static/locales/bs.yaml
@@ -122,11 +122,14 @@ Settings:
       Beginning: 'Početak'
       Middle: 'Sredina'
       End: 'Kraj'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious primjer
+      (standard je https://invidious.snopyta.org)'
     Region for Trending: 'Regiona za trend'
         #! List countries
   Theme Settings:
     Theme Settings: 'Postavke teme'
     Match Top Bar with Main Color: 'Koristi glavnu boju u gornjoj traci'
+  Advanced Settings: {}
 Channel:
   Videos: {}
 Tooltips: {}
diff --git a/static/locales/ca.yaml b/static/locales/ca.yaml
index c3978a4637bc5..b0ec4fc4b0b7c 100644
--- a/static/locales/ca.yaml
+++ b/static/locales/ca.yaml
@@ -105,6 +105,13 @@ Most Popular: 'Més populars'
 Playlists: 'Llistes de reproducció'
 User Playlists:
   Your Playlists: 'Les teves llistes de reproducció'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Els
+    vostres vídeos desats són buits. Feu clic al botó de desar a la cantonada d'un
+    vídeo per tenir-lo llistat aquí
+  Playlist Message: Aquesta pàgina no reflecteix les llistes de reproducció plenament
+    actives. Només llista els vídeos que heu desat o preferit. Quan la tasca hagi
+    acabat, tots els vídeos que hi ha actualment es migraran a una llista de reproducció
+    de "favorites".
   Search bar placeholder: Cerca a la llista de reproducció
   Empty Search Message: No hi ha cap vídeo en aquesta llista de reproducció que coincideixi
     amb la teva cerca
@@ -141,6 +148,8 @@ Settings:
       Beginning: 'Inici'
       Middle: 'Mig'
       End: 'Final'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instància Invidious
+      (https://invidious.snopyta.org per defecte)'
     Region for Trending: 'Regió per a les tendències'
         #! List countries
     View all Invidious instance information: Mostra tota la informació de la instància
@@ -258,11 +267,15 @@ Settings:
     Subscription Settings: 'Configuració de les subscripcions'
     Hide Videos on Watch: 'Oculta els vídeos visualitzats'
     Fetch Feeds from RSS: 'Recupera els canals de continguts des de l''RSS'
+    Manage Subscriptions: 'Gestiona les subscripcions'
   Data Settings:
     Data Settings: 'Configuració de les dades'
     Select Import Type: 'Selecciona tipus d''importació'
     Select Export Type: 'Selecciona tipus d''exportació'
     Import Subscriptions: 'Importa les subscripcions'
+    Import FreeTube: 'Importa FreeTube'
+    Import YouTube: 'Importa YouTube'
+    Import NewPipe: 'Importa NewPipe'
     Export Subscriptions: 'Exporta subscripcions'
     Export FreeTube: 'Exporta FreeTube'
     Export YouTube: 'Exporta YouTube'
@@ -300,6 +313,8 @@ Settings:
     Export Playlists: Exporta llistes de reproducció
     All playlists has been successfully imported: Totes les llistes de reproducció
       s'han importat amb èxit
+    Check for Legacy Subscriptions: Comprova les subscripcions antigues
+  Advanced Settings: {}
   The app needs to restart for changes to take effect. Restart and apply change?: Cal
     reiniciar l'aplicació perquè els canvis tinguin efecte. Vols reiniciar i aplicar
     els canvis?
@@ -355,6 +370,8 @@ About:
   Website: Lloc web
   Email: Correu-e
   Help: Ajuda
+  Licensed under the AGPLv3: Llicència AGPLv3
+  View License: Veure la llicència
   Downloads / Changelog: Descàrregues / Registre de canvis
   Chat on Matrix: Xat a Matrix
   Please read the: Si us plau, llegeix les
@@ -483,7 +500,37 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'El
     xat en directe no està actualment suportat per l''API d''Invidious.  Es requereix
     una connexió directa a YouTube.'
+  Published:
+    Jan: 'Gen'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Abr'
+    May: 'Maig'
+    Jun: 'Juny'
+    Jul: 'Jul'
+    Aug: 'Ag.'
+    Sep: 'Set'
+    Oct: 'Oct'
+    Nov: 'Nov'
+    Dec: 'Des'
+    Second: 'Segon'
+    Seconds: 'Segons'
+    Minute: 'Minut'
+    Minutes: 'Minuts'
+    Hour: 'Hora'
+    Hours: 'Hores'
+    Day: 'Dia'
+    Days: 'Dies'
+    Week: 'Setmana'
+    Weeks: 'Setmanes'
+    Month: 'Mes'
+    Months: 'Mesos'
+    Year: 'Any'
+    Years: 'Anys'
+    Ago: 'Fa'
+    Upcoming: 'S''estrena el'
   Published on: 'Publicat el'
+  Publicationtemplate: '{number} {unit} fa'
 #& Videos
   Started streaming on: Retransmissió iniciada el
   Sponsor Block category:
@@ -527,11 +574,15 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Visualitza la llista de reproducció sencera'
+  Videos: 'Vídeos'
+  View: 'Visualitza'
+  Views: 'Visualitzacions'
   Last Updated On: 'Última Actualització'
 
 # On Video Watch Page
 #* Published
 #& Views
+Toggle Theatre Mode: 'Commuta el mode teatre'
 Change Format:
   Change Media Formats: 'Canvia Els Formats De Vídeo'
   Use Dash Formats: 'Utilitza Formats DASH'
diff --git a/static/locales/ckb.yaml b/static/locales/ckb.yaml
index f848e647f7f68..524d79ab76411 100644
--- a/static/locales/ckb.yaml
+++ b/static/locales/ckb.yaml
@@ -42,7 +42,7 @@ Are you sure you want to open this link?: 'دڵنیایت دەتەوێت ئەم
 # Anything shared among components / views should be put here
 Global:
   Videos: 'ڤیدیۆکان'
-  Shorts: 'کورتەڤیدیۆکان'
+  Shorts: ''
   Live: 'ڕاستەوخۆ'
   Community: 'کۆمەڵگە'
   Counts:
@@ -53,16 +53,15 @@ Global:
     Watching Count: '١ تەمەشاکردن | {count} تەمەشاکردن'
 
 # Search Bar
-    Comment Count: ١ توانج | {count} توانج
 Search / Go to URL: 'گەڕان/ بڕۆ بۆ ئرڵ'
 Search Bar:
-  Clear Input: 'سڕینەوەی نووسراو'
+  Clear Input: ''
   # In Filter Button
 Search Filters:
   Search Filters: 'پاڵفتەکردنی گەڕان'
   Sort By:
     Sort By: 'ڕیزکردن بە'
-    Most Relevant: 'پەیوەندیدار'
+    Most Relevant: ''
     Rating: 'هەڵسەنگاندن'
     Upload Date: 'ڕێکەوتی بارکردن'
     View Count: 'ژمارەی بینین'
@@ -93,13 +92,6 @@ Search Filters:
   Fetch more results: ''
   There are no more results for this search: 'ئەنجامەکی تر نییە بۆ ئەم گەڕانە'
 # Sidebar
-  Features:
-    Location: شوێن
-    3D: ٣ ڕەهەندی
-    Subtitles: ژێرنووس
-    Live: ڕاستەوخۆ
-    4K: ٤ک
-    360 Video: ڤیدیۆی ٣٦٠°
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: ''
@@ -113,7 +105,7 @@ Subscriptions:
   'Getting Subscriptions. Please wait.': ''
   Empty Posts: ''
   Refresh Subscriptions: ''
-  Load More Videos: 'ڤیدیۆی زۆرتر بار بکە'
+  Load More Videos: 'بارکردنی ڤیدیۆی زۆرتر'
   Load More Posts: ''
   Subscriptions Tabs: ''
   All Subscription Tabs Hidden: ''
@@ -121,12 +113,14 @@ More: 'زۆرتر'
 Channels:
   Channels: 'کەناڵەکان'
   Title: 'پێڕستی کەناڵەکان'
-  Search bar placeholder: 'گەڕان لە کەناڵەکان'
+  Search bar placeholder: ''
   Count: '{number} کەناڵ دۆزرانەوە.'
   Empty: 'ئێستا پێڕستی کەناڵەکانت بەتاڵە.'
+  Unsubscribe: ''
+  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
-  Trending: 'باو'
+  Trending: ''
   Default: 'بنەڕەت'
   Music: 'مۆسیقا'
   Gaming: 'یاری'
@@ -136,33 +130,10 @@ Most Popular: 'باوترین'
 Playlists: 'پێڕستی لێدانەکان'
 User Playlists:
   Your Playlists: 'پێڕستی لێدانەکانت'
+  Playlist Message: ''
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   Empty Search Message: ''
   Search bar placeholder: 'لەناو پێڕستی لێدان بگەڕێ'
-  Move Video Up: ڤیدیۆکە ببە سەرتر
-  Move Video Down: ڤیدیۆکە ببە خوارتر
-  Add to Favorites: بۆ {playlistName}، زیاد بکە
-  Remove from Favorites: لە {playlistName}، لایببە
-  Cancel: هەڵوەشاندنەوە
-  Save Changes: دەستکارییەکان پاشەکەوت بکە
-  Remove Watched Videos: ڤیدیۆ بینراوەکان دەرکە
-  SinglePlaylistView:
-    Toast:
-      This video cannot be moved down.: ئەم ڤیدیۆیە نابرێتە خوارتر.
-      There was a problem with removing this video: گرفتێک لە لابردنی ڤیدیۆکە هەیە
-      This video cannot be moved up.: ئەم ڤیدیۆیە نابرێتە سەرتر.
-      Video has been removed: ڤیدیۆکە لابرا
-    Search for Videos: لە ڤیدیۆ بگەڕێ
-  Sort By:
-    Sort By: ڕیزکردن بە
-    NameAscending: ئ-ێ
-    NameDescending: ێ-ئ
-    EarliestCreatedFirst: زوو درووستکراو
-    LatestUpdatedFirst: دوایین نوێ کراوە
-    LatestPlayedFirst: دوایین لێدراو
-    EarliestPlayedFirst: زوو لێدراو
-    LatestCreatedFirst: دوایین درووستکراو
-    EarliestUpdatedFirst: زوو نوێ کراوە
-  Remove Duplicate Videos: ڤیدیۆی پاتە دەرکە
 History:
   # On History Page
   History: 'مێژوو'
@@ -348,6 +319,7 @@ Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
+    Manage Subscriptions: ''
     Fetch Automatically: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -399,6 +371,7 @@ Settings:
     Subscription File: ''
     History File: 'پەڕگەی مێژوو'
     Playlist File: 'پەڕگەی پێڕستی لێدان'
+    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: 'هەناردەکردنی فریتیوب'
     Export YouTube: 'هەناردەکردنی یوتیوب'
@@ -485,6 +458,8 @@ About:
   About: 'دەربارە'
   Beta: ''
   Source code: 'کۆدی سەرچاوە'
+  Licensed under the AGPLv3: 'مۆڵەتی وەشانی سێیەمی AGPL هەیە'
+  View License: 'بینینی مۆڵەت'
   Downloads / Changelog: ''
   GitHub releases: ''
   Help: 'یارمەتی'
@@ -650,10 +625,39 @@ Video:
   video only: 'تەنیا ڤیدیۆ'
   audio only: 'تەنیا دەنگ'
   Published:
+    Jan: ''
+    Feb: ''
+    Mar: ''
+    Apr: ''
+    May: ''
+    Jun: ''
+    Jul: ''
+    Aug: ''
+    Sep: ''
+    Oct: ''
+    Nov: ''
+    Dec: ''
+    Second: 'چرکە'
+    Seconds: 'چرکە'
+    Minute: 'خولەک'
+    Minutes: 'خولەک'
+    Hour: 'کاتژمێر'
+    Hours: 'کاتژمێر'
+    Day: 'ڕۆژ'
+    Days: 'ڕۆژ'
+    Week: 'هەفتە'
+    Weeks: 'هەفتە'
+    Month: 'مانگ'
+    Months: 'مانگ'
+    Year: 'ساڵ'
+    Years: 'ساڵ'
+    Ago: ''
+    Upcoming: ''
     In less than a minute: ''
   Published on: 'بڵاوکرایەوە لە'
   Streamed on: ''
   Started streaming on: ''
+  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -691,11 +695,15 @@ Playlist:
   #& About
   Playlist: 'پێڕستی لێدان'
   View Full Playlist: ''
+  Videos: 'ڤیدیۆکان'
+  View: 'بینراو'
+  Views: 'بینراو'
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
+Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -794,7 +802,9 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
+Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
@@ -824,11 +834,3 @@ Yes: 'بەڵێ'
 No: 'نەخێر'
 Ok: 'باشە'
 Go to page: بڕۆ بۆ {page}
-Search Listing:
-  Label:
-    4K: ٤ک
-    Subtitles: ژێرنووس
-    8K: ٨ک
-    360 Video: ٣٦٠°
-    New: نوێ
-    3D: ٣ ڕەهەندی
diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index c046d339dbb07..a6b4ad769f520 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -46,8 +46,8 @@ Global:
     Comment Count: 1 komentář | {count} komentářů
   Input Tags:
     Length Requirement: Štítek musí být dlouhý alespoň {number} znaků
-Version {versionNumber} is now available!  Click for more details: 'Je k dispozici
-  verze {versionNumber}! Klikněte pro více informací'
+Version {versionNumber} is now available!  Click for more details: 'Verze {versionNumber}
+  je k dispozici! Klikněte pro více informací'
 Download From Site: 'Stáhnout ze stránky'
 A new blog is now available, {blogTitle}. Click to view more: 'Je dostupný nový článek
   na blogu: {blogTitle}. Kliknutím zobrazíte více'
@@ -93,7 +93,7 @@ Search Filters:
     další výsledky
   Features:
     HD: HD
-    360 Video: 360° video
+    360 Video: 360°
     Subtitles: Titulky
     Features: Vlastnosti
     Creative Commons: Creative Commons
@@ -109,10 +109,8 @@ Subscriptions:
   Latest Subscriptions: 'Nejnovější odběry'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Tento
     profil má velký počet odběrů.  Vynucení RSS, aby se zabránilo omezení rychlosti'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Váš
-    seznam odběrů je prázdný. Pokud chcete importovat své odběry, přejděte do Nastavení
-    dat a vyberte Importovat odběry. Můžete také jednoduše vyhledat kanál a přihlásit
-    se u něj k odběru.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Vaše
+    odběry jsou prázdné. Přidejte odběry, zobrazí zde.'
   'Getting Subscriptions. Please wait.': 'Získávám odběry. Prosím čekejte.'
   Refresh Subscriptions: 'Obnovit odběry'
   Load More Videos: 'Načíst více videí'
@@ -137,9 +135,17 @@ Most Popular: 'Populární'
 Playlists: 'Playlisty'
 User Playlists:
   Your Playlists: 'Vaše playlisty'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Vaše
+    uložená videa jsou prázdná. Kliknutím na tlačítko Uložit v rohu videa jej zobrazíte
+    zde
+  Playlist Message: Tato stránka neodráží plně funkční playlisty. Uvádí pouze videa,
+    která jste si uložili nebo zařadili mezi oblíbená. Po dokončení práce budou všechna
+    aktuálně zde umístěná videa přenesena do seznamu „Oblíbené“.
   Search bar placeholder: Hledat playlisty
   Empty Search Message: V tomto playlistu nejsou žádná videa, která by odpovídala
     vašemu vyhledávání
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Opravdu
+    chcete z tohoto playlistu odstranit všechna zhlédnutá videa? Tato akce je nevratná.
   AddVideoPrompt:
     Search in Playlists: Hledat v playlistech
     Save: Uložit
@@ -187,13 +193,11 @@ User Playlists:
         byl navrácen pro rychlé uložení
       This playlist is now used for quick bookmark: Tento playlist bude nyní použit
         pro rychlé uložení
+      Quick bookmark disabled: Rychlé uložení vypnuto
       This playlist is already being used for quick bookmark.: Tento playlist je již
         používán pro rychlou záložku.
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist {playlistName}
         je nový playlist rychlé záložky.
-      This playlist has a video with a duration error: Tento playlist obsahuje nejméně
-        jedno video, které nemá dobu trvání. Bude seřazeno tak, jako by mělo dobu
-        trvání nula.
     Search for Videos: Hledat videa
   Are you sure you want to delete this playlist? This cannot be undone: Opravdu chcete
     odstranit tento playlist? Tato akce je nevratná.
@@ -236,6 +240,7 @@ User Playlists:
   Playlist Description: Popis playlistu
   Add to Favorites: Přidat do playlistu {playlistName}
   Remove from Favorites: Odebrat z playlistu {playlistName}
+  Disable Quick Bookmark: Vypnout rychlé uložení
   Enable Quick Bookmark With This Playlist: Zapnout u tohoto playlistu rychlé uložení
   Playlists with Matching Videos: Playlisty s odpovídajícími videi
   Quick Bookmark Enabled: Rychlá záložka zapnuta
@@ -250,8 +255,6 @@ User Playlists:
     | Opravdu chcete odstranit {playlistItemCount} zhlédnutých videí z tohoto playlistu?
     Tato akce je nevratná.
   Remove Duplicate Videos: Odstranit duplicitní videa
-  Export Playlist: Exportovat tento playlist
-  The playlist has been successfully exported: Playlist byl úspěšně exportován
 History:
   # On History Page
   History: 'Historie'
@@ -267,7 +270,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: 'Aby
     se změny projevily, je třeba aplikaci restartovat. Restartovat a použít změny?'
   General Settings:
-    General Settings: 'Obecné'
+    General Settings: 'Obecná nastavení'
     Check for Updates: 'Kontrolovat aktualizace'
     Check for Latest Blog Posts: 'Kontrolovat nejnovější příspěvky na blogu'
     Fallback to Non-Preferred Backend on Failure: 'Při chybě přepnout na nepreferovaný
@@ -291,6 +294,8 @@ Settings:
       End: 'Konec'
       Hidden: Skryté
       Blur: Rozmazané
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instance Invidious
+      (Výchozí je https://invidious.snopyta.org)'
     Region for Trending: 'Oblast pro trendy'
         #! List countries
     View all Invidious instance information: Zobrazit všechny informace o instancích
@@ -312,10 +317,8 @@ Settings:
     Auto Load Next Page:
       Label: Automaticky načíst další stránku
       Tooltip: Automaticky načítat další stránky a komentáře.
-    Open Deep Links In New Window: Otevírat adresy předané aplikaci FreeTube v novém
-      okně
   Theme Settings:
-    Theme Settings: 'Motiv'
+    Theme Settings: 'Nastavení motivu'
     Match Top Bar with Main Color: 'Přizpůsobit horní lištu hlavní barvě'
     Expand Side Bar by Default: 'Ve výchozím stavu rozbalený postranní panel'
     Disable Smooth Scrolling: 'Zakázat plynulé posouvání'
@@ -333,8 +336,6 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarizovaná tmavá
       Solarized Light: Solarizovaná světlá
-      Gruvbox Dark: Gruvbox tmavý
-      Gruvbox Light: Gruvbox světlý
     Main Color Theme:
       Main Color Theme: 'Hlavní barva motivu'
       Red: 'Červená'
@@ -382,22 +383,12 @@ Settings:
       Solarized Blue: Solarizovaná modrá
       Solarized Cyan: Solarizovaná azurová
       Solarized Green: Solarizovaná zelená
-      Gruvbox Dark Green: Gruvbox tmavě zelený
-      Gruvbox Dark Yellow: Gruvbox tmavě žlutý
-      Gruvbox Dark Blue: Gruvbox tmavě modrý
-      Gruvbox Dark Purple: Gruvbox tmavě fialový
-      Gruvbox Dark Orange: Gruvbox tmavě oranžový
-      Gruvbox Light Red: Gruvbox světle červený
-      Gruvbox Light Purple: Gruvbox světle fialový
-      Gruvbox Dark Aqua: Gruvbox tmavě azurový
-      Gruvbox Light Blue: Gruvbox světle modrý
-      Gruvbox Light Orange: Gruvbox světle oranžový
     Secondary Color Theme: 'Sekundární barva motivu'
         #* Main Color Theme
     Hide Side Bar Labels: Skrýt popisky na bočním panelu
     Hide FreeTube Header Logo: Skrýt logo FreeTube v záhlaví
   Player Settings:
-    Player Settings: 'Přehrávač'
+    Player Settings: 'Nastavení přehrávače'
     Play Next Video: 'Přehrát další video'
     Turn on Subtitles by Default: 'Ve výchozím nastavení zapnout titulky'
     Autoplay Videos: 'Automaticky přehrávat videa'
@@ -424,7 +415,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Interval pro další video na playlistu
-    Next Video Interval: Čas do automatického přehrání
+    Next Video Interval: Další interval videa
     Display Play Button In Video Player: Zobrazit tlačítko Přehrát v přehrávači videa
     Scroll Volume Over Video Player: Měnit hlasitost posuvem kolečka myši na přehrávači
     Fast-Forward / Rewind Interval: Interval rychlého přetáčení vpřed / vzad
@@ -449,9 +440,8 @@ Settings:
       Folder Button: Vybrat složku
     Enter Fullscreen on Display Rotate: Při otočení displeje přejít na celou obrazovku
     Skip by Scrolling Over Video Player: Posouvat čas posuvem kolečka myši na přehrávači
-    Autoplay Interruption Timer: Čas přerušení automatického přehrávání
   Privacy Settings:
-    Privacy Settings: 'Soukromí'
+    Privacy Settings: 'Nastavení soukromí'
     Remember History: 'Zapamatovat historii'
     Save Watched Progress: 'Uložit průběh zhlédnutých videí'
     Clear Search Cache: 'Vymazat mezipaměť vyhledávání'
@@ -472,16 +462,16 @@ Settings:
     Are you sure you want to remove all your playlists?: Opravdu chcete odstranit
       všechny své playlisty?
   Subscription Settings:
-    Subscription Settings: 'Odběry'
+    Subscription Settings: 'Nastavení odběrů'
     Hide Videos on Watch: 'Skrýt přehraná videa'
     Fetch Feeds from RSS: 'Získávat odběry z RSS'
+    Manage Subscriptions: 'Spravovat odebírané kanály'
     Fetch Automatically: Automaticky načítat odběry
+    Only Show Latest Video for Each Channel: U každého kanálu zobrazit pouze nejnovější
+      video
     Confirm Before Unsubscribing: Zamezit nechtěným odběrům
-    To: Do
-    'Limit the number of videos displayed for each channel': Omezit počet videí zobrazených
-      u každého kanálu
   Distraction Free Settings:
-    Distraction Free Settings: 'Rozptylování'
+    Distraction Free Settings: 'Nastavení rozptylování'
     Hide Video Views: 'Skrýt počet přehrání videa'
     Hide Video Likes And Dislikes: 'Skrýt hodnocení videa'
     Hide Channel Subscribers: 'Skrýt odběratele kanálu'
@@ -503,21 +493,22 @@ Settings:
     Display Titles Without Excessive Capitalisation: Zobrazit názvy bez nadměrného
       použití velkých písmen a interpunkce
     Hide Featured Channels: Skrýt doporučené kanály
-    Hide Channel Playlists: Skrýt kartu „Playlisty“ u kanálů
-    Hide Channel Community: Skrýt kartu „Komunita“ u kanálů
-    Hide Channel Shorts: Skrýt kartu „Shorts“ u kanálů
+    Hide Channel Playlists: Skrýt playlisty kanálu
+    Hide Channel Community: Skrýt komunitu kanálu
+    Hide Channel Shorts: Skrýt Shorts kanálu
     Sections:
       Side Bar: Postranní lišta
       Channel Page: Stránka kanálu
       Watch Page: Stránka sledování
       General: Obecné
       Subscriptions Page: Stránka s odběry
-    Hide Channel Podcasts: Skrýt kartu „Podcasty“ u kanálů
-    Hide Channel Releases: Skrýt kartu „Vydání“ u kanálů
+    Hide Channel Podcasts: Skrýt podcasty kanálu
+    Hide Channel Releases: Skrýt vydání kanálu
     Hide Subscriptions Shorts: Skrýt Shorts odběrů
     Hide Subscriptions Videos: Skrýt videa odběrů
     Hide Subscriptions Live: Skrýt živá vysílání odběrů
     Hide Profile Pictures in Comments: Skrýt profilové obrázky v komentářích
+    Blur Thumbnails: Rozmazat náhledy
     Hide Subscriptions Community: Skrýt komunitu odběratelů
     Hide Channels Invalid: Zadané ID kanálu je neplatné
     Hide Channels Disabled Message: Některé kanály byly zablokovány pomocí ID a nebyly
@@ -529,13 +520,15 @@ Settings:
       text
     Hide Videos and Playlists Containing Text Placeholder: Slovo, část slova nebo
       fráze
-    Hide Channel Home: Skrýt kartu „Domovská stránka“ u kanálů
-    Show Added Items: Zobrazit přidané položky
   Data Settings:
-    Data Settings: 'Data'
+    Data Settings: 'Nastavení dat'
     Select Import Type: 'Vybrat typ importu'
     Select Export Type: 'Vybrat typ exportu'
     Import Subscriptions: 'Importovat odběry'
+    Import FreeTube: 'Importovat FreeTube'
+    Import YouTube: 'Importovat YouTube'
+    Import NewPipe: 'Importovat NewPipe'
+    Check for Legacy Subscriptions: 'Zkontrolovat již odebírané kanály'
     Export Subscriptions: 'Exportovat odebírané kanály'
     Export FreeTube: 'Exportovat FreeTube'
     Export YouTube: 'Exportovat YouTube'
@@ -579,9 +572,34 @@ Settings:
         všechny své stávající playlisty možností Odstranit všechny playlisty v nastavení
         soukromí.\n3. Spusťte starší verzi FreeTube a importujte exportované playlisty."
       Label: Exportovat playlisty pro starší verze FreeTube
+  Advanced Settings:
+    Advanced Settings: 'Rozšířené nastavení'
+    Enable Debug Mode (Prints data to the console): 'Povolit režim ladění (výstup
+      se zobrazuje do terminálu)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adresa proxy (příklad: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Kliknutím
+      na tlačítko „OTESTOVAT PROXY“ odešlete požadavek na https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Použít Tor / Proxy pro volání API'
+    TEST PROXY: 'OTESTOVAT PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Veřejné instance'
+    Clear History:
+      Clear History: 'Vyčistit historii'
+      # On Click
+      Are you sure you want to delete your history?: 'Opravdu chcete smazat svou historii?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Vyčistit odebíraní kanálů'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Opravdu chcete smazat své
+        odebírané kanály?'
+      #& Yes
+      #& No
 
   Proxy Settings:
-    Proxy Settings: Proxy
+    Proxy Settings: Nastavení proxy
     City: Město
     Ip: IP
     Your Info: Vaše informace
@@ -596,18 +614,12 @@ Settings:
     Proxy Protocol: Protokol proxy
     Error getting network information. Is your proxy configured properly?: Chyba při
       získávání informací o síti. Je vaše proxy správně nakonfigurována?
-    Proxy Warning: FreeTube nemá vestavěný proxy server, ale může se připojit k externímu
-      proxy serveru, například k proxy serveru běžícímu na vašem počítači, jako je
-      Tor, nebo k externímu proxy serveru, jako je proxy server SOCKS5 poskytovaný
-      některými sítěmi VPN. Pokud je tato funkce povolena, ujistěte se, že je proxy
-      server/Tor správně nakonfigurován, jinak FreeTube nebude moci načítat žádná
-      data.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Upozornit při přeskočení segmentu
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL API SponsorBlock
       (výchozí je https://sponsor.ajay.app)
     Enable SponsorBlock: Zapnout SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Nastavení služby SponsorBlock
     Skip Options:
       Do Nothing: Nic nedělat
       Skip Option: Možnost přeskočení
@@ -624,25 +636,25 @@ Settings:
     Custom External Player Executable: Spustitelný vlastní externí přehrávač
     Ignore Unsupported Action Warnings: Ignorovat varování u nepodporovaných akcí
     External Player: Externí přehrávač
-    External Player Settings: Externí přehrávač
+    External Player Settings: Nastavení externího přehrávače
     Players:
       None:
         Name: Žádný
     Ignore Default Arguments: Ignorovat výchozí argumenty
   Download Settings:
     Ask Download Path: Zeptat se na cestu umístění souboru
-    Download Settings: Stahování
+    Download Settings: Nastavení stahování
     Choose Path: Zvolit cestu
     Download in app: Stáhnout v aplikaci
     Open in web browser: Otevřít v prohlížeči
     Download Behavior: Chování stahování
   Parental Control Settings:
-    Parental Control Settings: Rodičovská kontrola
+    Parental Control Settings: Nastavení rodičovské kontroly
     Hide Search Bar: Skrýt lištu vyhledávání
     Show Family Friendly Only: Zobrazit pouze obsah vhodný pro rodiny
     Hide Unsubscribe Button: Skrýt tlačítko ke zrušení odběru
   Experimental Settings:
-    Experimental Settings: Experimentální
+    Experimental Settings: Experimentální nastavení
     Warning: Tato nastavení jsou experimentální, při jejich aktivaci může docházet
       k pádům. Důrazně doporučujeme vytvářet zálohy. Používejte na vlastní nebezpečí!
     Replace HTTP Cache: Nahradit mezipaměť HTTP
@@ -652,16 +664,44 @@ Settings:
     Password Incorrect: Nesprávné heslo
     Unlock: Odemknout
   Password Settings:
-    Password Settings: Heslo
-    Set Password To Prevent Access: Nastavte heslo pro zabránění přístupu k nastavení
+    Password Settings: Nastavení hesla
+    Set Password To Prevent Access: Nastavte heslo, abyste zabránili přístupu k nastavení
     Remove Password: Odebrat heslo
     Set Password: Nastavit heslo
+  Expand All Settings Sections: Rozbalit všechny sekce nastavení
   Sort Settings Sections (A-Z): Seřadit sekce nastavení (A-Z)
-  Return to Settings Menu: Vrátit se do nastavení
 About:
   #On About page
   About: 'O aplikaci'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Tento
+    copyleftovaný software je zdarma licencován podle AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Našli jste chybu? Chcete navrhnout funkci? Chcete pomoci? Podívejte se na naši
+    stránku GitHub. Pull requesty jsou vítány.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Děkuji
+    moc lidem a projektům, které umožňují existenci FreeTube!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Chcete
+    si popovídat? Připojte se k našemu serveru Element / Matrix. Před připojením si
+    prosím zkontrolujte pravidla.'
+
+  'Looking for help? Check out our Wiki page.': 'Potřebujete pomoct? Podívejte se
+    na naši wiki stránku.'
+
+  Check out our Firefox extension!: 'Podívejte se na naše rozšíření pro Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Pokud
+    rádi používáte FreeTube, zvažte dar prostřednictvím Liberapay nebo prostřednictvím
+    naší bitcoinové adresy.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Nejnovější zprávy z FreeTube'
+
+  Licensed under the AGPLv3: Licencováno pod licencí AGPLv3
   Source code: Zdrojový kód
   Beta: Beta
   Donate: Přispět
@@ -676,6 +716,7 @@ About:
   FAQ: Často kladené dotazy
   FreeTube Wiki: Wiki FreeTube
   Downloads / Changelog: Ke stažení / Seznam změn
+  View License: Zobrazit licenci
   Translate: Překlady
   these people and projects: těmto lidem a projektům
   FreeTube is made possible by: FreeTube je možné dělat díky
@@ -729,7 +770,7 @@ Profile:
     profilu.'
 #On Channel Page
   Profile Filter: Filtr profilu
-  Profile Settings: Profil
+  Profile Settings: Nastavení profilu
   Toggle Profile List: Přepnout seznam profilů
   Open Profile Dropdown: Otevřít rozbalovací nabídku profilu
   Close Profile Dropdown: Zavřít rozbalovací nabídku profilu
@@ -801,9 +842,6 @@ Channel:
     This channel does not currently have any podcasts: Tento kanál momentálně nemá
       žádné podcasty
     Podcasts: Podcasty
-  Home:
-    Home: Domovská stránka
-    View Playlist: Zobrazit playlist
 Video:
   Mark As Watched: 'Označit jako zhlédnuto'
   Remove From History: 'Odstranit z historie'
@@ -847,8 +885,38 @@ Video:
   video only: 'pouze video'
   audio only: 'pouze zvuk'
   Published:
+    Jan: 'Leden'
+    Feb: 'Únor'
+    Mar: 'Březen'
+    Apr: 'Duben'
+    May: 'Květen'
+    Jun: 'Červen'
+    Jul: 'Červenec'
+    Aug: 'Srpen'
+    Sep: 'Září'
+    Oct: 'Říjen'
+    Nov: 'Listopad'
+    Dec: 'Prosinec'
+    Second: 'sekundou'
+    Seconds: 'sekund'
+    Minute: 'minutou'
+    Minutes: 'minut'
+    Hour: 'hodina'
+    Hours: 'hodin'
+    Day: 'den'
+    Days: 'dnů'
+    Week: 'týden'
+    Weeks: 'týdny'
+    Month: 'měsíc'
+    Months: 'měsíci'
+    Year: 'rok'
+    Years: 'let'
+    Ago: 'Před'
+    Upcoming: 'Premiéra'
+    Less than a minute: Méně než minuta
     In less than a minute: Za méně než minutu
   Published on: 'Publikováno'
+  Publicationtemplate: '{number} {unit}'
 #& Videos
   Started streaming on: Začátek vysílání
   Streamed on: Vysíláno
@@ -921,16 +989,6 @@ Video:
     You appear to be offline: Zdá se, že jste offline.
     Playback will resume automatically when your connection comes back: Přehrávání
       bude automaticky pokračovat, jakmile budete opět připojeni.
-  IP block: YouTube zablokoval sledování videí z vaší IP adresy. Zkuste prosím přepnout
-    na jinou VPN nebo proxy.
-  Unlisted: Neveřejné
-  MembersOnly: Videa určená pouze pro členy nelze na FreeTube sledovat, protože vyžadují
-    přihlášení k účtu Google a placené členství v kanálu nahrávajícího.
-  AgeRestricted: Videa s věkovým omezením nelze na FreeTube sledovat, protože vyžadují
-    přihlášení ke službě Google a použití účtu YouTube s ověřeným věkem.
-  DeArrow:
-    Show Modified Details: Zobrazit upravené podrobnosti
-    Show Original Details: Zobrazit původní podrobnosti
 Videos:
   #& Sort By
   Sort By:
@@ -941,6 +999,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Zobrazit celý seznam skladeb'
+  Videos: 'Videa'
+  View: 'Zobrazit'
+  Views: 'Zobrazení'
   Last Updated On: 'Naposledy upraveno'
 
 # On Video Watch Page
@@ -956,8 +1017,7 @@ Playlist:
     VideoTitleDescending: Název (Z-A)
     VideoTitleAscending: Název (A-Z)
     Custom: Vlastní
-    VideoDurationAscending: Doba trvání (od nejkratších)
-    VideoDurationDescending: Doba trvání (od nejdelších)
+Toggle Theatre Mode: 'Přepnout režim divadla'
 Change Format:
   Change Media Formats: 'Změnit formát videa'
   Use Dash Formats: 'Použít formáty DASH'
@@ -1040,8 +1100,6 @@ Tooltips:
     External Link Handling: "Zvolte výchozí chování při kliknutí na odkaz, který nelze
       otevřít ve FreeTube.\nVe výchozím nastavení otevře FreeTube odkaz ve vašem výchozím
       prohlížeči.\n"
-    Open Deep Links In New Window: Adresy předané aplikaci FreeTube, například rozšířením
-      pro prohlížeč nebo argumenty v příkazovém řádku, budou otevřeny v novém okně.
   Player Settings:
     Proxy Videos Through Invidious: 'Připojí se k Invidious, aby poskytoval videa
       namísto přímého připojení k YouTube.'
@@ -1072,7 +1130,7 @@ Tooltips:
       seznamu skladeb, pokud je podporován) v externím přehrávači, na náhledu. Varování,
       nastavení Invidious neovlivňují externí přehrávače.
     Custom External Player Arguments: Jakékoliv vlastní argumenty příkazové řádky,
-      které chcete předávat externímu přehrávač.
+      oddělené středníkem (';'), které chcete předávat externímu přehrávač.
     Custom External Player Executable: Ve výchozím nastavení Freetube předpokládá,
       že vybraný externí přehrávač lze nalézt přes proměnnou prostředí cesty PATH.
       V případě potřeby zde lze nastavit vlastní cestu.
@@ -1103,6 +1161,7 @@ Falling back to Local API: 'Přepínám na lokální API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Toto
   video není k dispozici z důvodu chybějících formátů. K tomu může dojít z důvodu
   nedostupnosti země.'
+Subscriptions have not yet been implemented: 'Odběry kanálů nebyly ještě implementovány'
 Loop is now disabled: 'Smyčka je vypnuta'
 Loop is now enabled: 'Smyčka je zapnuta'
 Shuffle is now disabled: 'Zamíchání je vypnuto'
@@ -1120,6 +1179,8 @@ Playing Next Video Interval: Přehrávání dalšího videa bez prodlevy Kliknut
   | Přehrávání dalšího videa za {nextVideoInterval} s. Kliknutím zrušíte. | Přehrávání
   dalšího videa za {nextVideoInterval} s. Kliknutím zrušíte.
 More: Více
+Hashtags have not yet been implemented, try again later: Hashtagy nebyly dosud implementovány,
+  zkuste to znovu později
 Unknown YouTube url type, cannot be opened in app: Neznámý typ adresy URL YouTube,
   nelze v aplikaci otevřít
 Open New Window: Otevřít nové okno
@@ -1138,10 +1199,12 @@ New Window: Nové okno
 Channels:
   Channels: Kanály
   Title: Seznam kanálů
+  Unsubscribed: Kanál {channelName} byl odebrán z vašich odběrů
   Unsubscribe Prompt: Opavdu chcete zrušit odběr kanálu „{channelName}“?
   Empty: Seznam vašich kanálů je momentálně prázdný.
   Search bar placeholder: Hledat kanály
   Count: Nalezeno {number} kanálů.
+  Unsubscribe: Zrušit odběr
 Screenshot Success: Snímek uložen jako „{filePath}“
 Screenshot Error: Snímek selhal. {error}
 Clipboard:
@@ -1154,7 +1217,6 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Seznam kapitol je skrytý,
     současná kapitola: {chapterName}'
   Chapters: Kapitoly
-  Key Moments: Klíčové momenty
 Preferences: Předvolby
 Ok: Ok
 Hashtag:
@@ -1191,25 +1253,5 @@ Search Listing:
     4K: 4K
     Subtitles: Titulky
     Closed Captions: Skryté titulky
-    360 Video: 360°
-    New: Nové
-    8K: 8K
-    VR180: VR180
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Zablokováno otevření potenciálně nebezpečné
   adresy URL: „{url}“.'
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Šipka dolů
-  arrowup: Šipka nahoru
-  arrowright: Šipka vpravo
-  arrowleft: Šipka vlevo
-Right-click or hold to see history: Klikněte pravým pro zobrazení historie
-Autoplay Interruption Timer: Automatické přehrávání zrušeno kvůli {autoplayInterruptionIntervalHours}
-  hodinám nečinnosti
-Description:
-  Expand Description: '...další'
-  Collapse Description: Zobrazit méně
diff --git a/static/locales/cy.yaml b/static/locales/cy.yaml
index b889d41748964..143ff1e776c41 100644
--- a/static/locales/cy.yaml
+++ b/static/locales/cy.yaml
@@ -1,8 +1,7 @@
 # Put the name of your locale in the same language
 Locale Name: 'Cymraeg'
 # Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Nid yw'r rhan hon o'r ap yn barod eto. Dewch nôl pan fydd cynnydd wedi'i wneud.
+'This part of the app is not ready yet. Come back later when progress has been made.': >
 
 # Webkit Menu Bar
 File: 'Ffeil'
@@ -54,10 +53,6 @@ Global:
     Watching Count: '1 yn gwylio | {count} yn gwylio'
 
 # Search Bar
-    Like Count: 1 hoffi | {count} hoffi
-    Comment Count: 1 sylw | {count} sylw
-  Input Tags:
-    Length Requirement: Rhaid i'r tag fod yn o leiaf {number} nod
 Search / Go to URL: 'Chwilio / Mynd i URL'
 Search Bar:
   Clear Input: 'Clirio Mewnbwn'
@@ -99,212 +94,76 @@ Search Filters:
   There are no more results for this search: 'Dim canlyniadau pellach ar gyfer y chwiliad
     hwn'
 # Sidebar
-  Features:
-    Creative Commons: Creative Commons
-    Live: Byw
-    360 Video: Fideo 360
-    Location: Lleoliad
-    HDR: HDR
-    VR180: VR180
-    HD: HD
-    Subtitles: Isdeitlau
-    3D: 3D
-    Features: Nodweddion
-    4K: 4K
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Tanysgrifiadau'
   # channels that were likely deleted
   Error Channels: 'Sianeli gyda Gwallau'
   Latest Subscriptions: 'Tanysgrifiadau Diweddaraf'
-  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Mae
-    gan y proffil hwn nifer fawr o danysgrifiadau.  Yn gorfodi RSS i osgoi cyfyngu
-    ar gyfraddau'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Mae
-    eich rhestr Tanysgrifio yn wag ar hyn o bryd. Os ydych chi am fewnforio''ch tanysgrifiadau
-    gallwch fynd i Gosodiadau Data a dewis Mewnforio Tanysgrifiadau neu gallwch chwilio
-    am sianel a thanysgrifio iddyn nw.'
-  Disabled Automatic Fetching: 'Rydych wedi analluogi cyrchu tanysgrifiad awtomatig.
-    Adnewyddwch danysgrifiadau i''w gweld yma.'
-  Empty Channels: 'Nid oes gan eich sianeli tanysgrifio unrhyw fideos ar hyn o bryd.'
+  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: ''
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': ''
+  Disabled Automatic Fetching: ''
+  Empty Channels: ''
   'Getting Subscriptions. Please wait.': 'Wrthi''n nôl Tanysgrifiadau. Arhoswch os
     gwelwch yn dda.'
-  Empty Posts: 'Nid oes gan eich sianeli tanysgrifio unrhyw bostiadau ar hyn o bryd.'
+  Empty Posts: ''
   Refresh Subscriptions: 'Adnewyddu Tanysgrifiadau'
   Load More Videos: 'Llwytho Mwy o Fideos'
   Load More Posts: 'Llwytho Mwy o Bostiadau'
   Subscriptions Tabs: 'Tabiau Tanysgrifio'
-  All Subscription Tabs Hidden: 'Mae pob tab tanysgrifio wedi''i guddio. I weld cynnwys
-    yma, dadguddiwch rhai tabiau yn yr adran "{subsection}" yn "{settingsSection}".'
+  All Subscription Tabs Hidden: ''
 More: 'Mwy'
 Channels:
   Channels: 'Sianeli'
   Title: 'Rhestr Sianeli'
   Search bar placeholder: 'Chwilio Sianeli'
-  Count: 'Canfuwyd {number} sianel.'
-  Empty: 'Mae eich rhestr sianeli yn wag ar hyn o bryd.'
-  Unsubscribe Prompt: 'Ydych chi''n siŵr eich bod am ddad-danysgrifio o "{channelName}"?'
+  Count: ''
+  Empty: ''
+  Unsubscribe: 'Dad-danysgrifio'
+  Unsubscribed: ''
+  Unsubscribe Prompt: ''
 Trending:
-  Trending: 'Trendio'
+  Trending: 'Llosg'
   Default: 'Diofyn'
   Music: 'Cerddoriaeth'
   Gaming: 'Gemau'
   Movies: 'Ffilmiau'
-  Trending Tabs: 'Tabiau Trendio'
-Most Popular: 'Poblogaidd'
-Playlists: 'Rhestrau'
+  Trending Tabs: 'Tabiau Llosg'
+Most Popular: 'Mwyaf Poblogaidd'
+Playlists: 'Rhestrau Chwarae'
 User Playlists:
   Your Playlists: 'Eich Rhestrau Chwarae'
-  Empty Search Message: 'Nid oes unrhyw fideos yn y rhestr chwarae hon sy''n cyfateb
-    i''ch chwiliad'
-  Search bar placeholder: 'Chwilio am Restrau Chwarae'
-  This playlist currently has no videos.: Nid oes gan y rhestr chwarae hon unrhyw
-    fideos ar hyn o bryd.
-  Add to Favorites: Ychwanegu at {playlistName}
-  Move Video Up: Symud Fideo i Fyny
-  Move Video Down: Symud Fideo i Lawr
-  AddVideoPrompt:
-    Save: Cadw
-    Select a playlist to add your N videos to: Dewiswch restr chwarae i ychwanegu
-      eich fideo i | Dewiswch restr chwarae i ychwanegu eich {videoCount} fideos ati
-    Added {count} Times: Wedi'u Hychwanegu Eisoes | Ychwanegwyd {count} Gwaith
-    Toast:
-      You haven't selected any playlist yet.: Nid ydych wedi dewis unrhyw restr chwarae
-        eto.
-      "{videoCount} video(s) added to 1 playlist": 1 fideo wedi'i ychwanegu at 1 rhestr
-        chwarae | {videoCount} fideo wedi'u hychwanegu at 1 rhestr chwarae
-      "{videoCount} video(s) added to {playlistCount} playlists": 1 fideo wedi'i ychwanegu
-        at {playlistCount} rhestr chwarae | {videoCount} fideo wedi'u hychwanegu at
-        {playlistCount} rhestr chwarae
-    Allow Adding Duplicate Video(s): Caniatáu Ychwanegu Fideo(s) Dyblyg
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": "{videoCount}/{totalVideoCount}
-      Fideo i'w Hychwanegu"
-    N playlists selected: "{playlistCount} Wedi'u dewis"
-    "{videoCount}/{totalVideoCount} Videos Already Added": "{videoCount}/{totalVideoCount}
-      Fideos Eisoes wedi'u Hychwanegu"
-    Search in Playlists: Chwilio mewn Rhestrau Chwarae
-  Add to Playlist: Ychwanegu at y Rhestr Chwarae
-  Remove from Favorites: Tynnu o {playlistName}
-  Quick Bookmark Enabled: Nod Tudalen Cyflym wedi'i Galluogi
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Ydych
-    chi'n siŵr eich bod am dynnu 1 fideo a wyliwyd o'r rhestr chwarae hon? Nid oes
-    modd dadwneud hyn. | A ydych yn siŵr eich bod am ddileu {playlistItemCount} fideos
-    a wyliwyd o'r rhestr chwarae hon? Nid oes modd dadwneud hyn.
-  Sort By:
-    LatestCreatedFirst: Crëwyd yn Ddiweddar
-    NameAscending: A-Z
-    EarliestCreatedFirst: Crëwyd Gynharaf
-    LatestUpdatedFirst: Diweddarwyd yn Ddiweddar
-    NameDescending: Z-A
-    LatestPlayedFirst: Chwaraewyd yn Ddiweddar
-    EarliestPlayedFirst: Chwaraewyd Cynharaf
-    EarliestUpdatedFirst: Diweddarwyd Cynharaf
-    Sort By: Trefnu yn Ôl
-  SinglePlaylistView:
-    Toast:
-      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Nid
-        yw rhai fideos yn y rhestr chwarae wedi'u llwytho eto. Cliciwch yma i gopïo
-        beth bynnag.
-      There were no videos to remove.: Nid oedd yna unrhyw fideos i'w tynnu.
-      This playlist has a video with a duration error: Mae'r rhestr chwarae hon yn
-        cynnwys o leiaf un fideo nad oes ganddo hyd, bydd yn cael ei drefnu fel pe
-        bai eu hyd yn sero.
-      This video cannot be moved up.: Nid oes modd symud y fideo hwn i fyny.
-      This video cannot be moved down.: Nid oes modd symud y fideo hwn i lawr.
-      Video has been removed: Mae'r fideo wedi'i dynnu
-      There was a problem with removing this video: Bu anhawster wrth dynnu'r fideo
-        hwn
-      This playlist is already being used for quick bookmark.: Mae'r rhestr chwarae
-        hon eisoes yn cael ei defnyddio ar gyfer nod tudalen cyflym.
-      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Mae'r
-        rhestr chwarae hon bellach yn cael ei defnyddio ar gyfer nodau tudalen cyflym
-        yn lle {oldPlaylistName}. Cliciwch yma i ddadwneud
-      Reverted to use {oldPlaylistName} for quick bookmark: Wedi dychwelyd i ddefnyddio
-        {oldPlaylistName} ar gyfer nod tudalen cyflym
-      Playlist has been updated.: Mae'r rhestr chwarae wedi'i diweddaru.
-      "{videoCount} video(s) have been removed": 1 fideo wedi'i dynnu | Mae {videoCount}
-        fideo wedi'u dileu
-      This playlist is now used for quick bookmark: Mae'r rhestr chwarae hon bellach
-        yn cael ei defnyddio ar gyfer nodau tudalen cyflym
-      Playlist {playlistName} is the new quick bookmark playlist.: Rhestr chwarae
-        {playlistName} yw'r rhestr chwarae nodau tudalen cyflym newydd.
-      This playlist is protected and cannot be removed.: Mae'r rhestr chwarae hon
-        wedi'i diogelu ac nid oes modd ei dileu.
-      Playlist {playlistName} has been deleted.: Mae rhestr chwarae {playlistName}
-        wedi'i dileu.
-      Playlist name cannot be empty. Please input a name.: Ni all enw'r rhestr chwarae
-        fod yn wag. Rhowch enw.
-      There was an issue with updating this playlist.: Bu problem gyda diweddaru'r
-        rhestr chwarae hon.
-      This playlist does not exist: Nid yw'r rhestr chwarae hon yn bodoli
-    Search for Videos: Chwilio am Fideos
-  CreatePlaylistPrompt:
-    Toast:
-      There is already a playlist with this name. Please pick a different name.: Mae
-        yna restr chwarae gyda'r enw hwn yn barod. Dewiswch enw gwahanol.
-      Playlist {playlistName} has been successfully created.: Mae rhestr chwarae {playlistName}
-        wedi'i chreu'n llwyddiannus.
-      There was an issue with creating the playlist.: Roedd problem gyda chreu'r rhestr
-        chwarae.
-    New Playlist Name: Enw Rhestr Chwarae Newydd
-    Create: Creu
-  Export Playlist: Allforio'r Rhestr Chwarae Hon
-  The playlist has been successfully exported: Mae'r rhestr chwarae wedi'i allforio'n
-    llwyddiannus
-  Delete Playlist: Dileu Rhestr Chwarae
-  Remove from Playlist: Dileu o'r Rhestr Chwarae
-  Playlist Name: Enw Rhestr Chwarae
-  Playlist Description: Disgrifiad o'r Rhestr Chwarae
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Ydych
-    chi'n siŵr eich bod am dynnu 1 fideo dyblyg o'r rhestr chwarae hon? Nid oes modd
-    dadwneud hyn. | Ydych chi'n siŵr eich bod am ddileu {playlistItemCount} fideos
-    dyblyg o'r rhestr chwarae hon? Nid oes modd dadwneud hyn.
-  Cancel: Diddymu
-  Edit Playlist Info: Golygu Manylion Rhestr Chwarae
-  Copy Playlist: Copïo Rhestr Chwarae
-  Cannot delete the quick bookmark target playlist.: Methu dileu'r rhestr chwarae
-    targed nod tudalen cyflym.
-  You have no playlists. Click on the create new playlist button to create a new one.: Nid
-    oes gennych unrhyw restrau chwarae. Cliciwch ar y botwm creu rhestr chwarae newydd
-    i greu un newydd.
-  Playlists with Matching Videos: Rhestrau chwarae gyda Fideos Cyfatebol
-  Create New Playlist: Creu Rhestr Chwarae Newydd
-  Enable Quick Bookmark With This Playlist: Galluogi Nod Tudalen Cyflym Gyda'r Rhestr
-    Chwarae Hon
-  Remove Watched Videos: Dileu Fideos Wedi'u Gwylio
-  Are you sure you want to delete this playlist? This cannot be undone: Ydych chi'n
-    siŵr eich bod am ddileu'r rhestr chwarae hon? Nid oes modd dadwneud hyn.
-  Save Changes: Cadw'r Newidiadau
-  Remove Duplicate Videos: Dileu Fideos Dyblyg
+  Playlist Message: ''
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
+  Empty Search Message: ''
+  Search bar placeholder: ''
 History:
   # On History Page
   History: 'Hanes'
   Watch History: 'Hanes Gwylio'
-  Your history list is currently empty.: 'Mae eich rhestr hanes yn wag ar hyn o bryd.'
-  Empty Search Message: 'Nid oes unrhyw fideos yn eich hanes sy''n cyfateb i''ch chwiliad'
-  Search bar placeholder: "Chwilio yn eich Hanes"
-  Case Sensitive Search: Chwiliad Nodau Mawr neu Fach
+  Your history list is currently empty.: ''
+  Empty Search Message: ''
+  Search bar placeholder: ""
 Settings:
   # On Settings Page
   Settings: 'Gosodiadau'
-  The app needs to restart for changes to take effect. Restart and apply change?: 'Mae
-    angen i''r ap ailgychwyn er mwyn i newidiadau ddod i rym. Ailgychwyn a gosod y
-    newidiadau?'
+  Expand All Settings Sections: ''
+  The app needs to restart for changes to take effect. Restart and apply change?: ''
   General Settings:
-    General Settings: 'Cyffredinol'
+    General Settings: 'Gosodiadau Cyffredinol'
     Check for Updates: 'Chwilio am Ddiweddariadau'
-    Check for Latest Blog Posts: 'Gwiriwch am y Postiadau Blog Diweddaraf'
-    Fallback to Non-Preferred Backend on Failure: 'Nôl i''r Cefn Diddewis ar Fethiant'
-    Enable Search Suggestions: 'Galluogi Awgrymiadau Chwilio'
-    Default Landing Page: 'Tudalen Glanio Ragosodedig'
+    Check for Latest Blog Posts: ''
+    Fallback to Non-Preferred Backend on Failure: ''
+    Enable Search Suggestions: ''
+    Default Landing Page: ''
     Locale Preference: 'Dewis Iaith'
     System Default: 'Rhagosodyn y System'
     Preferred API Backend:
-      Preferred API Backend: 'Cefn API Dewisol'
+      Preferred API Backend: ''
       Local API: 'API Lleol'
       Invidious API: 'API Invidious'
     Video View Type:
-      Video View Type: 'Math Gwylio Fideo'
+      Video View Type: ''
       Grid: 'Grid'
       List: 'Rhestr'
     Thumbnail Preference:
@@ -314,56 +173,45 @@ Settings:
       Middle: 'Canol'
       End: 'Diwedd'
       Hidden: 'Wedi''u cuddio'
-      Blur: 'Pŵl'
-    Current Invidious Instance: 'Enghraifft Invidious Cyfredol'
-    The currently set default instance is {instance}: 'Yr enghraifft rhagosodedig
-      a osodwyd ar hyn o bryd yw {instance}'
-    No default instance has been set: 'Nid oes enghraifft rhagosodedig wedi''i gosod'
-    Current instance will be randomized on startup: 'Bydd yr enghraifft gyfredol ar
-      gael ar hap wrth gychwyn'
-    Set Current Instance as Default: 'Gosod yr Enghraifft Gyfredol fel Rhagosodiad'
-    Clear Default Instance: 'Clirio''r Enghraifft Rhagosodedig'
-    View all Invidious instance information: 'Gweld yr holl wybodaeth am enghraifft
-      Invidious'
-    Region for Trending: 'Rhanbarth Trendio'
+      Blur: ''
+    Current Invidious Instance: ''
+    The currently set default instance is {instance}: ''
+    No default instance has been set: ''
+    Current instance will be randomized on startup: ''
+    Set Current Instance as Default: ''
+    Clear Default Instance: ''
+    View all Invidious instance information: ''
+    Region for Trending: ''
     #! List countries
     External Link Handling:
-      External Link Handling: 'Trin Cyswllt Allanol'
+      External Link Handling: ''
       Open Link: 'Agor Dolen'
-      Ask Before Opening Link: 'Gofyn Cyn Agor Dolen'
+      Ask Before Opening Link: ''
       No Action: 'Dim Gweithred'
-    Auto Load Next Page:
-      Label: Llwytho'r Dudalen Nesaf yn Awtomatig
-      Tooltip: Llwytho tudalennau a sylwadau ychwanegol yn awtomatig.
   Theme Settings:
-    Theme Settings: 'Thema'
-    Match Top Bar with Main Color: 'Cydweddu Bar Uchaf gyda Phrif Lliw'
-    Expand Side Bar by Default: 'Ehangu Bar Ochr fel rhagosodedig'
-    Disable Smooth Scrolling: 'Analluogi Sgrolio Llyfn'
+    Theme Settings: 'Gosodiadau Thema'
+    Match Top Bar with Main Color: ''
+    Expand Side Bar by Default: ''
+    Disable Smooth Scrolling: ''
     UI Scale: 'Graddfa UI'
-    Hide Side Bar Labels: 'Cuddio Labeli Bar Ochr'
-    Hide FreeTube Header Logo: 'Cuddio Logo Pennawd FreeTube'
+    Hide Side Bar Labels: ''
+    Hide FreeTube Header Logo: ''
     Base Theme:
       Base Theme: 'Thema Sylfaenol'
       Black: 'Du'
       Dark: 'Tywyll'
       System Default: 'Rhagosodyn y System'
       Light: 'Golau'
-      Dracula: 'Draciwla'
+      Dracula: ''
       Catppuccin Mocha: 'Catppuccin Mocha'
-      Pastel Pink: 'Pinc Meddal'
-      Hot Pink: 'Pinc Poeth'
-      Solarized Dark: Heulog Tywyll
-      Solarized Light: Heulog Golau
-      Nordic: Nordaidd
-      Gruvbox Dark: Gruvbox Tywyll
-      Gruvbox Light: Golau Gruvbox
+      Pastel Pink: ''
+      Hot Pink: ''
     Main Color Theme:
-      Main Color Theme: 'Thema Prif Lliw'
+      Main Color Theme: ''
       Red: 'Coch'
       Pink: 'Pinc'
       Purple: 'Porffor'
-      Deep Purple: 'Porffor Dwfn'
+      Deep Purple: ''
       Indigo: 'Indigo'
       Blue: 'Glas'
       Light Blue: 'Glas Golau'
@@ -373,72 +221,53 @@ Settings:
       Light Green: 'Gwyrdd Golau'
       Lime: 'Leim'
       Yellow: 'Melyn'
-      Amber: 'Ambr'
+      Amber: ''
       Orange: 'Oren'
-      Deep Orange: 'Oren Dwfn'
-      Dracula Cyan: 'Cyan Dracula'
-      Dracula Green: 'Gwyrdd Draciwla'
-      Dracula Orange: 'Oren Draciwla'
-      Dracula Pink: 'Pinc Draciwla'
-      Dracula Purple: 'Piws Draciwla'
-      Dracula Red: 'Coch Draciwla'
-      Dracula Yellow: 'Melyn Draciwla'
-      Catppuccin Mocha Rosewater: 'Catppuccin Mocha Rosewater'
-      Catppuccin Mocha Flamingo: 'Catppuccin Mocha Flamingo'
-      Catppuccin Mocha Pink: 'Catppuccin Mocha Pinc'
-      Catppuccin Mocha Mauve: 'Catppuccin Mocha Mauve'
-      Catppuccin Mocha Red: 'Catppuccin Mocha Coch'
-      Catppuccin Mocha Maroon: 'Catppuccin Mocha Maroon'
-      Catppuccin Mocha Peach: 'Catppuccin Mocha Peach'
-      Catppuccin Mocha Yellow: 'Catppuccin Mocha Melyn'
-      Catppuccin Mocha Green: 'Catppuccin Mocha Gwyrdd'
-      Catppuccin Mocha Teal: 'Corhwyaden Catppuccin Mocha'
-      Catppuccin Mocha Sky: 'Awyr Catppuccin Mocha'
-      Catppuccin Mocha Sapphire: 'Catppuccin Mocha Sapphire'
-      Catppuccin Mocha Blue: 'Catppuccin Mocha Glas'
-      Catppuccin Mocha Lavender: 'Catppuccin Mocha Lafant'
-      Gruvbox Light Red: Gruvbox Golau Coch
-      Solarized Red: Coch Heulog
-      Solarized Violet: Fioled Heulog
-      Gruvbox Dark Green: Gruvbox Gwyrdd Tywyll
-      Gruvbox Dark Yellow: Gruvbox Melyn Tywyll
-      Gruvbox Dark Blue: Gruvbox Glas Tywyll
-      Gruvbox Dark Purple: Gruvbox Porffor Tywyll
-      Gruvbox Dark Aqua: Aqua Tywyll Gruvbox
-      Gruvbox Dark Orange: Gruvbox Oren Tywyll
-      Gruvbox Light Blue: Gruvbox Glas Ysgafn
-      Gruvbox Light Purple: Gruvbox Porffor Ysgafn
-      Gruvbox Light Orange: Gruvbox Oren Ysgafn
-      Solarized Magenta: Magenta Heulog
-      Solarized Orange: Oren Heulog
-      Solarized Green: Gwyrdd Heulog
-      Solarized Yellow: Melyn Heulog
-      Solarized Blue: Glas Heulog
-      Solarized Cyan: Cyan Heulog
-    Secondary Color Theme: 'Thema Lliw Eilaidd'
+      Deep Orange: ''
+      Dracula Cyan: ''
+      Dracula Green: ''
+      Dracula Orange: ''
+      Dracula Pink: ''
+      Dracula Purple: ''
+      Dracula Red: ''
+      Dracula Yellow: ''
+      Catppuccin Mocha Rosewater: ''
+      Catppuccin Mocha Flamingo: ''
+      Catppuccin Mocha Pink: ''
+      Catppuccin Mocha Mauve: ''
+      Catppuccin Mocha Red: ''
+      Catppuccin Mocha Maroon: ''
+      Catppuccin Mocha Peach: ''
+      Catppuccin Mocha Yellow: ''
+      Catppuccin Mocha Green: ''
+      Catppuccin Mocha Teal: ''
+      Catppuccin Mocha Sky: ''
+      Catppuccin Mocha Sapphire: ''
+      Catppuccin Mocha Blue: ''
+      Catppuccin Mocha Lavender: ''
+    Secondary Color Theme: ''
         #* Main Color Theme
   Player Settings:
     Player Settings: 'Gosodiadau Chwaraewr'
-    Play Next Video: 'Chwarae Fideo Nesaf'
-    Turn on Subtitles by Default: 'Troi Isdeitlau ymlaen fel rhagosodiad'
+    Play Next Video: ''
+    Turn on Subtitles by Default: ''
     Autoplay Videos: 'Awto-chwarae Fideos'
-    Proxy Videos Through Invidious: 'Fideos Dirprwy Trwy Invidious'
+    Proxy Videos Through Invidious: ''
     Autoplay Playlists: 'Awto-chwarae Rhestrau Chwarae'
-    Enable Theatre Mode by Default: 'Galluogi Modd Theatr fel rhagosodiad'
-    Scroll Volume Over Video Player: 'Sgrolio Sain Dros Chwaraewr Fideo'
-    Scroll Playback Rate Over Video Player: 'Sgrolio Graddfa Chwarae Nôl Dros Chwaraewr
-      Fideo'
-    Skip by Scrolling Over Video Player: 'Neidio drwy Sgrolio Dros Chwaraewr Fideo'
-    Display Play Button In Video Player: 'Dangos Botwm Chwarae yn y Chwaraewr Fideo'
-    Enter Fullscreen on Display Rotate: 'Mynd i''r Sgrin Lawn wrth Cylchdroi Dangosydd'
-    Next Video Interval: 'Ysbaid Fideo Nesaf'
-    Fast-Forward / Rewind Interval: 'Ysbaid Cyflym Ymlaen / Ailddirwyn'
+    Enable Theatre Mode by Default: ''
+    Scroll Volume Over Video Player: ''
+    Scroll Playback Rate Over Video Player: ''
+    Skip by Scrolling Over Video Player: ''
+    Display Play Button In Video Player: ''
+    Enter Fullscreen on Display Rotate: ''
+    Next Video Interval: ''
+    Fast-Forward / Rewind Interval: ''
     Default Volume: 'Sain Diofyn'
-    Default Playback Rate: 'Cyfradd Chwarae rhagosodiad'
-    Max Video Playback Rate: 'Cyfradd Chwarae Fideo Uchaf'
-    Video Playback Rate Interval: 'Ysbaid Cyfradd Chwarae Fideo'
+    Default Playback Rate: ''
+    Max Video Playback Rate: ''
+    Video Playback Rate Interval: ''
     Default Video Format:
-      Default Video Format: 'Fformat Fideo Rhagosodedig'
+      Default Video Format: ''
       Dash Formats: 'Fformatau DASH'
       Legacy Formats: 'Hen Fformatau'
       Audio Formats: 'Fformatau Sain'
@@ -458,113 +287,94 @@ Settings:
       Enable: 'Galluogi Sgrinlun'
       Format Label: 'Fformat Sgrinluniau'
       Quality Label: 'Ansawdd Sgrinlun'
-      Ask Path: 'Gofynnwch am Ffolder Cadw'
+      Ask Path: ''
       Folder Label: 'Ffolder Sgrinlun'
       Folder Button: 'Dewis Ffolder'
       File Name Label: 'Patrwm Enw Ffeil'
-      File Name Tooltip: 'Gallwch ddefnyddio newidynnau isod. %Y Blwyddyn 4 digid.
-        % M Mis 2 ddigid. %D Diwrnod 2 ddigid. % H Awr 2 ddigid. % N Munud 2 ddigid.
-        %S Ail 2 ddigid. % T Millisecond 3 digid. %s Eiliad Fideo. %t Fideo Millisecond
-        3 digid. %i ID fideo. Gallwch hefyd ddefnyddio "\" neu "/" i greu is-ffolderi.'
+      File Name Tooltip: ''
       Error:
         Forbidden Characters: 'Nodau Gwahardd'
-        Empty File Name: 'Enw Ffeil Gwag'
+        Empty File Name: ''
   External Player Settings:
-    External Player Settings: 'Chwaraewr Allanol'
+    External Player Settings: ''
     External Player: 'Chwaraewr Allanol'
-    Ignore Unsupported Action Warnings: 'Anwybyddu Rhybuddion Gweithredu Heb Gefnogaeth'
-    Custom External Player Executable: 'Gweithredadwy Chwaraewr Allanol Cyfaddas'
-    Custom External Player Arguments: 'Dadleuon Chwaraewr Allanol Cyfaddas'
+    Ignore Unsupported Action Warnings: ''
+    Custom External Player Executable: ''
+    Custom External Player Arguments: ''
     Players:
       None:
         Name: 'Dim'
-    Ignore Default Arguments: Anwybyddu Dadleuon Rhagosodedig
   Privacy Settings:
-    Privacy Settings: 'Preifatrwydd'
+    Privacy Settings: 'Gosodiadau Preifatrwydd'
     Remember History: 'Cadw Hanes'
-    Save Watched Progress: 'Cadw y Cynnydd Gwylio'
-    Save Watched Videos With Last Viewed Playlist: 'Cadw Fideos Wedi''u Gwylio Gyda
-      Rhestr Chwarae y Gwylio Diwethaf'
-    Clear Search Cache: 'Clirio''r Storfa Chwilio'
-    Are you sure you want to clear out your search cache?: 'Ydych chi''n siŵr eich
-      bod am glirio''ch storfa chwilio?'
-    Search cache has been cleared: 'Mae storfa chwilio wedi''i chlirio'
-    Remove Watch History: 'Dileu Hanes Gwylio'
-    Are you sure you want to remove your entire watch history?: 'Ydych chi''n siŵr
-      eich bod am ddileu eich hanes gwylio i gyd?'
-    Watch history has been cleared: 'Mae hanes gwylio wedi''i glirio'
-    Remove All Subscriptions / Profiles: 'Dileu Pob Tanysgrifiad / Proffil'
-    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'A
-      ydych yn siŵr eich bod am ddileu pob tanysgrifiad a phroffil?  Nid oes modd
-      dadwneud hyn.'
-    All playlists have been removed: Mae'r holl restrau chwarae wedi'u dileu
-    Remove All Playlists: Dileu Pob Rhestr Chwarae
-    Are you sure you want to remove all your playlists?: Ydych chi'n siŵr eich bod
-      am ddileu eich holl restrau chwarae?
+    Save Watched Progress: ''
+    Save Watched Videos With Last Viewed Playlist: ''
+    Clear Search Cache: ''
+    Are you sure you want to clear out your search cache?: ''
+    Search cache has been cleared: ''
+    Remove Watch History: ''
+    Are you sure you want to remove your entire watch history?: ''
+    Watch history has been cleared: ''
+    Remove All Subscriptions / Profiles: ''
+    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
   Subscription Settings:
-    Subscription Settings: 'Tanysgrifiad'
-    Hide Videos on Watch: 'Cuddio Fideos wrth Wylio'
-    Fetch Feeds from RSS: 'Nôl Llif RSS'
-    Fetch Automatically: 'Nôl Llif yn Awtomatig'
-    Confirm Before Unsubscribing: Cadarnhau Cyn Dad-danysgrifio
+    Subscription Settings: 'Gosodiadau Tanysgrifio'
+    Hide Videos on Watch: ''
+    Fetch Feeds from RSS: ''
+    Manage Subscriptions: 'Rheoli Tanysgrifiadau'
+    Fetch Automatically: ''
+    Only Show Latest Video for Each Channel: ''
   Distraction Free Settings:
-    Distraction Free Settings: 'Dim Tarfu'
+    Distraction Free Settings: ''
     Sections:
       Side Bar: 'Bar Ochr'
       Subscriptions Page: 'Tudalen Tanysgrifiadau'
       Channel Page: 'Tudalen Sianel'
       Watch Page: 'Tudalen Wylio'
       General: 'Cyffredinol'
-    Hide Video Views: 'Cuddio Golygon Fideo'
-    Hide Video Likes And Dislikes: 'Cuddio Hoffi a Chasáu Fideos'
-    Hide Channel Subscribers: 'Cuddio Tanysgrifwyr Sianel'
-    Hide Comment Likes: 'Cuddio Sylwadau Hoffi'
-    Hide Recommended Videos: 'Cuddio Fideos Da'
-    Hide Trending Videos: 'Cuddio Fideos Trendio'
+    Hide Video Views: ''
+    Hide Video Likes And Dislikes: ''
+    Hide Channel Subscribers: ''
+    Hide Comment Likes: ''
+    Hide Recommended Videos: ''
+    Hide Trending Videos: 'Cuddio Fideos Llosg'
     Hide Popular Videos: 'Cuddio Fideos Poblogaidd'
     Hide Playlists: 'Cuddio Rhestrau Chwarae'
-    Hide Live Chat: 'Cuddio Sgwrs Fyw'
-    Hide Active Subscriptions: 'Cuddio Tanysgrifiadau Gweithredol'
-    Hide Video Description: 'Cuddio Disgrifiad Fideo'
+    Hide Live Chat: ''
+    Hide Active Subscriptions: ''
+    Hide Video Description: ''
     Hide Comments: 'Cuddio Sylwadau'
-    Hide Profile Pictures in Comments: 'Cuddio Lluniau Proffil mewn Sylwadau'
-    Display Titles Without Excessive Capitalisation: 'Dangos Teitlau Heb Prif Lythrennu
-      Ac Atalnodi Gormodol'
-    Hide Live Streams: 'Cuddio Ffrydiau Byw'
-    Hide Upcoming Premieres: 'Cuddio Cyflwyniadau i''r Dyfodol'
-    Hide Sharing Actions: 'Cuddio Gweithredoedd Rhannu'
+    Hide Profile Pictures in Comments: ''
+    Display Titles Without Excessive Capitalisation: ''
+    Hide Live Streams: ''
+    Hide Upcoming Premieres: ''
+    Hide Sharing Actions: ''
     Hide Chapters: 'Cuddio Siapteri'
-    Hide Channels: 'Cuddio Fideos O Sianeli'
-    Hide Channels Disabled Message: 'Cafodd rhai sianeli eu rhwystro gan ddefnyddio
-      dull adnabod ac ni chawsant eu prosesu. Mae nodwedd wedi''i rhwystro tra bod
-      yr IDau hynny''n cael eu diweddaru'
+    Hide Channels: ''
+    Hide Channels Disabled Message: ''
     Hide Channels Placeholder: 'ID Sianel'
-    Hide Channels Invalid: 'Roedd ID y sianel a ddarparwyd yn annilys'
-    Hide Channels API Error: 'Gwall wrth adalw defnyddiwr gyda''r ID a ddarparwyd.
-      Gwiriwch eto a yw''r ID yn gywir.'
-    Hide Channels Already Exists: 'Mae ID y sianel eisoes yn bodoli'
-    Hide Featured Channels: 'Cuddio Sianeli Nodwedd'
-    Hide Channel Playlists: 'Cuddio Rhestrau Chwarae Sianel'
-    Hide Channel Community: 'Cuddio Cymuned Sianel'
-    Hide Channel Shorts: 'Cuddio Byrion Sianel'
-    Hide Channel Podcasts: 'Cuddio Podlediadau Sianel'
-    Hide Channel Releases: 'Cuddio Fideos Newydd Sianel'
-    Hide Subscriptions Videos: 'Cuddio Fideos Tanysgrifiadau'
-    Hide Subscriptions Shorts: 'Cuddio Tanysgrifiadau Byrion'
-    Hide Subscriptions Live: 'Cuddio Tanysgrifiadau Byw'
-    Hide Subscriptions Community: 'Cuddio Cymuned Tanysgrifiadau'
-    Hide Videos and Playlists Containing Text: Cuddio Fideos a Rhestrau Chwarae sy'n
-      Cynnwys Testun
-    Hide Videos and Playlists Containing Text Placeholder: Gair, Darn o Arian, neu
-      Ymadrodd
+    Hide Channels Invalid: ''
+    Hide Channels API Error: ''
+    Hide Channels Already Exists: ''
+    Hide Featured Channels: ''
+    Hide Channel Playlists: ''
+    Hide Channel Community: ''
+    Hide Channel Shorts: ''
+    Hide Channel Podcasts: ''
+    Hide Channel Releases: ''
+    Hide Subscriptions Videos: ''
+    Hide Subscriptions Shorts: ''
+    Hide Subscriptions Live: ''
+    Hide Subscriptions Community: ''
   Data Settings:
-    Data Settings: 'Data'
-    Select Import Type: 'Dewis y Math o Fewnforio'
-    Select Export Type: 'Dewis y Math o Allforio'
+    Data Settings: 'Gosodiadau Data'
+    Select Import Type: ''
+    Select Export Type: ''
     Import Subscriptions: 'Mewnforio Tanysgrifiadau'
     Subscription File: 'Ffeil Tanysgrifio'
     History File: 'Ffeil Hanes'
     Playlist File: 'Ffeil Rhestr Chwarae'
+    Check for Legacy Subscriptions: ''
     Export Subscriptions: 'Allforio Tanysgrifiadau'
     Export FreeTube: 'Allforio FreeTube'
     Export YouTube: 'Allforio YouTube'
@@ -573,357 +383,309 @@ Settings:
     Export History: 'Allforio Hanes'
     Import Playlists: 'Mewnforio Rhestrau Chwarae'
     Export Playlists: 'Allforio Rhestrau Chwarae'
-    Profile object has insufficient data, skipping item: 'Nid oes gan y gwrthrych
-      proffil ddigon o ddata, gan hepgor yr eitem'
-    All subscriptions and profiles have been successfully imported: 'Mae''r holl danysgrifiadau
-      a phroffiliau wedi''u mewnforio''n llwyddiannus'
-    All subscriptions have been successfully imported: 'Mae pob tanysgrifiad wedi''i
-      fewnforio''n llwyddiannus'
-    Invalid subscriptions file: 'Ffeil tanysgrifiadau annilys'
+    Profile object has insufficient data, skipping item: ''
+    All subscriptions and profiles have been successfully imported: ''
+    All subscriptions have been successfully imported: ''
+    Invalid subscriptions file: ''
     This might take a while, please wait: ''
-    Invalid history file: 'Ffeil hanes annilys'
-    Subscriptions have been successfully exported: 'Mae tanysgrifiadau wedi''u hallforio''n
-      llwyddiannus'
-    History object has insufficient data, skipping item: 'Nid oes gan y gwrthrych
-      hanes ddigon o ddata, gan hepgor yr eitem'
-    All watched history has been successfully imported: 'Mae''r holl hanes gwylio
-      wedi''i fewnforio''n llwyddiannus'
-    All watched history has been successfully exported: 'Mae''r holl hanes gwylio
-      wedi''i allforio''n llwyddiannus'
-    Playlist insufficient data: 'Dim digon o ddata ar gyfer rhestr chwarae "{playlist}",
-      hepgor eitem'
-    All playlists has been successfully imported: 'Mae''r holl restrau chwarae wedi''u
-      mewnforio yn llwyddiannus'
-    All playlists has been successfully exported: 'Mae''r holl restrau chwarae wedi''u
-      hallforio''n llwyddiannus'
-    Unable to read file: 'Methu darllen ffeil'
-    Unable to write file: 'Methu ysgrifennu ffeil'
-    Unknown data key: 'Allwedd ddata anhysbys'
-    How do I import my subscriptions?: 'Sut ydw i''n mewnforio fy nhanysgrifiadau?'
+    Invalid history file: ''
+    Subscriptions have been successfully exported: ''
+    History object has insufficient data, skipping item: ''
+    All watched history has been successfully imported: ''
+    All watched history has been successfully exported: ''
+    Playlist insufficient data: ''
+    All playlists has been successfully imported: ''
+    All playlists has been successfully exported: ''
+    Unable to read file: ''
+    Unable to write file: ''
+    Unknown data key: ''
+    How do I import my subscriptions?: ''
     Manage Subscriptions: 'Rheoli Tanysgrifiadau'
-    Export Playlists For Older FreeTube Versions:
-      Tooltip: "Mae'r opsiwn hwn yn allforio fideos o bob rhestr chwarae i un rhestr
-        chwarae o'r enw 'Ffefrynnau'.\nSut i allforio a mewnforio fideos mewn rhestrau
-        chwarae ar gyfer fersiwn hŷn o FreeTube:\n1. Allforio eich rhestri chwarae
-        gyda'r opsiwn hwn wedi'i alluogi.\n2. Dileu eich holl restrau chwarae presennol
-        gan ddefnyddio'r opsiwn Dileu Pob Rhestr Chwarae o dan Gosodiadau Preifatrwydd.\n
-        3. Lansio'r fersiwn hŷn o FreeTube a mewngludo'r rhestri chwarae allforio.\""
-      Label: Allforio Rhestrau Chwarae Fersiynau FreeTube Hŷn
   Proxy Settings:
     Proxy Settings: 'Gosodiadau Dirprwy'
-    Enable Tor / Proxy: 'Galluogi Tor/Dirprwy'
+    Enable Tor / Proxy: ''
     Proxy Protocol: 'Protocol Dirprwy'
     Proxy Host: 'Gweinydd Dirprwy'
-    Proxy Port Number: 'Rhif Porth Dirprwy'
-    Clicking on Test Proxy will send a request to: 'Bydd clicio ar Test Proxy yn anfon
-      cais at'
+    Proxy Port Number: ''
+    Clicking on Test Proxy will send a request to: ''
     Test Proxy: 'Profi Dirprwy'
     Your Info: 'Eich Gwybodaeth'
     Ip: 'IP'
     Country: 'Gwlad'
     Region: 'Rhanbarth'
     City: 'Dinas'
-    Error getting network information. Is your proxy configured properly?: 'Gwall
-      wrth gael gwybodaeth rhwydwaith. A yw eich dirprwy wedi''i ffurfweddu''n gywir?'
-    Proxy Warning: Nid oes gan FreeTube ddirprwy mewnol ond gall gysylltu â dirprwy
-      allanol, fel un sy'n rhedeg ar eich peiriant fel Tor neu ddirprwy allanol fel
-      dirprwy SOCKS5 a ddarperir gan rai VPNs. Os yw wedi'i alluogi, gwnewch yn siŵr
-      bod eich dirprwy/Tor wedi'i ffurfweddu'n gywir, neu ni fydd FreeTube yn gallu
-      nôl unrhyw ddata.
+    Error getting network information. Is your proxy configured properly?: ''
   SponsorBlock Settings:
     SponsorBlock Settings: 'Gosodiadau SponsorBlock'
     Enable SponsorBlock: 'Galluogi SponsorBlock'
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'Url API SponsorBlock
-      (Y rhagosodiad yw https://sponsor.ajay.app)'
-    Notify when sponsor segment is skipped: 'Rhoi gwybod pan fydd segment y noddwr
-      yn cael ei hepgor'
-    UseDeArrowTitles: 'Defnyddio Teitlau Fideo DeArrow'
+    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
+    Notify when sponsor segment is skipped: ''
+    UseDeArrowTitles: ''
     Skip Options:
       Skip Option: 'Opsiwn Hepgor'
       Auto Skip: 'Awto-Hepgor'
-      Show In Seek Bar: 'Dangos yn y Bar Chwilio'
-      Prompt To Skip: 'Annog i Hepgor'
+      Show In Seek Bar: ''
+      Prompt To Skip: ''
       Do Nothing: 'Gwneud Dim'
     Category Color: 'Lliw Categori'
-    UseDeArrowThumbnails: Defnyddio DeArrow ar gyfer lluniau bach
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': DeArrow
-      Thumbnail Generator API (Y rhagosodiad yw https://dearrow-thumb.ajay.app)
   Parental Control Settings:
-    Parental Control Settings: 'Rheolaeth Rhieni'
+    Parental Control Settings: ''
     Hide Unsubscribe Button: 'Cuddio Botwm Dad-danysgrifio'
-    Show Family Friendly Only: 'Dangos Dim ond Addas i Deuluoedd'
+    Show Family Friendly Only: ''
     Hide Search Bar: 'Cuddio Bar Chwilio'
   Download Settings:
-    Download Settings: 'Llwytho i lawr'
-    Ask Download Path: 'Gofyn am lwybr llwytho'
+    Download Settings: 'Gosodiadau Lawrlwytho'
+    Ask Download Path: ''
     Choose Path: 'Dewiswch Lwybr'
     Download Behavior: 'Ymddygiad Lawrlwytho'
-    Download in app: 'Llwytho mewn ap'
-    Open in web browser: 'Agor mewn porwr gwe'
+    Download in app: ''
+    Open in web browser: ''
   Experimental Settings:
     Experimental Settings: 'Gosodiadau Arbrofol'
-    Warning: 'Mae''r gosodiadau hyn yn arbrofol, gallant achosi chwalu wrth eu galluogi.
-      Argymhellir yn gryf gwneud copïau wrth gefn. Defnyddiwch ar eich menter eich
-      hun!'
-    Replace HTTP Cache: 'Disodli HTTP Cache'
+    Warning: ''
+    Replace HTTP Cache: ''
   Password Dialog:
     Password: 'Cyfrinair'
-    Enter Password To Unlock: 'Rhowch gyfrinair i ddatgloi gosodiadau'
+    Enter Password To Unlock: ''
     Password Incorrect: 'Cyfrinair Anghywir'
     Unlock: 'Datgloi'
   Password Settings:
-    Password Settings: 'Cyfrinair'
-    Set Password To Prevent Access: 'Gosod cyfrinair i atal mynediad i osodiadau'
+    Password Settings: 'Gosodiadau Cyfrinair'
+    Set Password To Prevent Access: ''
     Set Password: 'Gosod Cyfrinair'
     Remove Password: 'Tynnu Cyfrinair'
-  Return to Settings Menu: Nôl i'r Ddewislen Gosodiadau
-  Sort Settings Sections (A-Z): Adrannau Gosodiadau Trefnu (A-Z)
 About:
   #On About page
   About: 'Ynghylch'
   Beta: 'Beta'
   Source code: 'Cod ffynhonnell'
-  Downloads / Changelog: 'Llwytho / Changelog'
-  GitHub releases: 'Ryddhau drwy GitHub'
+  Licensed under the AGPLv3: ''
+  View License: 'Gweld Trwydded'
+  Downloads / Changelog: ''
+  GitHub releases: ''
   Help: 'Cymorth'
   FreeTube Wiki: 'Wici FreeTube'
   FAQ: 'Cwestiynau Cyffredin'
   Discussions: 'Sgyrsiau'
-  Report a problem: 'Adrodd am broblem'
+  Report a problem: ''
   GitHub issues: 'Materion GitHub'
-  Please check for duplicates before posting: 'Gwiriwch am ddyblygiadau cyn postio'
+  Please check for duplicates before posting: ''
   Website: 'Gwefan'
   Blog: 'Blog'
   Email: 'E-bost'
   Mastodon: 'Mastodon'
-  Chat on Matrix: 'Sgwrsio ar Matrix'
-  Please read the: 'Darllenwch y'
+  Chat on Matrix: ''
+  Please read the: ''
   room rules: 'rheolau ystafell'
   Translate: 'Cyfieithu'
   Credits: 'Cydnabyddiaeth'
-  FreeTube is made possible by: 'Gwneir FreeTube yn bosibl gan'
-  these people and projects: 'y bobl a''r prosiectau hyn'
+  FreeTube is made possible by: ''
+  these people and projects: ''
   Donate: 'Rhoi arian'
 
-  Licensed under the: Trwyddedig o dan y
-  AGPLv3: AGPLv3
 Profile:
-  Profile Settings: 'Proffil'
-  Toggle Profile List: 'Toglo Rhestr Proffil'
+  Profile Settings: 'Gosodiadau Proffil'
+  Toggle Profile List: ''
   Profile Select: 'Dewis Proffil'
   Profile Filter: 'Hidlydd Proffil'
   All Channels: 'Pob Sianel'
   Profile Manager: 'Rheoli Proffiliau'
   Create New Profile: 'Creu Proffil Newydd'
   Edit Profile: 'Golygu Proffil'
-  Edit Profile Name: 'Golygu Enw Proffil'
-  Create Profile Name: 'Creu Enw Proffil'
+  Edit Profile Name: ''
+  Create Profile Name: ''
   Profile Name: 'Enw Proffil'
   Color Picker: 'Dewisydd Lliw'
   Custom Color: 'Lliw Addas'
   Profile Preview: 'Rhagweld Proffil'
   Create Profile: 'Creu Proffil'
   Update Profile: 'Diweddaru Proffil'
-  Make Default Profile: 'Gwneud Proffil Rhagosodedig'
+  Make Default Profile: ''
   Delete Profile: 'Dileu Proffil'
-  Are you sure you want to delete this profile?: 'Ydych chi''n siŵr eich bod am ddileu''r
-    proffil hwn?'
-  All subscriptions will also be deleted.: 'Bydd pob tanysgrifiad hefyd yn cael ei
-    ddileu.'
-  Profile could not be found: 'Nid oedd modd dod o hyd i broffil'
-  Your profile name cannot be empty: 'Ni all eich enw proffil fod yn wag'
-  Profile has been created: 'Mae proffil wedi''i greu'
-  Profile has been updated: 'Mae''r proffil wedi''i ddiweddaru'
-  Your default profile has been set to {profile}: 'Mae eich proffil rhagosodedig wedi''i
-    osod i {profile}'
-  Removed {profile} from your profiles: 'Wedi tynnu {profile} o''ch proffiliau'
-  Your default profile has been changed to your primary profile: 'Mae eich proffil
-    rhagosodedig wedi''i newid i''ch prif broffil'
-  '{profile} is now the active profile': '{profile} yw''r proffil gweithredol bellach'
+  Are you sure you want to delete this profile?: ''
+  All subscriptions will also be deleted.: ''
+  Profile could not be found: ''
+  Your profile name cannot be empty: ''
+  Profile has been created: ''
+  Profile has been updated: ''
+  Your default profile has been set to {profile}: ''
+  Removed {profile} from your profiles: ''
+  Your default profile has been changed to your primary profile: ''
+  '{profile} is now the active profile': ''
   Subscription List: 'Rhestr Tanysgrifiadau'
   Other Channels: 'Sianeli Eraill'
-  '{number} selected': 'Mae {number} wedi''i ddewis'
+  '{number} selected': ''
   Select All: 'Dewis Popeth'
   Select None: 'Dewis Dim'
-  Delete Selected: 'Dileu''r Dewis'
-  Add Selected To Profile: 'Ychwanegu''r Dewis i Broffil'
-  No channel(s) have been selected: 'Dim sianel(i) wedi''u dewis'
+  Delete Selected: ''
+  Add Selected To Profile: ''
+  No channel(s) have been selected: ''
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
-  : 'Dyma''ch prif broffil.  Ydych chi''n siŵr eich bod am ddileu''r sianeli a ddewiswyd?  Bydd
-    yr un sianeli yn cael eu dileu mewn unrhyw broffil sydd ynddo.'
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Ydych
-    chi''n siŵr eich bod am ddileu''r sianeli a ddewiswyd?  Ni fydd hyn yn dileu''r
-    sianel o unrhyw broffil arall.'
-  Close Profile Dropdown: 'Cau''r Cwymplen Proffil'
-  Open Profile Dropdown: 'Agor Cwymplen Proffil'
+  : ''
+  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
+  Close Profile Dropdown: ''
+  Open Profile Dropdown: ''
 #On Channel Page
 Channel:
   Subscribe: 'Tanysgrifio'
   Unsubscribe: 'Dad-danysgrifio'
-  Channel has been removed from your subscriptions: 'Mae''r sianel wedi''i dynnu o''ch
-    tanysgrifiadau'
-  Removed subscription from {count} other channel(s): 'Tynnwyd y tanysgrifiad o {count}
-    sianel(i) arall'
-  Added channel to your subscriptions: 'Ychwanegwyd sianel at eich tanysgrifiadau'
+  Channel has been removed from your subscriptions: ''
+  Removed subscription from {count} other channel(s): ''
+  Added channel to your subscriptions: ''
   Search Channel: 'Chwilio Sianel'
-  Your search results have returned 0 results: 'Mae eich canlyniadau chwilio wedi
-    dod o hyd i 0 canlyniad'
+  Your search results have returned 0 results: ''
   Sort By: 'Trefnu yn ôl'
-  This channel does not exist: 'Nid yw''r sianel hon yn bodoli'
-  This channel does not allow searching: 'Nid yw''r sianel hon yn caniatáu chwilio'
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: 'Mae
-    cyfyngiad oedran ar y sianel hon ac ar hyn o bryd nid oes modd ei gweld yn FreeTube.'
+  This channel does not exist: ''
+  This channel does not allow searching: ''
+  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
   Channel Tabs: 'Tabiau Sianel'
   Videos:
     Videos: 'Fideos'
-    This channel does not currently have any videos: 'Nid oes gan y sianel hon unrhyw
-      fideos ar hyn o bryd'
+    This channel does not currently have any videos: ''
     Sort Types:
       Newest: 'Diweddaraf'
       Oldest: 'Hynaf'
       Most Popular: 'Mwyaf Poblogaidd'
   Shorts:
-    This channel does not currently have any shorts: 'Nid oes gan y sianel hon unrhyw
-      siorts ar hyn o bryd'
+    This channel does not currently have any shorts: ''
   Live:
     Live: 'Byw'
-    This channel does not currently have any live streams: 'Nid oes gan y sianel hon
-      unrhyw ffrydiau byw ar hyn o bryd'
+    This channel does not currently have any live streams: ''
   Playlists:
     Playlists: 'Rhestrau Chwarae'
-    This channel does not currently have any playlists: 'Nid oes gan y sianel hon
-      unrhyw restrau chwarae ar hyn o bryd'
+    This channel does not currently have any playlists: ''
     Sort Types:
-      Last Video Added: 'Y Fideo Diwethaf a Ychwanegwyd'
+      Last Video Added: ''
       Newest: 'Diweddaraf'
       Oldest: 'Hynaf'
   Podcasts:
     Podcasts: 'Podlediadau'
-    This channel does not currently have any podcasts: 'Nid oes gan y sianel hon unrhyw
-      bodlediadau ar hyn o bryd'
+    This channel does not currently have any podcasts: ''
   Releases:
     Releases: 'Rhyddhadau'
-    This channel does not currently have any releases: 'Nid oes gan y sianel hon unrhyw
-      fdeos newydd ar hyn o bryd'
+    This channel does not currently have any releases: ''
   About:
     About: 'Ynghylch'
     Channel Description: 'Disgrifiad y Sianel'
     Tags:
       Tags: 'Tagiau'
-      Search for: 'Chwilio am "{tag}"'
+      Search for: ''
     Details: 'Manylion'
     Joined: 'Dyddiad ymuno'
     Location: 'Lleoliad'
     Featured Channels: 'Sianeli Dethol'
   Community:
-    This channel currently does not have any posts: 'Nid oes gan y sianel hon unrhyw
-      bostiadau ar hyn o bryd'
+    This channel currently does not have any posts: ''
     votes: '{votes} o bleidleisiau'
     Reveal Answers: 'Datgloi Atebion'
     Hide Answers: 'Cuddio Atebion'
-    Video hidden by FreeTube: Fideo wedi'i guddio gan FreeTube
-    View Full Post: Gweld Post Llawn
-    Viewing Posts Only Supported By Invidious: Dim ond Invidious sy'n cefnogi Gweld
-      Postiadau. Ewch i dab cymunedol sianel i weld cynnwys yno heb Invidious.
 Video:
-  Mark As Watched: 'Marcio wedi''i Wylio'
-  Remove From History: 'Dileu o Hanes'
-  Video has been marked as watched: 'Fideo wedi''i farcio fel wedi''i wylio'
-  Video has been removed from your history: 'Mae fideo wedi''i dynnu o''ch hanes'
+  Mark As Watched: ''
+  Remove From History: ''
+  Video has been marked as watched: ''
+  Video has been removed from your history: ''
   Save Video: 'Cadw Fideo'
-  Video has been saved: 'Mae fideo wedi''i gadw'
-  Video has been removed from your saved list: 'Mae fideo wedi''i dynnu oddi ar eich
-    rhestr sydd wedi''i chadw'
-  Open in YouTube: 'Agor yn YouTube'
-  Copy YouTube Link: 'Copïo Dolen YouTube'
-  Open YouTube Embedded Player: 'Agor Chwaraewr Mewnblannu YouTube'
-  Copy YouTube Embedded Player Link: 'Copïo Dolen Chwaraewr Mewnblanwyd YouTube'
-  Open in Invidious: 'Agor yn Invidious'
-  Copy Invidious Link: 'Copïo Dolen Invidious'
-  Open Channel in YouTube: 'Agor Sianel yn YouTube'
-  Copy YouTube Channel Link: 'Copïo Dolen Sianel YouTube'
-  Open Channel in Invidious: 'Agor Sianel yn Invidious'
-  Copy Invidious Channel Link: 'Copïo Dolen Sianel Invidious'
+  Video has been saved: ''
+  Video has been removed from your saved list: ''
+  Open in YouTube: ''
+  Copy YouTube Link: ''
+  Open YouTube Embedded Player: ''
+  Copy YouTube Embedded Player Link: ''
+  Open in Invidious: ''
+  Copy Invidious Link: ''
+  Open Channel in YouTube: ''
+  Copy YouTube Channel Link: ''
+  Open Channel in Invidious: ''
+  Copy Invidious Channel Link: ''
   Hide Channel: 'Cuddio Sianel'
   Unhide Channel: 'Dangos Sianel'
   Views: 'Edrychiadau'
   Loop Playlist: 'Ailadrodd Rhestr Chwarae'
-  Shuffle Playlist: 'Cymysgu Rhestr Chwarae'
-  Reverse Playlist: 'Gwrthdroi Rhestr Chwarae'
-  Play Next Video: 'Chwarae Fideo Nesaf'
-  Play Previous Video: 'Chwarae Fideo Blaenorol'
-  Pause on Current Video: 'Oedi ar Fideo Cyfredol'
+  Shuffle Playlist: ''
+  Reverse Playlist: ''
+  Play Next Video: ''
+  Play Previous Video: ''
+  Pause on Current Video: ''
   Watched: 'Wedi gwylio'
   Autoplay: 'Awtochwarae'
-  Starting soon, please refresh the page to check again: 'Yn dechrau''n fuan, adnewyddwch
-    y dudalen i wirio eto'
+  Starting soon, please refresh the page to check again: ''
   # As in a Live Video
-  Premieres on: 'Premières ar'
-  Premieres: 'Premières'
+  Premieres on: ''
+  Premieres: ''
   Upcoming: 'I ddod'
   Live: 'Byw'
   Live Now: 'Yn Fyw'
   Live Chat: 'Sgwrs Byw'
-  Enable Live Chat: 'Galluogi Sgwrsio Byw'
-  Live Chat is currently not supported in this build.: 'Nid yw Sgwrsio Byw yn cael
-    ei gefnogi yn yr fersiwn hwn ar hyn o bryd.'
-  'Chat is disabled or the Live Stream has ended.': 'Mae Sgwrsio wedi''i analluogi
-    neu mae''r Llif Byw wedi dod i ben.'
-  Live chat is enabled. Chat messages will appear here once sent.: 'Mae sgwrs fyw
-    wedi''i galluogi.  Bydd negeseuon sgwrsio yn ymddangos yma ar ôl eu hanfon.'
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Nid
-    yw Sgwrsio Byw yn cael ei gefnogi gan yr API Invidious ar hyn o bryd.  Mae angen
-    cysylltiad uniongyrchol â YouTube.'
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': 'Nid
-    yw Sgwrsio Byw ar gael ar gyfer y ffrwd hon. Mae''n bosib ei fod wedi''i analluogi
-    gan y llwythwr.'
-  Show Super Chat Comment: 'Dangos Sylw Sgwrsio Uwch'
-  Scroll to Bottom: 'Sgroliwch i''r Gwaelod'
+  Enable Live Chat: ''
+  Live Chat is currently not supported in this build.: ''
+  'Chat is disabled or the Live Stream has ended.': ''
+  Live chat is enabled. Chat messages will appear here once sent.: ''
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
+  Show Super Chat Comment: ''
+  Scroll to Bottom: ''
   Download Video: 'Lawrlwytho Fideo'
   video only: 'fideo yn unig'
   audio only: 'sain yn unig'
   Published:
-    In less than a minute: 'Mewn llai na munud'
-  Published on: 'Cyhoeddwyd ar'
-  Streamed on: 'Wedi''i ffrydio'
-  Started streaming on: 'Wedi dechrau ffrydio'
+    Jan: 'Ion'
+    Feb: 'Chw'
+    Mar: 'Maw'
+    Apr: 'Ebr'
+    May: 'Mai'
+    Jun: 'Meh'
+    Jul: 'Gor'
+    Aug: 'Awst'
+    Sep: 'Medi'
+    Oct: 'Hyd'
+    Nov: 'Tach'
+    Dec: 'Rhag'
+    Second: 'Eiliad'
+    Seconds: 'Eiliadau'
+    Minute: 'Munud'
+    Minutes: 'Munudau'
+    Hour: 'Awr'
+    Hours: 'Oriau'
+    Day: 'Diwrnod'
+    Days: 'Diwrnodau'
+    Week: 'Wythnos'
+    Weeks: 'Wythnosau'
+    Month: 'Mis'
+    Months: 'Misoedd'
+    Year: 'Blwyddyn'
+    Years: 'Blynyddoedd'
+    Ago: 'Yn ôl'
+    Upcoming: ''
+    In less than a minute: ''
+  Published on: ''
+  Streamed on: ''
+  Started streaming on: ''
+  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: 'Noddwr'
     intro: 'Cyflwyniad'
     outro: 'Diweddglo'
     self-promotion: 'Hunan-Hyrwyddo'
     interaction: 'Rhyngweithiad'
-    music offtopic: 'Music Offtopic'
+    music offtopic: ''
     recap: 'Crynhoi'
     filler: 'Dwli'
   External Player:
-    OpenInTemplate: 'Agor yn {externalPlayer}'
+    OpenInTemplate: ''
     video: 'fideo'
     playlist: 'rhestr chwarae'
-    OpeningTemplate: 'Yn agor {videoOrPlaylist} yn {externalPlayer}...'
-    UnsupportedActionTemplate: 'Nid yw {externalPlayer} yn cefnogi: {action}'
+    OpeningTemplate: ''
+    UnsupportedActionTemplate: ''
     Unsupported Actions:
-      starting video at offset: 'dechrau fideo wrth wrthbwyso'
-      setting a playback rate: 'gosod cyfradd chwarae yn ôl'
-      opening playlists: 'agor rhestrau chwarae'
-      opening specific video in a playlist (falling back to opening the video): 'agor
-        fideo penodol mewn rhestr chwarae (gan ddychwelyd i agor y fideo)'
-      reversing playlists: 'gwrthdroi rhestrau chwarae'
+      starting video at offset: ''
+      setting a playback rate: ''
+      opening playlists: ''
+      opening specific video in a playlist (falling back to opening the video): ''
+      reversing playlists: ''
       shuffling playlists: ''
       looping playlists: ''
 #& Videos
-  Player:
-    Take Screenshot: Tynnu Llun Sgrin
-  More Options: Rhagor o Ddewisiadau
-  AgeRestricted: Nid oes modd gwylio fideos â chyfyngiad oedran gyda FreeTube gan
-    fod angen mewngofnodi Google a defnyddio cyfrif YouTube a ddilysir yn ôl oedran
-    arnynt.
-  MembersOnly: Nid oes moddr gwylio fideos aelodau-yn-unig gyda FreeTube gan fod angen
-    mewngofnodi Google ac aelodaeth â thâl i sianel yr llwythwr.
-  Unlisted: Heb ei restru
-  IP block: Mae YouTube wedi rhwystro'ch cyfeiriad IP rhag gwylio fideos. Ceisiwch
-    newid i VPN neu ddirprwy arall.
 Videos:
   #& Sort By
   Sort By:
@@ -935,14 +697,15 @@ Playlist:
   #& About
   Playlist: 'Rhestr chwarae'
   View Full Playlist: ''
+  Videos: 'Fideos'
+  View: 'Edrychiad'
+  Views: 'Edrychiadau'
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
-  Sort By:
-    Sort By: Didoli Wrth
-    Custom: Cyfaddas
+Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -978,7 +741,7 @@ Chapters:
 Mini Player: ''
 Comments:
   Comments: 'Sylwadau'
-  Click to View Comments: 'Cliciwch i Weld Sylwadau'
+  Click to View Comments: ''
   Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Show Comments: 'Dangos Sylwadau'
@@ -1041,7 +804,9 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
+Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
@@ -1072,19 +837,3 @@ Hashtag:
 Yes: 'Ie'
 No: 'Na'
 Ok: 'Iawn'
-Search character limit: Mae'r ymholiad chwilio tu hwnt i {searchCharacterLimit} nod
-Cancel: Diddymu
-Search Listing:
-  Label:
-    Subtitles: Isdeitlau
-    New: Newydd
-    3D: 3D
-    4K: 4K
-    Closed Captions: Capsiynau Caeedig
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-Feed:
-  Feed Last Updated: 'Diweddarwyd llif {feedName} ddiwethaf: {date}'
-  Refresh Feed: Adnewyddu {subscriptionName}
-Close Banner: Cau'r Faner
diff --git a/static/locales/da.yaml b/static/locales/da.yaml
index ea8a04b386a0e..1819499a853a5 100644
--- a/static/locales/da.yaml
+++ b/static/locales/da.yaml
@@ -39,9 +39,7 @@ Global:
     View Count: 1 visning | {count} visninger
     Video Count: 1 video | {count} videoer
     Channel Count: 1 kanal | {count} kanaler
-    Comment Count: 1 kommentar | {count} kommentarer
   Community: Fællesskab
-  Live: Live
 Version {versionNumber} is now available!  Click for more details: 'Version {versionNumber}
   er nu tilgængelig!  Klik for flere detaljer'
 Download From Site: 'Hent Fra Netsted'
@@ -87,22 +85,13 @@ Search Filters:
 # Sidebar
   There are no more results for this search: Der er ikke flere resultater for denne
     søgning
-  Features:
-    Subtitles: Undertekster
-    HD: HD
-    3D: 3D
-    4K: 4K
-    Live: Live
-    HDR: HDR
-    Features: Funktioner
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Abonnenter'
   Latest Subscriptions: 'Seneste Abonnenter'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Din
-    Abonnementsliste er i øjeblikket tom. Hvis du vil importere dine abonnementer,
-    kan du gå til Dataindstillinger og vælge Importér Abonnementer, eller du kan søge
-    efter en kanal og abonnere på den.'
+    abonnentliste er i øjeblikket tom. Begynd at tilføje abonnenter for at se dem
+    her.'
   'Getting Subscriptions. Please wait.': 'Henter Abonnenter. Vent venligst.'
   Refresh Subscriptions: 'Opdatér Abonnenter'
   Load More Videos: Indlæs Flere Videoer
@@ -125,7 +114,13 @@ Most Popular: 'Mest Populære'
 Playlists: 'Playlister'
 User Playlists:
   Your Playlists: 'Dine Playlister'
-  Search bar placeholder: Søg efter Playlister
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Din
+    liste over gemte videoer er tom. Klik på gem-knappen i hjørnet af en video, for
+    at få den optegnet her
+  Playlist Message: Denne side afspejler ikke fuldt funktionelle playlister. Den optegner
+    blot videoer, som du har gemt eller favoriseret. Når arbejdet er færdigt, vil
+    alle videoer her blive flyttet til en 'Favoritter'-playliste.
+  Search bar placeholder: Søg i Playliste
   Empty Search Message: Der er ingen videoer i denne playliste, der passer til din
     søgning
   This playlist currently has no videos.: Denne playliste har i øjeblikket ingen videoer.
@@ -183,20 +178,14 @@ User Playlists:
       You haven't selected any playlist yet.: Du har ikke valgt nogen playliste endnu.
       "{videoCount} video(s) added to 1 playlist": 1 video tilføjet til 1 playliste
         | {videoCount} videoer tilføjet til 1 playliste
-    Added {count} Times: Allerede Tilføjet | Tilføjet {count} Gange
+    Added {count} Times: Tilføjet {count} Gang | Tilføjet {count} Gange
     Save: Gem
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
-      Videoer Bliver Tilføjet'
-    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
-      Videoer Allerede Tilføjet'
   CreatePlaylistPrompt:
     Toast:
       There was an issue with creating the playlist.: Der opstod et problem med at
         oprette denne playliste.
       There is already a playlist with this name. Please pick a different name.: En
         playliste med dette navn eksisterer allerede. Vælg venligst et andet navn.
-      Playlist {playlistName} has been successfully created.: Playlisten {playlistName}
-        blev oprettet.
     New Playlist Name: Ny Playliste Navn
     Create: Opret
   Move Video Down: Flyt Video Ned
@@ -207,12 +196,15 @@ User Playlists:
   Add to Favorites: Føj til {playlistName}
   Remove from Playlist: Fjern fra Playliste
   Playlist Name: Playliste Navn
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Er
+    du sikker på, at du vil fjerne alle sete videoer fra denne playliste? Dette kan
+    ikke fortrydes.
 History:
   # On History Page
   History: 'Historik'
   Watch History: 'Set Historik'
   Your history list is currently empty.: 'Din historikliste er i øjeblikket tom.'
-  Empty Search Message: Der er ingen videoer i din historik, som passer til din søgning
+  Empty Search Message: Der er ingen videoer i din historik som passer til din søgning
   Search bar placeholder: Søg i Historik
 Settings:
   # On Settings Page
@@ -242,6 +234,8 @@ Settings:
       End: 'Slutning'
       Blur: Slør
       Hidden: Skjult
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious-Instans
+      (Standard er https://invidious.snopyta.org)'
     Region for Trending: 'Område for Trending'
         #! List countries
     View all Invidious instance information: Vis al Invidious-instans-information
@@ -259,9 +253,6 @@ Settings:
     Current Invidious Instance: Nuværende Invidious-instans
     No default instance has been set: Ingen standardinstans er angivet
     Set Current Instance as Default: Angiv Nuværende Instans som Standard
-    Auto Load Next Page:
-      Label: Auto-indlæs Næste Side
-      Tooltip: Indlæs flere sider og kommentarer automatisk.
   Theme Settings:
     Theme Settings: 'Temaindstillinger'
     Match Top Bar with Main Color: 'Tilpas Topbjælke til Primær Farve'
@@ -397,13 +388,17 @@ Settings:
     Subscription Settings: 'Abonnementsindstillinger'
     Hide Videos on Watch: 'Skjul Videoer på Se'
     Fetch Feeds from RSS: 'Hent Feeds fra RSS'
+    Manage Subscriptions: 'Abonnementshåndtering'
+    Only Show Latest Video for Each Channel: Vis Kun Seneste Video for Hver Kanal
     Fetch Automatically: Hent Feed Automatisk
-    Confirm Before Unsubscribing: Bekræft Før Afmelding
   Data Settings:
     Data Settings: 'Dataindstillinger'
     Select Import Type: 'Vælg Importtype'
     Select Export Type: 'Vælg Eksporttype'
     Import Subscriptions: 'Importér Abonnementer'
+    Import FreeTube: 'Importér FreeTube'
+    Import YouTube: 'Importér YouTube'
+    Import NewPipe: 'Importér NewPipe'
     Export Subscriptions: 'Eksportér Abonnementer'
     Export FreeTube: 'Eksportér FreeTube'
     Export YouTube: 'Eksportér YouTube'
@@ -431,6 +426,7 @@ Settings:
     Unknown data key: 'Ukendt datanøgle'
     How do I import my subscriptions?: 'Hvordan importerer jeg mine abonnementer?'
     Manage Subscriptions: Abonnementshåndtering
+    Check for Legacy Subscriptions: Søg efter Gamle Abonnementer
     Export Playlists: Eksportér Playlister
     Playlist insufficient data: Utilstrækkelig data for "{playlist}" playliste, springer
       objektet over
@@ -441,6 +437,32 @@ Settings:
       succesfuldt
     History File: Historik-fil
     Playlist File: Playliste-fil
+  Advanced Settings:
+    Advanced Settings: 'Avancerede indstillinger'
+    Enable Debug Mode (Prints data to the console): 'Aktivér fejlretningstilstand
+      (udskriver data til konsollen)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy Adresse (eksempel:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Ved
+      at klikke på "TEST PROXY" -knappen sendes en anmodning til https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Brug Tor / Proxy til API opkald'
+    TEST PROXY: 'PRØVE PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Se offentlige Instances'
+    Clear History:
+      Clear History: 'Ryd historie'
+      # On Click
+      Are you sure you want to delete your history?: 'Er du sikker på, at du vil slette
+        din historik?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Ryd abonnementer'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Er du sikker på, at du
+        vil fjerne alle abonnementer?'
+      #& Yes
+      #& No
 
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: Fejl ved
@@ -553,6 +575,33 @@ About:
   #On About page
   About: 'Om'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Denne
+    copyleftede software er frit licenseret til AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Fundet en fejl? Vil du foreslå en funktion? Vil du hjælpe? Tjek vores GitHub-side.
+    Træk anmodninger velkommen.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Mange
+    tak til de mennesker og projekter, der gør FreeTube muligt!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Vil
+    du chatte? Deltag i vores Element / Matrix Server. Kontroller reglerne inden du
+    tilmelder dig.'
+
+  'Looking for help? Check out our Wiki page.': 'Leder du efter hjælp? Tjek vores
+    Wiki-side.'
+
+  Check out our Firefox extension!: 'Tjek vores Firefox-udvidelse!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Hvis
+    du kan lide at bruge FreeTube, kan du overveje at donere via Liberapay eller via
+    vores Bitcoin adresse.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Seneste FreeTube Nyheder'
+
   Donate: Donér
   these people and projects: disse mennesker og projekter
   FreeTube is made possible by: FreeTube er gjort mulig af
@@ -574,9 +623,10 @@ About:
   Help: Hjælp
   GitHub releases: GitHub-udgivelser
   Downloads / Changelog: Overførsler / Ændringslog
+  View License: Vis Licens
+  Licensed under the AGPLv3: Licenseret under AGPLv3
   Source code: Kildekode
   Beta: Beta
-  Discussions: Diskussioner
 Profile:
   Profile Select: 'Vælg Profil'
   All Channels: 'Alle Kanaler'
@@ -656,8 +706,6 @@ Channel:
     Channel Description: 'Kanalbeskrivelse'
     Featured Channels: 'Fremhævede Kanaler'
     Details: Detaljer
-    Tags:
-      Search for: Søg efter "{tag}"
   Community:
     Hide Answers: Skjul Svar
     This channel currently does not have any posts: Denne kanal har i øjeblikket ingen
@@ -673,12 +721,7 @@ Channel:
   Podcasts:
     This channel does not currently have any podcasts: Denne kanal har i øjeblikket
       ingen podcasts
-    Podcasts: Podcasts
   This channel does not exist: Denne kanal eksisterer ikke
-  Releases:
-    Releases: Udgivelser
-    This channel does not currently have any releases: Denne kanal har i øjeblikket
-      ingen udgivelser
 Video:
   Mark As Watched: 'Markér Som Set'
   Remove From History: 'Fjern Fra Historik'
@@ -714,7 +757,37 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Direkte
     Chat understøttes i øjeblikket ikke med Invidious-APIen.  Direkte forbindelse
     til YouTube kræves.'
+  Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Maj'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Dec'
+    Second: 'Sekund'
+    Seconds: 'Sekunder'
+    Minute: 'Minut'
+    Minutes: 'Minutter'
+    Hour: 'Time'
+    Hours: 'Timer'
+    Day: 'Dag'
+    Days: 'Dage'
+    Week: 'Uge'
+    Weeks: 'Uger'
+    Month: 'Måned'
+    Months: 'Måneder'
+    Year: 'År'
+    Years: 'År'
+    Ago: 'Siden'
+    Upcoming: 'Har premiere'
   Published on: 'Udgivet'
+  Publicationtemplate: '{number} {unit} siden'
 #& Videos
   Copy Invidious Channel Link: Kopiér Invidious Kanal-Link
   Open Channel in Invidious: Åbn Kanal i Invidious
@@ -763,15 +836,6 @@ Video:
   Upcoming: Kommende
   Scroll to Bottom: Rul til Bunden
   Pause on Current Video: Pause på Nuværende Video
-  Player:
-    Stats:
-      Video ID: 'Video-ID: {videoId}'
-      Media Formats: 'Medieformater: {formats}'
-      Resolution: 'Opløsning: {width}x{height}@{frameRate}'
-      Bandwidth: 'Båndbredde: {bandwidth} kbps'
-    Skipped segment: Sprang {segmentCategory} segment over
-    Playback will resume automatically when your connection comes back: Afspilning
-      genoptager automatisk, når din forbindelse vender tilbage.
 Videos:
   #& Sort By
   Sort By:
@@ -782,17 +846,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vis Hele Playliste'
+  Videos: 'Videoer'
+  View: 'Visning'
+  Views: 'Visninger'
   Last Updated On: 'Sidst Opdateret'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Playliste
-  Sort By:
-    DateAddedNewest: Seneste tilføjet først
-    VideoTitleDescending: Titel (Å-A)
-    VideoTitleAscending: Titel (A-Å)
-    Sort By: Sortér Efter
+Toggle Theatre Mode: 'Slå Biograftilstand til/fra'
 Change Format:
   Change Media Formats: 'Skift Videoformater'
   Use Dash Formats: 'Brug DASH-Formater'
@@ -854,6 +917,7 @@ Local API Error (Click to copy): 'Lokal API-Fejl (Klik for at kopiere)'
 Invidious API Error (Click to copy): 'Invidious-API-Fejl (Klik for at kopiere)'
 Falling back to Invidious API: 'Falder tilbage til Invidious-API'
 Falling back to Local API: 'Falder tilbage til den lokale API'
+Subscriptions have not yet been implemented: 'Abonnementer er endnu ikke blevet implementerede'
 Loop is now disabled: 'Gentagelse er nu deaktiveret'
 Loop is now enabled: 'Gentagelse er nu aktiveret'
 Shuffle is now disabled: 'Bland er nu deaktiveret'
@@ -909,7 +973,7 @@ Tooltips:
       kan blive angivet her hvis det er nødvendigt.
     DefaultCustomArgumentsTemplate: "(Standard: '{defaultCustomArguments}')"
     Custom External Player Arguments: Alle brugerdefinerede kommandolinjeargumenter,
-      du ønsker viderebragt til den eksterne afspiller.
+      opdelt med semikoloner (';'), du ønsker viderebragt til den eksterne afspiller.
     External Player: 'Valg af ekstern afspiller vil fremvise et ikon, for åbning af
       videoen (playliste hvis understøttet) i den eksterne afspiller, på miniaturebilledet.
       Advarsel: Invidious-indstillinger har ingen effekt på eksterne afspillere.'
@@ -930,6 +994,8 @@ Channels:
   Unsubscribe Prompt: Er du sikker på at du vil afmelde dit abonnement på "{channelName}"?
   Search bar placeholder: Søg Kanaler
   Empty: Din kanalliste er i øjeblikket tom.
+  Unsubscribe: Afmeld
+  Unsubscribed: '{channelName} er fjernet fra dine abonnementer'
 Default Invidious instance has been set to {instance}: Standard Invidious-instans
   er blevet sat til {instance}
 Default Invidious instance has been cleared: Standard Invidious-instans er blevet
@@ -941,6 +1007,8 @@ Downloading failed: Der var et problem med at downloade "{videoTitle}"
 Unknown YouTube url type, cannot be opened in app: Ukendt YouTube URL-type, kan ikke
   åbnes i appen
 Screenshot Error: Skærmbillede mislykkedes. {error}
+Hashtags have not yet been implemented, try again later: Hashtags er ikke implementeret
+  endnu, prøv igen senere
 External link opening has been disabled in the general settings: Åbning af eksterne
   links er slået fra i generelle indstillinger
 Starting download: Starter download af "{videoTitle}"
@@ -965,9 +1033,3 @@ Chapters:
 Age Restricted:
   This video is age restricted: Denne video er aldersbegrænset
   This channel is age restricted: Denne kanal er aldersbegrænset
-Search Listing:
-  Label:
-    Subtitles: Undertekster
-    4K: 4K
-Feed:
-  Refresh Feed: Opdater {subscriptionName}
diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 7f5f4cf07ba8e..11e0c250fd380 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -100,13 +100,12 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: Abos
   Latest Subscriptions: Neueste Abos
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Ihre
-    Aboliste ist derzeit leer. Wenn Sie Ihre Abos importieren möchten, können Sie
-    zu den Dateneinstellungen gehen und "Abos importieren" wählen oder Sie können
-    nach einem Kanal suchen und ihn abonnieren.
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Deine
+    Aboliste ist aktuell leer. Beginne mit dem Hinzufügen von Abos, um sie hier zu
+    sehen.
   'Getting Subscriptions.  Please wait.': Rufe Abonnements ab. Bitte warten.
   Refresh Subscriptions: Abos aktualisieren
-  Getting Subscriptions. Please wait.: Abos werden geladen. Bitte warten.
+  Getting Subscriptions. Please wait.: Abos werden geholt. Bitte warten.
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Dieses
     Profil hat eine große Anzahl von Abos.  RSS zur Vermeidung von Geschwindigkeitsbeschränkungen
     erzwingen
@@ -132,6 +131,13 @@ Most Popular: Am beliebtesten
 Playlists: Wiedergabelisten
 User Playlists:
   Your Playlists: Deine Wiedergabelisten
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Deine
+    gespeicherten Videos sind leer. Klicke auf die Schaltfläche „Speichern“ in der
+    Ecke eines Videos, damit es hier aufgelistet wird
+  Playlist Message: Diese Seite spiegelt nicht die vollständig funktionierenden Wiedergabelisten
+    wider. Sie listet nur Videos auf, die du gespeichert oder favorisiert hast. Wenn
+    die Arbeiten abgeschlossen sind, werden alle Videos, die sich derzeit hier befinden,
+    in eine Wiedergabeliste „Favoriten“ migriert.
   Search bar placeholder: Nach Wiedergabelisten suchen
   Empty Search Message: Es gibt keine Videos in dieser Wiedergabeliste, die deiner
     Suche entsprechen
@@ -191,6 +197,7 @@ User Playlists:
       This playlist does not exist: Diese Wiedergabeliste existiert nicht
       This playlist is now used for quick bookmark: Diese Wiedergabeliste wird jetzt
         für Schnelles Merken genutzt
+      Quick bookmark disabled: 'Schnelles Merken deaktiviert'
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Diese
         Wiedergabeliste wird jetzt für Schnelles Merken genutzt, statt {oldPlaylistName}.
         Klicke hier zum zurücksetzen
@@ -200,9 +207,6 @@ User Playlists:
         {playlistName} ist die neue Wiedergabeliste für schnelle Lesezeichen.
       This playlist is already being used for quick bookmark.: Diese Wiedergabeliste
         wird bereits für schnelle Lesezeichen verwendet.
-      This playlist has a video with a duration error: Diese Wiedergabeliste enthält
-        mindestens ein Video ohne Dauer. Daher wird die Wiedergabeliste so sortiert,
-        als ob die Dauer null wäre.
     Search for Videos: Nach Videos suchen
   AddVideoPrompt:
     N playlists selected: '{playlistCount} ausgewählt'
@@ -237,10 +241,14 @@ User Playlists:
         wurde erfolgreich erstellt.
   Create New Playlist: Neue Wiedergabeliste erstellen
   Remove from Playlist: Aus der Wiedergabeliste entfernen
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Bist
+    du sicher, dass du alle angesehenen Videos aus dieser Wiedergabeliste entfernen
+    möchtest? Dies kann nicht rückgängig gemacht werden.
   Add to Favorites: Hinzufügen zu {playlistName}
   Remove from Favorites: Löschen aus {playlistName}
   Enable Quick Bookmark With This Playlist: Schnelles Merken für diese Wiedergabeliste
     aktivieren
+  Disable Quick Bookmark: Schnelles Merken deaktivieren
   Playlists with Matching Videos: Wiedergabelisten mit passenden Videos
   Quick Bookmark Enabled: Schnelles Lesezeichen aktiviert
   Cannot delete the quick bookmark target playlist.: Die Wiedergabeliste für das schnelle
@@ -256,9 +264,6 @@ User Playlists:
     möchten? Dies kann nicht rückgängig gemacht werden. | Sind Sie sicher, dass Sie
     {playlistItemCount} angesehene Videos aus dieser Wiedergabeliste entfernen möchten?
     Dies kann nicht rückgängig gemacht werden.
-  Export Playlist: Diese Wiedergabeliste exportieren
-  The playlist has been successfully exported: Die Wiedergabeliste wurde erfolgreich
-    exportiert
 History:
   # On History Page
   History: Verlauf
@@ -271,9 +276,9 @@ Settings:
   # On Settings Page
   Settings: Einstellungen
   General Settings:
-    General Settings: Allgemein
-    Fallback to Non-Preferred Backend on Failure: Bei Ausfall auf nicht bevorzugtes
-      Backend zurückgreifen
+    General Settings: Allgemeine Einstellungen
+    Fallback to Non-Preferred Backend on Failure: Falle zu nicht-präferiertem System
+      bei Fehlschlag zurück
     Enable Search Suggestions: Suchvorschläge aktivieren
     Default Landing Page: Standard Startseite
 
@@ -294,9 +299,11 @@ Settings:
       End: Ende
       Hidden: Versteckt
       Blur: Unschärfe
+    'Invidious Instance (Default is https://invidious.snopyta.org)': Invidious-Instanz
+      (Standard ist https://invidious.snopyta.org)
     Region for Trending: Region für Trends
         #! List countries
-    Check for Latest Blog Posts: Nach neuesten Blogeinträgen suchen
+    Check for Latest Blog Posts: Nach aktuellsten Blogeinträgen suchen
     Check for Updates: Auf Aktualisierungen prüfen
     View all Invidious instance information: Alle Informationen zur Invidious-Instanz
       anzeigen
@@ -317,10 +324,8 @@ Settings:
     Auto Load Next Page:
       Label: Nächste Seite automatisch laden
       Tooltip: Zusätzliche Seiten und Kommentare automatisch laden.
-    Open Deep Links In New Window: An FreeTube übergebene URLs in einem neuen Fenster
-      öffnen
   Theme Settings:
-    Theme Settings: Farbschema
+    Theme Settings: Farbschema-Einstellungen
     Match Top Bar with Main Color: Obere Leiste an Hauptfarbe anpassen
     Base Theme:
       Base Theme: Grundlegendes Farbschema
@@ -335,8 +340,6 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarisiert Dunkel
       Solarized Light: Solarisiert Hell
-      Gruvbox Light: Gruvbox Hell
-      Gruvbox Dark: Gruvbox Dunkel
     Main Color Theme:
       Main Color Theme: Hauptfarbe des Farbschemas
       Red: Rot
@@ -384,16 +387,6 @@ Settings:
       Solarized Cyan: Solarisiertes Cyan
       Solarized Violet: Solarisiertes Violett
       Solarized Green: Solarisiertes Grün
-      Gruvbox Dark Green: Gruvbox Dunkelgrün
-      Gruvbox Dark Yellow: Gruvbox Dunkelgelb
-      Gruvbox Dark Purple: Gruvbox Dunkellila
-      Gruvbox Light Red: Gruvbox Hellrot
-      Gruvbox Light Blue: Gruvbox Hellblau
-      Gruvbox Light Purple: Gruvbox Helllila
-      Gruvbox Dark Orange: Gruvbox Dunkelorange
-      Gruvbox Dark Aqua: Gruvbox dunkles Wasser
-      Gruvbox Light Orange: Gruvbox Hellorange
-      Gruvbox Dark Blue: Gruvbox Dunkelblau
     Secondary Color Theme: Sekundäres Farbschema
         #* Main Color Theme
     UI Scale: Skalierung der Benutzeroberfläche
@@ -402,7 +395,8 @@ Settings:
     Hide Side Bar Labels: Seitenleisten-Beschriftungen ausblenden
     Hide FreeTube Header Logo: FreeTube-Titellogo ausblenden
   Player Settings:
-    Player Settings: Videoabspieler
+    Player Settings: Videoabspieler-Einstellungen
+    Remember History: Verlauf speichern
     Play Next Video: Nächstes Video abspielen
     Turn on Subtitles by Default: Untertitel standardmäßig aktivieren
     Autoplay Videos: Videos automatisch abspielen
@@ -429,7 +423,7 @@ Settings:
       4k: 4k
       8k: 8k
     Playlist Next Video Interval: Zeit zwischen automatischer Videowiedergabe
-    Next Video Interval: Automatischer Wiedergabe-Timer
+    Next Video Interval: Intervall bis zum nächsten Video
     Display Play Button In Video Player: Wiedergabetaste im Videoabspieler anzeigen
     Scroll Volume Over Video Player: Lautstärke durch Scrollen auf Video ändern
     Fast-Forward / Rewind Interval: Intervall für schnelles Vor-/Zurückspulen
@@ -454,17 +448,50 @@ Settings:
         Unterordner zu erstellen.
     Enter Fullscreen on Display Rotate: Beim Drehen des Bildschirms zu Vollbild wechseln
     Skip by Scrolling Over Video Player: Überspringen durch Scrollen über den Videoabspieler
-    Autoplay Interruption Timer: Automatische Wiedergabe Unterbrechungs-Timer
   Subscription Settings:
-    Subscription Settings: Abo
+    Subscription Settings: Abo-Einstellungen
     Hide Videos on Watch: Videos bei Wiedergabe ausblenden
+    Subscriptions Export Format:
+      Subscriptions Export Format: Abonnement Exportierformat
+      #& Freetube
+      Newpipe: Newpipe
+      OPML: OPML
+    Manage Subscriptions: Abos verwalten
+    Import Subscriptions: Importiere Abonnements
+    Export Subscriptions: Exportiere Abonnements
+    How do I import my subscriptions?: Wie importiere ich meine Abonnements?
     Fetch Feeds from RSS: Feeds von RSS abrufen
     Fetch Automatically: Feed automatisch abrufen
+    Only Show Latest Video for Each Channel: Nur das neueste Video für jeden Kanal
+      anzeigen
     Confirm Before Unsubscribing: Unbeabsichtigtes Deabonnieren verhindern
+  Advanced Settings:
+    Advanced Settings: Erweiterte Einstellungen
+    Enable Debug Mode (Prints data to the console): Aktiviere Debug-Modus (Konsolenausgabe
+      des Programmes)
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy-Adresse (Beispiel:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': >-
+      Den "TESTE PROXY"-Knopf zu drücken, sendet eine Anfrage an https://ipinfo.io/json
+    Use Tor / Proxy for API calls: Nutze Tor / Proxy für API Aufrufe
+    TEST PROXY: TESTE PROXY
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: Zeige öffentliche Instanzen
+    Clear History:
+      Clear History: Lösche Verlauf
+      # On Click
+      Are you sure you want to delete your history?: Bist du sicher, dass du deinen
+        Verlauf löschen möchtest?
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: Lösche Abonnements
+      # On Click
+      Are you sure you want to remove all subscriptions?: Bist du sicher, dass du
+        deine Abonnements löschen möchtest?
+      #& Yes
+      #& No
 
-    'Limit the number of videos displayed for each channel': Die Anzahl der für jeden
-      Kanal angezeigten Videos begrenzen
-    To: Limitieren auf
   Privacy Settings:
     Watch history has been cleared: Wiedergabeverlauf wurde gelöscht
     Are you sure you want to remove your entire watch history?: Bist du sicher, dass
@@ -476,7 +503,7 @@ Settings:
     Clear Search Cache: Suchcache löschen
     Save Watched Progress: Videofortschritt speichern
     Remember History: Verlauf merken
-    Privacy Settings: Datenschutz
+    Privacy Settings: Datenschutzeinstellungen
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Bist
       du sicher, dass du alle Abos und Profile löschen möchtest?  Diese Aktion kann
       nicht rückgängig gemacht werden.
@@ -514,10 +541,14 @@ Settings:
     Export YouTube: YouTube exportieren
     Export FreeTube: FreeTube exportieren
     Export Subscriptions: Abos exportieren
+    Import NewPipe: Importiere NewPipe
+    Import YouTube: Importiere YouTube
+    Import FreeTube: Importiere FreeTube
     Import Subscriptions: Abos importieren
     Select Export Type: Exporttyp auswählen
     Select Import Type: Importtyp auswählen
-    Data Settings: Daten
+    Data Settings: Dateneinstellungen
+    Check for Legacy Subscriptions: Auf ältere Abos prüfen
     Manage Subscriptions: Abos verwalten
     Export Playlists: Wiedergabelisten exportieren
     Import Playlists: Wiedergabelisten importieren
@@ -548,7 +579,7 @@ Settings:
     Hide Comment Likes: Kommentarbewertungen ausblenden
     Hide Video Likes And Dislikes: Videobewertungen ausblenden
     Hide Video Views: Video-Aufrufe ausblenden
-    Distraction Free Settings: Ablenkungsfreier Modus
+    Distraction Free Settings: Einstellungen für ablenkungsfreien Modus
     Hide Active Subscriptions: Aktive Abos ausblenden
     Hide Playlists: Wiedergabelisten ausblenden
     Hide Comments: Kommentare ausblenden
@@ -561,9 +592,9 @@ Settings:
     Hide Channels Placeholder: Kanal-ID
     Display Titles Without Excessive Capitalisation: Titel ohne übermäßige Großschreibung
       und Zeichensetzung anzeigen
-    Hide Channel Playlists: 'Tab „Wiedergabelisten“ des Kanals ausblenden'
-    Hide Channel Community: 'Tab „Gemeinschaft“ des Kanals ausblenden'
-    Hide Channel Shorts: 'Tab „Kurzvideos“ des Kanals ausblenden'
+    Hide Channel Playlists: Kanal-Wiedergabelisten ausblenden
+    Hide Channel Community: Kanal-Gemeinschaft ausblenden
+    Hide Channel Shorts: Kanal-Kurzvideos ausblenden
     Hide Featured Channels: Hervorgehobene Kanäle ausblenden
     Sections:
       Side Bar: Seitenleiste
@@ -571,11 +602,12 @@ Settings:
       General: Allgemein
       Watch Page: Seite beobachten
       Subscriptions Page: Abos-Seite
-    Hide Channel Podcasts: 'Tab „Podcasts“ des Kanals ausblenden'
+    Hide Channel Podcasts: Kanal-Podcasts ausblenden
     Hide Subscriptions Videos: Abo-Videos ausblenden
     Hide Subscriptions Shorts: Abo-Kurzvideos ausblenden
-    Hide Channel Releases: 'Tab „Veröffentlichungen“ des Kanals ausblenden'
-    Hide Subscriptions Live: Abo-Live ausblenden
+    Hide Channel Releases: Kanalveröffentlichungen ausblenden
+    Hide Subscriptions Live: Live der Abos ausblenden
+    Blur Thumbnails: Vorschaubilder unscharf machen
     Hide Profile Pictures in Comments: Profilbilder in den Kommentaren ausblenden
     Hide Subscriptions Community: Abo-Gemeinschaft ausblenden
     Hide Channels Invalid: Kanal-ID war ungültig
@@ -584,12 +616,10 @@ Settings:
     Hide Channels Already Exists: Kanal-ID bereits vorhanden
     Hide Channels API Error: Fehler beim Abrufen von Benutzern mit der bereitgestellten
       ID. Bitte überprüfen Sie erneut, ob der Ausweis korrekt ist.
-    Hide Videos and Playlists Containing Text: Videos und Wiedergabelisten, die Text
-      enthalten, ausblenden
-    Hide Videos and Playlists Containing Text Placeholder: Wort, Wortfragment oder
-      Phrase
-    Hide Channel Home: 'Tab „Startseite“ des Kanals ausblenden'
-    Show Added Items: Hinzugefügte Elemente anzeigen
+    Hide Videos and Playlists Containing Text: Videos und Playlisten verstecken, die
+      Text enthalten
+    Hide Videos and Playlists Containing Text Placeholder: Wort, Teil eines Wortes
+      oder Satz
   The app needs to restart for changes to take effect. Restart and apply change?: Die
     App muss neu gestartet werden, damit die Änderungen wirksam werden. Neu starten
     und Änderung übernehmen?
@@ -608,19 +638,14 @@ Settings:
     Proxy Host: Proxy-Host
     Proxy Protocol: Proxy-Protokoll
     Enable Tor / Proxy: Tor / Proxy aktivieren
-    Proxy Settings: Proxy
-    Proxy Warning: FreeTube hat keinen eingebauten Proxy, kann aber mit einem externen
-      Proxy verbunden werden, wie z. B. einem, der auf deinem Rechner läuft wie Tor,
-      oder einem externen Proxy wie einem SOCKS5-Proxy, der von einigen VPNs bereitgestellt
-      wird. Falls aktiviert, stelle sicher, dass dein Proxy/Tor richtig konfiguriert
-      ist, oder FreeTube wird keine Daten abrufen können.
+    Proxy Settings: Proxy-Einstellungen
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Benachrichtigen, wenn ein Sponsorsegment
       übersprungen wird
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock-API-URL
       (Standard ist https://sponsor.ajay.app)
     Enable SponsorBlock: SponsorBlock aktivieren
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: SponsorBlock-Einstellungen
     Skip Options:
       Skip Option: Option überspringen
       Auto Skip: Automatisch überspringen
@@ -629,34 +654,34 @@ Settings:
       Do Nothing: Nichts tun
     Category Color: Kategoriefarbe
     UseDeArrowTitles: DeArrow-Videotitel verwenden
-    UseDeArrowThumbnails: DeArrow für Miniaturansichten verwenden
+    UseDeArrowThumbnails: Nutze DeArrow für Thumbnails
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': DeArrow
       Thumbnail Generator API URL (Standard ist https://dearrow-thumb.ajay.app)
   External Player Settings:
     Ignore Unsupported Action Warnings: Warnungen vor nicht unterstützten Aktionen
       ignorieren
     External Player: Externer Abspieler
-    External Player Settings: Externe Abspieler
+    External Player Settings: Einstellungen für externe Abspieler
     Custom External Player Executable: Benutzerdefinierte ausführbare Datei des Abspielers
     Custom External Player Arguments: Benutzerdefinierte Argumente für externe Abspieler
     Players:
       None:
         Name: Keine
-    Ignore Default Arguments: Standardargumente ignorieren
+    Ignore Default Arguments: Ignoriere Standardargument
   Download Settings:
-    Download Settings: Herunterladen
+    Download Settings: Herunterladen-Einstellungen
     Ask Download Path: Nach dem Herunterladepfad fragen
     Choose Path: Pfad auswählen
     Download Behavior: Herunterladeverhalten
     Download in app: In der App herunterladen
     Open in web browser: Im Webbrowser öffnen
   Parental Control Settings:
-    Parental Control Settings: Kindersicherung
+    Parental Control Settings: Einstellungen der Kindersicherung
     Hide Unsubscribe Button: Schaltfläche zum Entfernen des Abos ausblenden
     Show Family Friendly Only: Nur familienfreundliche Inhalte anzeigen
     Hide Search Bar: Suchleiste ausblenden
   Experimental Settings:
-    Experimental Settings: Experimentell
+    Experimental Settings: Experimentelle Einstellungen
     Warning: Diese Einstellungen sind experimentell und können zu Abstürzen führen,
       wenn sie aktiviert sind. Es wird dringend empfohlen, Sicherungskopien zu erstellen.
       Verwendung auf eigene Gefahr!
@@ -668,25 +693,64 @@ Settings:
     Unlock: Entsperren
   Password Settings:
     Remove Password: Passwort entfernen
-    Password Settings: Passwort
+    Password Settings: Passworteinstellungen
     Set Password To Prevent Access: Passwort festlegen, um den Zugriff auf die Einstellungen
       zu verhindern
     Set Password: Passwort festlegen
-  Sort Settings Sections (A-Z): Einstellungsabschnitte sortieren (A-Z)
-  Return to Settings Menu: Zurück zum Einstellungsmenü
+  Expand All Settings Sections: Alle Einstellungsabschnitte aufklappen
+  Sort Settings Sections (A-Z): Einstellungsbereiche sortieren (A-Z)
 About:
   #On About page
   About: Über
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0..': >-
+    Dieses Programm is unter der freien Lizent AGPL-3.0 veröffentlicht.
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Einen Programmfehler gefunden? Eine neue Funktion vorschlagen? Mithelfen? Schau
+    auf unserer GitHub-Seite vorbei. Änderungsvorschläge am Programmquelltext sind
+    dort willkommen.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: >-
+    Vielen Dank an all die Personen und Projekte die FreeTube möglich machen!
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': >-
+    Lust zu chatten? Tritt unserem Element- / Matrix-Server bei. Bitte lese zuvor
+    aber noch die Regeln.
+
+  'Looking for help? Check out our Wiki page.': Suchst Du nach Hilfe? Schaue auf unseren
+    Wiki vorbei.
+
+  Check out our Firefox extension!: Installiere auch unsere Firefox-Erweiterung!
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': >-
+    Falls du FreeTube gerne nutzt, erwäge doch das Spenden über Liberapay oder unsere
+    Bitcoinadresse.
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: Aktuellsten FreeTube-Neuigkeiten
+
 #On Channel Page
+  This software is FOSS and released under the GNU Affero General Public License v3.0.: Diese
+    freie Software ist unter der AGPL-3.0 lizenziert.
+  Translate via Weblate: Auf Weblate übersetzen
   Website: Website
+  Source Code: Quellcode
+  Release Notes: Versionshinweise
   Blog: Blog
   Credits: Danksagungen
   FAQ: Häufig gestellte Fragen
+  Wiki: Wiki
+  Report an Issue: Fehler melden
+  Channel Rules: Kanalregeln
   Email: E-Mail
+  License: Lizenz
   Beta: Beta
   Donate: Spenden
+  Useful Links: Nützliche Links
   Help: Hilfe
+  Contact: Kontakt
   these people and projects: diesen Menschen und Projekten
   FreeTube is made possible by: FreeTube wird ermöglicht von
   Translate: Übersetzen
@@ -701,6 +765,8 @@ About:
   FreeTube Wiki: FreeTube-Wiki
   GitHub releases: GitHub-Veröffentlichungen
   Downloads / Changelog: Downloads / Änderungsprotokoll
+  View License: Lizenz ansehen
+  Licensed under the AGPLv3: Lizenziert unter der AGPLv3
   Source code: Quellcode
   Discussions: Diskussionen
   Licensed under the: Lizenziert unter der
@@ -773,9 +839,6 @@ Channel:
     Releases: Veröffentlichungen
     This channel does not currently have any releases: Dieser Kanal hat derzeit keine
       Veröffentlichungen
-  Home:
-    Home: Startseite
-    View Playlist: Wiedergabeliste anzeigen
 Video:
   Open in YouTube: In YouTube öffnen
   Copy YouTube Link: YouTube-Link kopieren
@@ -800,8 +863,38 @@ Video:
     wird von der Invidious-API derzeit nicht unterstützt. Eine direkte Verbindung
     zu YouTube ist erforderlich.
   Published:
+    Jan: Jan
+    Feb: Feb
+    Mar: Mär
+    Apr: Apr
+    May: Mai
+    Jun: Jun
+    Jul: Jul
+    Aug: Aug
+    Sep: Sep
+    Oct: Okt
+    Nov: Nov
+    Dec: Dez
+    Second: Sekunde
+    Seconds: Sekunden
+    Hour: Stunde
+    Hours: Stunden
+    Day: Tag
+    Days: Tage
+    Week: Woche
+    Weeks: Wochen
+    Month: Monat
+    Months: Monate
+    Year: Jahr
+    Years: Jahre
+    Ago: vor
+    Upcoming: Premiere am
+    Minutes: Minuten
+    Minute: Minute
+    Less than a minute: Weniger als einer Minute
     In less than a minute: In weniger als einer Minute
   Published on: Veröffentlicht am
+  Publicationtemplate: vor {number} {unit}
 
 #& Videos
   Video has been removed from your history: Video wurde aus deinem Verlauf entfernt
@@ -889,23 +982,11 @@ Video:
       CodecsVideoAudioNoItags: 'Codecs: {videoCodec} / {audioCodec}'
     You appear to be offline: Sie scheinen offline zu sein.
     Playback will resume automatically when your connection comes back: Die Wiedergabe
-      wird automatisch fortgesetzt, wenn deine Verbindung wiederhergestellt ist.
+      wird automatisch wieder aufgenommen, wenn Ihre Verbindung zurückkommt.
     Skipped segment: 'Segment {segmentCategory} übersprungen'
     TranslatedCaptionTemplate: '{language} (übersetzt von {originalLanguage})'
     Exit Full Window: Vollständiges Fenster beenden
     Hide Stats: Statistiken ausblenden
-  IP block: YouTube hat Ihre IP-Adresse für die Videowiedergabe gesperrt. Bitte versuchen
-    Sie, zu einem anderen VPN oder Proxy zu wechseln.
-  Unlisted: Nicht gelistet
-  MembersOnly: Videos, die nur für Mitglieder bestimmt sind, können mit FreeTube nicht
-    angesehen werden, da sie einen Google-Login und eine kostenpflichtige Mitgliedschaft
-    im Kanal des Hochladers erfordern.
-  AgeRestricted: Videos mit Altersbeschränkung können mit FreeTube nicht angesehen
-    werden, da sie eine Google-Anmeldung und die Verwendung eines altersgeprüften
-    YouTube-Kontos erfordern.
-  DeArrow:
-    Show Modified Details: Geänderte Details anzeigen
-    Show Original Details: Originaldetails anzeigen
 Videos:
   #& Sort By
   Sort By:
@@ -916,6 +997,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: Vollständige Wiedergabeliste ansehen
+  Videos: Videos
+  View: Aufruf
+  Views: Aufrufe
   Last Updated On: Zuletzt aktualisiert am
   Playlist: Wiedergabeliste
 
@@ -931,8 +1015,7 @@ Playlist:
     AuthorDescending: Autor (Z-A)
     VideoTitleAscending: Titel (A-Z)
     Custom: Benutzerdefiniert
-    VideoDurationAscending: Dauer (Kürzeste zuerst)
-    VideoDurationDescending: Dauer (Längste zuerst)
+Toggle Theatre Mode: Kinomodus umschalten
 Change Format:
   Change Media Formats: Medienformate ändern
   Use Dash Formats: DASH-Formate verwenden
@@ -1005,6 +1088,7 @@ Falling back to Local API: Rückgriff auf lokale API
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Dieses
   Video ist aufgrund fehlender Formate nicht verfügbar. Zugriffsbeschränkungen im
   Land kann dafür der Grund sein.
+Subscriptions have not yet been implemented: Abos sind noch nicht implementiert
 Loop is now disabled: Wiederholung ist jetzt deaktiviert
 Loop is now enabled: Wiederholung ist jetzt aktiviert
 Shuffle is now disabled: Zufallswiedergabe ist jetzt deaktiviert
@@ -1060,7 +1144,7 @@ Profile:
   Subscription List: Abo-Liste
   Profile Select: Profilauswahl
   Profile Filter: Profilfilter
-  Profile Settings: Profil
+  Profile Settings: Profileinstellungen
   Toggle Profile List: Profilliste umschalten
   Profile Name: Profilname
   Edit Profile Name: Profilname bearbeiten
@@ -1091,9 +1175,6 @@ Tooltips:
     External Link Handling: "Wähle das Standardverhalten, wenn ein Link angeklickt
       wird, der nicht in FreeTube geöffnet werden kann.\nStandardmäßig wird FreeTube
       den angeklickten Link in deinem Standardbrowser öffnen.\n"
-    Open Deep Links In New Window: URLs die an FreeTube übergeben werden, z. B. durch
-      Redirect-Browser-Erweiterungen oder Befehlszeilenargumente, werden in einem
-      neuen Fenster geöffnet.
   Subscription Settings:
     Fetch Feeds from RSS: Wenn aktiviert, verwendet FreeTube RSS anstelle der Standardmethode,
       um deinen Abo-Feed abzurufen. RSS ist schneller und verhindert die IP-Blockierung,
@@ -1118,7 +1199,8 @@ Tooltips:
       zu springen, MPV-Stil.
   External Player Settings:
     Custom External Player Arguments: Alle benutzerdefinierten Befehlszeilenargumente,
-      die an den externen Abspieler übergeben werden sollen.
+      getrennt durch Semikolon (';'), die an den externen Abspieler übergeben werden
+      sollen.
     Ignore Warnings: Warnungen unterdrücken, wenn der aktuelle externe Abspieler die
       aktuelle Aktion nicht unterstützt (z. B. das Umkehren von Wiedergabelisten usw.).
     Custom External Player Executable: Standardmäßig wird FreeTube annehmen, dass
@@ -1152,13 +1234,14 @@ Tooltips:
   SponsorBlock Settings:
     UseDeArrowTitles: Videotitel durch von Benutzern eingereichte Titel von DeArrow
       ersetzen.
-    UseDeArrowThumbnails: Video-Miniaturansichten durch Miniaturansichten von DeArrow
-      ersetzen.
+    UseDeArrowThumbnails: Ersetze Video-Thumbnails mit Thumbnails von DeArrow.
 Playing Next Video Interval: Nächstes Video wird sofort abgespielt. Zum Abbrechen
   klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen
   klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen
   klicken.
 More: Mehr
+Hashtags have not yet been implemented, try again later: Hashtags wurden noch nicht
+  implementiert, bitte versuche es später noch einmal
 Unknown YouTube url type, cannot be opened in app: Unbekannter YouTube-URL-Typ, kann
   in der App nicht geöffnet werden
 Open New Window: Neues Fenster öffnen
@@ -1182,8 +1265,10 @@ Channels:
   Channels: Kanäle
   Title: Kanal-Liste
   Search bar placeholder: Kanäle durchsuchen
-  Count: '{number} Kanal/Kanäle gefunden.'
+  Count: '{number} Kanal/Kanäle gefunden'
   Empty: Deine Kanal-Liste ist derzeit leer.
+  Unsubscribe: Abo entfernen
+  Unsubscribed: '{channelName} wurde aus deinen Abos entfernt'
   Unsubscribe Prompt: Bist du sicher, dass du dein Abo für „{channelName}“ entfernen
     willst?
 Clipboard:
@@ -1196,7 +1281,6 @@ Chapters:
     aktuelles Kapitel: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Kapitelliste ausgeblendet,
     aktuelles Kapitel: {chapterName}'
-  Key Moments: Schlüsselmomente
 Preferences: Einstellungen
 Ok: OK
 Hashtag:
@@ -1227,33 +1311,12 @@ Feed:
 Yes, Delete: Ja, löschen
 Cancel: Abbrechen
 Search character limit: Die Suche ist länger als das {searchCharacterLimit}-Zeichen-Limit
-Yes, Restart: Ja, neu starten
+Yes, Restart: Ja, neustarten
 Yes, Open Link: Ja, Link öffnen
 Search Listing:
   Label:
     4K: 4K
     Closed Captions: Geschlossene Untertitel
     Subtitles: Untertitel
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Neu
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Das Öffnen einer potenziell unsicheren
   URL wurde blockiert: „{url}“.'
-Keys:
-  arrowdown: Pfeil nach unten
-  arrowleft: Pfeil nach links
-  arrowup: Pfeil nach oben
-  ctrl: Strg
-  alt: Alt
-  arrowright: Pfeil nach rechts
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Right-click or hold to see history: Mit der rechten Maustaste klicken oder halten,
-  um den Verlauf zu sehen
-Autoplay Interruption Timer: Automatische Wiedergabe wurde aufgrund von {autoplayInterruptionIntervalHours}
-  Stunden Inaktivität abgebrochen
-Description:
-  Collapse Description: Weniger anzeigen
-  Expand Description: '...mehr'
diff --git a/static/locales/el.yaml b/static/locales/el.yaml
index 5e57bc21595ce..03affc214f6dc 100644
--- a/static/locales/el.yaml
+++ b/static/locales/el.yaml
@@ -116,6 +116,13 @@ Most Popular: 'Δημοφιλέστερα'
 Playlists: 'Λίστες αναπαραγωγής'
 User Playlists:
   Your Playlists: 'Προσωπικές Λίστες αναπαραγωγής'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Τα
+    αποθηκευμένα βίντεο σας είναι κενά. Κάντε κλικ στο κουμπί αποθήκευσης στη γωνία
+    ενός βίντεο για να το εισάγετε εδώ
+  Playlist Message: Αυτή η σελίδα δεν αντικατοπτρίζει πλήρως λειτουργικές λίστες αναπαραγωγής.
+    Παραθέτει μόνο βίντεο που έχετε αποθηκεύσει ή προσθέσει στα αγαπημένα. Όταν ολοκληρωθεί
+    η εργασία, όλα τα βίντεο που βρίσκονται εδώ θα μεταφερθούν στη λίστα αναπαραγωγής
+    «Αγαπημένα».
   Search bar placeholder: Αναζήτηση στη λίστα αναπαραγωγής
   Empty Search Message: Δεν υπάρχουν βίντεο σε αυτήν τη λίστα αναπαραγωγής που να
     ταιριάζουν με την αναζήτησή σας
@@ -154,6 +161,8 @@ Settings:
       End: 'Τέλος'
       Hidden: Κρυμμένο
       Blur: 'Θάμπωμα'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Διακομιστής
+      Invidious (προεπιλογή https://invidious.snopyta.org)'
     Region for Trending: 'Περιοχή που καθορίζει την καρτέλα των τάσεων'
         #! List countries
     Check for Latest Blog Posts: Ελέγξτε για τις τελευταίες δημοσιεύσεις ιστολογίου
@@ -314,12 +323,18 @@ Settings:
     Subscription Settings: 'Ρυθμίσεις Συνδρομών'
     Hide Videos on Watch: 'Απόκρυψη των βίντεο κατά την αναπαραγωγή'
     Fetch Feeds from RSS: 'Φόρτωση τροφοδοσίας RSS'
+    Manage Subscriptions: 'Διαχείριση Εγγραφών'
     Fetch Automatically: Αυτόματη Λήψη Τροφοδοσίας
+    Only Show Latest Video for Each Channel: Εμφάνιση μόνο του τελευταίου βίντεο για
+      κάθε κανάλι
   Data Settings:
     Data Settings: 'Ρυθμίσεις Δεδομένων'
     Select Import Type: 'Επιλογή Τρόπου Εισαγωγής'
     Select Export Type: 'Επιλογή Τρόπου Εξαγωγής'
     Import Subscriptions: 'Εισαγωγή Συνδρομών'
+    Import FreeTube: 'Εισαγωγή από FreeTube'
+    Import YouTube: 'Εισαγωγή από το Youtube'
+    Import NewPipe: 'Εισαγωγή από το NewPipe'
     Export Subscriptions: 'Εξαγωγή Συνδρομών'
     Export FreeTube: 'Εξαγωγή για FreeTube'
     Export YouTube: 'Εξαγωγή για Youtube'
@@ -348,6 +363,7 @@ Settings:
     Unable to write file: 'Αδύνατη εγγραφή του αρχείου'
     Unknown data key: 'Άγνωστο κλειδί δεδομένων'
     How do I import my subscriptions?: 'Πως γίνεται η εισαγωγή των συνδρομών μου;'
+    Check for Legacy Subscriptions: Ελέγξτε για παλαιότερες εγγραφές
     Manage Subscriptions: Διαχείριση συνδρομών
     Import Playlists: Εισαγωγή λιστών αναπαραγωγής
     Export Playlists: Εξαγωγή Λιστών Αναπαραγωγής
@@ -360,6 +376,33 @@ Settings:
     Subscription File: Αρχείο Συνδρομής
     History File: Αρχείο Ιστορικού
     Playlist File: Αρχείο Λίστας Αναπαραγωγής
+  Advanced Settings:
+    Advanced Settings: 'Ρυθμίσεις για προχωρημένους'
+    Enable Debug Mode (Prints data to the console): 'Ενεργοποίηση λειτουργίας εντοπισμού
+      σφαλμάτων (Εκτυπώνει τα δεδομένα στην κονσόλα)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Διεύθυνση διακομιστή μεσολάβησης
+      (παράδειγμα: SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Κάνοντας
+      κλικ στο κουμπί "Δοκιμή διακομιστή μεσολάβησης" θα στείλετε μια αίτηση στο https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Χρήση Tor / Διακομιστής μεσολάβησης για κλήσεις
+      σε διεπαφή προγραμματισμού εφαρμογών (API)'
+    TEST PROXY: 'Δοκιμή Διακομιστή Μεσολάβησης'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Δείτε δημόσιους μεσολαβητές'
+    Clear History:
+      Clear History: 'Εκκαθάριση Ιστορικού'
+      # On Click
+      Are you sure you want to delete your history?: 'Είστε βέβαιοι πως θέλετε να
+        γίνει διαγραφή του ιστορικού σας ;'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Εκκαθάριση Συνδρομών/Εγγραφών'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Είστε βέβαιοι ότι θέλετε
+        να γίνει διαγραφή όλων των Συνδρομών/Εγγραφών;'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Distraction Free Settings: Ρυθμίσεις απόσπασης προσοχής
@@ -398,6 +441,7 @@ Settings:
     Hide Subscriptions Videos: Απόκρυψη Βίντεο Συνδρομών
     Hide Subscriptions Shorts: Απόκρυψη Shorts Συνδρομών
     Hide Subscriptions Live: Απόκρυψη Live Συνδρομών
+    Blur Thumbnails: Θάμπωμα Μικρογραφιών
     Hide Profile Pictures in Comments: Απόκρυψη Εικόνων Προφίλ στα Σχόλια
     Hide Subscriptions Community: Απόκρυψη Συνδρομών Κοινότητας
     Hide Channels Invalid: Το αναγνωριστικό καναλιού που δόθηκε δεν ήταν έγκυρο
@@ -482,10 +526,41 @@ Settings:
     Show Family Friendly Only: Εμφάνιση Μόνο Για Οικογένειες
     Hide Unsubscribe Button: Απόκρυψη Κουμπιού Απεγγραφής
     Hide Search Bar: Απόκρυψη Μπάρας Αναζήτησης
+  Expand All Settings Sections: Αναπτύξτε όλες τις ενότητες ρυθμίσεων
 About:
   #On About page
   About: 'Σχετικά με'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Αυτό
+    το ανοιχτό λογισμικό έχει άδεια χρήσης βάσει του AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Εντοπίσατε κάποιο σφάλμα ή μήπως θέλετε να προτείνετε κάποια περαιτέρω λειτουργία;
+    Θέλετε να συμβάλετε στο έργο μας; Ρίξτε μία ματιά στη σελίδα μας στο Github. Τα
+    αιτήματα για Pull Request είναι ευπρόσδεκτα.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Ένα
+    μεγάλο ευχαριστώ σε όλους τους ανθρώπους και τα έργα, που καθιστούν τη λειτουργία
+    του FreeTube εφικτή!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Θέλετε
+    μήπως να συζητήσετε; Μπορείτε να μας βρείτε στον δικό μας Element/Matrix Server.
+    Παρακαλώ ελέγξτε τους υπάρχοντες κανόνες πριν από την εγγραφή σας.'
+
+  'Looking for help? Check out our Wiki page.': 'Ψάχνετε για βοήθεια; Ελέγξτε την
+    σελίδα μας στο Wiki.'
+
+  Check out our Firefox extension!: 'Εγκαταστήστε την επέκταση μας για τον φυλλομετρητή
+    FIREFOX!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Εάν
+    σας αρέσει να χρησιμοποιείτε την εφαρμογή FreeTube, σκεφτείτε να κάνετε μία δωρεά
+    μέσω του Liberapay ή μέσω της διεύθυνσης Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Τελευταία νέα που αφορούν το FreeTube'
+
   Donate: Δωρεά
   these people and projects: αυτούς τους ανθρώπους και τα έργα
   FreeTube is made possible by: Το FreeTube καθίσταται δυνατό από
@@ -507,6 +582,8 @@ About:
   Help: Βοήθεια
   GitHub releases: Κυκλοφορίες GitHub
   Downloads / Changelog: Λήψεις / Αρχείο καταγραφής αλλαγών
+  View License: Προβολή άδειας
+  Licensed under the AGPLv3: Με άδεια βάσει του AGPLv3
   Source code: Πηγαίος κώδικας
   Beta: Βήτα
   Discussions: Συζητήσεις
@@ -664,8 +741,37 @@ Video:
     ζωντανή συνομιλία δεν υποστηρίζεται προς το παρόν με το Invidious API. Απαιτείται
     άμεση σύνδεση με το YouTube.'
   Published:
+    Jan: 'Ιαν'
+    Feb: 'Φεβ'
+    Mar: 'Μαρ'
+    Apr: 'Απρ'
+    May: 'Μάιος'
+    Jun: 'Ιουν'
+    Jul: 'Ιουλ'
+    Aug: 'Αυγ'
+    Sep: 'Σεπ'
+    Oct: 'Οκτ'
+    Nov: 'Νοε'
+    Dec: 'Δεκ'
+    Second: 'Δευτερόλεπτο'
+    Seconds: 'Δευτερόλεπτα'
+    Minute: 'Λεπτό'
+    Minutes: 'Λεπτά'
+    Hour: 'Ώρα'
+    Hours: 'Ώρες'
+    Day: 'Ημέρα'
+    Days: 'Ημέρες'
+    Week: 'Εβδομάδα'
+    Weeks: 'Εβδομάδες'
+    Month: 'Μήνας'
+    Months: 'Μήνες'
+    Year: 'Έτος'
+    Years: 'Χρόνια'
+    Ago: 'Πριν'
+    Upcoming: 'Κάνει πρεμιέρα στις'
     In less than a minute: Σε λιγότερο από ένα λεπτό
   Published on: 'Δημοσιεύθηκε στις'
+  Publicationtemplate: 'δημοσιεύθηκε πριν από {number} {unit}'
 #& Videos
   Starting soon, please refresh the page to check again: Έναρξη σύντομα, παρακαλούμε
     κάντε ανανέωση της σελίδας για επανέλεγχο
@@ -728,12 +834,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Προβολή πλήρους λίστας αναπαραγωγής'
+  Videos: 'Βίντεο'
+  View: 'Προβολή'
+  Views: 'Προβολές'
   Last Updated On: 'Τελευταία ενημέρωση στις'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Λίστα αναπαραγωγής
+Toggle Theatre Mode: 'Εναλλαγή λειτουργίας θεάτρου'
 Change Format:
   Change Media Formats: 'Αλλαγή μορφής του βίντεο'
   Use Dash Formats: 'Χρησιμοποίηση μορφών Dash'
@@ -802,6 +912,7 @@ Invidious API Error (Click to copy): 'Σφάλμα Διεπαφής προγρα
 Falling back to Invidious API: 'Επιστροφή στο Invidious API'
 Falling back to Local API: 'Επιστροφή στη τοπική Διεπαφή προγραμματισμού εφαρμογής
   (API)'
+Subscriptions have not yet been implemented: 'Οι συνδρομές δεν έχουν ακόμη υλοποιηθεί'
 Loop is now disabled: 'Η επανάληψη είναι πλέον απενεργοποιημένη'
 Loop is now enabled: 'Η επανάληψη έχει ενεργοποιηθεί'
 Shuffle is now disabled: 'Η τυχαία αναπαραγωγή είναι πλέον απενεργοποιημένη'
@@ -877,7 +988,8 @@ Tooltips:
       ρυθμίσεις δεν επηρεάζουν τις εξωτερικές συσκευές αναπαραγωγής.
     DefaultCustomArgumentsTemplate: "(Προεπιλογή: '{defaultCustomArguments}')"
     Custom External Player Arguments: Τυχόν προσαρμοσμένα ορίσματα γραμμής εντολών,
-      που θέλετε να μεταβιβαστούν στο εξωτερικό πρόγραμμα αναπαραγωγής.
+      διαχωρισμένα με ερωτηματικά (';'), που θέλετε να μεταβιβαστούν στο εξωτερικό
+      πρόγραμμα αναπαραγωγής.
   Experimental Settings:
     Replace HTTP Cache: Απενεργοποιεί το Electron's disk-based HTTP cache και ενεργοποιεί
       μια προσαρμοσμένη προσωρινή μνήμη εικόνων στη μνήμη. Θα οδηγήσει σε αυξημένη
@@ -898,6 +1010,8 @@ Playing Next Video Interval: Αναπαραγωγή επόμενου βίντε
   ακύρωση. | Αναπαραγωγή επόμενου βίντεο σε {nextVideoInterval} δευτερόλεπτα. Κάντε
   κλικ για ακύρωση.
 More: Περισσότερα
+Hashtags have not yet been implemented, try again later: Τα Hashtags δεν έχουν ακόμη
+  εφαρμοστεί, δοκιμάστε ξανά αργότερα
 Unknown YouTube url type, cannot be opened in app: Άγνωστος τύπος διεύθυνσης URL YouTube,
   δεν είναι δυνατό να ανοίξει στην εφαρμογή
 Search Bar:
@@ -917,8 +1031,10 @@ Channels:
   Channels: Κανάλια
   Title: Λίστα Καναλιών
   Search bar placeholder: Αναζήτηση Καναλιών
+  Unsubscribe: Απεγγραφή
   Count: '{number} κανάλι(α) βρέθηκαν.'
   Empty: Η λίστα καναλιών σας είναι άδεια.
+  Unsubscribed: '{channelName} αφαιρέθηκε από τις Συνδρομές σας'
   Unsubscribe Prompt: Θέλετε σίγουρα να απεγγραφείτε από το "{channelName}"?
 New Window: Νέο Παράθυρο
 Screenshot Error: 'Λήψη στιγμιότυπου απέτυχε. {error}'
diff --git a/static/locales/en-GB.yaml b/static/locales/en-GB.yaml
index edb3eb0de337e..0e21909dd26f0 100644
--- a/static/locales/en-GB.yaml
+++ b/static/locales/en-GB.yaml
@@ -107,9 +107,7 @@ Subscriptions:
   Subscriptions: 'Subscriptions'
   Latest Subscriptions: 'Latest subscriptions'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Your
-    Subscription list is currently empty. If you want to import your subscriptions
-    you can go to Data Settings and select Import Subscriptions or you can search
-    for a channel and subscribe to them.'
+    Subscription list is currently empty. Start adding subscriptions to see them here.'
   'Getting Subscriptions. Please wait.': 'Getting Subscriptions. Please wait.'
   Refresh Subscriptions: 'Refresh Subscriptions'
   Load More Videos: Load more videos
@@ -135,6 +133,12 @@ Most Popular: 'Most Popular'
 Playlists: 'Playlists'
 User Playlists:
   Your Playlists: 'Your playlists'
+  Playlist Message: This page is not reflective of fully working playlists. It only
+    lists videos that you have saved or made a Favourite. When the work has finished,
+    all videos currently here will be migrated to a ‘Favourites’ playlist.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Your
+    saved videos are empty. Click on the save button on the corner of a video to have
+    it listed here
   Search bar placeholder: Search for playlists
   Empty Search Message: There are no videos in this playlist that match your search
   Create New Playlist: Create new Playlist
@@ -170,10 +174,6 @@ User Playlists:
       This playlist is protected and cannot be removed.: This playlist is protected
         and cannot be removed.
       This playlist does not exist: This playlist does not exist
-
-      This playlist has a video with a duration error: This playlist contains at least
-        one video that doesn't have a duration, it will be sorted as if their duration
-        is zero.
       Playlist {playlistName} has been deleted.: Playlist {playlistName} has been
         deleted.
       Video has been removed: Video has been removed
@@ -189,6 +189,7 @@ User Playlists:
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: This
         playlist is now used for quick bookmark instead of {oldPlaylistName}. Click
         here to undo
+      Quick bookmark disabled: Quick bookmark disabled
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist {playlistName}
         is the new quick bookmark playlist.
       This playlist is already being used for quick bookmark.: This playlist is already
@@ -230,11 +231,15 @@ User Playlists:
   Remove from Playlist: Remove from playlist
   Copy Playlist: Copy playlist
   Remove Watched Videos: Remove watched videos
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Are
+    you sure you want to remove all watched videos from this playlist? This cannot
+    be undone.
   Are you sure you want to delete this playlist? This cannot be undone: Are you sure
     you want to delete this playlist? This cannot be undone.
   Add to Favorites: Add to {playlistName}
   Remove from Favorites: Remove from {playlistName}
   Enable Quick Bookmark With This Playlist: Enable quick bookmark with this playlist
+  Disable Quick Bookmark: Disable quick bookmark
   Playlists with Matching Videos: Playlists with matching videos
   Quick Bookmark Enabled: Quick bookmark enabled
   Cannot delete the quick bookmark target playlist.: Cannot delete the quick bookmark
@@ -248,9 +253,6 @@ User Playlists:
     you sure you want to remove 1 watched video from this playlist? This cannot be
     undone. | Are you sure you want to remove {playlistItemCount} watched videos from
     this playlist? This cannot be undone.
-  Export Playlist: Export This Playlist
-  The playlist has been successfully exported: The playlist has been successfully
-    exported
 History:
   # On History Page
   History: 'History'
@@ -263,7 +265,7 @@ Settings:
   # On Settings Page
   Settings: 'Settings'
   General Settings:
-    General Settings: 'General'
+    General Settings: 'General settings'
     Check for Updates: 'Check for updates'
     Check for Latest Blog Posts: 'Check for latest blog posts'
     Fallback to Non-Preferred Backend on Failure: 'Revert to non-preferred backend
@@ -287,10 +289,14 @@ Settings:
       End: 'End'
       Blur: Blur
       Hidden: Hidden
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
+      (Default is https://invidious.snopyta.org)'
     Region for Trending: 'Region for trending'
         #! List countries
     View all Invidious instance information: View all Invidious instance information
     System Default: System default
+    External Player: External Player
+    External Player Executable: Custom External Player Executable
     Clear Default Instance: Clear default instance
     Set Current Instance as Default: Set current instance as default
     Current instance will be randomized on startup: Current instance will be randomised
@@ -307,9 +313,8 @@ Settings:
     Auto Load Next Page:
       Label: Auto load next page
       Tooltip: Load additional pages and comments automatically.
-    Open Deep Links In New Window: Open URLs Passed to FreeTube in a New Window
   Theme Settings:
-    Theme Settings: 'Theme'
+    Theme Settings: 'Theme settings'
     Match Top Bar with Main Color: 'Match top bar with main colour'
     Base Theme:
       Base Theme: 'Base theme'
@@ -324,8 +329,6 @@ Settings:
       Nordic: Nordic
       Solarized Dark: Solarised Dark
       Solarized Light: Solarised Light
-      Gruvbox Dark: Gruvbox Dark
-      Gruvbox Light: Gruvbox Light
     Main Color Theme:
       Main Color Theme: 'Main colour theme'
       Red: 'Red'
@@ -373,16 +376,6 @@ Settings:
       Solarized Orange: Solarised Orange
       Solarized Blue: Solarised Blue
       Solarized Green: Solarised Green
-      Gruvbox Dark Green: Gruvbox Dark Green
-      Gruvbox Dark Yellow: Gruvbox Dark Yellow
-      Gruvbox Dark Blue: Gruvbox Dark Blue
-      Gruvbox Light Red: Gruvbox Light Red
-      Gruvbox Light Blue: Gruvbox Light Blue
-      Gruvbox Light Purple: Gruvbox Light Purple
-      Gruvbox Dark Purple: Gruvbox Dark Purple
-      Gruvbox Dark Aqua: Gruvbox Dark Aqua
-      Gruvbox Light Orange: Gruvbox Light Orange
-      Gruvbox Dark Orange: Gruvbox Dark Orange
     Secondary Color Theme: 'Secondary colour theme'
         #* Main Color Theme
     UI Scale: UI Scale
@@ -391,7 +384,7 @@ Settings:
     Hide Side Bar Labels: Hide side bar labels
     Hide FreeTube Header Logo: Hide FreeTube header logo
   Player Settings:
-    Player Settings: 'Player'
+    Player Settings: 'Player settings'
     Play Next Video: 'Play next video'
     Turn on Subtitles by Default: 'Turn on subtitles by default'
     Autoplay Videos: 'Autoplay Videos'
@@ -419,7 +412,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Playlist Next Video Interval
-    Next Video Interval: Autoplay Countdown Timer
+    Next Video Interval: Next video interval
     Display Play Button In Video Player: Display play button in video player
     Enter Fullscreen on Display Rotate: Enter fullscreen on display rotate
     Fast-Forward / Rewind Interval: Fast-forward / rewind interval
@@ -442,9 +435,8 @@ Settings:
       Ask Path: Ask for Save Folder
       File Name Label: Filename pattern
     Skip by Scrolling Over Video Player: Skip by scrolling over video player
-    Autoplay Interruption Timer: Autoplay Interruption Timer
   External Player Settings:
-    External Player Settings: External Player
+    External Player Settings: External Player Settings
     External Player: External Player
     Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
     Ignore Default Arguments: Ignore Default Arguments
@@ -454,7 +446,7 @@ Settings:
       None:
         Name: None
   Privacy Settings:
-    Privacy Settings: 'Privacy'
+    Privacy Settings: 'Privacy Settings'
     Remember History: 'Remember History'
     Save Watched Progress: 'Save Watched Progress'
     Clear Search Cache: 'Clear Search Cache'
@@ -476,19 +468,21 @@ Settings:
     Are you sure you want to remove all your playlists?: Are you sure you want to
       remove all your playlists?
   Subscription Settings:
-    Subscription Settings: 'Subscription'
+    Subscription Settings: 'Subscription Settings'
     Hide Videos on Watch: 'Hide Videos on Watch'
     Fetch Feeds from RSS: 'Fetch feeds from RSS'
+    Manage Subscriptions: 'Manage subscriptions'
     Fetch Automatically: Fetch feed automatically
+    Only Show Latest Video for Each Channel: Only show latest video for each channel
     Confirm Before Unsubscribing: Confirm before unsubscribing
-    'Limit the number of videos displayed for each channel': Limit the number of videos
-      displayed for each channel
-    To: To
   Data Settings:
-    Data Settings: 'Data'
+    Data Settings: 'Data settings'
     Select Import Type: 'Select import type'
     Select Export Type: 'Select export type'
     Import Subscriptions: 'Import subscriptions'
+    Import FreeTube: 'Import FreeTube'
+    Import YouTube: 'Import YouTube'
+    Import NewPipe: 'Import NewPipe'
     Export Subscriptions: 'Export Subscriptions'
     Export FreeTube: 'Export FreeTube'
     Export YouTube: 'Export YouTube'
@@ -516,6 +510,7 @@ Settings:
     Unable to write file: 'Unable to write file'
     Unknown data key: 'Unknown data key'
     How do I import my subscriptions?: 'How do I import my subscriptions?'
+    Check for Legacy Subscriptions: Check for Legacy subscriptions
     Manage Subscriptions: Manage Subscriptions
     Import Playlists: Import playlists
     Export Playlists: Export playlists
@@ -536,6 +531,32 @@ Settings:
         all of your existing playlists using the Remove All playlists option under
         Privacy settings.\n3. Launch the older version of FreeTube and import the
         exported playlists.’"
+  Advanced Settings:
+    Advanced Settings: 'Advanced Settings'
+    Enable Debug Mode (Prints data to the console): 'Enable Debug Mode (Prints data
+      to the console)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy Address (Example:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Clicking
+      ‘TEST PROXY’ button will send a request to https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Use Tor / Proxy for API calls'
+    TEST PROXY: 'TEST PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'See Public Instances'
+    Clear History:
+      Clear History: 'Clear History'
+      # On Click
+      Are you sure you want to delete your history?: 'Are you sure you want to delete
+        your history?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Clear Subscriptions'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Are you sure you want to
+        remove all subscriptions?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Hide Live Chat
@@ -547,7 +568,7 @@ Settings:
     Hide Video Likes And Dislikes: Hide Video Likes And Dislikes
     Hide Video Views: Hide Video Views
     Hide Active Subscriptions: Hide Active Subscriptions
-    Distraction Free Settings: Distraction Free
+    Distraction Free Settings: Distraction Free Settings
     Hide Playlists: Hide Playlists
     Hide Comments: Hide comments
     Hide Video Description: Hide video description
@@ -560,17 +581,17 @@ Settings:
     Display Titles Without Excessive Capitalisation: Display titles without excessive
       capitalisation and punctuation
     Hide Featured Channels: Hide featured channels
-    Hide Channel Playlists: Hide channel "playlists" tab
-    Hide Channel Community: Hide channel "community" tab
-    Hide Channel Shorts: Hide channel "shorts" tab
+    Hide Channel Playlists: Hide channel playlists
+    Hide Channel Community: Hide channel community
+    Hide Channel Shorts: Hide channel shorts
     Sections:
       Side Bar: Side bar
       General: General
       Channel Page: Channel Page
       Watch Page: Watch Page
       Subscriptions Page: Subscriptions page
-    Hide Channel Podcasts: Hide channel "podcasts" tab
-    Hide Channel Releases: Hide channel "releases" tab
+    Hide Channel Podcasts: Hide channel podcasts
+    Hide Channel Releases: Hide channel releases
     Hide Subscriptions Shorts: Hide subscriptions shorts
     Hide Subscriptions Live: Hide subscriptions live
     Hide Subscriptions Videos: Hide subscriptions videos
@@ -586,7 +607,6 @@ Settings:
       phrase
     Hide Videos and Playlists Containing Text: Hide videos and playlists containing
       text
-    Hide Channel Home: Hide Channel "Home" Tab
   The app needs to restart for changes to take effect. Restart and apply change?: The
     app needs to restart for changes to take effect. Do you want to restart and apply
     the changes?
@@ -605,17 +625,13 @@ Settings:
     Proxy Host: Proxy Host
     Proxy Protocol: Proxy Protocol
     Enable Tor / Proxy: Enable Tor / Proxy
-    Proxy Settings: Proxy
-    Proxy Warning: FreeTube doesn't have a built-in proxy but can connect to an external
-      proxy, such as one running on your machine like Tor or an external proxy such-as
-      a SOCKS5 proxy provided by some VPNs. If enabled, make sure your proxy/Tor is
-      configured properly, or FreeTube won't be able to fetch any data.
+    Proxy Settings: Proxy Settings
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notify when sponsor segment is skipped
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       Url (Default is https://sponsor.ajay.app)
     Enable SponsorBlock: Enable SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: SponsorBlock Settings
     Skip Options:
       Skip Option: Skip option
       Auto Skip: Auto skip
@@ -628,7 +644,7 @@ Settings:
       Thumbnail Generator API URL (Default is https://dearrow-thumb.ajay.app)
     UseDeArrowThumbnails: Use DeArrow for thumbnails
   Download Settings:
-    Download Settings: Download
+    Download Settings: Download Settings
     Ask Download Path: Ask for download path
     Choose Path: Choose path
     Download Behavior: Download behaviour
@@ -636,12 +652,12 @@ Settings:
     Download in app: Download in app
   Parental Control Settings:
     Hide Unsubscribe Button: Hide Unsubscribe button
-    Parental Control Settings: Parental Control
+    Parental Control Settings: Parental control settings
     Show Family Friendly Only: Show family-friendly only
     Hide Search Bar: Hide search bar
   Experimental Settings:
     Replace HTTP Cache: Replace HTTP cache
-    Experimental Settings: Experimental
+    Experimental Settings: Experimental settings
     Warning: These settings are experimental, they may cause crashes while enabled.
       Making backups is highly recommended. Use at your own risk!
   Password Dialog:
@@ -652,21 +668,30 @@ Settings:
   Password Settings:
     Set Password To Prevent Access: Set a password to prevent access to settings
     Remove Password: Remove password
-    Password Settings: Password
+    Password Settings: Password settings
     Set Password: Set password
+  Expand All Settings Sections: Expand all settings sections
   Sort Settings Sections (A-Z): Sort settings sections (A-Z)
-  Return to Settings Menu: Return to Settings Menu
 About:
   #On About page
   About: About
+  Contact: Contact
   Help: Help
+  Useful Links: Useful Links
   Donate: Donate
   Beta: Beta
+  License: License
   Email: E-mail
+  Channel Rules: Channel Rules
+  Report an Issue: Report an Issue
+  Wiki: Wiki
   FAQ: FAQ
   Credits: Credits
   Blog: Blog
+  Release Notes: Release Notes
+  Source Code: Source Code
   Website: Website
+  Translate via Weblate: Translate via Weblate
 
   these people and projects: these people and projects
   FreeTube is made possible by: FreeTube is made possible by
@@ -681,12 +706,14 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub releases
   Downloads / Changelog: Downloads / Changelog
+  View License: View Licence
+  Licensed under the AGPLv3: Licensed under the AGPLv3
   Source code: Source code
   Discussions: Discussions
   Licensed under the: Licensed under the
   AGPLv3: AGPLv3
 Profile:
-  Profile Settings: Profile
+  Profile Settings: Profile Settings
   Profile Select: 'Profile Select'
   All Channels: 'All Channels'
   Profile Manager: 'Profile Manager'
@@ -714,6 +741,7 @@ Profile:
   '{profile} is now the active profile': '{profile} is now the active profile'
   Subscription List: 'Subscription List'
   Other Channels: 'Other Channels'
+  '{count} selected': '{count} selected'
   Select All: 'Select All'
   Select None: 'Select None'
   Delete Selected: 'Delete Selected'
@@ -803,9 +831,6 @@ Channel:
     Releases: Releases
     This channel does not currently have any releases: This channel does not currently
       have any releases
-  Home:
-    Home: Home
-    View Playlist: View Playlist
 Video:
   Mark As Watched: 'Mark As Watched'
   Remove From History: 'Remove From History'
@@ -842,8 +867,38 @@ Video:
     Chat is currently not supported with the Invidious API.  A direct connection to
     YouTube is required.'
   Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'May'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Oct'
+    Nov: 'Nov'
+    Dec: 'Dec'
+    Second: 'Second'
+    Seconds: 'Seconds'
+    Minute: 'Minute'
+    Minutes: 'Minutes'
+    Hour: 'Hour'
+    Hours: 'Hours'
+    Day: 'Day'
+    Days: 'Days'
+    Week: 'Week'
+    Weeks: 'Weeks'
+    Month: 'Month'
+    Months: 'Months'
+    Year: 'Year'
+    Years: 'Years'
+    Ago: 'Ago'
+    Upcoming: 'Premieres on'
+    Less than a minute: Less than a minute
     In less than a minute: In less than a minute
   Published on: 'Published on'
+  Publicationtemplate: '{number} {unit} ago'
 #& Videos
   Started streaming on: Started streaming on
   Streamed on: Streamed on
@@ -923,16 +978,6 @@ Video:
     Playback will resume automatically when your connection comes back: Playback will
       resume automatically when your connection comes back.
     Skipped segment: 'Skipped {segmentCategory} segment'
-  IP block: YouTube has blocked your IP address from watching videos. Please try switching
-    to a different VPN or proxy.
-  Unlisted: Unlisted
-  MembersOnly: Members-only videos cannot be watched with FreeTube as they require
-    Google login and paid membership to the uploader's channel.
-  AgeRestricted: Age-restricted videos cannot be watched with FreeTube as they require
-    Google login and using an age-verified YouTube account.
-  DeArrow:
-    Show Original Details: Show Original Details
-    Show Modified Details: Show Modified Details
 Videos:
   #& Sort By
   Sort By:
@@ -944,6 +989,9 @@ Playlist:
   #& About
   Playlist: Playlist
   View Full Playlist: 'View full playlist'
+  Videos: 'Videos'
+  View: 'View'
+  Views: 'Views'
   Last Updated On: 'Last updated on'
 
 # On Video Watch Page
@@ -958,8 +1006,7 @@ Playlist:
     AuthorAscending: Author (A-Z)
     AuthorDescending: Author (Z-A)
     VideoTitleAscending: Title (A-Z)
-    VideoDurationAscending: Duration (Shortest first)
-    VideoDurationDescending: Duration (Longest first)
+Toggle Theatre Mode: 'Toggle Theatre Mode'
 Change Format:
   Change Media Formats: 'Change Media Formats'
   Use Dash Formats: 'Use DASH Formats'
@@ -1019,15 +1066,13 @@ Comments:
   There are no comments available for this post: There are no comments available for
     this post
 Up Next: 'Up Next'
-Description:
-  Expand Description: '...more'
-  Collapse Description: Show less
 
 # Toast Messages
 Local API Error (Click to copy): 'Local API Error (Click to copy)'
 Invidious API Error (Click to copy): 'Invidious API Error (Click to copy)'
 Falling back to Invidious API: 'Falling back to Invidious API'
 Falling back to Local API: 'Falling back to Local API'
+Subscriptions have not yet been implemented: 'Subscriptions have not yet been implemented'
 Loop is now disabled: 'Loop is now disabled'
 Loop is now enabled: 'Loop is now enabled'
 Shuffle is now disabled: 'Shuffle is now disabled'
@@ -1081,8 +1126,6 @@ Tooltips:
     External Link Handling: "Choose the default behaviour when a link, which cannot
       be opened in FreeTube, is clicked.\nBy default FreeTube will open the clicked
       link in your default browser.\n"
-    Open Deep Links In New Window: URLs passed to FreeTube, such as by redirect browser
-      extensions or command line arguments, are opened in a new window.
   External Player Settings:
     External Player: Choosing an external player will display an icon, for opening
       the video (playlist if supported) in the external player, on the thumbnail.
@@ -1095,8 +1138,8 @@ Tooltips:
     Ignore Default Arguments: Do not send any default arguments to the external player
       aside from the video URL (e.g. playback rate, playlist URL, etc.). Custom arguments
       will still be passed on.
-    Custom External Player Arguments: Any custom command line arguments you want to
-      be passed on to the external player.
+    Custom External Player Arguments: Any custom command line arguments, separated
+      by semicolons (';'), you want to be passed to the external player.
     DefaultCustomArgumentsTemplate: '(Default: ‘{defaultCustomArguments}’)'
   Experimental Settings:
     Replace HTTP Cache: Disables Electron's disk-based HTTP cache and enables a custom
@@ -1118,6 +1161,8 @@ Playing Next Video Interval: Playing next video in no time. Click to cancel. | P
   next video in {nextVideoInterval} second. Click to cancel. | Playing next video
   in {nextVideoInterval} seconds. Click to cancel.
 More: More
+Hashtags have not yet been implemented, try again later: Hashtags have not yet been
+  implemented, try again later
 Unknown YouTube url type, cannot be opened in app: Unknown YouTube url type, cannot
   be opened in app
 Open New Window: Open New Window
@@ -1137,6 +1182,8 @@ Screenshot Success: Saved screenshot as ‘{filePath}’
 New Window: New window
 Channels:
   Empty: Your channel list is currently empty.
+  Unsubscribe: Unsubscribe
+  Unsubscribed: '{channelName} has been removed from your Subscriptions'
   Unsubscribe Prompt: Are you sure you want to Unsubscribe from ‘{channelName}’?
   Title: Channel list
   Search bar placeholder: Search channels
@@ -1151,7 +1198,6 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Chapters list hidden, current
     chapter: {chapterName}'
   Chapters: Chapters
-  Key Moments: Key Moments
 Clipboard:
   Copy failed: Copy to clipboard failed
   Cannot access clipboard without a secure connection: Cannot access clipboard without
@@ -1183,11 +1229,6 @@ Search Listing:
     4K: 4K
     Subtitles: Subtitles
     Closed Captions: Closed Captions
-    8K: 8K
-    3D: 3D
-    VR180: VR180
-    360 Video: 360°
-    New: New
 Search character limit: Search query is over the {searchCharacterLimit} character
   limit
 Feed:
@@ -1197,15 +1238,3 @@ Cancel: Cancel
 checkmark: ✓
 Display Label: '{label}: {value}'
 Moments Ago: moments ago
-Keys:
-  arrowup: Up Arrow
-  arrowleft: Left Arrow
-  arrowright: Right Arrow
-  ctrl: Ctrl
-  alt: Alt
-  arrowdown: Down Arrow
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Right-click or hold to see history: Right-click or hold to see history
-Autoplay Interruption Timer: Autoplay cancelled due to {autoplayInterruptionIntervalHours}
-  hours of inactivity
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 49d972440448b..143515e178c8e 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -29,7 +29,6 @@ Minimize: Minimize
 Close: Close
 Back: Back
 Forward: Forward
-Right-click or hold to see history: Right-click or hold to see history
 Open New Window: Open New Window
 Go to page: Go to {page}
 Close Banner: Close Banner
@@ -67,12 +66,7 @@ Search character limit: Search query is over the {searchCharacterLimit} characte
 Search Listing:
   Label:
     4K: 4K
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
     Subtitles: Subtitles
-    New: New
-    3D: 3D
     # Aria labels
     Closed Captions: Closed Captions
   # In Filter Button
@@ -131,7 +125,7 @@ Subscriptions:
   Latest Subscriptions: Latest Subscriptions
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: This
     profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Your Subscription list is currently empty. If you want to import your subscriptions you can go to Data Settings and select Import Subscriptions or you can search for a channel and subscribe to them.
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': Your Subscription list is currently empty. Start adding subscriptions to see them here.
   Disabled Automatic Fetching: You have disabled automatic subscription fetching. Refresh subscriptions to see them here.
   Empty Channels: Your subscribed channels currently does not have any videos.
   'Getting Subscriptions. Please wait.': Getting Subscriptions. Please wait.
@@ -147,6 +141,8 @@ Channels:
   Search bar placeholder: Search Channels
   Count: '{number} channel(s) found.'
   Empty: Your channel list is currently empty.
+  Unsubscribe: Unsubscribe
+  Unsubscribed: '{channelName} has been removed from your subscriptions'
   Unsubscribe Prompt: Are you sure you want to unsubscribe from "{channelName}"?
 Trending:
   Trending: Trending
@@ -162,6 +158,11 @@ Feed:
 Playlists: Playlists
 User Playlists:
   Your Playlists: Your Playlists
+  Playlist Message: This page is not reflective of fully working playlists. It only
+    lists videos that you have saved or favorited. When the work has finished, all
+    videos currently here will be migrated to a 'Favorites' playlist.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Your saved videos are empty. Click on the save button on the corner of a video to have
+    it listed here
   You have no playlists. Click on the create new playlist button to create a new one.: You have no playlists. Click on the create new playlist button to create a new one.
   Empty Search Message: There are no videos in this playlist that match your search
   Search bar placeholder: Search for Playlists
@@ -190,8 +191,6 @@ User Playlists:
   Remove Watched Videos: Remove Watched Videos
   Enable Quick Bookmark With This Playlist: Enable Quick Bookmark With This Playlist
   Quick Bookmark Enabled: Quick Bookmark Enabled
-  Export Playlist: Export This Playlist
-  The playlist has been successfully exported: The playlist has been successfully exported
   Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Are you sure you want to remove 1 duplicate video from this playlist? This cannot be undone. | Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone.
   Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Are you sure you want to remove 1 watched video from this playlist? This cannot be undone. | Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone.
   Delete Playlist: Delete Playlist
@@ -237,8 +236,6 @@ User Playlists:
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist {playlistName} is the new quick bookmark playlist.
 
       This playlist does not exist: This playlist does not exist
-
-      This playlist has a video with a duration error: This playlist contains at least one video that doesn't have a duration, it will be sorted as if their duration is zero.
   AddVideoPrompt:
     Select a playlist to add your N videos to: 'Select a playlist to add your video to | Select a playlist to add your {videoCount} videos to'
     N playlists selected: '{playlistCount} Selected'
@@ -273,18 +270,17 @@ History:
 Settings:
   # On Settings Page
   Settings: Settings
+  Expand All Settings Sections: Expand All Settings Sections
   Sort Settings Sections (A-Z): Sort Settings Sections (A-Z)
-  Return to Settings Menu: Return to Settings Menu
   The app needs to restart for changes to take effect. Restart and apply change?: The
     app needs to restart for changes to take effect. Restart and apply change?
   General Settings:
-    General Settings: General
+    General Settings: General Settings
     Check for Updates: Check for Updates
     Check for Latest Blog Posts: Check for Latest Blog Posts
     Fallback to Non-Preferred Backend on Failure: Fallback to Non-Preferred Backend
       on Failure
     Enable Search Suggestions: Enable Search Suggestions
-    Open Deep Links In New Window: Open URLs Passed to FreeTube in a New Window
     Auto Load Next Page:
       Label: Auto Load Next Page
       Tooltip: Load additional pages and comments automatically.
@@ -322,7 +318,7 @@ Settings:
       Ask Before Opening Link: Ask Before Opening Link
       No Action: No Action
   Theme Settings:
-    Theme Settings: Theme
+    Theme Settings: Theme Settings
     Match Top Bar with Main Color: Match Top Bar with Main Color
     Expand Side Bar by Default: Expand Side Bar by Default
     Disable Smooth Scrolling: Disable Smooth Scrolling
@@ -340,8 +336,6 @@ Settings:
       Pastel Pink: Pastel Pink
       Hot Pink: Hot Pink
       Nordic: Nordic
-      Gruvbox Dark: Gruvbox Dark
-      Gruvbox Light: Gruvbox Light
       Solarized Dark: Solarized Dark
       Solarized Light: Solarized Light
     Main Color Theme:
@@ -383,16 +377,6 @@ Settings:
       Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire
       Catppuccin Mocha Blue: Catppuccin Mocha Blue
       Catppuccin Mocha Lavender: Catppuccin Mocha Lavender
-      Gruvbox Dark Green: Gruvbox Dark Green
-      Gruvbox Dark Yellow: Gruvbox Dark Yellow
-      Gruvbox Dark Blue: Gruvbox Dark Blue
-      Gruvbox Dark Purple: Gruvbox Dark Purple
-      Gruvbox Dark Aqua: Gruvbox Dark Aqua
-      Gruvbox Dark Orange: Gruvbox Dark Orange
-      Gruvbox Light Red: Gruvbox Light Red
-      Gruvbox Light Blue: Gruvbox Light Blue
-      Gruvbox Light Purple: Gruvbox Light Purple
-      Gruvbox Light Orange: Gruvbox Light Orange
       Solarized Yellow: Solarized Yellow
       Solarized Orange: Solarized Orange
       Solarized Red: Solarized Red
@@ -404,7 +388,7 @@ Settings:
     Secondary Color Theme: Secondary Color Theme
         #* Main Color Theme
   Player Settings:
-    Player Settings: Player
+    Player Settings: Player Settings
     Play Next Video: Play Next Video
     Turn on Subtitles by Default: Turn on Subtitles by Default
     Autoplay Videos: Autoplay Videos
@@ -416,8 +400,7 @@ Settings:
     Skip by Scrolling Over Video Player: Skip by Scrolling Over Video Player
     Display Play Button In Video Player: Display Play Button In Video Player
     Enter Fullscreen on Display Rotate: Enter Fullscreen on Display Rotate
-    Next Video Interval: Autoplay Countdown Timer
-    Autoplay Interruption Timer: Autoplay Interruption Timer
+    Next Video Interval: Next Video Interval
     Fast-Forward / Rewind Interval: Fast-Forward / Rewind Interval
     Default Volume: Default Volume
     Default Playback Rate: Default Playback Rate
@@ -455,7 +438,7 @@ Settings:
         Forbidden Characters: Forbidden Characters
         Empty File Name: Empty File Name
   External Player Settings:
-    External Player Settings: External Player
+    External Player Settings: External Player Settings
     External Player: External Player
     Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
     Ignore Default Arguments: Ignore Default Arguments
@@ -465,7 +448,7 @@ Settings:
       None:
         Name: None
   Privacy Settings:
-    Privacy Settings: Privacy
+    Privacy Settings: Privacy Settings
     Remember History: Remember History
     Save Watched Progress: Save Watched Progress
     Save Watched Videos With Last Viewed Playlist: Save Watched Videos With Last Viewed Playlist
@@ -485,15 +468,15 @@ Settings:
     All playlists have been removed: All playlists have been removed
     Are you sure you want to remove all your playlists?: Are you sure you want to remove all your playlists?
   Subscription Settings:
-    Subscription Settings: Subscription
+    Subscription Settings: Subscription Settings
     Hide Videos on Watch: Hide Videos on Watch
     Fetch Feeds from RSS: Fetch Feeds from RSS
+    Manage Subscriptions: Manage Subscriptions
     Fetch Automatically: Fetch Feed Automatically
-    'Limit the number of videos displayed for each channel': 'Limit the number of videos displayed for each channel'
-    To: To
+    Only Show Latest Video for Each Channel: Only Show Latest Video for Each Channel
     Confirm Before Unsubscribing: Confirm Before Unsubscribing
   Distraction Free Settings:
-    Distraction Free Settings: Distraction Free
+    Distraction Free Settings: Distraction Free Settings
     Sections:
       Side Bar: Side Bar
       Subscriptions Page: Subscriptions Page
@@ -525,27 +508,26 @@ Settings:
     Hide Channels API Error: Error retrieving user with the ID provided. Please check again if the ID is correct.
     Hide Channels Already Exists: Channel ID already exists
     Hide Featured Channels: Hide Featured Channels
-    Hide Channel Playlists: Hide Channel "Playlists" Tab
-    Hide Channel Community: Hide Channel "Community" Tab
-    Hide Channel Home: Hide Channel "Home" Tab
-    Hide Channel Shorts: Hide Channel "Shorts" Tab
-    Hide Channel Podcasts: Hide Channel "Podcasts" Tab
-    Hide Channel Releases: Hide Channel "Releases" Tab
+    Hide Channel Playlists: Hide Channel Playlists
+    Hide Channel Community: Hide Channel Community
+    Hide Channel Shorts: Hide Channel Shorts
+    Hide Channel Podcasts: Hide Channel Podcasts
+    Hide Channel Releases: Hide Channel Releases
     Hide Videos and Playlists Containing Text: Hide Videos and Playlists Containing Text
     Hide Videos and Playlists Containing Text Placeholder: Word, Word Fragment, or Phrase
     Hide Subscriptions Videos: Hide Subscriptions Videos
     Hide Subscriptions Shorts: Hide Subscriptions Shorts
     Hide Subscriptions Live: Hide Subscriptions Live
     Hide Subscriptions Community: Hide Subscriptions Community
-    Show Added Items: Show Added Items
   Data Settings:
-    Data Settings: Data
+    Data Settings: Data Settings
     Select Import Type: Select Import Type
     Select Export Type: Select Export Type
     Import Subscriptions: Import Subscriptions
     Subscription File: Subscription File
     History File: History File
     Playlist File: Playlist File
+    Check for Legacy Subscriptions: Check for Legacy Subscriptions
     Export Subscriptions: Export Subscriptions
     Export FreeTube: Export FreeTube
     Export YouTube: Export YouTube
@@ -590,8 +572,7 @@ Settings:
     How do I import my subscriptions?: How do I import my subscriptions?
     Manage Subscriptions: Manage Subscriptions
   Proxy Settings:
-    Proxy Settings: Proxy
-    Proxy Warning: FreeTube doesn't have a built-in proxy but can connect to an external proxy, such as one running on your machine like Tor or an external proxy such-as a SOCKS5 proxy provided by some VPNs. If enabled, make sure your proxy/Tor is configured properly, or FreeTube won't be able to fetch any data.
+    Proxy Settings: Proxy Settings
     Enable Tor / Proxy: Enable Tor / Proxy
     Proxy Protocol: Proxy Protocol
     Proxy Host: Proxy Host
@@ -605,7 +586,7 @@ Settings:
     City: City
     Error getting network information. Is your proxy configured properly?: Error getting network information. Is your proxy configured properly?
   SponsorBlock Settings:
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: SponsorBlock Settings
     Enable SponsorBlock: Enable SponsorBlock
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API Url (Default is https://sponsor.ajay.app)
     Notify when sponsor segment is skipped: Notify when sponsor segment is skipped
@@ -620,19 +601,19 @@ Settings:
       Do Nothing: Do Nothing
     Category Color: Category Color
   Parental Control Settings:
-    Parental Control Settings: Parental Control
+    Parental Control Settings: Parental Control Settings
     Hide Unsubscribe Button: Hide Unsubscribe Button
     Show Family Friendly Only: Show Family Friendly Only
     Hide Search Bar: Hide Search Bar
   Download Settings:
-    Download Settings: Download
+    Download Settings: Download Settings
     Ask Download Path: Ask for download path
     Choose Path: Choose Path
     Download Behavior: Download Behavior
     Download in app: Download in app
     Open in web browser: Open in web browser
   Experimental Settings:
-    Experimental Settings: Experimental
+    Experimental Settings: Experimental Settings
     Warning: These settings are experimental, they may cause crashes while enabled. Making backups is highly recommended. Use at your own risk!
     Replace HTTP Cache: Replace HTTP Cache
   Password Dialog:
@@ -641,7 +622,7 @@ Settings:
     Password Incorrect: Password Incorrect
     Unlock: Unlock
   Password Settings:
-    Password Settings: Password
+    Password Settings: Password Settings
     Set Password To Prevent Access: Set a password to prevent access to settings
     Set Password: Set Password
     Remove Password: Remove Password
@@ -675,7 +656,7 @@ About:
   Donate: Donate
 
 Profile:
-  Profile Settings: Profile
+  Profile Settings: Profile Settings
   Toggle Profile List: Toggle Profile List
   Profile Select: Profile Select
   Profile Filter: Profile Filter
@@ -760,9 +741,6 @@ Channel:
       Last Video Added: Last Video Added
       Newest: Newest
       Oldest: Oldest
-  Home:
-    Home: Home
-    View Playlist: View Playlist
   Podcasts:
     Podcasts: Podcasts
     This channel does not currently have any podcasts: This channel does not currently have any podcasts
@@ -788,9 +766,6 @@ Channel:
     Video hidden by FreeTube: Video hidden by FreeTube
     Viewing Posts Only Supported By Invidious: Viewing Posts is only supported by Invidious. Head to a channel's community tab to view content there without Invidious.
 Video:
-  IP block: 'YouTube has blocked your IP address from watching videos. Please try switching to a different VPN or proxy.'
-  MembersOnly: Members-only videos cannot be watched with FreeTube as they require Google login and paid membership to the uploader's channel.
-  AgeRestricted: Age-restricted videos cannot be watched with FreeTube as they require Google login and using an age-verified YouTube account.
   More Options: More Options
   Mark As Watched: Mark As Watched
   Remove From History: Remove From History
@@ -826,7 +801,6 @@ Video:
   Premieres on: Premieres on
   Premieres: Premieres
   Upcoming: Upcoming
-  Unlisted: Unlisted
   Live: Live
   Live Now: Live Now
   Live Chat: Live Chat
@@ -847,13 +821,39 @@ Video:
   video only: video only
   audio only: audio only
   Published:
+    Jan: Jan
+    Feb: Feb
+    Mar: Mar
+    Apr: Apr
+    May: May
+    Jun: Jun
+    Jul: Jul
+    Aug: Aug
+    Sep: Sep
+    Oct: Oct
+    Nov: Nov
+    Dec: Dec
+    Second: Second
+    Seconds: Seconds
+    Minute: Minute
+    Minutes: Minutes
+    Hour: Hour
+    Hours: Hours
+    Day: Day
+    Days: Days
+    Week: Week
+    Weeks: Weeks
+    Month: Month
+    Months: Months
+    Year: Year
+    Years: Years
+    Ago: Ago
+    Upcoming: Premieres on
     In less than a minute: In less than a minute
   Published on: Published on
   Streamed on: Streamed on
   Started streaming on: Started streaming on
-  DeArrow:
-    Show Original Details: Show Original Details
-    Show Modified Details: Show Modified Details
+  Publicationtemplate: '{number} {unit} ago'
   Sponsor Block category:
     sponsor: Sponsor
     intro: Intro
@@ -916,6 +916,9 @@ Playlist:
   #& About
   Playlist: Playlist
   View Full Playlist: View Full Playlist
+  Videos: Videos
+  View: View
+  Views: Views
   Last Updated On: Last Updated On
   Sort By:
     Sort By: Sort By
@@ -925,13 +928,12 @@ Playlist:
     AuthorDescending: Author (Z-A)
     VideoTitleAscending: Title (A-Z)
     VideoTitleDescending: Title (Z-A)
-    VideoDurationAscending: Duration (Shortest first)
-    VideoDurationDescending: Duration (Longest first)
     Custom: Custom
 
 # On Video Watch Page
 #* Published
 #& Views
+Toggle Theatre Mode: Toggle Theatre Mode
 Change Format:
   Change Media Formats: Change Media Formats
   Use Dash Formats: Use DASH Formats
@@ -965,7 +967,6 @@ Clipboard:
 
 Chapters:
   Chapters: Chapters
-  Key Moments: Key Moments
   'Chapters list visible, current chapter: {chapterName}': 'Chapters list visible, current chapter: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Chapters list hidden, current chapter: {chapterName}'
 
@@ -1000,9 +1001,6 @@ Comments:
   Hearted: Hearted
 
 Up Next: Up Next
-Description:
-  Expand Description: ...more
-  Collapse Description: Show less
 
 #Tooltips
 Tooltips:
@@ -1022,8 +1020,6 @@ Tooltips:
     External Link Handling: |
       Choose the default behavior when a link, which cannot be opened in FreeTube, is clicked.
       By default FreeTube will open the clicked link in your default browser.
-    Open Deep Links In New Window: URLs passed to FreeTube, such as by redirect
-      browser extensions or command line arguments, are opened in a new window.
   Player Settings:
     Proxy Videos Through Invidious: Will connect to Invidious to serve videos instead
       of making a direct connection to YouTube.
@@ -1046,7 +1042,8 @@ Tooltips:
     Ignore Default Arguments: Do not send any default arguments to the external player
       aside from the video URL (e.g. playback rate, playlist URL, etc.).
       Custom arguments will still be passed on.
-    Custom External Player Arguments: Any custom command line arguments you want to be passed on to the external player.
+    Custom External Player Arguments: Any custom command line arguments, separated by semicolons (';'),
+      you want to be passed to the external player.
     DefaultCustomArgumentsTemplate: "(Default: '{defaultCustomArguments}')"
   Distraction Free Settings:
     Hide Channels: Enter a channel ID to hide all videos, playlists and the channel itself from appearing in search, trending, most popular and recommended.
@@ -1073,7 +1070,9 @@ Falling back to Local API: Falling back to Local API
 This video is unavailable because of missing formats. This can happen due to country unavailability.: This
   video is unavailable because of missing formats. This can happen due to country
   unavailability.
+Subscriptions have not yet been implemented: Subscriptions have not yet been implemented
 Unknown YouTube url type, cannot be opened in app: Unknown YouTube url type, cannot be opened in app
+Hashtags have not yet been implemented, try again later: Hashtags have not yet been implemented, try again later
 Loop is now disabled: Loop is now disabled
 Loop is now enabled: Loop is now enabled
 Shuffle is now disabled: Shuffle is now disabled
@@ -1085,7 +1084,6 @@ Playlist will not pause when current video is finished: Playlist will not pause
 Playlist will pause when current video is finished: Playlist will pause when current video is finished
 Playing Next Video Interval: Playing next video in no time. Click to cancel. | Playing next video in {nextVideoInterval} second. Click to cancel. | Playing next video in {nextVideoInterval} seconds. Click to cancel.
 Canceled next video autoplay: Canceled next video autoplay
-Autoplay Interruption Timer: Autoplay canceled due to {autoplayInterruptionIntervalHours} hours of inactivity
 
 Default Invidious instance has been set to {instance}: Default Invidious instance has been set to {instance}
 Default Invidious instance has been cleared: Default Invidious instance has been cleared
@@ -1122,12 +1120,3 @@ Cancel: Cancel
 checkmark: ✓
 # French is the only language that should change this (they have a space before the colon)
 Display Label: '{label}: {value}'
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Down Arrow
-  arrowleft: Left Arrow
-  arrowright: Right Arrow
-  arrowup: Up Arrow
diff --git a/static/locales/eo.yaml b/static/locales/eo.yaml
index 5fa981f8a190a..e3e94836f9100 100644
--- a/static/locales/eo.yaml
+++ b/static/locales/eo.yaml
@@ -98,6 +98,7 @@ Settings:
       Dark: 'Malluma'
       Light: 'Luma'
   Player Settings: {}
+  Advanced Settings: {}
 About:
   #On About page
   Blog: Blogo
diff --git a/static/locales/es-AR.yaml b/static/locales/es-AR.yaml
index 08b895302b525..ac0c5dd906a41 100644
--- a/static/locales/es-AR.yaml
+++ b/static/locales/es-AR.yaml
@@ -100,6 +100,13 @@ Most Popular: 'Más popular'
 Playlists: 'Listas de reproducción'
 User Playlists:
   Your Playlists: 'Tus listas de reproducción'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Tu
+    lista de videos guardados está vacía. Hacé clic en el botón de guardado en la
+    esquina de un video para que aparezca acá
+  Playlist Message: Esta página no refleja listas de reproducción completamente funcionales.
+    Solo lista los videos que guardaste o marcaste como favoritos. Cuando el trabajo
+    esté terminado, todos los videos que se encuentren acá serán migrados a una lista
+    de reproducción de 'Favoritos'.
   Search bar placeholder: Buscar en la Lista de Reproducción
   Empty Search Message: No hay videos en esta lista de reproducción que coincidan
     con tu búsqueda
@@ -140,6 +147,8 @@ Settings:
       Middle: 'Medio'
       End: 'Final'
       Hidden: Oculto
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
+      Invidious (por defecto es https://invidious.snopyta.org)'
     Region for Trending: 'Región para Tendencias'
         #! List countries
     View all Invidious instance information: Ver toda la información sobre la instancia
@@ -292,6 +301,7 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Configuraciones de suscripción'
     Hide Videos on Watch: 'Ocultar videos vistos'
+    Manage Subscriptions: 'Administrar suscripciones'
     Fetch Automatically: Obtener feed automáticamente
     Fetch Feeds from RSS: Obtener feeds desde RSS
   Data Settings:
@@ -299,12 +309,16 @@ Settings:
     Select Import Type: 'Seleccionar tipo de importación'
     Select Export Type: 'Seleccionar tipo para exportar'
     Import Subscriptions: 'Importar suscripciones'
+    Import FreeTube: 'Importar FreeTube'
+    Import YouTube: 'Importar Youtube'
+    Import NewPipe: 'Importar NewPipe'
     Export Subscriptions: 'Exportar suscripciones'
     Export FreeTube: 'Exportar Freetube'
     Export YouTube: 'Exportar Youtube'
     Export NewPipe: 'Exportar NewPipe'
     Import History: 'Importar historial'
     Export History: 'Exportar historial'
+    Check for Legacy Subscriptions: Comprobar suscripciones de legado
     All playlists has been successfully exported: Todas las listas de reproducción
       se han exportado con éxito
     Playlist File: Archivo de lista de reproducción
@@ -337,6 +351,7 @@ Settings:
     Unknown data key: Clave de datos desconocida
     This might take a while, please wait: Esto puede tardar un rato. Por favor, esperá
     Invalid history file: Archivo de historial no válido
+  Advanced Settings: {}
   Distraction Free Settings:
     Hide Active Subscriptions: Ocultar suscripciones activas
     Hide Live Chat: Ocultar chat en vivo
@@ -348,6 +363,7 @@ Settings:
     Hide Video Likes And Dislikes: Ocultar calificaciones del video
     Hide Video Views: Ocultar vistas del video
     Distraction Free Settings: Configuraciones para evitar distraerse
+    Blur Thumbnails: Desenfocar miniaturas
     Hide Channels Placeholder: Nombre o ID del canal
     Hide Video Description: Ocultar la descripción del vídeo
     Hide Chapters: Ocultar los capítulos
@@ -458,7 +474,9 @@ Channels:
   Channels: Canales
   Title: Lista de canales
   Empty: Tu lista de canales está actualmente vacía.
+  Unsubscribe: Desuscribirse
   Count: '{number} canal(es) encontrado(s).'
+  Unsubscribed: '{channelName} ha sido eliminado de tus suscripciones'
 Preferences: Preferencias
 Tooltips:
   Distraction Free Settings:
diff --git a/static/locales/es-MX.yaml b/static/locales/es-MX.yaml
index 0426058810b1b..753719906bda7 100644
--- a/static/locales/es-MX.yaml
+++ b/static/locales/es-MX.yaml
@@ -33,7 +33,6 @@ Global:
 
 # Search Bar
   Community: Comunidad
-  Live: En vivo
 Search / Go to URL: 'Buscar / Ir a la URL'
   # In Filter Button
 Search Filters:
@@ -69,9 +68,6 @@ Search Filters:
   Fetch more results: 'Obtener más resultados'
 # Sidebar
   There are no more results for this search: No hay más resultados para ésta búsqueda
-  Features:
-    Features: Características
-    Subtitles: Subtitulos
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Suscripciones'
@@ -101,6 +97,12 @@ User Playlists:
   Search bar placeholder: Buscar en la lista de reproducción
   Empty Search Message: No hay videos en esta lista de reproducción que coincidan
     con su búsqueda
+  Playlist Message: Esta página no muestra listas de reproducción funcionales. Únicamente
+    enlista videos que ha guardado o marcado en favoritos. Una vez terminado el proyecto,
+    todos los videos de aquí serán trasladados a la lista de 'Favoritos'.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Aún
+    no ha guardado videos. Haga clic en el botón de guardado en la esquina de cualquier
+    video para enlistarlo aquí
 History:
   # On History Page
   History: 'Historial'
@@ -132,6 +134,8 @@ Settings:
       Beginning: 'Comienzo'
       Middle: 'Medio'
       End: 'Fin'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
+      Invidious (por defecto es https://invidious.snopyta.org)'
     Region for Trending: 'Tendencia por región'
         #! List countries
     Check for Updates: Buscar actualizaciones
@@ -195,6 +199,7 @@ Settings:
     Hide Side Bar Labels: Ocultar etiquetas de la barra lateral
   Player Settings:
     Player Settings: 'Ajustes del reproductor'
+    Remember History: 'Recordar historial'
     Play Next Video: 'Reproducir el video siguiente'
     Turn on Subtitles by Default: 'Activar subtitulos por defecto'
     Autoplay Videos: 'Reproduccion automatica'
@@ -231,7 +236,42 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Ajustes de suscripción'
     Hide Videos on Watch: 'Ocultar videos vistos'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Formato de exportación de suscripciones'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Administrar suscripciones'
+    Import Subscriptions: 'Importa tus suscripciones'
+    Export Subscriptions: 'Exporta tus suscripciones'
+    How do I import my subscriptions?: '¿Cómo importo mis suscripciones?'
     Fetch Feeds from RSS: Buscar Información desde RSS
+  Advanced Settings:
+    Advanced Settings: 'Ajustes avanzados'
+    Enable Debug Mode (Prints data to the console): 'Activar modo de depuración (Muestra
+      datos en la consola)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Dirección de mascara (Ejemplo:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Presionando
+      el botón "PROBAR MASCARA" enviará una solicitud a https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Usar Tor / Mascara para las llamadas API'
+    TEST PROXY: 'PROBAR MASCARA'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Ver Instancias Públicas'
+    Clear History:
+      Clear History: 'Borrar Historial'
+      # On Click
+      Are you sure you want to delete your history?: '¿Está seguro de que desea eliminar
+        su historial?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Borrar Suscripciones'
+      # On Click
+      Are you sure you want to remove all subscriptions?: '¿Está seguro de que desea
+        eliminar todas las suscripciones?'
+      #& Yes
+      #& No
 
   Privacy Settings:
     Search cache has been cleared: Se ha borrado la caché de búsqueda
@@ -257,6 +297,9 @@ Settings:
     Export YouTube: Exportar YouTube
     Export FreeTube: Exportar FreeTube
     Export Subscriptions: Exportar Suscripciones
+    Import NewPipe: Importar NewPipe
+    Import YouTube: Importar YouTube
+    Import FreeTube: Importar FreeTube
     Import Subscriptions: Importar Suscripciones
     Select Export Type: Seleccionar tipo de exportación
     Select Import Type: Seleccionar tipo de importación
@@ -283,6 +326,7 @@ Settings:
       datos insuficientes, ignorando artículo
     Import Playlists: Importar listas de reproducción
     Export Playlists: Exportar listas de reproducción
+    Check for Legacy Subscriptions: Revisar suscripciones heredadas
     All playlists has been successfully exported: Todas sus listas de reproducción
       han sido exportadas con éxito
     All playlists has been successfully imported: Todas sus listas han sido importadas
@@ -341,13 +385,42 @@ About:
   #On About page
   About: 'Acerca de'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
+    software copylefted tiene licencia libre AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    ¿Encontraste un bug? ¿Quieres sugerir una nueva característica? ¿Quieres ayudar?
+    Visita nuestra página de Github. Las contribuciones son bienvenidas.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: '¡Muchas
+    gracias a las personas y proyectos que hacen posible FreeTube!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '¿Desea
+    chatear? Únete a nuestro servidor de Element / Matrix. Por favor revise las reglas
+    antes de unirse.'
+
+  'Looking for help? Check out our Wiki page.': '¿Buscando ayuda? Visite nuestra pagina
+    de Wiki.'
+
+  Check out our Firefox extension!: '¡Prueba nuestra extensión para Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Si
+    te gusta usar Free Tube, considera donar a través de Liberapay o a través de nuestra
+    dirección de Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Últimas noticias de FreeTube'
+
 #On Channel Page
   Blog: Blog
   Website: Sitio web
   Email: Correo electrónico
   Mastodon: Mastodon
   Source code: Código fuente
+  View License: Ver licencia
   Beta: Beta
+  Licensed under the AGPLv3: Bajo licencia de AGPLv3
   Downloads / Changelog: Descargas / Informe de cambios
   GitHub releases: Lanzamientos en GitHub
   Help: Ayuda
@@ -427,7 +500,37 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'El
     chat en vivo no esta soportado actualmente con la API de Invidious. Es necesaria
     una conexión directa a YouTube.'
+  Published:
+    Jan: 'Ene'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Abr'
+    May: 'May'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Ago'
+    Sep: 'Sep'
+    Oct: 'Oct'
+    Nov: 'Nov'
+    Dec: 'Dic'
+    Second: 'Segundo'
+    Seconds: 'Segundos'
+    Hour: 'Hora'
+    Hours: 'Horas'
+    Day: 'Dia'
+    Days: 'Dias'
+    Week: 'Semana'
+    Weeks: 'Semanas'
+    Month: 'Mes'
+    Months: 'Meses'
+    Year: 'Año'
+    Years: 'Años'
+    Ago: 'Hace'
+    Upcoming: 'Pronto en estreno'
+    Minutes: minutos
+    Minute: minuto
   Published on: 'Publicado en'
+  Publicationtemplate: 'Hace {number} {unit}'
 #& Videos
   Autoplay: Reproducción Automática
   Play Previous Video: Reproducir el video anterior
@@ -483,12 +586,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver lista de reproducción completa'
+  Videos: 'Videos'
+  View: 'Vista'
+  Views: 'Vistas'
   Last Updated On: 'Última actualización el'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Lista de reproducción
+Toggle Theatre Mode: 'Alternar modo teatro'
 Change Format:
   Change Media Formats: 'Cambia formatos de vídeo'
   Use Dash Formats: 'Usar formatos DASH'
@@ -549,6 +656,7 @@ Invidious API Error (Click to copy): 'Error de la API de Invidious (Presione par
   copiar)'
 Falling back to Invidious API: 'Recurriendo a la API de Invidious'
 Falling back to Local API: 'Recurriendo a la API local'
+Subscriptions have not yet been implemented: 'Las suscripciones aún no se han implementado'
 Loop is now disabled: 'El bucle esta desactivado'
 Loop is now enabled: 'El bucle esta activado'
 Shuffle is now disabled: 'La reproducción aleatoria se ha desactivada'
@@ -635,8 +743,8 @@ Tooltips:
       problema, FreeTube intentará usar automáticamente otra API como método de respaldo
       al activar esta opción.
   External Player Settings:
-    Custom External Player Arguments: Cualquier argumento, que deseé anticipar al
-      reproductor externo.
+    Custom External Player Arguments: Cualquier argumento, con separaciones de punto
+      y coma (';'), que deseé anticipar al reproductor externo.
     DefaultCustomArgumentsTemplate: "(Por defecto: '{defaultCustomArguments}')"
     External Player: Elegir un reproductor externo mostrará un ícono, para abrir el
       video (o lista, si es compatible) en el reproductor externo, sobre la miniatura
@@ -682,6 +790,8 @@ Default Invidious instance has been set to {instance}: La dirección de Invidiou
   se ha establecido en {instance}
 Unknown YouTube url type, cannot be opened in app: Tipo de URL de YouTube desconocida,
   imposible de abrir en la app
+Hashtags have not yet been implemented, try again later: Las etiquetas aún no han
+  sido implementadas, próximamente estarán en nuevas versiones
 Playing Next Video Interval: El próximo video se abrirá inmediatamente. Haga clic
   aquí para cancelar. | Se abrirá el siguiente video en {nextVideoInterval} segundo.
   Haga clic aquí para cancelar. | Se abrirá el siguiente video en {nextVideoInterval}
@@ -692,8 +802,3 @@ Channels:
   Channels: Canales
   Title: Lista de Canales
   Search bar placeholder: Buscar Canales
-Search Listing:
-  Label:
-    Subtitles: Subtítulos
-    New: Nuevo
-Go to page: Ir a {page}
diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index 0253d3ca37006..f036c6ab46dc2 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -2,8 +2,8 @@
 Locale Name: 'español (España)'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Esta parte de la aplicación aún no está lista. Vuelve más tarde cuando haya logrado
-  avances.
+  Esta parte de la aplicación aún no está lista. Vuelve más tarde cuando se hayan
+  hecho progresos.
 
 # Webkit Menu Bar
 File: 'Archivo'
@@ -102,9 +102,7 @@ Subscriptions:
   Subscriptions: 'Suscripciones'
   Latest Subscriptions: 'Últimas suscripciones'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Tu
-    lista de suscripciones está vacía. Si deseas importar tus suscripciones puedes
-    ir a Configuración de datos y seleccionar Importar suscripciones o puedes buscar
-    un canal y suscribirte.'
+    lista de suscripciones está vacía. Suscríbete a canales para verlos aquí.'
   'Getting Subscriptions. Please wait.': 'Obteniendo suscripciones. Por favor, espere.'
   Refresh Subscriptions: 'Recargar suscripciones'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Este
@@ -131,9 +129,17 @@ Most Popular: 'Más populares'
 Playlists: 'Listas de reproducción'
 User Playlists:
   Your Playlists: 'Tus listas de reproducción'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Tus
+    favoritos están vacíos. Haz clic en la estrella de cada vídeo para añadirlo aquí
+  Playlist Message: Esta página no refleja el estado final de las listas de reproducción,
+    solo muestra los vídeos guardados. En futuras actualizaciones, estos vídeos migrarán
+    a la lista de reproducción «Favoritos».
   Search bar placeholder: Buscar listas de reproducción
   Empty Search Message: No hay vídeos en esta lista de reproducción que coincidan
     con su búsqueda
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: ¿Estás
+    seguro de que quieres eliminar todos los vídeos vistos de esta lista de reproducción?
+    Esto no se puede deshacer.
   AddVideoPrompt:
     Search in Playlists: Buscar en listas de reproducción
     Save: Guardar
@@ -180,6 +186,7 @@ User Playlists:
       This video cannot be moved down.: Este vídeo no se puede bajar.
       This playlist is now used for quick bookmark: Esta lista de reproducción se
         utiliza ahora como marcador rápido
+      Quick bookmark disabled: Marcador rápido desactivado
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Esta
         lista de reproducción se utiliza ahora como marcador rápido en lugar de {oldPlaylistName}.
         Haga clic aquí para deshacer
@@ -189,9 +196,6 @@ User Playlists:
         ya se utiliza como marcador rápido.
       Playlist {playlistName} is the new quick bookmark playlist.: L lista de reproducción
         {playlistName} es la nueva lista de reproducción de marcadores rápidos.
-      This playlist has a video with a duration error: Esta lista de reproducción
-        contiene al menos un vídeo sin duración, se ordenará como si su duración fuera
-        cero.
     Search for Videos: Buscar vídeos
   Are you sure you want to delete this playlist? This cannot be undone: ¿Estás seguro
     de que quieres borrar esta lista de reproducción? Esto no se puede deshacer.
@@ -237,6 +241,7 @@ User Playlists:
   Remove from Favorites: Eliminar de {playlistName}
   Enable Quick Bookmark With This Playlist: Activar marcadores rápidos con esta lista
     de reproducción
+  Disable Quick Bookmark: Desactivar el marcador rápido
   Playlists with Matching Videos: Listas de reproducción con vídeos relacionados
   Quick Bookmark Enabled: Marcador rápido habilitado
   Cannot delete the quick bookmark target playlist.: No se puede eliminar la lista
@@ -250,8 +255,6 @@ User Playlists:
     seguro de que deseas eliminar 1 video duplicado de esta lista de reproducción?
     Esto no se puede deshacer. | ¿Estás seguro de que deseas eliminar {playlistItemCount}
     videos duplicados de esta lista de reproducción? Esto no se puede deshacer.
-  Export Playlist: Exportar esta Playlist
-  The playlist has been successfully exported: La playlist se ha exportado correctamente
 History:
   # On History Page
   History: 'Historial'
@@ -264,7 +267,7 @@ Settings:
   # On Settings Page
   Settings: 'Ajustes'
   General Settings:
-    General Settings: 'General'
+    General Settings: 'Ajustes generales'
     Fallback to Non-Preferred Backend on Failure: 'Vuelta al backend no preferido
       en caso de fallo'
     Enable Search Suggestions: 'Activar sugerencias de búsqueda'
@@ -286,6 +289,8 @@ Settings:
       End: 'Final'
       Hidden: Oculto
       Blur: Difuminar
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
+      Invidious (por defecto es https://invidious.snopyta.org)'
     Region for Trending: 'Región de las tendencias'
         #! List countries
     Check for Latest Blog Posts: Buscar últimas publicaciones del blog
@@ -310,9 +315,8 @@ Settings:
     Auto Load Next Page:
       Label: Carga automática de la página siguiente
       Tooltip: Cargar automáticamente páginas adicionales y comentarios.
-    Open Deep Links In New Window: Abrir URL pasadas a FreeTube en una nueva ventana
   Theme Settings:
-    Theme Settings: 'Tema'
+    Theme Settings: 'Configuración del tema'
     Match Top Bar with Main Color: 'Usar color principal para barra superior'
     Base Theme:
       Base Theme: 'Tema base'
@@ -327,8 +331,6 @@ Settings:
       Nordic: Nórdico
       Solarized Light: Solarized claro
       Solarized Dark: Solarized oscuro
-      Gruvbox Dark: Gruvbox oscuro
-      Gruvbox Light: Gruvbox claro
     Main Color Theme:
       Main Color Theme: 'Color principal'
       Red: 'Rojo'
@@ -376,16 +378,6 @@ Settings:
       Solarized Blue: Azul Solarized
       Solarized Cyan: Cian Solarized
       Solarized Green: Verde Solarized
-      Gruvbox Dark Green: Gruvbox verde oscuro
-      Gruvbox Dark Yellow: Gruvbox amarillo oscuro
-      Gruvbox Dark Blue: Gruvbox azul oscuro
-      Gruvbox Dark Purple: Gruvbox púrpura
-      Gruvbox Dark Aqua: Gruvbox aguamarina oscuro
-      Gruvbox Light Purple: Gruvbox violeta claro
-      Gruvbox Dark Orange: Gruvbox naranja oscuro
-      Gruvbox Light Red: Gruvbox rojo claro
-      Gruvbox Light Blue: Gruvbox azul claro
-      Gruvbox Light Orange: Gruvbox naranja claro
     Secondary Color Theme: 'Color secundario'
         #* Main Color Theme
     UI Scale: Escala de IU
@@ -394,7 +386,7 @@ Settings:
     Hide Side Bar Labels: Ocultar las etiquetas de la barra lateral
     Hide FreeTube Header Logo: Ocultar el logotipo de Freetube de la parte superior
   Player Settings:
-    Player Settings: 'Reproductor'
+    Player Settings: 'Configuración del reproductor'
     Play Next Video: 'Reproducción continua'
     Turn on Subtitles by Default: 'Activar subtítulos por defecto'
     Autoplay Videos: 'Reproducción automática de vídeos'
@@ -421,7 +413,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Intervalo de Siguiente Video en Playlist
-    Next Video Interval: Temporizador de cuenta atrás de reproducción automática
+    Next Video Interval: Siguiente segmento de vídeo
     Display Play Button In Video Player: Mostrar el botón de reproducción sobre el
       vídeo
     Scroll Volume Over Video Player: Cambiar el volumen con la rueda del ratón sobre
@@ -450,9 +442,8 @@ Settings:
     Enter Fullscreen on Display Rotate: Entrar en pantalla completa al girar la pantalla
     Skip by Scrolling Over Video Player: Omitir al desplazarse sobre el reproductor
       de vídeo
-    Autoplay Interruption Timer: Temporizador de interrupción de reproducción automática
   Privacy Settings:
-    Privacy Settings: 'Privacidad'
+    Privacy Settings: 'Ajustes de Privacidad'
     Remember History: 'Recordar historial'
     Save Watched Progress: 'Guardar progreso reproducido'
     Clear Search Cache: 'Borrar cache de búsqueda'
@@ -473,19 +464,22 @@ Settings:
     Are you sure you want to remove all your playlists?: ¿Estás seguro de que quieres
       eliminar todas tus listas de reproducción?
   Subscription Settings:
-    Subscription Settings: 'Suscripción'
+    Subscription Settings: 'Ajustes de Suscripciones'
     Hide Videos on Watch: 'Ocultar vídeos vistos'
     Fetch Feeds from RSS: 'Recuperar suministros desde RSS'
+    Manage Subscriptions: 'Gestionar suscripciones'
     Fetch Automatically: Obtener los feed automáticamente
+    Only Show Latest Video for Each Channel: Mostrar solo los últimos vídeos de cada
+      canal
     Confirm Before Unsubscribing: Evitar bajas accidentales
-    'Limit the number of videos displayed for each channel': Limitar el número de
-      vídeos mostrados para cada canal
-    To: A
   Data Settings:
-    Data Settings: 'Datos'
+    Data Settings: 'Ajustes de Datos'
     Select Import Type: 'Seleccionar tipo de importación'
     Select Export Type: 'Seleccionar tipo de exportación'
     Import Subscriptions: 'Importar suscripciones'
+    Import FreeTube: 'Importar FreeTube'
+    Import YouTube: 'Importar YouTube'
+    Import NewPipe: 'Importar NewPipe'
     Export Subscriptions: 'Exportar suscripciones'
     Export FreeTube: 'Exportar FreeTube'
     Export YouTube: 'Exportar YouTube'
@@ -513,6 +507,7 @@ Settings:
     Unable to write file: 'Imposible escribir el archivo'
     Unknown data key: 'Clave de datos desconocida'
     How do I import my subscriptions?: '¿Cómo puedo importar mis suscripciones?'
+    Check for Legacy Subscriptions: Comprobar suscripciones Legacy
     Manage Subscriptions: Administrar suscripciones
     Import Playlists: Importar listas de reproducción
     Export Playlists: Exportar listas de reproducción
@@ -534,6 +529,32 @@ Settings:
         listas de reproducción en Configuración de privacidad.\n3. Inicia la versión
         anterior de FreeTube e importa las listas de reproducción exportadas.\""
       Label: Exportar listas de reproducción de versiones anteriores de FreeTube
+  Advanced Settings:
+    Advanced Settings: 'Ajustes avanzados'
+    Enable Debug Mode (Prints data to the console): 'Activar modo de depuración (muestra
+      datos en la consola)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Dirección de máscara (Ejemplo:
+      SOCKS5://127.0.0.1:9050)'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Haciendo
+      click en "PROBAR MÁSCARA" se enviará una solicitud a https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Usa Tor / Máscara para llamadas API'
+    TEST PROXY: 'PROBAR MÁSCARA'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Ver instancias públicas'
+    Clear History:
+      Clear History: 'Borrar historial'
+      # On Click
+      Are you sure you want to delete your history?: '¿Seguro de que quieres borrar
+        el historial?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Borrar suscripciones'
+      # On Click
+      Are you sure you want to remove all subscriptions?: '¿Seguro de que quieres
+        borrar todas las suscripciones?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Video Likes And Dislikes: Ocultar «likes» y «dislikes» de vídeos
@@ -544,7 +565,7 @@ Settings:
     Hide Recommended Videos: Ocultar vídeos recomendados
     Hide Comment Likes: Ocultar «likes» de comentarios
     Hide Channel Subscribers: Ocultar suscriptores
-    Distraction Free Settings: Sin distracciones
+    Distraction Free Settings: Modo sin distracciones
     Hide Active Subscriptions: Ocultar suscripciones activas
     Hide Playlists: Ocultar listas de reproducción
     Hide Video Description: Ocultar la descripción del vídeo
@@ -558,21 +579,22 @@ Settings:
     Display Titles Without Excessive Capitalisation: Mostrar títulos sin mayúsculas
       ni signos de puntuación excesivos
     Hide Featured Channels: Ocultar canales recomendados
-    Hide Channel Playlists: Ocultar la pestaña "Listas de reproducción" del canal
-    Hide Channel Community: Ocultar la pestaña "Comunidad" del canal
-    Hide Channel Shorts: Ocultar la pestaña "Vídeos cortos" del canal
+    Hide Channel Playlists: Ocultar las listas de reproducción de los canales
+    Hide Channel Community: Ocultar canales de la comunidad
+    Hide Channel Shorts: Ocultar canales de shorts
     Sections:
       Side Bar: Barra lateral
       Channel Page: Página del canal
       Watch Page: Ver la página
       General: General
       Subscriptions Page: Página de suscripciones
-    Hide Channel Releases: Ocultar la pestaña "Lanzamientos" del canal
-    Hide Channel Podcasts: Ocultar la pestaña "Podcasts" del canal
+    Hide Channel Releases: Ocultar las nuevas publicaciones de los canales
+    Hide Channel Podcasts: Ocultar canales de podcasts
     Hide Subscriptions Shorts: Ocultar las suscripciones para shorts
     Hide Subscriptions Videos: Ocultar las suscripciones de los Vídeos
     Hide Subscriptions Live: Ocultar las suscripciones de los directos
     Hide Profile Pictures in Comments: Ocultar fotos de perfil en comentarios
+    Blur Thumbnails: Difuminar las miniaturas
     Hide Subscriptions Community: Ocultar las suscripciones de la comunidad
     Hide Channels Invalid: El ID del canal proporcionado no es válido
     Hide Channels Disabled Message: Algunos canales se bloquearon por ID y no se procesaron.
@@ -583,7 +605,6 @@ Settings:
     Hide Videos and Playlists Containing Text: Ocultar vídeos y listas de reproducción
       que contengan texto
     Hide Videos and Playlists Containing Text Placeholder: Palabra, fragmento o frase
-    Hide Channel Home: Ocultar la pestaña "Inicio" del canal
   The app needs to restart for changes to take effect. Restart and apply change?: ¿Quieres
     reiniciar FreeTube ahora para aplicar los cambios?
   Proxy Settings:
@@ -602,18 +623,13 @@ Settings:
     Proxy Protocol: Protocolo del proxy
     Enable Tor / Proxy: Activar Tor o «proxy»
     Proxy Settings: Proxy
-    Proxy Warning: FreeTube no tiene un proxy incorporado, pero puede conectarse a
-      un proxy externo, como uno que se ejecuta en su máquina como Tor o un proxy
-      externo como un proxy SOCKS5 proporcionado por algunas VPN. Si está habilitado,
-      asegúrese de que su proxy/Tor esté configurado correctamente, o FreeTube no
-      podrá recuperar ningún dato.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar cuando se salta un segmento
       de patrocinio
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL de la API de
       SponsorBlock (por defecto es https://sponsor.ajay.app)
     Enable SponsorBlock: Activar SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Ajustes de SponsorBlock
     Category Color: Color de categoría
     Skip Options:
       Show In Seek Bar: Mostrar en la barra de búsqueda
@@ -631,13 +647,13 @@ Settings:
     Custom External Player Executable: Ruta alternativa del ejecutable del reproductor
     Ignore Unsupported Action Warnings: Omitir advertencias sobre acciones no soportadas
     External Player: Reproductor externo
-    External Player Settings: Reproductor externo
+    External Player Settings: Ajustes de reproductor externo
     Players:
       None:
         Name: Ninguno
     Ignore Default Arguments: Ignorar argumentos por defecto
   Download Settings:
-    Download Settings: Descargar
+    Download Settings: Descargas
     Ask Download Path: Preguntar ruta de descarga
     Choose Path: Elegir ruta
     Download in app: Descargar en la aplicación
@@ -646,16 +662,16 @@ Settings:
   Parental Control Settings:
     Hide Unsubscribe Button: Ocultar botón de anular suscripción
     Hide Search Bar: Ocultar barra de búsqueda
-    Parental Control Settings: Control parental
+    Parental Control Settings: Ajustes del Control Parental
     Show Family Friendly Only: Mostrar solo lo apto para las familias
   Experimental Settings:
-    Experimental Settings: Experimental
+    Experimental Settings: Ajustes experimentales
     Warning: Estas configuraciones son experimentales, pueden causar fallos mientras
       están habilitadas. Es muy recomendable hacer copias de seguridad. ¡Úselo bajo
       su propio riesgo!
     Replace HTTP Cache: Reemplazar la caché HTTP
   Password Settings:
-    Password Settings: Contraseña
+    Password Settings: Configuración de la contraseña
     Set Password To Prevent Access: Establecer una contraseña para impedir el acceso
       a los ajustes
     Set Password: Establecer contraseña
@@ -665,12 +681,39 @@ Settings:
     Enter Password To Unlock: Introduce la contraseña para desbloquear los ajustes
     Password Incorrect: Contraseña incorrecta
     Unlock: Desbloquear
+  Expand All Settings Sections: Expandir todas las secciones de los ajustes
   Sort Settings Sections (A-Z): Ordenar secciones de configuración (A-Z)
-  Return to Settings Menu: Volver a los Ajustes
 About:
   #On About page
   About: 'Acerca de'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
+    software de copyleft tiene licencia libre AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    ¿Has encontrado algún fallo? ¿Tienes alguna sugerencia? ¿te gustaría colaborar?
+    Visita nuestra página en GitHub. Podrás solicitar nuevas características/cambios.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: '¡Muchísimas
+    gracias a todas las personas y los proyectos que han hecho posible FreeTube!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '¿Quieres
+    chatear? Únete a nuestro servidor en Element / Matrix. Por favor, antes de unirte,
+    lee las reglas.'
+
+  'Looking for help? Check out our Wiki page.': '¿Buscas ayuda? Visita nuestra página
+    Wiki.'
+
+  Check out our Firefox extension!: '¡Prueba nuestra extensión para Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Si
+    te gusta FreeTube, considera donar a través de Liberapay o a nuestra dirección
+    de Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Últimas noticias de FreeTube'
+
   Donate: Donar
   these people and projects: estas personas y proyectos
   FreeTube is made possible by: FreeTube es posible gracias a
@@ -692,6 +735,8 @@ About:
   Help: Ayuda
   GitHub releases: Lanzamientos de GitHub
   Downloads / Changelog: Descargas / Registro de cambios
+  View License: Ver licencia
+  Licensed under the AGPLv3: Licencia AGPLv3
   Source code: Código fuente
   Beta: Beta
   Discussions: Debates
@@ -740,7 +785,7 @@ Profile:
   Subscription List: Lista de suscripciones
   Profile Select: Seleccionar perfil
   Profile Filter: Filtro de perfil
-  Profile Settings: Perfil
+  Profile Settings: Ajustes del perfil
   Toggle Profile List: Alternar la lista de los perfiles
   Open Profile Dropdown: Abrir el desplegable del Perfil
   Close Profile Dropdown: Cerrar el desplegable del Perfil
@@ -815,9 +860,6 @@ Channel:
     Releases: Publicaciones
     This channel does not currently have any releases: Este canal no tiene actualmente
       ninguna publicación
-  Home:
-    Home: Inicio
-    View Playlist: Ver lista de reproducción
 Video:
   Mark As Watched: 'Marcar como visto'
   Remove From History: 'Borrar del historial'
@@ -848,8 +890,38 @@ Video:
     el chat no funciona con la API de Invidious. Se requiere una conexión directa
     con YouTube.'
   Published:
+    Jan: 'ene'
+    Feb: 'feb'
+    Mar: 'mar'
+    Apr: 'abr'
+    May: 'mayo'
+    Jun: 'jun'
+    Jul: 'jul'
+    Aug: 'ago'
+    Sep: 'sep'
+    Oct: 'oct'
+    Nov: 'nov'
+    Dec: 'dic'
+    Second: 'segundo'
+    Seconds: 'segundos'
+    Minute: 'minuto'
+    Minutes: 'minutos'
+    Hour: 'hora'
+    Hours: 'horas'
+    Day: 'día'
+    Days: 'días'
+    Week: 'semana'
+    Weeks: 'semanas'
+    Month: 'mes'
+    Months: 'meses'
+    Year: 'año'
+    Years: 'años'
+    Ago: 'Hace'
+    Upcoming: 'Se estrenará el'
+    Less than a minute: Menos de un minuto
     In less than a minute: En menos de un minuto
   Published on: 'Publicado el'
+  Publicationtemplate: 'Hace {number} {unit}'
 #& Videos
   Play Previous Video: Reproducir el vídeo anterior
   Play Next Video: Reproducir vídeo siguiente
@@ -937,17 +1009,6 @@ Video:
     Theatre Mode: Modo cine
     Exit Theatre Mode: Salir del modo cine
     Full Window: Pantalla completa
-  IP block: YouTube ha bloqueado tu dirección IP para ver vídeos. Por favor, intenta
-    cambiar a otra VPN o proxy.
-  MembersOnly: Los videos solo para miembros no se pueden ver con FreeTube ya que
-    requieren un inicio de sesión en Google y una membresía pagada al canal del cargador.
-  Unlisted: No listado
-  AgeRestricted: Los vídeos con restricciones de edad no se pueden ver con FreeTube
-    ya que requieren iniciar sesión en Google y usar una cuenta de YouTube verificada
-    por edad.
-  DeArrow:
-    Show Original Details: Mostrar detalles originales
-    Show Modified Details: Mostrar detalles modificados
 Videos:
   #& Sort By
   Sort By:
@@ -958,6 +1019,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver la lista de reproducción completa'
+  Videos: 'Vídeos'
+  View: 'Ver'
+  Views: 'Vistas'
   Last Updated On: 'Se actualizó por última vez el'
 
 # On Video Watch Page
@@ -973,8 +1037,7 @@ Playlist:
     VideoTitleAscending: Título (A-Z)
     Sort By: Ordenar por
     VideoTitleDescending: Título (Z-A)
-    VideoDurationAscending: Duración (primero la más corta)
-    VideoDurationDescending: Duración (la más larga primero)
+Toggle Theatre Mode: 'Activar modo cine'
 Change Format:
   Change Media Formats: 'Cambiar formato de vídeo'
   Use Dash Formats: 'Utilizar formatos DASH'
@@ -1043,6 +1106,7 @@ Invidious API Error (Click to copy): 'Error de la API de Invidious (Clic para co
   el código)'
 Falling back to Invidious API: 'Recurriendo a la API de Invidious'
 Falling back to Local API: 'Recurriendo a la API local'
+Subscriptions have not yet been implemented: 'Todavía no se han implementado las suscripciones'
 Loop is now disabled: 'Reproducción en bucle desactivada'
 Loop is now enabled: 'Reproducción en bucle activada'
 Shuffle is now disabled: 'Reproducción aleatoria desactivada'
@@ -1102,15 +1166,12 @@ Tooltips:
     External Link Handling: "Elija el comportamiento por defecto cuando se hace clic
       en un enlace que no se pueda abrirse en FreeTube. \nPor defecto, FreeTube abrirá
       el enlace en el que se hizo clic en su navegador predeterminado.\n"
-    Open Deep Links In New Window: Las URL que se pasan a FreeTube, por ejemplo mediante
-      la redirección de extensiones del navegador o argumentos de la línea de comandos,
-      se abren en una ventana nueva.
   External Player Settings:
     Custom External Player Executable: Por defecto, FreeTube buscará el reproductor
       externo seleccionado mediante la variable de entorno PATH, de no encontrarlo,
       podrás especificar una ruta personalizada aquí.
-    Custom External Player Arguments: Cualquier argumento personalizado de la línea
-      de comandos que desee pasar al reproductor externo.
+    Custom External Player Arguments: Depara cada argumento mediante un punto y coma
+      (;) cada argumento será enviado al reproductor externo.
     Ignore Warnings: Ocultar advertencias por argumentos incompatibles con el reproductor
       (ej. invertir listas de reproducción, etc.).
     External Player: La elección de un reproductor externo mostrará un icono, para
@@ -1146,6 +1207,8 @@ More: Más
 Unknown YouTube url type, cannot be opened in app: Tipo de URL desconocido. No se
   puede abrir en la aplicación
 Open New Window: Abrir ventana nueva
+Hashtags have not yet been implemented, try again later: Los hashtags no se han implementado
+  todavía, inténtalo más adelante
 Playing Next Video Interval: Reproduciendo el vídeo a continuación. Haz clic para
   cancelar. | El siguiente vídeo se reproducirá en {nextVideoInterval} segundos. Haz
   clic para cancelar. | El siguiente vídeo se reproducirá en {nextVideoInterval} segundos.
@@ -1172,6 +1235,8 @@ Channels:
   Search bar placeholder: Buscar canales
   Count: '{number} canal(es) encontrado(s).'
   Empty: Tu lista de canales está actualmente vacía.
+  Unsubscribe: Cancelar la suscripción
+  Unsubscribed: '{channelName} ha sido eliminado de tus suscripciones'
   Unsubscribe Prompt: ¿Está seguro/segura de querer desuscribirse de «{channelName}»?
 Clipboard:
   Copy failed: Error al copiar al portapapeles
@@ -1183,7 +1248,6 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Lista de los capítulos
     ocultos, capítulo actual: {chapterName}'
   Chapters: Capítulos
-  Key Moments: Momentos clave
 Preferences: Preferencias
 Ok: De acuerdo
 Hashtag:
@@ -1221,26 +1285,5 @@ Search Listing:
     Subtitles: Subtítulos
     Closed Captions: Subtítulos descriptivos
     4K: 4K
-    360 Video: 360°
-    New: Nuevo
-    8K: 8K
-    VR180: VR180
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Bloqueada la apertura de la URL potencialmente
   insegura: «{url}».'
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Right-click or hold to see history: Clic con el botón derecho del ratón o mantén presionado
-  para ver el historial
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Flecha hacia abajo
-  arrowleft: Flecha hacia la izquierda
-  arrowright: Flecha hacía la derecha
-  arrowup: Flecha hacia arriba
-Autoplay Interruption Timer: Reproducción automática cancelada debido a {autoplayInterruptionIntervalHours}
-  horas de inactividad
-Description:
-  Expand Description: '...más'
-  Collapse Description: Mostrar menos
diff --git a/static/locales/et.yaml b/static/locales/et.yaml
index cbc855c3bea9c..6dc971a053eb9 100644
--- a/static/locales/et.yaml
+++ b/static/locales/et.yaml
@@ -107,9 +107,7 @@ Subscriptions:
   Subscriptions: 'Tellimused'
   Latest Subscriptions: 'Viimased tellimused'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Sinu
-    tellimuste loend on hetkel tühi. Kui sa soovid importida oma tellimusi, siis ava
-    seadistustest „Andmehaldus“ ja vali „Impordi tellimused“, aga samuti võid kanaleid
-    lihtsalt otsida ning seejärel tellida.'
+    tellimuste loend on hetkel tühi. Telli kanaleid ja sa näed neid siin loendis.'
   'Getting Subscriptions. Please wait.': 'Laadin tellimusi, palun oota.'
   Refresh Subscriptions: 'Värskenda tellimusi'
   Load More Videos: Laadi veel videosid
@@ -136,8 +134,17 @@ Most Popular: 'Populaarseimad'
 Playlists: 'Esitusloendid'
 User Playlists:
   Your Playlists: 'Sinu esitusloendid'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Sa
+    pole veel videosid siia salvestanud. Selleks palun vajuta video nurgas asuvat
+    salvestusnuppu
+  Playlist Message: See leht ei kirjelda terviklikke ja toimivad esitusloendeid. Siin
+    on kirjas vaid videod, mida oled salvestanud või mille oled märkinud lemmikuks.
+    Kui kõik on valmis, siis siin nähtavad videod on leitavad esitusloendist „Lemmikud“.
   Search bar placeholder: Otsi esindusloendeid
   Empty Search Message: Selles esitusloendis pole sinu otsingule vastavaid videosid
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Kas
+    sa oled kindel, et soovid kõik vaadatud videod sellest esitusloendist eemaldada?
+    Seda tegevust ei saa tagasi pöörata.
   You have no playlists. Click on the create new playlist button to create a new one.: Sul
     pole esitusloendeid. Uue esitusloendi loomiseks vajuta nuppu „Uus esitusloend“.
   Remove from Playlist: Eemalda esitusloendist
@@ -199,15 +206,13 @@ User Playlists:
         tühistamiseks klõpsi siin'
       This playlist is now used for quick bookmark: See esitusloend on kasutusel kiirjärjehoidjate
         jaoks
+      Quick bookmark disabled: Kiirjärjehoidjad ei ole kasutusel
       Reverted to use {oldPlaylistName} for quick bookmark: Võtsime {oldPlaylistName}
         uuesti kasutusele kiirjärjehoidjate jaoks
       Playlist {playlistName} is the new quick bookmark playlist.: Esitusloend {playlistName}
         on uus kiirjärjehoidjate esitusloend.
       This playlist is already being used for quick bookmark.: See esitusloend juba
         on kasutusel kiirjärjehoidjate jaoks.
-      This playlist has a video with a duration error: Selles esitusloendis on vähemalt
-        üks video, millel puudub kestus. Järjestamisel me sel puhul arvestame kestuseks
-        nulli.
     Search for Videos: Otsi videoid
   Are you sure you want to delete this playlist? This cannot be undone: Kas sa oled
     kindel, et soovid selle esitusloendi kustutada? Seda tegevust ei saa tagasi pöörata.
@@ -231,6 +236,7 @@ User Playlists:
       There is already a playlist with this name. Please pick a different name.: Sellise
         nimega esitusloend on juba olemas. Palun sisesta muu nimi.
     New Playlist Name: Esitusloendi uus nimi
+  Disable Quick Bookmark: Lülita kiirjärjehoidjate kasutamine välja
   Add to Favorites: Lisa esitusloendisse {playlistName}
   Remove from Favorites: Eemalda esitusloendist {playlistName}
   Enable Quick Bookmark With This Playlist: Võimalda kiirjärjehoidjate kasutamist
@@ -248,8 +254,6 @@ User Playlists:
     sa oled kindel, et soovid sellest esitusloendist eemaldada 1 vaadatud video? Seda
     tegevust ei saa tagasi pöörata. | Kas sa oled kindel, et soovid sellest esitusloendist
     eemaldada {playlistItemCount} vaadatud videot? Seda tegevust ei saa tagasi pöörata.
-  Export Playlist: Ekspordi see esitusloend
-  The playlist has been successfully exported: Esitusloendi eksportimine õnnestus
 History:
   # On History Page
   History: 'Ajalugu'
@@ -262,7 +266,7 @@ Settings:
   # On Settings Page
   Settings: 'Seadistused'
   General Settings:
-    General Settings: 'Üldist'
+    General Settings: 'Üldised seadistused'
     Check for Updates: 'Kontrolli uuendusi'
     Check for Latest Blog Posts: 'Vaata viimaseid blogipostitusi'
     Fallback to Non-Preferred Backend on Failure: 'Luba vigade korral kasutada teist
@@ -286,6 +290,8 @@ Settings:
       End: 'Lõpus'
       Hidden: Peidetud
       Blur: Hägusta pildid
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious''e
+      veebirakendus (vaikimisi kasutatav sait on https://invidious.snopyta.org)'
     Region for Trending: 'Mis geograafia alusel tuvastame hetkel menukad ehk populaarsust
       koguvad videod'
         #! List countries
@@ -308,9 +314,8 @@ Settings:
     Auto Load Next Page:
       Label: Laadi järgmine leht automaatselt
       Tooltip: Laadi järgmised lehed ja kommentaarid automaatselt.
-    Open Deep Links In New Window: Ava FreeTube'ile antud võrguaadressid uues aknas
   Theme Settings:
-    Theme Settings: 'Kujundus'
+    Theme Settings: 'Välimuse seadistused'
     Match Top Bar with Main Color: 'Kasuta ülaribal põhivärvi'
     Base Theme:
       Base Theme: 'Põhiteema'
@@ -325,8 +330,6 @@ Settings:
       Nordic: Põhjala
       Solarized Dark: Tume päikesekuma
       Solarized Light: Hele päikesekuma
-      Gruvbox Dark: Gruuvimasina tume
-      Gruvbox Light: Gruuvimasina hele
     Main Color Theme:
       Main Color Theme: 'Põhiline värviteema'
       Red: 'Punane'
@@ -374,16 +377,6 @@ Settings:
       Solarized Cyan: Rohekassinine päikesekuma
       Solarized Green: Roheline päikesekuma
       Solarized Yellow: Kollane päikesekuma
-      Gruvbox Dark Blue: Gruuvimasina tumesinine
-      Gruvbox Light Blue: Gruuvimasina helesinine
-      Gruvbox Dark Green: Gruuvimasina tumeroheline
-      Gruvbox Light Red: Gruuvimasina helepunane
-      Gruvbox Dark Purple: Gruuvimasina tumepurpur
-      Gruvbox Dark Orange: Gruuvimasina tumeoranž
-      Gruvbox Dark Yellow: Gruuvimasina kollane
-      Gruvbox Dark Aqua: Gruuvimasina tume vesi
-      Gruvbox Light Purple: Gruuvimasina helepurpur
-      Gruvbox Light Orange: Gruuvimasina heleoranž
     Secondary Color Theme: 'Värvide alamteema'
         #* Main Color Theme
     UI Scale: Kasutajaliidese suurus
@@ -392,7 +385,7 @@ Settings:
     Hide Side Bar Labels: Peida külgriba sildid
     Hide FreeTube Header Logo: Peida FreeTube'i päise logo
   Player Settings:
-    Player Settings: 'Meediamängija'
+    Player Settings: 'Videomängija seadistused'
     Play Next Video: 'Esita ka järgmist videot'
     Turn on Subtitles by Default: 'Vaikimisi näita subtiitreid'
     Autoplay Videos: 'Esita videod automaatselt'
@@ -418,7 +411,7 @@ Settings:
       1440p: '1440p'
       4k: '4k'
       8k: '8k'
-    Next Video Interval: Viivituse taimer järgmise video esitamisel
+    Next Video Interval: Viivitus järgmise video esitamisel
     Display Play Button In Video Player: Kuva videomängijas esitamise nuppu
     Scroll Volume Over Video Player: Muuda helivaljust videovaate kohal kerides
     Fast-Forward / Rewind Interval: Kiirkerimise välp
@@ -443,9 +436,8 @@ Settings:
         Alamkaustade loomiseks võid kasutada ka „\“ või „/“.
     Skip by Scrolling Over Video Player: Jäta vahele, kerides üle videopleieri
     Enter Fullscreen on Display Rotate: Ekraani pööramisel ava täisekraanivaade
-    Autoplay Interruption Timer: Viivituse taimer järgmise video esitamise katkestamisel
   Privacy Settings:
-    Privacy Settings: 'Privaatsus'
+    Privacy Settings: 'Privaatsuse seadistused'
     Remember History: 'Jäta ajalugu meelde'
     Save Watched Progress: 'Salvesta vaatamise olek'
     Clear Search Cache: 'Kustuta otsingute ajalugu'
@@ -467,19 +459,21 @@ Settings:
     Are you sure you want to remove all your playlists?: Kas sa oled kindel, et soovid
       kõik esitusloendid eemaldada?
   Subscription Settings:
-    Subscription Settings: 'Tellimused'
+    Subscription Settings: 'Tellimuste seadistused'
     Hide Videos on Watch: 'Vaatamisel peida videod'
     Fetch Feeds from RSS: 'Laadi RSS-uudisvood'
+    Manage Subscriptions: 'Halda tellimusi'
     Fetch Automatically: Laadi tellimuste voog automaatselt
+    Only Show Latest Video for Each Channel: Iga kanali puhul näita vaid viimast videot
     Confirm Before Unsubscribing: Väldi ekslikku ja juhuslikku tellimusest loobumist
-    To: Kuni
-    'Limit the number of videos displayed for each channel': Piira igas kanalis näidatavate
-      videote arvu
   Data Settings:
     Data Settings: 'Andmehaldus'
     Select Import Type: 'Vali imporditava faili vorming'
     Select Export Type: 'Vali eksporditava faili vorming'
     Import Subscriptions: 'Impordi tellimused'
+    Import FreeTube: 'Kasuta FreeTube vormingut'
+    Import YouTube: 'Kasuta YouTube vormingut'
+    Import NewPipe: 'Kasuta NewPipe vormingut'
     Export Subscriptions: 'Ekspordi tellimused'
     Export FreeTube: 'Ekspordi FreeTube vormingus'
     Export YouTube: 'Ekspordi YouTube vormingus'
@@ -507,6 +501,7 @@ Settings:
     Unknown data key: 'Tundmatu andmevõti'
     How do I import my subscriptions?: 'Kuidas ma saan oma tellimusi importida?'
     Manage Subscriptions: Halda tellimusi
+    Check for Legacy Subscriptions: Kontrolli pärandvormingus tellimuste olemasolu
     Export Playlists: Ekspordi esitusloendeid
     All playlists has been successfully imported: Kõikide esitusloendite import õnnestus
     All playlists has been successfully exported: Kõikide esitusloendite eksport õnnestus
@@ -524,6 +519,7 @@ Settings:
         „Kustuta kõik esitusloendid“.\n3. Käivita vanem FreeTube'i versioon ja impordi
         esimeses sammus eksporditud esitusloendid."
       Label: Ekspordi esitusloendid vanemate FreeTube'i versioonide jaoks
+  Advanced Settings: {}
   Distraction Free Settings:
     Hide Active Subscriptions: Peida aktiivsed tellimused
     Hide Live Chat: Peida veebivestlused
@@ -535,7 +531,7 @@ Settings:
     Hide Channel Subscribers: Peida kanalite tellijad
     Hide Video Likes And Dislikes: Peida videote meeldimiste ja mittemeeldimiste arvud
     Hide Video Views: Peida videote vaatamiskordade arv
-    Distraction Free Settings: Rahulik vaade
+    Distraction Free Settings: Seadista endale võimalikult rahulik videote vaatamine
     Hide Video Description: Peida video kirjeldus
     Hide Comments: Peida kommentaarid
     Hide Live Streams: Peida otseülekanded
@@ -553,15 +549,16 @@ Settings:
       Watch Page: Videovaade
       Subscriptions Page: Tellimuste vaade
     Hide Featured Channels: Peaida soovitatud kanalid
-    Hide Channel Playlists: Peida kanalite vahekaart „Esitusloendid“
-    Hide Channel Shorts: Peida kanalite vahekaart „Lühivideod“
-    Hide Channel Community: Peida kanalite vahekaart „Kogukond“
-    Hide Channel Podcasts: Peida kanalite vahekaart „Taskuhäälingud“
-    Hide Channel Releases: Peida kanalite vahekaart „Väljalasked“
+    Hide Channel Playlists: Peida kanali esitusloendid
+    Hide Channel Shorts: Peida kanali lühivideod
+    Hide Channel Community: Peida kanali kogukond
+    Hide Channel Podcasts: Peida kanali taskuhäälingud
+    Hide Channel Releases: Peida kanali väljalasked
     Hide Subscriptions Videos: Peida tellimuste videod
     Hide Subscriptions Shorts: Peida tellimuste lühivideod
     Hide Subscriptions Live: Peida tellimuste otse-eetrid
     Hide Profile Pictures in Comments: Peida kommentaaride profiilipildid
+    Blur Thumbnails: Hägusta pisipildid
     Hide Subscriptions Community: Peida tellijate loend
     Hide Channels Invalid: Sisestatud kanali tunnus on vigane
     Hide Channels Disabled Message: Mõned kanalid on blokeeritud nende tunnuste alusel
@@ -573,8 +570,6 @@ Settings:
     Hide Videos and Playlists Containing Text Placeholder: Sõna, sõnaosa või fraas
     Hide Videos and Playlists Containing Text: Peida videod ja esitusloendid, kus
       leidub sellist teksti
-    Hide Channel Home: Peida kanalite vahekaart „Avaleht“
-    Show Added Items: Näita lisatud kirjeid
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: Võrguteavet
       ei õnnestu leida. Kas sa oled puhverserveri ikka korralikult seadistanud?
@@ -590,13 +585,7 @@ Settings:
     Proxy Host: Puhverserveri aadress
     Proxy Protocol: Puhverserveri protokoll
     Enable Tor / Proxy: Kasuta Tor'i või puhverserverit
-    Proxy Settings: Puhverserver
-    Proxy Warning: FreeTube'is pole sisseehitatud proksilahendust, kuid ta võib luua
-      ühenduse välise proksi kaudu. Näiteks kasutades sellist, mis töötab sinu arvutis
-      või nutiseadmes, olgu selleks Tor või mõne VPNi poolt pakutav SOCKS5. Kui sa
-      selle eelistuse sisse lülitad, palun jälgi et selline väline proksi on korralikult
-      seadistatud. Vastasel juhul võrguühendus ei toimi ja FreeTube ei saa andmeid
-      laadida.
+    Proxy Settings: Puhverserveri seadistused
   The app needs to restart for changes to take effect. Restart and apply change?: See
     rakendus vajab muudatuste jõustamiseks uuesti käivitamist. Kas teeme seda nüüd?
   SponsorBlock Settings:
@@ -604,7 +593,7 @@ Settings:
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Sponsorite blokeerija
       API URL (vaikimisi https://sponsor.ajay.app)
     Enable SponsorBlock: Kasuta sponsorite blokeerijat
-    SponsorBlock Settings: Sponsorite blokeerija
+    SponsorBlock Settings: Sponsorite blokeerija seadistused
     Skip Options:
       Auto Skip: Automaatne vahelejätmine
       Show In Seek Bar: Näita otsinguribal
@@ -618,7 +607,7 @@ Settings:
       pisipiltide loomise teenuse API url (Vaikimisi on see https://dearrow-thumb.ajay.app)
   External Player Settings:
     External Player: Väline meediamängija
-    External Player Settings: Väline meediamängija
+    External Player Settings: Välise meediamängija seadistused
     Custom External Player Arguments: Välise meediamängija rakenduse argumendid
     Custom External Player Executable: Välise meediamängija rakenduse asukoht
     Ignore Unsupported Action Warnings: Eira mittetoetatud toimingute hoiatusi
@@ -627,19 +616,19 @@ Settings:
         Name: Puudub
     Ignore Default Arguments: Eira vaikimisi käsureaargumente
   Download Settings:
-    Download Settings: Allalaadimised
+    Download Settings: Allalaadimise seadistused
     Ask Download Path: Küsi kuhu kausta soovid faile alla laadida
     Choose Path: Vali asukoht
     Download Behavior: Tegevus allalaadimisel
     Open in web browser: Ava veebibrauseris
     Download in app: Laadi alla rakenduses
   Parental Control Settings:
-    Parental Control Settings: Vanemlik järelevalve
+    Parental Control Settings: Vanemliku järelevalve seadistused
     Hide Unsubscribe Button: Peida tellimuse tühistamise nupp
     Show Family Friendly Only: Näita ainult peresõbralikku sisu
     Hide Search Bar: Peida otsinguriba
   Experimental Settings:
-    Experimental Settings: Katsed
+    Experimental Settings: Katselised seadistused
     Warning: Tegemist on katseliste seadistustega ja sisselülitamisel võivad põhjustada
       rakenduse kokkujooksmist. Kindlasti ära unusta oma andmete varundamist. Jätka
       omal vastutusel!
@@ -650,12 +639,12 @@ Settings:
     Unlock: Võta lukust lahti
     Password: Salasõna
   Password Settings:
-    Password Settings: Salasõnad
+    Password Settings: Salasõna seadistused
     Remove Password: Eemalda salasõna
     Set Password: Määra salasõna
     Set Password To Prevent Access: Vältimaks ligipääsu seadistustele määra salasõna
+  Expand All Settings Sections: Laienda kõik seadistuste lõigud
   Sort Settings Sections (A-Z): Järjesta seadistused (A-Z)
-  Return to Settings Menu: Tagasi seadistuste menüü juurde
 About:
   #On About page
   About: 'Teave'
@@ -681,6 +670,8 @@ About:
   Help: Abiteave
   GitHub releases: Avaldatud versioonid leiad GitHub'ist
   Downloads / Changelog: Allalaadimised ja muudatuste logi
+  View License: Vaata litsentsiteavet inglise keeles
+  Licensed under the AGPLv3: Avaldatud AGPLv3 litsentsi alusel
   Source code: Lähtekood
   Beta: beetaversioon
   Discussions: Arutelud
@@ -729,7 +720,7 @@ Profile:
     profiilidest.'
 #On Channel Page
   Profile Filter: Sirvi profiile
-  Profile Settings: Profiil
+  Profile Settings: Profiili seadistused
   Toggle Profile List: Lülita profiilide loend sisse/välja
   Profile Name: Profiili nimi
   Edit Profile Name: Muuda profiili nime
@@ -745,7 +736,7 @@ Channel:
   Added channel to your subscriptions: 'Lisasin kanali sinu tellimuste hulka'
   Search Channel: 'Otsi kanalit'
   Your search results have returned 0 results: 'Otsingul on 0 tulemust'
-  Sort By: 'Järjestus'
+  Sort By: 'Sortimise alus'
   Videos:
     Videos: 'Videod'
     This channel does not currently have any videos: 'Sellel kanalik pole hetkel ühtegi
@@ -801,9 +792,6 @@ Channel:
     This channel does not currently have any releases: Sellel kanalil pole hetkel
       ühtegi väljalaset
     Releases: Väljalasked
-  Home:
-    Home: Avaleht
-    View Playlist: Vaata esitusloendit
 Video:
   Mark As Watched: 'Märgi vaadatuks'
   Remove From History: 'Kustuta ajaloost'
@@ -840,8 +828,37 @@ Video:
     kasutad Invidious''e veebiteenuse-põhist API''t, siis reaalajas vestlus ei ole
     toetatud. Selleks on vajalik otseliidestus YouTube''ga.'
   Published:
+    Jan: 'Jaan'
+    Feb: 'Veeb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Mai'
+    Jun: 'Juuni'
+    Jul: 'Juuli'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Dets'
+    Second: 'Sekund'
+    Seconds: 'Sekundit'
+    Minute: 'Minut'
+    Minutes: 'Minutit'
+    Hour: 'Tund'
+    Hours: 'Tundi'
+    Day: 'Päev'
+    Days: 'Päeva'
+    Week: 'Nädal'
+    Weeks: 'Nädalat'
+    Month: 'Kuu'
+    Months: 'Kuud'
+    Year: 'Aasta'
+    Years: 'Aastat'
+    Ago: 'tagasi'
+    Upcoming: 'Esilinastus'
     In less than a minute: Vähem kui minuti pärast
   Published on: 'Avaldatud'
+  Publicationtemplate: '{number} {unit} tagasi'
 #& Videos
   Copy Invidious Channel Link: Kopeeri kanali link Invidious'e veebirakenduses
   Open Channel in Invidious: Ava kanal Invidious'e veebirakenduses
@@ -920,17 +937,6 @@ Video:
     Playback will resume automatically when your connection comes back: Taasesitus
       jätkub automaatselt niipea, kui sinu seadme võrguühendus taastub.
     You appear to be offline: Sa ei tundu olema võrgus.
-  IP block: YouTube on blokeerinud sinu nutiseadme IP-aadressilt videote vaatamise.
-    Palun kasuta mõnda muud VPN-teenust või puhverserverit.
-  MembersOnly: Kuna vajalik on sisselogimine Google'i kontoga ja tasuline liikmelisus
-    üleslaadija kanalis, siis ainult liikmetele mõeldud videoid ei saa FreeTube'is
-    vaadata.
-  AgeRestricted: Kuna vajalik on sisselogimine Google'i kontoga, kus vanus on kontrollitud,
-    siis vanusepiiranguga videoid ei saa FreeTube'is vaadata.
-  Unlisted: Registriväline
-  DeArrow:
-    Show Original Details: Näita algseid üksikasju
-    Show Modified Details: Näita muudetud üksikasju
 Videos:
   #& Sort By
   Sort By:
@@ -941,6 +947,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Näita kogu esitusloendit'
+  Videos: 'Videod'
+  View: 'Vaata'
+  Views: 'vaatamist'
   Last Updated On: 'Viimati uuendatud'
 
 # On Video Watch Page
@@ -956,8 +965,7 @@ Playlist:
     AuthorDescending: Autori alusel (Z-A)
     VideoTitleAscending: Pealkirja alusel (A-Z)
     VideoTitleDescending: Pealkirja alusel (Z-A)
-    VideoDurationAscending: Kestuse alusel (esmalt lühemad)
-    VideoDurationDescending: Kestuse alusel (esmalt pikemad)
+Toggle Theatre Mode: 'Lülita lai vaade sisse/välja'
 Change Format:
   Change Media Formats: 'Muuda videovorminguid'
   Use Dash Formats: 'Kasuta DASH-vorminguid'
@@ -1002,7 +1010,7 @@ Comments:
   Reply: 'vastus'
   There are no comments available for this video: 'Seda videot pole veel kommenteeritud'
   Load More Comments: 'Laadi veel kommentaare'
-  Sort by: Järjestus
+  Sort by: Sortimise alus
   No more comments available: Rohkem kommentaare pole
   Newest first: Uuemad esimesena
   Top comments: Parimad esimesena
@@ -1025,6 +1033,7 @@ Falling back to Local API: 'Varuvariandina kasutan kohalikku API''t'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Kuna
   vajalikke vorminguid ei leidu, siis see video pole saadaval. Niisugune viga võib
   juhtuda ka maapiirangute tõttu.'
+Subscriptions have not yet been implemented: 'Tellimuste kasutamine pole veel implementeeritud'
 Loop is now disabled: 'Esituse kordamine ei ole nüüd kasutusel'
 Loop is now enabled: 'Esituse kordamine on nüüd kasutusel'
 Shuffle is now disabled: 'Juhuslik esitus ei ole nüüd kasutusel'
@@ -1040,6 +1049,8 @@ Yes: 'Jah'
 No: 'Ei'
 More: Veel
 Open New Window: Ava uus aken
+Hashtags have not yet been implemented, try again later: Teemaviiteid ei saa veel
+  kasutada, palun proovi hiljem uuesti
 Unknown YouTube url type, cannot be opened in app: Tundmatu YouTube'i urli tüüp, mida
   ei saa rakenduses avada
 Tooltips:
@@ -1049,8 +1060,8 @@ Tooltips:
       muu asukoha.
     Ignore Warnings: Kui väline meediamängija antud funktsionaalsust (näiteks esitusloendi
       järjekorra pööramine) ei toeta, siis ära näita hoiatusi.
-    Custom External Player Arguments: Misiganes käsurea argumendid, mida sa soovid
-      välisele meediamängijale saata.
+    Custom External Player Arguments: Semikoolonitega (;) eraldatud käsurea argumendid,
+      mida sa soovid välisele meediamängijale saata.
     External Player: "Seadistades välise meediamängija kuvame pisipildil ikooni video
       (või esitusloendi) esitamiseks välises meediamängijas. Hoiatus: Invidious'e
       seadistused ei mõjuta välise meediamängija kasutamist."
@@ -1078,8 +1089,6 @@ Tooltips:
       tegemisel.
     External Link Handling: "Vali vaikekäitumine, kui vajutatakse linki, mida ei saa
       avada FreeTubes.\nVaikimisi avaneb link kasutaja vaikebrauseris.\n"
-    Open Deep Links In New Window: FreeTube'ile brauseritest või käsurealt antud võrguaadressid
-      avatakse uues aknas.
   Player Settings:
     Default Video Format: Vali kasutatavad videovormingud. DASH-vormingutel on üldjuhul
       parem kvaliteet. Pärandvormingute kvaliteedi ülempiir on 720p ja seetõttu kasutavad
@@ -1135,6 +1144,8 @@ Channels:
   Search bar placeholder: Otsi kanaleid
   Count: Leidsime {number} kanali(t).
   Empty: Sinu kanalite loend on praegu tühi.
+  Unsubscribe: Loobu tellimusest
+  Unsubscribed: '{channelName} on sinu tellimustest eemaldatud'
   Unsubscribe Prompt: Kas oled kindel, et soovid „{channelName}“ tellimusest loobuda?
 Screenshot Success: Kuvatõmmis on salvestatud faili „{filePath}“
 Clipboard:
@@ -1147,7 +1158,6 @@ Chapters:
     praegune peatükk: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Peatükkide loend on peidetud,
     praegune peatükk: {chapterName}'
-  Key Moments: Olulised hetked
 Ok: Sobib
 Preferences: Eelistused
 Hashtag:
@@ -1185,26 +1195,5 @@ Search Listing:
     Subtitles: Subtiitrid
     Closed Captions: Subtiitrid
     4K: 4K
-    New: Uus
-    3D: 3D-sisu
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
 'Blocked opening potentially unsafe URL': 'Blokeerisime võimaliku ohtliku aadressi
   avamise: „{url}“.'
-shortcutJoinOperator: +
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Keys:
-  arrowup: Nool üles
-  alt: Alt
-  ctrl: Ctrl
-  arrowleft: Nool vasakule
-  arrowright: Nool paremale
-  arrowdown: Nool alla
-Right-click or hold to see history: Ajaloo nägemiseks klõpsa parema hiireklahviga
-  ja hoia klahvi all
-Autoplay Interruption Timer: Automaatne esitamine katkes peale {autoplayInterruptionIntervalHours}
-  tundi jõudeolekut
-Description:
-  Expand Description: '...vaata lisaks'
-  Collapse Description: Näita vähem
diff --git a/static/locales/eu.yaml b/static/locales/eu.yaml
index 41b6ccc45bb80..eab187cf4a4a9 100644
--- a/static/locales/eu.yaml
+++ b/static/locales/eu.yaml
@@ -109,9 +109,7 @@ Subscriptions:
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Honako
     profilak harpidetza anitz ditu. RSS behartu abiadura muga saihesteko'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Zure
-    harpidetza-zerrenda hutsik dago. Zure harpidetzak inportatu nahi badituzu, Datuen
-    konfigurazioa atalera joan eta Inportaziorako harpidetzak aukera ditzakezu, edo
-    kanal bat bilatu eta harpidetza egin dezakezu.'
+    harpidetzen zerrenda hutsik da. Has zaitez harpidetzak gehitzen hemen ikusteko'
   'Getting Subscriptions. Please wait.': 'Harpidetzak eskuratzen. Itxaron mesedez.'
   Refresh Subscriptions: 'Harpidetzak freskatu'
   Load More Videos: 'Bideo gehiago kargatu'
@@ -136,6 +134,12 @@ Most Popular: 'Ikusienak'
 Playlists: 'Erreprodukzio zerrendak'
 User Playlists:
   Your Playlists: 'Zure erreprodukzio zerrendak'
+  Playlist Message: 'Orrialde honek ez ditu guztiz funtzionatzen duten erreprodukzio-zerrendak
+    islatzen. Gorde dituzun edo gogoko dituzun bideoak bakarrik zerrendatzen ditu.
+    Lana amaitzen denean, hemen dauden bideo guztiak "Gogokoak" erreprodukzio-zerrenda
+    batera migratuko dira.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Gordetako
+    bideoak hutsik daude. Egin klik bideoaren izkinan den "gorde" botoian hemen zerrendatzeko'
   Search bar placeholder: Bilatu erreprodukzio-zerrendak
   Empty Search Message: Erreprodukzio-zerrenda honetan ez dago zure bilaketarekin
     bat datorren bideorik
@@ -170,6 +174,7 @@ User Playlists:
     Create: Sortu
   Enable Quick Bookmark With This Playlist: Gaitu laster-marka azkarra erreprodukzio-zerrenda
     honekin
+  Disable Quick Bookmark: Desgaitu laster-marka azkarra
   Sort By:
     NameDescending: Z-A
     LatestCreatedFirst: Sortu berria
@@ -194,6 +199,7 @@ User Playlists:
       There was a problem with removing this video: Arazo bat izan da bideoa kentzean
       This playlist is now used for quick bookmark: Erreprodukzio-zerrenda hau laster-markak
         egiteko erabiltzen da orain
+      Quick bookmark disabled: Laster-marka azkarra desgaituta dago
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Erreprodukzio-zerrenda
         hau laster-marketarako erabiltzen da orain {oldPlaylistName}-ren ordez. Egin
         klik hemen desegiteko
@@ -215,9 +221,6 @@ User Playlists:
         hau laster-markak egiteko erabiltzen ari da dagoeneko.
       Playlist {playlistName} is the new quick bookmark playlist.: '{playlistName}
         erreprodukzio-zerrenda laster-marken erreprodukzio-zerrenda azkarra da.'
-      This playlist has a video with a duration error: Erreprodukzio-zerrenda honek
-        iraupenik ez duen bideo bat du gutxienez. Hortaz, zero balitz bezala sailkatuko
-        da.
     Search for Videos: Bilatu bideoak
   AddVideoPrompt:
     Added {count} Times: Gehitu da | {count} aldiz gehitu da
@@ -240,6 +243,9 @@ User Playlists:
       bideo gehituko dira'
     "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
       gehitu dira'
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Ziur
+    ikusitako bideo guztiak erreprodukzio-zerrenda honetatik kendu nahi dituzula?
+    Hau ezin da desegin.
   Playlists with Matching Videos: Bat datozen bideoak dituzten erreprodukzio-zerrendak
   Remove Duplicate Videos: Kendu bideo bikoiztuak
   Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Ziur
@@ -253,9 +259,6 @@ User Playlists:
     honetatik kendu nahi dituzula? Hau ezin da desegin.
   Cannot delete the quick bookmark target playlist.: Ezin da laster-marken helburuko
     erreprodukzio zerrenda azkarra ezabatu.
-  Export Playlist: Erreprodukzio-zerrenda hau esportatu
-  The playlist has been successfully exported: Erreprodukzio-zerrenda ongi esportatu
-    da
 History:
   # On History Page
   History: 'Historikoa'
@@ -271,7 +274,7 @@ Settings:
     berrabiarazi behar da aldaketek eragina izan dezaten. Berrabiarazi eta aldaketa
     aplikatu?'
   General Settings:
-    General Settings: 'Orokorra'
+    General Settings: 'Ezarpen orokorrak'
     Check for Updates: 'Eguneraketak bilatu'
     Check for Latest Blog Posts: 'Egiaztatu blogeko azken argitalpenak'
     Fallback to Non-Preferred Backend on Failure: 'Hutsegitean, hobetsi gabeko backend-era
@@ -316,10 +319,8 @@ Settings:
     Auto Load Next Page:
       Tooltip: Kargatu orrialde eta iruzkin gehigarriak automatikoki.
       Label: Kargatu automatikoki hurrengo orria
-    Open Deep Links In New Window: Ireki FreeTube-ra pasatu diren URLak leiho berri
-      batean
   Theme Settings:
-    Theme Settings: 'Gaia'
+    Theme Settings: 'Gaien ezarpenak'
     Match Top Bar with Main Color: 'Lotu goiko barra kolore nagusiarekin'
     Expand Side Bar by Default: 'Zabaldu alboko barra lehenespenez'
     Disable Smooth Scrolling: 'Desgaitu korritze leuna'
@@ -337,8 +338,6 @@ Settings:
       Hot Pink: Arrosa beroa
       Solarized Dark: Solarizatu iluna
       Solarized Light: Solarizatu argia
-      Gruvbox Dark: Gruvbox Iluna
-      Gruvbox Light: Gruvbox Argia
     Main Color Theme:
       Main Color Theme: 'Oinarrizko koloreen gaia'
       Red: 'Gorria'
@@ -386,22 +385,12 @@ Settings:
       Solarized Cyan: Zian solarizatua
       Solarized Violet: Violeta solarizatua
       Solarized Green: Berde solarizatua
-      Gruvbox Dark Yellow: Gruvbox Hori Iluna
-      Gruvbox Dark Purple: gruvbox Ubel Iluna
-      Gruvbox Dark Orange: gruvbox Laranja Iluna
-      Gruvbox Light Red: Gruvbox Gorri Argia
-      Gruvbox Light Blue: Gruvbox Urdin Argia
-      Gruvbox Light Orange: Gruvbox Laranja Argia
-      Gruvbox Dark Aqua: Gruvbox Aqua Iluna
-      Gruvbox Light Purple: Gruvbox Ubel Argia
-      Gruvbox Dark Blue: Gruvbox Urdin Iluna
-      Gruvbox Dark Green: Gruvbox Berde Iluna
     Secondary Color Theme: 'Gaiaren bigarren mailako kolorea'
         #* Main Color Theme
     Hide Side Bar Labels: Ezkutatu alboko barraren etiketak
     Hide FreeTube Header Logo: Ezkutatu FreeTube goiburuko logotipoa
   Player Settings:
-    Player Settings: 'Erreproduzitzailea'
+    Player Settings: 'Erreprodukzioaren ezarpenak'
     Play Next Video: 'Hurrengo bideoa erreproduzitu'
     Turn on Subtitles by Default: 'Aktibatu Azpitituluak lehenespenez'
     Autoplay Videos: 'Bideoen erreprodukzio automatikoa'
@@ -429,7 +418,7 @@ Settings:
       8k: '8k'
     Fast-Forward / Rewind Interval: Aurrera / atzera egiteko tartea
     Scroll Volume Over Video Player: Aldatu bolumena bideo erreproduzitzailean
-    Next Video Interval: Erreproduzitu automatikoki atzerako kontaketaren tenporizadorea
+    Next Video Interval: Hurrengo bideo tartea
     Screenshot:
       Enable: Bidea eman pantaila argazkiei
       Error:
@@ -452,9 +441,8 @@ Settings:
     Video Playback Rate Interval: Bideo Erreprodukzio-tasa tartea
     Skip by Scrolling Over Video Player: Saltatu bideo-erreproduzitzailean korrituz
     Enter Fullscreen on Display Rotate: Sartu pantaila osoko pantaila biratu pantailan
-    Autoplay Interruption Timer: Erreprodukzio automatikoa eteteko tenporizadorea
   Privacy Settings:
-    Privacy Settings: 'Pribatutasuna'
+    Privacy Settings: 'Pribatutasunari buruzko ezarpenak'
     Remember History: 'Historikoa oroitu'
     Save Watched Progress: 'Ikusitakoaren progresioa gorde'
     Clear Search Cache: 'Bilaketen cachea ezabatu'
@@ -476,16 +464,16 @@ Settings:
     Are you sure you want to remove all your playlists?: Ziur erreprodukzio-zerrenda
       guztiak kendu nahi dituzula?
   Subscription Settings:
-    Subscription Settings: 'Harpidetza'
+    Subscription Settings: 'Harpidetzen ezarpenak'
     Hide Videos on Watch: 'Ikusten ari zaren bideoa ezkutatu'
     Fetch Feeds from RSS: 'RSS jarioak eskuratu'
+    Manage Subscriptions: 'Harpidetzak kudeatu'
     Fetch Automatically: Eskuratu jarioa automatikoki
+    Only Show Latest Video for Each Channel: Erakutsi soilik kanal bakoitzeko azken
+      bideoa
     Confirm Before Unsubscribing: Saihestu ustekabeko harpidetza kentzea
-    'Limit the number of videos displayed for each channel': Mugatu kanal bakoitzeko
-      bistaratzen diren bideo kopurua
-    To: Hona
   Distraction Free Settings:
-    Distraction Free Settings: 'Oharkabetasunik ez'
+    Distraction Free Settings: 'Oharkabetasunak ekiditeko ezarpenak'
     Hide Video Views: 'Bideoen ikustaldi kopurua ezkutatu'
     Hide Video Likes And Dislikes: 'Bideoen atsegiteak eta desatsegiteak ezkutatu'
     Hide Channel Subscribers: 'Kanalaren harpidedun kopurua ezkutatu'
@@ -510,21 +498,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Bistaratu izenburuak gehiegizko
       letra larriz eta puntuaziorik gabe
     Hide Channels Placeholder: Kanalaren IDa
-    Hide Channel Playlists: Ezkutatu kanaleko "erreprodukzio-zerrendak" fitxa
-    Hide Channel Community: Ezkutatu kanalaren "komunitatea" fitxa
-    Hide Channel Podcasts: Ezkutatu kanaleko "podcastak" fitxa
+    Hide Channel Playlists: Ezkutatu kanaleko erreprodukzio-zerrendak
+    Hide Channel Community: Ezkutatu kanalaren komunitatea
+    Hide Channel Podcasts: Ezkutatu kanaleko podcastak
     Hide Videos and Playlists Containing Text: Ezkutatu testua duten bideoak eta erreprodukzio-zerrendak
     Hide Channels: Ezkutatu bideoak kanaletatik
     Hide Upcoming Premieres: Ezkutatu datozen estreinaldiak
     Hide Subscriptions Videos: Ezkutatu harpidetza-bideoak
     Hide Subscriptions Shorts: Ezkutatu bideo laburren harpidetzak
-    Hide Channel Releases: Ezkutatu kanalen "Argitalpenak" fitxa
+    Hide Channel Releases: Ezkutatu kanalen kaleratzeak
     Hide Chapters: Ezkutatu kapituluak
     Hide Channels Invalid: Emandako kanalaren IDa baliogabea da
     Hide Channels API Error: Errore bat gertatu da emandako IDa duen erabiltzailea
       berreskuratzean. Mesedez, egiaztatu berriro IDa zuzena den.
     Hide Channels Already Exists: Kanalaren IDa badago jada
-    Hide Channel Shorts: Ezkutatu kanalaren "bideo laburrak" fitxa
+    Hide Channel Shorts: Ezkutatu kanalaren bideo laburrak
     Hide Videos and Playlists Containing Text Placeholder: Hitza, Hitzaren zatia edo
       esaldia
     Hide Subscriptions Live: Ezkutatu zuzenekoen harpidetzak
@@ -532,12 +520,15 @@ Settings:
     Hide Featured Channels: Ezkutatu nabarmendutako kanalak
     Hide Channels Disabled Message: Kanal batzuk IDa erabiliz blokeatu dira eta ez
       dira prozesatu. Eginbidea blokeatuta dago ID horiek eguneratzen ari diren bitartean
-    Hide Channel Home: Ezkutatu kanala "Hasierako" fitxa
   Data Settings:
-    Data Settings: 'Datuak'
+    Data Settings: 'Datuen ezarpenak'
     Select Import Type: 'Hautatu Inportazio mota'
     Select Export Type: 'Hautatu esportazio mota'
     Import Subscriptions: 'Harpidetzak inportatu'
+    Import FreeTube: 'Freetube inportatu'
+    Import YouTube: 'Youtubetik inportatu'
+    Import NewPipe: 'Newpipetik inportatu'
+    Check for Legacy Subscriptions: 'Legacy harpidetzak bilatu'
     Export Subscriptions: 'Harpidetzak esportatu'
     Export FreeTube: 'Freetubera esportatu'
     Export YouTube: 'Youtubera esportatu'
@@ -587,7 +578,7 @@ Settings:
         bertsio zaharra eta inportatu esportatutako erreprodukzio-zerrendak.\""
     Subscription File: Harpidetza Fitxategia
   Proxy Settings:
-    Proxy Settings: 'Proxy-a'
+    Proxy Settings: 'Proxy-aren ezarpenak'
     Enable Tor / Proxy: 'Tor / Proxy ahalbidetu'
     Proxy Protocol: 'Proxy protokoloa'
     Proxy Host: 'Proxy ostalaria'
@@ -603,14 +594,10 @@ Settings:
     Error getting network information. Is your proxy configured properly?: 'Errore
       bat gertatu da sareko informazioa eskuratzean. Zure proxya behar bezala konfiguratuta
       al dago?'
-    Proxy Warning: FreeTube-k ez du proxy-rik, baina kanpoko proxy batera konekta
-      daiteke, adibidez, zure makinan Tor gisa exekutatzen den bat edo kanpoko proxy
-      bat, VPN batzuek emandako proxy bat bezala. Aktibatuta badago, ziurtatu proxy/Tor
-      behar bezala konfiguratuta dagoela, edo FreeTube-k ezingo du daturik lortu.
   External Player Settings:
     Ignore Unsupported Action Warnings: Onartu gabeko ekintzen oharrei ez ikusiarena
       egin
-    External Player Settings: Kanpoko erreproduzitzailea
+    External Player Settings: Kanpoko erreproduzitzailearen ezarpenak
     External Player: Kanpoko erreproduzitzailea
     Custom External Player Executable: Lehenetsitako kanpo erreproduzitzailea exekutagarria
     Custom External Player Arguments: Lehenetsitako kanpo erreproduzitzailea argudioak
@@ -619,7 +606,7 @@ Settings:
       None:
         Name: Bat ere ez
   Download Settings:
-    Download Settings: Deskargak
+    Download Settings: Deskargen ezarpenak
     Ask Download Path: Deskargaren ibilbidea galdetu
     Choose Path: Ibilbidea hautatu
     Download Behavior: Deskargen portaera
@@ -638,7 +625,7 @@ Settings:
     Enable SponsorBlock: Babesleak blokeatzea ahalbidetu
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Babesleak blokeatzeko
       API Url (lehenetsia https://sponsor.ajay.app da)
-    SponsorBlock Settings: Babesleak blokeatu
+    SponsorBlock Settings: Babesleak blokeatzeko ezarpenak
     UseDeArrowTitles: Erabili DeArrow bideo-izenburuak
     UseDeArrowThumbnails: Erabili DeArrow irudi txikietarako
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': DeArrow
@@ -646,7 +633,7 @@ Settings:
   Parental Control Settings:
     Show Family Friendly Only: Erakutsi familientzat aproposa dena bakarrik
     Hide Unsubscribe Button: Harpidetza kendu botoia ezkutatu
-    Parental Control Settings: Gurasoen kontrola
+    Parental Control Settings: Gurasoen kontrolaren ezarpenak
     Hide Search Bar: Bilaketa barra ezkutatu
   Password Dialog:
     Password: Pasahitza
@@ -655,21 +642,23 @@ Settings:
     Enter Password To Unlock: Sartu pasahitza ezarpenak desblokeatzeko
   Experimental Settings:
     Replace HTTP Cache: Ordeztu HTTP cachea
-    Experimental Settings: Esperimentalak
+    Experimental Settings: Ezarpen esperimentalak
     Warning: Ezarpen hauek esperimentalak dira, aktibatuta dauden bitartean hutsegiteak
       eragin ditzakete. Oso gomendagarria da babeskopiak egitea. Erabili zure ardurapean!
   Password Settings:
-    Password Settings: Pasahitza
+    Password Settings: Pasahitz ezarpenak
     Set Password To Prevent Access: Ezarri pasahitz bat ezarpenetara sarbidea galarazteko
     Remove Password: Pasahitza ezabatu
     Set Password: Ezarri pasahitza
+  Expand All Settings Sections: Zabaldu ezarpen guztien atalak
   Sort Settings Sections (A-Z): Ordenatu ezarpenen atalak (A-Z)
-  Return to Settings Menu: Ezarpenen menura itzuli
 About:
   #On About page
   About: 'Honi buruz'
   Beta: 'Beta'
   Source code: 'Kode iturria'
+  Licensed under the AGPLv3: 'AGPLv3 lizentziapean'
+  View License: 'Lizentzia ikusi'
   Downloads / Changelog: 'Deskargak / Aldaketen erregistroa'
   GitHub releases: 'Github argitalpenak'
   Help: 'Laguntza'
@@ -738,7 +727,7 @@ Profile:
     al zaude hautatutako kanalak ezabatu nahi dituzula? Honek ez du kanala beste profil
     batetik ezabatuko.'
 #On Channel Page
-  Profile Settings: Profila
+  Profile Settings: Profilaren ezarpenak
   Close Profile Dropdown: Itxi goitibeherako profila
   Open Profile Dropdown: Ireki goitibeherako profila
   Toggle Profile List: Aldatu profilen zerrenda
@@ -812,9 +801,6 @@ Channel:
     Podcasts: Podcastak
     This channel does not currently have any podcasts: Une honetan kanal honek ez
       du podcastik
-  Home:
-    Home: Menu nagusia
-    View Playlist: Ikusi Erreprodukzio zerrenda
 Video:
   Mark As Watched: 'Ikusitako gisa jarri'
   Remove From History: 'Historikotik ezabatu'
@@ -864,10 +850,39 @@ Video:
   video only: 'Bideoa soilik'
   audio only: 'Audioa soilik'
   Published:
+    Jan: 'Urtarrila'
+    Feb: 'Otsaila'
+    Mar: 'Martxoa'
+    Apr: 'Apirila'
+    May: 'Maiatza'
+    Jun: 'Ekaina'
+    Jul: 'Uztaila'
+    Aug: 'Abuztua'
+    Sep: 'Iraila'
+    Oct: 'Urria'
+    Nov: 'Azaroa'
+    Dec: 'Abendua'
+    Second: 'Segundua'
+    Seconds: 'Segundoak'
+    Minute: 'Minutua'
+    Minutes: 'Minutuak'
+    Hour: 'Ordua'
+    Hours: 'Orduak'
+    Day: 'Eguna'
+    Days: 'Egunak'
+    Week: 'Astea'
+    Weeks: 'Asteak'
+    Month: 'Hilabetea'
+    Months: 'Hilabeteak'
+    Year: 'Urtea'
+    Years: 'Urteak'
+    Ago: 'Duela'
+    Upcoming: 'Estreinaldiak'
     In less than a minute: Minutu bat baino gutxiagoan
   Published on: 'Noiz argitaratua'
   Streamed on: 'Noiz zuzenean emana'
   Started streaming on: 'Noiz hasi zen zuzenekoa'
+  Publicationtemplate: 'Duela {number} {unit}'
 #& Videos
   External Player:
     Unsupported Actions:
@@ -933,17 +948,6 @@ Video:
     Playback will resume automatically when your connection comes back: Erreprodukzioa
       automatikoki berrekingo da konexioa itzultzen denean.
     Full Window: Pantaila osoa
-  MembersOnly: Kideentzat baino ez diren bideoak ezin dira FreeTube-rekin ikusi, Googleren
-    saioa hastea eta eduki sortzailearen kanalari ordaindutako bazkidetza eskatzen
-    baitute.
-  Unlisted: Zerrendatugabeak
-  AgeRestricted: Adin muga duten bideoak ezin dira FreeTube-rekin ikusi, Googlen saioa
-    hasi eta adinak egiaztatutako YouTube-ko kontu bat erabili behar delako.
-  IP block: YouTubek bideoak ikusteko zure IP helbidea blokeatu du. Mesedez, saiatu
-    VPN edo proxy desberdin batera aldatzen.
-  DeArrow:
-    Show Original Details: Erakutsi jatorrizko xehetasunak
-    Show Modified Details: Erakutsi aldatutako xehetasunak
 Videos:
   #& Sort By
   Sort By:
@@ -954,6 +958,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ikusi erreprodukzio-zerrenda osoa'
+  Videos: 'Bideoak'
+  View: 'Ikusi'
+  Views: 'Ikustaldiak'
   Last Updated On: 'Azkenengoz eguneratua'
 
 # On Video Watch Page
@@ -969,8 +976,7 @@ Playlist:
     VideoTitleDescending: Izenburua (Z-A)
     AuthorAscending: Egilea (A-Z)
     AuthorDescending: Egilea (Z-A)
-    VideoDurationDescending: Iraupena (luzeenetik laburrenera)
-    VideoDurationAscending: Iraupena (laburrenetik luzeenera)
+Toggle Theatre Mode: 'Aldatu Antzerki modura'
 Change Format:
   Change Media Formats: 'Bideoen formatuak aldatu'
   Use Dash Formats: 'DASH formatuak erabili'
@@ -1054,9 +1060,6 @@ Tooltips:
     External Link Handling: "Lehenetsitako portaera hautatu, Freetube-n ireki ezin
       den esteka bat klikatua izan denean.\nLehentasunez, Freetube-k lehenetsitako
       nabigatazailean irekiko du klikatutako esteka.\n"
-    Open Deep Links In New Window: FreeTube-ra pasatzen diren URLak, birbideratzeko
-      arakatzailearen luzapenek edo komando-lerroko argumentuek, leiho berri batean
-      irekiko dira.
   Player Settings:
     Proxy Videos Through Invidious: 'Bideoak hornitzeko Invidious-era konektatuko
       da, YouTube-ra zuzeneko konexioa egin beharrean.'
@@ -1073,9 +1076,10 @@ Tooltips:
     Skip by Scrolling Over Video Player: Erabili korritze-gurpila bideoa saltatzeko,
       MPV estiloa.
   Subscription Settings:
-    Fetch Feeds from RSS: 'Gaituta dagoenean, FreeTube-k RSS erabiliko du zure harpidetza-elikadurari
-      eusteko. RSSa azkarragoa da eta IP blokeoa saihesten du, baina ez du informaziorik
-      ematen, hala nola bideoaren iraupena, zuzeneko egoera edo komunitateko mezuak'
+    Fetch Feeds from RSS: 'Posible denean, Freetube-k bere lehenetsitako metodoa erabili
+      beharrean RSS-ak baliatuko ditu zure harpidetzen jariora konektatzeko. RSS arinagoa
+      izateaz gain, IP-en blokeoak saihesten ditu. Aldiz, zuzenekoaren egoeraren edo
+      bideoaren iraupenaren informaziorik ez du ematen, besteak beste'
     Fetch Automatically: Gaituta dagoenean, FreeTubek automatikoki eskuratuko du zure
       harpidetza-jarioa leiho berri bat irekitzen denean eta profila aldatzean.
 
@@ -1091,7 +1095,7 @@ Tooltips:
       zerrenda (posible bada) irekitzerakoan, ikono bat agertuko da miniaturan. Kontuz,
       Individious-en ezarpenek ez dituzte kanpo erreproduzitzaileak trabatzen.
     Custom External Player Arguments: Komando-lerroko argumentu pertsonalizatuak,
-      kanpoko erreproduzitzailera pasatzea nahi duzu.
+      puntu eta komaz bereizita (';'), kanpoko erreproduzitzailera pasatzea nahi duzu.
     Ignore Default Arguments: Ez bidali argumentu lehenetsirik kanpoko erreproduzitzaileari
       bideoaren URLaz gain (adibidez, erreprodukzio-tasa, erreprodukzio-zerrendaren
       URLa, etab.). Argumentu pertsonalizatuak transmitituko dira oraindik.
@@ -1123,6 +1127,7 @@ Falling back to Local API: 'Tokiko APIra itzultzen'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Bideo
   hau ez dago erabilgarri, zenbait formatu eskas baitira. Honakoa zure herrialdean
   erabilgarri ez dagoelako gerta daiteke.'
+Subscriptions have not yet been implemented: 'Harpidetzak ez dira oraindik aktibatu'
 Loop is now disabled: 'Etengabeko erreprodukzioa desaktibatu egin da'
 Loop is now enabled: 'Etengabeko ereprodukzioa aktibatu egin da'
 Shuffle is now disabled: 'Erreprodukzioen nahasketak desaktibatu egin dira'
@@ -1153,6 +1158,8 @@ External link opening has been disabled in the general settings: Kanpo estekak i
 Downloading has completed: '"{videoTitle}" deskargatu egin da'
 Unknown YouTube url type, cannot be opened in app: Youtube-ko URL mota ezezaguna,
   ezin da aplikazioan ireki
+Hashtags have not yet been implemented, try again later: Etiketak ez dira oraindik
+  aktibatu, berriz ere saiatu zaitez beranduago
 Downloading failed: Akats bat gertatu da "{videoTitle}" deskargatzerakoan
 Screenshot Success: Pantaila-argazkia gode da "{filePath}" gisa
 Screenshot Error: Pantaila-argazkiak huts egin du. {error}
@@ -1162,6 +1169,8 @@ Channels:
   Channels: Kanalak
   Title: Kanalen zerrenda
   Search bar placeholder: Kanalak bilatu
+  Unsubscribe: Harpidetza kendu
+  Unsubscribed: '{channelName} zure harpidetzen zerrendatik ezabatu da'
   Unsubscribe Prompt: Ziur al zaude "{channelName}"-ren harpidetza kendu nahi duzula?
   Count: '{number} kanal aurkitu dira.'
   Empty: Zure kanalen zerrenda hutsik da.
@@ -1190,7 +1199,6 @@ Chapters:
   Chapters: Kapituluak
   'Chapters list visible, current chapter: {chapterName}': 'Kapituluen zerrenda ikusgai,
     uneko kapitulua: {chapterName}'
-  Key Moments: Une garrantzitsuenak
 Hashtag:
   Hashtag: Traola
   This hashtag does not currently have any videos: Traola honek ez du bideorik une
@@ -1214,26 +1222,5 @@ Search Listing:
     4K: 4K
     Subtitles: Azpitituluak
     Closed Captions: Azpititulu deskriptiboak
-    8K: 8K
-    VR180: VR180
-    360 Video: 360º
-    New: Berria
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Insegurua izan daitekeen URLa irekitzea
   blokeatu da: "{url}".'
-Keys:
-  arrowleft: Gezia ezkerrera
-  arrowright: Gezia eskuinera
-  arrowup: Gezia gora
-  arrowdown: Gezia behera
-  alt: Alt
-  ctrl: Ctrl
-shortcutJoinOperator: +
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Right-click or hold to see history: Egin klik eskuineko botoiarekin edo mantendu sakatuta
-  historia ikusteko
-Autoplay Interruption Timer: Erreprodukzio automatikoa bertan behera utzi da {autoplayInterruptionIntervalHours}
-  orduz geldirik egon delako
-Description:
-  Collapse Description: Gutxiago erakutsi
-  Expand Description: '...gehiago'
diff --git a/static/locales/fa.yaml b/static/locales/fa.yaml
index a45984c378042..c918fe849ac85 100644
--- a/static/locales/fa.yaml
+++ b/static/locales/fa.yaml
@@ -78,18 +78,14 @@ Search Filters:
     4K: ۴کی
     HD: وضوح‌بالا
     Creative Commons: کرییتیو کامنز
-    VR180: VR180
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'دنبال کرده ها'
   Latest Subscriptions: 'اخرین دنبال کرده ها'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'این
     پروفایل تعداد زیادی اشتراک دارد. اجبار RSS برای جلوگیری از محدودیت نرخ'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'لیست
-    اشتراک شما در حال حاضر خالی است. اضافه کردن اشتراک‌ها را برای مشاهده آنها در اینجا
-    شروع کنید. اگر می‌خواهید اشتراک‌های خود را وارد کنید، می‌توانید به تنظیمات داده
-    رفته و وارد کردن اشتراک‌ها را انتخاب کنید یا می‌توانید کانالی را جستجو کرده و
-    در آن‌ها مشترک شوید.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'چیزی
+    دنبال نکرده اید.شروع به افزودن دنبال کننده ها کنید تا اینجا نشان داده شوند.'
   'Getting Subscriptions. Please wait.': 'درحال گرفتن دنبال کرده ها.لطفا صبر کنید.'
   Refresh Subscriptions: 'تازه سازی دنبال کرده ها'
   Load More Videos: 'بارگیری ویدیو های بیشتر'
@@ -115,9 +111,15 @@ Most Popular: 'پر طرفدارترین ها'
 Playlists: 'لیست های پخش'
 User Playlists:
   Your Playlists: 'لیست های پخش شما'
+  Playlist Message: 'این صفحه، فهرست پخشی را نمایش میدهد که هنوز تکمیل نشده و در حال
+    کار میباشد. در اینجا فقط ویدیو هایی که ذخیره شده اند یا موردعلاقه اند را می بینید.
+    وقتی که عملیات تکمیل شد، این ویدیوها به بخش فهرت پخش «مورد علاقه ها» منتقل خواهند
+    شد.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'ویدیوی
+    ذخیره شده ای ندارید.بر روی دکمه ذخیره در گوشه ویدیو کلیک کنید تا اینجا لیست شوند'
   Search bar placeholder: جستجو برای فهرست های پخش
-  Empty Search Message: هیچ ویدیویی در این لیست پخش وجود ندارد که با جستجوی شما مطابقت
-    داشته باشد
+  Empty Search Message: هیچ ویدیویی در این فهرست پخش وجود ندارد که با جستجوی شما مطابق
+    باشد
   Cancel: لغو
   Remove from Playlist: پاک کردن از فهرست پخش
   Playlist Name: نام فهرست پخش
@@ -136,109 +138,17 @@ User Playlists:
   Remove Duplicate Videos: حذف ویدیوهای تکراری
   AddVideoPrompt:
     Save: ذخیره کنید
-    Search in Playlists: جستجو در لیست‌های پخش
-    Allow Adding Duplicate Video(s): اجازه افزودن ویدیو(های) تکراری
-    Toast:
-      "{videoCount} video(s) added to {playlistCount} playlists": 1 ویدیو به {playlistCount}
-        لیست پخش اضافه شد | {videoCount} ویدیو به {playlistCount} لیست پخش اضافه شد
-      You haven't selected any playlist yet.: هنوز هیچ لیست پخشی را انتخاب نکرده‌اید.
-      "{videoCount} video(s) added to 1 playlist": 1 ویدیو به 1 لیست پخش اضافه شد
-        | {videoCount} ویدیو به 1 لیست پخش اضافه شد
-    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
-      ویدیو از قبل اضافه شده'
-    N playlists selected: '{playlistCount} انتخاب شد'
-    Added {count} Times: قبلا اضافه شده | {count} بار اضافه شد
-    Select a playlist to add your N videos to: یک لیست پخش برای افزودن ویدیوی خود
-      به | انتخاب کنید یک لیست پخش برای افزودن ویدیوهای {videoCount} خود انتخاب کنید
-      در
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
-      ویدیو اضافه خواهند شد'
   SinglePlaylistView:
     Toast:
       Video has been removed: ویدیو حذف شده است
       There was a problem with removing this video: در حذف این ویدیو مشکلی وجود داشت
-      This playlist is now used for quick bookmark: این لیست پخش اکنون برای نشانک
-        سریع استفاده می‌شود
-      Some videos in the playlist are not loaded yet. Click here to copy anyway.: برخی
-        از ویدیوها در لیست پخش هنوز بارگیری نشده اند. به هر حال برای کپی اینجا کلیک
-        کنید.
-      "{videoCount} video(s) have been removed": 1 ویدئو حذف شد | {videoCount} ویدیو
-        حذف شد
-      Playlist {playlistName} has been deleted.: فهرست پخش {playlistName} حذف شد.
-      Playlist {playlistName} is the new quick bookmark playlist.: لیست پخش {playlistName}
-        یک فهرست پخش نشانک سریع جدید است.
-      This video cannot be moved up.: این ویدئو را نمی‌توان به بالا منتقل کرد.
-      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: این
-        لیست پخش اکنون برای نشانک سریع به جای {oldPlaylistName} استفاده می شود. برای
-        لغو اینجا را کلیک کنید
-      This playlist is already being used for quick bookmark.: این لیست پخش در حال
-        حاضر برای نشانک سریع استفاده می شود.
-      Playlist name cannot be empty. Please input a name.: نام لیست پخش نمی تواند
-        خالی باشد. لطفا یک نام وارد کنید.
-      There were no videos to remove.: هیچ ویدیویی برای حذف وجود نداشت.
-      This playlist is protected and cannot be removed.: این لیست پخش محافظت می‌شود
-        و نمی‌توان آن را حذف کرد.
-      This video cannot be moved down.: این ویدئو را نمی‌توان به پایین منتقل کرد.
-      Playlist has been updated.: لیست پخش به روز شد.
-      There was an issue with updating this playlist.: مشکلی در به‌روزرسانی این لیست
-        پخش وجود داشت.
-      This playlist does not exist: این لیست پخش وجود ندارد
-      Reverted to use {oldPlaylistName} for quick bookmark: به استفاده از {oldPlaylistName}
-        برای نشانک‌گذاری سریع بازگردد
-      This playlist has a video with a duration error: این لیست پخش شامل حداقل یک
-        ویدیو است که مدت زمان ندارد، به گونه‌ای مرتب می‌شود که گویی مدت زمان آنها
-        صفر است.
-    Search for Videos: جستجوی ویدئوها
-  Sort By:
-    EarliestUpdatedFirst: اولین به روز شده
-    LatestUpdatedFirst: به تازگی به روز شده
-    NameAscending: آ-ی
-    NameDescending: ی-آ
-    LatestCreatedFirst: به تازگی ایجاد شده
-    Sort By: مرتب‌کردن بر اساس
-    LatestPlayedFirst: اخیراً پخش شده
-    EarliestPlayedFirst: اولین پخش شده
-    EarliestCreatedFirst: قدیمی ترین ایجاد شده
-  CreatePlaylistPrompt:
-    Toast:
-      Playlist {playlistName} has been successfully created.: لیست پخش {playlistName}
-        با موفقیت ایجاد شد.
-      There is already a playlist with this name. Please pick a different name.: از
-        قبل یک فهرست پخش با این نام وجود دارد. لطفا نام دیگری انتخاب کنید.
-      There was an issue with creating the playlist.: مشکلی در ایجاد لیست پخش وجود
-        داشت.
-    New Playlist Name: نام لیست پخش جدید
-    Create: ایجاد
-  You have no playlists. Click on the create new playlist button to create a new one.: شما
-    هیچ لیست پخشی ندارید. بر روی دکمه ایجاد لیست پخش جدید کلیک کنید تا لیست پخش جدیدی
-    ایجاد شود.
-  Export Playlist: صادر کردن این لیست پخش
-  The playlist has been successfully exported: لیست پخش با موفقیت صادر شد
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: آیا
-    مطمئنید که می خواهید 1 ویدیوی تماشا شده را از این لیست پخش حذف کنید؟ این قابل
-    واگرد نیست. | آیا مطمئن هستید که می خواهید {playlistItemCount} ویدیو تماشا شده
-    را از این لیست پخش حذف کنید؟ این قابل واگرد نیست.
-  Cannot delete the quick bookmark target playlist.: نمی توان لیست پخش مورد نظر نشانک
-    سریع را حذف کرد.
-  Are you sure you want to delete this playlist? This cannot be undone: آیا مطمئن
-    هستید که می خواهید این لیست پخش را حذف کنید؟ این قابل واگرد نیست.
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: آیا
-    مطمئنید که می‌خواهید 1 ویدیوی تکراری را از این فهرست پخش حذف کنید؟ این قابل واگرد
-    نیست. | آیا مطمئنید که می خواهید {playlistItemCount} ویدیو تکراری را از این لیست
-    پخش حذف کنید؟ این قابل واگرد نیست.
-  Copy Playlist: رونوشت لیست‌پخش
-  Enable Quick Bookmark With This Playlist: فعال کردن نشانک سریع با این لیست پخش
-  Quick Bookmark Enabled: نشانک سریع فعال شد
-  Delete Playlist: حذف لیست پخش
 History:
   # On History Page
   History: 'تاریخچه'
   Watch History: 'تاریخچه تماشا'
   Your history list is currently empty.: 'تاریخچه شما در حال حاضر خالی است.'
   Search bar placeholder: جستجو در تاریخچه
-  Empty Search Message: هیچ ویدیویی در سابقه شما وجود ندارد که با جستجوی شما مطابقت
-    داشته باشد
-  Case Sensitive Search: جستجوی حساس به حروف کوچک و بزرگ
+  Empty Search Message: هیچ ویدیویی در تاریخچه وجود ندارد که با جستجوی شما مطابق باشد
 Settings:
   # On Settings Page
   Settings: 'تنظیمات'
@@ -246,7 +156,7 @@ Settings:
     نرم افزار نیاز به راه اندازی دوباره دارد تا تغییرات لحاظ شوند. تغییرات ذخیره و
     راه اندازی شود؟'
   General Settings:
-    General Settings: 'عمومی'
+    General Settings: 'تنظیمات عمومی'
     Check for Updates: 'بررسی برای به روزرسانی ها'
     Check for Latest Blog Posts: 'بررسی آخرین مطالب وبلاگ'
     Fallback to Non-Preferred Backend on Failure: 'بازگشت به Backend غیر ترجیحی در
@@ -270,7 +180,6 @@ Settings:
       Middle: 'وسط'
       End: 'انتها'
       Hidden: مخفی
-      Blur: تاری
     Current Invidious Instance: 'نمونه فعلی Invidious'
     The currently set default instance is {instance}: 'در حال حاضر نمونه Invidious
       پیشفرض {instance} است'
@@ -287,13 +196,8 @@ Settings:
       Ask Before Opening Link: پرسیدن قبل از باز کردن لینک
       No Action: کاری نکردن
       External Link Handling: اداره کردن لینک های خارجی
-    Auto Load Next Page:
-      Label: بارگذاری خودکار صفحه بعدی
-      Tooltip: صفحات و نظرات اضافی را به صورت خودکار بارگیری کنید.
-    Open Deep Links In New Window: نشانی های ارسال شده به FreeTube را در یک پنجره
-      جدید باز کنید
   Theme Settings:
-    Theme Settings: 'طرح'
+    Theme Settings: 'تنظیمات قالب'
     Match Top Bar with Main Color: 'یکسان سازی قطعه بالا با رنگ اصلی'
     Expand Side Bar by Default: 'گسترش ستون فرعی به صورت پیشفرض'
     Disable Smooth Scrolling: 'غیرفعال کردن حرکت ملایم'
@@ -308,11 +212,6 @@ Settings:
       Catppuccin Mocha: مجموعه رنگ کتپوسین موکا
       Hot Pink: صورتی داغ
       Pastel Pink: صورتی پاستلی
-      Solarized Dark: درخشش تاریک
-      Solarized Light: درخشش روشن
-      Gruvbox Dark: جعبه تیره تاریک
-      Gruvbox Light: جعبه تیره روشن
-      Nordic: شمال اروپا
     Main Color Theme:
       Main Color Theme: 'رنگ تم اصلی'
       Red: 'قرمز'
@@ -352,30 +251,12 @@ Settings:
       Catppuccin Mocha Peach: هلویی
       Catppuccin Mocha Yellow: کتپوسین موکا زرد
       Catppuccin Mocha Green: کتپوچین موکا سبز
-      Gruvbox Light Orange: جعبه‌تیره نارنجی روشن
-      Solarized Cyan: فیروزه‌ای درخشان
-      Solarized Orange: نارنجی درخشان
-      Solarized Red: قرمز درخشان
-      Solarized Violet: بنفش درخشان
-      Solarized Blue: آبی درخشان
-      Solarized Magenta: سرخابی درخشان
-      Solarized Green: سبز درخشان
-      Gruvbox Dark Yellow: جعبه‌تیره زرد
-      Gruvbox Dark Blue: جعبه‌تیره آبی
-      Gruvbox Dark Aqua: جعبه‌تیره آسمانی
-      Gruvbox Dark Purple: جعبه‌تیره ارغوانی
-      Gruvbox Dark Orange: جعبه‌تیره نارنجی
-      Gruvbox Light Red: جعبه‌تیره قرمز
-      Solarized Yellow: زرد درخشان
-      Gruvbox Dark Green: جعبه‌تیره سبز
-      Gruvbox Light Blue: جعبه‌تیره آبی روشن
-      Gruvbox Light Purple: جعبه‌تیره ارغوانی روشن
     Secondary Color Theme: 'رنگ دوم تم'
         #* Main Color Theme
     Hide Side Bar Labels: مخفی کردن عنوان های ستون فرعی
     Hide FreeTube Header Logo: لوگوی سربرگ FreeTube را مخفی کنید
   Player Settings:
-    Player Settings: 'پخش کننده'
+    Player Settings: 'تنظیمات پخش کننده'
     Play Next Video: 'پخش ویدیو بعدی'
     Turn on Subtitles by Default: 'فعال کردن زیرنویس به عنوان پیشفرض'
     Autoplay Videos: 'پخش خودکار ویدیو ها'
@@ -384,7 +265,7 @@ Settings:
     Enable Theatre Mode by Default: 'فعال کردن حالت تئاتر به عنوان پیشفرض'
     Scroll Volume Over Video Player: 'کنترل صدا با حرکت اسکرول موس روی پخش کننده ویدیو'
     Display Play Button In Video Player: 'نمایش دکمه پخش داخل پخش کننده ویدیو'
-    Next Video Interval: 'تایمر شمارش معکوس پخش خودکار'
+    Next Video Interval: 'بازه زمانی ویدیو بعدی'
     Fast-Forward / Rewind Interval: 'بازه زمانی جلو / عقب رفتن سریع'
     Default Volume: 'میزان صدای پیشفرض'
     Default Playback Rate: 'سرعت پخش پیشفرض'
@@ -426,9 +307,8 @@ Settings:
       Folder Label: پوشه اسکرین شات
       Folder Button: پوشه را انتخاب کنید
     Skip by Scrolling Over Video Player: با پیمایش روی پخش‌کننده ویدیو از آن بگذرید
-    Autoplay Interruption Timer: تایمر وقفه پخش خودکار
   External Player Settings:
-    External Player Settings: 'پخش کننده خارجی'
+    External Player Settings: 'تنظیمات پخش کننده خارجی'
     External Player: 'پخش کننده خارجی'
     Ignore Unsupported Action Warnings: 'به اخطارهای فعالیت پشتیبانی نشده اهمیت نده'
     Custom External Player Executable: 'پخش کننده خارجی شخصی سازی شده قابل اجرا'
@@ -436,9 +316,8 @@ Settings:
     Players:
       None:
         Name: هیچ کدام
-    Ignore Default Arguments: نادیده گرفتن برهان های پیش فرض
   Privacy Settings:
-    Privacy Settings: 'امنیتی'
+    Privacy Settings: 'تنظیمات امنیتی'
     Remember History: 'حفظ تاریخچه'
     Save Watched Progress: 'ذخیره ویدیو های دیده شده'
     Clear Search Cache: 'پاک کردن کش جستجو'
@@ -455,21 +334,14 @@ Settings:
       نیست.'
     Save Watched Videos With Last Viewed Playlist: ویدئوهای تماشا شده را با لیست پخش
       آخرین مشاهده ذخیره کنید
-    All playlists have been removed: تمام لیست های پخش حذف شد
-    Remove All Playlists: حذف تمام لیست های پخش
-    Are you sure you want to remove all your playlists?: آیا مطمئنید که می‌خواهید
-      همه فهرست‌های پخش خود را حذف کنید؟
   Subscription Settings:
-    Subscription Settings: 'دنبال شوندگان'
+    Subscription Settings: 'تنظیمات دنبال شوندگان'
     Hide Videos on Watch: 'مخفی کردن ویدیو ها هنگام تماشا'
     Fetch Feeds from RSS: 'دریافت feed ها از RSS'
+    Manage Subscriptions: 'سامان دهی دنبال شوندگان'
     Fetch Automatically: آوردن خودکار فید
-    Confirm Before Unsubscribing: تایید لغو اشتراک
-    'Limit the number of videos displayed for each channel': تعداد ویدیوهای نمایش
-      داده شده برای هر کانال را محدود کنید
-    To: به
   Distraction Free Settings:
-    Distraction Free Settings: 'اضافات مفید'
+    Distraction Free Settings: 'تنظیمات اضافی مفید'
     Hide Video Views: 'مخفی کردن دیده های ویدیو'
     Hide Video Likes And Dislikes: 'مخفی کردن لایک و دیسلایک های ویدیو'
     Hide Channel Subscribers: 'مخفی کردن دنبال کنندگان کانال'
@@ -480,7 +352,7 @@ Settings:
     Hide Playlists: 'مخفی کردن فهرست های پخش'
     Hide Live Chat: 'مخفی کردن چت لایو'
     Hide Active Subscriptions: 'مخفی کردن دنبال کنندگان فعال'
-    Hide Channel Playlists: '"لیست های پخش" کانال را مخفی کنید'
+    Hide Channel Playlists: لیست های پخش کانال را مخفی کنید
     Sections:
       Watch Page: صفحه تماشا
       Subscriptions Page: صفحه اشتراک ها
@@ -493,36 +365,28 @@ Settings:
     Hide Featured Channels: پنهان کردن کانال های ویژه
     Hide Comments: پنهان کردن نظرات
     Hide Profile Pictures in Comments: مخفی کردن تصاویر پروفایل در نظرات
-    Display Titles Without Excessive Capitalisation: نمایش عناوین بدون حروف بزرگ و
-      نقطه گذاری
+    Display Titles Without Excessive Capitalisation: نمایش عناوین بدون حروف بزرگ
     Hide Channels: پنهان کردن ویدیوها از کانال ها
     Hide Upcoming Premieres: مخفی کردن اولین نمایش های آینده
     Hide Chapters: پنهان کردن فصل ها
-    Hide Channels Placeholder: شناسه کانال
+    Hide Channels Placeholder: نام یا آیدی کانال
     Hide Subscriptions Live: مخفی کردن اشتراک های زنده
-    Hide Channel Community: مخفی کردن "انجمن" کانال
-    Hide Channel Shorts: مخفی کردن "ویدئو های کوتاه" کانال
+    Hide Channel Community: مخفی کردن انجمن کانال
+    Hide Channel Shorts: مخفی کردن شورت های کانال
     Hide Subscriptions Shorts: مخفی کردن شورت اشتراک ها
-    Hide Channel Podcasts: پنهان کردن "پادکست‌های" کانال
-    Hide Channel Releases: مخفی کردن "انتشارات" کانال
+    Hide Channel Podcasts: پنهان کردن پادکست های کانال
+    Hide Channel Releases: مخفی کردن انتشارات کانال
     Hide Sharing Actions: مخفی کردن فعالیت های مشترک
-    Hide Videos and Playlists Containing Text Placeholder: کلمه، بخش کلمه یا عبارت
-    Hide Channels Invalid: شناسه کانال ارائه شده نامعتبر بود
-    Hide Channels Already Exists: شناسه کانال از قبل وجود دارد
-    Hide Videos and Playlists Containing Text: ویدیوها و لیست های پخش حاوی متن را
-      مخفی کنید
-    Hide Subscriptions Community: مخفی کردن انجمن دنبال‌شده ها
-    Hide Channel Home: مخفی کردن "صفحه اصلی" کانال
-    Hide Channels API Error: خطای بازیابی کاربر با شناسه ارائه شده. لطفا دوباره بررسی
-      کنید که شناسه درست باشد.
-    Hide Channels Disabled Message: برخی از کانال‌ها با استفاده از شناسه مسدود شدند
-      و پردازش نشدند. در حالی که آن شناسه ها در حال به روز رسانی هستند، ویژگی مسدود
-      می شود
+    Blur Thumbnails: تار کردن ریز عکسها
   Data Settings:
-    Data Settings: 'داده ها'
+    Data Settings: 'تنظیمات اطلاعات'
     Select Import Type: 'انتخاب روش وارد کردن فایل بک آپ'
     Select Export Type: 'انتخاب روش پشتیبان گیری'
     Import Subscriptions: 'وارد کردن بک آپ دنبال شوندگان'
+    Import FreeTube: 'وارد کردن از FreeTube'
+    Import YouTube: 'وارد کردن از YouTube'
+    Import NewPipe: 'وارد کردن از NewPipe'
+    Check for Legacy Subscriptions: 'بررسی برای دنبال‌شوندگان قدیمی'
     Export Subscriptions: 'ذخیره (پشتیبان گیری)دنبال شوندگان'
     Export FreeTube: 'استخراج FreeTube'
     Export YouTube: 'استخراج YouTube'
@@ -562,14 +426,6 @@ Settings:
     Subscription File: فایل اشتراک
     Playlist insufficient data: داده ناکافی برای لیست پخش «{playlist}»، در حال رد
       شدن از مورد
-    Export Playlists For Older FreeTube Versions:
-      Tooltip: "این گزینه ویدئوها را از همه لیست های پخش به یک لیست پخش به نام \"
-        مورد علاقه\" صادر می کند.\nنحوه صادر کردن و وارد کردن ویدیوها در لیست پخش
-        برای نسخه قدیمی FreeTube:\n1. لیست های پخش خود را با فعال بودن این گزینه صادر
-        کنید.\n2. با استفاده از گزینه حذف تمام لیست‌های پخش در قسمت تنظیمات حریم خصوصی،
-        تمام لیست های پخش موجود خود را حذف کنید.\n3. نسخه قدیمی FreeTube را راه اندازی
-        کنید و لیست های پخش صادر شده را وارد کنید.\""
-      Label: صادر‌کردن لیست‌های پخش برای نسخه های قدیمی FreeTube
   Proxy Settings:
     Proxy Host: میزبان پروکسی
     Region: منطقه
@@ -577,7 +433,7 @@ Settings:
       دریافت اطلاعات شبکه. آیا پروکسی شما به درستی پیکربندی شده است؟
     Ip: آی پی
     Country: کشور
-    Proxy Settings: پروکسی
+    Proxy Settings: تنظیمات پروکسی
     Proxy Port Number: شماره پورت پروکسی
     Test Proxy: تست پروکسی
     Enable Tor / Proxy: پروکسی / تور را فعال کنید
@@ -586,11 +442,6 @@ Settings:
     Clicking on Test Proxy will send a request to: با کلیک بر روی تست پروکسی یک درخواست
       ارسال می شود
     Your Info: اطلاعات شما
-    Proxy Warning: FreeTube یک پروکسی داخلی ندارد اما می‌تواند به یک پروکسی خارجی
-      مانند پروکسی که روی دستگاه شما اجرا می‌شود مانند تور یا یک پراکسی خارجی مثل
-      یک پراکسی SOCKS5 که توسط برخی VPN‌ها ارائه می‌شود، متصل شود. در صورت فعال بودن،
-      مطمئن شوید که پروکسی/تور شما به درستی پیکربندی شده است، در غیر این صورت FreeTube
-      نمی تواند هیچ داده ای را واکشی کند.
   SponsorBlock Settings:
     Skip Options:
       Skip Option: گزینه پرش
@@ -599,19 +450,16 @@ Settings:
       Auto Skip: پرش خودکار
       Prompt To Skip: اعلان برای پرش
     Enable SponsorBlock: فعال کردن محدود کردن حامی
-    SponsorBlock Settings: محدود کردن حامی
+    SponsorBlock Settings: تنظیمات محدود کردن حامی
     Notify when sponsor segment is skipped: وقتی بخش حامی رد شد اطلاع دهید
     UseDeArrowTitles: از عنوان های ویدیویی DeArrow استفاده کنید
     Category Color: رنگ دسته
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       URL (پیش‌فرض https://sponsor.ajay.app است)
-    UseDeArrowThumbnails: استفاده از افزونه DeArrow برای ریز‌عکسها
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': رابط
-      آدرس سازنده ریز‌عکس DeArrow (پیش‌فرض https://dearrow-thumb.ajay.app است)
   Download Settings:
     Download in app: دانلود از طریق برنامه
     Open in web browser: در مرورگر وب باز کنید
-    Download Settings: بارگیری
+    Download Settings: تنظیمات دانلود
     Ask Download Path: هربار مسیر دانلود را سوال کند
     Choose Path: مکان ذخیره دانلود را انتخاب کنید
     Download Behavior: روش دانلود
@@ -619,15 +467,15 @@ Settings:
     Hide Unsubscribe Button: پنهان کردن دکمه لغو اشتراک
     Show Family Friendly Only: نمایش فقط دوستانه برای خانواده
     Hide Search Bar: پنهان کردن نوار جستجو
-    Parental Control Settings: کنترل والدین
+    Parental Control Settings: تنظیمات کنترل والدین
   Experimental Settings:
-    Experimental Settings: آزمایشی
+    Experimental Settings: تنظیمات آزمایشی
     Replace HTTP Cache: ‍کش HTTP را جایگزین کنید
     Warning: این تنظیمات آزمایشی هستند، ممکن است هنگام فعال بودن باعث خرابی شوند.
       تهیه نسخه پشتیبان به شدت توصیه می شود. با مسئولیت خود استفاده کنید!
   Password Settings:
     Remove Password: رمز عبور را حذف کنید
-    Password Settings: رمز عبور
+    Password Settings: تنظیمات رمز عبور
     Set Password To Prevent Access: برای جلوگیری از دسترسی به تنظیمات، رمز عبور تنظیم
       کنید
     Set Password: قراردادن رمز عبور
@@ -636,8 +484,6 @@ Settings:
     Enter Password To Unlock: برای باز کردن قفل تنظیمات رمز عبور را وارد کنید
     Password Incorrect: رمز عبور اشتباه است
     Unlock: باز کردن
-  Sort Settings Sections (A-Z): مرتب‌سازی بخش‌های تنظیمات (آ-ی)
-  Return to Settings Menu: بازگشت به منوی تنظیمات
 Channel:
   Playlists:
     Sort Types:
@@ -673,10 +519,6 @@ Channel:
     This channel currently does not have any posts: این کانال در حال حاضر هیچ پستی
       ندارد
     Hide Answers: پنهان کردن پاسخ ها
-    View Full Post: مشاهده کامل پست
-    Video hidden by FreeTube: ویدیو توسط FreeTube مخفی شده
-    Viewing Posts Only Supported By Invidious: مشاهده پست ها فقط توسط Invidious پشتیبانی
-      می شود. برای مشاهده محتوا بدون Invidious، به برگه انجمن کانال بروید.
   Removed subscription from {count} other channel(s): اشتراک از {count} کانال(های)
     دیگر حذف شد
   About:
@@ -707,9 +549,6 @@ Channel:
   Channel has been removed from your subscriptions: کانال از اشتراک های شما حذف شده
     است
   Added channel to your subscriptions: کانال به اشتراک های شما اضافه شد
-  Home:
-    View Playlist: نمایش لیست‌پخش
-    Home: خانه
 Video:
   External Player:
     video: ویدیو
@@ -727,6 +566,34 @@ Video:
     playlist: فهرست پخش
     OpeningTemplate: باز کردن {videoOrPlaylist} در {externalPlayer}...
   Published:
+    Sep: سپتامبر
+    Month: ماه
+    Months: ماه ها
+    Year: سال
+    May: می
+    Minute: دقیقه
+    Hours: ساعت ها
+    Day: روز
+    Weeks: هفته ها
+    Feb: فوریه
+    Hour: ساعت
+    Mar: مارس
+    Jul: ژوئیه
+    Jan: جان
+    Apr: آپریل
+    Jun: ژوئن
+    Aug: اوت
+    Oct: اکتبر
+    Nov: نوامبر
+    Dec: دسامبر
+    Second: دوم
+    Seconds: ثانیه ها
+    Minutes: دقیقه ها
+    Days: روزها
+    Week: هفته
+    Years: سالها
+    Ago: پیش
+    Upcoming: اولین نمایش در
     In less than a minute: در کمتر از یک دقیقه
   Copy Invidious Link: لینک Invidious را کپی کنید
   Play Previous Video: پخش ویدیوی قبلی
@@ -756,7 +623,7 @@ Video:
     است
   Download Video: دانلود ویدیو
   Open in YouTube: در یوتیوب باز کنید
-  Play Next Video: پخش ویدئوی بعدی
+  Play Next Video: پخش ویدیوی بعدی
   Open Channel in Invidious: کانال را در Invidious باز کنید
   Copy Invidious Channel Link: لینک کانال Invidious را کپی کنید
   Watched: دیده شده
@@ -773,6 +640,7 @@ Video:
   Streamed on: پخش جریانی
   Published on: منتشر شده در
   audio only: فقط صدا
+  Publicationtemplate: '{number} {unit} پیش'
   Video has been saved: ویدیو ذخیره شده است
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': گفتگوی
     زنده در حال حاضر با Invidious API پشتیبانی نمی شود. اتصال مستقیم به YouTube مورد
@@ -791,50 +659,6 @@ Video:
   Video has been marked as watched: ویدیو به عنوان تماشا شده علامت گذاری شده است
   Mark As Watched: علامت گذاری به عنوان تماشا شده
   Video has been removed from your history: ویدیو از سابقه شما حذف شده است
-  Player:
-    You appear to be offline: به نظر می رسد آفلاین هستید.
-    Exit Theatre Mode: خروج از حالت تئاتر
-    Stats:
-      Video ID: 'شناسه ویدئو: {videoId}'
-      Media Formats: 'فرمت ویدئو: {formats}'
-      Stats: اطلاعات
-      Resolution: 'وضوح: {width}x{height}@{frameRate}'
-      Bandwidth: 'پهنای باند: {bandwidth} کیلوبیت‌بر‌ثانیه'
-      Player Dimensions: 'ابعاد پخش کننده: {width}x{height}'
-      Bitrate: 'نرخ بیت: {bitrate} کیلوبیت‌بر‌ثانیه'
-      Buffered: 'بافر: {bufferedPercentage}%'
-      Volume: 'صدا: {volumePercentage}%'
-      CodecAudio: 'کدک: {audioCodec} ({audioItag})'
-      Dropped Frames / Total Frames: 'فریم‌های رد شده: {droppedFrames} / مجموع فریم‌ها:
-        {totalFrames}'
-      CodecsVideoAudio: 'کدک‌ها: {video Codec} ({video tag}) / {audio Codec} ({audio
-        Itag})'
-      CodecsVideoAudioNoItags: 'کدک‌ها: {video Codec} / {audio Codec}'
-    Take Screenshot: گرفتن عکس صفحه
-    Show Stats: نمایش اطلاعات
-    Skipped segment: بخش {segmentCategory} رد شد
-    TranslatedCaptionTemplate: '{language} (ترجمه شده از "{originalLanguage}")'
-    Hide Stats: مخفی کردن اطلاعات
-    Full Window: تمام‌صفحه
-    Exit Full Window: خروج از تمام‌صفحه
-    Playback will resume automatically when your connection comes back: با بازگشت
-      اتصال شما، پخش به طور خودکار از سر گرفته می شود.
-    Audio Tracks: تراک صوتی
-    Theatre Mode: حالت تئاتر
-  Hide Channel: مخفی‌کردن کانال
-  Pause on Current Video: توقف در ویدیو فعلی
-  IP block: YouTube آدرس نشانی شما را از تماشای ویدیو مسدود کرده است. لطفاً سعی کنید
-    به فیلترشکن یا پروکسی دیگری بروید.
-  More Options: گزینه‌های بیشتر
-  Unhide Channel: نمایش کانال
-  Unlisted: بدون لیست
-  MembersOnly: ویدیوهای مختص اعضا را نمی‌توان با FreeTube تماشا کرد زیرا به ورود Google
-    و عضویت پولی در کانال آپلودکننده نیاز دارند.
-  AgeRestricted: ویدیوهای دارای محدودیت سنی را نمی‌توان با FreeTube تماشا کرد، زیرا
-    نیاز به ورود به سیستم Google و استفاده از یک حساب YouTube تأیید شده برای سن دارند.
-  DeArrow:
-    Show Original Details: نمایش جزئیات اصلی
-    Show Modified Details: نمایش جزئیات اصلاح شده
 Tooltips:
   General Settings:
     External Link Handling: "وقتی روی پیوندی که در FreeTube باز نمی شود، روی آن کلیک
@@ -852,12 +676,9 @@ Tooltips:
     Preferred API Backend: پس زمینه ای را انتخاب کنید که FreeTube برای به دست آوردن
       داده ها استفاده می کند. API محلی یک استخراج کننده داخلی است. Invidious API برای
       اتصال به سرور Invidious نیاز دارد.
-    Open Deep Links In New Window: نشانی هایی که به FreeTube ارسال می شوند، مانند
-      پسوندهای مرورگر تغییر مسیر یا برهان های خط فرمان، در یک پنجره جدید باز می شوند.
   SponsorBlock Settings:
     UseDeArrowTitles: عناوین ویدیویی را با عناوین ارسال شده توسط کاربر از DeArrow
       جایگزین کنید.
-    UseDeArrowThumbnails: ریز عکسها را با ریز عکسهای DeArrow جایگزین کنید.
   Player Settings:
     Skip by Scrolling Over Video Player: از چرخ اسکرول برای رد شدن از ویدیو، سبک MPV
       استفاده کنید.
@@ -867,16 +688,16 @@ Tooltips:
       و نگه دارید و روی ماوس کلیک چپ کنید تا به سرعت به سرعت پخش پیش فرض برگردید (مگر
       اینکه در تنظیمات تغییر نکرده باشد).
     Proxy Videos Through Invidious: به جای اتصال مستقیم به YouTube، به Invidious متصل
-      می شود تا ویدیوها را ارائه دهد.
+      می شود تا ویدیوها را ارائه دهد. اولویت API را لغو می کند.
     Default Video Format: فرمت های مورد استفاده هنگام پخش ویدیو را تنظیم کنید. فرمت
       های DASH می توانند کیفیت های بالاتری را پخش کنند. فرمت های قدیمی به حداکثر 720p
       محدود می شوند اما از پهنای باند کمتری استفاده می کنند. فرمت های صوتی فقط جریان
       های صوتی هستند.
   Subscription Settings:
-    Fetch Feeds from RSS: هنگامی که فعال باشد، FreeTube از RSS به جای روش پیش فرض
+    Fetch Feeds from RSS: هنگامی که FreeTube فعال باشد، از RSS به جای روش پیش فرض
       خود برای گرفتن فید اشتراک شما استفاده می کند. RSS سریعتر است و از مسدود شدن
-      IP جلوگیری می کند، اما اطلاعات خاصی مانند مدت زمان ویدیو، وضعیت زنده یا پست
-      های انجمن را ارائه نمی دهد.
+      IP جلوگیری می کند، اما اطلاعات خاصی مانند مدت زمان ویدیو یا وضعیت زنده را ارائه
+      نمی دهد
     Fetch Automatically: هنگامی که فعال باشد، FreeTube به طور خودکار فید اشتراک شما
       را هنگام باز شدن یک پنجره جدید و هنگام تغییر نمایه دریافت می کند.
   External Player Settings:
@@ -886,24 +707,17 @@ Tooltips:
     DefaultCustomArgumentsTemplate: "(پیش‌فرض: '{defaultCustomArguments}')"
     Ignore Warnings: اخطارها را برای زمانی که پخش کننده خارجی فعلی از عملکرد فعلی
       پشتیبانی نمی کند (به عنوان مثال معکوس کردن لیست های پخش و غیره) حذف کنید.
-    Custom External Player Arguments: هر برهان خط فرمان سفارشی که می خواهید به پخش
-      کننده خارجی منتقل شود.
+    Custom External Player Arguments: هر آرگومان خط فرمان سفارشی، که با نقطه ویرگول
+      (';') از هم جدا شده اند، می خواهید به پخش کننده خارجی منتقل شوند.
     External Player: با انتخاب یک پخش کننده خارجی، نمادی برای باز کردن ویدیو (در صورت
       پشتیبانی لیست پخش) در پخش کننده خارجی، روی تصویر کوچک نمایش داده می شود. هشدار،
       تنظیمات ناخوشایند بر پخش کننده های خارجی تأثیر نمی گذارد.
-    Ignore Default Arguments: هیچ برهان پیش فرضی را به غیر از آدرس ویدیو به پخش کننده
-      خارجی ارسال نکنید (به عنوان مثال نرخ پخش، آدرس لیست پخش و غیره). برهان های سفارشی
-      همچنان منتقل خواهند شد.
   Distraction Free Settings:
-    Hide Subscriptions Live: این تنظیمات توسط تنظیم "{appWideSetting}" در سراسر برنامه،
-      در بخش "{subsection}" در "{settingsSection}" لغو شده است.
-    Hide Channels: یک شناسه کانال وارد کنید تا همه ویدیوها، لیست‌های پخش و خود کانال
-      در جستجو، پرطرفدار، محبوب‌ترین و توصیه‌شده‌ها ظاهر نشود. شناسه کانال وارد شده
-      باید کاملاً مطابقت داشته باشد و شامل حروف کوچک و بزرگ باشد.
-    Hide Videos and Playlists Containing Text: یک کلمه، قطعه کلمه یا عبارت (بدون حساسیت
-      به حروف کوچک) وارد کنید تا همه ویدیوها و فهرست‌های پخشی که عنوان اصلی آنها حاوی
-      آن در تمام FreeTube است، پنهان شود، به استثنای تاریخچه، فهرست‌های پخش شما، و
-      ویدیوهای داخل فهرست‌های پخش.
+    Hide Subscriptions Live: این تنظیم با «{appWideSetting}» در سراسر برنامه، در بخش
+      «{subsection}» در «{settingsSection}» لغو می‌شود.
+    Hide Channels: نام کانال یا شناسه کانال را وارد کنید تا همه ویدیوها، فهرست‌های
+      پخش و خود کانال در جستجو، پرطرفدار، محبوب‌ترین و توصیه‌شده‌ها ظاهر نشوند. نام
+      کانال وارد شده باید کاملا مطابقت داشته باشد و به حروف کوچک و بزرگ حساس باشد.
   Experimental Settings:
     Replace HTTP Cache: حافظه پنهان HTTP مبتنی بر دیسک Electron را غیرفعال می کند
       و یک کش تصویر سفارشی در حافظه را فعال می کند. منجر به افزایش مصرف رم خواهد شد.
@@ -930,15 +744,15 @@ About:
   Translate: ترجمه
   Blog: وبلاگ
   Chat on Matrix: چت در ماتریکس
+  Licensed under the AGPLv3: تحت مجوز AGPLv3
   these people and projects: این افراد و پروژه ها
+  View License: مشاهده مجوز
   Report a problem: گزارش یک مشکل
   GitHub issues: مشکلات گیت هاب
   Donate: اهدا
   Source code: کد منبع
-  Mastodon: برنامه ماستودون
+  Mastodon: Mastodon
   FreeTube is made possible by: فری تیوب ممکن است ساخته شده توسط
-  AGPLv3: پروانه‌عمومی‌جامع‌آفرو نسخه‌3
-  Licensed under the: دارای مجوز تحت
 New Window: پنجره جدید
 Preferences: تنظیمات
 Version {versionNumber} is now available!  Click for more details: نسخه {versionNumber}
@@ -947,6 +761,8 @@ A new blog is now available, {blogTitle}. Click to view more: یک مطلب جد
   است, {blogTitle}. برای مشاهده بیشتر کلیک کنید
 Channels:
   Channels: کانال ها
+  Unsubscribe: لغو اشتراک
+  Unsubscribed: '{channelName}از اشتراک های شما حذف شده است'
   Unsubscribe Prompt: آیا مطمئنید که می‌خواهید اشتراک «{channelName}» را لغو کنید؟
   Title: لیست کانال
   Search bar placeholder: جستجو در کانال ها
@@ -962,8 +778,6 @@ Global:
     Watching Count: ۱ در حال تماشا | {count} در حال تماشا
     Channel Count: ۱ کانال | {count} کانال
     Video Count: ۱ ویدیو | {count} ویدیو
-    Like Count: 1 پسند | {count} پسند
-    Comment Count: 1 نظر | {count} نظر
   Community: جامعه
   Input Tags:
     Length Requirement: برچسب باید حداقل {number} کاراکتر داشته باشد
@@ -992,15 +806,12 @@ Change Format:
     نیست
   Use Dash Formats: از فرمت های دش استفاده کنید
   Use Audio Formats: از فرمت های صوتی استفاده کنید
-  Legacy formats are not available for this video: قالب‌های قدیمی برای این ویدیو موجود
-    نیست
 Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'فهرست فصل‌ها پنهان است،
     فصل فعلی: {chapterName}'
   'Chapters list visible, current chapter: {chapterName}': 'فهرست فصل‌ها قابل مشاهده
     است، فصل فعلی: {chapterName}'
   Chapters: فصل
-  Key Moments: لحظات کلیدی
 Hashtag:
   This hashtag does not currently have any videos: این هشتگ در حال حاضر هیچ ویدیویی
     ندارد
@@ -1043,8 +854,6 @@ Comments:
   Hide: مخفی کردن
   Replies: پاسخ
   Hearted: دلی
-  There are no comments available for this post: هیچ نظری برای این پست موجود نیست
-  Subscribed: دنبال شده
 The playlist has been reversed: لیست پخش معکوس شده است
 Default Invidious instance has been cleared: نمونه پیش فرض Invidious پاک شده است
 Profile:
@@ -1058,7 +867,7 @@ Profile:
     same channels will be deleted in any profile they are found in.
   : این نمایه اصلی شماست. آیا مطمئن هستید که می خواهید کانال های انتخاب شده را حذف
     کنید؟ همان کانال ها در هر نمایه ای که در آن یافت می شوند حذف می شوند.
-  Profile Settings: نمایه
+  Profile Settings: تنظیمات پروفایل
   Profile Filter: فیلتر پروفایل
   Profile Manager: مدیر پروفایل
   Custom Color: رنگ سفارشی
@@ -1091,11 +900,6 @@ Profile:
   Your default profile has been changed to your primary profile: پروفایل پیش فرض شما
     به پروفایل اصلی شما تغییر یافته است
   Profile Select: پروفایل را انتخاب کنید
-  Edit Profile Name: ویرایش نام نمایه
-  Create Profile Name: ایجاد نام نمایه
-  Profile Name: نام نمایه
-  Open Profile Dropdown: بازکردن نمایه کشویی
-  Close Profile Dropdown: بستن نمایه کشویی
 Screenshot Success: اسکرین شات به عنوان «{filePath}» ذخیره شد
 Ok: تایید
 Downloading has completed: دانلود '{videoTitle}' به پایان رسید
@@ -1111,84 +915,35 @@ Falling back to Local API: بازگشت به API محلی
 This video is unavailable because of missing formats. This can happen due to country unavailability.: این
   ویدیو به دلیل عدم وجود قالب در دسترس نیست. این ممکن است به دلیل در دسترس نبودن کشور
   اتفاق بیفتد.
+Subscriptions have not yet been implemented: اشتراک ها هنوز اجرا نشده است
 Playing Previous Video: پخش ویدیوی قبلی
 Default Invidious instance has been set to {instance}: نمونه پیش‌فرض Invidious روی
   {instance} تنظیم شده است
 Starting download: شروع دانلود «{videoTitle}»
 Yes: بلی
 Invidious API Error (Click to copy): خطای Invidious API (برای کپی کلیک کنید)
+Hashtags have not yet been implemented, try again later: هشتگ ها هنوز پیاده سازی نشده
+  اند، بعداً دوباره امتحان کنید
 Downloading failed: مشکلی در بارگیری «{videoTitle}» وجود داشت
 No: خیر
 Playlist:
+  Views: مشاهدات
   Last Updated On: آخرین بروز رسانی در تاریخ
   View Full Playlist: مشاهده لیست پخش کامل
+  Videos: ویدیوها
+  View: مشاهده
   Playlist: فهرست پخش
-  Sort By:
-    VideoDurationDescending: مدت (اول طولانی‌ترین)
-    VideoDurationAscending: مدت (اول کوتاه ترین)
-    VideoTitleAscending: عنوان (آ-ی)
-    DateAddedNewest: آخرین اضافه شده در ابتدا
-    DateAddedOldest: اولین اضافه شده در ابتدا
-    AuthorDescending: نویسنده (ی-آ)
-    VideoTitleDescending: عنوان (ی-آ)
-    Custom: سفارشی
-    Sort By: به ترتیب
-    AuthorAscending: نویسنده (آ-ی)
 Mini Player: مینی پلیر
 Videos:
   Sort By:
     Newest: جدیدترین
     Oldest: قدیمی ترین
+Toggle Theatre Mode: حالت تئاتر را تغییر دهید
 Up Next: تا بعدی
 Feed:
   Refresh Feed: تازه‌سازی {subscriptionName}
-  Feed Last Updated: '{feedName} آخرین به روز رسانی فید: {date}'
 Go to page: برو به {page}
 Search Listing:
   Label:
     Subtitles: زیرنویس
-    4K: 4K
-    Closed Captions: زیرنویس‌ها
-    3D: 3 بعدی
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: جدید
 Close Banner: بستن بنر
-Age Restricted:
-  This video is age restricted: این ویدیو دارای محدودیت سنی است
-  This channel is age restricted: این کانال دارای محدودیت سنی می باشد
-Search character limit: عبارت جستجو از حد مجاز نویسه {searchCharacterLimit} فراتر
-  است
-Playlist will pause when current video is finished: پس از پایان ویدیوی فعلی، فهرست
-  پخش متوقف می‌شود
-Yes, Delete: بله حذف شود
-Yes, Restart: بله شروع دوباره
-Cancel: لغو
-Trimmed input must be at least N characters long: ورودی بریده شده باید حداقل 1 کاراکتر
-  طول داشته باشد | ورودی بریده شده باید حداقل {length} کاراکتر باشد
-Tag already exists: برچسب "{tagName}" از قبل وجود دارد
-checkmark: ✓
-Channel Unhidden: '{channel} از فیلتر کانال حذف شد'
-'Blocked opening potentially unsafe URL': 'باز کردن آدرس بالقوه ناامن مسدود شد: "{url}".'
-Channel Hidden: '{channel} به فیلتر کانال اضافه شد'
-Yes, Open Link: بله بازکردن پیوند
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Right-click or hold to see history: برای دیدن تاریخچه کلیک راست کرده یا نگه دارید
-Moments Ago: لحظاتی پیش
-Playlist will not pause when current video is finished: پس از اتمام ویدیوی فعلی، لیست
-  پخش متوقف نمی شود
-Display Label: '{label}: {value}'
-Autoplay Interruption Timer: پخش خودکار به دلیل {autoplayInterruptionIntervalHours}
-  ساعت عدم فعالیت لغو شد
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: فلش پایین
-  arrowleft: فلش چپ
-  arrowright: ‌فلش راست
-  arrowup: فلش بالا
-Description:
-  Expand Description: '...بیشتر'
-  Collapse Description: نمایش کمتر
diff --git a/static/locales/fi.yaml b/static/locales/fi.yaml
index 5d7bf13ac9add..9d2ccda264aee 100644
--- a/static/locales/fi.yaml
+++ b/static/locales/fi.yaml
@@ -118,6 +118,12 @@ Most Popular: 'Suosituimmat'
 Playlists: 'Soittolistat'
 User Playlists:
   Your Playlists: 'Omat soittolistat'
+  Playlist Message: Tämä sivu ei kuvasta täysin toimivia soittolistoja. Se listaa
+    vain tallentamasi tai tykkäämäsi videot. Kun tämä on valmis, kaikki täällä olevat
+    videot siirretään soittolistaan ”Tykkäykset”.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Et
+    ole tallentanut videoita. Paina "Tallenna"-painiketta videon kulmassa tallentaaksesi
+    sen tänne
   Search bar placeholder: Etsi soittolistoja
   Empty Search Message: Tällä soittolistalla ei ole hakuasi vastaavia videoita
   Sort By:
@@ -216,6 +222,8 @@ Settings:
       End: 'Loppu'
       Hidden: Piilotettu
       Blur: Sumennettu
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious instanssi
+      (Oletus on https://invidious.snopyta.org)'
     Region for Trending: 'Nousussa-sivun alue'
         #! List countries
     Check for Latest Blog Posts: Tarkista tuoreimmat blogimerkinnät
@@ -299,6 +307,7 @@ Settings:
     Hide FreeTube Header Logo: Piilota FreeTube-otsikkologo
   Player Settings:
     Player Settings: 'Soittimen asetukset'
+    Remember History: 'Muista historia'
     Play Next Video: 'Toista seuraava video'
     Turn on Subtitles by Default: 'Ota tekstitys käyttöön oletusarvoisesti'
     Autoplay Videos: 'Toista videot automaattisesti'
@@ -353,8 +362,44 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Tilausasetukset'
     Hide Videos on Watch: 'Piilota katsotut videot'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Tilausten vientiformaatti'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Hallinnoi tilauksia'
+    Import Subscriptions: 'Tuo tilauksia'
+    Export Subscriptions: 'Vie tilauksia'
+    How do I import my subscriptions?: 'Miten voin tuoda tilaukseni?'
     Fetch Feeds from RSS: Nouda RSS-syöte
     Fetch Automatically: Nouda syöte automaattisesti
+    Only Show Latest Video for Each Channel: Näytä vain jokaisen kanavan uusin video
+  Advanced Settings:
+    Advanced Settings: 'Lisäasetukset'
+    Enable Debug Mode (Prints data to the console): 'Ota virheenkorjaustila käyttöön
+      (Tulostaa tiedot konsoliin)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Välityspalvelimen osoite
+      (Esimerkiksi: SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '"TESTAA
+      VÄLITYSPALVELIN" -painikkeen napsauttaminen lähettää pyynnön osoitteeseen https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Käytä Tor-verkkoa / Välityspalvelinta API-pyynnöille'
+    TEST PROXY: 'TESTAA VÄLITYSPALVELIN'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Näytä julkiset instanssit'
+    Clear History:
+      Clear History: 'Tyhjennä historia'
+      # On Click
+      Are you sure you want to delete your history?: 'Haluatko varmasti poistaa historian?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Tyhjennä tilaukset'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Haluatko varmasti poistaa
+        kaikki tilaukset?'
+      #& Yes
+      #& No
+
   Privacy Settings:
     Watch history has been cleared: Katseluhistoria poistettiin
     Are you sure you want to remove your entire watch history?: Haluatko varmasti
@@ -402,10 +447,14 @@ Settings:
     Export YouTube: Vie YouTube-tilaukset
     Export FreeTube: Vie FreeTube-tilaukset
     Export Subscriptions: Vie tilaukset
+    Import NewPipe: Tuo NewPipe-tilaukset
+    Import YouTube: Tuo YouTube-tilaukset
+    Import FreeTube: Tuo FreeTube-tilaukset
     Import Subscriptions: Tuo tilaukset
     Select Export Type: Valitse Viennin tyyppi
     Select Import Type: Valitse Tuonnin tyyppi
     Data Settings: Data-asetukset
+    Check for Legacy Subscriptions: Tarkista vanhat tilaukset
     Manage Subscriptions: Hallitse tilauksia
     All playlists has been successfully imported: Kaikki soittolistat on onnistuneesti
       tuotu
@@ -455,6 +504,7 @@ Settings:
     Hide Channel Podcasts: Piilota kanavan podcastit
     Hide Subscriptions Videos: Piilota tilausvideot
     Hide Subscriptions Live: Piilota tilausten livet
+    Blur Thumbnails: Sumenna pikkukuvat
     Hide Profile Pictures in Comments: Piilota profiilikuvat kommenteissa
     Hide Channels Invalid: Annettu kanavatunnus oli virheellinen
     Hide Subscriptions Shorts: Piilota tilattujen kanavien Shorts-videot
@@ -530,21 +580,48 @@ Settings:
     Password Settings: Salasana-asetukset
     Set Password: Aseta salasana
     Remove Password: Poista salasana
+  Expand All Settings Sections: Laajenna asetusten kaikki osiot
   Sort Settings Sections (A-Z): Järjestä asetusosio (A-Ö)
 About:
   #On About page
   About: 'Tietoja'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Tämä
+    avoin ohjelmisto on julkaistu AGPL-3.0 -lisenssin alla.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Löysitko bugin? Haluatko ehdottaa ominaisuutta? Haluatko auttaa? Katso GitHub-sivumme.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Kiitos
+    ihmiset ja projektit, jotka tekevät FreeTuben mahdolliseksi!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Haluatko
+    keskustella? Liity Element / Matrix -serverillemme. Luethan säännöt ennen liittymistä.'
+
+  'Looking for help? Check out our Wiki page.': 'Tarvitko apua? Tutustu Wiki-sivuumme.'
+
+  Check out our Firefox extension!: 'Tutustu Firefox-laajennukseemme!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Jos
+    nautit FreeTuben käytöstä, harkitse lahjoittamista LiberaPayn tai Bitcoin-osoittemme
+    kautta.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Viimeisimmät Freetube-uutiset'
+
 #On Channel Page
   GitHub issues: GitHub-ongelmat
   Report a problem: Ilmoita ongelmasta
   FAQ: UKK
   Blog: Blogi
   Email: Sähköposti
+  Licensed under the AGPLv3: Lisensoitu AGPLv3:n alle
   Chat on Matrix: Matrix
   these people and projects: nämä henkilöt ja projektit
   room rules: huoneen säännöt
   Please read the: Lue
+  View License: Katso lisenssi
   Please check for duplicates before posting: Tarkista kopioiden varalta ennen julkaisua
   Website: Verkkosivusto
   Mastodon: Mastodon
@@ -647,8 +724,38 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Live-keskustelua
     ei tueta nykyisessä Invidious API:ssa. Suora yhteys Youtubeen vaaditaan.'
   Published:
+    Jan: 'Tam'
+    Feb: 'Hel'
+    Mar: 'Maa'
+    Apr: 'Huh'
+    May: 'Tou'
+    Jun: 'Kes'
+    Jul: 'Hei'
+    Aug: 'Elo'
+    Sep: 'Syy'
+    Oct: 'Lok'
+    Nov: 'Mar'
+    Dec: 'Jou'
+    Second: 'Sekunti'
+    Seconds: 'Sekuntia'
+    Hour: 'Tunti'
+    Hours: 'Tuntia'
+    Day: 'Päivä'
+    Days: 'Päivää'
+    Week: 'Viikko'
+    Weeks: 'Viikkoa'
+    Month: 'Kuukausi'
+    Months: 'Kuukautta'
+    Year: 'Vuosi'
+    Years: 'Vuotta'
+    Ago: 'sitten'
+    Upcoming: 'Ensiesitys'
+    Minutes: Minuuttia
+    Minute: Minuutti
+    Less than a minute: Vähemmän kuin minuutti
     In less than a minute: Alle minuutin kuluessa
   Published on: 'Julkaistu'
+  Publicationtemplate: '{number} {unit} sitten'
 #& Videos
   Video has been removed from your history: Video on poistettu historiastasi
   Video has been marked as watched: Video on merkitty katsotuksi
@@ -719,6 +826,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Näytä koko soittolista'
+  Videos: 'Videot'
+  View: 'Katselu'
+  Views: 'Katsomiskertaa'
   Last Updated On: 'Viimeksi päivitetty'
 
 # On Video Watch Page
@@ -730,6 +840,7 @@ Playlist:
     DateAddedNewest: Viimeksi lisätty ensin
     AuthorAscending: Tekijä (A-Ö)
     AuthorDescending: Tekijä (Ö-A)
+Toggle Theatre Mode: 'Teatteritila'
 Change Format:
   Change Media Formats: 'Vaihda videoformaattia'
   Use Dash Formats: 'Käytä DASH-formaatteja'
@@ -789,6 +900,7 @@ Local API Error (Click to copy): 'Paikallinen API-virhe (Kopioi napsauttamalla)'
 Invidious API Error (Click to copy): 'Invidious API-virhe (Kopioi napsauttamalla)'
 Falling back to Invidious API: 'Palaa takaisin Invidious-sovellusliittymään'
 Falling back to Local API: 'Palaa takaisin paikalliseen sovellusliittymään'
+Subscriptions have not yet been implemented: 'Tilauksia ei ole vielä jalkautettu'
 Loop is now disabled: 'Silmukka on poistettu käytöstä'
 Loop is now enabled: 'Silmukka on nyt käytössä'
 Shuffle is now disabled: 'Satunnaistoisto on poistettu käytöstä'
@@ -890,7 +1002,8 @@ Tooltips:
       MPV-tyyliin.
   External Player Settings:
     Custom External Player Arguments: Kaikki ne omavalintaiset komentorivin määreet,
-      jotka haluat siirtää eteenpäin ulkoiselle toisto-ohjelmalle.
+      puolipisteillä eroteltuina (';'), jotka haluat siirtää eteenpäin ulkoiselle
+      toisto-ohjelmalle.
     Ignore Warnings: Estä varoitukset, kun käytetty ulkoinen toisto-ohjelma ei tue
       määrättyä toimintamallia (kuten käänteiset soittoluettelot, jne.).
     Custom External Player Executable: Vakiollisesti FreeTube olettaa, että valittu
@@ -917,6 +1030,8 @@ More: Lisää
 Playing Next Video Interval: Seuraava video alkaa. Klikkaa peruuttaaksesi. |Seuraava
   video alkaa {nextVideoInterval} sekunnin kuluttua. Klikkaa peruuttaaksesi. | Seuraava
   video alkaa {nextVideoInterval} sekunnin kuluttua. Klikkaa peruuttaaksesi.
+Hashtags have not yet been implemented, try again later: Hashtageja ei vielä ole lisätty,
+  yritä uudelleen myöhemmin
 Open New Window: Avaa uusi ikkuna
 Unknown YouTube url type, cannot be opened in app: Tuntematon YouTube-videon osoitemuoto,
   ei voida avata sovelluksessa
@@ -941,7 +1056,9 @@ Channels:
   Search bar placeholder: Etsi kanavia
   Count: '{number} kanava(a) löydetty.'
   Empty: Kanavaluettelosi on tällä hetkellä tyhjä.
+  Unsubscribe: Peruuta tilaus
   Unsubscribe Prompt: Haluatko varmasti perua kanavan ”{channelName}” tilauksen?
+  Unsubscribed: '{channelName} on poistettu tilauksistasi'
 Clipboard:
   Copy failed: Kopiointi leikepöydälle epäonnistui
   Cannot access clipboard without a secure connection: Leikepöytää ei voi käyttää
diff --git a/static/locales/fil.yaml b/static/locales/fil.yaml
index 309e0e035da03..d427776684e50 100644
--- a/static/locales/fil.yaml
+++ b/static/locales/fil.yaml
@@ -113,6 +113,8 @@ External link opening has been disabled in the general settings: Ang pag bukas n
 Age Restricted:
   This channel is age restricted: Itong channel ay pinaghihigpitan sa edad
   This video is age restricted: Ang video na ito ay pinaghihigpitan sa edad
+Hashtags have not yet been implemented, try again later: Walang hashtags sa kasalukuyan,
+  subukan muli
 Close Banner: I-Sara ang banner
 Are you sure you want to open this link?: Sigurado mo na buksan itong link?
 Search character limit: Na sobrahan ng {searchCharacterLimit} na tilik ang Search
diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index 79291ddc4edad..dd7721d94ada4 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -43,7 +43,7 @@ Global:
     Subscriber Count: 1 abonné | {count} abonnés
     Watching Count: 1 spectateur | {count} spectateurs
     Comment Count: 1 commentaire | {count} commentaires
-    Like Count: 1 j’aime | {count} j’aime
+    Like Count: 1 like | {count} likes
   Input Tags:
     Length Requirement: L'étiquette doit comporter au moins {number} caractères
 Search / Go to URL: 'Rechercher / ouvrir l''URL'
@@ -82,7 +82,7 @@ Search Filters:
   Fetching results. Please wait: 'Récupération des résultats. Veuillez patienter'
   Fetch more results: 'Afficher plus de résultats'
 # Sidebar
-  There are no more results for this search: Il n’y a pas plus de résultats pour cette
+  There are no more results for this search: Il n'y a plus de résultats pour cette
     recherche
   Features:
     Creative Commons: Creative Commons
@@ -101,15 +101,14 @@ Subscriptions:
   Subscriptions: 'Abonnements'
   Latest Subscriptions: 'Derniers abonnements'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Votre
-    liste d’abonnements est actuellement vide. Si vous souhaitez importer vos abonnements,
-    vous pouvez aller dans Paramètres des données et sélectionner Importer des abonnements
-    ou vous pouvez rechercher une chaîne et vous y abonner.'
+    liste d''abonnements est vide. Ajoutez des abonnements pour les voir apparaître
+    ici.'
   'Getting Subscriptions.  Please wait.': 'Récupération des vidéos de vos abonnements,
     veuillez patienter.'
   Getting Subscriptions. Please wait.: Obtention des abonnements. Veuillez patienter.
   Refresh Subscriptions: Actualiser les abonnements
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Ce
-    profil comporte un grand nombre d'abonnements.  Le flux RSS dépassera la limite
+    profil comporte un grand nombre d'abonnements.  Le flux RSS outrepassera la limite
     fixée
   Load More Videos: Charger plus de vidéos
   Error Channels: Chaînes avec des erreurs
@@ -134,15 +133,25 @@ Most Popular: 'Les plus populaires'
 Playlists: 'Listes de lecture'
 User Playlists:
   Your Playlists: 'Vos listes de lecture'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Vous
+    n'avez enregistré aucune vidéo. Cliquez sur le bouton Enregistrer dans le coin
+    d'une vidéo pour l'afficher ici
+  Playlist Message: Cette page ne reflète pas les listes de lecture entièrement fonctionnelles.
+    Elle ne répertorie que les vidéos que vous avez enregistrées ou mises en favoris.
+    Une fois le travail terminé, toutes les vidéos actuellement présentes ici seront
+    migrées vers une liste de lecture « Favoris ».
   Search bar placeholder: Recherche de listes de lecture
   Empty Search Message: Il n'y a pas de vidéos dans cette liste de lecture qui correspondent
     à votre recherche
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Êtes-vous
+    sûr(e) de vouloir supprimer toutes les vidéos visionnées de cette liste de lecture ?
+    Cette opération ne peut pas être annulée.
   AddVideoPrompt:
     Search in Playlists: Recherche dans les listes de lecture
     Save: Sauvegarder
     Select a playlist to add your N videos to: Sélectionnez une liste de lecture à
       laquelle ajouter votre vidéo | Sélectionnez une liste de lecture à laquelle
-      ajouter vos {videoCount} vidéos
+      ajouter vos vidéos {videoCount}
     Toast:
       "{videoCount} video(s) added to 1 playlist": 1 vidéo ajoutée à 1 liste de lecture
         | {videoCount} vidéos ajoutées à 1 liste de lecture
@@ -185,6 +194,7 @@ User Playlists:
         le bas.
       This playlist is now used for quick bookmark: Cette liste de lecture est maintenant
         utilisée comme marque-page rapide
+      Quick bookmark disabled: Marque-page rapide désactivé
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Cette
         liste de lecture est désormais utilisée comme marque-page rapide à la place
         de {oldPlaylistName}. Cliquez ici pour annuler
@@ -194,9 +204,6 @@ User Playlists:
         est déjà utilisée comme signet rapide.
       Playlist {playlistName} is the new quick bookmark playlist.: La liste de lecture
         {playlistName} est la nouvelle liste de lecture des signets rapides.
-      This playlist has a video with a duration error: Cette liste de lecture contient
-        au moins une vidéo qui n'a pas de durée, elle sera triée comme si la durée
-        était nulle.
     Search for Videos: Rechercher des vidéos
   Are you sure you want to delete this playlist? This cannot be undone: Êtes-vous
     sûr(e) de vouloir supprimer cette liste de lecture ? Cette opération ne peut pas
@@ -244,6 +251,7 @@ User Playlists:
   Remove from Favorites: Retirer de {playlistName}
   Enable Quick Bookmark With This Playlist: Activer le marque-page rapide avec cette
     liste de lecture
+  Disable Quick Bookmark: Désactiver le marque-page rapide
   Playlists with Matching Videos: Listes de lecture avec des vidéos correspondantes
   Quick Bookmark Enabled: Signet rapide activé
   Cannot delete the quick bookmark target playlist.: Impossible de supprimer la liste
@@ -257,9 +265,6 @@ User Playlists:
     opération est irréversible. | Êtes-vous sûr(e) de vouloir supprimer {playlistItemCount}
     vidéos regardées de cette liste de lecture ? Cette opération est irréversible.
   Remove Duplicate Videos: Supprimer les vidéos en double
-  The playlist has been successfully exported: La liste de lecture a été exportée
-    avec succès
-  Export Playlist: Exporter cette liste de lecture
 History:
   # On History Page
   History: 'Historique'
@@ -273,7 +278,7 @@ Settings:
   # On Settings Page
   Settings: 'Paramètres'
   General Settings:
-    General Settings: 'Général'
+    General Settings: 'Paramètres généraux'
     Fallback to Non-Preferred Backend on Failure: 'Revenir au Backend non préférentiel
       en cas d''échec'
     Enable Search Suggestions: 'Activer les suggestions de recherche'
@@ -295,6 +300,8 @@ Settings:
       End: 'Fin'
       Hidden: Masqué
       Blur: Flou
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instance Individious
+      (https://invidious.snopyta.org par défaut)'
     Region for Trending: 'Pays pour les tendances'
         #! List countries
     Check for Latest Blog Posts: Consultez les derniers billets du blog
@@ -319,10 +326,8 @@ Settings:
     Auto Load Next Page:
       Label: Chargement automatique de la page suivante
       Tooltip: Chargement automatique des pages supplémentaires et des commentaires.
-    Open Deep Links In New Window: Les URL ouvertes ont été transmises à FreeTube
-      dans une nouvelle fenêtre
   Theme Settings:
-    Theme Settings: 'Thème'
+    Theme Settings: 'Paramètres du thème'
     Match Top Bar with Main Color: 'Faire correspondre la barre supérieure à la couleur
       principale'
     Base Theme:
@@ -338,8 +343,6 @@ Settings:
       Nordic: Nordic
       Solarized Light: Clair polarisé
       Solarized Dark: Noir polarisé
-      Gruvbox Light: Gruvbox Clair
-      Gruvbox Dark: Gruvbox Sombre
     Main Color Theme:
       Main Color Theme: 'Couleur principale du thème'
       Red: 'Rouge'
@@ -387,16 +390,6 @@ Settings:
       Solarized Yellow: Jaune polarisé
       Solarized Orange: Orange polarisé
       Solarized Red: Rouge polarisé
-      Gruvbox Dark Yellow: Gruvbox Jaune Sombre
-      Gruvbox Dark Purple: Gruvbox Violet Sombre
-      Gruvbox Dark Aqua: Gruvbox Eau Sombre
-      Gruvbox Dark Orange: Gruvbox Orange Sombre
-      Gruvbox Light Red: Gruvbox Rouge Sombre
-      Gruvbox Light Blue: Gruvbox Bleu Clair
-      Gruvbox Light Purple: Gruvbox Violet Clair
-      Gruvbox Light Orange: Gruvbox Orange Clair
-      Gruvbox Dark Green: Gruvbox Vert Sombre
-      Gruvbox Dark Blue: Gruvbox Bleu Sombre
     Secondary Color Theme: 'Couleur secondaire du thème'
         #* Main Color Theme
     UI Scale: Échelle de l'interface utilisateur
@@ -405,7 +398,8 @@ Settings:
     Hide Side Bar Labels: Masquer les étiquettes de la barre latérale
     Hide FreeTube Header Logo: Masquer le logo d'en-tête de FreeTube
   Player Settings:
-    Player Settings: 'Lecteur'
+    Player Settings: 'Paramètres du lecteur'
+    Remember History: 'Se souvenir de l''historique'
     Play Next Video: 'Lire la vidéo suivante'
     Turn on Subtitles by Default: 'Activer les sous-titres par défaut'
     Autoplay Videos: 'Lecture automatique des vidéos'
@@ -433,7 +427,7 @@ Settings:
       8k: '8k'
     Playlist Next Video Interval: Intervalle de la prochaine vidéo dans la liste de
       lecture
-    Next Video Interval: Minuteur de lecture automatique
+    Next Video Interval: Intervalle vidéo suivante
     Scroll Volume Over Video Player: Contrôler le niveau du volume avec la molette
       au dessus du lecteur vidéo
     Display Play Button In Video Player: Afficher le bouton de lecture dans le lecteur
@@ -461,19 +455,52 @@ Settings:
       Folder Label: Dossier de capture d'écran
     Enter Fullscreen on Display Rotate: Entrer en plein écran sur l'affichage Rotation
     Skip by Scrolling Over Video Player: Sauter en faisant défiler le lecteur vidéo
-    Autoplay Interruption Timer: Minuteur d'arrêt de la lecture automatique
   Subscription Settings:
-    Subscription Settings: 'Abonnements'
+    Subscription Settings: 'Paramètres des abonnements'
     Hide Videos on Watch: 'Masquer les vidéos visionnées'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Format d''exportation des abonnements'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Gérer les abonnements'
+    Import Subscriptions: 'Importer vos abonnements'
+    Export Subscriptions: 'Exporter vos abonnements'
+    How do I import my subscriptions?: 'Comment importer mes abonnements ?'
     Fetch Feeds from RSS: Récupération de flux RSS
     Fetch Automatically: Récupération automatique des flux
+    Only Show Latest Video for Each Channel: Afficher uniquement la dernière vidéo
+      pour chaque chaîne
     Confirm Before Unsubscribing: Évitez les désabonnements accidentels
+  Advanced Settings:
+    Advanced Settings: 'Paramètres Avancés'
+    Enable Debug Mode (Prints data to the console): 'Activer le mode débug (afficher
+      les données dans la console)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adresse Proxy (Exemple :
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Cliquer
+      sur le bouton « TEST PROXY » enverra une demande à https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Utiliser Tor / Proxy pour les appels de l''API'
+    TEST PROXY: 'TESTER LE PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Voir les instances publiques'
+    Clear History:
+      Clear History: 'Effacer l’historique'
+      # On Click
+      Are you sure you want to delete your history?: 'Êtes-vous sûr(e) de vouloir
+        effacer votre historique ?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Effacer les abonnements'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Êtes-vous sûr(e) de vouloir
+        supprimer tous les abonnements ?'
+      #& Yes
+      #& No
 
-    'Limit the number of videos displayed for each channel': Limiter le nombre de
-      vidéos affichées pour chaque chaîne
-    To: Pour
   Privacy Settings:
-    Privacy Settings: Confidentialité
+    Privacy Settings: Paramètres de confidentialité
     Remember History: Enregistrer l'historique
     Watch history has been cleared: L'historique a été effacé
     Are you sure you want to remove your entire watch history?: Êtes-vous sûr(e) de
@@ -508,6 +535,9 @@ Settings:
     Export YouTube: Exporter YouTube
     Export FreeTube: Exporter FreeTube
     Export Subscriptions: Exporter vos abonnements
+    Import NewPipe: Importer NewPipe
+    Import YouTube: Importer YouTube
+    Import FreeTube: Importer FreeTube
     Import Subscriptions: Importer vos abonnements
     Select Export Type: Sélectionner le type d'exportation
     Select Import Type: Sélectionner le type d'importation
@@ -518,7 +548,7 @@ Settings:
     This might take a while, please wait: Cela pourrait prendre un certain temps,
       veuillez patienter
     Invalid subscriptions file: Fichier d'abonnements invalide
-    Data Settings: Données
+    Data Settings: Paramètres des données
     All watched history has been successfully exported: Tout votre historique de visionnage
       a été exporté avec succès
     All watched history has been successfully imported: Tout votre historique de visionnage
@@ -527,6 +557,7 @@ Settings:
       données d'historique sont insuffisantes
     Profile object has insufficient data, skipping item: Ignorer cet élément car les
       données de profil sont insuffisantes
+    Check for Legacy Subscriptions: Vérifier les abonnements Legacy
     Manage Subscriptions: Gérer les abonnements
     Import Playlists: Importer des listes de lecture
     Export Playlists: Exporter des listes de lecture
@@ -557,7 +588,7 @@ Settings:
     Hide Popular Videos: Masquer les vidéos populaires
     Hide Trending Videos: Masquer les tendances
     Hide Recommended Videos: Masquer les vidéos recommandées
-    Distraction Free Settings: Sans distraction
+    Distraction Free Settings: Mode sans distraction
     Hide Active Subscriptions: Masquer les abonnements actifs
     Hide Playlists: Masquer les listes de lecture
     Hide Video Description: Masquer la description de la vidéo
@@ -570,21 +601,22 @@ Settings:
     Hide Channels Placeholder: Identifiant de la chaîne
     Display Titles Without Excessive Capitalisation: Afficher les titres sans majuscules
       ni ponctuation excessives
-    Hide Channel Playlists: Masquer l'onglet de la chaîne "Listes de lecture"
+    Hide Channel Playlists: Masquer les listes de lecture des chaînes
     Hide Featured Channels: Masquer les chaînes en vedette
-    Hide Channel Community: Masquer l'onglet de la chaîne "Communauté"
-    Hide Channel Shorts: Masquer l'onglet "Shorts" de la chaîne
+    Hide Channel Community: Masquer la communauté de la chaîne
+    Hide Channel Shorts: Masquer les shorts de la chaîne
     Sections:
       Channel Page: Page de la chaîne
       Side Bar: Barre latérale
       Watch Page: Page de lecture
       General: Général
       Subscriptions Page: Page Abonnements
-    Hide Channel Podcasts: Masquer l'onglet de la chaîne "Podcasts"
-    Hide Channel Releases: Masquer l'onglet de la chaîne "Publications"
+    Hide Channel Podcasts: Masquer les podcasts de la chaîne
+    Hide Channel Releases: Masquer les publications de la chaîne
     Hide Subscriptions Videos: Masquer les vidéos des abonnements
     Hide Subscriptions Shorts: Masquer les shorts des abonnements
     Hide Subscriptions Live: Masquer les diffusions en direct des abonnements
+    Blur Thumbnails: Flouter les miniatures
     Hide Profile Pictures in Comments: Masquer les photos de profil dans les commentaires
     Hide Subscriptions Community: Masquer les communautés abonnées
     Hide Channels Invalid: L'identifiant de la chaîne fourni n'est pas valide
@@ -598,8 +630,6 @@ Settings:
       lecture contenant du texte
     Hide Videos and Playlists Containing Text Placeholder: Mot, fragment de mot ou
       phrase
-    Hide Channel Home: Masquer l'onglet "Accueil" de la chaîne
-    Show Added Items: Afficher les articles ajoutés
   The app needs to restart for changes to take effect. Restart and apply change?: L'application
     doit être redémarrée pour que les changements prennent effet. Redémarrer et appliquer
     les changements ?
@@ -619,19 +649,14 @@ Settings:
     Proxy Host: Hôte du proxy
     Proxy Protocol: Protocole du proxy
     Enable Tor / Proxy: Activer Tor / proxy
-    Proxy Settings: Proxy
-    Proxy Warning: FreeTube n'a pas de proxy intégré mais peut se connecter à un proxy
-      externe, tel qu'un proxy fonctionnant sur votre machine comme Tor ou un proxy
-      externe tel qu'un proxy SOCKS5 fourni par certains VPN. Si cette option est
-      activée, assurez-vous que votre proxy/Tor est configuré correctement, sinon
-      FreeTube ne pourra pas récupérer de données.
+    Proxy Settings: Paramètres du proxy
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notification lorsqu'un segment sponsorisé
       est ignoré
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL de l'API SponsorBlock
       (la valeur par défaut est https://sponsor.ajay.app)
     Enable SponsorBlock: Activer SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Paramètres de SponsorBlock
     Skip Options:
       Skip Option: Ignorer l'option
       Auto Skip: Ignorer automatiquement
@@ -647,7 +672,7 @@ Settings:
     Ignore Unsupported Action Warnings: Ignorer les avertissements concernant les
       actions non prises en charge
     External Player: Lecteur externe
-    External Player Settings: Lecteur externe
+    External Player Settings: Paramètres du lecteur externe
     Custom External Player Arguments: Arguments personnalisés du lecteur externe
     Custom External Player Executable: Exécutable de lecteur externe personnalisé
     Players:
@@ -655,7 +680,7 @@ Settings:
         Name: Aucun
     Ignore Default Arguments: Ignorer les arguments par défaut
   Download Settings:
-    Download Settings: 'Téléchargement'
+    Download Settings: 'Paramètres de téléchargement'
     Ask Download Path: 'Demander l''emplacement de téléchargement'
     Choose Path: 'Choisir l''emplacement'
     Download Behavior: Comportement de téléchargement
@@ -664,11 +689,11 @@ Settings:
   Parental Control Settings:
     Hide Unsubscribe Button: Masquer le bouton de désabonnement
     Hide Search Bar: Masquer la barre de recherche
-    Parental Control Settings: Contrôle parental
+    Parental Control Settings: Paramètres du contrôle parental
     Show Family Friendly Only: Afficher uniquement le contenu familial
   Experimental Settings:
     Replace HTTP Cache: Remplacer le cache HTTP
-    Experimental Settings: Expérimental
+    Experimental Settings: Paramètres expérimentaux
     Warning: Ces paramètres sont expérimentaux ; ils peuvent provoquer des plantages
       lorsqu'ils sont activés. Il est fortement recommandé de faire des sauvegardes.
       Utilisez-les à vos risques et périls !
@@ -682,26 +707,66 @@ Settings:
     Set Password To Prevent Access: Définir un mot de passe pour empêcher l'accès
       aux paramètres
     Set Password: Définir un mot de passe
-    Password Settings: Mot de passe
+    Password Settings: Paramètres de mot de passe
+  Expand All Settings Sections: Développer toutes les sections des paramètres
   Sort Settings Sections (A-Z): Trier les rubriques de paramètres (A-Z)
-  Return to Settings Menu: Revenir au Menu paramètres
 About:
   #On About page
   About: 'À propos'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ce
+    logiciel est sous licence AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Vous avez trouvé une erreur ? Vous souhaitez suggérer une nouvelle fonctionnalité
+    ? Vous voulez aider de façon générale ? Rendez-vous sur la page GitHub. Les pull
+    requests sont les bienvenues.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Un
+    grand merci à toutes les personnes et à tous les projets qui ont rendu FreeTube
+    possible !'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Envie
+    de discuter ? Rejoigner notre serveur Element / Matrix. Merci de lire les règles
+    avant de nous rejoindre.'
+
+  'Looking for help? Check out our Wiki page.': 'Vous cherchez de l''aide ? Consultez
+    notre page Wiki.'
+
+  Check out our Firefox extension!: 'Découvrez notre extension Firefox !'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Si
+    vous aimez utiliser FreeTube, envisagez de faire un don via Liberapay ou via notre
+    adresse Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Les dernières actualités FreeTube'
+
 #On Channel Page
+  Channel Rules: Règles du salon
   Website: Site web
+  Source Code: Code source
+  Release Notes: Notes de version
   Email: Courriel
+  License: Licence
   Help: Aide
+  Contact: Contacts
+  Translate via Weblate: Traduire via Weblate
   Blog: Blog
   Credits: Crédits
   FAQ: FAQ
+  Wiki: Wiki
+  Report an Issue: Signaler un problème
   Beta: Bêta
   Donate: Faire un don
+  Useful Links: Liens utiles
   Translate: Aidez-nous à traduire FreeTube
   Chat on Matrix: Discuter sur Matrix
   Mastodon: Mastodon
   Report a problem: Signaler un problème
+  View License: Voir la licence
+  Licensed under the AGPLv3: Sous licence AGPLv3
   Source code: Code source
   these people and projects: ces personnes et ces projets
   FreeTube is made possible by: FreeTube est rendu possible par
@@ -785,9 +850,6 @@ Channel:
     Podcasts: Podcasts
     This channel does not currently have any podcasts: Cette chaîne n'a pas encore
       de podcasts
-  Home:
-    Home: Accueil
-    View Playlist: Afficher la liste de lecture
 Video:
   Mark As Watched: 'Marquer comme vu'
   Remove From History: 'Supprimer de l''historique'
@@ -816,8 +878,38 @@ Video:
     tchat en direct n''est actuellement pas pris en charge avec l''API Invidious.
     Une connexion directe à YouTube est requise.'
   Published:
+    Jan: 'jan'
+    Feb: 'fév'
+    Mar: 'mar'
+    Apr: 'avr'
+    May: 'mai'
+    Jun: 'juin'
+    Jul: 'juil'
+    Aug: 'août'
+    Sep: 'sep'
+    Oct: 'oct'
+    Nov: 'nov'
+    Dec: 'déc'
+    Second: 'seconde'
+    Seconds: 'secondes'
+    Hour: 'heure'
+    Hours: 'heures'
+    Day: 'jour'
+    Days: 'jours'
+    Week: 'semaine'
+    Weeks: 'semaines'
+    Month: 'mois'
+    Months: 'mois'
+    Year: 'année'
+    Years: 'années'
+    Ago: 'Il y a'
+    Upcoming: 'Avant-première le'
+    Minutes: minutes
+    Minute: minute
+    Less than a minute: Moins d'une minute
     In less than a minute: En moins d'une minute
   Published on: 'Mise en ligne le'
+  Publicationtemplate: 'Il y a {number} {unit}'
 #& Videos
   Play Previous Video: Lire la vidéo précédente
   Play Next Video: Lire la vidéo suivante
@@ -907,18 +999,6 @@ Video:
     You appear to be offline: Vous semblez être hors ligne.
     Playback will resume automatically when your connection comes back: La lecture
       reprendra automatiquement quand votre connexion reviendra.
-  IP block: YouTube a bloqué votre adresse IP pour le visionnage de vidéos. Veuillez
-    essayer de changer de VPN ou de proxy.
-  Unlisted: Non répertorié
-  AgeRestricted: Les vidéos soumises à des restrictions d'âge ne peuvent pas être
-    regardées avec FreeTube car elles nécessitent une connexion Google et l'utilisation
-    d'un compte YouTube dont l'âge a été vérifié.
-  MembersOnly: Les vidéos réservées aux membres ne peuvent pas être visionnées avec
-    FreeTube, car elles nécessitent une connexion Google et une adhésion payante à
-    la chaîne du vidéaste.
-  DeArrow:
-    Show Original Details: Afficher les détails originaux
-    Show Modified Details: Afficher les détails modifiés
 Videos:
   #& Sort By
   Sort By:
@@ -929,6 +1009,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Afficher la liste de lecture complète'
+  Videos: 'Vidéos'
+  View: 'Vue'
+  Views: 'Vues'
   Last Updated On: 'Dernière mise à jour le'
 
 # On Video Watch Page
@@ -944,8 +1027,7 @@ Playlist:
     VideoTitleAscending: Titre (A-Z)
     VideoTitleDescending: Titre (Z-A)
     Custom: Personnalisé
-    VideoDurationDescending: Durée (la plus longue en premier)
-    VideoDurationAscending: Durée (la plus courte en premier)
+Toggle Theatre Mode: 'Mode Cinéma'
 Change Format:
   Change Media Formats: 'Changer le format de la vidéo'
   Use Dash Formats: 'Utiliser le format DASH'
@@ -1015,6 +1097,8 @@ Local API Error (Click to copy): 'Erreur d''API locale (Cliquez pour copier)'
 Invidious API Error (Click to copy): 'Erreur d''API Invidious (Cliquez pour copier)'
 Falling back to Invidious API: 'Revenir à l''API Invidious'
 Falling back to Local API: 'Revenir à l''API locale'
+Subscriptions have not yet been implemented: 'Les abonnements n''ont pas encore été
+  implémentés'
 Loop is now disabled: 'La boucle est maintenant désactivée'
 Loop is now enabled: 'La boucle est maintenant activée'
 Shuffle is now disabled: 'Mode aléatoire désactivé'
@@ -1027,7 +1111,7 @@ Canceled next video autoplay: 'Annuler la lecture automatique'
 
 Yes: 'Oui'
 No: 'Non'
-Locale Name: Français (France)
+Locale Name: Français
 Profile:
   '{profile} is now the active profile': '{profile} est maintenant le profil actif'
   Your default profile has been changed to your primary profile: Votre profil par
@@ -1071,7 +1155,7 @@ Profile:
   '{number} selected': '{number} sélectionné(s)'
   Other Channels: Autres chaînes
   Profile Filter: Filtre de profil
-  Profile Settings: Profil
+  Profile Settings: Paramètres du profil
   Toggle Profile List: Afficher la liste des profils
   Open Profile Dropdown: Ouvrir la liste déroulante du profil
   Close Profile Dropdown: Fermer la liste déroulante du profil
@@ -1127,12 +1211,10 @@ Tooltips:
     External Link Handling: "Choisissez le comportement par défaut quand on clique
       sur un lien qui ne peut être ouvert dans FreeTube.\nPar défaut, FreeTube ouvrira
       le lien dans votre navigateur par défaut.\n"
-    Open Deep Links In New Window: Les URL transmises à FreeTube, par des extensions
-      de redirection d'un navigateur ou par les arguments de la ligne de commande,
-      sont ouvertes dans une nouvelle fenêtre.
   External Player Settings:
     Custom External Player Arguments: Tous les arguments de ligne de commande personnalisés,
-      que vous souhaitez transmettre au lecteur externe.
+      séparés par des points-virgules (';'), que vous souhaitez transmettre au lecteur
+      externe.
     Ignore Warnings: Suppression des avertissements lorsque le lecteur externe actuel
       ne prend pas en charge l'action en cours (par exemple, inversion des listes
       de lecture, etc.).
@@ -1173,6 +1255,8 @@ Playing Next Video Interval: Lecture de la prochaine vidéo en un rien de temps.
   pour annuler. | Lecture de la prochaine vidéo dans {nextVideoInterval} seconde.
   Cliquer pour annuler. | Lecture de la vidéo suivante dans {nextVideoInterval} secondes.
   Cliquer pour annuler.
+Hashtags have not yet been implemented, try again later: Les hashtags n'ont pas encore
+  été implémentés, réessayez plus tard
 Unknown YouTube url type, cannot be opened in app: Type d'URL YouTube inconnu, ne
   peut pas être ouvert dans l'application
 Open New Window: Ouvrir une nouvelle fenêtre
@@ -1198,8 +1282,10 @@ Channels:
   Channels: Chaînes
   Title: Liste des chaînes
   Empty: Votre liste de chaînes est actuellement vide.
+  Unsubscribe: Se désabonner
   Search bar placeholder: Rechercher des chaînes
   Count: '{number} chaîne(s) trouvée(s).'
+  Unsubscribed: '{channelName} a été supprimé de vos abonnements'
   Unsubscribe Prompt: Êtes-vous sûr(e) de vouloir vous désabonner de « {channelName} » ?
 Clipboard:
   Copy failed: La copie dans le presse-papiers a échoué
@@ -1211,7 +1297,6 @@ Chapters:
     chapitre actuel : {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Liste des chapitres cachée,
     chapitre actuel : {chapterName}'
-  Key Moments: Moments clés
 Preferences: Préférences
 Ok: OK
 Hashtag:
@@ -1249,25 +1334,5 @@ Search Listing:
     4K: 4K
     Subtitles: Sous-titres
     Closed Captions: Sous-titrage codé
-    8K: 8k
-    VR180: VR180
-    360 Video: 360°
-    New: Nouveau
-    3D: 3D
 'Blocked opening potentially unsafe URL': "Blocage de l'ouverture d'une URL potentiellement
   dangereuse : « {url} »."
-shortcutJoinOperator: +
-Keys:
-  ctrl: Ctrl
-  arrowdown: Flèche bas
-  arrowleft: Flèche gauche
-  arrowright: Flèche droite
-  arrowup: Flèche haut
-  alt: Alt
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Right-click or hold to see history: Clic droit ou maintenez pour voir l'historique
-Autoplay Interruption Timer: Lecture automatique annulée après {autoplayInterruptionIntervalHours}
-  heures d'inactivité
-Description:
-  Expand Description: '...plus'
-  Collapse Description: Montrer moins
diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index 598ddc5bc44a4..ea663d8f4b5a7 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -110,6 +110,13 @@ Most Popular: 'Máis populares'
 Playlists: 'Listaxes de reprodución'
 User Playlists:
   Your Playlists: 'As túas listaxes de reprodución'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Os
+    teus vídeos gardados están baleiros. Fai clic no botón Gardar na esquina dun vídeo
+    para que apareza aquí
+  Playlist Message: Esta páxina non reflicte as listas de reprodución que funcionan
+    completamente. Só lista os vídeos que gardaches ou marcaches como favoritos. Cando
+    remate o traballo, todos os vídeos que hai aquí migraranse a unha lista de reprodución
+    "Favoritos".
   Empty Search Message: Non hai vídeos nesta lista de reprodución que coincidan coa
     túa busca
   Search bar placeholder: Atopar na lista de reprodución
@@ -148,6 +155,8 @@ Settings:
       Beginning: 'Principio'
       Middle: 'Metade'
       End: 'Final'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instancia de
+      Invidious (por defecto é https://invidious.snopyta.org)'
     Region for Trending: 'Rexión para as tendencias'
         #! List countries
     View all Invidious instance information: Ver todala información da instancia de
@@ -298,6 +307,7 @@ Settings:
     Subscription Settings: 'Axustes de subscricións'
     Hide Videos on Watch: 'Agochar vídeos visualizados'
     Fetch Feeds from RSS: 'Obter subscricións a través de RSS'
+    Manage Subscriptions: 'Xestionar subscricións'
     Fetch Automatically: Obter feed automaticamente
   Distraction Free Settings:
     Distraction Free Settings: 'Sen distraccións'
@@ -326,6 +336,10 @@ Settings:
     Select Import Type: 'Escoller tipo de importación'
     Select Export Type: 'Escoller tipo de exportación'
     Import Subscriptions: 'Importar subscricións'
+    Import FreeTube: 'Importar FreeTube'
+    Import YouTube: 'Importar YouTube'
+    Import NewPipe: 'Importar NewPipe'
+    Check for Legacy Subscriptions: 'Comprobar subscricións antigas (Legacy)'
     Export Subscriptions: 'Exportar subscricións'
     Export FreeTube: 'Exportar Freetube'
     Export YouTube: 'Exportar YouTube'
@@ -365,6 +379,31 @@ Settings:
     All playlists has been successfully exported: Todalas listas de reprodución exportáronse
       correctamente
     Export Playlists: Exportalas listas de reprodución
+  Advanced Settings:
+    Enable Debug Mode (Prints data to the console): 'Activar modo de depuración (escribe
+      datos na consola)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Enderezo proxy (Exemplo:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Premendo
+      en "TESTAR PROXY" enviarase unha petición a https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Usar Tor / Proxy para chamadas API'
+    TEST PROXY: 'TESTAR PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Ver instancias públicas'
+    Clear History:
+      Clear History: 'Limpar histórico'
+      # On Click
+      Are you sure you want to delete your history?: 'Estás seguro de querer limpar
+        o histórico?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Limpar subscricións'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Estás seguro de querer
+        limpar tódalas subscricións?'
+      #& Yes
+      #& No
 
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar cando se omita o segmento do
@@ -438,6 +477,33 @@ About:
   #On About page
   About: 'Sobre'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
+    software ten licencia libre AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Atopaches un erro? Tes algunha suxestión? Queres axudar? Visita a nosa páxina
+    de GitHub. Calquera petición é benvida.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Moitas
+    grazas a tódalas persoas e proxectos que fan FreeTube posible!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Queres
+    chatear? Únete ao noso servidor Element / Matrix. Lembra comprobar as regras antes
+    de te unir.'
+
+  'Looking for help? Check out our Wiki page.': 'Precisas axuda? Visita a nosa páxina
+    Wiki.'
+
+  Check out our Firefox extension!: 'Comproba a nosa extensión para Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Se
+    estás a desfrutar FreeTube, considera doar através de Liberapay ou ao noso enderezo
+    Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Noticias recentes sobre FreeTube'
+
   Donate: Doar
   these people and projects: aquelas persoas e proxectos
   FreeTube is made possible by: FreeTube é posible grazas a
@@ -459,6 +525,8 @@ About:
   Help: Axuda
   GitHub releases: Lanzamentos de GitHub
   Downloads / Changelog: Descargas / Rexistro de cambios
+  View License: Ver licenza
+  Licensed under the AGPLv3: Licenza baixo o AGPLv3
   Source code: Código fonte
   Beta: Beta
 Profile:
@@ -593,10 +661,39 @@ Video:
   video only: 'Só vídeo'
   audio only: 'Só audio'
   Published:
+    Jan: 'Xan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Abr'
+    May: 'Mai'
+    Jun: 'Xuñ'
+    Jul: 'Xul'
+    Aug: 'Ago'
+    Sep: 'Set'
+    Oct: 'Out'
+    Nov: 'Nov'
+    Dec: 'Dec'
+    Second: 'Segundo'
+    Seconds: 'Segundos'
+    Minute: 'Minuto'
+    Minutes: 'Minutos'
+    Hour: 'Hora'
+    Hours: 'Horas'
+    Day: 'Día'
+    Days: 'Días'
+    Week: 'Semana'
+    Weeks: 'Semanas'
+    Month: 'Mes'
+    Months: 'Meses'
+    Year: 'Ano'
+    Years: 'Anos'
+    Ago: 'Hai'
+    Upcoming: 'Estrea'
     In less than a minute: En menos dun minuto
   Published on: 'Publicado'
   Streamed on: 'Transmitido'
   Started streaming on: 'A transmisión comezou'
+  Publicationtemplate: 'Fai {number} {unit}'
 #& Videos
   External Player:
     Unsupported Actions:
@@ -640,12 +737,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver listaxe de reprodución completa'
+  Videos: 'Vídeos'
+  View: 'Visualización'
+  Views: 'Visualizacións'
   Last Updated On: 'Última actualización'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Lista de reprodución
+Toggle Theatre Mode: 'Activar modo cinema'
 Change Format:
   Change Media Formats: 'Mudar formato do vídeo'
   Use Dash Formats: 'Utilizar formato Dash'
@@ -749,7 +850,7 @@ Tooltips:
       teu feed da subscrición, cando se abra unha nova ventá e cando cambies de perfil.
   External Player Settings:
     Custom External Player Arguments: Calquera argumento de liña de comandos personalizado,
-      que desexa que se pase ao reprodutor externo.
+      separado por puntos e coma (';'), que desexa que se pase ao reprodutor externo.
     Ignore Warnings: Suprime avisos para cando os reprodutores externos actuais non
       apoian a acción actual (e.g. Invertendo listas de reprodución, etc.).
     Custom External Player Executable: Por defecto, FreeTube asumirá que o reprodutor
@@ -775,6 +876,7 @@ Falling back to Local API: 'Recorrendo á API local'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Este
   vídeo non está dispoñible porque faltan formatos. Isto pode ocorrer debido á non
   dispoñibilidade do país.'
+Subscriptions have not yet been implemented: 'As subscricións aínda non foron implementadas'
 Loop is now disabled: 'Reprodución en bucle desactivada'
 Loop is now enabled: 'Reprodución en bucle activada'
 Shuffle is now disabled: 'Reprodución aleatoria desactivada'
@@ -792,6 +894,8 @@ Playing Next Video Interval: Reproducindo o seguinte vídeo en pouco tempo. Prem
   cancelar. | Reproducindo o seguinte vídeo en {nextVideoInterval} segundo. Prema
   para cancelar. | Reproducindo o seguinte vídeo en {nextVideoInterval} segundos.
   Prema para cancelar.
+Hashtags have not yet been implemented, try again later: Os cancelos non foron aínda
+  aplicados. Inténtao outra vez máis tarde
 Unknown YouTube url type, cannot be opened in app: O tipo de URL de YouTube descoñecido
   non se pode abrir no aplicativo
 More: Máis
@@ -803,6 +907,8 @@ Channels:
   Search bar placeholder: Busca canles
   Count: Atopouse {number} canle(s).
   Empty: A túa lista de canles atopase baleira.
+  Unsubscribe: Cancelar a subscrición
+  Unsubscribed: Eliminouse {channelName} das túas subscricións
   Unsubscribe Prompt: Estás seguro de que queres cancelar a subscrición a "{channelName}"?
 Search Bar:
   Clear Input: Borrar entrada
diff --git a/static/locales/he.yaml b/static/locales/he.yaml
index 3ec3ef1fa3e04..589f7bf9b28b8 100644
--- a/static/locales/he.yaml
+++ b/static/locales/he.yaml
@@ -107,8 +107,7 @@ Subscriptions:
   Subscriptions: 'מינויים'
   Latest Subscriptions: 'מינויים אחרונים'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'רשימת
-    המינויים שלך ריקה כרגע. כדי לייבא את המינויים שלך ניתן לגשת להגדרות הנתונים ולבחור
-    בייבוא מנויים או לחפש ערוצים ולהירשם אליהם.'
+    המינויים שלך ריקה כרגע. יש להוסיף מינויים כדי לראות אותם כאן.'
   'Getting Subscriptions. Please wait.': 'מינויים נאספים. נא להמתין.'
   Refresh Subscriptions: 'רענון מינויים'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: לפרופיל
@@ -134,6 +133,11 @@ Most Popular: 'הכי פופולרי'
 Playlists: 'רשימות נגינה'
 User Playlists:
   Your Playlists: 'רשימות הנגינה שלך'
+  Playlist Message: העמוד הזה אינו משקף רשימות נגינה תקינות לחלוטין. הוא מציג רק סרטונים
+    ששמרת או הוספת כמועדפים. עם סיום העבודה, כל הסרטונים שכאן ייובאו אל רשימת הנגינה
+    ‚מועדפים’.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: לא
+    שמרת סרטונים. יש ללחוץ על כפתור השמירה בפינת הסרטון כדי שיופיע כאן
   Search bar placeholder: חיפוש רשימות נגינה
   Empty Search Message: אין סרטונים ברשימת הנגינה הזו שעונים לחיפוש שלך
   You have no playlists. Click on the create new playlist button to create a new one.: אין
@@ -175,7 +179,7 @@ User Playlists:
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: רשימת
         הנגינה הזאת משמשת לסימניות מהירות במקום {oldPlaylistName}. לחיצה כאן תבטל
         את זה
-      This playlist does not exist: רשימת השידורים הזו לא קיימת
+      This playlist does not exist: רשימת השידורים הזו לא קיימת.
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: חלק
         מהסרטונים ברשימת השידורים עדיין לא הועלו. לחץ כאן כדי להעתיק בכל זאת.
       Playlist name cannot be empty. Please input a name.: שם רשימת השידורים לא יכול
@@ -193,8 +197,6 @@ User Playlists:
         הזו.
       Playlist {playlistName} is the new quick bookmark playlist.: רשימת השידורים
         {playlistName} היא רשימת הסימנייה המהירה החדשה.
-      This playlist has a video with a duration error: רשימת הנגינה הזאת מכילה סרטון
-        אחד לפחות שאין לו אורך, הם ימוינו כאילו המשך שלהם הוא אפס.
     Search for Videos: חיפוש סרטונים
   Cannot delete the quick bookmark target playlist.: לא ניתן למחוק את רשימת הנגינה
     ביעד הסימניות הזריזות.
@@ -215,8 +217,8 @@ User Playlists:
       | בחר רשימת שידורים להוספת {videoCount} הסרטונים שלך
     Toast:
       You haven't selected any playlist yet.: עדיין לא נבחרה רשימת שידורים.
-      "{videoCount} video(s) added to 1 playlist": סרטון נוסף לרשימת השמעה | {videoCount}
-        סרטונים נוספו לרשימת השמעה
+      "{videoCount} video(s) added to 1 playlist": סרטון 1 נוסף לרשימת השמעה 1 |  {videoCount}
+        סרטונים שנוספו לרשימת השמעה 1
       "{videoCount} video(s) added to {playlistCount} playlists": 1 סרטון הוסף ל{playlistCount}
         רשימות שידורים | {videoCount} סרטונים הוספו ל{playlistCount} רשימות שידורים
   CreatePlaylistPrompt:
@@ -240,8 +242,6 @@ User Playlists:
   Add to Favorites: הוספה אל {playlistName}
   Quick Bookmark Enabled: סימנייה מהירה מופעלת
   Enable Quick Bookmark With This Playlist: אפשר סימנייה מהירה עם רשימת השידורים הזו
-  Export Playlist: ייצוא רשימת הנגינה הזאת
-  The playlist has been successfully exported: רשימת הנגינה יוצאה בהצלחה
 History:
   # On History Page
   History: 'היסטוריה'
@@ -254,7 +254,7 @@ Settings:
   # On Settings Page
   Settings: 'הגדרות'
   General Settings:
-    General Settings: 'כללי'
+    General Settings: 'הגדרות כלליות'
     Check for Updates: 'לבדוק אם קיימים עדכונים'
     Check for Latest Blog Posts: 'לבדוק אם קיימים פוסטים חדשים בבלוג'
     Fallback to Non-Preferred Backend on Failure: 'נסיגה למנגנון שאינו מועדף בעת כשל'
@@ -277,6 +277,8 @@ Settings:
       End: 'סוף'
       Hidden: מוסתר
       Blur: טשטוש
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'שרת Invidious
+      (ברירת המחדל היא https://invidious.snopyta.org)'
     Region for Trending: 'אזור לסרטונים חמים'
         #! List countries
     View all Invidious instance information: הצגת כל פרטי העותק של Invidious
@@ -297,9 +299,8 @@ Settings:
     Auto Load Next Page:
       Label: טעינת העמוד הבא אוטומטית
       Tooltip: טען דפים ותגובות נוספים באופן אוטומטי.
-    Open Deep Links In New Window: פתיחת כתובות שהועברו ל־FreeTube בחלון חדש
   Theme Settings:
-    Theme Settings: 'ערכת עיצוב'
+    Theme Settings: 'הגדרת ערכת עיצוב'
     Match Top Bar with Main Color: 'התאמת האזור העליון לצבע הראשי'
     Base Theme:
       Base Theme: 'ערכת עיצוב בסיסית'
@@ -314,8 +315,6 @@ Settings:
       Nordic: נורדית
       Solarized Dark: חשוך זוהר
       Solarized Light: בהיר זוהר
-      Gruvbox Dark: תיבת גרוב כהה
-      Gruvbox Light: תיבת גרוב בהירה
     Main Color Theme:
       Main Color Theme: 'צבע ראשי'
       Red: 'אדום'
@@ -363,16 +362,6 @@ Settings:
       Solarized Blue: כחול זוהר
       Solarized Violet: ויולט מואר בשמש
       Solarized Cyan: סולרייזד כחול-ירוק
-      Gruvbox Light Orange: תיבת גרוב כתומה בהירה
-      Gruvbox Dark Green: תיבת גרוב ירוקה כהה
-      Gruvbox Dark Purple: תיבת גרוב סגולה כהה
-      Gruvbox Light Purple: תיבת גרוב סגולה בהירה
-      Gruvbox Dark Blue: תיבת גרוב כחולה כהה
-      Gruvbox Light Red: תיבת גרוב אדומה בהירה
-      Gruvbox Dark Yellow: תיבת גרוב צהובה כהה
-      Gruvbox Dark Orange: תיבת גרוב כתומה כהה
-      Gruvbox Dark Aqua: תיבת גרוב מים כהים
-      Gruvbox Light Blue: תיבת גרוב כחולה בהירה
     Secondary Color Theme: 'ערכת צבע משנית'
         #* Main Color Theme
     UI Scale: יחס גודל הממשק
@@ -381,7 +370,7 @@ Settings:
     Hide Side Bar Labels: הסתרת התוויות בסרגל הצד
     Hide FreeTube Header Logo: הסתרת הלוגו התחתון של FreeTube
   Player Settings:
-    Player Settings: 'נגן'
+    Player Settings: 'הגדרת נגן'
     Play Next Video: 'ניגון הסרטון הבא'
     Turn on Subtitles by Default: 'הפעלת כתוביות כברירת מחדל'
     Autoplay Videos: 'הפעלה אוטומטית לסרטונים'
@@ -408,7 +397,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: מרווח זמן לפני ניגון הסרטון הבא בפלייליסט
-    Next Video Interval: מתזמן ספירה לאחור של נגינה אוטומטית
+    Next Video Interval: משך הסרטון הבא
     Display Play Button In Video Player: הצגת כפתור הניגון בתוך נגן הווידאו
     Scroll Volume Over Video Player: גלילה על הסרטון לשינוי עוצמת השמע
     Scroll Playback Rate Over Video Player: גלילת מהירות הנגינה על גבי נגן הווידאו
@@ -433,7 +422,7 @@ Settings:
     Enter Fullscreen on Display Rotate: מעבר למסך מלא עם סיבוב התצוגה
     Skip by Scrolling Over Video Player: אפשר לדלג על ידי גלילה על נגן הווידאו
   Privacy Settings:
-    Privacy Settings: 'פרטיות'
+    Privacy Settings: 'הגדרות פרטיות'
     Remember History: 'לזכור את היסטוריית הצפייה'
     Save Watched Progress: 'שמירת משך הצפייה'
     Clear Search Cache: 'ניקוי מטמון החיפוש'
@@ -453,16 +442,21 @@ Settings:
     Are you sure you want to remove all your playlists?: האם אתה בטוח שברצונך למחוק
       את כל רשימות השידורים שלך?
   Subscription Settings:
-    Subscription Settings: 'מינוי'
+    Subscription Settings: 'הגדרות מינויים'
     Hide Videos on Watch: 'הסתרת סרטונים לאחר הצפייה'
     Fetch Feeds from RSS: 'ייבוא עדכונים בעזרת RSS'
+    Manage Subscriptions: 'ניהול מינויים'
     Fetch Automatically: משיכת ערוץ העדכונים אוטומטית
-    Confirm Before Unsubscribing: אישור לפני ביטול מינוי
+    Confirm Before Unsubscribing: אשר לפני ביטול מנוי
+    Only Show Latest Video for Each Channel: הצג רק את הסרטון האחרון לכל ערוץ
   Data Settings:
-    Data Settings: 'נתונים'
+    Data Settings: 'הגדרות נתונים'
     Select Import Type: 'נא לבחור את תסדיר הייבוא'
     Select Export Type: 'נא לבחור את תסדיר הייצוא'
     Import Subscriptions: 'ייבוא מינויים'
+    Import FreeTube: 'יבוא בפורמט FreeTube'
+    Import YouTube: 'יבוא בפורמט YouTube'
+    Import NewPipe: 'יבוא בפורמט NewPipe'
     Export Subscriptions: 'ייצוא מינויים'
     Export FreeTube: 'ייצוא בתסדיר של FreeTube'
     Export YouTube: 'ייצוא בתסדיר של YouTube'
@@ -488,6 +482,7 @@ Settings:
     Unable to write file: 'לא ניתן ליצור את הקובץ'
     Unknown data key: 'מפתח נתון לא ידוע'
     How do I import my subscriptions?: 'איך לייבא את המינויים שלי?'
+    Check for Legacy Subscriptions: איתור מינויים מיושנים
     Manage Subscriptions: ניהול מינויים
     All playlists has been successfully exported: כל רשימות הנגינה יוצאו בהצלחה
     All playlists has been successfully imported: כל רשימות הנגינה יובאו בהצלחה
@@ -505,6 +500,32 @@ Settings:
         הסרת כל הרשימות בהגדרות הפרטיות.\n3. הפעל את הגרסה הישנה של FreeTube וייבא
         את הרשימות שיוצאו."
       Label: ייצוא רשימות לגרסאות ישנות של FreeTube
+  Advanced Settings:
+    Advanced Settings: 'הגדרות מתקדמות'
+    Enable Debug Mode (Prints data to the console): 'הפעל מצב Debug ( מציג נתונים
+      בקונסול)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'כתובת פרוקסי (דוגמה: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'לחיצה
+      על כפתור "בדיקת פרוקסי" תשלח בקשה לאתר https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'השתמש ב-Tor או פרוקסי לקריאות API'
+    TEST PROXY: 'בדוק פרוקסי'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'ראה שרתים פומביים'
+    Clear History:
+      Clear History: 'נקה היסטוריה'
+      # On Click
+      Are you sure you want to delete your history?: 'האם אתה בטוח שאתה רוצה למחוק
+        את ההיסטוריה שלך?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'נקה מנויים'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'האם אתה בטוח שאתה רוצה
+        למחוק את כל המנויים?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Live Chat: הסתרת צ׳אט חי
@@ -514,7 +535,7 @@ Settings:
     Hide Comment Likes: הסתרת לייקים על תגובות
     Hide Channel Subscribers: הסתרת מנויי הערוץ
     Hide Video Likes And Dislikes: הסתרת לייקים ודיסלייקים לסרטון
-    Distraction Free Settings: השבתת הסחות
+    Distraction Free Settings: הגדרות להשבתת הסחות
     Hide Video Views: הסתרת תצוגות סרטונים
     Hide Active Subscriptions: הסתרת מינויים פעילים
     Hide Playlists: הסתרת רשימות נגינה
@@ -529,20 +550,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: הצג כותרות ללא אותיות גדולות
       וסימני פיסוק מיותרים
     Hide Featured Channels: הסתרת ערוצים מומלצים
-    Hide Channel Playlists: הסתרת לשונית „רשימות נגינה” של ערוץ
-    Hide Channel Community: הסתרת לשונית ה„קהילת” הערוץ
-    Hide Channel Shorts: הסתרת לשונית ה־„Shorts” של הערוץ
+    Hide Channel Playlists: הסתרת רשימת נגינה של ערוץ
+    Hide Channel Community: הסתרת קהילת הערוץ
+    Hide Channel Shorts: הסתרת ה־Shorts של הערוץ
     Sections:
       Watch Page: עמוד הצפייה
       Channel Page: עמוד ערוץ
       Side Bar: סרגל צד
       General: כללי
       Subscriptions Page: עמוד מינויים
-    Hide Channel Podcasts: הסתרת לשונית ה„הסכתים” של הערוץ
-    Hide Channel Releases: הסתרת לשונית ה„שחרורים” של הערוץ
+    Hide Channel Podcasts: הסתרת הסכתים של הערוץ
+    Hide Channel Releases: הסתרת שחרורים של הערוץ
     Hide Subscriptions Live: הסתרת שידורים חיים של המינויים
     Hide Subscriptions Shorts: הסתרת Shorts של המינויים
     Hide Subscriptions Videos: הסתרת סרטוני מינוי
+    Blur Thumbnails: טשטוש התמונות הממוזערות
     Hide Profile Pictures in Comments: הסתרת תמונות הפרופיל בהערות
     Hide Subscriptions Community: הסתרת קהילת המינויים
     Hide Videos and Playlists Containing Text Placeholder: מילה, חלק מילה או ביטוי
@@ -552,9 +574,8 @@ Settings:
     Hide Channels Already Exists: ID הערוץ כבר קיים
     Hide Channels API Error: אירעה שגיאה באיחזור משתמש עם ה-ID שסופק. נא לבדוק שוב
       אם ה-ID נכון.
-    Hide Videos and Playlists Containing Text: הסתרת סרטונים ורשימות שידורים המכילים
+    Hide Videos and Playlists Containing Text: הסתר סרטונים ורשימות שידורים המכילים
       טקסט
-    Hide Channel Home: הסתרת לשונית ה„בית” של הערוץ
   The app needs to restart for changes to take effect. Restart and apply change?: צריך
     להפעיל את היישומון מחדש כדי שהשינויים ייכנסו לתוקף. להפעיל מחדש ולהחיל את השינוי?
   Proxy Settings:
@@ -572,14 +593,10 @@ Settings:
     Proxy Host: מארח מתווך
     Proxy Protocol: פרוטוקול מתווך
     Enable Tor / Proxy: הפעלת Tor / מתווך
-    Proxy Settings: מתווך (פרוקסי)
-    Proxy Warning: ל־FreeTube אין מתווך מובנה אבל הוא יכול להתחבר למתווך חיצוני, כמו
-      למשל כזה שרץ על המחשב שלך כמו Tor או מתווך חיצוני כגון מתווך SOCKS5 שמסופק על
-      ידי איזשהו ספק VPN. אם האפשרות פעילה, נא לוודא שהמתווך/Tor שלך מוגדרים כראוי,
-      או ש־FreeTube לא יוכל למשוך נתונים כלל.
+    Proxy Settings: הגדרות מתווך (פרוקסי)
   External Player Settings:
     External Player: נגן חיצוני
-    External Player Settings: נגן חיצוני
+    External Player Settings: הגדרות נגן חיצוני
     Custom External Player Executable: קובץ בר־הרצה מותאם אישית לַנַּגָּן
     Ignore Unsupported Action Warnings: התעלמות מאזהרות על פעולות שאינן נתמכות
     Custom External Player Arguments: משתנים לנגן חיצוני בהתאמה אישית
@@ -589,7 +606,7 @@ Settings:
     Ignore Default Arguments: התעלם מפרמטרים ברירת מחדל
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: להודיע לגבי דילוג על קטע החסוּת
-    SponsorBlock Settings: חוסם מממנים
+    SponsorBlock Settings: הגדרות חוסם מממנים
     Enable SponsorBlock: הפעלת חוסם מממנים
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': כתובת ה־API של חוסם
       המממנים (ברירת המחדל היא https://sponsor.ajay.app)
@@ -605,19 +622,19 @@ Settings:
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': כתובת
       API של DeArrow Thumbnail Generator (ברירת מחדל היא https://dearrow-thumb.ajay.app)
   Download Settings:
-    Download Settings: הורדה
+    Download Settings: הגדרות הורדה
     Ask Download Path: לשאול מה נתיב ההורדות
     Choose Path: בחירת נתיב
     Download Behavior: התנהגות הורדה
     Download in app: הורדה ביישומון
     Open in web browser: פתיחה בדפדפן
   Parental Control Settings:
-    Parental Control Settings: בקרת הורים
+    Parental Control Settings: הגדרות בקרת הורים
     Hide Search Bar: הסתרת סרגל החיפוש
     Hide Unsubscribe Button: הסתרת כפתור ביטול מינוי
     Show Family Friendly Only: הצגת דברים ידידותיים למשפחה בלבד
   Experimental Settings:
-    Experimental Settings: ניסיוני
+    Experimental Settings: הגדרות ניסיוניות
     Replace HTTP Cache: החלפת מטמון HTTP
     Warning: הגדרות אלו הן ניסיוניות, הן גורמות לקריסות כשהן מופעלות. מומלץ מאוד לבצע
       גיבויים. השימוש על אחריותך בלבד!
@@ -627,24 +644,58 @@ Settings:
     Password: סיסמה
     Enter Password To Unlock: נא למלא סיסמה כדי לשחרר את ההגדרות
   Password Settings:
-    Password Settings: סיסמה
+    Password Settings: הגדרות סיסמה
     Set Password: הגדרת סיסמה
     Remove Password: הסרת סיסמה
     Set Password To Prevent Access: יש להגדיר סיסמה כדי למנוע גישה להגדרות
-  Sort Settings Sections (A-Z): מיון אזורי הגדרות (א-ת)
-  Return to Settings Menu: חזרה לתפריט ההגדרות
+  Expand All Settings Sections: פתח את כל חלקי ההגדרות
+  Sort Settings Sections (A-Z): מיין חלקי הגדרות (א-ת)
 About:
   #On About page
   About: 'על אודות'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'תוכנה
+    זו היא Copyleft המופצת ברשיון החופשי AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    מצאתם באג? יש הצעות לשיפור? רוצים לעזור? בקרו את עמוד ה-GitHub שלנו. Pull requests
+    ייתקבלו בברכה.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'תודה
+    רבה לאנשים ולפרוייקטים שהופכים את FreeTube לאפשרי!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'רוצים
+    לדבר? הצטרפו לשרת ה- Element / Matrix שלנו. בבקשה לקרוא את החוקים לפני ההצטרפות.'
+
+  'Looking for help? Check out our Wiki page.': 'צריכים עזרה? בקרו את עמוד ה- Wiki
+    שלנו.'
+
+  Check out our Firefox extension!: 'יש לנו תוסף ל-Firefox !'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'במידה
+    ואתם נהנים מ-FreeTube, בבקשה תשקלו לתרום דרך Liberapay או דרך ארנק ה-Bitcoin שלנו.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'מה חדש ב-FreeTube'
+
+  Translate via Weblate: תרגום עם Weblate
   Website: אתר
+  Source Code: קוד מקור
+  Release Notes: הערות מהדורה
   Blog: בלוג
   Credits: תודות
   FAQ: שו״ת
+  Wiki: ויקי
+  Report an Issue: דיווח על תקלה
+  Channel Rules: כללי הערוץ
   Email: דוא״ל
+  License: רישיון
   Beta: בטא
   Donate: תרומה
+  Useful Links: קישורים שימושיים
   Help: עזרה
+  Contact: יצירת קשר
   these people and projects: האנשים והמיזמים האלו
   FreeTube is made possible by: FreeTube קיים בזכות
   Translate: תרגום
@@ -658,6 +709,8 @@ About:
   FreeTube Wiki: הוויקי של FreeTube
   GitHub releases: מהדורות ב־GitHub
   Downloads / Changelog: הורדות / יומן שינויים
+  View License: הצגת הרישיון
+  Licensed under the AGPLv3: בכפוף לרישיון AGPLv3
   Source code: קוד מקור
   Discussions: דיונים
   AGPLv3: AGPLv3
@@ -703,7 +756,7 @@ Profile:
     את הערוצים שבחרת? הערוצים לא יימחקו משאר הפרופילים.'
 #On Channel Page
   Profile Filter: מסנן פרופילים
-  Profile Settings: הפרופיל
+  Profile Settings: הגדרת הפרופיל
   Toggle Profile List: החלפת תצוגת רשימת פרופילים
   Edit Profile Name: ערוך שם הפרופיל
   Close Profile Dropdown: סגור תפריט הפרופיל
@@ -771,9 +824,6 @@ Channel:
   Releases:
     Releases: שחרורים
     This channel does not currently have any releases: בערוץ הזה אין שחרורים כרגע
-  Home:
-    Home: בית
-    View Playlist: הצגת רשימת נגינה
 Video:
   Mark As Watched: 'סימון כנצפה'
   Remove From History: 'הסרה מהיסטוריית הצפייה'
@@ -808,8 +858,38 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'מנגנון
     הצ׳אט כרגע לא נתמך ע״י ה־API של Invidious. דרוש חיבור ישיר ל־YouTube.'
   Published:
+    Jan: 'בינו׳'
+    Feb: 'בפבר׳'
+    Mar: 'במרץ'
+    Apr: 'באפר׳'
+    May: 'במאי'
+    Jun: 'ביונ׳'
+    Jul: 'ביול׳'
+    Aug: 'באוג׳'
+    Sep: 'בספט׳'
+    Oct: 'באוק׳'
+    Nov: 'בנוב׳'
+    Dec: 'בדצמ׳'
+    Second: 'שנייה'
+    Seconds: 'שניות'
+    Minute: 'דקה'
+    Minutes: 'דקות'
+    Hour: 'שעה'
+    Hours: 'שעות'
+    Day: 'יום'
+    Days: 'ימים'
+    Week: 'שבוע'
+    Weeks: 'שבועות'
+    Month: 'חודש'
+    Months: 'חודשים'
+    Year: 'שנה'
+    Years: 'שנים'
+    Ago: 'לפני'
+    Upcoming: 'שידור הבכורה ישודר ב־'
+    Less than a minute: פחות מדקה
     In less than a minute: עוד פחות מדקה
   Published on: 'פורסם'
+  Publicationtemplate: 'לפני {number} {unit}'
 #& Videos
   audio only: שמע בלבד
   video only: סרטון בלבד
@@ -871,7 +951,7 @@ Video:
       Stats: נתונים
       Media Formats: 'פורמטים מדיה: {formats}'
       Player Dimensions: 'ממדי הנגן: {height}x‏{width}'
-      Bitrate: 'קצב סיביות: {bitrate} קסל״ש'
+      Bitrate: 'קצב נתונים:  kbps‏ {bitrate}'
       Buffered: 'מטופל: %{bufferedPercentage}‏‏‎‏‏‏‏‏'
       Volume: 'עוצמת קול: %{volumePercentage}'
       Bandwidth: 'רוחב פס: kbps ‏‏‏‏‎‎‎{bandwidth}‏‎'
@@ -881,23 +961,13 @@ Video:
       CodecsVideoAudio: 'קודקים: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
       CodecsVideoAudioNoItags: 'קודקים: {videoCodec} / {audioCodec}'
     Hide Stats: הסתר נתונים
-    You appear to be offline: נראה שהחיבור שלך נקטע.
+    You appear to be offline: נראה שאתה לא מחובר
     Playback will resume automatically when your connection comes back: הפלייבק יחודש
       אוטומטית כאשר החיבור שלך יחזור.
     Skipped segment: דילגתי על {segmentCategory}
   Hide Channel: הסתר ערוץ
   Unhide Channel: הצג ערוץ
   More Options: אפשרויות נוספות
-  IP block: YouTube חסמו את כתובת ה־IP לצפייה בסרטונים. נא לנסות לעבור ל־VPN או למתווך
-    אחרים.
-  MembersOnly: אי אפשר לצפות בסרטונים לחברים בלבד עם FreeTube כיוון שהם דורשים כניסה
-    ל־Google וחברות בתשלום לערוץ של מי שהעלה.
-  AgeRestricted: אי אפשר לצפות בסרטונים שמוגבלים בגיל עם FreeTube כיוון שהם דורשים
-    כניסה עם Google ושימוש בחשבון YouTube עם גיל מאומת.
-  Unlisted: לא מופיע
-  DeArrow:
-    Show Modified Details: הצגת פרטים לאחר שינוי
-    Show Original Details: הצגת פרטים מקוריים
 Videos:
   #& Sort By
   Sort By:
@@ -908,6 +978,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'צפייה ברשימת הנגינה המלאה'
+  Videos: 'סרטונים'
+  View: 'צפייה'
+  Views: 'צפיות'
   Last Updated On: 'עודכן לאחרונה ב־'
 
 # On Video Watch Page
@@ -923,8 +996,7 @@ Playlist:
     Custom: מותאם
     VideoTitleDescending: כותר (ת-א)
     DateAddedNewest: האחרונים שנוספו ראשונים
-    VideoDurationAscending: משך (קצרים בהתחלה)
-    VideoDurationDescending: משך (ארוכים בהתחלה)
+Toggle Theatre Mode: 'הפעלת / השבתת מצב קולנוע'
 Change Format:
   Change Media Formats: 'שינוי תסדירי המדיה'
   Use Dash Formats: 'שימוש בתסדירי DASH'
@@ -987,6 +1059,7 @@ Falling back to Invidious API: 'מתבצעת נסיגה ל־API של Invidious'
 Falling back to Local API: 'מתבצעת נסיגה ל־API המקומי'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'חסרות
   תצורות לסרטון הזה. הדבר יכול להיגרם בגלל חוסר זמינות למדינה.'
+Subscriptions have not yet been implemented: 'מנגנון המינויים עדיין לא מוכן'
 Loop is now disabled: 'ניגון בלולאה מושבת'
 Loop is now enabled: 'ניגון בלולאה הופעל'
 Shuffle is now disabled: 'ערבוב מושבת'
@@ -1015,11 +1088,9 @@ Tooltips:
       שלך.\n"
     Region for Trending: מגמות אזוריות מאפשרות לך לבחור סרטונים חמים של איזו מדינה
       שמעניין אותך לראות.
-    Open Deep Links In New Window: כתובות שמועברות ל־FreeTube, כגון העברת הרחבות דפדפן
-      או ארגומנטים בשורת הפקודה, תיפתחנה בחלון חדש.
   Player Settings:
     Proxy Videos Through Invidious: יתבצע חיבור ל־Invidious כדי להגיש סרטונים במקום
-      להתחבר ישירות ל־YouTube.
+      להתחבר ישירות ל־YouTube. דורס את העדפת ה־API.
     Default Video Format: קביעת התסדירים בעת ניגון סרטונים. תסדירי DASH יכולים להתנגן
       באיכויות גבוהות יותר. התסדירים המיושנים מוגבלים ל־720 פיקסלים לכל היותר אך משתמשויםבפחות
       רוחב פס. תסדירי שמע הם הזרמות של שמע בלבד.
@@ -1045,8 +1116,8 @@ Tooltips:
       על נגנים חיצוניים.
     Custom External Player Executable: כברירת מחדל FreeTube יניח שהנגן החיצוני הנבחר
       נגיש דרך משתנה הסביבה PATH. במקרה הצורך, ניתן להגדיר כאן נתיב משלך.
-    Custom External Player Arguments: ארגומנטים כלשהם משלך לשורת הפקודה להעברה הלאה
-      לנגן החיצוני.
+    Custom External Player Arguments: הארגומנטים משלך לשורת הפקודה שיועברו לנגן החיצוני,
+      מופרדים בפסיקים (‚;’).
     Ignore Default Arguments: אל תשלח אף ארגומנט סטנדרטי לנגן החיצוני, מלבד כתובת
       הסרטון (למשל, קצב הפלייבק, כתובת הרשימה, וכו'). ארגומנטים מותאמים ימשיכו להיות
       מועברים.
@@ -1077,6 +1148,8 @@ Default Invidious instance has been set to {instance}: עותק Invidious שהו
 Default Invidious instance has been cleared: נוקתה העדפת עותק ברירת המחדל של Invidious
 External link opening has been disabled in the general settings: פתיחת הקישורים החיצוניים
   מושבתת בהגדרות הכלליות
+Hashtags have not yet been implemented, try again later: עדיין לא הוטמעו תגיות הקבץ,
+  נא לנסות בהמשך
 Downloading failed: אירעה שגיאה בהורדת "{videoTitle}"
 Starting download: 'ההורדה של „{videoTitle}” החלה'
 Downloading has completed: 'ההורדה של „{videoTitle}” הסתיימה'
@@ -1089,6 +1162,8 @@ New Window: חלון חדש
 Channels:
   Search bar placeholder: חיפוש ערוצים
   Empty: רשימת הערוצים שלך ריקה כרגע.
+  Unsubscribe: ביטול מינוי
+  Unsubscribed: '{channelName} הוסר מרשימת המינויים שלך'
   Count: '{number} ערוצים נמצאו.'
   Channels: ערוצים
   Title: רשימת ערוצים
@@ -1099,7 +1174,6 @@ Chapters:
   Chapters: פרקים
   'Chapters list visible, current chapter: {chapterName}': 'רשימת הפרקים גלויה, הפרק
     הנוכחי: {chapterName}'
-  Key Moments: רגעי שיא
 Clipboard:
   Copy failed: ההעתקה ללוח הגזירים נכשלה
   Cannot access clipboard without a secure connection: לא ניתן לגשת ללוח הגזירים ללא
@@ -1120,11 +1194,6 @@ Search Listing:
     4K: 4K
     Subtitles: כתוביות
     Closed Captions: כתוביות לכבדי שמיעה
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: חדש
-    3D: תלת־ממד
 Search character limit: שאילתת החיפוש חורגת ממגבלת התווים {searchCharacterLimit}
 Feed:
   Feed Last Updated: 'הערוץ {feedName} התעדכן לאחרונה: {date}'
@@ -1145,13 +1214,3 @@ Channel Unhidden: '{channel} הוסר ממסנן ערוצים'
 Channel Hidden: '{channel} נוסף למסנן ערוצים'
 Trimmed input must be at least N characters long: הקלט המקוצץ חייב להיות באורך של
   לפחות תו אחד | הקלט המקוצץ חייב להיות באורך של לפחות {length} תווים
-Keys:
-  arrowright: חץ ימינה
-  arrowup: חץ למעלה
-  arrowdown: חץ למטה
-  arrowleft: חץ שמאלה
-  ctrl: Ctrl
-  alt: Alt
-Right-click or hold to see history: לחיצה ימנית או החזקה כדי לראות היסטוריה
-shortcutJoinOperator: +
-KeyboardShortcutTemplate: '{label} ({shortcut})'
diff --git a/static/locales/hi.yaml b/static/locales/hi.yaml
index 94b7151eae486..7a5fa624e6781 100644
--- a/static/locales/hi.yaml
+++ b/static/locales/hi.yaml
@@ -99,6 +99,13 @@ Most Popular: 'सबसे लोकप्रिय'
 Playlists: 'प्लेलिस्ट'
 User Playlists:
   Your Playlists: 'आपकी प्लेलिस्ट'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: आपके
+    सहेजे गए वीडियो खाली हैं। किसी वीडियो को यहां सूचीबद्ध करने के लिए उसके कोने पर
+    सहेजें बटन पर क्लिक करें
+  Playlist Message: यह पृष्ठ पूरी तरह से काम करने वाली प्लेलिस्ट को प्रतिबिंबित नहीं
+    करता है। यह केवल उन वीडियो को सूचीबद्ध करता है जिन्हें आपने सहेजा है या पसंदीदा
+    है। जब काम समाप्त हो जाता है, तो वर्तमान में यहां सभी वीडियो 'पसंदीदा' प्लेलिस्ट
+    में स्थानांतरित हो जाएंगे।
   Empty Search Message: इस प्लेलिस्ट में आपकी खोज से मेल खाने वाला कोई वीडियो नहीं
     है
   Search bar placeholder: प्लेलिस्ट में खोजें
@@ -161,6 +168,7 @@ Settings:
     Match Top Bar with Main Color: 'टॉप बार को मेन कलर से मैच करें'
   Player Settings:
     Proxy Videos Through Invidious: 'इनविडियस के माध्यम से प्रॉक्सी वीडियो'
+  Advanced Settings: {}
 About:
   #On About page
   Email: ईमेल करें
@@ -205,6 +213,8 @@ Channels:
   Count: '{number} चैनल मिला(मिले)।'
   Title: चैनल सूची
   Empty: आपकी चैनल सूची वर्तमान में खाली है।
+  Unsubscribe: अनसब्सक्राईब करें
+  Unsubscribed: '{channelName} को आपकी सब्सक्रिप्शन से हटा दिया गया है'
   Unsubscribe Prompt: क्या आप वाकई "{channelName}" की सदस्यता छोड़ना चाहते हैं?
 Are you sure you want to open this link?: क्या आप वाकई इस लिंक को खोलना चाहते हैं?
 Search Bar:
diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index b55df64ea13e7..9e8d51359ab80 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -41,10 +41,8 @@ Global:
     Video Count: 1 video | {count} videa
     Subscriber Count: 1 pretplatnik | {count} pretplatnika
     View Count: 1 prikaz | {count} prikaza
-    Watching Count: 1 gledatelj | {count} gledatelja
+    Watching Count: 1 praćenje | {count} praćenja
     Channel Count: 1 kanal | {count} kanala
-    Comment Count: 1 komentar | {count} komentara
-    Like Count: 1 lajk | {count} lajkova
   Input Tags:
     Length Requirement: Oznaka mora imati barem {number} znakova
 Search / Go to URL: 'Pretraži / Idi na URL'
@@ -101,9 +99,8 @@ Subscriptions:
   Subscriptions: 'Pretplate'
   Latest Subscriptions: 'Najnovije pretplate'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Tvoj
-    popis pretplata je trenutačno prazan. Ako želiš uvesti tvoje pretplate, idi u
-    postavke podataka i odaberi „Uvezi pretplate” ili traži kanale i pretplati se
-    na njih.'
+    popis pretplata je trenutačno prazan. Za prikaz pretplata na ovom mjestu, dodaj
+    neke pretplate.'
   'Getting Subscriptions. Please wait.': 'Preuzimanje pretplata. Pričekaj.'
   Refresh Subscriptions: 'Aktualiziraj pretplate'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Ovaj
@@ -130,6 +127,12 @@ Most Popular: 'Najpopularniji'
 Playlists: 'Zbirke'
 User Playlists:
   Your Playlists: 'Tvoje zbirke'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nemaš
+    spremljenih videa. Pritisni gumb za spremanje u sličici videa, kako bi se video
+    ovdje prikazao
+  Playlist Message: Ova stranica ne odražava potpuno funkcionalne zbirke. Prikazuje
+    samo spremljena ili kao favoriti označena videa. Kad posao završi, sva trenutačno
+    ovdje prisutna videa premjestit će se u zbirku „Favoriti”.
   Search bar placeholder: Traži zbirke
   Empty Search Message: U ovoj zbirci nema videa koji odgovaraju tvojem pretraživanju
   This playlist currently has no videos.: Ova zbirka trenutačno nema nijedan video.
@@ -143,6 +146,8 @@ User Playlists:
   Cancel: Odustani
   Edit Playlist Info: Uredi podatke zbirke
   Copy Playlist: Kopiraj zbirku
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Stvarno
+    želiš ukloniti sva gledana videa iz ove zbirke? To se ne može poništiti.
   Delete Playlist: Ukloni zbirku
   Are you sure you want to delete this playlist? This cannot be undone: Stvarno želiš
     izbrisati ovu zbirku? To se ne može poništiti.
@@ -183,6 +188,7 @@ User Playlists:
       There were no videos to remove.: Nije bilo videa za uklanjanje.
       This playlist is now used for quick bookmark: Ova se zbirka sada koristi za
         brze zabilješke
+      Quick bookmark disabled: Brze zabilješke su deaktivirane
       Reverted to use {oldPlaylistName} for quick bookmark: Vraćeno na korištenje
         zbirke „{oldPlaylistName}” za brze zabilješke
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Ova
@@ -192,9 +198,6 @@ User Playlists:
         je nova zbirka za brze zabilješke.
       This playlist is already being used for quick bookmark.: Ova se zbirka već koristi
         za brze zabilješke.
-      This playlist has a video with a duration error: Ova zbirka sadrži barem jedan
-        video koji nema trajanje. Video će se svrstati kao da je njegovo trajanje
-        nula.
     Search for Videos: Traži videa
   AddVideoPrompt:
     N playlists selected: 'Odabrano: {playlistCount}'
@@ -227,6 +230,7 @@ User Playlists:
   Add to Favorites: Dodaj u zbirku „{playlistName}”
   Remove from Favorites: Ukloni iz zbirke „{playlistName}”
   Enable Quick Bookmark With This Playlist: Aktiviraj brze zabilješke s ovom zbirkom
+  Disable Quick Bookmark: Deaktiviraj brze zabilješke
   Playlists with Matching Videos: Zbirke s poklapajućim videima
   Quick Bookmark Enabled: Brze zabilješke aktivirano
   Cannot delete the quick bookmark target playlist.: Nije moguće izbrisati zbirku
@@ -240,8 +244,6 @@ User Playlists:
     želiš ukloniti 1 gledani video iz ove zbirke? To se ne može poništiti. | Stvarno
     želiš ukloniti {playlistItemCount} gledana/ih videa iz ove zbirke? To se ne može
     poništiti.
-  Export Playlist: Izvezi ovu zbirku
-  The playlist has been successfully exported: Zbirka je uspješno izvezena
 History:
   # On History Page
   History: 'Povijest'
@@ -255,7 +257,7 @@ Settings:
   # On Settings Page
   Settings: 'Postavke'
   General Settings:
-    General Settings: 'Opće'
+    General Settings: 'Opće postavke'
     Fallback to Non-Preferred Backend on Failure: 'U slučaju problema koristi sekundarni
       pozadinski sustav'
     Enable Search Suggestions: 'Aktiviraj prijedloge pretrage'
@@ -277,6 +279,8 @@ Settings:
       End: 'Kraj'
       Hidden: Skriveno
       Blur: Neoštro
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious primjerak
+      (standardno se koristi https://invidious.snopyta.org)'
     Region for Trending: 'Regija za videa u trendu'
         #! List countries
     Check for Latest Blog Posts: Traži najnovije objave na blogu
@@ -300,8 +304,8 @@ Settings:
       Label: Automatski učitaj sljedeću stranicu
       Tooltip: Automatski učitaj dodatne stranice i komentare.
   Theme Settings:
-    Theme Settings: 'Tema'
-    Match Top Bar with Main Color: 'Uskladi gornju traku s glavnom bojom'
+    Theme Settings: 'Postavke teme'
+    Match Top Bar with Main Color: 'Koristi glavnu boju u gornjoj traci'
     Base Theme:
       Base Theme: 'Osnova teme'
       Black: 'Crna'
@@ -333,27 +337,27 @@ Settings:
       Amber: 'Žutosmeđa'
       Orange: 'Narančasta'
       Deep Orange: 'Tamnonarančasta'
-      Dracula Cyan: 'Drakula cijan'
-      Dracula Green: 'Drakula zelena'
-      Dracula Orange: 'Drakula narančasta'
-      Dracula Pink: 'Drakula ružičasta'
-      Dracula Purple: 'Drakula ljubičasta'
-      Dracula Red: 'Drakula crvena'
-      Dracula Yellow: 'Drakula žuta'
-      Catppuccin Mocha Rosewater: Catppuccin Mocha ruža
-      Catppuccin Mocha Flamingo: Catppuccin Mocha flamingo
-      Catppuccin Mocha Pink: Catppuccin Mocha ružičasta
-      Catppuccin Mocha Mauve: Catppuccin Mocha ljubičasta
-      Catppuccin Mocha Red: Catppuccin Mocha crvena
-      Catppuccin Mocha Maroon: Catppuccin Mocha kestenjasta
-      Catppuccin Mocha Peach: Catppuccin Mocha breskva
-      Catppuccin Mocha Yellow: Catppuccin Mocha žuta
-      Catppuccin Mocha Teal: Catppuccin Mocha plavozelena
-      Catppuccin Mocha Sky: Catppuccin Mocha nebo
-      Catppuccin Mocha Sapphire: Catppuccin Mocha safir
-      Catppuccin Mocha Blue: Catppuccin Mocha plava
-      Catppuccin Mocha Lavender: Catppuccin Mocha lavanda
-      Catppuccin Mocha Green: Catppuccin Mocha zelena
+      Dracula Cyan: 'Drakula Cijan'
+      Dracula Green: 'Drakula Zelena'
+      Dracula Orange: 'Drakula Narančasta'
+      Dracula Pink: 'Drakula Ružičasta'
+      Dracula Purple: 'Drakula Ljubičasta'
+      Dracula Red: 'Drakula Crvena'
+      Dracula Yellow: 'Drakula Žuta'
+      Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater
+      Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo
+      Catppuccin Mocha Pink: Catppuccin Mocha Ružičasta
+      Catppuccin Mocha Mauve: Catppuccin Mocha Ljubičasta
+      Catppuccin Mocha Red: Catppuccin Mocha Crvena
+      Catppuccin Mocha Maroon: Catppuccin Mocha Kestenjasta
+      Catppuccin Mocha Peach: Catppuccin Mocha Breskva
+      Catppuccin Mocha Yellow: Catppuccin Mocha Žuta
+      Catppuccin Mocha Teal: Catppuccin Mocha Plavozelena
+      Catppuccin Mocha Sky: Catppuccin Mocha Nebo
+      Catppuccin Mocha Sapphire: Catppuccin Mocha Safir
+      Catppuccin Mocha Blue: Catppuccin Mocha Plava
+      Catppuccin Mocha Lavender: Catppuccin Mocha Lavanda
+      Catppuccin Mocha Green: Catppuccin Mocha Zelena
       Solarized Blue: Solarna plava
       Solarized Green: Solarna zelena
       Solarized Yellow: Solarna žuta
@@ -370,7 +374,7 @@ Settings:
     Hide Side Bar Labels: Sakrij oznake bočnih traka
     Hide FreeTube Header Logo: Sakrij FreeTube logotip u zaglavlju
   Player Settings:
-    Player Settings: 'Player'
+    Player Settings: 'Postavke playera'
     Play Next Video: 'Reproduciraj sljedeći video'
     Turn on Subtitles by Default: 'Standardno uključi titlove'
     Autoplay Videos: 'Automatski reproduciraj videa'
@@ -387,15 +391,15 @@ Settings:
     Default Quality:
       Default Quality: 'Standardna kvaliteta'
       Auto: 'Automatski'
-      144p: '144p'
-      240p: '240p'
-      360p: '360p'
-      480p: '480p'
-      720p: '720p'
-      1080p: '1080p'
-      1440p: '1440p'
+      144p: '144 p'
+      240p: '240 p'
+      360p: '360 p'
+      480p: '480 p'
+      720p: '720 p'
+      1080p: '1080 p'
+      1440p: '1440 p'
       4k: '4k'
-      8k: '8k'
+      8k: '8 k'
     Playlist Next Video Interval: Interval sljedećeg videa zbirke
     Next Video Interval: Interval za sljedeći video
     Scroll Volume Over Video Player: Mijenjaj glasnoću u video playeru
@@ -424,7 +428,7 @@ Settings:
       ekrana
     Skip by Scrolling Over Video Player: Preskoči pomicanjem preko video playera
   Privacy Settings:
-    Privacy Settings: 'Privatnost'
+    Privacy Settings: 'Postavke privatnosti'
     Remember History: 'Zapamti povijest'
     Save Watched Progress: 'Spremi napredak gledanja'
     Clear Search Cache: 'Isprazni predmemoriju pretrage'
@@ -445,11 +449,47 @@ Settings:
     Are you sure you want to remove all your playlists?: Stvarno želiš ukloniti sve
       tvoje zbirke?
   Subscription Settings:
-    Subscription Settings: 'Pretplata'
+    Subscription Settings: 'Postavke pretplata'
     Hide Videos on Watch: 'Sakrij video nakon gledanja'
     Fetch Feeds from RSS: 'Dohvati feedove s RSS-a'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Format izvoza pretplata'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Upravljaj pretplatama'
+    Import Subscriptions: 'Uvoz pretplata'
+    Export Subscriptions: 'Izvoz pretplata'
+    How do I import my subscriptions?: 'Kako mogu uvesti pretplate?'
     Fetch Automatically: Automatski dohvati feed
+    Only Show Latest Video for Each Channel: Prikaži samo najnoviji video za svaki
+      kanal
     Confirm Before Unsubscribing: Izbjegni slučajno otkazivanje pretplate
+  Advanced Settings:
+    Advanced Settings: 'Napredne postavke'
+    Enable Debug Mode (Prints data to the console): 'Aktiviraj modus otklanjanja grešaka
+      (ispisuje podatke na konzolu)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adresa posrednika (npr.:
+      SOCKS5: //127.0.0.1: 9050)'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Pritiskom
+      gumba „TESTIRAJ POSREDNIKA” poslat će se zahtjev na https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Koristi Tor/posrednika za pozive sučelja'
+    TEST PROXY: 'TESTIRAJ POSREDNIKA'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Pogledaj javne primjerke'
+    Clear History:
+      Clear History: 'Izbriši povijest'
+      # On Click
+      Are you sure you want to delete your history?: 'Stvarno želiš izbrisati povijest?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Izbriši pretplate'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Stvarno želiš ukloniti
+        sve pretplate?'
+      #& Yes
+      #& No
 
   Data Settings:
     Unknown data key: Nepoznat podatkovni ključ
@@ -476,11 +516,15 @@ Settings:
     Export YouTube: Izvezi YouTube
     Export FreeTube: Izvezi FreeTube
     Export Subscriptions: Izvezi pretplate
+    Import NewPipe: Uvezi NewPipe
+    Import YouTube: Uvezi YouTube
     Import Subscriptions: Uvezi pretplate
+    Import FreeTube: Uvezi FreeTube
     Select Export Type: Odaberi vrstu izvoza
     Select Import Type: Odaberi vrstu uvoza
-    Data Settings: Podaci
+    Data Settings: Postavke podataka
     How do I import my subscriptions?: Kako uvesti pretplate?
+    Check for Legacy Subscriptions: Potraži stare pretplate
     Manage Subscriptions: Upravljaj pretplatama
     Import Playlists: Uvezi zbirke
     Export Playlists: Izvezi zbirke
@@ -505,9 +549,9 @@ Settings:
     Hide Live Chat: Sakrij razgovor uživo
     Hide Popular Videos: Sakrij popularna videa
     Hide Comment Likes: Sakrij ocjene komentara
-    Hide Video Likes And Dislikes: Sakrij broj sviđanja videa
+    Hide Video Likes And Dislikes: Sakrij ocjenjivanje videa
     Hide Video Views: Sakrij broj gledanja videa
-    Distraction Free Settings: Nesmetan rad
+    Distraction Free Settings: Postavke za nesmetan rad
     Hide Active Subscriptions: Sakrij aktivne pretplate
     Hide Playlists: Sakrij zbirke
     Hide Comments: Sakrij komentare
@@ -535,6 +579,7 @@ Settings:
     Hide Subscriptions Shorts: Sakrij pretplate kratkih videa
     Hide Subscriptions Live: Sakrij pretplate videa uživo
     Hide Subscriptions Videos: Sakrij pretplate videa
+    Blur Thumbnails: Zamuti minijature
     Hide Profile Pictures in Comments: Sakrij slike profila u komentarima
     Hide Subscriptions Community: Sakrij pretplate zajednice
     Hide Channels Invalid: Navedeni ID kanala nije bio ispravan
@@ -563,13 +608,13 @@ Settings:
     Proxy Host: Računalo posrednika
     Proxy Protocol: Protokol posrednika
     Enable Tor / Proxy: Aktiviraj Tor/Posrednik
-    Proxy Settings: Posrednik
+    Proxy Settings: Postavke posrednika
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Obavijesti kad se preskoči segment sponzora
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL API-a za blokiranja
       sponzora (standardno je https://sponsor.ajay.app)
     Enable SponsorBlock: Aktiviraj blokiranja sponzora
-    SponsorBlock Settings: Blokiranja sponzora
+    SponsorBlock Settings: Postavke blokiranja sponzora
     Skip Options:
       Auto Skip: Automatsko preskakanje
       Show In Seek Bar: Prikaži u traci napretka
@@ -586,27 +631,27 @@ Settings:
     Custom External Player Executable: Izvršna datoteka prilagođenog eksternog playera
     Ignore Unsupported Action Warnings: Zanemari upozorenja o nepodržanim radnjama
     External Player: Vanjski player
-    External Player Settings: Eksterni player
+    External Player Settings: Postavke vanjskog playera
     Players:
       None:
         Name: Bez
     Ignore Default Arguments: Zanemari zadane argumente
   Download Settings:
     Choose Path: Odaberi stazu
-    Download Settings: Preuzimanje
-    Ask Download Path: Zatraži stazu za preuzimanja
+    Download Settings: Postavke preuzimanja
+    Ask Download Path: Zatraži stazu preuzimanja
     Download in app: Preuzmi u aplikaciji
     Open in web browser: Otvori u web-pregledniku
     Download Behavior: Ponašanje preuzimanja
   Parental Control Settings:
-    Parental Control Settings: Roditeljski nadzor
+    Parental Control Settings: Postavke roditeljskog nadzora
     Hide Unsubscribe Button: Sakrij gumb za odjavu
     Hide Search Bar: Sakrij traku pretrage
     Show Family Friendly Only: Prikaži samo prikladne za obitelji
   Experimental Settings:
     Warning: Ovo su eksperimentalne postavke. Kad su aktivirane mogu prouzročiti prekid
       programa. Preporučujemo spremanje sigurnosnih kopija. Koristi na vlastitu odgovornost!
-    Experimental Settings: Eksperimentalno
+    Experimental Settings: Eksperimentalne postavke
     Replace HTTP Cache: Zamijeni HTTP predmemoriju
   Password Dialog:
     Password Incorrect: Lozinka neispravna
@@ -614,24 +659,60 @@ Settings:
     Enter Password To Unlock: Za otključavanje postavki upiši lozinku
     Password: Lozinka
   Password Settings:
-    Password Settings: Lozinka
+    Password Settings: Lozinka za postavke
     Set Password: Postavi lozinku
     Remove Password: Ukloni lozinku
     Set Password To Prevent Access: Postavi lozinku za sprečavanja pristupa postavkama
+  Expand All Settings Sections: Rasklopi sve odjeljke postavki
   Sort Settings Sections (A-Z): Razvrstaj odjeljke postavki (A-Z)
-  Return to Settings Menu: Vrati se na izbornik postavki
 About:
   #On About page
   About: 'Informacije'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ovaj
+    je program licenciran pod uvjetima AGPL-3.0 licence.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Pronašao/la si grešku? Želiš predložiti funkciju? Želiš pomoći? Pogledaj našu
+    GitHub stranicu. Zahtjevi za povlačenje su dobrodošli.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Zahvaljujemo
+    svim ljudima i projektima koji omogućuju razvoj programa FreeTube!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Želiš
+    razgovarati? Pridruži se našem Element/Matrix poslužitelju. Pročitaj pravila prije
+    pridruživanja.'
+
+  'Looking for help? Check out our Wiki page.': 'Tražiš pomoć? Pogledaj našu Wiki
+    stranicu.'
+
+  Check out our Firefox extension!: 'Isprobaj naše proširenje za Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ako
+    voliš koristiti FreeTube, doniraj projektu putem Liberapaya ili putem naše Bitcoin
+    adrese.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Najnovije vijesti o programu FreeTube'
+
+  Translate via Weblate: Prevedi putem Weblatea
   Website: Web-stranica
+  Source Code: Izvorni kod
+  Release Notes: Napomene uz izdanje
   Blog: Blog
   Credits: Zasluge
   FAQ: Često postavljena pitanja
+  Wiki: Wiki
+  Report an Issue: Prijavi problem
+  Channel Rules: Pravila kanala
   Email: E-adresa
+  License: Licenca
   Beta: Beta
   Donate: Doniraj
+  Useful Links: Korisne poveznice
   Help: Pomoć
+  Contact: Kontakt
   Chat on Matrix: Razgovaraj na Matrixu
   Please check for duplicates before posting: Prije slanja greške, provjeri, je li
     ista greška već prijavljena
@@ -646,6 +727,8 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub izdanja
   Downloads / Changelog: Preuzimanja/dnevnik promjena
+  View License: Pogledaj licencu
+  Licensed under the AGPLv3: AGPLv3 licenca
   Source code: Izvorni kod
   Discussions: Diskusije
   Licensed under the: Licencirano pod
@@ -691,7 +774,7 @@ Profile:
   Other Channels: Ostali kanali
   Subscription List: Popis pretplata
   Profile Filter: Filtar profila
-  Profile Settings: Profil
+  Profile Settings: Postavke profila
   Toggle Profile List: Uključi/Isključi popis profila
   Profile Name: Ime profila
   Edit Profile Name: Uredi ime profila
@@ -749,9 +832,6 @@ Channel:
     Hide Answers: Sakrij odgovore
     votes: '{votes} glasa'
     Video hidden by FreeTube: Video skriven od FreeTubea
-    View Full Post: Pogledaj cijeli post
-    Viewing Posts Only Supported By Invidious: Prikazivanje postova podržava samo
-      Invidious. Idi na karticu zajednice kanala za prikaz sadržaja bez Invidiousa.
   Shorts:
     This channel does not currently have any shorts: Ovaj kanal trenutačno nema kratka
       videa
@@ -791,8 +871,38 @@ Video:
     uživo trenutačno nije podržan s Invidious sučeljem. Potrebna je izravna veza s
     YouTubeom.'
   Published:
+    Jan: 'sij.'
+    Feb: 'velj.'
+    Mar: 'ožu.'
+    Apr: 'tra.'
+    May: 'svi.'
+    Jun: 'lip.'
+    Jul: 'srp.'
+    Aug: 'kol.'
+    Sep: 'ruj.'
+    Oct: 'lis.'
+    Nov: 'stu.'
+    Dec: 'pro.'
+    Second: 's'
+    Seconds: 's'
+    Minute: 'min'
+    Minutes: 'min'
+    Hour: 'h'
+    Hours: 'h'
+    Day: 'dan'
+    Days: 'dana'
+    Week: 'tj.'
+    Weeks: 'tj.'
+    Month: 'mj.'
+    Months: 'mj.'
+    Year: 'god.'
+    Years: 'god.'
+    Ago: 'Prije'
+    Upcoming: 'Premijera'
+    Less than a minute: Manje od jedne minute
     In less than a minute: Manje od jedne minute
   Published on: 'Objavljeno'
+  Publicationtemplate: 'prije {number} {unit}'
 #& Videos
   Autoplay: Automatska reprodukcija
   Play Previous Video: Reproduciraj prethodni video
@@ -846,47 +956,11 @@ Video:
   Scroll to Bottom: Pomakni se skroz dolje
   Upcoming: Predstojeći
   'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Razgovor
-    uživo nije dostupan za ovaj prijenos. Možda ga je autor deaktivirao.
+    uživo nije dostupan za ovaj prijenos. Možda ga je prenosnik deaktivirao.
   Pause on Current Video: Zaustavi trenutačni video
   Unhide Channel: Prikaži kanal
   Hide Channel: Sakrij kanal
   More Options: Više opcija
-  Player:
-    Stats:
-      Stats: Statistika
-      CodecsVideoAudio: 'Kodeci: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
-      Bitrate: 'Brzina: {bitrate} kbps'
-      Resolution: 'Rezolucija: {width}x{height}@{frameRate}'
-      CodecsVideoAudioNoItags: 'Kodeci: {videoCodec} / {audioCodec}'
-      Volume: 'Glasnoća: {volumePercentage}%'
-      Video ID: 'ID videa: {videoId}'
-      Media Formats: 'Formati medija: {formats}'
-      CodecAudio: 'Kodek: {audioCodec} ({audioItag})'
-      Dropped Frames / Total Frames: 'Ispušteni kadrovi: {droppedFrames} / Ukupni
-        broj kadrova: {totalFrames}'
-      Bandwidth: 'Propusnost: {bandwidth} kbps'
-      Player Dimensions: 'Veličina playera: {width}x{height}'
-      Buffered: 'Učitano: {bufferedPercentage}%'
-    You appear to be offline: Čini se da ne postoji veza s internetom.
-    Skipped segment: Preskočen segment „{segmentCategory}”
-    Take Screenshot: Snimi snimku ekrana
-    Show Stats: Prikaži statistiku
-    Hide Stats: Sakrij statistiku
-    Playback will resume automatically when your connection comes back: Reprodukcija
-      će se automatski nastaviti nakon što se veza ponovo uspostavi.
-    TranslatedCaptionTemplate: '{language} (izvorni jezik prijevoda: {originalLanguage})'
-    Exit Full Window: Zatvori cjeloekranski prikaz
-    Theatre Mode: Kazališni modus
-    Audio Tracks: Audio snimke
-    Exit Theatre Mode: Zatvori kazališni modus
-    Full Window: Cjeloekranski prikaz
-  MembersOnly: Videa koja su namijenjena samo za članove ne mogu se gledati putem
-    FreeTubea jer zahtijevaju prijavu na Google i plaćeno članstvo na kanalu prenositelja.
-  Unlisted: Skriveni za javnost
-  IP block: YouTube je blokirao tvoju IP adresu za gledanje videa. Pokušaj se prebaciti
-    na jedan drugi VPN ili proxy.
-  AgeRestricted: Videa s dobnim ograničenjem se ne mogu gledati s FreeTubeom jer zahtijevaju
-    prijavu na Google i korištenje YouTube računa s dobnom provjerom.
 Videos:
   #& Sort By
   Sort By:
@@ -897,6 +971,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Pogledaj cijelu zbirku'
+  Videos: 'Videa'
+  View: 'Prikaz'
+  Views: 'Prikazi'
   Last Updated On: 'Zadnje aktualiziranje'
 
 # On Video Watch Page
@@ -912,8 +989,7 @@ Playlist:
     VideoTitleAscending: Naslov (A-Z)
     VideoTitleDescending: Naslov (Z-A)
     Custom: Prilagođeno
-    VideoDurationDescending: Trajanje (najprije najduže)
-    VideoDurationAscending: Trajanje (najprije najkraće)
+Toggle Theatre Mode: 'Uključi/isključi kazališni modus'
 Change Format:
   Change Media Formats: 'Promijeni videoformate'
   Use Dash Formats: 'Koristi DASH formate'
@@ -923,8 +999,6 @@ Change Format:
     video
   Dash formats are not available for this video: DASH formati nisu dostupni za ovaj
     video
-  Legacy formats are not available for this video: Stari formati nisu dostupni za
-    ovaj video
 Share:
   Share Video: 'Dijeli video'
   Share Playlist: 'Dijeli zbirku'
@@ -955,7 +1029,7 @@ Comments:
   Hide: 'Sakrij'
   Replies: 'Odgovori'
   Reply: 'Odgovor'
-  There are no comments available for this video: 'Za ovaj video nema komentara'
+  There are no comments available for this video: 'Nema komentara za ovaj video'
   Load More Comments: 'Učitaj još komentara'
   There are no more comments for this video: Nema daljnjih komentara za ovaj video
   No more comments available: Nema daljnjih komentara
@@ -970,7 +1044,6 @@ Comments:
   Hearted: Omiljeno
   View {replyCount} replies: Pogledaj {replyCount} odgovora
   Subscribed: Pretplaćeno
-  There are no comments available for this post: Za ovaj post nema komentara
 Up Next: 'Sljedeći'
 
 # Toast Messages
@@ -978,6 +1051,7 @@ Local API Error (Click to copy): 'Greška lokalnog sučelja (pritisni za kopiran
 Invidious API Error (Click to copy): 'Greška Invidious sučelja (pritisni za kopiranje)'
 Falling back to Invidious API: 'Koristit će se Invidious sučelje'
 Falling back to Local API: 'Koristit će se lokalno sučelje'
+Subscriptions have not yet been implemented: 'Pretplate još nisu implementirane'
 Loop is now disabled: 'Ponavljanje je sada deaktivirano'
 Loop is now enabled: 'Ponavljanje je sada aktivirano'
 Shuffle is now disabled: 'Slučajni redoslijed je sada deaktiviran'
@@ -1032,8 +1106,8 @@ Tooltips:
   Subscription Settings:
     Fetch Feeds from RSS: Kada je aktivirano, FreeTube će koristiti RSS umjesto vlastite
       standardne metode za dohvaćanje podataka tvoje pretplate. RSS je brži i sprečava
-      blokiranje IP adresa, ali ne pruža određene podatke kao što su trajanje videa,
-      stanje „uživo” ili postova zajednice
+      blokiranje IP adresa, ali ne pruža određene podatke kao što su trajanje videa
+      ili stanja „uživo”
     Fetch Automatically: Kada je aktivirano, FreeTube će automatski dohvatiti feed
       tvoje pretplate kada se otvori novi prozor i prilikom mijenjanja profila.
   External Player Settings:
@@ -1041,7 +1115,7 @@ Tooltips:
       videa (zbirka, ako je podržana) u vanjskom playeru, na minijaturi. Upozorenje,
       Invidious postavke ne utječu na vanjske playere.
     Custom External Player Arguments: Svi prilagođeni argumenti naredbenog retka,
-      koje želiš da se proslijede vanjskom playeru.
+      odvojene točka-zarezom (;), koje želiš da se proslijede vanjskom playeru.
     Ignore Warnings: Nemoj prikazati upozorenja kad trenutačni vanjski player ne podržava
       trenutačnu radnju (npr. preokretanje redoslijeda zbirke itd.).
     Custom External Player Executable: Prema standardnim postavkama, FreeTube će pretpostaviti
@@ -1071,6 +1145,8 @@ Playing Next Video Interval: Trenutna reprodukcija sljedećeg videa. Pritisni za
   | Reprodukcija sljedećeg videa za {nextVideoInterval} sekunde. Pritisni za prekid.
   | Reprodukcija sljedećeg videa za {nextVideoInterval} sekundi. Pritisni za prekid.
 More: Još
+Hashtags have not yet been implemented, try again later: Hashtagovi još nisu implementirani,
+  pokušaj kasnije ponovo
 Unknown YouTube url type, cannot be opened in app: Nepoznata vrsta URL adrese na YouTubeu,
   ne može se otvoriti u programu
 Open New Window: Otvori novi prozor
@@ -1094,7 +1170,9 @@ Channels:
   Search bar placeholder: Pretraži kanale
   Count: '{number} kanala pronađena.'
   Empty: Tvoj popis kanala je trenutačno prazan.
+  Unsubscribe: Otkaži pretplatu
   Unsubscribe Prompt: Stvarno želiš prekinuti pretplatu na „{channelName}”?
+  Unsubscribed: '{channelName} je uklonjen iz tvojih pretplata'
 Clipboard:
   Copy failed: Neuspjelo kopiranje u međuspremnik
   Cannot access clipboard without a secure connection: Pristup međuspremniku nije
@@ -1105,7 +1183,6 @@ Chapters:
     aktualno poglavlje: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Popis poglavlja skriven,
     aktualno poglavlje: {chapterName}'
-  Key Moments: Ključni trenuci
 Preferences: Korisničke postavke
 Ok: U redu
 Hashtag:
@@ -1142,10 +1219,5 @@ Search Listing:
     4K: 4K
     Subtitles: Titlovi
     Closed Captions: Titlovi za gluhe
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Novi
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Blokirano je otvaranje potencijalno nesigurnog
   URL-a: „{url}”.'
diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
index 7f5b5667b87a4..85838d3863441 100644
--- a/static/locales/hu.yaml
+++ b/static/locales/hu.yaml
@@ -33,7 +33,7 @@ Forward: 'Előre'
 # Anything shared among components / views should be put here
 Global:
   Videos: 'Videók'
-  Shorts: Rövid videók
+  Shorts: Rövidfilmek
   Live: Élő
   Community: Közösség
 
@@ -108,9 +108,8 @@ Subscriptions:
   Subscriptions: 'Feliratkozások'
   Latest Subscriptions: 'Legfrissebb feliratkozások'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'A
-    feliratkozások listája jelenleg üres. Ha importálni szeretné előfizetéseit, lépjen
-    az Adatok beállításaiba és válassza a feliratkozások importálása lehetőséget,
-    vagy kereshet csatornákat és feliratkozhat rájuk.'
+    feliratkozások listája jelenleg üres. Kezdjen hozzáadni a feliratkozásokat, hogy
+    itt láthassa őket.'
   'Getting Subscriptions. Please wait.': 'Feliratkozások megszerzése. Kis türelmet
     kérünk.'
   Refresh Subscriptions: 'Feliratkozások frissítése'
@@ -129,7 +128,7 @@ Subscriptions:
   Load More Posts: További bejegyzések betöltése
   Empty Posts: A feliratkozott csatornáinak jelenleg nincsenek bejegyzései.
 Trending:
-  Trending: 'Népszerűek'
+  Trending: 'Népszerű'
   Trending Tabs: Népszerű lapok
   Movies: Filmek
   Gaming: Játék
@@ -138,10 +137,20 @@ Trending:
 Most Popular: 'Legnépszerűbbek'
 Playlists: 'Lejátszási listák'
 User Playlists:
-  Your Playlists: 'Az Ön lejátszási listái'
+  Your Playlists: 'A lejátszási listáid'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: A
+    mentett videók üresek. Kattintson a videó sarkában található mentés gombra, hogy
+    itt szerepeljen
+  Playlist Message: Ez az oldal nem tükrözi a teljesen működő lejátszási listákat.
+    Csak azokat a videókat sorolja fel, amelyeket ön elmentett vagy a kedvencek közé
+    helyezett. A munka befejezése után az összes itt található videó átkerül a „Kedvencek”
+    lejátszási listára.
   Search bar placeholder: Lejátszási listák keresése
   Empty Search Message: Ebben a lejátszási listában nincsenek olyan videók, amelyek
     megfelelnek a keresésnek
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Biztos,
+    hogy el akarja távolítani az összes megtekintett videót ebből a lejátszási listából?
+    Ezt nem lehet visszacsinálni.
   AddVideoPrompt:
     Search in Playlists: Keresés a lejátszási listában
     Save: Mentés
@@ -187,6 +196,7 @@ User Playlists:
       This video cannot be moved down.: Ez a videó nem mozgatható lejjebb.
       This playlist is now used for quick bookmark: Ez a lejátszási lista most gyors
         könyvjelzőként van használva
+      Quick bookmark disabled: Gyors könyvjelző letiltva
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: A(z)
         {oldPlaylistName} helyett mostantól ez a lejátszási lista szolgál gyors könyvjelzőként.
         Kattintson ide a visszavonáshoz
@@ -196,9 +206,6 @@ User Playlists:
         lejátszási lista az új gyors könyvjelző lejátszási lista.
       This playlist is already being used for quick bookmark.: Ez a lejátszási lista
         már használatban van mint gyors könyvjelző.
-      This playlist has a video with a duration error: Ez a lejátszási lista legalább
-        egy olyan videót tartalmaz, amelynek nincs időtartama, ezért úgy lesz rendezve,
-        mintha az időtartamuk nulla lenne.
     Search for Videos: Videók keresése
   Are you sure you want to delete this playlist? This cannot be undone: Biztos, hogy
     törölni szeretné ezt a lejátszási listát? Ezt nem lehet visszacsinálni.
@@ -241,6 +248,7 @@ User Playlists:
   Copy Playlist: Lejátszási lista másolása
   Playlist Description: Lejátszási lista leírása
   Add to Favorites: Hozzáadás a(z) {playlistName} lejátszási listához
+  Disable Quick Bookmark: Gyors Könyvjelző Letiltása
   Remove from Favorites: Eltávolítás a(z) {playlistName} lejátszási listából
   Enable Quick Bookmark With This Playlist: Gyors könyvjelző engedélyezése ezzel a
     lejátszási listával
@@ -257,9 +265,6 @@ User Playlists:
     eltávolít 1 megtekintett videót ebből a lejátszási listából? Ez a művelet nem
     vonható vissza. | Biztosan eltávolít {playlistItemCount} megtekintett videót ebből
     a lejátszási listából? Ez a művelet nem vonható vissza.
-  Export Playlist: Ezen lejátszási lista exportálása
-  The playlist has been successfully exported: A lejátszási lista sikeresen exportálva
-    lett
 History:
   # On History Page
   History: 'Előzmények'
@@ -273,7 +278,7 @@ Settings:
   # On Settings Page
   Settings: 'Beállítások'
   General Settings:
-    General Settings: 'Általános'
+    General Settings: 'Általános beállítások'
     Check for Updates: 'Frissítések keresése'
     Check for Latest Blog Posts: 'Legújabb blogbejegyzések keresése'
     Fallback to Non-Preferred Backend on Failure: 'A nem előnyben részesített háttéralkalmazás
@@ -286,7 +291,7 @@ Settings:
       Local API: 'Helyi API'
       Invidious API: 'Invidious-API'
     Video View Type:
-      Video View Type: 'Videónézet típusa'
+      Video View Type: 'Videó nézet típusa'
       Grid: 'Rács'
       List: 'Lista'
     Thumbnail Preference:
@@ -297,6 +302,8 @@ Settings:
       End: 'Vég'
       Hidden: Rejtett
       Blur: Elhomályosítás
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious példány
+      (Alapértelmezés: https://invidious.snopyta.org)'
     Region for Trending: 'Népszerűek innen'
         #! List countries
     View all Invidious instance information: Az Invidious-példányok listájának megtekintése
@@ -304,8 +311,7 @@ Settings:
     Current Invidious Instance: Jelenlegi Invidious-példány
     Clear Default Instance: Alapértelmezett példány eltávolítása
     Set Current Instance as Default: Állítsa be a jelenlegi példányt alapértelmezettként
-    Current instance will be randomized on startup: Véletlenszerű jelenlegi példány
-      használata indításkor
+    Current instance will be randomized on startup: Jelenlegi példány indításkor véletlenszerűsített
     No default instance has been set: Az alapértelmezett példány nincs beállítva
     The currently set default instance is {instance}: A jelenleg beállított alapértelmezett
       példány {instance}
@@ -317,9 +323,8 @@ Settings:
     Auto Load Next Page:
       Label: Következő oldal automatikus betöltése
       Tooltip: További oldalak és a hozzászólások automatikus betöltése.
-    Open Deep Links In New Window: A FreeTube-nak átadott webcímek megnyitása új ablakban
   Theme Settings:
-    Theme Settings: 'Téma'
+    Theme Settings: 'Téma beállítások'
     Match Top Bar with Main Color: 'Illessze a felső sávot a fő színnel'
     Base Theme:
       Base Theme: 'Alap téma'
@@ -334,8 +339,6 @@ Settings:
       Nordic: Skandináv
       Solarized Light: Szolarizált világos
       Solarized Dark: Szolarizált sötét
-      Gruvbox Light: Világos Gruvbox
-      Gruvbox Dark: Sötét Gruvbox
     Main Color Theme:
       Main Color Theme: 'Fő színtéma'
       Red: 'Vörös'
@@ -383,31 +386,21 @@ Settings:
       Solarized Green: Szolarizált zöld
       Solarized Magenta: Szolarizált magenta
       Solarized Violet: Szolarizált ibolya
-      Gruvbox Dark Yellow: Sötétsárga Gruvbox
-      Gruvbox Dark Blue: Sötétkék Gruvbox
-      Gruvbox Dark Aqua: Sötét-vízkék Gruvbox
-      Gruvbox Dark Orange: Sötétnarancssárga Gruvbox
-      Gruvbox Light Red: Világospiros Gruvbox
-      Gruvbox Light Blue: Világoskék Gruvbox
-      Gruvbox Dark Green: Sötétzöld Gruvbox
-      Gruvbox Dark Purple: Sötétlila Gruvbox
-      Gruvbox Light Orange: Világosnarancssárga Gruvbox
-      Gruvbox Light Purple: Világoslila Gruvbox
     Secondary Color Theme: 'Másodlagos színtéma'
         #* Main Color Theme
     UI Scale: Felhasználói felület méretezése
     Expand Side Bar by Default: Alapértelmezés szerinti oldalsáv megjelenítés
     Disable Smooth Scrolling: Finomgörgetés kikapcsolása
-    Hide Side Bar Labels: Gombfeliratok elrejtése az oldalsávról
+    Hide Side Bar Labels: Oldalsáv címkék elrejtése
     Hide FreeTube Header Logo: FreeTube logo elrejtése a fejlécből
   Player Settings:
-    Player Settings: 'Lejátszó'
+    Player Settings: 'Lejátszó beállításai'
     Play Next Video: 'Következő videó lejátszása'
-    Turn on Subtitles by Default: 'Feliratok bekapcsolása alapértelemezetten'
+    Turn on Subtitles by Default: 'Alapértelmezetten a feliratok megjelenítése'
     Autoplay Videos: 'Videók automatikus lejátszása'
-    Proxy Videos Through Invidious: 'Videók proxyzása az Invidiouson keresztül'
+    Proxy Videos Through Invidious: 'Meghatalmazás videók az Invidious révén'
     Autoplay Playlists: 'Lejátszási listák automatikus lejátszása'
-    Enable Theatre Mode by Default: 'A mozimód bekapcsolása alapértelmezetten'
+    Enable Theatre Mode by Default: 'Alapértelmezetten a mozi mód engedélyezése'
     Default Volume: 'Alapértelmezett hangerő'
     Default Playback Rate: 'Alapértelmezett lejátszási sebesség'
     Default Video Format:
@@ -429,7 +422,7 @@ Settings:
       4k: '4K'
       8k: '8K'
     Playlist Next Video Interval: Lejátszási lista következő videó intervalluma
-    Next Video Interval: Automatikus lejátszás időköze
+    Next Video Interval: Következő videó időköze
     Scroll Volume Over Video Player: A hangerő szintjét a videolejátszó feletti kerékkel
       szabályozhatja
     Display Play Button In Video Player: Lejátszás gomb megjelenítése a videolejátszóban
@@ -439,7 +432,7 @@ Settings:
       File Name Label: Fájlnévminta
       Folder Label: Képernyőképek mappa
       Folder Button: Mappa kiválasztása
-      Enable: Képernyőkép készítésének engedélyezése
+      Enable: Képernyőkép engedélyezése
       Format Label: Képernyőkép formátuma
       Error:
         Forbidden Characters: Tiltott karakterek
@@ -456,9 +449,8 @@ Settings:
     Video Playback Rate Interval: Videó lejátszási sebesség léptetési köze
     Enter Fullscreen on Display Rotate: Teljes képernyős mód a kijelzőn forgatáshoz
     Skip by Scrolling Over Video Player: Kihagyás a Videolejátszó felett görgetve
-    Autoplay Interruption Timer: Automatikus lejátszás megszakításának időköze
   Privacy Settings:
-    Privacy Settings: 'Adatvédelem'
+    Privacy Settings: 'Adatvédelmi beállítások'
     Remember History: 'Előzmények megjegyzése'
     Save Watched Progress: 'Megtekintési előrehaladás mentése'
     Clear Search Cache: 'Keresési gyorsítótár törlése'
@@ -479,19 +471,22 @@ Settings:
     Are you sure you want to remove all your playlists?: Biztosan el akarja távolítani
       az összes lejátszási listáját?
   Subscription Settings:
-    Subscription Settings: 'Feliratkozás'
+    Subscription Settings: 'Feliratkozás beállításai'
     Hide Videos on Watch: 'Videók elrejtése megtekintés után'
     Fetch Feeds from RSS: 'RSS-hírcsatornák beolvasása'
+    Manage Subscriptions: 'Feliratkozások kezelése'
     Fetch Automatically: Hírcsatorna automatikus lekérdezése
+    Only Show Latest Video for Each Channel: Csak a legújabb videókat jelenítse meg
+      a csatornáktól
     Confirm Before Unsubscribing: Kerülje el a véletlen leiratkozást
-    'Limit the number of videos displayed for each channel': Az egyes csatornákon
-      megjelenített videók számának korlátozása
-    To: 'Ennyire'
   Data Settings:
-    Data Settings: 'Adat'
+    Data Settings: 'Adatbeállítások'
     Select Import Type: 'Importálási típus kiválasztása'
     Select Export Type: 'Exportálási típus kiválasztása'
     Import Subscriptions: 'Feliratkozások importálása'
+    Import FreeTube: 'SzabadCső importálása'
+    Import YouTube: 'YouTube importálása'
+    Import NewPipe: 'NewPipe importálása'
     Export Subscriptions: 'Feliratkozások exportálása'
     Export FreeTube: 'FreeTube exportálása'
     Export YouTube: 'YouTube exportálása'
@@ -517,7 +512,8 @@ Settings:
     Unable to read file: 'Nem lehet olvasni a fájlt'
     Unable to write file: 'Nem lehet írni a fájlt'
     Unknown data key: 'Ismeretlen adatkulcs'
-    How do I import my subscriptions?: 'Hogyan importálhatja a feliratkozásait?'
+    How do I import my subscriptions?: 'Hogyan importálhatom a feliratkozásaimat?'
+    Check for Legacy Subscriptions: Örökölt feliratkozások keresése
     Manage Subscriptions: Feliratkozások kezelése
     Playlist insufficient data: Nincs elegendő adat a(z) „{playlist}” lejátszási listához,
       elem kihagyása
@@ -539,6 +535,33 @@ Settings:
         lista eltávolítása opcióval.\n3. Indítsa el a FreeTube régebbi verzióját,
         és importálja az exportált lejátszási listákat."
       Label: Lejátszási listák exportálása régebbi FreeTube verziókhoz
+  Advanced Settings:
+    Advanced Settings: 'További beállítások'
+    Enable Debug Mode (Prints data to the console): 'Hibakeresési mód engedélyezése
+      (Adatok nyomtatása a konzolra)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Meghatalmazás kiszolgáló
+      címe (Példa: SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'A
+      „Meghatalmazás kiszolgáló ellenőrzése” gombra kattintva kérelmet küld a https://ipinfo.io/json
+      címre'
+    Use Tor / Proxy for API calls: 'Használja a Tor/meghatalmazás kiszolgálót az API
+      hívásokhoz'
+    TEST PROXY: 'Meghatalmazás kiszolgáló ellenőrzése'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Nyilvános példányok megjelenítése'
+    Clear History:
+      Clear History: 'Előzmények törlése'
+      # On Click
+      Are you sure you want to delete your history?: 'Biztosan törli az előzményeket?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Feliratkozások törlése'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Biztosan eltávolítja az
+        összes feliratkozást?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Élő csevegés elrejtése
@@ -546,13 +569,13 @@ Settings:
     Hide Trending Videos: Felkapott videók elrejtése
     Hide Recommended Videos: Ajánlott videók elrejtése
     Hide Comment Likes: Hozzászólás-kedvelések elrejtése
-    Hide Channel Subscribers: Csatorna-feliratkozók elrejtése
-    Hide Video Likes And Dislikes: Kedvelések és nemtetszések elrejtése a videóknál
+    Hide Channel Subscribers: Csatorna feliratkozók elrejtése
+    Hide Video Likes And Dislikes: Videó kedvelések és nemtetszések elrejtése
     Hide Video Views: Videónézettség elrejtése
-    Distraction Free Settings: Ne zavarjanak
+    Distraction Free Settings: Ne zavarjanak beállítások
     Hide Active Subscriptions: Elérhető feliratkozások elrejtése
     Hide Playlists: Lejátszási listák elrejtése
-    Hide Video Description: Videóleírás elrejtése
+    Hide Video Description: Videó leírásának elrejtése
     Hide Comments: Hozzászólások elrejtése
     Hide Live Streams: Élő közvetítések elrejtése
     Hide Sharing Actions: Megosztási műveletek elrejtése
@@ -563,20 +586,21 @@ Settings:
     Display Titles Without Excessive Capitalisation: Címek túlzott nagybetűs írás
       és írásjelek nélkül való megjelenítése
     Hide Featured Channels: Kiemelt csatornák elrejtése
-    Hide Channel Playlists: Csatorna „lejátszási listák” lap elrejtése
-    Hide Channel Community: Csatorna „közösség” lap elrejtése
-    Hide Channel Shorts: Csatorna „rövid videók” lap elrejtése
+    Hide Channel Playlists: Csatorna lejátszási listák elrejtése
+    Hide Channel Community: Csatornaközösség elrejtése
+    Hide Channel Shorts: Csatorna rövidfilmek elrejtése
     Sections:
       Side Bar: Oldalsáv
       Channel Page: Csatornalap
       Watch Page: Nézőlap
       General: Általános
       Subscriptions Page: Feliratkozások oldal
-    Hide Channel Podcasts: Csatorna „podcastok” lap elrejtése
-    Hide Channel Releases: Csatorna „kiadások” lap elrejtése
-    Hide Subscriptions Shorts: Feliratkozások rövid videóinak elrejtése
+    Hide Channel Podcasts: Csatornapodcastok elrejtése
+    Hide Channel Releases: Csatornakiadások elrejtése
+    Hide Subscriptions Shorts: Feliratkozásos rövidfilmek elrejtése
     Hide Subscriptions Videos: Feliratkozási videók elrejtése
     Hide Subscriptions Live: Élő feliratkozások elrejtése
+    Blur Thumbnails: Indexkép elhomályosítása
     Hide Profile Pictures in Comments: Profilképek elrejtése a hozzászólásokban
     Hide Subscriptions Community: Közösségi feliratkozások elrejtése
     Hide Channels Invalid: Érvénytelen a megadott csatornaazonosító
@@ -588,8 +612,6 @@ Settings:
     Hide Videos and Playlists Containing Text Placeholder: Szó, szótöredék, vagy kifejezés
     Hide Videos and Playlists Containing Text: Szöveget tartalmazó videók és lejátszási
       listák elrejtése
-    Hide Channel Home: Csatorna „főoldal” lap elrejtése
-    Show Added Items: Hozzáadott elemek megjelenítése
   The app needs to restart for changes to take effect. Restart and apply change?: Az
     alkalmazásnak újra kell indulnia, hogy a változtatások életbe lépjenek. Induljon
     újra és alkalmazza a módosítást?
@@ -603,23 +625,18 @@ Settings:
       kérést küld a következő címre'
     Test Proxy: Proxy tesztelés
     Proxy Port Number: Proxy port száma
-    Proxy Host: Proxy-kiszolgáló
+    Proxy Host: Proxy gazdaszámítógép
     Proxy Protocol: Proxy protokoll
     Enable Tor / Proxy: Tor/Proxy engedélyezése
-    Proxy Settings: Proxy
+    Proxy Settings: Proxy beállítások
     Error getting network information. Is your proxy configured properly?: Hiba a
       hálózati adatok lekérésekor. Megfelelő a proxy beállítása?
-    Proxy Warning: A FreeTube nem rendelkezik beépített proxyval, de képes csatlakozni
-      egy külső proxyhoz, például egy olyanhoz, amely az Ön gépén fut, mint a Tor,
-      vagy egy külső proxyhoz, például egy SOCKS5 proxyhoz, amelyet egyes VPN-ek biztosítanak.
-      Ha engedélyezve van, győződjön meg róla, hogy a proxy/Tor megfelelően van beállítva,
-      különben a FreeTube nem fog tudni adatokat lekérni.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Értesítés a szponzorált szakasz kihagyásáról
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 'SponsorBlock API
       webcíme (Alapértelmezett: https://sponsor.ajay.app)'
     Enable SponsorBlock: SponsorBlock engedélyezése
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: SponsorBlock beállításai
     Skip Options:
       Skip Option: Beállítás kihagyása
       Auto Skip: Automatikus kihagyás
@@ -637,7 +654,7 @@ Settings:
     Custom External Player Arguments: Egyéni külső lejátszó argumentumok
     Custom External Player Executable: Egyéni külső lejátszó végrehajthatója
     External Player: Külső lejátszó
-    External Player Settings: Külső lejátszó
+    External Player Settings: Külső lejátszó beállításai
     Players:
       None:
         Name: Nincs
@@ -645,18 +662,18 @@ Settings:
   Download Settings:
     Ask Download Path: Rákérdezés a letöltés elérési útjára
     Choose Path: Elérési út kiválasztása
-    Download Settings: Letöltés
+    Download Settings: Letöltési beállítások
     Download Behavior: Letöltés viselkedése
     Open in web browser: Megnyitás böngészőben
     Download in app: Letöltés az alkalmazásban
   Parental Control Settings:
-    Parental Control Settings: Szülői felügyelet
-    Show Family Friendly Only: Csak a családbarát videók megjelenítése
+    Parental Control Settings: Szülői felügyelet beállításai
+    Show Family Friendly Only: Kizárólag családbarát megjelenítése
     Hide Search Bar: Keresősáv elrejtése
     Hide Unsubscribe Button: Leiratkozás gomb elrejtése
   Experimental Settings:
     Replace HTTP Cache: HTTP-gyorsítótár cseréje
-    Experimental Settings: Kísérleti
+    Experimental Settings: Kísérleti beállítások
     Warning: Ezek a beállítások kísérleti jellegűek, összeomlást okozhatnak, ha engedélyezve
       vannak. Erősen ajánlott biztonsági mentéseket készíteni. Csak saját felelősségre
       használja!
@@ -666,17 +683,45 @@ Settings:
     Enter Password To Unlock: Jelszó megadása a beállítások feloldásához
     Password: Jelszó
   Password Settings:
-    Password Settings: Jelszó
+    Password Settings: Jelszóbeállítások
     Set Password To Prevent Access: Jelszó megadása a beállításokhoz való hozzáférés
       megakadályozásához
     Set Password: Jelszó megadása
     Remove Password: Jelszó eltávolítása
+  Expand All Settings Sections: Beállítások kibontása
   Sort Settings Sections (A-Z): Beállítások rendezése (A-Z)
-  Return to Settings Menu: Vissza a „Beállítások” menübe
 About:
   #On About page
   About: 'Névjegy'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ez
+    a másolással szállított szoftver szabadon licencelt az AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Talált egy hibát? Szeretne javaslatot tenni egy szolgáltatásra? Szeretne segíteni?
+    Nézze meg GitHub oldalunkat. Húzni kéréseket szívesen fogadjuk.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Nagyon
+    köszönöm azoknak az embereknek és projekteknek, amelyek lehetővé teszik a FreeTube
+    használatát!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Szeretnél
+    csevegni? Csatlakozzon az Element/Matrix kiszolgálóhoz. Kérjük, csatlakozás előtt
+    ellenőrizze a szabályokat.'
+
+  'Looking for help? Check out our Wiki page.': 'Segítséget keres? Nézze meg Wiki
+    oldalunkat.'
+
+  Check out our Firefox extension!: 'Nézze meg Firefox kiegészítőnket!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ha
+    FreeTube-t használ, fontolja meg az adományozást a Liberapay-n keresztül vagy
+    a Bitcoin-címen keresztül.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Legfrissebb FreeTube hírek'
+
   these people and projects: az alábbi emberek és projektek
   FreeTube is made possible by: 'A FreeTube elkészítését lehetővé tették'
   Donate: Adományozás
@@ -694,7 +739,10 @@ About:
   GitHub issues: GitHub hibajegyek
   Help: Súgó
   GitHub releases: GitHub kiadások
-  Downloads / Changelog: Letöltések / Változáslista
+  Downloads / Changelog: Letöltések/Változásnapló
+  View License: Licenc megtekintése
+  Licensed under the AGPLv3: Az AGPL (GNU Affero General Public License - GNU Affero
+    általános nyilvános licenc) 3. verziója alatt licencelt
   FreeTube Wiki: FreeTube Wiki
   Source code: Forráskód
   Beta: Béta
@@ -745,7 +793,7 @@ Profile:
     törli a kiválasztott csatornákat? Ez nem törli a csatornát más profilokból.'
 #On Channel Page
   Profile Filter: Profilszűrő
-  Profile Settings: Profil
+  Profile Settings: Profilbeállítások
   Toggle Profile List: Profillista be-/kikapcsolása
   Profile Name: Profilnév
   Edit Profile Name: Profilnév szerkesztése
@@ -809,7 +857,7 @@ Channel:
       fülét.
   Shorts:
     This channel does not currently have any shorts: Ezen a csatornán jelenleg nincsenek
-      rövid videók
+      rövidfilmek
   This channel does not exist: Nem létezik ez a csatorna
   This channel does not allow searching: Keresés nem engedélyezett ezen a csatornán
   Releases:
@@ -820,9 +868,6 @@ Channel:
     Podcasts: Podcastok
     This channel does not currently have any podcasts: Ez a csatorna jelenleg nem
       rendelkezik podcastokkal
-  Home:
-    View Playlist: Lejátszási listák megtekintése
-    Home: Főoldal
 Video:
   Mark As Watched: 'Megjelölés megnézettként'
   Remove From History: 'Eltávolítás az előzményekből'
@@ -859,8 +904,37 @@ Video:
     élő csevegést jelenleg nem támogatja az Invidious API. Közvetlen kapcsolat szükséges
     a YouTube-hoz.'
   Published:
+    Jan: 'január'
+    Feb: 'február'
+    Mar: 'március'
+    Apr: 'április'
+    May: 'május'
+    Jun: 'június'
+    Jul: 'július'
+    Aug: 'augusztus'
+    Sep: 'szeptember'
+    Oct: 'október'
+    Nov: 'november'
+    Dec: 'december'
+    Second: 'másodperccel'
+    Seconds: 'másodperccel'
+    Minute: 'perccel'
+    Minutes: 'perccel'
+    Hour: 'órával'
+    Hours: 'órával'
+    Day: 'nappal'
+    Days: 'nappal'
+    Week: 'héttel'
+    Weeks: 'héttel'
+    Month: 'hónappal'
+    Months: 'hónappal'
+    Year: 'évvel'
+    Years: 'évvel'
+    Ago: 'ezelőtt'
+    Upcoming: 'Bemutató dátuma'
     In less than a minute: Kevesebb, mint egy perce
   Published on: 'Megjelent'
+  Publicationtemplate: '{number} {unit} ezelőtt'
 #& Videos
   audio only: csak hang
   video only: csak videó
@@ -903,7 +977,7 @@ Video:
     OpenInTemplate: 'Megnyitás itt: {externalPlayer}'
   Premieres on: 'Bemutató dátuma'
   Premieres: Első előadások
-  Show Super Chat Comment: Super Chat hozzászólás megjelenítése
+  Show Super Chat Comment: Haladó csevegési hozzászólás megjelenítése
   Scroll to Bottom: Görgetés legalulra
   Upcoming: Közelgő
   'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Az
@@ -941,16 +1015,6 @@ Video:
     Show Stats: Statisztika megjelenítése
     Playback will resume automatically when your connection comes back: A lejátszás
       automatikusan folytatódik, amikor a kapcsolat helyreáll.
-  IP block: A YouTube letiltotta az IP-címét a videók megtekintéséhez. Próbáljon meg
-    másik VPN-re vagy proxyra váltani.
-  Unlisted: Listázatlan
-  AgeRestricted: A FreeTube-on nem lehet korhatáros videókat megtekinteni, mivel ezekhez
-    Google bejelentkezés és korhatár-ellenőrzött YouTube-fiók használata szükséges.
-  MembersOnly: A csak tagoknak szóló videók nem tekinthetők meg a FreeTube-on, mivel
-    ezekhez Google bejelentkezés és fizetett tagság szükséges a feltöltő csatornájához.
-  DeArrow:
-    Show Modified Details: Módosított részletek megjelenítése
-    Show Original Details: Eredeti részletek megjelenítése
 Videos:
   #& Sort By
   Sort By:
@@ -961,6 +1025,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Teljes lejátszási lista megtekintése'
+  Videos: 'Videók'
+  View: 'Megtekintés'
+  Views: 'Megtekintés'
   Last Updated On: 'Utoljára frissítve'
 
 # On Video Watch Page
@@ -976,8 +1043,7 @@ Playlist:
     VideoTitleAscending: Cím szerint (A-Z)
     VideoTitleDescending: Cím szerint (Z-A)
     Custom: Egyéni rendezés
-    VideoDurationAscending: Időtartam (legrövidebb elöl)
-    VideoDurationDescending: Időtartam (leghosszabb elöl)
+Toggle Theatre Mode: 'Mozi mód be-/kikapcsolása'
 Change Format:
   Change Media Formats: 'Videoformátumok módosítása'
   Use Dash Formats: 'DASH (Dinamikus adaptív sávszélességű folyamatos átvitel HTTP-n
@@ -1027,9 +1093,9 @@ Comments:
     hozzászólások'
   Load More Comments: 'További hozzászólások betöltése'
   No more comments available: Nincs több hozzászólás
-  Newest first: Legújabb elöl
+  Newest first: Legújabb először
   Top comments: Legnépszerűbb hozzászólások
-  Sort by: Rendezési szempont
+  Sort by: Rendezés alapja
   Show More Replies: További válaszok megjelenítése
   From {channelName}: 'forrás: {channelName}'
   And others: és mások
@@ -1049,6 +1115,7 @@ Falling back to Local API: 'Helyi-API-ra visszatérve'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Ez
   a videó hiányzó formátumok miatt nem érhető el. Ez az ország nem elérhetősége miatt
   következhet be.'
+Subscriptions have not yet been implemented: 'Feliratkozások még nincsenek implementálva'
 Loop is now disabled: 'Folyamatos lejátszás kikapcsolva'
 Loop is now enabled: 'Folyamatos lejátszás bekapcsolva'
 Shuffle is now disabled: 'Véletlen sorrendű lejátszás kikapcsolva'
@@ -1079,8 +1146,6 @@ Tooltips:
     External Link Handling: "Válassza ki az alapértelmezett viselkedést, amikor egy
       hivatkozásra kattint, amely nem nyitható meg FreeTube-ban.\nA FreeTube alapértelmezés
       szerint megnyitja a kattintott hivatkozást az alapértelmezett böngészőben.\n"
-    Open Deep Links In New Window: A FreeTube-nak átadott webcímek, például a böngészőbővítmények
-      vagy parancssori argumentumok átirányításával, új ablakban nyílnak meg.
   Subscription Settings:
     Fetch Feeds from RSS: Amikor engedélyezve van, a FreeTube az RSS-t fogja használni
       az alapértelmezett módszer helyett az előfizetéses hírcsatorna lekérdezéséhez.
@@ -1111,8 +1176,8 @@ Tooltips:
       változón keresztül. Szükség esetén itt egyéni útvonal állítható be.
     Ignore Warnings: A figyelmeztetések mellőzése, amikor a jelenlegi külső lejátszó
       nem támogatja a jelenlegi műveletet (pl. lejátszási listák megfordítása stb.).
-    Custom External Player Arguments: A külső lejátszónak átadni kívánt egyéni parancssori
-      argumentumok.
+    Custom External Player Arguments: Bármely egyéni parancssori pontosvesszővel (;)
+      elválasztott argumentumot át kell adni a külső lejátszónak.
     External Player: Külső lejátszó kiválasztása esetén megjelenik egy ikon a videó
       (lejátszási lista, ha támogatott) megnyitásához a külső lejátszóban, az indexképen.
       Figyelem! Az Invidious beállításai nincsenek hatással a külső lejátszókra.
@@ -1144,6 +1209,8 @@ Playing Next Video Interval: A következő videó lejátszása folyamatban van.
   Kattintson a megszakításhoz. | A következő videó lejátszása {nextVideoInterval}
   másodperc múlva. Kattintson a megszakításhoz.
 More: Több
+Hashtags have not yet been implemented, try again later: A kettőskereszt címkék kezelése
+  még nincs implementálva, próbálkozzon újra később
 Unknown YouTube url type, cannot be opened in app: Ismeretlen YouTube webcímtípus,
   nem nyitható meg az alkalmazásban
 Open New Window: Új ablak megnyitása
@@ -1163,23 +1230,24 @@ Channels:
   Search bar placeholder: Csatornák keresése
   Count: '{number} csatorna találat.'
   Empty: A csatornalistája jelenleg üres.
+  Unsubscribe: Leiratkozás
+  Unsubscribed: 'A(z) {channelName} nevű csatorna el lett távolítva a feliratkozásáiból'
   Unsubscribe Prompt: Biztosan le szeretne iratkozni a(z) „{channelName}” csatornáról?
 Downloading failed: Hiba történt a(z) „{videoTitle}” letöltésekor
 Starting download: „{videoTitle}” letöltésének indítása
 Downloading has completed: A(z) „{videoTitle}” letöltése befejeződött
-Screenshot Success: A képernyőkép „{filePath}” néven mentve
+Screenshot Success: Képernyőkép „{filePath}” néven mentve
 Chapters:
   Chapters: Fejezetek
   'Chapters list visible, current chapter: {chapterName}': 'Fejezetlista látható,
     jelenlegi fejezet: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Fejezetlista elrejtve,
     jelenlegi fejezet: {chapterName}'
-  Key Moments: Fontos pillanatok
 Clipboard:
   Cannot access clipboard without a secure connection: Biztonságos kapcsolat nélkül
     nem lehet hozzáférni a vágólaphoz
   Copy failed: A vágólapra másolás nem sikerült
-Screenshot Error: Nem sikerült képernyőképet készíteni. {error}
+Screenshot Error: A képernyőkép nem sikerült. {error}
 Preferences: Beállítások
 Ok: OK
 Hashtag:
@@ -1217,26 +1285,5 @@ Search Listing:
     4K: 4K
     Subtitles: Feliratok
     Closed Captions: Feliratok (effektek is)
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Új
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Potenciálisan nem biztonságos webcím megnyitása
   letiltva: „{url}”.'
-Keys:
-  arrowup: Felfele nyíl
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Lefele nyíl
-  arrowleft: Balra nyíl
-  arrowright: Jobbra nyíl
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Right-click or hold to see history: Kattintson a jobb gombbal vagy tartsa lenyomva
-  az előzmények megtekintéséhez
-Autoplay Interruption Timer: Az automatikus lejátszás {autoplayInterruptionIntervalHours}
-  óra inaktivitás miatt visszavonásra került
-Description:
-  Collapse Description: Kevesebb megjelenítése
-  Expand Description: …továbbiak
diff --git a/static/locales/id.yaml b/static/locales/id.yaml
index 5a0eb5fee527e..bbb3560a6ca42 100644
--- a/static/locales/id.yaml
+++ b/static/locales/id.yaml
@@ -118,6 +118,11 @@ Most Popular: 'Paling Populer'
 Playlists: 'Daftar Putar'
 User Playlists:
   Your Playlists: 'Daftar Putar Anda'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Penyimpanan
+    video Anda kosong. Klik tombol simpan pada pojok video untuk menyimpannya di sini
+  Playlist Message: Halaman ini tidak mencerminkan playlist yang berfungsi sepenuhnya.
+    Ini hanya mencantumkan video yang telah Anda simpan atau favorit. Setelah selesai,
+    semua video yang ada di sini akan dipindahkan ke daftar putar 'Favorit'.
   Search bar placeholder: Cari Daftar Putar
   Empty Search Message: Tidak ada video di dalam daftar putar ini yang cocok dengan
     pencarian Anda
@@ -211,6 +216,8 @@ Settings:
       End: 'Akhir'
       Hidden: Tersembunyi
       Blur: Buramkan
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Situs Invidious
+      (Bawaan: https://invidious.snopyta.org)'
     Region for Trending: 'Wilayah untuk Sedang Tren'
         #! List countries
     View all Invidious instance information: Tampilkan informasi semua peladen Invidious
@@ -346,12 +353,18 @@ Settings:
     Subscription Settings: 'Pengaturan Langganan'
     Hide Videos on Watch: 'Sembunyikan Video saat Menonton'
     Fetch Feeds from RSS: 'Ambil Umpan dari RSS'
+    Manage Subscriptions: 'Kelola Langganan'
     Fetch Automatically: Ambil Umpan Secara Otomatis
+    Only Show Latest Video for Each Channel: Hanya Tampilkan Video Terbaru untuk Setiap
+      Kanal
   Data Settings:
     Data Settings: 'Pengaturan Data'
     Select Import Type: 'Pilih Tipe Impor'
     Select Export Type: 'Pilih Tipe Ekspor'
     Import Subscriptions: 'Impor Langganan'
+    Import FreeTube: 'Impor FreeTube'
+    Import YouTube: 'Impor YouTube'
+    Import NewPipe: 'Impor NewPipe'
     Export Subscriptions: 'Ekspor Langganan'
     Export FreeTube: 'Ekspor FreeTube'
     Export YouTube: 'Ekspor YouTube'
@@ -379,6 +392,7 @@ Settings:
     Unable to write file: 'Tidak dapat menulis berkas'
     Unknown data key: 'Kunci data tidak diketahui'
     How do I import my subscriptions?: 'Bagaimana saya mengimpor langganan saya?'
+    Check for Legacy Subscriptions: Periksa Langganan Lawas
     Manage Subscriptions: Kelola Langganan
     Import Playlists: Impor Playlist
     Export Playlists: Ekspor Playlist
@@ -391,6 +405,32 @@ Settings:
     Playlist File: Berkas Daftar Putar
     Export Playlists For Older FreeTube Versions:
       Label: Ekspor Daftar Putar untuk Versi FreeTube yang Lebih Tua
+  Advanced Settings:
+    Advanced Settings: 'Pengaturan Lanjutan'
+    Enable Debug Mode (Prints data to the console): 'Aktifkan Mode Debug (Menampilkan
+      data ke konsol)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Alamat Proksi (Contoh: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Meng-klik
+      tombol "TES PROKSI" akan mengirim permintaan ke https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Gunakan Tor / Proksi untuk panggilan API'
+    TEST PROXY: 'TES PROKSI'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Lihat Situs Publik'
+    Clear History:
+      Clear History: 'Bersihkan Riwayat'
+      # On Click
+      Are you sure you want to delete your history?: 'Apakah anda yakin ingin menghapus
+        riwayat anda?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Bersihkan Langganan'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Apakah anda yakin ingin
+        menghapus semua langganan?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Comment Likes: Sembunyikan Jumlah Suka pada Komentar
@@ -505,10 +545,37 @@ Settings:
     Hide Unsubscribe Button: Sembunyikan Tombol Berhenti Berlangganan
     Show Family Friendly Only: Tampilkan Hanya yang Ramah Keluarga
     Hide Search Bar: Sembunyikan Kotak Pencarian
+  Expand All Settings Sections: Buka Semua Bagian Pengaturan
 About:
   #On About page
   About: 'Tentang'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Perangkat
+    lunak copyleft ini berlisensi bebas AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Menemukan bug? Ingin mengajukan fitur? Ingin membantu? Kunjungi halaman Github
+    kami. Terbuka untuk pull request.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Terima
+    kasih banyak untuk orang-orang dan proyek-proyek yang membuat Freetube terwujud!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Ingin
+    mengobrol? Gabung Element / Server Matrix kami. Harap cek peraturannya sebelum
+    bergabung.'
+
+  'Looking for help? Check out our Wiki page.': 'Mencari bantuan? Cek laman Wiki kami.'
+
+  Check out our Firefox extension!: 'Cek ekstensi Firefox kami!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Jika
+    anda menyukai Freetube, pertimbangkan berdonasi via Liberapay atau melalui alamat
+    Bitcoin kami.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Berita FreeTube Terbaru'
+
   Donate: Donasi
   these people and projects: pengembang dan proyek berikut
   FreeTube is made possible by: FreeTube dikembangkan oleh
@@ -529,6 +596,8 @@ About:
   Help: Bantuan
   GitHub releases: Rilis GitHub
   Downloads / Changelog: Unduhan / Catatan Perubahan
+  View License: Lihat Lisensi
+  Licensed under the AGPLv3: Lisensi AGPLv3
   Source code: Kode sumber
   Beta: Beta
   Discussions: Diskusi
@@ -667,7 +736,37 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Obrolan
     Langsung belum didukung dengan API Invidious. Koneksi langsung dengan YouTube
     dibutuhkan.'
+  Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Mei'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Agu'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Des'
+    Second: 'Detik'
+    Seconds: 'Detik'
+    Minute: 'Menit'
+    Minutes: 'Menit'
+    Hour: 'Jam'
+    Hours: 'Jam'
+    Day: 'Hari'
+    Days: 'Hari'
+    Week: 'Pekan'
+    Weeks: 'Pekan'
+    Month: 'Bulan'
+    Months: 'Bulan'
+    Year: 'Tahun'
+    Years: 'Tahun'
+    Ago: 'Lalu'
+    Upcoming: 'Segera tayang di'
   Published on: 'Dipublikasi pada'
+  Publicationtemplate: '{number} {unit} yang lalu'
 #& Videos
   audio only: hanya audio
   video only: hanya video
@@ -720,6 +819,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Tampilkan Daftar Putar Penuh'
+  Videos: 'Video'
+  View: 'Tampilan'
+  Views: 'Tampilan'
   Last Updated On: 'Terakhir Diperbarui Pada'
 
 # On Video Watch Page
@@ -728,6 +830,7 @@ Playlist:
   Playlist: Daftar Putar
   Sort By:
     Sort By: Urut Menurut
+Toggle Theatre Mode: 'Mode Teater'
 Change Format:
   Change Media Formats: 'Ubah Format Video'
   Use Dash Formats: 'Gunakan Format DASH'
@@ -790,6 +893,7 @@ Local API Error (Click to copy): 'API Lokal Galat (Klik untuk menyalin)'
 Invidious API Error (Click to copy): 'API Invidious Galat (Klik untuk menyalin)'
 Falling back to Invidious API: 'Kembali ke API Invidious'
 Falling back to Local API: 'Kembali ke API lokal'
+Subscriptions have not yet been implemented: 'Langganan masih belum diterapkan'
 Loop is now disabled: 'Putar-Ulang sekarang dimatikan'
 Loop is now enabled: 'Putar-Ulang sekarang diaktifkan'
 Shuffle is now disabled: 'Acak sekarang dimatikan'
@@ -847,8 +951,8 @@ Tooltips:
       dibuka di FreeTube, diklik.\nSecara default FreeTube akan membuka tautan yang
       diklik dengan browser default Anda.\n"
   External Player Settings:
-    Custom External Player Arguments: Semua argumen perintah khusus, yang Anda ingin
-      gunakan dengan pemutar eksternal.
+    Custom External Player Arguments: Semua argumen perintah khusus, dipisahkan dengan
+      titik koma (';'), yang Anda ingin gunakan dengan pemutar eksternal.
     Ignore Warnings: Jangan tampilkan peringatan saat pemutar eksternal saat ini tidak
       mendukung tindakan yang ada (mis. membalik urutan daftar putar, dsb.).
     Custom External Player Executable: Secara bawaan, FreeTube akan berasumsi bahwa
@@ -870,6 +974,8 @@ Playing Next Video Interval: Langsung putar video berikutnya. Klik untuk membata
   | Putar video berikutnya dalam {nextVideoInterval} detik. Klik untuk membatalkan.
   | Putar video berikutnya dalam {nextVideoInterval} detik. Klik untuk membatalkan.
 More: Lebih banyak
+Hashtags have not yet been implemented, try again later: Hashtag belum diimplementasikan,
+  silakan coba lagi nanti
 Unknown YouTube url type, cannot be opened in app: Tipe URL YouTube tidak dikenal,
   tidak bisa dibuka di aplikasi
 Open New Window: Buka Jendela Baru
@@ -893,6 +999,8 @@ Channels:
   Count: '{number} kanal ditemukan.'
   Unsubscribe Prompt: Apakah Anda yakin ingin berhenti berlangganan "{channelName}"?
   Empty: Daftar kanal Anda kosong.
+  Unsubscribe: Berhenti langganan
+  Unsubscribed: '{channelName} telah dihapus dari daftar langganan Anda'
 Preferences: Pengaturan
 Clipboard:
   Copy failed: Gagal menyalin ke papan klip
diff --git a/static/locales/is.yaml b/static/locales/is.yaml
index d72f552fbf474..88d74c5e621ee 100644
--- a/static/locales/is.yaml
+++ b/static/locales/is.yaml
@@ -43,8 +43,6 @@ Global:
     Subscriber Count: 1 áskrifandi | {count} áskrifendur
     View Count: 1 áhorf | {count} áhorf
     Watching Count: 1 að horfa | {count} að horfa
-    Like Count: 1 líkaði | {count} líkaði
-    Comment Count: 1 athugasemd | {count} athugasemdir
   Input Tags:
     Length Requirement: Merki þarf að vera a.m.k. {number} stafa langt
 Version {versionNumber} is now available!  Click for more details: 'Útgáfa {versionNumber}
@@ -112,9 +110,8 @@ Subscriptions:
     notkunarsnið er með mikinn fjölda áskrifta. Þvinga notkun á RSS til að forðast
     takmarkanir á magni'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Listi
-    með áskriftum er tómur í augnablikinu. Ef þú vilt flytja inn áskriftirnar þínar,
-    geturðu farið í stillingar gagna og valið ''Flytja inn áskriftir'' eða leitað
-    að rás og gerst áskrifandi að henni.'
+    með áskriftum er tómur í augnablikinu. Gerstu áskrifandi að rásum og þær munu
+    birtast hér.'
   'Getting Subscriptions. Please wait.': 'Sæki áskriftir. Hinkraðu aðeins.'
   Refresh Subscriptions: 'Endurlesa áskriftir'
   Load More Videos: 'Hlaða inn fleiri myndskeiðum'
@@ -139,6 +136,12 @@ Most Popular: 'Vinsælast'
 Playlists: 'Spilunarlistar'
 User Playlists:
   Your Playlists: 'Spilunarlistarnir þínir'
+  Playlist Message: 'Þessi síða endurspeglar ekki alveg fullvirka spilunarlista. Hún
+    telur aðeins upp þau myndskeið sem þú hefur vistað eða sett í eftirlæti. Þegar
+    verkinu er lokið munu öll þessi myndskeið færast yfir í ''Eftirlæti''-spilunarlista.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Listinn
+    þinn yfir vistuð myndskeið er tómur. Smelltu á vistunarhnapp myndskeiðs til að
+    það birtist hér'
   Search bar placeholder: Leita að spilunarlistum
   Empty Search Message: Það eru engin myndskeið í þessum spilunarlista sem samsvara
     leitinni þinni
@@ -186,6 +189,7 @@ User Playlists:
         afrita samt.
       This playlist is now used for quick bookmark: Þessi spilunarlisti er núna notaður
         undir flýtibókamerki
+      Quick bookmark disabled: Flýtibókamerki óvirk
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Þessi
         spilunarlisti er núna notaður undir flýtibókamerki í stað {oldPlaylistName}.
         Smelltu hér til að afturkalla
@@ -195,9 +199,6 @@ User Playlists:
         {playlistName} er nýi spilunarlistinn með flýtibókamerkjum.
       This playlist is already being used for quick bookmark.: Þessi spilunarlisti
         er nú þegar notaður undir flýtibókamerki.
-      This playlist has a video with a duration error: Spilunarlistinn inniheldur
-        a.m.k. eitt myndskeið sem er ekki með neina tímalengd; það verður flokkað
-        eins og tímalengdin sé núll.
     Search for Videos: Leita að myndskeiðum
   AddVideoPrompt:
     N playlists selected: '{playlistCount} valin'
@@ -234,12 +235,16 @@ User Playlists:
   Move Video Down: Færa myndskeið niður
   Copy Playlist: Afrita spilunarlista
   Remove Watched Videos: Fjarlægja áhorfð myndskeið
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Ertu
+    viss um að þú viljir eyða öllum myndskeiðum sem búið er að horfa á af þessum spilunarlista?
+    Aðgerðin er ekki afturkallanleg.
   Delete Playlist: Eyða spilunarlista
   Are you sure you want to delete this playlist? This cannot be undone: Ertu viss
     um að þú viljir eyða þessum spilunarlista? Aðgerðin er ekki afturkallanleg.
   Add to Favorites: Bæta í {playlistName}
   Remove from Favorites: Fjarlægja af {playlistName}
   Enable Quick Bookmark With This Playlist: Virkja flýtibókamerki með þessum spilunarlista
+  Disable Quick Bookmark: Eyða flýtibókamerki
   Playlists with Matching Videos: Spilunarlistar með samsvarandi myndskeiðum
   Quick Bookmark Enabled: Flýtibókamerki virkjuð
   Remove Duplicate Videos: Fjarlægja tvítekin Myndskeið
@@ -253,8 +258,6 @@ User Playlists:
     viss um að þú viljir fjarlægja 1 áhorft myndskeið af þessum spilunarlista? Þetta
     er ekki hægt að afturkalla. | Ertu viss um að þú viljir fjarlægja {playlistItemCount}
     áhorfð myndskeið af þessum spilunarlista? Þetta er ekki hægt að afturkalla.
-  Export Playlist: Flytja út þennan spilunarlista
-  The playlist has been successfully exported: Það tókst að flytja út þennan spilunarlista
 History:
   # On History Page
   History: 'Áhorf'
@@ -271,7 +274,7 @@ Settings:
     þarft að endurræsa forritið svo breytingarnar taki gildi. á að endurræsa og virkja
     breytingar?'
   General Settings:
-    General Settings: 'Almennt'
+    General Settings: 'Almennar stillingar'
     Check for Updates: 'Athuga með uppfærslur'
     Check for Latest Blog Posts: 'Athuga með nýjustu bloggfærslur'
     Fallback to Non-Preferred Backend on Failure: 'Nota varaleið um ekki-forgangsbakenda
@@ -295,6 +298,8 @@ Settings:
       End: 'Endir'
       Hidden: Falið
       Blur: Móska
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious-tilvik
+      (sjálfgefið er https://invidious.snopyta.org)'
     View all Invidious instance information: 'Skoða allar upplýsingar um Invidious-tilvik'
     Region for Trending: 'Landssvæði sem skal miða vinsældir við'
         #! List countries
@@ -315,9 +320,8 @@ Settings:
     Auto Load Next Page:
       Label: Hlaða næstu síðu sjálfvirkt
       Tooltip: Hlaða viðbótarsíðum og athugasemdum sjálfkrafa inn.
-    Open Deep Links In New Window: Opna slóðir sem beint er til FreeTube í nýjum glugga
   Theme Settings:
-    Theme Settings: 'Þema'
+    Theme Settings: 'Þemastillingar'
     Match Top Bar with Main Color: 'Láta toppstiku samsvara aðallit'
     Expand Side Bar by Default: 'Fletta sjálfgefið út hliðarstiku'
     Disable Smooth Scrolling: 'Gera mjúkt skrun óvirkt'
@@ -335,8 +339,6 @@ Settings:
       Nordic: Norrænt
       Solarized Dark: Sólaríserað dökkt
       Solarized Light: Sólaríserað ljóst
-      Gruvbox Dark: Gruvbox dökkt
-      Gruvbox Light: Gruvbox ljóst
     Main Color Theme:
       Main Color Theme: 'Aðallitur þema'
       Red: 'Rautt'
@@ -384,22 +386,12 @@ Settings:
       Solarized Magenta: Sólaríserað blárautt
       Solarized Red: Sólaríserað rautt
       Solarized Green: Sólaríserað grænt
-      Gruvbox Dark Green: Gruvbox dökkgrænt
-      Gruvbox Dark Yellow: Gruvbox dökkgult
-      Gruvbox Dark Aqua: Gruvbox dökksægrænt
-      Gruvbox Light Red: Gruvbox ljósrautt
-      Gruvbox Light Blue: Gruvbox ljósblátt
-      Gruvbox Light Purple: Gruvbox ljósfjólublátt
-      Gruvbox Light Orange: Gruvbox ljósappelsínugult
-      Gruvbox Dark Orange: Gruvbox dökkappelsínugult
-      Gruvbox Dark Blue: Gruvbox dökkblátt
-      Gruvbox Dark Purple: Gruvbox dökkfjólublátt
     Secondary Color Theme: 'Aukalitur þema'
         #* Main Color Theme
     Hide Side Bar Labels: Fela skýringar á hliðarstiku
     Hide FreeTube Header Logo: Fela táknmynd FreeTube í haus
   Player Settings:
-    Player Settings: 'Spilari'
+    Player Settings: 'Stillingar spilara'
     Play Next Video: 'Spila næsta myndskeið'
     Turn on Subtitles by Default: 'Sjálfgefið kveikja á skjátextum'
     Autoplay Videos: 'Spila myndskeið sjálfkrafa'
@@ -426,7 +418,7 @@ Settings:
       1440p: '1440p'
       4k: '4k'
       8k: '8k'
-    Next Video Interval: Niðurtalning í sjálfvirka spilun
+    Next Video Interval: Bil í næsta myndskeið
     Display Play Button In Video Player: Birta afspilunarhnapp í myndspilara
     Scroll Volume Over Video Player: Skruna hljóðstyrk ofan á myndspilara
     Fast-Forward / Rewind Interval: Millibil hraðspólunar / spóla til baka
@@ -451,9 +443,8 @@ Settings:
       File Name Label: Mynstur skráaheita
     Enter Fullscreen on Display Rotate: Fara í skjáfylli við snúning á skjá
     Skip by Scrolling Over Video Player: Sleppa með því að skruna ofan á myndspilara
-    Autoplay Interruption Timer: Niðurtalning í stöðvun á sjálfvirkri spilun
   Privacy Settings:
-    Privacy Settings: 'Gagnaleynd'
+    Privacy Settings: 'Stillingar gagnaleyndar'
     Remember History: 'Muna áhorfsferil'
     Save Watched Progress: 'Vista framvindu áhorfs'
     Clear Search Cache: 'Hreinsa skyndiminni leitar'
@@ -475,16 +466,16 @@ Settings:
       fjarlægja alla spilunarlistana þína?
     All playlists have been removed: Allir spilunarlistar hafa verið fjarlægðir
   Subscription Settings:
-    Subscription Settings: 'Áskrift'
+    Subscription Settings: 'Stillingar áskrifta'
     Hide Videos on Watch: 'Fela myndskeið eftir áhorf'
     Fetch Feeds from RSS: 'Ná í streymi úr RSS'
+    Manage Subscriptions: 'Sýsla með áskriftir'
     Fetch Automatically: Sækja streymi sjálfvirkt
+    Only Show Latest Video for Each Channel: Aðeins birta nýjasta myndskeið fyrir
+      hverja myndskeiðarás
     Confirm Before Unsubscribing: Staðfesta uppsögn áskriftar
-    To: Við
-    'Limit the number of videos displayed for each channel': Takmarka fjölda myndskeiða
-      sem birt eru fyrir hverja rás
   Distraction Free Settings:
-    Distraction Free Settings: 'Truflanaminnkandi'
+    Distraction Free Settings: 'Truflanaminnkandi stillingar'
     Hide Video Views: 'Fela fjölda áhorfa á myndskeið'
     Hide Video Likes And Dislikes: 'Fela hve mörgum líkar eða mislíkar myndskeið'
     Hide Channel Subscribers: 'Fela fjölda áskrifenda myndskeiða'
@@ -511,15 +502,16 @@ Settings:
       Watch Page: Áhorfssíða
       General: Almennt
       Subscriptions Page: Áskriftasíða
-    Hide Channel Shorts: Fela stuttmyndaflipa rása
-    Hide Channel Playlists: Fela spilunarlistaflipa rása
-    Hide Channel Community: Fela samfélagsflipa rása
+    Hide Channel Shorts: Fela stuttmyndir rása
+    Hide Channel Playlists: Fela spilunarlista rása
+    Hide Channel Community: Fela samfélag rása
     Hide Featured Channels: Fela rásir í deiglunni
-    Hide Channel Podcasts: Fela hlaðvarpsflipa rása
-    Hide Channel Releases: Fela útgáfuflipa rása
+    Hide Channel Podcasts: Fela hlaðvörp rása
+    Hide Channel Releases: Fela útgáfur rása
     Hide Subscriptions Shorts: Fela stuttmyndir áskrifta
     Hide Subscriptions Live: Fela bein streymi áskrifta
     Hide Subscriptions Videos: Fela myndskeið áskrifta
+    Blur Thumbnails: Móska smámyndir
     Hide Profile Pictures in Comments: Fela auðkennismyndir í athugasemdum
     Hide Subscriptions Community: Fela samfélag áskrifenda
     Hide Channels Invalid: Uppgefið auðkenni rásar er ógilt
@@ -532,13 +524,15 @@ Settings:
     Hide Videos and Playlists Containing Text: Fela myndskeið og spilunarlista sem
       innihalda texta
     Hide Videos and Playlists Containing Text Placeholder: Orð, orðhluti eða setning
-    Hide Channel Home: Fela "Heim"-flipa rása
-    Show Added Items: Sýna atriði sem bætt hefur verið við
   Data Settings:
-    Data Settings: 'Gögn'
+    Data Settings: 'Stillingar gagna'
     Select Import Type: 'Veldu tegund innflutnings'
     Select Export Type: 'Veldu tegund útflutnings'
     Import Subscriptions: 'Flytja inn áskriftir'
+    Import FreeTube: 'Flytja inn FreeTube'
+    Import YouTube: 'Flytja inn YouTube'
+    Import NewPipe: 'Flytja inn NewPipe'
+    Check for Legacy Subscriptions: 'Athuga með eldri áskriftir'
     Export Subscriptions: 'Flytja út áskriftir'
     Export FreeTube: 'Flytja út FreeTube'
     Export YouTube: 'Flytja út YouTube'
@@ -587,7 +581,7 @@ Settings:
         spilunarlista' í stillingum gagnaleyndar.\n3. Ræstu eldri útgáfu FreeTube
         og flyttu inn spilunarlistana sem þú fluttir út.\""
   Proxy Settings:
-    Proxy Settings: 'Milliþjónn (proxy)'
+    Proxy Settings: 'Stillingar milliþjóns (proxy)'
     Enable Tor / Proxy: 'Virkja Tor / milliþjón'
     Proxy Protocol: 'Samskiptamáti milliþjóns'
     Proxy Host: 'Hýsilvél milliþjóns'
@@ -602,17 +596,12 @@ Settings:
     City: 'Borg/Sveitarfélag'
     Error getting network information. Is your proxy configured properly?: 'Það tókst
       ekki að sækja upplýsingar um netkerfið. Er milliþjónninn rétt uppsettur?'
-    Proxy Warning: FreeTube er ekki með innbyggðan milliþjón en getur tengst við utanaðkomandi
-      milliþjóna, til dæmis einhvern sem keyrir á vélinni þinni eins og Tor eða fjartengdan
-      milliþjón á borð við SOCKS5-milliþjóna sem sumar VPN-þjónustur bjóða. Ef þetta
-      er virkt skaltu ganga úr skugga um að milliþjónninn/Tor sé rétt stillt, annars
-      mun FreeTube ekki geta sótt nein gögn.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Láta vita þegar kostaður hluti er hunsaður
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API-slóð
       (sjálfgefið er https://sponsor.ajay.app)
     Enable SponsorBlock: Virkja SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Stillingar SponsorBlock
     Skip Options:
       Skip Option: Valkostir við hunsun
       Auto Skip: Hunsa sjálfvirkt
@@ -630,13 +619,13 @@ Settings:
     Custom External Player Executable: Sérsniðin skipun fyrir utanaðkomandi spilara
     Ignore Unsupported Action Warnings: Hunsa aðvarinir vegna óstuddra aðgerða
     External Player: Utanaðkomandi spilari
-    External Player Settings: Utanaðkomandi spilari
+    External Player Settings: Stillingar utanaðkomandi spilara
     Players:
       None:
         Name: Ekkert
     Ignore Default Arguments: Hunsa sjálfgefnar breytur
   Download Settings:
-    Download Settings: Niðurhal
+    Download Settings: Stillingar niðurhals
     Ask Download Path: Spyrja hvar eigi að vista skrár
     Choose Path: Veldu slóð
     Download in app: Sækja í forritinu
@@ -646,9 +635,9 @@ Settings:
     Hide Unsubscribe Button: Fela hnapp til að segja upp áskrift
     Show Family Friendly Only: Aðeins sýna fjölskylduvænt efni
     Hide Search Bar: Fela leitarstiku
-    Parental Control Settings: Foreldrastýringar
+    Parental Control Settings: Stillingar foreldrastýringar
   Experimental Settings:
-    Experimental Settings: Á tilraunastigi
+    Experimental Settings: Stillingar á tilraunastigi
     Warning: Þessar stillingar eru á tilraunastigi, þær geta valdið hruni þegar þær
       eru virkjaðar. Mælt er með því að öryggisafrit séu tekin. Notist á eigin ábyrgð!
     Replace HTTP Cache: Skipta út HTTP-skyndiminni
@@ -661,14 +650,16 @@ Settings:
     Set Password To Prevent Access: Settu lykilorð til að hindra aðgang að stillingum
     Set Password: Setja lykilorð
     Remove Password: Fjarlægja lykilorð
-    Password Settings: Lykilorð
+    Password Settings: Stillingar lykilorðs
+  Expand All Settings Sections: Fletta út öllum stillingahlutum
   Sort Settings Sections (A-Z): Röðun stillingahluta (A-Ö)
-  Return to Settings Menu: Fara aftur í stillingavalmynd
 About:
   #On About page
   About: 'Um hugbúnaðinn'
   Beta: 'Beta-prófunarútgáfa'
   Source code: 'Grunnkóði'
+  Licensed under the AGPLv3: 'Gefið út með AGPLv3-notkunarleyfi'
+  View License: 'Skoða notkunarleyfi'
   Downloads / Changelog: 'Sóttar skrár / Breytingaskrá'
   GitHub releases: 'Útgáfur af GitHub'
   Help: 'Hjálp'
@@ -737,7 +728,7 @@ Profile:
     viss um að þú viljir eyða völdu rásunum? Þetta mun ekki eyða rásunum úr öðrum
     notkunarsniðum.'
 #On Channel Page
-  Profile Settings: Notkunarsnið
+  Profile Settings: Stillingar notkunarsniðs
   Toggle Profile List: Víxla lista með notkunarsniðum af/á
   Profile Name: Heiti notkunarsniðs
   Edit Profile Name: Breyta heiti notkunarsniðs
@@ -795,9 +786,6 @@ Channel:
     Hide Answers: Fela svör
     votes: '{votes} atkvæði'
     Video hidden by FreeTube: Myndskeið falið af FreeTube
-    View Full Post: Skoða alla færsluna
-    Viewing Posts Only Supported By Invidious: Einungis er hægt að skoða innsendar
-      færslur á Invidious. Farðu á samfélagsflipa rásar til að skoða efni þar án Invidious.
   Shorts:
     This channel does not currently have any shorts: Þessi rás er í augnablikinu ekki
       með neinar stuttmyndir
@@ -809,9 +797,6 @@ Channel:
     Podcasts: Hlaðvörp
     This channel does not currently have any podcasts: Þessi rás er ekki með nein
       hlaðvörp í augnablikinu
-  Home:
-    Home: Heim
-    View Playlist: Skoða spilunarlista
 Video:
   Mark As Watched: 'Merkja sem búið að horfa á'
   Remove From History: 'Fjarlægja úr áhorfsferli'
@@ -860,10 +845,40 @@ Video:
   video only: 'einungis myndmerki'
   audio only: 'einungis hljóð'
   Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Maí'
+    Jun: 'Jún'
+    Jul: 'Júl'
+    Aug: 'Ágú'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nóv'
+    Dec: 'Des'
+    Second: 'sekúndu'
+    Seconds: 'sekúndum'
+    Minute: 'mínútu'
+    Minutes: 'mínútum'
+    Hour: 'klukkustund'
+    Hours: 'klukkustundum'
+    Day: 'degi'
+    Days: 'dögum'
+    Week: 'viku'
+    Weeks: 'vikum'
+    Month: 'mánuði'
+    Months: 'mánuðum'
+    Year: 'ári'
+    Years: 'árum'
+    Ago: 'síðan'
+    Upcoming: 'Frumsýnt'
+    Less than a minute: Minna en mínútu
     In less than a minute: eftir minna en mínútu
   Published on: 'Gefið út'
   Streamed on: 'Streymt'
   Started streaming on: 'Byrjaði streymi'
+  Publicationtemplate: 'Fyrir {number} {unit} síðan'
 #& Videos
   Sponsor Block category:
     music offtopic: Tónlist óskyld efni
@@ -902,46 +917,6 @@ Video:
   Unhide Channel: Birta rás
   Hide Channel: Fela rás
   More Options: Fleiri valkostir
-  Player:
-    Stats:
-      Player Dimensions: 'Stærðir spilara: {width}x{height}'
-      Bitrate: 'Bitahraði: {bitrate} kbps'
-      Resolution: 'Upplausn: {width}x{height}@{frameRate}'
-      Volume: 'Hljóðstyrkur: {volumePercentage}%'
-      Stats: Tölfræði
-      Bandwidth: 'Bandbreidd: {bandwidth} kbps'
-      Buffered: 'Biðminni: {bufferedPercentage}%'
-      CodecsVideoAudio: 'Kóðunarlyklar: {videoCodec} ({videoItag}) / {audioCodec}
-        ({audioItag})'
-      CodecsVideoAudioNoItags: 'Kóðunarlyklar: {videoCodec} / {audioCodec}'
-      Video ID: 'Auðkenni myndskeiðs: {videoId}'
-      Media Formats: 'Snið efnis: {formats}'
-      CodecAudio: 'Kóðunarlykill: {audioCodec} ({audioItag})'
-      Dropped Frames / Total Frames: 'Römmum sleppt: {droppedFrames} / Rammar alls:
-        {totalFrames}'
-    TranslatedCaptionTemplate: '{language} (þýtt úr "{originalLanguage}")'
-    Take Screenshot: Taka skjámynd
-    Hide Stats: Fela tölfræði
-    Show Stats: Birta tölfræði
-    Audio Tracks: Hljóðrásir
-    Full Window: Skjáfylli
-    You appear to be offline: Þú virðist ekki vera með tengingu við netið.
-    Skipped segment: Sleppti {segmentCategory} bút
-    Exit Full Window: Hætta í skjáfylli
-    Playback will resume automatically when your connection comes back: Afspilun heldur
-      sjálfkrafa áfram þegar tenging næst aftur.
-    Exit Theatre Mode: Fara út úr bíóham
-    Theatre Mode: Bíóhamur
-  Unlisted: Óskráð
-  MembersOnly: Ekki er hægt að horfa á myndskeið einungis fyrir meðlimi með FreeTube
-    þar sem þau krefjast innskráningar á Google og greiddu þátttökugjaldi á rás innsendandans.
-  AgeRestricted: Ekki er hægt að horfa á aldurstakmörkuð myndskeið með FreeTube þar
-    sem þau krefjast innskráningar á Google og notkunar á aldursvottuðum YouTube-reikningi.
-  IP block: YouTube hefur útilokað IP-vistfang þitt frá því að horfa á myndskeið.
-    Prófaðu að skipta yfir á annan VPN eða milliþjón.
-  DeArrow:
-    Show Original Details: Birta upprunalegar nánari upplýsingar
-    Show Modified Details: Birta breyttar nánari upplýsingar
 Videos:
   #& Sort By
   Sort By:
@@ -952,6 +927,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Sjá allan spilunarlistann'
+  Videos: 'Myndskeið'
+  View: 'Áhorf'
+  Views: 'Áhorf'
   Last Updated On: 'Síðast uppfært'
 
 # On Video Watch Page
@@ -967,8 +945,7 @@ Playlist:
     VideoTitleDescending: Titill (Ö-A)
     Custom: Sérsniðið
     DateAddedOldest: Elsta bætt við fyrst
-    VideoDurationAscending: Tímalengd (stysta fyrst)
-    VideoDurationDescending: Tímalengd (lengsta fyrst)
+Toggle Theatre Mode: 'Víxla bíóham af/á'
 Change Format:
   Change Media Formats: 'Skipta um myndskeiðasnið'
   Use Dash Formats: 'Nota DASH-skráasnið'
@@ -978,8 +955,6 @@ Change Format:
     þetta myndskeið'
   Audio formats are not available for this video: 'Hljóðskráasnið eru ekki tiltæk
     fyrir þetta myndskeið'
-  Legacy formats are not available for this video: Eldri snið eru ekki tiltæk fyrir
-    þetta myndskeið
 Share:
   Share Video: 'Deila myndskeiði'
   Share Playlist: 'Deila spilunarlista'
@@ -1026,8 +1001,6 @@ Comments:
   View {replyCount} replies: Skoða {replyCount} svör
   Hearted: Líkað
   Subscribed: Áskrifandi
-  There are no comments available for this post: Engar athugasemdir finnast fyrir
-    þessa færslu
 Up Next: 'Næst í spilun'
 
 #Tooltips
@@ -1048,9 +1021,6 @@ Tooltips:
     External Link Handling: "Veldu sjálfgefna hegðun þegar smellt er á tengil sem
       ekki er hægt að opna í FreeTube.\nSjálfgefið mun FreeTube opna viðkomandi tengil
       í sjálfgefna vafranum þínum.\n"
-    Open Deep Links In New Window: Slóðir sem beint er til FreeTube, til dæmis með
-      endurbeiningum vafraviðbóta eða skipanalínuviðföngum, verða opnaðar í nýjum
-      glugga.
   Player Settings:
     Proxy Videos Through Invidious: 'Mun tengjast við Invidious til að miðla myndskeiðum
       í stað þess að tengjast beint við YouTube.'
@@ -1070,14 +1040,14 @@ Tooltips:
     Fetch Feeds from RSS: 'Þegar þetta er virkt, mun FreeTube nota RSS í stað sjálfgefinnar
       aðferðar við að safna streymi áskriftarinnar þinnar. RSS er hraðvirkara og kemur
       í veg fyrir útilokun IP-vistfanga, en nær ekki að birta ákveðnar upplýsingar
-      á borð við tímalengd myndskeiða, stöðu í beinni útsendingu eða færslur á samfélagsgáttum'
+      á borð við tímalengd myndskeiða eða stöðu í beinni útsendingu'
 
 # Toast Messages
     Fetch Automatically: Þegar þetta er virkt, mun FreeTube sækja sjálfkrafa áskriftarstreymin
       þín þegar nýr gluggi er opnaður og þegar skipt er um notkunarsnið.
   External Player Settings:
-    Custom External Player Arguments: Öll sérsniðin skipanaviðföng og rofar, sem beina
-      á til utanaðkomandi spilarans.
+    Custom External Player Arguments: Öll sérsniðin skipanaviðföng og rofar, aðskilin
+      með semíkommum (';'), sem beina á til utanaðkomandi spilarans.
     Ignore Warnings: Hunsa aðvarinir þegar valinn utanaðkomandi spilari styður ekki
       viðkomandi aðgerð (t.d. að snúa við spilunarlista, o.s.frv.).
     Custom External Player Executable: Sjálfgefið gengur FreeTube út frá því að valinn
@@ -1118,6 +1088,7 @@ Falling back to Local API: 'Nota til vara staðvært API-kerfisviðmót'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Þetta
   myndskeiðer ekki tiltækt vegna þess að það vantar skráasnið. Þetta getur gest ef
   þau eru ekki tiltæk í viðkomandi landi.'
+Subscriptions have not yet been implemented: 'Áskriftir eru enn ekki frágengnar'
 Loop is now disabled: 'Endurtekning er núna óvirk'
 Loop is now enabled: 'Endurtekning er núna virk'
 Shuffle is now disabled: 'Stokkun er núna óvirk'
@@ -1135,6 +1106,8 @@ Canceled next video autoplay: 'Hætti við sjálfvirka afspilun næsta myndskei
 
 Yes: 'Já'
 No: 'Nei'
+Hashtags have not yet been implemented, try again later: Ekki er ennþá stuðningur
+  við myllumerki (hashtags), prófaðu aftur síðar
 Unknown YouTube url type, cannot be opened in app: Óþekkt gerð YouTube-slóðar, er
   ekki hægt að opna í forritinu
 Open New Window: Opna í nýjum glugga
@@ -1157,9 +1130,11 @@ Channels:
   Search bar placeholder: Leita í rásum
   Count: '{number} rás/rásir fundust.'
   Empty: Rásalistinn þinn er tómur.
+  Unsubscribed: '{channelName} hefur verið fjarlægð úr áskriftunum þínum'
   Unsubscribe Prompt: Ertu viss um að þú viljir hætta áskrift að "{channelName}"?
   Channels: Rásir
   Title: Rásalisti
+  Unsubscribe: Segja upp áskrift
 Clipboard:
   Copy failed: Afritun á klippispjald mistókst
   Cannot access clipboard without a secure connection: Get ekki tengst klippispjaldi
@@ -1170,7 +1145,6 @@ Chapters:
     núverandi kafli: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Listi yfir kafla falinn,
     núverandi kafli: {chapterName}'
-  Key Moments: Helstu augnablik
 Preferences: Kjörstillingar
 Ok: Í lagi
 Hashtag:
@@ -1211,23 +1185,3 @@ Search Listing:
     4K: 4K
     Subtitles: Skjátextar
     Closed Captions: Þýðingartextar
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Nýtt
-    3D: 3D
-Keys:
-  arrowright: Hægri-ör
-  arrowleft: Vinstri-ör
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Niður-ör
-  arrowup: Upp-ör
-Right-click or hold to see history: Hægri-smelltu til að sjá feril
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Autoplay Interruption Timer: Hætt sjálfvirkri spilun vegna {autoplayInterruptionIntervalHours}
-  klst án aðgerða
-Description:
-  Expand Description: '...meira'
-  Collapse Description: Birta minna
diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 54317d31ede33..dcac632b8efce 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -48,7 +48,7 @@ Global:
     Like Count: 1 mi piace | {count} mi piace
   Input Tags:
     Length Requirement: Il tag deve essere lungo almeno {number} caratteri
-Search / Go to URL: 'Ricerca o aggiungi URL YouTube'
+Search / Go to URL: 'Cerca o aggiungi URL YouTube'
   # In Filter Button
 Search Filters:
   Search Filters: 'Filtri di ricerca'
@@ -102,10 +102,8 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Iscrizioni'
   Latest Subscriptions: 'Ultime iscrizioni'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Il
-    tuo elenco di iscrizioni è attualmente vuoto. Se vuoi importare le tue iscrizioni
-    puoi andare su Impostazioni dati e selezionare Importa iscrizioni oppure puoi
-    cercare un canale e iscriverti ad esso.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'L''elenco
+    delle iscrizioni è vuoto. Iscriviti a qualche canale per visualizzare qui i video.'
   'Getting Subscriptions.  Please wait.': 'Caricamento Iscrizioni. Attendi.'
   Refresh Subscriptions: Ricarica le iscrizioni
   'Getting Subscriptions. Please wait.': Scaricamento delle iscrizioni. Per favore
@@ -133,11 +131,20 @@ Most Popular: 'Più popolari'
 Playlists: 'Playlist'
 User Playlists:
   Your Playlists: 'Le tue playlist'
-  Search bar placeholder: Ricerca nelle playlist
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Non
+    ci sono video salvati. Fai clic sulla stella in alto a destra di un video per
+    aggiungerlo qui
+  Playlist Message: Questa pagina non è rappresentativa di una playlist completa.
+    Mostra solo i video che hai salvato o aggiunto ai preferiti. A lavoro finito,
+    tutti i video che si trovano qui saranno spostati in una playlist preferiti.
+  Search bar placeholder: Cerca nelle playlist
   Empty Search Message: Non ci sono video in questa playlist che corrispondono alla
     tua ricerca
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Sei
+    sicuro di voler rimuovere tutti i video guardati da questa playlist? Questa operazione
+    non può essere annullata.
   AddVideoPrompt:
-    Search in Playlists: Ricerca nelle playlist
+    Search in Playlists: Cerca nelle playlist
     Save: Salva
     Toast:
       "{videoCount} video(s) added to {playlistCount} playlists": 1 video aggiunto
@@ -168,7 +175,7 @@ User Playlists:
       Playlist {playlistName} has been deleted.: La playlist {playlistName} è stata
         eliminata.
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: Alcuni
-        video nella playlist non sono ancora stati caricati. Fai clic qui per copiare
+        video nella playlist non sono ancora stati caricati. Clicca qui per copiare
         comunque.
       This playlist does not exist: Questa playlist non esiste
       Playlist name cannot be empty. Please input a name.: Il nome della playlist
@@ -181,6 +188,7 @@ User Playlists:
         il basso.
       This playlist is now used for quick bookmark: Questa playlist è ora usata per
         i segnalibri rapidi
+      Quick bookmark disabled: Segnalibro rapido disabilitato
       Reverted to use {oldPlaylistName} for quick bookmark: Ripristinato l'uso di
         {oldPlaylistName} per i segnalibri rapidi
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Questa
@@ -190,10 +198,7 @@ User Playlists:
         utilizzata per i segnalibri rapidi.
       Playlist {playlistName} is the new quick bookmark playlist.: La playlist {playlistName}
         è la nuova playlist con segnalibri rapidi.
-      This playlist has a video with a duration error: Questa playlist contiene almeno
-        un video che non ha durata; verranno ordinati come se la loro durata fosse
-        zero.
-    Search for Videos: Ricerca nei video
+    Search for Videos: Cerca video
   Are you sure you want to delete this playlist? This cannot be undone: Sei sicuro
     di voler eliminare questa playlist? Questa operazione non può essere annullata.
   Sort By:
@@ -236,6 +241,7 @@ User Playlists:
   Add to Favorites: Aggiungi a {playlistName}
   Remove from Favorites: Rimuovi da {playlistName}
   Enable Quick Bookmark With This Playlist: Abilita segnalibro rapido con questa playlist
+  Disable Quick Bookmark: Disabilita segnalibro rapido
   Playlists with Matching Videos: Playlist con video correlati
   Cannot delete the quick bookmark target playlist.: Impossibile eliminare la playlist
     di destinazione dei segnalibri rapidi.
@@ -249,14 +255,12 @@ User Playlists:
     sicuro di voler rimuovere 1 video guardato da questa playlist? Questa operazione
     non può essere annullata. | Vuoi rimuovere {playlistItemCount} video guardati
     da questa playlist? Questa operazione non può essere annullata.
-  Export Playlist: Esporta questa playlist
-  The playlist has been successfully exported: La playlist è stata esportata correttamente
 History:
   # On History Page
   History: 'Cronologia'
   Watch History: 'Cronologia delle visualizzazioni'
   Your history list is currently empty.: 'La tua cronologia è attualmente vuota.'
-  Search bar placeholder: Ricerca nella cronologia
+  Search bar placeholder: Cerca nella cronologia
   Empty Search Message: Non ci sono video nella tua cronologia che corrispondono alla
     tua ricerca
   Case Sensitive Search: Ricerca con distinzione tra maiuscole e minuscole
@@ -264,7 +268,7 @@ Settings:
   # On Settings Page
   Settings: 'Impostazioni'
   General Settings:
-    General Settings: 'Generale'
+    General Settings: 'Impostazioni generali'
     Fallback to Non-Preferred Backend on Failure: 'Ritorna al backend non preferito
       in caso di errore'
     Enable Search Suggestions: 'Abilita suggerimenti di ricerca'
@@ -286,6 +290,8 @@ Settings:
       End: 'Fine'
       Hidden: Nascoste
       Blur: Sfocatura
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Istanza Invidious
+      (La predefinita è https://invidious.snopyta.org)'
     Region for Trending: 'Regione per le tendenze'
         #! List countries
     Check for Latest Blog Posts: Controlla gli ultimi post del blog
@@ -309,12 +315,11 @@ Settings:
     Auto Load Next Page:
       Label: Carica automaticamente la pagina successiva
       Tooltip: Carica automaticamente pagine e commenti aggiuntivi.
-    Open Deep Links In New Window: Apri URL passati a FreeTube in una nuova finestra
   Theme Settings:
-    Theme Settings: 'Tema'
+    Theme Settings: 'Impostazioni del tema'
     Match Top Bar with Main Color: 'Abbina la barra superiore al colore principale'
     Base Theme:
-      Base Theme: 'Tema di base'
+      Base Theme: 'Tema'
       Black: 'Nero'
       Dark: 'Scuro'
       Light: 'Chiaro'
@@ -326,8 +331,6 @@ Settings:
       Nordic: Nordico
       Solarized Dark: Solarizzato scuro
       Solarized Light: Solarizzato chiaro
-      Gruvbox Light: Gruvbox chiaro
-      Gruvbox Dark: Gruvbox scuro
     Main Color Theme:
       Main Color Theme: 'Colore principale del tema'
       Red: 'Rosso'
@@ -336,7 +339,7 @@ Settings:
       Deep Purple: 'Viola scuro'
       Indigo: 'Indaco'
       Blue: 'Blu'
-      Light Blue: 'Blu chiaro'
+      Light Blue: 'Azzurro'
       Cyan: 'Ciano'
       Teal: 'Verde acqua'
       Green: 'Verde'
@@ -375,16 +378,6 @@ Settings:
       Solarized Cyan: Solarizzato ciano
       Solarized Green: Solarizzato verde
       Solarized Blue: Solarizzato blu
-      Gruvbox Dark Yellow: Gruvbox giallo scuro
-      Gruvbox Dark Purple: Gruvbox viola scuro
-      Gruvbox Light Blue: Gruvbox blu chiaro
-      Gruvbox Light Purple: Gruvbox viola chiaro
-      Gruvbox Light Orange: Gruvbox arancione chiaro
-      Gruvbox Dark Aqua: Gruvbox acqua marina scuro
-      Gruvbox Dark Green: Gruvbox verde scuro
-      Gruvbox Dark Blue: Gruvbox blu scuro
-      Gruvbox Light Red: Gruvbox rosso chiaro
-      Gruvbox Dark Orange: Gruvbox arancione scuro
     Secondary Color Theme: 'Colore secondario del tema'
         #* Main Color Theme
     UI Scale: Dimensioni dell'interfaccia utente
@@ -393,7 +386,7 @@ Settings:
     Hide Side Bar Labels: Nascondi le etichette della barra laterale
     Hide FreeTube Header Logo: Nascondi il logo dell'intestazione di FreeTube
   Player Settings:
-    Player Settings: 'Lettore'
+    Player Settings: 'Impostazioni del lettore'
     Play Next Video: 'Riproduci il prossimo video'
     Turn on Subtitles by Default: 'Abilita i sottotitoli per impostazione predefinita'
     Autoplay Videos: 'Riproduci i video automaticamente'
@@ -421,7 +414,7 @@ Settings:
       8k: '8k'
     Playlist Next Video Interval: Intervallo video successivo nella playlist
     Fast-Forward / Rewind Interval: Avanzamento veloce o riavvolgimento video
-    Next Video Interval: Timer di conto alla rovescia per la riproduzione automatica
+    Next Video Interval: Prossimo intervallo video
     Display Play Button In Video Player: Visualizza il pulsante di riproduzione nel
       lettore video
     Scroll Volume Over Video Player: Controlla il volume scorrendo sul lettore video
@@ -446,9 +439,8 @@ Settings:
         del video 3 cifre. %i ID video. Puoi anche usare \ o / per creare sottocartelle.
     Enter Fullscreen on Display Rotate: Entra a schermo intero su Ruota schermo
     Skip by Scrolling Over Video Player: Salta tramite scorrimento sul lettore video
-    Autoplay Interruption Timer: Timer di interruzione della riproduzione automatica
   Privacy Settings:
-    Privacy Settings: 'Privacy'
+    Privacy Settings: 'Impostazioni della privacy'
     Remember History: 'Salva la cronologia'
     Save Watched Progress: 'Salva i progressi raggiunti'
     Clear Search Cache: 'Svuota la cache della ricerca'
@@ -470,15 +462,47 @@ Settings:
     Are you sure you want to remove all your playlists?: Sei sicuro di voler rimuovere
       tutte le tue playlist?
   Subscription Settings:
-    Subscription Settings: 'Iscrizioni'
+    Subscription Settings: 'Impostazioni delle iscrizioni'
     Hide Videos on Watch: 'Nascondi i video visualizzati'
+    Subscriptions Export Format:
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Gestisci le iscrizioni'
+    Import Subscriptions: 'Importa Iscrizioni'
+    Export Subscriptions: 'Esporta Iscrizioni'
+    How do I import my subscriptions?: 'Come importo le mie iscrizioni?'
     Fetch Feeds from RSS: Scarica gli aggiornamenti dai flussi RSS
     Fetch Automatically: Recupera i feed automaticamente
+    Only Show Latest Video for Each Channel: Mostra solo il video più recente per
+      ciascun canale
     Confirm Before Unsubscribing: Evita la cancellazione accidentale dell'iscrizione
+  Advanced Settings:
+    Advanced Settings: 'Impostazioni Avanzate'
+    Enable Debug Mode (Prints data to the console): 'Abilità modalità Sviluppatore
+      (log nella console)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Indirizzo Proxy (Esempio:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Cliccare
+      "PROVA PROXY" manderà una richiesta a https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Usa Tor / Proxy per chiamate API'
+    TEST PROXY: 'PROVA PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Vedi Istanze Pubbliche'
+    Clear History:
+      Clear History: 'Pulisci Cronologia'
+      # On Click
+      Are you sure you want to delete your history?: 'Sei sicuro di voler eliminare
+        la cronologia?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Pulisci Iscrizioni'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Sei sicuro di voler rimuovere
+        tutte le iscrizioni?'
+      #& Yes
+      #& No
 
-    'Limit the number of videos displayed for each channel': Limita il numero di video
-      visualizzati per ogni canale
-    To: A
   Data Settings:
     How do I import my subscriptions?: Come posso importare le mie iscrizioni?
     Unknown data key: Chiave dati sconosciuta
@@ -509,9 +533,13 @@ Settings:
     Export YouTube: Esporta per YouTube
     Export FreeTube: Esporta per FreeTube
     Export Subscriptions: Esporta le iscrizioni
+    Import NewPipe: Importa da NewPipe
+    Import YouTube: Importa da YouTube
+    Import FreeTube: Importa da FreeTube
     Select Export Type: Seleziona il tipo di esportazione
     Select Import Type: Seleziona il tipo di importazione
-    Data Settings: Dati
+    Data Settings: Impostazioni dei dati
+    Check for Legacy Subscriptions: Controlla le iscrizioni obsolete
     Manage Subscriptions: Gestisci i profili
     Import Playlists: Importa playlist
     Export Playlists: Esporta playlist
@@ -539,7 +567,7 @@ Settings:
     Hide Comment Likes: Nascondi Mi piace dai commenti
     Hide Channel Subscribers: Nascondi il numero di iscritti
     Hide Video Views: Nascondi le visualizzazioni dei video
-    Distraction Free Settings: Modalità senza distrazioni
+    Distraction Free Settings: Impostazioni della modalità senza distrazioni
     Hide Live Chat: Nascondi la chat dal vivo
     Hide Video Likes And Dislikes: Nascondi Mi piace e Non mi piace
     Hide Active Subscriptions: Nascondi le iscrizioni attive
@@ -555,21 +583,22 @@ Settings:
     Display Titles Without Excessive Capitalisation: Visualizza i titoli senza maiuscole
       e punteggiatura eccessive
     Hide Featured Channels: Nascondi i canali in evidenza
-    Hide Channel Playlists: Nascondi la scheda "Playlist" del canale
-    Hide Channel Community: Nascondi la scheda "Comunità" del canale
-    Hide Channel Shorts: Nascondi i "Video brevi" del canale
+    Hide Channel Playlists: Nascondi le playlist del canale
+    Hide Channel Community: Nascondi la comunità del canale
+    Hide Channel Shorts: Nascondi i video brevi del canale
     Sections:
       General: Generale
       Watch Page: Pagina di visualizzazione
       Side Bar: Barra laterale
       Channel Page: Pagina del canale
       Subscriptions Page: Pagina delle iscrizioni
-    Hide Channel Podcasts: Nascondi la scheda "Podcast" del canale
-    Hide Channel Releases: Nascondi la scheda "Rilasci" del canale
+    Hide Channel Podcasts: Nascondi i podcast del canale
+    Hide Channel Releases: Nascondi i rilasci del canale
     Hide Subscriptions Live: Nascondi le iscrizioni dal vivo
     Hide Subscriptions Videos: Nascondi i video delle iscrizioni
     Hide Subscriptions Shorts: Nascondi le iscrizioni ai video brevi
     Hide Profile Pictures in Comments: Nascondi le immagini del profilo nei commenti
+    Blur Thumbnails: Miniature sfocate
     Hide Subscriptions Community: Nascondi la comunità di iscritti
     Hide Channels Invalid: L'ID canale fornito non è valido
     Hide Channels Disabled Message: Alcuni canali sono stati bloccati usando l'ID
@@ -582,15 +611,13 @@ Settings:
       il testo
     Hide Videos and Playlists Containing Text Placeholder: Parola, frammento di parola
       o frase
-    Hide Channel Home: Nascondi la scheda "Pagina iniziale" del canale
-    Show Added Items: Mostra elementi aggiunti
   The app needs to restart for changes to take effect. Restart and apply change?: L'app
     deve essere riavviata affinché le modifiche abbiano effetto. Riavviare e applicare
     la modifica?
   Proxy Settings:
     Proxy Protocol: Protocollo Proxy
     Enable Tor / Proxy: Attiva Tor o Proxy
-    Proxy Settings: Proxy
+    Proxy Settings: Impostazioni del proxy
     Error getting network information. Is your proxy configured properly?: C'è stato
       un errore di acquisizione delle informazioni di rete. Il proxy è stato configurato
       correttamente?
@@ -600,22 +627,17 @@ Settings:
     Ip: Ip
     Your Info: Le tue informazioni
     Test Proxy: Testa proxy
-    Clicking on Test Proxy will send a request to: Facendo clic su Testa proxy verrà
+    Clicking on Test Proxy will send a request to: Cliccando su Testa proxy verrà
       inviata una richiesta a
     Proxy Port Number: Numero di porta del proxy
     Proxy Host: Host del proxy
-    Proxy Warning: FreeTube non ha un proxy integrato ma può connettersi a un proxy
-      esterno, come uno in esecuzione sul tuo computer come Tor o un proxy esterno
-      come un proxy SOCKS5 fornito da alcune VPN. Se abilitato, assicurati che il
-      tuo proxy/Tor sia configurato correttamente, altrimenti FreeTube non sarà in
-      grado di recuperare alcun dato.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notifica quando un segmento sponsor viene
       saltato
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL dell'API di
       SponsorBlock (l'impostazione predefinita è https://sponsor.ajay.app)
     Enable SponsorBlock: Abilita SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Impostazioni di SponsorBlock
     Skip Options:
       Skip Option: Salta l'opzione
       Show In Seek Bar: Mostra nella barra di ricerca
@@ -632,13 +654,13 @@ Settings:
     Custom External Player Executable: File eseguibile del lettore esterno personalizzato
     Ignore Unsupported Action Warnings: Ignora avvisi per azioni non supportate
     External Player: Lettore esterno
-    External Player Settings: Lettore esterno
+    External Player Settings: Impostazioni del lettore esterno
     Players:
       None:
         Name: Nessuno
     Ignore Default Arguments: Ignora argomenti predefiniti
   Download Settings:
-    Download Settings: Download
+    Download Settings: Impostazioni dei download
     Ask Download Path: Chiedi il percorso di download
     Choose Path: Scegli percorso
     Download Behavior: Comportamento download
@@ -646,12 +668,12 @@ Settings:
     Download in app: Download nell'app
   Parental Control Settings:
     Hide Unsubscribe Button: Nascondi il pulsante Annulla iscrizione
-    Parental Control Settings: Controllo genitori
+    Parental Control Settings: Impostazioni del controllo parentale
     Show Family Friendly Only: Mostra Solo per famiglie
     Hide Search Bar: Nascondi la barra di ricerca
   Experimental Settings:
     Replace HTTP Cache: Sostituisci la cache HTTP
-    Experimental Settings: Sperimentale
+    Experimental Settings: Impostazioni sperimentali
     Warning: Queste Impostazioni sono sperimentali, causano arresti anomali se abilitate.
       Si consiglia prima di fare un backup. Usare a proprio rischio!
   Password Dialog:
@@ -661,16 +683,43 @@ Settings:
     Unlock: Sblocca
   Password Settings:
     Set Password: Imposta password
-    Password Settings: Password
+    Password Settings: Impostazioni password
     Set Password To Prevent Access: Imposta una password per impedire l'accesso alle
       Impostazioni
     Remove Password: Rimuovi password
+  Expand All Settings Sections: Espandi tutte le sezioni delle Impostazioni
   Sort Settings Sections (A-Z): Ordina le sezioni delle Impostazioni (A-Z)
-  Return to Settings Menu: Torna al menu Impostazioni
 About:
   #On About page
   About: 'Informazioni'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Questo
+    software è rilasciato con licenza gratuita AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Hai trovato un problema? Vuoi suggerire nuove funzionalità? Vuoi dare una mano?
+    Controlla la nostra pagina GitHub. Accettiamo volentieri pull request.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Grazie
+    mille alle persone e ai progetti che rendono FreeTube possibile!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Vuoi
+    chattare? Entra nel nostro server Element / Matrix. Per favore, leggi il regolamento
+    prima di entrare.'
+
+  'Looking for help? Check out our Wiki page.': 'Cerchi aiuto? Dai un’occhiata alla
+    nostra pagina Wiki.'
+
+  Check out our Firefox extension!: 'Dai un’occhiata alla nostra estensione Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Se
+    ti piace FreeTube, prendi in considerazione di donare con Liberapay o al nostro
+    indirizzo Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Ultime Notizie di Freetube'
+
 #On Channel Page
   Donate: Dona
   Blog: Blog
@@ -693,6 +742,8 @@ About:
   Website: Sito web
   Please check for duplicates before posting: Controlla se ci sono duplicati prima
     di pubblicare
+  View License: Vedi licenza
+  Licensed under the AGPLv3: Distribuito sotto la licenza AGPLv3
   Source code: Codice sorgente
   Beta: Beta
   Discussions: Discussioni
@@ -701,7 +752,7 @@ About:
 Channel:
   Subscribe: 'Iscriviti'
   Unsubscribe: 'Disiscriviti'
-  Search Channel: 'Ricerca nel canale'
+  Search Channel: 'Cerca nel canale'
   Your search results have returned 0 results: 'La tua ricerca ha prodotto 0 risultati'
   Sort By: 'Ordina per'
   Videos:
@@ -725,7 +776,7 @@ Channel:
     Channel Description: 'Descrizione canale'
     Featured Channels: 'Canali in evidenza'
     Tags:
-      Search for: Ricerca "{tag}"
+      Search for: Cerca "{tag}"
       Tags: Etichette
     Details: Dettagli
     Joined: Iscrizione
@@ -767,9 +818,6 @@ Channel:
     Releases: Rilasci
     This channel does not currently have any releases: Questo canale non ha attualmente
       alcun rilascio
-  Home:
-    Home: Pagina iniziale
-    View Playlist: Visualizza la playlist
 Video:
   Mark As Watched: 'Contrassegna come guardato'
   Remove From History: 'Rimuovi dalla cronologia'
@@ -799,8 +847,38 @@ Video:
     chat dal vivo non è attualmente supportata con le API di Invidious. È necessaria
     una connessione diretta a YouTube.'
   Published:
+    Jan: 'Gen'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Mag'
+    Jun: 'Giu'
+    Jul: 'Lug'
+    Aug: 'Ago'
+    Sep: 'Set'
+    Oct: 'Ott'
+    Nov: 'Nov'
+    Dec: 'Dic'
+    Second: 'Secondo'
+    Seconds: 'Secondi'
+    Hour: 'Ora'
+    Hours: 'Ore'
+    Day: 'Giorno'
+    Days: 'Giorni'
+    Week: 'Settimana'
+    Weeks: 'Settimane'
+    Month: 'Mese'
+    Months: 'Mesi'
+    Year: 'Anno'
+    Years: 'Anni'
+    Ago: 'Fa'
+    Upcoming: 'Première il'
+    Minutes: Minuti
+    Minute: Minuto
+    Less than a minute: Meno di un minuto
     In less than a minute: In meno di un minuto
   Published on: 'Pubblicato il'
+  Publicationtemplate: '{number} {unit} fa'
 #& Videos
   Play Previous Video: Riproduci il video precedente
   Play Next Video: Riproduci il prossimo video
@@ -889,18 +967,6 @@ Video:
     Playback will resume automatically when your connection comes back: La riproduzione
       riprenderà automaticamente quando verrà ripristinata la connessione.
     Skipped segment: Segmento {segmentCategory} saltato
-  IP block: YouTube ha bloccato il tuo indirizzo IP impedendogli di guardare i video.
-    Prova a passare a una VPN o a un proxy diverso.
-  Unlisted: Non elencato
-  MembersOnly: I video riservati agli abbonati non possono essere guardati con FreeTube,
-    poiché richiedono l'accesso a Google e l'iscrizione a pagamento al canale dell'utente
-    che li ha caricati.
-  AgeRestricted: I video con limiti di età non possono essere guardati con FreeTube
-    poiché richiedono l'accesso a Google e l'utilizzo di un account YouTube con età
-    verificata.
-  DeArrow:
-    Show Original Details: Mostra dettagli originali
-    Show Modified Details: Mostra dettagli modificati
 Videos:
   #& Sort By
   Sort By:
@@ -911,6 +977,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Guarda playlist completa'
+  Videos: 'Video'
+  View: 'Visualizzazione'
+  Views: 'Visualizzazioni'
   Last Updated On: 'Ultimo aggiornamento il'
 
 # On Video Watch Page
@@ -926,8 +995,7 @@ Playlist:
     DateAddedNewest: Prima gli aggiunti più nuovi
     DateAddedOldest: Prima gli aggiunti più vecchi
     VideoTitleAscending: Titolo (A-Z)
-    VideoDurationAscending: Durata (prima la più breve)
-    VideoDurationDescending: Durata (prima la più lunga)
+Toggle Theatre Mode: 'Attiva/disattiva la modalità teatro'
 Change Format:
   Change Media Formats: 'Cambia formato video'
   Use Dash Formats: 'Usa i formati DASH'
@@ -961,7 +1029,7 @@ Share:
 Mini Player: 'Mini visualizzatore'
 Comments:
   Comments: 'Commenti'
-  Click to View Comments: 'Fai clic per vedere i commenti'
+  Click to View Comments: 'Clicca per vedere i commenti'
   Getting comment replies, please wait: 'Sto scaricando le risposte ai commenti, per
     favore attendi'
   Show Comments: 'Mostra i commenti'
@@ -992,10 +1060,12 @@ Comments:
 Up Next: 'Prossimi video'
 
 # Toast Messages
-Local API Error (Click to copy): 'Errore API locale (fai clic per copiare)'
-Invidious API Error (Click to copy): 'Errore API Invidious (fai clic per copiare)'
+Local API Error (Click to copy): 'Errore API Locale (Clicca per copiare)'
+Invidious API Error (Click to copy): 'Errore API Invidious (Clicca per copiare)'
 Falling back to Invidious API: 'Torno alle API Invidious'
 Falling back to Local API: 'Torno alle API locali'
+Subscriptions have not yet been implemented: 'Le Iscrizioni non sono ancora state
+  implementate'
 Loop is now disabled: 'Il loop è ora disabilitato'
 Loop is now enabled: 'Il loop è ora abilitato'
 Shuffle is now disabled: 'La riproduzione casuale è disabilitata'
@@ -1009,9 +1079,9 @@ Canceled next video autoplay: 'Riproduzione automatica del prossimo video annull
 Yes: 'Sì'
 No: 'No'
 A new blog is now available, {blogTitle}. Click to view more: 'Un nuovo blog è ora
-  disponibile, {blogTitle}. Fai clic per saperne di più'
+  disponibile, {blogTitle}. Clicca per saperne di più'
 Version {versionNumber} is now available!  Click for more details: La versione {versionNumber}
-  è ora disponibile! Fai clic per maggiori dettagli
+  è ora disponibile! Clicca per maggiori dettagli
 Download From Site: Scarica dal sito
 The playlist has been reversed: La playlist è stata invertita
 Profile:
@@ -1056,7 +1126,7 @@ Profile:
   All Channels: Tutti i canali
   Profile Select: Seleziona il profilo
   Profile Filter: Filtro del profilo
-  Profile Settings: Profilo
+  Profile Settings: Impostazioni dei profili
   Toggle Profile List: Attiva/disattiva elenco profili
   Open Profile Dropdown: Apri il menu a discesa del profilo
   Close Profile Dropdown: Chiudi il menu a discesa del profilo
@@ -1077,9 +1147,9 @@ Tooltips:
     Scroll Playback Rate Over Video Player: Mentre il cursore è sopra il video, tieni
       premuto il tasto CTRL (Command su Mac) e scorri la rotella del mouse in avanti
       o indietro per controllare la velocità di riproduzione. Tieni premuto il tasto
-      CTRL (Command su Mac) e fai clic con il tasto sinistro del mouse per tornare
-      rapidamente alla velocità di riproduzione predefinita (1x a meno che non sia
-      stata cambiata nelle Impostazioni).
+      CTRL (Command su Mac) e clicca con il tasto sinistro del mouse per tornare rapidamente
+      alla velocità di riproduzione predefinita (1x a meno che non sia stata cambiata
+      nelle Impostazioni).
     Skip by Scrolling Over Video Player: Usa la rotella di scorrimento per saltare
       il video, in stile MPV.
   Subscription Settings:
@@ -1104,14 +1174,11 @@ Tooltips:
     External Link Handling: "Scegli il comportamento predefinito quando si fa clic
       su un link che non può essere aperto in FreeTube.\nPer impostazione predefinita,
       FreeTube aprirà il link cliccato nel browser predefinito.\n"
-    Open Deep Links In New Window: Gli URL passati a FreeTube, ad esempio tramite
-      estensioni del browser di reindirizzamento o argomenti della riga di comando,
-      vengono aperti in una nuova finestra.
   External Player Settings:
     Ignore Warnings: Non notifica gli avvisi quando il lettore esterno selezionato
       non supporta l'azione richiesta (ad esempio invertire la playlist, etc.).
     Custom External Player Arguments: Invia al lettore esterno qualsiasi argomento
-      personalizzato dalla linea di comando.
+      personalizzato dalla linea di comando, separato da punto e virgola (';').
     Custom External Player Executable: Per impostazione predefinita, FreeTube imposta
       il lettore esterno scelto tramite la variabile d'ambiente PATH. Se necessario,
       un percorso personalizzato può essere impostato qui.
@@ -1141,16 +1208,18 @@ Tooltips:
     UseDeArrowTitles: Sostituisci i titoli dei video coi titoli inviati dagli utenti
       di DeArrow.
     UseDeArrowThumbnails: Sostituisci le miniature dei video con le miniature di DeArrow.
-Playing Next Video Interval: Riproduzione del video successivo tra un attimo. Fai
-  clic per annullare. | Riproduzione del video successivo tra {nextVideoInterval}
-  secondi. Fai clic per annullare. | Riproduzione del video successivo tra {nextVideoInterval}
-  secondi. Fai clic per annullare.
+Playing Next Video Interval: Riproduzione del video successivo tra un attimo. Clicca
+  per annullare. | Riproduzione del video successivo tra {nextVideoInterval} secondi.
+  Clicca per annullare. | Riproduzione del video successivo tra {nextVideoInterval}
+  secondi. Clicca per annullare.
 More: Altro
 Open New Window: Apri una nuova finestra
 Default Invidious instance has been cleared: L'istanza predefinita di Invidious è
   stata cancellata
 Default Invidious instance has been set to {instance}: L'istanza predefinita di Invidious
   è stata impostata a {instance}
+Hashtags have not yet been implemented, try again later: Gli hashtag non sono ancora
+  stati implementati, riprova più tardi
 Unknown YouTube url type, cannot be opened in app: Tipo di URL di YouTube sconosciuto,
   non può essere aperto nell'app
 Search Bar:
@@ -1165,12 +1234,14 @@ Screenshot Success: Screenshot salvato come "{filePath}"
 Screenshot Error: Screenshot non riuscito. {error}
 New Window: Nuova finestra
 Channels:
+  Unsubscribed: '{channelName} è stato rimosso dalle tue iscrizioni'
   Title: Elenco canali
   Channels: Canali
-  Search bar placeholder: Ricerca canali
+  Search bar placeholder: Cerca canali
   Count: '{number} canale/i trovato/i.'
   Empty: L'elenco dei tuoi canali è attualmente vuoto.
   Unsubscribe Prompt: Sei sicuro di voler annullare l'iscrizione a "{channelName}"?
+  Unsubscribe: Annulla l'iscrizione
 Clipboard:
   Cannot access clipboard without a secure connection: Impossibile accedere agli appunti
     senza una connessione sicura
@@ -1181,7 +1252,6 @@ Chapters:
     capitolo corrente: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Elenco capitoli nascosto,
     capitolo corrente: {chapterName}'
-  Key Moments: Momenti chiave
 Preferences: Preferenze
 Ok: OK
 Hashtag:
@@ -1218,26 +1288,5 @@ Search Listing:
     4K: 4K
     Closed Captions: Sottotitoli per non udenti
     Subtitles: Sottotitoli
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Nuovo
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Apertura di URL potenzialmente non sicura
   bloccata: "{url}".'
-shortcutJoinOperator: +
-Keys:
-  ctrl: Ctrl
-  arrowdown: Freccia giù
-  arrowleft: Freccia sinistra
-  arrowright: Freccia destra
-  arrowup: Freccia su
-  alt: Alt
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Right-click or hold to see history: Fai clic con il tasto destro o tieni premuto per
-  visualizzare la cronologia
-Autoplay Interruption Timer: Riproduzione automatica annullata a causa di {autoplayInterruptionIntervalHours}
-  ore di inattività
-Description:
-  Expand Description: '...di più'
-  Collapse Description: Mostra meno
diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml
index 9bb728a19eab0..0fc9fe86a799a 100644
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@@ -98,7 +98,7 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: '登録チャンネル'
   Latest Subscriptions: '最新の登録'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '登録チャンネルリストは現在空です。登録チャンネルをインポートするには、設定からデータの設定に移動して登録チャンネルをインポートするか、チャンネルを検索して登録することができます。'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '登録チャンネルリストは空です。チャンネル登録をするとこちらに表示されます。'
   'Getting Subscriptions.  Please wait.': '登録を取得中。お待ちください...'
   Refresh Subscriptions: 登録チャンネルの更新
   Getting Subscriptions. Please wait.: 登録チャンネルの内容を取得中。しばらくお待ちください。
@@ -119,11 +119,14 @@ Trending:
   Movies: 映画
   Gaming: ゲーム
   Music: 音楽
-  Default: デフォルト
+  Default: 既定
 Most Popular: '人気'
 Playlists: '再生リスト'
 User Playlists:
   Your Playlists: 'あなたの再生リスト'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 保存した動画はありません。一覧に表示させるには、ビデオの角にある保存ボタンをクリックします
+  Playlist Message: 
+    このページは完全に機能する再生リストを反映していません。保存した動画やお気に入りの動画のみが表示されます。作業が完了すると、現在ここにあるすべての動画は「Favorites」の再生リストに移行されます。
   Search bar placeholder: 再生リストの検索
   Empty Search Message: この再生リストに、検索に一致する動画はありません
   This playlist currently has no videos.: 現在、この再生リストには動画がありません。
@@ -154,6 +157,7 @@ User Playlists:
       This video cannot be moved up.: この動画は上に移動できません.
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: 再生リスト内のすべての動画が読み込まれていません。とにかくコピーするにはここをクリック。
       There was an issue with updating this playlist.: この再生リストの更新に問題が発生しました。
+      Quick bookmark disabled: クイックブックマークは無効です
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: この再生リストは、{oldPlaylistName}
         の代わりにクイックブックマークとして使用されるようになりました。元に戻すにはここをクリック
       Video has been removed: 動画は削除されました
@@ -170,8 +174,6 @@ User Playlists:
       This playlist is already being used for quick bookmark.: この再生リストはすでにクイックブックマークとして使用されています。
       Playlist {playlistName} is the new quick bookmark playlist.: 再生リスト {playlistName}
         が新しいクイックブックマーク再生リストです。
-      This playlist has a video with a duration error: このプレイリストには、再生時間のない動画が少なくとも
-        1 つ含まれています。これらの動画は、再生時間が 0 であるかのように並べられます。
     Search for Videos: 動画検索
   Save Changes: 変更の保存
   Move Video Up: 動画を上へ移動
@@ -180,7 +182,9 @@ User Playlists:
   Add to Playlist: 再生リストに追加
   Delete Playlist: 再生リストの削除
   Cancel: キャンセル
+  Disable Quick Bookmark: クイック ブックマークを無効にする
   Are you sure you want to delete this playlist? This cannot be undone: この再生リストを削除してもいいですか？復元は不可能です。
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: 再生リストから再生済みの動画を削除してもいいですか？復元は不可能です。
   You have no playlists. Click on the create new playlist button to create a new one.: 再生リストがありません。新しい再生リストを作成するには、「新しい再生リストの作成」ボタンをクリックしてください。
   AddVideoPrompt:
     "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
@@ -215,8 +219,6 @@ User Playlists:
   Remove Duplicate Videos: 重複した動画を削除
   Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: この再生リストから視聴済みの動画を1本削除してもよろしいですか？この操作は元に戻せません。
     | この再生リストから視聴済みの {playlistItemCount} 本の動画を削除してもよろしいですか？この操作は元に戻せません。
-  The playlist has been successfully exported: 再生リストのエクスポートに成功しました
-  Export Playlist: この再生リストをエクスポート
 History:
   # On History Page
   History: '履歴'
@@ -229,7 +231,7 @@ Settings:
   # On Settings Page
   Settings: '設定'
   General Settings:
-    General Settings: '一般'
+    General Settings: '一般設定'
     Fallback to Non-Preferred Backend on Failure: 'データ取得の問題発生時には取得方法を自動変更'
     Enable Search Suggestions: '検索候補の有効化'
     Default Landing Page: '起動時の表示'
@@ -250,6 +252,8 @@ Settings:
       End: '最後'
       Hidden: 非表示
       Blur: ぼかし
+    'Invidious Instance (Default is https://invidious.snopyta.org)': '接続先の Invidious
+      サーバー（初期値は https://invidious.snopyta.org）'
     Region for Trending: '急上昇の地域設定'
         #! List countries
     Check for Latest Blog Posts: 新着ブログの確認
@@ -271,9 +275,8 @@ Settings:
     Auto Load Next Page:
       Label: 次のページを自動で読み込む
       Tooltip: 追加のページやコメント欄の続きを自動的に読み込みます。
-    Open Deep Links In New Window: FreeTube に渡された URL を新しいウィンドウで開く
   Theme Settings:
-    Theme Settings: 'テーマ'
+    Theme Settings: 'テーマの設定'
     Match Top Bar with Main Color: '上部のバーをメインカラーに合わせる'
     Base Theme:
       Base Theme: 'テーマの選択'
@@ -288,8 +291,6 @@ Settings:
       Nordic: ノルディック
       Solarized Dark: ソラライズド・ダーク
       Solarized Light: ソラライズド・ライト
-      Gruvbox Dark: Gruvbox ダーク
-      Gruvbox Light: Gruvbox ライト
     Main Color Theme:
       Main Color Theme: 'テーマのメイン カラー'
       Red: '赤'
@@ -337,16 +338,6 @@ Settings:
       Solarized Cyan: ソラライズド・シアン
       Solarized Green: ソラライズド・グリーン
       Solarized Blue: ソラライズド・ブルー
-      Gruvbox Dark Green: Gruvbox ダークグリーン
-      Gruvbox Dark Blue: Gruvbox ダークブルー
-      Gruvbox Dark Aqua: Gruvbox ダークアクア
-      Gruvbox Light Red: Gruvbox ライトレッド
-      Gruvbox Light Blue: Gruvbox ライトブルー
-      Gruvbox Light Purple: Gruvbox ライトパープル
-      Gruvbox Dark Orange: Gruvbox ダークオレンジ
-      Gruvbox Dark Yellow: Gruvbox ダークイエロー
-      Gruvbox Dark Purple: Gruvbox ダークパープル
-      Gruvbox Light Orange: Gruvbox ライトオレンジ
     Secondary Color Theme: 'テーマのアクセント カラー'
         #* Main Color Theme
     UI Scale: UIの拡大率
@@ -355,7 +346,8 @@ Settings:
     Hide Side Bar Labels: サイドバー ラベルの非表示
     Hide FreeTube Header Logo: FreeTube ヘッダー ロゴの非表示
   Player Settings:
-    Player Settings: 'プレーヤー'
+    Player Settings: 'プレーヤーの設定'
+    Remember History: '履歴を記憶'
     Play Next Video: '次の動画の自動再生'
     Turn on Subtitles by Default: 'デフォルトで字幕を有効にする'
     Autoplay Videos: '動画の自動再生'
@@ -404,15 +396,45 @@ Settings:
       Folder Button: フォルダの選択
     Enter Fullscreen on Display Rotate: 画面の回転時に全画面表示にする
     Skip by Scrolling Over Video Player: 動画プレーヤーをスクロールして動画をスキップ
-    Autoplay Interruption Timer: 自動再生の停止タイマー
   Subscription Settings:
-    Subscription Settings: '登録チャンネル'
+    Subscription Settings: '登録チャンネルの設定'
     Hide Videos on Watch: '視聴済みの動画を非表示にする'
+    Subscriptions Export Format:
+      Subscriptions Export Format: '登録のエクスポート形式'
+      #& Freetube
+      Newpipe: 'NewPipe'
+      OPML: 'OPML'
+    Manage Subscriptions: '登録の管理'
+    Import Subscriptions: '登録のインポート'
+    Export Subscriptions: '登録のエクスポート'
+    How do I import my subscriptions?: 'どうやってインポートするのですか？'
     Fetch Feeds from RSS: RSS から情報取得
     Fetch Automatically: フィードの自動取得
     Confirm Before Unsubscribing: 登録解除する前に確認画面を表示する
-    'Limit the number of videos displayed for each channel': 各チャンネルに表示する動画の数を制限する
-    To: 上限
+    Only Show Latest Video for Each Channel: 各チャンネルの最新動画のみを表示する
+  Advanced Settings:
+    Advanced Settings: '詳細設定'
+    Enable Debug Mode (Prints data to the console): 'デバッグ モードの有効化（コンソールにデータ出力）'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'プロキシーのアドレス（例：SOCKS5://127.0.0.1:9050）'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '「プロキシーのテスト」ボタンをクリックすると、https://ipinfo.io/json
+      へリクエストを送信します'
+    Use Tor / Proxy for API calls: 'API 呼び出しに Tor/Proxy を使用'
+    TEST PROXY: 'プロキシーのテスト'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: '公開インスタンスを参照'
+    Clear History:
+      Clear History: '履歴の削除'
+      # On Click
+      Are you sure you want to delete your history?: '履歴を削除しますか？'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: '登録の削除'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'すべての登録チャンネルを削除しますか？'
+      #& Yes
+      #& No
+
   Privacy Settings:
     Save Watched Progress: 再生位置の保存
     Remember History: 履歴の保存
@@ -422,7 +444,7 @@ Settings:
     Search cache has been cleared: 検索キャッシュを削除しました
     Are you sure you want to clear out your search cache?: 検索キャッシュを削除しますか？
     Clear Search Cache: 検索キャッシュの削除
-    Privacy Settings: プライバシー
+    Privacy Settings: プライバシーの設定
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: すべての登録チャンネルとプロファイルを削除しますか？元に戻せません。
     Remove All Subscriptions / Profiles: 登録とプロファイルをすべて削除
     Save Watched Videos With Last Viewed Playlist: 視聴済み動画を最後に見た再生リストと共に保存する
@@ -449,11 +471,15 @@ Settings:
     Export NewPipe: NewPipe エクスポート
     Export YouTube: YouTube エクスポート
     Export FreeTube: FreeTube エクスポート
+    Import YouTube: YouTube インポート
+    Import NewPipe: NewPipe インポート
+    Import FreeTube: FreeTube インポート
     Export Subscriptions: 登録チャンネルのエクスポート
     Import Subscriptions: 登録チャンネルのインポート
     Select Export Type: エクスポート形式の選択
     Select Import Type: インポート形式の選択
-    Data Settings: データ
+    Data Settings: データの設定
+    Check for Legacy Subscriptions: 旧型式の登録チャンネルの確認
     Manage Subscriptions: 登録チャンネルの管理
     Playlist insufficient data: 再生リスト「{playlist}」のデータが不十分なため、項目をスキップします
     All playlists has been successfully imported: すべての再生リストが正常にインポートされました
@@ -477,7 +503,7 @@ Settings:
     Hide Channel Subscribers: チャンネル登録者数の非表示
     Hide Video Views: 再生数の非表示
     Hide Video Likes And Dislikes: 評価の非表示
-    Distraction Free Settings: 集中モード
+    Distraction Free Settings: 集中モードの設定
     Hide Active Subscriptions: 登録チャンネルの非表示
     Hide Playlists: 再生リストの非表示
     Hide Video Description: 動画概要欄の非表示
@@ -489,8 +515,8 @@ Settings:
     Hide Channels: チャンネルから動画を非表示にする
     Hide Channels Placeholder: チャンネル ID
     Display Titles Without Excessive Capitalisation: 過剰な大文字や句読点のないタイトルの表示
-    Hide Channel Playlists: チャンネルの「再生リスト」タブを隠す
-    Hide Channel Community: チャンネルの「コミュニティ」タブを隠す
+    Hide Channel Playlists: チャンネル再生リストの非表示
+    Hide Channel Community: チャンネルコミュニティの非表示
     Sections:
       Side Bar: サイドバー
       Channel Page: チャンネル ページ
@@ -498,13 +524,14 @@ Settings:
       General: 一般
       Subscriptions Page: 登録チャンネル ページ
     Hide Featured Channels: おすすめチャンネルの非表示
-    Hide Channel Shorts: チャンネルの「ショート動画」タブを隠す
-    Hide Channel Podcasts: チャンネルの「ポッドキャスト」タブを隠す
+    Hide Channel Shorts: ショート動画チャンネルの非表示
+    Hide Channel Podcasts: ポッドキャスト チャンネルの非表示
     Hide Subscriptions Shorts: 登録チャンネルのショート動画の非表示
     Hide Subscriptions Live: 登録チャンネルのライブ配信の非表示
     Hide Subscriptions Videos: 登録チャンネルの動画の非表示
-    Hide Channel Releases: チャンネルの「新着情報」タブを隠す
+    Hide Channel Releases: チャンネルの新着情報の非表示
     Hide Profile Pictures in Comments: コメント欄のプロフィール写真を隠す
+    Blur Thumbnails: サムネイルをぼかす
     Hide Subscriptions Community: 登録チャンネルのコミュニティの非表示
     Hide Channels Invalid: 提供されたチャンネル ID が無効です
     Hide Channels Disabled Message: 一部のチャンネルが ID を使用してブロックされ、処理されませんでした。これらの ID が更新されている間、機能はブロックされます
@@ -512,7 +539,6 @@ Settings:
     Hide Channels API Error: 指定されたIDのユーザーを検索する際にエラーが発生しました。IDが正しいかもう一度確認してください。
     Hide Videos and Playlists Containing Text Placeholder: 単語、単語の一部、またはフレーズ
     Hide Videos and Playlists Containing Text: 特定のテキストを含む動画と再生リストを非表示にする
-    Hide Channel Home: チャンネルの「ホーム」タブを隠す
   The app needs to restart for changes to take effect. Restart and apply change?: 変更の反映には、アプリの再起動が必要です。再起動して変更を適用しますか？
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: ネットワーク情報の取得中にエラーが発生しました。プロキシーを正しく設定してますか?
@@ -527,16 +553,13 @@ Settings:
     Proxy Host: プロキシのホスト
     Proxy Protocol: プロキシのプロトコル
     Enable Tor / Proxy: Tor / プロキシの有効化
-    Proxy Settings: プロキシ
-    Proxy Warning: FreeTube にはプロキシは内蔵されていませんが、Tor のようなご使用のマシン上で動作するものや、一部の VPN が提供する
-      SOCKS5 プロキシのような外部プロキシに接続することができます。有効にした場合は、プロキシ/Tor が適切に設定されていることを確認してください。そうでないと、FreeTube
-      はデータを取得できなくなります。
+    Proxy Settings: プロキシの設定
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: スポンサーセグメントがスキップされたときに通知する
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': スポンサーブロック APIのURL（デフォルト
       https://sponsor.ajay.app）
     Enable SponsorBlock: スポンサーブロックの有効化
-    SponsorBlock Settings: スポンサーブロック
+    SponsorBlock Settings: スポンサーブロックの設定
     Skip Options:
       Skip Option: スキップの設定
       Auto Skip: 自動スキップ
@@ -553,13 +576,13 @@ Settings:
     Custom External Player Executable: カスタム外部プレーヤーの実行可能ファイル
     Ignore Unsupported Action Warnings: 未対応のアクションの警告を無視
     External Player: 外部プレーヤー
-    External Player Settings: 外部プレーヤー
+    External Player Settings: 外部プレーヤーの設定
     Players:
       None:
         Name: なし
     Ignore Default Arguments: デフォルト引数を無視する
   Download Settings:
-    Download Settings: ダウンロード
+    Download Settings: ダウンロードの設定
     Ask Download Path: ダウンロードパスを尋ねる
     Choose Path: パスの選択
     Download Behavior: ダウンロードの処理方法
@@ -567,16 +590,16 @@ Settings:
     Download in app: アプリでダウンロード
   Parental Control Settings:
     Hide Search Bar: 検索バーの非表示
-    Parental Control Settings: 制限付きモード
+    Parental Control Settings: 制限付きモードの設定
     Show Family Friendly Only: ファミリー向けのみ表示
     Hide Unsubscribe Button: 登録解除ボタンの非表示
   Experimental Settings:
     Replace HTTP Cache: HTTP キャッシュの置換
-    Experimental Settings: 試験的
+    Experimental Settings: 実験中の設定
     Warning: 
       これらの設定は実験的なものであり、有効にするとアプリのクラッシュを引き起こす恐れがあります。バックアップをとっておくことを強くお勧めします。自己責任で使用してください！
   Password Settings:
-    Password Settings: パスワード
+    Password Settings: パスワードの設定
     Set Password To Prevent Access: 設定にアクセスするためのパスワードの設定
     Set Password: パスワードの設定
     Remove Password: パスワードの削除
@@ -586,11 +609,34 @@ Settings:
     Password: パスワード
     Unlock: ロック解除
   Sort Settings Sections (A-Z): 設定項目の並べ替え（A-Z）
-  Return to Settings Menu: 設定に戻る
+  Expand All Settings Sections: 全ての設定項目を展開する
 About:
   #On About page
   About: '概要'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'このコピーレフトのソフトウェアは、AGPL-3.0
+    の自由なライセンスです。'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    バグの報告や機能要望、サポートが必要であれば、私たちの GitHub をご覧ください。プルリクエストも歓迎します。
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'FreeTube
+    の実現のために努力している人々とプロジェクトに感謝します！'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'チャットが必要であれば私たちの
+    Element / Matrix に参加してください。参加前にルールの確認をお願いします。'
+
+  'Looking for help? Check out our Wiki page.': 'ヘルプが必要なら私たちの Wiki をご覧ください。'
+
+  Check out our Firefox extension!: 'Firefox 拡張機能をご覧ください！'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'FreeTube
+    をお楽しみの方は、Liberapay か Bitcoin アドレスを通じて寄付をお願いします。'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'FreeTube 新着情報'
+
 #On Channel Page
   Donate: 寄付
   FreeTube is made possible by: FreeTube が実現できているのは
@@ -612,6 +658,8 @@ About:
   Help: ヘルプ
   GitHub releases: GitHub リリース
   Downloads / Changelog: ダウンロード / 変更ログ
+  View License: ライセンスの表示
+  Licensed under the AGPLv3: AGPLv3 の下でライセンス供与
   Source code: ソースコード
   Beta: ベータ
   Discussions: 議論
@@ -675,9 +723,6 @@ Channel:
   Podcasts:
     This channel does not currently have any podcasts: このチャンネルにはポッドキャストがありません
     Podcasts: ポッドキャスト
-  Home:
-    View Playlist: 再生リストを表示
-    Home: ホーム
 Video:
   Open in YouTube: 'YouTube で表示'
   Copy YouTube Link: 'YouTube リンクのコピー'
@@ -698,8 +743,38 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': '現在、ライブチャットは
     Invidious API では未対応です。直接 YouTube への接続が必要です。'
   Published:
-    In less than a minute: 1 分以内
+    Jan: '1 月'
+    Feb: '2 月'
+    Mar: '3 月'
+    Apr: '4 月'
+    May: '5 月'
+    Jun: '6 月'
+    Jul: '7 月'
+    Aug: '8 月'
+    Sep: '9 月'
+    Oct: '10 月'
+    Nov: '11 月'
+    Dec: '12 月'
+    Second: '秒'
+    Seconds: '秒'
+    Hour: '時間'
+    Hours: '時間'
+    Day: '日'
+    Days: '日'
+    Week: '週間'
+    Weeks: '週間'
+    Month: 'ヶ月'
+    Months: 'ヶ月'
+    Year: '年'
+    Years: '年'
+    Ago: '前'
+    Upcoming: 'プレミア公開'
+    Minutes: 分
+    Minute: 分
+    Less than a minute: 1分以内
+    In less than a minute: 1 分以内に
   Published on: '公開日'
+  Publicationtemplate: '{number} {unit} 前'
 #& Videos
   Video has been removed from your history: 動画を履歴から削除しました
   Remove From History: 履歴から削除
@@ -739,7 +814,7 @@ Video:
       looping playlists: 再生リストのループ
       shuffling playlists: シャッフル再生リスト
       reversing playlists: 再生リストを反転させる
-      opening specific video in a playlist (falling back to opening the video): 再生リストで特定の動画を開く
+      opening specific video in a playlist (falling back to opening the video): 再生リストで特定のビデオを開く
         (ビデオを開く前にフォールバック)
       opening playlists: 再生リストを開く
       setting a playback rate: 再生レートの設定
@@ -786,14 +861,6 @@ Video:
     Hide Stats: 統計を隠す
     Take Screenshot: スクリーンショットを撮る
     Show Stats: 統計を表示
-  IP block: YouTube はあなたのIPアドレスからの動画視聴をブロックしました。別の VPN またはプロキシに切り替えてみてください。
-  Unlisted: 限定公開
-  MembersOnly: メンバー限定動画は Google にログインし、投稿チャンネルに課金する必要があるので FreeTube から直接見ることはできません。
-  AgeRestricted: 年齢制限がかかっている 動画 は Google にログインしておりかつ年齢確認を済ましている YouTube アカウントが必要なため、FreeTube
-    から直接見ることはできません。
-  DeArrow:
-    Show Original Details: 元の情報を表示
-    Show Modified Details: 変更された詳細を表示
 Videos:
   #& Sort By
   Sort By:
@@ -804,6 +871,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '完全な再生リストの表示'
+  Videos: '本の動画'
+  View: '回視聴'
+  Views: '回視聴'
   Last Updated On: '最終更新日'
 
 # On Video Watch Page
@@ -819,8 +889,7 @@ Playlist:
     AuthorDescending: 著者名（Z-A）
     VideoTitleAscending: タイトル（A-Z）
     Sort By: 並び替え
-    VideoDurationAscending: 再生時間（短い順）
-    VideoDurationDescending: 再生時間（長い順）
+Toggle Theatre Mode: 'シアターモードの切替'
 Change Format:
   Change Media Formats: '動画形式の変更'
   Use Dash Formats: 'DASH 形式の使用'
@@ -880,6 +949,7 @@ Local API Error (Click to copy): '内部 API エラー（クリックしてコ
 Invidious API Error (Click to copy): 'Invidious API エラー（クリックしてコピー）'
 Falling back to Invidious API: '代替の Invidious API に切替'
 Falling back to Local API: '代替の内部 API に切替'
+Subscriptions have not yet been implemented: '登録チャンネルは未実装です'
 Loop is now disabled: 'ループ再生を無効にしました'
 Loop is now enabled: 'ループ再生を有効にしました'
 Shuffle is now disabled: 'シャッフル再生を無効にしました'
@@ -928,7 +998,7 @@ Profile:
     same channels will be deleted in any profile they are found in.
   : これはあなたのメインのプロファイルです。選択したチャンネルを本当に削除しますか？同じチャンネルがほかのプロファイルにも登録されていれば削除されます。
   Profile Filter: プロファイルのフィルター
-  Profile Settings: プロファイル
+  Profile Settings: プロファイルの設定
   Toggle Profile List: プロファイル一覧の切替
   Create Profile Name: プロファイル名を作成
   Profile Name: プロファイル名
@@ -963,9 +1033,8 @@ Tooltips:
     Region for Trending: 急上昇の地域設定では、急上昇動画を表示する国を選択できます。
     External Link Handling: "FreeTube で開けないリンクをクリックしたときのデフォルトの動作を選択します。\nデフォルトでは、FreeTube
       はクリックしたリンクをデフォルトのブラウザで開きます。\n"
-    Open Deep Links In New Window: FreeTube に渡された URL は、ブラウザの拡張機能やコマンドライン引数などによって、新しいウィンドウで開かれます。
   External Player Settings:
-    Custom External Player Arguments: '外部プレイヤーに渡したいカスタムコマンドライン引数。'
+    Custom External Player Arguments: '";"、セミコロンで区切られたカスタム コマンド ライン引数を外部プレーヤーに渡します。'
     Ignore Warnings: 現在の外部プレーヤーが、現在のアクションに未対応の場合（再生リストを逆順にするなど）に警告を抑制します。
     Custom External Player Executable: デフォルトでは、FreeTube は選択した外部プレーヤーが PATH 環境変数を介して見つかると想定します。必要に応じて、カスタム
       パスをここで設定できます。
@@ -989,6 +1058,7 @@ Tooltips:
 Playing Next Video Interval: すぐに次の動画を再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval}
   秒で再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval} 秒で再生します。クリックするとキャンセル。
 More: もっと見る
+Hashtags have not yet been implemented, try again later: ハッシュタグは未実装です。実装後に実行してください
 Unknown YouTube url type, cannot be opened in app: 不明な YouTube URL タイプのため、アプリで開くことができません
 Open New Window: 新しいウィンドウを開く
 Default Invidious instance has been cleared: デフォルトの Invidious インスタンスがクリアされました
@@ -1002,6 +1072,8 @@ Downloading has completed: '"{videoTitle}" のダウンロードが完了しま
 Downloading failed: '"{videoTitle}" のダウンロード中に問題が発生しました'
 Channels:
   Channels: チャンネル
+  Unsubscribe: 登録解除
+  Unsubscribed: '「{channelName} 」のチャンネル登録を解除しました'
   Title: チャンネル一覧
   Search bar placeholder: チャンネル検索
   Unsubscribe Prompt: 「{channelName}」のチャンネル登録を解除しますか？
@@ -1019,7 +1091,6 @@ Chapters:
     {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'チャプター リストを非表示、現在のチャプター：
     {chapterName}'
-  Key Moments: ハイライト
 Preferences: 環境設定
 Ok: オーケー
 Hashtag:
@@ -1041,11 +1112,6 @@ Search Listing:
     4K: 4K
     Subtitles: 字幕
     Closed Captions: クローズドキャプション
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: 最新
-    3D: 3D
 Yes, Delete: はい、削除します
 Yes, Restart: はい、再起動します
 Yes, Open Link: はい、リンクを開きます
@@ -1059,17 +1125,3 @@ Trimmed input must be at least N characters long: トリミングされた入力
   | トリミングされた入力は少なくとも {length} 文字以上でなければなりません
 'Blocked opening potentially unsafe URL': '安全でない可能性のあるURLをブロックしました： "{url}"。'
 Display Label: '{label}：{value}'
-KeyboardShortcutTemplate: '{label} （{shortcut}）'
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: 下矢印
-  arrowleft: 左矢印
-  arrowright: 右矢印
-  arrowup: 上矢印
-Right-click or hold to see history: 右クリックまたは長押しで 履歴 を表示
-Autoplay Interruption Timer: '{autoplayInterruptionIntervalHours} 時間の無操作状態が続いたため、自動再生をキャンセルしました'
-Description:
-  Expand Description: '...もっと見る'
-  Collapse Description: 表示を減らす
diff --git a/static/locales/ka.yaml b/static/locales/ka.yaml
index 9f030969a3569..3cee0eeade543 100644
--- a/static/locales/ka.yaml
+++ b/static/locales/ka.yaml
@@ -99,6 +99,8 @@ Channels:
   Search bar placeholder: 'არხების ძიება'
   Count: 'ნაპოვნია {number} არხი.'
   Empty: 'თქვენი არხების სია ამჟამად ცარიელია.'
+  Unsubscribe: 'გამოწერის გაუქმება'
+  Unsubscribed: '{channelName} წაიშალა თქვენი გამოწერებიდან'
   Unsubscribe Prompt: 'დარწმუნებული ხართ, რომ გსურთ "{channelName}"ის გამოწერის გაუქმება?'
 Trending:
   Trending: 'პოპულარული'
@@ -111,6 +113,13 @@ Most Popular: 'ყველაზე პოპულარული'
 Playlists: 'დასაკრავი სიები'
 User Playlists:
   Your Playlists: 'თქვენი დასაკრავი სიები'
+  Playlist Message: 'ეს გვერდი არ ასახავს სრულად მოქმედ დასაკრავ სიებს. აქ მხოლოდ
+    ჩამოთვლილი იქნება ვიდეოები, რომლებიც თქვენ გაქვთ შენახული ან დამატებული გაქვთ
+    რჩეულებში. როდესაც მუშაობა დასრულდება, ყველა აქ ჩამოთვლილი ვიდეო გადაინაცვლებს
+    „რჩეულების“ დასაკრავ სიაში.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'თქვენი
+    შენახული ვიდეოები ცარიელია. დააჭირეთ ღილაკს შენახვა ვიდეოს კუთხეში, რათა ის აქ
+    გამოჩნდეს'
   Empty Search Message: 'ამ დასაკრავ სიაში თქვენი ძიების შესაბამისი ვიდეოები არ არის'
   Search bar placeholder: 'დასაკრავ სიაში ძიება'
 History:
diff --git a/static/locales/ko.yaml b/static/locales/ko.yaml
index 48594bba59ce7..37d10467d5aca 100644
--- a/static/locales/ko.yaml
+++ b/static/locales/ko.yaml
@@ -105,6 +105,10 @@ Most Popular: '인기 동영상'
 Playlists: '재생 목록'
 User Playlists:
   Your Playlists: '나의 재생 목록'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 재생
+    목록이 없습니다. 영상의 오른쪽 아래에 있는 저장 버튼을 사용하여 재생 목록에 영상을 추가하세요
+  Playlist Message: 지금 보시는 페이지는 완전한 플레이 리스트가 아닙니다. 이곳에는 저장되었거나 즐겨 찾기 표시가 된 항목만 표시
+    됩니다. 작업이 끝나면, 여기에 표시된 영상들은 '즐겨 찾기' 항목으로 옮겨집니다.
   Search bar placeholder: 재생 목록에서 검색
   Empty Search Message: 이 재생 목록에 검색과 일치하는 동영상이 없습니다
 History:
@@ -141,6 +145,8 @@ Settings:
       Beginning: '시작장면'
       Middle: '중간장면'
       End: '마지막장면'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
+      (기본설정은 https://invidious.snopyta.org)'
     Region for Trending: '트렌드 국가'
         #! List countries
     View all Invidious instance information: Indivious 서버의 전체 목록 보기
@@ -281,6 +287,7 @@ Settings:
     Subscription Settings: '구독 설정'
     Hide Videos on Watch: '시청한 동영상 숨기기'
     Fetch Feeds from RSS: 'RSS에서 피드 가져오기'
+    Manage Subscriptions: '구독 관리'
     Fetch Automatically: 자동으로 피드 수집하기
   Distraction Free Settings:
     Distraction Free Settings: '방해받지 않는 모드 설정'
@@ -308,6 +315,10 @@ Settings:
     Select Import Type: '가져오기 유형 선택'
     Select Export Type: '내보내기 유형 선택'
     Import Subscriptions: '구독 목록 가져오기'
+    Import FreeTube: 'FreeTube 가져오기'
+    Import YouTube: 'YouTube 가져오기'
+    Import NewPipe: 'NewPipe 가져오기'
+    Check for Legacy Subscriptions: '레거시 구독 확인'
     Export Subscriptions: '구독 목록 내보내기'
     Export FreeTube: 'FreeTube 내보내기'
     Export YouTube: 'YouTube 내보내기'
@@ -338,6 +349,7 @@ Settings:
     Subscription File: 구독 정보 파일
     Playlist File: 재생목록 파일
     History File: 시청기록 파일
+  Advanced Settings: {}
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: 네트워크 정보를
       가져오는 중 오류가 발생했습니다. 프록시가 올바르게 구성되어 있습니까?
@@ -426,6 +438,8 @@ About:
   Help: 도움말
   GitHub releases: GitHub 릴리스
   Downloads / Changelog: 다운로드 / 변경 로그
+  View License: 라이센스 보기
+  Licensed under the AGPLv3: AGPLv3에 따라 라이센스가 부여됨
   Source code: 소스 코드
   Beta: 베타
 Profile:
@@ -469,6 +483,8 @@ Profile:
   Profile Filter: 프로필 필터
   Profile Settings: 프로필 설정
 Channel:
+  Subscriber: '구독자'
+  Subscribers: '구독자'
   Subscribe: '구독'
   Unsubscribe: '구독 취소'
   Channel has been removed from your subscriptions: '채널이 구독에서 제거되었습니다'
@@ -534,10 +550,39 @@ Video:
   video only: '비디오만'
   audio only: '오디오만'
   Published:
+    Jan: '1월'
+    Feb: '2월'
+    Mar: '3월'
+    Apr: '4월'
+    May: '5월'
+    Jun: '6월'
+    Jul: '7월'
+    Aug: '8월'
+    Sep: '9월'
+    Oct: '10월'
+    Nov: '11월'
+    Dec: '12월'
+    Second: '초'
+    Seconds: '초'
+    Minute: '분'
+    Minutes: '분'
+    Hour: '시'
+    Hours: '시'
+    Day: '일'
+    Days: '일'
+    Week: '주'
+    Weeks: '주'
+    Month: '월'
+    Months: '월'
+    Year: '년'
+    Years: '년'
+    Ago: '전에'
+    Upcoming: '초연일'
     In less than a minute: 1분 이내에
   Published on: '게시일'
   Streamed on: '스트리밍됨'
   Started streaming on: '스트리밍 시작'
+  Publicationtemplate: '{number} {unit} 전'
 #& Videos
   Video has been saved: 동영상이 저장되었습니다
   Video has been removed from your saved list: 저장된 목록에서 동영상이 제거되었습니다
@@ -581,12 +626,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '전체 재생 목록 보기'
+  Videos: '비디오'
+  View: '보기'
+  Views: '보기'
   Last Updated On: '마지막 업데이트 날짜'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: 재생 목록
+Toggle Theatre Mode: '극장 모드 전환'
 Change Format:
   Change Media Formats: '비디오 형식 변경'
   Use Dash Formats: 'DASH 형식 사용'
@@ -683,6 +732,7 @@ Falling back to Invidious API: 'Invidious API로 대체'
 Falling back to Local API: '로컬 API로 대체'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: '이
   동영상은 형식이 누락되어 사용할 수 없습니다. 이는 국가를 사용할 수 없기 때문에 발생할 수 있습니다.'
+Subscriptions have not yet been implemented: '구독이 아직 구현되지 않았습니다'
 Loop is now disabled: '반복이 비활성화되었습니다'
 Loop is now enabled: '반복이 활성화되었습니다'
 Shuffle is now disabled: '셔플이 비활성화되었습니다'
@@ -699,6 +749,8 @@ No: '아니오'
 More: 더 보기
 Unknown YouTube url type, cannot be opened in app: 알 수 없는 YouTube URL 유형, 앱에서 열 수
   없음
+Hashtags have not yet been implemented, try again later: 해시태그가 아직 구현되지 않았습니다. 나중에
+  다시 시도하세요
 Playing Next Video Interval: 즉시 다음 동영상을 재생합니다. 취소하려면 클릭하세요. | {nextVideoInterval}초
   후에 다음 동영상을 재생합니다. 취소하려면 클릭하세요. | {nextVideoInterval}초 후에 다음 동영상을 재생합니다. 취소하려면 클릭하세요.
 Default Invidious instance has been set to {instance}: 기본 Invidious 인스턴스가 {instance}로
@@ -716,8 +768,10 @@ Channels:
   Title: 채널 목록
   Search bar placeholder: 채널 검색
   Empty: 채널 목록이 비어 있습니다.
+  Unsubscribe: 구독 취소
   Unsubscribe Prompt: '"{channelName}"에서 구독을 취소하시겠습니까?'
   Count: '{number} 채널이 발견되었습니다.'
+  Unsubscribed: '{channelName} 구독에서 제거되었습니다'
 Downloading has completed: '"{videoTitle}" 다운로드가 완료되었습니다'
 Starting download: '"{videoTitle}" 다운로드를 시작하는 중'
 Downloading failed: '"{videoTitle}"를 다운로드하는 동안 문제가 발생했습니다'
diff --git a/static/locales/ku.yaml b/static/locales/ku.yaml
index 07e42cbd116cc..a0278df86c552 100644
--- a/static/locales/ku.yaml
+++ b/static/locales/ku.yaml
@@ -89,6 +89,11 @@ Most Popular: 'بەناوبانگترین'
 Playlists: 'پلەیلیست'
 User Playlists:
   Your Playlists: 'پلیەلیستەکانت'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ڤیدیۆ
+    سەڤکراوەکانت بەتاڵن. کلیک لە دوگمەی سەیڤ کە لە سووچی ڤیدیۆیەک بۆ ئەوەی لێرە لیستکرێت
+  Playlist Message: ئەم پەیجە شێوەی کۆتایی پلەیلیستەکە دەرناخات. تەنها ڤیدیۆت پیشان
+    دەدات کە سیڤت کردووە یان فەیڤرتت کردووە. کاتێک کارەکە تەواو بووە، گشت ئەم ڤیدیۆیانەی
+    لێرەدان دەبرێنە لیستی 'فەیڤرتەکان'.
 History:
   # On History Page
   History: 'مێژوو'
@@ -112,6 +117,7 @@ Settings:
     Unknown data key: 'کلیلی داتای نەناسراو'
     How do I import my subscriptions?: 'چۆن بەشدارییەکانم داخڵ بکەم؟'
     Manage Subscriptions: بەشدارییەکانت رێکبخە
+  Advanced Settings: {}
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: کێشە لە
       وەرگرتنی زانیاری نێتۆرک. ئایە پرۆکسێکەت بە رێکوپێکی رێکخراوە؟
@@ -154,6 +160,8 @@ About:
   Help: یارمەتی
   GitHub releases: GitHub دەرچونەکانی
   Downloads / Changelog: دابەزاندنەکان / لیستی گۆڕانکاری
+  View License: قەیدەکە پیشاندە
+  Licensed under the AGPLv3: AGPLv3 دەرکراوە لەژیر
   Source code: سەرچاوەی کۆد
   Beta: تاقیکارییە
 Profile:
diff --git a/static/locales/la.yaml b/static/locales/la.yaml
index 66fdd19f25421..e4b20b5a28e35 100644
--- a/static/locales/la.yaml
+++ b/static/locales/la.yaml
@@ -87,6 +87,9 @@ Most Popular: 'Maxime Popular'
 Playlists: 'Album ludere'
 User Playlists:
   Your Playlists: 'Album Ludere Vestra'
+  Playlist Message: Haec pagina est a plene reflective opus playlists. Is solum album
+    et conservi videos quod favorited. Ubi consummatum opus est, omnia hic Move Imaginibus
+    commodum migravit ad "Favorites" Album Ludere.
 History:
   # On History Page
   History: 'Historiam'
@@ -118,6 +121,8 @@ Settings:
       Beginning: 'Initium'
       Middle: 'Medium'
       End: 'Finis'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious nusquam
+      esset (Iusto est https://invidious.snopyta.org)'
     Region for Trending: 'ad usum inclinanatus regionem'
         #! List countries
   Theme Settings:
@@ -150,6 +155,7 @@ Settings:
       Dracula Red: 'Dracula Ruber'
       Dracula Yellow: 'Dracula Flavum'
   Player Settings: {}
+  Advanced Settings: {}
 Channel:
   Videos: {}
   Playlists: {}
diff --git a/static/locales/lt.yaml b/static/locales/lt.yaml
index 8290b04ce3d2e..7ed2beb644efb 100644
--- a/static/locales/lt.yaml
+++ b/static/locales/lt.yaml
@@ -115,6 +115,13 @@ Most Popular: 'Populiariausia'
 Playlists: 'Grojaraščiai'
 User Playlists:
   Your Playlists: 'Tavo grojaraščiai'
+  Playlist Message: 'Šis puslapis neatspindi visiškai veikiančių grojaraščių. Jame
+    pateikiami tik vaizdo įrašai, kuriuos išsaugojote arba įtraukėte į adresyną. Kai
+    darbas bus baigtas, visi šiuo metu čia esantys vaizdo įrašai bus perkelti į „Mėgiamiausi“
+    grojaraštį.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Jūsų
+    išsaugotų vaizdo įrašų skiltis tuščia. Spustelėkite vaizdo įrašo kampe esantį
+    išsaugojimo mygtuką, kad jis būtų pateikiamas čia'
   Empty Search Message: Šiame grojaraštyje nėra vaizdo įrašų, kurie atitiktų jūsų
     paiešką
   Search bar placeholder: Ieškoti grojaraštyje
@@ -155,6 +162,8 @@ Settings:
       Beginning: 'Vaizdo įrašo pradžia'
       Middle: 'Vaizdo įrašo vidurys'
       End: 'Vaizdo įrašo pabaiga'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
+      (Numatytoji yra https://invidious.snopyta.org)'
     View all Invidious instance information: 'Žiūrėti visą Invidious perdavimo šaltinio
       informaciją'
     Region for Trending: '„Dabar populiaru“ regionas'
@@ -313,6 +322,7 @@ Settings:
     Subscription Settings: 'Prenumeratų nustatymai'
     Hide Videos on Watch: 'Slėpti vaizdo įrašus po peržiūros'
     Fetch Feeds from RSS: 'Gauti kanalus iš RSS'
+    Manage Subscriptions: 'Valdyti prenumeratas'
     Fetch Automatically: Gauti sklaidos kanalą automatiškai
   Distraction Free Settings:
     Distraction Free Settings: 'Blaškančių elementų nustatymai'
@@ -350,6 +360,10 @@ Settings:
     Select Import Type: 'Pasirinkti importavimo tipą'
     Select Export Type: 'Pasirinkti eksportavimo tipą'
     Import Subscriptions: 'Importuoti prenumeratas'
+    Import FreeTube: 'Importuoti FreeTube'
+    Import YouTube: 'Importuot YouTube'
+    Import NewPipe: 'Importuoti NewPipe'
+    Check for Legacy Subscriptions: 'Patikrinti, ar nėra Senojo formato prenumeratų'
     Export Subscriptions: 'Eksportuoti prenumeratas'
     Export FreeTube: 'Eksportuoti FreeTube'
     Export YouTube: 'Eksportuoti YouTube'
@@ -444,6 +458,8 @@ About:
   About: 'Apie'
   Beta: 'Beta'
   Source code: 'Pirminis kodas'
+  Licensed under the AGPLv3: 'Licencijuota pagal AGPLv3'
+  View License: 'Žiūrėti licenciją'
   Downloads / Changelog: 'Atsisiuntimai / pakeitimų žurnalas'
   GitHub releases: 'Versijos GitHub'
   Help: 'Pagalba'
@@ -509,6 +525,8 @@ Profile:
 #On Channel Page
   Profile Settings: Profilio nustatymai
 Channel:
+  Subscriber: 'Prenumeratorius'
+  Subscribers: 'Prenumeratoriai'
   Subscribe: 'Prenumeruoti'
   Unsubscribe: 'Atšaukti prenumeratą'
   Channel has been removed from your subscriptions: 'Kanalas pašalintas iš jūsų prenumeratų'
@@ -586,10 +604,39 @@ Video:
   video only: 'tik video'
   audio only: 'tik audio'
   Published:
+    Jan: 'Sau'
+    Feb: 'Vas'
+    Mar: 'Kov'
+    Apr: 'Bal'
+    May: 'Geg'
+    Jun: 'Bir'
+    Jul: 'Lie'
+    Aug: 'Rug'
+    Sep: 'Rgs'
+    Oct: 'Spa'
+    Nov: 'Lap'
+    Dec: 'Gru'
+    Second: 'Sekundė'
+    Seconds: 'Sekundės'
+    Minute: 'Minutė'
+    Minutes: 'Minutės'
+    Hour: 'val.'
+    Hours: 'val.'
+    Day: 'd.'
+    Days: 'd.'
+    Week: 'sav.'
+    Weeks: 'sav.'
+    Month: 'mėn.'
+    Months: 'mėn.'
+    Year: 'm.'
+    Years: 'm.'
+    Ago: 'atgal'
+    Upcoming: 'premjera'
     In less than a minute: prieš mažiau nei minutę
   Published on: 'Publikuota'
   Streamed on: 'Transliuota'
   Started streaming on: 'Transliaciją pradėjo'
+  Publicationtemplate: 'prieš {number} {unit}'
   Sponsor Block category:
     sponsor: 'Rėmėjas'
     intro: 'Įžanga'
@@ -627,12 +674,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Peržiūrėti visą grojaraštį'
+  Videos: 'Vaizdo įrašai'
+  View: 'Žiūrėti'
+  Views: 'Peržiūros'
   Last Updated On: 'Paskutinį kartą atnaujinta'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Grojaraštis
+Toggle Theatre Mode: 'Įjungti teatro rėžimą'
 Change Format:
   Change Media Formats: 'Keisti vaizdo įrašo formatus'
   Use Dash Formats: 'Naudoti DASH formatus'
@@ -729,7 +780,8 @@ Tooltips:
     Ignore Warnings: 'Neatvaizduoti įspėjimų, kai dabartinis išorinis grotuvas nepalaiko
       dabartinio veiksmo (pvz., grojaraščių atkūrimas ir kt.).'
     Custom External Player Arguments: 'Bet kokius pasirinktinius komandinės eilutės
-      argumentus, kuriuos norite perduoti išoriniam grotuvui.'
+      argumentus, atskirtus kabliataškiais ('';''), kuriuos norite perduoti išoriniam
+      grotuvui.'
     DefaultCustomArgumentsTemplate: '(Numatytasis: „{defaultCustomArguments}“)'
   Subscription Settings:
     Fetch Feeds from RSS: 'Kai bus įgalinta, „FreeTube“ naudos RSS, o ne numatytąjį
@@ -752,8 +804,11 @@ Falling back to Local API: 'Grįžtama prie vietinio API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Šis
   vaizdo įrašas nepasiekiamas, nes trūksta formatų. Tai gali nutikti dėl to, kad šalis
   yra nepasiekiama.'
+Subscriptions have not yet been implemented: 'Prenumeratos dar nėra įgyvendintos'
 Unknown YouTube url type, cannot be opened in app: 'Nežinomas YouTube URL tipas, nėra
   galimybės jo atidaryti programoje'
+Hashtags have not yet been implemented, try again later: 'Grotažymės dar neveikia,
+  bandykite dar kartą vėliau'
 Loop is now disabled: 'Sukimas ciklu išjungtas'
 Loop is now enabled: 'Sukimas ciklu dabar įjungtas'
 Shuffle is now disabled: 'Maišymas dabar išjungtas'
@@ -787,6 +842,8 @@ Channels:
   Search bar placeholder: Ieškoti kanalų
   Count: rastas (-i) {number} kanalas (-ai).
   Empty: Jūsų kanalų sąrašas šiuo metu tuščias.
+  Unsubscribe: Atšaukti prenumeratą
+  Unsubscribed: '{channelName} buvo pašalintas iš jūsų prenumeratų'
   Unsubscribe Prompt: Ar tikrai norite atšaukti {channelName} prenumeratą?
 Downloading has completed: „{videoTitle}“ atsisiuntimas baigtas
 Starting download: Pradedamas „{videoTitle}“ atsisiuntimas
diff --git a/static/locales/lv.yaml b/static/locales/lv.yaml
index 510a878cda8be..42d4b3a67a3b3 100644
--- a/static/locales/lv.yaml
+++ b/static/locales/lv.yaml
@@ -1,8 +1,7 @@
 # Put the name of your locale in the same language
 Locale Name: 'Latviešu'
 # Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Šī aplikācijas sadaļa vēl nav gatava. Atnāc vēlāk, kad būs veikti uzlabojumi.
+'This part of the app is not ready yet. Come back later when progress has been made.': >
 
 # Webkit Menu Bar
 File: 'Datne'
@@ -31,13 +30,10 @@ Back: 'Atpakaļ'
 Forward: 'Uz priekšu'
 Open New Window: 'Atvērt jaunu logu'
 
-Version {versionNumber} is now available!  Click for more details: 'Versija {versionNumber}
-  tagad ir pieejama!  Spied, lai skatītu detaļas'
+Version {versionNumber} is now available!  Click for more details: ''
 Download From Site: 'Lejuplādēt no vietnes'
-A new blog is now available, {blogTitle}. Click to view more: 'Jauns emuāra ieraksts
-  ir pieejams, {blogTitle}. Spied, lai skatītu vairāk'
-Are you sure you want to open this link?: 'Vai esi pārliecināts, ka vēlies atvērt
-  šo saiti?'
+A new blog is now available, {blogTitle}. Click to view more: ''
+Are you sure you want to open this link?: ''
 
 # Global
 # Anything shared among components / views should be put here
@@ -47,25 +43,21 @@ Global:
   Live: 'Tiešraides'
   Community: 'Kopiena'
   Counts:
-    Video Count: '1 video | {count} video'
-    Channel Count: '1 kanāls | {count} kanāli'
-    Subscriber Count: '1 abonents | {count} abonenti'
-    View Count: '1 skatījums | {count} skatījumi'
-    Watching Count: '1 skatās | {count} skatās'
+    Video Count: ''
+    Channel Count: ''
+    Subscriber Count: ''
+    View Count: ''
+    Watching Count: ''
 
 # Search Bar
-    Like Count: 1 patikšana | {count} patikšanas
-    Comment Count: 1 viedoklis | {count} viedokļi
-  Input Tags:
-    Length Requirement: Birkai jābūt vismaz {number} simbolus garai
-Search / Go to URL: 'Meklē / Dodies uz URL'
+Search / Go to URL: ''
 Search Bar:
   Clear Input: 'Tīrīt ievadi'
   # In Filter Button
 Search Filters:
-  Search Filters: 'Meklēšanas atlase'
+  Search Filters: ''
   Sort By:
-    Sort By: 'Kārto pēc'
+    Sort By: ''
     Most Relevant: 'Visatbilstošākie'
     Rating: 'Vērtējums'
     Upload Date: 'Augšuplādes datums'
@@ -92,187 +84,88 @@ Search Filters:
     Medium (4 - 20 minutes): 'Vidējs (4 - 20 minūtes)'
     Long (> 20 minutes): 'Ilgs (> 20 minūtes)'
   # On Search Page
-  Search Results: 'Meklēšanas rezultāti'
-  Fetching results. Please wait: 'Iegūst rezultātus. Lūdzu gaidi'
-  Fetch more results: 'Iegūt vairāk rezultātu'
-  There are no more results for this search: 'Šim meklējumam nav vairāk rezultātu'
+  Search Results: ''
+  Fetching results. Please wait: ''
+  Fetch more results: ''
+  There are no more results for this search: ''
 # Sidebar
-  Features:
-    HD: HD
-    4K: 4K
-    360 Video: 360 Video
-    Location: Atrašanās vieta
-    Live: Tiešraide
-    3D: 3D
-    HDR: HDR
-    VR180: VR180
-    Features: Īpašības
-    Subtitles: Paraksti
-    Creative Commons: Creative Commons
 Subscriptions:
     # On Subscriptions Page
-  Subscriptions: 'Abonementi'
+  Subscriptions: ''
   # channels that were likely deleted
-  Error Channels: 'Kanāli ar kļūdām'
-  Latest Subscriptions: 'Jaunākie abonementi'
-  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'Šim
-    profilam ir daudz abonementu.  Piespiežu RSS, lai izvairītos no ierobežojumiem'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Tavs
-    abonementu saraksts ir tukšs. Ja vēlies ievest savus abonementus, dodies uz "Datņu
-    iestatījumiem" un izvēlies "Ievest abonementus", vai arī vari meklēt kanālus un
-    abonēt tos.'
-  Disabled Automatic Fetching: 'Tu esi izslēdzis automātisko abonementu iegūšanu.
-    Atsvaidzini abonementus, lai redzētu tos šeit.'
-  Empty Channels: 'Taviem abonētajiem kanāliem pašreiz nav neviena video.'
-  'Getting Subscriptions. Please wait.': 'Iegūst abonementus. Lūdzu gaidi.'
-  Empty Posts: 'Taviem abonētajiem kanāliem pašreiz nav neviena ieraksta.'
+  Error Channels: ''
+  Latest Subscriptions: ''
+  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: ''
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': ''
+  Disabled Automatic Fetching: ''
+  Empty Channels: ''
+  'Getting Subscriptions. Please wait.': ''
+  Empty Posts: ''
   Refresh Subscriptions: ''
-  Load More Videos: 'Ielādē vairāk video'
+  Load More Videos: ''
   Load More Posts: 'Ielādēt vairāk ierakstus'
-  Subscriptions Tabs: 'Abonementu cilnes'
-  All Subscription Tabs Hidden: 'Visas abonementu cilnes ir paslēptas. Lai redzētu
-    saturu šeit, lūdzu atslēp dažas cilnes "{settingsSection}" sadaļā "{subsection}".'
-More: 'Vairāk'
+  Subscriptions Tabs: ''
+  All Subscription Tabs Hidden: ''
+More: ''
 Channels:
-  Channels: 'Kanāli'
-  Title: 'Kanālu saraksts'
-  Search bar placeholder: 'Meklē kanālus'
-  Count: '{number} kanāls(-i) atrasti.'
-  Empty: 'Tavs kanālu saraksts pašreiz ir tukšs.'
-  Unsubscribe Prompt: 'Vai esi drošs, ka vēlies atcelt abonementu no "{channelName}"?'
+  Channels: ''
+  Title: ''
+  Search bar placeholder: ''
+  Count: ''
+  Empty: ''
+  Unsubscribe: ''
+  Unsubscribed: ''
+  Unsubscribe Prompt: ''
 Trending:
-  Trending: 'Tendences'
-  Default: 'Noklusējuma'
+  Trending: ''
+  Default: ''
   Music: 'Mūzika'
   Gaming: 'Spēles'
   Movies: 'Filmas'
-  Trending Tabs: 'Tendenču cilnes'
-Most Popular: 'Vispopulārākie'
-Playlists: 'Atskaņošanas saraksti'
+  Trending Tabs: ''
+Most Popular: ''
+Playlists: ''
 User Playlists:
-  Your Playlists: 'Tavi atskaņošanas saraksti'
-  Empty Search Message: 'Šajā atskaņošanas sarakstā nav video, kas atbilst tavam meklējumam'
-  Search bar placeholder: 'Meklē atskaņošanas sarakstus'
-  Playlist Description: Atskaņošanas saraksta apraksts
-  Sort By:
-    Sort By: Kārto pēc
-    NameDescending: Z-A
-    NameAscending: A-Z
-    EarliestUpdatedFirst: Visagrāk atjaunināti
-    LatestPlayedFirst: Nesen atskaņoti
-    LatestUpdatedFirst: Nesen atjaunināti
-    LatestCreatedFirst: Nesen izveidoti
-    EarliestCreatedFirst: Visagrāk izveidoti
-    EarliestPlayedFirst: Visagrāk atskaņoti
-  Cannot delete the quick bookmark target playlist.: Nevar izdzēst ātrās grāmatzīmes
-    mērķa atskaņošanas sarakstu.
-  Delete Playlist: Dzēs atskaņošanas sarakstu
-  Remove from Favorites: Noņem no {playlistName}
-  Move Video Up: Pārvieto video augšup
-  Save Changes: Saglabā izmaiņas
-  Edit Playlist Info: Rediģē atskaņošanas saraksta info
-  Copy Playlist: Kopē atskaņošanas sarakstu
-  Remove Watched Videos: Noņem skatītos video
-  SinglePlaylistView:
-    Toast:
-      This playlist is already being used for quick bookmark.: Šis atskaņošanas saraksts
-        jau tiek lietots priekš ātrās grāmatzīmes.
-      This playlist is now used for quick bookmark: Šis atskaņošanas saraksts tagad
-        tiek lietots priekš ātrās grāmatzīmes
-      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Šis
-        atskaņošanas saraksts tagad tiek lietots priekš ātrās grāmatzīmes {oldPlaylistName}
-        vietā. Spied šeit, lai atceltu
-      Playlist name cannot be empty. Please input a name.: Atskaņošanas saraksta nosaukums
-        nevar būt tukšs. Lūdzu ievadi nosaukumu.
-      Playlist has been updated.: Atskaņošanas saraksts tika atjaunināts.
-      Video has been removed: Video tika noņemts
-      This video cannot be moved up.: Šo video nevar pārvietot augšup.
-      This video cannot be moved down.: Šo video nevar pārvietot lejup.
-      Reverted to use {oldPlaylistName} for quick bookmark: Atgriezts pie {oldPlaylistName}
-        priekš ātrās grāmatzīmes
-      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Daži
-        video atskaņošanas sarakstā vēl nav ielādēti. Spied šeit, lai kopētu tik un
-        tā.
-      There was an issue with updating this playlist.: Radās problēma atjauninot šo
-        atskaņošanas sarakstu.
-      There was a problem with removing this video: Radās problēma noņemot video
-      This playlist is protected and cannot be removed.: Šis atskaņošanas saraksts
-        ir aizsargāts un nevar tikt noņemts.
-      There were no videos to remove.: Nebija video, ko noņemt.
-      Playlist {playlistName} has been deleted.: '{playlistName} atskaņošanas saraksts
-        tika dzēsts.'
-      "{videoCount} video(s) have been removed": 1 video tika noņemts | {videoCount}
-        video tika noņemti
-      Playlist {playlistName} is the new quick bookmark playlist.: '{playlistName}
-        atskaņošanas saraksts ir jaunais ātrās grāmatzīmes atskaņošanas saraksts.'
-    Search for Videos: Meklē video
-  You have no playlists. Click on the create new playlist button to create a new one.: Tev
-    nav atskaņošanas sarakstu. Spied uz "Izveido jaunu atskaņošanas sarakstu", lai
-    izveidotu jaunu.
-  This playlist currently has no videos.: Šajā atskaņošanas sarakstā pašreiz nav video.
-  Add to Favorites: Pievieno pie {playlistName}
-  Move Video Down: Pārvieto video lejup
-  Cancel: Atcel
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Vai
-    esi drošs, ka vēlies noņemt 1 skatīto video no šī atskaņošanas saraksta? To nevar
-    atcelt. | Vai esi drošs, ka vēlies noņemt {playlistItemCount} skatītos video no
-    šī atskaņošanas saraksta? To nevar atcelt.
-  Are you sure you want to delete this playlist? This cannot be undone: Vai esi drošs,
-    ka vēlies dzēst šo atskaņošanas sarakstu? To nevar atcelt.
-  Playlist Name: Atskaņošanas saraksta nosaukums
-  Create New Playlist: Izveido jaunu atskaņošanas sarakstu
-  Playlists with Matching Videos: Atskaņošanas saraksti ar atbilstošiem video
-  Remove Duplicate Videos: Noņem video dublikātus
-  Enable Quick Bookmark With This Playlist: Iespējo ātro grāmatzīmi ar šo atskaņošanas
-    sarakstu
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Vai
-    esi drošs, ka vēlies noņemt 1 video dublikātu no šī atskaņošanas saraksta? To
-    nevar atcelt. | Vai esi drošs, ka vēlies noņemt {playlistItemCount} video dublikātus
-    no šī atskaņošanas saraksta? To nevar atcelt.
-  Add to Playlist: Pievieno atskaņošanas sarakstam
-  Remove from Playlist: Noņem no atskaņošanas saraksta
-  Quick Bookmark Enabled: Atrā grāmatzīme iespējota
-  CreatePlaylistPrompt:
-    Toast:
-      There was an issue with creating the playlist.: Izveidojot atskaņošanas sarakstu
-        radās kļūda.
+  Your Playlists: ''
+  Playlist Message: ''
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
+  Empty Search Message: ''
+  Search bar placeholder: ''
 History:
   # On History Page
-  History: 'Vēsture'
-  Watch History: 'Skatīšanās vēsture'
-  Your history list is currently empty.: 'Tava skatīšanās vēsture pašreiz ir tukša.'
+  History: ''
+  Watch History: ''
+  Your history list is currently empty.: ''
   Empty Search Message: ''
-  Search bar placeholder: "Meklē vēsturē"
-  Case Sensitive Search: Reģistrjūtīga meklēšana
+  Search bar placeholder: ""
 Settings:
   # On Settings Page
-  Settings: 'Iestatījumi'
+  Settings: ''
   The app needs to restart for changes to take effect. Restart and apply change?: ''
   General Settings:
-    General Settings: 'Galvenie'
+    General Settings: 'Galvenie iestatījumi'
     Check for Updates: 'Pārbaudīt atjauninājumus'
     Check for Latest Blog Posts: 'Skatīt jaunākos bloga ierakstus'
     Fallback to Non-Preferred Backend on Failure: ''
-    Enable Search Suggestions: 'Iespējo meklēšanas ieteikumus'
-    Default Landing Page: 'Noklusējuma sākumlapa'
+    Enable Search Suggestions: ''
+    Default Landing Page: ''
     Locale Preference: 'Vietas iestatījums'
-    System Default: 'Sistēmas noklusējums'
+    System Default: ''
     Preferred API Backend:
-      Preferred API Backend: 'Vēlamā API aizmugure'
+      Preferred API Backend: ''
       Local API: 'Vietējais API'
-      Invidious API: 'Invidious API'
+      Invidious API: ''
     Video View Type:
       Video View Type: 'Video skata veids'
       Grid: 'Režģis'
       List: 'Saraksts'
     Thumbnail Preference:
       Thumbnail Preference: 'Sīktēlu iestatījums'
-      Default: 'Noklusējums'
+      Default: ''
       Beginning: 'Sākums'
       Middle: 'Vidus'
       End: 'Beigas'
       Hidden: 'Paslēpts'
-      Blur: Aizmiglo
     Current Invidious Instance: 'Pašreizējais Invidious gadījums'
     The currently set default instance is {instance}: ''
     No default instance has been set: ''
@@ -288,12 +181,10 @@ Settings:
       Open Link: 'Atvērt saiti'
       Ask Before Opening Link: 'Jautāt pirms saites atvēršanas'
       No Action: 'Nedarīt neko'
-    Auto Load Next Page:
-      Label: Autoielādē nākamo lapu
   Theme Settings:
-    Theme Settings: 'Izskats'
-    Match Top Bar with Main Color: 'Saskaņo augšmalu ar galveno krāsu'
-    Expand Side Bar by Default: 'Izvērs sānu malu pēc noklusējuma'
+    Theme Settings: 'Izskata iestatījumi'
+    Match Top Bar with Main Color: ''
+    Expand Side Bar by Default: ''
     Disable Smooth Scrolling: 'Atspējot plūdeno ritināšanu'
     UI Scale: 'Saskarnes izmērs'
     Hide Side Bar Labels: 'Paslēpt sānu paneļa etiķetes'
@@ -302,13 +193,12 @@ Settings:
       Base Theme: 'Pamata izskats'
       Black: 'Melns'
       Dark: 'Tumšs'
-      System Default: 'Sistēmas noklusējums'
+      System Default: ''
       Light: 'Gaišs'
       Dracula: 'Drakula'
       Catppuccin Mocha: 'Kaķpučīn moka'
       Pastel Pink: 'Pasteļu rozā'
       Hot Pink: 'Karsti rozā'
-      Nordic: Ziemeļvalsts
     Main Color Theme:
       Main Color Theme: 'Galvenās krāsas izskats'
       Red: 'Sarkans'
@@ -351,7 +241,7 @@ Settings:
     Secondary Color Theme: 'Otrās krāsas izskats'
         #* Main Color Theme
   Player Settings:
-    Player Settings: 'Atskaņotāja'
+    Player Settings: 'Atskaņotāja iestatījumi'
     Play Next Video: 'Atskaņot nākamo video'
     Turn on Subtitles by Default: ''
     Autoplay Videos: 'Autoatskaņot video'
@@ -366,18 +256,18 @@ Settings:
     Enter Fullscreen on Display Rotate: 'Pagriežot ekrānu pārslēgt uz pilnekrānu'
     Next Video Interval: 'Nākošā video intervāls'
     Fast-Forward / Rewind Interval: ''
-    Default Volume: 'Noklusējuma skaļums'
-    Default Playback Rate: 'Noklusējuma atskaņošanas ātrums'
+    Default Volume: ''
+    Default Playback Rate: ''
     Max Video Playback Rate: 'Maksimālais video atskaņošanas ātrums'
     Video Playback Rate Interval: 'Video atskaņošanas ātruma intervāls'
     Default Video Format:
-      Default Video Format: 'Noklusējuma video formāts'
+      Default Video Format: ''
       Dash Formats: 'DASH formāti'
       Legacy Formats: 'Mantojuma formāti'
       Audio Formats: 'Audio formāti'
     Default Quality:
-      Default Quality: 'Noklusējuma kvalitāte'
-      Auto: 'Auto'
+      Default Quality: ''
+      Auto: ''
       144p: '144p'
       240p: '240p'
       360p: '360p'
@@ -400,7 +290,7 @@ Settings:
         Forbidden Characters: 'Aizliegtās rakstzīmes'
         Empty File Name: 'Tukšs datnes nosaukums'
   External Player Settings:
-    External Player Settings: 'Ārējā atskaņotāja'
+    External Player Settings: 'Ārējā atskaņotāja iestatījumi'
     External Player: 'Ārējais atskaņotājs'
     Ignore Unsupported Action Warnings: 'Ignorēt neatbalstītas darbības brīdinājumus'
     Custom External Player Executable: 'Pielāgota ārējā atskaņotāja izpilddatne'
@@ -408,36 +298,35 @@ Settings:
     Players:
       None:
         Name: 'Nekas'
-    Ignore Default Arguments: Ignorēt noklusējuma argumentus
   Privacy Settings:
-    Privacy Settings: 'Privātuma'
+    Privacy Settings: 'Privātuma iestatījumi'
     Remember History: 'Atcerēties vēsturi'
     Save Watched Progress: 'Saglabāt skatīto attīstību'
     Save Watched Videos With Last Viewed Playlist: ''
-    Clear Search Cache: 'Iztīri meklēšanas kešatmiņu'
+    Clear Search Cache: ''
     Are you sure you want to clear out your search cache?: ''
-    Search cache has been cleared: 'Meklēšanas kešatmiņa tika iztīrīta'
+    Search cache has been cleared: ''
     Remove Watch History: 'Noņemt skatīšanās vēsturi'
     Are you sure you want to remove your entire watch history?: 'Vai tu esi pārliecināts,
       ka vēlies noņemt visu skatīšanās vēsturi?'
     Watch history has been cleared: 'Skatīšanās vēsture tika noņemta'
-    Remove All Subscriptions / Profiles: 'Noņemt visus abonementus / profilus'
+    Remove All Subscriptions / Profiles: ''
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
-    All playlists have been removed: Visi atskaņošanas saraksti tika noņemti
-    Remove All Playlists: Noņemt visus atskaņošanas sarakstus
   Subscription Settings:
-    Subscription Settings: 'Abonementu'
+    Subscription Settings: ''
     Hide Videos on Watch: 'Paslēpt video pēc skatīšanas'
     Fetch Feeds from RSS: 'Iegūt plūsmu no RSS'
+    Manage Subscriptions: ''
     Fetch Automatically: 'Iegūt plūsmu automātiski'
   Distraction Free Settings:
-    Distraction Free Settings: 'Beztraucēšanas'
+    Distraction Free Settings: 'Beztraucēšanas iestatījumi'
     Sections:
       Side Bar: 'Sānu panelis'
-      Subscriptions Page: 'Abonementu lapa'
+      Subscriptions Page: ''
       Channel Page: 'Kanāla lapa'
       Watch Page: 'Skatīšanās lapa'
       General: 'Galvenais'
+    Blur Thumbnails: 'Izpludināt sīktēlus'
     Hide Video Views: 'Paslēpt video skatījumus'
     Hide Video Likes And Dislikes: 'Paslēpt video novērtējuma atzīmes'
     Hide Channel Subscribers: 'Paslēpt kanāla abonentus'
@@ -447,40 +336,38 @@ Settings:
     Hide Popular Videos: 'Paslēpt populāros video'
     Hide Playlists: 'Paslēpt sarakstus'
     Hide Live Chat: 'Paslēpt dzīvo čatu'
-    Hide Active Subscriptions: 'Paslēp aktīvos abonementus'
+    Hide Active Subscriptions: ''
     Hide Video Description: 'Paslēpt video aprakstu'
     Hide Comments: 'Paslēpt komentārus'
     Hide Profile Pictures in Comments: 'Paslēpt kontu atēlus komentāros'
     Display Titles Without Excessive Capitalisation: 'Attēlot nosaukumus nepārspīlējot
-      ar lielajiem burtiem un interpunkciju'
+      ar lielajiem burtiem'
     Hide Live Streams: 'Paslēpt dzīvās straumes'
     Hide Upcoming Premieres: 'Paslēpt tuvojošās pirmizrādes'
     Hide Sharing Actions: 'Paslēpt dalīšanās darbības'
     Hide Chapters: 'Paslēpt nodaļas'
     Hide Channels: 'Kanālos paslēpt video'
-    Hide Channels Placeholder: 'Kanāla ID'
+    Hide Channels Placeholder: 'Kanāla vārds vai ID'
     Hide Featured Channels: 'Paslēpt izceltos kanālus'
     Hide Channel Playlists: 'Kanālā paslēpt sarakstus'
     Hide Channel Community: 'Kanālā paslēpt kopienu'
     Hide Channel Shorts: 'Kanālā paslēpt īsos'
     Hide Channel Podcasts: 'Kanālā paslēpt podkāstus'
     Hide Channel Releases: 'Kanālā paslēpt relīzes'
-    Hide Subscriptions Videos: 'Paslēp abonementu video'
-    Hide Subscriptions Shorts: 'Paslēp abonementu īsos video'
-    Hide Subscriptions Live: 'Paslēp abonementu tiešraides'
-    Hide Subscriptions Community: 'Paslēp abonementu komūnu'
-    Hide Channels Already Exists: Kanāla ID jau eksistē
-    Hide Videos and Playlists Containing Text Placeholder: Vārds, vārda daļa, vai
-      frāze
+    Hide Subscriptions Videos: ''
+    Hide Subscriptions Shorts: ''
+    Hide Subscriptions Live: ''
+    Hide Subscriptions Community: ''
   Data Settings:
-    Data Settings: 'Datu'
+    Data Settings: 'Datu iestatījumi'
     Select Import Type: 'Izvēlēties importa veidu'
     Select Export Type: 'Izvēlēties eksporta veidu'
-    Import Subscriptions: 'Ievest abonementus'
-    Subscription File: 'Aboenementu datne'
+    Import Subscriptions: ''
+    Subscription File: ''
     History File: 'Vēstures datne'
-    Playlist File: 'Atskaņošanas saraksta datne'
-    Export Subscriptions: 'Izvest abonementus'
+    Playlist File: ''
+    Check for Legacy Subscriptions: ''
+    Export Subscriptions: ''
     Export FreeTube: 'Eksportēt FreeTube'
     Export YouTube: 'Eksportēt YouTube'
     Export NewPipe: 'Eksportēt NewPipe'
@@ -491,13 +378,11 @@ Settings:
     Profile object has insufficient data, skipping item: 'Profila objektam nav pietiekami
       datu, izlaiž vienumu'
     All subscriptions and profiles have been successfully imported: ''
-    All subscriptions have been successfully imported: 'Visi abonementi tika veiksmīgi
-      ievesti'
-    Invalid subscriptions file: 'Nederīga abonementu datne'
+    All subscriptions have been successfully imported: ''
+    Invalid subscriptions file: ''
     This might take a while, please wait: 'Tas var aizņemt kādu laiku, lūdzu gaidiet'
     Invalid history file: 'Nederīga vēstures datne'
-    Subscriptions have been successfully exported: 'Visi abonementi tika veiksmīgi
-      izvesti'
+    Subscriptions have been successfully exported: ''
     History object has insufficient data, skipping item: 'Vēstures objektam nav pietiekami
       datu, izlaiž vienumu'
     All watched history has been successfully imported: 'Visa skatīšanās vēstures
@@ -511,9 +396,9 @@ Settings:
     Unable to write file: 'Nespēj ierakstīt datni'
     Unknown data key: 'Nezināma datu atslēga'
     How do I import my subscriptions?: ''
-    Manage Subscriptions: 'Pārvaldīt abonementus'
+    Manage Subscriptions: ''
   Proxy Settings:
-    Proxy Settings: 'Starpniekserveru'
+    Proxy Settings: 'Starpniekserveru iestatījumi'
     Enable Tor / Proxy: 'Iespējot Tor / starpniekserveri'
     Proxy Protocol: 'Starpniekservera protokols'
     Proxy Host: 'Starpniekservera saimnieks'
@@ -529,7 +414,7 @@ Settings:
     Error getting network information. Is your proxy configured properly?: 'Kļūda
       saņemot tīkla informāciju. Vai jūsu starpniekserveris ir uzstādīts pareizi?'
   SponsorBlock Settings:
-    SponsorBlock Settings: 'SponsorBlock'
+    SponsorBlock Settings: 'SponsorBlock iestatījumi'
     Enable SponsorBlock: 'Iespējot SponsorBlock'
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
     Notify when sponsor segment is skipped: 'Ziņot, kad sponsora gabals tiek izlaists'
@@ -541,21 +426,20 @@ Settings:
       Prompt To Skip: 'Jautāt, lai izlaistu'
       Do Nothing: 'Nedarīt neko'
     Category Color: 'Iedalījuma krāsa'
-    UseDeArrowThumbnails: Izmanto DeArrow priekš sīktēliem
   Parental Control Settings:
-    Parental Control Settings: 'Vecāku vadības'
+    Parental Control Settings: 'Vecāku vadības iestatījumi'
     Hide Unsubscribe Button: 'Paslēpt Atabonēt pogu'
     Show Family Friendly Only: 'Rādīt tikai ģimenei draudzīgi'
-    Hide Search Bar: 'Paslēp meklēšanas joslu'
+    Hide Search Bar: ''
   Download Settings:
-    Download Settings: 'Lejuplādes'
+    Download Settings: 'Lejuplādes iestatījumi'
     Ask Download Path: 'Jautāt lejuplādes ceļu'
     Choose Path: 'Izvēlēties ceļu'
     Download Behavior: 'Lejuplādes uzvedība'
     Download in app: 'Lejuplādēt aplikācijā'
     Open in web browser: 'Atvērt tīkla pārlūkā'
   Experimental Settings:
-    Experimental Settings: 'Izmēģinājuma'
+    Experimental Settings: 'Izmēģinājuma iestatījumi'
     Warning: ''
     Replace HTTP Cache: 'Aizvietot HTTP kešatmiņu'
   Password Dialog:
@@ -564,17 +448,17 @@ Settings:
     Password Incorrect: 'Parole nepareiza'
     Unlock: 'Atslēgt'
   Password Settings:
-    Password Settings: 'Paroles'
+    Password Settings: 'Paroles iestatījumi'
     Set Password To Prevent Access: 'Uzstādi paroli, lai neļautu piekļūt uzstādījumiem'
     Set Password: 'Uzstādi paroli'
     Remove Password: 'Noņem paroli'
-  Return to Settings Menu: Atgriezies iestatījumu izvēlnē
-  Sort Settings Sections (A-Z): Kārto iestatījumu sadaļas (A-Z)
 About:
   #On About page
   About: 'Par'
   Beta: 'Beta'
   Source code: 'Pirmkods'
+  Licensed under the AGPLv3: ''
+  View License: ''
   Downloads / Changelog: 'Lejuplādes / izmaiņu žurnāls'
   GitHub releases: 'GitHub laidieni'
   Help: 'Palīdzība'
@@ -597,10 +481,8 @@ About:
   these people and projects: 'šie cilvēki un apvienības'
   Donate: 'Ziedot'
 
-  Licensed under the: Licenzēts ar
-  AGPLv3: AGPLv3
 Profile:
-  Profile Settings: 'Profila'
+  Profile Settings: 'Profila iestatījumi'
   Toggle Profile List: 'Pārslēgt profilu sarakstu'
   Profile Select: 'Izvēlēties profilu'
   Profile Filter: 'Profilu filtrs'
@@ -613,11 +495,11 @@ Profile:
   Profile Preview: 'Profila priekšskatījums'
   Create Profile: 'Veidot profilu'
   Update Profile: 'Atjaunināt profilu'
-  Make Default Profile: 'Izveido noklusējuma profilu'
+  Make Default Profile: ''
   Delete Profile: 'Dzēst profilu'
   Are you sure you want to delete this profile?: 'Vai tu esi drošs, ka gribi dzēst
     šo profilu?'
-  All subscriptions will also be deleted.: 'Arī visi abonementi tiks izdzēsti.'
+  All subscriptions will also be deleted.: ''
   Profile could not be found: 'Profils netika atrasts'
   Your profile name cannot be empty: 'Tavs profila vārds nevar būt tukšs'
   Profile has been created: 'Profils tika izveidots'
@@ -625,10 +507,10 @@ Profile:
   Your default profile has been set to {profile}: ''
   Removed {profile} from your profiles: ''
   Your default profile has been changed to your primary profile: ''
-  '{profile} is now the active profile': '{profile} tagad ir aktīvais profils'
-  Subscription List: 'Abonementu saraksts'
+  '{profile} is now the active profile': ''
+  Subscription List: ''
   Other Channels: 'Citi kanāli'
-  '{number} selected': '{number} izvēlēts'
+  '{number} selected': ''
   Select All: 'Izvēlēties visus'
   Select None: 'Neizvēlēties nevienu'
   Delete Selected: 'Dzēst izvēlētos'
@@ -639,9 +521,6 @@ Profile:
   : ''
   Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
 #On Channel Page
-  Create Profile Name: Izveido profila vārdu
-  Profile Name: Profila vārds
-  Edit Profile Name: Rediģē profila vārdu
 Channel:
   Subscribe: 'Abonē'
   Unsubscribe: 'Atabonē'
@@ -746,10 +625,39 @@ Video:
   video only: ''
   audio only: ''
   Published:
+    Jan: ''
+    Feb: ''
+    Mar: ''
+    Apr: ''
+    May: ''
+    Jun: ''
+    Jul: ''
+    Aug: ''
+    Sep: ''
+    Oct: ''
+    Nov: ''
+    Dec: ''
+    Second: ''
+    Seconds: ''
+    Minute: ''
+    Minutes: ''
+    Hour: ''
+    Hours: ''
+    Day: ''
+    Days: ''
+    Week: ''
+    Weeks: ''
+    Month: ''
+    Months: ''
+    Year: ''
+    Years: ''
+    Ago: ''
+    Upcoming: ''
     In less than a minute: ''
   Published on: ''
   Streamed on: ''
   Started streaming on: ''
+  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -785,11 +693,15 @@ Playlist:
   #& About
   Playlist: ''
   View Full Playlist: ''
+  Videos: ''
+  View: ''
+  Views: ''
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
+Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -888,7 +800,9 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
+Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
@@ -917,19 +831,3 @@ Hashtag:
 Yes: ''
 No: ''
 Ok: ''
-Search character limit: Meklējamā frāze pārsniedz {searchCharacterLimit} simbolu ierobežojumu
-Feed:
-  Refresh Feed: Atsvaidzini {subscriptionName}
-  Feed Last Updated: '{feedName} barotne pēdējoreiz atjaunināta: {date}'
-Go to page: Iet uz {page}
-Close Banner: Aizvērt karogu
-Search Listing:
-  Label:
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Jauns
-    3D: 3D
-    Subtitles: Paraksti
-    Closed Captions: Slēgtie paraksti
-    4K: 4K
diff --git a/static/locales/nb-NO.yaml b/static/locales/nb-NO.yaml
index 9c214f5180838..624c9e2578a26 100644
--- a/static/locales/nb-NO.yaml
+++ b/static/locales/nb-NO.yaml
@@ -32,21 +32,11 @@ Forward: 'Framover'
 # Anything shared among components / views should be put here
 Global:
   Videos: 'Videoer'
-  Shorts: Shorts-videoer
-  Live: Direktesendinger
-  Community: Fellesskap
+  Shorts: Kortvideoer
+  Live: Direkte
+  Community: Gemenskap
 
 # Search Bar
-  Counts:
-    Subscriber Count: 1 abonnent | {count} abonnenter
-    Watching Count: 1 seer | {count] seere
-    Channel Count: 1 kanal | {count} kanaler
-    Comment Count: 1 kommentar | {count} kommentarer
-    Video Count: 1 video | {count} videoer
-    View Count: 1 visning | {count} visninger
-    Like Count: 1 liker | {count} liker
-  Input Tags:
-    Length Requirement: Etiketten må minst være {number} tegn lang.
 Search / Go to URL: 'Søk/gå til nettadresse'
   # In Filter Button
 Search Filters:
@@ -84,18 +74,6 @@ Search Filters:
   Fetch more results: 'Hent flere resultater'
 # Sidebar
   There are no more results for this search: Søket ga ingen flere resultater
-  Features:
-    HD: HD
-    VR180: VR180
-    Subtitles: Underskrifter
-    Creative Commons: Creative Commons
-    3D: 3D
-    Live: Direktesendt
-    4K: 4K
-    Location: Sted
-    HDR: HDR
-    Features: Egenskaper
-    360 Video: 360 Video
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Abonnementer'
@@ -105,7 +83,7 @@ Subscriptions:
   'Getting Subscriptions.  Please wait.': 'Henter abonnementer. Vent.'
   Refresh Subscriptions: Oppdater abonnementer
   Getting Subscriptions. Please wait.: Henter abonnementer. Vennligst vent.
-  Load More Videos: Last inn flere videoer
+  Load More Videos: Last flere videoer
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Denne
     profilen har mange abonnementer. Påtvinger RSS for å unngå adgangsbegrensning
   Error Channels: Kanaler med feil
@@ -115,8 +93,6 @@ Subscriptions:
   Subscriptions Tabs: Abonnementsfaner
   All Subscription Tabs Hidden: Alle abonnementsfaner er skjult. Opphev skjuling av
     noen faner i «{subsection}»-delen av «{settingsSection}» for å vise innhold her.
-  Empty Posts: Kanalene du abonnerer på, har ikke noen innlegg for øyeblikket.
-  Load More Posts: Last inn flere poster
 Trending:
   Trending: 'På vei opp'
   Trending Tabs: På vei opp-faner
@@ -128,97 +104,14 @@ Most Popular: 'Mest populært'
 Playlists: 'Spillelister'
 User Playlists:
   Your Playlists: 'Dine spillelister'
+  Playlist Message: Denne siden reflekterer ikke fullstendig fungerende spillelister.
+    Den viser kun videoer du har lagret eller favorittmerket. Når arbeidet er fullført,
+    vil alle videoer som vises her bli overført til en «Favoritt»-spilleliste.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Du
+    har ikke lagret noen videoer enda. Klikk på «Lagre»-knappen i hjørnet av en video
+    for å sende den hit
   Empty Search Message: Ingen videoer i denne spillelisten samsvarer med søket ditt
   Search bar placeholder: Søk i spilleliste
-  SinglePlaylistView:
-    Toast:
-      This playlist does not exist: Denne spillelisten finnes ikke
-      This video cannot be moved down.: Denne videoen kan ikke bli flyttet ned.
-      Video has been removed: Videoen har blitt fjernet
-      There were no videos to remove.: Det var ingen videoer å fjerne
-      There was an issue with updating this playlist.: Det oppstod et problem ved
-        oppdateringen av denne spillelisten.
-      "{videoCount} video(s) have been removed": 1 video har blitt fjernet | {videoCount}
-        videoer har blitt fjernet
-      Playlist has been updated.: Spilleliste har blitt endret
-      There was a problem with removing this video: Det oppstod et problem ved fjerningen
-        av denne videoen
-      This video cannot be moved up.: Denne videoen kan ikke bli flyttet opp.
-      Playlist {playlistName} has been deleted.: Spillelisten {playlistName} har blitt
-        fjernet.
-      This playlist is protected and cannot be removed.: Denne spillelisten er beskyttet,
-        og kan derfor ikke bli fjernet.
-      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Noen
-        av videoene i spillelisten har ikke blitt lastet inn skikkelig, enda. Trykk
-        her for å kopiere, uansett.
-      Playlist name cannot be empty. Please input a name.: Spillelisten må ha et navn.
-        Vennligst gi den et navn.
-    Search for Videos: Søk etter videoer
-  AddVideoPrompt:
-    Allow Adding Duplicate Video(s): Tillat å legge til dupliserte videoer
-    Search in Playlists: Søk i spillelister
-    Save: Lagre
-    N playlists selected: '{playlistCount} valgt'
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
-      videoer vil bli lagt til'
-    Toast:
-      You haven't selected any playlist yet.: Du har ikke valgt noen spillelister
-        enda.
-      "{videoCount} video(s) added to 1 playlist": 1 video lagt til 1 spilleliste
-        | {videoCount} videoer lagt til 1 spilleliste
-  Cancel: Avbryt
-  Add to Playlist: Legg til spilleliste
-  This playlist currently has no videos.: Denne spillelisten har ikke noen videoer
-    for øyeblikket.
-  Export Playlist: Eksporter denne spillelisten
-  Sort By:
-    EarliestCreatedFirst: Tidligst opprettet
-    Sort By: Sorter etter
-    EarliestUpdatedFirst: Tidligst endret
-    LatestPlayedFirst: Sist spilt av
-    EarliestPlayedFirst: Tidligst spilt av
-    LatestUpdatedFirst: Nylig endret
-    NameAscending: A-Å
-    NameDescending: Å-A
-    LatestCreatedFirst: Nylig opprettet
-  Add to Favorites: Legg til {playlistName}
-  Move Video Up: Flytt video opp
-  Move Video Down: Flytt video ned
-  Playlist Description: Beskrivelse på spilleliste
-  Save Changes: Lagre endringer
-  Copy Playlist: Kopier spilleliste
-  Playlist Name: Navn på spilleliste
-  Remove Watched Videos: Fjern sette videoer
-  Playlists with Matching Videos: Spillelister med like videoer
-  Create New Playlist: Opprett ny spilleliste
-  Remove from Favorites: Fjern fra {playlistName}
-  The playlist has been successfully exported: Spillelisten ble eksportert
-  Delete Playlist: Fjern spilleliste
-  CreatePlaylistPrompt:
-    Create: Opprett
-    New Playlist Name: Nytt navn på spilleliste
-    Toast:
-      There was an issue with creating the playlist.: Det oppstod et problem ved opprettelsen
-        av spillelisten.
-      There is already a playlist with this name. Please pick a different name.: Det
-        finnes allerede en spilleliste med det navnet. Vennligst velg et annet navn.
-      Playlist {playlistName} has been successfully created.: Spillelisten {playlistName}
-        har blitt opprettet.
-  Edit Playlist Info: Endre informasjon til spilleliste
-  Remove Duplicate Videos: Fjern duplikatvideoer
-  Remove from Playlist: Fjern fra spilleliste
-  You have no playlists. Click on the create new playlist button to create a new one.: Du
-    har ingen spillelister. Trykk på plusstegnet for å opprette en ny en.
-  Are you sure you want to delete this playlist? This cannot be undone: Er du sikker
-    på at du vil fjerne denne spillelisten? Dette kan ikke bli omgjort.
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Er
-    du sikker på at du vil fjerne en duplikatvideo fra denne spillelisten? Dette kan
-    ikke bli omgjort. Er du sikker på at du vil fjerne {playlistItemCount} duplikate
-    videoer fra denne spillelisten? Denne kan ikke bli omgjort.
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Er
-    du sikker på at du vil fjerne 1 sett video fra denne spillelisten? Dette kan ikke
-    bli omgjort. | Er du sikker på at du vil fjerne {playlistItemCount} sette videoer
-    fra denne spillelisten? Dette kan ikke bli omgjort.
 History:
   # On History Page
   History: 'Historikk'
@@ -235,7 +128,7 @@ Settings:
       bakende ved feil'
     Enable Search Suggestions: 'Slå på søkeforslag'
     Default Landing Page: 'Forvalgt landingsside'
-    Locale Preference: 'Innstillinger for språk'
+    Locale Preference: 'Språkinnstilling'
     Preferred API Backend:
       Preferred API Backend: 'Foretrukket API-bakende'
       Local API: 'Lokalt API'
@@ -245,12 +138,13 @@ Settings:
       Grid: 'Rutenett'
       List: 'Liste'
     Thumbnail Preference:
-      Thumbnail Preference: 'Innstillinger for miniatyrbilder'
+      Thumbnail Preference: 'Miniatyrbilde-innstilling'
       Default: 'Forvalg'
       Beginning: 'Begynnelsen'
       Middle: 'Midten'
       End: 'Slutten'
-      Hidden: Skjult
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Individious-forekomst
+      (forvalget er https://invidious.snopyta.org)'
     Region for Trending: 'Region for "På vei opp"'
         #! List countries
     Check for Updates: Se etter oppdateringer
@@ -269,11 +163,8 @@ Settings:
       Ask Before Opening Link: Spør før åpning av lenke
       Open Link: Åpne lenke
       External Link Handling: Håndtering av eksterne lenker
-    Auto Load Next Page:
-      Label: Last inn den neste siden automatisk
-      Tooltip: Last inn flere sider og kommentarer automatisk.
   Theme Settings:
-    Theme Settings: 'Tema'
+    Theme Settings: 'Draktvalg'
     Match Top Bar with Main Color: 'Tilpass topplinjen slik at den har samme farge
       som hovedfargen'
     Base Theme:
@@ -284,8 +175,6 @@ Settings:
       Dracula: 'Dracula'
       System Default: Systemforvalg
       Catppuccin Mocha: Catppuccin-mokka
-      Pastel Pink: Pastellrosa
-      Nordic: Nordisk
     Main Color Theme:
       Main Color Theme: 'Hovedfarge'
       Red: 'Rød'
@@ -331,9 +220,9 @@ Settings:
     Disable Smooth Scrolling: Slå av myk rulling
     Expand Side Bar by Default: Utvidet sidefelt som forvalg
     Hide Side Bar Labels: Skjul sidefeltsetiketter
-    Hide FreeTube Header Logo: Skjul FreeTubes tittel og logo
+    Hide FreeTube Header Logo: Skjul FreeTube-tittellogo
   Player Settings:
-    Player Settings: 'Innstillinger for avspilling av video'
+    Player Settings: 'Videoavspillingsinnstillinger'
     Play Next Video: 'Spill av neste video'
     Turn on Subtitles by Default: 'Undertekster som forvalg'
     Autoplay Videos: 'Spill av videoer automatisk'
@@ -348,7 +237,7 @@ Settings:
       Legacy Formats: 'Gamle formater'
       Audio Formats: 'Lydformater'
     Default Quality:
-      Default Quality: 'Forvalt kvalitet'
+      Default Quality: 'Kvalitetsinnstilling'
       Auto: 'Automatisk'
       144p: '144p'
       240p: '240p'
@@ -369,31 +258,30 @@ Settings:
       Error:
         Forbidden Characters: Forbudte tegn
         Empty File Name: Tomt filnavn
-      Enable: Aktiver skjermbilde
+      Enable: Skru på skjermavbildninger
       Folder Label: Skjermavbildningsmappe
       Folder Button: Velg mappe
-      Format Label: Format for skjermbilde
-      Quality Label: Kvalitet for skjermbilde
+      Format Label: Skjermavbildningsformat
+      Quality Label: Skjermavbildningskvalitet
       Ask Path: Spør om hvor ting skal lagres
       File Name Tooltip: Du kan bruke variablene nedenfor. %Y år, i 4 siffer. %M måned,
         i 2 siffer. %D dag, i to siffer. %H time, i to siffer. %N minutt, i to siffer.
         %s sekund, i to siffer. %T millisekunder, i tre siffer. %s videosekund. %t
         videomillisekunder, i tre siffer. %i video-ID. Du kan også bruke «\», eller
         «/» for å lage undermapper.
-    Max Video Playback Rate: Maksimal hastighet for videoavspilling
+    Max Video Playback Rate: Maks. videoavspillingshastighet
     Scroll Playback Rate Over Video Player: Avspillingshastighet ved rulling over
       videoavspiller
     Video Playback Rate Interval: Intervall for videoavspillingshastighet
     Enter Fullscreen on Display Rotate: Fullskjermsvisning når skjermen roteres
     Skip by Scrolling Over Video Player: Hopp over ved å rulle over videoavspiller
   Privacy Settings:
-    Privacy Settings: 'Innstillinger for personvern'
+    Privacy Settings: 'Personvernsinnstillinger'
     Remember History: 'Husk historikk'
     Save Watched Progress: 'Husk avspillingsposisjon'
-    Clear Search Cache: 'Tøm hurtiglager for søk'
-    Are you sure you want to clear out your search cache?: 'Er du sikker på at du
-      vil tømme hurtiglageret for søk?'
-    Search cache has been cleared: 'Hurtiglageret for søk har blitt tømt'
+    Clear Search Cache: 'Tøm søkehurtiglager'
+    Are you sure you want to clear out your search cache?: 'Tøm søkehurtiglager?'
+    Search cache has been cleared: 'Søkehurtiglager tømt'
     Remove Watch History: 'Fjern visningshistorikk'
     Are you sure you want to remove your entire watch history?: 'Er du sikker på at
       du vil fjerne hele visningshistorikken din?'
@@ -401,23 +289,41 @@ Settings:
     Remove All Subscriptions / Profiles: Fjern alle abonnementer/profiler
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Er
       du sikker på at du vil fjerne alle abonnementer og profiler? Dette kan ikke
-      bli omgjort.
+      angres.
     Save Watched Videos With Last Viewed Playlist: Lagre sette videoer med sist sette
       spilleliste
-    Remove All Playlists: Fjern alle spillelister
-    Are you sure you want to remove all your playlists?: Er du sikker på at du vil
-      fjerne alle spillelistene dine?
-    All playlists have been removed: Alle spillelister har blitt fjernet
   Subscription Settings:
-    Subscription Settings: 'Innstillinger for abonnementer'
+    Subscription Settings: 'Abonnementsinnstillinger'
     Hide Videos on Watch: 'Skjul sette videoer'
+    Subscriptions Export Format:
+      Newpipe: 'NewPipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Håndter abonnementer'
+    Import Subscriptions: 'Importer abonnementer'
+    Export Subscriptions: 'Eksporter abonnementer'
+    How do I import my subscriptions?: 'Hvordan importerer jeg mine abonnementer?'
     Fetch Feeds from RSS: Hent informasjonskanaler fra RSS
     Fetch Automatically: Hent informasjonskanaler automatisk
+  Advanced Settings:
+    Advanced Settings: 'Avanserte innstillinger'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Mellomtjener-adresse (Eksempel:
+      SOCKS5://127.0.0.1:9050 )'
+    Use Tor / Proxy for API calls: 'Bruk Tor / mellomtjener for API-kall'
+    Clear History:
+      Clear History: 'Tøm historikk'
+      # On Click
+      Are you sure you want to delete your history?: 'Er du sikker på at du vil slette
+        historikken din?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Tøm abonnementer'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Er du sikker på at du vil
+        fjerne alle abonnementer?'
+      #& Yes
+      #& No
 
-    Confirm Before Unsubscribing: Bekreft avslutning av abonnement
-    'Limit the number of videos displayed for each channel': Begrens antallet videoer
-      vist for hver kanal
-    To: Til
   Data Settings:
     How do I import my subscriptions?: Hvordan importerer jeg abonnementene mine?
     Unknown data key: Ukjent datanøkkel
@@ -438,6 +344,7 @@ Settings:
     Invalid subscriptions file: Ugyldig abonnementsfil
     Profile object has insufficient data, skipping item: Hopper over profilobjektet
       siden det har utilstrekkelig data.
+    Check for Legacy Subscriptions: Se etter foreldede abonnementer
     Subscriptions have been successfully exported: Abonnementer eksportert
     This might take a while, please wait: Dette kan ta litt tid …
     Export History: Eksporter historikk
@@ -446,10 +353,13 @@ Settings:
     Export YouTube: YouTube-eksport
     Export FreeTube: FreeTube-eksport
     Export Subscriptions: Eksporter abonnementer
+    Import NewPipe: Importer NewPipe
+    Import YouTube: Importer YouTube
+    Import FreeTube: Importer FreeTube
     Import Subscriptions: Importer abonnementer
     Select Export Type: Velg eksporttype
     Select Import Type: Velg importtype
-    Data Settings: Innstillinger for data
+    Data Settings: Datainnstillinger
     All playlists has been successfully imported: Importerte alle spillelister
     Subscription File: Abonnementsfil
     History File: Historikkfil
@@ -474,51 +384,44 @@ Settings:
     Proxy Host: Mellomtjenervert
     Proxy Protocol: Mellomtjenerprotokoll
     Enable Tor / Proxy: Skru på Tor/mellomtjener
-    Proxy Settings: Innstillinger for mellomtjenere
+    Proxy Settings: Mellomtjenerinnstillinger
   Distraction Free Settings:
     Hide Trending Videos: Skjul "På vei opp"
     Hide Video Likes And Dislikes: Skjul videogunst
-    Distraction Free Settings: Innstillinger for andre tilpasninger
+    Distraction Free Settings: Distraksjonsfri-innstillinger
     Hide Active Subscriptions: Skjul aktive abonnementer
     Hide Recommended Videos: Skjul anbefalte videoer
     Hide Comment Likes: Skjul kommentargunst
     Hide Channel Subscribers: Skjul kanalabonnementer
     Hide Popular Videos: Skjul "Mest populært"
     Hide Video Views: Skjul videovisninger
-    Hide Live Chat: Skjul direktechat
+    Hide Live Chat: Skjul sanntidssludring
     Hide Playlists: Skjul spillelister
     Hide Comments: Skjul kommentarer
-    Hide Live Streams: "Skjul direktesendinger"
+    Hide Live Streams: "Skjul direktestrømmer"
     Hide Chapters: Skjul kapitler
-    Hide Channels Placeholder: Kanal-ID
+    Hide Channels Placeholder: Kanalnavn eller ID
     Hide Channels: Skjul videoer fra kanaler
     Hide Sharing Actions: Skjul delingshandlinger
     Hide Upcoming Premieres: Skjul kommende premièrer
     Hide Video Description: Skjul videobeskrivelse
     Display Titles Without Excessive Capitalisation: Vis titler uten overdrevet bruk
       av store bokstaver
-    Hide Featured Channels: Skjul fremhevede kanaler
-    Hide Channel Community: Skjul fane for "fellesskap" i kanaler
-    Hide Channel Shorts: Skjul fane for "Shorts-videoer" i kanaler
+    Hide Featured Channels: Skjult framhevede kanaler
+    Hide Channel Community: Skjul kanalgemenskap
+    Hide Channel Shorts: Skjul kanal-kortvideoer
     Sections:
       Side Bar: Sidefelt
       Channel Page: Kanalside
       General: Generelt
       Watch Page: Seerlogg
       Subscriptions Page: Abonnementsside
-    Hide Channel Playlists: Skjul fane for "spillelister" i kanalar
+    Hide Channel Playlists: Skjul kanalspilleliste
     Hide Channel Releases: Skjul kanalpubliseringer
-    Hide Channel Podcasts: Skjul fane for "podcaster" i kanaler
+    Hide Channel Podcasts: Skjul kanal-nettradioopptak
     Hide Subscriptions Videos: Skjul abonnementsvideoer
-    Hide Subscriptions Shorts: Skjul Shorts
+    Hide Subscriptions Shorts: Skjul abonnements-kortvideoer
     Hide Subscriptions Live: Skjul abonnement det sendes direkte fra
-    Hide Profile Pictures in Comments: Skjul profilbilder i kommentarfeltet
-    Hide Channel Home: Skjule fane for "start" i kanaler
-    Hide Videos and Playlists Containing Text: Skjul videoer og spillelister som inneholder
-      tekst
-    Hide Channels Already Exists: Kanal-ID-en finnes allerede
-    Hide Videos and Playlists Containing Text Placeholder: Ord, del av ord eller setning
-    Hide Channels Invalid: Kanal-ID-en var ugyldig
   The app needs to restart for changes to take effect. Restart and apply change?: Start
     programmet på ny for å ta i bruk endringene?
   SponsorBlock Settings:
@@ -527,7 +430,7 @@ Settings:
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock-API-nettadresse
       (forvalget er https://sponsor.ajay.app)
     Enable SponsorBlock: Skru på SponsorBlock
-    SponsorBlock Settings: Innstillinger for SponsorBlock
+    SponsorBlock Settings: SponsorBlock-innstillinger
     Skip Options:
       Do Nothing: Ikke gjør noe
       Prompt To Skip: Spør om å hoppe over
@@ -536,12 +439,10 @@ Settings:
       Show In Seek Bar: Vis i blafringsfelt
     Category Color: Kategorifarge
     UseDeArrowTitles: Bruk DeArrow-videonavn
-    UseDeArrowThumbnails: Bruk DeArrow for miniatyrbilder
   External Player Settings:
     Custom External Player Arguments: Egendefinerte argumenter for ekstern avspiller
     Custom External Player Executable: Egendefinert kjørbar fil for ekstern avspiller
-    Ignore Unsupported Action Warnings: Ignorer advarsler om handlinger som ikke er
-      støttet
+    Ignore Unsupported Action Warnings: Ignorer advarsler om ustøttede handlinger
     External Player Settings: Innstillinger for ekstern avspiller
     External Player: Ekstern avspiller
     Players:
@@ -549,7 +450,7 @@ Settings:
         Name: Ingen
   Download Settings:
     Choose Path: Velg sti
-    Download Settings: Innstillinger for nedlastninger
+    Download Settings: Nedlastingsinnstillinger
     Download in app: Last ned i programmet
     Open in web browser: Åpne i nettleser
     Download Behavior: Nedlastingsadferd
@@ -557,7 +458,7 @@ Settings:
   Parental Control Settings:
     Parental Control Settings: Foreldrekontroll
     Hide Search Bar: Skjul søkefelt
-    Show Family Friendly Only: Vis kun familievennlig innhold
+    Show Family Friendly Only: Kun vis familievennlige
     Hide Unsubscribe Button: Skjul knapp for opphevelse av abonnement
   Experimental Settings:
     Experimental Settings: Eksperimentelle innstillinger
@@ -566,7 +467,7 @@ Settings:
       anbefales. Bruk på egen risiko.
   Password Settings:
     Remove Password: Fjern passord
-    Password Settings: Innstillinger for passord
+    Password Settings: Passordinnstillinger
     Set Password To Prevent Access: Sett et passord for å forhindre tilgang til innstillingene
     Set Password: Sett passord
   Password Dialog:
@@ -574,20 +475,23 @@ Settings:
     Enter Password To Unlock: Skriv inn passord for å låse opp innstillinger
     Password Incorrect: Feil passord
     Password: Passord
-  Return to Settings Menu: Gå tilbake til menyen for innstillinger
 About:
   #On About page
   About: 'Om'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Denne
+    gemenslig frie programvaren er lisensiert AGPL-3.0.'
 
   FAQ: Ofte stilte spørsmål
   Downloads / Changelog: Nedlastninger / Endringslogg
+  Licensed under the AGPLv3: Lisensiert AGPLv3.
   Help: Hjelp
+  View License: Vis lisens
   Donate: Doner
   Website: Nettsted
   Report a problem: Rapporter et problem
   Source code: Kildekode
-  Please read the: Vennligst les
+  Please read the: Les
   Mastodon: Mastodon
   Email: E-post
   Blog: Blogg
@@ -596,16 +500,16 @@ About:
   these people and projects: disse folkene og prosjektene
   FreeTube is made possible by: FreeTube er gjort mulig av
   Credits: Bidragsytere
-  room rules: reglene for rommet
+  room rules: romregler
   GitHub issues: GitHub-problemsporer
   FreeTube Wiki: FreeTube-wiki
   GitHub releases: GitHub-utgivelser
   Beta: Beta
   Chat on Matrix: Snakk med oss på Matrix
   Discussions: Diskusjoner
-  Licensed under the: Lisensiert under
-  AGPLv3: AGPLv3
 Channel:
+  Subscriber: 'Abonnent'
+  Subscribers: 'Abonnenter'
   Subscribe: 'Abonner'
   Unsubscribe: 'Opphev abonnement'
   Search Channel: 'Søk i kanal'
@@ -649,11 +553,11 @@ Channel:
   Community:
     This channel currently does not have any posts: Denne kanalen har ingen oppføringer
   Shorts:
-    This channel does not currently have any shorts: Denne kanalen har ingen Shorts-videoer
+    This channel does not currently have any shorts: Denne kanalen har ingen kortvideoer
   Live:
     Live: Direkte
     This channel does not currently have any live streams: Denne kanalen har ikke
-      noen direktesendinger
+      noen direktestrømmer
   Podcasts:
     Podcasts: Nettradioopptak
     This channel does not currently have any podcasts: Denne kanalen har ingen nettradioopptak
@@ -677,19 +581,48 @@ Video:
   # As in a Live Video
   Live: 'Direkte'
   Live Now: 'Direkte'
-  Live Chat: 'Direktechat'
-  Enable Live Chat: 'Slå på direktechat'
-  Live Chat is currently not supported in this build.: 'Direktechat støttes ikke i
-    denne versjonen.'
+  Live Chat: 'Sanntidssludring'
+  Enable Live Chat: 'Slå på sanntidssludring'
+  Live Chat is currently not supported in this build.: 'Sanntidssludring støttes ikke
+    i denne versjonen.'
   'Chat is disabled or the Live Stream has ended.': 'Sludringen er slått av, eller
     så er direktesendingen avsluttet.'
-  Live chat is enabled. Chat messages will appear here once sent.: 'Direktechat er
-    påslått. Meldinger vil vises her når de er sendt.'
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Direktechat
+  Live chat is enabled. Chat messages will appear here once sent.: 'Sanntidssludring
+    er påslått. Meldinger vil vises her når de er sendt.'
+  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Sanntidssludring
     støttes for tiden ikke med Invidious-API-et. Direkte tilkobling til YouTube kreves.'
   Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Mai'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Des'
+    Second: 'Sekund'
+    Seconds: 'Sekunder'
+    Hour: 'Time'
+    Hours: 'Timer'
+    Day: 'Dag'
+    Days: 'Dager'
+    Week: 'Uke'
+    Weeks: 'Uker'
+    Month: 'Måned'
+    Months: 'Måneder'
+    Year: 'År'
+    Years: 'År'
+    Ago: 'Siden'
+    Upcoming: 'Har premiere'
+    Minutes: Minutter
+    Minute: Minutt
     In less than a minute: Om mindre enn ett minutt
   Published on: 'Publisert'
+  Publicationtemplate: '{number} {unit} siden'
 #& Videos
   audio only: Bare lyd
   video only: Bare video
@@ -741,7 +674,7 @@ Video:
   Premieres on: Har première
   Premieres: Première
   Upcoming: Kommende
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Direktechat
+  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': Sanntidssludring
     er ikke tilgjengelig for denne strømmen. Opplasteren kan ha skrudd det av.
 Videos:
   #& Sort By
@@ -753,12 +686,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vis full spilleliste'
+  Videos: 'Videoer'
+  View: 'Visning'
+  Views: 'Visninger'
   Last Updated On: 'Sist oppdatert'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Spilleliste
+Toggle Theatre Mode: 'Teatermodus'
 Change Format:
   Change Media Formats: 'Endre videoformater'
   Use Dash Formats: 'Bruk DASH-formater'
@@ -821,6 +758,8 @@ Local API Error (Click to copy): 'Lokal API-feil (Klikk her for å kopiere)'
 Invidious API Error (Click to copy): 'Invidious-API-feil (Klikk her for å kopiere)'
 Falling back to Invidious API: 'Faller tilbake til Invidious-API-et'
 Falling back to Local API: 'Faller tilbake til det lokale API-et'
+Subscriptions have not yet been implemented: 'Abonnement har ikke blitt implementert
+  enda'
 Loop is now disabled: 'Gjenta er nå deaktivert'
 Loop is now enabled: 'Gjenta er nå aktivert'
 Shuffle is now disabled: 'Tilfeldig avspilling er nå deaktivert'
@@ -840,8 +779,8 @@ Profile:
   Removed {profile} from your profiles: Fjernet {profile} fra dine profiler
   Your default profile has been set to {profile}: 'Din forvalgte profil har blitt
     satt til {profile}'
-  Profile has been updated: Profilen har blitt oppdatert
-  Profile has been created: Profilen har blitt opprettet
+  Profile has been updated: Profil oppdatert
+  Profile has been created: Profil opprettet
   Your profile name cannot be empty: Profilnavnet ditt kan ikke stå tomt
   Profile could not be found: Fant ikke profilen
   All subscriptions will also be deleted.: Alle abonnementer vil også bli slettet.
@@ -870,16 +809,13 @@ Profile:
     De samme kanalene vil bli slettet i enhver profil de finnes i.
   Select None: Velg ingen
   Delete Selected: Slett valgte
-  Add Selected To Profile: Legg til de valgte kanalene til profilen
+  Add Selected To Profile: Legg til valgt i profil
   Subscription List: Abonnementsliste
   Profile Preview: Profilforhåndsvisning
   Custom Color: Egendefinert farge
   Profile Filter: Profilfilter
   Profile Settings: Profilinnstillinger
   Toggle Profile List: Slå av/på profilliste
-  Profile Name: Profilnavn
-  Create Profile Name: Lag profilnavn
-  Edit Profile Name: Endre profilnavn
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Denne
   videoen er utilgjengelig grunnet manglende formater. Dette kan skyldes tilgangbegrensninger
   i ditt land.
@@ -952,6 +888,8 @@ Playing Next Video Interval: Spiller av neste video nå. Klikk her for å avbryt
 More: Mer
 Unknown YouTube url type, cannot be opened in app: Ukjent YouTube-nettadressetype,
   kan ikke åpnes i programmet
+Hashtags have not yet been implemented, try again later: Emneknagger er ikke implementert
+  enda, prøv igjen senere
 Open New Window: Åpne et nytt vindu
 Default Invidious instance has been cleared: Fjernet forvalgt Invidious-instans
 Default Invidious instance has been set to {instance}: Forvalgt Invidious-instans
@@ -968,6 +906,8 @@ Channels:
   Search bar placeholder: Søk i kanaler
   Count: Fant {number} kanal(er).
   Empty: Kanallisten din er tom.
+  Unsubscribe: Opphev abonnement
+  Unsubscribed: '{channelName} ble fjernet fra dine abonnementer'
   Unsubscribe Prompt: Opphev abonnement på «{channelName}»?
 Chapters:
   Chapters: Kapitler
@@ -991,34 +931,3 @@ Hashtag:
   This hashtag does not currently have any videos: Denne emneknaggen har ingen videoer
     enda
 checkmark: ✓
-Cancel: Avbryt
-Yes, Restart: Ja, start på nytt
-Search Listing:
-  Label:
-    Subtitles: Undertekster
-    4K: 4K
-    Closed Captions: Undertekster
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Ny
-    3D: 3D
-Feed:
-  Refresh Feed: Oppdater {subscriptionName}
-Yes, Delete: Ja, slett
-Keys:
-  alt: Alt
-  arrowup: Piltast opp
-  arrowleft: Venstre piltast
-  arrowright: Høyre piltast
-  ctrl: Ctrl
-  arrowdown: Piltast ned
-Right-click or hold to see history: Høyreklikk eller hold musepekeren over for å se
-  historikk
-Close Banner: Lukk banner
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Yes, Open Link: Ja, åpne lenke
-Display Label: '{label}: {value}'
-Go to page: Gå til {page}
-Search character limit: Spørringen er over tegngrensen på {searchCharacterLimit}
diff --git a/static/locales/ne.yaml b/static/locales/ne.yaml
index 6ff55a8728c96..88cb5e2749fe1 100644
--- a/static/locales/ne.yaml
+++ b/static/locales/ne.yaml
@@ -96,6 +96,9 @@ Most Popular: 'सबैभन्दा लोकप्रिय'
 Playlists: 'प्लेसूचीहरू'
 User Playlists:
   Your Playlists: 'तपाईंका प्लेसूचीहरू'
+  Playlist Message: 'यो पृष्ठले पूरै काम गर्ने प्लेसूचीहरूको प्रतिबिम्बित गर्दैन।
+    यसले तपाईंले बचत गर्नुभएका वा मन पराउनुभएका भिडियोहरू मात्र सूचीबद्ध गर्दछ। काम
+    सकिएपछि हाल यहाँ रहेका सबै भिडियोहरू ''मन पराइएका'' प्लेसूचीमा स्थानान्तरण गरिनेछ।'
 Settings:
   # On Settings Page
   Theme Settings: {}
diff --git a/static/locales/nl.yaml b/static/locales/nl.yaml
index df79871d74811..93a2dc8100c48 100644
--- a/static/locales/nl.yaml
+++ b/static/locales/nl.yaml
@@ -129,6 +129,13 @@ Most Popular: 'Populairst'
 Playlists: 'Afspeel­lijsten'
 User Playlists:
   Your Playlists: 'Uw afspeel­lijsten'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Je
+    opgeslagen video's is leeg. Klik op de opslaan knop in de hoek van een video om
+    het hier in de lijst te plaatsen
+  Playlist Message: Deze pagina is niet reflectief van volledig functionele afspeellijst.
+    Er worden alleen video's weergegeven die jij hebt opgeslagen of gefavoriet. Wanneer
+    we klaar zijn met de ontwikkeling van deze feature zullen al deze video's worden
+    gemigreerd naar de 'favorieten' afspeellijst.
   Search bar placeholder: Zoeken naar afspeel­lijsten
   Empty Search Message: Deze afspeel­lijst bevat geen video's die overeen­komen met
     de zoek­opdracht
@@ -187,9 +194,11 @@ User Playlists:
   Remove Watched Videos: Bekeken video's verwijderen
   Add to Favorites: Toevoegen aan {playlistName}
   Remove from Favorites: Verwijderen uit {playlistName}
+  Disable Quick Bookmark: Snelle bladwijzers uitschakelen
   SinglePlaylistView:
     Toast:
       Video has been removed: Video is verwijderd
+      Quick bookmark disabled: Snelle bladwijzers uitgeschakeld
       Playlist has been updated.: De afspeel­lijst is bijgewerkt.
       This video cannot be moved up.: Deze video kan niet omhoog verplaatst worden.
       This video cannot be moved down.: Deze video kan niet omlaag verplaatst worden.
@@ -226,6 +235,9 @@ User Playlists:
   This playlist currently has no videos.: Deze afspeel­lijst bevat geen video's.
   Enable Quick Bookmark With This Playlist: Snelle blad­wijzers inschakelen voor deze
     afspeel­lijst
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Weet
+    u zeker dat u alle bekeken video's uit deze afspeel­lijst wilt verwijderen? Dit
+    kan niet ongedaan gemaakt worden.
   Are you sure you want to delete this playlist? This cannot be undone: Weet u zeker
     dat u deze afspeel­lijst wilt verwijderen? Dit kan niet ongedaan gemaakt worden.
   Playlists with Matching Videos: Afspeel­lijsten met overeen­komende video's
@@ -275,6 +287,8 @@ Settings:
       End: 'Eind'
       Hidden: Verborgen
       Blur: Vervagen
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instantie
+      (Standaard is https://invidious.snopyta.org)'
     Region for Trending: 'Regio voor trending'
         #! List countries
     Check for Latest Blog Posts: Op nieuwe blog­posts controleren
@@ -446,9 +460,38 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Abonnement­instellingen'
     Hide Videos on Watch: 'Bekeken video''s verbergen'
+    Manage Subscriptions: 'Abonnementen beheren'
     Fetch Feeds from RSS: Feeds ophalen via RSS
     Fetch Automatically: Feed automatisch ophalen
+    Only Show Latest Video for Each Channel: Alleen nieuwste video voor elk kanaal
+      tonen
     Confirm Before Unsubscribing: Onbedoeld deabonneren voor­komen
+  Advanced Settings:
+    Advanced Settings: 'Geavanceerde Instellingen'
+    Enable Debug Mode (Prints data to the console): 'Schakel Debug Modus in (Print
+      data naar console)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy Adres (Voorbeeld:
+      SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Door
+      op "TEST PROXY" te klikken zal er een verzoek worden gestuurd naar https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Gebruik Tor / Proxy voor API calls'
+    TEST PROXY: 'TEST PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Zie Publieke Instanties'
+    Clear History:
+      Clear History: 'Geschiedenis Opschonen'
+      # On Click
+      Are you sure you want to delete your history?: 'Weet u zeker dat u uw geschiedenis
+        wil verwijderen?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Abonnementen Opschonen'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Weet u zeker dat u alle
+        abonnementen wil verwijderen?'
+      #& Yes
+      #& No
 
   Data Settings:
     History object has insufficient data, skipping item: Geschiedenis object heeft
@@ -469,6 +512,9 @@ Settings:
     Export YouTube: YouTube exporteren
     Export FreeTube: FreeTube exporteren
     Export Subscriptions: Abonnementen exporteren
+    Import NewPipe: NewPipe importeren
+    Import YouTube: YouTube importeren
+    Import FreeTube: Importeer FreeTube
     Import Subscriptions: Abonnementen importeren
     Select Export Type: Exporteertype selecteren
     Select Import Type: Importeertype selecteren
@@ -481,6 +527,7 @@ Settings:
       met succes geëxporteerd
     All watched history has been successfully imported: De bekeken geschiedenis is
       met succes geïmporteerd
+    Check for Legacy Subscriptions: Op legacy-abonnementen controleren
     Manage Subscriptions: Abonnementen beheren
     Export Playlists: Afspeellijsten exporteren
     All playlists has been successfully imported: Alle speellijsten zijn met succes
@@ -528,6 +575,7 @@ Settings:
     Hide Chapters: Hoofdstukken verbergen
     Hide Upcoming Premieres: Aankomende premières verbergen
     Hide Featured Channels: Uitgelichte kanalen verbergen
+    Blur Thumbnails: Miniaturen vervagen
     Hide Channel Playlists: Kanaal­afspeellijsten verbergen
     Hide Channel Community: Kanaal­gemeenschap verbergen
     Hide Channels: Video's van kanalen verbergen
@@ -628,11 +676,39 @@ Settings:
     Password Incorrect: Wachtwoord onjuist
     Unlock: Ontgrendelen
     Enter Password To Unlock: Voer wachtwoord in om instellingen te ontgrendelen
+  Expand All Settings Sections: Alle instellingen­secties uitvouwen
   Sort Settings Sections (A-Z): Instellingen­secties sorteren (A-Z)
 About:
   #On About page
   About: 'Over'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Dit
+    is copyleft software en is vrij beschikbaar onder de AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Een probleem gevonden? Idee voor een feature? Wil je helpen? Ga naar onze GitHub
+    pagina. Pull requests zijn welkom.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Hartelijk
+    dank naar de Mensen en Projecten die FreeTube mogelijk maken!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Wil
+    je chatten? Kom op onze Element / Matrix Server. Lees alstublieft eerst de groep
+    regels voordat u in de chat springt.'
+
+  'Looking for help? Check out our Wiki page.': 'Heeft u hulp nodig? Bezichtig onze
+    Wiki pagina.'
+
+  Check out our Firefox extension!: 'Bekijk onze Firefox extensie!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Als
+    u FreeTube met plezier gebruikt denk er over na om te doneren via Liberapay of
+    via ons Bitcoin adres.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Laatste FreeTube nieuws'
+
 #On Channel Page
   Donate: Doneren
   these people and projects: deze mensen en projecten
@@ -655,12 +731,16 @@ About:
   Help: Hulp
   GitHub releases: GitHub-uitgaven
   Downloads / Changelog: Downloads en wijzigings­logboek
+  View License: Licentie bekijken
+  Licensed under the AGPLv3: Vrijgegeven onder de AGPLv3 licentie
   Source code: Broncode
   Beta: Bèta
   Discussions: Discussies
   AGPLv3: AGPLv3
   Licensed under the: Gelicentieerd onder de
 Channel:
+  Subscriber: 'Abonnee'
+  Subscribers: 'Abonnees'
   Subscribe: 'Abonneren'
   Unsubscribe: 'Deabonneren'
   Search Channel: 'Kanaal zoeken'
@@ -755,8 +835,37 @@ Video:
     wordt momenteel niet ondersteund door de Invidious API. Een directe verbinding
     met YouTube is nodig.'
   Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mrt'
+    Apr: 'Apr'
+    May: 'Mei'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Dec'
+    Second: 'Seconde'
+    Seconds: 'Seconden'
+    Hour: 'Uur'
+    Hours: 'Uur'
+    Day: 'Dag'
+    Days: 'Dagen'
+    Week: 'Week'
+    Weeks: 'Weken'
+    Month: 'Maand'
+    Months: 'Maanden'
+    Year: 'Jaar'
+    Years: 'Jaar'
+    Ago: 'Geleden'
+    Upcoming: 'Première start op'
+    Minutes: Minuten
+    Minute: Minuut
     In less than a minute: In minder dan één minuut
   Published on: 'Gepubliceerd op'
+  Publicationtemplate: '{number} {unit} geleden'
 #& Videos
   Autoplay: Automatisch afspelen
   Play Previous Video: Vorige video afspelen
@@ -824,6 +933,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Volledige afspeellijst bekijken'
+  Videos: 'Video''s'
+  View: 'Weergave'
+  Views: 'Weergaven'
   Last Updated On: 'Laatst bijgewerkt op'
 
 # On Video Watch Page
@@ -839,6 +951,7 @@ Playlist:
     VideoTitleDescending: Titel (Z-A)
     DateAddedOldest: Eerst toegevoegd bovenaan
     Custom: Aangepast
+Toggle Theatre Mode: 'Theatermodus omschakelen'
 Change Format:
   Change Media Formats: 'Videoformaten veranderen'
   Use Dash Formats: 'DASH-formaten gebruiken'
@@ -903,6 +1016,7 @@ Local API Error (Click to copy): 'Fout in lokale API (Klik om te kopiëren)'
 Invidious API Error (Click to copy): 'Fout in API van Invidious (Klik op te kopiëren)'
 Falling back to Invidious API: 'Terugvallen op Invidious API'
 Falling back to Local API: 'Terugvallen op lokale API'
+Subscriptions have not yet been implemented: 'Abonnementen zijn nog niet geïmplementeerd'
 Loop is now disabled: 'Herhalen is nu uitgeschakeld'
 Loop is now enabled: 'Herhalen is nu ingeschakeld'
 Shuffle is now disabled: 'Willekeurig afspelen is nu uitgeschakeld'
@@ -1013,8 +1127,8 @@ Tooltips:
       kan worden geopend in FreeTube is aangeklikt.\nStandaard zal FreeTube de aangeklikte
       link openen in je standaardbrowser.\n"
   External Player Settings:
-    Custom External Player Arguments: Aangepaste opdrachtregelargumenten, die je wil
-      doorgeven aan de externe videospeler.
+    Custom External Player Arguments: Aangepaste opdrachtregelargumenten, gescheiden
+      door puntkomma's (';'), die je wil doorgeven aan de externe videospeler.
     Ignore Warnings: Onderdruk waarschuwingen wanneer de geselecteerde videospeler
       een opgegeven actie niet ondersteund (bijv. afspeellijsten omkeren, etc.).
     Custom External Player Executable: Standaard gaat FreeTube er vanuit dat de gekozen
@@ -1050,6 +1164,8 @@ Playing Next Video Interval: Volgende video wordt afgespeeld. Klik om te onderbr
   | Volgende video wordt afgespeeld in {nextVideoInterval} seconde. Klik om te onderbreken.
   | Volgende video wordt afgespeeld in {nextVideoInterval} seconden. Klik om te onderbreken.
 More: Meer
+Hashtags have not yet been implemented, try again later: Hastags zijn nog niet geïmplementeerd,
+  probeer het later nogmaals
 Unknown YouTube url type, cannot be opened in app: Onbekende YouTube-URL; de URL kan
   niet worden geopend in de app
 Open New Window: Nieuw venster openen
@@ -1075,6 +1191,8 @@ Channels:
   Count: '{number} kanaal/kanalen gevonden'
   Channels: Kanalen
   Empty: Uw lijst van kanalen is momenteel leeg.
+  Unsubscribe: Deabonneren
+  Unsubscribed: '{channelName} is verwijderd uit uw lijst van abonnementen'
   Unsubscribe Prompt: Weet u zeker dat u zich wilt deabonneren van ‘{channelName}’?
 Screenshot Error: Schermafbeelding kon niet worden opgeslagen. {error}
 Preferences: Voorkeuren
diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index 9d1fb5a5cb34b..d2b542bcfdcff 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -34,15 +34,6 @@ Forward: 'Framover'
 Global:
   Videos: 'Videoar'
 
-  Counts:
-    Comment Count: 1 kommentar | {count} kommentarar
-    Video Count: 1 video | {count} videoar
-    Channel Count: 1 kanal | {count} kanalar
-    Subscriber Count: 1 abonnent | {count} abonnentar
-    View Count: 1 visning | {count} visningar
-  Shorts: Shorts
-  Live: Direkte
-  Community: Fellesskap
 Version {versionNumber} is now available!  Click for more details: 'Versjon {versionNumber}
   er no tilgjengeleg! Klikk for meir informasjon'
 Download From Site: 'Last ned frå nettstaden'
@@ -113,6 +104,12 @@ Most Popular: 'Mest populært'
 Playlists: 'Spelelister'
 User Playlists:
   Your Playlists: 'Dine spelelister'
+  Playlist Message: 'Denne sida reflekterer ikkje fullt fungerande spelelister. Den
+    viser berre videoar som du har lagra eller lagt til favorittar. Når arbeidet er
+    ferdig, blir alle videoane som for augeblikket er her overført til ei "Favoritt"-speleliste.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Du
+    har ingen lagra videoar for augeblikket. Klikk på "Lagre"-knappen i hjørnet av
+    ein video slik at den bli oppført her'
   Search bar placeholder: Søk i speleliste
   Empty Search Message: Det er ingen videoar i denne spelelista som samsvarar med
     søket ditt
@@ -153,6 +150,8 @@ Settings:
       Beginning: 'Begynning'
       Middle: 'Mellom'
       End: 'Slutt'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious-førekomst
+      (forvalet er https://invidious.snopyta.org)'
     View all Invidious instance information: 'Vis informasjon om alle Invidious-førekomstar'
     Region for Trending: 'Region for "På veg opp"'
         #! List countries
@@ -301,6 +300,7 @@ Settings:
     Subscription Settings: 'Abonnementinnstillingar'
     Hide Videos on Watch: 'Skjul sette videoar'
     Fetch Feeds from RSS: 'Hent informasjonkanalar frå RSS'
+    Manage Subscriptions: 'Behandle abonnement'
     Fetch Automatically: Hent informasjonkanalar automatisk
   Distraction Free Settings:
     Distraction Free Settings: '"Ikkje forstyrr"-innstillingar'
@@ -329,6 +329,10 @@ Settings:
     Select Import Type: 'Vel importtype'
     Select Export Type: 'Vel eksporttype'
     Import Subscriptions: 'Importer abonnement'
+    Import FreeTube: 'Importer FreeTube'
+    Import YouTube: 'Importer YouTube'
+    Import NewPipe: 'Importer NewPipe'
+    Check for Legacy Subscriptions: 'Sjå etter utdaterte abonnement'
     Export Subscriptions: 'Eksporter abonnement'
     Export FreeTube: 'Eksporter FreeTube'
     Export YouTube: 'Eksporter YouTube'
@@ -438,6 +442,8 @@ About:
   About: 'Om'
   Beta: 'Beta'
   Source code: 'Kjeldekode'
+  Licensed under the AGPLv3: 'Lisensiert under AGPLv3'
+  View License: 'Vis lisens'
   Downloads / Changelog: 'Nedlastingar / Endringslogg'
   GitHub releases: 'GitHub-utgjevingar'
   Help: 'Hjelp'
@@ -505,6 +511,8 @@ Profile:
   Profile Filter: Profilfilter
   Profile Settings: Profilinnstillingar
 Channel:
+  Subscriber: 'Abonnent'
+  Subscribers: 'Abonnentar'
   Subscribe: 'Abonner'
   Unsubscribe: 'Opphev abonnement'
   Channel has been removed from your subscriptions: 'Kanalen har blitt fjerna frå
@@ -582,10 +590,39 @@ Video:
   video only: 'berre video'
   audio only: 'berre lyd'
   Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Mai'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Des'
+    Second: 'Sekund'
+    Seconds: 'Sekund'
+    Minute: 'Minutt'
+    Minutes: 'Minutt'
+    Hour: 'Time'
+    Hours: 'Timar'
+    Day: 'Dag'
+    Days: 'Dagar'
+    Week: 'Veke'
+    Weeks: 'Veker'
+    Month: 'Månad'
+    Months: 'Månadar'
+    Year: 'År'
+    Years: 'År'
+    Ago: 'Sidan'
+    Upcoming: 'Har premiere på'
     In less than a minute: Om mindre enn eit minutt
   Published on: 'Publisert på'
   Streamed on: 'Strauma på'
   Started streaming on: 'Begynte å straume på'
+  Publicationtemplate: '{number} {unit} sidan'
 #& Videos
   Sponsor Block category:
     outro: Avslutting
@@ -626,12 +663,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vis heile spelelista'
+  Videos: 'Videoar'
+  View: 'Vising'
+  Views: 'Visingar'
   Last Updated On: 'Sist oppdatert'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Speleliste
+Toggle Theatre Mode: 'Veksle teatermodus'
 Change Format:
   Change Media Formats: 'Endre videoformat'
   Use Dash Formats: 'Bruk DASH-format'
@@ -740,7 +781,7 @@ Tooltips:
       ekstern videoavspelar. Ver merksam på at Invidious-innstillingar ikkje påverker
       den eksterne videoavspelaren.
     Custom External Player Arguments: Eventuelle eigendefinerte kommandolinjeargument,
-      du vil at skal bli sendt til den eksterne videoavspelaren.
+      åtskilt med semikolon (";"), du vil at skal bli sendt til den eksterne videoavspelaren.
   Experimental Settings:
     Replace HTTP Cache: Deaktiver Electrons diskbaserte HTTP-hurtiglager og aktiver
       eit eigendefinert biletehurtiglager i minnet. Dette vil føre til ei auking i
@@ -756,6 +797,8 @@ Falling back to Local API: 'Faller tilbake til det lokale API-et'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Denne
   videoen er utilgjengeleg grunna manglande format. Dette kan skuldast tilgangsavgrensingar
   i ditt land.'
+Subscriptions have not yet been implemented: 'Abonnement har ikkje blitt implementert
+  enda'
 Loop is now disabled: 'Gjenta er no deaktivert'
 Loop is now enabled: 'Gjenta er no aktivert'
 Shuffle is now disabled: 'Tilfeldig avspeling er no deaktivert'
@@ -776,6 +819,8 @@ Playing Next Video Interval: Speler av neste video no. Klikk her for å avbryte.
   Speler av neste video om {nextVideoInterval} sekund. Klikk her for å avbryte.
 More: Meir
 Open New Window: Opne nytt vindauge
+Hashtags have not yet been implemented, try again later: Emneknaggar er ikkje implementert
+  enda, ver venleg og prøv igjen seinare
 Search Bar:
   Clear Input: Tøm inndata
 Are you sure you want to open this link?: Er du sikker på at du vil opne denne lenka?
@@ -787,7 +832,9 @@ Channels:
   Search bar placeholder: Søk etter kanalar
   Count: Fant {number} kanal(ar).
   Empty: Kanallista di er tom.
+  Unsubscribed: '{channelName} blei fjerna frå dine abonnement'
   Unsubscribe Prompt: Er du sikker på at du vil avslutte abonnementet på "{channelName}"?
+  Unsubscribe: Opphev abonnement
 Screenshot Success: Lagra skjermbilete som "{filePath}"
 Screenshot Error: Skjermbilete feila. {error}
 Downloading has completed: Nedlastinga av "{videoTitle}" er fullført
@@ -810,12 +857,3 @@ Default Invidious instance has been set to {instance}: Standard-Invidious-førek
   har blitt satt til {instance}
 External link opening has been disabled in the general settings: Opening av eksterne
   lenker har blitt deaktivert i innstillingane
-Go to page: Gå til {page}
-Search Listing:
-  Label:
-    8K: 8K
-    New: Ny
-    3D: 3D
-    4K: 4K
-    Subtitles: Undertekstar
-    Closed Captions: Undertekstar
diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index 405075f226751..6a9f24e01d584 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -100,8 +100,8 @@ Subscriptions:
   Subscriptions: 'Subskrypcje'
   Latest Subscriptions: 'Ostatnie subskrypcje'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Twoja
-    lista subskrypcji jest obecnie pusta. Możesz zaimportować swoje subskrypcje w
-    Ustawieniach danych, klikając w „Zaimportuj subskrypcje”.'
+    lista subskrypcji jest obecnie pusta. Zacznij dodawać subskrypcje, aby zobaczyć
+    je tutaj.'
   'Getting Subscriptions.  Please wait.': 'Pobieranie subskrypcji. Proszę czekać...'
   Refresh Subscriptions: Odśwież subskrypcje
   Getting Subscriptions. Please wait.: Pobieranie subskrypcji. Proszę poczekać.
@@ -129,9 +129,19 @@ Most Popular: 'Popularne'
 Playlists: 'Playlisty'
 User Playlists:
   Your Playlists: 'Twoje playlisty'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nie
+    masz żadnych zapisanych filmów. Kliknij przycisk „Zapisz film” w rogu filmu, aby
+    został on wymieniony na tej liście
+  Playlist Message: Ta strona nie odzwierciedla w pełni działających playlist. Są
+    tu jedynie wymienione filmy, które zapisałeś lub oznaczyłeś jako ulubione. Kiedy
+    prace nad tą stroną zostaną zakończone, wszystkie filmy tu obecne zostaną przeniesione
+    do playlisty „Ulubione”.
   Search bar placeholder: Szukaj playlist
   Empty Search Message: Na tej playliście nie ma filmów, które pasowałyby do Twojego
     zapytania
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Czy
+    na pewno chcesz usunąć wszystkie obejrzane filmy z tej playlisty? Nie można cofnąć
+    tej czynności.
   AddVideoPrompt:
     Search in Playlists: Szukaj w playlistach
     Save: Zapisz
@@ -182,13 +192,11 @@ User Playlists:
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Teraz
         ta playlista, zamiast „{oldPlaylistName}”, będzie używana dla funkcji Szybkiej
         Zakładki . Kliknij tutaj, by cofnąć zmianę
+      Quick bookmark disabled: Wyłączono Szybką Zakładkę
       Playlist {playlistName} is the new quick bookmark playlist.: Playlista „{playlistName}”
         jest od teraz playlistą używaną dla funkcji Szybkiej Zakładki.
       This playlist is already being used for quick bookmark.: Ta playlista jest już
         używana dla funkcji Szybkiej Zakładki.
-      This playlist has a video with a duration error: Ta playlista zawiera przynajmniej
-        jeden film bez określonego czasu trwania. Będą one rozmieszczone tak, jakby
-        ich czas trwania wynosił zero.
     Search for Videos: Szukaj filmów
   Are you sure you want to delete this playlist? This cannot be undone: Czy na pewno
     chcesz usunąć tę playlistę? Nie można cofnąć tej czynności.
@@ -230,6 +238,7 @@ User Playlists:
   Playlist Description: Opis playlisty
   Add to Favorites: Dodaj do „{playlistName}”
   Remove from Favorites: Usuń z „{playlistName}”
+  Disable Quick Bookmark: Wyłącz Szybką Zakładkę
   Enable Quick Bookmark With This Playlist: Włącz Szybką Zakładkę z tą playlistą
   Playlists with Matching Videos: Playlisty z pasującymi filmami
   Quick Bookmark Enabled: Włączono Szybką Zakładkę
@@ -244,9 +253,6 @@ User Playlists:
     na pewno chcesz usunąć 1 zduplikowany film z tej listy odtwarzania? Nie można
     tego cofnąć. | Czy na pewno chcesz usunąć {playlistItemCount} duplikatów wideo
     z tej listy odtwarzania? Nie można tego cofnąć.
-  Export Playlist: Eksportuj listę odtwarzania
-  The playlist has been successfully exported: Lista odtwarzania została pomyślnie
-    wyeksportowana
 History:
   # On History Page
   History: 'Historia'
@@ -259,7 +265,7 @@ Settings:
   # On Settings Page
   Settings: 'Ustawienia'
   General Settings:
-    General Settings: 'Ogólne'
+    General Settings: 'Ustawienia ogólne'
     Fallback to Non-Preferred Backend on Failure: 'Wycofaj się do niepreferowanego
       back-endu przy niepowodzeniu'
     Enable Search Suggestions: 'Włącz sugestie wyszukiwania'
@@ -281,6 +287,8 @@ Settings:
       End: 'Koniec'
       Hidden: Nie pokazuj
       Blur: Rozmyte
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Serwer Invidious
+      (Domyślnie jest https://invidious.snopyta.org)'
     Region for Trending: '„Na czasie” z obszaru'
         #! List countries
     Check for Latest Blog Posts: Sprawdź ostatnie wpisy na blogu
@@ -304,10 +312,8 @@ Settings:
     Auto Load Next Page:
       Tooltip: Wczytuj kolejne strony oraz komentarze automatycznie.
       Label: Automatycznie wczytaj kolejną stronę
-    Open Deep Links In New Window: Odnośniki URL przekazane do FreeTube otwieraj w
-      nowym oknie
   Theme Settings:
-    Theme Settings: 'Wygląd'
+    Theme Settings: 'Ustawienia wyglądu'
     Match Top Bar with Main Color: 'Dopasuj górną belkę do głównego koloru'
     Base Theme:
       Base Theme: 'Bazowy motyw'
@@ -322,8 +328,6 @@ Settings:
       Nordic: Nordycki
       Solarized Light: Nasłoneczniony jasny
       Solarized Dark: Nasłoneczniony ciemny
-      Gruvbox Dark: Gruvbox ciemny
-      Gruvbox Light: Gruvbox jasny
     Main Color Theme:
       Main Color Theme: 'Główny kolor motywu'
       Red: 'Czerwony'
@@ -371,16 +375,6 @@ Settings:
       Solarized Cyan: Nasłoneczniony cyjan
       Solarized Green: Nasłoneczniony zielony
       Solarized Yellow: Nasłoneczniony żółty
-      Gruvbox Dark Green: Gruvbox ciemnozielony
-      Gruvbox Dark Yellow: Gruvbox żółty
-      Gruvbox Dark Blue: Gruvbox niebieski
-      Gruvbox Dark Purple: Gruvbox ciemnopurpurowy
-      Gruvbox Dark Aqua: Gruvbox ciemny wodny
-      Gruvbox Dark Orange: Gruvbox ciemnopomarańczowy
-      Gruvbox Light Red: Gruvbox jasnoczerwony
-      Gruvbox Light Blue: Gruvbox jasnoniebieski
-      Gruvbox Light Purple: Gruvbox jasnopurpurowy
-      Gruvbox Light Orange: Gruvbox jasnopomarańczowy
     Secondary Color Theme: 'Drugi kolor motywu'
         #* Main Color Theme
     UI Scale: Skala UI
@@ -389,7 +383,7 @@ Settings:
     Hide Side Bar Labels: Schowaj etykiety paska bocznego
     Hide FreeTube Header Logo: Schowaj logo FreeTube z paska górnego
   Player Settings:
-    Player Settings: 'Odtwarzacz'
+    Player Settings: 'Ustawienia odtwarzacza'
     Play Next Video: 'Odtwórz następny film'
     Turn on Subtitles by Default: 'Domyślnie odtwarzaj z napisami'
     Autoplay Videos: 'Autoodtwarzanie filmów'
@@ -416,7 +410,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Przerwa przed kolejną pozycją playlisty
-    Next Video Interval: Czas do następnego autoodtwarzania
+    Next Video Interval: Czas do następnego filmu
     Scroll Volume Over Video Player: Kontroluj głośność kółkiem myszy na obszarze
       odtwarzacza
     Display Play Button In Video Player: Pokaż przycisk odtwarzania na odtwarzaczu
@@ -445,17 +439,50 @@ Settings:
       orientacji ekranu
     Skip by Scrolling Over Video Player: Przewijaj film kółkiem myszy na obszarze
       odtwarzacza
-    Autoplay Interruption Timer: Czas do przerwania autoodtwarzania
   Subscription Settings:
-    Subscription Settings: 'Subskrypcje'
+    Subscription Settings: 'Ustawienia subskrypcji'
     Hide Videos on Watch: 'Ukrywaj filmy po obejrzeniu'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Format exportu subskrypcji'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Zarządzaj subskrypcjami'
+    Import Subscriptions: 'Importuj subskrypcje'
+    Export Subscriptions: 'Eksportuj subskrypcje'
+    How do I import my subscriptions?: 'Jak zaimportować swoje subskrypcje?'
     Fetch Feeds from RSS: Pobierz subskrypcje z RSS
     Fetch Automatically: Automatycznie odświeżaj subskrypcje
+    Only Show Latest Video for Each Channel: Pokaż tylko najnowszy film z każdego
+      kanału
     Confirm Before Unsubscribing: Uniknij przypadkowego usunięcia subskrypcji
+  Advanced Settings:
+    Advanced Settings: 'Ustawienia zaawansowane'
+    Enable Debug Mode (Prints data to the console): 'Włącz tryb dubugowania (pokazuje
+      dane w konsoli)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adres proxy (przykład: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Kliknięcie
+      przycisku „SPRAWDŹ PROXY” wyśle zapytanie na https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Użyj proxy, lub sieci Tor do wywołań API'
+    TEST PROXY: 'SPRAWDŹ PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Zobacz publiczne serwery'
+    Clear History:
+      Clear History: 'Wyczyść historię'
+      # On Click
+      Are you sure you want to delete your history?: 'Czy jesteś pewny/a, że chcesz
+        usunąć swoją historię?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Wyczyść subskrypcje'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Czy jesteś pewny/a, że
+        chcesz usunąć wszystkie subskrypcje?'
+      #& Yes
+      #& No
 
-    To: do
-    'Limit the number of videos displayed for each channel': Ogranicz liczbę filmów
-      wyświetlanych dla każdego z kanałów
   Privacy Settings:
     Watch history has been cleared: Historia oglądania została wyczyszczona
     Are you sure you want to remove your entire watch history?: Jesteś pewny/a, że
@@ -467,7 +494,7 @@ Settings:
     Clear Search Cache: Wyczyść plik pamięci podręcznej wyszukiwań
     Save Watched Progress: Zapisuj postęp odtwarzania
     Remember History: Pamiętaj historię
-    Privacy Settings: Prywatność
+    Privacy Settings: Ustawienia prywatności
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Czy
       jesteś pewny/a, że chcesz usunąć wszystkie subskrypcje i profile? Nie będzie
       można tego cofnąć.
@@ -506,10 +533,14 @@ Settings:
     Export YouTube: Eksport do YouTube
     Export NewPipe: Eksport do NewPipe
     Export Subscriptions: Wyeksportuj subskrypcje
+    Import NewPipe: Import z NewPipe
+    Import YouTube: Import z YouTube
+    Import FreeTube: Import z FreeTube
     Import Subscriptions: Zaimportuj subskrypcje
     Select Export Type: Wybierz typ eksportu
     Select Import Type: Wybierz typ importu
-    Data Settings: Dane
+    Data Settings: Ustawienia danych
+    Check for Legacy Subscriptions: Sprawdź subskrypcje ze starej wersji
     Manage Subscriptions: Zarządzaj subskrypcjami
     Export Playlists: Wyeksportuj playlisty
     All playlists has been successfully exported: Wszystkie playlisty pomyślnie wyeksportowano
@@ -529,7 +560,7 @@ Settings:
         zaimportuj wyeksportowane playlisty."
       Label: Wyeksportuj playlisty dla starszych wersji FreeTube
   Distraction Free Settings:
-    Distraction Free Settings: Skupienie uwagi
+    Distraction Free Settings: Ustawienia skupienia uwagi
     Hide Live Chat: Schowaj czat na żywo
     Hide Popular Videos: Schowaj filmy „Popularne”
     Hide Trending Videos: Schowaj filmy „Na czasie”
@@ -550,22 +581,23 @@ Settings:
     Hide Channels Placeholder: ID kanału
     Display Titles Without Excessive Capitalisation: Wyświetlaj tytuły nie nadużywając
       wielkich liter i interpunkcji
-    Hide Channel Community: Schowaj kartę kanału „Społeczność”
-    Hide Channel Shorts: Schowaj kartę kanału „Filmy Short”
+    Hide Channel Community: Schowaj społeczność kanału
+    Hide Channel Shorts: Schowaj filmy Short kanału
     Hide Featured Channels: Schowaj polecane kanały
-    Hide Channel Playlists: Schowaj kartę kanału „Playlisty”
+    Hide Channel Playlists: Schowaj playlisty kanału
     Sections:
       Side Bar: Pasek boczny
       Channel Page: Strona kanału
       General: Ogólne
       Watch Page: Strona odtwarzacza
       Subscriptions Page: Strona subskrypcji
-    Hide Channel Releases: Schowaj kartę kanału „Wydawnictwa”
-    Hide Channel Podcasts: Schowaj kartę kanału „Podkasty”
+    Hide Channel Releases: Schowaj wydawnictwa kanału
+    Hide Channel Podcasts: Schowaj podkasty kanału
     Hide Subscriptions Videos: Schowaj filmy z subskrypcji
     Hide Subscriptions Shorts: Schowaj filmy Short z subskrypcji
     Hide Subscriptions Live: Schowaj transmisje live z subskrypcji
     Hide Profile Pictures in Comments: Nie pokazuj zdjęć profilowych w komentarzach
+    Blur Thumbnails: Rozmazuj miniaturki
     Hide Subscriptions Community: Schowaj „Społeczność” kanałów
     Hide Channels Invalid: Podane ID kanału jest niepoprawne
     Hide Channels Disabled Message: Niektóre z kanałów nie zostały przetworzone, ponieważ
@@ -578,7 +610,6 @@ Settings:
       poniższy tekst
     Hide Videos and Playlists Containing Text Placeholder: Słowo, fragment słowa,
       lub wyrażenie
-    Hide Channel Home: Schowaj kartę kanału „Główna”
   The app needs to restart for changes to take effect. Restart and apply change?: Aplikacja
     musi zostać ponownie uruchomiona, aby zmiany zostały wprowadzone. Uruchomić ponownie
     i zastosować zmiany?
@@ -597,19 +628,14 @@ Settings:
     Proxy Host: Host proxy
     Proxy Protocol: Protokół proxy
     Enable Tor / Proxy: Włącz Tor / Proxy
-    Proxy Settings: Proxy
-    Proxy Warning: FreeTube nie ma wbudowanego proxy, ale może połączyć z zewnętrznym
-      proxy. Na przykład z uruchomionym na Twoim komputerze, jak Tor, albo z uruchomionym
-      na zewnętrznym serwerze, takim jak SOCKS5 proxy, oferowanym przez niektórych
-      dostawców VPN. Po włączeniu upewnij się, że twoje proxy lub Tor są skonfigurowane
-      poprawnie, by FreeTube był w stanie wymieniać jakiekolwiek dane.
+    Proxy Settings: Ustawienia proxy
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Powiadamiaj, kiedy segment sponsorowany
       zostanie pominięty
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Adres URL interfejsu
       API SponsorBlock (Domyślnie jest https://sponsor.ajay.app)
     Enable SponsorBlock: Włącz SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Ustawienia SponsorBlock
     Skip Options:
       Skip Option: Opcja pominięcia
       Auto Skip: Pomijaj automatycznie
@@ -627,26 +653,26 @@ Settings:
       odtwarzacza
     Ignore Unsupported Action Warnings: Ignoruj ostrzeżenia o nieobsługiwanych działaniach
     External Player: Zewnętrzny odtwarzacz
-    External Player Settings: Zewnętrzny odtwarzacz
+    External Player Settings: Ustawienia zewnętrznego odtwarzacza
     Players:
       None:
         Name: Żaden
     Ignore Default Arguments: Zignoruj argumenty domyślne
   Download Settings:
     Ask Download Path: Pytaj o lokalizację pobierania
-    Download Settings: Pobieranie
+    Download Settings: Ustawienia pobierania
     Choose Path: Wybierz folder
     Download Behavior: Sposób pobierania
     Download in app: Pobierz w aplikacji
     Open in web browser: Otwórz w przeglądarce
   Parental Control Settings:
-    Parental Control Settings: Kontrola rodzicielska
+    Parental Control Settings: Ustawienia kontroli rodzicielskiej
     Hide Unsubscribe Button: Schowaj przycisk „Odsubskrybuj”
     Show Family Friendly Only: Pokazuj tylko filmy przyjazne rodzinie
     Hide Search Bar: Schowaj pole wyszukiwania
   Experimental Settings:
     Replace HTTP Cache: Zastąp pamięć podręczną HTTP
-    Experimental Settings: Eksperymentalne
+    Experimental Settings: Ustawienia eksperymentalne
     Warning: Te ustawienia są w fazie testów i po włączeniu mogą powodować wywalanie
       się programu. Zalecane jest stworzenie kopii zapasowej. Używaj na własne ryzyko!
   Password Dialog:
@@ -655,25 +681,61 @@ Settings:
     Password Incorrect: Niepoprawne hasło
     Password: Hasło
   Password Settings:
-    Password Settings: Hasło
+    Password Settings: Ustawienia hasła
     Set Password To Prevent Access: Ustaw hasło, aby zabezpieczyć dostęp do ustawień
     Set Password: Ustaw hasło
     Remove Password: Usuń hasło
+  Expand All Settings Sections: Rozwiń wszystkie sekcje ustawień
   Sort Settings Sections (A-Z): Sortuj sekcje ustawień (A-Z)
-  Return to Settings Menu: Wróć do menu „Ustawienia”
 About:
   #On About page
   About: 'O projekcie'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ten
+    program copyleft jest objęty wolną licencją APGL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Znalazłeś/aś błąd? Masz pomysł na nową funkcję? Chcesz jakoś pomóc? Zajrzyj na
+    naszą stronę GitHub. Mile widziane pull requesty.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Wielkie
+    dzięki za wszystkich ludzi i projekty, dzięki którym istnienie FreeTube jest możliwe!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Chcesz
+    pogadać? Dołącz do naszej społeczności Element (serwer Matrix). Przejrzyj proszę
+    zasady zanim dołączysz.'
+
+  'Looking for help? Check out our Wiki page.': 'Szukasz pomocy? Sprawdź naszą stronę
+    Wiki.'
+
+  Check out our Firefox extension!: 'Sprawdź nasz dodatek do Firefoxa!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Jeśli
+    lubisz korzystać z FreeTube, rozważ darowiznę poprzez Liberapay lub naszego adresu
+    Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Ostatnie wieści o FreeTube'
+
 #On Channel Page
+  Translate via Weblate: Przetłumaczone poprzez Weblate
   Website: Strona internetowa
+  Source Code: Kod źródłowy
+  Release Notes: Informacje o wydaniu
   Blog: Blog
   Credits: Zasługi
   FAQ: FAQ
+  Wiki: Wiki
+  Report an Issue: Zgłoś problem
+  Channel Rules: Zasady kanału
   Email: E-mail
+  License: Licencja
   Beta: Beta
   Donate: Wesprzyj
+  Useful Links: Przydatne linki
   Help: Pomoc
+  Contact: Kontakt
   these people and projects: tym ludziom i projektom
   Translate: Przetłumacz
   room rules: zasady pokoju
@@ -686,12 +748,16 @@ About:
   FreeTube Wiki: Wiki FreeTube
   GitHub releases: wydania na GitHub
   Downloads / Changelog: Wydania / Lista zmian
+  View License: Zobacz licencję
+  Licensed under the AGPLv3: Na licencji AGPLv3
   Source code: Kod źródłowy
   FreeTube is made possible by: FreeTube powstał dzięki
   Discussions: Dyskusje
   Licensed under the: Licencjonowany na
   AGPLv3: AGPLv3
 Channel:
+  Subscriber: 'Subskrybent/ka'
+  Subscribers: 'subskrybentów'
   Subscribe: 'Zasubskrybuj'
   Unsubscribe: 'Odsubskrybuj'
   Search Channel: 'Przeszukaj kanał'
@@ -743,7 +809,7 @@ Channel:
     View Full Post: Zobacz całe posty
     Viewing Posts Only Supported By Invidious: Wyświetlanie postów jest wspierane
       tylko przez Invidious. Możesz zobaczyć zawartość nie korzystając z Invidious,
-      przechodząc do karty „Społeczność” danego kanału.
+      przechodząc do zakładki „Społeczność” danego kanału.
   Live:
     Live: Transmisje
     This channel does not currently have any live streams: Ten kanał nie ma obecnie
@@ -758,9 +824,6 @@ Channel:
   Podcasts:
     Podcasts: Podkasty
     This channel does not currently have any podcasts: Ten kanał nie ma żadnych podkastów
-  Home:
-    Home: Główna
-    View Playlist: Zobacz playlistę
 Video:
   Mark As Watched: 'Oznacz jako obejrzany'
   Remove From History: 'Usuń z historii'
@@ -789,8 +852,38 @@ Video:
     na żywo nie wspiera obecnie API Invidious. Konieczne jest połączenie bezpośrednie
     z YouTube.'
   Published:
+    Jan: 'sty.'
+    Feb: 'lut.'
+    Mar: 'mar.'
+    Apr: 'kwi.'
+    May: 'maj'
+    Jun: 'cze.'
+    Jul: 'lip.'
+    Aug: 'sie.'
+    Sep: 'wrz.'
+    Oct: 'paź.'
+    Nov: 'lis.'
+    Dec: 'gru.'
+    Second: 'sekundę'
+    Seconds: 'sekund/y'
+    Hour: 'godzinę'
+    Hours: 'godzin/y'
+    Day: 'dzień'
+    Days: 'dni'
+    Week: 'tydzień'
+    Weeks: 'tygodni/e'
+    Month: 'miesiąc'
+    Months: 'miesiące/y'
+    Year: 'rok'
+    Years: 'lat/a'
+    Ago: 'temu'
+    Upcoming: 'Premiera'
+    Minutes: minut/y
+    Minute: minutę
+    Less than a minute: mniej niż minutę
     In less than a minute: Za mniej niż minutę
   Published on: 'Opublikowano'
+  Publicationtemplate: '{number} {unit} temu'
 #& Videos
   Autoplay: Autoodtwarzanie
   Play Previous Video: Odtwórz poprzedni film
@@ -879,16 +972,6 @@ Video:
       zostanie wznowione, jak tylko połączenie zostanie odzyskane.
     Skipped segment: Pominięto segment {segmentCategory}
     Full Window: Pełny ekran
-  IP block: YouTube uniemożliwił odtworzenie filmów blokując Twój adres IP. Możesz
-    spróbować przełączyć się na inny, korzystając z VPN lub proxy.
-  AgeRestricted: Filmy z ograniczeniem wiekowym nie mogą być odtwarzane przez FreeTube,
-    ponieważ wymagają danych logowania do konta Google z potwierdzonym wiekiem użytkownika.
-  MembersOnly: Filmy tylko dla wspierających nie mogą być odtwarzane przez FreeTube,
-    ponieważ wymagają danych logowania do konta Googla oraz płatną subskrypcje kanału.
-  Unlisted: Niepubliczny
-  DeArrow:
-    Show Original Details: Pokaż szczegóły oryginału
-    Show Modified Details: Pokaż zmodyfikowane szczegóły
 Videos:
   #& Sort By
   Sort By:
@@ -899,6 +982,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Zobacz całą playlistę'
+  Videos: 'filmów'
+  View: 'wyświetlenie'
+  Views: 'wyświetleń'
   Last Updated On: 'Ostatnio zaktualizowano'
 
 # On Video Watch Page
@@ -914,8 +1000,7 @@ Playlist:
     Sort By: Sortuj
     AuthorAscending: Po autorze (A-Z)
     AuthorDescending: Po autorze (Z-A)
-    VideoDurationDescending: Czas trwania (od najdłuższych)
-    VideoDurationAscending: Czas trwania (od najkrótszych)
+Toggle Theatre Mode: 'Włącz/wyłącz tryb kinowy'
 Change Format:
   Change Media Formats: 'Zmień formaty wideo'
   Use Dash Formats: 'Użyj formatów DASH'
@@ -983,6 +1068,7 @@ Local API Error (Click to copy): 'Błąd lokalnego API (kliknij by skopiować)'
 Invidious API Error (Click to copy): 'Błąd API Invidious (kliknij by skopiować)'
 Falling back to Invidious API: 'Wycofywanie do API Invidious'
 Falling back to Local API: 'Wycofywanie do lokalnego API'
+Subscriptions have not yet been implemented: 'Subskrypcje nie zostały jeszcze wprowadzone'
 Loop is now disabled: 'Zapętlenie jest teraz wyłączone'
 Loop is now enabled: 'Zapętlenie jest teraz włączone'
 Shuffle is now disabled: 'Losowanie jest teraz wyłączone'
@@ -1038,7 +1124,7 @@ Profile:
   Other Channels: Inne kanały
   Subscription List: Lista subskrypcji
   Profile Filter: Filtr profilu
-  Profile Settings: Profil
+  Profile Settings: Ustawienia profilu
   Toggle Profile List: Włącz/wyłącz listę profili
   Open Profile Dropdown: Otwórz rozwijane menu profilu
   Close Profile Dropdown: Zamknij rozwijane menu profilu
@@ -1078,9 +1164,6 @@ Tooltips:
     External Link Handling: "Wybierz domyślne zachowanie kiedy odnośnik, który nie
       może zostać otworzony w FreeTube, został kliknięty.\nDomyślnie FreeTube otworzy
       kliknięty odnośnik w domyślnej przeglądarce.\n"
-    Open Deep Links In New Window: Odnośniki URL przekazane do FreeTube (np. przez
-      rozszerzenie przeglądarki, albo argumenty linii komend) są otwierane w nowym
-      oknie.
   Player Settings:
     Default Video Format: Ustaw formaty, które zostaną użyte do odtwarzania filmów.
       Formaty DASH obsługują wyższe rozdzielczości. Stare formaty są ograniczone do
@@ -1101,7 +1184,7 @@ Tooltips:
       ikony, która otworzy film (playlistę, jeśli są obsługiwane) w zewnętrznym odtwarzaczu.
       Uwaga! Ustawienia Invidious nie mają wpływu na zewnętrzny odtwarzacz.
     Custom External Player Arguments: Wszelkie niestandardowe argumenty wiersza poleceń,
-      które chcesz przekazać do zewnętrznego odtwarzacza.
+      oddzielone średnikami (';'), które chcesz przekazać do zewnętrznego odtwarzacza.
     Custom External Player Executable: FreeTube domyślnie przyjmie, że wybrany odtwarzacz
       jest do znalezienia za pomocą zmiennej środowiskowej PATH. Jeśli trzeba, można
       tutaj ustawić niestandardową ścieżkę.
@@ -1135,6 +1218,8 @@ Playing Next Video Interval: Odtwarzanie kolejnego filmu już za chwilę. Wciśn
 More: Więcej
 Unknown YouTube url type, cannot be opened in app: Nieznany typ adresu URL YouTube,
   nie można go otworzyć w aplikacji
+Hashtags have not yet been implemented, try again later: Hashtagi nie zostały jeszcze
+  wprowadzone, spróbuj później
 Open New Window: Otwórz nowe okno
 Default Invidious instance has been cleared: Domyślna instancja Invidious została
   wyczyszczona
@@ -1158,7 +1243,9 @@ Channels:
   Title: Lista kanałów
   Count: Znaleziono {number} kanał(y/ów).
   Empty: Twoja lista kanałów jest na razie pusta.
+  Unsubscribe: Odsubskrybuj
   Unsubscribe Prompt: Czy na pewno chcesz zrezygnować z subskrypcji „{channelName}”?
+  Unsubscribed: '{channelName} został usunięty z Twoich subskrypcji'
   Channels: Kanały
   Search bar placeholder: Przeszukaj kanały
 Clipboard:
@@ -1171,7 +1258,6 @@ Chapters:
     obecny rozdział: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Spis treści schowany, obecny
     rozdział: {chapterName}'
-  Key Moments: Kluczowe momenty
 Preferences: Preferencje
 Ok: Ok
 Hashtag:
@@ -1208,25 +1294,5 @@ Search Listing:
     Subtitles: Napisy
     Closed Captions: Napisy z opisami
     4K: 4K
-    New: Nowe
-    3D: 3D
-    VR180: VR180
-    8K: 8K
-    360 Video: 360°
 'Blocked opening potentially unsafe URL': 'Zablokowano otwarcie potencjalnie niebezpiecznego
   URL: "{url}".'
-Keys:
-  arrowup: Strzałka do góry
-  arrowright: Strzałka w prawo
-  arrowleft: Strzałka w lewo
-  arrowdown: Strzałka w dół
-  alt: Alt
-  ctrl: Ctrl
-Right-click or hold to see history: Kliknij prawym lub przytrzymaj, by zobaczyć historię
-shortcutJoinOperator: +
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Autoplay Interruption Timer: Automatyczne odtwarzanie zostało anulowane, z powodu
-  {autoplayInterruptionIntervalHours} godzin(y) braku aktywności
-Description:
-  Expand Description: '...więcej'
-  Collapse Description: Zwiń
diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml
index f659aa820d8e6..71777ac7b5a8a 100644
--- a/static/locales/pt-BR.yaml
+++ b/static/locales/pt-BR.yaml
@@ -100,9 +100,7 @@ Subscriptions:
   Subscriptions: 'Inscrições'
   Latest Subscriptions: 'Últimas inscrições'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Sua
-    lista de inscrições está vazia no momento. Se quiser importar suas inscrições,
-    acesse "Configurações de dados" e selecione "Importar inscrições" ou pesquise
-    um canal para inscrever-se.'
+    lista de inscrições está vazia no momento. Adicione algumas para vê-las aqui.'
   'Getting Subscriptions.  Please wait.': 'Buscando inscrições. Por favor, aguarde.'
   Refresh Subscriptions: Atualizar inscrições
   'Getting Subscriptions. Please wait.': Obtendo inscrições. Por favor, aguarde.
@@ -130,6 +128,13 @@ Most Popular: 'Mais populares'
 Playlists: 'Playlists'
 User Playlists:
   Your Playlists: 'Suas playlists'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Os
+    seus vídeos salvos estão vazios. Clique no botão salvar no canto de um vídeo para
+    que ele seja listado aqui
+  Playlist Message: Esta página não reflete playlists totalmente funcionais. Ela lista
+    apenas os vídeos que você salvou ou adicionou aos favoritos. Quando o trabalho
+    terminar, todos os vídeos atualmente aqui serão migrados para uma playlist chamada
+    "Favoritos".
   Search bar placeholder: Pesquisar playlists
   Empty Search Message: Não há vídeos nesta playlist que correspondam à sua pesquisa
   You have no playlists. Click on the create new playlist button to create a new one.: Você
@@ -159,6 +164,7 @@ User Playlists:
   Edit Playlist Info: Editar informação da playlist
   Copy Playlist: Copiar playlist
   Enable Quick Bookmark With This Playlist: Habilitar "Quick Bookmark" para esta playlist
+  Disable Quick Bookmark: Desativar Favoritos Rápidos
   Delete Playlist: Excluir playlist
   Are you sure you want to delete this playlist? This cannot be undone: Tem certeza
     de que deseja excluir esta playlist? Isto não pode ser desfeito.
@@ -176,6 +182,7 @@ User Playlists:
     Toast:
       This playlist is now used for quick bookmark: Esta playlist agora é usada como
         "Quick Bookmark"
+      Quick bookmark disabled: Favoritos Rápidos desativado
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Esta
         playlist agora é usada como "Quick Bookmark" em vez de "{oldPlaylistName}".
         Clique aqui para desfazer
@@ -205,9 +212,6 @@ User Playlists:
         sendo usada como "Quick Bookmark".
       Playlist {playlistName} is the new quick bookmark playlist.: Playlist "{playlistName}"
         é a nova playlist em "Quick Bookmark".
-      This playlist has a video with a duration error: Esta playlist contém pelo menos
-        um vídeo que não tem duração, ela será classificada como se sua duração fosse
-        zero.
     Search for Videos: Pesquisar vídeos
   AddVideoPrompt:
     Toast:
@@ -228,6 +232,9 @@ User Playlists:
       vídeos serão adicionados'
     "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
       vídeos já adicionados'
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Tem
+    certeza de que deseja remover todos os vídeos assistidos desta playlist? Isto
+    não pode ser desfeito.
   Remove Watched Videos: Remove vídeos assistidos
   Playlists with Matching Videos: Playlists com vídeos correspondentes
   Quick Bookmark Enabled: Quick Bookmark ativado
@@ -242,8 +249,6 @@ User Playlists:
     certeza de que deseja remover 1 vídeo assistido desta playlist? Isso não pode
     ser desfeito. | Tem certeza de que deseja remover {playlistItemCount} vídeos assistidos
     desta playlist? Isso não pode ser desfeito.
-  The playlist has been successfully exported: Playlist exportada com sucesso
-  Export Playlist: Exportar esta playlist
 History:
   # On History Page
   History: 'Histórico'
@@ -256,7 +261,7 @@ Settings:
   # On Settings Page
   Settings: 'Configurações'
   General Settings:
-    General Settings: 'Geral'
+    General Settings: 'Configurações gerais'
     Fallback to Non-Preferred Backend on Failure: 'Usar mecanismo de pesquisa alternativo
       em caso de falha'
     Enable Search Suggestions: 'Habilitar sugestões de pesquisa'
@@ -278,7 +283,9 @@ Settings:
       End: 'No fim'
       Hidden: Escondido
       Blur: Desfocar
-    Region for Trending: 'Região de Tendências'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instância do
+      Invidious (A padrão é https://invidious.snopyta.org)'
+    Region for Trending: 'Região'
         #! List countries
     Check for Updates: Buscar por atualizações
     Check for Latest Blog Posts: Verificar se há novas postagens no blog
@@ -301,9 +308,8 @@ Settings:
     Auto Load Next Page:
       Label: Carregamento automático da próxima página
       Tooltip: Carregar páginas e comentários adicionais automaticamente.
-    Open Deep Links In New Window: Abrir URLs a partir do FreeTube em uma nova janela
   Theme Settings:
-    Theme Settings: 'Tema'
+    Theme Settings: 'Configurações de aparência'
     Match Top Bar with Main Color: 'Usar cor principal na barra superior'
     Base Theme:
       Base Theme: 'Tema base'
@@ -318,8 +324,6 @@ Settings:
       Nordic: Nordico
       Solarized Light: Claro Solarizado
       Solarized Dark: Escuro Solarizado
-      Gruvbox Light: Gruvbox modo claro
-      Gruvbox Dark: Gruvbox modo escuro
     Main Color Theme:
       Main Color Theme: 'Cor principal'
       Red: 'Vermelha'
@@ -367,16 +371,6 @@ Settings:
       Solarized Cyan: Ciano Solarizado
       Solarized Green: Verde Solarizado
       Solarized Orange: Laranja Solarizada
-      Gruvbox Dark Blue: Gruvbox modo azul escuro
-      Gruvbox Dark Purple: Gruvbox modo roxo escuro
-      Gruvbox Dark Aqua: Gruvbox modo água escura
-      Gruvbox Light Red: Gruvbox modo vermelho claro
-      Gruvbox Light Blue: Gruvbox modo azul claro
-      Gruvbox Light Purple: Gruvbox modo roxo claro
-      Gruvbox Light Orange: Gruvbox modo laranja claro
-      Gruvbox Dark Green: Gruvbox modo verde escuro
-      Gruvbox Dark Yellow: Gruvbox modo amarelo escuro
-      Gruvbox Dark Orange: Gruvbox modo laranja escuro
     Secondary Color Theme: 'Cor secundária'
         #* Main Color Theme
     UI Scale: Escala da Interface de Usuário
@@ -385,7 +379,8 @@ Settings:
     Hide Side Bar Labels: Ocultar título na barra lateral
     Hide FreeTube Header Logo: Ocultar logotipo FreeTube na barra superior
   Player Settings:
-    Player Settings: 'Player'
+    Player Settings: 'Configurações de reprodução'
+    Remember History: 'Lembrar do histórico'
     Play Next Video: 'Reproduzir próximo vídeo'
     Turn on Subtitles by Default: 'Ativar legendas por padrão'
     Autoplay Videos: 'Reprodução automática de vídeos'
@@ -412,7 +407,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Intervalo do próximo vídeo da lista de reprodução
-    Next Video Interval: Temporizador de contagem regressiva para reprodução automática
+    Next Video Interval: Intervalo para o próximo vídeo
     Display Play Button In Video Player: Mostrar botão "Reproduzir" no centro do player
     Scroll Volume Over Video Player: Alterar volume ao rolar sobre o player
     Fast-Forward / Rewind Interval: Intervalo para avançar/retroceder rapidamente
@@ -439,17 +434,50 @@ Settings:
     Enter Fullscreen on Display Rotate: Entrar em tela cheia ao girar o dispositivo
       para o modo paisagem
     Skip by Scrolling Over Video Player: Pular vídeo ao rolar sobre o player
-    Autoplay Interruption Timer: Temporizador de interrupção para reprodução automática
   Subscription Settings:
-    Subscription Settings: 'Inscrições'
+    Subscription Settings: 'Configurações de inscrições'
     Hide Videos on Watch: 'Ocultar vídeos após assisti-los'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Formato de exportação das inscrições'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Gerenciar inscrições'
+    Import Subscriptions: 'Importar inscrições'
+    Export Subscriptions: 'Exportar inscrições'
+    How do I import my subscriptions?: 'Como posso importar minhas inscrições?'
     Fetch Feeds from RSS: Buscar Informações através de RSS
     Fetch Automatically: Buscar feed automaticamente
+    Only Show Latest Video for Each Channel: Mostrar apenas vídeo mais recente para
+      cada canal
     Confirm Before Unsubscribing: Evitar cancelamento acidental de inscrições
+  Advanced Settings:
+    Advanced Settings: 'Configurações avançadas'
+    Enable Debug Mode (Prints data to the console): 'Habilitar modo de depuração (Mostra
+      dados no console)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Endereço de proxy (ex.:
+      SOCKS5://127.0.0.1:9050)'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Clicar
+      em "TESTAR PROXY" enviara uma requisição para https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Usar tor / proxy para chamadas da API'
+    TEST PROXY: 'TESTAR PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Ver instâncias públicas'
+    Clear History:
+      Clear History: 'Apagar histórico'
+      # On Click
+      Are you sure you want to delete your history?: 'Tens certeza que queres apagar
+        teu histórico?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Apagar inscrições'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Tens certeza que queres
+        remover todas as tuas inscrições?'
+      #& Yes
+      #& No
 
-    'Limit the number of videos displayed for each channel': Limitar o número de vídeos
-      exibidos para cada canal
-    To: Para
   Privacy Settings:
     Watch history has been cleared: O histórico de exibição foi apagado
     Are you sure you want to remove your entire watch history?: Tem certeza de que
@@ -461,7 +489,7 @@ Settings:
     Clear Search Cache: Limpar cache de buscas
     Save Watched Progress: Habilitar histórico de exibição
     Remember History: Lembrar histórico
-    Privacy Settings: Privacidade
+    Privacy Settings: Configurações de privacidade
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Tem
       certeza de que deseja remover todas as inscrições e perfis? Isto não pode ser
       desfeito.
@@ -479,13 +507,17 @@ Settings:
     All subscriptions have been successfully imported: Todas as inscrições foram importadas
       com sucesso
     Select Import Type: Selecionar tipo de importação
-    Data Settings: Dados
+    Data Settings: Configurações de dados
     Export History: Exportar histórico
     Import History: Importar histórico
     Export NewPipe: Exportar NewPipe
     Export YouTube: Exportar YouTube
     Export FreeTube: Exportar FreeTube
     Export Subscriptions: Exportar inscrições
+    Check for Legacy Subscriptions: Verificar se há inscrições em formato antigo
+    Import NewPipe: Importar NewPipe
+    Import YouTube: Importar YouTube
+    Import FreeTube: Importar FreeTube
     Import Subscriptions: Importar inscrições
     Select Export Type: Escolher tipo de exportação
     How do I import my subscriptions?: Como faço para importar minhas inscrições?
@@ -530,7 +562,7 @@ Settings:
     Hide Trending Videos: Ocultar vídeos em alta
     Hide Recommended Videos: Ocultar vídeos recomendados
     Hide Comment Likes: Ocultar "curtidas" em comentários
-    Distraction Free Settings: Modo Sem Distrações
+    Distraction Free Settings: Configurações de distrações
     Hide Channel Subscribers: Ocultar número de inscritos
     Hide Video Likes And Dislikes: Ocultar "curtidas" em vídeo
     Hide Video Views: Ocultar visualizações do vídeo
@@ -553,15 +585,16 @@ Settings:
       General: Geral
       Subscriptions Page: Página de inscrições
     Hide Featured Channels: Ocultar canais em destaque
-    Hide Channel Playlists: Ocultar a guia "Playlists" do canal
-    Hide Channel Community: Ocultar a guia "Comunidade" do canal
-    Hide Channel Shorts: Ocultar a guia "Shorts" do canal
-    Hide Channel Podcasts: Ocultar a guia "Podcasts" do canal
-    Hide Channel Releases: Ocultar a guia "Lancamentos" do canal
+    Hide Channel Playlists: Ocultar playlists de canais
+    Hide Channel Community: Ocultar comunidade do canal
+    Hide Channel Shorts: Ocultar "Shorts" do canal
+    Hide Channel Podcasts: Ocultar podcasts do canal
+    Hide Channel Releases: Ocultar lançamentos do canal
     Hide Subscriptions Videos: Ocultar vídeos de suas inscrições
     Hide Subscriptions Shorts: Ocultar "Shorts" de suas inscrições
     Hide Subscriptions Live: Ocultar transmissões ao vivo de suas inscrições
     Hide Profile Pictures in Comments: Ocultar foto do perfil nos comentários
+    Blur Thumbnails: Desfocar Miniaturas
     Hide Subscriptions Community: Ocultar comunidade de suas inscrições
     Hide Channels Invalid: ID do canal fornecido é inválido
     Hide Channels Disabled Message: Alguns canais foram bloqueados por ID e não foram
@@ -573,7 +606,6 @@ Settings:
       palavra ou frase
     Hide Videos and Playlists Containing Text: Ocultar vídeos e playlists que contenham
       texto
-    Hide Channel Home: Ocultar a guia "Início" do canal
   The app needs to restart for changes to take effect. Restart and apply change?: O
     aplicativo necessita reiniciar para as mudanças fazerem efeito. Reiniciar e aplicar
     mudança?
@@ -588,23 +620,18 @@ Settings:
     Proxy Host: Host do Proxy
     Proxy Protocol: Protocolo do Proxy
     Enable Tor / Proxy: Ativar Tor/Proxy
-    Proxy Settings: Proxy
+    Proxy Settings: Configurações de Proxy
     Error getting network information. Is your proxy configured properly?: Erro ao
       obter informações da rede. Seu proxy está configurado corretamente?
     City: Cidade
     Region: Região
-    Proxy Warning: FreeTube não tem um proxy integrado, mas pode se conectar a um
-      proxy externo, como um proxy em execução no seu computador, como o Tor, ou um
-      proxy externo, como um proxy SOCKS5 fornecido por algumas VPNs. Se estiver ativado,
-      certifique-se de que seu proxy/Tor esteja configurado corretamente, ou o FreeTube
-      não conseguirá obter nenhum dado.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar quando vídeos publicitários
       for ignorado
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL da API SponsorBlock
       (o padrão é https://sponsor.ajay.app)
     Enable SponsorBlock: Ativar SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Configurações SponsorBlock
     Skip Options:
       Show In Seek Bar: Mostrar na barra de busca
       Prompt To Skip: Solicitar para pular
@@ -620,14 +647,14 @@ Settings:
     Custom External Player Arguments: Argumentos do player externo personalizados
     External Player: Player externo
     Ignore Unsupported Action Warnings: Ignorar avisos de ação não suportada
-    External Player Settings: Player externo
+    External Player Settings: Configurações para players externos
     Custom External Player Executable: Executável do player externo personalizado
     Players:
       None:
         Name: Nenhum
     Ignore Default Arguments: Ignorar argumentos padrão
   Download Settings:
-    Download Settings: Download
+    Download Settings: Configurações de download
     Ask Download Path: Perguntar onde salvar o download
     Choose Path: Escolha o caminho
     Open in web browser: Abrir no navegador
@@ -636,16 +663,16 @@ Settings:
   Parental Control Settings:
     Show Family Friendly Only: Mostrar apenas conteúdo adequado para todos os públicos
     Hide Search Bar: Ocultar barra de pesquisa
-    Parental Control Settings: Controle dos Pais
+    Parental Control Settings: Configurações de Controle Parental
     Hide Unsubscribe Button: Ocultar botão "Cancelar inscrição"
   Experimental Settings:
-    Experimental Settings: Experimental
+    Experimental Settings: Configurações experimentais
     Warning: Essas configurações são experimentais, elas podem causar travamentos
       enquanto ativadas. Fazer backups é altamente recomendado. Use por sua conta
       e risco!
     Replace HTTP Cache: Repor cache HTTP
   Password Settings:
-    Password Settings: Senha
+    Password Settings: Configurações de senha
     Set Password: Definir senha
     Remove Password: Remover senha
     Set Password To Prevent Access: Defina uma senha para impedir o acesso às configurações
@@ -654,12 +681,38 @@ Settings:
     Password Incorrect: Senha incorreta
     Password: Senha
     Enter Password To Unlock: Digite a senha para desbloquear as configurações
+  Expand All Settings Sections: Expandir todas as seções de configurações
   Sort Settings Sections (A-Z): Classificar seções de configurações (A-Z)
-  Return to Settings Menu: Retornar ao menu de configurações
 About:
   #On About page
   About: 'Sobre'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
+    software é Livre sob a licença AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Encontrastes um problema? Tens uma sugestão de funcionalidade? Queres ajudar?
+    Veja como na nossa página na GitHub. PR são bem-vindas.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Muito
+    Obrigado a todas as pessoas e projetos que tornam o FreeTube possível!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Queres
+    conversar? Junte-se ao nosso servidor Element/Matrix. Verifique as regras antes
+    de juntar-se.'
+
+  'Looking for help? Check out our Wiki page.': 'Procurastes ajuda? Veja na nossa
+    página Wiki.'
+
+  Check out our Firefox extension!: 'Experimente nosso complemento do Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Gosta
+    de usar o FreeTube, considere realizar uma doação via Liberapay ou via Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Ultimas notícias sobre o FreeTube'
+
 #On Channel Page
   GitHub issues: Relatórios no GitHub
   Report a problem: Informar um problema
@@ -668,6 +721,8 @@ About:
   Help: Ajuda
   GitHub releases: Lançamentos do GitHub
   Downloads / Changelog: Downloads / Modificações
+  View License: Ver Licença
+  Licensed under the AGPLv3: Licença AGPLv3
   Source code: Código-fonte
   Beta: Beta
   Donate: Fazer doação
@@ -688,6 +743,8 @@ About:
   Licensed under the: Licenciado sob o
   AGPLv3: AGPLv3
 Channel:
+  Subscriber: 'Inscrito'
+  Subscribers: 'Inscritos'
   Subscribe: 'Inscrever-se'
   Unsubscribe: 'Remover inscrição'
   Search Channel: 'Buscar no canal'
@@ -754,9 +811,6 @@ Channel:
     Releases: Lançamentos
     This channel does not currently have any releases: Este canal não tem nenhum lançamento
       no momento
-  Home:
-    Home: Início
-    View Playlist: Ver playlist
 Video:
   Mark As Watched: 'Marcar como assistido'
   Remove From History: 'Remover do histórico'
@@ -785,8 +839,38 @@ Video:
     chat ao vivo não é suportado pela API do Invidious. Uma conexão com o YouTube
     é necessária.'
   Published:
+    Jan: 'jan'
+    Feb: 'fev'
+    Mar: 'mar'
+    Apr: 'abr'
+    May: 'mai'
+    Jun: 'jun'
+    Jul: 'jul'
+    Aug: 'ago'
+    Sep: 'set'
+    Oct: 'out'
+    Nov: 'nov'
+    Dec: 'dez'
+    Second: 'segundo'
+    Seconds: 'segundos'
+    Hour: 'hora'
+    Hours: 'horas'
+    Day: 'dia'
+    Days: 'dias'
+    Week: 'semana'
+    Weeks: 'semanas'
+    Month: 'mês'
+    Months: 'meses'
+    Year: 'ano'
+    Years: 'anos'
+    Ago: 'atrás'
+    Upcoming: 'Estreia em'
+    Minutes: minutos
+    Minute: minuto
+    Less than a minute: Menos de um minuto
     In less than a minute: Em menos de um minuto
   Published on: 'Publicado em'
+  Publicationtemplate: 'Há {number} {unit}'
 #& Videos
   Started streaming on: Transmissão iniciada em
   Streamed on: Transmitido em
@@ -875,16 +959,6 @@ Video:
     TranslatedCaptionTemplate: '{language} (traduzido do "{originalLanguage}")'
     Show Stats: Mostrar estatísticas
     Exit Full Window: Sair do preenchimento de janela
-  IP block: O YouTube bloqueou seu endereço IP para assistir a vídeos. Tente mudar
-    para uma VPN ou proxy diferente.
-  Unlisted: Não listado
-  MembersOnly: Vídeos exclusivos para membros não podem ser assistidos com o FreeTube,
-    pois exigem login do Google e assinatura paga do canal do remetente.
-  AgeRestricted: Vídeos com restrição de idade não podem ser assistidos com o FreeTube,
-    pois exigem login do Google e uso de uma conta do YouTube com verificação de idade.
-  DeArrow:
-    Show Original Details: Mostrar detalhes originais
-    Show Modified Details: Mostrar detalhes modificados
 Videos:
   #& Sort By
   Sort By:
@@ -895,6 +969,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Visualizar playlist completa'
+  Videos: 'Vídeos'
+  View: 'Visualização'
+  Views: 'Visualizações'
   Last Updated On: 'Atualizado em'
 
 # On Video Watch Page
@@ -910,8 +987,7 @@ Playlist:
     DateAddedOldest: Mais antigos
     AuthorDescending: Autor (Z-A)
     VideoTitleDescending: Título (Z-A)
-    VideoDurationAscending: Duração (a mais curta primeiro)
-    VideoDurationDescending: Duração (a mais longa primeiro)
+Toggle Theatre Mode: 'Alternar "Modo Teatro"'
 Change Format:
   Change Media Formats: 'Mudar formato do vídeo'
   Use Dash Formats: 'Usar formatos DASH'
@@ -980,6 +1056,7 @@ Local API Error (Click to copy): 'Erro da API local (clique para copiar)'
 Invidious API Error (Click to copy): 'Erro da API do Invidious (clique para copiar)'
 Falling back to Invidious API: 'Recorrendo à API do Invidious'
 Falling back to Local API: 'Recorrendo à API local'
+Subscriptions have not yet been implemented: 'Inscrições ainda não foram implementadas'
 Loop is now disabled: 'Modo de repetição desativado'
 Loop is now enabled: 'Modo de repetição ativado'
 Shuffle is now disabled: 'Reprodução aleatória desativada'
@@ -1035,7 +1112,7 @@ Profile:
   Profile has been created: Perfil criado
   Your profile name cannot be empty: O nome do seu perfil não pode ficar vazio
   Profile Filter: Filtrar perfil
-  Profile Settings: Perfil
+  Profile Settings: Configurações do perfil
   Toggle Profile List: Alternar lista de perfis
   Profile Name: Nome do perfil
   Edit Profile Name: Editar nome do perfil
@@ -1090,12 +1167,10 @@ Tooltips:
     External Link Handling: "Escolha o comportamento padrão quando um link que não
       pode ser aberto no FreeTube for clicado.\nPor padrão, o FreeTube abrirá o link
       clicado em seu navegador padrão.\n"
-    Open Deep Links In New Window: Os URLs a partir do FreeTube, como por extensões
-      de navegador de redirecionamento ou argumentos de linha de comando, são abertos
-      em uma nova janela.
   External Player Settings:
     Custom External Player Arguments: Quaisquer argumentos de linha de comando personalizados,
-      você deseja que seja passado para o player externo.
+      separados por ponto e vírgula (';'), você deseja que seja passado para o player
+      externo.
     Ignore Warnings: Suprime os avisos para quando o player externo atual não suporta
       a ação atual (por exemplo, reverter playlist, etc.).
     Custom External Player Executable: Por padrão, o FreeTube assumirá que o player
@@ -1131,6 +1206,8 @@ Playing Next Video Interval: A reproduzir o próximo vídeo imediatamente. Cliqu
   cancelar. | A reproduzir o próximo vídeo em {nextVideoInterval} segundo. Clique
   para cancelar. | A reproduzir o próximo vídeo em {nextVideoInterval} segundos. Clique
   para cancelar.
+Hashtags have not yet been implemented, try again later: Hashtags ainda não foram
+  implementadas, tente novamente mais tarde
 Unknown YouTube url type, cannot be opened in app: Tipo de URL do YouTube desconhecida,
   não pode ser aberta no aplicativo
 Open New Window: Abrir uma nova janela
@@ -1151,6 +1228,8 @@ Channels:
   Title: Lista de canais
   Search bar placeholder: Buscar canais
   Empty: Sua lista de canais está vazia no momento.
+  Unsubscribe: Cancelar inscrição
+  Unsubscribed: '"{channelName}" foi removido de suas inscrições'
   Unsubscribe Prompt: Tem certeza de que quer cancelar a sua inscrição de "{channelName}"?
   Count: '{number} canais encontrados.'
 Screenshot Success: Captura de tela salva em "{filePath}"
@@ -1166,7 +1245,6 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Lista oculta de capítulos,
     capítulo atual: {chapterName}'
   Chapters: Capítulos
-  Key Moments: Melhores momentos
 Ok: OK
 Hashtag:
   This hashtag does not currently have any videos: Esta hashtag não tem atualmente
@@ -1203,26 +1281,5 @@ Search Listing:
     Subtitles: Legendas
     Closed Captions: Legendas ocultas (CC)
     4K: 4K
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    3D: 3D
-    New: Novo
 'Blocked opening potentially unsafe URL': 'Impedido de abrir URL potencialmente inseguro:
   "{url}".'
-Keys:
-  alt: Alt
-  arrowup: Seta para cima
-  arrowright: Seta para a direita
-  ctrl: Ctrl
-  arrowdown: Seta para baixo
-  arrowleft: Seta para a esquerda
-shortcutJoinOperator: +
-Right-click or hold to see history: Clique com o botão direito do mouse ou mantenha-o
-  pressionado para ver o histórico
-Autoplay Interruption Timer: Reprodução automática cancelada devido a {autoplayInterruptionIntervalHours}
-  horas de inatividade
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Description:
-  Expand Description: '...mais'
-  Collapse Description: Mostrar menos
diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
index 269ae1acdfded..665e7e1b7ccc9 100644
--- a/static/locales/pt-PT.yaml
+++ b/static/locales/pt-PT.yaml
@@ -134,9 +134,18 @@ Most Popular: Mais populares
 Playlists: Listas de reprodução
 User Playlists:
   Your Playlists: As suas listas de reprodução
+  Playlist Message: Esta página não é indicativa do resultado final. Apenas mostra
+    os vídeos que foram guardados ou marcados como favoritos. Quando estiver pronta,
+    todos os vídeos que estiverem aqui serão postos numa lista chamada 'Favoritos'.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: A
+    lista está vazia. Clique no botão Guardar no canto de um vídeo para o mostrar
+    aqui.
   Search bar placeholder: Procurar listas de reprodução
   Empty Search Message: Não há vídeos nesta lista de reprodução que coincidam com
     a sua pesquisa
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Tem
+    certeza que quer remover todos os vídeos vistos desta lista de reprodução? Isto
+    não pode ser revertido.
   Are you sure you want to delete this playlist? This cannot be undone: Tem certeza
     de que pretende eliminar esta lista de reprodução? Isto não pode ser revertido.
   SinglePlaylistView:
@@ -266,6 +275,8 @@ Settings:
       End: Final
       Blur: Desfocar
       Hidden: Oculta
+    'Invidious Instance (Default is https://invidious.snopyta.org)': Instância Invidious
+      (Por omissão é https://invidious.snopyta.org)
     View all Invidious instance information: Mostrar toda a informação sobre esta
       instância Invidious
     Region for Trending: Região para as tendências
@@ -358,6 +369,7 @@ Settings:
     Hide FreeTube Header Logo: Ocultar logotipo FreeTube no topo
   Player Settings:
     Player Settings: Definições do reprodutor
+    Remember History: Lembrar Histórico
     Play Next Video: Reproduzir vídeo seguinte
     Turn on Subtitles by Default: Ativar legendas automaticamente
     Autoplay Videos: Reproduzir vídeos automaticamente
@@ -435,7 +447,15 @@ Settings:
     Subscription Settings: Definições de subscrições
     Hide Videos on Watch: Ocultar vídeos visualizados
     Fetch Feeds from RSS: Obter subscrições através de RSS
+    Subscriptions Export Format:
+      Subscriptions Export Format: Formato de Exportação de Subscrições
+      #& Freetube
+      Newpipe: Newpipe
+      OPML: OPML
+    Manage Subscriptions: Gerir subscrições
     Fetch Automatically: Obter fontes automaticamente
+    Only Show Latest Video for Each Channel: Mostrar apenas o último vídeo de cada
+      canal
     Confirm Before Unsubscribing: Impedir cancelamento acidental de subscrições
   Distraction Free Settings:
     Distraction Free Settings: Definições de distrações
@@ -492,6 +512,10 @@ Settings:
     Select Import Type: Selecione o tipo de importação
     Select Export Type: Selecione o tipo de exportação
     Import Subscriptions: Importar subscrições
+    Import FreeTube: Importar FreeTube
+    Import YouTube: Importar YouTube
+    Import NewPipe: Importar NewPipe
+    Check for Legacy Subscriptions: Verificar se há subscrições no formato antigo
     Export Subscriptions: Exportar subscrições
     Export FreeTube: Exportar FreeTube
     Export YouTube: Exportar YouTube
@@ -611,12 +635,15 @@ Settings:
       às definições
     Set Password: Definir palavra-passe
     Remove Password: Remover palavra-passe
+  Expand All Settings Sections: Expandir todas as secções de definições
   Sort Settings Sections (A-Z): Ordenar definições (A-Z)
 About:
   #On About page
   About: Acerca
   Beta: Beta
   Source code: Código-fonte
+  Licensed under the AGPLv3: Licenciado nos termos da AGPLv3
+  View License: Ver licença
   Downloads / Changelog: Descargas/Alterações
   GitHub releases: Versões no GitHub
   Help: Ajuda
@@ -694,6 +721,8 @@ Profile:
   Create Profile Name: Criar nome do perfil
   Profile Name: Nome do perfil
 Channel:
+  Subscriber: Subscritor
+  Subscribers: Subscritores
   Subscribe: Subscrever
   Unsubscribe: Cancelar subscrição
   Channel has been removed from your subscriptions: O canal foi removido das suas
@@ -798,10 +827,39 @@ Video:
   video only: apenas vídeo
   audio only: apenas áudio
   Published:
+    Jan: jan
+    Feb: fev
+    Mar: mar
+    Apr: abr
+    May: mai
+    Jun: jun
+    Jul: jul
+    Aug: ago
+    Sep: set
+    Oct: out
+    Nov: nov
+    Dec: dez
+    Second: Segundo
+    Seconds: Segundos
+    Minute: Minuto
+    Minutes: Minutos
+    Hour: Hora
+    Hours: Horas
+    Day: Dia
+    Days: Dias
+    Week: Semana
+    Weeks: Semanas
+    Month: Mês
+    Months: Meses
+    Year: Ano
+    Years: Anos
+    Ago: Há
+    Upcoming: Estreia em
     In less than a minute: Em menos de um minuto
   Published on: Publicado a
   Streamed on: Transmitido a
   Started streaming on: Transmissão iniciada em
+  Publicationtemplate: Há {number} {unit}
 #& Videos
   Play Previous Video: Reproduzir vídeo anterior
   Play Next Video: Reproduzir vídeo seguinte
@@ -854,6 +912,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: Ver lista de reprodução completa
+  Videos: Vídeos
+  View: Visualização
+  Views: Visualizações
   Last Updated On: Última atualização
 
 # On Video Watch Page
@@ -869,6 +930,7 @@ Playlist:
     Sort By: Ordenar por
     AuthorDescending: Autor (Z-A)
     VideoTitleAscending: Título (A-Z)
+Toggle Theatre Mode: Alternar modo cinema
 Change Format:
   Change Media Formats: Alterar formatos multimédia
   Use Dash Formats: Utilizar formatos DASH
@@ -971,8 +1033,8 @@ Tooltips:
     Fetch Automatically: Se ativa, FreeTube irá obter automaticamente as subscrições
       ao abrir uma nova janela e/ou quando mudar de perfil.
   External Player Settings:
-    Custom External Player Arguments: Quaisquer argumentos de linha de comando, que
-      quiser passar ao reprodutor externo.
+    Custom External Player Arguments: Quaisquer argumentos de linha de comando, separados
+      por ponto e vírgula (';'), que quiser passar ao reprodutor externo.
     Ignore Warnings: Ignorar avisos quando o reprodutor externo escolhido não suporte
       uma ação (por exemplo, inverter listas de reprodução).
     Custom External Player Executable: Por omissão, FreeTube assume que o reprodutor
@@ -1003,6 +1065,7 @@ Falling back to Local API: Ocorreu um erro e a API local será utilizada
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Este
   vídeo não está disponível porque faltam formatos. Isto pode acontecer devido à indisponibilidade
   no seu país.
+Subscriptions have not yet been implemented: As subscrições ainda não foram implementadas
 Loop is now disabled: Repetição desativada
 Loop is now enabled: Repetição ativada
 Shuffle is now disabled: Reprodução aleatória desativada
@@ -1023,6 +1086,8 @@ Playing Next Video Interval: A reproduzir o vídeo seguinte imediatamente. Cliqu
   para cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundos.
   Clique para cancelar.
 More: Mais
+Hashtags have not yet been implemented, try again later: As 'hashtags' ainda não foram
+  implementadas, tente mais tarde
 Unknown YouTube url type, cannot be opened in app: O tipo de URL YouTube é desconhecido
   e não pode ser aberto na aplicação
 Open New Window: Abrir nova janela
@@ -1041,6 +1106,8 @@ Channels:
   Search bar placeholder: Procurar canais
   Count: '{number} canais encontrados.'
   Empty: A lista de canais está vazia.
+  Unsubscribe: Anular subscrição
+  Unsubscribed: '{channelName} foi removido das suas subscrições'
   Unsubscribe Prompt: Tem a certeza de que pretende cancelar a subscrição em "{channelName}"?
 Downloading has completed: '"{videoTitle}" foi descarregado'
 Starting download: A descarregar "{videoTitle}"
diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 3faed77643f40..2032179bd2db0 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -2,10 +2,10 @@
 Locale Name: 'Português'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Esta parte do aplicativo ainda não está pronta. Volte mais tarde quando já houver
+  Esta parte da aplicação ainda não está pronta. Volte mais tarde quando já houver
   progresso.
 # Webkit Menu Bar
-File: 'Arquivo'
+File: 'Ficheiro'
 Quit: 'Sair'
 Edit: 'Editar'
 Undo: 'Desfazer'
@@ -42,8 +42,6 @@ Global:
     Subscriber Count: 1 subscritor | {count} subscritores
     View Count: 1 visualização | {count} visualizações
     Watching Count: 1 a assistir | {count} a assistir
-    Like Count: 1 gosto | {count} gostos
-    Comment Count: 1 comentário | {count} comentários
   Input Tags:
     Length Requirement: A etiqueta tem que ter, pelo menos, {number} caracteres
 Version {versionNumber} is now available!  Click for more details: 'A versão {versionNumber}
@@ -107,9 +105,7 @@ Subscriptions:
   Subscriptions: 'Subscrições'
   Latest Subscriptions: 'Subscrições recentes'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'A
-    sua lista de subscrições está vazia. Se quiser importar subscrições, pode aceder
-    às definições de dados e selecionar Importar subscrições. Em alternativa, pode
-    procurar os canais e efetuar a subscrição.'
+    sua lista de subscrições está vazia. Adicione algumas para as ver aqui.'
   'Getting Subscriptions. Please wait.': 'A carregar subscrições. Por favor aguarde.'
   Refresh Subscriptions: 'Recarregar subscrições'
   Load More Videos: Carregar mais vídeos
@@ -137,6 +133,12 @@ Most Popular: 'Mais populares'
 Playlists: 'Listas de reprodução'
 User Playlists:
   Your Playlists: 'As suas listas de reprodução'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: A
+    lista está vazia. Clique no botão Guardar no canto de um vídeo para o mostrar
+    aqui.
+  Playlist Message: Esta página não é indicativa do resultado final. Apenas mostra
+    os vídeos que foram guardados ou marcados como favoritos. Quando estiver pronta,
+    todos os vídeos que estiverem aqui serão postos numa lista chamada 'Favoritos'.
   Search bar placeholder: Procurar listas de reprodução
   Empty Search Message: Não há vídeos nesta lista de reprodução que coincidam com
     a sua pesquisa
@@ -187,15 +189,9 @@ User Playlists:
       This playlist does not exist: Esta lista de reprodução não existe
       This playlist is now used for quick bookmark: Esta lista de reprodução é agora
         usada como marcador rápido
+      Quick bookmark disabled: Marcador rápido desativado
       This playlist is already being used for quick bookmark.: Esta lista de reprodução
         já está a ser usada como marcador rápido.
-      This playlist has a video with a duration error: A lista de reprodução contém,
-        pelo menos, um vídeo sem informação de duração. Será organizado como se tivesse
-        0 segundos.
-      Reverted to use {oldPlaylistName} for quick bookmark: Revertido para usar {oldPlaylistName}
-        para favoritos rápidos
-      Playlist {playlistName} is the new quick bookmark playlist.: Revertido para
-        usar {oldPlaylistName} para favoritos rápidos
     Search for Videos: Procurar vídeos
   AddVideoPrompt:
     Search in Playlists: Procurar nas listas de reprodução
@@ -233,11 +229,15 @@ User Playlists:
     para criar uma.
   Move Video Down: Mover vídeo para baixo
   Edit Playlist Info: Editar informação da lista de reprodução
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Tem
+    certeza que quer remover todos os vídeos vistos desta lista de reprodução? Isto
+    não pode ser revertido.
   Playlist Description: Descrição da lista de reprodução
   Add to Favorites: Adicionar a {playlistName}
   Remove from Favorites: Remover de {playlistName}
   Enable Quick Bookmark With This Playlist: Ativar marcador rápido para esta lista
     de reprodução
+  Disable Quick Bookmark: Desativar marcador rápido
   Playlists with Matching Videos: Listas de reprodução coincidentes
   Quick Bookmark Enabled: Marcador rápido ativado
   Remove Duplicate Videos: Remover duplicados
@@ -249,10 +249,6 @@ User Playlists:
     a certeza de que pretende remover 1 vídeo duplicado desta lista de reprodução?
     Esta remoção não pode ser revertida. | Tem a certeza de que pretende remover {playlistItemCount}
     vídeos duplicados desta lista de reprodução? Esta remoção não pode ser revertida.
-  Export Playlist: Exportar lista de reprodução
-  The playlist has been successfully exported: Lista de reprodução exportada com sucesso
-  Cannot delete the quick bookmark target playlist.: Não é possível excluir a lista
-    de reprodução de destino dos favoritos rápidos.
 History:
   # On History Page
   History: 'Histórico'
@@ -260,12 +256,11 @@ History:
   Your history list is currently empty.: 'O seu histórico está vazio.'
   Search bar placeholder: Procurar no histórico
   Empty Search Message: Não há vídeos no histórico que coincidam com a sua pesquisa
-  Case Sensitive Search: Diferenciar maiúsculas e minúsculas
 Settings:
   # On Settings Page
   Settings: 'Definições'
   General Settings:
-    General Settings: 'Geral'
+    General Settings: 'Definições gerais'
     Check for Updates: 'Procurar atualizações'
     Check for Latest Blog Posts: 'Verificar se há novas publicações no blogue'
     Fallback to Non-Preferred Backend on Failure: 'Utilizar sistema de ligação secundário,
@@ -289,6 +284,8 @@ Settings:
       End: 'Final'
       Hidden: Oculta
       Blur: Desfocar
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Instância Invidious
+      (Por omissão é https://invidious.snopyta.org)'
     Region for Trending: 'Região para as tendências'
         #! List countries
     View all Invidious instance information: Mostrar toda a informação sobre esta
@@ -310,7 +307,7 @@ Settings:
       Label: Carregar seguinte automaticamente
       Tooltip: Carrega as páginas e comentários automaticamente.
   Theme Settings:
-    Theme Settings: 'Tema'
+    Theme Settings: 'Definições de tema'
     Match Top Bar with Main Color: 'Utilizar cor principal na barra superior'
     Base Theme:
       Base Theme: 'Tema base'
@@ -325,8 +322,6 @@ Settings:
       Nordic: Nórdico
       Solarized Dark: Escuro solar
       Solarized Light: Claro solar
-      Gruvbox Dark: Gruvbox Escuro
-      Gruvbox Light: Luz Gruvbox
     Main Color Theme:
       Main Color Theme: 'Cor principal'
       Red: 'Vermelho'
@@ -382,7 +377,7 @@ Settings:
     Hide Side Bar Labels: Ocultar texto na barra lateral
     Hide FreeTube Header Logo: Ocultar logotipo FreeTube no topo
   Player Settings:
-    Player Settings: 'Reprodutor'
+    Player Settings: 'Definições do reprodutor'
     Play Next Video: 'Reproduzir vídeo seguinte'
     Turn on Subtitles by Default: 'Ativar legendas automaticamente'
     Autoplay Videos: 'Reproduzir vídeos automaticamente'
@@ -435,7 +430,7 @@ Settings:
     Enter Fullscreen on Display Rotate: Ativar modo de ecrã completo ao rodar o ecrã
     Skip by Scrolling Over Video Player: Ignorar ao deslocar por cima do reprodutor
   Privacy Settings:
-    Privacy Settings: 'Privacidade'
+    Privacy Settings: 'Definições de privacidade'
     Remember History: 'Memorizar histórico'
     Save Watched Progress: 'Guardar progresso de reprodução'
     Clear Search Cache: 'Limpar cache de pesquisas'
@@ -457,16 +452,22 @@ Settings:
     Are you sure you want to remove all your playlists?: Tem a certeza de que pretende
       remover todas as suas listas de reprodução?
   Subscription Settings:
-    Subscription Settings: 'Subscrição'
+    Subscription Settings: 'Definições de subscrições'
     Hide Videos on Watch: 'Ocultar vídeos visualizados'
     Fetch Feeds from RSS: 'Obter subscrições através de RSS'
+    Manage Subscriptions: 'Gerir subscrições'
     Fetch Automatically: Obter fontes automaticamente
+    Only Show Latest Video for Each Channel: Mostrar apenas o último vídeo de cada
+      canal
     Confirm Before Unsubscribing: Impedir cancelamento acidental de subscrições
   Data Settings:
-    Data Settings: 'Dados'
+    Data Settings: 'Definições de dados'
     Select Import Type: 'Selecione o tipo de importação'
     Select Export Type: 'Selecione o tipo de exportação'
     Import Subscriptions: 'Importar subscrições'
+    Import FreeTube: 'Importar FreeTube'
+    Import YouTube: 'Importar YouTube'
+    Import NewPipe: 'Importar NewPipe'
     Export Subscriptions: 'Exportar subscrições'
     Export FreeTube: 'Exportar FreeTube'
     Export YouTube: 'Exportar YouTube'
@@ -495,6 +496,7 @@ Settings:
     Unknown data key: 'Chave de dados desconhecida'
     How do I import my subscriptions?: 'Como importar as minhas subscrições?'
     Manage Subscriptions: Gerir subscrições
+    Check for Legacy Subscriptions: Verificar se há subscrições no formato antigo
     Import Playlists: Importar listas de reprodução
     Export Playlists: Exportar listas de reprodução
     Playlist insufficient data: Dados insuficientes para a lista de reprodução "{playlist}",
@@ -515,13 +517,39 @@ Settings:
         listas de reprodução existentes usando a opção \"Remover todas as listas de
         reprodução\" em \"Definições de privacidade\".\n3. Abra a versão mais antiga
         do FreeTube e importe as listas de reprodução."
+  Advanced Settings:
+    Advanced Settings: 'Definições Avançadas'
+    Enable Debug Mode (Prints data to the console): 'Ligar Modo de Depuração (Escreve
+      dados à consola)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Endereço de intermediário
+      (Exemplo: SOCKS5://127.0.0.1:9050 )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Ao
+      Carregar "TESTAR INTERMEDIÁRIO" um pedido vai ser enviado a https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Usar Tor / Intermediário para Chamadas API'
+    TEST PROXY: 'TESTAR INTERMEDIÁRIO'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Ver Instâncias Públicas'
+    Clear History:
+      Clear History: 'Limpar Histórico'
+      # On Click
+      Are you sure you want to delete your history?: 'Tem a certeza de que quer apagar
+        o seu histórico?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Limpar Subscrições'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Tem a certeza de que quer
+        apagar as suas subscrições?'
+      #& Yes
+      #& No
 
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Notificar se um anúncio for ignorado
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL da API SponsorBlock
       (padrão é https://sponsor.ajay.app)
     Enable SponsorBlock: Ativar bloqueio da publicidade SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Definições SponsorBlock
     Skip Options:
       Skip Option: Opção para ignorar
       Auto Skip: Ignorar automaticamente
@@ -548,7 +576,7 @@ Settings:
     Proxy Host: Servidor do proxy
     Proxy Protocol: Protocolo do proxy
     Enable Tor / Proxy: Ativar Tor/Proxy
-    Proxy Settings: Proxy
+    Proxy Settings: Definições de proxy
   Distraction Free Settings:
     Hide Active Subscriptions: Ocultar subscrições ativas
     Hide Live Chat: Ocultar conversas em direto
@@ -560,7 +588,7 @@ Settings:
     Hide Channel Subscribers: Ocultar número de subscritores
     Hide Video Likes And Dislikes: Ocultar "gostos" em vídeos
     Hide Video Views: Ocultar visualizações
-    Distraction Free Settings: Distrações
+    Distraction Free Settings: Definições de distrações
     Hide Video Description: Ocultar descrição dos vídeos
     Hide Sharing Actions: Ocultar ações de partilha
     Hide Live Streams: Ocultar transmissões em direto
@@ -587,6 +615,7 @@ Settings:
     Hide Subscriptions Shorts: Ocultar subscrições de curtos
     Hide Subscriptions Live: Ocultar subscrições de emissões em direto
     Hide Profile Pictures in Comments: Ocultar imagens de perfil nos comentários
+    Blur Thumbnails: Desfocar miniaturas
     Hide Subscriptions Community: Ocultar subscrições de comunidades
     Hide Channels Invalid: O ID do canal não é válido
     Hide Channels Disabled Message: Alguns canais foram bloqueados e não foram processados.
@@ -604,7 +633,7 @@ Settings:
     Custom External Player Executable: Executável do reprodutor externo
     Ignore Unsupported Action Warnings: Ignorar avisos sobre ações inválidas
     External Player: Reprodutor externo
-    External Player Settings: Reprodutores externos
+    External Player Settings: Definições para reprodutores externos
     Players:
       None:
         Name: Nenhum
@@ -612,7 +641,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: Tem
     que reiniciar a aplicação para aplicar as alterações. Reiniciar e aplicar alterações?
   Download Settings:
-    Download Settings: Descargas
+    Download Settings: Definições para descargas
     Ask Download Path: Perguntar local para guardar
     Choose Path: Escolher local
     Download in app: Descarregar na aplicação
@@ -622,10 +651,10 @@ Settings:
     Hide Unsubscribe Button: Ocultar botão "Cancelar subscrição"
     Show Family Friendly Only: Mostrar apenas "Para famílias"
     Hide Search Bar: Ocultar barra de pesquisa
-    Parental Control Settings: Controlo parental
+    Parental Control Settings: Definições de controlo parental
   Experimental Settings:
     Replace HTTP Cache: Substituir cache HTTP
-    Experimental Settings: Experimentais
+    Experimental Settings: Definições experimentais
     Warning: Estas definições são experimentais e podem provocar falhas se ativadas.
       É altamente recomendado fazer cópias de segurança. Use por sua conta e risco!
   Password Dialog:
@@ -634,17 +663,43 @@ Settings:
     Password: Palavra-passe
     Unlock: Desbloquear
   Password Settings:
-    Password Settings: Palavra-passe
+    Password Settings: Definições de palavra-passe
     Set Password To Prevent Access: Defina uma palavra-passe para impedir o acesso
       às definições
     Set Password: Definir palavra-passe
     Remove Password: Remover palavra-passe
+  Expand All Settings Sections: Expandir todas as secções de definições
   Sort Settings Sections (A-Z): Ordenar definições (A-Z)
-  Return to Settings Menu: Voltar para as definições
 About:
   #On About page
   About: 'Acerca'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Este
+    software é licenciado livremente via AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Encontraste um bug? Queres sugerir uma funcionalidade? Queres ajudar-nos? Vai
+    á nossa página de GitHub. Pull requests são bem vindos.
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Agradeço
+    imenso a todas as pessoas e projetos que façam com que o FreeTube seja possivel!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Queres
+    conversar? Junta-te ao nosso servidor Element / Matrix. Por favor verifica as
+    regras antes de te juntares.'
+
+  'Looking for help? Check out our Wiki page.': 'Há procura de ajuda? Vê a nossa página
+    Wiki.'
+
+  Check out our Firefox extension!: 'Experimenta a nossa extensão Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Se
+    gostas de usar FreeTube, considera doar via Liberapay ou através do nosso endereço
+    Bitcoin.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Notícias recentes sobre FreeTube'
+
   FAQ: FAQ
   Blog: Blogue
   Website: Página web
@@ -666,6 +721,8 @@ About:
   Help: Ajuda
   GitHub releases: Versões no GitHub
   Downloads / Changelog: Descargas/Alterações
+  View License: Ver licença
+  Licensed under the AGPLv3: Licenciado nos termos da AGPLv3
   Source code: Código-fonte
   Beta: Beta
   Discussions: Discussões
@@ -716,7 +773,7 @@ Profile:
     os canais dos outros perfis.'
 #On Channel Page
   Profile Filter: Filtro de perfil
-  Profile Settings: Perfil
+  Profile Settings: Definições do perfil
   Toggle Profile List: Alternar lista de perfis
   Profile Name: Nome do perfil
   Edit Profile Name: Editar nome do perfil
@@ -724,6 +781,8 @@ Profile:
   Open Profile Dropdown: Abrir menu do perfil
   Close Profile Dropdown: Fechar menu do perfil
 Channel:
+  Subscriber: 'Subscritor'
+  Subscribers: 'Subscritores'
   Subscribe: 'Subscrever'
   Unsubscribe: 'Cancelar subscrição'
   Channel has been removed from your subscriptions: 'O canal foi removido das suas
@@ -773,10 +832,6 @@ Channel:
     Reveal Answers: Mostrar respostas
     votes: '{votes} votos'
     Video hidden by FreeTube: Freetube ocultou este vídeo
-    View Full Post: Ver publicação na íntegra
-    Viewing Posts Only Supported By Invidious: A visualização de comentários apenas
-      é suportada por Indivious. Aceda ao separador Comunidade de um canal para ver
-      o seu conteúdo sem Indivious.
   Live:
     Live: Em direto
     This channel does not currently have any live streams: Este canal não tem, atualmente,
@@ -826,8 +881,38 @@ Video:
     conversa em direto não se encontra a funcionar com a API Invividious. É necessária
     uma ligação direta ao YouTube.'
   Published:
+    Jan: 'jan'
+    Feb: 'fev'
+    Mar: 'mar'
+    Apr: 'abr'
+    May: 'mai'
+    Jun: 'jun'
+    Jul: 'jul'
+    Aug: 'ago'
+    Sep: 'set'
+    Oct: 'out'
+    Nov: 'nov'
+    Dec: 'dez'
+    Second: 'Segundo'
+    Seconds: 'Segundos'
+    Minute: 'Minuto'
+    Minutes: 'Minutos'
+    Hour: 'Hora'
+    Hours: 'Horas'
+    Day: 'Dia'
+    Days: 'Dias'
+    Week: 'Semana'
+    Weeks: 'Semanas'
+    Month: 'Mês'
+    Months: 'Meses'
+    Year: 'Ano'
+    Years: 'Anos'
+    Ago: 'Há'
+    Upcoming: 'Estreia em'
+    Less than a minute: Menos de um minuto
     In less than a minute: Em menos de um minuto
   Published on: 'Publicado a'
+  Publicationtemplate: 'Há {number} {unit}'
 #& Videos
   Starting soon, please refresh the page to check again: Irá começar brevemente. Recarregue
     a página para reanalisar
@@ -885,43 +970,6 @@ Video:
   Unhide Channel: Mostrar canal
   Hide Channel: Ocultar canal
   More Options: Mais opções
-  Player:
-    Theatre Mode: Modo teatro
-    Stats:
-      Media Formats: 'Formatos multimédia: {formats}'
-      Bitrate: Taxa de dados :{bitrate} kbps
-      Volume: 'Volume: {volumePercentage}%'
-      Bandwidth: 'Largura de banda: {bandwidth} kbps'
-      Resolution: 'Resolução: {width}x{height}@{frameRate}'
-      Player Dimensions: 'Dimensões do reprodutor: {width}x{height}'
-      Stats: Estatísticas
-      Video ID: 'ID do vídeo: {videoId}'
-      CodecAudio: 'Codificador: {audioCodec} ({audioItag})'
-      Buffered: 'A processar: {bufferedPercentage}%'
-      CodecsVideoAudio: 'Codificadores: {videoCodec} ({videoItag}) / {audioCodec}
-        ({audioItag})'
-      CodecsVideoAudioNoItags: 'Codificadores: {videoCodec} / {audioCodec}'
-    TranslatedCaptionTemplate: '{language} (traduzido de "{originalLanguage}")'
-    Audio Tracks: Faixas de áudio
-    Exit Theatre Mode: Sair do modo teatro
-    Full Window: Ecrã completo
-    Exit Full Window: Sair de ecrã completo
-    Take Screenshot: Captura de ecrã
-    Show Stats: Mostrar estatísticas
-    Hide Stats: Ocultar estatísticas
-    You appear to be offline: Parece que está offline.
-    Playback will resume automatically when your connection comes back: A reprodução
-      será retomada assim que se estabeleça uma nova ligação.
-    Skipped segment: Segmento {segmentCategory} ignorado
-  MembersOnly: Os vídeos apenas disponíveis para membros não podem ser vistos nesta
-    aplicação pois requerem que o utilizador inicie sessão e que tenha uma subscrição
-    paga.
-  IP block: O YouTube está a impedir o seu IP de ver vídeos. Experimente utilizar
-    outra VPN ou proxy.
-  AgeRestricted: Os vídeos com restrição de idade não podem ser vistos nesta aplicação
-    pois requerem que o utilizador inicie sessão com uma conta que tenha confirmação
-    da sua idade..
-  Unlisted: Não listado
 Videos:
   #& Sort By
   Sort By:
@@ -932,6 +980,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Ver lista de reprodução completa'
+  Videos: 'Vídeos'
+  View: 'Visualização'
+  Views: 'Visualizações'
   Last Updated On: 'Última atualização'
 
 # On Video Watch Page
@@ -947,8 +998,7 @@ Playlist:
     VideoTitleAscending: Título (A-Z)
     VideoTitleDescending: Título (Z-A)
     Custom: Personalizado
-    VideoDurationDescending: Duração (longos primeiro)
-    VideoDurationAscending: Duração (curtos primeiro)
+Toggle Theatre Mode: 'Alternar modo cinema'
 Change Format:
   Change Media Formats: 'Alterar formatos multimédia'
   Use Dash Formats: 'Utilizar formatos DASH'
@@ -958,8 +1008,6 @@ Change Format:
     para este vídeo'
   Audio formats are not available for this video: 'Os formatos de áudio não estão
     disponíveis para este vídeo'
-  Legacy formats are not available for this video: Este vídeo não permite formatos
-    antigos
 Share:
   Share Video: 'Partilhar vídeo'
   Share Playlist: 'Partilhar lista'
@@ -1008,8 +1056,6 @@ Comments:
   Hearted: Favorito
   View {replyCount} replies: Ver {replyCount} respostas
   Subscribed: Subscrito
-  There are no comments available for this post: Não existem comentários para esta
-    publicação
 Up Next: 'Próximo'
 
 # Toast Messages
@@ -1017,6 +1063,7 @@ Local API Error (Click to copy): 'Erro na API local (clique para copiar)'
 Invidious API Error (Click to copy): 'Erro na API Invidious (clique para copiar)'
 Falling back to Invidious API: 'Ocorreu um erro e a API Invidious será utilizada'
 Falling back to Local API: 'Ocorreu um erro e a API local será utilizada'
+Subscriptions have not yet been implemented: 'As subscrições ainda não foram implementadas'
 Loop is now disabled: 'Repetição desativada'
 Loop is now enabled: 'Repetição ativada'
 Shuffle is now disabled: 'Reprodução aleatória desativada'
@@ -1039,6 +1086,8 @@ Playing Next Video Interval: A reproduzir o vídeo seguinte imediatamente. Cliqu
   cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundo. Clique
   para cancelar. | A reproduzir o vídeo seguinte em {nextVideoInterval} segundos.
   Clique para cancelar.
+Hashtags have not yet been implemented, try again later: As 'hashtags' ainda não foram
+  implementadas, tente mais tarde
 Unknown YouTube url type, cannot be opened in app: O tipo de URL YouTube é desconhecido
   e não pode ser aberto na aplicação
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Este
@@ -1049,12 +1098,12 @@ Tooltips:
     Fetch Feeds from RSS: Se ativa, FreeTube irá obter as subscrições através de RSS
       em vez do método normal. O formato RSS é mais rápido e não é bloqueado pelo
       YouTube, mas não disponibiliza certas informações como, por exemplo, a duração
-      dos vídeos, se são emissões em direto e as publicações da comunidade
+      dos vídeos ou se são emissões em direto.
     Fetch Automatically: Se ativa, FreeTube irá obter automaticamente as subscrições
       ao abrir uma nova janela e/ou quando mudar de perfil.
   External Player Settings:
-    Custom External Player Arguments: Quaisquer argumentos de linha de comando, que
-      quiser passar ao reprodutor externo.
+    Custom External Player Arguments: Quaisquer argumentos de linha de comando, separados
+      por ponto e vírgula (';'), que quiser passar ao reprodutor externo.
     Ignore Warnings: Ignorar avisos quando o reprodutor externo escolhido não suporte
       uma ação (por exemplo, inverter listas de reprodução).
     Custom External Player Executable: Por omissão, FreeTube assume que o reprodutor
@@ -1125,6 +1174,8 @@ New Window: Nova janela
 Channels:
   Count: '{number} canais encontrados.'
   Empty: A lista de canais está vazia.
+  Unsubscribe: Anular subscrição
+  Unsubscribed: '{channelName} foi removido das suas subscrições'
   Search bar placeholder: Procurar canais
   Channels: Canais
   Title: Lista de canais
@@ -1173,8 +1224,3 @@ Search Listing:
     4K: 4K
     Subtitles: Legendas
     Closed Captions: Legendas fechadas
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Nova
-    3D: 3D
diff --git a/static/locales/ro.yaml b/static/locales/ro.yaml
index cd8613e1aa0e1..d3f5541960c65 100644
--- a/static/locales/ro.yaml
+++ b/static/locales/ro.yaml
@@ -133,6 +133,13 @@ Most Popular: 'Cele mai populare'
 Playlists: 'Liste de redare'
 User Playlists:
   Your Playlists: 'Listele tale de redare'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nu
+    ați salvat niciun videoclip. Faceți clic pe butonul de salvare din colțul unui
+    videoclip pentru a-l afișa aici
+  Playlist Message: Această pagină nu reflectă listele de redare complet funcționale.
+    Aceasta enumeră doar videoclipurile pe care le-ați salvat sau le-ați favorizat.
+    Când lucrările vor fi finalizate, toate videoclipurile care se află în prezent
+    aici vor fi migrate într-o listă de redare "Favorite".
   Search bar placeholder: Căutați liste de redare
   Empty Search Message: Nu există videoclipuri în această listă de redare care să
     corespundă căutării dvs.
@@ -177,6 +184,9 @@ User Playlists:
   Edit Playlist Info: Editați informațiile despre lista de redare
   Copy Playlist: Copiați lista de redare
   Remove Watched Videos: Eliminați videoclipurile vizionate
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Sunteți
+    sigur că doriți să eliminați toate videoclipurile vizionate din această listă
+    de redare? Acest lucru nu poate fi anulat.
   Create New Playlist: Creați o nouă listă de redare
   Add to Playlist: Adăugați la lista de redare
   Add to Favorites: Adaugă la {playlistName}
@@ -186,6 +196,7 @@ User Playlists:
   Playlist Name: Numele listei de redare
   Playlist Description: Descrierea listei de redare
   Save Changes: Salvați modificările
+  Disable Quick Bookmark: Dezactivați marcajul rapid
   Delete Playlist: Ștergeți lista de redare
   Are you sure you want to delete this playlist? This cannot be undone: Sunteți sigur
     că doriți să ștergeți această listă de redare? Acest lucru nu poate fi anulat.
@@ -211,6 +222,7 @@ User Playlists:
       This video cannot be moved down.: Acest videoclip nu poate fi mutat în jos.
       This video cannot be moved up.: Acest videoclip nu poate fi mutat în sus.
       Video has been removed: Videoclipul a fost eliminat
+      Quick bookmark disabled: Marcaj rapid dezactivat
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: Unele
         videoclipuri din lista de redare nu au fost incă încărcate. Face-ți click
         aici pentru a le copia oricum.
@@ -436,13 +448,19 @@ Settings:
     Subscription Settings: 'Setări de abonament'
     Hide Videos on Watch: 'Ascunde videoclipurile la vizionare'
     Fetch Feeds from RSS: 'Preluare de fluxuri din RSS'
+    Manage Subscriptions: 'Gestionați abonamentele'
     Fetch Automatically: Preluați feedul automat
     Confirm Before Unsubscribing: Confirmă înainte de dezabonare
+    Only Show Latest Video for Each Channel: Arată doar cele mai noi videoclipuri
+      pentru fiecare canal
   Data Settings:
     Data Settings: 'Setări de date'
     Select Import Type: 'Selectează tipul de import'
     Select Export Type: 'Selectează tipul de export'
     Import Subscriptions: 'Importă abonamente'
+    Import FreeTube: 'Importă FreeTube'
+    Import YouTube: 'Importă YouTube'
+    Import NewPipe: 'Importă NewPipe'
     Export Subscriptions: 'Exportați abonamentele'
     Export FreeTube: 'Exportați FreeTube'
     Export YouTube: 'Exportați YouTube'
@@ -471,6 +489,7 @@ Settings:
     Unable to write file: 'Nu se poate scrie fișierul'
     Unknown data key: 'Cheie de date necunoscută'
     How do I import my subscriptions?: 'Cum îmi pot importa abonamentele?'
+    Check for Legacy Subscriptions: Verificați dacă există abonamente vechi
     Manage Subscriptions: Gestionare abonamente
     All playlists has been successfully imported: Toate listele de redare au fost
       importate cu succes
@@ -483,6 +502,7 @@ Settings:
     Playlist File: Fișier listă de redare
     History File: Fișier istoric
     Subscription File: Fișier abonament
+  Advanced Settings: {}
   The app needs to restart for changes to take effect. Restart and apply change?: Aplicația
     trebuie repornită pentru ca modificările să intre în vigoare. Reporniți și aplicați
     modificările?
@@ -532,6 +552,7 @@ Settings:
     Hide Channels Placeholder: ID-ul canalului
     Hide Channel Playlists: Ascunde playlisturile canalului
     Hide Upcoming Premieres: Ascundeți premierele viitoare
+    Blur Thumbnails: Estomparea miniaturilor
     Hide Profile Pictures in Comments: Ascundeți imaginile de profil în comentarii
     Hide Channels Already Exists: ID-ul Canalului există deja
   SponsorBlock Settings:
@@ -620,6 +641,8 @@ About:
   Help: Ajutor
   GitHub releases: Lansări GitHub
   Downloads / Changelog: Descărcări / Jurnal de modificări
+  View License: Vezi licența
+  Licensed under the AGPLv3: Licențiat sub AGPLv3
   Source code: Codul sursă
   Beta: Beta
   Discussions: Discuții
@@ -673,6 +696,8 @@ Profile:
   Profile Name: Numele Profilului
   Edit Profile Name: Editează Numele Profilului
 Channel:
+  Subscriber: 'Abonat'
+  Subscribers: 'Abonați'
   Subscribe: 'Abonați-vă'
   Unsubscribe: 'Dezabonați-vă'
   Channel has been removed from your subscriptions: 'Canalul a fost eliminat din abonamentele
@@ -772,8 +797,38 @@ Video:
     în direct nu este acceptat în prezent cu API-ul Invidious.  Este necesară o conexiune
     directă la YouTube.'
   Published:
+    Jan: 'Ian'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Mai'
+    Jun: 'iun'
+    Jul: 'Iul'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Oct'
+    Nov: 'Noi'
+    Dec: 'Dec'
+    Second: 'Secundă'
+    Seconds: 'Secunde'
+    Minute: 'Minut'
+    Minutes: 'Minute'
+    Hour: 'Oră'
+    Hours: 'Ore'
+    Day: 'Zi'
+    Days: 'Zile'
+    Week: 'Săptămână'
+    Weeks: 'Săptămâni'
+    Month: 'Lună'
+    Months: 'Luni'
+    Year: 'An'
+    Years: 'Ani'
+    Ago: 'În urmă'
+    Upcoming: 'În premieră la'
+    Less than a minute: Mai putin de un minut
     In less than a minute: În mai puțin de un minut
   Published on: 'Publicat pe'
+  Publicationtemplate: 'acum {number} {unit}'
 #& Videos
   External Player:
     Unsupported Actions:
@@ -834,12 +889,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Vezi lista de redare completă'
+  Videos: 'Videoclipuri'
+  View: 'Vizionări'
+  Views: 'Vizualizări'
   Last Updated On: 'Ultima actualizare la'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Listă de redare
+Toggle Theatre Mode: 'Comutați modul Teatru'
 Change Format:
   Change Media Formats: 'Schimbați formatele video'
   Use Dash Formats: 'Utilizați formate DASH'
@@ -907,6 +966,7 @@ Falling back to Local API: 'Revenire la API-ul local'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Acest
   videoclip nu este disponibil din cauza lipsei de formate. Acest lucru se poate întâmpla
   din cauza indisponibilității țării.'
+Subscriptions have not yet been implemented: 'Abonamentele nu au fost încă implementate'
 Loop is now disabled: 'Bucla este acum dezactivată'
 Loop is now enabled: 'Bucla este acum activată'
 Shuffle is now disabled: 'Amestecarea este acum dezactivată'
@@ -933,6 +993,8 @@ Playing Next Video Interval: Se redară următorul videoclip în cel mai scurt t
   Faceți clic pentru a anula. | Se redă următorul videoclip în {nextVideoInterval}
   secundă. Faceți clic pentru a anula. | Se redă următorul videoclip în {nextVideoInterval}
   secunde. Faceți clic pentru a anula.
+Hashtags have not yet been implemented, try again later: Hashtag-urile nu au fost
+  încă implementate, încercați din nou mai târziu
 Unknown YouTube url type, cannot be opened in app: Tip url YouTube necunoscut, nu
   poate fi deschis în aplicație
 Tooltips:
@@ -945,7 +1007,8 @@ Tooltips:
       când se deschide o fereastră nouă și când schimbați profilul.
   External Player Settings:
     Custom External Player Arguments: Orice argumente personalizate din linia de comandă,
-      pe care doriți să le transmiteți playerului extern.
+      separate prin punct și virgulă (";"), pe care doriți să le transmiteți playerului
+      extern.
     Ignore Warnings: Suprimarea avertismentelor în cazul în care playerul extern curent
       nu acceptă acțiunea curentă (de exemplu, inversarea listelor de redare etc.).
     Custom External Player Executable: În mod implicit, FreeTube va presupune că playerul
@@ -1012,6 +1075,8 @@ Channels:
   Search bar placeholder: Caută canale
   Count: '{number} canal(e) găsit(e).'
   Empty: Lista ta de canale este goală.
+  Unsubscribe: Dezabonează-te
+  Unsubscribed: '{channelName} a fost eliminat din lista ta de abonamente'
   Unsubscribe Prompt: Ești sigur că dorești să te dezabonezi de la "{channelName}"?
 Screenshot Success: Capturi de ecran salvate ca "{filePath}"
 Screenshot Error: Captura de ecran a eșuat {error}
diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 1386d8e9c0630..e29684f82c692 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -98,10 +98,9 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Подписки'
   Latest Subscriptions: 'Последние подписки'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'В
-    настоящее время список подписок пуст. Если вы хотите импортировать свои подписки,
-    вы можете перейти в Настройки данных и выбрать Импорт подписок или найти канал
-    и подписаться на него.'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваш
+    список подписок в настоящее время пуст. Начните добавлять подписки, чтобы увидеть
+    их здесь.'
   'Getting Subscriptions.  Please wait.': 'Получение подписок. Пожалуйста, подождите.'
   Refresh Subscriptions: Обновить подписки
   Getting Subscriptions. Please wait.: Получение подписок, подождите.
@@ -129,6 +128,13 @@ Most Popular: 'Самые популярные'
 Playlists: 'Подборки'
 User Playlists:
   Your Playlists: 'Ваши подборки'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: У
+    вас нет сохранённых видео. Нажмите «Добавить видео в сохранённые», чтобы добавить
+    сюда
+  Playlist Message: Эта страница не отражает все возможности подборок. Она показывает
+    только те видео, которые вы сохранили или добавили в избранное. После переработки
+    этой страницы все видео, которые сейчас находятся здесь, переместятся в подборку
+    «Избранное».
   Search bar placeholder: Поиск подборок
   Empty Search Message: В этом плейлисте нет видео, соответствующих вашему запросу
   This playlist currently has no videos.: Пока в этой подборке нет видео.
@@ -182,8 +188,6 @@ User Playlists:
         для быстрого создания закладок.
       Playlist {playlistName} is the new quick bookmark playlist.: Плейлист {playlistName}
         - это новый плейлист быстрых закладок.
-      This playlist has a video with a duration error: Этот плейлист содержит хотя-бы
-        одно видео без продолжтельности, оно будет отсротрированно как с нулевой продолжительностью.
     Search for Videos: Поиск видео
   AddVideoPrompt:
     N playlists selected: '{playlistCount} выбрано'
@@ -218,6 +222,9 @@ User Playlists:
   Save Changes: Сохранить изменения
   Edit Playlist Info: Изменить сведения о подборке
   Remove Watched Videos: Удалить просмотренные видео
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Ты
+    действительно хочешь удалить все просмотренные видео из этой подборки? Это действие
+    необратимо.
   Cancel: Отмена
   You have no playlists. Click on the create new playlist button to create a new one.: У
     тебя нет подборок. Нажми на кнопку создания новой подборки, чтобы создать новую.
@@ -239,8 +246,6 @@ User Playlists:
     уверены, что хотите удалить 1 просмотренное видео из этого плейлиста? Это нельзя
     отменить. | Вы уверены, что хотите удалить {playlistItemCount} просмотренных видео
     из этого плейлиста? Это нельзя отменить.
-  Export Playlist: Экспортировать этот плейлист
-  The playlist has been successfully exported: Плейлист успешно экспортирован
 History:
   # On History Page
   History: 'История'
@@ -253,34 +258,36 @@ Settings:
   # On Settings Page
   Settings: 'Настройки'
   General Settings:
-    General Settings: 'Общие'
+    General Settings: 'Общие настройки'
     Fallback to Non-Preferred Backend on Failure: 'Откатить к непредпочтительному
       движку при сбое'
-    Enable Search Suggestions: 'Включить поисковые предложения'
-    Default Landing Page: 'Страница по умолчанию'
+    Enable Search Suggestions: 'Отображать поисковые предложения'
+    Default Landing Page: 'Целевая страница по умолчанию'
     Locale Preference: 'Язык приложения'
     Preferred API Backend:
-      Preferred API Backend: 'Предпочитаемый движок API'
-      Local API: 'Локальный API'
-      Invidious API: 'Invidious API'
+      Preferred API Backend: 'Предпочитаемый движок набора функций'
+      Local API: 'Локальный набор функций'
+      Invidious API: 'Набор функций Invidious'
     Video View Type:
-      Video View Type: 'Способ отображения видео'
+      Video View Type: 'Тип отображения видео'
       Grid: 'Сеткой'
       List: 'Списком'
     Thumbnail Preference:
       Thumbnail Preference: 'Настройка заставок'
       Default: 'По умолчанию'
       Beginning: 'В начале'
-      Middle: 'По середине'
+      Middle: 'В середине'
       End: 'В конце'
       Blur: Размытие
       Hidden: Скрыто
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Экземпляр Invidious
+      (по умолчанию https://invidious.snopyta.org)'
     Region for Trending: 'Регион подбора трендов'
         #! List countries
     Check for Latest Blog Posts: Проверять последние записи в блоге
-    Check for Updates: Проверить на наличие новых версий
+    Check for Updates: Проверять обновления
     View all Invidious instance information: Просмотреть все экземпляры Invidious
-    System Default: Системные настройки по умолчанию
+    System Default: Системные установки по умолчанию
     Clear Default Instance: Очистить экземпляр по умолчанию
     Set Current Instance as Default: Установить текущий экземпляр по умолчанию
     Current instance will be randomized on startup: Текущий экземпляр при запуске
@@ -295,10 +302,8 @@ Settings:
       Open Link: Открыть ссылку
       External Link Handling: Обработка внешних ссылок
     Auto Load Next Page:
-      Label: Авто-загрузка следующей страницы
+      Label: Автоматическая загрузка следующей страницы
       Tooltip: Автоматическая загрузка дополнительных страниц и комментариев.
-    Open Deep Links In New Window: Открыть URL-адреса, переданные в FreeTube, в новом
-      окне
   Theme Settings:
     Theme Settings: 'Внешний вид'
     Match Top Bar with Main Color: 'Использовать основной цвет к верхней панели'
@@ -315,8 +320,6 @@ Settings:
       Nordic: Северный
       Solarized Dark: Соляризованная темнота
       Solarized Light: Солнечное освещение
-      Gruvbox Dark: Gruvbox Темный
-      Gruvbox Light: Gruvbox Светлый
     Main Color Theme:
       Main Color Theme: 'Основной цвет темы'
       Red: 'Красный'
@@ -364,16 +367,6 @@ Settings:
       Solarized Cyan: Соляризованный голубой
       Solarized Violet: Соляризованный фиолетовый
       Solarized Green: Соляризованный зеленый
-      Gruvbox Dark Green: Gruvbox Темно-зеленый
-      Gruvbox Dark Blue: Gruvbox Темно-синий
-      Gruvbox Dark Purple: Gruvbox Темно-фиолетовый
-      Gruvbox Dark Aqua: Грувбокс темный аква
-      Gruvbox Light Red: Gruvbox Светло-красный
-      Gruvbox Light Blue: Gruvbox Светло-голубой
-      Gruvbox Light Purple: Gruvbox Светло-фиолетовый
-      Gruvbox Light Orange: Gruvbox Светло-оранжевый
-      Gruvbox Dark Yellow: Gruvbox Темно-желтый
-      Gruvbox Dark Orange: Gruvbox Темно-оранжевый
     Secondary Color Theme: 'Вторичный цвет темы'
         #* Main Color Theme
     UI Scale: Масштаб интерфейса
@@ -382,7 +375,8 @@ Settings:
     Hide Side Bar Labels: Скрыть надписи боковой панели
     Hide FreeTube Header Logo: Скрыть значок FreeTube
   Player Settings:
-    Player Settings: 'Проигрыватель'
+    Player Settings: 'Настройки проигрывателя'
+    Remember History: 'Запоминать историю'
     Play Next Video: 'Воспроизводить следующее видео'
     Turn on Subtitles by Default: 'Субтитры по умолчанию включены'
     Autoplay Videos: 'Автовоспроизведение видео'
@@ -439,9 +433,46 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Подписки'
     Hide Videos on Watch: 'Скрывать видео после просмотра'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Формат экспорта подписок'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Управление подписками'
+    Import Subscriptions: 'Импорт подписок'
+    Export Subscriptions: 'Экспорт подписок'
+    How do I import my subscriptions?: 'Как мне импортировать свои подписки?'
     Fetch Feeds from RSS: Получать ленты из RSS
     Fetch Automatically: Автоматически получать ленту
+    Only Show Latest Video for Each Channel: Показывать только последние видео для
+      каждого канала
     Confirm Before Unsubscribing: Подтвердить, прежде чем отписаться
+  Advanced Settings:
+    Advanced Settings: 'Расширенные настройки'
+    Enable Debug Mode (Prints data to the console): 'Включить режим отладки (выводит
+      данные на консоль)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Прокси-адрес (пример: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Нажатие
+      кнопки "ТЕСТ ПРОКСИ" отправит запрос на https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Использовать Tor / Прокси для вызовов API'
+    TEST PROXY: 'ТЕСТ ПРОКСИ'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'См. общедоступные экземпляры'
+    Clear History:
+      Clear History: 'Очистить историю'
+      # On Click
+      Are you sure you want to delete your history?: 'Вы уверены, что хотите удалить
+        свою историю?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Очистить подписки'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Вы уверены, что хотите
+        удалить все подписки?'
+      #& Yes
+      #& No
 
   Privacy Settings:
     Watch history has been cleared: История просмотров очищена
@@ -490,10 +521,14 @@ Settings:
     Export YouTube: Экспортировать YouTube
     Export FreeTube: Экспортировать FreeTube
     Export Subscriptions: Экспортировать подписки
+    Import NewPipe: Импортировать NewPipe
+    Import YouTube: Импортировать YouTube
+    Import FreeTube: Импортировать FreeTube
     Import Subscriptions: Импортировать подписки
     Select Export Type: Выбрать тип экспорта
     Select Import Type: Выбрать тип импорта
     Data Settings: Данные
+    Check for Legacy Subscriptions: Проверить устаревшие подписки
     Manage Subscriptions: Управление подписками
     Import Playlists: Импортировать подборки
     All playlists has been successfully exported: Все подборки успешно экспортированы
@@ -517,7 +552,7 @@ Settings:
     Hide Popular Videos: Скрыть популярные видео
     Hide Trending Videos: Скрыть видео в тренде
     Hide Recommended Videos: Скрыть рекомендуемые видео
-    Distraction Free Settings: Отвлекающие элементы
+    Distraction Free Settings: Отвлекающие части интерфейса
     Hide Comment Likes: Скрыть лайки в комментариях
     Hide Channel Subscribers: Скрыть подписчиков канала
     Hide Video Likes And Dislikes: Скрыть лайки и дизлайки к видео
@@ -535,19 +570,19 @@ Settings:
     Display Titles Without Excessive Capitalisation: Отображать заголовки без сплошных
       заглавных букв и знаков препинания
     Hide Featured Channels: Скрыть избранные каналы
-    Hide Channel Playlists: Скрыть вкладку "Списки воспроизведения" канала
-    Hide Channel Community: Скрыть вкладку "Сообщество" канала
-    Hide Channel Shorts: Скрыть вкладку "Шорты" канала
+    Hide Channel Playlists: Скрыть подборки канала
+    Hide Channel Community: Скрыть сообщество канала
+    Hide Channel Shorts: Скрыть короткие видео канала
     Sections:
       Side Bar: Боковая полоса
       Channel Page: Страница канала
       Watch Page: Страница просмотра
       General: Основные
       Subscriptions Page: Страница подписок
-    Hide Channel Releases: Скрыть вкладку "Релизы" канала
+    Hide Channel Releases: Скрыть выпуски канала
     Hide Subscriptions Videos: Скрыть видео из подписок
     Hide Subscriptions Live: Скрыть трансляции из подписок
-    Hide Channel Podcasts: Скрыть вкладку "Подкасты" канала
+    Hide Channel Podcasts: Скрыть звукопередачи канала
     Hide Subscriptions Shorts: Скрыть короткие видео из подписок
     Hide Profile Pictures in Comments: Скрыть изображения профилей в комментариях
     Hide Channels Invalid: Указанный идентификатор канала недействителен
@@ -561,7 +596,6 @@ Settings:
       текст
     Hide Videos and Playlists Containing Text Placeholder: Слово, часть слова, или
       выражение
-    Hide Channel Home: Скрыть вкладку "Главная" канала
   The app needs to restart for changes to take effect. Restart and apply change?: Чтобы
     изменения вступили в силу, необходимо перезапустить приложение. Перезапустить
     и применить изменения?
@@ -581,16 +615,12 @@ Settings:
     Ip: Ip
     Enable Tor / Proxy: Включить Tor/Прокси
     Proxy Settings: Прокси
-    Proxy Warning: FreeTube не имеет встроенного прокси, но может подключаться к внешнему
-      прокси, например, к запущенному на вашей машине Tor или к внешнему прокси, например,
-      SOCKS5, предоставляемому некоторыми VPN. Если прокси включен, убедитесь, что
-      ваш прокси/Tor настроен правильно, иначе FreeTube не сможет получать данные.
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Уведомлять о пропущенном сегменте
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Сетевой адрес SponsorBlock
       API (По умолчанию https://sponsor.ajay.app)
     Enable SponsorBlock: Включить
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Настройки SponsorBlock
     Skip Options:
       Skip Option: Опция пропуска
       Prompt To Skip: Предлагать пропустить
@@ -622,11 +652,11 @@ Settings:
     Open in web browser: Открыть в браузере
   Parental Control Settings:
     Show Family Friendly Only: Показать только семейный контент
-    Parental Control Settings: Родительский Контроль
+    Parental Control Settings: Настройки родительского контроля
     Hide Unsubscribe Button: Скрыть кнопку отписки
     Hide Search Bar: Скрыть строку поиска
   Experimental Settings:
-    Experimental Settings: Эксперементы
+    Experimental Settings: Пробные настройки
     Replace HTTP Cache: Заменить HTTP-кэш
     Warning: Эти настройки являются пробными, они могут привести к вылетам приложения
       при включении. Желательно сделать резервные копии. Используйте на своё усмотрение!
@@ -636,17 +666,44 @@ Settings:
     Unlock: Разблокировать
     Enter Password To Unlock: Введите пароль для разблокировки настроек
   Password Settings:
-    Password Settings: Пароль
+    Password Settings: Настройка пароля
     Set Password To Prevent Access: Установите пароль для предотвращения доступа к
       настройкам
     Set Password: Установить пароль
     Remove Password: Удалить пароль
+  Expand All Settings Sections: Расширить все разделы настроек
   Sort Settings Sections (A-Z): Сортировка разделов настроек (A-Z)
-  Return to Settings Menu: Вернуться в Настройки
 About:
   #On About page
   About: 'О приложении'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Это
+    программное обеспечение с авторским левом распространяется под свободной лицензией
+    AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Нашли ошибку? Хотите предложить функцию? Хотите помочь? Посетите нашу страницу
+    GitHub. Запросы на объединение приветствуются.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Большое
+    спасибо людям и проектам, которые сделали FreeTube возможным!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Хотите
+    пообщаться? Присоединяйтесь к нашему серверу Element / Matrix. Пожалуйста, ознакомьтесь
+    с правилами перед тем, как присоединиться.'
+
+  'Looking for help? Check out our Wiki page.': 'Нужна помощь? Посетите нашу вики-страницу.'
+
+  Check out our Firefox extension!: 'Ознакомьтесь с нашим расширением для Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Если
+    вам нравится использовать FreeTube, рассмотрите возможность пожертвования через
+    Liberapay или через наш биткойн-адрес.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Последние новости FreeTube'
+
 #On Channel Page
   Donate: Пожертвовать
   these people and projects: этим людям и проектам
@@ -666,6 +723,8 @@ About:
   Help: Помощь
   GitHub releases: Выпуски на GitHub
   Downloads / Changelog: Скачать / Список изменений
+  View License: Посмотреть лицензию
+  Licensed under the AGPLv3: Лицензия AGPLv3
   Source code: Исходный код
   Beta: Бета
   Please check for duplicates before posting: Перед публикацией проблемы, проверьте
@@ -675,6 +734,8 @@ About:
   Licensed under the: Лицензия выдана под
   AGPLv3: AGPLv3
 Channel:
+  Subscriber: 'Подписчик'
+  Subscribers: 'Подписчиков'
   Subscribe: 'Подписаться'
   Unsubscribe: 'Отписаться'
   Search Channel: 'Поиск на канале'
@@ -741,9 +802,6 @@ Channel:
     Releases: Выпуски
     This channel does not currently have any releases: На этом канале пока нет ни
       одного выпуска
-  Home:
-    Home: Дом
-    View Playlist: Просмотреть плейлист
 Video:
   Mark As Watched: 'Отметить как просмотренное'
   Remove From History: 'Удалить из истории'
@@ -773,8 +831,38 @@ Video:
     трансляции в настоящее время не поддерживается Invidious API. Требуется прямое
     подключение к YouTube.'
   Published:
+    Jan: 'Янв'
+    Feb: 'Фев'
+    Mar: 'Мар'
+    Apr: 'Апр'
+    May: 'Май'
+    Jun: 'Июн'
+    Jul: 'Июл'
+    Aug: 'Авг'
+    Sep: 'Сен'
+    Oct: 'Окт'
+    Nov: 'Ноя'
+    Dec: 'Дек'
+    Second: 'Секунда'
+    Seconds: 'Секунд'
+    Hour: 'Час'
+    Hours: 'Часов'
+    Day: 'День'
+    Days: 'Дней'
+    Week: 'Неделя'
+    Weeks: 'Недель'
+    Month: 'Месяц'
+    Months: 'Месяцев'
+    Year: 'Год'
+    Years: 'Лет'
+    Ago: 'Назад'
+    Upcoming: 'Премьера'
+    Minutes: Минут
+    Minute: Минута
+    Less than a minute: Менее минуты
     In less than a minute: Меньше чем через минуту
   Published on: 'Размещено'
+  Publicationtemplate: '{number} {unit} назад'
 #& Videos
   Autoplay: Автовоспроизведение
   Play Previous Video: Воспроизвести предыдущее видео
@@ -861,18 +949,6 @@ Video:
     Take Screenshot: Сделать Снимок Экрана
     Show Stats: Показать Статистику
     Hide Stats: Скрыть Статистику
-  IP block: YouTube заблокировал ваш IP-адрес для просмотра видео. Пожалуйста, попробуйте
-    переключиться на другой VPN или прокси.
-  MembersOnly: Видео только для подписчиков нельзя смотреть на FreeTube, так как для
-    них требуется вход в Google и платное членство на канале пользователя, загрузившего
-    подписку.
-  Unlisted: Отсутствует в списках
-  AgeRestricted: Видео с возрастными ограничениями нельзя смотреть через FreeTube,
-    так как для этого требуется вход в Google и использование подтвержденной учетной
-    записи YouTube.
-  DeArrow:
-    Show Original Details: Показать стандартные свойства
-    Show Modified Details: Показать модифицированные свойства
 Videos:
   #& Sort By
   Sort By:
@@ -883,6 +959,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Посмотреть всю подборку'
+  Videos: 'Видео'
+  View: 'Вид'
+  Views: 'Просмотров'
   Last Updated On: 'Последнее обновление'
 
 # On Video Watch Page
@@ -898,8 +977,7 @@ Playlist:
     VideoTitleAscending: Название (от А до Я)
     VideoTitleDescending: Название (Z-A)
     Custom: Пользовательский
-    VideoDurationAscending: Продолжительность (Сначала кратчайшие)
-    VideoDurationDescending: Продолжительность (Сначала длиннейшие)
+Toggle Theatre Mode: 'Переключить режим широкого экрана'
 Change Format:
   Change Media Formats: 'Изменить форматы видео'
   Use Dash Formats: 'Использовать форматы DASH'
@@ -969,6 +1047,7 @@ Invidious API Error (Click to copy): 'Ошибка набора функций I
   скопировать)'
 Falling back to Invidious API: 'Возврат к набору функций Invidious'
 Falling back to Local API: 'Возврат к локальному набору функций'
+Subscriptions have not yet been implemented: 'Подписки еще не реализованы'
 Loop is now disabled: 'Повторение теперь отключено'
 Loop is now enabled: 'Повторение теперь включено'
 Shuffle is now disabled: 'Перемешивание теперь отключено'
@@ -1023,7 +1102,7 @@ Profile:
   Other Channels: Другие каналы
   Subscription List: Список подписок
   Profile Filter: Фильтр профилей
-  Profile Settings: Профиль
+  Profile Settings: Настройки профиля
   Toggle Profile List: Переключить список профилей
   Create Profile Name: Создать название учётки
   Profile Name: Название учётки
@@ -1058,10 +1137,9 @@ Tooltips:
       по умолчанию.\n"
   Subscription Settings:
     Fetch Feeds from RSS: Если эта настройка включена, FreeTube будет получать вашу
-      ленту подписок с помощью RSS, вместо метода по умолчанию. RSS работает быстрее
-      и предотвращает блокировку IP, но не предоставляет определённую информацию,
-      такую как продолжительность видео или сведения о том, транслируется ли видео
-      в настоящем времени
+      ленту подписок с помощью RSS, а не как обычно. RSS работает быстрее и предотвращает
+      блокировку IP, но не предоставляет определённую информацию, такую как продолжительность
+      видео или сведения о том, транслируется ли видео в настоящем времени
     Fetch Automatically: Если эта функция включена, FreeTube автоматически будет получать
       ленту ваших подписок как при открытии нового окна, так при переключении профиля.
   Player Settings:
@@ -1070,7 +1148,7 @@ Tooltips:
       ограничены пределом в 720p, но используют меньшую пропускную способность. Звуковые
       форматы — только звуковые потоки.
     Proxy Videos Through Invidious: Будет подключаться к Invidious для показа видео
-      вместо прямого подключения к YouTube.
+      вместо прямого подключения к YouTube. Переопределяет предпочтения набора функций.
     Scroll Playback Rate Over Video Player: Пока указатель мыши находится над видео,
       нажмите и удерживайте клавишу Control (клавиша Command на Mac) и прокрутите
       колесо мыши вперед или назад, чтобы изменять скорость воспроизведения. Нажмите
@@ -1081,7 +1159,7 @@ Tooltips:
       видео в стиле MPV.
   External Player Settings:
     Custom External Player Arguments: Любые пользовательские аргументы командной строки,
-      которые вы хотите передать внешнему проигрывателю.
+      разделенные точкой с запятой (';'), которые вы хотите передать внешнему проигрывателю.
     Ignore Warnings: Скрыть предупреждения, когда текущий внешний проигрыватель не
       поддерживает текущее действие (например, обратный порядок подборок и другие).
     Custom External Player Executable: По умолчанию FreeTube будет считать, что выбранный
@@ -1116,6 +1194,8 @@ Playing Next Video Interval: Воспроизведение следующего
   для отмены. | Воспроизведение следующего видео через {nextVideoInterval} сек. Нажмите
   для отмены. | Воспроизведение следующего видео через {nextVideoInterval} сек. Нажмите
   для отмены.
+Hashtags have not yet been implemented, try again later: Распределительные метки ещё
+  не сделаны, попробуйте позже
 Unknown YouTube url type, cannot be opened in app: Неизвестный тип адреса YouTube,
   невозможно открыть в приложении
 Open New Window: Открыть новое окно
@@ -1139,6 +1219,8 @@ Channels:
   Empty: Список каналов пуст.
   Channels: Каналы
   Search bar placeholder: Поиск каналов
+  Unsubscribe: Отписаться
+  Unsubscribed: '{channelName} был удалён из ваших подписок'
   Unsubscribe Prompt: Вы уверены, что хотите отписаться от «{channelName}»?
 Clipboard:
   Copy failed: Не удалось скопировать в буфер обмена
@@ -1150,7 +1232,6 @@ Chapters:
     текущий раздел: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Список разделов скрыт,
     текущий раздел: {chapterName}'
-  Key Moments: Основные моменты
 Preferences: Настройки
 Ok: Хорошо
 Hashtag:
@@ -1187,20 +1268,5 @@ Search Listing:
     4K: 4K
     Subtitles: Субтитры
     Closed Captions: Субтитры
-    8K: 8К
-    VR180: VR180
-    360 Video: 360°
-    New: Новинка
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Заблокировано открытие потенциально небезопасного
   URL: "{url}".'
-KeyboardShortcutTemplate: '{метка} ({короткое нажатие})'
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Стрелка вниз
-  arrowleft: Стрелка влево
-  arrowright: Стрелка вправо
-  arrowup: Стрелка вверх
-Right-click or hold to see history: ПКМ или зажми для просмотра истории
diff --git a/static/locales/si.yaml b/static/locales/si.yaml
index 03a504e13fe93..c6edfc65bd4ab 100644
--- a/static/locales/si.yaml
+++ b/static/locales/si.yaml
@@ -73,6 +73,7 @@ Settings:
       Black: 'කළු'
       Dark: 'අඳුරු'
   Player Settings: {}
+  Advanced Settings: {}
 Channel:
   Playlists: {}
 More: තව
diff --git a/static/locales/sk.yaml b/static/locales/sk.yaml
index 8d546bedb3c47..3f9c5004650a9 100644
--- a/static/locales/sk.yaml
+++ b/static/locales/sk.yaml
@@ -126,6 +126,11 @@ Most Popular: 'Populárne'
 Playlists: 'Playlist'
 User Playlists:
   Your Playlists: 'Tvoj playlist'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Vaše
+    uložené videá sú prázdne. Kliknutím na tlačidlo uložiť v rohu videa ho tu zobrazíte
+  Playlist Message: Zatiaľ tu nie sú plne funkčné playlisty. Sú tu len videá, ktoré
+    ste uložili medzi obľúbené. Keď playlisty plne implementujeme do aplikácie, presunú
+    sa do „Obľúbené“.
   You have no playlists. Click on the create new playlist button to create a new one.: Nemáte
     žiadne playlisty. Kliknutím na tlačidlo playlistu vytvoríte nový.
   Empty Search Message: V tomto playliste nie sú žiadne videá, ktoré by zodpovedali
@@ -178,6 +183,8 @@ Settings:
       Beginning: 'Začiatok'
       Middle: 'Stred'
       End: 'Koniec'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Stránka
+      (Predvolená je https://invidious.snopyta.org)'
     Region for Trending: 'Región pre trendy'
         #! List countries
     Check for Latest Blog Posts: Kontrolovať najnovšie príspevky na blogu
@@ -276,7 +283,33 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Nastavenia Odberov'
     Hide Videos on Watch: 'Skryť videá po zhliadnutí'
+    Manage Subscriptions: 'Spravovať odbery'
     Fetch Feeds from RSS: Natiahnuť kanály z RSS
+  Advanced Settings:
+    Enable Debug Mode (Prints data to the console): 'Povoliť režim ladenia (Zaplní
+      konzolu údajmi)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy adresa (príklad: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Kliknutím
+      na tlačidlo „VYSKÚŠAŤ PROXY“ odošlete žiadosť na adresu https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Používať Tor / Proxy pre volania API'
+    TEST PROXY: 'VYSKÚŠAŤ PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Zobraziť verejné inštancie'
+    Clear History:
+      Clear History: 'Vymazať históriu'
+      # On Click
+      Are you sure you want to delete your history?: 'Naozaj chcete odstrániť svoju
+        históriu?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Vymazať odbery'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Naozaj chcete odstrániť
+        všetky odbery?'
+      #& Yes
+      #& No
 
   Data Settings:
     How do I import my subscriptions?: Ako môžem importovať svoje odbery?
@@ -304,6 +337,10 @@ Settings:
     Export YouTube: Exportovať dáta vo formáte Youtube
     Export FreeTube: Exportovať dáta vo formáte FreeTube
     Export Subscriptions: Exportovať Odbery
+    Check for Legacy Subscriptions: Skontrolovať zastarané odbery
+    Import NewPipe: Importovať dáta z NewPipe
+    Import YouTube: Importovať dáta z Youtube
+    Import FreeTube: Importovať dáta z FreeTube
     Import Subscriptions: Importovať odbery
     Select Export Type: Vybrať typ exportu
     Select Import Type: Vybrať typ importu
@@ -370,11 +407,40 @@ About:
   #On About page
   About: 'O FreeTube'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Tento
+    softvér je voľne licencovaný pod AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Našli ste chybu? Chcete navrhnúť funkciu? Chcete pomôcť? Navštívte našu stránku
+    GitHub. PRka vítané.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Ďakujeme
+    veľmi pekne ľuďom a projektom, ktoré umožňujú, že FreeTube funguje!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Chcete
+    sa porozprávať? Pripojte sa k nášmu serveru Element / Matrix. Pred pripojením
+    si prečítajte pravidlá.'
+
+  'Looking for help? Check out our Wiki page.': 'Hľadáte pomoc? Navštívte našu stránku
+    Wiki.'
+
+  Check out our Firefox extension!: 'Vyskúšajte naše rozšírenie pre Firefox!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Ak
+    radi využívate FreeTube, zvážte donate skrz Liberapay alebo prostredníctvom našej
+    bitcoinovej adresy.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Najnovšie správy o FreeTube'
+
 #On Channel Page
   FreeTube Wiki: Wiki FreeTube
   Help: Pomoc
   GitHub releases: Vydania na GitHube
   Downloads / Changelog: Súbory na stiahnutie / Zoznam zmien
+  View License: Zobraziť licenciu
+  Licensed under the AGPLv3: Na základe licencie AGPLv3
   Beta: Testovacia verzia
   Source code: Zdrojový kód
   GitHub issues: Problémy z GitHubu
@@ -395,6 +461,8 @@ About:
   Please check for duplicates before posting: Pred odoslaním prosím skontrolujte duplicitné
     otázky
 Channel:
+  Subscriber: 'Odberateľ'
+  Subscribers: 'Odberateľov'
   Subscribe: 'Odberať'
   Unsubscribe: 'Zrušiť odber'
   Search Channel: 'Vyhľadať v kanáli'
@@ -451,7 +519,37 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': 'Live
     Chat momentálne nie je podporovaný pomocou API Invidious. Vyžaduje sa priame pripojenie
     k službe YouTube.'
+  Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Máj'
+    Jun: 'Jún'
+    Jul: 'Júl'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Dec'
+    Second: 'Sekunda'
+    Seconds: 'Sekúnd'
+    Hour: 'Hodina'
+    Hours: 'Hodín'
+    Day: 'Deň'
+    Days: 'Dni'
+    Week: 'Týždeň'
+    Weeks: 'Týždne'
+    Month: 'Mesiac'
+    Months: 'Mesiace'
+    Year: 'Rok'
+    Years: 'Rokov'
+    Ago: 'Pred'
+    Upcoming: 'Premiéra o'
+    Minute: Minúta
+    Minutes: Minút
   Published on: 'Publikované dňa'
+  Publicationtemplate: 'pred {number} {unit}'
 #& Videos
   Autoplay: Automatické prehrávanie
   Starting soon, please refresh the page to check again: Čoskoro začína, obnovte stránku
@@ -506,12 +604,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Zobraziť celý zoznam videí'
+  Videos: 'Videá'
+  View: 'Pozrieť'
+  Views: 'Zhliadnutí'
   Last Updated On: 'Posledná aktualizácia'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Zoznam videí
+Toggle Theatre Mode: 'Prepnúť na režim kino'
 Change Format:
   Change Media Formats: 'Zmena formátov videa'
   Use Dash Formats: 'Použitie formátov DASH'
@@ -572,6 +674,7 @@ Local API Error (Click to copy): 'Local API chyba (kliknutím skopírujete)'
 Invidious API Error (Click to copy): 'Invidious API chyba (kliknutím skopírujete)'
 Falling back to Invidious API: 'Návrat k Invidious API'
 Falling back to Local API: 'Návrat k local API'
+Subscriptions have not yet been implemented: 'Odbery ešte nie sú implementované'
 Loop is now disabled: 'Opakovanie je teraz deaktivované'
 Loop is now enabled: 'Opakovanie je teraz povolené'
 Shuffle is now disabled: 'Náhodné prehrávanie je teraz zakázané'
@@ -684,6 +787,8 @@ Playing Next Video Interval: Prehrávanie ďalšieho videa za chvíľu. Kliknut
   | Prehráva sa ďalšie video o {nextVideoInterval} sekundu. Kliknutím zrušíte. | Prehráva
   sa ďalšie video o {nextVideoInterval} sekúnd. Kliknutím zrušíte.
 More: Viac
+Hashtags have not yet been implemented, try again later: Neznámy typ adresy URL YouTube,
+  v aplikácii sa nedá otvoriť
 Unknown YouTube url type, cannot be opened in app: Neznámy typ adresy URL YouTube,
   v aplikácii sa nedá otvoriť
 Open New Window: Otvoriť nové okno
@@ -701,7 +806,9 @@ Channels:
   Title: Zoznam kanálov
   Count: 'Nájdených {number} kanálov.'
   Search bar placeholder: Vyhľadať kanály
+  Unsubscribed: '{channelName} bol odstránený z vašich odberov'
   Empty: Váš zoznam kanálov je momentálne prázdny.
+  Unsubscribe: Zrušiť odber
   Unsubscribe Prompt: Určite sa chcete odhlásiť z odberu "{channelName}"?
 Preferences: Predvoľby
 Close Banner: Zavrieť banner
diff --git a/static/locales/sl.yaml b/static/locales/sl.yaml
index b468c4f5f5728..bbf549da3c2c6 100644
--- a/static/locales/sl.yaml
+++ b/static/locales/sl.yaml
@@ -105,6 +105,13 @@ Most Popular: 'Najbolj popularno'
 Playlists: 'Seznami predvajanja'
 User Playlists:
   Your Playlists: 'Vaši seznami predvajanja'
+  Playlist Message: Ta stran ne odraža stanja popolnoma delujočih seznamov predvajanja.
+    Na njej so prikazani zgolj videoposnetki, ki ste jih shranili ali označili kot
+    priljubljene. Ko bo delo končano, bodo ti videoposnetki preseljeni v Seznam priljubljenih
+    videoposnetkov.
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Nimate
+    shranjenih videoposnetkov. Kliknite na gumb Shrani v kotu videoposnetka, da bo
+    ta dodan tukaj
   Search bar placeholder: Iskanje v seznamu predvajanja
   Empty Search Message: Na tem seznamu predvajanja ni videoposnetkov, ki bi ustrezali
     vašemu iskanju
@@ -143,6 +150,8 @@ Settings:
       Beginning: 'Začetek'
       Middle: 'Sredina'
       End: 'Konec'
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious instanca
+      (prevzeta je https://invidious.snopyta.org)'
     Region for Trending: 'Regija za priljubljene videoposnetke'
         #! List countries
     View all Invidious instance information: Prikaži vse podatke o Invidious domeni
@@ -288,11 +297,15 @@ Settings:
     Subscription Settings: 'Nastavitve naročnin'
     Hide Videos on Watch: 'Skrij gledane videoposnetke'
     Fetch Feeds from RSS: 'Pridobi vire iz RSS'
+    Manage Subscriptions: 'Upravljanje z naročninami'
   Data Settings:
     Data Settings: 'Podatkovne nastavitve'
     Select Import Type: 'Izberi uvozno obliko'
     Select Export Type: 'Izberi izvozno obliko'
     Import Subscriptions: 'Uvozi naročnine'
+    Import FreeTube: 'Uvozi iz FreeTube'
+    Import YouTube: 'Uvozi iz YouTube'
+    Import NewPipe: 'Uvozi iz NewPipe'
     Export Subscriptions: 'Izvozi naročnine'
     Export FreeTube: 'Izvozi za FreeTube'
     Export YouTube: 'Izvozi za YouTube'
@@ -320,7 +333,33 @@ Settings:
     Unable to write file: 'Datoteke ni možno prebrati'
     Unknown data key: 'Neznan podatkovni ključ'
     How do I import my subscriptions?: 'Kako lahko uvozim moje naročnine?'
+    Check for Legacy Subscriptions: Poišči zapuščinske naročnine
     Manage Subscriptions: Upravljaj z naročninami
+  Advanced Settings:
+    Advanced Settings: 'Napredne nastavitve'
+    Enable Debug Mode (Prints data to the console): 'Vklopi razhroščevalni način (podatke
+      prikaže v konzoli)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy naslov (primer: SOCKS5://127.0.0.1:9050)'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Če
+      kliknete gumb "Preizkusi Proxy", bo poslana zahteva na https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Uporabi Tor/Proxy za API klice'
+    TEST PROXY: 'Preizkusi Proxy'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Prikaži javne domene'
+    Clear History:
+      Clear History: 'Izbriši zgodovino'
+      # On Click
+      Are you sure you want to delete your history?: 'Ste prepričani, da želite izbrisati
+        vašo zgodovino?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Izbriši naročnine'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Ste prepričani, da želite
+        izbrisati vse naročnine?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Skrij klepet v živo
@@ -372,6 +411,33 @@ About:
   #On About page
   About: 'O programu'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Ta
+    programska oprema je objavljena pod odprto licenco AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Ste našli napako? Želite prelagati novo funkcijo? Želite priskočiti na pomoč?
+    Pojdite na našo GitHub stran. Pull request-i so dobrodošli.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Najlepša
+    hvala projektom in osebam, zaradi katerih je FreeTube mogoč!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Si
+    želite pogovora? Pridružite se našemu Element/Matrix strežniku. Prosimo, pred
+    včlanitvijo preberite pravila.'
+
+  'Looking for help? Check out our Wiki page.': 'Potrebujete pomoč? Oglejte si našo
+    Wiki stran.'
+
+  Check out our Firefox extension!: 'Preizkusite naš Firefox dodatek!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Če
+    radi uporabljate FreeTube, bi bili zelo veseli donacije preko LiberaPay ali našega
+    Bitcoin naslova.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Najnovejše FreeTube novice'
+
   Donate: Doniraj
   these people and projects: teh ljudi in projektov
   FreeTube is made possible by: FreeTube obstaja zaradi
@@ -393,6 +459,8 @@ About:
   Help: Pomoč
   GitHub releases: Github izdaje
   Downloads / Changelog: Prenosi in dnevnik sprememb
+  View License: Ogled licence
+  Licensed under the AGPLv3: Licencirano pod AGPLv3
   Source code: Izvirna koda
   Beta: Beta
 Profile:
@@ -440,6 +508,8 @@ Profile:
   Profile Filter: Filter profilov
   Profile Settings: Nastavitve profila
 Channel:
+  Subscriber: 'Naročnik'
+  Subscribers: 'Naročnikov'
   Subscribe: 'Naroči se'
   Unsubscribe: 'Prekini naročnino'
   Channel has been removed from your subscriptions: 'Kanal je bil odstranjen iz vaših
@@ -506,8 +576,37 @@ Video:
     v živo trenutno ni podprt v Invidious APV.  Potrebna je neposredna povezava z
     YouTubom.'
   Published:
+    Jan: 'jan.'
+    Feb: 'feb.'
+    Mar: 'mar.'
+    Apr: 'apr.'
+    May: 'maj'
+    Jun: 'jun.'
+    Jul: 'jul.'
+    Aug: 'avg.'
+    Sep: 'sep.'
+    Oct: 'okt.'
+    Nov: 'nov.'
+    Dec: 'dec.'
+    Second: 'sekunda'
+    Seconds: 'sekunde'
+    Minute: 'minuta'
+    Minutes: 'minute'
+    Hour: 'h'
+    Hours: 'h'
+    Day: 'd'
+    Days: 'd'
+    Week: 'ted.'
+    Weeks: 'tedni'
+    Month: 'mesec'
+    Months: 'meseci'
+    Year: 'let.'
+    Years: 'leta'
+    Ago: 'Nazaj'
+    Upcoming: 'Kmalu bo objavljeno'
     In less than a minute: Manj kot minuti
   Published on: 'Objavljeno dne'
+  Publicationtemplate: '{number} {unit} nazaj'
 #& Videos
   audio only: Samo avdio
   video only: Samo video
@@ -532,12 +631,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Pokaži celoten seznam predvajanja'
+  Videos: 'Videoposnetki'
+  View: 'Ogled'
+  Views: 'Ogledi'
   Last Updated On: 'Nazadnje posodobljeno dne'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Seznam predvajanja
+Toggle Theatre Mode: 'Preklopi gledališki način'
 Change Format:
   Change Media Formats: 'Spremeni vrsto videoposnetka'
   Use Dash Formats: 'Uporabi DASH oblike'
@@ -594,6 +697,7 @@ Falling back to Invidious API: 'Začasno bo uporabljen Invidious APV'
 Falling back to Local API: 'Začasno bo uporabljen lokalni APV'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Videoposnetek
   zaradi mankajočih oblik ni dostopen. To se lahko zgodi, ko v vaši državi ni na razpolago.'
+Subscriptions have not yet been implemented: 'Naročnine še niso bile implementirane'
 Loop is now disabled: 'Ponovno predvajanje je izklopljeno'
 Loop is now enabled: 'Ponovno predvajanje je vklopljeno'
 Shuffle is now disabled: 'Mešanje je izklopljeno'
@@ -627,7 +731,9 @@ Channels:
   Title: Seznam kanalov
   Search bar placeholder: Išči kanale
   Empty: Vaš seznam kanalov je trenutno prazen.
+  Unsubscribe: Prekini naročnino
   Count: Najdenih {number} kanalov.
+  Unsubscribed: '{channelName} je bil odstranjen iz vašega seznama kanalov'
   Unsubscribe Prompt: Ali ste prepričani, da želite prekiniti naročnino od "{channelName}"?
 Are you sure you want to open this link?: Ali ste prepričani, da želite odpreti to
   povezavo?
diff --git a/static/locales/sm.yaml b/static/locales/sm.yaml
index cdc59a9a0c026..e28da2d8b204c 100644
--- a/static/locales/sm.yaml
+++ b/static/locales/sm.yaml
@@ -115,6 +115,8 @@ Channels:
   Search bar placeholder: ''
   Count: ''
   Empty: ''
+  Unsubscribe: ''
+  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
   Trending: ''
@@ -127,6 +129,8 @@ Most Popular: ''
 Playlists: ''
 User Playlists:
   Your Playlists: ''
+  Playlist Message: ''
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   Empty Search Message: ''
   Search bar placeholder: ''
 History:
@@ -245,25 +249,27 @@ Settings:
     Proxy Videos Through Invidious: ''
     Autoplay Playlists: ''
     Enable Theatre Mode by Default: ''
-    Scroll Volume Over Video Player: ''
-    Scroll Playback Rate Over Video Player: ''
-    Skip by Scrolling Over Video Player: ''
-    Display Play Button In Video Player: ''
-    Enter Fullscreen on Display Rotate: ''
-    Next Video Interval: ''
-    Fast-Forward / Rewind Interval: ''
-    Default Volume: ''
-    Default Playback Rate: ''
-    Max Video Playback Rate: ''
-    Video Playback Rate Interval: ''
+    Scroll Volume Over Video Player: 'Прагортваць гучнасці па-над відэапрайгравальнікам'
+    Scroll Playback Rate Over Video Player: 'Прагортваць хуткасці прайгравання па-над
+      відэапрайгравальнікам'
+    Skip by Scrolling Over Video Player: 'Прапусціць, прагарнуўшы відэапрайгравальнік'
+    Display Play Button In Video Player: 'Адлюстроўваць кнопку прайгравання ў відэапрайгравальніку'
+    Enter Fullscreen on Display Rotate: 'Пераходзіць у поўнаэкранны рэжым пры павароце
+      дысплэя'
+    Next Video Interval: 'Інтэрвал да наступнага відэа'
+    Fast-Forward / Rewind Interval: 'Інтэрвал перамоткі наперад / назад'
+    Default Volume: 'Гучнасць па змаўчанні'
+    Default Playback Rate: 'Хуткасць прайгравання па змаўчанні'
+    Max Video Playback Rate: 'Максімальная хуткасць прайгравання відэа'
+    Video Playback Rate Interval: 'Інтэрвал хуткасці прайгравання відэа'
     Default Video Format:
-      Default Video Format: ''
-      Dash Formats: ''
-      Legacy Formats: ''
-      Audio Formats: ''
+      Default Video Format: 'Фармат відэа па змаўчанні'
+      Dash Formats: 'Фарматы DASH'
+      Legacy Formats: 'Састарэлыя фарматы'
+      Audio Formats: 'Аўдыё фарматы'
     Default Quality:
-      Default Quality: ''
-      Auto: ''
+      Default Quality: 'Якасць па змаўчанні'
+      Auto: 'Аўта'
       144p: '144p'
       240p: '240p'
       360p: '360p'
@@ -274,27 +280,32 @@ Settings:
       4k: '4k'
       8k: '8k'
     Screenshot:
-      Enable: ''
-      Format Label: ''
-      Quality Label: ''
-      Ask Path: ''
-      Folder Label: ''
-      Folder Button: ''
-      File Name Label: ''
-      File Name Tooltip: ''
+      Enable: 'Уключыць здымак экрана'
+      Format Label: 'Фармат здымка'
+      Quality Label: 'Якасць здымка'
+      Ask Path: 'Пытаць папку для захоўвання'
+      Folder Label: 'Папка для здымкаў'
+      Folder Button: 'Выбраць папку'
+      File Name Label: 'Шаблон назвы файла'
+      File Name Tooltip: 'Вы можаце выкарыстоўваць пераменныя ніжэй. %Y Год 4 лічбы.
+        %M Месяц 2 лічбы. %D Дні 2 лічбы. %H Гадзіны 2 лічбы. %N Хвіліны 2 лічбы.
+        %S Секунды 2 лічбы. %T Мілісекунды 3 лічбы. %s Секунды відэа. %t Мілісекунды
+        відэа 3 лічбы. %i Ідэнтыфікатар відэа. Вы таксама можаце выкарыстоўваць "\"
+        або "/" для стварэння падпапак.'
       Error:
-        Forbidden Characters: ''
-        Empty File Name: ''
+        Forbidden Characters: 'Забароненыя сімвалы'
+        Empty File Name: 'Пустая назва файла'
   External Player Settings:
-    External Player Settings: ''
-    External Player: ''
-    Ignore Unsupported Action Warnings: ''
+    External Player Settings: 'Налады вонкавага прайгравальніка'
+    External Player: 'Вонкавы прайгравальнік'
+    Ignore Unsupported Action Warnings: 'Ігнараваць папярэджанні аб дзеяннях, якія
+      не падтрымліваюцца'
     Custom External Player Executable: ''
     Custom External Player Arguments: ''
     Players:
       None:
         Name: ''
-    Ignore Default Arguments: ''
+    Ignore Default Arguments: Ігнараваць аргументы па змаўчанні
   Privacy Settings:
     Privacy Settings: ''
     Remember History: ''
@@ -308,13 +319,11 @@ Settings:
     Watch history has been cleared: ''
     Remove All Subscriptions / Profiles: ''
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
-    Remove All Playlists: ''
-    All playlists have been removed: ''
-    Are you sure you want to remove all your playlists?: ''
   Subscription Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
+    Manage Subscriptions: ''
     Fetch Automatically: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -324,6 +333,7 @@ Settings:
       Channel Page: ''
       Watch Page: ''
       General: ''
+    Blur Thumbnails: ''
     Hide Video Views: ''
     Hide Video Likes And Dislikes: ''
     Hide Channel Subscribers: ''
@@ -362,6 +372,7 @@ Settings:
     Subscription File: ''
     History File: ''
     Playlist File: ''
+    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: ''
     Export YouTube: ''
@@ -446,6 +457,8 @@ About:
   About: ''
   Beta: ''
   Source code: ''
+  Licensed under the AGPLv3: ''
+  View License: ''
   Downloads / Changelog: ''
   GitHub releases: ''
   Help: ''
@@ -607,10 +620,39 @@ Video:
   video only: ''
   audio only: ''
   Published:
+    Jan: ''
+    Feb: ''
+    Mar: ''
+    Apr: ''
+    May: ''
+    Jun: ''
+    Jul: ''
+    Aug: ''
+    Sep: ''
+    Oct: ''
+    Nov: ''
+    Dec: ''
+    Second: ''
+    Seconds: ''
+    Minute: ''
+    Minutes: ''
+    Hour: ''
+    Hours: ''
+    Day: ''
+    Days: ''
+    Week: ''
+    Weeks: ''
+    Month: ''
+    Months: ''
+    Year: ''
+    Years: ''
+    Ago: ''
+    Upcoming: ''
     In less than a minute: ''
   Published on: ''
   Streamed on: ''
   Started streaming on: ''
+  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -646,11 +688,15 @@ Playlist:
   #& About
   Playlist: ''
   View Full Playlist: ''
+  Videos: ''
+  View: ''
+  Views: ''
   Last Updated On: ''
 
 # On Video Watch Page
 #* Published
 #& Views
+Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -749,7 +795,9 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
+Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
diff --git a/static/locales/sr.yaml b/static/locales/sr.yaml
index 3d9523dbd9703..f9bd8cd4a4a61 100644
--- a/static/locales/sr.yaml
+++ b/static/locales/sr.yaml
@@ -110,9 +110,8 @@ Subscriptions:
     профил има велики број праћења.  Присиљавање RSS-а да се избегне ограничавање
     брзине'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваша
-    листа праћења је тренутно празна. Ако желите да увезете своја праћења, можете
-    отићи у Подешавања података и изабрати Увоз праћења или можете претражити канал
-    и запратити га.'
+    листа праћења је тренутно празна. Почните да додајете праћења да бисте их видели
+    овде.'
   'Getting Subscriptions. Please wait.': 'Набављање праћења. Сачекајте.'
   Refresh Subscriptions: 'Освежи праћења'
   Load More Videos: 'Учитај више видео снимака'
@@ -137,9 +136,18 @@ Most Popular: 'Најпопуларније'
 Playlists: 'Плејлисте'
 User Playlists:
   Your Playlists: 'Ваше плејлисте'
+  Playlist Message: 'Ова страница не одражава потпуно функционалне плејлисте. Наводи
+    само видео снимке које сте сачували или означили као фаворите. Када се посао заврши,
+    сви видео снимци који су тренутно овде биће пребачени на плејлисту „Омиљено“.'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Немате
+    сачуване видео снимке. Кликните на дугме за чување у углу видео снимка да бисте
+    га додали на ову листу'
   Empty Search Message: На овој плејлисти нема видео снимака који одговарају вашој
     претрази
   Search bar placeholder: Претрага плејлиста
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Желите
+    ли заиста да уклоните све одгледане видео снимке са ове плејлисте? Ово се не може
+    поништити.
   AddVideoPrompt:
     Search in Playlists: Претрага у плејлистама
     Save: Сачувај
@@ -184,6 +192,7 @@ User Playlists:
       This video cannot be moved down.: Овај видео снимак се не може померити надоле.
       This playlist is now used for quick bookmark: Ова плејлиста се сада користи
         за брзо обележавање
+      Quick bookmark disabled: Брзо обележавање је онемогућено
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Ова
         плејлиста се сада користи за брзо обележавање, уместо „{oldPlaylistName}“.
         Кликните овде да поништите
@@ -193,9 +202,6 @@ User Playlists:
         користи за брзо обележавање.
       Playlist {playlistName} is the new quick bookmark playlist.: Плејлиста {playlistName}
         је нова плејлиста за брзо обележавање.
-      This playlist has a video with a duration error: Ова плејлиста садржи најмање
-        један видео снимак који нема трајање, биће сортиран као да је његово трајање
-        нула.
     Search for Videos: Претрага видео снимака
   Are you sure you want to delete this playlist? This cannot be undone: Желите ли
     заиста да избришете ову плејлисту? Ово се не може поништити.
@@ -237,6 +243,7 @@ User Playlists:
   Copy Playlist: Копирај плејлисту
   Playlist Description: Опис плејлисте
   Enable Quick Bookmark With This Playlist: Омогући брзо обележавање помоћу ове плејлисте
+  Disable Quick Bookmark: Онемогући брзо обележавање
   Add to Favorites: Додај на плејлисту „{playlistName}“
   Remove from Favorites: Уклони са плејлисте „{playlistName}“
   Playlists with Matching Videos: Плејлисте с подударајућим видео снимцима
@@ -252,8 +259,6 @@ User Playlists:
     ли заиста да уклоните 1 одгледани видео с ове плејлисте? Ово не може бити опозвано.
     | Желите ли заиста да уклоните {playlistItemCount} одледаних видео снимака с ове
     плејлисте? Ово не може бити опозвано.
-  Export Playlist: Извези ову плејлисту
-  The playlist has been successfully exported: Плејлиста је успешно извезена
 History:
   # On History Page
   History: 'Историја'
@@ -269,7 +274,7 @@ Settings:
   The app needs to restart for changes to take effect. Restart and apply change?: 'Апликација
     се мора рестартовати да би се примениле промене. Рестартовати и применити промене?'
   General Settings:
-    General Settings: 'Опште'
+    General Settings: 'Општа подешавања'
     Check for Updates: 'Провера ажурирања'
     Check for Latest Blog Posts: 'Провера најновијих објава на блогу'
     Fallback to Non-Preferred Backend on Failure: 'Повратак на непреферирани бек-енд
@@ -293,6 +298,8 @@ Settings:
       End: 'Крај'
       Hidden: Скривено
       Blur: Замагљено
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious инстанца
+      (Подразумевано је https://invidious.snopyta.org)'
     View all Invidious instance information: 'Погледај све информације о Invidious
       инстанци'
     Region for Trending: 'Регион за „У тренду“'
@@ -314,10 +321,8 @@ Settings:
     Auto Load Next Page:
       Label: Аутоматски учитај следећу страницу
       Tooltip: Аутоматско учитавање додатних страница и коментара.
-    Open Deep Links In New Window: Отворите URL адресе прослеђене FreeTube-у у новом
-      прозору
   Theme Settings:
-    Theme Settings: 'Тема'
+    Theme Settings: 'Подешавања теме'
     Match Top Bar with Main Color: 'Усклади горњу траку са главном бојом'
     Expand Side Bar by Default: 'Подразумевано прошири бочну траку'
     Disable Smooth Scrolling: 'Онемогући глатко прелажење'
@@ -331,12 +336,10 @@ Settings:
       Pastel Pink: Пастелно розе
       Hot Pink: Врућа розе
       Catppuccin Mocha: Catppuccin Mocha
-      System Default: Системски подразумевана
+      System Default: Системски подразумевано
       Nordic: Нордичка
       Solarized Dark: Соларизована тамна
       Solarized Light: Соларизована светла
-      Gruvbox Dark: Gruvbox тамна
-      Gruvbox Light: Gruvbox светла
     Main Color Theme:
       Main Color Theme: 'Главна тема боја'
       Red: 'Црвена'
@@ -384,22 +387,12 @@ Settings:
       Solarized Magenta: Соларизована магента
       Solarized Blue: Соларизована плава
       Solarized Violet: Соларизована љубичаста
-      Gruvbox Dark Green: Gruvbox тамнозелена
-      Gruvbox Dark Purple: Gruvbox тамнољубичаста
-      Gruvbox Dark Yellow: Gruvbox тамножута
-      Gruvbox Dark Blue: Gruvbox тамноплава
-      Gruvbox Dark Aqua: Gruvbox тамноаква
-      Gruvbox Dark Orange: Gruvbox тамнонаранџаста
-      Gruvbox Light Red: Gruvbox светлоцрвена
-      Gruvbox Light Blue: Gruvbox светлоплава
-      Gruvbox Light Purple: Gruvbox светлољубичаста
-      Gruvbox Light Orange: Gruvbox светлонаранџаста
     Secondary Color Theme: 'Секундарна тема боје'
         #* Main Color Theme
     Hide FreeTube Header Logo: Сакриј FreeTube логотип у заглављу
     Hide Side Bar Labels: Сакриј ознаке бочне траке
   Player Settings:
-    Player Settings: 'Плејер'
+    Player Settings: 'Подешавања плејера'
     Play Next Video: 'Пусти следећи видео снимак'
     Turn on Subtitles by Default: 'Подразумевано укључи титлове'
     Autoplay Videos: 'Аутоматски пусти видео снимак'
@@ -451,12 +444,11 @@ Settings:
     Video Playback Rate Interval: Интервал брзине репродукције видео снимка
     Max Video Playback Rate: Максимална брзина репродукције видео снимка
     Enter Fullscreen on Display Rotate: Уђи у цео екран при окретању екрана
-    Next Video Interval: Тајмер за одбројавање аутоплеја
+    Next Video Interval: Интервал следећег видео снимка
     Display Play Button In Video Player: Прикажи дугме за пуштање у плејеру видео
       снимка
-    Autoplay Interruption Timer: Тајмер за прекид аутоплеја
   Privacy Settings:
-    Privacy Settings: 'Приватност'
+    Privacy Settings: 'Подешавања приватности'
     Remember History: 'Запамти историју'
     Save Watched Progress: 'Сачувај напредак одгледаног'
     Clear Search Cache: 'Очисти кеш претраге'
@@ -477,16 +469,16 @@ Settings:
     Are you sure you want to remove all your playlists?: Желите ли заиста да уклоните
       све своје плејлисте?
   Subscription Settings:
-    Subscription Settings: 'Праћење'
+    Subscription Settings: 'Подешавања праћења'
     Hide Videos on Watch: 'Сакриј видео снимке на гледању'
     Fetch Feeds from RSS: 'Прикупи фидове из RSS-а'
+    Manage Subscriptions: 'Управљање праћењима'
     Fetch Automatically: Аутоматски прикупи фид
+    Only Show Latest Video for Each Channel: Прикажи само најновији видео снимак за
+      сваки канал
     Confirm Before Unsubscribing: Избегни случајно отпраћивање
-    To: На
-    'Limit the number of videos displayed for each channel': Ограничи број приказаних
-      видео снимака за сваки канал
   Distraction Free Settings:
-    Distraction Free Settings: 'Без ометања'
+    Distraction Free Settings: 'Подешавања „Без ометања“'
     Hide Video Views: 'Сакриј прегледе видео снимка'
     Hide Video Likes And Dislikes: 'Сакриј свиђања и несвиђања видео снимка'
     Hide Channel Subscribers: 'Сакриј праћења канала'
@@ -497,6 +489,7 @@ Settings:
     Hide Playlists: 'Сакриј плејлисте'
     Hide Live Chat: 'Сакриј ћаскање уживо'
     Hide Active Subscriptions: 'Сакриј активна праћења'
+    Blur Thumbnails: Замагли сличице
     Hide Channels Placeholder: ID канала
     Hide Video Description: Сакриј опис видео снимка
     Hide Chapters: Сакриј поглавља
@@ -506,14 +499,14 @@ Settings:
       Channel Page: Страница канала
       Subscriptions Page: Страница праћења
       General: Опште
-    Hide Channel Community: Сакриј картицу „Заједница“ канала
+    Hide Channel Community: Сакриј заједницу канала
     Hide Subscriptions Videos: Сакриј видео снимке канала које пратите
     Hide Comments: Сакриј коментаре
-    Hide Channel Shorts: Сакриј картицу „Shorts“ канала
+    Hide Channel Shorts: Сакриј Shorts снимке канала
     Hide Sharing Actions: Сакриј радње дељења
-    Hide Channel Podcasts: Сакриј картицу „Подкасти“ канала
+    Hide Channel Podcasts: Сакриј подкасте канала
     Hide Live Streams: Сакриј стримове уживо
-    Hide Channel Playlists: Сакриј картицу „Плејлисте“ канала
+    Hide Channel Playlists: Сакриј плејлисте канала
     Hide Subscriptions Community: Сакриј заједницу канала које пратите
     Hide Channels: Сакриј видео снимке са канала
     Hide Subscriptions Live: Сакриј стримове уживо канала које пратите
@@ -523,7 +516,7 @@ Settings:
     Hide Featured Channels: Сакриј истакнуте канале
     Hide Profile Pictures in Comments: Сакриј слике профила у коментарима
     Hide Upcoming Premieres: Сакриј предстојеће премијере
-    Hide Channel Releases: Сакриј картицу „Издања“ канала
+    Hide Channel Releases: Сакриј издања канала
     Hide Channels Invalid: Наведени ID канала је неважећи
     Hide Channels Disabled Message: Неки канали су блокирани помоћу ID-а и нису обрађени.
       Функција је блокирана док се ти ID-ови ажурирају
@@ -533,13 +526,15 @@ Settings:
     Hide Videos and Playlists Containing Text: Сакриј видео снимке и плејлисте које
       садрже текст
     Hide Videos and Playlists Containing Text Placeholder: Реч, део речи или фраза
-    Hide Channel Home: Сакриј картицу „Почетна“ канала
-    Show Added Items: Прикажи додате предмете
   Data Settings:
-    Data Settings: 'Подаци'
+    Data Settings: 'Подешавања података'
     Select Import Type: 'Избор врсте увоза'
     Select Export Type: 'Избор врсте извоза'
     Import Subscriptions: 'Увоз праћења'
+    Import FreeTube: 'Увоз FreeTube'
+    Import YouTube: 'Увоз YouTube'
+    Import NewPipe: 'Увоз NewPipe'
+    Check for Legacy Subscriptions: 'Провера застарелих праћења'
     Export Subscriptions: 'Извоз праћења'
     Export FreeTube: 'Извоз FreeTube-а'
     Export YouTube: 'Извоз YouTube-а'
@@ -584,7 +579,7 @@ Settings:
         верзију FreeTube-а и увезите извезене плејлисте."
       Label: Извоз плејлиста за старије верзије FreeTube-а
   Proxy Settings:
-    Proxy Settings: 'Прокси'
+    Proxy Settings: 'Подешавања проксија'
     Enable Tor / Proxy: 'Омогући Tor / Прокси'
     Proxy Protocol: 'Протокол проксија'
     Proxy Host: 'Хост проксија'
@@ -599,14 +594,9 @@ Settings:
     City: 'Град'
     Error getting network information. Is your proxy configured properly?: 'Грешка
       при набављању информација о мрежи. Да ли је ваш прокси исправно конфигурисан?'
-    Proxy Warning: FreeTube нема уграђени прокси, али може да се повеже са спољним
-      проксијем, као што је онај који ради на вашој машини као што је Tor или спољни
-      прокси као што је SOCKS5 прокси који пружају неки VPN-ови. Ако је омогућено,
-      уверите се да је ваш прокси/Tor исправно конфигурисан или FreeTube неће моћи
-      да прикупи никакве податке.
   Experimental Settings:
     Replace HTTP Cache: Замени HTTP кеш
-    Experimental Settings: Експериментално
+    Experimental Settings: Експериментална подешавања
     Warning: Ова подешавања су експериментална, могу да доведу до отказивања док су
       омогућена. Прављење резервних копија је веома препоручљиво. Користите на властиту
       одговорност!
@@ -622,50 +612,52 @@ Settings:
       Show In Seek Bar: Приказ у траци за прескакање
     UseDeArrowTitles: Користи DeArrow наслове видео снимака
     Enable SponsorBlock: Омогући SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Подешавања SponsorBlock-а
     Category Color: Боја категорије
     UseDeArrowThumbnails: Користи DeArrow за сличице
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': URL
       API-ја DeArrow генератора сличица (Подразумевано је https://dearrow-thumb.ajay.app)
   External Player Settings:
     External Player: Спољни плејер
-    External Player Settings: Спољни плејер
+    External Player Settings: Подешавања спољног плејера
     Custom External Player Executable: Прилагођени извршни спољни плејер
-    Ignore Unsupported Action Warnings: Занемари упозорења о неподржаним радњама
+    Ignore Unsupported Action Warnings: Игнориши упозорења о неподржаним радњама
     Custom External Player Arguments: Прилагођени аргументи спољног плејера
     Players:
       None:
         Name: Ниједно
-    Ignore Default Arguments: Занемари подразумеване аргументе
+    Ignore Default Arguments: Игнориши подразумеване аргументе
   Download Settings:
     Choose Path: Избор путање
     Open in web browser: Отвори у прегледачу
     Ask Download Path: Питај за путању за преузимање
     Download Behavior: Понашање преузимања
     Download in app: Преузми у апликацији
-    Download Settings: Преузимање
+    Download Settings: Подешавања преузимања
   Password Settings:
     Remove Password: Уклони лозинку
     Set Password To Prevent Access: Подеси лозинку да спречиш приступ подешавањима
-    Password Settings: Лозинка
+    Password Settings: Подешавања лозинке
     Set Password: Подеси лозинку
   Parental Control Settings:
     Show Family Friendly Only: Прикажи само погодно за породицу
     Hide Unsubscribe Button: Сакриј дугме „Прекини праћење“
     Hide Search Bar: Сакриј траку за претрагу
-    Parental Control Settings: Родитељска контрола
+    Parental Control Settings: Подешавања родитељске контроле
   Password Dialog:
     Password Incorrect: Лозинка нетачна
     Password: Лозинка
     Enter Password To Unlock: Унесите лозинку да бисте откључали подешавања
     Unlock: Откључај
+  Expand All Settings Sections: Прошири све одељке подешавања
   Sort Settings Sections (A-Z): Сортирање одељка подешавања (A-Z)
-  Return to Settings Menu: Врати се у мени подешавања
 About:
   #On About page
   About: 'О апликацији'
   Beta: 'Бета'
   Source code: 'Изворни кôд'
+  Licensed under the AGPLv3: 'Лиценцирано под AGPLv3'
+  View License: 'Погледај лиценцу'
   Downloads / Changelog: 'Преузимања / Евиденција промена'
   GitHub releases: 'GitHub издања'
   Help: 'Помоћ'
@@ -682,7 +674,7 @@ About:
   Please read the: 'Прочитајте'
   room rules: 'правила собе'
   Translate: 'Преведи'
-  Credits: 'Заслуге'
+  Credits: 'Кредити'
   FreeTube is made possible by: 'FreeTube су омогућили'
   these people and projects: 'ови људи и пројекти'
   Donate: 'Донација'
@@ -733,7 +725,7 @@ Profile:
     ли заиста да избришете изабране канале?  Ово неће избрисати канал из било ког
     другог профила.'
 #On Channel Page
-  Profile Settings: Профил
+  Profile Settings: Подешавања профила
   Toggle Profile List: Укључи листу профила
   Open Profile Dropdown: Отвори падајући мени профила
   Close Profile Dropdown: Затвори падајући мени профила
@@ -741,6 +733,8 @@ Profile:
   Edit Profile Name: Измени име профила
   Create Profile Name: Направи име профила
 Channel:
+  Subscriber: 'Пратилац'
+  Subscribers: 'Пратиоци'
   Subscribe: 'Запрати'
   Unsubscribe: 'Прекини праћење'
   Channel has been removed from your subscriptions: 'Канал је уклоњен из ваших праћења'
@@ -806,9 +800,6 @@ Channel:
   This channel is age-restricted and currently cannot be viewed in FreeTube.: Овај
     канал је старосно ограничен и тренутно се не може гледати на FreeTube-у.
   This channel does not exist: Овај канал не постоји
-  Home:
-    Home: Почетна
-    View Playlist: Погледај плејлисту
 Video:
   Mark As Watched: 'Означи као одгледано'
   Remove From History: 'Уклони из историје'
@@ -848,7 +839,35 @@ Video:
   'Chat is disabled or the Live Stream has ended.': 'Ћаскање је онемогућено или је
     стрим уживо завршен.'
   Published:
+    Month: Месец
+    Sep: Сеп.
+    Seconds: Секунди
     In less than a minute: За мање од једног минута
+    Week: Недеља
+    Upcoming: Премијера за
+    Dec: Дец.
+    Jan: Јан.
+    Weeks: Недеља
+    Days: Дана
+    Years: Године
+    May: Мај
+    Mar: Мар.
+    Hours: Сати
+    Oct: Окт.
+    Months: Месеци
+    Apr: Апр.
+    Feb: Феб.
+    Jul: Јул
+    Minutes: Минути
+    Minute: Минут
+    Day: Дан
+    Hour: Сат
+    Jun: Јун
+    Second: Секунда
+    Year: Година
+    Nov: Нов.
+    Ago: Пре
+    Aug: Авг.
   Upcoming: Предстојеће
   Sponsor Block category:
     interaction: Интеракција
@@ -884,6 +903,7 @@ Video:
   Show Super Chat Comment: Прикажи Super Chat коментар
   Scroll to Bottom: Превуци до дна
   Started streaming on: Започето стримовање
+  Publicationtemplate: пре {number} {unit}
   Premieres: Премијера
   Download Video: Преузми видео снимак
   Published on: Објављено
@@ -924,17 +944,6 @@ Video:
     Playback will resume automatically when your connection comes back: Репродукција
       ће се аутоматски наставити када се ваша интернет веза врати.
     Skipped segment: Прескочен сегмент „{segmentCategory}“
-  IP block: YouTube је блокирао вашу IP адресу за гледање видео снимака. Покушајте
-    прећи на други VPN или прокси.
-  Unlisted: По позиву
-  MembersOnly: Видео снимци само за чланове не могу да се гледају на FreeTube-у јер
-    захтевају пријављивање на Google налог и плаћено чланство на каналу.
-  AgeRestricted: Видео снимци са старосним ограничењемне могу се гледати на FreeTube-у
-    јер захтевају пријаву на Google налог и коришћење YouTube налога који је старосно
-    верификован.
-  DeArrow:
-    Show Modified Details: Прикажи измењене детаље
-    Show Original Details: Прикажи оригиналне детаље
 Tooltips:
   Subscription Settings:
     Fetch Feeds from RSS: 'Када је омогућено, FreeTube ће користити RSS уместо свог
@@ -961,12 +970,9 @@ Tooltips:
       снимке у тренду коју желите да се приказује.
     Invidious Instance: Invidious инстанца на коју ће се FreeTube повезати за API
       позиве.
-    Open Deep Links In New Window: URL адресе прослеђене FreeTube-у, као што су додаци
-      прегледача за преусмеравање или аргументи командне линије, отварају се у новом
-      прозору.
   External Player Settings:
-    Custom External Player Arguments: Сви прилагођени аргументи командне линије, желите
-      да буду прослеђени спољном плејеру.
+    Custom External Player Arguments: Сви прилагођени аргументи командне линије, раздвојени
+      тачком и зарезом („;“), желите да буду прослеђени спољном плејеру.
     External Player: Избором спољног плејера ће приказати иконицу, за отварање видео
       снимка (плејлисте, ако је подржана) у спољном плејеру, на сличици. Упозорење,
       подешавања Invidious-а не утичу на спољне плејере.
@@ -1011,6 +1017,7 @@ Tooltips:
     UseDeArrowTitles: Замена наслова видео снимака насловима које су послали корисници
       DeArrow-a.
     UseDeArrowThumbnails: Замените сличице видео снимака сличицама из DeArrow-а.
+Subscriptions have not yet been implemented: 'Праћења још увек нису имплементирана'
 Open New Window: Отвори нови прозор
 Shuffle is now disabled: Мешање је сада онемогућено
 New Window: Нови прозор
@@ -1021,7 +1028,10 @@ Clipboard:
 Playlist:
   View Full Playlist: Погледај целу плејлисту
   Last Updated On: Последњи пут ажурирано
+  Videos: Видео снимци
+  View: Преглед
   Playlist: Плејлиста
+  Views: Прегледа
   Sort By:
     DateAddedOldest: Најраније додато прво
     AuthorAscending: Аутор (A-Z)
@@ -1031,8 +1041,6 @@ Playlist:
     Sort By: Сортирање по
     AuthorDescending: Аутор (Z-A)
     DateAddedNewest: Најновије додато прво
-    VideoDurationDescending: Трајање (прво најдуже)
-    VideoDurationAscending: Трајање (прво најкраће)
 Falling back to Invidious API: Повратак на Invidious API
 Change Format:
   Dash formats are not available for this video: DASH формати нису доступни за овај
@@ -1072,6 +1080,8 @@ Comments:
   And others: и осталих
   Newest first: Најновије прво
   There are no comments available for this post: Нема доступних коментара за ову објаву
+Hashtags have not yet been implemented, try again later: Хеш-ознаке још увек нису
+  имплементиране, покушајте поново касније
 Share:
   Invidious Embed URL copied to clipboard: Invidious уграђени URL је копиран у привремену
     меморију
@@ -1113,7 +1123,9 @@ Channels:
   Channels: Канали
   Title: Листа канала
   Empty: Ваша листа канала је тренутно празна.
+  Unsubscribe: Прекини праћење
   Count: 'Пронађено канала: {number}.'
+  Unsubscribed: '{channelName} је уклоњен из ваших праћења'
 External link opening has been disabled in the general settings: Отварање спољног
   линка је онемогућено у општим подешавањима
 Screenshot Success: Снимак екрана је сачуван као „{filePath}“
@@ -1131,7 +1143,6 @@ Chapters:
   Chapters: Поглавља
   'Chapters list hidden, current chapter: {chapterName}': 'Листа поглавља је скривена,
     тренутно поглавље: {chapterName}'
-  Key Moments: Кључни тренуци
 Hashtag:
   This hashtag does not currently have any videos: Ова хеш-ознака тренутно нема ниједан
     видео снимак
@@ -1144,6 +1155,7 @@ Preferences: Преференце
 Default Invidious instance has been cleared: Подразумевана инстанца Invidious-а је
   избрисана
 Mini Player: Мини плејер
+Toggle Theatre Mode: Укључи биоскопски режим
 'The playlist has ended. Enable loop to continue playing': Плејлиста је завршена.
   Омогућите понављање да бисте наставили пуштање
 Shuffle is now enabled: Мешање је сада омогућено
@@ -1184,26 +1196,5 @@ Search Listing:
     Closed Captions: Скривени титлови
     4K: 4K
     Subtitles: Титлови
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Ново
-    3D: 3D
 'Blocked opening potentially unsafe URL': 'Блокирано отварање потенцијално небезбедне
   URL адресе: „{url}“.'
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Keys:
-  alt: Alt
-  arrowdown: Стрелица доле
-  arrowleft: Стрелица лево
-  ctrl: Ctrl
-  arrowup: Стрелица горе
-  arrowright: Стрелица десно
-shortcutJoinOperator: +
-Right-click or hold to see history: Кликните десним тастером миша или задржите да
-  бисте видели историју
-Autoplay Interruption Timer: Аутоплеј је отказан због {autoplayInterruptionIntervalHours}
-  сати неактивности
-Description:
-  Expand Description: …више
-  Collapse Description: Прикажи мање
diff --git a/static/locales/sv.yaml b/static/locales/sv.yaml
index 9c43c9eed069d..57350eef59d29 100644
--- a/static/locales/sv.yaml
+++ b/static/locales/sv.yaml
@@ -132,6 +132,13 @@ Most Popular: 'Populäraste'
 Playlists: 'Spellistor'
 User Playlists:
   Your Playlists: 'Dina spellistor'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Dina
+    sparade videor är tomma. Klicka på sparknappen på hörnet av en video för att få
+    den listad här
+  Playlist Message: Den här sidan representerar inte fullt fungerande spellistor.
+    Den listar bara videor som du har sparat eller satt som favorit. När arbetet är
+    färdigt kommer alla videor som för närvarande här här att flyttas till en spellista
+    för 'Favoriter'.
   Search bar placeholder: Sök efter Spellistor
   Empty Search Message: Det finns inga videor i denna spellista som matchar din sökning
   Playlist Name: Spellistenamn
@@ -180,6 +187,7 @@ User Playlists:
         spellistor
   SinglePlaylistView:
     Toast:
+      Quick bookmark disabled: Snabb bokmärke inaktiverat
       Video has been removed: Videon har tagits bort
       "{videoCount} video(s) have been removed": 1 video har tagits bort | {videoCount}
         videor har tagits bort
@@ -209,8 +217,12 @@ User Playlists:
       This video cannot be moved down.: Den här videon kan inte flyttas nedåt.
     Search for Videos: Sök efter videor
   Playlists with Matching Videos: Spellistor med passande videor
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Är
+    du säker på att du vill ta bort alla tittade videor från den här spellistan? Detta
+    kan inte ångras.
   Enable Quick Bookmark With This Playlist: Aktivera snabb bokmärke på den här spellistan
   Remove Watched Videos: Ta bort sedda videor
+  Disable Quick Bookmark: Avaktivera snabb bokmärke
   CreatePlaylistPrompt:
     Create: Skapa
 History:
@@ -248,6 +260,8 @@ Settings:
       End: 'Slutet'
       Hidden: Dold
       Blur: Oskärpa
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Instance
+      (Standard är https://invidious.snopyta.org)'
     Region for Trending: 'Region för Trender'
         #! List countries
     View all Invidious instance information: Visa all Invidious instansinformation
@@ -396,12 +410,18 @@ Settings:
     Subscription Settings: 'Prenumerationsinställningar'
     Hide Videos on Watch: 'Dölj video under visning'
     Fetch Feeds from RSS: 'Hämta prenumerationer från RSS'
+    Manage Subscriptions: 'Hantera prenumerationer'
     Fetch Automatically: Hämta flöde automatiskt
+    Only Show Latest Video for Each Channel: Visa endast den senaste videon för varje
+      kanal
   Data Settings:
     Data Settings: 'Datainställningar'
     Select Import Type: 'Välj import-typen'
     Select Export Type: 'Välj export-typen'
     Import Subscriptions: 'Importera prenumerationer'
+    Import FreeTube: 'Importera FreeTube'
+    Import YouTube: 'Importera YouTube'
+    Import NewPipe: 'Importera NewPipe'
     Export Subscriptions: 'Exportera prenumerationer'
     Export FreeTube: 'Exportera FreeTube'
     Export YouTube: 'Exportera YouTube'
@@ -427,6 +447,7 @@ Settings:
     Unable to write file: 'Kunde inte skriva filen'
     Unknown data key: 'Okänd datanyckel'
     How do I import my subscriptions?: 'Hur importerar jag mina prenumerationer?'
+    Check for Legacy Subscriptions: Sök efter äldre prenumerationer
     Manage Subscriptions: Hantera prenumerationer
     History File: Historikfil
     Subscription File: Prenumerationsfil
@@ -437,6 +458,32 @@ Settings:
     Import Playlists: Importera spellistor
     Playlist insufficient data: Otillräcklig data för "{playlist}" spellista, hoppar
       över objekt
+  Advanced Settings:
+    Advanced Settings: 'Avancerade inställningar'
+    Enable Debug Mode (Prints data to the console): 'Aktivera felsökningsläge (Skriver
+      ut data till konsolen)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxyadress (Exempel: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Om
+      du klickar på knappen "TEST PROXY" skickas en begäran om https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Använd Tor / Proxy för API-anrop'
+    TEST PROXY: 'TESTPROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Se offentliga instanser'
+    Clear History:
+      Clear History: 'Rensa historik'
+      # On Click
+      Are you sure you want to delete your history?: 'Vill du verkligen ta bort din
+        historik?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Rensa prenumerationer'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Vill du verkligen ta bort
+        alla prenumerationer?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Dölj livechatt
@@ -476,6 +523,7 @@ Settings:
     Hide Subscriptions Shorts: Dölj prenumerationsshorts
     Hide Subscriptions Live: Dölj prenumerations Live-sändningar
     Hide Profile Pictures in Comments: Dölj profilbilder i kommentarer
+    Blur Thumbnails: Oskärpa tumnaglar
     Hide Subscriptions Community: Dölj prenumerationsgemenskap
     Hide Channels Invalid: Det angivna kanal-ID var ogiltigt
     Hide Channels Disabled Message: Vissa kanaler blockerades med ID och bearbetades
@@ -554,10 +602,38 @@ Settings:
     Warning: Dessa inställlningar är experimentella, de kan eventuellt orsakar kracher
       om de är aktiverade. Att göra backupfiler rekomenderas. Används på egen risk!
     Replace HTTP Cache: Ersätt HTTP-cache
+  Expand All Settings Sections: Expandera alla inställningssektioner
 About:
   #On About page
   About: 'Om'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Denna
+    copylefted programvara är fritt licensierad AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Hittade ett fel? Vill du föreslå en funktion? Vill du hjälpa till? Kolla in vår
+    GitHub-sida. Dragförfrågningar välkomna.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Tack
+    så mycket till människorna och projekten som gör FreeTube möjligt!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Vill
+    chatta? Gå med i vår Element / Matrix Server. Kontrollera reglerna innan du går
+    med.'
+
+  'Looking for help? Check out our Wiki page.': 'Letar du efter hjälp? Kolla in vår
+    Wiki-sida.'
+
+  Check out our Firefox extension!: 'Kolla in vårt Firefox-tillägg!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Om
+    du gillar att använda FreeTube, överväga att donera via Liberapay eller via vår
+    Bitcoin-adress.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Senaste FreeTube Nyheter'
+
   Donate: Donera
   these people and projects: dessa människor och projekt
   FreeTube is made possible by: FreeTube möjliggörs av
@@ -579,6 +655,8 @@ About:
   Help: Hjälp
   GitHub releases: GitHub-versioner
   Downloads / Changelog: Nedladdningar / Ändringslogg
+  View License: Visa licens
+  Licensed under the AGPLv3: Licensierad under AGPLv3
   Source code: Källkod
   Beta: Beta
   Discussions: Diskussioner
@@ -632,6 +710,8 @@ Profile:
   Edit Profile Name: Redigera profilnamn
   Create Profile Name: Skapa profilnamn
 Channel:
+  Subscriber: 'Prenumerant'
+  Subscribers: 'Prenumeranter'
   Subscribe: 'Prenumerera'
   Unsubscribe: 'Avsluta prenumeration'
   Channel has been removed from your subscriptions: 'Kanalen har tagits bort från
@@ -729,8 +809,37 @@ Video:
     stöds för närvarande inte med Invidious API. En direktanslutning till YouTube
     krävs.'
   Published:
+    Jan: 'Jan'
+    Feb: 'Feb'
+    Mar: 'Mar'
+    Apr: 'Apr'
+    May: 'Maj'
+    Jun: 'Jun'
+    Jul: 'Jul'
+    Aug: 'Aug'
+    Sep: 'Sep'
+    Oct: 'Okt'
+    Nov: 'Nov'
+    Dec: 'Dec'
+    Second: 'Sekund'
+    Seconds: 'Sekunder'
+    Minute: 'Minut'
+    Minutes: 'Minuter'
+    Hour: 'Timme'
+    Hours: 'Timmar'
+    Day: 'Dag'
+    Days: 'Dagar'
+    Week: 'Vecka'
+    Weeks: 'Veckor'
+    Month: 'Månad'
+    Months: 'Månader'
+    Year: 'År'
+    Years: 'År'
+    Ago: 'Sedan'
+    Upcoming: 'Premiärer på'
     In less than a minute: Mindre än en minut
   Published on: 'Publicerad den'
+  Publicationtemplate: 'för {number} {unit} sedan'
 #& Videos
   audio only: endast ljud
   video only: endast video
@@ -789,12 +898,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Visa hela spellistan'
+  Videos: 'Videor'
+  View: 'Visning'
+  Views: 'Visningar'
   Last Updated On: 'Senast uppdaterad den'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Spellista
+Toggle Theatre Mode: 'Aktivera Bioläge'
 Change Format:
   Change Media Formats: 'Ändra videoformat'
   Use Dash Formats: 'Använd DASH-format'
@@ -859,6 +972,7 @@ Falling back to Local API: 'Faller tillbaka till lokal API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Den
   här videon är inte tillgänglig på grund av format som saknas. Detta kan hända på
   grund av landets otillgänglighet.'
+Subscriptions have not yet been implemented: 'Prenumerationer har ännu inte implementerats'
 Loop is now disabled: 'Loop är nu inaktiverad'
 Loop is now enabled: 'Loop är nu aktiverad'
 Shuffle is now disabled: 'Blandning är nu inaktiverad'
@@ -908,8 +1022,8 @@ Tooltips:
       kan öppnas i FreeTube är. \nStandard är att FreeTube kommer öppna länken i din
       standardwebbläsare.\n"
   External Player Settings:
-    Custom External Player Arguments: Alla anpassade kommandoradsargument, ska skickas
-      till den externa spelaren.
+    Custom External Player Arguments: Alla anpassade kommandoradsargument, åtskilda
+      av semikolon (';'), ska skickas till den externa spelaren.
     Ignore Warnings: Dämpa varningar för när den aktuella externa spelaren inte stöder
       den aktuella åtgärden (t.ex. backning av spellistor, etc.).
     Custom External Player Executable: Som standard antar FreeTube att den valda externa
@@ -936,6 +1050,8 @@ Open New Window: Öppna nytt fönster
 Playing Next Video Interval: Spelar strax nästa video. Klicka för att stoppa. | Spelar
   nästa video om {nextVideoInterval} sekunder. Klicka för att stoppa. | Spelar nästa
   video om {nextVideoInterval} sekunder. Klicka för att stoppa.
+Hashtags have not yet been implemented, try again later: Hashtaggar har inte implementerats
+  än, försök vid ett senare tillfälle
 Unknown YouTube url type, cannot be opened in app: Okänd YouTube URL, kan inte öppnas
   i programmet
 Default Invidious instance has been cleared: Standard Invidious-instans har rensats
@@ -952,6 +1068,8 @@ Channels:
   Channels: Kanaler
   Title: Kanallista
   Search bar placeholder: Sök Kanaler
+  Unsubscribe: Avprenumerera
+  Unsubscribed: '{channelName} blev bortagen från dina prenumerationer'
   Unsubscribe Prompt: Är du säker på att du vill avprenumerera från "{channelName}"?
   Count: '{number} kanal(er) hittade.'
   Empty: Din kanallista är tom.
diff --git a/static/locales/ta.yaml b/static/locales/ta.yaml
deleted file mode 100644
index 46518453b4c84..0000000000000
--- a/static/locales/ta.yaml
+++ /dev/null
@@ -1,1047 +0,0 @@
-# Put the name of your locale in the same language
-Locale Name: 'தமிழ்'
-# Currently on Subscriptions, Playlists, and History
-'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  இந்த பகுதி இன்னும் தயாராக இல்லை. சிறிது நேரம் கழித்து மீண்டும் பார்க்கவும்.
-
-# Webkit Menu Bar
-File: 'கோப்பு'
-New Window: 'புதிய விண்டோ'
-Preferences: 'விருப்பத்தேர்வுகள்'
-Quit: 'வெளியேறு'
-Edit: 'திருத்து'
-Undo: 'செயல்தவிர்'
-Redo: 'மீண்டும் செய்'
-Cut: 'வெட்டு'
-Copy: 'நகலெடு'
-Paste: 'ஒட்டு'
-Delete: 'அழி'
-Select all: 'அனைத்தையும் தேர்ந்தெடு'
-Reload: 'மீள் ஏற்று'
-Force Reload: 'வற்புறுத்தி மீள்ஏற்று'
-Toggle Developer Tools: 'டெவலப்பர் கருவிகளை நிலைமாற்று'
-Actual size: 'உண்மை அளவு'
-Zoom in: 'பெரிதாக்கு'
-Zoom out: 'சிறிதாக்கு'
-Toggle fullscreen: ''
-Window: ''
-Minimize: ''
-Close: ''
-Back: ''
-Forward: ''
-Open New Window: ''
-Go to page: ''
-Close Banner: ''
-
-Version {versionNumber} is now available!  Click for more details: ''
-Download From Site: ''
-A new blog is now available, {blogTitle}. Click to view more: ''
-Are you sure you want to open this link?: ''
-
-# Global
-# Anything shared among components / views should be put here
-Global:
-  Videos: ''
-  Shorts: ''
-  Live: ''
-  Community: ''
-  Counts:
-    Video Count: ''
-    Channel Count: ''
-    Subscriber Count: ''
-    View Count: ''
-    Like Count: ''
-    Comment Count: ''
-    Watching Count: ''
-  Input Tags:
-    Length Requirement: ''
-
-# Search Bar
-Search / Go to URL: ''
-Search Bar:
-  Clear Input: ''
-Search character limit: ''
-Search Listing:
-  Label:
-    4K: ''
-    8K: ''
-    VR180: ''
-    360 Video: ''
-    Subtitles: ''
-    New: ''
-    3D: ''
-    # Aria labels
-    Closed Captions: ''
-  # In Filter Button
-Search Filters:
-  Search Filters: ''
-  Sort By:
-    Sort By: ''
-    Most Relevant: ''
-    Rating: ''
-    Upload Date: ''
-    View Count: ''
-  Time:
-    Time: ''
-    Any Time: ''
-    Last Hour: ''
-    Today: ''
-    This Week: ''
-    This Month: ''
-    This Year: ''
-  Type:
-    Type: ''
-    All Types: ''
-    Videos: ''
-    Channels: ''
-    Movies: ''
-    #& Playlists
-  Duration:
-    Duration: ''
-    All Durations: ''
-    Short (< 4 minutes): ''
-    Medium (4 - 20 minutes): ''
-    Long (> 20 minutes): ''
-  Features:
-    Features: ''
-    HD: ''
-    Subtitles: ''
-    Creative Commons: ''
-    3D: ''
-    Live: ''
-    4K: ''
-    360 Video: ''
-    Location: ''
-    HDR: ''
-    VR180: ''
-  # On Search Page
-  Search Results: ''
-  Fetching results. Please wait: ''
-  Fetch more results: ''
-  There are no more results for this search: ''
-# Sidebar
-Subscriptions:
-    # On Subscriptions Page
-  Subscriptions: ''
-  # channels that were likely deleted
-  Error Channels: ''
-  Latest Subscriptions: ''
-  This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: ''
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': ''
-  Disabled Automatic Fetching: ''
-  Empty Channels: ''
-  'Getting Subscriptions. Please wait.': ''
-  Empty Posts: ''
-  Load More Videos: ''
-  Load More Posts: ''
-  Subscriptions Tabs: ''
-  All Subscription Tabs Hidden: ''
-More: ''
-Channels:
-  Channels: ''
-  Title: ''
-  Search bar placeholder: ''
-  Count: ''
-  Empty: ''
-  Unsubscribe Prompt: ''
-Trending:
-  Trending: ''
-  Default: ''
-  Music: ''
-  Gaming: ''
-  Movies: ''
-  Trending Tabs: ''
-Most Popular: ''
-Feed:
-  Feed Last Updated: ''
-  Refresh Feed: ''
-Playlists: ''
-User Playlists:
-  Your Playlists: ''
-  You have no playlists. Click on the create new playlist button to create a new one.: ''
-  Empty Search Message: ''
-  Search bar placeholder: ''
-  Playlists with Matching Videos: ''
-
-  This playlist currently has no videos.: ''
-
-  Create New Playlist: ''
-
-  Add to Playlist: ''
-  Add to Favorites: ''
-  Remove from Favorites: ''
-
-  Move Video Up: ''
-  Move Video Down: ''
-  Remove from Playlist: ''
-
-  Playlist Name: ''
-  Playlist Description: ''
-
-  Save Changes: ''
-  Cancel: ''
-  Edit Playlist Info: ''
-  Copy Playlist: ''
-  Remove Duplicate Videos: ''
-  Remove Watched Videos: ''
-  Enable Quick Bookmark With This Playlist: ''
-  Quick Bookmark Enabled: ''
-  Export Playlist: ''
-  The playlist has been successfully exported: ''
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: ''
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: ''
-  Delete Playlist: ''
-  Cannot delete the quick bookmark target playlist.: ''
-  Are you sure you want to delete this playlist? This cannot be undone: ''
-
-  Sort By:
-    Sort By: ''
-
-    NameAscending: ''
-    NameDescending: ''
-
-    LatestCreatedFirst: ''
-    EarliestCreatedFirst: ''
-
-    LatestUpdatedFirst: ''
-    EarliestUpdatedFirst: ''
-
-    LatestPlayedFirst: ''
-    EarliestPlayedFirst: ''
-  SinglePlaylistView:
-    Search for Videos: ''
-
-    Toast:
-      This video cannot be moved up.: ''
-      This video cannot be moved down.: ''
-      Video has been removed: ''
-      There was a problem with removing this video: ''
-
-      This playlist is already being used for quick bookmark.: ''
-      This playlist is now used for quick bookmark: ''
-      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: ''
-      Reverted to use {oldPlaylistName} for quick bookmark: ''
-
-      Some videos in the playlist are not loaded yet. Click here to copy anyway.: ''
-      Playlist name cannot be empty. Please input a name.: ''
-      Playlist has been updated.: ''
-      There was an issue with updating this playlist.: ''
-      "{videoCount} video(s) have been removed": ""
-      There were no videos to remove.: ''
-      This playlist is protected and cannot be removed.: ''
-      Playlist {playlistName} has been deleted.: ''
-      Playlist {playlistName} is the new quick bookmark playlist.: ''
-
-      This playlist does not exist: ''
-
-      This playlist has a video with a duration error: ''
-  AddVideoPrompt:
-    Select a playlist to add your N videos to: ''
-    N playlists selected: ''
-    Search in Playlists: ''
-    Allow Adding Duplicate Video(s): ''
-    Save: ''
-
-    Added {count} Times: ''
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": ''
-    "{videoCount}/{totalVideoCount} Videos Already Added": ''
-
-    Toast:
-      You haven't selected any playlist yet.: ''
-      "{videoCount} video(s) added to 1 playlist": ""
-      "{videoCount} video(s) added to {playlistCount} playlists": ""
-  CreatePlaylistPrompt:
-    New Playlist Name: ''
-    Create: ''
-
-    Toast:
-      There is already a playlist with this name. Please pick a different name.: ''
-      Playlist {playlistName} has been successfully created.: ''
-      There was an issue with creating the playlist.: ''
-History:
-  # On History Page
-  History: ''
-  Watch History: ''
-  Your history list is currently empty.: ''
-  Empty Search Message: ''
-  Search bar placeholder: ""
-  Case Sensitive Search: ''
-Settings:
-  # On Settings Page
-  Settings: ''
-  Sort Settings Sections (A-Z): ''
-  Return to Settings Menu: ''
-  The app needs to restart for changes to take effect. Restart and apply change?: ''
-  General Settings:
-    General Settings: ''
-    Check for Updates: ''
-    Check for Latest Blog Posts: ''
-    Fallback to Non-Preferred Backend on Failure: ''
-    Enable Search Suggestions: ''
-    Auto Load Next Page:
-      Label: ''
-      Tooltip: ''
-    Default Landing Page: ''
-    Locale Preference: ''
-    System Default: ''
-    Preferred API Backend:
-      Preferred API Backend: ''
-      Local API: ''
-      Invidious API: ''
-    Video View Type:
-      Video View Type: ''
-      Grid: ''
-      List: ''
-    Thumbnail Preference:
-      Thumbnail Preference: ''
-      Default: ''
-      Beginning: ''
-      Middle: ''
-      End: ''
-      Hidden: ''
-      Blur: ''
-    Current Invidious Instance: ''
-    The currently set default instance is {instance}: ''
-    No default instance has been set: ''
-    Current instance will be randomized on startup: ''
-    Set Current Instance as Default: ''
-    Clear Default Instance: ''
-    View all Invidious instance information: ''
-    Region for Trending: ''
-    #! List countries
-    External Link Handling:
-      External Link Handling: ''
-      Open Link: ''
-      Ask Before Opening Link: ''
-      No Action: ''
-  Theme Settings:
-    Theme Settings: ''
-    Match Top Bar with Main Color: ''
-    Expand Side Bar by Default: ''
-    Disable Smooth Scrolling: ''
-    UI Scale: ''
-    Hide Side Bar Labels: ''
-    Hide FreeTube Header Logo: ''
-    Base Theme:
-      Base Theme: ''
-      Black: ''
-      Dark: ''
-      System Default: ''
-      Light: ''
-      Dracula: ''
-      Catppuccin Mocha: ''
-      Pastel Pink: ''
-      Hot Pink: ''
-      Nordic: ''
-      Solarized Dark: ''
-      Solarized Light: ''
-    Main Color Theme:
-      Main Color Theme: ''
-      Red: ''
-      Pink: ''
-      Purple: ''
-      Deep Purple: ''
-      Indigo: ''
-      Blue: ''
-      Light Blue: ''
-      Cyan: ''
-      Teal: ''
-      Green: ''
-      Light Green: ''
-      Lime: ''
-      Yellow: ''
-      Amber: ''
-      Orange: ''
-      Deep Orange: ''
-      Dracula Cyan: ''
-      Dracula Green: ''
-      Dracula Orange: ''
-      Dracula Pink: ''
-      Dracula Purple: ''
-      Dracula Red: ''
-      Dracula Yellow: ''
-      Catppuccin Mocha Rosewater: ''
-      Catppuccin Mocha Flamingo: ''
-      Catppuccin Mocha Pink: ''
-      Catppuccin Mocha Mauve: ''
-      Catppuccin Mocha Red: ''
-      Catppuccin Mocha Maroon: ''
-      Catppuccin Mocha Peach: ''
-      Catppuccin Mocha Yellow: ''
-      Catppuccin Mocha Green: ''
-      Catppuccin Mocha Teal: ''
-      Catppuccin Mocha Sky: ''
-      Catppuccin Mocha Sapphire: ''
-      Catppuccin Mocha Blue: ''
-      Catppuccin Mocha Lavender: ''
-      Solarized Yellow: ''
-      Solarized Orange: ''
-      Solarized Red: ''
-      Solarized Magenta: ''
-      Solarized Violet: ''
-      Solarized Blue: ''
-      Solarized Cyan: ''
-      Solarized Green: ''
-    Secondary Color Theme: ''
-        #* Main Color Theme
-  Player Settings:
-    Player Settings: ''
-    Play Next Video: ''
-    Turn on Subtitles by Default: ''
-    Autoplay Videos: ''
-    Proxy Videos Through Invidious: ''
-    Autoplay Playlists: ''
-    Enable Theatre Mode by Default: ''
-    Scroll Volume Over Video Player: ''
-    Scroll Playback Rate Over Video Player: ''
-    Skip by Scrolling Over Video Player: ''
-    Display Play Button In Video Player: ''
-    Enter Fullscreen on Display Rotate: ''
-    Next Video Interval: ''
-    Fast-Forward / Rewind Interval: ''
-    Default Volume: ''
-    Default Playback Rate: ''
-    Max Video Playback Rate: ''
-    Video Playback Rate Interval: ''
-    Default Video Format:
-      Default Video Format: ''
-      Dash Formats: ''
-      Legacy Formats: ''
-      Audio Formats: ''
-    Default Quality:
-      Default Quality: ''
-      Auto: ''
-      144p: ''
-      240p: ''
-      360p: ''
-      480p: ''
-      720p: ''
-      1080p: ''
-      1440p: ''
-      4k: ''
-      8k: ''
-    Screenshot:
-      Enable: ''
-      Format Label: ''
-      Quality Label: ''
-      Ask Path: ''
-      Folder Label: ''
-      Folder Button: ''
-      File Name Label: ''
-      File Name Tooltip: ''
-      Error:
-        Forbidden Characters: ''
-        Empty File Name: ''
-  External Player Settings:
-    External Player Settings: ''
-    External Player: ''
-    Ignore Unsupported Action Warnings: ''
-    Ignore Default Arguments: ''
-    Custom External Player Executable: ''
-    Custom External Player Arguments: ''
-    Players:
-      None:
-        Name: ''
-  Privacy Settings:
-    Privacy Settings: ''
-    Remember History: ''
-    Save Watched Progress: ''
-    Save Watched Videos With Last Viewed Playlist: ''
-    Clear Search Cache: ''
-    Are you sure you want to clear out your search cache?: ''
-    Search cache has been cleared: ''
-    Remove Watch History: ''
-    Are you sure you want to remove your entire watch history?: ''
-    Watch history has been cleared: ''
-    Remove All Subscriptions / Profiles: ''
-    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: ''
-    Remove All Playlists: ''
-    All playlists have been removed: ''
-    Are you sure you want to remove all your playlists?: ''
-  Subscription Settings:
-    Subscription Settings: ''
-    Hide Videos on Watch: ''
-    Fetch Feeds from RSS: ''
-    Fetch Automatically: ''
-    Only Show Latest Video for Each Channel: ''
-    Confirm Before Unsubscribing: ''
-  Distraction Free Settings:
-    Distraction Free Settings: ''
-    Sections:
-      Side Bar: ''
-      Subscriptions Page: ''
-      Channel Page: ''
-      Watch Page: ''
-      General: ''
-    Hide Video Views: ''
-    Hide Video Likes And Dislikes: ''
-    Hide Channel Subscribers: ''
-    Hide Comment Likes: ''
-    Hide Recommended Videos: ''
-    Hide Trending Videos: ''
-    Hide Popular Videos: ''
-    Hide Playlists: ''
-    Hide Live Chat: ''
-    Hide Active Subscriptions: ''
-    Hide Video Description: ''
-    Hide Comments: ''
-    Hide Profile Pictures in Comments: ''
-    Display Titles Without Excessive Capitalisation: ''
-    Hide Live Streams: ''
-    Hide Upcoming Premieres: ''
-    Hide Sharing Actions: ''
-    Hide Chapters: ''
-    Hide Channels: ''
-    Hide Channels Disabled Message: ''
-    Hide Channels Placeholder: ''
-    Hide Channels Invalid: ''
-    Hide Channels API Error: ''
-    Hide Channels Already Exists: ''
-    Hide Featured Channels: ''
-    Hide Channel Playlists: ''
-    Hide Channel Community: ''
-    Hide Channel Shorts: ''
-    Hide Channel Podcasts: ''
-    Hide Channel Releases: ''
-    Hide Videos and Playlists Containing Text: ''
-    Hide Videos and Playlists Containing Text Placeholder: ''
-    Hide Subscriptions Videos: ''
-    Hide Subscriptions Shorts: ''
-    Hide Subscriptions Live: ''
-    Hide Subscriptions Community: ''
-  Data Settings:
-    Data Settings: ''
-    Select Import Type: ''
-    Select Export Type: ''
-    Import Subscriptions: ''
-    Subscription File: ''
-    History File: ''
-    Playlist File: ''
-    Export Subscriptions: ''
-    Export FreeTube: ''
-    Export YouTube: ''
-    Export NewPipe: ''
-    Import History: ''
-    Export History: ''
-    Import Playlists: ''
-    Export Playlists: ''
-    Export Playlists For Older FreeTube Versions:
-      Label: ''
-      # |- = Keep newlines, No newline at end
-      Tooltip: |
-    Profile object has insufficient data, skipping item: ''
-    All subscriptions and profiles have been successfully imported: ''
-    All subscriptions have been successfully imported: ''
-    Invalid subscriptions file: ''
-    Invalid history file: ''
-    Subscriptions have been successfully exported: ''
-    History object has insufficient data, skipping item: ''
-    All watched history has been successfully imported: ''
-    All watched history has been successfully exported: ''
-    Playlist insufficient data: ''
-    All playlists has been successfully imported: ''
-    All playlists has been successfully exported: ''
-    Unable to read file: ''
-    Unable to write file: ''
-    Unknown data key: ''
-    How do I import my subscriptions?: ''
-    Manage Subscriptions: ''
-  Proxy Settings:
-    Proxy Settings: ''
-    Enable Tor / Proxy: ''
-    Proxy Protocol: ''
-    Proxy Host: ''
-    Proxy Port Number: ''
-    Clicking on Test Proxy will send a request to: ''
-    Test Proxy: ''
-    Your Info: ''
-    Ip: ''
-    Country: ''
-    Region: ''
-    City: ''
-    Error getting network information. Is your proxy configured properly?: ''
-  SponsorBlock Settings:
-    SponsorBlock Settings: ''
-    Enable SponsorBlock: ''
-    'SponsorBlock API Url (Default is https://sponsor.ajay.app)': ''
-    Notify when sponsor segment is skipped: ''
-    UseDeArrowTitles: ''
-    UseDeArrowThumbnails: ''
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': ''
-    Skip Options:
-      Skip Option: ''
-      Auto Skip: ''
-      Show In Seek Bar: ''
-      Prompt To Skip: ''
-      Do Nothing: ''
-    Category Color: ''
-  Parental Control Settings:
-    Parental Control Settings: ''
-    Hide Unsubscribe Button: ''
-    Show Family Friendly Only: ''
-    Hide Search Bar: ''
-  Download Settings:
-    Download Settings: ''
-    Ask Download Path: ''
-    Choose Path: ''
-    Download Behavior: ''
-    Download in app: ''
-    Open in web browser: ''
-  Experimental Settings:
-    Experimental Settings: ''
-    Warning: ''
-    Replace HTTP Cache: ''
-  Password Dialog:
-    Password: ''
-    Enter Password To Unlock: ''
-    Password Incorrect: ''
-    Unlock: ''
-  Password Settings:
-    Password Settings: ''
-    Set Password To Prevent Access: ''
-    Set Password: ''
-    Remove Password: ''
-About:
-  #On About page
-  About: ''
-  Beta: ''
-  Source code: ''
-  Licensed under the: ''
-  AGPLv3: ''
-  Downloads / Changelog: ''
-  GitHub releases: ''
-  Help: ''
-  FreeTube Wiki: ''
-  FAQ: ''
-  Discussions: ''
-  Report a problem: ''
-  GitHub issues: ''
-  Please check for duplicates before posting: ''
-  Website: ''
-  Blog: ''
-  Email: ''
-  Mastodon: ''
-  Chat on Matrix: ''
-  Please read the: ''
-  room rules: ''
-  Translate: ''
-  Credits: ''
-  FreeTube is made possible by: ''
-  these people and projects: ''
-  Donate: ''
-
-Profile:
-  Profile Settings: ''
-  Toggle Profile List: ''
-  Profile Select: ''
-  Profile Filter: ''
-  All Channels: ''
-  Profile Manager: ''
-  Create New Profile: ''
-  Edit Profile: ''
-  Edit Profile Name: ''
-  Create Profile Name: ''
-  Profile Name: ''
-  Color Picker: ''
-  Custom Color: ''
-  Profile Preview: ''
-  Create Profile: ''
-  Update Profile: ''
-  Make Default Profile: ''
-  Delete Profile: ''
-  Are you sure you want to delete this profile?: ''
-  All subscriptions will also be deleted.: ''
-  Profile could not be found: ''
-  Your profile name cannot be empty: ''
-  Profile has been created: ''
-  Profile has been updated: ''
-  Your default profile has been set to {profile}: ''
-  Removed {profile} from your profiles: ''
-  Your default profile has been changed to your primary profile: ''
-  '{profile} is now the active profile': ''
-  Subscription List: ''
-  Other Channels: ''
-  '{number} selected': ''
-  Select All: ''
-  Select None: ''
-  Delete Selected: ''
-  Add Selected To Profile: ''
-  No channel(s) have been selected: ''
-  ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
-    same channels will be deleted in any profile they are found in.
-  : ''
-  Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: ''
-  Close Profile Dropdown: ''
-  Open Profile Dropdown: ''
-#On Channel Page
-Channel:
-  Subscribe: ''
-  Unsubscribe: ''
-  Channel has been removed from your subscriptions: ''
-  Removed subscription from {count} other channel(s): ''
-  Added channel to your subscriptions: ''
-  Search Channel: ''
-  Your search results have returned 0 results: ''
-  Sort By: ''
-  This channel does not exist: ''
-  This channel does not allow searching: ''
-  This channel is age-restricted and currently cannot be viewed in FreeTube.: ''
-  Channel Tabs: ''
-  Videos:
-    Videos: ''
-    This channel does not currently have any videos: ''
-    Sort Types:
-      Newest: ''
-      Oldest: ''
-      Most Popular: ''
-  Shorts:
-    This channel does not currently have any shorts: ''
-  Live:
-    Live: ''
-    This channel does not currently have any live streams: ''
-  Playlists:
-    Playlists: ''
-    This channel does not currently have any playlists: ''
-    Sort Types:
-      Last Video Added: ''
-      Newest: ''
-      Oldest: ''
-  Podcasts:
-    Podcasts: ''
-    This channel does not currently have any podcasts: ''
-  Releases:
-    Releases: ''
-    This channel does not currently have any releases: ''
-  About:
-    About: ''
-    Channel Description: ''
-    Tags:
-      Tags: ''
-      Search for: ''
-    Details: ''
-    Joined: ''
-    Location: ''
-    Featured Channels: ''
-  Community:
-    This channel currently does not have any posts: ''
-    votes: ''
-    View Full Post: ''
-    Reveal Answers: ''
-    Hide Answers: ''
-    Video hidden by FreeTube: ''
-    Viewing Posts Only Supported By Invidious: ''
-Video:
-  IP block: ''
-  MembersOnly: ''
-  AgeRestricted: ''
-  More Options: ''
-  Mark As Watched: ''
-  Remove From History: ''
-  Video has been marked as watched: ''
-  Video has been removed from your history: ''
-  Save Video: ''
-  Video has been saved: ''
-  Video has been removed from your saved list: ''
-  Open in YouTube: ''
-  Copy YouTube Link: ''
-  Open YouTube Embedded Player: ''
-  Copy YouTube Embedded Player Link: ''
-  Open in Invidious: ''
-  Copy Invidious Link: ''
-  Open Channel in YouTube: ''
-  Copy YouTube Channel Link: ''
-  Open Channel in Invidious: ''
-  Copy Invidious Channel Link: ''
-  Hide Channel: ''
-  Unhide Channel: ''
-  Views: ''
-  Loop Playlist: ''
-  Shuffle Playlist: ''
-  Reverse Playlist: ''
-  Play Next Video: ''
-  Play Previous Video: ''
-  Pause on Current Video: ''
-  Watched: ''
-  Autoplay: ''
-  Starting soon, please refresh the page to check again: ''
-  # As in a Live Video
-  Premieres on: ''
-  Premieres: ''
-  Upcoming: ''
-  Unlisted: ''
-  Live: ''
-  Live Now: ''
-  Live Chat: ''
-  Enable Live Chat: ''
-  Live Chat is currently not supported in this build.: ''
-  'Chat is disabled or the Live Stream has ended.': ''
-  Live chat is enabled. Chat messages will appear here once sent.: ''
-  'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': ''
-  'Live Chat is unavailable for this stream. It may have been disabled by the uploader.': ''
-  Show Super Chat Comment: ''
-  Scroll to Bottom: ''
-  Download Video: ''
-  video only: ''
-  audio only: ''
-  Published:
-    Jan: ''
-    Feb: ''
-    Mar: ''
-    Apr: ''
-    May: ''
-    Jun: ''
-    Jul: ''
-    Aug: ''
-    Sep: ''
-    Oct: ''
-    Nov: ''
-    Dec: ''
-    Second: ''
-    Seconds: ''
-    Minute: ''
-    Minutes: ''
-    Hour: ''
-    Hours: ''
-    Day: ''
-    Days: ''
-    Week: ''
-    Weeks: ''
-    Month: ''
-    Months: ''
-    Year: ''
-    Years: ''
-    Ago: ''
-    Upcoming: ''
-    In less than a minute: ''
-  Published on: ''
-  Streamed on: ''
-  Started streaming on: ''
-  Publicationtemplate: ''
-  Sponsor Block category:
-    sponsor: ''
-    intro: ''
-    outro: ''
-    self-promotion: ''
-    interaction: ''
-    music offtopic: ''
-    recap: ''
-    filler: ''
-  External Player:
-    OpenInTemplate: ''
-    video: ''
-    playlist: ''
-    OpeningTemplate: ''
-    UnsupportedActionTemplate: ''
-    Unsupported Actions:
-      starting video at offset: ''
-      setting a playback rate: ''
-      opening playlists: ''
-      opening specific video in a playlist (falling back to opening the video): ''
-      reversing playlists: ''
-      shuffling playlists: ''
-      looping playlists: ''
-  Player:
-    TranslatedCaptionTemplate: ''
-    Audio Tracks: ''
-    Theatre Mode: ''
-    Exit Theatre Mode: ''
-    Full Window: ''
-    Exit Full Window: ''
-    Take Screenshot: ''
-    Show Stats: ''
-    Hide Stats: ''
-    Stats:
-      Stats: ''
-      Video ID: ''
-      Media Formats: ''
-      Resolution: ''
-      Player Dimensions: ''
-      Bitrate: ''
-      Volume: ''
-      Bandwidth: ''
-      Buffered: ''
-      Dropped Frames / Total Frames: ''
-      CodecAudio: ''
-      CodecsVideoAudio: ''
-      CodecsVideoAudioNoItags: ''
-    You appear to be offline: ''
-    Playback will resume automatically when your connection comes back: ''
-    Skipped segment: ''
-#& Videos
-Videos:
-  #& Sort By
-  Sort By:
-    Newest: ''
-    Oldest: ''
-    #& Most Popular
-#& Playlists
-Playlist:
-  #& About
-  Playlist: ''
-  View Full Playlist: ''
-  Last Updated On: ''
-  Sort By:
-    Sort By: ''
-    DateAddedNewest: ''
-    DateAddedOldest: ''
-    AuthorAscending: ''
-    AuthorDescending: ''
-    VideoTitleAscending: ''
-    VideoTitleDescending: ''
-    VideoDurationAscending: ''
-    VideoDurationDescending: ''
-    Custom: ''
-
-# On Video Watch Page
-#* Published
-#& Views
-Change Format:
-  Change Media Formats: ''
-  Use Dash Formats: ''
-  Use Legacy Formats: ''
-  Use Audio Formats: ''
-  Dash formats are not available for this video: ''
-  Audio formats are not available for this video: ''
-  Legacy formats are not available for this video: ''
-Share:
-  Share Video: ''
-  Share Channel: ''
-  Share Playlist: ''
-  Include Timestamp: ''
-  Copy Link: ''
-  Open Link: ''
-  Copy Embed: ''
-  Open Embed: ''
-  # On Click
-  Invidious URL copied to clipboard: ''
-  Invidious Embed URL copied to clipboard: ''
-  Invidious Channel URL copied to clipboard: ''
-  YouTube URL copied to clipboard: ''
-  YouTube Embed URL copied to clipboard: ''
-  YouTube Channel URL copied to clipboard: ''
-Clipboard:
-  Copy failed: ''
-  Cannot access clipboard without a secure connection: ''
-
-Chapters:
-  Chapters: ''
-  'Chapters list visible, current chapter: {chapterName}': ''
-  'Chapters list hidden, current chapter: {chapterName}': ''
-
-Mini Player: ''
-Comments:
-  Comments: ''
-  Click to View Comments: ''
-  Getting comment replies, please wait: ''
-  There are no more comments for this video: ''
-  Show Comments: ''
-  Hide Comments: ''
-  Sort by: ''
-  Top comments: ''
-  Newest first: ''
-  View {replyCount} replies: ''
-  # Context: View 10 Replies, View 1 Reply, View 1 Reply from Owner, View 2 Replies from Owner and others
-  View: ''
-  Hide: ''
-  Replies: ''
-  Show More Replies: ''
-  Reply: ''
-  From {channelName}: ''
-  And others: ''
-  There are no comments available for this video: ''
-  There are no comments available for this post: ''
-  Load More Comments: ''
-  No more comments available: ''
-  Pinned by: ''
-  Member: ''
-  Subscribed: ''
-  Hearted: ''
-
-Up Next: ''
-
-#Tooltips
-Tooltips:
-  General Settings:
-    Preferred API Backend: ''
-    Fallback to Non-Preferred Backend on Failure: ''
-    Thumbnail Preference: ''
-    Invidious Instance: ''
-    Region for Trending: ''
-    External Link Handling: |
-  Player Settings:
-    Proxy Videos Through Invidious: ''
-    Default Video Format: ''
-    Scroll Playback Rate Over Video Player: ''
-    Skip by Scrolling Over Video Player: ''
-  External Player Settings:
-    External Player: ''
-    Custom External Player Executable: ''
-    Ignore Warnings: ''
-    Ignore Default Arguments: ''
-    Custom External Player Arguments: ''
-    DefaultCustomArgumentsTemplate: ""
-  Distraction Free Settings:
-    Hide Channels: ''
-    Hide Subscriptions Live: ''
-    Hide Videos and Playlists Containing Text: ''
-  Subscription Settings:
-    Fetch Feeds from RSS: ''
-    Fetch Automatically: ''
-  Experimental Settings:
-    Replace HTTP Cache: ''
-  SponsorBlock Settings:
-    UseDeArrowTitles: ''
-    UseDeArrowThumbnails: ''
-
-# Toast Messages
-Local API Error (Click to copy): ''
-Invidious API Error (Click to copy): ''
-Falling back to Invidious API: ''
-Falling back to Local API: ''
-This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
-Unknown YouTube url type, cannot be opened in app: ''
-Loop is now disabled: ''
-Loop is now enabled: ''
-Shuffle is now disabled: ''
-Shuffle is now enabled: ''
-The playlist has been reversed: ''
-Playing Next Video: ''
-Playing Previous Video: ''
-Playlist will not pause when current video is finished: ''
-Playlist will pause when current video is finished: ''
-Playing Next Video Interval: ''
-Canceled next video autoplay: ''
-
-Default Invidious instance has been set to {instance}: ''
-Default Invidious instance has been cleared: ''
-'The playlist has ended. Enable loop to continue playing': ''
-Age Restricted:
-  This channel is age restricted: ''
-  This video is age restricted: ''
-External link opening has been disabled in the general settings: ''
-'Blocked opening potentially unsafe URL': ''
-Downloading has completed: ''
-Starting download: ''
-Downloading failed: ''
-Screenshot Success: ''
-Screenshot Error: ''
-Channel Hidden: ''
-Channel Unhidden: ''
-Trimmed input must be at least N characters long: ''
-Tag already exists: ''
-
-Hashtag:
-  Hashtag: ''
-  This hashtag does not currently have any videos: ''
-Moments Ago: ''
-Yes: ''
-No: ''
-Ok: ''
-Yes, Delete: ''
-Yes, Restart: ''
-Yes, Open Link: ''
-Cancel: ''
-# symbol used to indicate that an item is correct
-checkmark: ''
-# French is the only language that should change this (they have a space before the colon)
-Display Label: ''
diff --git a/static/locales/tok.yaml b/static/locales/tok.yaml
index 9b5e9774ec5bd..b9d4d445df38a 100644
--- a/static/locales/tok.yaml
+++ b/static/locales/tok.yaml
@@ -21,16 +21,16 @@ Actual size: 'suli lon'
 Zoom in: 'lukin suli'
 Zoom out: 'lukin lili'
 Toggle fullscreen: 'ante e sitelin suli'
-Window: 'lupa'
+Window: 'sitelin'
 Minimize: 'kama lili'
 Close: 'pini'
 Back: 'tawa monsi'
 Forward: 'tawa sinpin'
-Open New Window: 'open lon lupa sin'
+Open New Window: 'open lon sitelin sin'
 
 Version {versionNumber} is now available!  Click for more details: 'ilo pi nanpa {versionNumber}
-  li lon! open la, sina ken sona mute'
-Download From Site: 'kama jo tan lipu'
+  li lon! open la, sina ken sona mute.'
+Download From Site: 'poki e sitelin ni'
 A new blog is now available, {blogTitle}. Click to view more: 'lipu sin li lon. ona
   li {blogTitle}. open la, sina ken lukin mute.'
 Are you sure you want to open this link?: 'sina wile ala wile open e ni?'
@@ -46,56 +46,13 @@ Search Filters:
     Sort By: 'nasin li seme?'
     Most Relevant: 'sama e wile sina'
     Rating: 'pona'
-  Duration:
-    All Durations: tenpo ali
-    Duration: tenpo
-  Features:
-    Live: tenpo ni
-    3D: 3D
-    4K: 4K
-    HD: HD
-    HDR: HDR
-    VR180: VR180
-  Time:
-    Any Time: tenpo ali
-    Time: tenpo
 Settings:
   # On Settings Page
   General Settings: {}
   Theme Settings: {}
   Player Settings:
     Screenshot: {}
-    Default Quality:
-      4k: 4K
   SponsorBlock Settings: {}
 Video:
   External Player: {}
-  Live: tenpo ni
 Tooltips: {}
-Global:
-  Community: kulupu
-  Videos: sitelen tawa
-  Shorts: lili
-  Live: tenpo ni
-  Counts:
-    Video Count: 1 sitelen tawa | {count} sitelen tawa
-    Subscriber Count: 1 jan li kama jo | {count} jan li kama jo
-    View Count: 1 lukin | {count} lukin
-    Watching Count: 1 jan li lukin | {count} jan li lukin
-    Channel Count: 1 toki nasin | {count} toki nasin
-    Like Count: 1 musi | {count} musi
-    Comment Count: 1 toki | {count} toki
-Close Banner: pini e sitelen esun
-New Window: lupa sin
-Preferences: wile
-Go to page: tawa lipu
-Search Listing:
-  Label:
-    New: sin
-    4K: 4K
-    8K: 8K
-    360 Video: 360°
-Channel:
-  Live:
-    Live: tenpo ni
-More: mute
diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index b373f6ec0c028..be1f28afa91ac 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -107,8 +107,7 @@ Subscriptions:
   Subscriptions: 'Abonelikler'
   Latest Subscriptions: 'En Yeni'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Abonelik
-    listeniz şu anda boş. Aboneliklerinizi içe aktarmak istiyorsanız Veri Ayarları''na
-    gidip Abonelikleri İçe Aktar''ı seçebilir veya bir kanal arayıp abone olabilirsiniz.'
+    listeniz şu anda boş. Aboneliklerinizi görebilmek için abone olmaya başlayın.'
   'Getting Subscriptions. Please wait.': 'Abonelikler yükleniyor. Lütfen bekleyin.'
   Refresh Subscriptions: 'Abonelikleri Yenile'
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: Bu
@@ -135,6 +134,13 @@ Most Popular: 'Popüler Olanlar'
 Playlists: 'Oynatma Listeleri'
 User Playlists:
   Your Playlists: 'Oynatma Listelerin'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Kaydedilen
+    videolarınız boş. Kaydedilen videolarınızın burada listelenmesi için videonun
+    köşesindeki kaydet düğmesine tıklayın
+  Playlist Message: Bu sayfa, tam olarak çalışan oynatma listelerini yansıtmamaktadır.
+    Yalnızca kaydettiğiniz veya favorilerinize eklediğiniz videoları listeler. İş
+    bittiğinde, şu anda burada bulunan tüm videolar bir 'Favoriler' oynatma listesine
+    taşınacaktır.
   Search bar placeholder: Oynatma Listesi Ara
   Empty Search Message: Bu oynatma listesinde aramanızla eşleşen video yok
   This playlist currently has no videos.: Bu oynatma listesinde şu anda hiç video
@@ -177,6 +183,7 @@ User Playlists:
         ve kaldırılamaz.
       There were no videos to remove.: Kaldırılacak video yok.
       This playlist does not exist: Bu oynatma listesi yok
+      Quick bookmark disabled: Hızlı yer imi devre dışı bırakıldı
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Bu
         oynatma listesi artık {oldPlaylistName} yerine hızlı yer imi için kullanılıyor.
         Geri almak için buraya tıklayın
@@ -188,8 +195,6 @@ User Playlists:
         oynatma listesi yeni hızlı yer imi oynatma listesi.'
       This playlist is already being used for quick bookmark.: Bu oynatma listesi
         zaten hızlı yer imi için kullanılıyor.
-      This playlist has a video with a duration error: Bu oynatma listesi süresi olmayan
-        en az bir video içeriyor, süreleri sıfırmış gibi sıralanacaktır.
     Search for Videos: Video Ara
   AddVideoPrompt:
     Select a playlist to add your N videos to: Videonuzu eklemek için bir oynatma
@@ -231,11 +236,15 @@ User Playlists:
   Cancel: İptal
   Edit Playlist Info: Oynatma Listesi Bilgilerini Düzenle
   Copy Playlist: Oynatma Listesini Kopyala
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: İzlenen
+    tüm videoları bu oynatma listesinden kaldırmak istediğinizden emin misiniz? Bu
+    işlem geri alınamaz.
   Remove Watched Videos: İzlenen Videoları Kaldır
   Add to Favorites: '{playlistName} oynatma listesine ekle'
   Remove from Favorites: '{playlistName} oynatma listesinden kaldır'
   Enable Quick Bookmark With This Playlist: Bu Oynatma Listesiyle Hızlı Yer İmini
     Etkinleştir
+  Disable Quick Bookmark: Hızlı Yer İşaretini Devre Dışı Bırak
   Playlists with Matching Videos: Eşleşen Videoları İçeren Oynatma Listeleri
   Quick Bookmark Enabled: Hızlı Yer İmi Etkin
   Cannot delete the quick bookmark target playlist.: Hızlı yer imi hedef oynatma listesi
@@ -249,9 +258,6 @@ User Playlists:
     oynatma listesinden 1 yinelenen videoyu kaldırmak istediğinizden emin misiniz?
     Bu geri alınamaz. | Bu oynatma listesinden {playlistItemCount} yinelenen videoyu
     kaldırmak istediğinizden emin misiniz? Bu geri alınamaz.
-  Export Playlist: Bu Oynatma Listesini Dışa Aktar
-  The playlist has been successfully exported: Oynatma listesi başarılı bir şekilde
-    dışa aktarıldı
 History:
   # On History Page
   History: 'Geçmiş'
@@ -264,7 +270,7 @@ Settings:
   # On Settings Page
   Settings: 'Ayarlar'
   General Settings:
-    General Settings: 'Genel'
+    General Settings: 'Genel Ayarlar'
     Check for Updates: 'Güncellemeleri Denetle'
     Check for Latest Blog Posts: 'En Yeni Blog Gönderilerini Denetle'
     Fallback to Non-Preferred Backend on Failure: 'Hata Durumunda Tercih Edilmeyen
@@ -288,6 +294,8 @@ Settings:
       End: 'Bitiş'
       Hidden: Gizli
       Blur: Bulanıklık
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious Örneği
+      (Öntanımlı olarak https://invidious.snopyta.org)'
     Region for Trending: 'Öne Çıkanlar İçin Bölge Tercihi'
         #! List countries
     View all Invidious instance information: Tüm Invidious örnek bilgilerini görüntüle
@@ -308,9 +316,8 @@ Settings:
     Auto Load Next Page:
       Label: Sonraki Sayfayı Otomatik Yükle
       Tooltip: Sonraki sayfaları ve yorumları otomatik olarak yükle.
-    Open Deep Links In New Window: FreeTube'a Geçen URL'leri Yeni Pencerede Aç
   Theme Settings:
-    Theme Settings: 'Tema'
+    Theme Settings: 'Tema Ayarları'
     Match Top Bar with Main Color: 'Üst Barı Ana Renk ile Eşleştir'
     Base Theme:
       Base Theme: 'Uygulama Teması'
@@ -325,8 +332,6 @@ Settings:
       Nordic: Nord
       Solarized Light: Solarized Açık
       Solarized Dark: Solarized Koyu
-      Gruvbox Dark: Gruvbox Karanlık
-      Gruvbox Light: Gruvbox Aydınlık
     Main Color Theme:
       Main Color Theme: 'Ana Renk Teması'
       Red: 'Kırmızı'
@@ -374,16 +379,6 @@ Settings:
       Solarized Blue: Solarized Mavi
       Solarized Cyan: Solarized Camgöbeği
       Solarized Green: Solarized Yeşil
-      Gruvbox Dark Green: Gruvbox Koyu Yeşil
-      Gruvbox Dark Yellow: Gruvbox Koyu Sarı
-      Gruvbox Dark Aqua: Gruvbox Koyu Deniz Mavisi
-      Gruvbox Dark Blue: Gruvbox Koyu Mavi
-      Gruvbox Dark Purple: Gruvbox Koyu Mor
-      Gruvbox Dark Orange: Gruvbox Koyu Turuncu
-      Gruvbox Light Purple: Gruvbox Açık Mor
-      Gruvbox Light Orange: Gruvbox Açık Turuncu
-      Gruvbox Light Red: Gruvbox Açık Kırmızı
-      Gruvbox Light Blue: Gruvbox Açık Mavi
     Secondary Color Theme: 'İkincil Renk Teması'
         #* Main Color Theme
     UI Scale: Kullanıcı Arayüzü Ölçeği
@@ -392,7 +387,7 @@ Settings:
     Hide Side Bar Labels: Kenar Çubuğu Etiketlerini Gizle
     Hide FreeTube Header Logo: FreeTube Başlık Logosunu Gizle
   Player Settings:
-    Player Settings: 'Oynatıcı'
+    Player Settings: 'Oynatıcı Ayarları'
     Play Next Video: 'Sonraki Videoyu Oynat'
     Turn on Subtitles by Default: 'Alt Yazıları Öntanımlı Olarak Aç'
     Autoplay Videos: 'Videoları Otomatik Başlat'
@@ -419,7 +414,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Oynatma Listesi Sonraki Video Aralığı
-    Next Video Interval: Otomatik Oynatma Geri Sayım Sayacı
+    Next Video Interval: Sonraki Video Aralığı
     Scroll Volume Over Video Player: Ses Düzeyini Video Oynatıcı Üzerinden Kaydır
     Display Play Button In Video Player: Video Oynatıcıda Oynatma Düğmesini Göster
     Fast-Forward / Rewind Interval: Hızlı İleri / Geri Sarma Aralığı
@@ -445,9 +440,8 @@ Settings:
         veya "/" kullanabilirsiniz.
     Enter Fullscreen on Display Rotate: Ekran Döndürüldüğünde Tam Ekrana Geç
     Skip by Scrolling Over Video Player: Video Oynatıcı Üzerinde Kaydırarak Atla
-    Autoplay Interruption Timer: Otomatik Oynatma Durdurma Sayacı
   Privacy Settings:
-    Privacy Settings: 'Gizlilik'
+    Privacy Settings: 'Gizlilik Ayarları'
     Remember History: 'Geçmişi Hatırla'
     Save Watched Progress: 'Kaldığım Yeri Hatırla'
     Clear Search Cache: 'Arama Önbelleğini Temizle'
@@ -468,19 +462,22 @@ Settings:
     Are you sure you want to remove all your playlists?: Tüm oynatma listelerinizi
       kaldırmak istediğinizden emin misiniz?
   Subscription Settings:
-    Subscription Settings: 'Abonelik'
+    Subscription Settings: 'Abonelik Ayarları'
     Hide Videos on Watch: 'İzlenmiş Videoları Gizle'
     Fetch Feeds from RSS: 'Akışları RSS''den Getir'
+    Manage Subscriptions: 'Abonelikleri Yönet'
     Fetch Automatically: Akışı Otomatik Olarak Getir
+    Only Show Latest Video for Each Channel: Her Kanal için Yalnızca En Son Videoyu
+      Göster
     Confirm Before Unsubscribing: Abonelikten Çıkmadan Önce Onayla
-    'Limit the number of videos displayed for each channel': Her kanal için gösterilen
-      video sayısını sınırlayın
-    To: Kadar
   Data Settings:
-    Data Settings: 'Veri'
+    Data Settings: 'Veri Ayarları'
     Select Import Type: 'İçe Aktarma Türünü Seç'
     Select Export Type: 'Dışa Aktarma Türünü Seç'
     Import Subscriptions: 'Abonelikleri İçe Aktar'
+    Import FreeTube: 'Freetube''dan İçe Aktar'
+    Import YouTube: 'YouTube''dan İçe Aktar'
+    Import NewPipe: 'NewPipe''dan İçe Aktar'
     Export Subscriptions: 'Abonelikleri Dışa Aktar'
     Export FreeTube: 'Freetube Biçiminde Dışa Aktar'
     Export YouTube: 'YouTube Biçiminde Dışa Aktar'
@@ -508,6 +505,7 @@ Settings:
     Unable to write file: 'Dosya yazılamadı'
     Unknown data key: 'Bilinmeyen veri anahtarı'
     How do I import my subscriptions?: 'Aboneliklerimi nasıl içe artarırım?'
+    Check for Legacy Subscriptions: Eski Abonelikleri Denetle
     Manage Subscriptions: Abonelikleri Yönet
     Export Playlists: Oynatma Listelerini Dışa Aktar
     All playlists has been successfully imported: Tüm oynatma listeleri başarıyla
@@ -529,6 +527,33 @@ Settings:
         Listelerini Kaldır seçeneğini kullanarak var olan tüm oynatma listelerinizi
         silin.\n3. FreeTube'un eski sürümünü başlatın ve dışa aktarılan oynatma listelerini
         içe aktarın.\""
+  Advanced Settings:
+    Advanced Settings: 'Gelişmiş Ayarlar'
+    Enable Debug Mode (Prints data to the console): 'Hata Ayıklama Modunu Etkinleştir
+      (Veriyi Konsola Yazdırır)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Vekil Sunucu Adresi (Örneğin:
+      SOCKS5://127.0.0.1:9050)'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '"Vekil
+      Sunucuyu Test Et" Butonuna Tıklamak https://ipinfo.io/json Adresine bir Talep
+      Gönderecek'
+    Use Tor / Proxy for API calls: 'API çağrıları için Tor / Vekil Sunucu Kullan'
+    TEST PROXY: 'Vekil Sunucuyu Test Et'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Genel Oluşumları Göster'
+    Clear History:
+      Clear History: 'Geçmişi Temizle'
+      # On Click
+      Are you sure you want to delete your history?: 'Geçmişi silmek istediğinizden
+        emin misiniz?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Abonelikleri Temizle'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Abonelikleri temizlemek
+        istediğinizden emin misiniz?'
+      #& Yes
+      #& No
 
   Distraction Free Settings:
     Hide Live Chat: Canlı Sohbeti Gizle
@@ -539,7 +564,7 @@ Settings:
     Hide Channel Subscribers: Kanal Abonelerini Gizle
     Hide Video Likes And Dislikes: Video Beğenmeleri Ve Beğenmemelerini Gizle
     Hide Video Views: Video İzlenme Sayılarını Gizle
-    Distraction Free Settings: Dikkat Dağıtmama
+    Distraction Free Settings: Dikkat Dağıtmama Ayarları
     Hide Active Subscriptions: Etkin Abonelikleri Gizle
     Hide Playlists: Oynatma Listelerini Gizle
     Hide Live Streams: Canlı Yayınları Gizle
@@ -553,21 +578,22 @@ Settings:
     Display Titles Without Excessive Capitalisation: Başlıkları Aşırı Büyük Harf ve
       Noktalama İşaretleri Kullanmadan Görüntüle
     Hide Featured Channels: Öne Çıkan Kanalları Gizle
-    Hide Channel Playlists: Kanal "Oynatma Listelerini" Gizle Sekmesi
-    Hide Channel Community: Kanal "Topluluğunu" Gizle Sekmesi
-    Hide Channel Shorts: Kanal "Kısa Videolarını" Gizle Sekmesi
+    Hide Channel Playlists: Kanal Oynatma Listelerini Gizle
+    Hide Channel Community: Kanal Topluluğunu Gizle
+    Hide Channel Shorts: Kanal Kısa Videolarını Gizle
     Sections:
       Side Bar: Kenar Çubuğu
       Channel Page: Kanal Sayfası
       Watch Page: İzleme Sayfası
       General: Genel
       Subscriptions Page: Abonelikler Sayfası
-    Hide Channel Releases: Kanal "Yayınlarını" Gizle Sekmesi
-    Hide Channel Podcasts: Kanal "Podcast'lerini" Gizle Sekmesi
+    Hide Channel Releases: Kanal Yayınlarını Gizle
+    Hide Channel Podcasts: Kanal Podcast'lerini Gizle
     Hide Subscriptions Videos: Abonelik Videolarını Gizle
     Hide Subscriptions Shorts: Abonelik Kısa Videolarını Gizle
     Hide Subscriptions Live: Abonelik Canlı Yayınlarını Gizle
     Hide Profile Pictures in Comments: Yorumlardaki Profil Resimlerini Gizle
+    Blur Thumbnails: Küçük Resimleri Bulanıklaştır
     Hide Subscriptions Community: Abonelik Topluluğunu Gizle
     Hide Channels Invalid: Belirtilen kanal kimliği geçersiz
     Hide Channels Disabled Message: Bazı kanallar kimliği kullanılarak engellendi
@@ -579,7 +605,6 @@ Settings:
       Gizle
     Hide Videos and Playlists Containing Text Placeholder: Sözcük, Sözcük Parçası
       veya İfade
-    Hide Channel Home: Kanal "Ana Sayfasını" Gizle Sekmesi
   The app needs to restart for changes to take effect. Restart and apply change?: Değişikliklerin
     etkili olması için uygulamanın yeniden başlatılması gerekiyor. Yeniden başlatılsın
     ve değişiklikler uygulansın mı?
@@ -598,17 +623,13 @@ Settings:
     Proxy Host: Vekil Sunucu Ana Makinesi
     Proxy Protocol: Vekil Sunucu Protokolü
     Enable Tor / Proxy: Tor / Vekil Sunucu Etkinleştir
-    Proxy Settings: Vekil Sunucu
-    Proxy Warning: FreeTube yerleşik bir proxy'ye sahip değildir, ancak Tor gibi makinenizde
-      çalışan bir proxy veya bazı VPN'ler tarafından sağlanan SOCKS5 proxy gibi harici
-      bir proxy'ye bağlanabilir. Etkinleştirilmişse, proxy/Tor'unuzun düzgün yapılandırıldığından
-      emin olun, aksi takdirde FreeTube herhangi bir veri alamayacaktır.
+    Proxy Settings: Vekil Sunucu Ayarları
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Sponsor bölümü atlandığında bildir
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       URL'si (Öntanımlı olarak https://sponsor.ajay.app)
     Enable SponsorBlock: SponsorBlock'u Etkinleştir
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: SponsorBlock Ayarları
     Skip Options:
       Skip Option: Atlama Seçeneği
       Auto Skip: Otomatik Atla
@@ -625,7 +646,7 @@ Settings:
     Custom External Player Executable: Özel Harici Oynatıcı Çalıştırılabilir Dosyası
     Ignore Unsupported Action Warnings: Desteklenmeyen Eylem Uyarılarını Yok Say
     External Player: Harici Oynatıcı
-    External Player Settings: Harici Oynatıcı
+    External Player Settings: Harici Oynatıcı Ayarları
     Players:
       None:
         Name: Yok
@@ -633,12 +654,12 @@ Settings:
   Download Settings:
     Choose Path: Yol Seç
     Ask Download Path: İndirme yolu için sor
-    Download Settings: İndirme
+    Download Settings: İndirme Ayarları
     Download Behavior: İndirme Davranışı
     Download in app: Uygulamada indir
     Open in web browser: Web tarayıcısında aç
   Parental Control Settings:
-    Parental Control Settings: Ebeveyn Denetimi
+    Parental Control Settings: Ebeveyn Denetimi Ayarları
     Show Family Friendly Only: Yalnızca Aileye Uygun Olanları Göster
     Hide Unsubscribe Button: Abonelikten Çık Düğmesini Gizle
     Hide Search Bar: Arama Çubuğunu Gizle
@@ -647,31 +668,66 @@ Settings:
     Warning: Bu ayarlar deneyseldir, etkin durumdayken çökmelere neden olabilirler.
       Yedekleme yapılması şiddetle tavsiye edilir. Kullanmanız durumunda risk size
       aittir!
-    Experimental Settings: Deneysel
+    Experimental Settings: Deneysel Ayarlar
   Password Dialog:
     Password Incorrect: Parola Yanlış
     Unlock: Kilidi aç
     Password: Parola
     Enter Password To Unlock: Ayarların kilidini açmak için parolayı girin
   Password Settings:
-    Password Settings: Parola
+    Password Settings: Parola Ayarları
     Set Password To Prevent Access: Ayarlara erişimi engellemek için bir parola belirleyin
     Remove Password: Parolayı Kaldır
     Set Password: Parola Ayarla
+  Expand All Settings Sections: Tüm Ayarlar Bölümlerini Genişlet
   Sort Settings Sections (A-Z): Ayarlar Bölümlerini Sırala (A-Z)
-  Return to Settings Menu: Ayarlar Menüsüne Dön
 About:
   #On About page
   About: 'Hakkında'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Bu
+    copyleft yazılım, özgür bir şekilde AGPL-3.0 altında lisanslanmıştır.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Hata mı buldunuz? Yeni bir özellik mi önermek istiyorsunuz? Yardım etmek mi istiyorsunuz?
+    GitHub sayfamıza bakın. Çekme istekleri kabul edilir.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Freetube''yi
+    yapmamıza olanak veren herkese ve tüm projelere teşekkürler!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Sohbet
+    etmek mi istiyorsunuz? Element / Matrix sunucumuza katılın. Lütfen katılmadan
+    önce kuralları gözden geçirin.'
+
+  'Looking for help? Check out our Wiki page.': 'Yardım mı lazım? Wiki sayfamıza bakın.'
+
+  Check out our Firefox extension!: 'Firefox uzantımıza göz atın!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'FreeTube''u
+    kullanmaktan hoşlanıyorsanız, Liberapay veya Bitcoin adresimiz aracılığıyla bağış
+    yapmayı düşünün.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'En Yeni FreeTube Haberleri'
+
+  Translate via Weblate: Weblate'de Çevir
   Website: İnternet Sitesi
+  Source Code: Kaynak Kodları
+  Release Notes: Sürüm Notları
   Blog: Blog
   Credits: Katkıda Bulunanlar
   FAQ: SSS
+  Wiki: Wiki
+  Report an Issue: Sorun Bildir
+  Channel Rules: Kanal Kuralları
   Email: E-posta
+  License: Lisans
   Beta: Beta
   Donate: Bağış Yap
+  Useful Links: Faydalı Bağlantılar
   Help: Yardım
+  Contact: İletişim
   these people and projects: bu kişiler ve projeler
   FreeTube is made possible by: FreeTube'e katkıda bulunanlar
   Translate: Çevir
@@ -686,6 +742,8 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub yayınları
   Downloads / Changelog: İndirmeler / Değişiklikler
+  View License: Lisansı Görüntüle
+  Licensed under the AGPLv3: AGPLv3 altında lisanslanmıştır
   Source code: Kaynak kodları
   Discussions: Tartışmalar
   Licensed under the: 'Lisans:'
@@ -733,7 +791,7 @@ Profile:
     silmez.'
 #On Channel Page
   Profile Filter: Profil Filtresi
-  Profile Settings: Profil
+  Profile Settings: Profil Ayarları
   Toggle Profile List: Profil Listesini Aç/Kapat
   Profile Name: Profil Adı
   Edit Profile Name: Profil Adını Düzenle
@@ -741,6 +799,8 @@ Profile:
   Open Profile Dropdown: Profil Açılır Menüsünü Aç
   Close Profile Dropdown: Profil Açılır Menüsünü Kapat
 Channel:
+  Subscriber: 'Abone'
+  Subscribers: 'Abone'
   Subscribe: 'Abone ol'
   Unsubscribe: 'Abonelikten çık'
   Channel has been removed from your subscriptions: 'Kanal aboneliklerinizden kaldırıldı'
@@ -807,12 +867,9 @@ Channel:
     This channel does not currently have any releases: Bu kanalda şu anda herhangi
       bir yayın yok
     Releases: Yayınlar
-  Home:
-    Home: Ana Sayfa
-    View Playlist: Oynatma Listesini Gözat
 Video:
   Mark As Watched: 'İzlendi Olarak İşaretle'
-  Remove From History: 'Geçmişten Kaldır'
+  Remove From History: 'Geçmişden Kaldır'
   Video has been marked as watched: 'Video izlendi olarak işaretlendi'
   Video has been removed from your history: 'Video geçmişinizden kaldırıldı'
   Open in YouTube: 'YouTube''da aç'
@@ -845,8 +902,38 @@ Video:
     Sohbet şu anda Invidious API ile desteklenmemektedir. YouTube ile doğrudan bağlantı
     gerekli.'
   Published:
+    Jan: 'Oca'
+    Feb: 'Şub'
+    Mar: 'Mar'
+    Apr: 'Nis'
+    May: 'May'
+    Jun: 'Haz'
+    Jul: 'Tem'
+    Aug: 'Ağu'
+    Sep: 'Eyl'
+    Oct: 'Eki'
+    Nov: 'Kas'
+    Dec: 'Ara'
+    Second: 'Saniye'
+    Seconds: 'Saniye'
+    Minute: 'Dakika'
+    Minutes: 'Dakika'
+    Hour: 'Saat'
+    Hours: 'Saat'
+    Day: 'Gün'
+    Days: 'Gün'
+    Week: 'Hafta'
+    Weeks: 'Hafta'
+    Month: 'Ay'
+    Months: 'Ay'
+    Year: 'Yıl'
+    Years: 'Yıl'
+    Ago: 'Önce'
+    Upcoming: 'İlk gösterim tarihi'
+    Less than a minute: Bir dakikadan az
     In less than a minute: Bir dakikadan kısa sürede
   Published on: 'Yayımlanma tarihi'
+  Publicationtemplate: '{number} {unit} önce'
 #& Videos
   audio only: yalnızca ses
   video only: yalnızca video
@@ -927,17 +1014,6 @@ Video:
     Playback will resume automatically when your connection comes back: Bağlantınız
       geri geldiğinde oynatma otomatik olarak devam edecektir.
     Skipped segment: '{segmentCategory} bölümü atlandı'
-  IP block: YouTube, IP adresinizin video izlemesini engelledi. Lütfen farklı bir
-    VPN veya vekil sunucuya geçmeyi deneyin.
-  Unlisted: Listelenmemiş
-  AgeRestricted: Yaş sınırlamalı videolar, Google hesabına giriş ve yaş doğrulaması
-    yapılmış bir YouTube hesabının kullanımını gerektirdiği için FreeTube üzerinden
-    izlenemez.
-  MembersOnly: Yalnızca üyelere özel videolar, Google girişi ve yükleyicinin kanalına
-    ücretli üyelik gerektirdiğinden FreeTube ile izlenemez.
-  DeArrow:
-    Show Original Details: Düzenlenmemiş Detayları Göster
-    Show Modified Details: Düzenlenmiş Detayları Göster
 Videos:
   #& Sort By
   Sort By:
@@ -948,6 +1024,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Tüm oynatma listesini görüntüle'
+  Videos: 'Videolar'
+  View: 'Görüntüle'
+  Views: 'İzlenme'
   Last Updated On: 'Son güncelleme tarihi'
 
 # On Video Watch Page
@@ -963,8 +1042,7 @@ Playlist:
     Sort By: Sıralama ölçütü
     DateAddedOldest: İlk eklenen önce
     Custom: Özel
-    VideoDurationAscending: Süre (Önce en kısa)
-    VideoDurationDescending: Süre (Önce en uzun)
+Toggle Theatre Mode: 'Tiyatro Modunu Aç/Kapat'
 Change Format:
   Change Media Formats: 'Medya Biçimlerini Değiştir'
   Use Dash Formats: 'DASH Biçimlerini Kullan'
@@ -1029,6 +1107,7 @@ Local API Error (Click to copy): 'Yerel API Hatası (Kopyalamak için tıklayın
 Invidious API Error (Click to copy): 'Invidious API Hatası (Kopyalamak için tıklayın)'
 Falling back to Invidious API: 'Invidious API''ye geri dönülüyor'
 Falling back to Local API: 'Yerel API''ye geri dönülüyor'
+Subscriptions have not yet been implemented: 'Abonelikler henüz uygulanmadı'
 Loop is now disabled: 'Döngü artık devre dışı'
 Loop is now enabled: 'Döngü artık etkin'
 Shuffle is now disabled: 'Karıştır artık devre dışı'
@@ -1082,12 +1161,9 @@ Tooltips:
     External Link Handling: "FreeTube'da açılamayan bir bağlantı tıklandığında öntanımlı
       davranışı seçin.\nÖntanımlı olarak FreeTube, tıklanan bağlantıyı öntanımlı tarayıcınızda
       açacaktır.\n"
-    Open Deep Links In New Window: Yeniden yönlendirilmiş tarayıcı eklentileri veya
-      komut satırı bağımsız değişkenleri gibi FreeTube'a yönlendirilen URL'ler, yeni
-      pencerede açılırlar.
   External Player Settings:
-    Custom External Player Arguments: Harici oynatıcıya iletmek isteyeceğiniz, herhangi
-      özel komut satırı argümanları.
+    Custom External Player Arguments: Harici oynatıcıya iletmek isteyeceğiniz, noktalı
+      virgülle (';') ayrılmış özel komut satırı argümanları.
     Ignore Warnings: Geçerli harici oynatıcının geçerli eylemi desteklemediği durumlar
       için uyarıları bastır (örn. çalma listelerini ters çevirme vb.).
     Custom External Player Executable: Öntanımlı olarak FreeTube, seçilen harici oynatıcının
@@ -1127,6 +1203,8 @@ Playing Next Video Interval: Sonraki video hemen oynatılıyor. İptal etmek iç
   tıklayın. | Sonraki video {nextVideoInterval} saniye içinde oynatılıyor. İptal etmek
   için tıklayın.
 More: Daha Fazla
+Hashtags have not yet been implemented, try again later: Hashtag'ler henüz uygulanmadı,
+  daha sonra tekrar deneyin
 Unknown YouTube url type, cannot be opened in app: Bilinmeyen YouTube URL türü, uygulamada
   açılamıyor
 Open New Window: Yeni Pencere Aç
@@ -1154,6 +1232,8 @@ Channels:
   Title: Kanal Listesi
   Search bar placeholder: Kanalları Ara
   Count: '{number} kanal bulundu.'
+  Unsubscribe: Abonelikten çık
+  Unsubscribed: '{channelName} aboneliklerinizden kaldırıldı'
   Unsubscribe Prompt: '"{channelName}" aboneliğinden çıkmak istediğinizden emin misiniz?'
 Clipboard:
   Copy failed: Panoya kopyalanamadı
@@ -1165,7 +1245,6 @@ Chapters:
     geçerli bölüm: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Bölüm listesi gizli, geçerli
     bölüm: {chapterName}'
-  Key Moments: Kilit Anlar
 Preferences: Tercihler
 Ok: Tamam
 Hashtag:
@@ -1203,26 +1282,5 @@ Search Listing:
     Closed Captions: Kapalı Alt Yazılar
     4K: 4K
     Subtitles: Alt Yazılar
-    VR180: VR180
-    360 Video: 360°
-    New: Yeni
-    3D: 3B
-    8K: 8K
 'Blocked opening potentially unsafe URL': "Güvenli olmayabilir URL'nin açılması engellendi:
   \"{url}\"."
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Keys:
-  arrowdown: Aşağı Ok
-  arrowleft: Sol Ok
-  arrowup: Yukarı Ok
-  ctrl: Ctrl
-  arrowright: Sağ Ok
-  alt: Alt
-shortcutJoinOperator: +
-Right-click or hold to see history: Geçmişi görmek için sağ tıklayın ya da basılı
-  tutun
-Description:
-  Expand Description: '...devamı'
-  Collapse Description: Daha az göster
-Autoplay Interruption Timer: Otomatik oynatma, {autoplayInterruptionIntervalHours}
-  saattir aktif olmadığı için iptal edildi
diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index e004ced8335e0..1c394b2f79706 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -42,8 +42,6 @@ Global:
     Subscriber Count: 1 підписник | {count} підписників
     View Count: 1 перегляд | {count} переглядів
     Watching Count: 1 глядач | {count} глядачів
-    Like Count: 1 вподобання | {count} вподобань
-    Comment Count: 1 коментар | {count} коментарів
   Input Tags:
     Length Requirement: Тег повинен мати довжину не менше {number} символів
 Version {versionNumber} is now available!  Click for more details: 'Доступна нова
@@ -90,18 +88,6 @@ Search Filters:
   Fetch more results: 'Завантажити більше результатів'
 # Sidebar
   There are no more results for this search: Більше результатів для цього пошуку немає
-  Features:
-    Features: Функції
-    HD: HD
-    Subtitles: Субтитри
-    Live: Наживо
-    4K: 4K
-    360 Video: 360 Відео
-    Location: Розташування
-    HDR: HDR
-    VR180: VR180
-    3D: 3D
-    Creative Commons: Творчі Спільноти
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Підписки'
@@ -110,9 +96,7 @@ Subscriptions:
     профіль має велику кількість підписок. Використайте RSS щоб уникнути обмеження
     швидкості'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Ваш
-    список підписок наразі порожній. Якщо ви хочете імпортувати свої підписки, перейдіть
-    до налаштувань даних і виберіть "Імпортувати підписки", або ви можете знайти канал
-    і підписатися на нього.'
+    список Підписок на разі пустий. Почніть додавати підписки щоб побачити їх тут.'
   'Getting Subscriptions. Please wait.': 'Отримання Підписок. Будь ласка, зачекайте.'
   Refresh Subscriptions: 'Оновити Підписки'
   Load More Videos: 'Завантажити більше відео'
@@ -133,10 +117,16 @@ Trending:
   Music: Музика
   Default: Типово
 Most Popular: 'Найпопулярніші'
-Playlists: 'Добірки'
+Playlists: 'Списки відтворення'
 User Playlists:
-  Your Playlists: 'Ваші добірки'
-  Search bar placeholder: Шукати добірки
+  Your Playlists: 'Ваші списки відтворення'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Збережені
+    відео порожні. Клацніть на кнопку збереження у куті відео, щоб воно було перелічено
+    тут
+  Playlist Message: Ця сторінка не показує повністю робочих списків відтворення. На
+    ній перелічено лише відео, які ви зберегли або вибрали. Коли робота завершиться,
+    усі відео, які зараз знаходяться тут, буде переміщено до списку відтворення "Вибране".
+  Search bar placeholder: Шукати у добірці
   Empty Search Message: Немає відео в цій добірці, які відповідають вашому запиту
   Create New Playlist: Створити новий список відтворення
   Add to Playlist: Додати список відтворення
@@ -157,109 +147,13 @@ User Playlists:
   Playlist Name: Назва списку відтворення
   Edit Playlist Info: Змінити інформацію списку відтворення
   Remove Watched Videos: Вилучити з переглянутих відео
-  Delete Playlist: Видалити добірку
-  Sort By:
-    Sort By: Сортувати за
-    LatestPlayedFirst: Нещодавно переглянуті
-    EarliestPlayedFirst: Найдавніше переглянуті
-    NameAscending: А-Я
-    LatestCreatedFirst: Нещодавно створено
-    EarliestCreatedFirst: Створено найраніше
-    NameDescending: Я-А
-    EarliestUpdatedFirst: Найстаріші оновлення
-    LatestUpdatedFirst: Останні оновлення
-  SinglePlaylistView:
-    Toast:
-      This playlist is now used for quick bookmark: Ця добірка тепер використовується
-        для швидких закладок
-      This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: Ця
-        добірка тепер використовується для швидких закладок замість {oldPlaylistName}.
-        Натисніть тут, щоб скасувати
-      This video cannot be moved up.: Це відео не можна перемістити вгору.
-      This video cannot be moved down.: Це відео не можна перемістити вниз.
-      Video has been removed: Відео було видалено
-      This playlist is already being used for quick bookmark.: Ця добірка вже використовується
-        для швидких закладок.
-      There was a problem with removing this video: Сталася помилка під час видалення
-        цього відео
-      Reverted to use {oldPlaylistName} for quick bookmark: Повернуто до використання
-        {oldPlaylistName} для швидких закладок
-      This playlist is protected and cannot be removed.: Цю добірку захищено, тому
-        її не можна видалити.
-      "{videoCount} video(s) have been removed": 1 відео було видалено | {videoCount}
-        відео було видалено
-      Playlist {playlistName} has been deleted.: Добірку {playlistName} було видалено.
-      This playlist does not exist: Ця добірка не існує
-      This playlist has a video with a duration error: Ця добірка містить принаймні
-        одне відео, яке не має тривалості, тому воно буде відсортоване так, ніби його
-        тривалість дорівнює нулю.
-      Some videos in the playlist are not loaded yet. Click here to copy anyway.: Деякі
-        відео в добірці ще не завантажено. Натисніть тут, щоб все одно скопіювати.
-      Playlist name cannot be empty. Please input a name.: Назва добірки не може бути
-        порожньою. Будь ласка, введіть назву.
-      Playlist has been updated.: Добірка була оновлена.
-      There was an issue with updating this playlist.: Сталася помилка при оновленні
-        цієї добірки.
-      There were no videos to remove.: Відео для видалення не знайдено.
-      Playlist {playlistName} is the new quick bookmark playlist.: Добірка {playlistName}
-        тепер є новою швидкою закладкою.
-    Search for Videos: Пошук відео
-  The playlist has been successfully exported: Добірку успішно експортовано
-  Export Playlist: Експортувати цю добірку
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Ви
-    впевнені, що хочете видалити 1 переглянуте відео з цієї добірки? Цю дію не можна
-    скасувати. | Ви впевнені, що хочете видалити {playlistItemCount} переглянутих
-    відео з цієї добірки? Цю дію не можна скасувати.
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Ви
-    впевнені, що хочете видалити 1 дубльоване відео з цієї добірки? Цю дію не можна
-    скасувати. | Ви впевнені, що хочете видалити {playlistItemCount} дубльованих відео
-    з цієї добірки? Цю дію не можна скасувати.
-  Are you sure you want to delete this playlist? This cannot be undone: Ви впевнені,
-    що хочете видалити цю добірку? Це неможливо скасувати.
-  Enable Quick Bookmark With This Playlist: Увімкнути швидке додавання в закладки
-    для цієї добірки
-  Quick Bookmark Enabled: Швидке додавання в закладки увімкнено
-  Cannot delete the quick bookmark target playlist.: Неможливо видалити добірку швидких
-    закладок.
-  Playlists with Matching Videos: Добірки з відповідними відео
-  Remove Duplicate Videos: Видалити дублікати відео
-  AddVideoPrompt:
-    Save: Зберегти
-    Search in Playlists: Пошук в добірках
-    Allow Adding Duplicate Video(s): Дозволити додавати дублікатів відео
-    Added {count} Times: Вже додано | Додано {count} разів
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
-      Відео буде додано'
-    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
-      Відео вже додано'
-    Toast:
-      "{videoCount} video(s) added to 1 playlist": 1 відео додано до 1 добірки | {videoCount}
-        відео додано до 1 добірки
-      "{videoCount} video(s) added to {playlistCount} playlists": 1 відео додано до
-        {playlistCount} добірок | {videoCount} відео додано до {playlistCount} добірок
-      You haven't selected any playlist yet.: Ви ще не вибрали жодної добірки.
-    N playlists selected: '{playlistCount} вибрано'
-    Select a playlist to add your N videos to: Виберіть добірку, до якої ви хочете
-      додати своє відео | Виберіть добірку, до якої ви хочете додати свої {videoCount}
-      відео
-  CreatePlaylistPrompt:
-    Create: Створити
-    Toast:
-      Playlist {playlistName} has been successfully created.: Добірку {playlistName}
-        успішно створено.
-      There was an issue with creating the playlist.: Сталася помилка під час створення
-        добірки.
-      There is already a playlist with this name. Please pick a different name.: Вже
-        існує добірка з такою назвою. Будь ласка, виберіть іншу назву.
-    New Playlist Name: Нова назва добірки
 History:
   # On History Page
   History: 'Історія'
   Watch History: 'Історія переглядів'
   Your history list is currently empty.: 'Ваша історія переглядів на разі порожня.'
   Search bar placeholder: Шукати в історії
-  Empty Search Message: У вашій історії немає відео, що відповідають вашому пошуку
-  Case Sensitive Search: Пошук з урахуванням регістру
+  Empty Search Message: Немає відео в історії, які відповідають вашому запиту
 Settings:
   # On Settings Page
   Settings: 'Налаштування'
@@ -267,7 +161,7 @@ Settings:
     зміни набули чинності, необхідно перезавантижити застосунок. Перезавантажити та
     застосувати зміни?'
   General Settings:
-    General Settings: 'Загальні'
+    General Settings: 'Загальні налаштування'
     Check for Updates: 'Перевірити наявність оновлень'
     Check for Latest Blog Posts: 'Перевірити останні повідомлення в блозі'
     Fallback to Non-Preferred Backend on Failure: 'Коли у вашого головного API виникає
@@ -292,6 +186,8 @@ Settings:
       End: 'У кінці'
       Hidden: Сховано
       Blur: Розмиття
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Екземпляр Invidious
+      (За замовчуванням https://invidious.snopyta.org)'
     Region for Trending: 'Регіон для Популярних'
         #! List countries
     View all Invidious instance information: Перегляд усіх відомостей про екземпляр
@@ -310,13 +206,8 @@ Settings:
       Ask Before Opening Link: Запитувати, перш ніж відкрити посилання
       Open Link: Відкрити посилання
       External Link Handling: Обробка зовнішніх посилань
-    Auto Load Next Page:
-      Label: Автозавантаження наступної сторінки
-      Tooltip: Автоматично завантажувати додаткові сторінки та коментарі.
-    Open Deep Links In New Window: Відкривати URL-адреси, передані в FreeTube, в новому
-      вікні
   Theme Settings:
-    Theme Settings: 'Теми'
+    Theme Settings: 'Налаштування теми'
     Match Top Bar with Main Color: 'Верхня панель основного кольору'
     Expand Side Bar by Default: 'Усталено розгортати бічну панель'
     Disable Smooth Scrolling: 'Відключити плавну прокрутку'
@@ -331,11 +222,6 @@ Settings:
       Catppuccin Mocha: Catppuccin Mocha
       Hot Pink: Гарячий рожевий
       Pastel Pink: Пастельний рожевий
-      Gruvbox Dark: Gruvbox Темний
-      Solarized Light: Solarized Світлий
-      Nordic: Нордичний
-      Gruvbox Light: Gruvbox Світлий
-      Solarized Dark: Solarized Темна
     Main Color Theme:
       Main Color Theme: 'Основна кольорова тема'
       Red: 'Червона'
@@ -375,30 +261,12 @@ Settings:
       Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo
       Catppuccin Mocha Yellow: Catppuccin Mocha Yellow
       Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater
-      Gruvbox Dark Purple: Gruvbox Темно Фіолетовий
-      Gruvbox Light Blue: Gruvbox Світло Голубий
-      Solarized Cyan: Solarized Голубий
-      Solarized Green: Solarized Зелений
-      Gruvbox Light Orange: Gruvbox Світло Оранжевий
-      Solarized Yellow: Solarized Жовтий
-      Gruvbox Dark Green: Gruvbox Темно Зелений
-      Gruvbox Dark Blue: Gruvbox Темно Синій
-      Gruvbox Dark Aqua: Gruvbox Темна Аква
-      Gruvbox Dark Orange: Gruvbox Темно Оранжевий
-      Gruvbox Light Red: Gruvbox Світло Червоний
-      Gruvbox Light Purple: Gruvbox Світло Фіолетовий
-      Solarized Magenta: Solarized Пурпурний
-      Solarized Violet: Solarized Фіолетовий
-      Solarized Orange: Solarized Оранжевий
-      Solarized Red: Solarized Червоний
-      Gruvbox Dark Yellow: Gruvbox Темно Жовтий
-      Solarized Blue: Solarized Голубий
     Secondary Color Theme: 'Другорядна кольорова тема'
         #* Main Color Theme
     Hide Side Bar Labels: Сховати мітки бічної панелі
     Hide FreeTube Header Logo: Сховати логотип FreeTube із заголовка
   Player Settings:
-    Player Settings: 'Плеєр'
+    Player Settings: 'Налаштування програвача'
     Play Next Video: 'Грати наступне відео'
     Turn on Subtitles by Default: 'Увімкнути субтитри за замовченням'
     Autoplay Videos: 'Автоматичне відтворення відео'
@@ -425,7 +293,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: Інтервал відтворення наступного відео
-    Next Video Interval: Таймер автозапуску
+    Next Video Interval: Інтервал до наступного відео
     Scroll Volume Over Video Player: Прокручування гучності на відеопрогравачі
     Display Play Button In Video Player: Показувати кнопку відтворення у відеопрогравачі
     Fast-Forward / Rewind Interval: Інтервал перемотування вперед/назад
@@ -452,9 +320,8 @@ Settings:
     Enter Fullscreen on Display Rotate: Переходити в повноекранний режим за обертання
       екрана
     Skip by Scrolling Over Video Player: Пропустити гортанням відеопрогравача
-    Autoplay Interruption Timer: Таймер переривання автозапуску
   Privacy Settings:
-    Privacy Settings: 'Конфіденційність'
+    Privacy Settings: 'Налаштування приватності'
     Remember History: 'Збрігати історію'
     Save Watched Progress: 'Зберігати прогрес перегляду'
     Clear Search Cache: 'Очистити пошуковий кеш'
@@ -470,21 +337,16 @@ Settings:
       хочете вилучити всі підписки та профілі? Цю дію не можна скасувати.'
     Save Watched Videos With Last Viewed Playlist: Зберегти переглянуті відео у список
       відтворення, який ви переглядали останнім часом
-    All playlists have been removed: Усі добірки були видалені
-    Remove All Playlists: Видалити всі добірки
-    Are you sure you want to remove all your playlists?: Ви впевнені, що хочете видалити
-      всі свої добірки?
   Subscription Settings:
-    Subscription Settings: 'Підписка'
+    Subscription Settings: 'Налаштування підписки'
     Hide Videos on Watch: 'Ховати відео при перегляді'
     Fetch Feeds from RSS: 'Отримати канали з RSS'
+    Manage Subscriptions: 'Керування підписками'
     Fetch Automatically: Автоматично отримувати стрічку
-    Confirm Before Unsubscribing: Підтвердити перед скасуванням підписки
-    'Limit the number of videos displayed for each channel': Обмежити кількість відео,
-      що відображаються для кожного каналу
-    To: До
+    Only Show Latest Video for Each Channel: Показувати лише останні відео для кожного
+      каналу
   Distraction Free Settings:
-    Distraction Free Settings: 'Без відволікань'
+    Distraction Free Settings: 'Налаштування зосередження'
     Hide Video Views: 'Сховати перегляди відео'
     Hide Video Likes And Dislikes: 'Приховати вподобайки до відео'
     Hide Channel Subscribers: 'Не показувати підписників каналу'
@@ -494,7 +356,7 @@ Settings:
     Hide Popular Videos: 'Не показувати популярні відео'
     Hide Live Chat: 'Не показувати живий чат'
     Hide Active Subscriptions: Сховати активні підписки
-    Hide Playlists: Сховати добірки
+    Hide Playlists: Сховати списки відтворення
     Hide Video Description: Сховати опис відео
     Hide Comments: Сховати коментарі
     Hide Sharing Actions: Сховати дії поширення
@@ -503,12 +365,12 @@ Settings:
     Hide Upcoming Premieres: Сховати майбутні прем'єри
     Hide Channels: Сховати відео з каналів
     Hide Channels Placeholder: ID каналу
-    Display Titles Without Excessive Capitalisation: Відображати заголовки без зайвої
-      капіталізації та пунктуації
+    Display Titles Without Excessive Capitalisation: Показувати заголовки без надмірно
+      великих літер
     Hide Featured Channels: Сховати пропоновані канали
-    Hide Channel Playlists: Сховати добірки каналу
-    Hide Channel Community: Сховати вкладку "Спільнота" каналу
-    Hide Channel Shorts: Сховати вкладку "Shorts" каналу
+    Hide Channel Playlists: Сховати списки відтворення каналу
+    Hide Channel Community: Сховати спільноту каналу
+    Hide Channel Shorts: Сховати Shorts каналу
     Sections:
       Side Bar: Бічна панель
       Channel Page: Сторінка каналу
@@ -516,11 +378,12 @@ Settings:
       General: Загальні
       Subscriptions Page: Сторінка підписок
     Hide Subscriptions Videos: Сховати відео з підписок
-    Hide Channel Podcasts: Сховати вкладку "Подкасти" каналу
-    Hide Channel Releases: Сховати вкладку "Випуски" каналу
+    Hide Channel Podcasts: Сховати канали подкастів
+    Hide Channel Releases: Сховати канали випусків
     Hide Subscriptions Shorts: Сховати Shorts із підписок
     Hide Subscriptions Live: Сховати трансляції з підписок
     Hide Profile Pictures in Comments: Сховати зображення профілю в коментарях
+    Blur Thumbnails: Розмиті мініатюри
     Hide Subscriptions Community: Сховати спільноту підписників
     Hide Channels Invalid: Вказаний ID каналу недійсний
     Hide Channels Disabled Message: Деякі канали були заблоковані за допомогою ID
@@ -528,17 +391,15 @@ Settings:
     Hide Channels Already Exists: ID каналу вже існує
     Hide Channels API Error: Помилка під час пошуку користувача з наданим ID. Перевірте
       ще раз, чи правильний ID.
-    Hide Channel Home: Сховати вкладку "Головна" каналу
-    Hide Videos and Playlists Containing Text Placeholder: Слово, фрагмент слова або
-      фраза
-    Hide Videos and Playlists Containing Text: Сховати відео та добірки, що містять
-      текст
-    Show Added Items: Показати додані елементи
   Data Settings:
-    Data Settings: 'Дані'
+    Data Settings: 'Налаштування даних'
     Select Import Type: 'Оберіть тип імпорту'
     Select Export Type: 'Оберіть тип експорту'
     Import Subscriptions: 'Імпортувати підписки'
+    Import FreeTube: 'Імпортувати FreeTube'
+    Import YouTube: 'Імпортувати YouTube'
+    Import NewPipe: 'Імпортувати NewPipe'
+    Check for Legacy Subscriptions: 'Перевірка наявності застарілих підписок'
     Export Subscriptions: 'Експортувати підписки'
     Export FreeTube: 'Експортувати FreeTube'
     Export YouTube: 'Експортувати YouTube'
@@ -567,21 +428,14 @@ Settings:
     Manage Subscriptions: Керування підписками
     Playlist insufficient data: Недостатньо даних для списку відтворення "{playlist}",
       пропуск елемента
-    All playlists has been successfully exported: Усі добірки успішно експортовано
+    All playlists has been successfully exported: Усі списки відтворення успішно експортовано
     Import Playlists: Імпорт добірок
     Export Playlists: Експорт добірок
-    All playlists has been successfully imported: Усі добірки успішно імпортовано
+    All playlists has been successfully imported: Усі списки відтворення успішно імпортовано
     Playlist File: Файл списку відтворення
     Subscription File: Файл підписки
     History File: Файл історії
-    Export Playlists For Older FreeTube Versions:
-      Label: Експортувати добірки для старих версій FreeTube
-      Tooltip: "Ця опція експортує відео з усіх добірок в одну добірку під назвою
-        \"Улюблені\".\nЯк експортувати та імпортувати відео з добірок для старої версії
-        FreeTube:\n1. Експортуйте свої добірки з увімкненою цією опцією.\n2. Видаліть
-        усі свої наявні добірки за допомогою опції \"Видалити всі добірки\" в налаштуваннях
-        конфіденційності.\n3. Запустіть стару версію FreeTube та імпортуйте експортовані
-        добірки."
+  Advanced Settings: {}
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: Помилка
       отримання відомостей про мережу. Чи правильно налаштовано ваш проксі?
@@ -597,18 +451,13 @@ Settings:
     Proxy Host: Проксі-вузол
     Proxy Protocol: Проксі-протокол
     Enable Tor / Proxy: Увімкнути Tor / Проксі
-    Proxy Settings: Проксі
-    Proxy Warning: FreeTube не має вбудованого проксі, але може підключатися до зовнішнього
-      проксі, такого як Tor, що працює на вашому комп'ютері, або зовнішній проксі,
-      наприклад, SOCKS5 проксі, який надають деякі VPN-сервіси. Якщо ця опція увімкнена,
-      переконайтеся, що ваш проксі/Tor налаштовані правильно, інакше FreeTube не зможе
-      завантажувати дані.
+    Proxy Settings: Налаштування проксі
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: Сповіщати про пропуск спонсорованого відтинка
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL-адреса API SponsorBlock
       (типово https://sponsor.ajay.app)
     Enable SponsorBlock: Увімкнути SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Налаштування SponsorBlock
     Skip Options:
       Skip Option: Опція пропуску
       Auto Skip: Автопропуск
@@ -617,35 +466,31 @@ Settings:
       Do Nothing: Нічого не робити
     Category Color: Колір категорії
     UseDeArrowTitles: Використовувати назви для відео DeArrow
-    UseDeArrowThumbnails: Використовувати DeArrow для ескізів
-    'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': 'URL
-      API генератора ескізів DeArrow (за замовчуванням: https://dearrow-thumb.ajay.app)'
   External Player Settings:
     Custom External Player Arguments: Власні аргументи зовнішнього програвача
     Custom External Player Executable: Власний виконуваний зовнішній програвач
     Ignore Unsupported Action Warnings: Нехтувати попередженнями про непідтримувані
       дії
     External Player: Зовнішній програвач
-    External Player Settings: Зовнішній плеєр
+    External Player Settings: Параметри зовнішнього програвача
     Players:
       None:
         Name: Немає
-    Ignore Default Arguments: Ігнорувати стандартні аргументи
   Download Settings:
-    Download Settings: Завантаження
+    Download Settings: Налаштування завантаження
     Choose Path: Вибрати шлях
     Ask Download Path: Запитувати шлях завантаження
     Download Behavior: Поведінка завантаження
     Download in app: Завантажити в застосунку
     Open in web browser: Відкрити у переглядачі
   Parental Control Settings:
-    Parental Control Settings: Батьківський контроль
+    Parental Control Settings: Налаштування батьківського контролю
     Hide Unsubscribe Button: Сховати кнопку скасування підписки
     Show Family Friendly Only: Показати лише для сімейного перегляду
     Hide Search Bar: Сховати панель пошуку
   Experimental Settings:
     Replace HTTP Cache: Заміна кешу HTTP
-    Experimental Settings: Експериментальні
+    Experimental Settings: Експериментальні налаштування
     Warning: Ці налаштування експериментальні, їхнє ввімкнення може призводити до
       збоїв. Радимо робити резервні копії. Використовуйте на свій страх і ризик!
   Password Dialog:
@@ -654,15 +499,14 @@ Settings:
     Password Incorrect: Пароль неправильний
     Password: Пароль
   Password Settings:
-    Password Settings: Пароль
+    Password Settings: Налаштування пароля
     Set Password: Установити пароль
     Remove Password: Вилучити пароль
     Set Password To Prevent Access: Встановіть пароль, щоб запобігти доступу до налаштувань
-  Return to Settings Menu: Повернутися до налаштувань
-  Sort Settings Sections (A-Z): Сортувати розділи налаштувань (А-Я)
+  Expand All Settings Sections: Розгорнути всі розділи налаштувань
 About:
   #On About page
-  About: 'Про додаток'
+  About: 'Про'
   #& About
   Donate: Підтримати
   these people and projects: цим людям та проєктам
@@ -685,11 +529,11 @@ About:
   Help: Довідка
   GitHub releases: Випуски GitHub
   Downloads / Changelog: Завантаження / Журнал змін
+  View License: Переглянути ліцензію
+  Licensed under the AGPLv3: Ліцензовано під AGPLv3
   Source code: Джерельний код
   Beta: Бета
   Discussions: Обговорення
-  Licensed under the: Ліцензовано за умовами
-  AGPLv3: AGPLv3
 Profile:
   Profile Select: 'Вибір профілю'
   All Channels: 'Усі канали'
@@ -730,7 +574,7 @@ Profile:
     бажаєте видалити вибрані канали?  Канал не буде видалено з будь-якого іншого профілю.'
 #On Channel Page
   Profile Filter: Фільтр профілю
-  Profile Settings: Профіль
+  Profile Settings: Налаштування профілю
   Toggle Profile List: Перемкнути список профілів
   Profile Name: Назва профілю
   Edit Profile Name: Змінити назву профілю
@@ -738,6 +582,8 @@ Profile:
   Open Profile Dropdown: Відкрити спадне меню профілю
   Close Profile Dropdown: Закрити спадне меню профілю
 Channel:
+  Subscriber: 'Підписник'
+  Subscribers: 'Підписники'
   Subscribe: 'Підписатися'
   Unsubscribe: 'Відписатися'
   Channel has been removed from your subscriptions: 'Канал прибрано з ваших підписок'
@@ -756,14 +602,14 @@ Channel:
       Oldest: 'Найдавніші'
       Most Popular: 'Найпопулярніші'
   Playlists:
-    Playlists: 'Добірки'
+    Playlists: 'Списки відтворення'
     This channel does not currently have any playlists: 'Цей канал наразі не має добірок'
     Sort Types:
       Last Video Added: 'Останнє додане відео'
       Newest: 'Найновіші'
       Oldest: 'Найдавніші'
   About:
-    About: 'Про канал'
+    About: 'Про'
     Channel Description: 'Опис каналу'
     Featured Channels: 'Рекомендовані канали'
     Tags:
@@ -782,11 +628,6 @@ Channel:
     votes: 'Голосів: {votes}'
     Reveal Answers: Розгорнути відповіді
     Hide Answers: Сховати відповіді
-    Video hidden by FreeTube: Відео приховане FreeTube
-    View Full Post: Переглянути повний пост
-    Viewing Posts Only Supported By Invidious: Перегляд постів підтримується лише
-      через Invidious. Перейдіть до вкладки спільноти каналу, щоб переглядати контент
-      без Invidious.
   Live:
     This channel does not currently have any live streams: Наразі на цьому каналі
       немає прямих трансляцій
@@ -801,9 +642,6 @@ Channel:
     This channel does not currently have any releases: Наразі на цьому каналі немає
       випусків
     Releases: Випуски
-  Home:
-    Home: Головна
-    View Playlist: Переглянути добірку
 Video:
   Mark As Watched: 'Позначити переглянутим'
   Remove From History: 'Прибрати з історії'
@@ -847,8 +685,38 @@ Video:
   video only: 'лише відео'
   audio only: 'лише звук'
   Published:
+    Jan: 'Ян'
+    Feb: 'Лют'
+    Mar: 'Бер'
+    Apr: 'Кві'
+    May: 'Тра'
+    Jun: 'Чер'
+    Jul: 'Лип'
+    Aug: 'Сер'
+    Sep: 'Вер'
+    Oct: 'Жов'
+    Nov: 'Лис'
+    Dec: 'Гру'
+    Second: 'Секунда'
+    Seconds: 'Секунд'
+    Minute: 'Хвилина'
+    Minutes: 'Хвилин'
+    Hour: 'Година'
+    Hours: 'Годин'
+    Day: 'День'
+    Days: 'Днів'
+    Week: 'Тиждень'
+    Weeks: 'Тижнів'
+    Month: 'Місяць'
+    Months: 'Місяців'
+    Year: 'Рік'
+    Years: 'Років'
+    Ago: 'Тому'
+    Upcoming: 'Прем''єри'
+    Less than a minute: Менш як за хвилину
     In less than a minute: Менше ніж за хвилину
   Published on: 'Опубліковано'
+  Publicationtemplate: '{number} {unit} тому'
 #& Videos
   Started streaming on: Почато трансляцію
   Streamed on: Потокове передавання
@@ -890,48 +758,6 @@ Video:
   Pause on Current Video: Призупинити на поточному відео
   Unhide Channel: Показати канал
   Hide Channel: Сховати канал
-  Player:
-    TranslatedCaptionTemplate: '{language} (перекладено з "{originalLanguage}")'
-    Stats:
-      Bandwidth: 'Пропускна здатність: {bandwidth} кбіт/с'
-      CodecsVideoAudio: 'Кодеки: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
-      Bitrate: 'Бітрейт: {bitrate} кбіт/с'
-      Volume: 'Гучність: {volumePercentage}%'
-      Buffered: 'Буферизація: {bufferedPercentage}%'
-      Dropped Frames / Total Frames: 'Втрачені кадри: {droppedFrames} / Загальні кадри:
-        {totalFrames}'
-      Player Dimensions: 'Розміри плеєра: {width}x{height}'
-      CodecAudio: 'Кодек: {audioCodec} ({audioItag})'
-      Stats: Статистика
-      Video ID: 'ID відео: {videoId}'
-      Media Formats: 'Медійні формати: {formats}'
-      Resolution: 'Роздільна здатність: {width}x{height}@{frameRate}'
-      CodecsVideoAudioNoItags: 'Кодеки: {videoCodec} / {audioCodec}'
-    Show Stats: Показати статистику
-    Full Window: Повний екран
-    Take Screenshot: Зробити скріншот
-    You appear to be offline: Виглядає, що ви не в мережі.
-    Playback will resume automatically when your connection comes back: Відтворення
-      відновиться автоматично, коли ваше підключення відновиться.
-    Exit Theatre Mode: Вийти з режиму кінотеатру
-    Exit Full Window: Вийти з повного екрану
-    Audio Tracks: Аудіотреки
-    Theatre Mode: Режим кінотеатру
-    Hide Stats: Сховати статистику
-    Skipped segment: Пропущено сегмент {segmentCategory}
-  IP block: YouTube заблокував вашу IP-адресу для перегляду відео. Будь ласка, спробуйте
-    змінити VPN або проксі.
-  Unlisted: Не в списку
-  AgeRestricted: Відео з віковими обмеженнями не можна переглядати за допомогою FreeTube,
-    оскільки вони вимагають входу через Google та використання відео-аккаунту YouTube
-    з підтвердженням віку.
-  More Options: Більше опцій
-  DeArrow:
-    Show Original Details: Показати оригінальні деталі
-    Show Modified Details: Показати змінені деталі
-  MembersOnly: Відео, доступні лише для учасників, не можна переглядати за допомогою
-    FreeTube, оскільки вони вимагають входу через Google та платної підписки на канал
-    завантажувача.
 Videos:
   #& Sort By
   Sort By:
@@ -942,23 +768,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Переглянути весь список відтворення'
+  Videos: 'Відео'
+  View: 'Перегляд'
+  Views: 'Переглядів'
   Last Updated On: 'Востаннє оновлено'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Список відтворення
-  Sort By:
-    VideoDurationDescending: Тривалість (спочатку найдовші)
-    Custom: Користувацький
-    VideoTitleDescending: Заголовок (Я-А)
-    VideoTitleAscending: Заголовок (А-Я)
-    DateAddedOldest: Спочатку найстаріші добавлені
-    AuthorAscending: Автор (А-Я)
-    AuthorDescending: Автор (Я-А)
-    VideoDurationAscending: Тривалість (спочатку найкоротші)
-    Sort By: Сортувати за
-    DateAddedNewest: Спочатку новіші добавлені
+Toggle Theatre Mode: 'Перемкнути режим театру'
 Change Format:
   Change Media Formats: 'Зміна форматів відео'
   Use Dash Formats: 'Використовувати формати DASH'
@@ -968,8 +787,6 @@ Change Format:
     відео'
   Audio formats are not available for this video: 'Аудіоформати недоступні для цього
     відео'
-  Legacy formats are not available for this video: Застарілі формати недоступні для
-    цього відео
 Share:
   Share Video: 'Поділитися відео'
   Share Playlist: 'Поділитися списком відтворення'
@@ -1018,8 +835,7 @@ Comments:
   Hearted: З сердечком
   View {replyCount} replies: Переглянути {replyCount} відповідей
   Subscribed: Слідкують
-  There are no comments available for this post: Коментарі для цього поста відсутні
-Up Next: 'Далі'
+Up Next: 'Далі вгору'
 
 #Tooltips
 Tooltips:
@@ -1039,9 +855,6 @@ Tooltips:
     External Link Handling: "Визначте типову поведінку, коли натиснено на посилання,
       яке не можна відкрити у FreeTube.\nТипово FreeTube відкриває натиснуте посилання
       у вашому типовому переглядачі.\n"
-    Open Deep Links In New Window: URL-адреси, передані в FreeTube, наприклад через
-      розширення для браузера або аргументи командного рядка, відкриваються в новому
-      вікні.
   Player Settings:
     Proxy Videos Through Invidious: 'Під’єднається до Invidious, щоб дивитися відео,
       а не встановлювати пряме з’єднання з YouTube.'
@@ -1058,17 +871,17 @@ Tooltips:
     Skip by Scrolling Over Video Player: Використовувати колесо прокрутки для прокручування
       відео в стилі MPV.
   Subscription Settings:
-    Fetch Feeds from RSS: 'При увімкненні FreeTube буде використовувати RSS замість
-      стандартного методу для отримання підписок. RSS є швидшим і запобігає блокуванню
-      IP-адрес, але не надає певної інформації, такої як тривалість відео, статус
-      в прямому ефірі або пости в спільноті'
+    Fetch Feeds from RSS: 'Якщо ввімкнено, FreeTube використовуватиме RSS замість
+      стандартного способу захоплення каналу підписки. RSS швидше і запобігає блокуванню
+      ІР, але не надає дані, як-от тривалість відео або стан трансляції'
 
 # Toast Messages
     Fetch Automatically: Якщо увімкнено, FreeTube автоматично отримуватиме вашу стрічку
       підписок під час відкриття нового вікна та за перемикання профілю.
   External Player Settings:
-    Custom External Player Arguments: Будь-які користувацькі аргументи командного
-      рядка, які ви хочете передати зовнішньому плеєру.
+    Custom External Player Arguments: Будь-які нетипові аргументи командного рядка
+      розділяються (';') крапкою з комою, ви бажаєте, щоб вас було перенаправлено
+      до зовнішнього програвача.
     Ignore Warnings: Заборонити попередження, якщо поточний зовнішній програвач не
       підтримує поточну дію (наприклад, зворотна почерговість відтворення добірок
       тощо).
@@ -1079,25 +892,17 @@ Tooltips:
       відео (список відтворення, якщо підтримується) у зовнішньому програвачі, на
       мініатюрі. Увага, налаштування Invidious не застосовуються до сторонніх програвачів.
     DefaultCustomArgumentsTemplate: "(Типово: '{defaultCustomArguments}')"
-    Ignore Default Arguments: Не надсилати жодних стандартних аргументів зовнішньому
-      плеєру, окрім URL-адреси відео (наприклад, швидкість відтворення, URL-адреса
-      добірки тощо). Користувацькі аргументи все одно будуть передаватися.
   Experimental Settings:
     Replace HTTP Cache: Вимикає дисковий HTTP-кеш Electron і вмикає власний кеш зображень
       у пам'яті. Призведе до збільшення використання оперативної пам'яті.
   Distraction Free Settings:
-    Hide Channels: Введіть ID, щоб сховати всі відео, добірки та сам канал від появи
-      в пошуку, тренді, найпопулярніших і рекомендованих. Введений ID каналу повинен
-      повністю збігатися і чутливий до регістру.
+    Hide Channels: Введіть ID, щоб сховати всі відео, списки відтворення та сам канал
+      від появи в пошуку, тренді, найпопулярніших і рекомендованих. Введений ID каналу
+      повинен повністю збігатися і чутливий до регістру.
     Hide Subscriptions Live: Цей параметр перевизначається загальнодоступним налаштуванням
       "{appWideSetting}" у розділі "{subsection}" "{settingsSection}"
-    Hide Videos and Playlists Containing Text: Введіть слово, фрагмент слова або фразу
-      (незалежно від регістру), щоб приховати всі відео та добірки, у заголовках яких
-      вона міститься, по всьому FreeTube, за винятком Історії, Ваших Добірок і відео
-      в межах добірок.
   SponsorBlock Settings:
     UseDeArrowTitles: Замінити назви відео на надіслані користувачем назви з DeArrow.
-    UseDeArrowThumbnails: Замінити ескізи відео на ескізи з DeArrow.
 Local API Error (Click to copy): 'Помилка локального API (натисніть, щоб скопіювати)'
 Invidious API Error (Click to copy): 'Помилка Invidious API (натисніть, щоб скопіювати)'
 Falling back to Invidious API: 'Повернення до API Invidious'
@@ -1105,6 +910,7 @@ Falling back to Local API: 'Повернення до локального API'
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'Це
   відео недоступне через відсутність форматів. Це може статися через недоступність
   країни.'
+Subscriptions have not yet been implemented: 'Підписки ще не впроваджено'
 Loop is now disabled: 'Цикл вимкнено'
 Loop is now enabled: 'Цикл увімкнено'
 Shuffle is now disabled: 'Випадковий порядок вимкнено'
@@ -1123,6 +929,8 @@ Playing Next Video Interval: Відтворення наступного від
   Клацніть, щоб скасувати. | Відтворення наступного відео через {nextVideoInterval}
   секунд. Клацніть, щоб скасувати.
 More: Докладніше
+Hashtags have not yet been implemented, try again later: Хештеги ще не впроваджені,
+  спробуйте пізніше
 Unknown YouTube url type, cannot be opened in app: Невідомий тип URL-адреси YouTube,
   його не можна відкрити в застосункові
 Open New Window: Відкрити нове вікно
@@ -1149,7 +957,9 @@ Channels:
   Unsubscribe Prompt: Ви впевнені, що хочете відписатися від «{channelName}»?
   Channels: Канали
   Title: Список каналів
+  Unsubscribe: Відписатися
   Search bar placeholder: Пошук каналів
+  Unsubscribed: '{channelName} вилучено з ваших підписок'
 Clipboard:
   Copy failed: Не вдалося скопіювати до буфера обміну
   Cannot access clipboard without a secure connection: Неможливо отримати доступ до
@@ -1160,7 +970,6 @@ Chapters:
     поточний розділ: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Список розділів схований,
     поточний розділ: {chapterName}'
-  Key Moments: Ключові моменти
 Preferences: Налаштування
 Ok: Гаразд
 Hashtag:
@@ -1174,47 +983,3 @@ Channel Hidden: '{channel} додано до фільтра каналу'
 Go to page: Перейти до {page}
 Channel Unhidden: '{channel} вилучено з фільтра каналу'
 Close Banner: Закрити банер
-Search character limit: Запит перевищує ліміт у {searchCharacterLimit} символів
-Feed:
-  Refresh Feed: Оновити {subscriptionName}
-  Feed Last Updated: 'Останнє оновлення фіда {feedName}: {date}'
-Search Listing:
-  Label:
-    4K: 4K
-    Subtitles: Субтитри
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Новинка
-    3D: 3D
-    Closed Captions: Закриті субтитри
-Right-click or hold to see history: ПКМ або утримуйте для перегляду історії
-Display Label: '{label}: {value}'
-Tag already exists: Тег "{tagName}" вже існує
-'Blocked opening potentially unsafe URL': 'Блоковано відкриття потенційно небезпечної
-  URL-адреси: "{url}".'
-shortcutJoinOperator: +
-Keys:
-  arrowright: Стрілка вправо
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Стрілка вниз
-  arrowleft: Стрілка вліво
-  arrowup: Стрілка вгору
-checkmark: ✓
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-Age Restricted:
-  This channel is age restricted: Цей канал має вікові обмеження
-  This video is age restricted: Це відео має вікові обмеження
-Trimmed input must be at least N characters long: Обрізаний ввід повинен бути хоча
-  б 1 символ довжиною | Обрізаний ввід повинен бути хоча б {length} символів довжиною
-Moments Ago: щойно
-Yes, Restart: Так, перезапустити
-Yes, Open Link: Так, відкрити посилання
-Yes, Delete: Так, видалити
-Cancel: Скасувати
-Autoplay Interruption Timer: Автозапуск скасовано через {autoplayInterruptionIntervalHours}
-  годин бездіяльності
-Description:
-  Expand Description: '...докладніше'
-  Collapse Description: Показати менше
diff --git a/static/locales/ur.yaml b/static/locales/ur.yaml
index 39e486cc376b4..18a7637daa28d 100644
--- a/static/locales/ur.yaml
+++ b/static/locales/ur.yaml
@@ -2,92 +2,97 @@
 Locale Name: 'اردو'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  ایپ کا یہ حصہ ابھی تک تیار نہیں ہے۔ جب پیش رفت ہو جائے تو بعد میں واپس آئیں۔
+  'ایپ کا یہ حصہ ابھی تک تیار نہیں ہے۔ جب پیش رفت ہو جائے تو بعد میں واپس آئیں۔'
 
 # Webkit Menu Bar
 File: 'فائل'
-New Window: 'نئی ونڈو'
-Quit: 'چھوڑیں'
+New Window: 'نئی کھڑکی'
+Quit: 'چھوڑو'
 Edit: 'ترمیم'
 Undo: 'کالعدم'
-Redo: 'دوبارہ کریں'
+Redo: 'دوبارہ کریں۔'
 Cut: 'کاٹنا'
 Copy: 'کاپی'
-Paste: 'چسپاں کریں'
-Delete: 'حذف کریں'
+Paste: 'چسپاں کریں۔'
+Delete: 'حذف کریں۔'
 Select all: 'تمام منتخب کریں'
-Reload: 'دوبارہ لوڈ کریں'
-Force Reload: 'زبردستی دوبارہ لوڈ کریں'
-Toggle Developer Tools: 'ڈویلپر ٹولز کو ٹوگل کریں'
+Reload: 'دوبارہ لوڈ کریں۔'
+Force Reload: 'زبردستی دوبارہ لوڈ کریں۔'
+Toggle Developer Tools: 'ڈویلپر ٹولز کو ٹوگل کریں۔'
 Actual size: 'اصل سائز'
-Zoom in: 'زوم ان'
-Zoom out: 'زوم آؤٹ'
-Toggle fullscreen: 'پوری اسکرین کو ٹوگل کریں'
-Window: 'ونڈو'
+Zoom in: 'زوم ان کریں۔'
+Zoom out: 'دور کرنا'
+Toggle fullscreen: 'پوری اسکرین کو ٹوگل کریں۔'
+Window: 'کھڑکی'
 Minimize: 'کم سے کم کرنا'
 Close: 'بند کریں'
 Back: 'پیچھے'
 Forward: 'آگے'
-Open New Window: 'نئی ونڈو کھولیں'
+Open New Window: 'نئی ونڈو کھولیں۔'
 
-Download From Site: 'سائٹ سے ڈاؤن لوڈ کریں'
+Download From Site: 'سائٹ سے ڈاؤن لوڈ کریں۔'
 A new blog is now available, {blogTitle}. Click to view more: 'ایک نیا بلاگ اب دستیاب
-  ہے، {blogTitle}۔ مزید دیکھنے کے لیے کلک کریں'
-Are you sure you want to open this link?: 'کیا واقعی آپ اس لنک کو کھولنا چاہتے ہیں؟'
+  ہے، {blogTitle}. مزید دیکھنے کے لیے کلک کریں۔'
+Are you sure you want to open this link?: 'کیا آپ واقعی اس لنک کو کھولنا چاہتے ہیں؟'
 
 # Search Bar
-Search / Go to URL: 'تلاش کریں / یو آر ایل پر جائیں'
+Search / Go to URL: 'تلاش کریں / یو آر ایل پر جائیں۔'
 Search Bar:
-  Clear Input: 'ان پٹ صاف کریں'
+  Clear Input: 'ان پٹ صاف کریں۔'
   # In Filter Button
 Search Filters:
-  Search Filters: 'فلٹرز تلاش کریں'
-  There are no more results for this search: 'اس تلاش کے مزید نتائج نہیں ہیں'
+  Search Filters: 'فلٹرز تلاش کریں۔'
+  There are no more results for this search: 'اس تلاش کے مزید نتائج نہیں ہیں۔'
 # Sidebar
 Subscriptions:
     # On Subscriptions Page
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 'یہ
-    پروفائل میں سبسکرپشنز کی ایک بڑی تعداد ہے۔ . .شرح کو محدود کرنے سے بچنے کے لیے
-    آر ایس ایس کو مجبور کر رہے ہیں'
+    پروفائل میں سبسکرپشنز کی ایک بڑی تعداد ہے۔ شرح کو محدود کرنے سے بچنے کے لیے آر
+    ایس ایس کو مجبور کرنا'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'آپ
-    کی سبسکرپشن کی فہرست فی الحال خالی ہے۔ اگر آپ اپنی سبسکرپشنز امپورٹ کرنا چاہتے
-    ہیں تو آپ ڈیٹا سیٹنگز میں جا کر امپورٹ سبسکرپشنز کو منتخب کر سکتے ہیں یا آپ کوئی
-    چینل تلاش کر کے سبسکرائب کر سکتے ہیں۔'
+    کا رکنیت کی فہرست فی الحال خالی ہے۔ انہیں یہاں دیکھنے کے لیے سبسکرپشنز شامل کرنا
+    شروع کریں۔'
   'Getting Subscriptions. Please wait.': 'سبسکرپشنز حاصل کرنا۔ برائے مہربانی انتظار
     کریں.'
   Refresh Subscriptions: 'سبسکرپشنز کو ریفریش کریں۔'
-  Load More Videos: 'مزید ویڈیوز لوڈ کریں'
+  Load More Videos: 'مزید ویڈیوز لوڈ کریں۔'
 More: 'مزید'
 Channels:
   Channels: 'چینلز'
   Title: 'چینل کی فہرست'
-  Search bar placeholder: 'چینلز تلاش کریں'
+  Search bar placeholder: 'چینلز تلاش کریں۔'
   Count: '{number}چینل ملا۔'
   Empty: 'آپ کے چینل کی فہرست فی الحال خالی ہے۔'
+  Unsubscribe: 'ان سبسکرائب کریں۔'
+  Unsubscribed: '{channelName} کو آپ کی سبسکرپشنز سے ہٹا دیا گیا ہے۔'
 User Playlists:
+  Playlist Message: یہ صفحہ مکمل طور پر کام کرنے والی پلے لسٹس کا عکاس نہیں ہے۔ یہ
+    صرف ان ویڈیوز کی فہرست بناتا ہے جنہیں آپ نے محفوظ کیا ہے یا پسند کیا ہے۔ جب کام
+    ختم ہو جائے تو سب فی الحال یہاں موجود ویڈیوز کو 'پسندیدہ' پلے لسٹ میں منتقل کر
+    دیا جائے گا۔
   Empty Search Message: 'اس پلے لسٹ میں کوئی ایسی ویڈیوز نہیں ہیں جو آپ کی تلاش سے
-    مماثل ہوں'
-  Search bar placeholder: 'پلے لسٹ کی تلاش'
+    مماثل ہوں۔'
+  Search bar placeholder: 'پلے لسٹ میں تلاش کریں۔'
 History:
   # On History Page
   History: 'تاریخ'
   Watch History: 'تاریخ دیکھیں'
   Your history list is currently empty.: 'آپ کی تاریخ کی فہرست فی الحال خالی ہے۔'
   Empty Search Message: 'آپ کی سرگزشت میں کوئی ایسی ویڈیوز نہیں ہیں جو آپ کی تلاش
-    سے مماثل ہوں'
-  Search bar placeholder: "سرگزشت میں تلاش کریں"
+    سے مماثل ہوں۔'
+  Search bar placeholder: "تاریخ میں تلاش کریں۔"
 Settings:
   # On Settings Page
   The app needs to restart for changes to take effect. Restart and apply change?: 'دی
     تبدیلیاں اثر انداز ہونے کے لیے ایپ کو دوبارہ شروع کرنے کی ضرورت ہے۔ دوبارہ شروع
     کریں اور تبدیلی کا اطلاق کریں؟'
   General Settings:
-    General Settings: 'عام'
+    General Settings: 'عام ترتیبات'
     Check for Updates: 'اپ ڈیٹ کے لیے چیک کریں'
-    Check for Latest Blog Posts: 'تازہ ترین بلاگ پوسٹس چیک کریں'
+    Check for Latest Blog Posts: 'تازہ ترین بلاگ پوسٹس چیک کریں۔'
     Fallback to Non-Preferred Backend on Failure: 'غیر ترجیحی بیک اینڈ پر فال بیک
       ناکامی پر'
-    Enable Search Suggestions: 'تلاش کی تجاویز کو فعال کریں'
+    Enable Search Suggestions: 'تلاش کی تجاویز کو فعال کریں۔'
     Default Landing Page: 'ڈیفالٹ لینڈنگ پیج'
   Theme Settings: {}
   Player Settings:
@@ -102,36 +107,36 @@ Settings:
     Profile object has insufficient data, skipping item: 'پروفائل آبجیکٹ ناکافی ہے۔
       ڈیٹا، آئٹم کو چھوڑنا'
     All subscriptions and profiles have been successfully imported: 'تمام سبسکرپشنز
-      اور پروفائلز کو کامیابی کے ساتھ درآمد کیا گیا ہے'
-    All subscriptions have been successfully imported: 'تمام سبسکرپشنز کو کامیابی
-      کے ساتھ درآمد کر لیا گیا'
+      اور پروفائلز کو کامیابی کے ساتھ درآمد کیا گیا ہے۔'
+    All subscriptions have been successfully imported: 'تمام سبسکرپشنز ہو چکی ہیں۔
+      کامیابی سے درآمد کیا گیا۔'
     Subscriptions have been successfully exported: 'سبسکرپشنز کامیابی سے ہو گئی ہیں۔
       برآمد'
     History object has insufficient data, skipping item: 'تاریخ کا اعتراض ناکافی ہے۔
       ڈیٹا، آئٹم کو چھوڑنا'
-    All watched history has been successfully imported: 'تمام دیکھی گئی سرگزشت کامیابی
-      سے درآمد کیا گیا'
+    All watched history has been successfully imported: 'تمام دیکھی گئی تاریخ رہی
+      ہے۔ کامیابی سے درآمد کیا گیا۔'
     All watched history has been successfully exported: 'تمام دیکھی گئی تاریخ رہی
       ہے۔ کامیابی سے برآمد'
     Playlist insufficient data: '"{playlist}" پلے لسٹ کے لیے ناکافی ڈیٹا، آئٹم کو
       چھوڑنا'
-    All playlists has been successfully imported: 'تمام پلے لسٹ کامیابی سے درآمد کی
-      گئی'
+    All playlists has been successfully imported: 'تمام پلے لسٹ ہو چکی ہیں۔ کامیابی
+      سے درآمد کیا گیا۔'
     All playlists has been successfully exported: 'تمام پلے لسٹ ہو چکی ہیں۔ کامیابی
       سے برآمد'
   SponsorBlock Settings: {}
 About:
   #On About page
   Please check for duplicates before posting: 'براہ کرم پوسٹ کرنے سے پہلے ڈپلیکیٹس
-    کی جانچ کریں'
+    کی جانچ کریں۔'
 Profile:
   Are you sure you want to delete this profile?: 'کیا آپ واقعی اسے حذف کرنا چاہتے
     ہیں۔ پروفائل؟'
   All subscriptions will also be deleted.: 'تمام سبسکرپشنز بھی حذف کر دی جائیں گی۔'
   Profile could not be found: 'پروفائل نہیں مل سکا'
   Your profile name cannot be empty: 'آپ کا پروفائل نام خالی نہیں ہو سکتا'
-  Profile has been created: 'پروفائل بن گیا ہے'
-  Profile has been updated: 'پروفائل اپ ڈیٹ کر دیا گیا'
+  Profile has been created: 'پروفائل بن گیا ہے۔'
+  Profile has been updated: 'پروفائل کو اپ ڈیٹ کر دیا گیا ہے۔'
   ? This is your primary profile.  Are you sure you want to delete the selected channels?  The
     same channels will be deleted in any profile they are found in.
   : 'یہ آپ کا بنیادی پروفائل ہے۔ کیا آپ واقعی منتخب چینلز کو حذف کرنا چاہتے ہیں؟ دی
@@ -153,13 +158,14 @@ Tooltips:
       کی کوشش کرے گا۔ فعال ہونے پر طریقہ۔'
     Thumbnail Preference: 'FreeTube کے تمام تھمب نیلز کو اس سے بدل دیا جائے گا۔ پہلے
       سے طے شدہ تھمب نیل کے بجائے ویڈیو کا ایک فریم۔'
-    Invidious Instance: 'Invidious Instance جس سے فری ٹیوب API کالز کے لیے جڑے گا۔'
+    Invidious Instance: 'Invidious مثال جس سے FreeTube API کے لیے جڑے گا۔ کالز'
     External Link Handling: |
       'جب کوئی لنک، جسے FreeTube میں نہیں کھولا جا سکتا، پر کلک کیا جاتا ہے تو پہلے سے طے شدہ طرز عمل کا انتخاب کریں۔
        بطور ڈیفالٹ FreeTube آپ کے ڈیفالٹ براؤزر میں کلک کردہ لنک کو کھول دے گا۔'
   Player Settings:
-    Proxy Videos Through Invidious: 'یوٹیوب سے براہ راست کنکشن بنانے کے بجائے ویڈیوز
-      پیش کرنے کے لیے Invidious سے جڑے گا۔'
+    Proxy Videos Through Invidious: 'اس کی بجائے ویڈیوز پیش کرنے کے لیے Invidious
+      سے منسلک ہوں گے۔ یوٹیوب سے براہ راست کنکشن بنانے کا۔ API کی ترجیح کو اوور رائیڈ
+      کرتا ہے۔'
     Default Video Format: 'ویڈیو چلتے وقت استعمال ہونے والے فارمیٹس کو سیٹ کریں۔ DASH
       فارمیٹس کر سکتے ہیں۔ اعلی خصوصیات کو کھیلیں. لیگیسی فارمیٹس زیادہ سے زیادہ 720p
       تک محدود ہیں لیکن کم استعمال کرتے ہیں۔ بینڈوڈتھ. آڈیو فارمیٹس صرف آڈیو سلسلے
@@ -183,54 +189,39 @@ Tooltips:
       (';') سے الگ کیے گئے ہیں، آپ بیرونی کھلاڑی کو منتقل کرنا چاہتے ہیں۔
     DefaultCustomArgumentsTemplate: '(پہلے سے طے شدہ: ''{defaultCustomArguments}'')'
   Subscription Settings:
-    Fetch Feeds from RSS: 'فعال ہونے پر، FreeTube آپ کے سبسکرپشن فیڈ کو حاصل کرنے
-      کے لیے اپنے پہلے سے طے شدہ طریقہ کے بجائے RSS کا استعمال کرے گا۔ RSS تیز ہے
-      اور آئی پی کو بلاک کرنے سے روکتا ہے، لیکن کچھ معلومات فراہم نہیں کرتا ہے جیسے
-      ویڈیو کا دورانیہ، لائیو اسٹیٹس یا کمیونٹی پوسٹس'
+    Fetch Feeds from RSS: 'فعال ہونے پر، FreeTube اپنے ڈیفالٹ کے بجائے RSS کا استعمال
+      کرے گا۔ آپ کی سبسکرپشن فیڈ حاصل کرنے کا طریقہ۔ آر ایس ایس تیز ہے اور آئی پی
+      کو بلاک کرنے سے روکتا ہے، لیکن کچھ معلومات فراہم نہیں کرتا ہے جیسے ویڈیو کا
+      دورانیہ یا لائیو اسٹیٹس'
 
 # Toast Messages
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 'یہ
-  ویڈیو غائب فارمیٹس کی وجہ سے دستیاب نہیں ہے۔ یہ ملک کی عدم دستیابی کی وجہ سے ہوسکتا
+  ویڈیو غائب فارمیٹس کی وجہ سے دستیاب نہیں ہے۔ یہ ملک کی وجہ سے ہوسکتا ہے۔ غیر دستیابی'
+Subscriptions have not yet been implemented: 'سبسکرپشنز کو ابھی تک نافذ نہیں کیا گیا
   ہے۔'
 Unknown YouTube url type, cannot be opened in app: 'نامعلوم YouTube url قسم، ایپ میں
   نہیں کھولی جا سکتی'
-Loop is now disabled: 'بار بار چلانا اب غیر فعال ہے'
-Loop is now enabled: 'بار بار چلانا اب فعال ہے'
-Shuffle is now disabled: 'شفل اب غیر فعال ہے'
-Shuffle is now enabled: 'شفل اب فعال ہے'
-The playlist has been reversed: 'پلے لسٹ کو الٹ دیا گیا ہے'
-Playing Next Video: 'اگلا ویڈیو چل رہا ہے'
-Playing Previous Video: 'پچھلا ویڈیو چل رہا ہے'
+Hashtags have not yet been implemented, try again later: 'ہیش ٹیگز ابھی لاگو نہیں
+  ہوئے، بعد میں دوبارہ کوشش کریں۔'
+Loop is now disabled: 'لوپ اب غیر فعال ہے۔'
+Loop is now enabled: 'لوپ اب فعال ہے۔'
+Shuffle is now disabled: 'شفل اب غیر فعال ہے۔'
+Shuffle is now enabled: 'شفل اب فعال ہے۔'
+The playlist has been reversed: 'پلے لسٹ کو الٹ دیا گیا ہے۔'
+Playing Next Video: 'اگلا ویڈیو چل رہا ہے۔'
+Playing Previous Video: 'پچھلا ویڈیو چل رہا ہے۔'
 Playing Next Video Interval: 'اگلی ویڈیو بغیر کسی وقت چلائی جا رہی ہے۔ منسوخ کرنے
   کے لیے کلک کریں۔ | اگلی ویڈیو {nextVideoInterval} سیکنڈ میں چلائی جا رہی ہے۔ منسوخ
   کرنے کے لیے کلک کریں۔ | اگلی ویڈیو {nextVideoInterval} سیکنڈ میں چلائی جا رہی ہے۔
   منسوخ کرنے کے لیے کلک کریں۔'
-Canceled next video autoplay: 'اگلا ویڈیو آٹو پلے منسوخ کر دی گئی'
-Default Invidious instance has been cleared: 'طے شدہ Invidious instance کو صاف کر
-  دیا گیا ہے'
+Canceled next video autoplay: 'اگلی ویڈیو آٹو پلے منسوخ کر دی گئی۔'
+Default Invidious instance has been cleared: 'ڈیفالٹ Invidious مثال کو صاف کر دیا
+  گیا ہے۔'
 'The playlist has ended. Enable loop to continue playing': 'پلے لسٹ ختم ہو گئی ہے۔
   فعال کھیل جاری رکھنے کے لیے لوپ'
 External link opening has been disabled in the general settings: 'عام ترتیبات میں
-  بیرونی لنک کھولنے کو غیر فعال کر دیا گیا ہے'
-Downloading has completed: '"{videoTitle}" نے ڈاؤن لوڈ مکمل کر لیا ہے'
+  بیرونی لنک کھولنے کو غیر فعال کر دیا گیا ہے۔'
+Downloading has completed: '"{videoTitle}" نے ڈاؤن لوڈ مکمل کر لیا ہے۔'
 Starting download: '"{videoTitle}" کا ڈاؤن لوڈ شروع ہو رہا ہے'
 Downloading failed: '"{videoTitle}" کو ڈاؤن لوڈ کرنے میں ایک مسئلہ تھا'
 Screenshot Error: 'اسکرین شاٹ ناکام ہو گیا۔ {error}'
-Version {versionNumber} is now available!  Click for more details: ورژن {versionNumber}
-  اب دستیاب ہے! . . مزید تفصیلات کے لیے کلک کریں
-Global:
-  Counts:
-    Video Count: 1 ویڈیو | {count} ویڈیوز
-    Channel Count: 1 چینل | {count} چینلز
-    Subscriber Count: 1 سبسکرائبر | {count} سبسکرائبرس
-    Watching Count: 1 دیکھ رہا ہے | {count} دیکھ رہے ہیں
-    View Count: 1 نظر | {count} نظریں
-    Like Count: 1 لائک | {count} لائکس
-    Comment Count: 1 تبصرہ | {count} تبصرے
-  Videos: ویڈیوز
-  Shorts: شورٹس
-  Live: لاؤو
-  Community: کمیونٹی
-Close Banner: بینر بندکریں
-Preferences: ترجیحات
-Go to page: '{page} میں جائیں'
diff --git a/static/locales/vi.yaml b/static/locales/vi.yaml
index 249e059ee78bb..1fcc3b0bd8059 100644
--- a/static/locales/vi.yaml
+++ b/static/locales/vi.yaml
@@ -42,8 +42,6 @@ Global:
     Channel Count: 1 kênh | {count} kênh
     Video Count: 1 video | {count} video
     Watching Count: 1 lượt xem | {count} lượt xem
-    Like Count: '{count} lượt thích'
-    Comment Count: '{count} bình luận'
   Input Tags:
     Length Requirement: 1 đang xem | {number} đang xem
 Search / Go to URL: 'Tìm kiếm / Đi đến URL'
@@ -83,26 +81,12 @@ Search Filters:
   Fetch more results: 'Lấy thêm kết quả'
 # Sidebar
   There are no more results for this search: Không còn kết quả nào cho tìm kiếm này
-  Features:
-    Features: Chức năng
-    Subtitles: Có phụ đề
-    3D: 3D
-    Creative Commons: Creative Commons
-    Location: Địa điểm
-    HD: HD
-    Live: Trực tiếp
-    4K: 4K
-    360 Video: Video 360 độ
-    HDR: HDR
-    VR180: VR180
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'Đăng ký'
   Latest Subscriptions: 'Đăng ký mới nhất'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'Danh
-    sách Đăng ký đang trống. Bắt đầu bằng cách tìm kiếm và đăng ký các kênh hoặc nhập
-    các đăng ký hiện có của bạn bằng cách đi đến Cài đặt dữ liệu và nhấn vào Nhập
-    đăng ký.'
+    sách Đăng ký đang trống. Bắt đầu thêm đăng ký để xem chúng tại đây.'
   'Getting Subscriptions.  Please wait.': 'Đang lấy Đăng ký. Vui lòng đợi.'
   'Getting Subscriptions. Please wait.': Đang lấy Đăng ký. Vui lòng chờ.
   Load More Videos: Tải thêm video
@@ -129,9 +113,14 @@ Most Popular: 'Phổ biến nhất'
 Playlists: 'Danh sách phát'
 User Playlists:
   Your Playlists: 'Danh sách phát của bạn'
-  Search bar placeholder: Tìm kiếm danh sách phát
-  Empty Search Message: Không có video nào trong danh sách phát này trùng với những
-    gì bạn đang tìm
+  Search bar placeholder: Tìm kiếm trong danh sách phát
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Video
+    đã lưu của bạn trống rỗng. Nhấp vào nút lưu ở góc video để được liệt kê tại đây
+  Empty Search Message: Không có video nào trong danh sách này trùng với những gì
+    bạn đang tìm
+  Playlist Message: Trang này không liệt kê tất cả danh sách video bạn đã theo giỏi.
+    Nó chỉ hiển thị các video mà bạn đã lưu hoặc thêm vào mục yêu thích. Khi xong
+    việc, tất cả các video trên trang này sẽ được chuyển vào danh sách 'yêu thích'.
   Remove from Playlist: Xóa khỏi danh sách phát
   Playlist Name: Tên danh sách phát
   Save Changes: Lưu thay đổi
@@ -153,6 +142,7 @@ User Playlists:
         cập nhập danh sách phát.
       Reverted to use {oldPlaylistName} for quick bookmark: Đã quay lại dùng {oldPlaylistName}
         cho dấu trang nhanh
+      Quick bookmark disabled: Đã tắt dấu trang nhanh
       Some videos in the playlist are not loaded yet. Click here to copy anyway.: Một
         số video trong danh sách phát này chưa được tải, bạn vẫn có thể nhấn vào đây
         để sao chép.
@@ -176,21 +166,13 @@ User Playlists:
       "{videoCount} video(s) have been removed": 1 video đã được xóa | {videoCount}
         video đã được xóa
       There were no videos to remove.: Không có video nào để xóa.
-      This playlist is already being used for quick bookmark.: Danh sách phát này
-        đã được dùng cho dấu trang nhanh rồi.
-      Playlist {playlistName} is the new quick bookmark playlist.: '{playlistName}
-        giờ đã là danh sách phát cho dấu trang nhanh.'
-      This playlist has a video with a duration error: Danh sách phát này có chứa
-        một video trở lên không có thông tin thời lượng và sẽ được coi như thời lượng
-        bằng không.
-    Search for Videos: Tìm kiếm video
   You have no playlists. Click on the create new playlist button to create a new one.: Bạn
     đang không có danh sách phát nào. Nhấn vào nút tạo danh sách phát mới để tạo một
     cái mới.
   This playlist currently has no videos.: Danh sách phát này hiện không có video nào.
   Edit Playlist Info: Chỉnh sửa thông tin danh sách phát
   Are you sure you want to delete this playlist? This cannot be undone: Bạn có chắc
-    muốn xóa danh sách phát này? Việc này sẽ không thể được hoàn tác.
+    muốn xóa danh sách phát này?Việc này không thể hoàn tác.
   CreatePlaylistPrompt:
     Create: Tạo mới
     Toast:
@@ -214,12 +196,6 @@ User Playlists:
       "{videoCount} video(s) added to 1 playlist": Đã thêm 1 video vào 1 danh sách
         phát | Đã thêm {videoCount} vào 1 danh sách phát
     Save: Lưu
-    "{videoCount}/{totalVideoCount} Videos Already Added": '{videoCount}/{totalVideoCount}
-      đã có trong danh sách phát'
-    Added {count} Times: Đã được thêm | Đã được thêm {count} lần
-    "{videoCount}/{totalVideoCount} Videos Will Be Added": '{videoCount}/{totalVideoCount}
-      video sẽ được thêm'
-    Allow Adding Duplicate Video(s): Cho phép thêm video trùng lặp
   Create New Playlist: Tạo danh sách phat mới
   Playlist Description: Mô tả danh sách phát
   Copy Playlist: Sao chép danh sách phát
@@ -231,20 +207,11 @@ User Playlists:
   Remove from Favorites: Xóa khỏi {playlistName}
   Move Video Down: Chuyển video xuống
   Move Video Up: Chuyển video lên
+  Disable Quick Bookmark: Tắt dấu trang nhanh
   Delete Playlist: Xóa danh sách phát
-  Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: Bạn
-    có chắc muốn loại bỏ {playlistItemCount} video trùng lặp khỏi danh sách phát này
-    không? Việc này sẽ không thể được hoàn tác.
-  Cannot delete the quick bookmark target playlist.: Không thể xóa danh sách phát
-    vì nó được dùng cho dấu trang nhanh.
-  Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: Bạn
-    có chắc muốn loại bỏ {playlistItemCount} video đã xem khỏi danh sách phát này
-    không? Việc này sẽ không thể được hoàn tác.
-  Quick Bookmark Enabled: Dấu trang nhanh đã bật
-  Remove Duplicate Videos: Loại bỏ các video trùng lặp
-  Playlists with Matching Videos: Bao gồm video trong danh sách phát
-  Export Playlist: Xuất danh sách phát này
-  The playlist has been successfully exported: Đã xuất thành công danh sách phát này
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: Bạn
+    có chắc muốn xóa tất cả các video đã xem khỏi danh sách phát này? Việc này không
+    thể được hoàn tác.
 History:
   # On History Page
   History: 'Lịch sử'
@@ -253,12 +220,11 @@ History:
   Search bar placeholder: Tìm trong lịch sử
   Empty Search Message: Không có video nào trong lịch sử của bạn trùng với những gì
     bạn đang tìm kiếm
-  Case Sensitive Search: Phân biệt hoa thường
 Settings:
   # On Settings Page
   Settings: 'Cài đặt'
   General Settings:
-    General Settings: 'Chung'
+    General Settings: 'Cài đặt chung'
     Fallback to Non-Preferred Backend on Failure: 'Trở về Backend không mong muốn
       khi có lỗi'
     Enable Search Suggestions: 'Bật gợi ý tìm kiếm'
@@ -280,6 +246,8 @@ Settings:
       End: 'Cuối'
       Blur: Làm mờ
       Hidden: Ẩn
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Phiên bản Invidious
+      (Mặc định là https://invidious.snopyta.org)'
     Region for Trending: 'Phổ biến theo quốc gia'
         #! List countries
     Check for Latest Blog Posts: Kiểm tra bài đăng mới nhất
@@ -299,13 +267,8 @@ Settings:
       External Link Handling: Xử lý liên kết bên ngoài
     View all Invidious instance information: Xem tất cả thông tin phiên bản Invidious
     System Default: Mặc định hệ thống
-    Auto Load Next Page:
-      Tooltip: Tự động tải các trang video và bình luận.
-      Label: Tự động nhấn tải thêm
-    Open Deep Links In New Window: Mở các URL được truyền đến FreeTube vào cửa sổ
-      mới
   Theme Settings:
-    Theme Settings: 'Chủ đề'
+    Theme Settings: 'Cài đặt chủ đề'
     Match Top Bar with Main Color: 'Khớp thanh trên cùng với màu chính'
     Base Theme:
       Base Theme: 'Chủ đề mặc định'
@@ -318,10 +281,6 @@ Settings:
       Nordic: Nordic
       Pastel Pink: Hồng phấn tiên
       Hot Pink: Hồng nóng bỏng
-      Solarized Dark: Solarized Tối
-      Solarized Light: Solarized Sáng
-      Gruvbox Dark: Gruvbox Tối
-      Gruvbox Light: Gruvbox Sáng
     Main Color Theme:
       Main Color Theme: 'Màu chủ đề chính'
       Red: 'Đỏ'
@@ -361,12 +320,6 @@ Settings:
       Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire màu xanh
       Catppuccin Mocha Lavender: Catppuccin Mocha Lavender Màu tím nhạt
       Catppuccin Mocha Blue: Catppuccin Mocha Blue Màu xanh
-      Solarized Yellow: Solarized Vàng
-      Solarized Orange: Solarized Cam
-      Solarized Red: Solarized Đỏ
-      Gruvbox Dark Yellow: Vàng Tối Cổ Điển
-      Gruvbox Dark Blue: Xanh Biển Tối
-      Gruvbox Dark Green: Xanh Rêu Đậm
     Secondary Color Theme: 'Màu chủ đề phụ'
         #* Main Color Theme
     UI Scale: Tỉ lệ UI
@@ -375,12 +328,13 @@ Settings:
     Hide Side Bar Labels: Ẩn nhãn thanh bên
     Hide FreeTube Header Logo: Ẩn logo FreeTube trên thanh trên
   Player Settings:
-    Player Settings: 'Trình phát'
+    Player Settings: 'Cài đặt trình phát'
+    Remember History: 'Nhớ lịch sử'
     Play Next Video: 'Phát video tiếp theo'
     Turn on Subtitles by Default: 'Bật phụ đề theo mặc định'
     Autoplay Videos: 'Tự phát video'
     Proxy Videos Through Invidious: 'Proxy video qua Invidious'
-    Autoplay Playlists: 'Tự phát video trong danh sách phát'
+    Autoplay Playlists: 'Danh sách tự động phát'
     Enable Theatre Mode by Default: 'Bật chế độ rạp hát theo mặc định'
     Default Volume: 'Âm lượng mặc định'
     Default Playback Rate: 'Tốc độ phát mặc định'
@@ -390,7 +344,7 @@ Settings:
       Legacy Formats: 'Định dạng Legacy'
       Audio Formats: 'Định dạng âm thanh'
     Default Quality:
-      Default Quality: 'Chất lượng mặc định'
+      Default Quality: 'Định dạng chất lượng'
       Auto: 'Tự động'
       144p: '144p'
       240p: '240p'
@@ -404,7 +358,7 @@ Settings:
     Scroll Playback Rate Over Video Player: Con lăn chuột điểu chỉnh tốc độ phát lại
     Scroll Volume Over Video Player: Con lăn chuột điểu chỉnh âm lượng
     Display Play Button In Video Player: Hiển thị nút phát trong trình phát video
-    Next Video Interval: Quãng nghỉ giữa các video tự động phát
+    Next Video Interval: Khoảng thời gian Video Tiếp theo
     Fast-Forward / Rewind Interval: Khoảng thời gian tua đi / tua lại
     Screenshot:
       Enable: Bật chức năng chụp màn hình
@@ -412,7 +366,7 @@ Settings:
       Quality Label: Chất lượng chụp màn hình
       File Name Label: Mẫu tên tệp
       Folder Label: Thư mục ảnh chụp màn hình
-      Ask Path: Yêu cầu thư mục lưu
+      Ask Path: Yêu cầu thứ mục lưu
       Folder Button: Chọn thư mục
       Error:
         Empty File Name: Tên tệp trống
@@ -427,14 +381,46 @@ Settings:
     Enter Fullscreen on Display Rotate: Bật toàn màn hình khi xoay
     Skip by Scrolling Over Video Player: Tua video bằng con lăn chuột
   Subscription Settings:
-    Subscription Settings: 'Đăng ký'
+    Subscription Settings: 'Cài đặt đăng ký'
     Hide Videos on Watch: 'Ẩn video khi đã xem'
+    Subscriptions Export Format:
+      Subscriptions Export Format: 'Xuất định dạng đăng ký'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: 'Quản lý đăng ký'
+    Import Subscriptions: 'Nhập đăng ký'
+    Export Subscriptions: 'Xuất đăng ký'
+    How do I import my subscriptions?: 'Làm sao để nhập đăng ký của tôi?'
     Fetch Feeds from RSS: Cập nhật bảng tin qua RSS
     Fetch Automatically: Tự động làm mới bảng tin
-    Confirm Before Unsubscribing: Nhắc xác nhận trước khi hủy đăng ký
-    'Limit the number of videos displayed for each channel': Giới hạn số video được
-      hiển thị cho mỗi kênh
-    To: Xuống
+    Only Show Latest Video for Each Channel: Chỉ hiện video mới nhất cho mỗi kênh
+  Advanced Settings:
+    Advanced Settings: 'Cài đặt nâng cao'
+    Enable Debug Mode (Prints data to the console): 'Bật chế độ Debug (Ghi data ra
+      console)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Địa chỉ Proxy (Ví dụ: SOCKS5://127.0.0.1:9050
+      )'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Nhấn
+      nút "TEST PROXY" sẽ gửi một yêu cầu đến https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Sử dụng Tor / Proxy cho API calls'
+    TEST PROXY: 'TEST PROXY'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: 'Xem Instances công cộng'
+    Clear History:
+      Clear History: 'Xóa lịch sử'
+      # On Click
+      Are you sure you want to delete your history?: 'Bạn có chắc xóa lịch sử không?'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: 'Dọn dẹp đăng ký'
+      # On Click
+      Are you sure you want to remove all subscriptions?: 'Bạn có chắc xóa tất cả
+        đăng ký không?'
+      #& Yes
+      #& No
+
   Data Settings:
     How do I import my subscriptions?: Làm sao để tôi nhập đăng ký?
     Unknown data key: Key dữ liệu không xác định
@@ -462,10 +448,14 @@ Settings:
     Export YouTube: Xuất YouTube
     Export FreeTube: Xuất FreeTube
     Export Subscriptions: Xuất đăng ký
+    Check for Legacy Subscriptions: Kiểm tra đăng ký cũ
+    Import NewPipe: Nhập NewPipe
+    Import YouTube: Nhập YouTube
+    Import FreeTube: Nhập FreeTube
     Import Subscriptions: Nhập đăng ký
     Select Export Type: Chọn kiểu xuất ra
     Select Import Type: Chọn kiểu nhập vào
-    Data Settings: Dữ liệu
+    Data Settings: Cài đặt dữ liệu
     Manage Subscriptions: Quản lý đăng ký
     Import Playlists: Nhập danh sách phát
     All playlists has been successfully imported: Tất cả các danh sách phát đã được
@@ -495,7 +485,7 @@ Settings:
     Hide Channel Subscribers: Ẩn số người đăng ký
     Hide Video Likes And Dislikes: Ẩn lượt thích và không thích
     Hide Video Views: Ẩn lượt xem
-    Distraction Free Settings: Giảm phân tâm
+    Distraction Free Settings: Cài đặt không phân tâm
     Hide Active Subscriptions: Ẩn đăng ký hiện hoạt
     Hide Playlists: Ẩn danh sách phát
     Hide Comments: Ẩn bình luận
@@ -513,7 +503,7 @@ Settings:
     Hide Channels Placeholder: ID kênh
     Hide Profile Pictures in Comments: Ẩn ảnh đại diện trong bình luận
     Hide Chapters: Ẩn các chương
-    Hide Channels: Ẩn video từ các kênh
+    Hide Channels: Ẩn các video khỏi kênh
     Hide Channel Releases: Ẩn nhạc của kênh
     Hide Videos and Playlists Containing Text: Ẩn các video và danh sách phát có chứa
     Hide Channels Invalid: ID kênh không hợp lệ
@@ -543,7 +533,7 @@ Settings:
     Clear Search Cache: Xóa cache tìm kiếm
     Save Watched Progress: Lưu quá trình xem
     Remember History: Nhớ lịch sử
-    Privacy Settings: Quyền riêng tư
+    Privacy Settings: Cài đặt quyền riêng tư
     Remove All Playlists: Xóa tất cả danh sách phát
     Are you sure you want to remove all your playlists?: Bạn có chắc muốn xóa tất
       cả các danh sách phát không?
@@ -557,7 +547,7 @@ Settings:
     Proxy Host: Máy chủ proxy
     Region: Vùng
     Country: Quốc gia
-    Proxy Settings: Proxy
+    Proxy Settings: Cài đặt proxy
     Enable Tor / Proxy: Bật Tor / Proxy
     Proxy Protocol: Giao thức proxy
     Proxy Port Number: Số cổng proxy
@@ -569,11 +559,6 @@ Settings:
     Clicking on Test Proxy will send a request to: Nhấn vào Thử proxy sẽ gửi yêu cầu
       đến
     Test Proxy: Thử proxy
-    Proxy Warning: FreeTube không bao gồm proxy theo mặc định nhưng có thể kết nối
-      đến một proxy bên ngoài, bao gồm các proxy chạy cục bộ như Tor hoặc các proxy
-      SOCKS5 được cung cấp bởi một số các VPN. Nếu bạn sử dụng tính năng này, hãy
-      đảm bảo proxy/Tor của bạn được cấu hình đúng cách, nếu không FreeTube sẽ không
-      thể tải dữ liệu về được.
   SponsorBlock Settings:
     Enable SponsorBlock: Bật SponsorBlock
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL API SponsorBlock
@@ -586,13 +571,13 @@ Settings:
       Do Nothing: Không làm gì
     Notify when sponsor segment is skipped: Thông báo khi đoạn quảng cáo bị bỏ qua
     Category Color: Bản màu
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: Cài đặt SponsorBlock
     'DeArrow Thumbnail Generator API Url (Default is https://dearrow-thumb.ajay.app)': URL
       API ảnh xem trước DeArrow (Mặc định là https://dearrow-thumb.ajay.app)
     UseDeArrowTitles: Dùng tiêu đề video từ DeArrow
     UseDeArrowThumbnails: Dùng ảnh xem trước từ DeArrow
   External Player Settings:
-    External Player Settings: Trình phát ngoại
+    External Player Settings: Cài đặt trình phát video bên ngoài
     External Player: Trình phát video bên ngoài
     Custom External Player Arguments: Tham số trình phát bên ngoài tùy chỉnh
     Ignore Unsupported Action Warnings: Bỏ qua các cảnh bảo tác vụ không được hổ trợ
@@ -602,7 +587,7 @@ Settings:
         Name: Trống
     Ignore Default Arguments: Bỏ qua tham số mặc định
   Parental Control Settings:
-    Parental Control Settings: Kiểm soát của phụ huynh
+    Parental Control Settings: Cài đặt kiểm soát của phụ huynh
     Hide Unsubscribe Button: Ẩn nút huỷ đăng ký
     Show Family Friendly Only: Chỉ hiển thị nội dung thân thiện với gia đình
     Hide Search Bar: Ẩn thanh tìm kiếm
@@ -612,7 +597,7 @@ Settings:
     Open in web browser: Mở trên trình duyệt
     Ask Download Path: Yêu cầu đường dẫn tải xuống
     Choose Path: Chọn đường dẫn
-    Download Settings: Tải xuống
+    Download Settings: Cài đặt tải xuống
   Password Dialog:
     Password: Mật khẩu
     Password Incorrect: Mật khẩu sai
@@ -620,27 +605,55 @@ Settings:
     Unlock: Mở khoá
   Password Settings:
     Set Password To Prevent Access: Đặt mặt khẩu để ngăn truy cập cài đặt
-    Password Settings: Mật khẩu
+    Password Settings: Cài đặt mật khẩu
     Remove Password: Xoá mật khẩu
     Set Password: Đặt mật khẩu
   Experimental Settings:
     Warning: Những cài đặt này đều đang trong quá trình thử nghiệm, bật các tùy chọn
       cài đặt này có thể gây ra hoạt động bất ổn định. Hãy tạo phương án dự phòng
       trước khi bật!
-    Experimental Settings: Thử nghiệm
+    Experimental Settings: Cài đặt thử nghiệm
     Replace HTTP Cache: Thay thế bộ đệm HTTP
-  Return to Settings Menu: Quay lại menu Cài đặt
-  Sort Settings Sections (A-Z): Sắp xếp các mục cài đặt (A-Z)
+  Expand All Settings Sections: Mở rộng tất cả các mục tùy chọn
 About:
   #On About page
   About: 'Giới thiệu'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'Phần
+    mềm copylefted này được miễn phí dưới cấp phép AGPL-3.0.'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    Tìm thấy bug (lỗi)? Muốn gợi ý một tính năng? Muốn chung tay giúp đỡ? Hãy xem
+    trang Github của chúng tôi. Pull Requests luôn cảm kích.
+
+  Thank you very much to the People and Projects that make FreeTube possible!: 'Cảm
+    ơn rất nhiều những Người và Dự án đã làm cho FreeTube khả thi!'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Muốn
+    chat? Hãy tham gia Server Element / Matrix của chúng tôi. Vui lòng xem nội quy
+    trước khi tham gia.'
+
+  'Looking for help? Check out our Wiki page.': 'Tìm kiếm sự giúp đỡ? Hãy xem trang
+    Wiki của chúng tôi.'
+
+  Check out our Firefox extension!: 'Hãy xem tiện ích Firefox của chúng tôi!'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'Nếu
+    bạn thích sử dụng FreeTube, hãy xem xét đến việc đóng góp thông qua Liberapay
+    hoặc qua địa chỉ Bitcoin của chúng tôi.'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: 'Tin tức mới nhất về FreeTube'
+
 #On Channel Page
   Mastodon: Mastodon
   Email: Email
   Source code: Mã nguồn
   FAQ: Câu hỏi thường gặp
   Report a problem: Báo cáo sự cố
+  Licensed under the AGPLv3: Được cấp phép theo AGPLv3
+  View License: Xem giấy phép
   Help: Trợ giúp
   Translate: Phiên dịch
   Website: Trang web
@@ -660,9 +673,9 @@ About:
   these people and projects: những người và dự án này
   Please read the: Hãy đọc
   Discussions: Thảo luận
-  Licensed under the: Được cấp phép theo
-  AGPLv3: giấy phép AGPLv3
 Channel:
+  Subscriber: 'Người đăng ký'
+  Subscribers: 'Người đăng ký'
   Subscribe: 'Đăng ký'
   Unsubscribe: 'Hủy đăng ký'
   Search Channel: 'Tìm trong kênh'
@@ -713,7 +726,6 @@ Channel:
     Reveal Answers: Hiện Câu trả lời
     Hide Answers: Ẩn Câu trả lời
     Video hidden by FreeTube: FreeTube đã ẩn video này
-    View Full Post: Mở rộng bài đăng
   Releases:
     Releases: Xuất bản
     This channel does not currently have any releases: Kênh này hiện không có bất
@@ -728,9 +740,6 @@ Channel:
     Podcasts: Podcast
     This channel does not currently have any podcasts: Kênh này hiện không có podcast
       nào
-  Home:
-    Home: Trang chủ
-    View Playlist: Xem danh sách phát
 Video:
   Open in YouTube: 'Mở trong Youtube'
   Copy YouTube Link: 'Sao chép liên kết Youtube'
@@ -756,8 +765,37 @@ Video:
     trực tiếp hiện tại không hỗ trợ với Invidious API. Một đường truyền trực tiếp
     đến Youtube là cần thiết.'
   Published:
+    Jan: 'Tháng 1'
+    Feb: 'Tháng 2'
+    Mar: 'Tháng 3'
+    Apr: 'Tháng 4'
+    May: 'Tháng 5'
+    Jun: 'Tháng 6'
+    Jul: 'Tháng 7'
+    Aug: 'Tháng 8'
+    Sep: 'Tháng 9'
+    Oct: 'Tháng 10'
+    Nov: 'Tháng 11'
+    Dec: 'Tháng 12'
+    Second: 'Giây'
+    Seconds: 'Giây'
+    Hour: 'Giờ'
+    Hours: 'Giờ'
+    Day: 'Ngày'
+    Days: 'Ngày'
+    Week: 'Tuần'
+    Weeks: 'Tuần'
+    Month: 'Tháng'
+    Months: 'Tháng'
+    Year: 'Năm'
+    Years: 'Năm'
+    Ago: 'Vừa qua'
+    Upcoming: 'Công chiếu vào'
+    Minutes: Phút
+    Minute: Phút
     In less than a minute: Trong khoảng ít hơn 1 phút
   Published on: 'Phát hành vào'
+  Publicationtemplate: '{number} {unit} trước'
 #& Videos
   Video has been removed from your history: Video đã được xóa khỏi lịch sử của bạn
   Video has been marked as watched: Video đánh dấu đã xem
@@ -820,46 +858,6 @@ Video:
   Upcoming: Sắp ra mắt
   Premieres: Công chiếu
   Unhide Channel: Hiển thị kênh này
-  Player:
-    Show Stats: Hiện thông tin nâng cao
-    Hide Stats: Ẩn thông tin nâng cao
-    Stats:
-      CodecsVideoAudio: 'Codec: {videoCodec} ({videoItag}) / {audioCodec} ({audioItag})'
-      CodecsVideoAudioNoItags: 'Codec: {videoCodec} / {audioCodec}'
-      Bandwidth: 'Băng thông: {bandwidth} kbps'
-      Resolution: 'Độ phân ảnh: {width}x{height}@{frameRate}'
-      Player Dimensions: 'Kích thước trình xem: {width}x{height}'
-      CodecAudio: 'Codec: {audioCodec} ({audioItag})'
-      Bitrate: 'Tốc độ bit: {bitrate} kbps'
-      Volume: 'Âm lượng: {volumePercentage}%'
-      Buffered: 'Đã tải trước: {bufferedPercentage}%'
-      Video ID: 'ID video: {videoId}'
-      Stats: Thông tin nâng cao
-      Media Formats: 'Định dạng: {formats}'
-      Dropped Frames / Total Frames: 'Khung bị bỏ: {droppedFrames} / tổng số khung:
-        {totalFrames}'
-    Skipped segment: Đã bỏ qua phân đoạn {segmentCategory}
-    You appear to be offline: Bạn có vẻ đang offline.
-    Playback will resume automatically when your connection comes back: Trình phát
-      sẽ tự động tiếp tục khi bạn kết nối trở lại.
-    TranslatedCaptionTemplate: '{language} (được dịch từ "{originalLanguage}")'
-    Audio Tracks: Rãnh âm thanh
-    Theatre Mode: Chế độ rạp hát
-    Exit Theatre Mode: Thoát chế độ rạp hát
-    Full Window: Toàn màn hình
-    Exit Full Window: Thoát toàn màn hình
-    Take Screenshot: Chụp ảnh màn hình
-  MembersOnly: Các video trả phí không thể được xem qua FreeTube vì chúng yêu cầu
-    đăng nhập qua một tài khoản Google có đăng kí trả phí với kênh đã đăng các video
-    đó.
-  AgeRestricted: Các video giới hạn độ tuổi không thể được xem qua FreeTube vì chúng
-    yêu cầu đăng nhập qua Google và sử dụng một tài khoản YouTube đã được xác minh
-    độ tuổi.
-  IP block: YouTube đang chặn địa chị IP của bạn khỏi việc xem video. Hãy thử sử dụng
-    một VPN hoặc proxy khác.
-  DeArrow:
-    Show Modified Details: Hiện thông tin đã sửa đổi
-    Show Original Details: Hiện thông tin gốc
 Videos:
   #& Sort By
   Sort By:
@@ -870,23 +868,16 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: 'Xem danh sách phát hoàn chỉnh'
+  Videos: 'Video'
+  View: 'Lượt xem'
+  Views: 'Lượt xem'
   Last Updated On: 'Update lần cuối vào'
 
 # On Video Watch Page
 #* Published
 #& Views
   Playlist: Danh sách phát
-  Sort By:
-    VideoDurationAscending: Thời lượng (Ngắn nhất trước)
-    DateAddedOldest: Thêm vào cũ nhất
-    AuthorDescending: Tác giả (Z-A)
-    VideoTitleAscending: Tiêu đề (A-Z)
-    VideoDurationDescending: Thời lượng (Dài nhất trước)
-    Custom: Tùy chỉnh
-    AuthorAscending: Tác giả (A-Z)
-    Sort By: Sắp xếp theo
-    DateAddedNewest: Thêm vào gần đây nhất
-    VideoTitleDescending: Tiêu đề (Z-A)
+Toggle Theatre Mode: 'Chuyển đổi chế độ rạp hát'
 Change Format:
   Change Media Formats: 'Chuyển đổi định dạng video'
   Use Dash Formats: 'Sử dụng định dạng DASH'
@@ -896,8 +887,6 @@ Change Format:
     cho video này
   Dash formats are not available for this video: Định dạng DASH không có sẵn cho video
     này
-  Legacy formats are not available for this video: Định dạng legacy không có sẵn cho
-    video này
 Share:
   Share Video: 'Chia sẻ video'
   Share Playlist: 'Chia sẻ danh sách phát'
@@ -936,14 +925,12 @@ Comments:
   There are no more comments for this video: Không có bình luận cho video này
   Member: Thành viên
   From {channelName}: từ {channelName}
-  And others: và những người khác
+  And others: Và những thứ khác
   Pinned by: Được ghim bởi
   Show More Replies: Hiện thêm câu trả lời
   View {replyCount} replies: Hiển thị {replyCount} câu trả lời
-  Hearted: Đã thả tim
+  Hearted: Thả Tim
   Subscribed: Đã đăng ký
-  There are no comments available for this post: Không có bình luận nào cho bài đăng
-    này
 Up Next: 'Tiếp theo'
 
 # Toast Messages
@@ -951,6 +938,8 @@ Local API Error (Click to copy): 'Local API lỗi (Nhấn để copy)'
 Invidious API Error (Click to copy): 'Invidious API lỗi (Nhấn để copy)'
 Falling back to Invidious API: 'Quay trở về Invidious API'
 Falling back to Local API: 'Quay trở về local API'
+Subscriptions have not yet been implemented: 'Danh sách đăng kí hiện chưa được áp
+  đặt'
 Loop is now disabled: 'Lặp lại hiện đã tắt'
 Loop is now enabled: 'Lặp lại hiện đã bật'
 Shuffle is now disabled: 'Xáo trộn hiện đã tắt'
@@ -1007,7 +996,7 @@ Profile:
   All Channels: Tất cả kênh
   Profile Select: Chọn hồ sơ
   Profile Filter: Bộ lọc hồ sơ
-  Profile Settings: Hồ sơ
+  Profile Settings: Cài đặt hồ sơ
   Toggle Profile List: Mở/đóng danh sách hồ sơ
   Edit Profile Name: Chỉnh sửa tên hồ sơ
   Profile Name: Tên hồ sơ
@@ -1031,7 +1020,9 @@ Channels:
   Title: Danh sách kênh
   Search bar placeholder: Tìm kênh
   Empty: Danh sách kênh của bạn hiện đang trống.
+  Unsubscribed: '{channelName} đã bị xoá khỏi danh sách kênh đã đăng ký của bạn'
   Unsubscribe Prompt: Bạn có chắc răng bạn muốn huỷ đăng ký kênh "{channelName}"?
+  Unsubscribe: Huỷ đăng ký
   Count: '{number} kênh đã tìm được.'
 Tooltips:
   General Settings:
@@ -1050,9 +1041,6 @@ Tooltips:
       lệnh API.
     Region for Trending: Xu hướng khu vực cho phép bạn chọn các video thịnh hành của
       quốc gia mà bạn muốn hiển thị.
-    Open Deep Links In New Window: Các URL được truyền đến FreeTube, chẳng hạn như
-      thông qua các trình mở rộng trình duyệt tự động chuyển hướng hay đối số khị
-      mở qua dòng lệnh, sẽ được mở trên một cửa sổ mới.
   Player Settings:
     Proxy Videos Through Invidious: Sẽ kết nối với Invidious để cung cấp video thay
       vì kết nối trực tiếp với YouTube.
@@ -1068,8 +1056,9 @@ Tooltips:
     Skip by Scrolling Over Video Player: Sử dụng con lăn chuột để bỏ qua video, kiểu
       MPV.
   External Player Settings:
-    Custom External Player Arguments: Bất kỳ tham số dòng lệnh tùy chỉnh nào, bạn
-      muốn được chuyển đến trình phát bên ngoài.
+    Custom External Player Arguments: Bất kỳ tham số dòng lệnh tùy chỉnh nào, được
+      phân tách bằng dấu chấm phẩy (';'), bạn muốn được chuyển đến trình phát bên
+      ngoài.
     Custom External Player Executable: Theo mặc định, FreeTube sẽ giả định rằng trình
       phát bên ngoài đã chọn có thể được tìm thấy thông qua biến môi trường PATH.
       Nếu cần, bạn có thể đặt một đường dẫn tuỳ chọn ở đây.
@@ -1080,14 +1069,11 @@ Tooltips:
       video (danh sách phát nếu được hỗ trợ) trong trình phát bên ngoài, trên hình
       thu nhỏ của video. Cảnh báo, cài đặt Invidious không ảnh hưởng đến trình phát
       bên ngoài.
-    Ignore Default Arguments: Không gửi các tham số mặc định đến trình phát bên ngoài
-      ngoài URL của video (như tốc độ phát, URL danh sách phát, v.v.). Các tham số
-      tùy chỉnh vẫn sẽ được gửi.
   Subscription Settings:
     Fetch Feeds from RSS: Khi được bật lên, FreeTube sẽ sử dụng RSS thay vì phương
       thức mặc định để lấy nguồn cấp dữ liệu đăng ký của bạn. RSS nhanh hơn và tránh
-      việc bị chặn IP, nhưng không cung cấp thông tin nhất định như thời lượng video,
-      trạng thái phát trực tiếp hoặc các bài đăng cộng đồng
+      việc bị chặn IP, nhưng không cung cấp thông tin nhất định như thời lượng video
+      hoặc trạng thái phát trực tiếp
     Fetch Automatically: Khi được bật, FreeTube sẽ tự động tìm nạp nguồn cấp dữ liệu
       đăng ký của bạn khi cửa sổ mới được mở và khi chuyển đổi hồ sơ.
   Distraction Free Settings:
@@ -1096,16 +1082,14 @@ Tooltips:
       đề xuất. Tên kênh đã nhập phải khớp hoàn toàn và có phân biệt chữ hoa chữ thường.
     Hide Subscriptions Live: Cài đặt này bị ghi đè bởi cài đặt "{appWideSetting}"
       trên toàn ứng dụng, trong phần "{subsection}" của "{settingsSection}"
-    Hide Videos and Playlists Containing Text: Nhập một từ khóa hoặc cụm từ (không
-      phân biết hoa thường) để ẩn các video & danh sách phát có tiêu đề gốc chứa các
-      mục đó khỏi FreeTube, ngoại trừ các video trong Lịch sử, các danh sách phát
-      của bạn, và video trong các danh sách phát.
   SponsorBlock Settings:
     UseDeArrowThumbnails: Thay thế thumbnail video bằng thumbnail gửi từ DeArrow.
     UseDeArrowTitles: Thay thế tiêu đề video bằng tiêu đề do người dùng gửi từ DeArrow.
   Experimental Settings:
     Replace HTTP Cache: Tắt bộ nhớ đệm HTTP dựa trên đĩa của Electron và bật bộ nhớ
       đệm hình ảnh trong bộ nhớ tùy chỉnh. Sẽ dẫn đến việc sử dụng RAM tăng lên.
+Hashtags have not yet been implemented, try again later: Thẻ hashtag chưa thể dùng
+  được, hãy thử lại sau
 Playing Next Video Interval: Phát video tiếp theo ngay lập tức. Nhấn vào để hủy. |
   Phát video tiếp theo sau {nextVideoInterval} giây nữa. Nhấn vào để hủy. | Phát video
   tiếp theo sau {nextVideoInterval} giây. Nhấn vào để hủy.
@@ -1134,7 +1118,6 @@ Chapters:
   Chapters: Chương
   'Chapters list hidden, current chapter: {chapterName}': 'Danh sách các chương bị
     ẩn, chương hiện tại: {chapterName}'
-  Key Moments: Khoảnh khắc chính
 Channel Unhidden: '{channel} đã bị xóa khỏi bộ lọc kênh'
 Tag already exists: Thẻ "{tagName}" đã tồn tại
 Hashtag:
@@ -1152,41 +1135,3 @@ Playlist will pause when current video is finished: Danh sách phát sẽ tạm
   video hiện tại kết thúc
 Trimmed input must be at least N characters long: Dữ liệu nhập bị cắt bớt phải dài
   ít nhất 1 ký tự | Dữ liệu nhập bị cắt bớt phải dài ít nhất {length} ký tự
-Feed:
-  Refresh Feed: Tải lại {subscriptionName}
-  Feed Last Updated: 'Lần cuối cập nhật {feedName}: {date}'
-Search Listing:
-  Label:
-    4K: 4K
-    Subtitles: Có phụ đề
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: Mới
-    3D: 3D
-    Closed Captions: Có phụ đề
-'Blocked opening potentially unsafe URL': 'Đã chặn mở URL tiềm ẩn không an toàn: "{url}".'
-Search character limit: Chuỗi tìm kiếm vượt quá độ dài {searchCharacterLimit} ký tự
-  cho phép
-Yes, Open Link: Có, mở liên kết
-Cancel: Hủy bỏ
-Moments Ago: vừa xong
-Yes, Delete: Có, xóa đi
-Display Label: '{label}: {value}'
-checkmark: ✓
-Yes, Restart: Có, khởi đông lại đi
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: Mũi tên xuống
-  arrowleft: Mũi tên trái
-  arrowright: Mũi tên phải
-  arrowup: Mũi tên lên
-Right-click or hold to see history: Giữ hoặc nhấn chuột phải để xem lịch sử
-Autoplay Interruption Timer: Tự động phát bị hủy do không có hành động trong {autoplayInterruptionIntervalHours}
-  giờ
-Description:
-  Expand Description: '...thêm'
-  Collapse Description: Ẩn bớt
diff --git a/static/locales/vls.yaml b/static/locales/vls.yaml
index 157d1c32c1590..b80e004668385 100644
--- a/static/locales/vls.yaml
+++ b/static/locales/vls.yaml
@@ -145,6 +145,8 @@ Channels:
   Search bar placeholder: ''
   Count: ''
   Empty: ''
+  Unsubscribe: ''
+  Unsubscribed: ''
   Unsubscribe Prompt: ''
 Trending:
   Trending: ''
@@ -160,6 +162,8 @@ Feed:
 Playlists: ''
 User Playlists:
   Your Playlists: ''
+  Playlist Message: ''
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: ''
   You have no playlists. Click on the create new playlist button to create a new one.: ''
   Empty Search Message: ''
   Search bar placeholder: ''
@@ -267,6 +271,7 @@ History:
 Settings:
   # On Settings Page
   Settings: ''
+  Expand All Settings Sections: ''
   Sort Settings Sections (A-Z): ''
   The app needs to restart for changes to take effect. Restart and apply change?: ''
   General Settings:
@@ -459,7 +464,9 @@ Settings:
     Subscription Settings: ''
     Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
+    Manage Subscriptions: ''
     Fetch Automatically: ''
+    Only Show Latest Video for Each Channel: ''
     Confirm Before Unsubscribing: ''
   Distraction Free Settings:
     Distraction Free Settings: ''
@@ -513,6 +520,7 @@ Settings:
     Subscription File: ''
     History File: ''
     Playlist File: ''
+    Check for Legacy Subscriptions: ''
     Export Subscriptions: ''
     Export FreeTube: ''
     Export YouTube: ''
@@ -776,10 +784,39 @@ Video:
   video only: ''
   audio only: ''
   Published:
+    Jan: ''
+    Feb: ''
+    Mar: ''
+    Apr: ''
+    May: ''
+    Jun: ''
+    Jul: ''
+    Aug: ''
+    Sep: ''
+    Oct: ''
+    Nov: ''
+    Dec: ''
+    Second: ''
+    Seconds: ''
+    Minute: ''
+    Minutes: ''
+    Hour: ''
+    Hours: ''
+    Day: ''
+    Days: ''
+    Week: ''
+    Weeks: ''
+    Month: ''
+    Months: ''
+    Year: ''
+    Years: ''
+    Ago: ''
+    Upcoming: ''
     In less than a minute: ''
   Published on: ''
   Streamed on: ''
   Started streaming on: ''
+  Publicationtemplate: ''
   Sponsor Block category:
     sponsor: ''
     intro: ''
@@ -842,6 +879,9 @@ Playlist:
   #& About
   Playlist: ''
   View Full Playlist: ''
+  Videos: ''
+  View: ''
+  Views: ''
   Last Updated On: ''
   Sort By:
     Sort By: ''
@@ -856,6 +896,7 @@ Playlist:
 # On Video Watch Page
 #* Published
 #& Views
+Toggle Theatre Mode: ''
 Change Format:
   Change Media Formats: ''
   Use Dash Formats: ''
@@ -960,7 +1001,9 @@ Invidious API Error (Click to copy): ''
 Falling back to Invidious API: ''
 Falling back to Local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
+Subscriptions have not yet been implemented: ''
 Unknown YouTube url type, cannot be opened in app: ''
+Hashtags have not yet been implemented, try again later: ''
 Loop is now disabled: ''
 Loop is now enabled: ''
 Shuffle is now disabled: ''
diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index f00d217f4a194..cd92b76a21a1a 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -98,7 +98,7 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: '订阅'
   Latest Subscriptions: '最新订阅'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的订阅列表目前是空的。如果想要导入订阅，可以转到“数据设置”并选择“导入订阅”，或者搜索频道并订阅。'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的订阅列表目前是空的。在这里开始添加订阅。'
   'Getting Subscriptions.  Please wait.': '获取订阅中。 请稍等。'
   Refresh Subscriptions: 刷新订阅
   Getting Subscriptions. Please wait.: 获取订阅中。 请稍候。
@@ -124,8 +124,11 @@ Most Popular: '最流行'
 Playlists: '播放列表'
 User Playlists:
   Your Playlists: '您的播放列表'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 您未保存视频。点击视频角落的“保存”按钮保存视频
+  Playlist Message: 本页面不代表功能完备的播放列表。它只列举您保存或喜爱的播放列表。当项目完成时，本页面的所有视频将会迁移到“最喜爱”播放列表。
   Search bar placeholder: 搜索播放列表
   Empty Search Message: 此播放列表中没有匹配你搜索的视频
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: 你确定要从此播放列表删除所有已观看的视频吗？此操作无法撤销。
   AddVideoPrompt:
     Search in Playlists: 在播放列表中搜索
     Save: 保存
@@ -160,6 +163,7 @@ User Playlists:
       "{videoCount} video(s) have been removed": 1 则视频已被删除 | {videoCount} 则视频已被删除
       This video cannot be moved down.: 无法下移此视频。
       This playlist is now used for quick bookmark: 此播放列表现用于快速添加书签
+      Quick bookmark disabled: 停用了快速添加书签
       Reverted to use {oldPlaylistName} for quick bookmark: 恢复到使用播放列表 {oldPlaylistName}
         进行快速添加书签操作
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: 此播放列表现用于快速添加书签，而非
@@ -167,8 +171,6 @@ User Playlists:
       This playlist is already being used for quick bookmark.: 此播放列表已被用于快速书签。
       Playlist {playlistName} is the new quick bookmark playlist.: 播放列表 {playlistName}
         是新的快速书签播放列表。
-      This playlist has a video with a duration error: 此播放列表包含至少一个没有持续时间的视频，排序时将按照持续时间为
-        0 对待此视频。
     Search for Videos: 搜索视频
   Are you sure you want to delete this playlist? This cannot be undone: 你确定要删除此播放列表吗？此操作无法撤销。
   Sort By:
@@ -206,6 +208,7 @@ User Playlists:
   Add to Favorites: 添加到播放列表 {playlistName}
   Enable Quick Bookmark With This Playlist: 开启使用此播放列表来快速添加书签
   Remove from Favorites: 从播放列表 {playlistName} 删除
+  Disable Quick Bookmark: 停用快速添加书签
   Playlists with Matching Videos: 有匹配视频的播放列表
   Quick Bookmark Enabled: 启用了快速书签
   Cannot delete the quick bookmark target playlist.: 无法删除快速书签目标播放列表。
@@ -214,8 +217,6 @@ User Playlists:
     1 个已观看视频吗？此操作无法撤销。 | 你确定要从此播放列表删除 {playlistItemCount} 个已观看视频吗？此操作无法撤销。
   Are you sure you want to remove {playlistItemCount} duplicate videos from this playlist? This cannot be undone: 你确定要从此播放列表中删除
     1 个重复视频吗？无法撤销删除。| 你确定要从此播放列表中删除 {playlistItemCount} 个重复视频吗？无法撤销删除。
-  Export Playlist: 导出播放清单
-  The playlist has been successfully exported: 成功导出播放清单
 History:
   # On History Page
   History: '历史记录'
@@ -228,7 +229,7 @@ Settings:
   # On Settings Page
   Settings: '设置'
   General Settings:
-    General Settings: '常规'
+    General Settings: '常规设置'
     Fallback to Non-Preferred Backend on Failure: '失败时回撤到非首选后端'
     Enable Search Suggestions: '允许搜索建议'
     Default Landing Page: '默认加载页面'
@@ -249,6 +250,7 @@ Settings:
       End: '结尾'
       Hidden: 隐藏缩略图
       Blur: 模糊
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious实例（默认https://invidious.snopyta.org）'
     Region for Trending: '热门区域'
         #! List countries
     Check for Updates: 检查更新
@@ -269,9 +271,8 @@ Settings:
     Auto Load Next Page:
       Label: 自动加载下一页
       Tooltip: 自动加载额外页面和评论。
-    Open Deep Links In New Window: 在新窗口打开传递到 FreeTube 的 URL
   Theme Settings:
-    Theme Settings: '主题'
+    Theme Settings: '主题设置'
     Match Top Bar with Main Color: '顶部菜单栏对应主颜色'
     Base Theme:
       Base Theme: '基本主题'
@@ -286,8 +287,6 @@ Settings:
       Nordic: Nordic
       Solarized Light: 日照白
       Solarized Dark: 日照黑
-      Gruvbox Dark: Gruvbox Dark
-      Gruvbox Light: Gruvbox Light
     Main Color Theme:
       Main Color Theme: '主题色'
       Red: '红'
@@ -335,16 +334,6 @@ Settings:
       Solarized Red: 日照红
       Solarized Blue: 日照蓝
       Solarized Violet: 日照紫
-      Gruvbox Dark Aqua: Gruvbox 深蓝绿
-      Gruvbox Light Red: Gruvbox 浅红
-      Gruvbox Light Blue: Gruvbox 浅蓝
-      Gruvbox Light Purple: Gruvbox 浅紫
-      Gruvbox Dark Yellow: Gruvbox 深黄
-      Gruvbox Dark Blue: Gruvbox 深蓝
-      Gruvbox Dark Purple: Gruvbox 深紫
-      Gruvbox Light Orange: Gruvbox 浅橙
-      Gruvbox Dark Green: Gruvbox 深绿
-      Gruvbox Dark Orange: Gruvbox 深橙
     Secondary Color Theme: '次主题色'
         #* Main Color Theme
     UI Scale: UI缩放
@@ -353,7 +342,8 @@ Settings:
     Hide Side Bar Labels: 隐藏侧边栏标签
     Hide FreeTube Header Logo: 隐藏 FreeTube 标题徽标
   Player Settings:
-    Player Settings: '播放器'
+    Player Settings: '播放器选项'
+    Remember History: '记住历史'
     Play Next Video: '播放下一视频'
     Turn on Subtitles by Default: '默认开启字幕'
     Autoplay Videos: '自动播放视频'
@@ -380,7 +370,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: 播放列表 下一个影片时间间隔
-    Next Video Interval: 自动播放倒计时器
+    Next Video Interval: 下个视频的间隔时间
     Display Play Button In Video Player: 在视频播放器上显示播放按钮
     Scroll Volume Over Video Player: 在视频播放器上滑动音量
     Fast-Forward / Rewind Interval: 快进/快退间隔
@@ -402,22 +392,50 @@ Settings:
       Folder Label: 截屏文件夹
     Enter Fullscreen on Display Rotate: 屏幕旋转时进入全屏
     Skip by Scrolling Over Video Player: 从视频播放器一侧滚动到另一侧来跳过视频
-    Autoplay Interruption Timer: 自动播放中断计时器
   Subscription Settings:
-    Subscription Settings: '订阅'
+    Subscription Settings: '订阅设置'
     Hide Videos on Watch: '观看时隐藏视频'
+    Subscriptions Export Format:
+      Subscriptions Export Format: '导出订阅格式'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: '管理订阅'
+    Import Subscriptions: '导入订阅'
+    Export Subscriptions: '导出订阅'
+    How do I import my subscriptions?: '如何导入我的订阅？'
     Fetch Feeds from RSS: 从RSS摘取推送
     Fetch Automatically: 自动抓取订阅源
+    Only Show Latest Video for Each Channel: 只显示每个频道的最新视频
     Confirm Before Unsubscribing: 避免意外取消订阅
+  Advanced Settings:
+    Advanced Settings: '高级设置'
+    Enable Debug Mode (Prints data to the console): '允许调试模式（打印数据在控制板）'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': '代理地址（例如：SOCKS5://127.0.0.1:9050）'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '点击“测试代理”键将发送请求给https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: '用Tor / 代理给API呼叫'
+    TEST PROXY: '测试代理'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: '显示公共实例'
+    Clear History:
+      Clear History: '清除历史记录'
+      # On Click
+      Are you sure you want to delete your history?: '您确认想删除您的历史记录？'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: '清除订阅'
+      # On Click
+      Are you sure you want to remove all subscriptions?: '您确定想移除所有订阅？'
+      #& Yes
+      #& No
 
-    'Limit the number of videos displayed for each channel': 限制每个频道展示的视频数
-    To: 到
   Privacy Settings:
     Are you sure you want to remove your entire watch history?: 您确认想移除您的全部观看历史记录？
     Are you sure you want to clear out your search cache?: 您确定想清除您的搜索缓存？
     Save Watched Progress: 保存观看进度
     Remember History: 记住历史记录
-    Privacy Settings: 隐私
+    Privacy Settings: 隐私设置
     Watch history has been cleared: 观看历史记录已清除
     Remove Watch History: 移除观看历史记录
     Search cache has been cleared: 搜索缓存已清除
@@ -449,10 +467,14 @@ Settings:
     Export YouTube: 导出YouTube
     Export FreeTube: 导出FreeTube
     Export Subscriptions: 导出订阅
+    Import NewPipe: 导入NewPipe
+    Import YouTube: 导入YouTube
+    Import FreeTube: 导入FreeTube
     Import Subscriptions: 导入订阅
     Select Export Type: 选择导出类型
     Select Import Type: 选择导入类型
-    Data Settings: 数据
+    Data Settings: 数据设置
+    Check for Legacy Subscriptions: 检查传统订阅
     Manage Subscriptions: 管理订阅
     Import Playlists: 导入播放列表
     Export Playlists: 导出播放列表
@@ -476,7 +498,7 @@ Settings:
     Hide Channel Subscribers: 隐藏频道订阅者
     Hide Video Likes And Dislikes: 隐藏视频喜欢与不喜欢
     Hide Video Views: 隐藏视频观看数量
-    Distraction Free Settings: 零打扰
+    Distraction Free Settings: 零打扰设置
     Hide Active Subscriptions: 隐藏活跃的订阅
     Hide Playlists: 隐藏播放列表
     Hide Live Streams: 隐藏直播
@@ -489,21 +511,22 @@ Settings:
     Hide Channels Placeholder: 频道ID
     Display Titles Without Excessive Capitalisation: 去除标题中对字母大写和标点符号的过度使用
     Hide Featured Channels: 隐藏精选频道
-    Hide Channel Playlists: 隐藏频道“播放列表”标签
-    Hide Channel Community: 隐藏频道“社区”标签
-    Hide Channel Shorts: 隐藏频道“短视频”标签
+    Hide Channel Playlists: 隐藏频道播放列表
+    Hide Channel Community: 隐藏频道社区
+    Hide Channel Shorts: 隐藏频道短视频
     Sections:
       Side Bar: 侧边栏
       Channel Page: 频道页
       Watch Page: 观看页
       General: 常规
       Subscriptions Page: 订阅页
-    Hide Channel Podcasts: 隐藏频道“播客”标签
-    Hide Channel Releases: 隐藏频道“发布”标签
+    Hide Channel Podcasts: 隐藏频道播客
+    Hide Channel Releases: 隐藏频道发布
     Hide Subscriptions Shorts: 隐藏订阅短视频
     Hide Subscriptions Videos: 隐藏订阅视频
     Hide Subscriptions Live: 隐藏订阅直播
     Hide Profile Pictures in Comments: 在评论中隐藏个人资料图片
+    Blur Thumbnails: 模糊缩略图
     Hide Subscriptions Community: 隐藏订阅社区
     Hide Channels Invalid: 提供的频道 ID 无效
     Hide Channels Disabled Message: 使用 ID 屏蔽了某些频道，这些频道未被处理。当这些 ID 在升级时，功能被停用
@@ -511,12 +534,11 @@ Settings:
     Hide Channels API Error: 获取 ID 为所提供值的用户出错。请再次检查 ID 是否正确。
     Hide Videos and Playlists Containing Text: 隐藏包含文本的视频和播放列表
     Hide Videos and Playlists Containing Text Placeholder: 单词、单词片段或词组
-    Hide Channel Home: 隐藏频道“主页”标签
   The app needs to restart for changes to take effect. Restart and apply change?: 应用需要重启让修改生效。重启以应用修改？
   Proxy Settings:
     Proxy Protocol: 代理协议
     Enable Tor / Proxy: 使用Tor/代理
-    Proxy Settings: 代理
+    Proxy Settings: 代理设置
     Error getting network information. Is your proxy configured properly?: 获取网络信息错误。您的代理配置是否正确？
     City: 城市
     Region: 地区
@@ -527,14 +549,12 @@ Settings:
     Clicking on Test Proxy will send a request to: 点击测试代理将会发送一个请求给
     Proxy Port Number: 代理端口号
     Proxy Host: 代理主机
-    Proxy Warning: FreeTube 没有内置的代理，但可以连接到外部代理，例如像 Tor 这样运行在你机器上的代理，或者如某些 VPN 提供的
-      SOCKS5 代理这样的外部代理。如果开启了代理选项，请确保你的代理/Tor 正确配置，否则 FreeTube 无法获取任何数据。
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: 当赞助商时间被跳过时通知
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': 赞助商区域调用的API地址（默认是
       https://sponsor.ajay.app）
     Enable SponsorBlock: 开启赞助商区域
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: 赞助商区域设置
     Skip Options:
       Auto Skip: 自动跳过
       Show In Seek Bar: 显示在查找栏中
@@ -551,25 +571,25 @@ Settings:
     Custom External Player Executable: 自定义外部播放器的可执行文件
     Ignore Unsupported Action Warnings: 忽略不支持的行为的警告
     External Player: 外部播放器
-    External Player Settings: 外部播放器
+    External Player Settings: 外部播放器设置
     Players:
       None:
         Name: 无
     Ignore Default Arguments: 忽略默认变量
   Download Settings:
-    Download Settings: 下载
+    Download Settings: 下载设置
     Ask Download Path: 询问下载路径
     Choose Path: 选择路径
     Download in app: 应用内下载
     Open in web browser: 在网络浏览器内打开
     Download Behavior: 下载行为
   Parental Control Settings:
-    Parental Control Settings: 家长控制
+    Parental Control Settings: 家长控制设置
     Show Family Friendly Only: 仅显示“家庭友好”视频
     Hide Search Bar: 隐藏搜索栏
     Hide Unsubscribe Button: 隐藏“取消订阅”按钮
   Experimental Settings:
-    Experimental Settings: 实验性
+    Experimental Settings: 实验性设置
     Warning: 这些设置是实验性的，启用可能导致崩溃。强烈建议进行备份。使用风险自负！
     Replace HTTP Cache: 替换 HTTP 缓存
   Password Dialog:
@@ -578,16 +598,36 @@ Settings:
     Password Incorrect: 密码不正确
     Unlock: 解锁
   Password Settings:
-    Password Settings: 密码
+    Password Settings: 密码设置
     Set Password To Prevent Access: 设置密码防止访问设置
     Set Password: 设置密码
     Remove Password: 删除密码
+  Expand All Settings Sections: 展开所有设置部分
   Sort Settings Sections (A-Z): 对设置部分进行排序（A-Z）
-  Return to Settings Menu: 返回设置菜单
 About:
   #On About page
   About: '关于'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': '这个自由软件发布在AGPL-3.0自由许可证下。'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    发现bug？想建议新功能？想帮助？查看我们的GitHub页面。 欢迎pull requests。
+
+  Thank you very much to the People and Projects that make FreeTube possible!: '非常感谢让FreeTube变得有可能的人和项目！'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '想聊天？加入我们的Element
+    / Matrix服务器。加入前请检查规则。'
+
+  'Looking for help? Check out our Wiki page.': '寻求帮助？查看我们的Wiki页面。'
+
+  Check out our Firefox extension!: '查看我们的Firefox插件！'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': '如果您喜欢使用FreeTube，考虑通过Liberapay或者Bitcoin地址捐赠。'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: '最新FreeTube新闻'
+
 #On Channel Page
   Source code: 源代码
   Beta: 测试版
@@ -604,6 +644,8 @@ About:
   FreeTube Wiki: FreeTube维基
   Help: 说明
   GitHub releases: GitHub 版本
+  View License: 查看授权
+  Licensed under the AGPLv3: 以 AGPLv3 协议授权
   Please check for duplicates before posting: 请在发布前检查是否与现有问题重复
   GitHub issues: Github 问题
   Report a problem: 报告问题
@@ -615,6 +657,8 @@ About:
   Licensed under the: 许可依据
   AGPLv3: AGPLv3
 Channel:
+  Subscriber: '订阅者'
+  Subscribers: '订阅者'
   Subscribe: '订阅'
   Unsubscribe: '取消订阅'
   Search Channel: '搜索频道'
@@ -672,9 +716,6 @@ Channel:
   Releases:
     Releases: 发布
     This channel does not currently have any releases: 此频道当前无任何发布
-  Home:
-    Home: 主页
-    View Playlist: 查看播放列表
 Video:
   Open in YouTube: '在YouTube中打开'
   Copy YouTube Link: '复制YouTube链接'
@@ -695,8 +736,38 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': '在线聊天目前不被Invidious
     API支持。 需要直接连接YouTube。'
   Published:
+    Jan: '一月'
+    Feb: '二月'
+    Mar: '三月'
+    Apr: '四月'
+    May: '五月'
+    Jun: '六月'
+    Jul: '七月'
+    Aug: '八月'
+    Sep: '九月'
+    Oct: '十月'
+    Nov: '十一月'
+    Dec: '十二月'
+    Second: '秒'
+    Seconds: '秒'
+    Hour: '小时'
+    Hours: '小时'
+    Day: '日'
+    Days: '日'
+    Week: '周'
+    Weeks: '周'
+    Month: '月'
+    Months: '月'
+    Year: '年'
+    Years: '年'
+    Ago: '前'
+    Upcoming: '首映于'
+    Minutes: 分钟
+    Minute: 分钟
+    Less than a minute: 不到一分钟
     In less than a minute: 不到一分钟
   Published on: '发布于'
+  Publicationtemplate: '{number} {unit} 之前'
 #& Videos
   Video has been removed from your history: 视频已从您的历史记录中移除
   Mark As Watched: 标记为已观看
@@ -783,13 +854,6 @@ Video:
     TranslatedCaptionTemplate: '{language} (翻译自 "{originalLanguage}")'
     Exit Theatre Mode: 推出影院模式
     Skipped segment: 跳过了 {segmentCategory} 部分
-  IP block: 你的 IP 地址被 Youtube 禁止观看视频。请试着切换到不同的 VPN 或代理。
-  MembersOnly: 无法用 FreeTube 观看仅供会员的视频，因这些视频需要 Google 登录以及上传者频道的付费会员身份。
-  AgeRestricted: 无法用 FreeTube 观看受限年龄的视频，因这些视频需要 Google 登录并使用验证过年龄的 YouTube 账户。
-  Unlisted: 不公开列出的视频
-  DeArrow:
-    Show Modified Details: 显示修改过的详情
-    Show Original Details: 显示原始详情
 Videos:
   #& Sort By
   Sort By:
@@ -800,6 +864,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '查看完整播放列表'
+  Videos: '视频'
+  View: '观看'
+  Views: '观看'
   Last Updated On: '最后更新于'
 
 # On Video Watch Page
@@ -815,8 +882,7 @@ Playlist:
     VideoTitleDescending: 标题（Z-A)
     Custom: 自定义
     VideoTitleAscending: 标题（A-Z）
-    VideoDurationAscending: 持续时间（最短的优先）
-    VideoDurationDescending: 持续时间（最长的优先）
+Toggle Theatre Mode: '切换剧场模式'
 Change Format:
   Change Media Formats: '更换视频格式'
   Use Dash Formats: '使用Dash格式'
@@ -876,6 +942,7 @@ Local API Error (Click to copy): '本地API错误（点击复制）'
 Invidious API Error (Click to copy): 'Invidious API错误（点击复制）'
 Falling back to Invidious API: '回退到Invidious API'
 Falling back to Local API: '回退到本地API'
+Subscriptions have not yet been implemented: '订阅功能尚未被推行'
 Loop is now disabled: '循环播放现在被禁用'
 Loop is now enabled: '循环播放现在被允许'
 Shuffle is now disabled: '随机播放现在被禁用'
@@ -924,7 +991,7 @@ Profile:
   Select All: 全选
   Other Channels: 其他频道
   Subscription List: 订阅列表
-  Profile Settings: 个人资料
+  Profile Settings: 个人资料设置
   Profile Filter: 个人资料筛选器
   Toggle Profile List: 切换个人资料列表
   Open Profile Dropdown: 打开配置文件下拉菜单
@@ -956,13 +1023,12 @@ Tooltips:
     Preferred API Backend: 选择FreeTube 要用于取得数据的后端。本地API 是内置提取器。Invidious API需要Invidious服务器才能连接。
     Region for Trending: 热门区域让您挑选您想要显示哪个国家的热门视频。
     External Link Handling: "选择单击一个无法在 FreeTube 中打开的链接时触发的默认操作。\n默认情况下，FreeTube 将在您的默认浏览器中打开所点击链接。\n"
-    Open Deep Links In New Window: 在新窗口由浏览器的重定向扩展或命令行变量传递到 FreeTube 的 URL。
   External Player Settings:
     External Player: 选择一个外部播放器将在缩略图上显示一个图标，用于在外部播放器中打开视频(播放列表，如果支持)。警告，Invidious 设置不影响外部播放器。
     Custom External Player Executable: 默认情况下，FreeTube 假设选择的外部播放器可以通过 PATH 环境变量找到。如果需要，可以在这里设置自定义路径。
     Ignore Warnings: 当前外部播放器不支持当前操作时(例如，颠倒播放列表文件顺序)，抑制警告。
     DefaultCustomArgumentsTemplate: "(默认: '{defaultCustomArguments}')"
-    Custom External Player Arguments: 任何你希望传递给外部播放器的自定义命令行参数。
+    Custom External Player Arguments: 任何你希望传递给外部播放器的用分号(';')分隔的自定义命令行参数。
     Ignore Default Arguments: 不要向外部播放器发送除视频 URL 外的任何默认变量（如播放速度、播放列表 URL 等）。自定义变量仍将被传递。
   Experimental Settings:
     Replace HTTP Cache: 禁用 Electron 基于磁盘的 HTTP 缓存，启用自定义内存中图像缓存。会增加内存的使用。
@@ -981,6 +1047,7 @@ Search Bar:
 Are you sure you want to open this link?: 您确定要打开此链接吗？
 Unknown YouTube url type, cannot be opened in app: 未知的 YouTube url 类型，不能在应用程序中打开
 External link opening has been disabled in the general settings: 外部链接打开在常规设置中被禁用
+Hashtags have not yet been implemented, try again later: 话题标签功能尚未实现，请稍后再试
 Default Invidious instance has been set to {instance}: 默认的 Invidious 实例已被设置为 {instance}
 Playing Next Video Interval: 马上播放下一个视频。单击取消。| {nextVideoInterval} 秒内播放下个视频。单击取消。 |
   {nextVideoInterval} 秒内播放下个视频。单击取消。
@@ -996,9 +1063,11 @@ New Window: 新窗口
 Channels:
   Search bar placeholder: 搜索频道
   Count: 找到了 {number} 个频道。
+  Unsubscribe: 取消订阅
   Channels: 频道
   Title: 频道列表
   Empty: 你的频道列表当前为空。
+  Unsubscribed: 从你的订阅里删除了 {channelName}
   Unsubscribe Prompt: 你确定你要取消订阅 "{channelName}" 吗？
 Clipboard:
   Copy failed: 未能复制到剪贴板
@@ -1007,7 +1076,6 @@ Chapters:
   Chapters: 章节
   'Chapters list visible, current chapter: {chapterName}': 章节列表可见，当前章节：{chapterName}
   'Chapters list hidden, current chapter: {chapterName}': 章节列表隐藏，当前章节：{chapterName}
-  Key Moments: 关键时刻
 Preferences: 选项
 Ok: 好
 Hashtag:
@@ -1041,23 +1109,4 @@ Search Listing:
     4K: 4K
     Subtitles: 字幕
     Closed Captions: 隐藏式字幕
-    New: 新的
-    3D: 3D
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
 'Blocked opening potentially unsafe URL': 阻止了打开潜在不安全的 URL： "{url}".
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: 向下箭头 (↓)
-  arrowleft: 向左箭头(←)
-  arrowright: 向右箭头(→)
-  arrowup: 向上箭头 (↑)
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Right-click or hold to see history: 右键单击或静止不动查看历史记录
-Autoplay Interruption Timer: 由于 {autoplayInterruptionIntervalHours} 小时不活跃，自动播放被取消
-Description:
-  Expand Description: '...更多'
-  Collapse Description: 显示较少
diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index 84ca2cf991a80..e11720beca25d 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -19,7 +19,7 @@ Toggle Developer Tools: '切換開發者工具'
 Actual size: '實際大小'
 Zoom in: '放大'
 Zoom out: '縮小'
-Toggle fullscreen: '切換全螢幕'
+Toggle fullscreen: '切換至全螢幕'
 Window: '視窗'
 Minimize: '最小化'
 Close: '關閉'
@@ -60,11 +60,11 @@ Search Filters:
     Any Time: '任何時間'
     Last Hour: '最近一小時'
     Today: '今天'
-    This Week: '本週'
+    This Week: '本周'
     This Month: '本月'
     This Year: '今年'
   Type:
-    Type: '類型'
+    Type: '類別'
     All Types: '所有類別'
     Videos: '影片'
     Channels: '頻道'
@@ -98,12 +98,12 @@ Subscriptions:
     # On Subscriptions Page
   Subscriptions: '訂閱'
   Latest Subscriptions: '最新訂閱'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的訂閱清單目前是空的。如果您想要匯入您的訂閱，您可以前往「資料設定」，然後選取「匯入訂閱」，或者您也可以搜尋頻道並訂閱。'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': '您的訂閱清單目前是空的。在這裡開始新增訂閱。'
   'Getting Subscriptions.  Please wait.': '抓取訂閱中。請稍等。'
   Refresh Subscriptions: 重新整理訂閱內容的影片
   Getting Subscriptions. Please wait.: 正在取得訂閱中，請稍候....
   This profile has a large number of subscriptions. Forcing RSS to avoid rate limiting: 這個設定檔有大量訂閱。
-    強制使用 RSS 以防止速率限制
+    強制RSS已防止速率限制
   Load More Videos: 載入更多影片
   Error Channels: 有錯誤的頻道
   Disabled Automatic Fetching: 您已停用自動訂閱擷取。重新整理訂閱以在此處檢視。
@@ -123,6 +123,8 @@ Most Popular: '最受歡迎'
 Playlists: '播放清單'
 User Playlists:
   Your Playlists: '您的播放清單'
+  Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 您播放清單的影片是空的。點擊影片角落的星星按鈕以將其列在此處
+  Playlist Message: 此頁面無法列出完整的播放清單。其僅列出您已儲存或加入最愛的影片。工作完成後，所有目前在此的影片都會轉移到「最愛」播放清單。
   Search bar placeholder: 搜尋播放清單
   Empty Search Message: 此播放清單中沒有與您的搜尋相符的影片
   This playlist currently has no videos.: 此播放清單目前沒有影片。
@@ -164,6 +166,7 @@ User Playlists:
       Playlist {playlistName} has been deleted.: 播放清單 {playlistName} 已刪除。
       This playlist does not exist: 此播放清單不存在
       This playlist is now used for quick bookmark: 此播放清單現在用於快速書籤
+      Quick bookmark disabled: 快速書籤已停用
       This playlist is now used for quick bookmark instead of {oldPlaylistName}. Click here to undo: 此播放清單現在用於快速書籤，而非
         {oldPlaylistName}。點擊此處撤銷
       Reverted to use {oldPlaylistName} for quick bookmark: 恢復為使用 {oldPlaylistName}
@@ -171,7 +174,6 @@ User Playlists:
       This playlist is already being used for quick bookmark.: 此播放清單已用於快速書籤。
       Playlist {playlistName} is the new quick bookmark playlist.: 播放清單 {playlistName}
         是新的快速書籤播放清單。
-      This playlist has a video with a duration error: 此播放清單至少包含一個沒有時間長度的影片，則會以時間長度為零的方式排序。
     Search for Videos: 搜尋影片
   AddVideoPrompt:
     Select a playlist to add your N videos to: 選擇要新增影片的播放清單 | 選擇播放清單以將您的 {videoCount}
@@ -201,9 +203,12 @@ User Playlists:
   You have no playlists. Click on the create new playlist button to create a new one.: 您沒有播放清單。按一下建立新播放清單按鈕以建立新的。
   Save Changes: 儲存變更
   Remove Watched Videos: 移除已觀看的影片
+  Are you sure you want to remove all watched videos from this playlist? This cannot be undone: 您確定要從此播放清單中移除所有觀看過的影片嗎？
+    這無法還原。
   Add to Favorites: 新增至 {playlistName}
   Remove from Favorites: 從 {playlistName} 移除
   Enable Quick Bookmark With This Playlist: 啟用此播放清單的快速書籤
+  Disable Quick Bookmark: 停用快速書籤
   Playlists with Matching Videos: 包含相符影片的播放清單
   Quick Bookmark Enabled: 已啟用快速書籤
   Cannot delete the quick bookmark target playlist.: 無法刪除快速書籤目標播放清單。
@@ -212,8 +217,6 @@ User Playlists:
     1 個重複的影片嗎？這無法還原。 | 您確定要從此播放清單中刪除 {playlistItemCount} 個重複影片嗎？這無法還原。
   Are you sure you want to remove {playlistItemCount} watched videos from this playlist? This cannot be undone: 您確定要從此播放清單中刪除
     1 個觀看過的影片嗎？這無法還原。 | 您確定要從此播放清單中刪除已觀看的 {playlistItemCount} 個影片嗎？這無法還原。
-  Export Playlist: 匯出此播放清單
-  The playlist has been successfully exported: 播放清單已成功匯出
 History:
   # On History Page
   History: '觀看紀錄'
@@ -226,7 +229,7 @@ Settings:
   # On Settings Page
   Settings: '設定'
   General Settings:
-    General Settings: '一般'
+    General Settings: '一般設定'
     Fallback to Non-Preferred Backend on Failure: '連線失敗時連線到非預設伺服器'
     Enable Search Suggestions: '啟用搜尋建議'
     Default Landing Page: '預設加載頁面'
@@ -247,6 +250,8 @@ Settings:
       End: '片尾'
       Hidden: 隱藏
       Blur: 模糊
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious實例(預設為
+      https://invidious.snopyta.org )'
     Region for Trending: '發燒影片區域'
         #! List countries
     Check for Latest Blog Posts: 檢查最新的部落格貼文
@@ -267,9 +272,8 @@ Settings:
     Auto Load Next Page:
       Tooltip: 自動載入額外頁面與留言。
       Label: 自動載入下一頁
-    Open Deep Links In New Window: 在新視窗中開啟傳遞給 FreeTube 的 URL
   Theme Settings:
-    Theme Settings: '主題'
+    Theme Settings: '主題設定'
     Match Top Bar with Main Color: '頂部功能表欄對應主色彩'
     Base Theme:
       Base Theme: '基本主題'
@@ -284,8 +288,6 @@ Settings:
       Nordic: 北歐
       Solarized Dark: Solarized Dark
       Solarized Light: Solarized Light
-      Gruvbox Dark: Gruvbox 深色
-      Gruvbox Light: Gruvbox 淺色
     Main Color Theme:
       Main Color Theme: '主題色'
       Red: '紅'
@@ -333,16 +335,6 @@ Settings:
       Solarized Blue: Solarized 藍色
       Solarized Cyan: Solarized 青色
       Solarized Green: Solarized 綠色
-      Gruvbox Light Red: Gruvbox 淺紅色
-      Gruvbox Dark Green: Gruvbox 深綠色
-      Gruvbox Dark Yellow: Gruvbox 深黃色
-      Gruvbox Dark Blue: Gruvbox 深藍色
-      Gruvbox Dark Purple: Gruvbox 深紫色
-      Gruvbox Dark Aqua: Gruvbox 深水藍色
-      Gruvbox Dark Orange: Gruvbox 深橘色
-      Gruvbox Light Blue: Gruvbox 淺藍色
-      Gruvbox Light Purple: Gruvbox 淺紫色
-      Gruvbox Light Orange: Gruvbox 淺橘色
     Secondary Color Theme: '次要主題色'
         #* Main Color Theme
     UI Scale: UI縮放
@@ -351,7 +343,8 @@ Settings:
     Hide Side Bar Labels: 隱藏側邊欄標籤
     Hide FreeTube Header Logo: 隱藏 FreeTube 標題圖示
   Player Settings:
-    Player Settings: '播放器'
+    Player Settings: '播放器選項'
+    Remember History: '記住曆史'
     Play Next Video: '播放下一部影片'
     Turn on Subtitles by Default: '預設開啟字幕'
     Autoplay Videos: '自動播放影片'
@@ -378,7 +371,7 @@ Settings:
       4k: '4k'
       8k: '8k'
     Playlist Next Video Interval: 播放清單 下一個影片間隔時間
-    Next Video Interval: 自動播放倒數計時器
+    Next Video Interval: 下一個影片區段
     Scroll Volume Over Video Player: 在影片播放器上捲動以變更音量
     Display Play Button In Video Player: 在影片播放器中顯示播放按鈕
     Fast-Forward / Rewind Interval: 快轉／倒帶間隔
@@ -401,16 +394,44 @@ Settings:
         或 "/" 來建立子資料夾。
     Enter Fullscreen on Display Rotate: 在顯示旋轉時進入全螢幕
     Skip by Scrolling Over Video Player: 捲動影片播放器跳過
-    Autoplay Interruption Timer: 自動播放中斷計時器
   Subscription Settings:
-    Subscription Settings: '訂閱'
+    Subscription Settings: '訂閱設定'
     Hide Videos on Watch: '觀看時隱藏影片'
+    Subscriptions Export Format:
+      Subscriptions Export Format: '導出訂閱格式'
+      #& Freetube
+      Newpipe: 'Newpipe'
+      OPML: 'OPML'
+    Manage Subscriptions: '管理訂閱'
+    Import Subscriptions: '導入訂閱'
+    Export Subscriptions: '導出訂閱'
+    How do I import my subscriptions?: '如何導入我的訂閱？'
     Fetch Feeds from RSS: 從RSS擷取推送
     Fetch Automatically: 自動擷取 Feed
+    Only Show Latest Video for Each Channel: 只顯示每個頻道的最新影片
     Confirm Before Unsubscribing: 避免意外取消訂閱
+  Advanced Settings:
+    Advanced Settings: '進階設定'
+    Enable Debug Mode (Prints data to the console): '允許除錯型態（列印資料在控制板）'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': '代理位址（例如：SOCKS5://127.0.0.1:9050）'
+    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': '點擊“測試代理”健將傳送要求給https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: '用Tor / 代理給API呼叫'
+    TEST PROXY: '測試代理'
+    #& Invidious Instance (Default is https://invidious.snopyta.org)
+    See Public Instances: '察看公用實例'
+    Clear History:
+      Clear History: '清除曆史紀錄'
+      # On Click
+      Are you sure you want to delete your history?: '您確認想刪除您的曆史紀錄？'
+      #& Yes
+      #& No
+    Clear Subscriptions:
+      Clear Subscriptions: '清除訂閱'
+      # On Click
+      Are you sure you want to remove all subscriptions?: '您確定想移除所有訂閱？'
+      #& Yes
+      #& No
 
-    'Limit the number of videos displayed for each channel': 限制每個頻道顯示的影片數量
-    To: 到
   Privacy Settings:
     Watch history has been cleared: 已刪除觀看紀錄
     Are you sure you want to remove your entire watch history?: 您確定要移除全部的觀看紀錄嗎？
@@ -420,7 +441,7 @@ Settings:
     Clear Search Cache: 清除搜尋快取
     Save Watched Progress: 儲存觀看進度
     Remember History: 儲存觀看紀錄
-    Privacy Settings: 隱私
+    Privacy Settings: 隱私設定
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 您確定要移除所有訂閱與設定檔嗎嗎?  注意:這無法復原。
     Remove All Subscriptions / Profiles: 移除所有訂閱／設定檔
     Save Watched Videos With Last Viewed Playlist: 使用上次觀看的播放清單儲存觀看的影片
@@ -448,10 +469,14 @@ Settings:
     Export YouTube: 匯出YouTube
     Export FreeTube: 匯出FreeTube
     Export Subscriptions: 匯出訂閱
+    Import NewPipe: 匯入NewPipe
+    Import YouTube: 匯入YouTube
+    Import FreeTube: 匯入FreeTube
     Import Subscriptions: 匯入訂閱
     Select Export Type: 選取匯出類型
     Select Import Type: 選取匯入類型
-    Data Settings: 資料
+    Data Settings: 資料設定
+    Check for Legacy Subscriptions: 檢查舊版訂閱
     Manage Subscriptions: 管理訂閱
     Import Playlists: 匯入播放清單
     All playlists has been successfully imported: 所有播放清單都已成功匯入
@@ -467,7 +492,7 @@ Settings:
         啟用此選項後匯出播放清單。\n2. 使用「隱私設定」下的「刪除所有播放清單」選項刪除所有現有播放清單。\n3. 啟動舊版的 FreeTube 並導入匯出的播放清單。”"
   Distraction Free Settings:
     Hide Video Likes And Dislikes: 隱藏影片喜歡與不喜歡
-    Distraction Free Settings: 勿擾
+    Distraction Free Settings: 勿擾設定
     Hide Video Views: 隱藏影片觀看次數
     Hide Popular Videos: 隱藏流行影片
     Hide Trending Videos: 隱藏熱門影片
@@ -487,21 +512,22 @@ Settings:
     Hide Channels: 隱藏頻道中的影片
     Display Titles Without Excessive Capitalisation: 顯示沒有過多大寫與標點符號的標題
     Hide Featured Channels: 隱藏精選頻道
-    Hide Channel Playlists: 隱藏頻道「播放清單」分頁
-    Hide Channel Community: 隱藏頻道「社群」分頁
-    Hide Channel Shorts: 隱藏頻道「短片」分頁
+    Hide Channel Playlists: 隱藏頻道播放清單
+    Hide Channel Community: 隱藏頻道社群
+    Hide Channel Shorts: 隱藏頻道短片
     Sections:
       Side Bar: 側邊欄
       Watch Page: 觀看頁面
       General: 一般
       Channel Page: 頻道頁面
       Subscriptions Page: 訂閱頁面
-    Hide Channel Podcasts: 隱藏頻道「Podcast」分頁
-    Hide Channel Releases: 隱藏頻道「發布」分頁
+    Hide Channel Podcasts: 隱藏頻道 Podcast
+    Hide Channel Releases: 隱藏頻道發布
     Hide Subscriptions Shorts: 隱藏訂閱短片
     Hide Subscriptions Videos: 隱藏訂閱影片
     Hide Subscriptions Live: 隱藏訂閱直播
     Hide Profile Pictures in Comments: 在留言中隱藏個人檔案圖片
+    Blur Thumbnails: 模糊縮圖
     Hide Subscriptions Community: 隱藏訂閱社群
     Hide Channels Invalid: 提供的頻道 ID 無效
     Hide Channels Disabled Message: 某些頻道被使用 ID 封鎖且無法處理。當這些 ID 更新時，功能將會被封鎖
@@ -509,8 +535,6 @@ Settings:
     Hide Channels API Error: 使用提供的 ID 擷取使用者時發生錯誤。請再次檢查 ID 是否正確。
     Hide Videos and Playlists Containing Text: 隱藏包含文字的影片與播放清單
     Hide Videos and Playlists Containing Text Placeholder: 單字、單字片段或片語
-    Hide Channel Home: 隱藏頻道「首頁」分頁
-    Show Added Items: 顯示新增的項目
   The app needs to restart for changes to take effect. Restart and apply change?: 必須重新啟動應用程式以生效。重新啟動並套用變更嗎？
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: 取得網路資訊時發生錯誤。您的代理伺服器設定正確嗎？
@@ -525,15 +549,13 @@ Settings:
     Proxy Host: 代理伺服器主機
     Proxy Protocol: 代理伺服器協定
     Enable Tor / Proxy: 啟用 Tor 或代理伺服器
-    Proxy Settings: 代理伺服器
-    Proxy Warning: FreeTube 沒有內建代理伺服器，但可以連線至外部代理伺服器，例如在您的機器上執行的代理伺服器，如 Tor 或外部代理伺服器，如某些
-      VPN 提供的 SOCKS5 代理伺服器。如果啟用，請確定您的代理伺服器/Tor 已經正確設定，否則 FreeTube 將無法取得任何資料。
+    Proxy Settings: 代理伺服器設定
   SponsorBlock Settings:
     Notify when sponsor segment is skipped: 當贊助商片段被跳過時通知
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock API
       網址（預設為 https://sponsor.ajay.app）
     Enable SponsorBlock: 啟用 SponsorBlock
-    SponsorBlock Settings: SponsorBlock
+    SponsorBlock Settings: SponsorBlock 設定
     Skip Options:
       Skip Option: 略過選項
       Auto Skip: 自動略過
@@ -550,13 +572,13 @@ Settings:
     Custom External Player Executable: 自訂外部播放程式可執行檔
     Ignore Unsupported Action Warnings: 忽略不支援的動作警告
     External Player: 外部播放程式
-    External Player Settings: 外部播放程式
+    External Player Settings: 外部播放程式設定
     Players:
       None:
         Name: 無
     Ignore Default Arguments: 忽略預設引數
   Download Settings:
-    Download Settings: 下載
+    Download Settings: 下載設定
     Ask Download Path: 詢問下載路徑
     Choose Path: 選擇路徑
     Download in app: 在應用程式中下載
@@ -566,36 +588,65 @@ Settings:
     Hide Unsubscribe Button: 隱藏取消訂閱按鈕
     Show Family Friendly Only: 僅顯示適合家庭觀看
     Hide Search Bar: 隱藏搜尋列
-    Parental Control Settings: 家長控制
+    Parental Control Settings: 家長控制設定
   Experimental Settings:
     Replace HTTP Cache: 取代 HTTP 快取
     Warning: 這些設定是實驗性的，它們啟用時可能會導致當機。強烈建議做好備份。使用時風險自負！
-    Experimental Settings: 實驗
+    Experimental Settings: 實驗設定
   Password Settings:
     Set Password To Prevent Access: 設定密碼以防止存取設定
     Remove Password: 移除密碼
-    Password Settings: 密碼
+    Password Settings: 密碼設定
     Set Password: 設定密碼
   Password Dialog:
     Password: 密碼
     Enter Password To Unlock: 輸入密碼以解鎖設定
     Password Incorrect: 密碼不正確
     Unlock: 解鎖
+  Expand All Settings Sections: 展開所有設定
   Sort Settings Sections (A-Z): 對設定區塊進行排序 (A-Z)
-  Return to Settings Menu: 回到設定選單
 About:
   #On About page
   About: '關於'
   #& About
+  'This software is FOSS and released under the GNU Affero General Public License v3.0.': '這個自由軟體發布在AGPL-3.0自由許可證下。'
+
+  'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >-
+    發現bug？想建議新功能？想輔助說明？檢視我們的GitHub頁面。 歡迎pull requests。
+
+  Thank you very much to the People and Projects that make FreeTube possible!: '非常感謝讓FreeTube變得有可能的人和項目！'
+
+  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': '想聊天？加入我們的Element
+    / Matrix伺服器。加入前請檢查規則。'
+
+  'Looking for help? Check out our Wiki page.': '尋求輔助說明？檢視我們的Wiki頁面。'
+
+  Check out our Firefox extension!: '檢視我們的Firefox插件！'
+
+  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': '如果您喜歡使用FreeTube，考慮通過Liberapay或者Bitcoin位址捐贈。'
+
+  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'
+
+  Latest FreeTube News: '最新FreeTube新聞'
+
 #On Channel Page
+  Translate via Weblate: 透過 Weblate 翻譯
   Website: 網站
+  Source Code: 原始碼
+  Release Notes: 版本註記
   Blog: 部落格
   Credits: 貢獻者
   FAQ: 常見問題
+  Wiki: Wiki
+  Report an Issue: 回報問題
+  Channel Rules: 頻道規則
   Email: 電子郵件
+  License: 授權條款
   Beta: 測試版
   Donate: 捐款
+  Useful Links: 有用連結
   Help: 說明
+  Contact: 聯絡
   these people and projects: 這些人與專案
   FreeTube is made possible by: FreeTube 誕生都要感謝這些人
   Translate: 翻譯
@@ -609,11 +660,15 @@ About:
   FreeTube Wiki: FreeTube Wiki
   GitHub releases: GitHub 版本
   Downloads / Changelog: 下載 / 變更紀錄
+  View License: 檢視授權條款
+  Licensed under the AGPLv3: 以 AGPLv3 授權
   Source code: 原始碼
   Discussions: 討論
   Licensed under the: 授權以
   AGPLv3: AGPLv3
 Channel:
+  Subscriber: '訂閱者'
+  Subscribers: '訂閱者'
   Subscribe: '訂閱'
   Unsubscribe: '取消訂閱'
   Search Channel: '搜尋頻道'
@@ -671,9 +726,6 @@ Channel:
   Releases:
     Releases: 發布
     This channel does not currently have any releases: 此頻道目前沒有任何發布
-  Home:
-    Home: 首頁
-    View Playlist: 檢視播放清單
 Video:
   Open in YouTube: '在 YouTube 中開啟'
   Copy YouTube Link: '複製 YouTube 連結'
@@ -694,8 +746,38 @@ Video:
   'Live Chat is currently not supported with the Invidious API. A direct connection to YouTube is required.': '直播聊天室目前不被Invidious
     API支援。 需要直接連線YouTube。'
   Published:
+    Jan: '一月'
+    Feb: '二月'
+    Mar: '三月'
+    Apr: '四月'
+    May: '五月'
+    Jun: '六月'
+    Jul: '七月'
+    Aug: '八月'
+    Sep: '九月'
+    Oct: '十月'
+    Nov: '十一月'
+    Dec: '十二月'
+    Second: '秒'
+    Seconds: '秒'
+    Hour: '小時'
+    Hours: '小時'
+    Day: '日'
+    Days: '日'
+    Week: '周'
+    Weeks: '周'
+    Month: '月'
+    Months: '月'
+    Year: '年'
+    Years: '年'
+    Ago: '前'
+    Upcoming: '首播於'
+    Minutes: 分鐘
+    Minute: 分鐘
+    Less than a minute: 少於一分鐘
     In less than a minute: 不到一分鐘內
   Published on: '發布於'
+  Publicationtemplate: '{number} {unit} 前'
 #& Videos
   Video has been removed from your history: 影片已從您的觀看紀錄中移除
   Video has been marked as watched: 影片標記為已觀看
@@ -781,13 +863,6 @@ Video:
     You appear to be offline: 您似乎已離線。
     Playback will resume automatically when your connection comes back: 當您的連線恢復時，將會自動繼續播放。
     Skipped segment: 已跳過 {segmentCategory} 段
-  IP block: YouTube 已封鎖您的 IP 位址，因此無法觀看影片。請嘗試切換到其他 VPN 或代理伺服器。
-  MembersOnly: 會員專屬影片無法使用 FreeTube 觀看，因為這些影片需要 Google 登入並且必須訂閱上傳者的付費頻道。
-  AgeRestricted: 由於需要 Google 登入並使用經過年齡驗證的 YouTube 帳戶，FreeTube 無法觀看有限制年齡的影片。
-  Unlisted: 未公開
-  DeArrow:
-    Show Original Details: 顯示原始詳細資訊
-    Show Modified Details: 顯示修改後的詳細資訊
 Videos:
   #& Sort By
   Sort By:
@@ -798,6 +873,9 @@ Videos:
 Playlist:
   #& About
   View Full Playlist: '觀看完整播放清單'
+  Videos: '影片'
+  View: '觀看'
+  Views: '觀看'
   Last Updated On: '最後更新於'
 
 # On Video Watch Page
@@ -813,8 +891,7 @@ Playlist:
     VideoTitleAscending: 標題 (A-Z)
     VideoTitleDescending: 標題 (Z-A)
     Custom: 自訂
-    VideoDurationDescending: 持續時間（最長優先）
-    VideoDurationAscending: 持續時間（最短優先）
+Toggle Theatre Mode: '切換為劇院模式'
 Change Format:
   Change Media Formats: '變更影片格式'
   Use Dash Formats: '使用 DASH 格式'
@@ -833,7 +910,7 @@ Share:
   # On Click
   Invidious URL copied to clipboard: '複製Invidious URL到剪貼簿'
   Invidious Embed URL copied to clipboard: '複製Invidious內嵌URL到剪貼簿'
-  YouTube URL copied to clipboard: '複製 YouTube 連結到剪貼簿'
+  YouTube URL copied to clipboard: '複製YouTube URL到剪下板'
   YouTube Embed URL copied to clipboard: '複製YouTube內嵌URL到剪貼簿'
   Include Timestamp: 包含時間戳
   YouTube Channel URL copied to clipboard: YouTube頻道URL已複製到剪貼簿
@@ -874,6 +951,7 @@ Local API Error (Click to copy): '區域API錯誤（點擊複製）'
 Invidious API Error (Click to copy): 'Invidious API錯誤（點擊複製）'
 Falling back to Invidious API: '回退到Invidious API'
 Falling back to Local API: '回退到區域API'
+Subscriptions have not yet been implemented: '訂閱功能尚未被推行'
 Loop is now disabled: '循環播放現在被停用'
 Loop is now enabled: '循環播放現在被啟用'
 Shuffle is now disabled: '隨機播放現在被停用'
@@ -923,7 +1001,7 @@ Profile:
   Other Channels: 其他頻道
   Subscription List: 訂閱清單
   Profile Filter: 設定檔篩選器
-  Profile Settings: 設定檔
+  Profile Settings: 設定檔設定
   Toggle Profile List: 切換個人檔案清單
   Open Profile Dropdown: 開啟個人資料下拉式選單
   Close Profile Dropdown: 關閉個人資料下拉式選單
@@ -933,8 +1011,8 @@ Profile:
 The playlist has been reversed: 播放清單已反轉
 A new blog is now available, {blogTitle}. Click to view more: 已有新的部落格文章，{blogTitle}。點擊以檢視更多
 Download From Site: 從網站下載
-Version {versionNumber} is now available!  Click for more details: 有新版本！最新版本是 {versionNumber}
-  ！按此取得更多資訊
+Version {versionNumber} is now available!  Click for more details: 版本更新囉! 最新版本 {versionNumber}
+  ! 點擊以取得更多資訊
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 沒有這個影片因為缺少格式。這個可能發生由於國家不可用。
 Tooltips:
   Subscription Settings:
@@ -956,9 +1034,8 @@ Tooltips:
       API 需要 Invidious 伺服器才能連線。
     Region for Trending: 熱門影片區域可以讓您選擇想要顯示哪個國家的熱門影片。
     External Link Handling: "選擇點擊後無法在 FreeTube 中開啟連結時的預設行為。\n預設情況下 FreeTube 將會在您的預設瀏覽器中開啟點擊的連結。\n"
-    Open Deep Links In New Window: 傳遞給 FreeTube 的 URL，例如透過重定向瀏覽器擴充套件或命令列引數，會在新視窗中開啟。
   External Player Settings:
-    Custom External Player Arguments: 要傳給外部播放器的任何自訂命令列引數。
+    Custom External Player Arguments: 任何您想要傳遞給外部播放程式的自訂命令列參數，以半形冒號分隔 (';')。
     Ignore Warnings: 當目前的外部播放程式不支援目前動作時（例如反向播放清單等等），消除警告。
     Custom External Player Executable: 預設情況下，FreeTube 會假設選定的外部播放程式可以透過 PATH 環境變數找到。如果需要的話，請在此設定自訂路徑。
     External Player: 選擇外部播放程式將會在縮圖上顯示圖示，用來在外部播放程式中開啟影片（若支援的話，播放清單也可以）。警告：Invidious
@@ -978,8 +1055,9 @@ Tooltips:
 Playing Next Video Interval: 馬上播放下一個影片。點擊取消。| 播放下一個影片的時間為{nextVideoInterval}秒。點擊取消。|
   播放下一個影片的時間為{nextVideoInterval}秒。點擊取消。
 More: 更多
+Hashtags have not yet been implemented, try again later: 尚未實作主題標籤，請稍後再試
 Unknown YouTube url type, cannot be opened in app: 未知的 YouTube url 類型，無法在應用程式開啟
-Open New Window: 開新視窗
+Open New Window: 開啟新視窗
 Default Invidious instance has been cleared: 預設 Invidious 站台已被清除
 Default Invidious instance has been set to {instance}: 預設 Invidious 站台已被設定為 {instance}
 Search Bar:
@@ -996,9 +1074,11 @@ Channels:
   Channels: 頻道
   Title: 頻道清單
   Search bar placeholder: 搜尋頻道
+  Unsubscribe: 取消訂閱
   Count: 找到 {number} 個頻道。
   Empty: 您的頻道清單目前為空。
   Unsubscribe Prompt: 您確定您想要從「{channelName}」取消訂閱嗎？
+  Unsubscribed: '{channelName} 已從您的訂閱移除'
 Clipboard:
   Copy failed: 複製到剪貼簿失敗
   Cannot access clipboard without a secure connection: 無法在沒有安全連線的情況下存取剪貼簿
@@ -1006,7 +1086,6 @@ Chapters:
   Chapters: 章節
   'Chapters list visible, current chapter: {chapterName}': 章節清單可見，目前章節：{chapterName}
   'Chapters list hidden, current chapter: {chapterName}': 章節清單已隱藏，目前章節：{chapterName}
-  Key Moments: 重要時刻
 Preferences: 偏好設定
 Ok: 確定
 Hashtag:
@@ -1040,23 +1119,4 @@ Search Listing:
     4K: 4K
     Subtitles: 字幕
     Closed Captions: 隱藏式字幕
-    8K: 8K
-    VR180: VR180
-    360 Video: 360°
-    New: 新
-    3D: 3D
 'Blocked opening potentially unsafe URL': 已阻止開啟可能不安全的 URL：「{url}」。
-KeyboardShortcutTemplate: '{label} ({shortcut})'
-shortcutJoinOperator: +
-Keys:
-  alt: Alt
-  ctrl: Ctrl
-  arrowdown: 向下方向鍵
-  arrowleft: 向左方向鍵
-  arrowright: 向右方向鍵
-  arrowup: 向上方向鍵
-Right-click or hold to see history: 右鍵點選或按住不放可以檢視歷史紀錄
-Autoplay Interruption Timer: 自動播放因 {autoplayInterruptionIntervalHours} 小時未活動而取消
-Description:
-  Collapse Description: 顯示較少
-  Expand Description: ……更多
diff --git a/yarn.lock b/yarn.lock
index ef7cb998d9b7f..f82c8083e6e85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,51 +20,68 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.0.tgz#9374b5cd068d128dac0b94ff482594273b1c2815"
-  integrity sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.25.9"
-    js-tokens "^4.0.0"
+    "@babel/highlight" "^7.24.7"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.9", "@babel/compat-data@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.0.tgz#f02ba6d34e88fadd5e8861e8b38902f43cc1c819"
-  integrity sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2", "@babel/compat-data@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb"
+  integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==
 
-"@babel/core@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40"
-  integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
+"@babel/core@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
+  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.26.0"
-    "@babel/generator" "^7.26.0"
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-module-transforms" "^7.26.0"
-    "@babel/helpers" "^7.26.0"
-    "@babel/parser" "^7.26.0"
-    "@babel/template" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.26.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-module-transforms" "^7.25.2"
+    "@babel/helpers" "^7.25.0"
+    "@babel/parser" "^7.25.0"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.2"
+    "@babel/types" "^7.25.2"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.25.9", "@babel/generator@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.0.tgz#505cc7c90d92513f458a477e5ef0703e7c91b8d7"
-  integrity sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==
+"@babel/eslint-parser@^7.25.1":
+  version "7.25.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz#469cee4bd18a88ff3edbdfbd227bd20e82aa9b82"
+  integrity sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==
+  dependencies:
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.1"
+
+"@babel/generator@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e"
+  integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==
   dependencies:
-    "@babel/parser" "^7.26.0"
-    "@babel/types" "^7.26.0"
+    "@babel/types" "^7.25.0"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
-    jsesc "^3.0.2"
+    jsesc "^2.5.1"
+
+"@babel/generator@^7.25.4":
+  version "7.25.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.5.tgz#b31cf05b3fe8c32d206b6dad03bb0aacbde73450"
+  integrity sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w==
+  dependencies:
+    "@babel/types" "^7.25.4"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
@@ -73,43 +90,43 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-annotate-as-pure@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
-  integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
+"@babel/helper-annotate-as-pure@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
+  integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
   dependencies:
-    "@babel/types" "^7.25.9"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz#f41752fe772a578e67286e6779a68a5a92de1ee9"
-  integrity sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3"
+  integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==
   dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
-  integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==
+"@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8", "@babel/helper-compilation-targets@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
+  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
   dependencies:
-    "@babel/compat-data" "^7.25.9"
-    "@babel/helper-validator-option" "^7.25.9"
-    browserslist "^4.24.0"
+    "@babel/compat-data" "^7.25.2"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83"
-  integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-member-expression-to-functions" "^7.25.9"
-    "@babel/helper-optimise-call-expression" "^7.25.9"
-    "@babel/helper-replace-supers" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+"@babel/helper-create-class-features-plugin@^7.24.7", "@babel/helper-create-class-features-plugin@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz#57eaf1af38be4224a9d9dd01ddde05b741f50e14"
+  integrity sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.8"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.25.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/traverse" "^7.25.4"
     semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6":
@@ -120,13 +137,31 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26"
-  integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==
+"@babel/helper-create-regexp-features-plugin@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz#be4f435a80dc2b053c76eeb4b7d16dd22cfc89da"
+  integrity sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    regexpu-core "^6.1.1"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    regexpu-core "^5.3.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.0.tgz#17afe5d23b3a833a90f0fab9c2ae69fea192de5c"
+  integrity sha512-q0T+dknZS+L5LDazIP+02gEZITG5unzvb6yIjcmj5i0eFrs5ToBV2m2JGH4EsE/gtP8ygEGLGApBgRIZkTm7zg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    regexpu-core "^5.3.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz#24c75974ed74183797ffd5f134169316cd1808d9"
+  integrity sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    regexpu-core "^5.3.1"
     semver "^6.3.1"
 
 "@babel/helper-define-polyfill-provider@^0.6.1":
@@ -151,644 +186,836 @@
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
 
-"@babel/helper-member-expression-to-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3"
-  integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
-"@babel/helper-module-imports@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
-  integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
-  dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
-"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae"
-  integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+"@babel/helper-environment-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
+  dependencies:
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-optimise-call-expression@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e"
-  integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==
+"@babel/helper-function-name@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
+  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
   dependencies:
-    "@babel/types" "^7.25.9"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46"
-  integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==
+"@babel/helper-member-expression-to-functions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f"
+  integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-remap-async-to-generator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92"
-  integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==
+"@babel/helper-member-expression-to-functions@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6"
+  integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-wrap-function" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/traverse" "^7.24.8"
+    "@babel/types" "^7.24.8"
 
-"@babel/helper-replace-supers@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5"
-  integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.25.9"
-    "@babel/helper-optimise-call-expression" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-simple-access@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739"
-  integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==
+"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.0", "@babel/helper-module-transforms@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
+  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
   dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.2"
+
+"@babel/helper-optimise-call-expression@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"
+  integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==
+  dependencies:
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878"
+  integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==
+
+"@babel/helper-remap-async-to-generator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz#b3f0f203628522713849d49403f1a414468be4c7"
+  integrity sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-wrap-function" "^7.24.7"
+
+"@babel/helper-remap-async-to-generator@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz#d2f0fbba059a42d68e5e378feaf181ef6055365e"
+  integrity sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-wrap-function" "^7.25.0"
+    "@babel/traverse" "^7.25.0"
+
+"@babel/helper-replace-supers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765"
+  integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.7"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+
+"@babel/helper-replace-supers@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz#ff44deac1c9f619523fe2ca1fd650773792000a9"
+  integrity sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.24.8"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/traverse" "^7.25.0"
+
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
+  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
+
+"@babel/helper-validator-identifier@^7.24.5", "@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
+"@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
+
+"@babel/helper-wrap-function@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz#52d893af7e42edca7c6d2c6764549826336aae1f"
+  integrity sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==
+  dependencies:
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/template" "^7.24.7"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-wrap-function@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz#dab12f0f593d6ca48c0062c28bcfb14ebe812f81"
+  integrity sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ==
+  dependencies:
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
+"@babel/helpers@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a"
+  integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==
+  dependencies:
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.7"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9"
-  integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==
+"@babel/parser@^7.23.5", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065"
+  integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==
   dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/types" "^7.25.2"
 
-"@babel/helper-string-parser@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
-  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
+"@babel/parser@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.4.tgz#af4f2df7d02440286b7de57b1c21acfb2a6f257a"
+  integrity sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==
+  dependencies:
+    "@babel/types" "^7.25.4"
 
-"@babel/helper-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
-  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f"
+  integrity sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.3"
 
-"@babel/helper-validator-option@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
-  integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz#cd0c583e01369ef51676bdb3d7b603e17d2b3f73"
+  integrity sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/helper-wrap-function@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0"
-  integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz#749bde80356b295390954643de7635e0dffabe73"
+  integrity sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA==
   dependencies:
-    "@babel/template" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/helpers@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4"
-  integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89"
+  integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ==
   dependencies:
-    "@babel/template" "^7.25.9"
-    "@babel/types" "^7.26.0"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/plugin-transform-optional-chaining" "^7.24.7"
 
-"@babel/parser@^7.23.5", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0":
-  version "7.26.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.1.tgz#44e02499960df2cdce2c456372a3e8e0c3c5c975"
-  integrity sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz#3a82a70e7cb7294ad2559465ebcb871dfbf078fb"
+  integrity sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw==
   dependencies:
-    "@babel/types" "^7.26.0"
-
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
-  integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.0"
+
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-
-"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30"
-  integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137"
-  integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1"
-  integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
-    "@babel/plugin-transform-optional-chaining" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e"
-  integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
-  version "7.21.0-placeholder-for-preset-env.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
-  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
+"@babel/plugin-syntax-import-assertions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778"
+  integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-syntax-import-assertions@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f"
-  integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==
+"@babel/plugin-syntax-import-attributes@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca"
+  integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-syntax-import-attributes@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7"
-  integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
-  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-arrow-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845"
-  integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-generator-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz#1b18530b077d18a407c494eb3d1d72da505283a2"
-  integrity sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-remap-async-to-generator" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-async-to-generator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71"
-  integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-remap-async-to-generator" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz#5700691dbd7abb93de300ca7be94203764fce458"
-  integrity sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-block-scoping@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1"
-  integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-class-properties@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f"
-  integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-transform-class-static-block@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0"
-  integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52"
-  integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-replace-supers" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-    globals "^11.1.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-computed-properties@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b"
-  integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/template" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-transform-arrow-functions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514"
+  integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
+"@babel/plugin-transform-async-generator-functions@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz#2afd4e639e2d055776c9f091b6c0c180ed8cf083"
+  integrity sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-remap-async-to-generator" "^7.25.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/traverse" "^7.25.4"
+
+"@babel/plugin-transform-async-to-generator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc"
+  integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-remap-async-to-generator" "^7.24.7"
+
+"@babel/plugin-transform-block-scoped-functions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f"
+  integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
+"@babel/plugin-transform-block-scoping@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz#23a6ed92e6b006d26b1869b1c91d1b917c2ea2ac"
+  integrity sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.8"
+
+"@babel/plugin-transform-class-properties@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz#bae7dbfcdcc2e8667355cd1fb5eda298f05189fd"
+  integrity sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.25.4"
+    "@babel/helper-plugin-utils" "^7.24.8"
+
+"@babel/plugin-transform-class-static-block@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d"
+  integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz#d29dbb6a72d79f359952ad0b66d88518d65ef89a"
+  integrity sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-replace-supers" "^7.25.0"
+    "@babel/traverse" "^7.25.4"
+    globals "^11.1.0"
 
-"@babel/plugin-transform-destructuring@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1"
-  integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==
+"@babel/plugin-transform-computed-properties@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707"
+  integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/template" "^7.24.7"
 
-"@babel/plugin-transform-dotall-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a"
-  integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==
+"@babel/plugin-transform-destructuring@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550"
+  integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-duplicate-keys@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d"
-  integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==
+"@babel/plugin-transform-dotall-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0"
+  integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31"
-  integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==
+"@babel/plugin-transform-duplicate-keys@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee"
+  integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-dynamic-import@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8"
-  integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz#809af7e3339466b49c034c683964ee8afb3e2604"
+  integrity sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.0"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-exponentiation-operator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz#ece47b70d236c1d99c263a1e22b62dc20a4c8b0f"
-  integrity sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==
+"@babel/plugin-transform-dynamic-import@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4"
+  integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-export-namespace-from@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2"
-  integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==
+"@babel/plugin-transform-exponentiation-operator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d"
+  integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-for-of@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz#4bdc7d42a213397905d89f02350c5267866d5755"
-  integrity sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==
+"@babel/plugin-transform-export-namespace-from@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197"
+  integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-function-name@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97"
-  integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==
+"@babel/plugin-transform-for-of@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70"
+  integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
 
-"@babel/plugin-transform-json-strings@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660"
-  integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==
+"@babel/plugin-transform-function-name@^7.25.1":
+  version "7.25.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz#b85e773097526c1a4fc4ba27322748643f26fc37"
+  integrity sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/traverse" "^7.25.1"
 
-"@babel/plugin-transform-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de"
-  integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==
+"@babel/plugin-transform-json-strings@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a"
+  integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7"
-  integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==
+"@babel/plugin-transform-literals@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz#deb1ad14fc5490b9a65ed830e025bca849d8b5f3"
+  integrity sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-member-expression-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de"
-  integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==
+"@babel/plugin-transform-logical-assignment-operators@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0"
+  integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5"
-  integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==
+"@babel/plugin-transform-member-expression-literals@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df"
+  integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-modules-commonjs@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz#d165c8c569a080baf5467bda88df6425fc060686"
-  integrity sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==
+"@babel/plugin-transform-modules-amd@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7"
+  integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-simple-access" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-modules-systemjs@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8"
-  integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==
+"@babel/plugin-transform-modules-commonjs@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c"
+  integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.24.8"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-simple-access" "^7.24.7"
 
-"@babel/plugin-transform-modules-umd@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9"
-  integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==
+"@babel/plugin-transform-modules-systemjs@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz#8f46cdc5f9e5af74f3bd019485a6cbe59685ea33"
+  integrity sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.25.0"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a"
-  integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==
+"@babel/plugin-transform-modules-umd@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8"
+  integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-new-target@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd"
-  integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923"
+  integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz#bcb1b0d9e948168102d5f7104375ca21c3266949"
-  integrity sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==
+"@babel/plugin-transform-new-target@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00"
+  integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-numeric-separator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1"
-  integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120"
+  integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-object-rest-spread@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18"
-  integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==
+"@babel/plugin-transform-numeric-separator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63"
+  integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/plugin-transform-parameters" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03"
-  integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==
+"@babel/plugin-transform-object-rest-spread@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6"
+  integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.24.7"
 
-"@babel/plugin-transform-optional-catch-binding@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3"
-  integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==
+"@babel/plugin-transform-object-super@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be"
+  integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.24.7"
 
-"@babel/plugin-transform-optional-chaining@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd"
-  integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==
+"@babel/plugin-transform-optional-catch-binding@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4"
+  integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257"
-  integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==
+"@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d"
+  integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-private-methods@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57"
-  integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==
+"@babel/plugin-transform-parameters@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68"
+  integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-private-property-in-object@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33"
-  integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==
+"@babel/plugin-transform-private-methods@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz#9bbefbe3649f470d681997e0b64a4b254d877242"
+  integrity sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-class-features-plugin" "^7.25.4"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-property-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f"
-  integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==
+"@babel/plugin-transform-private-property-in-object@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061"
+  integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-regenerator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b"
-  integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==
+"@babel/plugin-transform-property-literals@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc"
+  integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    regenerator-transform "^0.15.2"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-regexp-modifiers@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850"
-  integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==
+"@babel/plugin-transform-regenerator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8"
+  integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    regenerator-transform "^0.15.2"
 
-"@babel/plugin-transform-reserved-words@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce"
-  integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==
+"@babel/plugin-transform-reserved-words@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4"
+  integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-shorthand-properties@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2"
-  integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==
+"@babel/plugin-transform-shorthand-properties@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73"
+  integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-spread@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9"
-  integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==
+"@babel/plugin-transform-spread@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3"
+  integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
 
-"@babel/plugin-transform-sticky-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32"
-  integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==
+"@babel/plugin-transform-sticky-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb"
+  integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-template-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz#6dbd4a24e8fad024df76d1fac6a03cf413f60fe1"
-  integrity sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==
+"@babel/plugin-transform-template-literals@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8"
+  integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz#224ba48a92869ddbf81f9b4a5f1204bbf5a2bc4b"
-  integrity sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==
+"@babel/plugin-transform-typeof-symbol@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c"
+  integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/plugin-transform-unicode-escapes@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82"
-  integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==
+"@babel/plugin-transform-unicode-escapes@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e"
+  integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-unicode-property-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3"
-  integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==
+"@babel/plugin-transform-unicode-property-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd"
+  integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-unicode-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1"
-  integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==
+"@babel/plugin-transform-unicode-regex@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f"
+  integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-unicode-sets-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe"
-  integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==
+"@babel/plugin-transform-unicode-sets-regex@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz#be664c2a0697ffacd3423595d5edef6049e8946c"
+  integrity sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.25.2"
+    "@babel/helper-plugin-utils" "^7.24.8"
 
-"@babel/preset-env@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.0.tgz#30e5c6bc1bcc54865bff0c5a30f6d4ccdc7fa8b1"
-  integrity sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==
+"@babel/preset-env@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.25.4.tgz#be23043d43a34a2721cd0f676c7ba6f1481f6af6"
+  integrity sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==
   dependencies:
-    "@babel/compat-data" "^7.26.0"
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-validator-option" "^7.25.9"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9"
-    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9"
+    "@babel/compat-data" "^7.25.4"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-plugin-utils" "^7.24.8"
+    "@babel/helper-validator-option" "^7.24.8"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.3"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.0"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.0"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.0"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-import-assertions" "^7.26.0"
-    "@babel/plugin-syntax-import-attributes" "^7.26.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.24.7"
+    "@babel/plugin-syntax-import-attributes" "^7.24.7"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.25.9"
-    "@babel/plugin-transform-async-generator-functions" "^7.25.9"
-    "@babel/plugin-transform-async-to-generator" "^7.25.9"
-    "@babel/plugin-transform-block-scoped-functions" "^7.25.9"
-    "@babel/plugin-transform-block-scoping" "^7.25.9"
-    "@babel/plugin-transform-class-properties" "^7.25.9"
-    "@babel/plugin-transform-class-static-block" "^7.26.0"
-    "@babel/plugin-transform-classes" "^7.25.9"
-    "@babel/plugin-transform-computed-properties" "^7.25.9"
-    "@babel/plugin-transform-destructuring" "^7.25.9"
-    "@babel/plugin-transform-dotall-regex" "^7.25.9"
-    "@babel/plugin-transform-duplicate-keys" "^7.25.9"
-    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9"
-    "@babel/plugin-transform-dynamic-import" "^7.25.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.25.9"
-    "@babel/plugin-transform-export-namespace-from" "^7.25.9"
-    "@babel/plugin-transform-for-of" "^7.25.9"
-    "@babel/plugin-transform-function-name" "^7.25.9"
-    "@babel/plugin-transform-json-strings" "^7.25.9"
-    "@babel/plugin-transform-literals" "^7.25.9"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.25.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.25.9"
-    "@babel/plugin-transform-modules-amd" "^7.25.9"
-    "@babel/plugin-transform-modules-commonjs" "^7.25.9"
-    "@babel/plugin-transform-modules-systemjs" "^7.25.9"
-    "@babel/plugin-transform-modules-umd" "^7.25.9"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9"
-    "@babel/plugin-transform-new-target" "^7.25.9"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.25.9"
-    "@babel/plugin-transform-numeric-separator" "^7.25.9"
-    "@babel/plugin-transform-object-rest-spread" "^7.25.9"
-    "@babel/plugin-transform-object-super" "^7.25.9"
-    "@babel/plugin-transform-optional-catch-binding" "^7.25.9"
-    "@babel/plugin-transform-optional-chaining" "^7.25.9"
-    "@babel/plugin-transform-parameters" "^7.25.9"
-    "@babel/plugin-transform-private-methods" "^7.25.9"
-    "@babel/plugin-transform-private-property-in-object" "^7.25.9"
-    "@babel/plugin-transform-property-literals" "^7.25.9"
-    "@babel/plugin-transform-regenerator" "^7.25.9"
-    "@babel/plugin-transform-regexp-modifiers" "^7.26.0"
-    "@babel/plugin-transform-reserved-words" "^7.25.9"
-    "@babel/plugin-transform-shorthand-properties" "^7.25.9"
-    "@babel/plugin-transform-spread" "^7.25.9"
-    "@babel/plugin-transform-sticky-regex" "^7.25.9"
-    "@babel/plugin-transform-template-literals" "^7.25.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.25.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.25.9"
-    "@babel/plugin-transform-unicode-property-regex" "^7.25.9"
-    "@babel/plugin-transform-unicode-regex" "^7.25.9"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.25.9"
+    "@babel/plugin-transform-arrow-functions" "^7.24.7"
+    "@babel/plugin-transform-async-generator-functions" "^7.25.4"
+    "@babel/plugin-transform-async-to-generator" "^7.24.7"
+    "@babel/plugin-transform-block-scoped-functions" "^7.24.7"
+    "@babel/plugin-transform-block-scoping" "^7.25.0"
+    "@babel/plugin-transform-class-properties" "^7.25.4"
+    "@babel/plugin-transform-class-static-block" "^7.24.7"
+    "@babel/plugin-transform-classes" "^7.25.4"
+    "@babel/plugin-transform-computed-properties" "^7.24.7"
+    "@babel/plugin-transform-destructuring" "^7.24.8"
+    "@babel/plugin-transform-dotall-regex" "^7.24.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.24.7"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.0"
+    "@babel/plugin-transform-dynamic-import" "^7.24.7"
+    "@babel/plugin-transform-exponentiation-operator" "^7.24.7"
+    "@babel/plugin-transform-export-namespace-from" "^7.24.7"
+    "@babel/plugin-transform-for-of" "^7.24.7"
+    "@babel/plugin-transform-function-name" "^7.25.1"
+    "@babel/plugin-transform-json-strings" "^7.24.7"
+    "@babel/plugin-transform-literals" "^7.25.2"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.24.7"
+    "@babel/plugin-transform-member-expression-literals" "^7.24.7"
+    "@babel/plugin-transform-modules-amd" "^7.24.7"
+    "@babel/plugin-transform-modules-commonjs" "^7.24.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.25.0"
+    "@babel/plugin-transform-modules-umd" "^7.24.7"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7"
+    "@babel/plugin-transform-new-target" "^7.24.7"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7"
+    "@babel/plugin-transform-numeric-separator" "^7.24.7"
+    "@babel/plugin-transform-object-rest-spread" "^7.24.7"
+    "@babel/plugin-transform-object-super" "^7.24.7"
+    "@babel/plugin-transform-optional-catch-binding" "^7.24.7"
+    "@babel/plugin-transform-optional-chaining" "^7.24.8"
+    "@babel/plugin-transform-parameters" "^7.24.7"
+    "@babel/plugin-transform-private-methods" "^7.25.4"
+    "@babel/plugin-transform-private-property-in-object" "^7.24.7"
+    "@babel/plugin-transform-property-literals" "^7.24.7"
+    "@babel/plugin-transform-regenerator" "^7.24.7"
+    "@babel/plugin-transform-reserved-words" "^7.24.7"
+    "@babel/plugin-transform-shorthand-properties" "^7.24.7"
+    "@babel/plugin-transform-spread" "^7.24.7"
+    "@babel/plugin-transform-sticky-regex" "^7.24.7"
+    "@babel/plugin-transform-template-literals" "^7.24.7"
+    "@babel/plugin-transform-typeof-symbol" "^7.24.8"
+    "@babel/plugin-transform-unicode-escapes" "^7.24.7"
+    "@babel/plugin-transform-unicode-property-regex" "^7.24.7"
+    "@babel/plugin-transform-unicode-regex" "^7.24.7"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.25.4"
     "@babel/preset-modules" "0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2 "^0.4.10"
     babel-plugin-polyfill-corejs3 "^0.10.6"
     babel-plugin-polyfill-regenerator "^0.6.1"
-    core-js-compat "^3.38.1"
+    core-js-compat "^3.37.1"
     semver "^6.3.1"
 
 "@babel/preset-modules@0.1.6-no-external-plugins":
@@ -800,6 +1027,11 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+
 "@babel/runtime@^7.14.0":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
@@ -814,65 +1046,83 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
-  integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==
-  dependencies:
-    "@babel/code-frame" "^7.25.9"
-    "@babel/parser" "^7.25.9"
-    "@babel/types" "^7.25.9"
-
-"@babel/traverse@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
-  integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==
-  dependencies:
-    "@babel/code-frame" "^7.25.9"
-    "@babel/generator" "^7.25.9"
-    "@babel/parser" "^7.25.9"
-    "@babel/template" "^7.25.9"
-    "@babel/types" "^7.25.9"
+"@babel/template@^7.24.7", "@babel/template@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
+  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
+"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490"
+  integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/parser" "^7.25.3"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.2"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.4.tgz#648678046990f2957407e3086e97044f13c3e18e"
+  integrity sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.4"
+    "@babel/parser" "^7.25.4"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.4"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.18.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.4.4":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff"
-  integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==
+"@babel/types@^7.18.6", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.4.4":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
+  integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==
   dependencies:
-    "@babel/helper-string-parser" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.25.4":
+  version "7.25.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.4.tgz#6bcb46c72fdf1012a209d016c07f769e10adcb5f"
+  integrity sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
 
 "@bufbuild/protobuf@^2.0.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-2.1.0.tgz#6925f30c25789b4f74d7c505e731c96f79fb48a7"
   integrity sha512-+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A==
 
-"@csstools/css-parser-algorithms@^3.0.0", "@csstools/css-parser-algorithms@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
-  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
+"@csstools/css-parser-algorithms@^3.0.0", "@csstools/css-parser-algorithms@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.1.tgz#f14ade63bae5f6025ac85c7d03fe47a7ca0e58af"
+  integrity sha512-lSquqZCHxDfuTg/Sk2hiS0mcSFCEBuj49JfzPHJogDBT0mGCyY5A1AQzBWngitrp7i1/HAZpIgzF/VjhOEIJIg==
 
-"@csstools/css-tokenizer@^3.0.0", "@csstools/css-tokenizer@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
-  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
+"@csstools/css-tokenizer@^3.0.0", "@csstools/css-tokenizer@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.1.tgz#9dd9b10084f3011290f96789598091e5bcb3c29a"
+  integrity sha512-UBqaiu7kU0lfvaP982/o3khfXccVlHPWp0/vwwiIgDF0GmqqqxoiXC/6FCjlS9u92f7CoEz6nXKQnrn1kIAkOw==
 
-"@csstools/media-query-list-parser@^3.0.0":
+"@csstools/media-query-list-parser@^3.0.0", "@csstools/media-query-list-parser@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz#9474e08e6d7767cf68c56bf1581b59d203360cb0"
   integrity sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==
 
-"@csstools/media-query-list-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz#e80e17eba1693fceafb8d6f2cfc68c0e7a9ab78a"
-  integrity sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==
-
-"@csstools/selector-specificity@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz#037817b574262134cabd68fc4ec1a454f168407b"
-  integrity sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==
+"@csstools/selector-specificity@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz#7dfccb9df5499e627e7bfdbb4021a06813a45dba"
+  integrity sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==
 
 "@develar/schema-utils@~2.6.5":
   version "2.6.5"
@@ -899,7 +1149,7 @@
   resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b"
   integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==
 
-"@electron/asar@^3.2.7":
+"@electron/asar@^3.2.1":
   version "3.2.13"
   resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.13.tgz#56565ea423ead184465adfa72663b2c70d9835f2"
   integrity sha512-pY5z2qQSwbFzJsBdgfJIzXf5ElHTVMutC2dxh0FD60njknMu3n1NnTABOcQwbb5/v5soqE79m9UjaJryBf3epg==
@@ -924,19 +1174,19 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/notarize@2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e"
-  integrity sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==
+"@electron/notarize@2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.1.tgz#d0aa6bc43cba830c41bfd840b85dbe0e273f59fe"
+  integrity sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==
   dependencies:
     debug "^4.1.1"
     fs-extra "^9.0.1"
     promise-retry "^2.0.1"
 
-"@electron/osx-sign@1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.1.tgz#faf7eeca7ca004a6be541dc4cf7a1bd59ec59b1c"
-  integrity sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==
+"@electron/osx-sign@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8"
+  integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==
   dependencies:
     compare-version "^0.1.2"
     debug "^4.3.4"
@@ -945,80 +1195,50 @@
     minimist "^1.2.6"
     plist "^3.0.5"
 
-"@electron/rebuild@3.6.1":
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.1.tgz#59e8e36c3f6e6b94a699425dfb61f0394c3dd4df"
-  integrity sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==
-  dependencies:
-    "@malept/cross-spawn-promise" "^2.0.0"
-    chalk "^4.0.0"
-    debug "^4.1.1"
-    detect-libc "^2.0.1"
-    fs-extra "^10.0.0"
-    got "^11.7.0"
-    node-abi "^3.45.0"
-    node-api-version "^0.2.0"
-    node-gyp "^9.0.0"
-    ora "^5.1.0"
-    read-binary-file-arch "^1.0.6"
-    semver "^7.3.5"
-    tar "^6.0.5"
-    yargs "^17.0.1"
-
-"@electron/universal@2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-2.0.1.tgz#7b070ab355e02957388f3dbd68e2c3cd08c448ae"
-  integrity sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==
+"@electron/universal@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.5.1.tgz#f338bc5bcefef88573cf0ab1d5920fac10d06ee5"
+  integrity sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==
   dependencies:
-    "@electron/asar" "^3.2.7"
-    "@malept/cross-spawn-promise" "^2.0.0"
+    "@electron/asar" "^3.2.1"
+    "@malept/cross-spawn-promise" "^1.1.0"
     debug "^4.3.1"
-    dir-compare "^4.2.0"
-    fs-extra "^11.1.1"
-    minimatch "^9.0.3"
-    plist "^3.1.0"
-
-"@es-joy/jsdoccomment@~0.49.0":
-  version "0.49.0"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.49.0.tgz#e5ec1eda837c802eca67d3b29e577197f14ba1db"
-  integrity sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==
-  dependencies:
-    comment-parser "1.4.1"
-    esquery "^1.6.0"
-    jsdoc-type-pratt-parser "~4.1.0"
+    dir-compare "^3.0.0"
+    fs-extra "^9.0.1"
+    minimatch "^3.0.4"
+    plist "^3.0.4"
 
-"@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0", "@eslint-community/eslint-utils@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56"
-  integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==
+"@eslint-community/eslint-utils@^4.1.2", "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
-    eslint-visitor-keys "^3.4.3"
+    eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0", "@eslint-community/regexpp@^4.12.1":
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
-  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
+"@eslint-community/regexpp@^4.6.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/config-array@^0.19.0":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.1.tgz#734aaea2c40be22bbb1f2a9dac687c57a6a4c984"
-  integrity sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
-    "@eslint/object-schema" "^2.1.5"
-    debug "^4.3.1"
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
     minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
 
-"@eslint/core@^0.9.0":
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.1.tgz#31763847308ef6b7084a4505573ac9402c51f9d1"
-  integrity sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==
-  dependencies:
-    "@types/json-schema" "^7.0.15"
-
-"@eslint/eslintrc@^3.0.0", "@eslint/eslintrc@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c"
-  integrity sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==
+"@eslint/eslintrc@^3.0.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
+  integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1030,125 +1250,94 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.17.0", "@eslint/js@^9.17.0":
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.17.0.tgz#1523e586791f80376a6f8398a3964455ecc651ec"
-  integrity sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==
-
-"@eslint/object-schema@^2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.5.tgz#8670a8f6258a2be5b2c620ff314a1d984c23eb2e"
-  integrity sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==
-
-"@eslint/plugin-kit@^0.2.3":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz#2b78e7bb3755784bb13faa8932a1d994d6537792"
-  integrity sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==
-  dependencies:
-    levn "^0.4.1"
+"@eslint/js@8.57.1":
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
+  integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
 "@fastify/busboy@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
   integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
 
-"@fortawesome/fontawesome-common-types@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.1.tgz#6201640f39fdcf8e41cd9d1a92b2da3a96817fa4"
-  integrity sha512-gbDz3TwRrIPT3i0cDfujhshnXO9z03IT1UKRIVi/VEjpNHtSBIP2o5XSm+e816FzzCFEzAxPw09Z13n20PaQJQ==
+"@fortawesome/fontawesome-common-types@6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.6.0.tgz#31ab07ca6a06358c5de4d295d4711b675006163f"
+  integrity sha512-xyX0X9mc0kyz9plIyryrRbl7ngsA9jz77mCZJsUkLl+ZKs0KWObgaEBoSgQiYWAsSmjz/yjl0F++Got0Mdp4Rw==
 
-"@fortawesome/fontawesome-svg-core@^6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.1.tgz#1f8ebb6f35cf02f89c110198514e848de17ac99e"
-  integrity sha512-8dBIHbfsKlCk2jHQ9PoRBg2Z+4TwyE3vZICSnoDlnsHA6SiMlTwfmW6yX0lHsRmWJugkeb92sA0hZdkXJhuz+g==
+"@fortawesome/fontawesome-svg-core@^6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.6.0.tgz#2a24c32ef92136e98eae2ff334a27145188295ff"
+  integrity sha512-KHwPkCk6oRT4HADE7smhfsKudt9N/9lm6EJ5BVg0tD1yPA5hht837fB87F8pn15D8JfTqQOjhKTktwmLMiD7Kg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.7.1"
+    "@fortawesome/fontawesome-common-types" "6.6.0"
 
-"@fortawesome/free-brands-svg-icons@^6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.7.1.tgz#1c1bbbac3ab897d02322b18fbbdf4d9b67ec1619"
-  integrity sha512-nJR76eqPzCnMyhbiGf6X0aclDirZriTPRcFm1YFvuupyJOGwlNF022w3YBqu+yrHRhnKRpzFX+8wJKqiIjWZkA==
+"@fortawesome/free-brands-svg-icons@^6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.6.0.tgz#2797f2cc66d21e7e47fa64e680b8835e8d30e825"
+  integrity sha512-1MPD8lMNW/earme4OQi1IFHtmHUwAKgghXlNwWi9GO7QkTfD+IIaYpIai4m2YJEzqfEji3jFHX1DZI5pbY/biQ==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.7.1"
+    "@fortawesome/fontawesome-common-types" "6.6.0"
 
-"@fortawesome/free-regular-svg-icons@^6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.1.tgz#d7ec06f896ee91116a388a5a234cd26420ccdfe4"
-  integrity sha512-e13cp+bAx716RZOTQ59DhqikAgETA9u1qTBHO3e3jMQQ+4H/N1NC1ZVeFYt1V0m+Th68BrEL1/X6XplISutbXg==
+"@fortawesome/free-regular-svg-icons@^6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.6.0.tgz#fc49a947ac8dfd20403c9ea5f37f0919425bdf04"
+  integrity sha512-Yv9hDzL4aI73BEwSEh20clrY8q/uLxawaQ98lekBx6t9dQKDHcDzzV1p2YtBGTtolYtNqcWdniOnhzB+JPnQEQ==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.7.1"
+    "@fortawesome/fontawesome-common-types" "6.6.0"
 
-"@fortawesome/free-solid-svg-icons@^6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.1.tgz#c1f9a6c25562a12c283e87e284f9d82a5b0dbcc0"
-  integrity sha512-BTKc0b0mgjWZ2UDKVgmwaE0qt0cZs6ITcDgjrti5f/ki7aF5zs+N91V6hitGo3TItCFtnKg6cUVGdTmBFICFRg==
+"@fortawesome/free-solid-svg-icons@^6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.6.0.tgz#061751ca43be4c4d814f0adbda8f006164ec9f3b"
+  integrity sha512-IYv/2skhEDFc2WGUcqvFJkeK39Q+HyPf5GHUrT/l2pKbtgEIv1al1TKd6qStR5OIwQdN1GZP54ci3y4mroJWjA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.7.1"
+    "@fortawesome/fontawesome-common-types" "6.6.0"
 
 "@fortawesome/vue-fontawesome@^2.0.10":
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.10.tgz#b10721425d7efdee6d83fba21c64cad86fa51904"
   integrity sha512-OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg==
 
-"@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
-"@humanfs/core@^0.19.1":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
-  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
-
-"@humanfs/node@^0.16.6":
-  version "0.16.6"
-  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
-  integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
   dependencies:
-    "@humanfs/core" "^0.19.1"
-    "@humanwhocodes/retry" "^0.3.0"
-
-"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
-  integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
+    "@humanwhocodes/object-schema" "^2.0.3"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/retry@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
-  integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==
-
-"@humanwhocodes/retry@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b"
-  integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==
+"@humanwhocodes/object-schema@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@intlify/core-base@^9.12.0":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.14.2.tgz#2c074506ea72425e937f911c95c0d845b43f7fdf"
-  integrity sha512-DZyQ4Hk22sC81MP4qiCDuU+LdaYW91A6lCjq8AWPvY3+mGMzhGDfOCzvyR6YBQxtlPjFqMoFk9ylnNYRAQwXtQ==
+  version "9.13.1"
+  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.13.1.tgz#bd1f38e665095993ef9b67aeeb794f3cabcb515d"
+  integrity sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==
   dependencies:
-    "@intlify/message-compiler" "9.14.2"
-    "@intlify/shared" "9.14.2"
+    "@intlify/message-compiler" "9.13.1"
+    "@intlify/shared" "9.13.1"
 
-"@intlify/eslint-plugin-vue-i18n@^3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@intlify/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-3.2.0.tgz#5213e9eda3c4b1391630ee31b654f9ff705918fb"
-  integrity sha512-TOIrD4tJE48WMyVIB8bNeQJJPYo1Prpqnm9Xpn1UZmcqlELhm8hmP8QyJnkgesfbG7hyiX/kvo63W7ClEQmhpg==
+"@intlify/eslint-plugin-vue-i18n@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@intlify/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-3.0.0.tgz#3714d15038b805e3755ef2180e0129ce09cb64ad"
+  integrity sha512-s4fe+VOiqMZGhDrXWnL1xLyHbcFWBcEBeD/KpVrkOtL+utH2LPTi7uZ8RvWSthMS0mUL/7L74hFJ//OUU7AYww==
   dependencies:
     "@eslint/eslintrc" "^3.0.0"
     "@intlify/core-base" "^9.12.0"
     "@intlify/message-compiler" "^9.12.0"
     debug "^4.3.4"
-    eslint-compat-utils "^0.6.0"
+    eslint-compat-utils "^0.5.0"
     glob "^10.3.3"
     globals "^15.0.0"
-    ignore "^6.0.0"
+    ignore "^5.2.4"
     import-fresh "^3.3.0"
     is-language-code "^3.1.0"
     js-yaml "^4.1.0"
@@ -1161,18 +1350,18 @@
     vue-eslint-parser "^9.3.1"
     yaml-eslint-parser "^1.2.2"
 
-"@intlify/message-compiler@9.14.2", "@intlify/message-compiler@^9.12.0":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.14.2.tgz#7217842ea1875d80bbf0f708e9b3ef5ad7c57a03"
-  integrity sha512-YsKKuV4Qv4wrLNsvgWbTf0E40uRv+Qiw1BeLQ0LAxifQuhiMe+hfTIzOMdWj/ZpnTDj4RSZtkXjJM7JDiiB5LQ==
+"@intlify/message-compiler@9.13.1", "@intlify/message-compiler@^9.12.0":
+  version "9.13.1"
+  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.13.1.tgz#ff8129badf77db3fb648b8d3cceee87c8033ed0a"
+  integrity sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==
   dependencies:
-    "@intlify/shared" "9.14.2"
+    "@intlify/shared" "9.13.1"
     source-map-js "^1.0.2"
 
-"@intlify/shared@9.14.2":
-  version "9.14.2"
-  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.14.2.tgz#f7dceea32db44c9253e3f965745a42a5cb3a1883"
-  integrity sha512-uRAHAxYPeF+G5DBIboKpPgC/Waecd4Jz8ihtkpJQD5ycb5PwXp0k/+hBGl5dAjwF7w+l74kz/PKA8r8OK//RUw==
+"@intlify/shared@9.13.1":
+  version "9.13.1"
+  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.13.1.tgz#202741d11ece1a9c7480bfd3f27afcf9cb8f72e4"
+  integrity sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
@@ -1290,10 +1479,10 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@malept/cross-spawn-promise@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d"
-  integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==
+"@malept/cross-spawn-promise@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
+  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
   dependencies:
     cross-spawn "^7.0.1"
 
@@ -1307,6 +1496,13 @@
     lodash "^4.17.15"
     tmp-promise "^3.0.2"
 
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1320,7 +1516,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1328,110 +1524,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@nolyfill/is-core-module@1.0.39":
-  version "1.0.39"
-  resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e"
-  integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==
-
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@parcel/watcher-android-arm64@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
-  integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==
-
-"@parcel/watcher-darwin-arm64@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34"
-  integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==
-
-"@parcel/watcher-darwin-x64@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020"
-  integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==
-
-"@parcel/watcher-freebsd-x64@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8"
-  integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==
-
-"@parcel/watcher-linux-arm-glibc@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d"
-  integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==
-
-"@parcel/watcher-linux-arm64-glibc@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7"
-  integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==
-
-"@parcel/watcher-linux-arm64-musl@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635"
-  integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==
-
-"@parcel/watcher-linux-x64-glibc@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39"
-  integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==
-
-"@parcel/watcher-linux-x64-musl@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16"
-  integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==
-
-"@parcel/watcher-win32-arm64@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc"
-  integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==
-
-"@parcel/watcher-win32-ia32@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7"
-  integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==
-
-"@parcel/watcher-win32-x64@2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf"
-  integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==
-
-"@parcel/watcher@^2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8"
-  integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==
-  dependencies:
-    detect-libc "^1.0.3"
-    is-glob "^4.0.3"
-    micromatch "^4.0.5"
-    node-addon-api "^7.0.0"
-  optionalDependencies:
-    "@parcel/watcher-android-arm64" "2.4.1"
-    "@parcel/watcher-darwin-arm64" "2.4.1"
-    "@parcel/watcher-darwin-x64" "2.4.1"
-    "@parcel/watcher-freebsd-x64" "2.4.1"
-    "@parcel/watcher-linux-arm-glibc" "2.4.1"
-    "@parcel/watcher-linux-arm64-glibc" "2.4.1"
-    "@parcel/watcher-linux-arm64-musl" "2.4.1"
-    "@parcel/watcher-linux-x64-glibc" "2.4.1"
-    "@parcel/watcher-linux-x64-musl" "2.4.1"
-    "@parcel/watcher-win32-arm64" "2.4.1"
-    "@parcel/watcher-win32-ia32" "2.4.1"
-    "@parcel/watcher-win32-x64" "2.4.1"
-
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -1442,6 +1534,11 @@
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
   integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
 
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
 "@seald-io/binary-search-tree@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz#165a9a456eaa30d15885b25db83861bcce2c6a74"
@@ -1471,17 +1568,6 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz#9cd84cc15bc865a5ca35fcaae198eb899f7b5c90"
   integrity sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==
 
-"@stylistic/eslint-plugin@2.11.0":
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-2.11.0.tgz#50d0289f36f7201055b7fa1729fdc1d8c46e93fa"
-  integrity sha512-PNRHbydNG5EH8NK4c+izdJlxajIR6GxcUhzsYNRsn6Myep4dsZt0qFCz3rCPnkvgO5FYibDcMqgNHUT+zvjYZw==
-  dependencies:
-    "@typescript-eslint/utils" "^8.13.0"
-    eslint-visitor-keys "^4.2.0"
-    espree "^10.3.0"
-    estraverse "^5.3.0"
-    picomatch "^4.0.2"
-
 "@stylistic/stylelint-plugin@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@stylistic/stylelint-plugin/-/stylelint-plugin-3.0.1.tgz#3521534c545808ebf9870c074d42579cc6bd9c67"
@@ -1560,26 +1646,10 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/eslint-scope@^3.7.7":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
-  integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
-  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+"@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/express-serve-static-core@*":
   version "4.17.28"
@@ -1666,10 +1736,15 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
 "@types/keyv@^3.1.4":
   version "3.1.4"
@@ -1809,131 +1884,10 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@8.18.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.18.0.tgz#0901933326aea4443b81df3f740ca7dfc45c7bea"
-  integrity sha512-NR2yS7qUqCL7AIxdJUQf2MKKNDVNaig/dEB0GBLU7D+ZdHgK1NoH/3wsgO3OnPVipn51tG3MAwaODEGil70WEw==
-  dependencies:
-    "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.18.0"
-    "@typescript-eslint/type-utils" "8.18.0"
-    "@typescript-eslint/utils" "8.18.0"
-    "@typescript-eslint/visitor-keys" "8.18.0"
-    graphemer "^1.4.0"
-    ignore "^5.3.1"
-    natural-compare "^1.4.0"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/parser@8.18.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.18.0.tgz#a1c9456cbb6a089730bf1d3fc47946c5fb5fe67b"
-  integrity sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==
-  dependencies:
-    "@typescript-eslint/scope-manager" "8.18.0"
-    "@typescript-eslint/types" "8.18.0"
-    "@typescript-eslint/typescript-estree" "8.18.0"
-    "@typescript-eslint/visitor-keys" "8.18.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@8.17.0":
-  version "8.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.17.0.tgz#a3f49bf3d4d27ff8d6b2ea099ba465ef4dbcaa3a"
-  integrity sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==
-  dependencies:
-    "@typescript-eslint/types" "8.17.0"
-    "@typescript-eslint/visitor-keys" "8.17.0"
-
-"@typescript-eslint/scope-manager@8.18.0", "@typescript-eslint/scope-manager@^8.1.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz#30b040cb4557804a7e2bcc65cf8fdb630c96546f"
-  integrity sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==
-  dependencies:
-    "@typescript-eslint/types" "8.18.0"
-    "@typescript-eslint/visitor-keys" "8.18.0"
-
-"@typescript-eslint/type-utils@8.18.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.18.0.tgz#6f0d12cf923b6fd95ae4d877708c0adaad93c471"
-  integrity sha512-er224jRepVAVLnMF2Q7MZJCq5CsdH2oqjP4dT7K6ij09Kyd+R21r7UVJrF0buMVdZS5QRhDzpvzAxHxabQadow==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "8.18.0"
-    "@typescript-eslint/utils" "8.18.0"
-    debug "^4.3.4"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/types@8.17.0":
-  version "8.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.17.0.tgz#ef84c709ef8324e766878834970bea9a7e3b72cf"
-  integrity sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==
-
-"@typescript-eslint/types@8.18.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.18.0.tgz#3afcd30def8756bc78541268ea819a043221d5f3"
-  integrity sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==
-
-"@typescript-eslint/typescript-estree@8.17.0":
-  version "8.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.17.0.tgz#40b5903bc929b1e8dd9c77db3cb52cfb199a2a34"
-  integrity sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==
-  dependencies:
-    "@typescript-eslint/types" "8.17.0"
-    "@typescript-eslint/visitor-keys" "8.17.0"
-    debug "^4.3.4"
-    fast-glob "^3.3.2"
-    is-glob "^4.0.3"
-    minimatch "^9.0.4"
-    semver "^7.6.0"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/typescript-estree@8.18.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz#d8ca785799fbb9c700cdff1a79c046c3e633c7f9"
-  integrity sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==
-  dependencies:
-    "@typescript-eslint/types" "8.18.0"
-    "@typescript-eslint/visitor-keys" "8.18.0"
-    debug "^4.3.4"
-    fast-glob "^3.3.2"
-    is-glob "^4.0.3"
-    minimatch "^9.0.4"
-    semver "^7.6.0"
-    ts-api-utils "^1.3.0"
-
-"@typescript-eslint/utils@8.18.0", "@typescript-eslint/utils@^8.1.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.18.0.tgz#48f67205d42b65d895797bb7349d1be5c39a62f7"
-  integrity sha512-p6GLdY383i7h5b0Qrfbix3Vc3+J2k6QWw6UMUeY5JGfm3C5LbZ4QIZzJNoNOfgyRe0uuYKjvVOsO/jD4SJO+xg==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.18.0"
-    "@typescript-eslint/types" "8.18.0"
-    "@typescript-eslint/typescript-estree" "8.18.0"
-
-"@typescript-eslint/utils@^8.13.0":
-  version "8.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.17.0.tgz#41c05105a2b6ab7592f513d2eeb2c2c0236d8908"
-  integrity sha512-bQC8BnEkxqG8HBGKwG9wXlZqg37RKSMY7v/X8VEWD8JG2JuTHuNK0VFvMPMUKQcbk6B+tf05k+4AShAEtCtJ/w==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.17.0"
-    "@typescript-eslint/types" "8.17.0"
-    "@typescript-eslint/typescript-estree" "8.17.0"
-
-"@typescript-eslint/visitor-keys@8.17.0":
-  version "8.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.17.0.tgz#4dbcd0e28b9bf951f4293805bf34f98df45e1aa8"
-  integrity sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==
-  dependencies:
-    "@typescript-eslint/types" "8.17.0"
-    eslint-visitor-keys "^4.2.0"
-
-"@typescript-eslint/visitor-keys@8.18.0":
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz#7b6d33534fa808e33a19951907231ad2ea5c36dd"
-  integrity sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==
-  dependencies:
-    "@typescript-eslint/types" "8.18.0"
-    eslint-visitor-keys "^4.2.0"
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
 "@vue/compiler-sfc@2.7.16":
   version "2.7.16"
@@ -1962,125 +1916,125 @@
   optionalDependencies:
     prettier "^1.18.2 || ^2.0.0"
 
-"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6"
-  integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.13.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
 
-"@webassemblyjs/floating-point-hex-parser@1.13.2":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb"
-  integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
 
-"@webassemblyjs/helper-api-error@1.13.2":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7"
-  integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b"
-  integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==
+"@webassemblyjs/helper-buffer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
 
-"@webassemblyjs/helper-numbers@1.13.2":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d"
-  integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.13.2"
-    "@webassemblyjs/helper-api-error" "1.13.2"
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.13.2":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b"
-  integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348"
-  integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==
+"@webassemblyjs/helper-wasm-section@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
   dependencies:
-    "@webassemblyjs/ast" "1.14.1"
-    "@webassemblyjs/helper-buffer" "1.14.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
-    "@webassemblyjs/wasm-gen" "1.14.1"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
 
-"@webassemblyjs/ieee754@1.13.2":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba"
-  integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.13.2":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0"
-  integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.13.2":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1"
-  integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==
-
-"@webassemblyjs/wasm-edit@^1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597"
-  integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.14.1"
-    "@webassemblyjs/helper-buffer" "1.14.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
-    "@webassemblyjs/helper-wasm-section" "1.14.1"
-    "@webassemblyjs/wasm-gen" "1.14.1"
-    "@webassemblyjs/wasm-opt" "1.14.1"
-    "@webassemblyjs/wasm-parser" "1.14.1"
-    "@webassemblyjs/wast-printer" "1.14.1"
-
-"@webassemblyjs/wasm-gen@1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570"
-  integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==
-  dependencies:
-    "@webassemblyjs/ast" "1.14.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
-    "@webassemblyjs/ieee754" "1.13.2"
-    "@webassemblyjs/leb128" "1.13.2"
-    "@webassemblyjs/utf8" "1.13.2"
-
-"@webassemblyjs/wasm-opt@1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b"
-  integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==
-  dependencies:
-    "@webassemblyjs/ast" "1.14.1"
-    "@webassemblyjs/helper-buffer" "1.14.1"
-    "@webassemblyjs/wasm-gen" "1.14.1"
-    "@webassemblyjs/wasm-parser" "1.14.1"
-
-"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb"
-  integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.14.1"
-    "@webassemblyjs/helper-api-error" "1.13.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.13.2"
-    "@webassemblyjs/ieee754" "1.13.2"
-    "@webassemblyjs/leb128" "1.13.2"
-    "@webassemblyjs/utf8" "1.13.2"
-
-"@webassemblyjs/wast-printer@1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07"
-  integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==
-  dependencies:
-    "@webassemblyjs/ast" "1.14.1"
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-opt" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/wast-printer" "1.12.1"
+
+"@webassemblyjs/wasm-gen@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wasm-opt@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wast-printer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^2.1.1":
@@ -2113,11 +2067,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abbrev@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -2126,45 +2075,28 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.14.0, acorn@^8.5.0, acorn@^8.8.0, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
-  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
+acorn@^8.11.3, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
-agent-base@6, agent-base@^6.0.2:
+agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
-agent-base@^7.0.2, agent-base@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
-  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
-  dependencies:
-    debug "^4.3.4"
-
-agentkeepalive@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -2219,6 +2151,13 @@ ansi-regex@^6.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -2239,67 +2178,44 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-builder-bin@5.0.0-alpha.10:
-  version "5.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz#cf12e593b6b847fb9d04027fa755c6c6610d778b"
-  integrity sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==
+app-builder-bin@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
+  integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@25.1.8:
-  version "25.1.8"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.1.8.tgz#ae376039c5f269c7d562af494a087e5bc6310f1b"
-  integrity sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==
+app-builder-lib@24.13.3:
+  version "24.13.3"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.13.3.tgz#36e47b65fecb8780bb73bff0fee4e0480c28274b"
+  integrity sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==
   dependencies:
     "@develar/schema-utils" "~2.6.5"
-    "@electron/notarize" "2.5.0"
-    "@electron/osx-sign" "1.3.1"
-    "@electron/rebuild" "3.6.1"
-    "@electron/universal" "2.0.1"
+    "@electron/notarize" "2.2.1"
+    "@electron/osx-sign" "1.0.5"
+    "@electron/universal" "1.5.1"
     "@malept/flatpak-bundler" "^0.4.0"
     "@types/fs-extra" "9.0.13"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    builder-util "24.13.1"
+    builder-util-runtime "9.2.4"
     chromium-pickle-js "^0.2.0"
-    config-file-ts "0.2.8-rc1"
     debug "^4.3.4"
-    dotenv "^16.4.5"
-    dotenv-expand "^11.0.6"
     ejs "^3.1.8"
-    electron-publish "25.1.7"
+    electron-publish "24.13.1"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
     is-ci "^3.0.0"
     isbinaryfile "^5.0.0"
     js-yaml "^4.1.0"
-    json5 "^2.2.3"
     lazy-val "^1.0.5"
-    minimatch "^10.0.0"
-    resedit "^1.7.0"
+    minimatch "^5.1.1"
+    read-config-file "6.3.2"
     sanitize-filename "^1.6.3"
     semver "^7.3.8"
     tar "^6.1.12"
     temp-file "^3.4.0"
 
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-are-docs-informative@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
-  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
-
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2333,7 +2249,7 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-array-includes@^3.1.6, array-includes@^3.1.8:
+array-includes@^3.1.8:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
   integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
@@ -2350,10 +2266,10 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.findlast@^1.2.5:
+array.prototype.findlastindex@^1.2.5:
   version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"
-  integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
+  integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
   dependencies:
     call-bind "^1.0.7"
     define-properties "^1.2.1"
@@ -2362,7 +2278,7 @@ array.prototype.findlast@^1.2.5:
     es-object-atoms "^1.0.0"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.flat@^1.3.1:
+array.prototype.flat@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
   integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
@@ -2382,17 +2298,6 @@ array.prototype.flatmap@^1.3.2:
     es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.tosorted@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"
-  integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.3"
-    es-errors "^1.3.0"
-    es-shim-unscopables "^1.0.2"
-
 arraybuffer.prototype.slice@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
@@ -2531,15 +2436,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bl@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
-  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
-  dependencies:
-    buffer "^5.5.0"
-    inherits "^2.0.4"
-    readable-stream "^3.4.0"
-
 bluebird-lst@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c"
@@ -2610,13 +2506,13 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.23.0, browserslist@^4.23.3, browserslist@^4.24.0:
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4"
-  integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==
+browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.23.0, browserslist@^4.23.1, browserslist@^4.23.3:
+  version "4.23.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
+  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
   dependencies:
-    caniuse-lite "^1.0.30001663"
-    electron-to-chromium "^1.5.28"
+    caniuse-lite "^1.0.30001646"
+    electron-to-chromium "^1.5.4"
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.0"
 
@@ -2625,12 +2521,17 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
+buffer-equal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
+  integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.1.0, buffer@^5.5.0:
+buffer@^5.1.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2638,30 +2539,30 @@ buffer@^5.1.0, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builder-util-runtime@9.2.10:
-  version "9.2.10"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz#a0f7d9e214158402e78b74a745c8d9f870c604bc"
-  integrity sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==
+builder-util-runtime@9.2.4:
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a"
+  integrity sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@25.1.7:
-  version "25.1.7"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-25.1.7.tgz#a07b404f0cb1a635aa165902be65297d58932ff8"
-  integrity sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==
+builder-util@24.13.1:
+  version "24.13.1"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.13.1.tgz#4a4c4f9466b016b85c6990a0ea15aa14edec6816"
+  integrity sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==
   dependencies:
     "7zip-bin" "~5.2.0"
     "@types/debug" "^4.1.6"
-    app-builder-bin "5.0.0-alpha.10"
+    app-builder-bin "4.0.0"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "9.2.10"
+    builder-util-runtime "9.2.4"
     chalk "^4.1.2"
     cross-spawn "^7.0.3"
     debug "^4.3.4"
     fs-extra "^10.1.0"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-ci "^3.0.0"
     js-yaml "^4.1.0"
     source-map-support "^0.5.19"
@@ -2690,30 +2591,6 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
-
 cacheable-lookup@^5.0.3:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
@@ -2788,12 +2665,21 @@ caniuse-lite@^1.0.0:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz"
   integrity sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==
 
-caniuse-lite@^1.0.30001663:
-  version "1.0.30001667"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz#99fc5ea0d9c6e96897a104a8352604378377f949"
-  integrity sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==
+caniuse-lite@^1.0.30001646:
+  version "1.0.30001653"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56"
+  integrity sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2862,23 +2748,6 @@ clean-regexp@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-spinners@^2.5.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
-  integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
-
 cli-truncate@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
@@ -2920,10 +2789,12 @@ clone-response@^1.0.2:
   dependencies:
     mimic-response "^1.0.0"
 
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
@@ -2932,16 +2803,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
 color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
@@ -2984,11 +2855,6 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-comment-parser@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
-  integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
-
 common-path-prefix@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
@@ -3024,24 +2890,19 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-config-file-ts@0.2.8-rc1:
-  version "0.2.8-rc1"
-  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz#fb7fc6ccb2e313f69dbeb78f1db0b00038049de0"
-  integrity sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==
+config-file-ts@^0.2.4:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.6.tgz#b424ff74612fb37f626d6528f08f92ddf5d22027"
+  integrity sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==
   dependencies:
-    glob "^10.3.12"
-    typescript "^5.4.3"
+    glob "^10.3.10"
+    typescript "^5.3.3"
 
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
   integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -3076,10 +2937,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
-  integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 copy-webpack-plugin@^12.0.2:
   version "12.0.2"
@@ -3093,7 +2954,7 @@ copy-webpack-plugin@^12.0.2:
     schema-utils "^4.2.0"
     serialize-javascript "^6.0.2"
 
-core-js-compat@^3.38.0, core-js-compat@^3.38.1:
+core-js-compat@^3.37.0, core-js-compat@^3.37.1, core-js-compat@^3.38.0:
   version "3.38.1"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.38.1.tgz#2bc7a298746ca5a7bcb9c164bcb120f2ebc09a09"
   integrity sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==
@@ -3127,10 +2988,10 @@ crc@^3.8.0:
   dependencies:
     buffer "^5.1.0"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3, cross-spawn@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -3141,10 +3002,10 @@ css-declaration-sorter@^7.2.0:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024"
   integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==
 
-css-functions-list@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.3.tgz#95652b0c24f0f59b291a9fc386041a19d4f40dbe"
-  integrity sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==
+css-functions-list@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.2.tgz#9a54c6dd8416ed25c1079cd88234e927526c1922"
+  integrity sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==
 
 css-loader@^7.1.2:
   version "7.1.2"
@@ -3202,14 +3063,6 @@ css-tree@^2.3.1:
     mdn-data "2.0.30"
     source-map-js "^1.0.1"
 
-css-tree@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-3.0.1.tgz#bea6deaea60bb5bcf416adfb1ecf607a8d9471f6"
-  integrity sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==
-  dependencies:
-    mdn-data "2.12.1"
-    source-map-js "^1.0.1"
-
 css-tree@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
@@ -3323,12 +3176,12 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.6, debug@^4.3.7:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
-  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
   dependencies:
-    ms "^2.1.3"
+    ms "2.1.2"
 
 debug@^3.2.7:
   version "3.2.7"
@@ -3362,13 +3215,6 @@ default-browser@^5.2.1:
     bundle-name "^4.1.0"
     default-browser-id "^5.0.0"
 
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
 defer-to-connect@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
@@ -3427,11 +3273,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -3452,28 +3293,18 @@ destroy@1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-detect-libc@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
-
-detect-libc@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
-  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
-
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-dir-compare@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-4.2.0.tgz#d1d4999c14fbf55281071fdae4293b3b9ce86f19"
-  integrity sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==
+dir-compare@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416"
+  integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==
   dependencies:
-    minimatch "^3.0.5"
-    p-limit "^3.1.0 "
+    buffer-equal "^1.0.0"
+    minimatch "^3.0.4"
 
 dir-glob@^3.0.1:
   version "3.0.1"
@@ -3482,14 +3313,14 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@25.1.8:
-  version "25.1.8"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.1.8.tgz#41f3b725edd896156e891016a44129e1bd580430"
-  integrity sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==
+dmg-builder@24.13.3:
+  version "24.13.3"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.13.3.tgz#95d5b99c587c592f90d168a616d7ec55907c7e55"
+  integrity sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==
   dependencies:
-    app-builder-lib "25.1.8"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    app-builder-lib "24.13.3"
+    builder-util "24.13.1"
+    builder-util-runtime "9.2.4"
     fs-extra "^10.1.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -3601,17 +3432,15 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dotenv-expand@^11.0.6:
-  version "11.0.6"
-  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-11.0.6.tgz#f2c840fd924d7c77a94eff98f153331d876882d3"
-  integrity sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==
-  dependencies:
-    dotenv "^16.4.4"
+dotenv-expand@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
+  integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv@^16.4.4, dotenv@^16.4.5:
-  version "16.4.5"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
-  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
+dotenv@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
+  integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
 
 eastasianwidth@^0.2.0:
   version "0.2.0"
@@ -3630,19 +3459,20 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^25.1.8:
-  version "25.1.8"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.1.8.tgz#b0e310f1600787610bb84c3f39bc7aadb2548486"
-  integrity sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==
+electron-builder@^24.13.3:
+  version "24.13.3"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.13.3.tgz#c506dfebd36d9a50a83ee8aa32d803d83dbe4616"
+  integrity sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==
   dependencies:
-    app-builder-lib "25.1.8"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    app-builder-lib "24.13.3"
+    builder-util "24.13.1"
+    builder-util-runtime "9.2.4"
     chalk "^4.1.2"
-    dmg-builder "25.1.8"
+    dmg-builder "24.13.3"
     fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
+    read-config-file "6.3.2"
     simple-update-notifier "2.0.0"
     yargs "^17.6.2"
 
@@ -3669,37 +3499,37 @@ electron-is-dev@^3.0.1:
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-3.0.1.tgz#1cbc79b1dd046787903acd357efdfab6549dc17a"
   integrity sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q==
 
-electron-publish@25.1.7:
-  version "25.1.7"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.1.7.tgz#14e50c2a3fafdc1c454eadbbc47ead89a48bb554"
-  integrity sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==
+electron-publish@24.13.1:
+  version "24.13.1"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.13.1.tgz#57289b2f7af18737dc2ad134668cdd4a1b574a0c"
+  integrity sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    builder-util "24.13.1"
+    builder-util-runtime "9.2.4"
     chalk "^4.1.2"
     fs-extra "^10.1.0"
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
-electron-to-chromium@^1.5.28:
-  version "1.5.32"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz#4a05ee78e29e240aabaf73a67ce9fe73f52e1bc7"
-  integrity sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==
+electron-to-chromium@^1.5.4:
+  version "1.5.13"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6"
+  integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==
 
-electron@^33.2.1:
-  version "33.2.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-33.2.1.tgz#d0d7bba7a7abf4f14881d0a6e03c498b301a2d5f"
-  integrity sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==
+electron@^32.1.2:
+  version "32.1.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-32.1.2.tgz#84d1efd95d41224e58a6a9bbd1db4ba80154fc02"
+  integrity sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"
     extract-zip "^2.0.1"
 
-eme-encryption-scheme-polyfill@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.6.tgz#7a0df1d3b64f7a5486ea1af2e1483e483a20d547"
-  integrity sha512-SmQ8UxDkH/8hrjLo6ASo452hIe4dSJzqKmJyrNsvUciEJNxf4z9hewIwF1k/c7A5uRk4GApavPZ6dgqXqfvegw==
+eme-encryption-scheme-polyfill@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.1.5.tgz#86338bdd3b13f04ba02fa36758501c7c6c122efe"
+  integrity sha512-z9BKXV4TCYjmar0wiZLObZ0J8HE13VIg7Zq/iyPWdbEfROtxVXEJalknWKtBR5XNezzy15/zWS964TGbcAWlPg==
 
 emoji-regex@^10.0.0, emoji-regex@^10.3.0:
   version "10.3.0"
@@ -3731,13 +3561,6 @@ encodeurl@~2.0.0:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
   integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
 
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -3745,7 +3568,7 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.15.0, enhanced-resolve@^5.17.1:
+enhanced-resolve@^5.17.0, enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -3790,58 +3613,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.5, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
-  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
-  dependencies:
-    array-buffer-byte-length "^1.0.1"
-    arraybuffer.prototype.slice "^1.0.3"
-    available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    data-view-buffer "^1.0.1"
-    data-view-byte-length "^1.0.1"
-    data-view-byte-offset "^1.0.0"
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    es-set-tostringtag "^2.0.3"
-    es-to-primitive "^1.2.1"
-    function.prototype.name "^1.1.6"
-    get-intrinsic "^1.2.4"
-    get-symbol-description "^1.0.2"
-    globalthis "^1.0.3"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
-    has-proto "^1.0.3"
-    has-symbols "^1.0.3"
-    hasown "^2.0.2"
-    internal-slot "^1.0.7"
-    is-array-buffer "^3.0.4"
-    is-callable "^1.2.7"
-    is-data-view "^1.0.1"
-    is-negative-zero "^2.0.3"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.3"
-    is-string "^1.0.7"
-    is-typed-array "^1.1.13"
-    is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
-    object-keys "^1.1.1"
-    object.assign "^4.1.5"
-    regexp.prototype.flags "^1.5.2"
-    safe-array-concat "^1.1.2"
-    safe-regex-test "^1.0.3"
-    string.prototype.trim "^1.2.9"
-    string.prototype.trimend "^1.0.8"
-    string.prototype.trimstart "^1.0.8"
-    typed-array-buffer "^1.0.2"
-    typed-array-byte-length "^1.0.1"
-    typed-array-byte-offset "^1.0.2"
-    typed-array-length "^1.0.6"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.15"
-
 es-abstract@^1.19.0, es-abstract@^1.19.5:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.0.tgz#b2d526489cceca004588296334726329e0a6bfb6"
@@ -3946,43 +3717,74 @@ es-abstract@^1.22.1:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.13"
 
-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
-
-es-errors@^1.2.1, es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
-es-iterator-helpers@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz#2f1a3ab998b30cb2d10b195b587c6d9ebdebf152"
-  integrity sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==
+es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
   dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
     call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.3"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
     es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
     es-set-tostringtag "^2.0.3"
-    function-bind "^1.1.2"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
     get-intrinsic "^1.2.4"
-    globalthis "^1.0.4"
+    get-symbol-description "^1.0.2"
+    globalthis "^1.0.3"
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
     has-proto "^1.0.3"
     has-symbols "^1.0.3"
+    hasown "^2.0.2"
     internal-slot "^1.0.7"
-    iterator.prototype "^1.1.3"
+    is-array-buffer "^3.0.4"
+    is-callable "^1.2.7"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.3"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.13"
+    is-weakref "^1.0.2"
+    object-inspect "^1.13.1"
+    object-keys "^1.1.1"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
     safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.6"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.15"
+
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.2.1, es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-module-lexer@^1.2.1, es-module-lexer@^1.5.3:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
-  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
+es-module-lexer@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.2.1.tgz#ba303831f63e6a394983fde2f97ad77b22324527"
+  integrity sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==
 
 es-object-atoms@^1.0.0:
   version "1.0.0"
@@ -4072,20 +3874,28 @@ escape-string-regexp@^5.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
   integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
 
-eslint-compat-utils@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz#7fc92b776d185a70c4070d03fd26fde3d59652e4"
-  integrity sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==
-  dependencies:
-    semver "^7.5.4"
+eslint-compat-utils@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz#f45e3b5ced4c746c127cf724fb074cd4e730d653"
+  integrity sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==
 
-eslint-compat-utils@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.6.0.tgz#d7beb1bdefd91c3753bf2fa050575d8b755d6845"
-  integrity sha512-1vVBdI/HLS6HTHVQCJGlN+LOF0w1Rs/WB9se23mQr84cRM0iMM8PulMFFhQdQ1BvS0cGwjpis4xziI91Rk0l6g==
+eslint-compat-utils@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.0.tgz#f7b2eb2befec25a370fac76934d3f9189f312a65"
+  integrity sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==
   dependencies:
     semver "^7.5.4"
 
+eslint-config-prettier@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
+  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
+
+eslint-config-standard@^17.1.0:
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975"
+  integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==
+
 eslint-import-resolver-node@^0.3.9:
   version "0.3.9"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
@@ -4095,141 +3905,98 @@ eslint-import-resolver-node@^0.3.9:
     is-core-module "^2.13.0"
     resolve "^1.22.4"
 
-eslint-import-resolver-typescript@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.7.0.tgz#e69925936a771a9cb2de418ccebc4cdf6c0818aa"
-  integrity sha512-Vrwyi8HHxY97K5ebydMtffsWAn1SCR9eol49eCd5fJS4O1WV7PaAjbcjmbfJJSMz/t4Mal212Uz/fQZrOB8mow==
-  dependencies:
-    "@nolyfill/is-core-module" "1.0.39"
-    debug "^4.3.7"
-    enhanced-resolve "^5.15.0"
-    fast-glob "^3.3.2"
-    get-tsconfig "^4.7.5"
-    is-bun-module "^1.0.2"
-    is-glob "^4.0.3"
-    stable-hash "^0.0.4"
-
-eslint-json-compat-utils@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz#32931d42c723da383712f25177a2c57b9ef5f079"
-  integrity sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==
+eslint-module-utils@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.11.0.tgz#b99b211ca4318243f09661fae088f373ad5243c4"
+  integrity sha512-gbBE5Hitek/oG6MUVj6sFuzEjA/ClzNflVrLovHi/JgLdC7fiN5gLAY1WIPW1a0V5I999MnsrvVrCOGmmVqDBQ==
   dependencies:
-    esquery "^1.6.0"
+    debug "^3.2.7"
 
-eslint-plugin-es-x@^7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz#a207aa08da37a7923f2a9599e6d3eb73f3f92b74"
-  integrity sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==
+eslint-plugin-es-x@^7.5.0:
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz#d08d9cd155383e35156c48f736eb06561d07ba92"
+  integrity sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.1.2"
-    "@eslint-community/regexpp" "^4.11.0"
-    eslint-compat-utils "^0.5.1"
+    "@eslint-community/regexpp" "^4.6.0"
+    eslint-compat-utils "^0.1.2"
 
-eslint-plugin-import-x@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import-x/-/eslint-plugin-import-x-4.5.0.tgz#a2e65113513c4ee44bec13ed600389558b041cf0"
-  integrity sha512-l0OTfnPF8RwmSXfjT75N8d6ZYLVrVYWpaGlgvVkVqFERCI5SyBfDP7QEMr3kt0zWi2sOa9EQ47clbdFsHkF83Q==
+eslint-plugin-import@^2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz#21ceea0fc462657195989dd780e50c92fe95f449"
+  integrity sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==
   dependencies:
-    "@typescript-eslint/scope-manager" "^8.1.0"
-    "@typescript-eslint/utils" "^8.1.0"
-    debug "^4.3.4"
-    doctrine "^3.0.0"
+    "@rtsao/scc" "^1.1.0"
+    array-includes "^3.1.8"
+    array.prototype.findlastindex "^1.2.5"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.9"
-    get-tsconfig "^4.7.3"
+    eslint-module-utils "^2.9.0"
+    hasown "^2.0.2"
+    is-core-module "^2.15.1"
     is-glob "^4.0.3"
-    minimatch "^9.0.3"
-    semver "^7.6.3"
-    stable-hash "^0.0.4"
-    tslib "^2.6.3"
-
-eslint-plugin-jsdoc@^50.6.1:
-  version "50.6.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.6.1.tgz#791a668fd4b0700a759e9a16a741a6a805f5b95c"
-  integrity sha512-UWyaYi6iURdSfdVVqvfOs2vdCVz0J40O/z/HTsv2sFjdjmdlUI/qlKLOTmwbPQ2tAfQnE5F9vqx+B+poF71DBQ==
-  dependencies:
-    "@es-joy/jsdoccomment" "~0.49.0"
-    are-docs-informative "^0.0.2"
-    comment-parser "1.4.1"
-    debug "^4.3.6"
-    escape-string-regexp "^4.0.0"
-    espree "^10.1.0"
-    esquery "^1.6.0"
-    parse-imports "^2.1.1"
-    semver "^7.6.3"
-    spdx-expression-parse "^4.0.0"
-    synckit "^0.9.1"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.8"
+    object.groupby "^1.0.3"
+    object.values "^1.2.0"
+    semver "^6.3.1"
+    tsconfig-paths "^3.15.0"
 
-eslint-plugin-jsonc@^2.18.2:
-  version "2.18.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.18.2.tgz#893520feb35d343e7438e2fb57fad179ef3ff6aa"
-  integrity sha512-SDhJiSsWt3nItl/UuIv+ti4g3m4gpGkmnUJS9UWR3TrpyNsIcnJoBRD7Kof6cM4Rk3L0wrmY5Tm3z7ZPjR2uGg==
+eslint-plugin-jsonc@^2.16.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz#e90eca15aa2e172f5aca52a77fc8c819f52862d7"
+  integrity sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    eslint-compat-utils "^0.6.0"
-    eslint-json-compat-utils "^0.2.1"
+    eslint-compat-utils "^0.5.0"
     espree "^9.6.1"
     graphemer "^1.4.0"
     jsonc-eslint-parser "^2.0.4"
     natural-compare "^1.4.0"
     synckit "^0.6.0"
 
-eslint-plugin-n@^17.14.0:
-  version "17.14.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-17.14.0.tgz#162a7c17a7ce7e3834af537bca68ab8b6aa26edc"
-  integrity sha512-maxPLMEA0rPmRpoOlxEclKng4UpDe+N5BJS4t24I3UKnN109Qcivnfs37KMy84G0af3bxjog5lKctP5ObsvcTA==
+eslint-plugin-n@^17.10.3:
+  version "17.10.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-17.10.3.tgz#6c8bae69b4d3354fe25c3c844afb3f83b83a3942"
+  integrity sha512-ySZBfKe49nQZWR1yFaA0v/GsH6Fgp8ah6XV0WDz6CN8WO0ek4McMzb7A2xnf4DCYV43frjCygvb9f/wx7UUxRw==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.4.1"
-    enhanced-resolve "^5.17.1"
-    eslint-plugin-es-x "^7.8.0"
-    get-tsconfig "^4.8.1"
-    globals "^15.11.0"
-    ignore "^5.3.2"
+    "@eslint-community/eslint-utils" "^4.4.0"
+    enhanced-resolve "^5.17.0"
+    eslint-plugin-es-x "^7.5.0"
+    get-tsconfig "^4.7.0"
+    globals "^15.8.0"
+    ignore "^5.2.4"
     minimatch "^9.0.5"
-    semver "^7.6.3"
+    semver "^7.5.3"
 
-eslint-plugin-promise@^7.2.1:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-7.2.1.tgz#a0652195700aea40b926dc3c74b38e373377bfb0"
-  integrity sha512-SWKjd+EuvWkYaS+uN2csvj0KoP43YTu7+phKQ5v+xw6+A0gutVX2yqCeCkC3uLCJFiPfR2dD8Es5L7yUsmvEaA==
+eslint-plugin-prettier@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz#d1c8f972d8f60e414c25465c163d16f209411f95"
+  integrity sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
+    prettier-linter-helpers "^1.0.0"
+    synckit "^0.9.1"
 
-eslint-plugin-react@^7.37.2:
-  version "7.37.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz#cd0935987876ba2900df2f58339f6d92305acc7a"
-  integrity sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==
-  dependencies:
-    array-includes "^3.1.8"
-    array.prototype.findlast "^1.2.5"
-    array.prototype.flatmap "^1.3.2"
-    array.prototype.tosorted "^1.1.4"
-    doctrine "^2.1.0"
-    es-iterator-helpers "^1.1.0"
-    estraverse "^5.3.0"
-    hasown "^2.0.2"
-    jsx-ast-utils "^2.4.1 || ^3.0.0"
-    minimatch "^3.1.2"
-    object.entries "^1.1.8"
-    object.fromentries "^2.0.8"
-    object.values "^1.2.0"
-    prop-types "^15.8.1"
-    resolve "^2.0.0-next.5"
-    semver "^6.3.1"
-    string.prototype.matchall "^4.0.11"
-    string.prototype.repeat "^1.0.0"
+eslint-plugin-promise@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-7.1.0.tgz#06b3ad6d36b3c3ef3ec201c8a8d97049cf5dbb20"
+  integrity sha512-8trNmPxdAy3W620WKDpaS65NlM5yAumod6XeC4LOb+jxlkG4IVcp68c6dXY2ev+uT4U1PtG57YDV6EGAXN0GbQ==
 
-eslint-plugin-unicorn@^56.0.1:
-  version "56.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-56.0.1.tgz#d10a3df69ba885939075bdc95a65a0c872e940d4"
-  integrity sha512-FwVV0Uwf8XPfVnKSGpMg7NtlZh0G0gBarCaFcMUOoqPxXryxdYxTRRv4kH6B9TFCVIrjRXG+emcxIk2ayZilog==
+eslint-plugin-unicorn@^55.0.0:
+  version "55.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-55.0.0.tgz#e2aeb397914799895702480970e7d148df5bcc7b"
+  integrity sha512-n3AKiVpY2/uDcGrS3+QsYDkjPfaOrNrsfQxU9nt5nitd9KuvVXrfAvgCO9DYPSfap+Gqjw9EOrXIsBp5tlHZjA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.5"
     "@eslint-community/eslint-utils" "^4.4.0"
     ci-info "^4.0.0"
     clean-regexp "^1.0.0"
-    core-js-compat "^3.38.1"
-    esquery "^1.6.0"
-    globals "^15.9.0"
+    core-js-compat "^3.37.0"
+    esquery "^1.5.0"
+    globals "^15.7.0"
     indent-string "^4.0.0"
     is-builtin-module "^3.2.1"
     jsesc "^3.0.2"
@@ -4237,13 +4004,13 @@ eslint-plugin-unicorn@^56.0.1:
     read-pkg-up "^7.0.1"
     regexp-tree "^0.1.27"
     regjsparser "^0.10.0"
-    semver "^7.6.3"
+    semver "^7.6.1"
     strip-indent "^3.0.0"
 
-eslint-plugin-vue@^9.32.0:
-  version "9.32.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.32.0.tgz#2b558e827886b567dfaa156cc1cad0f596461fab"
-  integrity sha512-b/Y05HYmnB/32wqVcjxjHZzNpwxj1onBOvqW89W+V+XNG1dRuaFbNd3vT9CLbr2LXjEoq+3vn8DanWf7XU22Ug==
+eslint-plugin-vue@^9.28.0:
+  version "9.28.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz#e4412f0c1024bafd15ffeaa6f76f4c99152e2765"
+  integrity sha512-ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     globals "^13.24.0"
@@ -4263,13 +4030,13 @@ eslint-plugin-vuejs-accessibility@^2.4.1:
     emoji-regex "^10.0.0"
     vue-eslint-parser "^9.0.1"
 
-eslint-plugin-yml@^1.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-1.16.0.tgz#1dc7d24d1dc40912db2e70fcab79312cdfb70875"
-  integrity sha512-t4MNCetPjTn18/fUDlQ/wKkcYjnuLYKChBrZ0qUaNqRigVqChHWzTP8SrfFi5s4keX3vdlkWRSu8zHJMdKwxWQ==
+eslint-plugin-yml@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-1.14.0.tgz#98a019dfe4eb6837f881fb80d564df79cb05d8d9"
+  integrity sha512-ESUpgYPOcAYQO9czugcX5OqRvn/ydDVwGCPXY4YjPqc09rHaUVUA6IE6HLQys4rXk/S+qx3EwTd1wHCwam/OWQ==
   dependencies:
     debug "^4.3.2"
-    eslint-compat-utils "^0.6.0"
+    eslint-compat-utils "^0.5.0"
     lodash "^4.17.21"
     natural-compare "^1.4.0"
     yaml-eslint-parser "^1.2.1"
@@ -4282,7 +4049,7 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
+eslint-scope@^7.1.1, eslint-scope@^7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
   integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
@@ -4290,74 +4057,75 @@ eslint-scope@^7.1.1:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-scope@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.2.0.tgz#377aa6f1cb5dc7592cfd0b7f892fd0cf352ce442"
-  integrity sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
+eslint-visitor-keys@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
 eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint-visitor-keys@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
-  integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
+eslint-visitor-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
 
-eslint@^9.17.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.17.0.tgz#faa1facb5dd042172fdc520106984b5c2421bb0c"
-  integrity sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==
+eslint@^8.57.1:
+  version "8.57.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"
+  integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.12.1"
-    "@eslint/config-array" "^0.19.0"
-    "@eslint/core" "^0.9.0"
-    "@eslint/eslintrc" "^3.2.0"
-    "@eslint/js" "9.17.0"
-    "@eslint/plugin-kit" "^0.2.3"
-    "@humanfs/node" "^0.16.6"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.1"
+    "@humanwhocodes/config-array" "^0.13.0"
     "@humanwhocodes/module-importer" "^1.0.1"
-    "@humanwhocodes/retry" "^0.4.1"
-    "@types/estree" "^1.0.6"
-    "@types/json-schema" "^7.0.15"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
     ajv "^6.12.4"
     chalk "^4.0.0"
-    cross-spawn "^7.0.6"
+    cross-spawn "^7.0.2"
     debug "^4.3.2"
+    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^8.2.0"
-    eslint-visitor-keys "^4.2.0"
-    espree "^10.3.0"
-    esquery "^1.5.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^8.0.0"
+    file-entry-cache "^6.0.1"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    text-table "^0.2.0"
 
-espree@^10.0.1, espree@^10.1.0, espree@^10.3.0:
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a"
-  integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==
+espree@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
   dependencies:
-    acorn "^8.14.0"
+    acorn "^8.11.3"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^4.2.0"
+    eslint-visitor-keys "^4.0.0"
 
-espree@^9.0.0, espree@^9.3.1, espree@^9.6.1:
+espree@^9.0.0, espree@^9.3.1, espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -4366,10 +4134,10 @@ espree@^9.0.0, espree@^9.3.1, espree@^9.6.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esquery@^1.4.0, esquery@^1.5.0, esquery@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
-  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
+esquery@^1.4.0, esquery@^1.4.2, esquery@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -4385,7 +4153,7 @@ estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
+estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -4410,42 +4178,37 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-exponential-backoff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
-  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
-
-express@^4.21.2:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
-  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
+express@^4.19.2:
+  version "4.20.0"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
+  integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
     body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.7.1"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
     encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.3.1"
+    finalhandler "1.2.0"
     fresh "0.5.2"
     http-errors "2.0.0"
     merge-descriptors "1.0.3"
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.12"
+    path-to-regexp "0.1.10"
     proxy-addr "~2.0.7"
-    qs "6.13.0"
+    qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.19.0"
-    serve-static "1.16.2"
+    serve-static "1.16.0"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -4488,6 +4251,11 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-diff@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+
 fast-glob@^3.2.9, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
@@ -4535,17 +4303,17 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-file-entry-cache@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
-  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
-    flat-cache "^4.0.0"
+    flat-cache "^3.0.4"
 
-file-entry-cache@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.1.0.tgz#2e66ad98ce93f49aed1b178c57b0b5741591e075"
-  integrity sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==
+file-entry-cache@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-9.0.0.tgz#4478e7ceaa5191fa9676a2daa7030211c31b1e7e"
+  integrity sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==
   dependencies:
     flat-cache "^5.0.0"
 
@@ -4563,13 +4331,13 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
-  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
   dependencies:
     debug "2.6.9"
-    encodeurl "~2.0.0"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "2.4.1"
     parseurl "~1.3.3"
@@ -4608,13 +4376,13 @@ find-up@^6.3.0:
     locate-path "^7.1.0"
     path-exists "^5.0.0"
 
-flat-cache@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
-  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
-    flatted "^3.2.9"
-    keyv "^4.5.4"
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
 
 flat-cache@^5.0.0:
   version "5.0.0"
@@ -4624,7 +4392,12 @@ flat-cache@^5.0.0:
     flatted "^3.3.1"
     keyv "^4.5.4"
 
-flatted@^3.2.9, flatted@^3.3.1:
+flatted@^3.1.0:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
+  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+
+flatted@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
@@ -4677,15 +4450,6 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^11.1.1:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -4705,7 +4469,7 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
@@ -4757,20 +4521,6 @@ functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4859,10 +4609,10 @@ get-symbol-description@^1.0.2:
     es-errors "^1.3.0"
     get-intrinsic "^1.2.4"
 
-get-tsconfig@^4.7.3, get-tsconfig@^4.7.5, get-tsconfig@^4.8.1:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.8.1.tgz#8995eb391ae6e1638d251118c7b56de7eb425471"
-  integrity sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==
+get-tsconfig@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.0.tgz#06ce112a1463e93196aa90320c35df5039147e34"
+  integrity sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -4885,7 +4635,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.12, glob@^10.3.3:
+glob@^10.3.10:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -4897,6 +4647,17 @@ glob@^10.3.12, glob@^10.3.3:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
+glob@^10.3.3:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
+  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    path-scurry "^1.11.1"
+
 glob@^11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.0.tgz#6031df0d7b65eaa1ccb9b29b5ced16cea658e77e"
@@ -4909,7 +4670,7 @@ glob@^11.0.0:
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
 
-glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.1.3, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4921,17 +4682,6 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
-  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -4965,7 +4715,7 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.24.0:
+globals@^13.19.0, globals@^13.24.0:
   version "13.24.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
   integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
@@ -4977,10 +4727,10 @@ globals@^14.0.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
   integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
-globals@^15.0.0, globals@^15.11.0, globals@^15.13.0, globals@^15.9.0:
-  version "15.13.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-15.13.0.tgz#bbec719d69aafef188ecd67954aae76a696010fc"
-  integrity sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==
+globals@^15.0.0, globals@^15.7.0, globals@^15.8.0:
+  version "15.8.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.8.0.tgz#e64bb47b619dd8cbf32b3c1a0a61714e33cbbb41"
+  integrity sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw==
 
 globalthis@^1.0.1, globalthis@^1.0.3:
   version "1.0.3"
@@ -4989,14 +4739,6 @@ globalthis@^1.0.1, globalthis@^1.0.3:
   dependencies:
     define-properties "^1.1.3"
 
-globalthis@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
-  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
-  dependencies:
-    define-properties "^1.2.1"
-    gopd "^1.0.1"
-
 globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
@@ -5033,23 +4775,6 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-got@^11.7.0:
-  version "11.8.6"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
-  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
-  dependencies:
-    "@sindresorhus/is" "^4.0.0"
-    "@szmarczak/http-timer" "^4.0.5"
-    "@types/cacheable-request" "^6.0.1"
-    "@types/responselike" "^1.0.0"
-    cacheable-lookup "^5.0.3"
-    cacheable-request "^7.0.2"
-    decompress-response "^6.0.0"
-    http2-wrapper "^1.0.0-beta.5.2"
-    lowercase-keys "^2.0.0"
-    p-cancelable "^2.0.0"
-    responselike "^2.0.0"
-
 got@^11.8.5:
   version "11.8.5"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
@@ -5087,6 +4812,11 @@ has-bigints@^1.0.1, has-bigints@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@ -5135,11 +4865,6 @@ has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -5186,6 +4911,11 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
+html-entities@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
+  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
+
 html-minifier-terser@^6.0.2:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
@@ -5204,10 +4934,10 @@ html-tags@^3.3.1:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.3.1.tgz#a04026a18c882e4bba8a01a3d39cfe465d40b5ce"
   integrity sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==
 
-html-webpack-plugin@^5.6.3:
-  version "5.6.3"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz#a31145f0fee4184d53a794f9513147df1e653685"
-  integrity sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==
+html-webpack-plugin@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
+  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
   dependencies:
     "@types/html-minifier-terser" "^6.0.0"
     html-minifier-terser "^6.0.2"
@@ -5225,7 +4955,7 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
-http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
+http-cache-semantics@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -5270,18 +5000,10 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
-  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
-  dependencies:
-    agent-base "^7.1.0"
-    debug "^4.3.4"
-
-http-proxy-middleware@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
-  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
+http-proxy-middleware@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
+  integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -5306,7 +5028,7 @@ http2-wrapper@^1.0.0-beta.5.2:
     quick-lru "^5.1.1"
     resolve-alpn "^1.0.0"
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -5314,21 +5036,6 @@ https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.0:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
-  integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
-  dependencies:
-    agent-base "^7.0.2"
-    debug "4"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
 iconv-corefoundation@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a"
@@ -5361,25 +5068,20 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1, ignore@^5.3.2:
+ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-ignore@^6.0.0, ignore@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-6.0.2.tgz#77cccb72a55796af1b6d2f9eb14fa326d24f4283"
-  integrity sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==
-
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.2.tgz#bb8a987349a73efbe6b3b292a9cbaf1b530d296b"
-  integrity sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==
+immutable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
+  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
@@ -5407,11 +5109,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -5420,7 +5117,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5467,14 +5164,6 @@ interpret@^3.1.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
   integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
-ip-address@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
-  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
-  dependencies:
-    jsbn "1.1.0"
-    sprintf-js "^1.1.3"
-
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -5524,13 +5213,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
-is-async-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
-  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
-  dependencies:
-    has-tostringtag "^1.0.0"
-
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -5560,13 +5242,6 @@ is-builtin-module@^3.2.1:
   dependencies:
     builtin-modules "^3.3.0"
 
-is-bun-module@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/is-bun-module/-/is-bun-module-1.3.0.tgz#ea4d24fdebfcecc98e81bcbcb506827fee288760"
-  integrity sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==
-  dependencies:
-    semver "^7.6.3"
-
 is-callable@^1.1.3, is-callable@^1.2.6, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
@@ -5584,7 +5259,7 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.13.0:
+is-core-module@^2.13.0, is-core-module@^2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
   integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
@@ -5598,7 +5273,7 @@ is-data-view@^1.0.1:
   dependencies:
     is-typed-array "^1.1.13"
 
-is-date-object@^1.0.1, is-date-object@^1.0.5:
+is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
@@ -5615,13 +5290,6 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finalizationregistry@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6"
-  integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==
-  dependencies:
-    call-bind "^1.0.2"
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -5632,7 +5300,7 @@ is-fullwidth-code-point@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
   integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
 
-is-generator-function@^1.0.10, is-generator-function@^1.0.7:
+is-generator-function@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
   integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
@@ -5653,16 +5321,6 @@ is-inside-container@^1.0.0:
   dependencies:
     is-docker "^3.0.0"
 
-is-interactive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
-  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
-
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
 is-language-code@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-3.1.0.tgz#b2386b49227e7010636f16d0c2c681ca40136ab5"
@@ -5670,11 +5328,6 @@ is-language-code@^3.1.0:
   dependencies:
     "@babel/runtime" "^7.14.0"
 
-is-map@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
-  integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
-
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -5702,6 +5355,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -5732,11 +5390,6 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-set@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
-  integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -5801,16 +5454,6 @@ is-typed-array@^1.1.3, is-typed-array@^1.1.9:
     for-each "^0.3.3"
     has-tostringtag "^1.0.0"
 
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
-is-weakmap@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
-  integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
-
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -5818,14 +5461,6 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-weakset@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007"
-  integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==
-  dependencies:
-    call-bind "^1.0.7"
-    get-intrinsic "^1.2.4"
-
 is-wsl@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2"
@@ -5858,27 +5493,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-isexe@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-3.1.1.tgz#4a407e2bd78ddfb14bea0c27c6f7072dde775f0d"
-  integrity sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==
-
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-iterator.prototype@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.3.tgz#016c2abe0be3bbdb8319852884f60908ac62bf9c"
-  integrity sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==
-  dependencies:
-    define-properties "^1.2.1"
-    get-intrinsic "^1.2.1"
-    has-symbols "^1.0.3"
-    reflect.getprototypeof "^1.0.4"
-    set-function-name "^2.0.1"
-
 jackspeak@^3.1.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a"
@@ -5938,14 +5557,14 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.2.0.tgz#38bfc2311c7ed4412ebe0bfc5c2e700f8f433921"
-  integrity sha512-psD1yf05kMKDNsUdW1l5YhO59pHScQ6OIHHb8W5SKSM2dCOFPsqolmIuSHgVA8+3Dc47NJR181CXZ4alCAPTkA==
+jintr@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-2.1.1.tgz#84d555df06d26128c2a1d0e1eebd6fecdf8eb280"
+  integrity sha512-89cwX4ouogeDGOBsEVsVYsnWWvWjchmwXBB4kiBhmjOKw19FiOKhNhMhpxhTlK2ctl7DS+d/ethfmuBpzoNNgA==
   dependencies:
     acorn "^8.8.0"
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -5957,17 +5576,12 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbn@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
-  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
-
-jsdoc-type-pratt-parser@~4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz#ff6b4a3f339c34a6c188cbf50a16087858d22113"
-  integrity sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-jsesc@^3.0.2, jsesc@~3.0.2:
+jsesc@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
   integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
@@ -5994,10 +5608,10 @@ json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json-parse-even-better-errors@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz#d3f67bd5925e81d3e31aa466acc821c8375cec43"
-  integrity sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==
+json-parse-even-better-errors@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da"
+  integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -6019,14 +5633,14 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^1.0.1:
+json5@^1.0.1, json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
   integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.2.3:
+json5@^2.2.0, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -6057,16 +5671,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"
-  integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==
-  dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    object.assign "^4.1.4"
-    object.values "^1.1.6"
-
 keyv@^4.0.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
@@ -6091,10 +5695,10 @@ known-css-properties@^0.29.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
   integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==
 
-known-css-properties@^0.35.0:
-  version "0.35.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.35.0.tgz#f6f8e40ab4e5700fa32f5b2ef5218a56bc853bd6"
-  integrity sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==
+known-css-properties@^0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.34.0.tgz#ccd7e9f4388302231b3f174a8b1d5b1f7b576cea"
+  integrity sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==
 
 launch-editor@^2.6.1:
   version "2.6.1"
@@ -6104,76 +5708,76 @@ launch-editor@^2.6.1:
     picocolors "^1.0.0"
     shell-quote "^1.8.1"
 
-lazy-val@^1.0.5:
+lazy-val@^1.0.4, lazy-val@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"
   integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==
 
-lefthook-darwin-arm64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.9.2.tgz#7d280fe30b184e1cf209052df4497723ea34a412"
-  integrity sha512-kWcSqAdGu5MAtxdLBpxg8H+p4d/pO7tA7+3Q1Cj9NM+c0L3R2ZefGNStGF6Ftbu8grkpz9/jCD588O9PHjsVfw==
-
-lefthook-darwin-x64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.9.2.tgz#837ee47ecb53eed1b3906d1e58194f7ec9c0354c"
-  integrity sha512-M4zspEhp0uXaIEVkcPFYayxElFzFhhSfEk29FMhxZOfbmZYPUSYaSsTHgb7oeR0O0/zcMTVDk4nNWsBp2Jpx5A==
-
-lefthook-freebsd-arm64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.9.2.tgz#a80f4409e6ce9a9e05ccd19519d8f9569a817758"
-  integrity sha512-7Grb+wdY99Iuorw9aUu+zYKdkEaQs6OVGn4jgav+AyBSxJA0WZmXgdmZqd6+LuRVYn8JRO8bER8Tu4QUa1fSxg==
-
-lefthook-freebsd-x64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.9.2.tgz#f28ab005b95e6bbe3b065e0644d107eef1df9b6b"
-  integrity sha512-tMBN//hqHMUJ9v7k9W3l9aMEBw//enEX+2eQLcvDJSuEE+J3AUbNg9YA5kTpVsDuafg10ziJXAuGD0kYh2ubww==
-
-lefthook-linux-arm64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.9.2.tgz#847d28b7498cd8720488b292e0eb6c104987c56f"
-  integrity sha512-U16CUCaQSRQTbjqvrsJrwppCK4d/IQjMimfC/SwAEreXr7WkBiekV+Gv+fytEnVHJTCSb5MajJTV+WpBsg6jGg==
-
-lefthook-linux-x64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.9.2.tgz#2707cfd6e4cac4fa1fbec3f8bbd81632355d4fb6"
-  integrity sha512-lkEes30MquDhiIrNQ61CfNvGLCN39d8PZ2S/dwLMJBtTH7qfVqXu8UR3KhKEDD1h43cEb4pnIeO2BJUZyn/FNw==
-
-lefthook-openbsd-arm64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-openbsd-arm64/-/lefthook-openbsd-arm64-1.9.2.tgz#998f579495d2dd5ab04b8583db2e4cd2d278a93f"
-  integrity sha512-UJKcL8Iiga8GetYqXqGXy6OeIhtNGim8PHQZH4nfR70s6TPvTvBEGvf48mvfwRyXt8t6aUvz1oyVvRQSdXETug==
-
-lefthook-openbsd-x64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-openbsd-x64/-/lefthook-openbsd-x64-1.9.2.tgz#c538554d6fed779395501cbd21a2b732c5500cfc"
-  integrity sha512-CLS119Fn91mZ2U7ug3fjYMfM7rvwB7gwpDUbuQlEPnVsHJOtaIpu+cmhnKKtU6b4B6r5ETMwhc5dDt/tS5curQ==
-
-lefthook-windows-arm64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.9.2.tgz#b7e6d552295167edbcbc2ce6b04b56a86acc7e4d"
-  integrity sha512-MlN2EnYNF6RUMTGX4csJnHq/J+werlerQsUcYfZrs+TruXCm4MLjwO9Q7vShTws3bsCoeDZnacNTVESQpZG6Lg==
-
-lefthook-windows-x64@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.9.2.tgz#459904fe083a78402fe5f50c387fd0e95c1c4ed8"
-  integrity sha512-7gl1L3qj6xWsqsYJ/ACRDUJruMWLqIRGcI66RiAEnQ3aSnnk0FLCVxIyMwecgW3IWY1O2C69EXV4Og7/0l9JVQ==
-
-lefthook@^1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.9.2.tgz#0cac904e048f5e48a5157ae59df048e8cf72729e"
-  integrity sha512-boUWdXdT6MUPghZuuX64xXbG7u69fcgkD6vNEjoxh3Gll6o6MfY/ITpj/HrRAUVym1jWXB0Z298qL789OD+dZw==
+lefthook-darwin-arm64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.7.17.tgz#e3ad332b977e78529cfcaf2ee127592527f3df51"
+  integrity sha512-SR9nbYydecL1OMqZCFNbr0L0RXSJXlNbYK6QBJGlGiOuhnliRHJ45wrmnOY/LLYfcc7g9S2QGvMF4X42qmpSnQ==
+
+lefthook-darwin-x64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.7.17.tgz#166c341fe77ff5f3ca794659c283530eff118abb"
+  integrity sha512-hGhqKxuFEcI9nHM2maR6cn/VmTp1OtkkN/GKYxEJ6xmo5Qz5GeeSbG0oJ7AhdGNAuEgj8JN/z0qeir6l7jAaZg==
+
+lefthook-freebsd-arm64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.7.17.tgz#39973535f5b4f39e2d28fcb13c125dd42528dded"
+  integrity sha512-ZTKDb1GIsaZn4guUMcohQSfpWQClt3o2oOjGPoqxHm9Sq5+K7EMzETdjtV+hz528UI6j/oaKoNnw7U6mx/BiVA==
+
+lefthook-freebsd-x64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.7.17.tgz#378b646c72a78b279636b30ea4438eb57bf2b6c5"
+  integrity sha512-4Hn7cceYCm1e9oB0St0OAiQ/r4u2w1wvcoMyNPlynJiD/xL/N5vd9gpSzgGp07zoHrBiz9UaT2xyg9O4RNaQ/g==
+
+lefthook-linux-arm64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.7.17.tgz#ae72037b59ec950b7f0f470a223214e5632f75d5"
+  integrity sha512-Y3YuvWpaWd7vUG11bTAdEVAeCZxW3EDzKxGkpUPeITSRLKpf/G3n1MCUSv+IqstVYq6T+idBizEDj0ZCfVESMQ==
+
+lefthook-linux-x64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.7.17.tgz#b4e534bf482a046b478ef619aa393f2cfeb9ddf5"
+  integrity sha512-UaT6jARLx1vCeNe+S9/NsOJd5jRuU3JPkIvDD3QZQ1Yy1p0C+LbqeNjAYCkvYs9Gr2yvHNsPVvCBWej7/1EO8A==
+
+lefthook-openbsd-arm64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-openbsd-arm64/-/lefthook-openbsd-arm64-1.7.17.tgz#5250a897ff51925f723272d27de30a955ad810c7"
+  integrity sha512-QeEIDXHUQm7eoIEcUACNVfIW/5oUw2Mia7RXs5tBUJHxdWumtnMi9P/gpZZyeNkiN5EGI1MNNm3UD88f/Cz0SA==
+
+lefthook-openbsd-x64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-openbsd-x64/-/lefthook-openbsd-x64-1.7.17.tgz#29be6699e5de662e19af9bf163249a714b985616"
+  integrity sha512-lFXWh/5m+OlY+Uk/YB7y2wKTVPu6CQi3Gr4+m+nbhK07JR3gUI1+0jXvDLO9Y8U1n8RMJxM41R3Fspitf+MFUQ==
+
+lefthook-windows-arm64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.7.17.tgz#9b335d730f4a4df9496412289056069fe380104b"
+  integrity sha512-xsDZhzFUdd0ScAjx9dvnyge5QUELNPpk8dTT2QeS04SiAPRIFpiNMJYVTEns7UI78x3HDeTduiYwF0WoPtKgTg==
+
+lefthook-windows-x64@1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.7.17.tgz#632edc4249bfb11324d93b49680f0b5e5f2f412d"
+  integrity sha512-gMEJn5xabAJoXPDRfzcIbNz5WrVzmLrRc7X+b6MmUYFiPCYvs4ZpausZPq0qQ/8kdwkZVXuunrwWgCtXXBosZw==
+
+lefthook@^1.7.17:
+  version "1.7.17"
+  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.7.17.tgz#a274c24a5c8d3e926c32cf1b444ecb68b0a76476"
+  integrity sha512-1oQO4wqTB1kEWRxImGCqzp+nqIhV8CRxdAj3AMvSOkrNVkUZHLyB8o4EGl7Os+6+2iRKY94WaBXZDaTi210DXA==
   optionalDependencies:
-    lefthook-darwin-arm64 "1.9.2"
-    lefthook-darwin-x64 "1.9.2"
-    lefthook-freebsd-arm64 "1.9.2"
-    lefthook-freebsd-x64 "1.9.2"
-    lefthook-linux-arm64 "1.9.2"
-    lefthook-linux-x64 "1.9.2"
-    lefthook-openbsd-arm64 "1.9.2"
-    lefthook-openbsd-x64 "1.9.2"
-    lefthook-windows-arm64 "1.9.2"
-    lefthook-windows-x64 "1.9.2"
+    lefthook-darwin-arm64 "1.7.17"
+    lefthook-darwin-x64 "1.7.17"
+    lefthook-freebsd-arm64 "1.7.17"
+    lefthook-freebsd-x64 "1.7.17"
+    lefthook-linux-arm64 "1.7.17"
+    lefthook-linux-x64 "1.7.17"
+    lefthook-openbsd-arm64 "1.7.17"
+    lefthook-openbsd-x64 "1.7.17"
+    lefthook-windows-arm64 "1.7.17"
+    lefthook-windows-x64 "1.7.17"
 
 levn@^0.4.1:
   version "0.4.1"
@@ -6272,21 +5876,6 @@ lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
-loose-envify@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
 lower-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
@@ -6331,37 +5920,10 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.7.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
-make-fetch-happen@^10.0.3:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
-
-marked@^15.0.4:
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.4.tgz#864dbf50227b6507646c771c2ef5f0de2924833e"
-  integrity sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==
+marked@^14.1.2:
+  version "14.1.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-14.1.2.tgz#3cbc26b2d6832be32b75ae0746e0968c781b6156"
+  integrity sha512-f3r0yqpz31VXiDB/wj9GaOB0a2PRLQl6vJmXiFrniNwjkKdvakqJRULhjFKJpxOchlCRiG5fcacoUZY5Xa6PEQ==
 
 matcher@^3.0.0:
   version "3.0.0"
@@ -6385,11 +5947,6 @@ mdn-data@2.0.30:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
   integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
 
-mdn-data@2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.12.1.tgz#10cb462215c13d95c92ff60d0fb3becac1bbb924"
-  integrity sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -6439,7 +5996,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -6469,11 +6026,6 @@ mime@^2.5.2:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -6489,10 +6041,10 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-css-extract-plugin@^2.9.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz#966031b468917a5446f4c24a80854b2947503c5b"
-  integrity sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==
+mini-css-extract-plugin@^2.9.1:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz#4d184f12ce90582e983ccef0f6f9db637b4be758"
+  integrity sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==
   dependencies:
     schema-utils "^4.0.0"
     tapable "^2.2.1"
@@ -6516,63 +6068,24 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1:
+minimatch@^5.0.1, minimatch@^5.1.1:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
-    brace-expansion "^2.0.1"
-
-minimatch@^9.0.0, minimatch@^9.0.3, minimatch@^9.0.4, minimatch@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
-  dependencies:
-    brace-expansion "^2.0.1"
-
-minimist@^1.2.0, minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
+    brace-expansion "^2.0.1"
 
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+minimatch@^9.0.0, minimatch@^9.0.4, minimatch@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
-    minipass "^3.0.0"
+    brace-expansion "^2.0.1"
+
+minimist@^1.2.0, minimist@^1.2.6:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 minipass@^3.0.0:
   version "3.3.4"
@@ -6581,13 +6094,6 @@ minipass@^3.0.0:
   dependencies:
     yallist "^4.0.0"
 
-minipass@^3.1.1, minipass@^3.1.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
 minipass@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
@@ -6603,7 +6109,7 @@ minipass@^7.1.2:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -6611,7 +6117,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -6621,7 +6127,12 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -6635,16 +6146,16 @@ multicast-dns@^7.2.5:
     thunky "^1.0.2"
 
 nanoid@^3.3.7:
-  version "3.3.8"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
-  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.3, negotiator@^0.6.3:
+negotiator@0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -6654,23 +6165,6 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-neostandard@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/neostandard/-/neostandard-0.12.0.tgz#780b32014483c9a2daf749e0766c07dffff37934"
-  integrity sha512-MvtiRhevDzE+oqQUxFvDsEmipzy3erNmnz5q5TG9M8xZ30n86rt4PxGP9jgocGIZr1105OgPZNlK2FQEtb2Vng==
-  dependencies:
-    "@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
-    "@stylistic/eslint-plugin" "2.11.0"
-    eslint-import-resolver-typescript "^3.7.0"
-    eslint-plugin-import-x "^4.5.0"
-    eslint-plugin-n "^17.14.0"
-    eslint-plugin-promise "^7.2.1"
-    eslint-plugin-react "^7.37.2"
-    find-up "^5.0.0"
-    globals "^15.13.0"
-    peowly "^1.3.2"
-    typescript-eslint "^8.17.0"
-
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -6679,64 +6173,21 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-abi@^3.45.0:
-  version "3.68.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.68.0.tgz#8f37fb02ecf4f43ebe694090dcb52e0c4cc4ba25"
-  integrity sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==
-  dependencies:
-    semver "^7.3.5"
-
 node-addon-api@^1.6.3:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
-node-addon-api@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
-  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
-
-node-api-version@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d"
-  integrity sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==
-  dependencies:
-    semver "^7.3.5"
-
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-gyp@^9.0.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
-  integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
-  dependencies:
-    env-paths "^2.2.0"
-    exponential-backoff "^3.1.1"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-releases@^2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -6757,34 +6208,23 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-normalize-package-bin@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz#df79e70cd0a113b77c02d1fe243c96b8e618acb1"
-  integrity sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==
+npm-normalize-package-bin@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
+  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
 
-npm-run-all2@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-all2/-/npm-run-all2-7.0.1.tgz#7a20f65d072db4a880802d4ba5cd19566daef752"
-  integrity sha512-Adbv+bJQ8UTAM03rRODqrO5cx0YU5KCG2CvHtSURiadvdTjjgGJXdbc1oQ9CXBh9dnGfHSoSB1Web/0Dzp6kOQ==
+npm-run-all2@^6.2.3:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/npm-run-all2/-/npm-run-all2-6.2.3.tgz#ea0c0987337b828eaa78c2f5488e70de0969917b"
+  integrity sha512-5RsxC7jEc/RjxOYBVdEfrJf5FsJ0pHA7jr2/OxrThXknajETCTYjigOCG3iaGjdYIKEQlDuCG0ir0T1HTva8pg==
   dependencies:
     ansi-styles "^6.2.1"
     cross-spawn "^7.0.3"
     memorystream "^0.3.1"
     minimatch "^9.0.0"
     pidtree "^0.6.0"
-    read-package-json-fast "^4.0.0"
+    read-package-json-fast "^3.0.2"
     shell-quote "^1.7.3"
-    which "^5.0.0"
-
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
 
 nth-check@^2.0.1, nth-check@^2.1.1:
   version "2.1.1"
@@ -6793,11 +6233,6 @@ nth-check@^2.0.1, nth-check@^2.1.1:
   dependencies:
     boolbase "^1.0.0"
 
-object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
-
 object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
@@ -6848,15 +6283,6 @@ object.assign@^4.1.5:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.entries@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41"
-  integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-object-atoms "^1.0.0"
-
 object.fromentries@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
@@ -6867,7 +6293,16 @@ object.fromentries@^2.0.8:
     es-abstract "^1.23.2"
     es-object-atoms "^1.0.0"
 
-object.values@^1.1.6, object.values@^1.2.0:
+object.groupby@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+
+object.values@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
   integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
@@ -6900,13 +6335,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
 open@^10.0.3:
   version "10.0.3"
   resolved "https://registry.yarnpkg.com/open/-/open-10.0.3.tgz#f60d8db49fa126c50aec751957fb5d7de3308d4f"
@@ -6929,21 +6357,6 @@ optionator@^0.9.3:
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
 
-ora@^5.1.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
-  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
-  dependencies:
-    bl "^4.1.0"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.5.0"
-    is-interactive "^1.0.0"
-    is-unicode-supported "^0.1.0"
-    log-symbols "^4.1.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
 p-cancelable@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
@@ -6956,7 +6369,7 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2, "p-limit@^3.1.0 ":
+p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -6991,13 +6404,6 @@ p-locate@^6.0.0:
   dependencies:
     p-limit "^4.0.0"
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-retry@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd"
@@ -7032,14 +6438,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-imports@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/parse-imports/-/parse-imports-2.2.1.tgz#0a6e8b5316beb5c9905f50eb2bbb8c64a4805642"
-  integrity sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==
-  dependencies:
-    es-module-lexer "^1.5.3"
-    slashes "^3.0.12"
-
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
@@ -7116,10 +6514,10 @@ path-scurry@^2.0.0:
     lru-cache "^11.0.0"
     minipass "^7.1.2"
 
-path-to-regexp@0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
-  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
+path-to-regexp@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
+  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
 
 path-type@^4.0.0:
   version "4.0.0"
@@ -7131,41 +6529,26 @@ path-type@^5.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"
   integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==
 
-pe-library@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-0.4.1.tgz#e269be0340dcb13aa6949d743da7d658c3e2fbea"
-  integrity sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
 
-peowly@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/peowly/-/peowly-1.3.2.tgz#98dad1df75dfb2d6b1e2d6b848de633bf573d7a4"
-  integrity sha512-BYIrwr8JCXY49jUZscgw311w9oGEKo7ux/s+BxrhKTQbiQ0iYNdZNJ5LgagaeercQdFHwnR7Z5IxxFWVQ+BasQ==
-
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
+  integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-picomatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
-  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
-
 pidtree@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
@@ -7193,7 +6576,7 @@ plist@^3.0.4:
     base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
 
-plist@^3.0.5, plist@^3.1.0:
+plist@^3.0.5:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
   integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
@@ -7436,10 +6819,10 @@ postcss-resolve-nested-selector@^0.1.1, postcss-resolve-nested-selector@^0.1.6:
   resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz#3d84dec809f34de020372c41b039956966896686"
   integrity sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==
 
-postcss-safe-parser@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz#36e4f7e608111a0ca940fd9712ce034718c40ec0"
-  integrity sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==
+postcss-safe-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz#6273d4e5149e286db5a45bc6cf6eafcad464014a"
+  integrity sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==
 
 postcss-scss@^4.0.9:
   version "4.0.9"
@@ -7454,14 +6837,6 @@ postcss-selector-parser@^6.0.15, postcss-selector-parser@^6.0.16, postcss-select
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c"
-  integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
 postcss-svgo@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-7.0.0.tgz#2f11b45c6fa42da155fd7c16c44e69bf086c5992"
@@ -7490,13 +6865,13 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4.14, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.49:
-  version "8.4.49"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
-  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+postcss@^8.4.14, postcss@^8.4.33, postcss@^8.4.38, postcss@^8.4.41, postcss@^8.4.47:
+  version "8.4.47"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
+  integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
   dependencies:
     nanoid "^3.3.7"
-    picocolors "^1.1.1"
+    picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
 prelude-ls@^1.2.1:
@@ -7504,7 +6879,14 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-"prettier@^1.18.2 || ^2.0.0":
+prettier-linter-helpers@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+  dependencies:
+    fast-diff "^1.1.2"
+
+"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.8:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
@@ -7532,11 +6914,6 @@ progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -7545,15 +6922,6 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-prop-types@^15.8.1:
-  version "15.8.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.13.1"
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -7587,6 +6955,13 @@ pupa@^3.1.0:
   dependencies:
     escape-goat "^4.0.0"
 
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
+
 qs@6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
@@ -7626,25 +7001,25 @@ raw-body@2.5.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-react-is@^16.13.1:
-  version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-
-read-binary-file-arch@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz#959c4637daa932280a9b911b1a6766a7e44288fc"
-  integrity sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==
+read-config-file@6.3.2:
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411"
+  integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==
   dependencies:
-    debug "^4.3.4"
+    config-file-ts "^0.2.4"
+    dotenv "^9.0.2"
+    dotenv-expand "^5.1.0"
+    js-yaml "^4.1.0"
+    json5 "^2.2.0"
+    lazy-val "^1.0.4"
 
-read-package-json-fast@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz#8ccbc05740bb9f58264f400acc0b4b4eee8d1b39"
-  integrity sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==
+read-package-json-fast@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
+  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
   dependencies:
-    json-parse-even-better-errors "^4.0.0"
-    npm-normalize-package-bin "^4.0.0"
+    json-parse-even-better-errors "^3.0.0"
+    npm-normalize-package-bin "^3.0.0"
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
@@ -7687,15 +7062,6 @@ readable-stream@^3.0.6:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.1.tgz#b2fe35f8dca63183cd3b86883ecc8f720ea96ae6"
@@ -7715,19 +7081,6 @@ rechoir@^0.8.0:
   dependencies:
     resolve "^1.20.0"
 
-reflect.getprototypeof@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859"
-  integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.1"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    globalthis "^1.0.3"
-    which-builtin-type "^1.1.3"
-
 regenerate-unicode-properties@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
@@ -7735,10 +7088,10 @@ regenerate-unicode-properties@^10.0.1:
   dependencies:
     regenerate "^1.4.2"
 
-regenerate-unicode-properties@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
-  integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
@@ -7809,15 +7162,15 @@ regexpu-core@^5.1.0:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-regexpu-core@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.1.1.tgz#b469b245594cb2d088ceebc6369dceb8c00becac"
-  integrity sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
+    "@babel/regjsgen" "^0.8.0"
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.2.0"
-    regjsgen "^0.8.0"
-    regjsparser "^0.11.0"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
@@ -7826,11 +7179,6 @@ regjsgen@^0.6.0:
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
   integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
 
-regjsgen@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab"
-  integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==
-
 regjsparser@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.10.0.tgz#b1ed26051736b436f22fdec1c8f72635f9f44892"
@@ -7838,13 +7186,6 @@ regjsparser@^0.10.0:
   dependencies:
     jsesc "~0.5.0"
 
-regjsparser@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.11.1.tgz#ae55c74f646db0c8fcb922d4da635e33da405149"
-  integrity sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==
-  dependencies:
-    jsesc "~3.0.2"
-
 regjsparser@^0.8.2:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
@@ -7852,6 +7193,13 @@ regjsparser@^0.8.2:
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+  dependencies:
+    jsesc "~0.5.0"
+
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -7883,13 +7231,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-resedit@^1.7.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/resedit/-/resedit-1.7.1.tgz#150c101000210968730141ae2eb504ca0aead165"
-  integrity sha512-/FJ6/gKAXbcHtivannhecWsa43kGVFK3aHHv9Jm3x0eFiM31MoGihkAOWbm3UsvjYLRVw0zTkfARy2dI96JL1Q==
-  dependencies:
-    pe-library "^0.4.1"
-
 resolve-alpn@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
@@ -7926,15 +7267,6 @@ resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^2.0.0-next.5:
-  version "2.0.0-next.5"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"
-  integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==
-  dependencies:
-    is-core-module "^2.13.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -7942,14 +7274,6 @@ responselike@^2.0.0:
   dependencies:
     lowercase-keys "^2.0.0"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
@@ -8064,23 +7388,21 @@ sanitize-filename@^1.6.3:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sass-loader@^16.0.4:
-  version "16.0.4"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.4.tgz#5c2afb755fbc0a45a004369efa11579518a39a45"
-  integrity sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==
+sass-loader@^16.0.2:
+  version "16.0.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.2.tgz#e581bc13d7cb5090e27f155c6aa2855c08cafe86"
+  integrity sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw==
   dependencies:
     neo-async "^2.6.2"
 
-sass@^1.83.0:
-  version "1.83.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.0.tgz#e36842c0b88a94ed336fd16249b878a0541d536f"
-  integrity sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==
+sass@^1.79.4:
+  version "1.79.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.4.tgz#f9c45af35fbeb53d2c386850ec842098d9935267"
+  integrity sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==
   dependencies:
     chokidar "^4.0.0"
-    immutable "^5.0.2"
+    immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
-  optionalDependencies:
-    "@parcel/watcher" "^2.4.1"
 
 sax@^1.2.4:
   version "1.2.4"
@@ -8134,11 +7456,30 @@ semver@^6.2.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3:
+semver@^7.3.2, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.1, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
+  dependencies:
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "2.4.1"
+    range-parser "~1.2.1"
+    statuses "2.0.1"
+
 send@0.19.0:
   version "0.19.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
@@ -8185,20 +7526,15 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
-  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
+serve-static@1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
+  integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
   dependencies:
-    encodeurl "~2.0.0"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.19.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+    send "0.18.0"
 
 set-function-length@^1.1.1:
   version "1.1.1"
@@ -8231,7 +7567,7 @@ set-function-name@^2.0.0:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.0"
 
-set-function-name@^2.0.1, set-function-name@^2.0.2:
+set-function-name@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
   integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
@@ -8251,12 +7587,12 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-shaka-player@^4.12.5:
-  version "4.12.5"
-  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.12.5.tgz#8de74e5ecf659faa14766f80205164998c28d274"
-  integrity sha512-jJEkASLivZ0Eqg+sIfBJWCWFDzo2l4rfG1e2y5apqphKbDZaMrSCX0Z/B14epJCfStSAwGqKyuC1D+K3e4xBEg==
+shaka-player@^4.11.7:
+  version "4.11.7"
+  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.11.7.tgz#da49dc6c3c0e4cc0281b677b4580b162b3bbcf10"
+  integrity sha512-jNsdQd4pa24w2QwXHGNBs8MQ33YajYiZclWaSuGt+dLJ7/D9+NG1LJQGnTrGd0G1aDdbEzmEpppG3ic4OsGpyw==
   dependencies:
-    eme-encryption-scheme-polyfill "^2.1.6"
+    eme-encryption-scheme-polyfill "^2.1.5"
 
 shallow-clone@^3.0.0:
   version "3.0.1"
@@ -8301,11 +7637,6 @@ side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
-signal-exit@^3.0.2, signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
 signal-exit@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967"
@@ -8328,11 +7659,6 @@ slash@^5.1.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce"
   integrity sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==
 
-slashes@^3.0.12:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/slashes/-/slashes-3.0.12.tgz#3d664c877ad542dc1509eaf2c50f38d483a6435a"
-  integrity sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==
-
 slice-ansi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
@@ -8359,7 +7685,7 @@ slice-ansi@^5.0.0:
     ansi-styles "^6.0.0"
     is-fullwidth-code-point "^4.0.0"
 
-smart-buffer@^4.0.2, smart-buffer@^4.2.0:
+smart-buffer@^4.0.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
@@ -8373,23 +7699,6 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks@^2.6.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
-  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
-  dependencies:
-    ip-address "^9.0.5"
-    smart-buffer "^4.2.0"
-
 sort-keys-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
@@ -8443,14 +7752,6 @@ spdx-expression-parse@^3.0.0:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz#a23af9f3132115465dac215c099303e4ceac5794"
-  integrity sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
 spdx-license-ids@^3.0.0:
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
@@ -8484,23 +7785,6 @@ sprintf-js@^1.1.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
-sprintf-js@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
-  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
-
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
-stable-hash@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stable-hash/-/stable-hash-0.0.4.tgz#55ae7dadc13e4b3faed13601587cec41859b42f7"
-  integrity sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==
-
 stat-mode@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
@@ -8525,7 +7809,7 @@ statuses@2.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -8552,32 +7836,6 @@ string-width@^7.0.0:
     get-east-asian-width "^1.0.0"
     strip-ansi "^7.1.0"
 
-string.prototype.matchall@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a"
-  integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==
-  dependencies:
-    call-bind "^1.0.7"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-errors "^1.3.0"
-    es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.7"
-    regexp.prototype.flags "^1.5.2"
-    set-function-name "^2.0.2"
-    side-channel "^1.0.6"
-
-string.prototype.repeat@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"
-  integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trim@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
@@ -8597,7 +7855,25 @@ string.prototype.trim@^1.2.9:
     es-abstract "^1.23.0"
     es-object-atoms "^1.0.0"
 
-string.prototype.trimend@^1.0.5, string.prototype.trimend@^1.0.7, string.prototype.trimend@^1.0.8:
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
+
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
+string.prototype.trimend@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
   integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
@@ -8668,6 +7944,11 @@ strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   dependencies:
     ansi-regex "^6.0.1"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -8737,48 +8018,49 @@ stylelint-use-logical-spec@^5.0.1:
   resolved "https://registry.yarnpkg.com/stylelint-use-logical-spec/-/stylelint-use-logical-spec-5.0.1.tgz#d5aa254d615d373f18214297c0b49a03a6ca5980"
   integrity sha512-UfLB4LW6iG4r3cXxjxkiHQrFyhWFqt8FpNNngD+TyvgMWSokk5TYwTvBHS3atUvZhOogllTOe/PUrGE+4z84AA==
 
-stylelint@^16.12.0, stylelint@^16.8.2:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.12.0.tgz#13532dcbaed21348da0e9e0fb9a4e1e7f6dab2b8"
-  integrity sha512-F8zZ3L/rBpuoBZRvI4JVT20ZanPLXfQLzMOZg1tzPflRVh9mKpOZ8qcSIhh1my3FjAjZWG4T2POwGnmn6a6hbg==
+stylelint@^16.8.2, stylelint@^16.9.0:
+  version "16.9.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.9.0.tgz#81615c0608b9dc645486e08e35c6c9206e1ba132"
+  integrity sha512-31Nm3WjxGOBGpQqF43o3wO9L5AC36TPIe6030Lnm13H3vDMTcS21DrLh69bMX+DBilKqMMVLian4iG6ybBoNRQ==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
-    "@csstools/selector-specificity" "^5.0.0"
+    "@csstools/css-parser-algorithms" "^3.0.1"
+    "@csstools/css-tokenizer" "^3.0.1"
+    "@csstools/media-query-list-parser" "^3.0.1"
+    "@csstools/selector-specificity" "^4.0.0"
     "@dual-bundle/import-meta-resolve" "^4.1.0"
     balanced-match "^2.0.0"
     colord "^2.9.3"
     cosmiconfig "^9.0.0"
-    css-functions-list "^3.2.3"
-    css-tree "^3.0.1"
-    debug "^4.3.7"
+    css-functions-list "^3.2.2"
+    css-tree "^2.3.1"
+    debug "^4.3.6"
     fast-glob "^3.3.2"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^9.1.0"
+    file-entry-cache "^9.0.0"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
     html-tags "^3.3.1"
-    ignore "^6.0.2"
+    ignore "^5.3.2"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.35.0"
+    known-css-properties "^0.34.0"
     mathml-tag-names "^2.1.3"
     meow "^13.2.0"
     micromatch "^4.0.8"
     normalize-path "^3.0.0"
-    picocolors "^1.1.1"
-    postcss "^8.4.49"
+    picocolors "^1.0.1"
+    postcss "^8.4.41"
     postcss-resolve-nested-selector "^0.1.6"
-    postcss-safe-parser "^7.0.1"
-    postcss-selector-parser "^7.0.0"
+    postcss-safe-parser "^7.0.0"
+    postcss-selector-parser "^6.1.2"
     postcss-value-parser "^4.2.0"
     resolve-from "^5.0.0"
     string-width "^4.2.3"
+    strip-ansi "^7.1.0"
     supports-hyperlinks "^3.1.0"
     svg-tags "^1.0.0"
-    table "^6.9.0"
+    table "^6.8.2"
     write-file-atomic "^5.0.1"
 
 sumchecker@^3.0.1:
@@ -8788,6 +8070,13 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
@@ -8833,10 +8122,10 @@ svgo@^3.2.0:
     csso "^5.0.5"
     picocolors "^1.0.0"
 
-swiper@^11.1.15:
-  version "11.1.15"
-  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.15.tgz#e2258c8d38282e2f115ca463d6e8c5b84cdcf1ca"
-  integrity sha512-IzWeU34WwC7gbhjKsjkImTuCRf+lRbO6cnxMGs88iVNKDwV+xQpBCJxZ4bNH6gSrIbbyVJ1kuGzo3JTtz//CBw==
+swiper@^11.1.14:
+  version "11.1.14"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.14.tgz#7901b4955c46dd0ad76fac1e9de2a69f04f34abb"
+  integrity sha512-VbQLQXC04io6AoAjIUWuZwW4MSYozkcP9KjLdrsG/00Q/yiwvhz9RQyt0nHXV10hi9NVnDNy1/wv7Dzq1lkOCQ==
 
 synckit@^0.6.0:
   version "0.6.2"
@@ -8846,17 +8135,17 @@ synckit@^0.6.0:
     tslib "^2.3.1"
 
 synckit@^0.9.0, synckit@^0.9.1:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.2.tgz#a3a935eca7922d48b9e7d6c61822ee6c3ae4ec62"
-  integrity sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.1.tgz#febbfbb6649979450131f64735aa3f6c14575c88"
+  integrity sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==
   dependencies:
     "@pkgr/core" "^0.1.0"
     tslib "^2.6.2"
 
-table@^6.9.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.9.0.tgz#50040afa6264141c7566b3b81d4d82c47a8668f5"
-  integrity sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==
+table@^6.8.2:
+  version "6.8.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58"
+  integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -8869,7 +8158,7 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2:
+tar@^6.1.12:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
   integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
@@ -8920,6 +8209,11 @@ terser@^5.26.0:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -8939,6 +8233,11 @@ tmp@^0.2.0:
   dependencies:
     rimraf "^3.0.0"
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -8963,21 +8262,21 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-api-utils@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
-  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
 
 tslib@^2.0.0, tslib@^2.0.3, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-tslib@^2.6.3:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
-  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -9096,16 +8395,7 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typescript-eslint@^8.17.0:
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.18.0.tgz#41026f27a3481185f3239d817ae5b960572145a0"
-  integrity sha512-Xq2rRjn6tzVpAyHr3+nmSg1/9k9aIHnJ2iZeOH7cfGOWqTkXTm3kwpQglEuLGdNrYvPF+2gtAs+/KF5rjVo+WQ==
-  dependencies:
-    "@typescript-eslint/eslint-plugin" "8.18.0"
-    "@typescript-eslint/parser" "8.18.0"
-    "@typescript-eslint/utils" "8.18.0"
-
-typescript@^5.4.3:
+typescript@^5.3.3:
   version "5.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
   integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
@@ -9165,20 +8455,6 @@ unicorn-magic@^0.1.0:
   resolved "https://registry.yarnpkg.com/unicorn-magic/-/unicorn-magic-0.1.0.tgz#1bb9a51c823aaf9d73a8bfcd3d1a23dde94b0ce4"
   integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -9366,13 +8642,6 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
-
 webpack-cli@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
@@ -9404,10 +8673,10 @@ webpack-dev-middleware@^7.4.2:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.0.tgz#68043886edaa3fd875ad20e01589990a79612f9c"
-  integrity sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==
+webpack-dev-server@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz#8f44147402b4d8ab99bfeb9b6880daa1411064e5"
+  integrity sha512-aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==
   dependencies:
     "@types/bonjour" "^3.5.13"
     "@types/connect-history-api-fallback" "^1.5.4"
@@ -9422,9 +8691,10 @@ webpack-dev-server@^5.2.0:
     colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^2.0.0"
-    express "^4.21.2"
+    express "^4.19.2"
     graceful-fs "^4.2.6"
-    http-proxy-middleware "^2.0.7"
+    html-entities "^2.4.0"
+    http-proxy-middleware "^2.0.3"
     ipaddr.js "^2.1.0"
     launch-editor "^2.6.1"
     open "^10.0.3"
@@ -9450,18 +8720,18 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.97.1:
-  version "5.97.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.97.1.tgz#972a8320a438b56ff0f1d94ade9e82eac155fa58"
-  integrity sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==
-  dependencies:
-    "@types/eslint-scope" "^3.7.7"
-    "@types/estree" "^1.0.6"
-    "@webassemblyjs/ast" "^1.14.1"
-    "@webassemblyjs/wasm-edit" "^1.14.1"
-    "@webassemblyjs/wasm-parser" "^1.14.1"
-    acorn "^8.14.0"
-    browserslist "^4.24.0"
+webpack@^5.95.0:
+  version "5.95.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
+  integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
+  dependencies:
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.7.1"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
     enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
@@ -9504,34 +8774,6 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-builtin-type@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3"
-  integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==
-  dependencies:
-    function.prototype.name "^1.1.6"
-    has-tostringtag "^1.0.2"
-    is-async-function "^2.0.0"
-    is-date-object "^1.0.5"
-    is-finalizationregistry "^1.0.2"
-    is-generator-function "^1.0.10"
-    is-regex "^1.1.4"
-    is-weakref "^1.0.2"
-    isarray "^2.0.5"
-    which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.2"
-    which-typed-array "^1.1.15"
-
-which-collection@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
-  integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
-  dependencies:
-    is-map "^2.0.3"
-    is-set "^2.0.3"
-    is-weakmap "^2.0.2"
-    is-weakset "^2.0.3"
-
 which-typed-array@^1.1.11, which-typed-array@^1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
@@ -9573,27 +8815,13 @@ which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@^2.0.2:
+which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-which@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6"
-  integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==
-  dependencies:
-    isexe "^3.1.1"
-
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-  dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
-
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
@@ -9698,7 +8926,7 @@ yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs@^17.0.1, yargs@^17.6.2:
+yargs@^17.6.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -9729,12 +8957,12 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^12.2.0:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-12.2.0.tgz#54f058b5d0892b5c7e35019e2be6a2a7f7ba4447"
-  integrity sha512-G+50qrbJCToMYhu8jbaHiS3Vf+RRul+CcDbz3hEGwHkGPh+zLiWwD6SS+YhYF+2/op4ZU5zDYQJrGqJ+wKh7Gw==
+youtubei.js@^10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-10.5.0.tgz#3cf0c79cf73fb26e13d167f37dec7d65419e91b8"
+  integrity sha512-iyA+VF28c15tCCKH9ExM2RKC3zYiHzA/eixGlJ3vERANkuI+xYKzAZ4vtOhmyqwrAddu88R/DkzEsmpph5NWjg==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
-    jintr "^3.2.0"
+    jintr "^2.1.1"
     tslib "^2.5.0"
     undici "^5.19.1"

From 28c5b7852f5f06d259934155e8c3e739a5620bb5 Mon Sep 17 00:00:00 2001
From: pkrasicki <pkrasicki@protonmail.com>
Date: Sat, 28 Dec 2024 15:38:21 +0000
Subject: [PATCH 18/18] Fix button alignment in remote playlists

---
 .../playlist-info/playlist-info.scss          | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
index 0b502f5b71264..7086773919e3d 100644
--- a/src/renderer/components/playlist-info/playlist-info.scss
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -71,6 +71,13 @@
   word-break: break-all;
 }
 
+.playlistOptions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: center;
+}
+
 .channelShareWrapper {
   column-gap: 8px;
   display: grid;
@@ -79,13 +86,13 @@
   inset-block-end: -20px;
   background-color: var(--card-bg-color);
   padding-block: 5px;
-}
 
-.playlistOptions {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  justify-content: center;
+  .playlistOptions {
+    display: grid;
+    grid-auto-flow: column;
+    column-gap: 8px;
+    justify-content: flex-end;
+  }
 }
 
 .searchInputsRow {