diff --git a/.fvmrc b/.fvmrc
index 307a44abfaf..1da865136bc 100644
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,4 +1,4 @@
 {
-  "flutter": "3.22.3",
+  "flutter": "3.24.2",
   "updateVscodeSettings": false
 }
\ No newline at end of file
diff --git a/.github/workflows/conventional_commits.yaml b/.github/workflows/conventional_commits.yaml
index 9f59dda7e2f..6b0c2f0446b 100644
--- a/.github/workflows/conventional_commits.yaml
+++ b/.github/workflows/conventional_commits.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.4
+          sdk: 3.5
       - name: Install commitlint_cli
         run: dart pub get
 
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index b23d5c84d36..3be1f7780b6 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.4
+          sdk: 3.5
       - name: Setup
         run: ./tool/setup.sh
 
diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml
index 0fc1a2dbf92..298cb1dc1d0 100644
--- a/.github/workflows/generate.yaml
+++ b/.github/workflows/generate.yaml
@@ -40,7 +40,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.4
+          sdk: 3.5
       - name: Setup
         run: ./tool/setup.sh
 
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 92f31abafa9..4d03c819ee3 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -25,7 +25,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.4
+          sdk: 3.5
       - name: Setup
         run: ./tool/setup.sh
 
@@ -104,7 +104,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.4
+          sdk: 3.5
       - name: Setup
         run: ./tool/setup.sh
       - name: Build
diff --git a/.github/workflows/update_presets.yaml b/.github/workflows/update_presets.yaml
index c8facdf1f46..1950b961fad 100644
--- a/.github/workflows/update_presets.yaml
+++ b/.github/workflows/update_presets.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.4
+          sdk: 3.5
       - name: Setup
         run: ./tool/setup.sh
 
diff --git a/melos.yaml b/melos.yaml
index f34ba614d07..63c27aaec2d 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -36,6 +36,7 @@ scripts:
   format:check: dart format --output=none --set-exit-if-changed --line-length 120 .
   analyze: >
     dart analyze --fatal-infos . &&
+    rm -rf packages/neon_framework/example/linux/flutter/ephemeral/ &&
     dart run custom_lint --fatal-infos .
   test: >
     melos run test:dart &&
diff --git a/packages/neon_framework/example/pubspec.lock b/packages/neon_framework/example/pubspec.lock
index 89102372397..5356d362b11 100644
--- a/packages/neon_framework/example/pubspec.lock
+++ b/packages/neon_framework/example/pubspec.lock
@@ -5,18 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "67.0.0"
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.1"
+    version: "6.7.0"
   analyzer_plugin:
     dependency: transitive
     description:
@@ -244,26 +249,26 @@ packages:
     dependency: "direct dev"
     description:
       name: custom_lint
-      sha256: "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799"
+      sha256: "4939d89e580c36215e48a7de8fd92f22c79dcc3eb11fda84f3402b3b45aec663"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   custom_lint_builder:
     dependency: transitive
     description:
       name: custom_lint_builder
-      sha256: d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9
+      sha256: d9e5bb63ed52c1d006f5a1828992ba6de124c27a531e8fba0a31afffa81621b3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   custom_lint_core:
     dependency: transitive
     description:
       name: custom_lint_core
-      sha256: a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6
+      sha256: "4ddbbdaa774265de44c97054dcec058a83d9081d071785ece601e348c18c267d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.5"
   dart_style:
     dependency: transitive
     description:
@@ -749,18 +754,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -785,6 +790,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
   markdown:
     dependency: transitive
     description:
@@ -805,18 +818,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
@@ -1182,10 +1195,10 @@ packages:
     dependency: transitive
     description:
       name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
       url: "https://pub.dev"
     source: hosted
-    version: "0.27.7"
+    version: "0.28.0"
   screen_retriever:
     dependency: transitive
     description:
@@ -1401,10 +1414,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2"
   timezone:
     dependency: transitive
     description:
@@ -1577,10 +1590,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.5"
   wakelock_plus:
     dependency: transitive
     description:
diff --git a/packages/neon_framework/example/pubspec.yaml b/packages/neon_framework/example/pubspec.yaml
index 06e22338684..dd68670eac8 100644
--- a/packages/neon_framework/example/pubspec.yaml
+++ b/packages/neon_framework/example/pubspec.yaml
@@ -41,7 +41,7 @@ dependencies:
   vector_graphics: any
 
 dev_dependencies:
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   neon_lints:
     git:
       url: https://github.com/nextcloud/neon
diff --git a/packages/neon_framework/lib/l10n/localizations.dart b/packages/neon_framework/lib/l10n/localizations.dart
index e6d35f53533..037e2200da9 100644
--- a/packages/neon_framework/lib/l10n/localizations.dart
+++ b/packages/neon_framework/lib/l10n/localizations.dart
@@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
+// ignore_for_file: type=lint
+
 /// Callers can lookup localized strings with an instance of NeonLocalizations
 /// returned by `NeonLocalizations.of(context)`.
 ///
diff --git a/packages/neon_framework/lib/l10n/localizations_en.dart b/packages/neon_framework/lib/l10n/localizations_en.dart
index 095105424c5..01215946372 100644
--- a/packages/neon_framework/lib/l10n/localizations_en.dart
+++ b/packages/neon_framework/lib/l10n/localizations_en.dart
@@ -2,6 +2,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations.dart';
 
+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class NeonLocalizationsEn extends NeonLocalizations {
   NeonLocalizationsEn([String locale = 'en']) : super(locale);
diff --git a/packages/neon_framework/lib/src/app.dart b/packages/neon_framework/lib/src/app.dart
index 3a144d24c81..029807f986d 100644
--- a/packages/neon_framework/lib/src/app.dart
+++ b/packages/neon_framework/lib/src/app.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:built_collection/built_collection.dart';
-import 'package:collection/collection.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
@@ -219,7 +218,7 @@ class _NeonAppState extends State<NeonApp> with WidgetsBindingObserver, WindowLi
                   deviceThemeLight: deviceThemeLight,
                   deviceThemeDark: deviceThemeDark,
                   oledAsDark: options.themeOLEDAsDark.value,
-                  appThemes: _appImplementations.map((a) => a.theme).whereNotNull(),
+                  appThemes: _appImplementations.map((a) => a.theme).nonNulls,
                   neonTheme: widget.neonTheme,
                 );
 
diff --git a/packages/neon_framework/lib/src/pages/home.dart b/packages/neon_framework/lib/src/pages/home.dart
index 488effcaea2..8e1f16c55d6 100644
--- a/packages/neon_framework/lib/src/pages/home.dart
+++ b/packages/neon_framework/lib/src/pages/home.dart
@@ -63,14 +63,18 @@ class _HomePageState extends State<HomePage> {
     });
 
     maintenanceModeErrorsSubscription = maintenanceModeBloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
 
     maintenanceModeSubscription = maintenanceModeBloc.onMaintenanceMode.listen((_) async {
-      await showErrorDialog(
-        context: context,
-        message: NeonLocalizations.of(context).errorServerInMaintenanceMode,
-      );
+      if (mounted) {
+        await showErrorDialog(
+          context: context,
+          message: NeonLocalizations.of(context).errorServerInMaintenanceMode,
+        );
+      }
     });
 
     GlobalPopups().register(context);
diff --git a/packages/neon_framework/lib/src/pages/login_flow.dart b/packages/neon_framework/lib/src/pages/login_flow.dart
index 6ac2ae7c433..8c173438282 100644
--- a/packages/neon_framework/lib/src/pages/login_flow.dart
+++ b/packages/neon_framework/lib/src/pages/login_flow.dart
@@ -43,11 +43,13 @@ class _LoginFlowPageState extends State<LoginFlowPage> {
     });
 
     resultSubscription = bloc.result.listen((result) async {
-      await LoginCheckAccountRoute(
-        serverUrl: Uri.parse(result.server),
-        loginName: result.loginName,
-        password: result.appPassword,
-      ).push<LoginCheckAccountRoute>(context);
+      if (mounted) {
+        await LoginCheckAccountRoute(
+          serverUrl: Uri.parse(result.server),
+          loginName: result.loginName,
+          password: result.appPassword,
+        ).push<LoginCheckAccountRoute>(context);
+      }
     });
   }
 
diff --git a/packages/neon_framework/lib/src/utils/global_options.dart b/packages/neon_framework/lib/src/utils/global_options.dart
index 7c067260952..a844099185a 100644
--- a/packages/neon_framework/lib/src/utils/global_options.dart
+++ b/packages/neon_framework/lib/src/utils/global_options.dart
@@ -190,7 +190,7 @@ class GlobalOptions extends OptionsCollection {
   /// Defaults to `false`.
   ///
   /// See:
-  ///   * [minimizeInsteadOfExit]: for an option to minimize instead of closing the app.
+  ///   * [startupMinimizeInsteadOfExit]: for an option to minimize instead of closing the app.
   late final startupMinimized = ToggleOption(
     storage: storage,
     key: GlobalOptionKeys.startupMinimized,
diff --git a/packages/neon_framework/lib/src/widgets/drawer.dart b/packages/neon_framework/lib/src/widgets/drawer.dart
index 40133537bdc..d66f42652aa 100644
--- a/packages/neon_framework/lib/src/widgets/drawer.dart
+++ b/packages/neon_framework/lib/src/widgets/drawer.dart
@@ -87,8 +87,8 @@ class _NeonDrawerState extends State<NeonDrawer> {
 
 /// Custom styled [DrawerHeader] used inside a [Drawer] or [NeonDrawer].
 ///
-/// The neon drawer will display the [core.ThemingPublicCapabilities_Theming.name]
-/// and [core.ThemingPublicCapabilities_Theming.logo] and automatically rebuild
+/// The neon drawer will display the [core.$ThemingPublicCapabilities_ThemingInterface.name]
+/// and [core.$ThemingPublicCapabilities_ThemingInterface.logo] and automatically rebuild
 /// when the current theme changes.
 @internal
 class NeonDrawerHeader extends StatelessWidget {
diff --git a/packages/neon_framework/packages/account_repository/pubspec.yaml b/packages/neon_framework/packages/account_repository/pubspec.yaml
index b322cdf6a39..fd05e66fdb9 100644
--- a/packages/neon_framework/packages/account_repository/pubspec.yaml
+++ b/packages/neon_framework/packages/account_repository/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework/packages/neon_http_client
   nextcloud: ^7.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
 
 dev_dependencies:
   build_runner: ^2.4.11
diff --git a/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart
index deb5cdab3fa..b06701202ea 100644
--- a/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart
+++ b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart
@@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
+// ignore_for_file: type=lint
+
 /// Callers can lookup localized strings with an instance of DashboardLocalizations
 /// returned by `DashboardLocalizations.of(context)`.
 ///
diff --git a/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart
index 16bfcbf4f9a..d13435f789b 100644
--- a/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart
+++ b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart
@@ -2,6 +2,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations.dart';
 
+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class DashboardLocalizationsEn extends DashboardLocalizations {
   DashboardLocalizationsEn([String locale = 'en']) : super(locale);
diff --git a/packages/neon_framework/packages/dashboard_app/pubspec.yaml b/packages/neon_framework/packages/dashboard_app/pubspec.yaml
index 702e89d9d52..baf7e67148c 100644
--- a/packages/neon_framework/packages/dashboard_app/pubspec.yaml
+++ b/packages/neon_framework/packages/dashboard_app/pubspec.yaml
@@ -21,11 +21,11 @@ dependencies:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework
   nextcloud: ^7.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
 
 dev_dependencies:
   build_runner: ^2.4.11
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   flutter_test:
     sdk: flutter
   go_router_builder: ^2.7.1
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget.png
index fbdb0b0267b..9f58dcf4a8e 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png
index 0d3b4d0dc5d..8e4bc4cd23c 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png
index 0d3b4d0dc5d..8e4bc4cd23c 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png
index 0d3b4d0dc5d..8e4bc4cd23c 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png
index acbf30e4ebf..9ee54757718 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png
index acbf30e4ebf..9ee54757718 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png
index fbdb0b0267b..9f58dcf4a8e 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png
index d15936a4e86..ab79b9e3d33 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png
index d15936a4e86..ab79b9e3d33 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png
index 09c8948b3c4..1eab6f916d0 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png
index 6fd2c6da101..62c98f5d660 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png
index 77c606be8d6..ef34d7a397f 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png differ
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png
index 14b24fc1200..c6f0dd8af9e 100644
Binary files a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png and b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png differ
diff --git a/packages/neon_framework/packages/files_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/files_app/lib/l10n/localizations.dart
index 49ef82530c2..86b39353a68 100644
--- a/packages/neon_framework/packages/files_app/lib/l10n/localizations.dart
+++ b/packages/neon_framework/packages/files_app/lib/l10n/localizations.dart
@@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
+// ignore_for_file: type=lint
+
 /// Callers can lookup localized strings with an instance of FilesLocalizations
 /// returned by `FilesLocalizations.of(context)`.
 ///
diff --git a/packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart
index 7bffc39274d..69dd3ccebf0 100644
--- a/packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart
+++ b/packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart
@@ -1,5 +1,7 @@
 import 'localizations.dart';
 
+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class FilesLocalizationsEn extends FilesLocalizations {
   FilesLocalizationsEn([String locale = 'en']) : super(locale);
diff --git a/packages/neon_framework/packages/files_app/lib/src/pages/main.dart b/packages/neon_framework/packages/files_app/lib/src/pages/main.dart
index fa11217983d..7aec5ce36d8 100644
--- a/packages/neon_framework/packages/files_app/lib/src/pages/main.dart
+++ b/packages/neon_framework/packages/files_app/lib/src/pages/main.dart
@@ -31,7 +31,9 @@ class _FilesMainPageState extends State<FilesMainPage> {
     bloc = NeonProvider.of<FilesBloc>(context);
 
     errorsSubscription = bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
   }
 
diff --git a/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart b/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart
index d193c93ebbe..fb41c934959 100644
--- a/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart
+++ b/packages/neon_framework/packages/files_app/lib/src/widgets/browser_view.dart
@@ -56,7 +56,9 @@ class _FilesBrowserViewState extends State<FilesBrowserView> {
     );
 
     errorsSubscription = bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
 
     super.initState();
diff --git a/packages/neon_framework/packages/files_app/pubspec.yaml b/packages/neon_framework/packages/files_app/pubspec.yaml
index 2549ca277d2..d136d9b91c8 100644
--- a/packages/neon_framework/packages/files_app/pubspec.yaml
+++ b/packages/neon_framework/packages/files_app/pubspec.yaml
@@ -31,14 +31,14 @@ dependencies:
   path: ^1.0.0
   path_provider: ^2.0.0
   queue: ^3.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
   share_plus: ^10.0.0
   timezone: ^0.9.4
   universal_io: ^2.0.0
 
 dev_dependencies:
   build_runner: ^2.4.11
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   go_router_builder: ^2.7.1
   neon_lints:
     git:
diff --git a/packages/neon_framework/packages/news_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/news_app/lib/l10n/localizations.dart
index 8b5e07a1a81..3b2c4768c59 100644
--- a/packages/neon_framework/packages/news_app/lib/l10n/localizations.dart
+++ b/packages/neon_framework/packages/news_app/lib/l10n/localizations.dart
@@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
+// ignore_for_file: type=lint
+
 /// Callers can lookup localized strings with an instance of NewsLocalizations
 /// returned by `NewsLocalizations.of(context)`.
 ///
diff --git a/packages/neon_framework/packages/news_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/news_app/lib/l10n/localizations_en.dart
index 3a9cae952b0..16c48ac9375 100644
--- a/packages/neon_framework/packages/news_app/lib/l10n/localizations_en.dart
+++ b/packages/neon_framework/packages/news_app/lib/l10n/localizations_en.dart
@@ -1,5 +1,7 @@
 import 'localizations.dart';
 
+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class NewsLocalizationsEn extends NewsLocalizations {
   NewsLocalizationsEn([String locale = 'en']) : super(locale);
diff --git a/packages/neon_framework/packages/news_app/lib/src/pages/article.dart b/packages/neon_framework/packages/news_app/lib/src/pages/article.dart
index a59d0d8eba9..edb8045b594 100644
--- a/packages/neon_framework/packages/news_app/lib/src/pages/article.dart
+++ b/packages/neon_framework/packages/news_app/lib/src/pages/article.dart
@@ -47,7 +47,9 @@ class _NewsArticlePageState extends State<NewsArticlePage> {
     super.initState();
 
     errorsSubscription = widget.bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
diff --git a/packages/neon_framework/packages/news_app/lib/src/pages/main.dart b/packages/neon_framework/packages/news_app/lib/src/pages/main.dart
index 53ebab8849d..d862fe7c945 100644
--- a/packages/neon_framework/packages/news_app/lib/src/pages/main.dart
+++ b/packages/neon_framework/packages/news_app/lib/src/pages/main.dart
@@ -34,7 +34,9 @@ class _NewsMainPageState extends State<NewsMainPage> {
     index = NeonProvider.of<NewsOptions>(context).defaultCategoryOption.value.index;
 
     errorsSubscription = bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
   }
 
diff --git a/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart b/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart
index 6204bc84067..80e53b0df63 100644
--- a/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart
+++ b/packages/neon_framework/packages/news_app/lib/src/widgets/articles_view.dart
@@ -48,7 +48,9 @@ class _NewsArticlesViewState extends State<NewsArticlesView> {
     super.initState();
 
     errorsSubscription = widget.bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
 
     options = NeonProvider.of<NewsOptions>(context);
diff --git a/packages/neon_framework/packages/news_app/pubspec.yaml b/packages/neon_framework/packages/news_app/pubspec.yaml
index 2fb2ad9cdc3..8f362830f91 100644
--- a/packages/neon_framework/packages/news_app/pubspec.yaml
+++ b/packages/neon_framework/packages/news_app/pubspec.yaml
@@ -24,7 +24,7 @@ dependencies:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework
   nextcloud: ^7.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
   share_plus: ^10.0.0
   timezone: ^0.9.4
   wakelock_plus: ^1.0.0
@@ -32,7 +32,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.4.11
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   go_router_builder: ^2.7.1
   neon_lints:
     git:
diff --git a/packages/neon_framework/packages/notes_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/notes_app/lib/l10n/localizations.dart
index 23121431dfc..d4c6c35c6d9 100644
--- a/packages/neon_framework/packages/notes_app/lib/l10n/localizations.dart
+++ b/packages/neon_framework/packages/notes_app/lib/l10n/localizations.dart
@@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
+// ignore_for_file: type=lint
+
 /// Callers can lookup localized strings with an instance of NotesLocalizations
 /// returned by `NotesLocalizations.of(context)`.
 ///
diff --git a/packages/neon_framework/packages/notes_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/notes_app/lib/l10n/localizations_en.dart
index b8e077f75fc..efe926ce6fc 100644
--- a/packages/neon_framework/packages/notes_app/lib/l10n/localizations_en.dart
+++ b/packages/neon_framework/packages/notes_app/lib/l10n/localizations_en.dart
@@ -1,5 +1,7 @@
 import 'localizations.dart';
 
+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class NotesLocalizationsEn extends NotesLocalizations {
   NotesLocalizationsEn([String locale = 'en']) : super(locale);
diff --git a/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart b/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart
index 29e5af394f1..414d5530b1f 100644
--- a/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart
+++ b/packages/neon_framework/packages/notes_app/lib/src/pages/main.dart
@@ -34,7 +34,9 @@ class _NotesMainPageState extends State<NotesMainPage> {
     index = NeonProvider.of<NotesOptions>(context).defaultCategoryOption.value.index;
 
     errorsSubscription = bloc.errors.listen((error) {
-      handleNotesException(context, error);
+      if (mounted) {
+        handleNotesException(context, error);
+      }
     });
   }
 
diff --git a/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart b/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart
index f6a226ee27b..78fd8dfabdc 100644
--- a/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart
+++ b/packages/neon_framework/packages/notes_app/lib/src/pages/note.dart
@@ -49,7 +49,9 @@ class _NotesNotePageState extends State<NotesNotePage> {
     super.initState();
 
     errorsSubscription = widget.bloc.errors.listen((error) {
-      handleNotesException(context, error);
+      if (mounted) {
+        handleNotesException(context, error);
+      }
     });
 
     _contentController.text = widget.bloc.initialContent;
diff --git a/packages/neon_framework/packages/notes_app/pubspec.yaml b/packages/neon_framework/packages/notes_app/pubspec.yaml
index 38e1fe16687..a90199d1003 100644
--- a/packages/neon_framework/packages/notes_app/pubspec.yaml
+++ b/packages/neon_framework/packages/notes_app/pubspec.yaml
@@ -25,13 +25,13 @@ dependencies:
       path: packages/neon_framework
   nextcloud: ^7.0.0
   queue: ^3.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
   timezone: ^0.9.4
   wakelock_plus: ^1.0.0
 
 dev_dependencies:
   build_runner: ^2.4.11
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   go_router_builder: ^2.7.1
   neon_lints:
     git:
diff --git a/packages/neon_framework/packages/notifications_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/notifications_app/lib/l10n/localizations.dart
index cbbe32f82f4..95bc2230fd6 100644
--- a/packages/neon_framework/packages/notifications_app/lib/l10n/localizations.dart
+++ b/packages/neon_framework/packages/notifications_app/lib/l10n/localizations.dart
@@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
+// ignore_for_file: type=lint
+
 /// Callers can lookup localized strings with an instance of NotificationsLocalizations
 /// returned by `NotificationsLocalizations.of(context)`.
 ///
diff --git a/packages/neon_framework/packages/notifications_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/notifications_app/lib/l10n/localizations_en.dart
index 6f891a93bea..28d59684b9b 100644
--- a/packages/neon_framework/packages/notifications_app/lib/l10n/localizations_en.dart
+++ b/packages/neon_framework/packages/notifications_app/lib/l10n/localizations_en.dart
@@ -1,5 +1,7 @@
 import 'localizations.dart';
 
+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class NotificationsLocalizationsEn extends NotificationsLocalizations {
   NotificationsLocalizationsEn([String locale = 'en']) : super(locale);
diff --git a/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart b/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart
index 09b8f70b37a..b27fbaf06e6 100644
--- a/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart
+++ b/packages/neon_framework/packages/notifications_app/lib/src/pages/main.dart
@@ -30,7 +30,9 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
     bloc = NeonProvider.of<NotificationsBlocInterface>(context) as NotificationsBloc;
 
     errorsSubscription = bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
   }
 
diff --git a/packages/neon_framework/packages/notifications_app/pubspec.yaml b/packages/neon_framework/packages/notifications_app/pubspec.yaml
index 4ecc46ec0f2..cab14d79a01 100644
--- a/packages/neon_framework/packages/notifications_app/pubspec.yaml
+++ b/packages/neon_framework/packages/notifications_app/pubspec.yaml
@@ -24,12 +24,12 @@ dependencies:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework
   nextcloud: ^7.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
   timezone: ^0.9.4
 
 dev_dependencies:
   build_runner: ^2.4.11
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   flutter_test:
     sdk: flutter
   go_router_builder: ^2.7.1
diff --git a/packages/neon_framework/packages/notifications_app/test/goldens/action_primary.png b/packages/neon_framework/packages/notifications_app/test/goldens/action_primary.png
index d469c9cf924..7da236498f0 100644
Binary files a/packages/neon_framework/packages/notifications_app/test/goldens/action_primary.png and b/packages/neon_framework/packages/notifications_app/test/goldens/action_primary.png differ
diff --git a/packages/neon_framework/packages/notifications_app/test/goldens/action_secondary.png b/packages/neon_framework/packages/notifications_app/test/goldens/action_secondary.png
index 0901ee6ff9f..1579c24aea2 100644
Binary files a/packages/neon_framework/packages/notifications_app/test/goldens/action_secondary.png and b/packages/neon_framework/packages/notifications_app/test/goldens/action_secondary.png differ
diff --git a/packages/neon_framework/packages/notifications_app/test/goldens/main_page_error.png b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_error.png
index 5caf53d77a1..0c46c07baf7 100644
Binary files a/packages/neon_framework/packages/notifications_app/test/goldens/main_page_error.png and b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_error.png differ
diff --git a/packages/neon_framework/packages/notifications_app/test/goldens/main_page_with_notifications.png b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_with_notifications.png
index 273476745e8..f5efe1fb436 100644
Binary files a/packages/neon_framework/packages/notifications_app/test/goldens/main_page_with_notifications.png and b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_with_notifications.png differ
diff --git a/packages/neon_framework/packages/notifications_app/test/goldens/main_page_without_notifications.png b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_without_notifications.png
index 48ef7f2bee8..01fb9fc732b 100644
Binary files a/packages/neon_framework/packages/notifications_app/test/goldens/main_page_without_notifications.png and b/packages/neon_framework/packages/notifications_app/test/goldens/main_page_without_notifications.png differ
diff --git a/packages/neon_framework/packages/notifications_app/test/goldens/notification.png b/packages/neon_framework/packages/notifications_app/test/goldens/notification.png
index 463cd3ee4f9..3f18e53a8a9 100644
Binary files a/packages/neon_framework/packages/notifications_app/test/goldens/notification.png and b/packages/neon_framework/packages/notifications_app/test/goldens/notification.png differ
diff --git a/packages/neon_framework/packages/talk_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/talk_app/lib/l10n/localizations.dart
index 78c77d23739..36689ccd382 100644
--- a/packages/neon_framework/packages/talk_app/lib/l10n/localizations.dart
+++ b/packages/neon_framework/packages/talk_app/lib/l10n/localizations.dart
@@ -7,6 +7,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
+// ignore_for_file: type=lint
+
 /// Callers can lookup localized strings with an instance of TalkLocalizations
 /// returned by `TalkLocalizations.of(context)`.
 ///
diff --git a/packages/neon_framework/packages/talk_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/talk_app/lib/l10n/localizations_en.dart
index 5fbffd304a8..472ae198a5c 100644
--- a/packages/neon_framework/packages/talk_app/lib/l10n/localizations_en.dart
+++ b/packages/neon_framework/packages/talk_app/lib/l10n/localizations_en.dart
@@ -2,6 +2,8 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations.dart';
 
+// ignore_for_file: type=lint
+
 /// The translations for English (`en`).
 class TalkLocalizationsEn extends TalkLocalizations {
   TalkLocalizationsEn([String locale = 'en']) : super(locale);
diff --git a/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart b/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart
index eba2449e683..23eb5755a65 100644
--- a/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart
+++ b/packages/neon_framework/packages/talk_app/lib/src/pages/main.dart
@@ -40,7 +40,9 @@ class _TalkMainPageState extends State<TalkMainPage> {
 
     bloc = NeonProvider.of<TalkBloc>(context);
     errorsSubscription = bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
   }
 
diff --git a/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart
index 567efd3b5a7..9d7fb0639e6 100644
--- a/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart
+++ b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart
@@ -38,7 +38,9 @@ class _TalkRoomPageState extends State<TalkRoomPage> {
     bloc = NeonProvider.of<TalkRoomBloc>(context);
 
     errorsSubscription = bloc.errors.listen((error) {
-      NeonError.showSnackbar(context, error);
+      if (mounted) {
+        NeonError.showSnackbar(context, error);
+      }
     });
   }
 
diff --git a/packages/neon_framework/packages/talk_app/pubspec.yaml b/packages/neon_framework/packages/talk_app/pubspec.yaml
index 725ef574494..2d61275c988 100644
--- a/packages/neon_framework/packages/talk_app/pubspec.yaml
+++ b/packages/neon_framework/packages/talk_app/pubspec.yaml
@@ -26,12 +26,12 @@ dependencies:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework
   nextcloud: ^7.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
   timezone: ^0.9.4
 
 dev_dependencies:
   build_runner: ^2.4.11
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   flutter_keyboard_visibility: ^6.0.0
   flutter_test:
     sdk: flutter
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/main_page_error.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_error.png
index 5caf53d77a1..0c46c07baf7 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/main_page_error.png and b/packages/neon_framework/packages/talk_app/test/goldens/main_page_error.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_with_unread_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_with_unread_messages.png
index e60654fba5e..3b7f6709f49 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_with_unread_messages.png and b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_with_unread_messages.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_other.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_other.png
index d272732e377..06cd93a9bcf 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_other.png and b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_other.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_self.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_self.png
index abd07899f07..2cad937b1d2 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_self.png and b/packages/neon_framework/packages/talk_app/test/goldens/main_page_with_message_preview_without_unread_messages_self.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/main_page_without_message_preview.png b/packages/neon_framework/packages/talk_app/test/goldens/main_page_without_message_preview.png
index 6a2d783debc..f2c53e92e3e 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/main_page_without_message_preview.png and b/packages/neon_framework/packages/talk_app/test/goldens/main_page_without_message_preview.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_deleted.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_deleted.png
index 23caf646131..ea4ae37ea28 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_deleted.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_deleted.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_other.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_other.png
index d81d38f4161..d3a0416404f 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_other.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_other.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_self.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_self.png
index 1e18fbfa700..0a27836d40e 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_self.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_self.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_actor.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_actor.png
index b3132832a55..985d9f5f470 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_actor.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_actor.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_edited.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_edited.png
index c45e226e4c9..b1692f079e6 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_edited.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_edited.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_system_message.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_system_message.png
index b3132832a55..985d9f5f470 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_system_message.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_system_message.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_time.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_time.png
index b3132832a55..985d9f5f470 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_time.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_separate_time.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_parent.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_parent.png
index 48295707211..ed93844a206 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_parent.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_parent.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_references.png b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_references.png
index cd6a8dadbb1..b526ddaf5ea 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_references.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_comment_message_with_references.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_input_edit.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_edit.png
index d4c496864e1..ae2eaeed9d2 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_input_edit.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_input_edit.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_input_emoji.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_emoji.png
index 0eaa801b323..8b8d21cdcab 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_input_emoji.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_input_emoji.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_input_mention_suggestions.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_mention_suggestions.png
index 912d5ec406f..7b2cab4680a 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_input_mention_suggestions.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_input_mention_suggestions.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_input_multiline.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_multiline.png
index c5a42485fcb..285f74b199e 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_input_multiline.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_input_multiline.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_input_no_emoji_button.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_no_emoji_button.png
index e8cd0eb7faf..05a6d47a07f 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_input_no_emoji_button.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_input_no_emoji_button.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_input_reply.png b/packages/neon_framework/packages/talk_app/test/goldens/message_input_reply.png
index 37a705e390d..2ebacf69d56 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_input_reply.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_input_reply.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/message_parent_message.png b/packages/neon_framework/packages/talk_app/test/goldens/message_parent_message.png
index 202f7b054f3..8c16b3f6641 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/message_parent_message.png and b/packages/neon_framework/packages/talk_app/test/goldens/message_parent_message.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/reactions.png b/packages/neon_framework/packages/talk_app/test/goldens/reactions.png
index eaa78d92bb8..8ec35e05334 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/reactions.png and b/packages/neon_framework/packages/talk_app/test/goldens/reactions.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/reference_preview.png b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview.png
index ffc91e12388..3fc532a3f49 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/reference_preview.png and b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_description.png b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_description.png
index e93e9a4091c..f90f9fe825f 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_description.png and b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_description.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_thumb.png b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_thumb.png
index c825cb7995c..b23b3f6ae78 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_thumb.png and b/packages/neon_framework/packages/talk_app/test/goldens/reference_preview_with_thumb.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_deck_card.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_deck_card.png
index d920543988b..990fc7bc025 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_deck_card.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_deck_card.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_with_icon.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_with_icon.png
index 50b267d0da9..8f9b2cdac14 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_with_icon.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_with_icon.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_without_icon.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_without_icon.png
index f0b6a9641b1..9e9d90e41ab 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_without_icon.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_fallback_without_icon.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_file_without_preview.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_file_without_preview.png
index a07f44a8a77..d3fc2f32fe8 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_file_without_preview.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_file_without_preview.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_call.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_call.png
index cdee51b9028..1724d971665 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_call.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_call.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_highlight.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_highlight.png
index 30cf6a6cd87..17d4d24f29a 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_highlight.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_highlight.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_other.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_other.png
index 77af0489258..e06c6f4f789 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_other.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_group_other.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_guest.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_guest.png
index 77af0489258..e06c6f4f789 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_guest.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_guest.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_highlight.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_highlight.png
index 30cf6a6cd87..17d4d24f29a 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_highlight.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_highlight.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_other.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_other.png
index 77af0489258..e06c6f4f789 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_other.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user-group_other.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_highlight.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_highlight.png
index cdee51b9028..1724d971665 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_highlight.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_highlight.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_other.png b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_other.png
index c355bc6744a..28ce2fb4137 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_other.png and b/packages/neon_framework/packages/talk_app/test/goldens/rich_object_mention_user_other.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/room_page_error.png b/packages/neon_framework/packages/talk_app/test/goldens/room_page_error.png
index 5a3b486d4e5..dee9b1c35e5 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/room_page_error.png and b/packages/neon_framework/packages/talk_app/test/goldens/room_page_error.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/room_page_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/room_page_messages.png
index 87fe40a3174..4c3596bf5bc 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/room_page_messages.png and b/packages/neon_framework/packages/talk_app/test/goldens/room_page_messages.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/room_page_read_only.png b/packages/neon_framework/packages/talk_app/test/goldens/room_page_read_only.png
index af0268c19e7..4d4b8fc7a34 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/room_page_read_only.png and b/packages/neon_framework/packages/talk_app/test/goldens/room_page_read_only.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention.png
index a6f3df3e56d..6a45323a9b2 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention.png and b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention_direct.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention_direct.png
index cb34c588874..09d367c569b 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention_direct.png and b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_mention_direct.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_messages.png
index ea9b5cf9d95..903c89c1dd6 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_messages.png and b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_messages.png differ
diff --git a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_single_user_messages.png b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_single_user_messages.png
index a6f3df3e56d..6a45323a9b2 100644
Binary files a/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_single_user_messages.png and b/packages/neon_framework/packages/talk_app/test/goldens/unread_indicator_unread_single_user_messages.png differ
diff --git a/packages/neon_framework/pubspec.yaml b/packages/neon_framework/pubspec.yaml
index dfe6daef271..f6fc2e598fb 100644
--- a/packages/neon_framework/pubspec.yaml
+++ b/packages/neon_framework/pubspec.yaml
@@ -50,7 +50,7 @@ dependencies:
   permission_handler: ^11.0.0
   provider: ^6.0.0
   quick_actions: ^1.0.0
-  rxdart: ^0.27.0
+  rxdart: ^0.28.0
   scrollable_positioned_list: ^0.3.0
   shared_preferences_platform_interface: ^2.3.2
   sort_box:
@@ -77,7 +77,7 @@ dev_dependencies:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/cookie_store_conformance_tests
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   flutter_test:
     sdk: flutter
   go_router_builder: ^2.7.1
diff --git a/packages/neon_framework/test/goldens/neon_server_icon_nextcloud_logo.png b/packages/neon_framework/test/goldens/neon_server_icon_nextcloud_logo.png
index 8cf8d9483d3..15887fb05bf 100644
Binary files a/packages/neon_framework/test/goldens/neon_server_icon_nextcloud_logo.png and b/packages/neon_framework/test/goldens/neon_server_icon_nextcloud_logo.png differ
diff --git a/packages/neon_framework/test/goldens/nextcloud_logo.png b/packages/neon_framework/test/goldens/nextcloud_logo.png
index a4dd2c2ecdb..9d963a8ed63 100644
Binary files a/packages/neon_framework/test/goldens/nextcloud_logo.png and b/packages/neon_framework/test/goldens/nextcloud_logo.png differ
diff --git a/packages/neon_framework/test/goldens/user_status_dialog.png b/packages/neon_framework/test/goldens/user_status_dialog.png
index 13e34aa279d..d01aab83cef 100644
Binary files a/packages/neon_framework/test/goldens/user_status_dialog.png and b/packages/neon_framework/test/goldens/user_status_dialog.png differ
diff --git a/packages/neon_lints/example/pubspec.yaml b/packages/neon_lints/example/pubspec.yaml
index f888109048c..75ba3fc9da1 100644
--- a/packages/neon_lints/example/pubspec.yaml
+++ b/packages/neon_lints/example/pubspec.yaml
@@ -11,7 +11,7 @@ dependencies:
   nextcloud: ^7.0.0
 
 dev_dependencies:
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   flutter_test:
     sdk: flutter
   meta: ^1.11.0
diff --git a/packages/neon_lints/lib/src/avoid_dart_html.dart b/packages/neon_lints/lib/src/avoid_dart_html.dart
index c792266267b..549e9b8b41c 100644
--- a/packages/neon_lints/lib/src/avoid_dart_html.dart
+++ b/packages/neon_lints/lib/src/avoid_dart_html.dart
@@ -20,8 +20,7 @@ final class AvoidDartHTML extends DartLintRule {
   ) {
     context.registry.addImportDirective((node) {
       if (node.uri.stringValue == 'dart:html') {
-        // ignore: deprecated_member_use
-        reporter.reportErrorForToken(code, node.beginToken);
+        reporter.atToken(node.beginToken, _code);
       }
     });
   }
diff --git a/packages/neon_lints/lib/src/avoid_dart_io.dart b/packages/neon_lints/lib/src/avoid_dart_io.dart
index a4608fee682..0e33970434e 100644
--- a/packages/neon_lints/lib/src/avoid_dart_io.dart
+++ b/packages/neon_lints/lib/src/avoid_dart_io.dart
@@ -20,8 +20,7 @@ final class AvoidDartIO extends DartLintRule {
   ) {
     context.registry.addImportDirective((node) {
       if (node.uri.stringValue == 'dart:io') {
-        // ignore: deprecated_member_use
-        reporter.reportErrorForToken(code, node.beginToken);
+        reporter.atToken(node.beginToken, _code);
       }
     });
   }
diff --git a/packages/neon_lints/lib/src/avoid_debug_print.dart b/packages/neon_lints/lib/src/avoid_debug_print.dart
index 1b6424beefd..d56ae192650 100644
--- a/packages/neon_lints/lib/src/avoid_debug_print.dart
+++ b/packages/neon_lints/lib/src/avoid_debug_print.dart
@@ -41,8 +41,7 @@ if unsure about the logging level to use.
     context.registry.addInvocationExpression((node) {
       final element = node.function;
       if (element case Identifier(:final name) when name.startsWith(_debugPrint)) {
-        // ignore: deprecated_member_use
-        reporter.reportErrorForToken(code, node.beginToken);
+        reporter.atToken(node.beginToken, _code);
       }
     });
   }
diff --git a/packages/neon_lints/lib/src/avoid_exports.dart b/packages/neon_lints/lib/src/avoid_exports.dart
index e003f51f836..ca6b8ee6d1d 100644
--- a/packages/neon_lints/lib/src/avoid_exports.dart
+++ b/packages/neon_lints/lib/src/avoid_exports.dart
@@ -28,14 +28,12 @@ Neon clients should not have any public api other than the 'AppImplementation'.
   ) {
     context.registry.addAnnotation((node) {
       if (node.name case Identifier(name: _internal)) {
-        // ignore: deprecated_member_use
-        reporter.reportErrorForToken(code, node.beginToken);
+        reporter.atToken(node.beginToken, _code);
       }
     });
 
     context.registry.addExportDirective((node) {
-      // ignore: deprecated_member_use
-      reporter.reportErrorForToken(code, node.beginToken);
+      reporter.atToken(node.beginToken, _code);
     });
   }
 }
diff --git a/packages/neon_lints/lib/src/prefer_prefixed_nextcloud_import.dart b/packages/neon_lints/lib/src/prefer_prefixed_nextcloud_import.dart
index f21164604cd..169980c4baf 100644
--- a/packages/neon_lints/lib/src/prefer_prefixed_nextcloud_import.dart
+++ b/packages/neon_lints/lib/src/prefer_prefixed_nextcloud_import.dart
@@ -37,8 +37,7 @@ Use `import 'package:nextcloud/<id>.dart' as <id>;` instead.
         return;
       }
 
-      // ignore: deprecated_member_use
-      reporter.reportErrorForToken(code, node.beginToken);
+      reporter.atToken(node.beginToken, _code);
     });
   }
 }
diff --git a/packages/neon_lints/lib/src/prefer_pump_widget_with_accessibility.dart b/packages/neon_lints/lib/src/prefer_pump_widget_with_accessibility.dart
index f8510d5441e..f703d44d03f 100644
--- a/packages/neon_lints/lib/src/prefer_pump_widget_with_accessibility.dart
+++ b/packages/neon_lints/lib/src/prefer_pump_widget_with_accessibility.dart
@@ -24,8 +24,7 @@ Use 'pumpWidgetWithAccessibility' instead to perform automatic accessibility gui
   ) {
     context.registry.addInvocationExpression((node) {
       if (node.function.toSource() == _pumpWidget) {
-        // ignore: deprecated_member_use
-        reporter.reportErrorForToken(code, node.beginToken);
+        reporter.atToken(node.beginToken, _code);
       }
     });
   }
diff --git a/packages/neon_lints/pubspec.yaml b/packages/neon_lints/pubspec.yaml
index b296dda900f..7046babdca6 100644
--- a/packages/neon_lints/pubspec.yaml
+++ b/packages/neon_lints/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   analyzer: ^6.4.1
   analyzer_plugin: ^0.11.3
-  custom_lint_builder: ^0.6.2
+  custom_lint_builder: ^0.6.5
 
 dev_dependencies:
   lint_maker: ^0.2.1
diff --git a/pubspec.yaml b/pubspec.yaml
index a0fb9a6c3a1..1b6f25b1154 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,5 +9,5 @@ dev_dependencies:
   fvm: ^3.2.1
   husky: ^0.1.7
   melos: ^6.0.0
-  custom_lint: ^0.6.4
+  custom_lint: ^0.6.5
   coverage: ^1.9.2