diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
index 768834d7..16e9ccb4 100644
--- a/.fvm/fvm_config.json
+++ b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.0.5@stable",
+  "flutterSdkVersion": "3.3.0@stable",
   "flavors": {}
 }
\ No newline at end of file
diff --git a/packages/file_icons/pubspec.yaml b/packages/file_icons/pubspec.yaml
index ac1c6dd5..f5d75b15 100644
--- a/packages/file_icons/pubspec.yaml
+++ b/packages/file_icons/pubspec.yaml
@@ -2,8 +2,8 @@ name: file_icons
 version: 1.0.0
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
-  flutter: '>=3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
+  flutter: '>=3.3.0'
 
 dependencies:
   flutter:
diff --git a/packages/neon/lib/l10n/localizations.dart b/packages/neon/lib/l10n/localizations.dart
index 13b0f61e..606eb57e 100644
--- a/packages/neon/lib/l10n/localizations.dart
+++ b/packages/neon/lib/l10n/localizations.dart
@@ -7,14 +7,14 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
-/// Callers can lookup localized strings with an instance of AppLocalizations returned
-/// by `AppLocalizations.of(context)`.
+/// Callers can lookup localized strings with an instance of AppLocalizations
+/// returned by `AppLocalizations.of(context)`.
 ///
 /// Applications need to include `AppLocalizations.delegate()` in their app's
-/// localizationDelegates list, and the locales they support in the app's
-/// supportedLocales list. For example:
+/// `localizationDelegates` list, and the locales they support in the app's
+/// `supportedLocales` list. For example:
 ///
-/// ```
+/// ```dart
 /// import 'l10n/localizations.dart';
 ///
 /// return MaterialApp(
@@ -29,14 +29,14 @@ import 'localizations_en.dart';
 /// Please make sure to update your pubspec.yaml to include the following
 /// packages:
 ///
-/// ```
+/// ```yaml
 /// dependencies:
 ///   # Internationalization support.
 ///   flutter_localizations:
 ///     sdk: flutter
 ///   intl: any # Use the pinned version from flutter_localizations
 ///
-///   # rest of dependencies
+///   # Rest of dependencies
 /// ```
 ///
 /// ## iOS Applications
diff --git a/packages/neon/pubspec.lock b/packages/neon/pubspec.lock
index 0a751161..d01a05b7 100644
--- a/packages/neon/pubspec.lock
+++ b/packages/neon/pubspec.lock
@@ -7,21 +7,21 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "45.0.0"
+    version: "46.0.0"
   analyzer:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.5.0"
+    version: "4.6.0"
   archive:
     dependency: transitive
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.11"
+    version: "3.3.0"
   args:
     dependency: transitive
     description:
@@ -42,7 +42,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -105,14 +105,14 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.4.0"
+    version: "8.4.1"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   charcode:
     dependency: transitive
     description:
@@ -133,7 +133,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
@@ -168,7 +168,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   crypton:
     dependency: transitive
     description:
@@ -203,7 +203,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
@@ -269,7 +269,7 @@ packages:
       name: flutter_file_dialog
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   flutter_html:
     dependency: "direct main"
     description:
@@ -283,7 +283,7 @@ packages:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "9.7.0"
+    version: "9.9.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -309,14 +309,14 @@ packages:
       name: flutter_markdown
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.10+3"
+    version: "0.6.10+5"
   flutter_native_splash:
     dependency: "direct main"
     description:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.7"
+    version: "2.2.8"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -330,14 +330,14 @@ packages:
       name: flutter_rx_bloc
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.2"
+    version: "5.0.1"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.1.4"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -518,14 +518,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   material_design_icons_flutter:
     dependency: "direct main"
     description:
@@ -546,7 +546,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:
@@ -646,7 +646,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   path_drawing:
     dependency: transitive
     description:
@@ -674,7 +674,7 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.18"
+    version: "2.0.20"
   path_provider_ios:
     dependency: transitive
     description:
@@ -807,7 +807,7 @@ packages:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   queue:
     dependency: "direct main"
     description:
@@ -835,7 +835,7 @@ packages:
       name: quick_actions_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.0+13"
+    version: "0.6.0+14"
   quick_actions_platform_interface:
     dependency: transitive
     description:
@@ -961,7 +961,7 @@ packages:
       name: shared_preferences_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   shared_preferences_web:
     dependency: transitive
     description:
@@ -1029,7 +1029,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   sqflite:
     dependency: "direct main"
     description:
@@ -1057,7 +1057,7 @@ packages:
       name: sqlite3
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.2"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
@@ -1085,14 +1085,14 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   sync_http:
     dependency: transitive
     description:
       name: sync_http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.3.1"
   synchronized:
     dependency: transitive
     description:
@@ -1106,14 +1106,14 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   timezone:
     dependency: transitive
     description:
@@ -1134,14 +1134,14 @@ packages:
       name: tray_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.8"
+    version: "0.2.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   unifiedpush:
     dependency: "direct main"
     description:
@@ -1239,7 +1239,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.2.2"
+    version: "9.0.0"
   wakelock:
     dependency: "direct main"
     description:
@@ -1309,14 +1309,14 @@ packages:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.3"
+    version: "2.9.5"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.1"
+    version: "1.9.2"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
@@ -1337,14 +1337,14 @@ packages:
       name: window_manager
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.7"
   xdg_directories:
     dependency: "direct main"
     description:
       name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0+1"
+    version: "0.2.0+2"
   xml:
     dependency: transitive
     description:
@@ -1360,5 +1360,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=2.18.0 <3.0.0"
+  flutter: ">=3.3.0"
diff --git a/packages/neon/pubspec.yaml b/packages/neon/pubspec.yaml
index 99e76e68..eb75d114 100644
--- a/packages/neon/pubspec.yaml
+++ b/packages/neon/pubspec.yaml
@@ -3,8 +3,8 @@ version: 1.0.0
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
-  flutter: '>=3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
+  flutter: '>=3.3.0'
 
 dependencies:
   collection: ^1.16.0
@@ -23,7 +23,7 @@ dependencies:
     sdk: flutter
   flutter_markdown: ^0.6.10+2
   flutter_native_splash: ^2.2.0+1
-  flutter_rx_bloc: ^4.0.0
+  flutter_rx_bloc: ^5.0.1
   flutter_svg: ^1.0.3
   html: ^0.15.0
   http: ^0.13.4
@@ -52,7 +52,7 @@ dependencies:
     path: ../sort_box
   sqflite: ^2.0.2+1
   sqflite_common_ffi: ^2.1.1
-  tray_manager: ^0.1.8
+  tray_manager: ^0.2.0
   unifiedpush: ^4.0.1
   url_launcher: ^6.0.18
   wakelock: ^0.6.1+2
@@ -75,9 +75,6 @@ dev_dependencies:
       ref: f29382f
   rx_bloc_generator: ^6.0.0
 
-dependency_overrides:
-  analyzer: ^4.0.0 # https://github.com/dart-lang/language/issues/1855#issuecomment-1013212536
-
 flutter:
   uses-material-design: true
   assets:
diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml
index 7a2e59a3..48aaf958 100644
--- a/packages/nextcloud/pubspec.yaml
+++ b/packages/nextcloud/pubspec.yaml
@@ -2,7 +2,7 @@ name: nextcloud
 version: 1.0.0
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
   crypto: ^3.0.1
diff --git a/packages/nextcloud_push_proxy/pubspec.yaml b/packages/nextcloud_push_proxy/pubspec.yaml
index e222887d..3ef2589d 100644
--- a/packages/nextcloud_push_proxy/pubspec.yaml
+++ b/packages/nextcloud_push_proxy/pubspec.yaml
@@ -2,7 +2,7 @@ name: nextcloud_push_proxy
 version: 1.0.0
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
   shelf: ^1.3.1
diff --git a/packages/settings/pubspec.yaml b/packages/settings/pubspec.yaml
index e0fe8785..47484846 100644
--- a/packages/settings/pubspec.yaml
+++ b/packages/settings/pubspec.yaml
@@ -2,8 +2,8 @@ name: settings
 version: 1.0.0
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
-  flutter: '>=3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
+  flutter: '>=3.3.0'
 
 dependencies:
   flutter:
diff --git a/packages/sort_box/pubspec.yaml b/packages/sort_box/pubspec.yaml
index 05a7e8e2..bd56760f 100644
--- a/packages/sort_box/pubspec.yaml
+++ b/packages/sort_box/pubspec.yaml
@@ -2,7 +2,7 @@ name: sort_box
 version: 1.0.0
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dev_dependencies:
   nit_picking:
diff --git a/packages/spec_templates/pubspec.yaml b/packages/spec_templates/pubspec.yaml
index 41004cbc..349a158f 100644
--- a/packages/spec_templates/pubspec.yaml
+++ b/packages/spec_templates/pubspec.yaml
@@ -3,7 +3,7 @@ version: 1.0.0
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies: 
   path: ^1.8.1