diff --git a/forui/lib/src/widgets/alert/alert.dart b/forui/lib/src/widgets/alert/alert.dart
index abbc9da3a..a3e11e15d 100644
--- a/forui/lib/src/widgets/alert/alert.dart
+++ b/forui/lib/src/widgets/alert/alert.dart
@@ -157,13 +157,14 @@ final class FAlertCustomStyle extends FAlertStyle with Diagnosticable {
     FAlertIconStyle? icon,
     TextStyle? titleTextStyle,
     TextStyle? subtitleTextStyle,
-  }) => FAlertCustomStyle(
-      decoration: decoration ?? this.decoration,
-      padding: padding ?? this.padding,
-      icon: icon ?? this.icon,
-      titleTextStyle: titleTextStyle ?? this.titleTextStyle,
-      subtitleTextStyle: subtitleTextStyle ?? this.subtitleTextStyle,
-    );
+  }) =>
+      FAlertCustomStyle(
+        decoration: decoration ?? this.decoration,
+        padding: padding ?? this.padding,
+        icon: icon ?? this.icon,
+        titleTextStyle: titleTextStyle ?? this.titleTextStyle,
+        subtitleTextStyle: subtitleTextStyle ?? this.subtitleTextStyle,
+      );
 
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
diff --git a/forui/lib/src/widgets/alert/alert_icon.dart b/forui/lib/src/widgets/alert/alert_icon.dart
index e0119983e..94766d4cd 100644
--- a/forui/lib/src/widgets/alert/alert_icon.dart
+++ b/forui/lib/src/widgets/alert/alert_icon.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
+
+import 'package:meta/meta.dart';
+
 import 'package:forui/forui.dart';
 import 'package:forui/src/widgets/alert/alert.dart';
-import 'package:meta/meta.dart';
 
 /// A [FAlert]'s icon.
 class FAlertIcon extends StatelessWidget {
diff --git a/forui/lib/src/widgets/alert/alert_styles.dart b/forui/lib/src/widgets/alert/alert_styles.dart
index 30e59ba6f..bad695a77 100644
--- a/forui/lib/src/widgets/alert/alert_styles.dart
+++ b/forui/lib/src/widgets/alert/alert_styles.dart
@@ -1,9 +1,10 @@
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 
+import 'package:forui/forui.dart';
+
 /// [FAlertCustomStyle]'s style.
 final class FAlertStyles with Diagnosticable {
   /// The primary alert style.
diff --git a/forui/lib/src/widgets/avatar/avatar.dart b/forui/lib/src/widgets/avatar/avatar.dart
index eb9c8658e..b95bb01a6 100644
--- a/forui/lib/src/widgets/avatar/avatar.dart
+++ b/forui/lib/src/widgets/avatar/avatar.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/src/widgets/avatar/avatar_content.dart';
 
 import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
+import 'package:forui/src/widgets/avatar/avatar_content.dart';
 
 /// An image element with a fallback for representing the user.
 ///
diff --git a/forui/lib/src/widgets/avatar/avatar_content.dart b/forui/lib/src/widgets/avatar/avatar_content.dart
index d8aba71eb..ffcda2289 100644
--- a/forui/lib/src/widgets/avatar/avatar_content.dart
+++ b/forui/lib/src/widgets/avatar/avatar_content.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 
+import 'package:forui/forui.dart';
+
 @internal
 final class Content extends StatelessWidget {
   final FAvatarStyle? style;
diff --git a/forui/lib/src/widgets/badge/badge.dart b/forui/lib/src/widgets/badge/badge.dart
index 94ab9296f..ffbaa1156 100644
--- a/forui/lib/src/widgets/badge/badge.dart
+++ b/forui/lib/src/widgets/badge/badge.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/src/widgets/badge/badge_content.dart';
 
 import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
+import 'package:forui/src/widgets/badge/badge_content.dart';
 
 /// A badge. Badges are typically used to draw attention to specific information, such as labels and counts.
 ///
diff --git a/forui/lib/src/widgets/badge/badge_content.dart b/forui/lib/src/widgets/badge/badge_content.dart
index 64898f216..fca578c77 100644
--- a/forui/lib/src/widgets/badge/badge_content.dart
+++ b/forui/lib/src/widgets/badge/badge_content.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 
+import 'package:forui/forui.dart';
+
 @internal
 final class Content extends StatelessWidget {
   final FBadgeCustomStyle style;
diff --git a/forui/lib/src/widgets/badge/badge_styles.dart b/forui/lib/src/widgets/badge/badge_styles.dart
index 8bf2d90b0..afb813cc6 100644
--- a/forui/lib/src/widgets/badge/badge_styles.dart
+++ b/forui/lib/src/widgets/badge/badge_styles.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 
+import 'package:forui/forui.dart';
+
 /// The [FBadgeCustomStyle]s.
 final class FBadgeStyles with Diagnosticable {
   /// The primary badge style.
diff --git a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart
index 3f2bf46be..6c54924b4 100644
--- a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart
+++ b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar.dart
@@ -103,6 +103,7 @@ class FBottomNavigationBarData extends InheritedWidget {
 
   /// The item's style.
   final FBottomNavigationBarItemStyle itemStyle;
+
   /// Whether the item is currently selected.
   final bool selected;
 
diff --git a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart
index 146dc3b2a..b0eb33008 100644
--- a/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart
+++ b/forui/lib/src/widgets/bottom_navigation_bar/bottom_navigation_bar_item.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 
+import 'package:forui/forui.dart';
+
 /// A [FBottomNavigationBar] item.
 class FBottomNavigationBarItem extends StatelessWidget {
   /// The style.
diff --git a/forui/lib/src/widgets/button/button.dart b/forui/lib/src/widgets/button/button.dart
index 5185b3606..ea0b9ed12 100644
--- a/forui/lib/src/widgets/button/button.dart
+++ b/forui/lib/src/widgets/button/button.dart
@@ -5,7 +5,6 @@ import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
 import 'package:forui/src/foundation/tappable.dart';
-
 import 'package:forui/src/widgets/button/button_content.dart';
 
 /// A button.
diff --git a/forui/lib/src/widgets/button/button_content.dart b/forui/lib/src/widgets/button/button_content.dart
index 29e3d4e60..14b2f0daa 100644
--- a/forui/lib/src/widgets/button/button_content.dart
+++ b/forui/lib/src/widgets/button/button_content.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 import 'package:sugar/sugar.dart';
 
+import 'package:forui/forui.dart';
+
 @internal
 class Content extends StatelessWidget {
   final Widget? prefix;
@@ -154,7 +156,7 @@ final class FButtonIconContentStyle with Diagnosticable {
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-          other is FButtonIconContentStyle && runtimeType == other.runtimeType && padding == other.padding;
+      other is FButtonIconContentStyle && runtimeType == other.runtimeType && padding == other.padding;
 
   @override
   int get hashCode => padding.hashCode;
diff --git a/forui/lib/src/widgets/button/button_icon.dart b/forui/lib/src/widgets/button/button_icon.dart
index 4356ce8de..5e13d94f7 100644
--- a/forui/lib/src/widgets/button/button_icon.dart
+++ b/forui/lib/src/widgets/button/button_icon.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 
+import 'package:forui/forui.dart';
+
 /// A [FButton]'s icon.
 class FButtonIcon extends StatelessWidget {
   /// The icon.
diff --git a/forui/lib/src/widgets/button/button_styles.dart b/forui/lib/src/widgets/button/button_styles.dart
index 65ebb13b8..d82ff4af7 100644
--- a/forui/lib/src/widgets/button/button_styles.dart
+++ b/forui/lib/src/widgets/button/button_styles.dart
@@ -1,10 +1,10 @@
-
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 
+import 'package:forui/forui.dart';
+
 /// [FButtonCustomStyle]'s style.
 final class FButtonStyles with Diagnosticable {
   /// The primary button style.
diff --git a/forui/lib/src/widgets/calendar/shared/header.dart b/forui/lib/src/widgets/calendar/shared/header.dart
index 6b74df21f..5ad0333ef 100644
--- a/forui/lib/src/widgets/calendar/shared/header.dart
+++ b/forui/lib/src/widgets/calendar/shared/header.dart
@@ -129,39 +129,39 @@ class Navigation extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => Padding(
-      padding: const EdgeInsets.only(bottom: 5),
-      child: SizedBox(
-        height: Header.height,
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(left: 7),
-              child: FButton.icon(
-                style: style.buttonStyle,
-                onPress: onPrevious,
-                child: FAssets.icons.chevronLeft(
-                  height: 17,
-                  colorFilter: ColorFilter.mode(style.iconColor, BlendMode.srcIn),
+        padding: const EdgeInsets.only(bottom: 5),
+        child: SizedBox(
+          height: Header.height,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(left: 7),
+                child: FButton.icon(
+                  style: style.buttonStyle,
+                  onPress: onPrevious,
+                  child: FAssets.icons.chevronLeft(
+                    height: 17,
+                    colorFilter: ColorFilter.mode(style.iconColor, BlendMode.srcIn),
+                  ),
                 ),
               ),
-            ),
-            const Expanded(child: SizedBox()),
-            Padding(
-              padding: const EdgeInsets.only(right: 7),
-              child: FButton.icon(
-                style: style.buttonStyle,
-                onPress: onNext,
-                child: FAssets.icons.chevronRight(
-                  height: 17,
-                  colorFilter: ColorFilter.mode(style.iconColor, BlendMode.srcIn),
+              const Expanded(child: SizedBox()),
+              Padding(
+                padding: const EdgeInsets.only(right: 7),
+                child: FButton.icon(
+                  style: style.buttonStyle,
+                  onPress: onNext,
+                  child: FAssets.icons.chevronRight(
+                    height: 17,
+                    colorFilter: ColorFilter.mode(style.iconColor, BlendMode.srcIn),
+                  ),
                 ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
-      ),
-    );
+      );
 
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
diff --git a/forui/lib/src/widgets/card/card.dart b/forui/lib/src/widgets/card/card.dart
index 7ec6748d0..cbf9acf64 100644
--- a/forui/lib/src/widgets/card/card.dart
+++ b/forui/lib/src/widgets/card/card.dart
@@ -4,7 +4,6 @@ import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
-
 import 'package:forui/src/widgets/card/card_content.dart';
 
 /// A card.
diff --git a/forui/lib/src/widgets/card/card_content.dart b/forui/lib/src/widgets/card/card_content.dart
index 5817672d4..732810794 100644
--- a/forui/lib/src/widgets/card/card_content.dart
+++ b/forui/lib/src/widgets/card/card_content.dart
@@ -1,10 +1,10 @@
-
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
+
+import 'package:meta/meta.dart';
+
 import 'package:forui/forui.dart';
 import 'package:forui/src/foundation/util.dart';
-import 'package:meta/meta.dart';
 
 @internal
 class Content extends StatelessWidget {
diff --git a/forui/lib/src/widgets/dialog/dialog.dart b/forui/lib/src/widgets/dialog/dialog.dart
index 37328f724..48e7eb11f 100644
--- a/forui/lib/src/widgets/dialog/dialog.dart
+++ b/forui/lib/src/widgets/dialog/dialog.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/semantics.dart';
-import 'package:forui/src/widgets/dialog/dialog_content.dart';
 
 import 'package:meta/meta.dart';
 
 import 'package:forui/forui.dart';
+import 'package:forui/src/widgets/dialog/dialog_content.dart';
 
 /// A modal dialog.
 ///
diff --git a/forui/lib/src/widgets/dialog/dialog_content.dart b/forui/lib/src/widgets/dialog/dialog_content.dart
index 5f287002e..790cd2d5c 100644
--- a/forui/lib/src/widgets/dialog/dialog_content.dart
+++ b/forui/lib/src/widgets/dialog/dialog_content.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
+
 import 'package:meta/meta.dart';
 import 'package:sugar/sugar.dart';
 
+import 'package:forui/forui.dart';
+
 @internal
 sealed class Content extends StatelessWidget {
   final FDialogContentStyle style;
diff --git a/forui/lib/src/widgets/resizable/resizable_controller.dart b/forui/lib/src/widgets/resizable/resizable_controller.dart
index 97ec161b2..f17863810 100644
--- a/forui/lib/src/widgets/resizable/resizable_controller.dart
+++ b/forui/lib/src/widgets/resizable/resizable_controller.dart
@@ -5,7 +5,6 @@ import 'package:flutter/widgets.dart';
 import 'package:sugar/collection_aggregate.dart';
 
 import 'package:forui/forui.dart';
-import 'package:forui/src/widgets/resizable/resizable.dart';
 import 'package:forui/src/widgets/resizable/resizable_region_data.dart';
 
 /// A controller that manages the resizing of regions in a [FResizable].
diff --git a/forui/lib/src/widgets/resizable/resizable_region.dart b/forui/lib/src/widgets/resizable/resizable_region.dart
index ad2146acc..5230c2895 100644
--- a/forui/lib/src/widgets/resizable/resizable_region.dart
+++ b/forui/lib/src/widgets/resizable/resizable_region.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
 
+import 'package:forui/forui.dart';
 import 'package:forui/src/widgets/resizable/resizable.dart';
 
 /// A resizable region that can be resized along the parent [FResizable]'s axis. It should always be in a [FResizable].
diff --git a/forui/lib/widgets/resizable.dart b/forui/lib/widgets/resizable.dart
index 72c16065c..226d5522d 100644
--- a/forui/lib/widgets/resizable.dart
+++ b/forui/lib/widgets/resizable.dart
@@ -9,4 +9,4 @@ export '../src/widgets/resizable/resizable.dart' hide InheritedData;
 export '../src/widgets/resizable/divider.dart' hide Divider, HorizontalDivider, VerticalDivider;
 export '../src/widgets/resizable/resizable_controller.dart';
 export '../src/widgets/resizable/resizable_region.dart';
-export '../src/widgets/resizable/resizable_region_data.dart' hide UpdatableResizableRegionData;
\ No newline at end of file
+export '../src/widgets/resizable/resizable_region_data.dart' hide UpdatableResizableRegionData;