diff --git a/lib/_tools/artifact_search_helper.dart b/lib/_tools/artifact_search_helper.dart
index 4acd9644..1171c75f 100644
--- a/lib/_tools/artifact_search_helper.dart
+++ b/lib/_tools/artifact_search_helper.dart
@@ -5,9 +5,9 @@ import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:http/http.dart' as http;
 import 'package:path_provider/path_provider.dart';
 import 'package:wonders/common_libs.dart';
-import 'package:http/http.dart' as http;
 import 'package:wonders/logic/data/wonder_data.dart';
 import 'package:wonders/logic/data/wonders_data/search/search_data.dart';
 
diff --git a/lib/common_libs.dart b/lib/common_libs.dart
index 54f17731..219104d1 100644
--- a/lib/common_libs.dart
+++ b/lib/common_libs.dart
@@ -7,6 +7,7 @@ export 'package:extra_alignments/extra_alignments.dart';
 export 'package:flextras/flextras.dart';
 export 'package:flutter/material.dart';
 export 'package:flutter/services.dart';
+export 'package:flutter_animate/flutter_animate.dart';
 export 'package:gap/gap.dart';
 export 'package:get_it/get_it.dart';
 export 'package:get_it_mixin/get_it_mixin.dart';
@@ -22,9 +23,7 @@ export 'package:wonders/logic/settings_logic.dart';
 export 'package:wonders/main.dart';
 export 'package:wonders/router.dart';
 export 'package:wonders/styles/styles.dart';
+export 'package:wonders/ui/common/controls/app_image.dart';
 export 'package:wonders/ui/common/controls/buttons.dart';
 export 'package:wonders/ui/common/controls/circle_buttons.dart';
 export 'package:wonders/ui/common/controls/scroll_decorator.dart';
-export 'package:wonders/ui/common/controls/app_image.dart';
-export 'package:wonders/ui/common/listenable_builder.dart';
-export 'package:flutter_animate/flutter_animate.dart';
diff --git a/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart b/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart
index 2d6525c7..b55c34c8 100644
--- a/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart
+++ b/lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart
@@ -1,4 +1,3 @@
-import 'dart:math' as math;
 import 'dart:ui';
 
 import 'package:wonders/common_libs.dart';
@@ -9,8 +8,8 @@ import 'package:wonders/ui/common/controls/simple_header.dart';
 import 'package:wonders/ui/common/static_text_scale.dart';
 
 part 'widgets/_blurred_image_bg.dart';
-part 'widgets/_collapsing_carousel_item.dart';
 part 'widgets/_bottom_text_content.dart';
+part 'widgets/_collapsing_carousel_item.dart';
 
 class ArtifactCarouselScreen extends StatefulWidget {
   final WonderType type;
diff --git a/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart b/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart
index 0e92c2ba..2e430c1f 100644
--- a/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart
+++ b/lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart
@@ -1,5 +1,4 @@
 import 'package:wonders/common_libs.dart';
-import 'package:wonders/logic/common/string_utils.dart';
 import 'package:wonders/logic/data/artifact_data.dart';
 import 'package:wonders/ui/common/compass_divider.dart';
 import 'package:wonders/ui/common/controls/app_loading_indicator.dart';
diff --git a/lib/ui/screens/collectible_found/collectible_found_screen.dart b/lib/ui/screens/collectible_found/collectible_found_screen.dart
index 42384047..217f52ef 100644
--- a/lib/ui/screens/collectible_found/collectible_found_screen.dart
+++ b/lib/ui/screens/collectible_found/collectible_found_screen.dart
@@ -1,6 +1,6 @@
+import 'package:particle_field/particle_field.dart';
 import 'package:wonders/common_libs.dart';
 import 'package:wonders/logic/data/collectible_data.dart';
-import 'package:particle_field/particle_field.dart';
 import 'package:wonders/ui/common/centered_box.dart';
 
 part 'widgets/_animated_ribbon.dart';
diff --git a/lib/ui/screens/collection/collection_screen.dart b/lib/ui/screens/collection/collection_screen.dart
index 14067f94..ca4fc66d 100644
--- a/lib/ui/screens/collection/collection_screen.dart
+++ b/lib/ui/screens/collection/collection_screen.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:wonders/common_libs.dart';
 import 'package:wonders/logic/collectibles_logic.dart';
-import 'package:wonders/logic/common/string_utils.dart';
 import 'package:wonders/logic/data/collectible_data.dart';
 import 'package:wonders/logic/data/wonder_data.dart';
 import 'package:wonders/ui/common/centered_box.dart';
diff --git a/lib/ui/screens/home/wonders_home_screen.dart b/lib/ui/screens/home/wonders_home_screen.dart
index 349ad5e2..bae6e4fd 100644
--- a/lib/ui/screens/home/wonders_home_screen.dart
+++ b/lib/ui/screens/home/wonders_home_screen.dart
@@ -1,5 +1,4 @@
 import 'package:wonders/common_libs.dart';
-import 'package:wonders/logic/common/string_utils.dart';
 import 'package:wonders/logic/data/wonder_data.dart';
 import 'package:wonders/ui/common/app_icons.dart';
 import 'package:wonders/ui/common/controls/app_page_indicator.dart';
diff --git a/lib/ui/screens/timeline/timeline_screen.dart b/lib/ui/screens/timeline/timeline_screen.dart
index 7e20656f..e61281d4 100644
--- a/lib/ui/screens/timeline/timeline_screen.dart
+++ b/lib/ui/screens/timeline/timeline_screen.dart
@@ -16,6 +16,7 @@ import 'package:wonders/ui/common/timeline_event_card.dart';
 import 'package:wonders/ui/common/utils/app_haptics.dart';
 import 'package:wonders/ui/common/wonders_timeline_builder.dart';
 
+part 'widgets/_animated_era_text.dart';
 part 'widgets/_bottom_scrubber.dart';
 part 'widgets/_dashed_divider_with_year.dart';
 part 'widgets/_event_markers.dart';
@@ -24,7 +25,6 @@ part 'widgets/_scrolling_viewport.dart';
 part 'widgets/_scrolling_viewport_controller.dart';
 part 'widgets/_timeline_section.dart';
 part 'widgets/_year_markers.dart';
-part 'widgets/_animated_era_text.dart';
 
 class TimelineScreen extends StatefulWidget {
   final WonderType? type;
diff --git a/lib/ui/wonder_illustrations/colosseum_illustration.dart b/lib/ui/wonder_illustrations/colosseum_illustration.dart
index 68ff54ea..2bad0dcd 100644
--- a/lib/ui/wonder_illustrations/colosseum_illustration.dart
+++ b/lib/ui/wonder_illustrations/colosseum_illustration.dart
@@ -2,7 +2,6 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/fade_color_transition.dart';
 import 'package:wonders/ui/wonder_illustrations/common/illustration_piece.dart';
 import 'package:wonders/ui/wonder_illustrations/common/paint_textures.dart';
-import 'package:wonders/ui/wonder_illustrations/common/wonder_hero.dart';
 import 'package:wonders/ui/wonder_illustrations/common/wonder_illustration_builder.dart';
 import 'package:wonders/ui/wonder_illustrations/common/wonder_illustration_config.dart';
 
@@ -47,13 +46,13 @@ class ColosseumIllustration extends StatelessWidget {
 
   List<Widget> _buildMg(BuildContext context, Animation<double> anim) {
     return [
-          IllustrationPiece(
-            fileName: 'colosseum.png',
-            enableHero: true,
-            heightFactor: .6,
-            minHeight: 200,
-            zoomAmt: .15,
-            fractionalOffset: Offset(0, config.shortMode ? .10: -.1),
+      IllustrationPiece(
+        fileName: 'colosseum.png',
+        enableHero: true,
+        heightFactor: .6,
+        minHeight: 200,
+        zoomAmt: .15,
+        fractionalOffset: Offset(0, config.shortMode ? .10 : -.1),
       )
     ];
   }
diff --git a/lib/ui/wonder_illustrations/common/animated_clouds.dart b/lib/ui/wonder_illustrations/common/animated_clouds.dart
index 44d0a94a..7568ff31 100644
--- a/lib/ui/wonder_illustrations/common/animated_clouds.dart
+++ b/lib/ui/wonder_illustrations/common/animated_clouds.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/utils/context_utils.dart';