diff --git a/README.md b/README.md
index 4ad4e1be2..8b8a62143 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,7 @@ If you are concerned, you can [read the reason of choosing this license](https:/
 1. [YouTube](https://youtube.com/) - YouTube is an American online video-sharing platform headquartered in San Bruno, California. Three former PayPal employees—Chad Hurley, Steve Chen, and Jawed Karim—created the service in February 2005
 1. [JioSaavn](https://www.jiosaavn.com) - JioSaavn is an Indian online music streaming service and a digital distributor of Bollywood, English and other regional Indian music across the world. Since it was founded in 2007 as Saavn, the company has acquired rights to over 5 crore (50 million) music tracks in 15 languages
 1. [SongLink](https://song.link) - SongLink is a free smart link service that helps you share music with your audience. It's a one-stop-shop for creating smart links for music, podcasts, and other audio content
+1. [LRCLib](https://lrclib.net/) - A public synced lyric API
 1. [Linux](https://www.linux.org) - Linux is a family of open-source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991, by Linus Torvalds. Linux is typically packaged in a Linux distribution
 1. [AUR](https://aur.archlinux.org) - AUR stands for Arch User Repository. It is a community-driven repository for Arch-based Linux distributions users
 1. [Flatpak](https://flatpak.org) - Flatpak is a utility for software deployment and package management for Linux
@@ -233,9 +234,6 @@ If you are concerned, you can [read the reason of choosing this license](https:/
 1. [duration](https://github.com/desktop-dart/duration) - Utilities to make working with 'Duration's easier. Formats duration in human readable form and also parses duration in human readable form to Dart's Duration.
 1. [envied](https://github.com/petercinibulk/envied) - Explicitly reads environment variables into a dart file from a .env file for more security and faster start up times.
 1. [file_selector](https://pub.dev/packages/file_selector) - Flutter plugin for opening and saving files, or selecting directories, using native file selection UI.
-1. [fl_query](https://fl-query.krtirtho.dev) - Asynchronous data caching, refetching & invalidation library for Flutter
-1. [fl_query_hooks](https://fl-query.krtirtho.dev) - Elite flutter_hooks compatible library for fl_query, the Asynchronous data caching, refetching & invalidation library for Flutter
-1. [fl_query_devtools](https://fl-query.krtirtho.dev) - Devtools support for Fl-Query
 1. [fluentui_system_icons](https://github.com/microsoft/fluentui-system-icons/tree/main) - Fluent UI System Icons are a collection of familiar, friendly and modern icons from Microsoft.
 1. [flutter_cache_manager](https://github.com/Baseflow/flutter_cache_manager/tree/develop/flutter_cache_manager) - Generic cache manager for flutter. Saves web files on the storages of the device and saves the cache info using sqflite.
 1. [flutter_displaymode](https://github.com/ajinasokan/flutter_displaymode) - A Flutter plugin to set display mode (resolution, refresh rate) on Android platform. Allows to enable high refresh rate on supported devices.
@@ -257,7 +255,7 @@ If you are concerned, you can [read the reason of choosing this license](https:/
 1. [http](https://pub.dev/packages/http) - A composable, multi-platform, Future-based API for HTTP requests.
 1. [image_picker](https://pub.dev/packages/image_picker) - Flutter plugin for selecting images from the Android and iOS image library, and taking new pictures with the camera.
 1. [intl](https://pub.dev/packages/intl) - Contains code to deal with internationalized/localized messages, date and number formatting and parsing, bi-directional text, and other internationalization issues.
-1. [introduction_screen](https://github.com/pyozer/introduction_screen) - Introduction/Onboarding package for flutter app with some customizations possibilities
+1. [introduction_screen](https://pub.dev/packages/introduction_screen) - Introduction/Onboarding package for flutter app with some customizations possibilities
 1. [json_annotation](https://pub.dev/packages/json_annotation) - Classes and helper functions that support JSON code generation via the `json_serializable` package.
 1. [logger](https://pub.dev/packages/logger) - Small, easy to use and extensible logger which prints beautiful logs.
 1. [media_kit](https://github.com/media-kit/media-kit) - A cross-platform video player & audio player for Flutter & Dart. Performant, stable, feature-proof & modular.
@@ -295,22 +293,32 @@ If you are concerned, you can [read the reason of choosing this license](https:/
 1. [wikipedia_api](https://github.com/KRTirtho/wikipedia_api) - Wikipedia API for dart and flutter
 1. [skeletonizer](https://github.com/Milad-Akarie/skeletonizer) - Converts already built widgets into skeleton loaders with no extra effort.
 1. [app_links](https://github.com/llfbandit/app_links) - Android App Links, Deep Links, iOs Universal Links and Custom URL schemes handler for Flutter (desktop included).
-1. [win32_registry](https://win32.pub) - A package that provides a friendly Dart API for accessing the Windows Registry.
+1. [win32_registry](https://pub.dev/packages/win32_registry) - A package that provides a friendly Dart API for accessing the Windows Registry.
 1. [flutter_sharing_intent](https://github.com/bhagat-techind/flutter_sharing_intent.git) - A flutter plugin that allow flutter apps to receive photos, videos, text, urls or any other file types from another app.
 1. [flutter_broadcasts](https://pub.dev/packages/flutter_broadcasts) - A plugin for sending and receiving broadcasts with Android intents and iOS notifications.
 1. [freezed_annotation](https://pub.dev/packages/freezed_annotation) - Annotations for the freezed code-generator. This package does nothing without freezed too.
 1. [spotify](https://github.com/rinukkusu/spotify-dart) - An incomplete dart library for interfacing with the Spotify Web API.
+1. [bonsoir](https://bonsoir.skyost.eu) - A Zeroconf library that allows you to discover network services and to broadcast your own. Based on Apple Bonjour and Android NSD.
+1. [shelf](https://pub.dev/packages/shelf) - A model for web server middleware that encourages composition and easy reuse.
+1. [shelf_router](https://pub.dev/packages/shelf_router) - A convenient request router for the shelf web-framework, with support for URL-parameters, nested routers and routers generated from source annotations.
+1. [shelf_web_socket](https://pub.dev/packages/shelf_web_socket) - A shelf handler that wires up a listener for every connection.
+1. [web_socket_channel](https://pub.dev/packages/web_socket_channel) - StreamChannel wrappers for WebSockets. Provides a cross-platform WebSocketChannel API, a cross-platform implementation of that API that communicates over an underlying StreamChannel.
+1. [lrc](https://pub.dev/packages/lrc) - A Dart-only package that creates, parses, and handles LRC, which is a format that stores song lyrics.
+1. [pub_api_client](https://github.com/leoafarias/pub_api_client) - An API Client for Pub to interact with public package information.
+1. [pubspec_parse](https://pub.dev/packages/pubspec_parse) - Simple package for parsing pubspec.yaml files with a type-safe API and rich error reporting.
+1. [timezone](https://pub.dev/packages/timezone) - Time zone database and time zone aware DateTime.
+1. [crypto](https://pub.dev/packages/crypto) - Implementations of SHA, MD5, and HMAC cryptographic functions.
 1. [build_runner](https://pub.dev/packages/build_runner) - A build system for Dart code generation and modular compilation.
 1. [envied_generator](https://github.com/petercinibulk/envied) - Generator for the Envied package. See https://pub.dev/packages/envied.
-1. [flutter_distributor](https://distributor.leanflutter.org) - A complete tool for packaging and publishing your Flutter apps.
+1. [flutter_distributor](https://distributor.leanflutter.dev) - A complete tool for packaging and publishing your Flutter apps.
 1. [flutter_gen_runner](https://github.com/FlutterGen/flutter_gen) - The Flutter code generator for your assets, fonts, colors, … — Get rid of all String-based APIs.
 1. [flutter_launcher_icons](https://github.com/fluttercommunity/flutter_launcher_icons) - A package which simplifies the task of updating your Flutter app's launcher icon.
 1. [flutter_lints](https://pub.dev/packages/flutter_lints) - Recommended lints for Flutter apps, packages, and plugins to encourage good coding practices.
 1. [hive_generator](https://github.com/hivedb/hive/tree/master/hive_generator) - Extension for Hive. Automatically generates TypeAdapters to store any class.
 1. [json_serializable](https://pub.dev/packages/json_serializable) - Automatically generate code for converting to and from JSON by annotating Dart classes.
-1. [pub_api_client](https://github.com/leoafarias/pub_api_client) - An API Client for Pub to interact with public package information.
-1. [pubspec_parse](https://pub.dev/packages/pubspec_parse) - Simple package for parsing pubspec.yaml files with a type-safe API and rich error reporting.
 1. [freezed](https://pub.dev/packages/freezed) - Code generation for immutable classes that has a simple syntax/API without compromising on the features.
+1. [custom_lint](https://pub.dev/packages/custom_lint) - Lint rules are a powerful way to improve the maintainability of a project. Custom Lint allows package authors and developers to easily write custom lint rules.
+1. [riverpod_lint](https://riverpod.dev) - Riverpod_lint is a developer tool for users of Riverpod, designed to help stop common issues and simplify repetitive tasks.
 1. [flutter_desktop_tools](https://github.com/KRTirtho/flutter_desktop_tools) - Essential collection of tools for flutter desktop app development
 1. [piped_client](https://github.com/KRTirtho/piped_client) - API Client for piped.video
 1. [scrobblenaut](https://github.com/Nebulino/Scrobblenaut) - A deadly simple LastFM API Wrapper for Dart. So deadly simple that it's gonna hit the mark.
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index 41fab0834..68308ba1f 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube هو مشروع مفتوح المصدر. يمكنك مساعدة هذا المشروع في النمو عن طريق المساهمة في المشروع، أو الإبلاغ عن الأخطاء، أو اقتراح ميزات جديدة.",
   "contribute_on_github": "المساهمة على GitHub",
   "donate_on_open_collective": "التبرع على Open Collective",
-  "browse_anonymously": "تصفح بشكل مجهول"
+  "browse_anonymously": "تصفح بشكل مجهول",
+  "enable_connect": "تمكين الاتصال",
+  "enable_connect_description": "التحكم في Spotube من الأجهزة الأخرى",
+  "devices": "الأجهزة",
+  "select": "اختر",
+  "connect_client_alert": "أنت تتم التحكم بواسطة {client}",
+  "this_device": "هذا الجهاز",
+  "remote": "بعيد"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_bn.arb b/lib/l10n/app_bn.arb
index 353ca6177..506e78bcb 100644
--- a/lib/l10n/app_bn.arb
+++ b/lib/l10n/app_bn.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "স্পটুব একটি ওপেন সোর্স প্রকল্প। আপনি প্রকল্পে অবদান রাখেন, বাগ রিপোর্ট করেন, বা নতুন বৈশিষ্ট্যগুলি সুপারিশ করেন।",
   "contribute_on_github": "গিটহাবে অবদান রাখুন",
   "donate_on_open_collective": "ওপেন কলেক্টিভে অনুদান করুন",
-  "browse_anonymously": "অজানে ব্রাউজ করুন"
+  "browse_anonymously": "অজানে ব্রাউজ করুন",
+  "enable_connect": "সংযোগ সক্রিয় করুন",
+  "enable_connect_description": "অন্যান্য ডিভাইস থেকে Spotube নিয়ন্ত্রণ করুন",
+  "devices": "ডিভাইস",
+  "select": "নির্বাচন করুন",
+  "connect_client_alert": "আপনি {client} দ্বারা নিয়ন্ত্রিত হচ্ছেন",
+  "this_device": "এই ডিভাইস",
+  "remote": "রিমোট"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
index 9848954ae..8faa0d093 100644
--- a/lib/l10n/app_ca.arb
+++ b/lib/l10n/app_ca.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube és un projecte de codi obert. Podeu ajudar a fer créixer aquest projecte contribuint al projecte, informant d'errors o suggerint noves funcionalitats.",
   "contribute_on_github": "Contribueix a GitHub",
   "donate_on_open_collective": "Fes una donació a Open Collective",
-  "browse_anonymously": "Navega de manera anònima"
+  "browse_anonymously": "Navega de manera anònima",
+  "enable_connect": "Habilita la connexió",
+  "enable_connect_description": "Controla Spotube des d'altres dispositius",
+  "devices": "Dispositius",
+  "select": "Selecciona",
+  "connect_client_alert": "Estàs sent controlat per {client}",
+  "this_device": "Aquest dispositiu",
+  "remote": "Remot"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index b058d41a6..77435d674 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube ist ein Open-Source-Projekt. Sie können diesem Projekt helfen, indem Sie zum Projekt beitragen, Fehler melden oder neue Funktionen vorschlagen.",
   "contribute_on_github": "Auf GitHub beitragen",
   "donate_on_open_collective": "Auf Open Collective spenden",
-  "browse_anonymously": "Anonym durchsuchen"
+  "browse_anonymously": "Anonym durchsuchen",
+  "enable_connect": "Verbindung aktivieren",
+  "enable_connect_description": "Spotube von anderen Geräten steuern",
+  "devices": "Geräte",
+  "select": "Auswählen",
+  "connect_client_alert": "Du wirst von {client} gesteuert",
+  "this_device": "Dieses Gerät",
+  "remote": "Fernbedienung"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 0b4cbb2a9..11617b423 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube es un proyecto de código abierto. Puedes ayudar a que este proyecto crezca contribuyendo al proyecto, informando errores o sugiriendo nuevas funciones.",
   "contribute_on_github": "Contribuir en GitHub",
   "donate_on_open_collective": "Donar en Open Collective",
-  "browse_anonymously": "Navegar Anónimamente"
+  "browse_anonymously": "Navegar Anónimamente",
+  "enable_connect": "Habilitar conexión",
+  "enable_connect_description": "Controla Spotube desde otros dispositivos",
+  "devices": "Dispositivos",
+  "select": "Seleccionar",
+  "connect_client_alert": "Estás siendo controlado por {client}",
+  "this_device": "Este dispositivo",
+  "remote": "Remoto"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index 629238cc1..8a0bee3ad 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube یک پروژه متن باز است. شما می‌توانید با به پروژه کمک کردن، گزارش دادن اشکالات یا پیشنهاد ویژگی‌های جدید، به این پروژه کمک کنید.",
   "contribute_on_github": "مشارکت در GitHub",
   "donate_on_open_collective": "کمک مالی در Open Collective",
-  "browse_anonymously": "مرور به صورت ناشناس"
+  "browse_anonymously": "مرور به صورت ناشناس",
+  "enable_connect": "فعال‌سازی اتصال",
+  "enable_connect_description": "کنترل Spotube از دیگر دستگاه‌ها",
+  "devices": "دستگاه‌ها",
+  "select": "انتخاب",
+  "connect_client_alert": "شما توسط {client} کنترل می‌شوید",
+  "this_device": "این دستگاه",
+  "remote": "راه‌دور"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 69b2bb696..cabcb8e1e 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube est un projet open-source. Vous pouvez aider ce projet à grandir en contribuant au projet, en signalant des bugs ou en suggérant de nouvelles fonctionnalités.",
   "contribute_on_github": "Contribuer sur GitHub",
   "donate_on_open_collective": "Faire un don sur Open Collective",
-  "browse_anonymously": "Naviguer anonymement"
+  "browse_anonymously": "Naviguer anonymement",
+  "enable_connect": "Activer la connexion",
+  "enable_connect_description": "Contrôlez Spotube depuis d'autres appareils",
+  "devices": "Appareils",
+  "select": "Sélectionner",
+  "connect_client_alert": "Vous êtes contrôlé par {client}",
+  "this_device": "Cet appareil",
+  "remote": "À distance"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
index b442da37f..a72e136ec 100644
--- a/lib/l10n/app_hi.arb
+++ b/lib/l10n/app_hi.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube एक ओपन सोर्स परियोजना है। आप इस परियोजना को योगदान देकर, बग रिपोर्ट करके या नई विशेषताओं का सुझाव देकर इस परियोजना को बढ़ा सकते हैं।",
   "contribute_on_github": "GitHub पर योगदान करें",
   "donate_on_open_collective": "ओपन कलेक्टिव पर दान करें",
-  "browse_anonymously": "बिना नाम के ब्राउज़ करें"
+  "browse_anonymously": "बिना नाम के ब्राउज़ करें",
+  "enable_connect": "कनेक्ट सक्षम करें",
+  "enable_connect_description": "अन्य उपकरणों से Spotube को नियंत्रित करें",
+  "devices": "उपकरण",
+  "select": "चयन करें",
+  "connect_client_alert": "आप {client} द्वारा नियंत्रित हो रहे हैं",
+  "this_device": "यह उपकरण",
+  "remote": "रिमोट"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index f8440cd07..bb1881d6c 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -314,5 +314,12 @@
   "help_project_grow_description": "Spotube è un progetto open-source. Puoi aiutare questo progetto a crescere contribuendo al progetto, segnalando bug o suggerendo nuove funzionalità.",
   "contribute_on_github": "Contribuisci su GitHub",
   "donate_on_open_collective": "Dona su Open Collective",
-  "browse_anonymously": "Naviga in modo anonimo"
+  "browse_anonymously": "Naviga in modo anonimo",
+  "enable_connect": "Abilita connessione",
+  "enable_connect_description": "Controlla Spotube da altri dispositivi",
+  "devices": "Dispositivi",
+  "select": "Seleziona",
+  "connect_client_alert": "Stai venendo controllato da {client}",
+  "this_device": "Questo dispositivo",
+  "remote": "Remoto"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index ecdc77a20..ab759404d 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotubeはオープンソースプロジェクトです。プロジェクトに貢献したり、バグを報告したり、新しい機能を提案することで、このプロジェクトの成長に貢献できます。",
   "contribute_on_github": "GitHubで貢献する",
   "donate_on_open_collective": "Open Collectiveで寄付する",
-  "browse_anonymously": "匿名で閲覧する"
+  "browse_anonymously": "匿名で閲覧する",
+  "enable_connect": "接続を有効にする",
+  "enable_connect_description": "他のデバイスからSpotubeを制御する",
+  "devices": "デバイス",
+  "select": "選択する",
+  "connect_client_alert": "{client} によって操作されています",
+  "this_device": "このデバイス",
+  "remote": "リモート"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index 5a3ee8bce..c94f81425 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -314,5 +314,12 @@
   "help_project_grow_description": "Spotube는 오픈 소스 프로젝트입니다. 프로젝트에 기여하거나 버그를 보고하거나 새로운 기능을 제안하여이 프로젝트의 성장에 도움을 줄 수 있습니다.",
   "contribute_on_github": "GitHub에서 기여하기",
   "donate_on_open_collective": "Open Collective에 기부하기",
-  "browse_anonymously": "익명으로 둘러보기"
+  "browse_anonymously": "익명으로 둘러보기",
+  "enable_connect": "연결 활성화",
+  "enable_connect_description": "다른 장치에서 Spotube 제어",
+  "devices": "장치",
+  "select": "선택",
+  "connect_client_alert": "{client}님에 의해 제어되고 있습니다",
+  "this_device": "이 장치",
+  "remote": "원격"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_ne.arb b/lib/l10n/app_ne.arb
index d921f3bad..4085b00e7 100644
--- a/lib/l10n/app_ne.arb
+++ b/lib/l10n/app_ne.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube एक खुला स्रोतको परियोजना हो। तपाईं परियोजनामा योगदान गरेर, त्रुटिहरू सूचिकै, वा नयाँ सुविधाहरू सुझाव दिएर यस परियोजनामा वृद्धि गर्न सक्नुहुन्छ।",
   "contribute_on_github": "GitHubमा योगदान गर्नुहोस्",
   "donate_on_open_collective": "खुला संगठनमा दान गर्नुहोस्",
-  "browse_anonymously": "अनामित रूपमा ब्राउज़ गर्नुहोस्"
+  "browse_anonymously": "अनामित रूपमा ब्राउज़ गर्नुहोस्",
+  "enable_connect": "कनेक्ट सक्रिय गर्नुहोस्",
+  "enable_connect_description": "अन्य उपकरणहरूबाट Spotube कन्ट्रोल गर्नुहोस्",
+  "devices": "उपकरणहरू",
+  "select": "चयन गर्नुहोस्",
+  "connect_client_alert": "तपाईंलाई {client} द्वारा नियन्त्रित गरिएको छ",
+  "this_device": "यो उपकरण",
+  "remote": "दूरसंचार"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index 33e94a2e4..0a04c40b0 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -314,5 +314,12 @@
   "help_project_grow_description": "Spotube is een open-source project. U kunt dit project helpen groeien door bij te dragen aan het project, bugs te melden of nieuwe functies voor te stellen.",
   "contribute_on_github": "Bijdragen op GitHub",
   "donate_on_open_collective": "Doneren op Open Collective",
-  "browse_anonymously": "Anoniem Bladeren"
+  "browse_anonymously": "Anoniem Bladeren",
+  "enable_connect": "Verbinding inschakelen",
+  "enable_connect_description": "Spotube bedienen vanaf andere apparaten",
+  "devices": "Apparaten",
+  "select": "Selecteren",
+  "connect_client_alert": "Je wordt gecontroleerd door {client}",
+  "this_device": "Dit apparaat",
+  "remote": "Afstandsbediening"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index a1bc5de61..9ce311870 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube to projekt open-source. Możesz pomóc temu projektowi rosnąć, przyczyniając się do projektu, zgłaszając błędy lub sugerując nowe funkcje.",
   "contribute_on_github": "Przyczyniaj się na GitHubie",
   "donate_on_open_collective": "Dotuj na Open Collective",
-  "browse_anonymously": "Przeglądaj Anonimowo"
+  "browse_anonymously": "Przeglądaj Anonimowo",
+  "enable_connect": "Włącz połączenie",
+  "enable_connect_description": "Kontroluj Spotube z innych urządzeń",
+  "devices": "Urządzenia",
+  "select": "Wybierz",
+  "connect_client_alert": "Jesteś sterowany przez {client}",
+  "this_device": "To urządzenie",
+  "remote": "Zdalny"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 7f290a1d3..537325894 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube é um projeto de código aberto. Você pode ajudar este projeto a crescer contribuindo para o projeto, relatando bugs ou sugerindo novos recursos.",
   "contribute_on_github": "Contribuir no GitHub",
   "donate_on_open_collective": "Doar no Open Collective",
-  "browse_anonymously": "Navegar Anonimamente"
+  "browse_anonymously": "Navegar Anonimamente",
+  "enable_connect": "Ativar conexão",
+  "enable_connect_description": "Controle o Spotube a partir de outros dispositivos",
+  "devices": "Dispositivos",
+  "select": "Selecionar",
+  "connect_client_alert": "Você está sendo controlado por {client}",
+  "this_device": "Este dispositivo",
+  "remote": "Remoto"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index c9139a901..a18e02e7d 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube - это проект с открытым исходным кодом. Вы можете помочь этому проекту развиваться, внося вклад в проект, сообщая ошибках или предлагая новые функции.",
   "contribute_on_github": "Внести вклад на GitHub",
   "donate_on_open_collective": "Пожертвовать на Open Collective",
-  "browse_anonymously": "Анонимно просматривать"
+  "browse_anonymously": "Анонимно просматривать",
+  "enable_connect": "Включить подключение",
+  "enable_connect_description": "Управление Spotube с других устройств",
+  "devices": "Устройства",
+  "select": "Выбрать",
+  "connect_client_alert": "Вас контролирует {client}",
+  "this_device": "Это устройство",
+  "remote": "Дистанционное управление"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_th.arb b/lib/l10n/app_th.arb
index cd58a20da..866929fa9 100644
--- a/lib/l10n/app_th.arb
+++ b/lib/l10n/app_th.arb
@@ -313,5 +313,13 @@
   "help_project_grow_description": "Spotube เป็นโครงการโอเพนซอร์ส คุณสามารถช่วยให้โครงการนี้เติบโตได้โดยการมีส่วนร่วมในโครงการ รายงานข้อบกพร่อง หรือเสนอคุณสมบัติใหม่",
   "contribute_on_github": "มีส่วนร่วมบน GitHub",
   "donate_on_open_collective": "บริจาคบน Open Collective",
-  "browse_anonymously": "เรียกดูแบบไม่ระบุตัวตน"
+  "browse_anonymously": "เรียกดูแบบไม่ระบุตัวตน",
+  "choose_your_language": "เลือกภาษาของคุณ",
+  "enable_connect": "เปิดใช้งานการเชื่อมต่อ",
+  "enable_connect_description": "ควบคุม Spotube จากอุปกรณ์อื่น",
+  "devices": "อุปกรณ์",
+  "select": "เลือก",
+  "connect_client_alert": "คุณกำลังถูกควบคุมโดย {client}",
+  "this_device": "อุปกรณ์นี้",
+  "remote": "ระยะไกล"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index fe57e6173..4208a3d2c 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube - це проект з відкритим кодом. Ви можете допомогти цьому проекту зростати, вносячи свій внесок у проект, повідомляючи про помилки або пропонуючи нові функції.",
   "contribute_on_github": "Долучайтесь на GitHub",
   "donate_on_open_collective": "Пожертвуйте на Open Collective",
-  "browse_anonymously": "Анонімно переглядати"
+  "browse_anonymously": "Анонімно переглядати",
+  "enable_connect": "Увімкнути підключення",
+  "enable_connect_description": "Керуйте Spotube з інших пристроїв",
+  "devices": "Пристрої",
+  "select": "Вибрати",
+  "connect_client_alert": "Вас керує {client}",
+  "this_device": "Цей пристрій",
+  "remote": "Віддалений"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_vi.arb b/lib/l10n/app_vi.arb
index 0e9b0b7c0..6115fc0ce 100644
--- a/lib/l10n/app_vi.arb
+++ b/lib/l10n/app_vi.arb
@@ -311,5 +311,14 @@
   "help_project_grow_description": "Spotube là một dự án mã nguồn mở. Bạn có thể giúp dự án này phát triển bằng cách đóng góp vào dự án, báo cáo lỗi hoặc đề xuất tính năng mới.",
   "contribute_on_github": "Đóng góp trên GitHub",
   "donate_on_open_collective": "Quyên góp trên Open Collective",
-  "browse_anonymously": "Duyệt Anonymously"
+  "browse_anonymously": "Duyệt Anonymously",
+  "friends": "Bạn bè",
+  "no_lyrics_available": "Xin lỗi, không tìm thấy lời cho bài hát này",
+  "enable_connect": "Kích hoạt kết nối",
+  "enable_connect_description": "Điều khiển Spotube từ các thiết bị khác",
+  "devices": "Thiết bị",
+  "select": "Chọn",
+  "connect_client_alert": "Bạn đang được điều khiển bởi {client}",
+  "this_device": "Thiết bị này",
+  "remote": "Từ xa"
 }
\ No newline at end of file
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 506661f03..da5254a32 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -313,5 +313,12 @@
   "help_project_grow_description": "Spotube是一个开源项目。您可以通过为项目做出贡献、报告错误或建议新功能来帮助该项目成长。",
   "contribute_on_github": "在GitHub上做出贡献",
   "donate_on_open_collective": "在Open Collective上捐款",
-  "browse_anonymously": "匿名浏览"
+  "browse_anonymously": "匿名浏览",
+  "enable_connect": "启用连接",
+  "enable_connect_description": "从其他设备控制Spotube",
+  "devices": "设备",
+  "select": "选择",
+  "connect_client_alert": "您正在被 {client} 控制",
+  "this_device": "此设备",
+  "remote": "远程"
 }
\ No newline at end of file
diff --git a/untranslated_messages.json b/untranslated_messages.json
index 3696d52e7..9e26dfeeb 100644
--- a/untranslated_messages.json
+++ b/untranslated_messages.json
@@ -1,204 +1 @@
-{
-  "ar": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "bn": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "ca": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "de": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "es": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "fa": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "fr": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "hi": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "it": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "ja": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "ko": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "ne": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "nl": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "pl": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "pt": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "ru": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "th": [
-    "choose_your_language",
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "uk": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "vi": [
-    "friends",
-    "no_lyrics_available",
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ],
-
-  "zh": [
-    "enable_connect",
-    "enable_connect_description",
-    "devices",
-    "select",
-    "connect_client_alert",
-    "this_device",
-    "remote"
-  ]
-}
+{}
\ No newline at end of file