diff --git a/packages/neon/neon/lib/src/blocs/apps.dart b/packages/neon/neon/lib/src/blocs/apps.dart
index e8c8b201..fdcba90c 100644
--- a/packages/neon/neon/lib/src/blocs/apps.dart
+++ b/packages/neon/neon/lib/src/blocs/apps.dart
@@ -16,7 +16,7 @@ import 'package:nextcloud/nextcloud.dart';
 import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart';
 
-abstract class AppsBlocEvents {
+abstract interface class AppsBlocEvents {
   /// Sets the active app using the [appID].
   ///
   /// If the app is already the active app nothing will happen.
@@ -24,7 +24,7 @@ abstract class AppsBlocEvents {
   void setActiveApp(final String appID, {final bool skipAlreadySet = false});
 }
 
-abstract class AppsBlocStates {
+abstract interface class AppsBlocStates {
   BehaviorSubject<Result<List<CoreNavigationEntry>>> get apps;
 
   BehaviorSubject<Result<Iterable<AppImplementation>>> get appImplementations;
diff --git a/packages/neon/neon/lib/src/blocs/capabilities.dart b/packages/neon/neon/lib/src/blocs/capabilities.dart
index bc6a2d43..4070c6f0 100644
--- a/packages/neon/neon/lib/src/blocs/capabilities.dart
+++ b/packages/neon/neon/lib/src/blocs/capabilities.dart
@@ -8,9 +8,9 @@ import 'package:neon/src/utils/request_manager.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 
-abstract class CapabilitiesBlocEvents {}
+abstract interface class CapabilitiesBlocEvents {}
 
-abstract class CapabilitiesBlocStates {
+abstract interface class CapabilitiesBlocStates {
   BehaviorSubject<Result<CoreOcsGetCapabilitiesResponseApplicationJson_Ocs_Data>> get capabilities;
 }
 
diff --git a/packages/neon/neon/lib/src/blocs/first_launch.dart b/packages/neon/neon/lib/src/blocs/first_launch.dart
index 2a0e9341..7d32a371 100644
--- a/packages/neon/neon/lib/src/blocs/first_launch.dart
+++ b/packages/neon/neon/lib/src/blocs/first_launch.dart
@@ -5,9 +5,9 @@ import 'package:neon/src/bloc/bloc.dart';
 import 'package:neon/src/settings/models/storage.dart';
 import 'package:rxdart/rxdart.dart';
 
-abstract class FirstLaunchBlocEvents {}
+abstract interface class FirstLaunchBlocEvents {}
 
-abstract class FirstLaunchBlocStates {
+abstract interface class FirstLaunchBlocStates {
   BehaviorSubject<void> get onFirstLaunch;
 }
 
diff --git a/packages/neon/neon/lib/src/blocs/login_flow.dart b/packages/neon/neon/lib/src/blocs/login_flow.dart
index 291907af..cd8d0d17 100644
--- a/packages/neon/neon/lib/src/blocs/login_flow.dart
+++ b/packages/neon/neon/lib/src/blocs/login_flow.dart
@@ -7,9 +7,9 @@ import 'package:neon/src/utils/user_agent.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 
-abstract class LoginFlowBlocEvents {}
+abstract interface class LoginFlowBlocEvents {}
 
-abstract class LoginFlowBlocStates {
+abstract interface class LoginFlowBlocStates {
   BehaviorSubject<Result<CoreLoginFlowV2>> get init;
 
   Stream<CoreLoginFlowV2Credentials> get result;
diff --git a/packages/neon/neon/lib/src/blocs/next_push.dart b/packages/neon/neon/lib/src/blocs/next_push.dart
index 4419d495..463cc32f 100644
--- a/packages/neon/neon/lib/src/blocs/next_push.dart
+++ b/packages/neon/neon/lib/src/blocs/next_push.dart
@@ -8,9 +8,9 @@ import 'package:neon/src/models/account.dart';
 import 'package:neon/src/utils/global_options.dart';
 import 'package:rxdart/rxdart.dart';
 
-abstract class NextPushBlocEvents {}
+abstract interface class NextPushBlocEvents {}
 
-abstract class NextPushBlocStates {
+abstract interface class NextPushBlocStates {
   BehaviorSubject<void> get onNextPushSupported;
 }
 
diff --git a/packages/neon/neon/lib/src/blocs/push_notifications.dart b/packages/neon/neon/lib/src/blocs/push_notifications.dart
index 2ab5e109..cc6c43d9 100644
--- a/packages/neon/neon/lib/src/blocs/push_notifications.dart
+++ b/packages/neon/neon/lib/src/blocs/push_notifications.dart
@@ -14,9 +14,9 @@ import 'package:neon/src/utils/push_utils.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:unifiedpush/unifiedpush.dart';
 
-abstract class PushNotificationsBlocEvents {}
+abstract interface class PushNotificationsBlocEvents {}
 
-abstract class PushNotificationsBlocStates {
+abstract interface class PushNotificationsBlocStates {
   Stream<PushNotification> get notifications;
 }
 
diff --git a/packages/neon/neon/lib/src/blocs/timer.dart b/packages/neon/neon/lib/src/blocs/timer.dart
index b839b414..a765202a 100644
--- a/packages/neon/neon/lib/src/blocs/timer.dart
+++ b/packages/neon/neon/lib/src/blocs/timer.dart
@@ -4,7 +4,7 @@ import 'dart:ui';
 import 'package:meta/meta.dart';
 import 'package:neon/src/bloc/bloc.dart';
 
-abstract class TimerBlocEvents {
+abstract interface class TimerBlocEvents {
   /// Register a [callback] that will be called periodically.
   /// The time between the executions is defined by the [duration].
   NeonTimer registerTimer(final Duration duration, final VoidCallback callback);
@@ -14,7 +14,7 @@ abstract class TimerBlocEvents {
   void unregisterTimer(final NeonTimer timer);
 }
 
-abstract class TimerBlocStates {}
+abstract interface class TimerBlocStates {}
 
 /// Execute callbacks at defined periodic intervals.
 /// Components can register their callbacks and everything with the same periodicity will be executed at the same time.
diff --git a/packages/neon/neon/lib/src/blocs/user_details.dart b/packages/neon/neon/lib/src/blocs/user_details.dart
index 8a528316..05d00a45 100644
--- a/packages/neon/neon/lib/src/blocs/user_details.dart
+++ b/packages/neon/neon/lib/src/blocs/user_details.dart
@@ -8,9 +8,9 @@ import 'package:neon/src/utils/request_manager.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 
-abstract class UserDetailsBlocEvents {}
+abstract interface class UserDetailsBlocEvents {}
 
-abstract class UserDetailsBlocStates {
+abstract interface class UserDetailsBlocStates {
   BehaviorSubject<Result<ProvisioningApiUserDetails>> get userDetails;
 }
 
diff --git a/packages/neon/neon/lib/src/blocs/user_statuses.dart b/packages/neon/neon/lib/src/blocs/user_statuses.dart
index 96213c1d..ee503caa 100644
--- a/packages/neon/neon/lib/src/blocs/user_statuses.dart
+++ b/packages/neon/neon/lib/src/blocs/user_statuses.dart
@@ -11,11 +11,11 @@ import 'package:nextcloud/nextcloud.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:window_manager/window_manager.dart';
 
-abstract class UserStatusesBlocEvents {
+abstract interface class UserStatusesBlocEvents {
   void load(final String username, {final bool force = false});
 }
 
-abstract class UserStatusesBlocStates {
+abstract interface class UserStatusesBlocStates {
   BehaviorSubject<Map<String, Result<UserStatusPublicInterface?>>> get statuses;
 }
 
diff --git a/packages/neon/neon_files/lib/blocs/browser.dart b/packages/neon/neon_files/lib/blocs/browser.dart
index ad00a6a6..ca54bb98 100644
--- a/packages/neon/neon_files/lib/blocs/browser.dart
+++ b/packages/neon/neon_files/lib/blocs/browser.dart
@@ -1,12 +1,12 @@
 part of '../neon_files.dart';
 
-abstract class FilesBrowserBlocEvents {
+abstract interface class FilesBrowserBlocEvents {
   void setPath(final List<String> path);
 
   void createFolder(final List<String> path);
 }
 
-abstract class FilesBrowserBlocStates {
+abstract interface class FilesBrowserBlocStates {
   BehaviorSubject<Result<List<WebDavFile>>> get files;
 
   BehaviorSubject<List<String>> get path;
diff --git a/packages/neon/neon_files/lib/blocs/files.dart b/packages/neon/neon_files/lib/blocs/files.dart
index c48ea9a0..56b43d1f 100644
--- a/packages/neon/neon_files/lib/blocs/files.dart
+++ b/packages/neon/neon_files/lib/blocs/files.dart
@@ -1,6 +1,6 @@
 part of '../neon_files.dart';
 
-abstract class FilesBlocEvents {
+abstract interface class FilesBlocEvents {
   void uploadFile(final List<String> path, final String localPath);
 
   void syncFile(final List<String> path);
@@ -20,7 +20,7 @@ abstract class FilesBlocEvents {
   void removeFavorite(final List<String> path);
 }
 
-abstract class FilesBlocStates {
+abstract interface class FilesBlocStates {
   BehaviorSubject<List<FilesTask>> get tasks;
 }
 
diff --git a/packages/neon/neon_news/lib/blocs/article.dart b/packages/neon/neon_news/lib/blocs/article.dart
index a87e5c65..7ccc7aed 100644
--- a/packages/neon/neon_news/lib/blocs/article.dart
+++ b/packages/neon/neon_news/lib/blocs/article.dart
@@ -1,6 +1,6 @@
 part of '../neon_news.dart';
 
-abstract class NewsArticleBlocEvents {
+abstract interface class NewsArticleBlocEvents {
   void markArticleAsRead();
 
   void markArticleAsUnread();
@@ -10,7 +10,7 @@ abstract class NewsArticleBlocEvents {
   void unstarArticle();
 }
 
-abstract class NewsArticleBlocStates {
+abstract interface class NewsArticleBlocStates {
   BehaviorSubject<bool> get unread;
 
   BehaviorSubject<bool> get starred;
diff --git a/packages/neon/neon_news/lib/blocs/articles.dart b/packages/neon/neon_news/lib/blocs/articles.dart
index be12878e..c8ae115f 100644
--- a/packages/neon/neon_news/lib/blocs/articles.dart
+++ b/packages/neon/neon_news/lib/blocs/articles.dart
@@ -11,7 +11,7 @@ enum ListType {
   folder,
 }
 
-abstract class NewsArticlesBlocEvents {
+abstract interface class NewsArticlesBlocEvents {
   void setFilterType(final FilterType type);
 
   void markArticleAsRead(final NewsArticle article);
@@ -23,7 +23,7 @@ abstract class NewsArticlesBlocEvents {
   void unstarArticle(final NewsArticle article);
 }
 
-abstract class NewsArticlesBlocStates {
+abstract interface class NewsArticlesBlocStates {
   BehaviorSubject<Result<List<NewsArticle>>> get articles;
 
   BehaviorSubject<FilterType> get filterType;
diff --git a/packages/neon/neon_news/lib/blocs/news.dart b/packages/neon/neon_news/lib/blocs/news.dart
index 5c21298b..c82c6c02 100644
--- a/packages/neon/neon_news/lib/blocs/news.dart
+++ b/packages/neon/neon_news/lib/blocs/news.dart
@@ -1,6 +1,6 @@
 part of '../neon_news.dart';
 
-abstract class NewsBlocEvents {
+abstract interface class NewsBlocEvents {
   void addFeed(final String url, final int? folderId);
 
   void removeFeed(final int feedId);
@@ -20,7 +20,7 @@ abstract class NewsBlocEvents {
   void markFolderAsRead(final int folderId);
 }
 
-abstract class NewsBlocStates {
+abstract interface class NewsBlocStates {
   BehaviorSubject<Result<List<NewsFolder>>> get folders;
 
   BehaviorSubject<Result<List<NewsFeed>>> get feeds;
diff --git a/packages/neon/neon_notes/lib/blocs/note.dart b/packages/neon/neon_notes/lib/blocs/note.dart
index d53c165d..de552b54 100644
--- a/packages/neon/neon_notes/lib/blocs/note.dart
+++ b/packages/neon/neon_notes/lib/blocs/note.dart
@@ -1,6 +1,6 @@
 part of '../neon_notes.dart';
 
-abstract class NotesNoteBlocEvents {
+abstract interface class NotesNoteBlocEvents {
   void updateContent(final String content);
 
   void updateTitle(final String title);
@@ -8,7 +8,7 @@ abstract class NotesNoteBlocEvents {
   void updateCategory(final String category);
 }
 
-abstract class NotesNoteBlocStates {
+abstract interface class NotesNoteBlocStates {
   BehaviorSubject<String> get category;
 }
 
diff --git a/packages/neon/neon_notes/lib/blocs/notes.dart b/packages/neon/neon_notes/lib/blocs/notes.dart
index ec3427cb..2f24714b 100644
--- a/packages/neon/neon_notes/lib/blocs/notes.dart
+++ b/packages/neon/neon_notes/lib/blocs/notes.dart
@@ -1,6 +1,6 @@
 part of '../neon_notes.dart';
 
-abstract class NotesBlocEvents {
+abstract interface class NotesBlocEvents {
   void createNote({
     final String title = '',
     final String category = '',
@@ -18,7 +18,7 @@ abstract class NotesBlocEvents {
   void deleteNote(final int id);
 }
 
-abstract class NotesBlocStates {
+abstract interface class NotesBlocStates {
   BehaviorSubject<Result<List<NotesNote>>> get notes;
 }