diff --git a/packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml b/packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml
index 3fe6b2e8..3cc4948a 100644
--- a/packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml
+++ b/packages/neon/android/app/src/main/res/drawable-night-v21/launch_background.xml
@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/packages/neon/android/app/src/main/res/drawable-night/launch_background.xml b/packages/neon/android/app/src/main/res/drawable-night/launch_background.xml
index 3fe6b2e8..3cc4948a 100644
--- a/packages/neon/android/app/src/main/res/drawable-night/launch_background.xml
+++ b/packages/neon/android/app/src/main/res/drawable-night/launch_background.xml
@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml
index 3fe6b2e8..3cc4948a 100644
--- a/packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/packages/neon/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/packages/neon/android/app/src/main/res/drawable/launch_background.xml b/packages/neon/android/app/src/main/res/drawable/launch_background.xml
index 3fe6b2e8..3cc4948a 100644
--- a/packages/neon/android/app/src/main/res/drawable/launch_background.xml
+++ b/packages/neon/android/app/src/main/res/drawable/launch_background.xml
@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/packages/neon/android/app/src/main/res/values-night-v31/styles.xml b/packages/neon/android/app/src/main/res/values-night-v31/styles.xml
index 58f53f4a..cbd0a64c 100644
--- a/packages/neon/android/app/src/main/res/values-night-v31/styles.xml
+++ b/packages/neon/android/app/src/main/res/values-night-v31/styles.xml
@@ -17,4 +17,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/neon/android/app/src/main/res/values-night/styles.xml b/packages/neon/android/app/src/main/res/values-night/styles.xml
index 507616b8..58ee4d9b 100644
--- a/packages/neon/android/app/src/main/res/values-night/styles.xml
+++ b/packages/neon/android/app/src/main/res/values-night/styles.xml
@@ -18,4 +18,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/neon/android/app/src/main/res/values-v31/styles.xml b/packages/neon/android/app/src/main/res/values-v31/styles.xml
index 2b3eb99d..2f799656 100644
--- a/packages/neon/android/app/src/main/res/values-v31/styles.xml
+++ b/packages/neon/android/app/src/main/res/values-v31/styles.xml
@@ -18,4 +18,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/neon/android/app/src/main/res/values/styles.xml b/packages/neon/android/app/src/main/res/values/styles.xml
index cd86e752..82c1a057 100644
--- a/packages/neon/android/app/src/main/res/values/styles.xml
+++ b/packages/neon/android/app/src/main/res/values/styles.xml
@@ -18,4 +18,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/neon/pubspec.lock b/packages/neon/pubspec.lock
index c2c01d0a..0a751161 100644
--- a/packages/neon/pubspec.lock
+++ b/packages/neon/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "42.0.0"
+    version: "45.0.0"
   analyzer:
     dependency: "direct overridden"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.0"
+    version: "4.5.0"
   archive:
     dependency: transitive
     description:
@@ -140,7 +140,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "4.2.0"
   collection:
     dependency: "direct main"
     description:
@@ -290,7 +290,7 @@ packages:
       name: flutter_local_notifications_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.0+1"
+    version: "0.5.1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
@@ -316,7 +316,7 @@ packages:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.5"
+    version: "2.2.7"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -337,7 +337,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1+1"
+    version: "1.1.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -387,7 +387,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:
@@ -422,7 +422,7 @@ packages:
       name: image_picker_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.5+1"
+    version: "0.8.5+2"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -443,7 +443,7 @@ packages:
       name: image_picker_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -497,7 +497,7 @@ packages:
       name: lint
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.10.0"
   logging:
     dependency: transitive
     description:
@@ -653,14 +653,14 @@ packages:
       name: path_drawing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   path_provider:
     dependency: "direct main"
     description:
@@ -674,14 +674,14 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.16"
+    version: "2.0.18"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.0.11"
   path_provider_linux:
     dependency: transitive
     description:
@@ -828,14 +828,14 @@ packages:
       name: quick_actions_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.2"
   quick_actions_ios:
     dependency: transitive
     description:
       name: quick_actions_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.0+11"
+    version: "0.6.0+13"
   quick_actions_platform_interface:
     dependency: transitive
     description:
@@ -856,7 +856,7 @@ packages:
       name: rx_bloc_generator
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.1"
+    version: "6.0.0"
   rxdart:
     dependency: "direct main"
     description:
@@ -884,7 +884,7 @@ packages:
       name: share_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.10"
+    version: "4.0.10+1"
   share_plus_linux:
     dependency: transitive
     description:
@@ -982,7 +982,7 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -1036,7 +1036,7 @@ packages:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.3+1"
   sqflite_common:
     dependency: transitive
     description:
@@ -1218,7 +1218,7 @@ packages:
       name: url_launcher_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1309,7 +1309,7 @@ packages:
       name: webview_flutter_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.2"
+    version: "2.9.3"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1323,7 +1323,7 @@ packages:
       name: webview_flutter_wkwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.3"
   win32:
     dependency: transitive
     description:
diff --git a/packages/neon/pubspec.yaml b/packages/neon/pubspec.yaml
index 4da6a5ed..99e76e68 100644
--- a/packages/neon/pubspec.yaml
+++ b/packages/neon/pubspec.yaml
@@ -73,7 +73,7 @@ dev_dependencies:
     git:
       url: https://github.com/stack11/dart_nit_picking
       ref: f29382f
-  rx_bloc_generator: ^5.1.1
+  rx_bloc_generator: ^6.0.0
 
 dependency_overrides:
   analyzer: ^4.0.0 # https://github.com/dart-lang/language/issues/1855#issuecomment-1013212536