diff --git a/lib/main.dart b/lib/main.dart
index 11a3d339..641137b2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,6 +4,7 @@ import 'package:args/args.dart';
 import 'package:catcher/catcher.dart';
 import 'package:device_preview/device_preview.dart';
 import 'package:fl_query/fl_query.dart';
+import 'package:fl_query_connectivity_plus_adapter/fl_query_connectivity_plus_adapter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -97,6 +98,7 @@ Future<void> main(List<String> rawArgs) async {
   await QueryClient.initialize(
     cachePrefix: "oss.krtirtho.spotube",
     cacheDir: (await getApplicationSupportDirectory()).path,
+    connectivity: FlQueryConnectivityPlusAdapter(),
   );
   Hive.registerAdapter(MatchedTrackAdapter());
 
@@ -134,6 +136,10 @@ Future<void> main(List<String> rawArgs) async {
         DevicePreview(
           availableLocales: L10n.all,
           enabled: !kReleaseMode && DesktopTools.platform.isDesktop,
+          data: const DevicePreviewData(
+            isEnabled: false,
+            orientation: Orientation.portrait,
+          ),
           builder: (context) {
             return ProviderScope(
               child: QueryClientProvider(
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index cbd42bdc..aa7d7e1d 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -9,6 +9,7 @@ import app_links
 import audio_service
 import audio_session
 import catcher
+import connectivity_plus
 import device_info_plus
 import flutter_secure_storage_macos
 import local_notifier
@@ -30,6 +31,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AudioServicePlugin.register(with: registry.registrar(forPlugin: "AudioServicePlugin"))
   AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
   CatcherPlugin.register(with: registry.registrar(forPlugin: "CatcherPlugin"))
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   LocalNotifierPlugin.register(with: registry.registrar(forPlugin: "LocalNotifierPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index 16354d81..f845f4b5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -354,6 +354,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
+  connectivity_plus:
+    dependency: transitive
+    description:
+      name: connectivity_plus
+      sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.1"
+  connectivity_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: connectivity_plus_platform_interface
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
   convert:
     dependency: transitive
     description:
@@ -542,18 +558,26 @@ packages:
     dependency: "direct main"
     description:
       name: fl_query
-      sha256: b119e0d7e4cb615780f6cab00e7b40f88f8f549d9f8d20f6e1076e08cbf97c42
+      sha256: "64f482fc09eb1166adca232f68772b2b11c616d88bce3208b2753c940ebc9f71"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0-alpha.2"
+    version: "1.0.0-alpha.3"
+  fl_query_connectivity_plus_adapter:
+    dependency: "direct main"
+    description:
+      name: fl_query_connectivity_plus_adapter
+      sha256: ce170730117b2da27467953c2d8a063ea89a99cfb666b332b6ea621211f09b8a
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0-alpha.1"
   fl_query_hooks:
     dependency: "direct main"
     description:
       name: fl_query_hooks
-      sha256: "9a4263cc5e1ef6e246089602256011172a9d3be212c41c08d67bc365ce6fec22"
+      sha256: b0ffc81fb047cbcedd9766776f9c72b95382730ce173226f0695c3f45774b0bc
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0-alpha.2"
+    version: "1.0.0-alpha.3"
   fluentui_system_icons:
     dependency: "direct main"
     description:
@@ -1158,6 +1182,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  nm:
+    dependency: transitive
+    description:
+      name: nm
+      sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
   oauth2:
     dependency: transitive
     description:
@@ -1638,12 +1670,11 @@ packages:
   smtc_windows:
     dependency: "direct main"
     description:
-      path: "packages/smtc_windows"
-      ref: "6cc93624b8fab8d7727c8693e91577a7413ccd13"
-      resolved-ref: "6cc93624b8fab8d7727c8693e91577a7413ccd13"
-      url: "https://github.com/KRTirtho/smtc_windows.git"
-    source: git
-    version: "0.0.1"
+      name: smtc_windows
+      sha256: dd86d0f29b5a73ffed5650279e6abee01846017b9bc16c07c708e129648c08ac
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   source_gen:
     dependency: transitive
     description:
@@ -2102,5 +2133,5 @@ packages:
     source: hosted
     version: "1.0.4"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
+  dart: ">=3.0.2 <4.0.0"
   flutter: ">=3.10.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 3fd3a71b..dc70baff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,8 +25,9 @@ dependencies:
   curved_navigation_bar: ^1.0.3
   envied: ^0.3.0
   file_picker: ^5.2.2
-  fl_query: ^1.0.0-alpha.2
-  fl_query_hooks: ^1.0.0-alpha.2
+  fl_query: ^1.0.0-alpha.3
+  fl_query_hooks: ^1.0.0-alpha.3
+  fl_query_connectivity_plus_adapter: ^0.1.0-alpha.1
   fluentui_system_icons: ^1.1.189
   flutter:
     sdk: flutter
@@ -73,11 +74,7 @@ dependencies:
   shared_preferences: ^2.0.11
   sidebarx: ^0.15.0
   skeleton_text: ^3.0.0
-  smtc_windows:
-    git:
-      url: https://github.com/KRTirtho/smtc_windows.git
-      ref: 6cc93624b8fab8d7727c8693e91577a7413ccd13
-      path: packages/smtc_windows
+  smtc_windows: ^0.1.0
   spotify: ^0.11.0
   system_theme: ^2.1.0
   titlebar_buttons: ^1.0.0
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index f0256a87..93029f40 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -8,6 +8,7 @@
 
 #include <app_links/app_links_plugin_c_api.h>
 #include <catcher/catcher_plugin.h>
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <local_notifier/local_notifier_plugin.h>
 #include <media_kit_libs_windows_audio/media_kit_libs_windows_audio_plugin_c_api.h>
@@ -24,6 +25,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
   CatcherPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("CatcherPlugin"));
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   LocalNotifierPluginRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 186806c7..eeb98007 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -5,6 +5,7 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   app_links
   catcher
+  connectivity_plus
   flutter_secure_storage_windows
   local_notifier
   media_kit_libs_windows_audio