diff --git a/app/.gitignore b/app/.gitignore
index 8ae589b0..421345df 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -33,7 +33,6 @@
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index 5150e65f..9541de68 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -34,7 +34,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 ext.abiCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86_64": 3]
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     ndkVersion "23.2.8568313"
 
     sourceSets {
diff --git a/app/lib/main.dart b/app/lib/main.dart
index b13c8a0a..dcead5f6 100644
--- a/app/lib/main.dart
+++ b/app/lib/main.dart
@@ -24,15 +24,15 @@ void main() async {
       statusBarColor: Colors.transparent,
     ));
   }
-  BlocOverrides.runZoned(
-    () => runApp(const MyApp()),
-    blocObserver: _BlocObserver(),
-    eventTransformer: sequential(),
-  );
+  Bloc.observer = const _BlocObserver();
+  Bloc.transformer = sequential();
+  runApp(const MyApp());
 }
 
 @npLog
 class _BlocObserver extends BlocObserver {
+  const _BlocObserver();
+
   @override
   void onChange(BlocBase bloc, Change change) {
     super.onChange(bloc, change);
diff --git a/app/lib/mobile/android/android_info.dart b/app/lib/mobile/android/android_info.dart
index 9c282f39..8d737518 100644
--- a/app/lib/mobile/android/android_info.dart
+++ b/app/lib/mobile/android/android_info.dart
@@ -22,7 +22,7 @@ class AndroidInfo {
 
   static Future<void> init() async {
     final info = await DeviceInfoPlugin().androidInfo;
-    final sdkInt = info.version.sdkInt!;
+    final sdkInt = info.version.sdkInt;
 
     final memInfo = await MemoryInfoPlugin().memoryInfo;
     final totalMemMb = memInfo.totalMem!.toDouble();
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 5466c42c..abebb25a 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -58,56 +58,28 @@ packages:
       name: battery_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
-  battery_plus_linux:
-    dependency: transitive
-    description:
-      name: battery_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.2"
-  battery_plus_macos:
-    dependency: transitive
-    description:
-      name: battery_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.1"
+    version: "3.0.6"
   battery_plus_platform_interface:
     dependency: transitive
     description:
       name: battery_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
-  battery_plus_web:
-    dependency: transitive
-    description:
-      name: battery_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  battery_plus_windows:
-    dependency: transitive
-    description:
-      name: battery_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.2"
+    version: "1.2.2"
   bloc:
     dependency: transitive
     description:
       name: bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.0.3"
+    version: "8.1.2"
   bloc_concurrency:
     dependency: "direct main"
     description:
       name: bloc_concurrency
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.2"
   bloc_test:
     dependency: "direct dev"
     description:
@@ -135,7 +107,7 @@ packages:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
@@ -156,7 +128,7 @@ packages:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.11"
+    version: "2.3.0"
   build_runner_core:
     dependency: transitive
     description:
@@ -184,21 +156,21 @@ packages:
       name: cached_network_image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.3"
   cached_network_image_platform_interface:
     dependency: transitive
     description:
       name: cached_network_image_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "2.0.0"
   cached_network_image_web:
     dependency: transitive
     description:
       name: cached_network_image_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   characters:
     dependency: transitive
     description:
@@ -247,7 +219,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "4.4.0"
   collection:
     dependency: "direct main"
     description:
@@ -370,49 +342,21 @@ packages:
       name: device_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
-  device_info_plus_linux:
-    dependency: transitive
-    description:
-      name: device_info_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
-  device_info_plus_macos:
-    dependency: transitive
-    description:
-      name: device_info_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.3"
+    version: "8.2.2"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0+1"
-  device_info_plus_web:
-    dependency: transitive
-    description:
-      name: device_info_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  device_info_plus_windows:
-    dependency: transitive
-    description:
-      name: device_info_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
+    version: "7.0.0"
   devicelocale:
     dependency: "direct main"
     description:
       name: devicelocale
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.0"
+    version: "0.6.0"
   diff_match_patch:
     dependency: transitive
     description:
@@ -449,7 +393,7 @@ packages:
       name: equatable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   event_bus:
     dependency: "direct main"
     description:
@@ -514,7 +458,7 @@ packages:
       name: flutter_bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.0.1"
+    version: "8.1.3"
   flutter_blurhash:
     dependency: transitive
     description:
@@ -582,7 +526,7 @@ packages:
       name: flutter_map
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "2.2.0"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -643,14 +587,28 @@ packages:
       name: google_maps_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.8"
+    version: "2.2.8"
+  google_maps_flutter_android:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.15"
+  google_maps_flutter_ios:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.3"
   google_maps_flutter_platform_interface:
     dependency: transitive
     description:
       name: google_maps_flutter_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.7"
   graphs:
     dependency: transitive
     description:
@@ -678,7 +636,7 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.4"
+    version: "0.13.5"
   http_multi_server:
     dependency: transitive
     description:
@@ -745,7 +703,7 @@ packages:
       name: kiwi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.0"
   latlong2:
     dependency: transitive
     description:
@@ -773,7 +731,7 @@ packages:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.1"
   matcher:
     dependency: transitive
     description:
@@ -794,7 +752,7 @@ packages:
       name: memory_info
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.2"
+    version: "0.0.3"
   memory_info_platform_interface:
     dependency: transitive
     description:
@@ -822,7 +780,7 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   mocktail:
     dependency: transitive
     description:
@@ -836,7 +794,7 @@ packages:
       name: mutex
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   native_device_orientation:
     dependency: "direct main"
     description:
@@ -934,7 +892,7 @@ packages:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.15"
   path_provider_android:
     dependency: transitive
     description:
@@ -942,13 +900,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.16"
-  path_provider_ios:
+  path_provider_foundation:
     dependency: transitive
     description:
-      name: path_provider_ios
+      name: path_provider_foundation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.2.3"
   path_provider_linux:
     dependency: transitive
     description:
@@ -956,13 +914,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.7"
-  path_provider_macos:
-    dependency: transitive
-    description:
-      name: path_provider_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.6"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -1039,7 +990,7 @@ packages:
       name: proj4dart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   provider:
     dependency: transitive
     description:
@@ -1067,7 +1018,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.1"
   recase:
     dependency: transitive
     description:
@@ -1088,7 +1039,7 @@ packages:
       name: screen_brightness
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.2"
   screen_brightness_android:
     dependency: transitive
     description:
@@ -1117,6 +1068,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.0"
+  screen_brightness_windows:
+    dependency: transitive
+    description:
+      name: screen_brightness_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.1"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1268,7 +1226,7 @@ packages:
       name: sqlite3_flutter_libs
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.8"
+    version: "0.5.15"
   sqlparser:
     dependency: transitive
     description:
@@ -1310,7 +1268,7 @@ packages:
       name: synchronized
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0+2"
+    version: "3.1.0"
   term_glyph:
     dependency: transitive
     description:
@@ -1370,7 +1328,7 @@ packages:
       name: tuple
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   typed_data:
     dependency: transitive
     description:
@@ -1385,13 +1343,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.1"
+  upower:
+    dependency: transitive
+    description:
+      name: upower
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.0"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.4"
+    version: "6.1.11"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1447,7 +1412,7 @@ packages:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
@@ -1498,7 +1463,7 @@ packages:
       name: visibility_detector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3"
+    version: "0.4.0+2"
   vm_service:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 6da13a21..b1baa2a5 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -33,9 +33,9 @@ dependencies:
       url: https://gitlab.com/nc-photos/plus_plugins
       ref: android_intent_plus-v3.1.1-nc-photos-1
       path: packages/android_intent_plus
-  battery_plus: ^2.1.3
-  bloc_concurrency: ^0.2.0
-  cached_network_image: ^3.2.1
+  battery_plus: ^3.0.6
+  bloc_concurrency: ^0.2.2
+  cached_network_image: ^3.2.3
   circular_reveal_animation: ^2.0.1
   clock: ^1.1.1
   collection: ^1.15.0
@@ -45,14 +45,14 @@ dependencies:
       url: https://gitlab.com/nkming2/dart-copy-with
       path: copy_with
       ref: copy_with-1.3.0
-  devicelocale: ^0.5.0
-  device_info_plus: ^4.0.0
+  devicelocale: ^0.6.0
+  device_info_plus: ^8.2.2
   draggable_scrollbar:
     git:
       url: https://gitlab.com/nc-photos/flutter-draggable-scrollbar
       ref: v0.1.0-nc-photos-6
   drift: ^1.7.1
-  equatable: ^2.0.0
+  equatable: ^2.0.5
   event_bus: ^2.0.0
   exifdart:
     git:
@@ -63,18 +63,18 @@ dependencies:
     git:
       url: https://gitlab.com/nc-photos/flutter_background_service.git
       ref: v0.2.6-nc-photos-2
-  flutter_bloc: ^8.0.0
+  flutter_bloc: ^8.1.2
   flutter_colorpicker: ^1.0.3
   flutter_isolate: ^2.0.4
-  flutter_map: ^1.1.1
+  flutter_map: ^2.2.0
   flutter_staggered_grid_view:
     git:
       url: https://gitlab.com/nc-photos/flutter_staggered_grid_view
       ref: v0.4.0-nc-photos-1
   flutter_typeahead: ^4.0.0
   # android/ios only
-  google_maps_flutter: ^2.1.0
-  http: ^0.13.1
+  google_maps_flutter: ^2.2.8
+  http: ^0.13.5
   image_size_getter:
     git:
       url: https://gitlab.com/nc-photos/dart_image_size_getter
@@ -85,11 +85,11 @@ dependencies:
     git:
       url: https://gitlab.com/nc-photos/kd-tree-dart.git
       ref: 0.2.0-nc-photos-1
-  kiwi: ^4.0.1
-  logging: ^1.0.1
-  memory_info: ^0.0.2
-  mime: ^1.0.1
-  mutex: ^3.0.0
+  kiwi: ^4.1.0
+  logging: ^1.1.1
+  memory_info: ^0.0.3
+  mime: ^1.0.4
+  mutex: ^3.0.1
   native_device_orientation: ^1.1.0
   nc_photos_plugin:
     path: ../plugin
@@ -101,25 +101,25 @@ dependencies:
     path: ../np_common
   page_view_indicators: ^2.0.0
   path: ^1.8.0
-  path_provider: ^2.0.6
-  quiver: ^3.1.0
+  path_provider: ^2.0.15
+  quiver: ^3.2.1
   rxdart: ^0.27.7
-  screen_brightness:  ^0.2.1
+  screen_brightness:  ^0.2.2
   shared_preferences: ^2.0.8
   smooth_corner: ^1.1.0
   sqlite3: any
-  sqlite3_flutter_libs: ^0.5.8
-  synchronized: ^3.0.0
+  sqlite3_flutter_libs: ^0.5.15
+  synchronized: ^3.1.0
   to_string:
     git:
       url: https://gitlab.com/nkming2/dart-to-string
       ref: to_string-1.0.0
       path: to_string
-  tuple: ^2.0.0
-  url_launcher: ^6.0.3
-  uuid: ^3.0.6
+  tuple: ^2.0.1
+  url_launcher: ^6.1.11
+  uuid: ^3.0.7
   video_player: 2.4.5
-  visibility_detector: ^0.3.3
+  visibility_detector: ^0.4.0+2
   wakelock: ^0.6.2
   woozy_search: ^2.0.3
 
@@ -133,7 +133,7 @@ dependency_overrides:
 dev_dependencies:
   test: any
   bloc_test: any
-  build_runner: ^2.1.11
+  build_runner: ^2.2.1
   copy_with_build:
     git:
       url: https://gitlab.com/nkming2/dart-copy-with
diff --git a/np_api/pubspec.yaml b/np_api/pubspec.yaml
index 0d4c1421..e301092f 100644
--- a/np_api/pubspec.yaml
+++ b/np_api/pubspec.yaml
@@ -9,11 +9,11 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  equatable: ^2.0.0
+  equatable: ^2.0.5
   flutter:
     sdk: flutter
-  http: ^0.13.1
-  logging: ^1.0.1
+  http: ^0.13.5
+  logging: ^1.1.1
   np_codegen:
     path: ../codegen
   np_common:
@@ -26,7 +26,7 @@ dependencies:
   xml: ^6.1.0
 
 dev_dependencies:
-  build_runner: ^2.1.11
+  build_runner: ^2.2.1
   flutter_lints: ^2.0.0
   np_codegen_build:
     path: ../codegen_build
diff --git a/np_common/pubspec.yaml b/np_common/pubspec.yaml
index b1569761..8b3c14a9 100644
--- a/np_common/pubspec.yaml
+++ b/np_common/pubspec.yaml
@@ -11,7 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  logging: ^1.0.1
+  logging: ^1.1.1
 
 dev_dependencies:
   flutter_lints: ^2.0.0
diff --git a/plugin/pubspec.yaml b/plugin/pubspec.yaml
index bddab377..b73af9e7 100644
--- a/plugin/pubspec.yaml
+++ b/plugin/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  logging: ^1.0.2
+  logging: ^1.1.1
 
 dev_dependencies:
   flutter_lints: ^1.0.0