diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 0e8afa3b..00000000
--- a/.drone.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-kind: pipeline
-type: docker
-name: Android app
-
-steps:
-  - name: Build app
-    image: ghcr.io/cirruslabs/flutter:stable
-    environment:
-      ANDROID_KEY_FILE: /tmp/key.properties
-      SERVER_URL:
-        from_secret: server_url
-    commands:
-      - wget http://$SERVER_URL/service-account.json -O /tmp/service-account.json
-      - wget http://$SERVER_URL/key.properties -O /tmp/key.properties
-      - wget http://$SERVER_URL/keystore.jks -O /tmp/keystore.jks
-      - cd ..
-      - cp -R src /tmp/build
-      - cd /tmp/build
-      - git submodule init
-      - git submodule update
-      - export PUB_CACHE=$(pwd)/.pub-cache
-      - ./submodules/flutter/bin/flutter doctor
-      - ./submodules/flutter/bin/flutter config --no-analytics
-      - ./submodules/flutter/bin/flutter pub get
-      - ./submodules/flutter/bin/flutter pub run flutter_native_splash:create
-      - ./submodules/flutter/bin/flutter build apk --split-per-abi --dart-define=cronetHttpNoPlay=true
-      - ./submodules/flutter/bin/flutter build apk --dart-define=cronetHttpNoPlay=true
-      - ./submodules/flutter/bin/flutter build appbundle --dart-define=cronetHttpNoPlay=true
-      - cd /drone/src/
-      - mkdir -p build/app/outputs/flutter-apk
-      - mkdir -p build/app/outputs/bundle/release
-      - cp /tmp/build/build/app/outputs/flutter-apk/* build/app/outputs/flutter-apk/
-      - cp /tmp/build/build/app/outputs/bundle/release/* build/app/outputs/bundle/release/
-      - ls build/app/outputs/flutter-apk/
-      - ls build/app/outputs/bundle/release/
-    when:
-      event: tag
-  - name: Accrescent APKs
-    image: gonzague/bundletool
-    environment:
-      ANDROID_KEY_FILE: /tmp/key.properties
-      SERVER_URL:
-        from_secret: server_url
-    commands:
-      - mkdir /tmp
-      - wget http://$SERVER_URL/service-account.json -O /tmp/service-account.json
-      - wget http://$SERVER_URL/key.properties -O /tmp/key.properties
-      - wget http://$SERVER_URL/keystore.jks -O /tmp/keystore.jks
-      - . /tmp/key.properties
-      - cd build/app/outputs/bundle/release/
-      - bundletool build-apks --bundle=app-release.aab --output=app-release.apks --ks-pass=pass:$${storePassword} --ks=/tmp/keystore.jks --ks-key-alias=upload --key-pass=pass:$${keyPassword} --aapt2=/bin/aapt2
-    when:
-      event: tag
-  - name: Publish
-    image: plugins/github-release
-    settings:
-      api_key:
-        from_secret: github_token
-      files:
-        - "build/app/outputs/flutter-apk/*"
-        - "build/app/outputs/bundle/release/*"
-    when:
-      event: tag
-
-#- name: Release Android
-#    image: ruby
-#    environment:
-#      JSON_KEY_FILE: /tmp/service-account.json
-#      SERVER_URL:
-#       from_secret: server_url
-#     commands:
-#       - wget http://$SERVER_URL/service-account.json -O /tmp/service-account.json
-#       - wget http://$SERVER_URL/key.properties -O /tmp/key.properties
-#       - wget http://$SERVER_URL/keystore.jks -O /tmp/keystore.jks
-#       - cd android
-#       - gem install fastlane
-#       - fastlane deploy
-#     when:
-#       event: tag
-# trigger:
-#   event:
-#     - push
-#     - tag
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9451dd3..1d0a143a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
       - run: ./submodules/flutter/bin/flutter config --no-analytics
       - run: ./submodules/flutter/bin/flutter pub get
       - run: ./submodules/flutter/bin/dart format --output=none --set-exit-if-changed ./lib
-      - run: ./submodules/flutter/bin/dart analyze ./lib
+      - run: ./submodules/flutter/bin/dart analyze --no-fatal-warnings ./lib
 #      - name: Run tests with nix (starts postgres and invidious server)
 #        run: nix-shell --run './submodules/flutter/bin/flutter test'
       - run: ./submodules/flutter/bin/flutter pub run flutter_native_splash:create
diff --git a/lib/app/states/app.freezed.dart b/lib/app/states/app.freezed.dart
index e0a10a18..339d25a8 100644
--- a/lib/app/states/app.freezed.dart
+++ b/lib/app/states/app.freezed.dart
@@ -36,6 +36,8 @@ abstract class $AppStateCopyWith<$Res> {
       Server? server,
       HomeLayout homeLayout,
       bool globalLoading});
+
+  $ServerCopyWith<$Res>? get server;
 }
 
 /// @nodoc
@@ -75,6 +77,18 @@ class _$AppStateCopyWithImpl<$Res, $Val extends AppState>
               as bool,
     ) as $Val);
   }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $ServerCopyWith<$Res>? get server {
+    if (_value.server == null) {
+      return null;
+    }
+
+    return $ServerCopyWith<$Res>(_value.server!, (value) {
+      return _then(_value.copyWith(server: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -90,6 +104,9 @@ abstract class _$$AppStateImplCopyWith<$Res>
       Server? server,
       HomeLayout homeLayout,
       bool globalLoading});
+
+  @override
+  $ServerCopyWith<$Res>? get server;
 }
 
 /// @nodoc
diff --git a/lib/globals.dart b/lib/globals.dart
index 13f752e0..724b58d5 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -1,5 +1,6 @@
 library app.globals;
 
+import 'package:flutter/animation.dart';
 import 'package:invidious/service.dart';
 import 'package:invidious/utils/file_db.dart';
 import 'package:invidious/utils/interfaces/db.dart';
@@ -19,6 +20,7 @@ const youtubeHosts = [
 ];
 
 const animationDuration = Duration(milliseconds: 250);
+const animationCurve = Curves.easeInOutQuad;
 
 Service service = Service();
 
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index b75fc6e6..13694608 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -1,1362 +1,1375 @@
 {
-    "subscriptions": "Subscriptions",
-    "@subscriptions": {
-        "description": "User subscriptions"
-    },
-    "playlists": "Playlists",
-    "@playlists": {
-        "description": "User playlists"
-    },
-    "popular": "Popular",
-    "@popular": {
-        "description": "Popular videos title"
-    },
-    "trending": "Trending",
-    "@trending": {
-        "description": "Trending videos title"
-    },
-    "noVideoInPlayList": "No video in playlist",
-    "@noVideoInPlayList": {
-        "description": "When no videos in the playlist"
-    },
-    "removeFromPlayList": "Remove from playlist",
-    "@removeFromPlayList": {
-        "description": "Menu item description to show remove a video from a playlist"
-    },
-    "deletePlayListQ": "Delete Playlist?",
-    "@deletePlayListQ": {
-        "description": "Ask user to delete a playlist"
-    },
-    "irreversibleAction": "This action is irreversible",
-    "@irreversibleAction": {
-        "description": "Tell the user that the action cannot be undone"
-    },
-    "addPlayList": "Add Playlist",
-    "@addPlayList": {
-        "description": "Title for add playlist dialog"
-    },
-    "playListName": "Playlist name",
-    "@playListName": {
-        "description": "Place holder for new playlist name text field"
-    },
-    "playlistVisibility": "Visibility",
-    "@playlistVisibility": {
-        "description": "Dropdown label for playlist visibility"
-    },
-    "publicPlaylist": "Public",
-    "@publicPlaylist": {
-        "description": "Public playlist"
-    },
-    "privatePlaylist": "Private",
-    "@privatePlaylist": {
-        "description": "Private playlist"
-    },
-    "cancel": "Cancel",
-    "@cancel": {
-        "description": "Cancel button label"
-    },
-    "add": "Add",
-    "@add": {
-        "description": "Add button abel"
-    },
-    "unlistedPlaylist": "Unlisted",
-    "@unlistedPlaylist": {
-        "description": "Unlisted playlist"
-    },
-    "info": "Info",
-    "@info": {
-        "description": "Info label"
-    },
-    "videos": "Videos",
-    "@videos": {
-        "description": "Videos label"
-    },
-    "streams": "Streams",
-    "@streams": {
-        "description": "Streams label"
-    },
-    "latestVideos": "Latest Videos",
-    "@latestVideos": {
-        "description": "Latest channel videos"
-    },
-    "subscribed": "Subscribed",
-    "@subscribed": {
-        "description": "When the user is subscribed to a channel"
-    },
-    "subscribe": "Subscribe",
-    "@subscribe": {
-        "description": "Label for user to subscribe to a channel"
-    },
-    "nSubscribers": "{count, select, no{No subscribers} other{{count} subscribers}}",
-    "@nSubscribers": {
-        "description": "number of subscribers",
-        "placeholders": {
-            "count": {
-                "type": "String"
-            }
-        }
-    },
-    "share": "Share",
-    "@share": {
-        "description": "asking user if to share"
-    },
-    "shareYoutubeLink": "Share YouTube link",
-    "@shareYoutubeLink": {
-        "description": "asking user to share youtube link"
-    },
-    "shareInvidiousLink": "Share Invidious link",
-    "@shareInvidiousLink": {
-        "description": "asking user to share invidious link"
-    },
-    "redirectInvidiousLink": "Share Invidious Redirect link",
-    "@redirectInvidiousLink": {
-        "description": "asking user to share redirecting invidious link"
-    },
-    "shareLinkWithTimestamp": "Add timestamp",
-    "@shareLinkWithTimestamp": {
-        "description": "asking user to share link along with timestamp"
-    },
-    "ok": "OK",
-    "@ok": {
-        "description": "Ok"
-    },
-    "noChannels": "No channels",
-    "@noChannels": {
-        "description": "when there are no channels to display"
-    },
-    "noPlaylists": "No playlists",
-    "@noPlaylists": {
-        "description": "when there are no playlists to display"
-    },
-    "channels": "Channels",
-    "@channels": {
-        "description": "Channels label"
-    },
-    "couldntLoadVideo": "Could not load the video",
-    "@couldntLoadVideo": {
-        "description": "Message to display when a video can't be loaded"
-    },
-    "comments": "Comments",
-    "@comments": {
-        "description": "Comments label"
-    },
-    "recommended": "Recommended",
-    "@recommended": {
-        "description": "Recommended label"
-    },
-    "couldntFetchVideos": "Could not fetch videos. Tap to try again.",
-    "@couldntFetchVideos": {
-        "description": "Can't load bunch of videos, asking  user to try again"
-    },
-    "wizardIntro": "Select a public server or add your own. (Can be changed later in the settings)",
-    "@wizardIntro": {
-        "description": "Welcome message on frst time use"
-    },
-    "startUsingClipious": "Start using Clipious",
-    "@startUsingClipious": {
-        "description": "button label to start using the app"
-    },
-    "videoAddedToPlaylist": "Video added to playlist",
-    "@videoAddedToPlaylist": {
-        "description": "Pop up message when a video was added to a playlist"
-    },
-    "videoAddedToQueue": "Video added to queue",
-    "@videoAddedToQueue": {
-        "description": "Pop up message when a video was added at the end of the video queue"
-    },
-    "errorAddingVideoToPlaylist": "Error while adding video to playlist",
-    "@errorAddingVideoToPlaylist": {
-        "description": "Error while adding video to playlist"
-    },
-    "itemlistErrorGeneric": "Could not fetch data",
-    "@itemlistErrorGeneric": {
-        "description": "Error showing when the data can't be fetch"
-    },
-    "itemListErrorInvalidScope": "You don''t have the permission to see this, if you logged in using the token method try to log out and in again",
-    "@itemListErrorInvalidScope": {
-        "description": "Error when the user doesn't have the proper scope to its current token"
-    },
-    "selectPlaylist": "Select playlist",
-    "@selectPlaylist": {
-        "description": "Title when users wants to add a video to a playlist"
-    },
-    "createNewPlaylist": "Create new playlist",
-    "@createNewPlaylist": {
-        "description": "Button label to create a new playlist when the user wants to add a video to a playlist"
-    },
-    "nReplies": "{count, plural, =0{No replies} =1{1 reply} other{{count} replies}}",
-    "@nReplies": {
-        "description": "number of replies to a comment",
-        "placeholders": {
-            "count": {
-                "type": "num",
-                "format": "compact"
-            }
-        }
-    },
-    "loadMore": "Load more",
-    "@loadMore": {
-        "description": "CTA to load more"
-    },
-    "topSorting": "Top",
-    "@topSorting": {
-        "description": "Content sorting: top"
-    },
-    "newSorting": "New",
-    "@newSorting": {
-        "description": "Content sorting: new"
-    },
-    "streamIsLive": "Live",
-    "@streamIsLive": {
-        "description": "Label when a video is a live stream"
-    },
-    "sponsorSkipped": "Sponsor skipped",
-    "@sponsorSkipped": {
-        "description": "When a sponsor segment is skipped thanks to sponsor block"
-    },
-    "selectBrowsingCountry": "Select browsing country",
-    "@selectBrowsingCountry": {
-        "description": "Select country for trending content"
-    },
-    "showOnStart": "Select what to show when the app starts",
-    "@showOnStart": {
-        "description": "Title of dialog asking which screen the users prefers to see"
-    },
-    "settings": "Settings",
-    "@settings": {
-        "description": "Settings title"
-    },
-    "browsing": "Browsing",
-    "@browsing": {
-        "description": "video browsing preferences"
-    },
-    "country": "Country",
-    "@country": {
-        "description": "Country label"
-    },
-    "whenAppStartsShow": "When the app starts, show…",
-    "@whenAppStartsShow": {
-        "description": "Setting title for selecting the screen to show on start"
-    },
-    "servers": "Servers",
-    "@servers": {
-        "description": "Server management settings category"
-    },
-    "manageServers": "Manage servers",
-    "@manageServers": {
-        "description": "Settings to manage servers"
-    },
-    "currentServer": "Currently using {current}",
-    "@currentServer": {
-        "description": "Which server the user is currently using",
-        "placeholders": {
-            "current": {
-                "type": "String"
-            }
-        }
-    },
-    "useSponsorBlock": "Use SponsorBlock",
-    "@useSponsorBlock": {
-        "description": "label for sponsorblock checkbox"
-    },
-    "sponsorBlockDescription": "Skip sponsor segments submitted by the community",
-    "@sponsorBlockDescription": {
-        "description": "Sponsorblock setting description"
-    },
-    "about": "About",
-    "@about": {
-        "description": "About"
-    },
-    "name": "Name",
-    "@name": {
-        "description": "NAme label"
-    },
-    "package": "Package",
-    "@package": {
-        "description": "package label"
-    },
-    "version": "Version",
-    "@version": {
-        "description": "version label"
-    },
-    "build": "Build",
-    "@build": {
-        "description": "build label"
-    },
-    "addServer": "Add server",
-    "@addServer": {
-        "description": "Add server label"
-    },
-    "useThisServer": "Use this server",
-    "@useThisServer": {
-        "description": "Use this server label"
-    },
-    "logIn": "Log in",
-    "@logIn": {
-        "description": "CTA to log in to server"
-    },
-    "delete": "Delete",
-    "@delete": {
-        "description": "Delete label"
-    },
-    "invalidInvidiousServer": "Invalid Invidious server",
-    "@invalidInvidiousServer": {
-        "description": "Error when the user tries to add a server that is not a proper or reachable invidious server"
-    },
-    "yourServers": "Your servers",
-    "@yourServers": {
-        "description": "Your servers label"
-    },
-    "loggedIn": "Logged in",
-    "@loggedIn": {
-        "description": "Label to tell the user that he is logged in to the server"
-    },
-    "notLoggedIn": "Not logged in",
-    "@notLoggedIn": {
-        "description": "Label when the user is not logged in to the server"
-    },
-    "addServerHelpText": "Use the + button to add your own servers or tap on a public server and add it.",
-    "@addServerHelpText": {
-        "description": "label for when the user hasn't chosen a server yet"
-    },
-    "publicServers": "Public servers",
-    "@publicServers": {
-        "description": "Public servers label"
-    },
-    "loadingPublicServer": "Loading public servers",
-    "@loadingPublicServer": {
-        "description": "Message telling users the app is loading the list of public servers"
-    },
-    "tapToAddServer": "Tap to add server to your list",
-    "@tapToAddServer": {
-        "description": "public server description"
-    },
-    "publicServersError": "Could not fetch list of public servers. Tap to retry.",
-    "@publicServersError": {
-        "description": "Error message when trying to get public servers but it failed"
-    },
-    "appearance": "Appearance",
-    "@appearance": {
-        "description": "Settings category title"
-    },
-    "useDynamicTheme": "Dynamic colors",
-    "@useDynamicTheme": {
-        "description": ""
-    },
-    "useDynamicThemeDescription": "Use Material You colors (only available on Android 12+)",
-    "@useDynamicThemeDescription": {
-        "description": ""
-    },
-    "useDash": "Use DASH",
-    "@useDash": {
-        "description": "Label on video options if a user wants to switch to dash urls instead of the regular quality selection"
-    },
-    "useDashDescription": "DASH adaptive streaming can sometimes be problematic, Youtube can throttle it.",
-    "@useDashDescription": {
-        "description": "Description for dash in the settings screen"
-    },
-    "videoPlayer": "Video player",
-    "@videoPlayer": {
-        "description": "Title for video player related options"
-    },
-    "videoListed": "Public",
-    "@videoListed": {
-        "description": "Status of a publicly available video"
-    },
-    "videoUnlisted": "Unlisted",
-    "@videoUnlisted": {
-        "description": "Status of a video that is only accessible by link"
-    },
-    "videoIsFamilyFriendly": "Family friendly",
-    "@videoIsFamilyFriendly": {
-        "description": "Displayed only when a video is family friendly"
-    },
-    "tapToManage": "Tap to manage",
-    "@tapToManage": {
-        "description": "Text shown below a server in the 'Your servers' list"
-    },
-    "authentication": "Authentication",
-    "@authentication": {
-        "description": "Label for server settings related to authentications"
-    },
-    "tokenLogin": "Log in with token",
-    "@tokenLogin": {
-        "description": "Textto login to a server using the recommended way"
-    },
-    "tokenLoginDescription": "Recommended way to log in",
-    "@tokenLoginDescription": {
-        "description": "Recommended way to log in"
-    },
-    "cookieLogin": "Log in with cookie",
-    "@cookieLogin": {
-        "description": "Text to login to a server using the cookie jar method"
-    },
-    "cookieLoginDescription": "Use this method if you face issues with the token authentication",
-    "@cookieLoginDescription": {
-        "description": "Cookie log in description"
-    },
-    "logout": "Log out",
-    "@logout": {
-        "description": "CTA to logout of a server"
-    },
-    "username": "Username",
-    "@username": {
-        "description": "Username label for login to a server"
-    },
-    "password": "Password",
-    "@password": {
-        "description": "Password label for login to a server"
-    },
-    "wrongUsernamePassword": "Wrong username or password",
-    "@wrongUsernamePassword": {
-        "description": "Error message when authentication fails"
-    },
-    "error": "Error",
-    "@error": {},
-    "malformedStatsEndpoint": "/api/v1/stats is not as expected",
-    "@malformedStatsEndpoint": {
-        "description": "Title for dialog when adding a server that isn't validated as it should"
-    },
-    "malformedStatsEndpointDescription": "The server stats endpoint did not respond an expected payload, the key \"software.name\" should be equal to \"invidious\".\nResponse from the server:",
-    "@malformedStatsEndpointDescription": {
-        "description": "Description of the possible issue for an invalid stats endpoints"
-    },
-    "serverIsNotReachable": "Server is not reachable",
-    "@serverIsNotReachable": {
-        "description": "Title for dialog when adding a server that is not reachable"
-    },
-    "videoQueue": "Video queue",
-    "@videoQueue": {
-        "description": "Label for button to display the video queue"
-    },
-    "addToQueueList": "Add to queue",
-    "@addToQueueList": {
-        "description": "Label on button to add a video to the queue list"
-    },
-    "addToPlaylist": "Add to playlist",
-    "@addToPlaylist": {
-        "description": "Label to add a video to a playlist"
-    },
-    "playNext": "Play next",
-    "@playNext": {
-        "description": "Label to play the video after the current one."
-    },
-    "playNextAddedToQueue": "Video will play next",
-    "@playNextAddedToQueue": {
-        "description": "Pop up message to confirm that the video has been properly set to play next"
-    },
-    "addRecommendedToQueue": "Auto-play recommended next",
-    "@addRecommendedToQueue": {
-        "description": "Switch when playing a video to automatically add the recommended videos to the video queue"
-    },
-    "sponsorBlockSettingsQuickDescription": "Select which type of segments to skip",
-    "@sponsorBlockSettingsQuickDescription": {
-        "description": "Small description of what the sponsor block settings do"
-    },
-    "sponsorBlockCategorySponsor": "Sponsor",
-    "@sponsorBlockCategorySponsor": {
-        "description": "Sponsor block 'Sponsor' Category"
-    },
-    "sponsorBlockCategorySponsorDescription": "Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shoutouts to causes/creators/websites/products they like.",
-    "@sponsorBlockCategorySponsorDescription": {
-        "description": "Sponsor block 'Sponsor' Category description"
-    },
-    "sponsorBlockCategoryUnpaidSelfPromo": "Unpaid/Self Promotion",
-    "@sponsorBlockCategoryUnpaidSelfPromo": {
-        "description": "Sponsor block 'Unpaid/Self promotion' Category"
-    },
-    "sponsorBlockCategoryUnpaidSelfPromoDescription": "Similar to \"sponsor\" except for unpaid or self promotion. This includes sections about merchandise, donations, or information about who they collaborated ",
-    "@sponsorBlockCategoryUnpaidSelfPromoDescription": {
-        "description": "Sponsor block 'Unpaid/Self promotion' Category description"
-    },
-    "sponsorBlockCategoryInteraction": "Interaction Reminder (Subscribe)",
-    "@sponsorBlockCategoryInteraction": {
-        "description": "Sponsor block 'Interaction' Category"
-    },
-    "sponsorBlockCategoryInteractionDescription": "When there is a short reminder to like, subscribe or follow them in the middle of content. If it is long or about something specific, it should be under self promotion instead.",
-    "@sponsorBlockCategoryInteractionDescription": {
-        "description": "Sponsor block 'Interaction' Category description"
-    },
-    "sponsorBlockCategoryIntro": "Intermission/Intro Animation",
-    "@sponsorBlockCategoryIntro": {
-        "description": "Sponsorblock 'Intro' Category"
-    },
-    "sponsorBlockCategoryIntroDescription": "An interval without actual content. Could be a pause, static frame, repeating animation. This should not be used for transitions containing information.",
-    "@sponsorBlockCategoryIntroDescription": {
-        "description": "Sponsorblock 'Intro' Category description"
-    },
-    "sponsorBlockCategoryOutro": "Endcards/Credits",
-    "@sponsorBlockCategoryOutro": {
-        "description": "Outro block 'Outro' Category"
-    },
-    "sponsorBlockCategoryOutroDescription": "Credits or when the YouTube endcards appear. Not for conclusions with information.",
-    "@sponsorBlockCategoryOutroDescription": {
-        "description": "Outro block 'Outro' Category description"
-    },
-    "sponsorBlockCategoryPreview": "Preview/Recap",
-    "@sponsorBlockCategoryPreview": {
-        "description": "Sponsorblock 'Preview' Category"
-    },
-    "sponsorBlockCategoryPreviewDescription": "Collection of clips that show what is coming up in in this video or other videos in a series where all information is repeated later in the video.",
-    "@sponsorBlockCategoryPreviewDescription": {
-        "description": "Sponsorblock 'Preview' Category description"
-    },
-    "sponsorBlockCategoryFiller": "Filler Tangent/Jokes",
-    "@sponsorBlockCategoryFiller": {
-        "description": "Sponsorblock 'Filler' Category"
-    },
-    "sponsorBlockCategoryFillerDescription": "Tangential scenes added only for filler or humor that are not required to understand the main content of the video. This should not include segments providing context or background details. This is a very aggressive category meant for when you aren''t in the mood for \"fun\".",
-    "@sponsorBlockCategoryFillerDescription": {
-        "description": "Sponsorblock 'Filler' Category description"
-    },
-    "sponsorBlockCategoryMusicOffTopic": "Music: Non-Music Section",
-    "@sponsorBlockCategoryMusicOffTopic": {
-        "description": "Sponsorblock 'MusicOffTopic' Category"
-    },
-    "sponsorBlockCategoryMusicOffTopicDescription": "Only for use in music videos. This only should be used for sections of music videos that aren''t already covered by another category.",
-    "@sponsorBlockCategoryMusicOffTopicDescription": {
-        "description": "Only for use in music videos. This only should be used for sections of music videos that aren't already covered by another category."
-    },
-    "useProxy": "Proxy videos",
-    "@useProxy": {
-        "description": "label for settings switch to proxy videos from server"
-    },
-    "useProxyDescription": "By proxying video streams from the server, you can bypass regional blocks or ISP blocking YouTube",
-    "@useProxyDescription": {
-        "description": "Description for the use proxy settings"
-    },
-    "pressDownToShowSettings": "Press down to show settings",
-    "@pressDownToShowSettings": {
-        "description": "Instruction on how to show video settings when playing a video on TV"
-    },
-    "quality": "Quality",
-    "@quality": {
-        "description": "Name of TV ui video settings"
-    },
-    "audio": "Audio",
-    "@audio": {
-        "description": "Name TV ui audio settings"
-    },
-    "subtitles": "Subtitles",
-    "@subtitles": {
-        "description": "Name of TV ui subtitles settings"
-    },
-    "playbackSpeed": "Playback speed",
-    "@playbackSpeed": {
-        "description": "Name of TV ui Playback speed"
-    },
-    "blackBackground": "Black background",
-    "@blackBackground": {
-        "description": "Settings name for black background"
-    },
-    "blackBackgroundDescription": "For dark theme on OLED screen",
-    "@blackBackgroundDescription": {
-        "description": "Description for dark background setting"
-    },
-    "search": "Search",
-    "@search": {
-        "description": "search title"
-    },
-    "subtitleFontSize": "Subtitles font size",
-    "@subtitleFontSize": {
-        "description": "Settings label for the size of the subtitles"
-    },
-    "subtitleFontSizeDescription": "Change the size of the subtitles if it is too small or too big on your device",
-    "@subtitleFontSizeDescription": {
-        "description": "Settings description for subtitle size"
-    },
-    "skipSslVerification": "Skip SSL certificate verification",
-    "@skipSslVerification": {
-        "description": "Setting label to skip ssl certification verification"
-    },
-    "skipSslVerificationDescription": "For using a self-signed SSL certificate, or when having SSL related issues with your server.",
-    "@skipSslVerificationDescription": {
-        "description": "Setting description for the skip ssl certification verification"
-    },
-    "themeBrightness": "Theme",
-    "@themeBrightness": {
-        "description": "Ask the user to user dark / light / system theme"
-    },
-    "themeLight": "Light",
-    "@themeLight": {
-        "description": "Light theme"
-    },
-    "themeDark": "Dark",
-    "@themeDark": {
-        "description": "Dark theme"
-    },
-    "followSystem": "Follow system",
-    "@followSystem": {
-        "description": "Follow system label"
-    },
-    "requiresRestart": "Requires app restart",
-    "@requiresRestart": {
-        "description": "Requires app restart label"
-    },
-    "appLanguage": "App language",
-    "@appLanguage": {
-        "description": "Select app language"
-    },
-    "nVideos": "{count, plural, =0{No videos} =1{1 video} other{{count} videos}}",
-    "@nVideos": {
-        "description": "One or more videos",
-        "placeholders": {
-            "count": {
-                "type": "num",
-                "format": "compact"
-            }
-        }
-    },
-    "returnYoutubeUrlValidation": "Url must start with http:// or https://",
-    "@returnYoutubeUrlValidation": {
-        "description": "error message for invalid custom url for return to youtube"
-    },
-    "returnYoutubeDislikeDescription": "Show estimated video dislikes using API provided by returnyoutubedislike.com",
-    "@returnYoutubeDislikeDescription": {
-        "description": "ReturnYoutubeDislike setting description"
-    },
-    "rydCustomInstance": "Custom RYD instance url",
-    "@rydCustomInstance": {
-        "description": "title for setting to set a custom ryd instance"
-    },
-    "rydCustomInstanceDescription": "Use a different RYD instance, leave empty to use the default",
-    "@rydCustomInstanceDescription": {
-        "description": "description for custom ryd instancr setting"
-    },
-    "autoplayVideoOnLoad": "Automatically play video on load",
-    "@autoplayVideoOnLoad": {
-        "description": "Label for settings to enable autoplay when a video loads"
-    },
-    "autoplayVideoOnLoadDescription": "Automatically start playing the video after it has loaded",
-    "@autoplayVideoOnLoadDescription": {
-        "description": "Description for the autoplay video on load setting"
-    },
-    "searchHistory": "Search history",
-    "@searchHistory": {
-        "description": "Settings label for search history"
-    },
-    "searchHistoryDescription": "Search history settings",
-    "@searchHistoryDescription": {
-        "description": "Description for search history settings"
-    },
-    "enableSearchHistory": "Enable search history",
-    "@enableSearchHistory": {
-        "description": "Settings label for enabling search history"
-    },
-    "searchHistoryLimit": "Search history limit",
-    "@searchHistoryLimit": {
-        "description": "Settings label for search history limit"
-    },
-    "searchHistoryLimitDescription": "Set how many previous searches will show up in suggestions",
-    "@searchHistoryLimitDescription": {
-        "description": "Settings label for search history limit description"
-    },
-    "shorts": "Shorts",
-    "@shorts": {
-        "description": "Youtube shorts"
-    },
-    "searchUploadDate": "Upload date",
-    "@searchUploadDate": {
-        "description": "Filter search result by upload date"
-    },
-    "searchUploadDateAny": "Any date",
-    "@searchUploadDateAny": {
-        "description": "Do not filter search result by upload date"
-    },
-    "searchUploadDateHour": "Last Hour",
-    "@searchUploadDateHour": {
-        "description": "Search for uploaded in last hour"
-    },
-    "searchUploadDateToday": "Today",
-    "@searchUploadDateToday": {
-        "description": "Search for uploaded today"
-    },
-    "searchUploadDateWeek": "This week",
-    "@searchUploadDateWeek": {
-        "description": "Search for uploaded this week"
-    },
-    "searchUploadDateMonth": "This month",
-    "@searchUploadDateMonth": {
-        "description": "Search for uploaded this month"
-    },
-    "searchUploadDateYear": "This year",
-    "@searchUploadDateYear": {
-        "description": "Search for uploaded this year"
-    },
-    "searchDuration": "Duration",
-    "@searchDuration": {
-        "description": "Filter search result by duration"
-    },
-    "searchDurationAny": "Any duration",
-    "@searchDurationAny": {
-        "description": "Do not filter search result by duration"
-    },
-    "searchDurationShort": "Short (<4 minutes)",
-    "@searchDurationShort": {
-        "description": "Search for short videos only"
-    },
-    "searchDurationLong": "Long (>20 minutes)",
-    "@searchDurationLong": {
-        "description": "Search for long videos only"
-    },
-    "searchDurationMedium": "Medium (4-20 minutes)",
-    "@searchDurationMedium": {
-        "description": "Search for medium videos only"
-    },
-    "searchSortBy": "Sort by",
-    "@searchSortBy": {
-        "description": "Search sorting option"
-    },
-    "searchSortRelevance": "Relevance",
-    "@searchSortRelevance": {
-        "description": "Sort search by relevance"
-    },
-    "searchSortRating": "Rating",
-    "@searchSortRating": {
-        "description": "Sort search by rating"
-    },
-    "searchSortUploadDate": "Upload Date",
-    "@searchSortUploadDate": {
-        "description": "Sort search by upload date"
-    },
-    "searchSortViewCount": "View Count",
-    "@searchSortViewCount": {
-        "description": "Sort search by view count"
-    },
-    "clearSearchHistory": "Clear search history",
-    "@clearSearchHistory": {
-        "description": "Settings label for clearing search history"
-    },
-    "appLogs": "Application Logs",
-    "@appLogs": {
-        "description": "Title for settings that leads to application logs"
-    },
-    "appLogsDescription": "Get logs of what is happening in the application, can be useful to report issues",
-    "@appLogsDescription": {
-        "description": "Description of the app log settings"
-    },
-    "copyToClipBoard": "Copy to clipboard",
-    "@copyToClipBoard": {
-        "description": "Text to copy something to clipboard"
-    },
-    "logsCopied": "Logs copied to clipboard",
-    "@logsCopied": {
-        "description": "Message to tell user that logs have been copied to the clipboard"
-    },
-    "rememberSubtitleLanguage": "Remember subtitles language",
-    "@rememberSubtitleLanguage": {
-        "description": "Settings label for remembering subtitle language"
-    },
-    "videoFilters": "Video filters",
-    "@videoFilters": {
-        "description": "Title for video filter settings"
-    },
-    "nFilters": "{count, plural, =0{No videos} =1{1 filter} other{{count} filters}}",
-    "@nFilters": {
-        "description": "One or more video filters",
-        "placeholders": {
-            "count": {
-                "type": "num",
-                "format": "compact"
-            }
-        }
-    },
-    "videoFiltersExplanation": "Hide or Obfuscate videos from all the video feeds in the application based on the filters defined below. This allow you for example to hide sports spoilers or hide shorts from a certain channel.",
-    "@videoFiltersExplanation": {
-        "description": "Description on how filter work"
-    },
-    "videoFiltersSettingTileDescriptions": "Define rules to filter out videos",
-    "@videoFiltersSettingTileDescriptions": {
-        "description": "Description for the main settings page"
-    },
-    "videoFilterAllChannels": "All channels",
-    "@videoFilterAllChannels": {
-        "description": "Title for the sections that applies to all channels"
-    },
-    "addVideoFilter": "Create filter",
-    "@addVideoFilter": {
-        "description": "Title when creating a new filter"
-    },
-    "editVideoFilter": "Edit filter",
-    "@editVideoFilter": {
-        "description": "Title when editting a filter"
-    },
-    "videoFilterType": "Type",
-    "@videoFilterType": {
-        "description": "Label for filter type"
-    },
-    "videoFilterOperation": "Operation",
-    "@videoFilterOperation": {
-        "description": "Label for filter operation"
-    },
-    "videoFilterValue": "Value",
-    "@videoFilterValue": {
-        "description": "Label for filter value"
-    },
-    "save": "Save",
-    "@save": {
-        "description": "Text for save action"
-    },
-    "videoFilterEditDescription": "Select an optional channel, a filter type, operation and a value to filter OUT videos from lists. Example, type: video name, operation: contains, value: test will EXCLUDE all the videos with the word 'test' in their name.",
-    "@videoFilterEditDescription": {
-        "description": "Descriptive test for video filter set up"
-    },
-    "optional": "optional",
-    "@optional": {
-        "description": "Optional label"
-    },
-    "videoFilterHideLabel": "Hide",
-    "@videoFilterHideLabel": {
-        "description": "Label to hide videos"
-    },
-    "videoFilterFilterLabel": "Obfuscate",
-    "@videoFilterFilterLabel": {
-        "description": "Label to filter videos"
-    },
-    "videoFilterDescriptionString": "{hideOrFilter} videos where {type} {operation} ''{value}''.",
-    "@videoFilterDescriptionString": {
-        "description": "Human readable description of a video filter, in this case is it for string comparison, example: Hide videos where the name of the video does not contain the following string 'test' (Do not translate text between { })",
-        "placeholders": {
-            "hideOrFilter": {
-                "type": "String",
-                "example": "Hide"
-            },
-            "type": {
-                "type": "String",
-                "example": "video title"
-            },
-            "operation": {
-                "type": "String",
-                "example": "does not contain"
-            },
-            "value": {
-                "type": "String",
-                "example": "some filter text"
-            }
-        }
-    },
-    "videoFiltered": "Video filtered for the following reason(s):",
-    "@videoFiltered": {
-        "description": "Label shown on video list when it is filtered out"
-    },
-    "videoFilterTapToReveal": "Tap to reveal",
-    "@videoFilterTapToReveal": {
-        "description": "Label to tell user to tap to show a filtered video"
-    },
-    "videoFilterHide": "Hide filtered videos",
-    "@videoFilterHide": {
-        "description": "Label for settings to hide filtered videos"
-    },
-    "videoFilterHideDescription": "By default filtered videos are not hidden but shown as obfuscated with the reason(s) why it has been filtered. This setting remove the filtered videos from lists.",
-    "@videoFilterHideDescription": {
-        "description": ""
-    },
-    "videoFilterNoFilters": "No video filters, tap the '+' button below to start adding filters.",
-    "@videoFilterNoFilters": {
-        "description": "Label when there are no video filters"
-    },
-    "videoFilterTypeVideoTitle": "Video title",
-    "@videoFilterTypeVideoTitle": {
-        "description": "Label for video filter video title"
-    },
-    "videoFilterTypeChannelName": "Channel name",
-    "@videoFilterTypeChannelName": {
-        "description": "Label for video filter channel name"
-    },
-    "videoFilterTypeVideoLength": "Video length (seconds)",
-    "@videoFilterTypeVideoLength": {
-        "description": "Label for video filter video length"
-    },
-    "videoFilterOperationContains": "Contains",
-    "@videoFilterOperationContains": {
-        "description": "Label for video filter operation Contains"
-    },
-    "videoFilterOperationNotContain": "Does not contain",
-    "@videoFilterOperationNotContain": {
-        "description": "Label for video filter operation Does not contain"
-    },
-    "videoFilterOperationLowerThan": "Lower than",
-    "@videoFilterOperationLowerThan": {
-        "description": "Label for video filter operation Lower than"
-    },
-    "videoFilterOperationHigherThan": "Higher than",
-    "@videoFilterOperationHigherThan": {
-        "description": "Label for video filter operation Higher than"
-    },
-    "channel": "Channel",
-    "@channel": {
-        "description": "A single channel"
-    },
-    "videoFilterHideAllFromChannel": "Filter all videos from channel",
-    "@videoFilterHideAllFromChannel": {
-        "description": "Label for video filter switch to allow to hide all videos from a channel"
-    },
-    "videoFilterWholeChannel": "{hideOrFilter} all videos from channel",
-    "@videoFilterWholeChannel": {
-        "description": "Label for whole channel filtering",
-        "placeholders": {
-            "hideOrFilter": {
-                "type": "String",
-                "example": "Hide"
-            }
-        }
-    },
-    "rememberSubtitleLanguageDescription": "Automatically set subtitles to last language selected, if available",
-    "@rememberSubtitleLanguageDescription": {
-        "description": "Settings description for remembering subtitle language"
-    },
-    "lockFullScreenToLandscape": "Lock full screen orientation to video aspect ratio",
-    "@lockFullScreenToLandscape": {
-        "description": "Title to force full screen to landscape"
-    },
-    "lockFullScreenToLandscapeDescription": "Locks the full screen orientation based on video format, landscape for wide video and portrait for portrait videos",
-    "@lockFullScreenToLandscapeDescription": {
-        "description": "Setting description for forcing video to landscape when in full screen"
-    },
-    "fillFullscreen": "Maximize video to fit screen",
-    "@fillFullscreen": {
-        "description": "Title to maximize video to fit screen"
-    },
-    "fillFullscreenDescription": "Adjusts the video to fill the entire screen in landscape mode",
-    "@fillFullscreenDescription": {
-        "description": "Setting description for filling video to screen in landscape"
-    },
-    "rememberPlaybackSpeed": "Remember playback speed",
-    "@rememberPlaybackSpeed": {
-        "description": "Setting label for remembering playback speed"
-    },
-    "rememberPlaybackSpeedDescription": "Automatically set playback speed to the last speed selected",
-    "@rememberPlaybackSpeedDescription": {
-        "description": "Settings description for remembering playback speed"
-    },
-    "downloads": "Downloads",
-    "@downloads": {
-        "description": "Downloads"
-    },
-    "download": "Download",
-    "@download": {
-        "description": "A single download or CTA for downloading a video"
-    },
-    "videoAlreadyDownloaded": "Video already downloaded",
-    "@videoAlreadyDownloaded": {
-        "description": "Message when a user tries to download a video he already has"
-    },
-    "noDownloadedVideos": "No downloaded videos, browse, long press on a video in a list or tap the download button on a video screen to download",
-    "@noDownloadedVideos": {
-        "description": "Message showing when the user goes to the download screen but there are no offline videos."
-    },
-    "downloadsPlayAll": "Play all",
-    "@downloadsPlayAll": {
-        "description": "Button to play all downloaded videos"
-    },
-    "videoDownloadStarted": "Video download started",
-    "@videoDownloadStarted": {
-        "description": "Message when a video starts being downloaded"
-    },
-    "videoFailedDownloadRetry": "Download failed, tap to retry",
-    "@videoFailedDownloadRetry": {
-        "description": "Shown on download manager when a download fails and prompt the user to retry"
-    },
-    "videoDownloadAudioOnly": "Audio only",
-    "@videoDownloadAudioOnly": {
-        "description": "Label for toggle to download audio only "
-    },
-    "manageSubscriptions": "Manage Subscriptions",
-    "@manageSubscriptions": {
-        "description": "Title of manage subscriptions page"
-    },
-    "noSubscriptions": "No subscriptions, browse videos and subscribe to any channel you like.",
-    "@noSubscriptions": {
-        "description": "Message when the user has no subs"
-    },
-    "youCanSubscribeAgainLater": "You can subscribe to this channel again later",
-    "@youCanSubscribeAgainLater": {
-        "description": "Text for the unscubscribe confirmation dialog"
-    },
-    "unSubscribeQuestion": "Unsubscribe ?",
-    "@unSubscribeQuestion": {
-        "description": "Title for dialog if a user wants to unsubscribe in the subscribtion management screen"
-    },
-    "clearHistoryQuestion": "Clear history ?",
-    "@clearHistoryQuestion": {},
-    "clearHistoryQuestionExplanation": "This will clear your viewing history of your account on the Invidious instance you use. This cannot be undone.",
-    "@clearHistoryQuestionExplanation": {
-        "description": "Message for dialog before clearing full viewing history"
-    },
-    "noHistory": "No viewing history, watch some videos and it will appear here",
-    "@noHistory": {
-        "description": "Message when the user visits the history tab but it's empty"
-    },
-    "homeLayoutEditor": "Edit home layout",
-    "@homeLayoutEditor": {
-        "description": "Title of layout editor screen"
-    },
-    "layoutEditorAddVideoSource": "Add video source",
-    "@layoutEditorAddVideoSource": {
-        "description": "Label for button to allow user to add more video sources to the home screen"
-    },
-    "layoutEditorExplanation": "You can decide what to display on your home screen, you can have up to 2 small view with horizontal scrolling and one big source.",
-    "@layoutEditorExplanation": {
-        "description": "text to explain the home layout editor"
-    },
-    "home": "Home",
-    "@home": {
-        "description": "Label for Home browsing tab"
-    },
-    "library": "Library",
-    "@library": {
-        "description": "Name for user library"
-    },
-    "customizeAppLayout": "Customize app sections",
-    "@customizeAppLayout": {
-        "description": "Settings label for the settings to allow the user to set up the app sections themselves"
-    },
-    "customizeAppLayoutExplanation": "Select which sections you want to appear in the main app navigation bar. Click on the home icon to select which screen shows when the application starts. You can reorder the sections by dragging them around.",
-    "@customizeAppLayoutExplanation": {
-        "description": ""
-    },
-    "navigationBarStyle": "Navigation bar style",
-    "@navigationBarStyle": {
-        "description": "Label for settings on customizing navigation bar style"
-    },
-    "navigationBarLabelAlwaysShowing": "Label always showing",
-    "@navigationBarLabelAlwaysShowing": {
-        "description": "Label always showing option for navigation bar"
-    },
-    "navigationBarLabelShowOnSelect": "Label shown on selected item",
-    "@navigationBarLabelShowOnSelect": {
-        "description": "Label only showing when selected option for navigation bar"
-    },
-    "navigationBarLabelNeverShow": "Never show label",
-    "@navigationBarLabelNeverShow": {
-        "description": "Never show label option for navigation bar"
-    },
-    "distractionFreeMode": "Distraction free mode",
-    "@distractionFreeMode": {
-        "description": "title for distraction free mode settings"
-    },
-    "distractionFreeModeDescription": "Disable video comments and recommendations",
-    "@distractionFreeModeDescription": {
-        "description": "Description for distraction free mode"
-    },
-    "secondsShortForm": "secs",
-    "@secondsShortForm": {
-        "description": "Short form for the word seconds"
-    },
-    "videoFilterApplyDateToFilter": "Filter videos on given times",
-    "@videoFilterApplyDateToFilter": {
-        "description": "Label for switch to allow user to customize video filter and set days of week and time to them"
-    },
-    "videoFilterDayOfWeek": "Select days to apply filters",
-    "@videoFilterDayOfWeek": {
-        "description": "Title for day selection for the filter"
-    },
-    "videoFilterDayOfWeekDescription": "You can selectively choose days of the week and time to which the filters apply to, for example, avoid sport events spoilers.",
-    "@videoFilterDayOfWeekDescription": {
-        "description": ""
-    },
-    "videoFilterStartTime": "Start time",
-    "@videoFilterStartTime": {
-        "description": "Title for filter start time"
-    },
-    "videoFilterEndTime": "End time",
-    "@videoFilterEndTime": {
-        "description": "Title for filter end time"
-    },
-    "videoFilterAppliedOn": "Applied on {selectedDays}",
-    "@videoFilterAppliedOn": {
-        "description": "Readable text on when the filter should apply",
-        "placeholders": {
-            "selectedDays": {
-                "type": "String",
-                "example": "Monday, Wednesday, Friday"
-            }
-        }
-    },
-    "from": "From",
-    "@from": {
-        "description": "From word (as in 'From xx To xx')"
-    },
-    "to": "To",
-    "@to": {
-        "description": "To word as in 'From xx To xx')"
-    },
-    "videoFilterTimeOfDayFromTo": "From {from} to {to}",
-    "@videoFilterTimeOfDayFromTo": {
-        "description": "Time of day range",
-        "placeholders": {
-            "from": {
-                "type": "String",
-                "example": "3:00 AM"
-            },
-            "to": {
-                "type": "String",
-                "example": "5:00 PM"
-            }
-        }
-    },
-    "notifications": "Notifications",
-    "@notifications": {
-        "description": "Notification settings title"
-    },
-    "notificationsDescription": "Enable and review what you are notified about",
-    "@notificationsDescription": {
-        "description": "Setting description for notifications"
-    },
-    "enableNotificationDescriptions": "Runs foreground service to check and notify you on the changes you are monitoring",
-    "@enableNotificationDescriptions": {
-        "description": ""
-    },
-    "subscriptionNotification": "Subscription notifications",
-    "@subscriptionNotification": {
-        "description": "Title for subscriptions notifications"
-    },
-    "subscriptionNotificationDescription": "Get notified of new videos from your subscription feed if you are logged in to your current instance",
-    "@subscriptionNotificationDescription": {
-        "description": "Description for subscription notifications"
-    },
-    "subscriptionNotificationTitle": "New videos from your subscriptions",
-    "@subscriptionNotificationTitle": {
-        "description": "Title for the notification showing that there are new videos from the subscription feed"
-    },
-    "subscriptionNotificationContent": "There are  {count, plural, =0{no new videos} =1{1 new video} other{{count} new videos}} in your subscription feed",
-    "@subscriptionNotificationContent": {
-        "description": "Content for subscription notification",
-        "placeholders": {
-            "count": {
-                "type": "num",
-                "format": "compact"
-            }
-        }
-    },
-    "askForDisableBatteryOptimizationTitle": "Disabling battery optimization required",
-    "@askForDisableBatteryOptimizationTitle": {
-        "description": "Title for the dialog asking the user to turn off disabling battery optimization when turning on notifications"
-    },
-    "askForDisableBatteryOptimizationContent": "In order to send notification Clipious needs to run a background service. For it to run smoothly it is required that Clipious is given unrestricted battery usage, tapping ok will open the battery optimization settings.",
-    "@askForDisableBatteryOptimizationContent": {
-        "description": "Content for the dialog asking the user to turn off disabling battery optimization when turning on notifications"
-    },
-    "askToEnableBackgroundServiceTitle": "Notifications turned off",
-    "@askToEnableBackgroundServiceTitle": {
-        "description": "If the users tries to turn on notifications for a channel but hasn't enable notifications in the app we need to turn it on for them"
-    },
-    "askToEnableBackgroundServiceContent": "To get notifications, Clipious notifications need to be enabled, press OK to enable it.",
-    "@askToEnableBackgroundServiceContent": {
-        "description": "If the users tries to turn on notifications for a channel but hasn't enable notifications in the app we need to turn it on for them"
-    },
-    "otherNotifications": "Other notifications sources (bell icons)",
-    "@otherNotifications": {
-        "description": "Title for settings section in the notification settings"
-    },
-    "deleteChannelNotificationTitle": "Delete channel notification ?",
-    "@deleteChannelNotificationTitle": {
-        "description": "Title for dialog to confirm whether to delete channel notifications"
-    },
-    "deleteChannelNotificationContent": "You won''t receive anymore notifications from this channel.",
-    "@deleteChannelNotificationContent": {
-        "description": "Title for dialog to confirm whether to delete channel notifications"
-    },
-    "deletePlaylistNotificationTitle": "Delete playlist notification ?",
-    "@deletePlaylistNotificationTitle": {
-        "description": "Title for dialog to confirm whether to delete playlist notifications"
-    },
-    "deletePlaylistNotificationContent": "You won''t receive anymore notifications from this playlist.",
-    "@deletePlaylistNotificationContent": {
-        "description": "Title for dialog to confirm whether to delete playlist notifications"
-    },
-    "channelNotificationTitle": "New videos from {channel}",
-    "@channelNotificationTitle": {
-        "description": "Title for the channel notifications when there are new videos",
-        "placeholders": {
-            "channel": {
-                "type": "String",
-                "example": "MKBHD"
-            }
-        }
-    },
-    "channelNotificationContent": "There are {count, plural, =0{no new videos} =1{1 new video} other{{count} new videos}} from {channel}",
-    "@channelNotificationContent": {
-        "description": "Content for channel notification when there are new videos",
-        "placeholders": {
-            "channel": {
-                "type": "String",
-                "example": "MKBHD"
-            },
-            "count": {
-                "type": "num",
-                "format": "compact"
-            }
-        }
-    },
-    "playlistNotificationTitle": "New videos in {playlist} playlist",
-    "@playlistNotificationTitle": {
-        "description": "Title for the playlist notifications when there are new videos",
-        "placeholders": {
-            "playlist": {
-                "type": "String",
-                "example": "Lo-Fi girl"
-            }
-        }
-    },
-    "playlistNotificationContent": "There are {count, plural, =0{no new videos} =1{1 new video} other{{count} new videos}} in the {playlist} playlist",
-    "@playlistNotificationContent": {
-        "description": "Content for playlist notification when there are new videos",
-        "placeholders": {
-            "playlist": {
-                "type": "String",
-                "example": "Lo-Fi girl"
-            },
-            "count": {
-                "type": "num",
-                "format": "compact"
-            }
-        }
-    },
-    "foregroundServiceNotificationTitle": "Video monitoring",
-    "@foregroundServiceNotificationTitle": {
-        "description": "Title for the foreground service running notification when the user wants to receive notifications"
-    },
-    "foregroundServiceNotificationContent": "Will check for new videos once {hours, select, 1{per hour} 24{a day} other{every {hours} hours}}",
-    "@foregroundServiceNotificationContent": {
-        "description": "Content for the foreground service running notification when the user wants to receive notifications",
-        "hours": {
-            "type": "num",
-            "format": "compact"
-        }
-    },
-    "foregroundServiceUpdatingSubscriptions": "Checking subscriptions...",
-    "@foregroundServiceUpdatingSubscriptions": {
-        "description": "Foreground service notification text when checking for new subscription videos"
-    },
-    "foregroundServiceUpdatingPlaylist": "Checking playlists...",
-    "@foregroundServiceUpdatingPlaylist": {
-        "description": "Foreground service notification text when checking for new playlist videos"
-    },
-    "foregroundServiceUpdatingChannels": "Checking channels...",
-    "@foregroundServiceUpdatingChannels": {
-        "description": "Foreground service notification text when checking for new channel videos"
-    },
-    "notificationFrequencySettingsTitle": "New video check frequency",
-    "@notificationFrequencySettingsTitle": {
-        "description": "Title for frequency settings"
-    },
-    "notificationFrequencySettingsDescription": "How often the application will check for new videos",
-    "@notificationFrequencySettingsDescription": {
-        "description": "Description for frequency settings"
-    },
-    "notificationFrequencySliderLabel": "{hours, select,  24{1d} other{{hours}h}}",
-    "@notificationFrequencySliderLabel": {
-        "description": "Short form for a number of hours going up to 1 day",
-        "hours": {
-            "type": "num",
-            "format": "compact"
-        }
-    },
-    "subtitlesBackground": "Subtitles background",
-    "@subtitlesBackground": {
-        "description": "Title for settings to set black background  for subtitles"
-    },
-    "subtitlesBackgroundDescription": "Adds a black background to subtitles to make them more readable",
-    "@subtitlesBackgroundDescription": {
-        "description": "Description for settings to set black background  for subtitles"
-    },
-    "history": "History",
-    "@history": {
-        "description": "User view history label"
-    },
-    "deArrowSettingDescription": "Replace click bait titles and thumbnails",
-    "@deArrowSettingDescription": {
-        "description": "Description for dearrow"
-    },
-    "deArrowReplaceThumbnails": "Replace thumbnails",
-    "@deArrowReplaceThumbnails": {
-        "description": "Settings title for checkbox on whether the thumbnail should be replaced as well"
-    },
-    "deArrowReplaceThumbnailsDescription": "Replace video thumbnails in addition of the titles",
-    "@deArrowReplaceThumbnailsDescription": {
-        "description": "Description for DeArrow setting switch"
-    },
-    "deArrowWarning": "Enabling DeArrow can significantly reduce the browsing speed of the app as extra http requests are needed for every single video",
-    "@deArrowWarning": {
-        "description": "Warning message when the user enables DeArrow"
-    },
-    "copySettingsAsJson": "Copy settings as JSON to clipboard",
-    "@copySettingsAsJson": {
-        "description": "title for settings sections to allow users to copy their settings as json to make debugging easier"
-    },
-    "copySettingsAsJsonDescription": "Copy the settings as JSON to help debugging if you encounter an issue with the app and decide to raise an issue",
-    "@copySettingsAsJsonDescription": {
-        "description": ""
-    },
-    "seeking": "Seeking",
-    "@seeking": {
-        "description": "category for settings related to seeking in a video"
-    },
-    "skipStep": "Skip forward/backward step",
-    "@skipStep": {
-        "description": "Title for the settings to set the skipping step"
-    },
-    "skipStepDescription": "Seconds to skip on forward/backward actions",
-    "@skipStepDescription": {
-        "description": "Title for the settings to set the skipping step"
-    },
-    "exponentialSkip": "Exponential skip forward/backward",
-    "@exponentialSkip": {
-        "description": "Title for the setting to enable the exponential skipping"
-    },
-    "exponentialSkipDescription": "The more you skip forward, the bigger the step is.",
-    "@exponentialSkipDescription": {
-        "description": "Title for the setting to enable the exponential skipping"
-    },
-    "fullscreenOnLandscape": "Full screen on landscape",
-    "@fullscreenOnLandscape": {
-        "description": "Setting title to enable full screen on landscape orientation"
-    },
-    "fullscreenOnLandscapeDescription": "Switch to full screen when the device is rotated to landscape mode",
-    "@fullscreenOnLandscapeDescription": {
-        "description": "Setting to enable full screen on landscape orientation"
-    },
-    "enabled": "Enabled",
-    "@enabled": {
-        "description": "Text to show something is enabled"
-    },
-    "submitFeedback": "Submit feedback",
-    "@submitFeedback": {
-        "description": "Title for settings to submit feed back through the app"
-    },
-    "submitFeedbackDescription": "Found a bug or have a suggestion? Use this tool to take screenshot of the app, annotate and submit feedback",
-    "@submitFeedbackDescription": {
-        "description": "Setting tile descriptions for feedback submission"
-    },
-    "feedbackDisclaimer": "To submit feedback you will need a GitHub account and your screenshot will be submitted to Imgur anonymously.",
-    "@feedbackDisclaimer": {
-        "description": "Content of dialog shown before submitting feedback to make sure the user is ok whith where the data is going"
-    },
-    "feedbackScreenshotError": "Error while uploading screenshot to Imgur",
-    "@feedbackScreenshotError": {
-        "description": "Title for dialog if something goes wrong while uploading feedback screenshot"
-    },
-    "channelSortByNewest": "Newest",
-    "@channelSortByNewest": {
-        "description": "Sort channel videos from newest to oldest"
-    },
-    "channelSortByOldest": "Oldest",
-    "@channelSortByOldest": {
-        "description": "Sort channel videos from oldest to newest"
-    },
-    "channelSortByPopular": "Popular",
-    "@channelSortByPopular": {
-        "description": "Sort channel videos by popularity"
-    },
-    "invidiousAccount": "Invidious account",
-    "@invidiousAccount": {
-        "description": "Text when the user choose where to subscribe to a channel"
-    },
-    "onDeviceSubscriptions": "On device",
-    "@onDeviceSubscriptions": {
-        "description": "Text when the user chooses where to subscribe to a channel"
-    },
-    "both": "Both",
-    "refresh": "Refresh"
+  "subscriptions": "Subscriptions",
+  "@subscriptions": {
+    "description": "User subscriptions"
+  },
+  "playlists": "Playlists",
+  "@playlists": {
+    "description": "User playlists"
+  },
+  "popular": "Popular",
+  "@popular": {
+    "description": "Popular videos title"
+  },
+  "trending": "Trending",
+  "@trending": {
+    "description": "Trending videos title"
+  },
+  "noVideoInPlayList": "No video in playlist",
+  "@noVideoInPlayList": {
+    "description": "When no videos in the playlist"
+  },
+  "removeFromPlayList": "Remove from playlist",
+  "@removeFromPlayList": {
+    "description": "Menu item description to show remove a video from a playlist"
+  },
+  "deletePlayListQ": "Delete Playlist?",
+  "@deletePlayListQ": {
+    "description": "Ask user to delete a playlist"
+  },
+  "irreversibleAction": "This action is irreversible",
+  "@irreversibleAction": {
+    "description": "Tell the user that the action cannot be undone"
+  },
+  "addPlayList": "Add Playlist",
+  "@addPlayList": {
+    "description": "Title for add playlist dialog"
+  },
+  "playListName": "Playlist name",
+  "@playListName": {
+    "description": "Place holder for new playlist name text field"
+  },
+  "playlistVisibility": "Visibility",
+  "@playlistVisibility": {
+    "description": "Dropdown label for playlist visibility"
+  },
+  "publicPlaylist": "Public",
+  "@publicPlaylist": {
+    "description": "Public playlist"
+  },
+  "privatePlaylist": "Private",
+  "@privatePlaylist": {
+    "description": "Private playlist"
+  },
+  "cancel": "Cancel",
+  "@cancel": {
+    "description": "Cancel button label"
+  },
+  "add": "Add",
+  "@add": {
+    "description": "Add button abel"
+  },
+  "unlistedPlaylist": "Unlisted",
+  "@unlistedPlaylist": {
+    "description": "Unlisted playlist"
+  },
+  "info": "Info",
+  "@info": {
+    "description": "Info label"
+  },
+  "videos": "Videos",
+  "@videos": {
+    "description": "Videos label"
+  },
+  "streams": "Streams",
+  "@streams": {
+    "description": "Streams label"
+  },
+  "latestVideos": "Latest Videos",
+  "@latestVideos": {
+    "description": "Latest channel videos"
+  },
+  "subscribed": "Subscribed",
+  "@subscribed": {
+    "description": "When the user is subscribed to a channel"
+  },
+  "subscribe": "Subscribe",
+  "@subscribe": {
+    "description": "Label for user to subscribe to a channel"
+  },
+  "nSubscribers": "{count, select, no{No subscribers} other{{count} subscribers}}",
+  "@nSubscribers": {
+    "description": "number of subscribers",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
+  "share": "Share",
+  "@share": {
+    "description": "asking user if to share"
+  },
+  "shareYoutubeLink": "Share YouTube link",
+  "@shareYoutubeLink": {
+    "description": "asking user to share youtube link"
+  },
+  "shareInvidiousLink": "Share Invidious link",
+  "@shareInvidiousLink": {
+    "description": "asking user to share invidious link"
+  },
+  "redirectInvidiousLink": "Share Invidious Redirect link",
+  "@redirectInvidiousLink": {
+    "description": "asking user to share redirecting invidious link"
+  },
+  "shareLinkWithTimestamp": "Add timestamp",
+  "@shareLinkWithTimestamp": {
+    "description": "asking user to share link along with timestamp"
+  },
+  "ok": "OK",
+  "@ok": {
+    "description": "Ok"
+  },
+  "noChannels": "No channels",
+  "@noChannels": {
+    "description": "when there are no channels to display"
+  },
+  "noPlaylists": "No playlists",
+  "@noPlaylists": {
+    "description": "when there are no playlists to display"
+  },
+  "channels": "Channels",
+  "@channels": {
+    "description": "Channels label"
+  },
+  "couldntLoadVideo": "Could not load the video",
+  "@couldntLoadVideo": {
+    "description": "Message to display when a video can't be loaded"
+  },
+  "comments": "Comments",
+  "@comments": {
+    "description": "Comments label"
+  },
+  "recommended": "Recommended",
+  "@recommended": {
+    "description": "Recommended label"
+  },
+  "couldntFetchVideos": "Could not fetch videos. Tap to try again.",
+  "@couldntFetchVideos": {
+    "description": "Can't load bunch of videos, asking  user to try again"
+  },
+  "wizardIntro": "Select a public server or add your own. (Can be changed later in the settings)",
+  "@wizardIntro": {
+    "description": "Welcome message on frst time use"
+  },
+  "startUsingClipious": "Start using Clipious",
+  "@startUsingClipious": {
+    "description": "button label to start using the app"
+  },
+  "videoAddedToPlaylist": "Video added to playlist",
+  "@videoAddedToPlaylist": {
+    "description": "Pop up message when a video was added to a playlist"
+  },
+  "videoAddedToQueue": "Video added to queue",
+  "@videoAddedToQueue": {
+    "description": "Pop up message when a video was added at the end of the video queue"
+  },
+  "errorAddingVideoToPlaylist": "Error while adding video to playlist",
+  "@errorAddingVideoToPlaylist": {
+    "description": "Error while adding video to playlist"
+  },
+  "itemlistErrorGeneric": "Could not fetch data",
+  "@itemlistErrorGeneric": {
+    "description": "Error showing when the data can't be fetch"
+  },
+  "itemListErrorInvalidScope": "You don''t have the permission to see this, if you logged in using the token method try to log out and in again",
+  "@itemListErrorInvalidScope": {
+    "description": "Error when the user doesn't have the proper scope to its current token"
+  },
+  "selectPlaylist": "Select playlist",
+  "@selectPlaylist": {
+    "description": "Title when users wants to add a video to a playlist"
+  },
+  "createNewPlaylist": "Create new playlist",
+  "@createNewPlaylist": {
+    "description": "Button label to create a new playlist when the user wants to add a video to a playlist"
+  },
+  "nReplies": "{count, plural, =0{No replies} =1{1 reply} other{{count} replies}}",
+  "@nReplies": {
+    "description": "number of replies to a comment",
+    "placeholders": {
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  },
+  "loadMore": "Load more",
+  "@loadMore": {
+    "description": "CTA to load more"
+  },
+  "topSorting": "Top",
+  "@topSorting": {
+    "description": "Content sorting: top"
+  },
+  "newSorting": "New",
+  "@newSorting": {
+    "description": "Content sorting: new"
+  },
+  "streamIsLive": "Live",
+  "@streamIsLive": {
+    "description": "Label when a video is a live stream"
+  },
+  "sponsorSkipped": "Sponsor skipped",
+  "@sponsorSkipped": {
+    "description": "When a sponsor segment is skipped thanks to sponsor block"
+  },
+  "selectBrowsingCountry": "Select browsing country",
+  "@selectBrowsingCountry": {
+    "description": "Select country for trending content"
+  },
+  "showOnStart": "Select what to show when the app starts",
+  "@showOnStart": {
+    "description": "Title of dialog asking which screen the users prefers to see"
+  },
+  "settings": "Settings",
+  "@settings": {
+    "description": "Settings title"
+  },
+  "browsing": "Browsing",
+  "@browsing": {
+    "description": "video browsing preferences"
+  },
+  "country": "Country",
+  "@country": {
+    "description": "Country label"
+  },
+  "whenAppStartsShow": "When the app starts, show…",
+  "@whenAppStartsShow": {
+    "description": "Setting title for selecting the screen to show on start"
+  },
+  "servers": "Servers",
+  "@servers": {
+    "description": "Server management settings category"
+  },
+  "manageServers": "Manage servers",
+  "@manageServers": {
+    "description": "Settings to manage servers"
+  },
+  "currentServer": "Currently using {current}",
+  "@currentServer": {
+    "description": "Which server the user is currently using",
+    "placeholders": {
+      "current": {
+        "type": "String"
+      }
+    }
+  },
+  "useSponsorBlock": "Use SponsorBlock",
+  "@useSponsorBlock": {
+    "description": "label for sponsorblock checkbox"
+  },
+  "sponsorBlockDescription": "Skip sponsor segments submitted by the community",
+  "@sponsorBlockDescription": {
+    "description": "Sponsorblock setting description"
+  },
+  "about": "About",
+  "@about": {
+    "description": "About"
+  },
+  "name": "Name",
+  "@name": {
+    "description": "NAme label"
+  },
+  "package": "Package",
+  "@package": {
+    "description": "package label"
+  },
+  "version": "Version",
+  "@version": {
+    "description": "version label"
+  },
+  "build": "Build",
+  "@build": {
+    "description": "build label"
+  },
+  "addServer": "Add server",
+  "@addServer": {
+    "description": "Add server label"
+  },
+  "useThisServer": "Use this server",
+  "@useThisServer": {
+    "description": "Use this server label"
+  },
+  "logIn": "Log in",
+  "@logIn": {
+    "description": "CTA to log in to server"
+  },
+  "delete": "Delete",
+  "@delete": {
+    "description": "Delete label"
+  },
+  "invalidInvidiousServer": "Invalid Invidious server",
+  "@invalidInvidiousServer": {
+    "description": "Error when the user tries to add a server that is not a proper or reachable invidious server"
+  },
+  "yourServers": "Your servers",
+  "@yourServers": {
+    "description": "Your servers label"
+  },
+  "loggedIn": "Logged in",
+  "@loggedIn": {
+    "description": "Label to tell the user that he is logged in to the server"
+  },
+  "notLoggedIn": "Not logged in",
+  "@notLoggedIn": {
+    "description": "Label when the user is not logged in to the server"
+  },
+  "addServerHelpText": "Use the + button to add your own servers or tap on a public server and add it.",
+  "@addServerHelpText": {
+    "description": "label for when the user hasn't chosen a server yet"
+  },
+  "publicServers": "Public servers",
+  "@publicServers": {
+    "description": "Public servers label"
+  },
+  "loadingPublicServer": "Loading public servers",
+  "@loadingPublicServer": {
+    "description": "Message telling users the app is loading the list of public servers"
+  },
+  "tapToAddServer": "Tap to add server to your list",
+  "@tapToAddServer": {
+    "description": "public server description"
+  },
+  "publicServersError": "Could not fetch list of public servers. Tap to retry.",
+  "@publicServersError": {
+    "description": "Error message when trying to get public servers but it failed"
+  },
+  "appearance": "Appearance",
+  "@appearance": {
+    "description": "Settings category title"
+  },
+  "useDynamicTheme": "Dynamic colors",
+  "@useDynamicTheme": {
+    "description": ""
+  },
+  "useDynamicThemeDescription": "Use Material You colors (only available on Android 12+)",
+  "@useDynamicThemeDescription": {
+    "description": ""
+  },
+  "useDash": "Use DASH",
+  "@useDash": {
+    "description": "Label on video options if a user wants to switch to dash urls instead of the regular quality selection"
+  },
+  "useDashDescription": "DASH adaptive streaming can sometimes be problematic, Youtube can throttle it.",
+  "@useDashDescription": {
+    "description": "Description for dash in the settings screen"
+  },
+  "videoPlayer": "Video player",
+  "@videoPlayer": {
+    "description": "Title for video player related options"
+  },
+  "videoListed": "Public",
+  "@videoListed": {
+    "description": "Status of a publicly available video"
+  },
+  "videoUnlisted": "Unlisted",
+  "@videoUnlisted": {
+    "description": "Status of a video that is only accessible by link"
+  },
+  "videoIsFamilyFriendly": "Family friendly",
+  "@videoIsFamilyFriendly": {
+    "description": "Displayed only when a video is family friendly"
+  },
+  "tapToManage": "Tap to manage",
+  "@tapToManage": {
+    "description": "Text shown below a server in the 'Your servers' list"
+  },
+  "authentication": "Authentication",
+  "@authentication": {
+    "description": "Label for server settings related to authentications"
+  },
+  "tokenLogin": "Log in with token",
+  "@tokenLogin": {
+    "description": "Textto login to a server using the recommended way"
+  },
+  "tokenLoginDescription": "Recommended way to log in",
+  "@tokenLoginDescription": {
+    "description": "Recommended way to log in"
+  },
+  "cookieLogin": "Log in with cookie",
+  "@cookieLogin": {
+    "description": "Text to login to a server using the cookie jar method"
+  },
+  "cookieLoginDescription": "Use this method if you face issues with the token authentication",
+  "@cookieLoginDescription": {
+    "description": "Cookie log in description"
+  },
+  "logout": "Log out",
+  "@logout": {
+    "description": "CTA to logout of a server"
+  },
+  "username": "Username",
+  "@username": {
+    "description": "Username label for login to a server"
+  },
+  "password": "Password",
+  "@password": {
+    "description": "Password label for login to a server"
+  },
+  "wrongUsernamePassword": "Wrong username or password",
+  "@wrongUsernamePassword": {
+    "description": "Error message when authentication fails"
+  },
+  "error": "Error",
+  "@error": {},
+  "malformedStatsEndpoint": "/api/v1/stats is not as expected",
+  "@malformedStatsEndpoint": {
+    "description": "Title for dialog when adding a server that isn't validated as it should"
+  },
+  "malformedStatsEndpointDescription": "The server stats endpoint did not respond an expected payload, the key \"software.name\" should be equal to \"invidious\".\nResponse from the server:",
+  "@malformedStatsEndpointDescription": {
+    "description": "Description of the possible issue for an invalid stats endpoints"
+  },
+  "serverIsNotReachable": "Server is not reachable",
+  "@serverIsNotReachable": {
+    "description": "Title for dialog when adding a server that is not reachable"
+  },
+  "videoQueue": "Video queue",
+  "@videoQueue": {
+    "description": "Label for button to display the video queue"
+  },
+  "addToQueueList": "Add to queue",
+  "@addToQueueList": {
+    "description": "Label on button to add a video to the queue list"
+  },
+  "addToPlaylist": "Add to playlist",
+  "@addToPlaylist": {
+    "description": "Label to add a video to a playlist"
+  },
+  "playNext": "Play next",
+  "@playNext": {
+    "description": "Label to play the video after the current one."
+  },
+  "playNextAddedToQueue": "Video will play next",
+  "@playNextAddedToQueue": {
+    "description": "Pop up message to confirm that the video has been properly set to play next"
+  },
+  "addRecommendedToQueue": "Auto-play recommended next",
+  "@addRecommendedToQueue": {
+    "description": "Switch when playing a video to automatically add the recommended videos to the video queue"
+  },
+  "sponsorBlockSettingsQuickDescription": "Select which type of segments to skip",
+  "@sponsorBlockSettingsQuickDescription": {
+    "description": "Small description of what the sponsor block settings do"
+  },
+  "sponsorBlockCategorySponsor": "Sponsor",
+  "@sponsorBlockCategorySponsor": {
+    "description": "Sponsor block 'Sponsor' Category"
+  },
+  "sponsorBlockCategorySponsorDescription": "Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shoutouts to causes/creators/websites/products they like.",
+  "@sponsorBlockCategorySponsorDescription": {
+    "description": "Sponsor block 'Sponsor' Category description"
+  },
+  "sponsorBlockCategoryUnpaidSelfPromo": "Unpaid/Self Promotion",
+  "@sponsorBlockCategoryUnpaidSelfPromo": {
+    "description": "Sponsor block 'Unpaid/Self promotion' Category"
+  },
+  "sponsorBlockCategoryUnpaidSelfPromoDescription": "Similar to \"sponsor\" except for unpaid or self promotion. This includes sections about merchandise, donations, or information about who they collaborated ",
+  "@sponsorBlockCategoryUnpaidSelfPromoDescription": {
+    "description": "Sponsor block 'Unpaid/Self promotion' Category description"
+  },
+  "sponsorBlockCategoryInteraction": "Interaction Reminder (Subscribe)",
+  "@sponsorBlockCategoryInteraction": {
+    "description": "Sponsor block 'Interaction' Category"
+  },
+  "sponsorBlockCategoryInteractionDescription": "When there is a short reminder to like, subscribe or follow them in the middle of content. If it is long or about something specific, it should be under self promotion instead.",
+  "@sponsorBlockCategoryInteractionDescription": {
+    "description": "Sponsor block 'Interaction' Category description"
+  },
+  "sponsorBlockCategoryIntro": "Intermission/Intro Animation",
+  "@sponsorBlockCategoryIntro": {
+    "description": "Sponsorblock 'Intro' Category"
+  },
+  "sponsorBlockCategoryIntroDescription": "An interval without actual content. Could be a pause, static frame, repeating animation. This should not be used for transitions containing information.",
+  "@sponsorBlockCategoryIntroDescription": {
+    "description": "Sponsorblock 'Intro' Category description"
+  },
+  "sponsorBlockCategoryOutro": "Endcards/Credits",
+  "@sponsorBlockCategoryOutro": {
+    "description": "Outro block 'Outro' Category"
+  },
+  "sponsorBlockCategoryOutroDescription": "Credits or when the YouTube endcards appear. Not for conclusions with information.",
+  "@sponsorBlockCategoryOutroDescription": {
+    "description": "Outro block 'Outro' Category description"
+  },
+  "sponsorBlockCategoryPreview": "Preview/Recap",
+  "@sponsorBlockCategoryPreview": {
+    "description": "Sponsorblock 'Preview' Category"
+  },
+  "sponsorBlockCategoryPreviewDescription": "Collection of clips that show what is coming up in in this video or other videos in a series where all information is repeated later in the video.",
+  "@sponsorBlockCategoryPreviewDescription": {
+    "description": "Sponsorblock 'Preview' Category description"
+  },
+  "sponsorBlockCategoryFiller": "Filler Tangent/Jokes",
+  "@sponsorBlockCategoryFiller": {
+    "description": "Sponsorblock 'Filler' Category"
+  },
+  "sponsorBlockCategoryFillerDescription": "Tangential scenes added only for filler or humor that are not required to understand the main content of the video. This should not include segments providing context or background details. This is a very aggressive category meant for when you aren''t in the mood for \"fun\".",
+  "@sponsorBlockCategoryFillerDescription": {
+    "description": "Sponsorblock 'Filler' Category description"
+  },
+  "sponsorBlockCategoryMusicOffTopic": "Music: Non-Music Section",
+  "@sponsorBlockCategoryMusicOffTopic": {
+    "description": "Sponsorblock 'MusicOffTopic' Category"
+  },
+  "sponsorBlockCategoryMusicOffTopicDescription": "Only for use in music videos. This only should be used for sections of music videos that aren''t already covered by another category.",
+  "@sponsorBlockCategoryMusicOffTopicDescription": {
+    "description": "Only for use in music videos. This only should be used for sections of music videos that aren't already covered by another category."
+  },
+  "useProxy": "Proxy videos",
+  "@useProxy": {
+    "description": "label for settings switch to proxy videos from server"
+  },
+  "useProxyDescription": "By proxying video streams from the server, you can bypass regional blocks or ISP blocking YouTube",
+  "@useProxyDescription": {
+    "description": "Description for the use proxy settings"
+  },
+  "pressDownToShowSettings": "Press down to show settings",
+  "@pressDownToShowSettings": {
+    "description": "Instruction on how to show video settings when playing a video on TV"
+  },
+  "quality": "Quality",
+  "@quality": {
+    "description": "Name of TV ui video settings"
+  },
+  "audio": "Audio",
+  "@audio": {
+    "description": "Name TV ui audio settings"
+  },
+  "subtitles": "Subtitles",
+  "@subtitles": {
+    "description": "Name of TV ui subtitles settings"
+  },
+  "playbackSpeed": "Playback speed",
+  "@playbackSpeed": {
+    "description": "Name of TV ui Playback speed"
+  },
+  "blackBackground": "Black background",
+  "@blackBackground": {
+    "description": "Settings name for black background"
+  },
+  "blackBackgroundDescription": "For dark theme on OLED screen",
+  "@blackBackgroundDescription": {
+    "description": "Description for dark background setting"
+  },
+  "search": "Search",
+  "@search": {
+    "description": "search title"
+  },
+  "subtitleFontSize": "Subtitles font size",
+  "@subtitleFontSize": {
+    "description": "Settings label for the size of the subtitles"
+  },
+  "subtitleFontSizeDescription": "Change the size of the subtitles if it is too small or too big on your device",
+  "@subtitleFontSizeDescription": {
+    "description": "Settings description for subtitle size"
+  },
+  "skipSslVerification": "Skip SSL certificate verification",
+  "@skipSslVerification": {
+    "description": "Setting label to skip ssl certification verification"
+  },
+  "skipSslVerificationDescription": "For using a self-signed SSL certificate, or when having SSL related issues with your server.",
+  "@skipSslVerificationDescription": {
+    "description": "Setting description for the skip ssl certification verification"
+  },
+  "themeBrightness": "Theme",
+  "@themeBrightness": {
+    "description": "Ask the user to user dark / light / system theme"
+  },
+  "themeLight": "Light",
+  "@themeLight": {
+    "description": "Light theme"
+  },
+  "themeDark": "Dark",
+  "@themeDark": {
+    "description": "Dark theme"
+  },
+  "followSystem": "Follow system",
+  "@followSystem": {
+    "description": "Follow system label"
+  },
+  "requiresRestart": "Requires app restart",
+  "@requiresRestart": {
+    "description": "Requires app restart label"
+  },
+  "appLanguage": "App language",
+  "@appLanguage": {
+    "description": "Select app language"
+  },
+  "nVideos": "{count, plural, =0{No videos} =1{1 video} other{{count} videos}}",
+  "@nVideos": {
+    "description": "One or more videos",
+    "placeholders": {
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  },
+  "returnYoutubeUrlValidation": "Url must start with http:// or https://",
+  "@returnYoutubeUrlValidation": {
+    "description": "error message for invalid custom url for return to youtube"
+  },
+  "returnYoutubeDislikeDescription": "Show estimated video dislikes using API provided by returnyoutubedislike.com",
+  "@returnYoutubeDislikeDescription": {
+    "description": "ReturnYoutubeDislike setting description"
+  },
+  "rydCustomInstance": "Custom RYD instance url",
+  "@rydCustomInstance": {
+    "description": "title for setting to set a custom ryd instance"
+  },
+  "rydCustomInstanceDescription": "Use a different RYD instance, leave empty to use the default",
+  "@rydCustomInstanceDescription": {
+    "description": "description for custom ryd instancr setting"
+  },
+  "autoplayVideoOnLoad": "Automatically play video on load",
+  "@autoplayVideoOnLoad": {
+    "description": "Label for settings to enable autoplay when a video loads"
+  },
+  "autoplayVideoOnLoadDescription": "Automatically start playing the video after it has loaded",
+  "@autoplayVideoOnLoadDescription": {
+    "description": "Description for the autoplay video on load setting"
+  },
+  "searchHistory": "Search history",
+  "@searchHistory": {
+    "description": "Settings label for search history"
+  },
+  "searchHistoryDescription": "Search history settings",
+  "@searchHistoryDescription": {
+    "description": "Description for search history settings"
+  },
+  "enableSearchHistory": "Enable search history",
+  "@enableSearchHistory": {
+    "description": "Settings label for enabling search history"
+  },
+  "searchHistoryLimit": "Search history limit",
+  "@searchHistoryLimit": {
+    "description": "Settings label for search history limit"
+  },
+  "searchHistoryLimitDescription": "Set how many previous searches will show up in suggestions",
+  "@searchHistoryLimitDescription": {
+    "description": "Settings label for search history limit description"
+  },
+  "shorts": "Shorts",
+  "@shorts": {
+    "description": "Youtube shorts"
+  },
+  "searchUploadDate": "Upload date",
+  "@searchUploadDate": {
+    "description": "Filter search result by upload date"
+  },
+  "searchUploadDateAny": "Any date",
+  "@searchUploadDateAny": {
+    "description": "Do not filter search result by upload date"
+  },
+  "searchUploadDateHour": "Last Hour",
+  "@searchUploadDateHour": {
+    "description": "Search for uploaded in last hour"
+  },
+  "searchUploadDateToday": "Today",
+  "@searchUploadDateToday": {
+    "description": "Search for uploaded today"
+  },
+  "searchUploadDateWeek": "This week",
+  "@searchUploadDateWeek": {
+    "description": "Search for uploaded this week"
+  },
+  "searchUploadDateMonth": "This month",
+  "@searchUploadDateMonth": {
+    "description": "Search for uploaded this month"
+  },
+  "searchUploadDateYear": "This year",
+  "@searchUploadDateYear": {
+    "description": "Search for uploaded this year"
+  },
+  "searchDuration": "Duration",
+  "@searchDuration": {
+    "description": "Filter search result by duration"
+  },
+  "searchDurationAny": "Any duration",
+  "@searchDurationAny": {
+    "description": "Do not filter search result by duration"
+  },
+  "searchDurationShort": "Short (<4 minutes)",
+  "@searchDurationShort": {
+    "description": "Search for short videos only"
+  },
+  "searchDurationLong": "Long (>20 minutes)",
+  "@searchDurationLong": {
+    "description": "Search for long videos only"
+  },
+  "searchDurationMedium": "Medium (4-20 minutes)",
+  "@searchDurationMedium": {
+    "description": "Search for medium videos only"
+  },
+  "searchSortBy": "Sort by",
+  "@searchSortBy": {
+    "description": "Search sorting option"
+  },
+  "searchSortRelevance": "Relevance",
+  "@searchSortRelevance": {
+    "description": "Sort search by relevance"
+  },
+  "searchSortRating": "Rating",
+  "@searchSortRating": {
+    "description": "Sort search by rating"
+  },
+  "searchSortUploadDate": "Upload Date",
+  "@searchSortUploadDate": {
+    "description": "Sort search by upload date"
+  },
+  "searchSortViewCount": "View Count",
+  "@searchSortViewCount": {
+    "description": "Sort search by view count"
+  },
+  "clearSearchHistory": "Clear search history",
+  "@clearSearchHistory": {
+    "description": "Settings label for clearing search history"
+  },
+  "appLogs": "Application Logs",
+  "@appLogs": {
+    "description": "Title for settings that leads to application logs"
+  },
+  "appLogsDescription": "Get logs of what is happening in the application, can be useful to report issues",
+  "@appLogsDescription": {
+    "description": "Description of the app log settings"
+  },
+  "copyToClipBoard": "Copy to clipboard",
+  "@copyToClipBoard": {
+    "description": "Text to copy something to clipboard"
+  },
+  "logsCopied": "Logs copied to clipboard",
+  "@logsCopied": {
+    "description": "Message to tell user that logs have been copied to the clipboard"
+  },
+  "rememberSubtitleLanguage": "Remember subtitles language",
+  "@rememberSubtitleLanguage": {
+    "description": "Settings label for remembering subtitle language"
+  },
+  "videoFilters": "Video filters",
+  "@videoFilters": {
+    "description": "Title for video filter settings"
+  },
+  "nFilters": "{count, plural, =0{No videos} =1{1 filter} other{{count} filters}}",
+  "@nFilters": {
+    "description": "One or more video filters",
+    "placeholders": {
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  },
+  "videoFiltersExplanation": "Hide or Obfuscate videos from all the video feeds in the application based on the filters defined below. This allow you for example to hide sports spoilers or hide shorts from a certain channel.",
+  "@videoFiltersExplanation": {
+    "description": "Description on how filter work"
+  },
+  "videoFiltersSettingTileDescriptions": "Define rules to filter out videos",
+  "@videoFiltersSettingTileDescriptions": {
+    "description": "Description for the main settings page"
+  },
+  "videoFilterAllChannels": "All channels",
+  "@videoFilterAllChannels": {
+    "description": "Title for the sections that applies to all channels"
+  },
+  "addVideoFilter": "Create filter",
+  "@addVideoFilter": {
+    "description": "Title when creating a new filter"
+  },
+  "editVideoFilter": "Edit filter",
+  "@editVideoFilter": {
+    "description": "Title when editting a filter"
+  },
+  "videoFilterType": "Type",
+  "@videoFilterType": {
+    "description": "Label for filter type"
+  },
+  "videoFilterOperation": "Operation",
+  "@videoFilterOperation": {
+    "description": "Label for filter operation"
+  },
+  "videoFilterValue": "Value",
+  "@videoFilterValue": {
+    "description": "Label for filter value"
+  },
+  "save": "Save",
+  "@save": {
+    "description": "Text for save action"
+  },
+  "videoFilterEditDescription": "Select an optional channel, a filter type, operation and a value to filter OUT videos from lists. Example, type: video name, operation: contains, value: test will EXCLUDE all the videos with the word 'test' in their name.",
+  "@videoFilterEditDescription": {
+    "description": "Descriptive test for video filter set up"
+  },
+  "optional": "optional",
+  "@optional": {
+    "description": "Optional label"
+  },
+  "videoFilterHideLabel": "Hide",
+  "@videoFilterHideLabel": {
+    "description": "Label to hide videos"
+  },
+  "videoFilterFilterLabel": "Obfuscate",
+  "@videoFilterFilterLabel": {
+    "description": "Label to filter videos"
+  },
+  "videoFilterDescriptionString": "{hideOrFilter} videos where {type} {operation} ''{value}''.",
+  "@videoFilterDescriptionString": {
+    "description": "Human readable description of a video filter, in this case is it for string comparison, example: Hide videos where the name of the video does not contain the following string 'test' (Do not translate text between { })",
+    "placeholders": {
+      "hideOrFilter": {
+        "type": "String",
+        "example": "Hide"
+      },
+      "type": {
+        "type": "String",
+        "example": "video title"
+      },
+      "operation": {
+        "type": "String",
+        "example": "does not contain"
+      },
+      "value": {
+        "type": "String",
+        "example": "some filter text"
+      }
+    }
+  },
+  "videoFiltered": "Video filtered for the following reason(s):",
+  "@videoFiltered": {
+    "description": "Label shown on video list when it is filtered out"
+  },
+  "videoFilterTapToReveal": "Tap to reveal",
+  "@videoFilterTapToReveal": {
+    "description": "Label to tell user to tap to show a filtered video"
+  },
+  "videoFilterHide": "Hide filtered videos",
+  "@videoFilterHide": {
+    "description": "Label for settings to hide filtered videos"
+  },
+  "videoFilterHideDescription": "By default filtered videos are not hidden but shown as obfuscated with the reason(s) why it has been filtered. This setting remove the filtered videos from lists.",
+  "@videoFilterHideDescription": {
+    "description": ""
+  },
+  "videoFilterNoFilters": "No video filters, tap the '+' button below to start adding filters.",
+  "@videoFilterNoFilters": {
+    "description": "Label when there are no video filters"
+  },
+  "videoFilterTypeVideoTitle": "Video title",
+  "@videoFilterTypeVideoTitle": {
+    "description": "Label for video filter video title"
+  },
+  "videoFilterTypeChannelName": "Channel name",
+  "@videoFilterTypeChannelName": {
+    "description": "Label for video filter channel name"
+  },
+  "videoFilterTypeVideoLength": "Video length (seconds)",
+  "@videoFilterTypeVideoLength": {
+    "description": "Label for video filter video length"
+  },
+  "videoFilterOperationContains": "Contains",
+  "@videoFilterOperationContains": {
+    "description": "Label for video filter operation Contains"
+  },
+  "videoFilterOperationNotContain": "Does not contain",
+  "@videoFilterOperationNotContain": {
+    "description": "Label for video filter operation Does not contain"
+  },
+  "videoFilterOperationLowerThan": "Lower than",
+  "@videoFilterOperationLowerThan": {
+    "description": "Label for video filter operation Lower than"
+  },
+  "videoFilterOperationHigherThan": "Higher than",
+  "@videoFilterOperationHigherThan": {
+    "description": "Label for video filter operation Higher than"
+  },
+  "channel": "Channel",
+  "@channel": {
+    "description": "A single channel"
+  },
+  "videoFilterHideAllFromChannel": "Filter all videos from channel",
+  "@videoFilterHideAllFromChannel": {
+    "description": "Label for video filter switch to allow to hide all videos from a channel"
+  },
+  "videoFilterWholeChannel": "{hideOrFilter} all videos from channel",
+  "@videoFilterWholeChannel": {
+    "description": "Label for whole channel filtering",
+    "placeholders": {
+      "hideOrFilter": {
+        "type": "String",
+        "example": "Hide"
+      }
+    }
+  },
+  "rememberSubtitleLanguageDescription": "Automatically set subtitles to last language selected, if available",
+  "@rememberSubtitleLanguageDescription": {
+    "description": "Settings description for remembering subtitle language"
+  },
+  "lockFullScreenToLandscape": "Lock full screen orientation to video aspect ratio",
+  "@lockFullScreenToLandscape": {
+    "description": "Title to force full screen to landscape"
+  },
+  "lockFullScreenToLandscapeDescription": "Locks the full screen orientation based on video format, landscape for wide video and portrait for portrait videos",
+  "@lockFullScreenToLandscapeDescription": {
+    "description": "Setting description for forcing video to landscape when in full screen"
+  },
+  "fillFullscreen": "Maximize video to fit screen",
+  "@fillFullscreen": {
+    "description": "Title to maximize video to fit screen"
+  },
+  "fillFullscreenDescription": "Adjusts the video to fill the entire screen in landscape mode",
+  "@fillFullscreenDescription": {
+    "description": "Setting description for filling video to screen in landscape"
+  },
+  "rememberPlaybackSpeed": "Remember playback speed",
+  "@rememberPlaybackSpeed": {
+    "description": "Setting label for remembering playback speed"
+  },
+  "rememberPlaybackSpeedDescription": "Automatically set playback speed to the last speed selected",
+  "@rememberPlaybackSpeedDescription": {
+    "description": "Settings description for remembering playback speed"
+  },
+  "downloads": "Downloads",
+  "@downloads": {
+    "description": "Downloads"
+  },
+  "download": "Download",
+  "@download": {
+    "description": "A single download or CTA for downloading a video"
+  },
+  "videoAlreadyDownloaded": "Video already downloaded",
+  "@videoAlreadyDownloaded": {
+    "description": "Message when a user tries to download a video he already has"
+  },
+  "noDownloadedVideos": "No downloaded videos, browse, long press on a video in a list or tap the download button on a video screen to download",
+  "@noDownloadedVideos": {
+    "description": "Message showing when the user goes to the download screen but there are no offline videos."
+  },
+  "downloadsPlayAll": "Play all",
+  "@downloadsPlayAll": {
+    "description": "Button to play all downloaded videos"
+  },
+  "videoDownloadStarted": "Video download started",
+  "@videoDownloadStarted": {
+    "description": "Message when a video starts being downloaded"
+  },
+  "videoFailedDownloadRetry": "Download failed, tap to retry",
+  "@videoFailedDownloadRetry": {
+    "description": "Shown on download manager when a download fails and prompt the user to retry"
+  },
+  "videoDownloadAudioOnly": "Audio only",
+  "@videoDownloadAudioOnly": {
+    "description": "Label for toggle to download audio only "
+  },
+  "manageSubscriptions": "Manage Subscriptions",
+  "@manageSubscriptions": {
+    "description": "Title of manage subscriptions page"
+  },
+  "noSubscriptions": "No subscriptions, browse videos and subscribe to any channel you like.",
+  "@noSubscriptions": {
+    "description": "Message when the user has no subs"
+  },
+  "youCanSubscribeAgainLater": "You can subscribe to this channel again later",
+  "@youCanSubscribeAgainLater": {
+    "description": "Text for the unscubscribe confirmation dialog"
+  },
+  "unSubscribeQuestion": "Unsubscribe ?",
+  "@unSubscribeQuestion": {
+    "description": "Title for dialog if a user wants to unsubscribe in the subscribtion management screen"
+  },
+  "clearHistoryQuestion": "Clear history ?",
+  "@clearHistoryQuestion": {},
+  "clearHistoryQuestionExplanation": "This will clear your viewing history of your account on the Invidious instance you use. This cannot be undone.",
+  "@clearHistoryQuestionExplanation": {
+    "description": "Message for dialog before clearing full viewing history"
+  },
+  "noHistory": "No viewing history, watch some videos and it will appear here",
+  "@noHistory": {
+    "description": "Message when the user visits the history tab but it's empty"
+  },
+  "homeLayoutEditor": "Edit home layout",
+  "@homeLayoutEditor": {
+    "description": "Title of layout editor screen"
+  },
+  "layoutEditorAddVideoSource": "Add video source",
+  "@layoutEditorAddVideoSource": {
+    "description": "Label for button to allow user to add more video sources to the home screen"
+  },
+  "layoutEditorExplanation": "You can decide what to display on your home screen, you can have up to 2 small view with horizontal scrolling and one big source.",
+  "@layoutEditorExplanation": {
+    "description": "text to explain the home layout editor"
+  },
+  "home": "Home",
+  "@home": {
+    "description": "Label for Home browsing tab"
+  },
+  "library": "Library",
+  "@library": {
+    "description": "Name for user library"
+  },
+  "customizeAppLayout": "Customize app sections",
+  "@customizeAppLayout": {
+    "description": "Settings label for the settings to allow the user to set up the app sections themselves"
+  },
+  "customizeAppLayoutExplanation": "Select which sections you want to appear in the main app navigation bar. Click on the home icon to select which screen shows when the application starts. You can reorder the sections by dragging them around.",
+  "@customizeAppLayoutExplanation": {
+    "description": ""
+  },
+  "navigationBarStyle": "Navigation bar style",
+  "@navigationBarStyle": {
+    "description": "Label for settings on customizing navigation bar style"
+  },
+  "navigationBarLabelAlwaysShowing": "Label always showing",
+  "@navigationBarLabelAlwaysShowing": {
+    "description": "Label always showing option for navigation bar"
+  },
+  "navigationBarLabelShowOnSelect": "Label shown on selected item",
+  "@navigationBarLabelShowOnSelect": {
+    "description": "Label only showing when selected option for navigation bar"
+  },
+  "navigationBarLabelNeverShow": "Never show label",
+  "@navigationBarLabelNeverShow": {
+    "description": "Never show label option for navigation bar"
+  },
+  "distractionFreeMode": "Distraction free mode",
+  "@distractionFreeMode": {
+    "description": "title for distraction free mode settings"
+  },
+  "distractionFreeModeDescription": "Disable video comments and recommendations",
+  "@distractionFreeModeDescription": {
+    "description": "Description for distraction free mode"
+  },
+  "secondsShortForm": "secs",
+  "@secondsShortForm": {
+    "description": "Short form for the word seconds"
+  },
+  "videoFilterApplyDateToFilter": "Filter videos on given times",
+  "@videoFilterApplyDateToFilter": {
+    "description": "Label for switch to allow user to customize video filter and set days of week and time to them"
+  },
+  "videoFilterDayOfWeek": "Select days to apply filters",
+  "@videoFilterDayOfWeek": {
+    "description": "Title for day selection for the filter"
+  },
+  "videoFilterDayOfWeekDescription": "You can selectively choose days of the week and time to which the filters apply to, for example, avoid sport events spoilers.",
+  "@videoFilterDayOfWeekDescription": {
+    "description": ""
+  },
+  "videoFilterStartTime": "Start time",
+  "@videoFilterStartTime": {
+    "description": "Title for filter start time"
+  },
+  "videoFilterEndTime": "End time",
+  "@videoFilterEndTime": {
+    "description": "Title for filter end time"
+  },
+  "videoFilterAppliedOn": "Applied on {selectedDays}",
+  "@videoFilterAppliedOn": {
+    "description": "Readable text on when the filter should apply",
+    "placeholders": {
+      "selectedDays": {
+        "type": "String",
+        "example": "Monday, Wednesday, Friday"
+      }
+    }
+  },
+  "from": "From",
+  "@from": {
+    "description": "From word (as in 'From xx To xx')"
+  },
+  "to": "To",
+  "@to": {
+    "description": "To word as in 'From xx To xx')"
+  },
+  "videoFilterTimeOfDayFromTo": "From {from} to {to}",
+  "@videoFilterTimeOfDayFromTo": {
+    "description": "Time of day range",
+    "placeholders": {
+      "from": {
+        "type": "String",
+        "example": "3:00 AM"
+      },
+      "to": {
+        "type": "String",
+        "example": "5:00 PM"
+      }
+    }
+  },
+  "notifications": "Notifications",
+  "@notifications": {
+    "description": "Notification settings title"
+  },
+  "notificationsDescription": "Enable and review what you are notified about",
+  "@notificationsDescription": {
+    "description": "Setting description for notifications"
+  },
+  "enableNotificationDescriptions": "Runs foreground service to check and notify you on the changes you are monitoring",
+  "@enableNotificationDescriptions": {
+    "description": ""
+  },
+  "subscriptionNotification": "Subscription notifications",
+  "@subscriptionNotification": {
+    "description": "Title for subscriptions notifications"
+  },
+  "subscriptionNotificationDescription": "Get notified of new videos from your subscription feed if you are logged in to your current instance",
+  "@subscriptionNotificationDescription": {
+    "description": "Description for subscription notifications"
+  },
+  "subscriptionNotificationTitle": "New videos from your subscriptions",
+  "@subscriptionNotificationTitle": {
+    "description": "Title for the notification showing that there are new videos from the subscription feed"
+  },
+  "subscriptionNotificationContent": "There are  {count, plural, =0{no new videos} =1{1 new video} other{{count} new videos}} in your subscription feed",
+  "@subscriptionNotificationContent": {
+    "description": "Content for subscription notification",
+    "placeholders": {
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  },
+  "askForDisableBatteryOptimizationTitle": "Disabling battery optimization required",
+  "@askForDisableBatteryOptimizationTitle": {
+    "description": "Title for the dialog asking the user to turn off disabling battery optimization when turning on notifications"
+  },
+  "askForDisableBatteryOptimizationContent": "In order to send notification Clipious needs to run a background service. For it to run smoothly it is required that Clipious is given unrestricted battery usage, tapping ok will open the battery optimization settings.",
+  "@askForDisableBatteryOptimizationContent": {
+    "description": "Content for the dialog asking the user to turn off disabling battery optimization when turning on notifications"
+  },
+  "askToEnableBackgroundServiceTitle": "Notifications turned off",
+  "@askToEnableBackgroundServiceTitle": {
+    "description": "If the users tries to turn on notifications for a channel but hasn't enable notifications in the app we need to turn it on for them"
+  },
+  "askToEnableBackgroundServiceContent": "To get notifications, Clipious notifications need to be enabled, press OK to enable it.",
+  "@askToEnableBackgroundServiceContent": {
+    "description": "If the users tries to turn on notifications for a channel but hasn't enable notifications in the app we need to turn it on for them"
+  },
+  "otherNotifications": "Other notifications sources (bell icons)",
+  "@otherNotifications": {
+    "description": "Title for settings section in the notification settings"
+  },
+  "deleteChannelNotificationTitle": "Delete channel notification ?",
+  "@deleteChannelNotificationTitle": {
+    "description": "Title for dialog to confirm whether to delete channel notifications"
+  },
+  "deleteChannelNotificationContent": "You won''t receive anymore notifications from this channel.",
+  "@deleteChannelNotificationContent": {
+    "description": "Title for dialog to confirm whether to delete channel notifications"
+  },
+  "deletePlaylistNotificationTitle": "Delete playlist notification ?",
+  "@deletePlaylistNotificationTitle": {
+    "description": "Title for dialog to confirm whether to delete playlist notifications"
+  },
+  "deletePlaylistNotificationContent": "You won''t receive anymore notifications from this playlist.",
+  "@deletePlaylistNotificationContent": {
+    "description": "Title for dialog to confirm whether to delete playlist notifications"
+  },
+  "channelNotificationTitle": "New videos from {channel}",
+  "@channelNotificationTitle": {
+    "description": "Title for the channel notifications when there are new videos",
+    "placeholders": {
+      "channel": {
+        "type": "String",
+        "example": "MKBHD"
+      }
+    }
+  },
+  "channelNotificationContent": "There are {count, plural, =0{no new videos} =1{1 new video} other{{count} new videos}} from {channel}",
+  "@channelNotificationContent": {
+    "description": "Content for channel notification when there are new videos",
+    "placeholders": {
+      "channel": {
+        "type": "String",
+        "example": "MKBHD"
+      },
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  },
+  "playlistNotificationTitle": "New videos in {playlist} playlist",
+  "@playlistNotificationTitle": {
+    "description": "Title for the playlist notifications when there are new videos",
+    "placeholders": {
+      "playlist": {
+        "type": "String",
+        "example": "Lo-Fi girl"
+      }
+    }
+  },
+  "playlistNotificationContent": "There are {count, plural, =0{no new videos} =1{1 new video} other{{count} new videos}} in the {playlist} playlist",
+  "@playlistNotificationContent": {
+    "description": "Content for playlist notification when there are new videos",
+    "placeholders": {
+      "playlist": {
+        "type": "String",
+        "example": "Lo-Fi girl"
+      },
+      "count": {
+        "type": "num",
+        "format": "compact"
+      }
+    }
+  },
+  "foregroundServiceNotificationTitle": "Video monitoring",
+  "@foregroundServiceNotificationTitle": {
+    "description": "Title for the foreground service running notification when the user wants to receive notifications"
+  },
+  "foregroundServiceNotificationContent": "Will check for new videos once {hours, select, 1{per hour} 24{a day} other{every {hours} hours}}",
+  "@foregroundServiceNotificationContent": {
+    "description": "Content for the foreground service running notification when the user wants to receive notifications",
+    "hours": {
+      "type": "num",
+      "format": "compact"
+    }
+  },
+  "foregroundServiceUpdatingSubscriptions": "Checking subscriptions...",
+  "@foregroundServiceUpdatingSubscriptions": {
+    "description": "Foreground service notification text when checking for new subscription videos"
+  },
+  "foregroundServiceUpdatingPlaylist": "Checking playlists...",
+  "@foregroundServiceUpdatingPlaylist": {
+    "description": "Foreground service notification text when checking for new playlist videos"
+  },
+  "foregroundServiceUpdatingChannels": "Checking channels...",
+  "@foregroundServiceUpdatingChannels": {
+    "description": "Foreground service notification text when checking for new channel videos"
+  },
+  "notificationFrequencySettingsTitle": "New video check frequency",
+  "@notificationFrequencySettingsTitle": {
+    "description": "Title for frequency settings"
+  },
+  "notificationFrequencySettingsDescription": "How often the application will check for new videos",
+  "@notificationFrequencySettingsDescription": {
+    "description": "Description for frequency settings"
+  },
+  "notificationFrequencySliderLabel": "{hours, select,  24{1d} other{{hours}h}}",
+  "@notificationFrequencySliderLabel": {
+    "description": "Short form for a number of hours going up to 1 day",
+    "hours": {
+      "type": "num",
+      "format": "compact"
+    }
+  },
+  "subtitlesBackground": "Subtitles background",
+  "@subtitlesBackground": {
+    "description": "Title for settings to set black background  for subtitles"
+  },
+  "subtitlesBackgroundDescription": "Adds a black background to subtitles to make them more readable",
+  "@subtitlesBackgroundDescription": {
+    "description": "Description for settings to set black background  for subtitles"
+  },
+  "history": "History",
+  "@history": {
+    "description": "User view history label"
+  },
+  "deArrowSettingDescription": "Replace click bait titles and thumbnails",
+  "@deArrowSettingDescription": {
+    "description": "Description for dearrow"
+  },
+  "deArrowReplaceThumbnails": "Replace thumbnails",
+  "@deArrowReplaceThumbnails": {
+    "description": "Settings title for checkbox on whether the thumbnail should be replaced as well"
+  },
+  "deArrowReplaceThumbnailsDescription": "Replace video thumbnails in addition of the titles",
+  "@deArrowReplaceThumbnailsDescription": {
+    "description": "Description for DeArrow setting switch"
+  },
+  "deArrowWarning": "Enabling DeArrow can significantly reduce the browsing speed of the app as extra http requests are needed for every single video",
+  "@deArrowWarning": {
+    "description": "Warning message when the user enables DeArrow"
+  },
+  "copySettingsAsJson": "Copy settings as JSON to clipboard",
+  "@copySettingsAsJson": {
+    "description": "title for settings sections to allow users to copy their settings as json to make debugging easier"
+  },
+  "copySettingsAsJsonDescription": "Copy the settings as JSON to help debugging if you encounter an issue with the app and decide to raise an issue",
+  "@copySettingsAsJsonDescription": {
+    "description": ""
+  },
+  "seeking": "Seeking",
+  "@seeking": {
+    "description": "category for settings related to seeking in a video"
+  },
+  "skipStep": "Skip forward/backward step",
+  "@skipStep": {
+    "description": "Title for the settings to set the skipping step"
+  },
+  "skipStepDescription": "Seconds to skip on forward/backward actions",
+  "@skipStepDescription": {
+    "description": "Title for the settings to set the skipping step"
+  },
+  "exponentialSkip": "Exponential skip forward/backward",
+  "@exponentialSkip": {
+    "description": "Title for the setting to enable the exponential skipping"
+  },
+  "exponentialSkipDescription": "The more you skip forward, the bigger the step is.",
+  "@exponentialSkipDescription": {
+    "description": "Title for the setting to enable the exponential skipping"
+  },
+  "fullscreenOnLandscape": "Full screen on landscape",
+  "@fullscreenOnLandscape": {
+    "description": "Setting title to enable full screen on landscape orientation"
+  },
+  "fullscreenOnLandscapeDescription": "Switch to full screen when the device is rotated to landscape mode",
+  "@fullscreenOnLandscapeDescription": {
+    "description": "Setting to enable full screen on landscape orientation"
+  },
+  "enabled": "Enabled",
+  "@enabled": {
+    "description": "Text to show something is enabled"
+  },
+  "submitFeedback": "Submit feedback",
+  "@submitFeedback": {
+    "description": "Title for settings to submit feed back through the app"
+  },
+  "submitFeedbackDescription": "Found a bug or have a suggestion? Use this tool to take screenshot of the app, annotate and submit feedback",
+  "@submitFeedbackDescription": {
+    "description": "Setting tile descriptions for feedback submission"
+  },
+  "feedbackDisclaimer": "To submit feedback you will need a GitHub account and your screenshot will be submitted to Imgur anonymously.",
+  "@feedbackDisclaimer": {
+    "description": "Content of dialog shown before submitting feedback to make sure the user is ok whith where the data is going"
+  },
+  "feedbackScreenshotError": "Error while uploading screenshot to Imgur",
+  "@feedbackScreenshotError": {
+    "description": "Title for dialog if something goes wrong while uploading feedback screenshot"
+  },
+  "channelSortByNewest": "Newest",
+  "@channelSortByNewest": {
+    "description": "Sort channel videos from newest to oldest"
+  },
+  "channelSortByOldest": "Oldest",
+  "@channelSortByOldest": {
+    "description": "Sort channel videos from oldest to newest"
+  },
+  "channelSortByPopular": "Popular",
+  "@channelSortByPopular": {
+    "description": "Sort channel videos by popularity"
+  },
+  "invidiousAccount": "Invidious account",
+  "@invidiousAccount": {
+    "description": "Text when the user choose where to subscribe to a channel"
+  },
+  "onDeviceSubscriptions": "On device",
+  "@onDeviceSubscriptions": {
+    "description": "Text when the user chooses where to subscribe to a channel"
+  },
+  "both": "Both",
+  "refresh": "Refresh",
+  "addBasicAuth": "Add Basic Authentication",
+  "addBasicAuthExplanation": "If your server requires basic HTTP authentication, add the details below. These are not your invidious account details",
+  "addHeader": "Add header",
+  "advancedConfiguration": "Advanced Configuration",
+  "customHeaders": "Custom headers",
+  "customHeadersExplanation": "Set custom headers to be sent to the invidious server",
+  "value": "Value",
+  "testAndAddServer": "Test and add server",
+  "alsoTestServerConfig":"Also test server configuration, like if thumbnails would display properly",
+  "serverAlreadyExists": "Server already exists in settings",
+  "wrongThumbnailConfiguration": "The server is reachable but is not configured properly, the video and channel thumbnails will not be displayed properly. Disable the server test configuration if you are OK with this, fix your server otherwise",
+  "openWikiLink": "Open wiki for help",
+  "serverUnreachable": "Server is unreachable, or is not a valid invidious server"
 }
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 3fcd69e8..61c44c29 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -861,7 +861,7 @@
   "@itemlistErrorGeneric": {
     "description": "Error showing when the data can't be fetch"
   },
-  "homeLayoutEditor": "Modifier la disposition de l'accueil",
+  "homeLayoutEditor": "Modifier la disposition de l''accueil",
   "@homeLayoutEditor": {
     "description": "Title of layout editor screen"
   },
@@ -1351,7 +1351,7 @@
   "@invidiousAccount": {
     "description": "Text when the user choose where to subscribe to a channel"
   },
-  "onDeviceSubscriptions": "Sur l'appareil",
+  "onDeviceSubscriptions": "Sur l''appareil",
   "@onDeviceSubscriptions": {
     "description": "Text when the user chooses where to subscribe to a channel"
   },
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 285dfaef..518f8b65 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -1139,7 +1139,7 @@
   "@layoutEditorExplanation": {
     "description": "text to explain the home layout editor"
   },
-  "customizeAppLayout": "Personalizza le sezioni dell'app",
+  "customizeAppLayout": "Personalizza le sezioni dell''app",
   "@customizeAppLayout": {
     "description": "Settings label for the settings to allow the user to set up the app sections themselves"
   },
@@ -1147,7 +1147,7 @@
   "@home": {
     "description": "Label for Home browsing tab"
   },
-  "customizeAppLayoutExplanation": "Seleziona quali sezioni si desidera visualizzare nella barra di navigazione dell'app principale. Fare clic sull'icona di casa per selezionare quale schermata mostra quando l'applicazione inizia. È possibile riordinare le sezioni trascinandole intorno.",
+  "customizeAppLayoutExplanation": "Seleziona quali sezioni si desidera visualizzare nella barra di navigazione dell''app principale. Fare clic sull'icona di casa per selezionare quale schermata mostra quando l'applicazione inizia. È possibile riordinare le sezioni trascinandole intorno.",
   "@customizeAppLayoutExplanation": {
     "description": ""
   },
diff --git a/lib/router.dart b/lib/router.dart
index 6dd52773..8affe723 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -18,6 +18,7 @@ import 'package:invidious/search/views/screens/video_tab.dart';
 import 'package:invidious/search/views/tv/screens/search.dart';
 import 'package:invidious/settings/models/db/server.dart';
 import 'package:invidious/settings/models/db/video_filter.dart';
+import 'package:invidious/settings/views/screens/add_server.dart';
 import 'package:invidious/settings/views/screens/app_logs.dart';
 import 'package:invidious/settings/views/screens/appearance.dart';
 import 'package:invidious/settings/views/screens/browsing.dart';
@@ -31,6 +32,7 @@ import 'package:invidious/settings/views/screens/sponsor_block_settings.dart';
 import 'package:invidious/settings/views/screens/video_filter.dart';
 import 'package:invidious/settings/views/screens/video_filter_setup.dart';
 import 'package:invidious/settings/views/screens/video_player.dart';
+import 'package:invidious/settings/views/tv/screens/add_server.dart';
 import 'package:invidious/settings/views/tv/screens/app_layout.dart';
 import 'package:invidious/settings/views/tv/screens/dearrow_settings.dart';
 import 'package:invidious/settings/views/tv/screens/filter_edit.dart';
@@ -144,6 +146,7 @@ class AppRouter extends _$AppRouter implements AutoRouteGuard {
             AutoRoute(page: TvFilterListSettingsRoute.page),
             AutoRoute(page: TvTimePickerRoute.page),
             AutoRoute(page: TvPlainTextRoute.page),
+            AutoRoute(page: TvAddServerRoute.page)
           ]
         : [
             AutoRoute(
@@ -216,7 +219,10 @@ class AppRouter extends _$AppRouter implements AutoRouteGuard {
             AutoRoute(
                 page: ManageSingleServerRoute.page,
                 path: pathManageSingleServerFromWizard),
-            AutoRoute(page: WelcomeWizardRoute.page, initial: !hasServer)
+            AutoRoute(page: WelcomeWizardRoute.page, initial: !hasServer),
+            AutoRoute(
+              page: AddServerRoute.page,
+            )
           ];
   }
 
@@ -224,8 +230,12 @@ class AppRouter extends _$AppRouter implements AutoRouteGuard {
   Future<void> onNavigation(
       NavigationResolver resolver, StackRouter router) async {
     try {
-      if (resolver.route.name == TvWelcomeWizardRoute.name ||
-          resolver.route.name == WelcomeWizardRoute.name) {
+      var routeName = resolver.route.name;
+      if (routeName == TvWelcomeWizardRoute.name ||
+          routeName == WelcomeWizardRoute.name ||
+          routeName == AddServerRoute.name ||
+          routeName == TvTextFieldRoute.name ||
+          routeName == TvAddServerRoute.name) {
         resolver.next(true);
         return;
       }
diff --git a/lib/router.gr.dart b/lib/router.gr.dart
index 61cc7054..67cdd745 100644
--- a/lib/router.gr.dart
+++ b/lib/router.gr.dart
@@ -15,6 +15,12 @@ abstract class _$AppRouter extends RootStackRouter {
 
   @override
   final Map<String, PageFactory> pagesMap = {
+    AddServerRoute.name: (routeData) {
+      return AutoRoutePage<dynamic>(
+        routeData: routeData,
+        child: const AddServerScreen(),
+      );
+    },
     AppLogsRoute.name: (routeData) {
       return AutoRoutePage<dynamic>(
         routeData: routeData,
@@ -294,6 +300,12 @@ abstract class _$AppRouter extends RootStackRouter {
         child: const TrendingTab(),
       );
     },
+    TvAddServerRoute.name: (routeData) {
+      return AutoRoutePage<dynamic>(
+        routeData: routeData,
+        child: const TvAddServerScreen(),
+      );
+    },
     TvAppLayoutSettingsRoute.name: (routeData) {
       return AutoRoutePage<dynamic>(
         routeData: routeData,
@@ -544,6 +556,20 @@ abstract class _$AppRouter extends RootStackRouter {
   };
 }
 
+/// generated route for
+/// [AddServerScreen]
+class AddServerRoute extends PageRouteInfo<void> {
+  const AddServerRoute({List<PageRouteInfo>? children})
+      : super(
+          AddServerRoute.name,
+          initialChildren: children,
+        );
+
+  static const String name = 'AddServerRoute';
+
+  static const PageInfo<void> page = PageInfo<void>(name);
+}
+
 /// generated route for
 /// [AppLogsScreen]
 class AppLogsRoute extends PageRouteInfo<void> {
@@ -1337,6 +1363,20 @@ class TrendingRoute extends PageRouteInfo<void> {
   static const PageInfo<void> page = PageInfo<void>(name);
 }
 
+/// generated route for
+/// [TvAddServerScreen]
+class TvAddServerRoute extends PageRouteInfo<void> {
+  const TvAddServerRoute({List<PageRouteInfo>? children})
+      : super(
+          TvAddServerRoute.name,
+          initialChildren: children,
+        );
+
+  static const String name = 'TvAddServerRoute';
+
+  static const PageInfo<void> page = PageInfo<void>(name);
+}
+
 /// generated route for
 /// [TvAppLayoutSettingsScreen]
 class TvAppLayoutSettingsRoute extends PageRouteInfo<void> {
diff --git a/lib/service.dart b/lib/service.dart
index a21b7ad5..d5b19cad 100644
--- a/lib/service.dart
+++ b/lib/service.dart
@@ -78,18 +78,16 @@ const imgurClientId = 'Client-ID 2cfbc27ce77879d';
 const maxPing = 9007199254740991;
 
 class Service {
-  final log;
+  final log = Logger('Service');
   final Client httpClient;
 
-  Service() :
-    log = Logger('Service'),
-    httpClient = Platform.isAndroid ?
-      CronetClient.fromCronetEngine(
-        CronetEngine.build(
-          cacheMode: CacheMode.memory,
-          cacheMaxSize: 2 * 1024 * 1024),
-        closeEngine: true) :
-      http.Client();
+  Service()
+      : httpClient = Platform.isAndroid
+            ? CronetClient.fromCronetEngine(
+                CronetEngine.build(
+                    cacheMode: CacheMode.memory, cacheMaxSize: 2 * 1024 * 1024),
+                closeEngine: true)
+            : http.Client();
 
   String urlFormatForLog(Uri? uri) {
     return kDebugMode ? uri.toString() : '${uri?.replace(host: 'xxxxxxxxxx')}';
@@ -128,10 +126,16 @@ class Service {
     return db.getSettings(useProxySettingName)?.value == 'true';
   }
 
-  Future<Uri> buildUrl(String baseUrl,
-      {Map<String, String>? pathParams, Map<String, String?>? query}) async {
+  Future<ServerRequest> buildRequest(String baseUrl,
+      {Map<String, String>? pathParams,
+      Map<String, String?>? query,
+      bool authenticated = false,
+      bool utf16 = false,
+      bool forceJson = false,
+      Server? serverOverride}) async {
     try {
-      String url = '${(await db.getCurrentlySelectedServer()).url}$baseUrl';
+      final server = serverOverride ?? (await db.getCurrentlySelectedServer());
+      String url = '${(server).url}$baseUrl';
 
       pathParams?.forEach((key, value) {
         url = url.replaceAll(key, value);
@@ -155,7 +159,22 @@ class Service {
 
       var uri = Uri.parse(url);
       log.info('calling ${urlFormatForLog(uri)}');
-      return uri;
+
+      final Map<String, String> headers = Map.from(server.customHeaders);
+
+      if (authenticated) {
+        headers.addAll(getAuthenticationHeaders(server));
+      }
+
+      if (utf16) {
+        headers['Content-Type'] = 'application/json; charset=utf-16';
+      }
+
+      if (forceJson) {
+        headers['Content-Type'] = 'application/json';
+      }
+
+      return ServerRequest(uri: uri, headers: headers);
     } catch (err) {
       log.severe('Couldn\'t build url', err);
       rethrow;
@@ -164,10 +183,12 @@ class Service {
 
   handleErrors(Response response) {}
 
-  Future<Video> getVideo(String videoId) async {
-    var url = await buildUrl(urlGetVideo, pathParams: {':id': videoId});
-    final response = await httpClient.get(url,
-        headers: {'Content-Type': 'application/json; charset=utf-16'});
+  Future<Video> getVideo(String videoId, {Server? serverOverride}) async {
+    var req = await buildRequest(urlGetVideo,
+        pathParams: {':id': videoId},
+        utf16: true,
+        serverOverride: serverOverride);
+    final response = await httpClient.get(req.uri, headers: req.headers);
 
     var video = Video.fromJson(handleResponse(response));
     await DeArrow.processVideos([video]);
@@ -177,12 +198,14 @@ class Service {
   }
 
   Future<String> loginWithCookies(
-      String serverUrl, String username, String password) async {
+      String serverUrl, String username, String password,
+      {Map<String, String>? headers}) async {
     try {
       String url = '$serverUrl/login?type=invidious';
       var map = {'email': username, 'password': password};
 
-      final response = await httpClient.post(Uri.parse(url), body: map);
+      final response =
+          await httpClient.post(Uri.parse(url), body: map, headers: headers);
       if (response.statusCode == 302 &&
           response.headers.containsKey('set-cookie')) {
         // we have a cookie to parse
@@ -213,7 +236,7 @@ class Service {
     Server? server = db.getServer(serverUrl);
 
     if (server != null) {
-      server.authToken = Uri.decodeComponent(token ?? '');
+      server = server.copyWith(authToken: Uri.decodeComponent(token ?? ''));
 
       await db.upsertServer(server);
       if (server.inUse) {
@@ -248,8 +271,8 @@ class Service {
       query.putIfAbsent('type', () => type);
     }
 
-    var url = await buildUrl(urlGetTrending, query: query);
-    final response = await httpClient.get(url);
+    var req = await buildRequest(urlGetTrending, query: query);
+    final response = await httpClient.get(req.uri, headers: req.headers);
 
     Iterable i = handleResponse(response);
     var list = List<VideoInList>.from(i.map((e) => VideoInList.fromJson(e)));
@@ -258,8 +281,8 @@ class Service {
   }
 
   Future<List<VideoInList>> getPopular() async {
-    var url = await buildUrl(urlGetPopular);
-    final response = await httpClient.get(url);
+    var req = await buildRequest(urlGetPopular);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     Iterable i = handleResponse(response);
     var list = List<VideoInList>.from(i.map((e) => VideoInList.fromJson(e)));
     list = (await postProcessVideos(list)).cast();
@@ -273,7 +296,7 @@ class Service {
       SearchDate date = SearchDate.any,
       SearchDuration duration = SearchDuration.any}) async {
     String countryCode = db.getSettings(browsingCountry)?.value ?? 'US';
-    Uri uri = await buildUrl(urlSearch, query: {
+    final req = await buildRequest(urlSearch, query: {
       'q': Uri.encodeQueryComponent(query),
       'type': type?.name,
       'page': page?.toString() ?? '1',
@@ -282,7 +305,7 @@ class Service {
       'date': date != SearchDate.any ? date.name : null,
       'duration': duration != SearchDuration.any ? duration.name : null,
     });
-    final response = await httpClient.get(uri);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     Iterable i = handleResponse(response);
     // only getting videos for now
     SearchResults results = SearchResults();
@@ -312,15 +335,14 @@ class Service {
   Future<UserFeed> getUserFeed(
       {int? maxResults, int? page, bool saveLastSeen = true}) async {
     // for background service to be able to use
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    Uri uri = await buildUrl(urlGetUserFeed, query: {
-      'max_results': maxResults?.toString(),
-      'page': page?.toString()
-    });
-
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    final response = await httpClient.get(uri, headers: headers);
+    final req = await buildRequest(urlGetUserFeed,
+        query: {
+          'max_results': maxResults?.toString(),
+          'page': page?.toString()
+        },
+        authenticated: true);
+
+    final response = await httpClient.get(req.uri, headers: req.headers);
     var feed = UserFeed.fromJson(handleResponse(response));
     feed.videos = (await postProcessVideos(feed.videos ?? [])).cast();
     feed.notifications =
@@ -387,8 +409,10 @@ class Service {
 
   Future<SearchSuggestion> getSearchSuggestion(String query) async {
     if (query.isEmpty) return SearchSuggestion(query, []);
-    final response = await httpClient.get(await buildUrl(urlSearchSuggestions,
-        query: {"q": Uri.encodeQueryComponent(query)}));
+    var request = await buildRequest(urlSearchSuggestions,
+        query: {"q": Uri.encodeQueryComponent(query)});
+    final response =
+        await httpClient.get(request.uri, headers: request.headers);
     SearchSuggestion search =
         SearchSuggestion.fromJson(handleResponse(response));
     if (search.suggestions.any((element) => element.contains(";"))) {
@@ -403,11 +427,12 @@ class Service {
     return search;
   }
 
-  Future<void> validateServer(String serverUrl) async {
+  Future<void> validateServer(
+      String serverUrl, Map<String, String>? headers) async {
     try {
       String url = serverUrl + urlStats;
       log.info('Calling $url');
-      final response = await httpClient.get(Uri.parse(url));
+      final response = await httpClient.get(Uri.parse(url), headers: headers);
       Map<String, dynamic> json = handleResponse(response);
 
       if (json.containsKey("software") &&
@@ -433,14 +458,10 @@ class Service {
 
   Future<bool> subscribe(String channelId) async {
     if (!await isLoggedIn()) return false;
+    final req = await buildRequest(urlAddDeleteSubscriptions,
+        pathParams: {":ucid": channelId}, authenticated: true);
 
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlAddDeleteSubscriptions,
-        pathParams: {":ucid": channelId});
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-
-    final response = await httpClient.post(url, headers: headers);
+    final response = await httpClient.post(req.uri, headers: req.headers);
     log.info('${response.statusCode} - ${response.body}');
 
     if (response.statusCode == 204 || response.statusCode == 403) {
@@ -453,13 +474,10 @@ class Service {
   Future<bool> unSubscribe(String channelId) async {
     if (!await isLoggedIn()) return false;
 
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlAddDeleteSubscriptions,
-        pathParams: {":ucid": channelId});
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
+    final req = await buildRequest(urlAddDeleteSubscriptions,
+        pathParams: {":ucid": channelId}, authenticated: true);
 
-    final response = await httpClient.delete(url, headers: headers);
+    final response = await httpClient.delete(req.uri, headers: req.headers);
     log.info('${response.statusCode} - ${response.body}');
 
     if (response.statusCode == 204 || response.statusCode == 403) {
@@ -480,12 +498,9 @@ class Service {
   Future<List<Subscription>> getSubscriptions() async {
     if (!await isLoggedIn()) return [];
 
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
+    var req = await buildRequest(urlGetSubscriptions, authenticated: true);
 
-    var url = await buildUrl(urlGetSubscriptions);
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-
-    final response = await httpClient.get(url, headers: headers);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     Iterable i = handleResponse(response);
 
     return List<Subscription>.from(i.map((e) => Subscription.fromJson(e)));
@@ -500,17 +515,19 @@ class Service {
     if (sortBy != null) queryStr.putIfAbsent('sort_by', () => sortBy);
     if (source != null) queryStr.putIfAbsent('source', () => source);
 
-    final response = await httpClient.get(await buildUrl(urlGetComments,
-        pathParams: {':id': videoId}, query: queryStr));
+    var req = await buildRequest(urlGetComments,
+        pathParams: {':id': videoId}, query: queryStr);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     return VideoComments.fromJson(handleResponse(response));
   }
 
   Future<Channel> getChannel(String channelId) async {
     // sometimes the api gives the channel with /channel/<channelid> format
     channelId = channelId.replaceAll("/channel/", '');
-    final response = await httpClient.get(
-        await buildUrl(urlGetChannel, pathParams: {':id': channelId}),
-        headers: {'Content-Type': 'application/json; charset=utf-16'});
+    var req = await buildRequest(urlGetChannel,
+        pathParams: {':id': channelId}, utf16: true);
+
+    final response = await httpClient.get(req.uri, headers: req.headers);
 
     var channel = Channel.fromJson(handleResponse(response));
     channel.latestVideos =
@@ -527,14 +544,14 @@ class Service {
       String channelId, String? continuation,
       {bool saveLastSeen = true,
       ChannelSortBy sortBy = ChannelSortBy.newest}) async {
-    Uri uri = await buildUrl(urlGetChannelVideos, pathParams: {
-      ':id': channelId
-    }, query: {
-      'continuation': continuation,
-      'sort_by': sortBy.name,
-    });
-    final response = await httpClient.get(uri,
-        headers: {'Content-Type': 'application/json; charset=utf-16'});
+    final req = await buildRequest(urlGetChannelVideos,
+        pathParams: {':id': channelId},
+        query: {
+          'continuation': continuation,
+          'sort_by': sortBy.name,
+        },
+        utf16: true);
+    final response = await httpClient.get(req.uri, headers: req.headers);
 
     var videosWithContinuation =
         VideosWithContinuation.fromJson(handleResponse(response));
@@ -550,10 +567,11 @@ class Service {
 
   Future<VideosWithContinuation> getChannelStreams(
       String channelId, String? continuation) async {
-    Uri uri = await buildUrl(urlGetChannelStreams,
-        pathParams: {':id': channelId}, query: {'continuation': continuation});
-    final response = await httpClient.get(uri,
-        headers: {'Content-Type': 'application/json; charset=utf-16'});
+    final req = await buildRequest(urlGetChannelStreams,
+        pathParams: {':id': channelId},
+        query: {'continuation': continuation},
+        utf16: true);
+    final response = await httpClient.get(req.uri, headers: req.headers);
 
     var videosWithContinuation =
         VideosWithContinuation.fromJson(handleResponse(response));
@@ -564,10 +582,11 @@ class Service {
 
   Future<VideosWithContinuation> getChannelShorts(
       String channelId, String? continuation) async {
-    Uri uri = await buildUrl(urlGetChannelShorts,
-        pathParams: {':id': channelId}, query: {'continuation': continuation});
-    final response = await httpClient.get(uri,
-        headers: {'Content-Type': 'application/json; charset=utf-16'});
+    final req = await buildRequest(urlGetChannelShorts,
+        pathParams: {':id': channelId},
+        query: {'continuation': continuation},
+        utf16: true);
+    final response = await httpClient.get(req.uri, headers: req.headers);
 
     var videosWithContinuation =
         VideosWithContinuation.fromJson(handleResponse(response));
@@ -577,13 +596,10 @@ class Service {
   }
 
   Future<List<Playlist>> getUserPlaylists({bool postProcessing = true}) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
     try {
-      var url = await buildUrl(urlGetUserPlaylists);
-      var headers = getAuthenticationHeaders(currentlySelectedServer);
+      var req = await buildRequest(urlGetUserPlaylists, authenticated: true);
 
-      final response = await httpClient.get(url, headers: headers);
+      final response = await httpClient.get(req.uri, headers: req.headers);
       Iterable i = handleResponse(response);
       var list = List<Playlist>.from(i.map((e) => Playlist.fromJson(e)));
       if (postProcessing) {
@@ -599,10 +615,10 @@ class Service {
 
   Future<ChannelPlaylists> getChannelPlaylists(String channelId,
       {String? continuation}) async {
-    Uri uri = await buildUrl(urlGetChannelPlaylists,
+    final req = await buildRequest(urlGetChannelPlaylists,
         pathParams: {':id': channelId}, query: {'continuation': continuation});
 
-    final response = await httpClient.get(uri);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     var channelPlaylists = ChannelPlaylists.fromJson(handleResponse(response));
     for (var pl in channelPlaylists.playlists) {
       pl.videos = (await postProcessVideos(pl.videos)).cast();
@@ -611,11 +627,8 @@ class Service {
   }
 
   Future<String?> createPlayList(String name, String type) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlPostUserPlaylists);
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
+    var req = await buildRequest(urlPostUserPlaylists,
+        authenticated: true, forceJson: true);
 
     Map<String, String> body = {
       'title': name,
@@ -624,64 +637,51 @@ class Service {
 
     log.info(jsonEncode(body));
 
-    final response =
-        await httpClient.post(url, headers: headers, body: jsonEncode(body));
+    final response = await httpClient.post(req.uri,
+        headers: req.headers, body: jsonEncode(body));
     Map<String, dynamic> playlist = handleResponse(response);
     return playlist['playlistId'] as String;
   }
 
   Future<void> addVideoToPlaylist(String playListId, String videoId) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlPostUserPlaylistVideo,
-        pathParams: {":id": playListId});
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
+    var req = await buildRequest(urlPostUserPlaylistVideo,
+        pathParams: {":id": playListId}, authenticated: true, forceJson: true);
 
     Map<String, String> body = {
       'videoId': videoId,
     };
 
-    final response =
-        await httpClient.post(url, headers: headers, body: jsonEncode(body));
+    final response = await httpClient.post(req.uri,
+        headers: req.headers, body: jsonEncode(body));
     handleResponse(response);
   }
 
   Future<void> deleteUserPlaylist(String playListId) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
+    var req = await buildRequest(urlDeleteUserPlaylist,
+        pathParams: {":id": playListId}, authenticated: true, forceJson: true);
 
-    var url =
-        await buildUrl(urlDeleteUserPlaylist, pathParams: {":id": playListId});
-
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
-
-    final response = await httpClient.delete(url, headers: headers);
+    final response = await httpClient.delete(req.uri, headers: req.headers);
     handleResponse(response);
   }
 
   Future<void> deleteUserPlaylistVideo(
       String playListId, String indexId) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlDeleteUserPlaylistVideo,
-        pathParams: {':id': playListId, ':index': indexId});
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
+    final req = await buildRequest(urlDeleteUserPlaylistVideo,
+        pathParams: {':id': playListId, ':index': indexId},
+        authenticated: true,
+        forceJson: true);
 
-    final response = await httpClient.delete(url, headers: headers);
+    final response = await httpClient.delete(req.uri, headers: req.headers);
     handleResponse(response);
   }
 
   Future<List<String>> getUserHistory(int page, int maxResults) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
+    final req = await buildRequest(urlGetClearHistory,
+        query: {'page': page.toString(), 'max_results': maxResults.toString()},
+        authenticated: true,
+        forceJson: true);
 
-    var url = await buildUrl(urlGetClearHistory,
-        query: {'page': page.toString(), 'max_results': maxResults.toString()});
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
-
-    final response = await httpClient.get(url, headers: headers);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     Iterable i = handleResponse(response);
 
     return List<String>.from(i.map((e) => e as String));
@@ -703,35 +703,25 @@ class Service {
   }
 
   Future<void> clearUserHistory() async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlGetClearHistory);
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
+    var req = await buildRequest(urlGetClearHistory,
+        authenticated: true, forceJson: true);
 
-    final response = await httpClient.delete(url, headers: headers);
+    final response = await httpClient.delete(req.uri, headers: req.headers);
     handleResponse(response);
   }
 
   Future<void> deleteFromUserHistory(String videoId) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlAddDeleteHistory, pathParams: {':id': videoId});
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
-
-    final response = await httpClient.delete(url, headers: headers);
+    var req = await buildRequest(urlAddDeleteHistory,
+        pathParams: {':id': videoId}, authenticated: true, forceJson: true);
+    final response = await httpClient.delete(req.uri, headers: req.headers);
     handleResponse(response);
   }
 
   Future<void> addToUserHistory(String videoId) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    var url = await buildUrl(urlAddDeleteHistory, pathParams: {':id': videoId});
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
-    headers['Content-Type'] = 'application/json';
+    var req = await buildRequest(urlAddDeleteHistory,
+        pathParams: {':id': videoId}, authenticated: true, forceJson: true);
 
-    final response = await httpClient.post(url, headers: headers);
+    final response = await httpClient.post(req.uri, headers: req.headers);
     handleResponse(response);
   }
 
@@ -753,7 +743,8 @@ class Service {
   }
 
   Future<List<InvidiousPublicServer>> getPublicServers() async {
-    final response = await httpClient.get(Uri.parse(urlGetInvidiousPublicServers));
+    final response =
+        await httpClient.get(Uri.parse(urlGetInvidiousPublicServers));
     List<InvidiousPublicServer> servers = [];
     Iterable i = handleResponse(response);
 
@@ -772,10 +763,10 @@ class Service {
 
   Future<Playlist> getPublicPlaylists(String playlistId,
       {int? page, bool saveLastSeen = true}) async {
-    Uri uri = await buildUrl(urlGetPublicPlaylist,
+    final req = await buildRequest(urlGetPublicPlaylist,
         pathParams: {':id': playlistId}, query: {'page': page?.toString()});
 
-    final response = await httpClient.get(uri);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     var playlist = Playlist.fromJson(handleResponse(response));
     var oldLength = playlist.videos.length;
     playlist.videos = (await postProcessVideos(playlist.videos)).cast();
@@ -790,14 +781,10 @@ class Service {
   }
 
   Future<Playlist> getUserPlaylist(String playlistId) async {
-    var currentlySelectedServer = await db.getCurrentlySelectedServer();
-
-    Uri uri =
-        await buildUrl(urlGetUserPlaylist, pathParams: {':id': playlistId});
-
-    var headers = getAuthenticationHeaders(currentlySelectedServer);
+    final req = await buildRequest(urlGetUserPlaylist,
+        pathParams: {':id': playlistId}, authenticated: true);
 
-    final response = await httpClient.get(uri, headers: headers);
+    final response = await httpClient.get(req.uri, headers: req.headers);
     var playlist = Playlist.fromJson(handleResponse(response));
     var oldLength = playlist.videos.length;
     playlist.videos = (await postProcessVideos(playlist.videos)).cast();
@@ -846,3 +833,10 @@ class Service {
     }
   }
 }
+
+class ServerRequest {
+  final Uri uri;
+  final Map<String, String> headers;
+
+  ServerRequest({required this.uri, required this.headers});
+}
diff --git a/lib/settings/models/add_server_validation_errors.dart b/lib/settings/models/add_server_validation_errors.dart
new file mode 100644
index 00000000..27092a39
--- /dev/null
+++ b/lib/settings/models/add_server_validation_errors.dart
@@ -0,0 +1,6 @@
+enum AddServerValidationErrors {
+  invalidUrl,
+  serverAlreadyExists,
+  thumbnailWontShow,
+  cannotReachServer;
+}
diff --git a/lib/settings/models/db/server.dart b/lib/settings/models/db/server.dart
index 8360ed85..2ac4d5c9 100644
--- a/lib/settings/models/db/server.dart
+++ b/lib/settings/models/db/server.dart
@@ -1,36 +1,19 @@
-import 'package:copy_with_extension/copy_with_extension.dart';
-import 'package:json_annotation/json_annotation.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 
+part 'server.freezed.dart';
 part 'server.g.dart';
 
-@CopyWith()
-@JsonSerializable()
-class Server {
-  String url;
-  String? authToken;
-  String? sidCookie;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  Duration? ping;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  String? flag;
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  String? region;
-
-  bool inUse;
-
-  Server(
-      {required this.url,
-      this.authToken,
-      this.sidCookie,
-      this.ping,
-      this.flag,
-      this.region,
-      this.inUse = false});
-
-  factory Server.fromJson(Map<String, dynamic> json) => _$ServerFromJson(json);
-
-  Map<String, dynamic> toJson() => _$ServerToJson(this);
+@freezed
+class Server with _$Server {
+  const factory Server(
+      {required String url,
+      String? authToken,
+      String? sidCookie,
+      @JsonKey(includeFromJson: false, includeToJson: false) Duration? ping,
+      @JsonKey(includeFromJson: false, includeToJson: false) String? flag,
+      @JsonKey(includeFromJson: false, includeToJson: false) String? region,
+      @Default({}) Map<String, String> customHeaders,
+      @Default(false) bool inUse}) = _Server;
+
+  factory Server.fromJson(Map<String, Object?> json) => _$ServerFromJson(json);
 }
diff --git a/lib/settings/models/db/server.freezed.dart b/lib/settings/models/db/server.freezed.dart
new file mode 100644
index 00000000..b72c7920
--- /dev/null
+++ b/lib/settings/models/db/server.freezed.dart
@@ -0,0 +1,315 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'server.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+Server _$ServerFromJson(Map<String, dynamic> json) {
+  return _Server.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Server {
+  String get url => throw _privateConstructorUsedError;
+  String? get authToken => throw _privateConstructorUsedError;
+  String? get sidCookie => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  Duration? get ping => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get flag => throw _privateConstructorUsedError;
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get region => throw _privateConstructorUsedError;
+  Map<String, String> get customHeaders => throw _privateConstructorUsedError;
+  bool get inUse => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $ServerCopyWith<Server> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ServerCopyWith<$Res> {
+  factory $ServerCopyWith(Server value, $Res Function(Server) then) =
+      _$ServerCopyWithImpl<$Res, Server>;
+  @useResult
+  $Res call(
+      {String url,
+      String? authToken,
+      String? sidCookie,
+      @JsonKey(includeFromJson: false, includeToJson: false) Duration? ping,
+      @JsonKey(includeFromJson: false, includeToJson: false) String? flag,
+      @JsonKey(includeFromJson: false, includeToJson: false) String? region,
+      Map<String, String> customHeaders,
+      bool inUse});
+}
+
+/// @nodoc
+class _$ServerCopyWithImpl<$Res, $Val extends Server>
+    implements $ServerCopyWith<$Res> {
+  _$ServerCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? url = null,
+    Object? authToken = freezed,
+    Object? sidCookie = freezed,
+    Object? ping = freezed,
+    Object? flag = freezed,
+    Object? region = freezed,
+    Object? customHeaders = null,
+    Object? inUse = null,
+  }) {
+    return _then(_value.copyWith(
+      url: null == url
+          ? _value.url
+          : url // ignore: cast_nullable_to_non_nullable
+              as String,
+      authToken: freezed == authToken
+          ? _value.authToken
+          : authToken // ignore: cast_nullable_to_non_nullable
+              as String?,
+      sidCookie: freezed == sidCookie
+          ? _value.sidCookie
+          : sidCookie // ignore: cast_nullable_to_non_nullable
+              as String?,
+      ping: freezed == ping
+          ? _value.ping
+          : ping // ignore: cast_nullable_to_non_nullable
+              as Duration?,
+      flag: freezed == flag
+          ? _value.flag
+          : flag // ignore: cast_nullable_to_non_nullable
+              as String?,
+      region: freezed == region
+          ? _value.region
+          : region // ignore: cast_nullable_to_non_nullable
+              as String?,
+      customHeaders: null == customHeaders
+          ? _value.customHeaders
+          : customHeaders // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+      inUse: null == inUse
+          ? _value.inUse
+          : inUse // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ServerImplCopyWith<$Res> implements $ServerCopyWith<$Res> {
+  factory _$$ServerImplCopyWith(
+          _$ServerImpl value, $Res Function(_$ServerImpl) then) =
+      __$$ServerImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {String url,
+      String? authToken,
+      String? sidCookie,
+      @JsonKey(includeFromJson: false, includeToJson: false) Duration? ping,
+      @JsonKey(includeFromJson: false, includeToJson: false) String? flag,
+      @JsonKey(includeFromJson: false, includeToJson: false) String? region,
+      Map<String, String> customHeaders,
+      bool inUse});
+}
+
+/// @nodoc
+class __$$ServerImplCopyWithImpl<$Res>
+    extends _$ServerCopyWithImpl<$Res, _$ServerImpl>
+    implements _$$ServerImplCopyWith<$Res> {
+  __$$ServerImplCopyWithImpl(
+      _$ServerImpl _value, $Res Function(_$ServerImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? url = null,
+    Object? authToken = freezed,
+    Object? sidCookie = freezed,
+    Object? ping = freezed,
+    Object? flag = freezed,
+    Object? region = freezed,
+    Object? customHeaders = null,
+    Object? inUse = null,
+  }) {
+    return _then(_$ServerImpl(
+      url: null == url
+          ? _value.url
+          : url // ignore: cast_nullable_to_non_nullable
+              as String,
+      authToken: freezed == authToken
+          ? _value.authToken
+          : authToken // ignore: cast_nullable_to_non_nullable
+              as String?,
+      sidCookie: freezed == sidCookie
+          ? _value.sidCookie
+          : sidCookie // ignore: cast_nullable_to_non_nullable
+              as String?,
+      ping: freezed == ping
+          ? _value.ping
+          : ping // ignore: cast_nullable_to_non_nullable
+              as Duration?,
+      flag: freezed == flag
+          ? _value.flag
+          : flag // ignore: cast_nullable_to_non_nullable
+              as String?,
+      region: freezed == region
+          ? _value.region
+          : region // ignore: cast_nullable_to_non_nullable
+              as String?,
+      customHeaders: null == customHeaders
+          ? _value._customHeaders
+          : customHeaders // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+      inUse: null == inUse
+          ? _value.inUse
+          : inUse // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$ServerImpl implements _Server {
+  const _$ServerImpl(
+      {required this.url,
+      this.authToken,
+      this.sidCookie,
+      @JsonKey(includeFromJson: false, includeToJson: false) this.ping,
+      @JsonKey(includeFromJson: false, includeToJson: false) this.flag,
+      @JsonKey(includeFromJson: false, includeToJson: false) this.region,
+      final Map<String, String> customHeaders = const {},
+      this.inUse = false})
+      : _customHeaders = customHeaders;
+
+  factory _$ServerImpl.fromJson(Map<String, dynamic> json) =>
+      _$$ServerImplFromJson(json);
+
+  @override
+  final String url;
+  @override
+  final String? authToken;
+  @override
+  final String? sidCookie;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final Duration? ping;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? flag;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  final String? region;
+  final Map<String, String> _customHeaders;
+  @override
+  @JsonKey()
+  Map<String, String> get customHeaders {
+    if (_customHeaders is EqualUnmodifiableMapView) return _customHeaders;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_customHeaders);
+  }
+
+  @override
+  @JsonKey()
+  final bool inUse;
+
+  @override
+  String toString() {
+    return 'Server(url: $url, authToken: $authToken, sidCookie: $sidCookie, ping: $ping, flag: $flag, region: $region, customHeaders: $customHeaders, inUse: $inUse)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ServerImpl &&
+            (identical(other.url, url) || other.url == url) &&
+            (identical(other.authToken, authToken) ||
+                other.authToken == authToken) &&
+            (identical(other.sidCookie, sidCookie) ||
+                other.sidCookie == sidCookie) &&
+            (identical(other.ping, ping) || other.ping == ping) &&
+            (identical(other.flag, flag) || other.flag == flag) &&
+            (identical(other.region, region) || other.region == region) &&
+            const DeepCollectionEquality()
+                .equals(other._customHeaders, _customHeaders) &&
+            (identical(other.inUse, inUse) || other.inUse == inUse));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(runtimeType, url, authToken, sidCookie, ping,
+      flag, region, const DeepCollectionEquality().hash(_customHeaders), inUse);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ServerImplCopyWith<_$ServerImpl> get copyWith =>
+      __$$ServerImplCopyWithImpl<_$ServerImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$ServerImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _Server implements Server {
+  const factory _Server(
+      {required final String url,
+      final String? authToken,
+      final String? sidCookie,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final Duration? ping,
+      @JsonKey(includeFromJson: false, includeToJson: false) final String? flag,
+      @JsonKey(includeFromJson: false, includeToJson: false)
+      final String? region,
+      final Map<String, String> customHeaders,
+      final bool inUse}) = _$ServerImpl;
+
+  factory _Server.fromJson(Map<String, dynamic> json) = _$ServerImpl.fromJson;
+
+  @override
+  String get url;
+  @override
+  String? get authToken;
+  @override
+  String? get sidCookie;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  Duration? get ping;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get flag;
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  String? get region;
+  @override
+  Map<String, String> get customHeaders;
+  @override
+  bool get inUse;
+  @override
+  @JsonKey(ignore: true)
+  _$$ServerImplCopyWith<_$ServerImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
diff --git a/lib/settings/models/db/server.g.dart b/lib/settings/models/db/server.g.dart
index 70051e60..562978b1 100644
--- a/lib/settings/models/db/server.g.dart
+++ b/lib/settings/models/db/server.g.dart
@@ -2,139 +2,26 @@
 
 part of 'server.dart';
 
-// **************************************************************************
-// CopyWithGenerator
-// **************************************************************************
-
-abstract class _$ServerCWProxy {
-  Server url(String url);
-
-  Server authToken(String? authToken);
-
-  Server sidCookie(String? sidCookie);
-
-  Server ping(Duration? ping);
-
-  Server flag(String? flag);
-
-  Server region(String? region);
-
-  Server inUse(bool inUse);
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Server(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// Server(...).copyWith(id: 12, name: "My name")
-  /// ````
-  Server call({
-    String? url,
-    String? authToken,
-    String? sidCookie,
-    Duration? ping,
-    String? flag,
-    String? region,
-    bool? inUse,
-  });
-}
-
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfServer.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfServer.copyWith.fieldName(...)`
-class _$ServerCWProxyImpl implements _$ServerCWProxy {
-  const _$ServerCWProxyImpl(this._value);
-
-  final Server _value;
-
-  @override
-  Server url(String url) => this(url: url);
-
-  @override
-  Server authToken(String? authToken) => this(authToken: authToken);
-
-  @override
-  Server sidCookie(String? sidCookie) => this(sidCookie: sidCookie);
-
-  @override
-  Server ping(Duration? ping) => this(ping: ping);
-
-  @override
-  Server flag(String? flag) => this(flag: flag);
-
-  @override
-  Server region(String? region) => this(region: region);
-
-  @override
-  Server inUse(bool inUse) => this(inUse: inUse);
-
-  @override
-
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Server(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
-  ///
-  /// Usage
-  /// ```dart
-  /// Server(...).copyWith(id: 12, name: "My name")
-  /// ````
-  Server call({
-    Object? url = const $CopyWithPlaceholder(),
-    Object? authToken = const $CopyWithPlaceholder(),
-    Object? sidCookie = const $CopyWithPlaceholder(),
-    Object? ping = const $CopyWithPlaceholder(),
-    Object? flag = const $CopyWithPlaceholder(),
-    Object? region = const $CopyWithPlaceholder(),
-    Object? inUse = const $CopyWithPlaceholder(),
-  }) {
-    return Server(
-      url: url == const $CopyWithPlaceholder() || url == null
-          ? _value.url
-          // ignore: cast_nullable_to_non_nullable
-          : url as String,
-      authToken: authToken == const $CopyWithPlaceholder()
-          ? _value.authToken
-          // ignore: cast_nullable_to_non_nullable
-          : authToken as String?,
-      sidCookie: sidCookie == const $CopyWithPlaceholder()
-          ? _value.sidCookie
-          // ignore: cast_nullable_to_non_nullable
-          : sidCookie as String?,
-      ping: ping == const $CopyWithPlaceholder()
-          ? _value.ping
-          // ignore: cast_nullable_to_non_nullable
-          : ping as Duration?,
-      flag: flag == const $CopyWithPlaceholder()
-          ? _value.flag
-          // ignore: cast_nullable_to_non_nullable
-          : flag as String?,
-      region: region == const $CopyWithPlaceholder()
-          ? _value.region
-          // ignore: cast_nullable_to_non_nullable
-          : region as String?,
-      inUse: inUse == const $CopyWithPlaceholder() || inUse == null
-          ? _value.inUse
-          // ignore: cast_nullable_to_non_nullable
-          : inUse as bool,
-    );
-  }
-}
-
-extension $ServerCopyWith on Server {
-  /// Returns a callable class that can be used as follows: `instanceOfServer.copyWith(...)` or like so:`instanceOfServer.copyWith.fieldName(...)`.
-  // ignore: library_private_types_in_public_api
-  _$ServerCWProxy get copyWith => _$ServerCWProxyImpl(this);
-}
-
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
-Server _$ServerFromJson(Map<String, dynamic> json) => Server(
+_$ServerImpl _$$ServerImplFromJson(Map<String, dynamic> json) => _$ServerImpl(
       url: json['url'] as String,
       authToken: json['authToken'] as String?,
       sidCookie: json['sidCookie'] as String?,
+      customHeaders: (json['customHeaders'] as Map<String, dynamic>?)?.map(
+            (k, e) => MapEntry(k, e as String),
+          ) ??
+          const {},
       inUse: json['inUse'] as bool? ?? false,
     );
 
-Map<String, dynamic> _$ServerToJson(Server instance) => <String, dynamic>{
+Map<String, dynamic> _$$ServerImplToJson(_$ServerImpl instance) =>
+    <String, dynamic>{
       'url': instance.url,
       'authToken': instance.authToken,
       'sidCookie': instance.sidCookie,
+      'customHeaders': instance.customHeaders,
       'inUse': instance.inUse,
     };
diff --git a/lib/settings/models/errors/cannot_add_server_error.dart b/lib/settings/models/errors/cannot_add_server_error.dart
index c2193427..366483d6 100644
--- a/lib/settings/models/errors/cannot_add_server_error.dart
+++ b/lib/settings/models/errors/cannot_add_server_error.dart
@@ -1,5 +1,11 @@
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
 class CannotAddServerError extends Error {
   final String error;
 
   CannotAddServerError({required this.error});
+
+  String getLabel(AppLocalizations locals) {
+    return '${locals.serverUnreachable}\n\n$error';
+  }
 }
diff --git a/lib/settings/models/errors/server_already_exists.dart b/lib/settings/models/errors/server_already_exists.dart
new file mode 100644
index 00000000..fd5499c9
--- /dev/null
+++ b/lib/settings/models/errors/server_already_exists.dart
@@ -0,0 +1,12 @@
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+import 'cannot_add_server_error.dart';
+
+class ServerAlreadyExists extends CannotAddServerError {
+  ServerAlreadyExists({super.error = 'Server already exists'});
+
+  @override
+  String getLabel(AppLocalizations locals) {
+    return locals.serverAlreadyExists;
+  }
+}
diff --git a/lib/settings/models/errors/wrong_thumbnail_url.dart b/lib/settings/models/errors/wrong_thumbnail_url.dart
new file mode 100644
index 00000000..f3fda19b
--- /dev/null
+++ b/lib/settings/models/errors/wrong_thumbnail_url.dart
@@ -0,0 +1,11 @@
+import 'package:invidious/settings/models/errors/cannot_add_server_error.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class WrongThumbnailUrl extends CannotAddServerError {
+  WrongThumbnailUrl({super.error = 'Wrong thumbnail url'});
+
+  @override
+  String getLabel(AppLocalizations locals) {
+    return locals.wrongThumbnailConfiguration;
+  }
+}
diff --git a/lib/settings/states/add_server.dart b/lib/settings/states/add_server.dart
new file mode 100644
index 00000000..2678de90
--- /dev/null
+++ b/lib/settings/states/add_server.dart
@@ -0,0 +1,117 @@
+import 'package:bloc/bloc.dart';
+import 'package:flutter/material.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:invidious/settings/models/errors/server_already_exists.dart';
+import 'package:invidious/settings/models/errors/wrong_thumbnail_url.dart';
+
+import '../../globals.dart';
+import '../models/db/server.dart';
+
+part 'add_server.freezed.dart';
+
+class AddServerCubit extends Cubit<AddServerState> {
+  final TextEditingController urlController =
+      TextEditingController(text: 'https://');
+  final TextEditingController headerNameController = TextEditingController();
+  final TextEditingController headerValueController = TextEditingController();
+
+  AddServerCubit(super.initialState) {
+    urlController.addListener(
+      () {
+        emit(state.copyWith(valid: validUrl));
+      },
+    );
+  }
+
+  @override
+  Future<void> close() {
+    urlController.dispose();
+    headerNameController.dispose();
+    headerValueController.dispose();
+    return super.close();
+  }
+
+  Future<Server?> validateServer() async {
+    emit(state.copyWith(loading: true));
+    try {
+      var serverUrl = urlController.value.text.trim();
+
+      final existingServer = db.getServer(serverUrl);
+
+      if (existingServer != null) {
+        throw ServerAlreadyExists();
+      }
+
+      if (serverUrl.endsWith("/")) {
+        serverUrl = serverUrl.substring(0, serverUrl.length - 1);
+      }
+
+      await service.validateServer(serverUrl, state.headers);
+
+      if (state.advancedTest) {
+        Server server = Server(url: serverUrl, customHeaders: state.headers);
+        final video =
+            await service.getVideo('dQw4w9WgXcQ', serverOverride: server);
+
+        final invalidThumbnailUrls = video.videoThumbnails
+            .map(
+              (e) => e.url,
+            )
+            .any((u) => u.startsWith("/"));
+
+        if (invalidThumbnailUrls) {
+          throw WrongThumbnailUrl();
+        }
+      }
+
+      return Server(url: serverUrl, customHeaders: state.headers);
+    } finally {
+      emit(state.copyWith(loading: false));
+    }
+  }
+
+  setShowAdvanced(bool advanced) {
+    emit(state.copyWith(showAdvanced: advanced));
+  }
+
+  addHeader(String key, String value) {
+    final Map<String, String> headers = Map.from(state.headers);
+    headers[key] = value;
+    emit(state.copyWith(headers: headers));
+  }
+
+  removeHeader(String key) {
+    final Map<String, String> headers = Map.from(state.headers);
+    headers.remove(key);
+    emit(state.copyWith(headers: headers));
+  }
+
+  bool get validUrl {
+    var regExp = RegExp(r'^(http://|https://)');
+    if (!urlController.text.trim().startsWith(regExp)) {
+      return false;
+    }
+
+    final urlWithoutProtocol = urlController.text.replaceAll(regExp, "").trim();
+
+    if (urlWithoutProtocol.isEmpty) {
+      return false;
+    }
+
+    return true;
+  }
+
+  setAdvancedTest(bool advancedTest) {
+    emit(state.copyWith(advancedTest: advancedTest));
+  }
+}
+
+@freezed
+class AddServerState with _$AddServerState {
+  const factory AddServerState(
+      {@Default(false) bool loading,
+      @Default(false) bool valid,
+      @Default(false) bool showAdvanced,
+      @Default(true) bool advancedTest,
+      @Default({}) Map<String, String> headers}) = _AddServerState;
+}
diff --git a/lib/settings/states/add_server.freezed.dart b/lib/settings/states/add_server.freezed.dart
new file mode 100644
index 00000000..9dc02c23
--- /dev/null
+++ b/lib/settings/states/add_server.freezed.dart
@@ -0,0 +1,231 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'add_server.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+/// @nodoc
+mixin _$AddServerState {
+  bool get loading => throw _privateConstructorUsedError;
+  bool get valid => throw _privateConstructorUsedError;
+  bool get showAdvanced => throw _privateConstructorUsedError;
+  bool get advancedTest => throw _privateConstructorUsedError;
+  Map<String, String> get headers => throw _privateConstructorUsedError;
+
+  @JsonKey(ignore: true)
+  $AddServerStateCopyWith<AddServerState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $AddServerStateCopyWith<$Res> {
+  factory $AddServerStateCopyWith(
+          AddServerState value, $Res Function(AddServerState) then) =
+      _$AddServerStateCopyWithImpl<$Res, AddServerState>;
+  @useResult
+  $Res call(
+      {bool loading,
+      bool valid,
+      bool showAdvanced,
+      bool advancedTest,
+      Map<String, String> headers});
+}
+
+/// @nodoc
+class _$AddServerStateCopyWithImpl<$Res, $Val extends AddServerState>
+    implements $AddServerStateCopyWith<$Res> {
+  _$AddServerStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? loading = null,
+    Object? valid = null,
+    Object? showAdvanced = null,
+    Object? advancedTest = null,
+    Object? headers = null,
+  }) {
+    return _then(_value.copyWith(
+      loading: null == loading
+          ? _value.loading
+          : loading // ignore: cast_nullable_to_non_nullable
+              as bool,
+      valid: null == valid
+          ? _value.valid
+          : valid // ignore: cast_nullable_to_non_nullable
+              as bool,
+      showAdvanced: null == showAdvanced
+          ? _value.showAdvanced
+          : showAdvanced // ignore: cast_nullable_to_non_nullable
+              as bool,
+      advancedTest: null == advancedTest
+          ? _value.advancedTest
+          : advancedTest // ignore: cast_nullable_to_non_nullable
+              as bool,
+      headers: null == headers
+          ? _value.headers
+          : headers // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$AddServerStateImplCopyWith<$Res>
+    implements $AddServerStateCopyWith<$Res> {
+  factory _$$AddServerStateImplCopyWith(_$AddServerStateImpl value,
+          $Res Function(_$AddServerStateImpl) then) =
+      __$$AddServerStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {bool loading,
+      bool valid,
+      bool showAdvanced,
+      bool advancedTest,
+      Map<String, String> headers});
+}
+
+/// @nodoc
+class __$$AddServerStateImplCopyWithImpl<$Res>
+    extends _$AddServerStateCopyWithImpl<$Res, _$AddServerStateImpl>
+    implements _$$AddServerStateImplCopyWith<$Res> {
+  __$$AddServerStateImplCopyWithImpl(
+      _$AddServerStateImpl _value, $Res Function(_$AddServerStateImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? loading = null,
+    Object? valid = null,
+    Object? showAdvanced = null,
+    Object? advancedTest = null,
+    Object? headers = null,
+  }) {
+    return _then(_$AddServerStateImpl(
+      loading: null == loading
+          ? _value.loading
+          : loading // ignore: cast_nullable_to_non_nullable
+              as bool,
+      valid: null == valid
+          ? _value.valid
+          : valid // ignore: cast_nullable_to_non_nullable
+              as bool,
+      showAdvanced: null == showAdvanced
+          ? _value.showAdvanced
+          : showAdvanced // ignore: cast_nullable_to_non_nullable
+              as bool,
+      advancedTest: null == advancedTest
+          ? _value.advancedTest
+          : advancedTest // ignore: cast_nullable_to_non_nullable
+              as bool,
+      headers: null == headers
+          ? _value._headers
+          : headers // ignore: cast_nullable_to_non_nullable
+              as Map<String, String>,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$AddServerStateImpl implements _AddServerState {
+  const _$AddServerStateImpl(
+      {this.loading = false,
+      this.valid = false,
+      this.showAdvanced = false,
+      this.advancedTest = true,
+      final Map<String, String> headers = const {}})
+      : _headers = headers;
+
+  @override
+  @JsonKey()
+  final bool loading;
+  @override
+  @JsonKey()
+  final bool valid;
+  @override
+  @JsonKey()
+  final bool showAdvanced;
+  @override
+  @JsonKey()
+  final bool advancedTest;
+  final Map<String, String> _headers;
+  @override
+  @JsonKey()
+  Map<String, String> get headers {
+    if (_headers is EqualUnmodifiableMapView) return _headers;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_headers);
+  }
+
+  @override
+  String toString() {
+    return 'AddServerState(loading: $loading, valid: $valid, showAdvanced: $showAdvanced, advancedTest: $advancedTest, headers: $headers)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$AddServerStateImpl &&
+            (identical(other.loading, loading) || other.loading == loading) &&
+            (identical(other.valid, valid) || other.valid == valid) &&
+            (identical(other.showAdvanced, showAdvanced) ||
+                other.showAdvanced == showAdvanced) &&
+            (identical(other.advancedTest, advancedTest) ||
+                other.advancedTest == advancedTest) &&
+            const DeepCollectionEquality().equals(other._headers, _headers));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType, loading, valid, showAdvanced,
+      advancedTest, const DeepCollectionEquality().hash(_headers));
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$AddServerStateImplCopyWith<_$AddServerStateImpl> get copyWith =>
+      __$$AddServerStateImplCopyWithImpl<_$AddServerStateImpl>(
+          this, _$identity);
+}
+
+abstract class _AddServerState implements AddServerState {
+  const factory _AddServerState(
+      {final bool loading,
+      final bool valid,
+      final bool showAdvanced,
+      final bool advancedTest,
+      final Map<String, String> headers}) = _$AddServerStateImpl;
+
+  @override
+  bool get loading;
+  @override
+  bool get valid;
+  @override
+  bool get showAdvanced;
+  @override
+  bool get advancedTest;
+  @override
+  Map<String, String> get headers;
+  @override
+  @JsonKey(ignore: true)
+  _$$AddServerStateImplCopyWith<_$AddServerStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
diff --git a/lib/settings/states/server_list_settings.dart b/lib/settings/states/server_list_settings.dart
index f797a8dc..56a94493 100644
--- a/lib/settings/states/server_list_settings.dart
+++ b/lib/settings/states/server_list_settings.dart
@@ -1,5 +1,4 @@
 import 'package:bloc/bloc.dart';
-import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:logging/logging.dart';
 
@@ -16,8 +15,6 @@ enum PublicServerErrors { none, couldNotGetList }
 final log = Logger('ManagerServerView');
 
 class ServerListSettingsCubit extends Cubit<ServerListSettingsState> {
-  final TextEditingController addServerController =
-      TextEditingController(text: 'https://');
   final AppCubit appCubit;
 
   ServerListSettingsCubit(super.initialState, this.appCubit) {
@@ -25,12 +22,6 @@ class ServerListSettingsCubit extends Cubit<ServerListSettingsState> {
     getPublicServers();
   }
 
-  @override
-  close() async {
-    addServerController.dispose();
-    super.close();
-  }
-
   upsertServer(Server server) async {
     await db.upsertServer(server);
 
@@ -54,22 +45,18 @@ class ServerListSettingsCubit extends Cubit<ServerListSettingsState> {
       var public = await service.getPublicServers();
 
       var servers = public.map((e) {
-        var s = Server(url: e.uri);
-        s.flag = e.flag;
-        s.region = e.region;
-
-        return s;
+        return Server(url: e.uri, flag: e.flag, region: e.region);
       }).toList();
       int progress = 0;
       List<Server?> pingedServers = await Future.wait(servers.map((e) async {
         try {
-          e.ping = await service.pingServer(e.url).timeout(
+          final ping = await service.pingServer(e.url).timeout(
               const Duration(seconds: pingTimeout),
               onTimeout: () => const Duration(seconds: pingTimeout));
           progress++;
 
           emit(state.copyWith(publicServerProgress: progress / servers.length));
-          return e;
+          return e.copyWith(ping: ping);
         } catch (err, stacktrace) {
           log.severe('couldn\'t reach server ${e.url}', err, stacktrace);
           return null;
@@ -102,24 +89,15 @@ class ServerListSettingsCubit extends Cubit<ServerListSettingsState> {
   }
 
   bool isLoggedInToServer(String url) {
-    Server server = state.dbServers
-        .firstWhere((s) => s.url == url, orElse: () => Server(url: 'notFound'));
+    Server server = state.dbServers.firstWhere((s) => s.url == url,
+        orElse: () => const Server(url: 'notFound'));
 
     return (server.authToken?.isNotEmpty ?? false) ||
         (server.sidCookie?.isNotEmpty ?? false);
   }
 
-  saveServer() async {
-    var serverUrl = addServerController.value.text;
-    if (serverUrl.endsWith("/")) {
-      serverUrl = serverUrl.substring(0, serverUrl.length - 1);
-    }
-
-    await service.validateServer(serverUrl);
-
-    Server server = Server(url: serverUrl);
+  saveServer(Server server) async {
     await db.upsertServer(server);
-    addServerController.text = 'https://';
     if (state.dbServers.isEmpty) {
       switchServer(server);
     }
diff --git a/lib/settings/states/server_settings.dart b/lib/settings/states/server_settings.dart
index c50e61b0..91dc746a 100644
--- a/lib/settings/states/server_settings.dart
+++ b/lib/settings/states/server_settings.dart
@@ -18,15 +18,28 @@ class ServerSettingsCubit extends Cubit<ServerSettingsState> {
     await db.useServer(state.server);
     await fileDb.useServer(state.server);
     Server s = state.server.copyWith(inUse: true);
-    s.inUse = true;
     emit(state.copyWith(server: s));
     app.setServer(state.server);
   }
 
+  addHeader(String key, String value) {
+    final Map<String, String> headers = Map.from(state.server.customHeaders);
+    headers[key] = value;
+    emit(state.copyWith.server(customHeaders: headers));
+    db.upsertServer(state.server);
+    fileDb.upsertServer(state.server);
+  }
+
+  removeHeader(String key) {
+    final Map<String, String> headers = Map.from(state.server.customHeaders);
+    headers.remove(key);
+    emit(state.copyWith.server(customHeaders: headers));
+    db.upsertServer(state.server);
+    fileDb.upsertServer(state.server);
+  }
+
   Future<void> logOut() async {
-    Server s = state.server.copyWith();
-    s.sidCookie = null;
-    s.authToken = null;
+    Server s = state.server.copyWith(sidCookie: null, authToken: null);
     await db.upsertServer(s);
     if (s.inUse) {
       await fileDb.useServer(s);
@@ -51,9 +64,9 @@ class ServerSettingsCubit extends Cubit<ServerSettingsState> {
 
   Future<void> logInWithCookie(String username, String password) async {
     var s = state.server.copyWith();
-    String cookie = await service.loginWithCookies(s.url, username, password);
-
-    s.sidCookie = cookie;
+    String cookie = await service.loginWithCookies(s.url, username, password,
+        headers: s.customHeaders);
+    s = s.copyWith(sidCookie: cookie);
     await db.upsertServer(s);
     if (s.inUse) {
       fileDb.useServer(s);
@@ -79,19 +92,13 @@ class ServerSettingsCubit extends Cubit<ServerSettingsState> {
   }
 }
 
-/*
-class ServerSettingsController {
-  late Server server;
-
-
-  ServerSettingsController(this.server);
-
-}
-*/
-
 @freezed
 class ServerSettingsState with _$ServerSettingsState {
   const factory ServerSettingsState(
       {required Server server,
       @Default(false) bool canDelete}) = _ServerSettingsState;
+
+  const ServerSettingsState._();
+
+  bool get hasBasicAuth => server.customHeaders.containsKey("Authorization");
 }
diff --git a/lib/settings/states/server_settings.freezed.dart b/lib/settings/states/server_settings.freezed.dart
index 49a0a0dc..1484903f 100644
--- a/lib/settings/states/server_settings.freezed.dart
+++ b/lib/settings/states/server_settings.freezed.dart
@@ -31,6 +31,8 @@ abstract class $ServerSettingsStateCopyWith<$Res> {
       _$ServerSettingsStateCopyWithImpl<$Res, ServerSettingsState>;
   @useResult
   $Res call({Server server, bool canDelete});
+
+  $ServerCopyWith<$Res> get server;
 }
 
 /// @nodoc
@@ -60,6 +62,14 @@ class _$ServerSettingsStateCopyWithImpl<$Res, $Val extends ServerSettingsState>
               as bool,
     ) as $Val);
   }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $ServerCopyWith<$Res> get server {
+    return $ServerCopyWith<$Res>(_value.server, (value) {
+      return _then(_value.copyWith(server: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -71,6 +81,9 @@ abstract class _$$ServerSettingsStateImplCopyWith<$Res>
   @override
   @useResult
   $Res call({Server server, bool canDelete});
+
+  @override
+  $ServerCopyWith<$Res> get server;
 }
 
 /// @nodoc
@@ -102,9 +115,10 @@ class __$$ServerSettingsStateImplCopyWithImpl<$Res>
 
 /// @nodoc
 
-class _$ServerSettingsStateImpl implements _ServerSettingsState {
+class _$ServerSettingsStateImpl extends _ServerSettingsState {
   const _$ServerSettingsStateImpl(
-      {required this.server, this.canDelete = false});
+      {required this.server, this.canDelete = false})
+      : super._();
 
   @override
   final Server server;
@@ -138,10 +152,11 @@ class _$ServerSettingsStateImpl implements _ServerSettingsState {
           this, _$identity);
 }
 
-abstract class _ServerSettingsState implements ServerSettingsState {
+abstract class _ServerSettingsState extends ServerSettingsState {
   const factory _ServerSettingsState(
       {required final Server server,
       final bool canDelete}) = _$ServerSettingsStateImpl;
+  const _ServerSettingsState._() : super._();
 
   @override
   Server get server;
diff --git a/lib/settings/views/components/manager_server_inner.dart b/lib/settings/views/components/manager_server_inner.dart
index 22b3925d..838a0dc6 100644
--- a/lib/settings/views/components/manager_server_inner.dart
+++ b/lib/settings/views/components/manager_server_inner.dart
@@ -69,7 +69,7 @@ class ManagerServersView extends StatelessWidget {
       BuildContext context, ServerListSettingsCubit cubit) async {
     var locals = AppLocalizations.of(context)!;
     try {
-      await cubit.saveServer();
+      // await cubit.saveServer();
       if (context.mounted) {
         Navigator.pop(context);
       }
@@ -102,52 +102,6 @@ class ManagerServersView extends StatelessWidget {
     }
   }
 
-  addServerDialog(BuildContext context) {
-    ServerListSettingsCubit cubit = context.read<ServerListSettingsCubit>();
-    var locals = AppLocalizations.of(context)!;
-    showDialog<String>(
-        context: context,
-        useRootNavigator: false,
-        builder: (BuildContext context) => Dialog(
-              child: SizedBox(
-                width: 400,
-                child: Padding(
-                  padding: const EdgeInsets.all(8.0),
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: <Widget>[
-                      Text(locals.addServer),
-                      TextField(
-                        controller: cubit.addServerController,
-                        autocorrect: false,
-                        enableSuggestions: false,
-                        enableIMEPersonalizedLearning: false,
-                      ),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.end,
-                        children: [
-                          TextButton(
-                            onPressed: () {
-                              Navigator.pop(context);
-                            },
-                            child: Text(locals.cancel),
-                          ),
-                          TextButton(
-                            onPressed: () async {
-                              _serverServerHandling(context, cubit);
-                            },
-                            child: Text(locals.add),
-                          ),
-                        ],
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ));
-  }
-
   openServer(BuildContext context, Server s) {
     var cubit = context.read<ServerListSettingsCubit>();
     AutoRouter.of(context)
@@ -155,6 +109,14 @@ class ManagerServersView extends StatelessWidget {
         .then((value) => cubit.refreshServers());
   }
 
+  addServer(BuildContext context) async {
+    var cubit = context.read<ServerListSettingsCubit>();
+    final server = await AutoRouter.of(context).push(const AddServerRoute());
+    if (server != null && server is Server && context.mounted) {
+      cubit.saveServer(server);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     ColorScheme colorScheme = Theme.of(context).colorScheme;
@@ -285,7 +247,7 @@ class ManagerServersView extends StatelessWidget {
               right: 20,
               bottom: 20,
               child: FloatingActionButton(
-                onPressed: () => addServerDialog(ctx),
+                onPressed: () => addServer(context),
                 backgroundColor: colorScheme.primaryContainer,
                 child: const Icon(Icons.add),
               ),
diff --git a/lib/settings/views/screens/add_server.dart b/lib/settings/views/screens/add_server.dart
new file mode 100644
index 00000000..5567f502
--- /dev/null
+++ b/lib/settings/views/screens/add_server.dart
@@ -0,0 +1,236 @@
+import 'package:auto_route/annotations.dart';
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:invidious/globals.dart';
+import 'package:invidious/main.dart';
+import 'package:invidious/settings/models/errors/cannot_add_server_error.dart';
+import 'package:invidious/settings/models/errors/wrong_thumbnail_url.dart';
+import 'package:invidious/settings/states/add_server.dart';
+import 'package:invidious/settings/views/screens/manage_single_server.dart';
+import 'package:invidious/utils.dart';
+import 'package:invidious/utils/views/components/conditional_wrap.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../../../utils/string.dart';
+
+@RoutePage()
+class AddServerScreen extends StatelessWidget {
+  const AddServerScreen({super.key});
+
+  void showAddHeaderDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    ManageSingleServerScreen.showKeyValueDialog(context,
+        field1Title: locals.name,
+        field2Title: locals.value,
+        field2Secret: false,
+        okText: locals.add, onOk: (key, value) async {
+      var cubit = context.read<AddServerCubit>();
+      await cubit.addHeader(key, value);
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
+  void showBasicAuthDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    ManageSingleServerScreen.showKeyValueDialog(context,
+        field1Title: locals.username,
+        field2Title: locals.password,
+        field1AutofillHints: const [
+          AutofillHints.username,
+          AutofillHints.email
+        ],
+        field2AutofillHints: const [AutofillHints.password],
+        field2Secret: true,
+        okText: locals.add, onOk: (username, password) async {
+      var cubit = context.read<AddServerCubit>();
+
+      await cubit.addHeader(
+          "Authorization", 'Basic ${encodeBase64('$username:$password')}');
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
+  static void handleError(BuildContext context, dynamic e) {
+    var locals = AppLocalizations.of(context)!;
+    const wikiUrl =
+        'https://github.com/lamarios/clipious/wiki/Common-Issues#video-thumbnails-not-working';
+    List<Widget> actions = [
+      if (e is WrongThumbnailUrl && !isTv)
+        TextButton(
+            onPressed: () {
+              launchUrl(Uri.parse(wikiUrl));
+            },
+            child: Text(locals.openWikiLink)),
+      TextButton(
+          onPressed: () => Navigator.of(context).pop(), child: Text(locals.ok))
+    ];
+
+    List<Widget> body = [
+      if (!isTv)
+        e is CannotAddServerError
+            ? Text(e.getLabel(locals))
+            : Text(e.toString()),
+      if (isTv) ...[
+        e is WrongThumbnailUrl
+            ? Text('${e.getLabel(locals)}\n\n$wikiUrl')
+            : e is CannotAddServerError
+                ? Text(e.getLabel(locals))
+                : Text(e.toString())
+      ]
+    ];
+
+    showAlertDialog(context, locals.error, body, actions: actions);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+
+    final textTheme = Theme.of(context).textTheme;
+    final colors = Theme.of(context).colorScheme;
+    final device = getDeviceType();
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(locals.addServer),
+      ),
+      body: SafeArea(
+        bottom: false,
+        child: ConditionalWrap(
+          wrapIf: device == DeviceType.tablet,
+          wrapper: (child) => Align(
+            alignment: Alignment.topCenter,
+            child: Container(
+                constraints: const BoxConstraints(maxWidth: 500), child: child),
+          ),
+          child: BlocProvider(
+            create: (BuildContext context) =>
+                AddServerCubit(const AddServerState()),
+            child: BlocBuilder<AddServerCubit, AddServerState>(
+                builder: (context, state) {
+              final cubit = context.read<AddServerCubit>();
+              return Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: SingleChildScrollView(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: <Widget>[
+                      const Text('Url'),
+                      TextField(
+                        controller: cubit.urlController,
+                        autocorrect: false,
+                        enableSuggestions: false,
+                        enableIMEPersonalizedLearning: false,
+                      ),
+                      const Gap(10),
+                      ListTile(
+                        leading: AnimatedRotation(
+                            duration: animationDuration,
+                            curve: animationCurve,
+                            turns: state.showAdvanced ? 0.5 : 0,
+                            child: const Icon(Icons.expand_less)),
+                        title: Text(locals.advancedConfiguration),
+                        onTap: () => cubit.setShowAdvanced(!state.showAdvanced),
+                      ),
+                      if (state.showAdvanced)
+                        Column(
+                                mainAxisSize: MainAxisSize.min,
+                                crossAxisAlignment: CrossAxisAlignment.stretch,
+                                children: [
+                              Text(
+                                locals.customHeaders,
+                                style: textTheme.bodyLarge
+                                    ?.copyWith(color: colors.primary),
+                              ),
+                              Text(locals.customHeadersExplanation,
+                                  style: textTheme.bodySmall),
+                              const Gap(10),
+                              ...state.headers.keys.map((k) {
+                                String display = state.headers[k] ?? '';
+                                if (k == 'Authorization') {
+                                  display = "········";
+                                }
+
+                                return ListTile(
+                                  title: Text(k),
+                                  subtitle: Text(display),
+                                  trailing: IconButton(
+                                    icon: const Icon(Icons.delete),
+                                    onPressed: () => cubit.removeHeader(k),
+                                  ),
+                                );
+                              }),
+                              ListTile(
+                                leading: const Icon(Icons.key),
+                                title: Text(locals.addBasicAuth),
+                                onTap: () => showBasicAuthDialog(context),
+                              ),
+                              ListTile(
+                                leading: const Icon(Icons.add),
+                                title: Text(locals.addHeader),
+                                onTap: () => showAddHeaderDialog(context),
+                              )
+                            ])
+                            .animate()
+                            .slideY(
+                                begin: -0.2,
+                                end: 0,
+                                curve: animationCurve,
+                                duration: animationDuration)
+                            .fade(
+                                begin: 0,
+                                end: 1,
+                                curve: animationCurve,
+                                duration: animationDuration,
+                                delay: animationDuration ~/ 4),
+                      FilledButton.tonal(
+                          onPressed: state.loading || !state.valid
+                              ? null
+                              : () async {
+                                  try {
+                                    final server = await cubit.validateServer();
+
+                                    if (server != null && context.mounted) {
+                                      AutoRouter.of(context).maybePop(server);
+                                    }
+                                  } catch (e) {
+                                    if (context.mounted)
+                                      handleError(context, e);
+                                  }
+                                },
+                          child: state.loading
+                              ? const SizedBox.square(
+                                  dimension: 20,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 1,
+                                  ))
+                              : Text(locals.testAndAddServer)),
+                      CheckboxListTile(
+                        title: Text(
+                          locals.alsoTestServerConfig,
+                          style: textTheme.bodySmall,
+                        ),
+                        value: state.advancedTest,
+                        onChanged: (value) =>
+                            cubit.setAdvancedTest(value ?? true),
+                      )
+                    ],
+                  ),
+                ),
+              );
+            }),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/settings/views/screens/manage_single_server.dart b/lib/settings/views/screens/manage_single_server.dart
index 3415aa78..07170f1f 100644
--- a/lib/settings/views/screens/manage_single_server.dart
+++ b/lib/settings/views/screens/manage_single_server.dart
@@ -5,6 +5,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:invidious/app/states/app.dart';
 import 'package:invidious/settings/states/server_settings.dart';
 import 'package:invidious/utils.dart';
+import 'package:invidious/utils/string.dart';
 import 'package:settings_ui/settings_ui.dart';
 
 import '../../models/db/server.dart';
@@ -16,12 +17,20 @@ class ManageSingleServerScreen extends StatelessWidget {
 
   const ManageSingleServerScreen({super.key, required this.server});
 
-  void showLogInWithCookiesDialog(BuildContext context) async {
+  static void showKeyValueDialog(
+    BuildContext context, {
+    required String field1Title,
+    required String field2Title,
+    bool field1Secret = false,
+    bool field2Secret = false,
+    List<String>? field1AutofillHints,
+    List<String>? field2AutofillHints,
+    required String okText,
+    required Function(String field1, String field2) onOk,
+  }) {
     var locals = AppLocalizations.of(context)!;
-    TextEditingController userController = TextEditingController();
-    TextEditingController passwordController = TextEditingController();
-
-    var cubit = context.read<ServerSettingsCubit>();
+    TextEditingController field1Controller = TextEditingController();
+    TextEditingController field2Controller = TextEditingController();
 
     showDialog(
       context: context,
@@ -32,19 +41,17 @@ class ManageSingleServerScreen extends StatelessWidget {
             mainAxisSize: MainAxisSize.min,
             children: [
               TextField(
-                  controller: userController,
+                  controller: field1Controller,
                   autocorrect: false,
-                  autofillHints: const [
-                    AutofillHints.username,
-                    AutofillHints.email
-                  ],
-                  decoration: InputDecoration(label: Text(locals.username))),
+                  autofillHints: field1AutofillHints,
+                  obscureText: field1Secret,
+                  decoration: InputDecoration(label: Text(field1Title))),
               TextField(
-                obscureText: true,
+                obscureText: field2Secret,
                 autocorrect: false,
-                controller: passwordController,
-                autofillHints: const [AutofillHints.password],
-                decoration: InputDecoration(label: Text(locals.password)),
+                controller: field2Controller,
+                autofillHints: field2AutofillHints,
+                decoration: InputDecoration(label: Text(field2Title)),
               ),
             ],
           ),
@@ -57,29 +64,79 @@ class ManageSingleServerScreen extends StatelessWidget {
               },
             ),
             TextButton(
-              child: Text(locals.ok),
-              onPressed: () async {
-                try {
-                  await cubit.logInWithCookie(
-                      userController.text, passwordController.text);
-                  if (context.mounted) {
-                    Navigator.of(context).pop();
-                  }
-                } catch (err) {
-                  if (context.mounted) {
-                    showAlertDialog(context, locals.error,
-                        [Text(locals.wrongUsernamePassword)]);
-                  }
-                  rethrow;
-                }
-              },
-            ),
+                child: Text(okText),
+                onPressed: () =>
+                    onOk(field1Controller.text, field2Controller.text)),
           ],
         );
       },
     );
   }
 
+  void showAddHeaderDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    showKeyValueDialog(context,
+        field1Title: locals.name,
+        field2Title: locals.value,
+        okText: locals.add, onOk: (key, value) async {
+      var cubit = context.read<ServerSettingsCubit>();
+      await cubit.addHeader(key, value);
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
+  void showBasicAuthDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    showKeyValueDialog(context,
+        field1Title: locals.username,
+        field2Title: locals.password,
+        field1AutofillHints: const [
+          AutofillHints.username,
+          AutofillHints.email
+        ],
+        field2AutofillHints: const [AutofillHints.password],
+        field2Secret: true,
+        okText: locals.add, onOk: (username, password) async {
+      var cubit = context.read<ServerSettingsCubit>();
+
+      await cubit.addHeader(
+          "Authorization", 'Basic ${encodeBase64('$username:$password')}');
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
+  void showLogInWithCookiesDialog(BuildContext context) async {
+    var locals = AppLocalizations.of(context)!;
+    showKeyValueDialog(context,
+        field1Title: locals.username,
+        field2Title: locals.password,
+        field1AutofillHints: const [
+          AutofillHints.username,
+          AutofillHints.email
+        ],
+        field2AutofillHints: const [AutofillHints.password],
+        field2Secret: true,
+        okText: locals.ok, onOk: (username, password) async {
+      var cubit = context.read<ServerSettingsCubit>();
+      try {
+        await cubit.logInWithCookie(username, password);
+        if (context.mounted) {
+          Navigator.of(context).pop();
+        }
+      } catch (err) {
+        if (context.mounted) {
+          showAlertDialog(
+              context, locals.error, [Text(locals.wrongUsernamePassword)]);
+        }
+        rethrow;
+      }
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     var locals = AppLocalizations.of(context)!;
@@ -122,7 +179,7 @@ class ManageSingleServerScreen extends StatelessWidget {
                               leading: server.authToken?.isNotEmpty ?? false
                                   ? const Icon(Icons.check)
                                   : const Icon(Icons.token),
-                              enabled: !isLoggedIn,
+                              enabled: !isLoggedIn && !state.hasBasicAuth,
                               title: Text(locals.tokenLogin),
                               value: Text(server.authToken?.isNotEmpty ?? false
                                   ? locals.loggedIn
@@ -149,6 +206,47 @@ class ManageSingleServerScreen extends StatelessWidget {
                               onPressed: (context) => cubit.logOut(),
                             )
                           ]),
+                      SettingsSection(
+                          title: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.stretch,
+                            children: [
+                              Text(locals.customHeaders),
+                              Text(
+                                locals.customHeadersExplanation,
+                                style: TextStyle(
+                                    color: theme.tileDescriptionTextColor),
+                              )
+                            ],
+                          ),
+                          tiles: [
+                            ...state.server.customHeaders.keys.map((k) {
+                              String value =
+                                  state.server.customHeaders[k] ?? '';
+                              if (k == 'Authorization') {
+                                value = "········";
+                              }
+
+                              return SettingsTile(
+                                title: Text(k),
+                                description: Text(value),
+                                trailing: IconButton(
+                                  icon: const Icon(Icons.delete),
+                                  onPressed: () => cubit.removeHeader(k),
+                                ),
+                              );
+                            }),
+                            SettingsTile(
+                              title: Text(locals.addBasicAuth),
+                              leading: const Icon(Icons.key),
+                              onPressed: showBasicAuthDialog,
+                            ),
+                            SettingsTile(
+                              title: Text(locals.addHeader),
+                              leading: const Icon(Icons.add),
+                              onPressed: showAddHeaderDialog,
+                            )
+                          ]),
                       SettingsSection(title: const Text(''), tiles: [
                         SettingsTile(
                           enabled: state.canDelete,
@@ -172,7 +270,7 @@ class ManageSingleServerScreen extends StatelessWidget {
                                     : Colors.red.withOpacity(0.5)),
                           ),
                         )
-                      ])
+                      ]),
                     ]),
               ));
         },
diff --git a/lib/settings/views/tv/components/manage_server_inner.dart b/lib/settings/views/tv/components/manage_server_inner.dart
index 815815c4..890e2a4c 100644
--- a/lib/settings/views/tv/components/manage_server_inner.dart
+++ b/lib/settings/views/tv/components/manage_server_inner.dart
@@ -4,13 +4,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:invidious/router.dart';
 import 'package:invidious/settings/states/settings.dart';
-import 'package:invidious/utils.dart';
-import 'package:invidious/utils/views/tv/components/tv_button.dart';
 
 import '../../../models/db/server.dart';
-import '../../../models/errors/cannot_add_server_error.dart';
-import '../../../models/errors/missing_software_key.dart';
-import '../../../models/errors/unreacheable_server.dart';
 import '../../../states/server_list_settings.dart';
 import '../screens/settings.dart';
 
@@ -24,92 +19,12 @@ class TvManageServersInner extends StatelessWidget {
         .then((value) => cubit.refreshServers());
   }
 
-  addServerDialog(BuildContext context, ServerListSettingsState controller) {
-    var locals = AppLocalizations.of(context)!;
+  addServer(BuildContext context) async {
     var cubit = context.read<ServerListSettingsCubit>();
-
-    FocusNode focusNode = FocusNode();
-    showTvDialog(
-      title: locals.addServer,
-      context: context,
-      actions: [
-        TvButton(
-          onPressed: (context) {
-            Navigator.pop(context);
-          },
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16),
-            child: Text(locals.cancel),
-          ),
-        ),
-        TvButton(
-          onPressed: (context) async {
-            try {
-              await cubit.saveServer();
-              if (context.mounted) {
-                Navigator.pop(context);
-              }
-            } catch (err) {
-              if (context.mounted) {
-                if (err is CannotAddServerError) {
-                  showTvAlertdialog(
-                      context,
-                      switch (err.runtimeType) {
-                        (MissingSoftwareKeyError _) =>
-                          locals.malformedStatsEndpoint,
-                        (UnreachableServerError _) =>
-                          locals.serverIsNotReachable,
-                        (_) => locals.error
-                      },
-                      [
-                        Text(
-                          '${err is MissingSoftwareKeyError ? "${locals.malformedStatsEndpointDescription}\n" : ""}${err.error}',
-                          maxLines: 100,
-                        )
-                      ]);
-                } else {
-                  showTvAlertdialog(context, locals.error, [
-                    Text(
-                      err.toString(),
-                      maxLines: 100,
-                    )
-                  ]);
-                }
-              }
-            }
-          },
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16),
-            child: Text(locals.add),
-          ),
-        ),
-      ],
-      builder: (BuildContext context) => [
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              TextField(
-                autofocus: true,
-                focusNode: focusNode,
-                textInputAction: TextInputAction.next,
-                controller: cubit.addServerController,
-                autocorrect: false,
-                enableSuggestions: false,
-                enableIMEPersonalizedLearning: false,
-              ),
-              const Row(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [],
-              ),
-            ],
-          ),
-        )
-      ],
-    );
+    final server = await AutoRouter.of(context).push(const TvAddServerRoute());
+    if (server != null && server is Server && context.mounted) {
+      cubit.saveServer(server);
+    }
   }
 
   @override
@@ -162,7 +77,7 @@ class TvManageServersInner extends StatelessWidget {
               color: colorScheme.secondary,
             ),
           ),
-          onSelected: (context) => addServerDialog(context, state),
+          onSelected: (context) => addServer(context),
         ),
         SettingsTitle(title: locals.publicServers),
         ...state.publicServersError != PublicServerErrors.none
diff --git a/lib/settings/views/tv/screens/add_server.dart b/lib/settings/views/tv/screens/add_server.dart
new file mode 100644
index 00000000..899a39e0
--- /dev/null
+++ b/lib/settings/views/tv/screens/add_server.dart
@@ -0,0 +1,189 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:gap/gap.dart';
+import 'package:invidious/globals.dart';
+import 'package:invidious/settings/states/add_server.dart';
+import 'package:invidious/settings/views/screens/add_server.dart';
+import 'package:invidious/settings/views/tv/screens/manage_single_server.dart';
+import 'package:invidious/utils/views/tv/components/tv_overscan.dart';
+
+import '../../../../utils/string.dart';
+import '../../../../utils/views/tv/components/tv_text_field.dart';
+
+@RoutePage()
+class TvAddServerScreen extends StatelessWidget {
+  const TvAddServerScreen({super.key});
+
+  void showAddHeaderDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    TvManageSingleServerScreen.showKeyValueDialog(context,
+        field1Title: locals.name,
+        field2Title: locals.value,
+        field2Secret: false,
+        okText: locals.add, onOk: (key, value) async {
+      var cubit = context.read<AddServerCubit>();
+      await cubit.addHeader(key, value);
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
+  void showBasicAuthDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    TvManageSingleServerScreen.showKeyValueDialog(context,
+        field1Title: locals.username,
+        field2Title: locals.password,
+        field1AutofillHints: const [
+          AutofillHints.username,
+          AutofillHints.email
+        ],
+        field2AutofillHints: const [AutofillHints.password],
+        field2Secret: true,
+        okText: locals.add, onOk: (username, password) async {
+      var cubit = context.read<AddServerCubit>();
+
+      await cubit.addHeader(
+          "Authorization", 'Basic ${encodeBase64('$username:$password')}');
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+
+    final textTheme = Theme.of(context).textTheme;
+    final colors = Theme.of(context).colorScheme;
+    return Scaffold(
+      body: SafeArea(
+        bottom: false,
+        child: TvOverscan(
+          child: BlocProvider(
+            create: (BuildContext context) =>
+                AddServerCubit(const AddServerState()),
+            child: BlocBuilder<AddServerCubit, AddServerState>(
+                builder: (context, state) {
+              final cubit = context.read<AddServerCubit>();
+              return Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: SingleChildScrollView(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: <Widget>[
+                      const Text('Url'),
+                      TvTextField(
+                        controller: cubit.urlController,
+                        autocorrect: false,
+                      ),
+                      const Gap(10),
+                      ListTile(
+                        leading: AnimatedRotation(
+                            duration: animationDuration,
+                            curve: animationCurve,
+                            turns: state.showAdvanced ? 0.5 : 0,
+                            child: const Icon(Icons.expand_less)),
+                        title: Text(locals.advancedConfiguration),
+                        onTap: () => cubit.setShowAdvanced(!state.showAdvanced),
+                      ),
+                      if (state.showAdvanced)
+                        Column(
+                                mainAxisSize: MainAxisSize.min,
+                                crossAxisAlignment: CrossAxisAlignment.stretch,
+                                children: [
+                              Text(
+                                locals.customHeaders,
+                                style: textTheme.bodyLarge
+                                    ?.copyWith(color: colors.primary),
+                              ),
+                              Text(locals.customHeadersExplanation,
+                                  style: textTheme.bodySmall),
+                              const Gap(10),
+                              ...state.headers.keys.map((k) {
+                                String display = state.headers[k] ?? '';
+                                if (k == 'Authorization') {
+                                  display = "········";
+                                }
+
+                                return ListTile(
+                                  title: Text(k),
+                                  subtitle: Text(display),
+                                  trailing: IconButton(
+                                    icon: const Icon(Icons.delete),
+                                    onPressed: () => cubit.removeHeader(k),
+                                  ),
+                                );
+                              }),
+                              ListTile(
+                                leading: const Icon(Icons.key),
+                                title: Text(locals.addBasicAuth),
+                                onTap: () => showBasicAuthDialog(context),
+                              ),
+                              ListTile(
+                                leading: const Icon(Icons.add),
+                                title: Text(locals.addHeader),
+                                onTap: () => showAddHeaderDialog(context),
+                              )
+                            ])
+                            .animate()
+                            .slideY(
+                                begin: -0.2,
+                                end: 0,
+                                curve: animationCurve,
+                                duration: animationDuration)
+                            .fade(
+                                begin: 0,
+                                end: 1,
+                                curve: animationCurve,
+                                duration: animationDuration,
+                                delay: animationDuration ~/ 4),
+                      FilledButton.tonal(
+                          onPressed: state.loading || !state.valid
+                              ? null
+                              : () async {
+                                  try {
+                                    final server = await cubit.validateServer();
+
+                                    if (server != null && context.mounted) {
+                                      AutoRouter.of(context).maybePop(server);
+                                    }
+                                  } catch (e) {
+                                    if (context.mounted) {
+                                      AddServerScreen.handleError(context, e);
+                                    }
+                                  }
+                                },
+                          child: state.loading
+                              ? const SizedBox.square(
+                                  dimension: 20,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 1,
+                                  ))
+                              : Text(locals.testAndAddServer)),
+                      CheckboxListTile(
+                        title: Text(
+                          locals.alsoTestServerConfig,
+                          style: textTheme.bodySmall,
+                        ),
+                        value: state.advancedTest,
+                        onChanged: (value) =>
+                            cubit.setAdvancedTest(value ?? true),
+                      )
+                    ],
+                  ),
+                ),
+              );
+            }),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/settings/views/tv/screens/manage_single_server.dart b/lib/settings/views/tv/screens/manage_single_server.dart
index 4db64ae0..abb0e7ef 100644
--- a/lib/settings/views/tv/screens/manage_single_server.dart
+++ b/lib/settings/views/tv/screens/manage_single_server.dart
@@ -2,7 +2,9 @@ import 'package:auto_route/annotations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:gap/gap.dart';
 import 'package:invidious/settings/views/tv/screens/settings.dart';
+import 'package:invidious/utils/string.dart';
 import 'package:invidious/utils/views/tv/components/tv_button.dart';
 import 'package:invidious/utils/views/tv/components/tv_overscan.dart';
 
@@ -18,6 +20,111 @@ class TvManageSingleServerScreen extends StatelessWidget {
 
   const TvManageSingleServerScreen({super.key, required this.server});
 
+  static void showKeyValueDialog(
+    BuildContext context, {
+    required String field1Title,
+    required String field2Title,
+    bool field1Secret = false,
+    bool field2Secret = false,
+    List<String>? field1AutofillHints,
+    List<String>? field2AutofillHints,
+    required String okText,
+    required Function(String field1, String field2) onOk,
+  }) {
+    var locals = AppLocalizations.of(context)!;
+    TextEditingController field1Controller = TextEditingController();
+    TextEditingController field2Controller = TextEditingController();
+
+    showDialog(
+      context: context,
+      useRootNavigator: false,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              TvTextField(
+                  controller: field1Controller,
+                  autocorrect: false,
+                  autofillHints: field1AutofillHints,
+                  obscureText: field1Secret,
+                  decoration: InputDecoration(label: Text(field1Title))),
+              TvTextField(
+                obscureText: field2Secret,
+                autocorrect: false,
+                controller: field2Controller,
+                autofillHints: field2AutofillHints,
+                decoration: InputDecoration(label: Text(field2Title)),
+              ),
+            ],
+          ),
+          actions: <Widget>[
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                TvButton(
+                  unfocusedColor: Colors.transparent,
+                  onPressed: (context) {
+                    //Put your code here which you want to execute on Cancel button click.
+                    Navigator.of(context).pop();
+                  },
+                  child: Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Text(locals.cancel),
+                  ),
+                ),
+                TvButton(
+                    unfocusedColor: Colors.transparent,
+                    child: Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Text(okText),
+                    ),
+                    onPressed: (context) =>
+                        onOk(field1Controller.text, field2Controller.text)),
+              ],
+            )
+          ],
+        );
+      },
+    );
+  }
+
+  void showAddHeaderDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    showKeyValueDialog(context,
+        field1Title: locals.name,
+        field2Title: locals.value,
+        okText: locals.add, onOk: (key, value) async {
+      var cubit = context.read<ServerSettingsCubit>();
+      await cubit.addHeader(key, value);
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
+  void showBasicAuthDialog(BuildContext context) {
+    var locals = AppLocalizations.of(context)!;
+    showKeyValueDialog(context,
+        field1Title: locals.username,
+        field2Title: locals.password,
+        field1AutofillHints: const [
+          AutofillHints.username,
+          AutofillHints.email
+        ],
+        field2AutofillHints: const [AutofillHints.password],
+        field2Secret: true,
+        okText: locals.add, onOk: (username, password) async {
+      var cubit = context.read<ServerSettingsCubit>();
+
+      await cubit.addHeader(
+          "Authorization", 'Basic ${encodeBase64('$username:$password')}');
+      if (context.mounted) {
+        Navigator.of(context).pop();
+      }
+    });
+  }
+
   void showLogInWithCookiesDialog(BuildContext context) async {
     var locals = AppLocalizations.of(context)!;
     var textTheme = Theme.of(context).textTheme;
@@ -118,73 +225,6 @@ class TvManageSingleServerScreen extends StatelessWidget {
         ]);
   }
 
-/*
-  void showLogInWithCookiesDialog(BuildContext context) async {
-    var locals = AppLocalizations.of(context)!;
-    TextEditingController userController = TextEditingController();
-    TextEditingController passwordController = TextEditingController();
-    FocusNode focusNode = FocusNode();
-
-    Navigator.of(context).push(MaterialPageRoute(
-      builder: (BuildContext context) {
-        return Scaffold(
-          body: Padding(
-            padding: const EdgeInsets.all(40),
-            child: Column(mainAxisSize: MainAxisSize.min, children: [
-              TextField(
-                  autofocus: true,
-                  focusNode: focusNode,
-                  controller: userController,
-                  autocorrect: false,
-                  textInputAction: TextInputAction.next,
-                  autofillHints: const [AutofillHints.username, AutofillHints.email],
-                  decoration: InputDecoration(label: Text(locals.username))),
-              TextField(
-                obscureText: true,
-                autocorrect: false,
-                controller: passwordController,
-                textInputAction: TextInputAction.next,
-                autofillHints: const [AutofillHints.password],
-                decoration: InputDecoration(label: Text(locals.password)),
-              ),
-              Row(
-                children: <Widget>[
-                  GetBuilder<ServerSettingsController>(
-                    builder: (controller) => Focus(
-                      onKeyEvent: (node, event) => onTvSelect(event, context, (context) async {
-                        try {
-                          await controller.logInWithCookie(userController.text, passwordController.text);
-                          Navigator.of(context).pop();
-                        } catch (err) {
-                          showAlertDialog(context, locals.error, [Text(locals.wrongUsernamePassword)]);
-                          rethrow;
-                        }
-                      }),
-                      child: TextButton(
-                        // focusNode: focusNode,
-                        child: Text(locals.ok),
-                        onPressed: () {},
-                      ),
-                    ),
-                  ),
-                  TextButton(
-                    child: Text(locals.cancel),
-                    onPressed: () {
-                      //Put your code here which you want to execute on Cancel button click.
-                      focusNode.dispose();
-                      Navigator.of(context).pop();
-                    },
-                  ),
-                ],
-              )
-            ]),
-          ),
-        );
-      },
-    ));
-  }
-*/
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -224,6 +264,31 @@ class TvManageSingleServerScreen extends StatelessWidget {
                   enabled: isLoggedIn,
                   onSelected: (context) => cubit.logOut(),
                 ),
+                SettingsTitle(title: locals.customHeaders),
+                ...state.server.customHeaders.keys.map((k) {
+                  String value = state.server.customHeaders[k] ?? '';
+                  if (k == 'Authorization') {
+                    value = "········";
+                  }
+
+                  return SettingsTile(
+                    title: k,
+                    description: value,
+                    onSelected: (context) => cubit.removeHeader(k),
+                    trailing: const Icon(Icons.delete),
+                  );
+                }),
+                SettingsTile(
+                  title: locals.addBasicAuth,
+                  leading: const Icon(Icons.key),
+                  onSelected: (context) => showBasicAuthDialog(context),
+                ),
+                SettingsTile(
+                  title: locals.addHeader,
+                  leading: const Icon(Icons.add),
+                  onSelected: showAddHeaderDialog,
+                ),
+                const Gap(20),
                 SettingsTile(
                   title: locals.delete,
                   enabled: state.canDelete,
diff --git a/lib/utils.dart b/lib/utils.dart
index c4a9f3eb..2a198ff6 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -72,7 +72,8 @@ NumberFormat compactCurrency = NumberFormat.compactCurrency(
 );
 
 Future<void> showAlertDialog(
-    BuildContext context, String title, List<Widget> body) async {
+    BuildContext context, String title, List<Widget> body,
+    {List<Widget>? actions}) async {
   var locals = AppLocalizations.of(context)!;
   return showDialog<void>(
     context: context,
@@ -85,14 +86,15 @@ Future<void> showAlertDialog(
             children: body,
           ),
         ),
-        actions: <Widget>[
-          TextButton(
-            child: Text(locals.ok),
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
+        actions: actions ??
+            <Widget>[
+              TextButton(
+                child: Text(locals.ok),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+            ],
       );
     },
   );
diff --git a/lib/utils/extensions/list_unique.dart b/lib/utils/extensions/list_unique.dart
index 9ba951d9..eddd9fd4 100644
--- a/lib/utils/extensions/list_unique.dart
+++ b/lib/utils/extensions/list_unique.dart
@@ -1,6 +1,6 @@
 extension Unique<E, Id> on List<E> {
   List<E> unique([Id Function(E element)? id, bool inplace = true]) {
-    final ids = Set();
+    final Set<Id> ids = {};
     var list = inplace ? this : List<E>.from(this);
     list.retainWhere((x) => ids.add(id != null ? id(x) : x as Id));
     return list;
diff --git a/lib/utils/file_db.dart b/lib/utils/file_db.dart
index d94c9e17..d0b801ef 100644
--- a/lib/utils/file_db.dart
+++ b/lib/utils/file_db.dart
@@ -477,7 +477,7 @@ class FileDB extends IDbClient {
   }
 
   @override
-  Future<void> deleteOfflineSubscription(String sub) {
+  Future<void> deleteOfflineSubscription(String channelId) {
     // TODO: implement deleteOfflineSubscription
     throw UnimplementedError();
   }
diff --git a/lib/utils/sembast_sqflite_database.dart b/lib/utils/sembast_sqflite_database.dart
index 03fb0297..5784e86f 100644
--- a/lib/utils/sembast_sqflite_database.dart
+++ b/lib/utils/sembast_sqflite_database.dart
@@ -304,15 +304,15 @@ class SembastSqfDb extends IDbClient {
 
   @override
   Future<void> useServer(Server server) async {
-    List<Server> servers = await getServers();
-    for (Server s in servers) {
-      s.inUse = false;
+    List<Server> servers = List.from(await getServers());
+    for (int i = 0; i < servers.length; i++) {
+      Server s = servers[i].copyWith(inUse: false);
       await serversStore.record(s.url).put(db, s.toJson());
     }
 
-    server.inUse = true;
-
-    await serversStore.record(server.url).put(db, server.toJson());
+    await serversStore
+        .record(server.url)
+        .put(db, server.copyWith(inUse: true).toJson());
   }
 
   @override
@@ -321,8 +321,8 @@ class SembastSqfDb extends IDbClient {
   }
 
   @override
-  Future<void> deleteOfflineSubscription(String sub) async {
-    await offlineSubscriptions.record(sub).delete(db);
+  Future<void> deleteOfflineSubscription(String channelId) async {
+    await offlineSubscriptions.record(channelId).delete(db);
   }
 
   @override
diff --git a/lib/utils/string.dart b/lib/utils/string.dart
new file mode 100644
index 00000000..3bc349fe
--- /dev/null
+++ b/lib/utils/string.dart
@@ -0,0 +1,6 @@
+import 'dart:convert';
+
+String encodeBase64(String s) {
+  final bytes = utf8.encode(s);
+  return base64Encode(bytes);
+}
diff --git a/lib/videos/views/components/video_thumbnail.dart b/lib/videos/views/components/video_thumbnail.dart
index 7bd517b5..e8c04816 100644
--- a/lib/videos/views/components/video_thumbnail.dart
+++ b/lib/videos/views/components/video_thumbnail.dart
@@ -1,6 +1,7 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:invidious/globals.dart';
+import 'package:invidious/settings/models/db/server.dart';
 
 class VideoThumbnailView extends StatelessWidget {
   final String videoId;
@@ -51,49 +52,64 @@ class Thumbnail extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     ColorScheme colors = Theme.of(context).colorScheme;
-    return CachedNetworkImage(
-      cacheKey: thumbnailUrl,
-      imageBuilder: (context, imageProvider) => AnimatedContainer(
-        height: height,
-        width: width,
-        decoration: decoration.copyWith(
-            image: DecorationImage(image: imageProvider, fit: BoxFit.cover)),
-        // duration: animationDuration,
-        duration: animationDuration ~/ 2,
-        curve: Curves.easeInOutQuad,
-        child: child,
-      ),
-      imageUrl: thumbnailUrl,
-      placeholderFadeInDuration: animationDuration,
-      fadeInDuration: animationDuration,
-      fadeOutDuration: animationDuration,
-      errorWidget: (context, url, error) => Container(
-        height: height,
-        width: width,
-        alignment: Alignment.center,
-        decoration: decoration.copyWith(color: colors.secondaryContainer),
-        // duration: animationDuration,
-        child: SizedBox(
-            height: 20,
-            width: 20,
-            child: Icon(
-              Icons.error_outline,
-              color: colors.onSecondaryContainer.withOpacity(0.5),
-            )),
-      ),
-      progressIndicatorBuilder: (context, url, progress) => Container(
-        height: height,
-        width: width,
-        alignment: Alignment.center,
-        decoration: decoration.copyWith(color: colors.secondaryContainer),
-        // duration: animationDuration,
-        child: const SizedBox(
-            height: 20,
-            width: 20,
-            child: CircularProgressIndicator(
-              strokeWidth: 1,
-            )),
-      ),
-    );
+    return FutureBuilder<Server?>(
+        future: db.getCurrentlySelectedServer(),
+        builder: (context, server) {
+          return !server.hasData || server.data == null
+              ? Container(
+                  decoration: decoration,
+                  width: width,
+                  height: height,
+                  child: child)
+              : CachedNetworkImage(
+                  cacheKey: thumbnailUrl,
+                  httpHeaders: server.data?.customHeaders,
+                  imageBuilder: (context, imageProvider) => AnimatedContainer(
+                    height: height,
+                    width: width,
+                    decoration: decoration.copyWith(
+                        image: DecorationImage(
+                            image: imageProvider, fit: BoxFit.cover)),
+                    // duration: animationDuration,
+                    duration: animationDuration ~/ 2,
+                    curve: Curves.easeInOutQuad,
+                    child: child,
+                  ),
+                  imageUrl: thumbnailUrl,
+                  placeholderFadeInDuration: animationDuration,
+                  fadeInDuration: animationDuration,
+                  fadeOutDuration: animationDuration,
+                  errorWidget: (context, url, error) => Container(
+                    height: height,
+                    width: width,
+                    alignment: Alignment.center,
+                    decoration:
+                        decoration.copyWith(color: colors.secondaryContainer),
+                    // duration: animationDuration,
+                    child: SizedBox(
+                        height: 20,
+                        width: 20,
+                        child: Icon(
+                          Icons.error_outline,
+                          color: colors.onSecondaryContainer.withOpacity(0.5),
+                        )),
+                  ),
+                  progressIndicatorBuilder: (context, url, progress) =>
+                      Container(
+                    height: height,
+                    width: width,
+                    alignment: Alignment.center,
+                    decoration:
+                        decoration.copyWith(color: colors.secondaryContainer),
+                    // duration: animationDuration,
+                    child: const SizedBox(
+                        height: 20,
+                        width: 20,
+                        child: CircularProgressIndicator(
+                          strokeWidth: 1,
+                        )),
+                  ),
+                );
+        });
   }
 }
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 7879666f..76ac626b 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  jni
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)
diff --git a/pubspec.lock b/pubspec.lock
index 267f257c..e028229a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -628,6 +628,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  gap:
+    dependency: "direct main"
+    description:
+      name: gap
+      sha256: f19387d4e32f849394758b91377f9153a1b41d79513ef7668c088c77dbc6955d
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   glob:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d8606ffc..48de2113 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: invidious
-version: 1.20.0+4058
+version: 1.21.0+4059
 publish_to: none
 description: A new Flutter project.
 environment: 
@@ -32,6 +32,7 @@ dependencies:
   flutter_swipe_action_cell: 3.1.3
   flutter_web_auth: 0.5.0
   freezed_annotation: 2.4.1
+  gap: 3.0.1
   http: 1.2.1
   intl: 0.19.0
   json_annotation: 4.9.0
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index d65156e1..08d150d2 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  jni
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)