diff --git a/forui/lib/src/widgets/calendar/day/paged_day_picker.dart b/forui/lib/src/widgets/calendar/day/paged_day_picker.dart
index 1851b6e1b..2899e3607 100644
--- a/forui/lib/src/widgets/calendar/day/paged_day_picker.dart
+++ b/forui/lib/src/widgets/calendar/day/paged_day_picker.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/semantics.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
 
 import 'package:meta/meta.dart';
 import 'package:sugar/sugar.dart';
diff --git a/forui/lib/src/widgets/calendar/month/month_picker.dart b/forui/lib/src/widgets/calendar/month/month_picker.dart
index 172253ea8..7ab820ef4 100644
--- a/forui/lib/src/widgets/calendar/month/month_picker.dart
+++ b/forui/lib/src/widgets/calendar/month/month_picker.dart
@@ -7,8 +7,8 @@ import 'package:sugar/sugar.dart';
 
 import 'package:forui/src/widgets/calendar/day/day_picker.dart';
 import 'package:forui/src/widgets/calendar/shared/entry.dart';
-import 'package:forui/src/widgets/calendar/year_month_picker.dart';
 import 'package:forui/src/widgets/calendar/year/year_picker.dart';
+import 'package:forui/src/widgets/calendar/year_month_picker.dart';
 
 // ignore: non_constant_identifier_names
 final _MMM = DateFormat.MMM();
@@ -67,8 +67,8 @@ class _MonthPickerState extends State<MonthPicker> {
 
   @override
   Widget build(BuildContext context) => Padding(
-    padding: const EdgeInsets.only(top: 5.0),
-    child: GridView(
+        padding: const EdgeInsets.only(top: 5.0),
+        child: GridView(
           gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
             crossAxisCount: YearPicker.columns,
             mainAxisExtent: ((DayPicker.tileDimension - 5.0) * DayPicker.maxRows) / YearPicker.rows,
@@ -87,7 +87,7 @@ class _MonthPickerState extends State<MonthPicker> {
               ),
           ],
         ),
-  );
+      );
 
   @override
   void didUpdateWidget(MonthPicker old) {
diff --git a/forui/lib/src/widgets/calendar/shared/entry.dart b/forui/lib/src/widgets/calendar/shared/entry.dart
index 3d21ef775..21fece6ea 100644
--- a/forui/lib/src/widgets/calendar/shared/entry.dart
+++ b/forui/lib/src/widgets/calendar/shared/entry.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/forui.dart';
 
 import 'package:intl/intl.dart';
 import 'package:meta/meta.dart';
 import 'package:sugar/sugar.dart';
 
+import 'package:forui/forui.dart';
 import 'package:forui/src/foundation/tappable.dart';
 
 final _yMMMMd = DateFormat.yMMMMd();
diff --git a/forui/lib/src/widgets/calendar/year/year_picker.dart b/forui/lib/src/widgets/calendar/year/year_picker.dart
index e4fef6f20..a0d3efc24 100644
--- a/forui/lib/src/widgets/calendar/year/year_picker.dart
+++ b/forui/lib/src/widgets/calendar/year/year_picker.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
-import 'package:forui/src/widgets/calendar/day/day_picker.dart';
 
 import 'package:meta/meta.dart';
 import 'package:sugar/sugar.dart';
 
+import 'package:forui/src/widgets/calendar/day/day_picker.dart';
 import 'package:forui/src/widgets/calendar/shared/entry.dart';
 import 'package:forui/src/widgets/calendar/year_month_picker.dart';