diff --git a/flutter/lib/api/api_client.dart b/flutter/lib/api/api_client.dart
index d02174e..b469440 100644
--- a/flutter/lib/api/api_client.dart
+++ b/flutter/lib/api/api_client.dart
@@ -8,9 +8,8 @@ import 'package:simplecloudnotifier/models/key_token_auth.dart';
 import 'package:simplecloudnotifier/models/user.dart';
 import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/request_log.dart';
-
-import '../models/channel.dart';
-import '../models/message.dart';
+import 'package:simplecloudnotifier/models/channel.dart';
+import 'package:simplecloudnotifier/models/message.dart';
 
 enum ChannelSelector {
   owned(apiKey: 'owned'), // Return all channels of the user
diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index 4b05bef..6699d77 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -2,7 +2,6 @@ import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-
 import 'package:simplecloudnotifier/nav_layout.dart';
 import 'package:simplecloudnotifier/state/app_theme.dart';
 import 'package:simplecloudnotifier/state/application_log.dart';
diff --git a/flutter/lib/nav_layout.dart b/flutter/lib/nav_layout.dart
index ac5aa51..47cbc42 100644
--- a/flutter/lib/nav_layout.dart
+++ b/flutter/lib/nav_layout.dart
@@ -3,11 +3,10 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:simplecloudnotifier/components/layout/app_bar.dart';
 import 'package:simplecloudnotifier/pages/channel_list/root.dart';
 import 'package:simplecloudnotifier/pages/send/root.dart';
-
-import 'components/bottom_fab/fab_bottom_app_bar.dart';
-import 'pages/account/root.dart';
-import 'pages/message_list/message_list.dart';
-import 'pages/settings/root.dart';
+import 'package:simplecloudnotifier/components/bottom_fab/fab_bottom_app_bar.dart';
+import 'package:simplecloudnotifier/pages/account/root.dart';
+import 'package:simplecloudnotifier/pages/message_list/message_list.dart';
+import 'package:simplecloudnotifier/pages/settings/root.dart';
 
 class SCNNavLayout extends StatefulWidget {
   const SCNNavLayout({super.key});
diff --git a/flutter/lib/pages/account/root.dart b/flutter/lib/pages/account/root.dart
index ff6a1f6..078a4ef 100644
--- a/flutter/lib/pages/account/root.dart
+++ b/flutter/lib/pages/account/root.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/pages/account/login.dart';
-
-import '../../state/user_account.dart';
-import 'choose_auth.dart';
+import 'package:simplecloudnotifier/state/user_account.dart';
+import 'package:simplecloudnotifier/pages/account/choose_auth.dart';
 
 class AccountRootPage extends StatefulWidget {
   const AccountRootPage({super.key});
diff --git a/flutter/lib/pages/channel_list/channel_list_item.dart b/flutter/lib/pages/channel_list/channel_list_item.dart
index 86dd59b..aa765f2 100644
--- a/flutter/lib/pages/channel_list/channel_list_item.dart
+++ b/flutter/lib/pages/channel_list/channel_list_item.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-
-import '../../models/channel.dart';
+import 'package:simplecloudnotifier/models/channel.dart';
 
 class ChannelListItem extends StatelessWidget {
   const ChannelListItem({
diff --git a/flutter/lib/pages/channel_list/root.dart b/flutter/lib/pages/channel_list/root.dart
index aa4909f..4889718 100644
--- a/flutter/lib/pages/channel_list/root.dart
+++ b/flutter/lib/pages/channel_list/root.dart
@@ -3,9 +3,8 @@ import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:provider/provider.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
-
-import '../../state/user_account.dart';
-import 'channel_list_item.dart';
+import 'package:simplecloudnotifier/state/user_account.dart';
+import 'package:simplecloudnotifier/pages/channel_list/channel_list_item.dart';
 
 class ChannelRootPage extends StatefulWidget {
   const ChannelRootPage({super.key});
diff --git a/flutter/lib/pages/message_list/message_list.dart b/flutter/lib/pages/message_list/message_list.dart
index 818f022..46a00c6 100644
--- a/flutter/lib/pages/message_list/message_list.dart
+++ b/flutter/lib/pages/message_list/message_list.dart
@@ -6,8 +6,7 @@ import 'package:simplecloudnotifier/models/channel.dart';
 import 'package:simplecloudnotifier/models/message.dart';
 import 'package:simplecloudnotifier/pages/message_view/message_view.dart';
 import 'package:simplecloudnotifier/state/user_account.dart';
-
-import 'message_list_item.dart';
+import 'package:simplecloudnotifier/pages/message_list/message_list_item.dart';
 
 class MessageListPage extends StatefulWidget {
   const MessageListPage({super.key});
diff --git a/flutter/lib/pages/send/root.dart b/flutter/lib/pages/send/root.dart
index 1f2002f..d0aa084 100644
--- a/flutter/lib/pages/send/root.dart
+++ b/flutter/lib/pages/send/root.dart
@@ -2,8 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
-
-import '../../state/user_account.dart';
+import 'package:simplecloudnotifier/state/user_account.dart';
 
 class SendRootPage extends StatefulWidget {
   const SendRootPage({super.key});
diff --git a/flutter/lib/state/user_account.dart b/flutter/lib/state/user_account.dart
index bc5a3cc..ce7b1c3 100644
--- a/flutter/lib/state/user_account.dart
+++ b/flutter/lib/state/user_account.dart
@@ -1,9 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:simplecloudnotifier/api/api_client.dart';
-
-import '../models/key_token_auth.dart';
-import '../models/user.dart';
+import 'package:simplecloudnotifier/models/key_token_auth.dart';
+import 'package:simplecloudnotifier/models/user.dart';
 
 class UserAccount extends ChangeNotifier {
   User? _user;