diff --git a/lib/src/ui/builder/participant/participant_kind.dart b/lib/src/ui/builder/participant/participant_kind.dart
index fc8439b..5b55990 100644
--- a/lib/src/ui/builder/participant/participant_kind.dart
+++ b/lib/src/ui/builder/participant/participant_kind.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import 'package:provider/provider.dart';
 import 'package:livekit_client/livekit_client.dart' as lk;
+import 'package:provider/provider.dart';
 
 import '../../../context/participant_context.dart';
 import '../../../debug/logger.dart';
diff --git a/lib/src/ui/widgets/participant/participant_status_bar.dart b/lib/src/ui/widgets/participant/participant_status_bar.dart
index 29b0af5..7103d66 100644
--- a/lib/src/ui/widgets/participant/participant_status_bar.dart
+++ b/lib/src/ui/widgets/participant/participant_status_bar.dart
@@ -5,10 +5,10 @@ import 'package:provider/provider.dart';
 import '../../../context/participant_context.dart';
 import '../../../context/track_reference_context.dart';
 import '../../../debug/logger.dart';
-import '../../builder/track/connection_quality_indicator.dart';
-import '../../builder/track/e2e_encryption_indicator.dart';
 import '../../builder/participant/participant_muted_indicator.dart';
 import '../../builder/participant/participant_name.dart';
+import '../../builder/track/connection_quality_indicator.dart';
+import '../../builder/track/e2e_encryption_indicator.dart';
 import 'connection_quality_indicator.dart';
 
 class ParticipantStatusBar extends StatelessWidget {
diff --git a/lib/src/ui/widgets/participant/participant_tile_widget.dart b/lib/src/ui/widgets/participant/participant_tile_widget.dart
index e07b22a..788819e 100644
--- a/lib/src/ui/widgets/participant/participant_tile_widget.dart
+++ b/lib/src/ui/widgets/participant/participant_tile_widget.dart
@@ -6,10 +6,10 @@ import '../../../context/track_reference_context.dart';
 import '../../../debug/logger.dart';
 import '../../builder/track/is_speaking_indicator.dart';
 import '../track/focus_toggle.dart';
-import 'is_speaking_indicator.dart';
-import 'participant_status_bar.dart';
 import '../track/track_stats_widget.dart';
 import '../track/video_track_widget.dart';
+import 'is_speaking_indicator.dart';
+import 'participant_status_bar.dart';
 
 class ParticipantTileWidget extends StatelessWidget {
   const ParticipantTileWidget({
diff --git a/lib/src/ui/widgets/room/chat_widget.dart b/lib/src/ui/widgets/room/chat_widget.dart
index 579e137..0e3119f 100644
--- a/lib/src/ui/widgets/room/chat_widget.dart
+++ b/lib/src/ui/widgets/room/chat_widget.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:chat_bubbles/chat_bubbles.dart';
 
 import '../../../context/chat_context.dart';
-import 'data_chip.dart';
 import '../theme.dart';
+import 'data_chip.dart';
 
 class ChatWidget extends StatelessWidget {
   ChatWidget({
diff --git a/lib/src/ui/widgets/track/video_track_widget.dart b/lib/src/ui/widgets/track/video_track_widget.dart
index 266d31d..d921dc3 100644
--- a/lib/src/ui/widgets/track/video_track_widget.dart
+++ b/lib/src/ui/widgets/track/video_track_widget.dart
@@ -5,8 +5,8 @@ import 'package:provider/provider.dart';
 
 import '../../../context/track_reference_context.dart';
 import '../../../debug/logger.dart';
-import 'no_track_widget.dart';
 import '../theme.dart';
+import 'no_track_widget.dart';
 
 class VideoTrackWidget extends StatelessWidget {
   const VideoTrackWidget({