diff --git a/lib/widgets/about/app_ref.dart b/lib/widgets/about/app_ref.dart
index cf632b400..2f401185e 100644
--- a/lib/widgets/about/app_ref.dart
+++ b/lib/widgets/about/app_ref.dart
@@ -13,7 +13,7 @@ class AppReference extends StatefulWidget {
   const AppReference({Key? key}) : super(key: key);
 
   @override
-  _AppReferenceState createState() => _AppReferenceState();
+  State<AppReference> createState() => _AppReferenceState();
 }
 
 class _AppReferenceState extends State<AppReference> {
diff --git a/lib/widgets/about/bug_report.dart b/lib/widgets/about/bug_report.dart
index 978123c10..592486d78 100644
--- a/lib/widgets/about/bug_report.dart
+++ b/lib/widgets/about/bug_report.dart
@@ -25,7 +25,7 @@ class BugReport extends StatefulWidget {
   const BugReport({Key? key}) : super(key: key);
 
   @override
-  _BugReportState createState() => _BugReportState();
+  State<BugReport> createState() => _BugReportState();
 }
 
 class _BugReportState extends State<BugReport> with FeedbackMixin {
diff --git a/lib/widgets/about/licenses.dart b/lib/widgets/about/licenses.dart
index 3de3ae949..18e593d42 100644
--- a/lib/widgets/about/licenses.dart
+++ b/lib/widgets/about/licenses.dart
@@ -13,7 +13,7 @@ class Licenses extends StatefulWidget {
   const Licenses({Key? key}) : super(key: key);
 
   @override
-  _LicensesState createState() => _LicensesState();
+  State<Licenses> createState() => _LicensesState();
 }
 
 class _LicensesState extends State<Licenses> {
diff --git a/lib/widgets/about/policy_page.dart b/lib/widgets/about/policy_page.dart
index 67c12597c..534f3f7dc 100644
--- a/lib/widgets/about/policy_page.dart
+++ b/lib/widgets/about/policy_page.dart
@@ -11,7 +11,7 @@ class PolicyPage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _PolicyPageState createState() => _PolicyPageState();
+  State<PolicyPage> createState() => _PolicyPageState();
 }
 
 class _PolicyPageState extends State<PolicyPage> {
diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index 387338698..a1fcd40d9 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -44,7 +44,7 @@ class AvesApp extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AvesAppState createState() => _AvesAppState();
+  State<AvesApp> createState() => _AvesAppState();
 }
 
 class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart
index bb810f95d..773b54a4f 100644
--- a/lib/widgets/collection/app_bar.dart
+++ b/lib/widgets/collection/app_bar.dart
@@ -43,7 +43,7 @@ class CollectionAppBar extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _CollectionAppBarState createState() => _CollectionAppBarState();
+  State<CollectionAppBar> createState() => _CollectionAppBarState();
 }
 
 class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerProviderStateMixin {
diff --git a/lib/widgets/collection/collection_grid.dart b/lib/widgets/collection/collection_grid.dart
index 8f85f6995..629b52c27 100644
--- a/lib/widgets/collection/collection_grid.dart
+++ b/lib/widgets/collection/collection_grid.dart
@@ -50,7 +50,7 @@ class CollectionGrid extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _CollectionGridState createState() => _CollectionGridState();
+  State<CollectionGrid> createState() => _CollectionGridState();
 }
 
 class _CollectionGridState extends State<CollectionGrid> {
@@ -170,7 +170,7 @@ class _CollectionSectionedContent extends StatefulWidget {
   });
 
   @override
-  _CollectionSectionedContentState createState() => _CollectionSectionedContentState();
+  State<_CollectionSectionedContent> createState() => _CollectionSectionedContentState();
 }
 
 class _CollectionSectionedContentState extends State<_CollectionSectionedContent> {
@@ -291,7 +291,7 @@ class _CollectionScrollView extends StatefulWidget {
   });
 
   @override
-  _CollectionScrollViewState createState() => _CollectionScrollViewState();
+  State<_CollectionScrollView> createState() => _CollectionScrollViewState();
 }
 
 class _CollectionScrollViewState extends State<_CollectionScrollView> {
diff --git a/lib/widgets/collection/collection_page.dart b/lib/widgets/collection/collection_page.dart
index 2f3b4cdca..463053562 100644
--- a/lib/widgets/collection/collection_page.dart
+++ b/lib/widgets/collection/collection_page.dart
@@ -29,7 +29,7 @@ class CollectionPage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _CollectionPageState createState() => _CollectionPageState();
+  State<CollectionPage> createState() => _CollectionPageState();
 }
 
 class _CollectionPageState extends State<CollectionPage> {
diff --git a/lib/widgets/collection/filter_bar.dart b/lib/widgets/collection/filter_bar.dart
index 76f265e2a..7d67a60ec 100644
--- a/lib/widgets/collection/filter_bar.dart
+++ b/lib/widgets/collection/filter_bar.dart
@@ -20,7 +20,7 @@ class FilterBar extends StatefulWidget {
         super(key: key);
 
   @override
-  _FilterBarState createState() => _FilterBarState();
+  State<FilterBar> createState() => _FilterBarState();
 }
 
 class _FilterBarState extends State<FilterBar> {
diff --git a/lib/widgets/collection/query_bar.dart b/lib/widgets/collection/query_bar.dart
index f12c18b16..2cc898ade 100644
--- a/lib/widgets/collection/query_bar.dart
+++ b/lib/widgets/collection/query_bar.dart
@@ -19,7 +19,7 @@ class EntryQueryBar extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EntryQueryBarState createState() => _EntryQueryBarState();
+  State<EntryQueryBar> createState() => _EntryQueryBarState();
 }
 
 class _EntryQueryBarState extends State<EntryQueryBar> {
diff --git a/lib/widgets/common/action_mixins/feedback.dart b/lib/widgets/common/action_mixins/feedback.dart
index e05c77a82..d1c9f9e54 100644
--- a/lib/widgets/common/action_mixins/feedback.dart
+++ b/lib/widgets/common/action_mixins/feedback.dart
@@ -107,7 +107,7 @@ class ReportOverlay<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ReportOverlayState createState() => _ReportOverlayState<T>();
+  State<ReportOverlay<T>> createState() => _ReportOverlayState<T>();
 }
 
 class _ReportOverlayState<T> extends State<ReportOverlay<T>> with SingleTickerProviderStateMixin {
@@ -239,7 +239,7 @@ class _FeedbackMessage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _FeedbackMessageState createState() => _FeedbackMessageState();
+  State<_FeedbackMessage> createState() => _FeedbackMessageState();
 }
 
 class _FeedbackMessageState extends State<_FeedbackMessage> {
@@ -304,7 +304,7 @@ class ActionFeedback extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ActionFeedbackState createState() => _ActionFeedbackState();
+  State<ActionFeedback> createState() => _ActionFeedbackState();
 }
 
 class _ActionFeedbackState extends State<ActionFeedback> with SingleTickerProviderStateMixin {
diff --git a/lib/widgets/common/basic/color_list_tile.dart b/lib/widgets/common/basic/color_list_tile.dart
index 4ee3a65ba..92216f957 100644
--- a/lib/widgets/common/basic/color_list_tile.dart
+++ b/lib/widgets/common/basic/color_list_tile.dart
@@ -56,7 +56,7 @@ class ColorPickerDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ColorPickerDialogState createState() => _ColorPickerDialogState();
+  State<ColorPickerDialog> createState() => _ColorPickerDialogState();
 }
 
 class _ColorPickerDialogState extends State<ColorPickerDialog> {
diff --git a/lib/widgets/common/basic/draggable_scrollbar.dart b/lib/widgets/common/basic/draggable_scrollbar.dart
index fb7bd7b11..b3b0ea687 100644
--- a/lib/widgets/common/basic/draggable_scrollbar.dart
+++ b/lib/widgets/common/basic/draggable_scrollbar.dart
@@ -71,7 +71,7 @@ class DraggableScrollbar extends StatefulWidget {
         super(key: key);
 
   @override
-  _DraggableScrollbarState createState() => _DraggableScrollbarState();
+  State<DraggableScrollbar> createState() => _DraggableScrollbarState();
 
   static Widget buildScrollThumbAndLabel({
     required Widget scrollThumb,
diff --git a/lib/widgets/common/basic/menu.dart b/lib/widgets/common/basic/menu.dart
index 8bb4db14a..a4984026f 100644
--- a/lib/widgets/common/basic/menu.dart
+++ b/lib/widgets/common/basic/menu.dart
@@ -63,7 +63,7 @@ class PopupMenuItemExpansionPanel<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _PopupMenuItemExpansionPanelState createState() => _PopupMenuItemExpansionPanelState<T>();
+  State<PopupMenuItemExpansionPanel<T>> createState() => _PopupMenuItemExpansionPanelState<T>();
 }
 
 class _PopupMenuItemExpansionPanelState<T> extends State<PopupMenuItemExpansionPanel<T>> {
diff --git a/lib/widgets/common/basic/multi_cross_fader.dart b/lib/widgets/common/basic/multi_cross_fader.dart
index ebf7a7e99..95be7ff94 100644
--- a/lib/widgets/common/basic/multi_cross_fader.dart
+++ b/lib/widgets/common/basic/multi_cross_fader.dart
@@ -16,7 +16,7 @@ class MultiCrossFader extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _MultiCrossFaderState createState() => _MultiCrossFaderState();
+  State<MultiCrossFader> createState() => _MultiCrossFaderState();
 }
 
 class _MultiCrossFaderState extends State<MultiCrossFader> {
diff --git a/lib/widgets/common/basic/popup_menu_button.dart b/lib/widgets/common/basic/popup_menu_button.dart
index ede8487ee..a6b224f78 100644
--- a/lib/widgets/common/basic/popup_menu_button.dart
+++ b/lib/widgets/common/basic/popup_menu_button.dart
@@ -41,7 +41,7 @@ class AvesPopupMenuButton<T> extends PopupMenuButton<T> {
         );
 
   @override
-  _AvesPopupMenuButtonState<T> createState() => _AvesPopupMenuButtonState<T>();
+  PopupMenuButtonState<T> createState() => _AvesPopupMenuButtonState<T>();
 }
 
 class _AvesPopupMenuButtonState<T> extends PopupMenuButtonState<T> {
diff --git a/lib/widgets/common/basic/query_bar.dart b/lib/widgets/common/basic/query_bar.dart
index c4b97f3ad..909b5fe05 100644
--- a/lib/widgets/common/basic/query_bar.dart
+++ b/lib/widgets/common/basic/query_bar.dart
@@ -21,7 +21,7 @@ class QueryBar extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _QueryBarState createState() => _QueryBarState();
+  State<QueryBar> createState() => _QueryBarState();
 }
 
 class _QueryBarState extends State<QueryBar> {
diff --git a/lib/widgets/common/basic/wheel.dart b/lib/widgets/common/basic/wheel.dart
index 0c258668f..f1e9cbf34 100644
--- a/lib/widgets/common/basic/wheel.dart
+++ b/lib/widgets/common/basic/wheel.dart
@@ -15,7 +15,7 @@ class WheelSelector<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _WheelSelectorState createState() => _WheelSelectorState<T>();
+  State<WheelSelector<T>> createState() => _WheelSelectorState<T>();
 }
 
 class _WheelSelectorState<T> extends State<WheelSelector<T>> {
diff --git a/lib/widgets/common/behaviour/double_back_pop.dart b/lib/widgets/common/behaviour/double_back_pop.dart
index 6b198c293..d1bbfc8c3 100644
--- a/lib/widgets/common/behaviour/double_back_pop.dart
+++ b/lib/widgets/common/behaviour/double_back_pop.dart
@@ -17,7 +17,7 @@ class DoubleBackPopScope extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _DoubleBackPopScopeState createState() => _DoubleBackPopScopeState();
+  State<DoubleBackPopScope> createState() => _DoubleBackPopScopeState();
 }
 
 class _DoubleBackPopScopeState extends State<DoubleBackPopScope> with FeedbackMixin {
diff --git a/lib/widgets/common/favourite_toggler.dart b/lib/widgets/common/favourite_toggler.dart
index 319c1d8ac..d3a2e563b 100644
--- a/lib/widgets/common/favourite_toggler.dart
+++ b/lib/widgets/common/favourite_toggler.dart
@@ -20,7 +20,7 @@ class FavouriteToggler extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _FavouriteTogglerState createState() => _FavouriteTogglerState();
+  State<FavouriteToggler> createState() => _FavouriteTogglerState();
 }
 
 class _FavouriteTogglerState extends State<FavouriteToggler> {
diff --git a/lib/widgets/common/fx/sweeper.dart b/lib/widgets/common/fx/sweeper.dart
index 2227508d5..6062016cb 100644
--- a/lib/widgets/common/fx/sweeper.dart
+++ b/lib/widgets/common/fx/sweeper.dart
@@ -26,7 +26,7 @@ class Sweeper extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _SweeperState createState() => _SweeperState();
+  State<Sweeper> createState() => _SweeperState();
 }
 
 class _SweeperState extends State<Sweeper> with SingleTickerProviderStateMixin {
diff --git a/lib/widgets/common/fx/transition_image.dart b/lib/widgets/common/fx/transition_image.dart
index e611fa921..33d5b2472 100644
--- a/lib/widgets/common/fx/transition_image.dart
+++ b/lib/widgets/common/fx/transition_image.dart
@@ -25,7 +25,7 @@ class TransitionImage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _TransitionImageState createState() => _TransitionImageState();
+  State<TransitionImage> createState() => _TransitionImageState();
 }
 
 class _TransitionImageState extends State<TransitionImage> {
diff --git a/lib/widgets/common/grid/item_tracker.dart b/lib/widgets/common/grid/item_tracker.dart
index 3bb375a9e..bceaf8dd8 100644
--- a/lib/widgets/common/grid/item_tracker.dart
+++ b/lib/widgets/common/grid/item_tracker.dart
@@ -26,7 +26,7 @@ class GridItemTracker<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _GridItemTrackerState createState() => _GridItemTrackerState<T>();
+  State<GridItemTracker<T>> createState() => _GridItemTrackerState<T>();
 }
 
 class _GridItemTrackerState<T> extends State<GridItemTracker<T>> with WidgetsBindingObserver {
diff --git a/lib/widgets/common/grid/scaling.dart b/lib/widgets/common/grid/scaling.dart
index 15097ba46..7d99d31f2 100644
--- a/lib/widgets/common/grid/scaling.dart
+++ b/lib/widgets/common/grid/scaling.dart
@@ -42,7 +42,7 @@ class GridScaleGestureDetector<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _GridScaleGestureDetectorState createState() => _GridScaleGestureDetectorState<T>();
+  State<GridScaleGestureDetector<T>> createState() => _GridScaleGestureDetectorState<T>();
 }
 
 class _GridScaleGestureDetectorState<T> extends State<GridScaleGestureDetector<T>> {
@@ -235,7 +235,7 @@ class _ScaleOverlay extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ScaleOverlayState createState() => _ScaleOverlayState();
+  State<_ScaleOverlay> createState() => _ScaleOverlayState();
 }
 
 class _ScaleOverlayState extends State<_ScaleOverlay> {
diff --git a/lib/widgets/common/grid/selector.dart b/lib/widgets/common/grid/selector.dart
index 05f41d58c..907166958 100644
--- a/lib/widgets/common/grid/selector.dart
+++ b/lib/widgets/common/grid/selector.dart
@@ -28,7 +28,7 @@ class GridSelectionGestureDetector<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _GridSelectionGestureDetectorState createState() => _GridSelectionGestureDetectorState<T>();
+  State<GridSelectionGestureDetector<T>> createState() => _GridSelectionGestureDetectorState<T>();
 }
 
 class _GridSelectionGestureDetectorState<T> extends State<GridSelectionGestureDetector<T>> {
diff --git a/lib/widgets/common/identity/aves_filter_chip.dart b/lib/widgets/common/identity/aves_filter_chip.dart
index 7061b9f99..e362d4ce7 100644
--- a/lib/widgets/common/identity/aves_filter_chip.dart
+++ b/lib/widgets/common/identity/aves_filter_chip.dart
@@ -110,7 +110,7 @@ class AvesFilterChip extends StatefulWidget {
   }
 
   @override
-  _AvesFilterChipState createState() => _AvesFilterChipState();
+  State<AvesFilterChip> createState() => _AvesFilterChipState();
 }
 
 class _AvesFilterChipState extends State<AvesFilterChip> {
diff --git a/lib/widgets/common/magnifier/core/gesture_detector.dart b/lib/widgets/common/magnifier/core/gesture_detector.dart
index 52794be27..507ae5252 100644
--- a/lib/widgets/common/magnifier/core/gesture_detector.dart
+++ b/lib/widgets/common/magnifier/core/gesture_detector.dart
@@ -31,7 +31,7 @@ class MagnifierGestureDetector extends StatefulWidget {
   final Widget? child;
 
   @override
-  _MagnifierGestureDetectorState createState() => _MagnifierGestureDetectorState();
+  State<MagnifierGestureDetector> createState() => _MagnifierGestureDetectorState();
 }
 
 class _MagnifierGestureDetectorState extends State<MagnifierGestureDetector> {
diff --git a/lib/widgets/common/map/buttons.dart b/lib/widgets/common/map/buttons.dart
index 48223c7cb..1622ea8cb 100644
--- a/lib/widgets/common/map/buttons.dart
+++ b/lib/widgets/common/map/buttons.dart
@@ -248,7 +248,7 @@ class _OverlayCoordinateFilterChip extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _OverlayCoordinateFilterChipState createState() => _OverlayCoordinateFilterChipState();
+  State<_OverlayCoordinateFilterChip> createState() => _OverlayCoordinateFilterChipState();
 }
 
 class _OverlayCoordinateFilterChipState extends State<_OverlayCoordinateFilterChip> {
diff --git a/lib/widgets/common/map/geo_map.dart b/lib/widgets/common/map/geo_map.dart
index b9862fdee..93202ab46 100644
--- a/lib/widgets/common/map/geo_map.dart
+++ b/lib/widgets/common/map/geo_map.dart
@@ -56,7 +56,7 @@ class GeoMap extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _GeoMapState createState() => _GeoMapState();
+  State<GeoMap> createState() => _GeoMapState();
 }
 
 class _GeoMapState extends State<GeoMap> {
diff --git a/lib/widgets/common/map/google/marker_generator.dart b/lib/widgets/common/map/google/marker_generator.dart
index ded1b979c..55f093b2f 100644
--- a/lib/widgets/common/map/google/marker_generator.dart
+++ b/lib/widgets/common/map/google/marker_generator.dart
@@ -21,7 +21,7 @@ class MarkerGeneratorWidget<T extends Key> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _MarkerGeneratorWidgetState createState() => _MarkerGeneratorWidgetState<T>();
+  State<MarkerGeneratorWidget<T>> createState() => _MarkerGeneratorWidgetState<T>();
 }
 
 class _MarkerGeneratorWidgetState<T extends Key> extends State<MarkerGeneratorWidget<T>> {
diff --git a/lib/widgets/common/thumbnail/error.dart b/lib/widgets/common/thumbnail/error.dart
index 6ca741e0d..b00266454 100644
--- a/lib/widgets/common/thumbnail/error.dart
+++ b/lib/widgets/common/thumbnail/error.dart
@@ -18,7 +18,7 @@ class ErrorThumbnail extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ErrorThumbnailState createState() => _ErrorThumbnailState();
+  State<ErrorThumbnail> createState() => _ErrorThumbnailState();
 }
 
 class _ErrorThumbnailState extends State<ErrorThumbnail> {
diff --git a/lib/widgets/common/thumbnail/image.dart b/lib/widgets/common/thumbnail/image.dart
index 0a6961070..f3ae1a39a 100644
--- a/lib/widgets/common/thumbnail/image.dart
+++ b/lib/widgets/common/thumbnail/image.dart
@@ -37,7 +37,7 @@ class ThumbnailImage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ThumbnailImageState createState() => _ThumbnailImageState();
+  State<ThumbnailImage> createState() => _ThumbnailImageState();
 }
 
 class _ThumbnailImageState extends State<ThumbnailImage> {
diff --git a/lib/widgets/common/thumbnail/overlay.dart b/lib/widgets/common/thumbnail/overlay.dart
index 39a4f60b9..7b1d2912e 100644
--- a/lib/widgets/common/thumbnail/overlay.dart
+++ b/lib/widgets/common/thumbnail/overlay.dart
@@ -58,7 +58,7 @@ class ThumbnailHighlightOverlay extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ThumbnailHighlightOverlayState createState() => _ThumbnailHighlightOverlayState();
+  State<ThumbnailHighlightOverlay> createState() => _ThumbnailHighlightOverlayState();
 }
 
 class _ThumbnailHighlightOverlayState extends State<ThumbnailHighlightOverlay> {
diff --git a/lib/widgets/common/thumbnail/scroller.dart b/lib/widgets/common/thumbnail/scroller.dart
index 2894b3ded..10ba991f2 100644
--- a/lib/widgets/common/thumbnail/scroller.dart
+++ b/lib/widgets/common/thumbnail/scroller.dart
@@ -30,7 +30,7 @@ class ThumbnailScroller extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ThumbnailScrollerState createState() => _ThumbnailScrollerState();
+  State<ThumbnailScroller> createState() => _ThumbnailScrollerState();
 }
 
 class _ThumbnailScrollerState extends State<ThumbnailScroller> {
diff --git a/lib/widgets/debug/android_apps.dart b/lib/widgets/debug/android_apps.dart
index 25a89ef64..1aa035e91 100644
--- a/lib/widgets/debug/android_apps.dart
+++ b/lib/widgets/debug/android_apps.dart
@@ -11,7 +11,7 @@ class DebugAndroidAppSection extends StatefulWidget {
   const DebugAndroidAppSection({Key? key}) : super(key: key);
 
   @override
-  _DebugAndroidAppSectionState createState() => _DebugAndroidAppSectionState();
+  State<DebugAndroidAppSection> createState() => _DebugAndroidAppSectionState();
 }
 
 class _DebugAndroidAppSectionState extends State<DebugAndroidAppSection> with AutomaticKeepAliveClientMixin {
diff --git a/lib/widgets/debug/android_codecs.dart b/lib/widgets/debug/android_codecs.dart
index f9b1d8289..dc2c47c12 100644
--- a/lib/widgets/debug/android_codecs.dart
+++ b/lib/widgets/debug/android_codecs.dart
@@ -10,7 +10,7 @@ class DebugAndroidCodecSection extends StatefulWidget {
   const DebugAndroidCodecSection({Key? key}) : super(key: key);
 
   @override
-  _DebugAndroidCodecSectionState createState() => _DebugAndroidCodecSectionState();
+  State<DebugAndroidCodecSection> createState() => _DebugAndroidCodecSectionState();
 }
 
 class _DebugAndroidCodecSectionState extends State<DebugAndroidCodecSection> with AutomaticKeepAliveClientMixin {
diff --git a/lib/widgets/debug/android_dirs.dart b/lib/widgets/debug/android_dirs.dart
index ddf426495..5b5bd1a36 100644
--- a/lib/widgets/debug/android_dirs.dart
+++ b/lib/widgets/debug/android_dirs.dart
@@ -9,7 +9,7 @@ class DebugAndroidDirSection extends StatefulWidget {
   const DebugAndroidDirSection({Key? key}) : super(key: key);
 
   @override
-  _DebugAndroidDirSectionState createState() => _DebugAndroidDirSectionState();
+  State<DebugAndroidDirSection> createState() => _DebugAndroidDirSectionState();
 }
 
 class _DebugAndroidDirSectionState extends State<DebugAndroidDirSection> with AutomaticKeepAliveClientMixin {
diff --git a/lib/widgets/debug/cache.dart b/lib/widgets/debug/cache.dart
index 9dca26878..28bbcc23a 100644
--- a/lib/widgets/debug/cache.dart
+++ b/lib/widgets/debug/cache.dart
@@ -7,7 +7,7 @@ class DebugCacheSection extends StatefulWidget {
   const DebugCacheSection({Key? key}) : super(key: key);
 
   @override
-  _DebugCacheSectionState createState() => _DebugCacheSectionState();
+  State<DebugCacheSection> createState() => _DebugCacheSectionState();
 }
 
 class _DebugCacheSectionState extends State<DebugCacheSection> with AutomaticKeepAliveClientMixin {
diff --git a/lib/widgets/debug/database.dart b/lib/widgets/debug/database.dart
index f2bf3386b..60eaad3b6 100644
--- a/lib/widgets/debug/database.dart
+++ b/lib/widgets/debug/database.dart
@@ -14,7 +14,7 @@ class DebugAppDatabaseSection extends StatefulWidget {
   const DebugAppDatabaseSection({Key? key}) : super(key: key);
 
   @override
-  _DebugAppDatabaseSectionState createState() => _DebugAppDatabaseSectionState();
+  State<DebugAppDatabaseSection> createState() => _DebugAppDatabaseSectionState();
 }
 
 class _DebugAppDatabaseSectionState extends State<DebugAppDatabaseSection> with AutomaticKeepAliveClientMixin {
diff --git a/lib/widgets/debug/media_store_scan_dialog.dart b/lib/widgets/debug/media_store_scan_dialog.dart
index f211c652e..a63d07202 100644
--- a/lib/widgets/debug/media_store_scan_dialog.dart
+++ b/lib/widgets/debug/media_store_scan_dialog.dart
@@ -9,7 +9,7 @@ class MediaStoreScanDirDialog extends StatefulWidget {
   const MediaStoreScanDirDialog({Key? key}) : super(key: key);
 
   @override
-  _MediaStoreScanDirDialogState createState() => _MediaStoreScanDirDialogState();
+  State<MediaStoreScanDirDialog> createState() => _MediaStoreScanDirDialogState();
 }
 
 class _MediaStoreScanDirDialogState extends State<MediaStoreScanDirDialog> {
diff --git a/lib/widgets/debug/storage.dart b/lib/widgets/debug/storage.dart
index 2dccf852d..e7c697590 100644
--- a/lib/widgets/debug/storage.dart
+++ b/lib/widgets/debug/storage.dart
@@ -9,7 +9,7 @@ class DebugStorageSection extends StatefulWidget {
   const DebugStorageSection({Key? key}) : super(key: key);
 
   @override
-  _DebugStorageSectionState createState() => _DebugStorageSectionState();
+  State<DebugStorageSection> createState() => _DebugStorageSectionState();
 }
 
 class _DebugStorageSectionState extends State<DebugStorageSection> with AutomaticKeepAliveClientMixin {
diff --git a/lib/widgets/dialogs/add_shortcut_dialog.dart b/lib/widgets/dialogs/add_shortcut_dialog.dart
index 42ce29bb7..e14416b85 100644
--- a/lib/widgets/dialogs/add_shortcut_dialog.dart
+++ b/lib/widgets/dialogs/add_shortcut_dialog.dart
@@ -23,7 +23,7 @@ class AddShortcutDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AddShortcutDialogState createState() => _AddShortcutDialogState();
+  State<AddShortcutDialog> createState() => _AddShortcutDialogState();
 }
 
 class _AddShortcutDialogState extends State<AddShortcutDialog> {
diff --git a/lib/widgets/dialogs/aves_confirmation_dialog.dart b/lib/widgets/dialogs/aves_confirmation_dialog.dart
index 6d51c812e..de287290a 100644
--- a/lib/widgets/dialogs/aves_confirmation_dialog.dart
+++ b/lib/widgets/dialogs/aves_confirmation_dialog.dart
@@ -36,7 +36,7 @@ class AvesConfirmationDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AvesConfirmationDialogState createState() => _AvesConfirmationDialogState();
+  State<AvesConfirmationDialog> createState() => _AvesConfirmationDialogState();
 }
 
 class _AvesConfirmationDialogState extends State<AvesConfirmationDialog> {
diff --git a/lib/widgets/dialogs/aves_selection_dialog.dart b/lib/widgets/dialogs/aves_selection_dialog.dart
index e6f70dda0..ab6c0b626 100644
--- a/lib/widgets/dialogs/aves_selection_dialog.dart
+++ b/lib/widgets/dialogs/aves_selection_dialog.dart
@@ -22,7 +22,7 @@ class AvesSelectionDialog<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AvesSelectionDialogState<T> createState() => _AvesSelectionDialogState<T>();
+  State<AvesSelectionDialog<T>> createState() => _AvesSelectionDialogState<T>();
 }
 
 class _AvesSelectionDialogState<T> extends State<AvesSelectionDialog<T>> {
diff --git a/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart
index 95145b337..28112801c 100644
--- a/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart
+++ b/lib/widgets/dialogs/entry_editors/edit_date_dialog.dart
@@ -21,7 +21,7 @@ class EditEntryDateDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EditEntryDateDialogState createState() => _EditEntryDateDialogState();
+  State<EditEntryDateDialog> createState() => _EditEntryDateDialogState();
 }
 
 class _EditEntryDateDialogState extends State<EditEntryDateDialog> {
diff --git a/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart
index 3f3e67c95..20520155e 100644
--- a/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart
+++ b/lib/widgets/dialogs/entry_editors/edit_location_dialog.dart
@@ -21,7 +21,7 @@ class EditEntryLocationDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EditEntryLocationDialogState createState() => _EditEntryLocationDialogState();
+  State<EditEntryLocationDialog> createState() => _EditEntryLocationDialogState();
 }
 
 class _EditEntryLocationDialogState extends State<EditEntryLocationDialog> {
diff --git a/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart
index 5ab85c56f..275aab264 100644
--- a/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart
+++ b/lib/widgets/dialogs/entry_editors/edit_rating_dialog.dart
@@ -14,7 +14,7 @@ class EditEntryRatingDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EditEntryRatingDialogState createState() => _EditEntryRatingDialogState();
+  State<EditEntryRatingDialog> createState() => _EditEntryRatingDialogState();
 }
 
 class _EditEntryRatingDialogState extends State<EditEntryRatingDialog> {
diff --git a/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart b/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart
index 49dbe5af8..09ee22b97 100644
--- a/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart
+++ b/lib/widgets/dialogs/entry_editors/edit_tags_dialog.dart
@@ -24,7 +24,7 @@ class TagEditorPage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _TagEditorPageState createState() => _TagEditorPageState();
+  State<TagEditorPage> createState() => _TagEditorPageState();
 }
 
 class _TagEditorPageState extends State<TagEditorPage> {
diff --git a/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart b/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart
index 4967af2e4..c7aeb4e52 100644
--- a/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart
+++ b/lib/widgets/dialogs/entry_editors/remove_metadata_dialog.dart
@@ -20,7 +20,7 @@ class RemoveEntryMetadataDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _RemoveEntryMetadataDialogState createState() => _RemoveEntryMetadataDialogState();
+  State<RemoveEntryMetadataDialog> createState() => _RemoveEntryMetadataDialogState();
 }
 
 class _RemoveEntryMetadataDialogState extends State<RemoveEntryMetadataDialog> {
diff --git a/lib/widgets/dialogs/entry_editors/rename_dialog.dart b/lib/widgets/dialogs/entry_editors/rename_dialog.dart
index f50b32e13..768d9f11a 100644
--- a/lib/widgets/dialogs/entry_editors/rename_dialog.dart
+++ b/lib/widgets/dialogs/entry_editors/rename_dialog.dart
@@ -17,7 +17,7 @@ class RenameEntryDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _RenameEntryDialogState createState() => _RenameEntryDialogState();
+  State<RenameEntryDialog> createState() => _RenameEntryDialogState();
 }
 
 class _RenameEntryDialogState extends State<RenameEntryDialog> {
diff --git a/lib/widgets/dialogs/export_entry_dialog.dart b/lib/widgets/dialogs/export_entry_dialog.dart
index d84b6c10d..8f5ded8e9 100644
--- a/lib/widgets/dialogs/export_entry_dialog.dart
+++ b/lib/widgets/dialogs/export_entry_dialog.dart
@@ -16,7 +16,7 @@ class ExportEntryDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ExportEntryDialogState createState() => _ExportEntryDialogState();
+  State<ExportEntryDialog> createState() => _ExportEntryDialogState();
 }
 
 class _ExportEntryDialogState extends State<ExportEntryDialog> {
diff --git a/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart b/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart
index 72f463e92..2b861a791 100644
--- a/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart
+++ b/lib/widgets/dialogs/filter_editors/cover_selection_dialog.dart
@@ -22,7 +22,7 @@ class CoverSelectionDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _CoverSelectionDialogState createState() => _CoverSelectionDialogState();
+  State<CoverSelectionDialog> createState() => _CoverSelectionDialogState();
 }
 
 class _CoverSelectionDialogState extends State<CoverSelectionDialog> {
diff --git a/lib/widgets/dialogs/filter_editors/create_album_dialog.dart b/lib/widgets/dialogs/filter_editors/create_album_dialog.dart
index dba5b396e..e32a949c0 100644
--- a/lib/widgets/dialogs/filter_editors/create_album_dialog.dart
+++ b/lib/widgets/dialogs/filter_editors/create_album_dialog.dart
@@ -13,7 +13,7 @@ class CreateAlbumDialog extends StatefulWidget {
   const CreateAlbumDialog({Key? key}) : super(key: key);
 
   @override
-  _CreateAlbumDialogState createState() => _CreateAlbumDialogState();
+  State<CreateAlbumDialog> createState() => _CreateAlbumDialogState();
 }
 
 class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
diff --git a/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart b/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart
index d13ff04f6..288cdaed5 100644
--- a/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart
+++ b/lib/widgets/dialogs/filter_editors/rename_album_dialog.dart
@@ -14,7 +14,7 @@ class RenameAlbumDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _RenameAlbumDialogState createState() => _RenameAlbumDialogState();
+  State<RenameAlbumDialog> createState() => _RenameAlbumDialogState();
 }
 
 class _RenameAlbumDialogState extends State<RenameAlbumDialog> {
diff --git a/lib/widgets/dialogs/item_pick_dialog.dart b/lib/widgets/dialogs/item_pick_dialog.dart
index 7623c05e1..184187a04 100644
--- a/lib/widgets/dialogs/item_pick_dialog.dart
+++ b/lib/widgets/dialogs/item_pick_dialog.dart
@@ -23,7 +23,7 @@ class ItemPickDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ItemPickDialogState createState() => _ItemPickDialogState();
+  State<ItemPickDialog> createState() => _ItemPickDialogState();
 }
 
 class _ItemPickDialogState extends State<ItemPickDialog> {
diff --git a/lib/widgets/dialogs/location_pick_dialog.dart b/lib/widgets/dialogs/location_pick_dialog.dart
index ce0cf1e65..00b3ede5d 100644
--- a/lib/widgets/dialogs/location_pick_dialog.dart
+++ b/lib/widgets/dialogs/location_pick_dialog.dart
@@ -66,7 +66,7 @@ class _Content extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ContentState createState() => _ContentState();
+  State<_Content> createState() => _ContentState();
 }
 
 class _ContentState extends State<_Content> with SingleTickerProviderStateMixin {
@@ -237,7 +237,7 @@ class _AddressRow extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AddressRowState createState() => _AddressRowState();
+  State<_AddressRow> createState() => _AddressRowState();
 }
 
 class _AddressRowState extends State<_AddressRow> {
diff --git a/lib/widgets/dialogs/tile_view_dialog.dart b/lib/widgets/dialogs/tile_view_dialog.dart
index de3a26288..61c1a03c1 100644
--- a/lib/widgets/dialogs/tile_view_dialog.dart
+++ b/lib/widgets/dialogs/tile_view_dialog.dart
@@ -24,7 +24,7 @@ class TileViewDialog<S, G, L> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _TileViewDialogState createState() => _TileViewDialogState<S, G, L>();
+  State<TileViewDialog> createState() => _TileViewDialogState<S, G, L>();
 }
 
 class _TileViewDialogState<S, G, L> extends State<TileViewDialog<S, G, L>> with SingleTickerProviderStateMixin {
diff --git a/lib/widgets/dialogs/video_speed_dialog.dart b/lib/widgets/dialogs/video_speed_dialog.dart
index 7aad16f24..a61a53d86 100644
--- a/lib/widgets/dialogs/video_speed_dialog.dart
+++ b/lib/widgets/dialogs/video_speed_dialog.dart
@@ -14,7 +14,7 @@ class VideoSpeedDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _VideoSpeedDialogState createState() => _VideoSpeedDialogState();
+  State<VideoSpeedDialog> createState() => _VideoSpeedDialogState();
 }
 
 class _VideoSpeedDialogState extends State<VideoSpeedDialog> {
diff --git a/lib/widgets/dialogs/video_stream_selection_dialog.dart b/lib/widgets/dialogs/video_stream_selection_dialog.dart
index a841051d8..e9fa19a0f 100644
--- a/lib/widgets/dialogs/video_stream_selection_dialog.dart
+++ b/lib/widgets/dialogs/video_stream_selection_dialog.dart
@@ -17,7 +17,7 @@ class VideoStreamSelectionDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _VideoStreamSelectionDialogState createState() => _VideoStreamSelectionDialogState();
+  State<VideoStreamSelectionDialog> createState() => _VideoStreamSelectionDialogState();
 }
 
 class _VideoStreamSelectionDialogState extends State<VideoStreamSelectionDialog> {
diff --git a/lib/widgets/filter_grids/album_pick.dart b/lib/widgets/filter_grids/album_pick.dart
index 0f33853fb..ccdcee07c 100644
--- a/lib/widgets/filter_grids/album_pick.dart
+++ b/lib/widgets/filter_grids/album_pick.dart
@@ -58,7 +58,7 @@ class _AlbumPickPage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AlbumPickPageState createState() => _AlbumPickPageState();
+  State<_AlbumPickPage> createState() => _AlbumPickPageState();
 }
 
 class _AlbumPickPageState extends State<_AlbumPickPage> {
diff --git a/lib/widgets/filter_grids/common/app_bar.dart b/lib/widgets/filter_grids/common/app_bar.dart
index 5023a70ac..858b0c7ac 100644
--- a/lib/widgets/filter_grids/common/app_bar.dart
+++ b/lib/widgets/filter_grids/common/app_bar.dart
@@ -31,7 +31,7 @@ class FilterGridAppBar<T extends CollectionFilter> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _FilterGridAppBarState createState() => _FilterGridAppBarState<T>();
+  State<FilterGridAppBar<T>> createState() => _FilterGridAppBarState<T>();
 }
 
 class _FilterGridAppBarState<T extends CollectionFilter> extends State<FilterGridAppBar<T>> with SingleTickerProviderStateMixin {
diff --git a/lib/widgets/filter_grids/common/filter_grid_page.dart b/lib/widgets/filter_grids/common/filter_grid_page.dart
index 387513474..50679bac9 100644
--- a/lib/widgets/filter_grids/common/filter_grid_page.dart
+++ b/lib/widgets/filter_grids/common/filter_grid_page.dart
@@ -146,7 +146,7 @@ class FilterGrid<T extends CollectionFilter> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _FilterGridState createState() => _FilterGridState<T>();
+  State<FilterGrid<T>> createState() => _FilterGridState<T>();
 }
 
 class _FilterGridState<T extends CollectionFilter> extends State<FilterGrid<T>> {
@@ -338,7 +338,7 @@ class _FilterSectionedContent<T extends CollectionFilter> extends StatefulWidget
   });
 
   @override
-  _FilterSectionedContentState createState() => _FilterSectionedContentState<T>();
+  State<_FilterSectionedContent<T>> createState() => _FilterSectionedContentState<T>();
 }
 
 class _FilterSectionedContentState<T extends CollectionFilter> extends State<_FilterSectionedContent<T>> {
diff --git a/lib/widgets/filter_grids/common/filter_tile.dart b/lib/widgets/filter_grids/common/filter_tile.dart
index f175a3101..b7850d69a 100644
--- a/lib/widgets/filter_grids/common/filter_tile.dart
+++ b/lib/widgets/filter_grids/common/filter_tile.dart
@@ -33,7 +33,7 @@ class InteractiveFilterTile<T extends CollectionFilter> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _InteractiveFilterTileState createState() => _InteractiveFilterTileState<T>();
+  State<InteractiveFilterTile<T>> createState() => _InteractiveFilterTileState<T>();
 }
 
 class _InteractiveFilterTileState<T extends CollectionFilter> extends State<InteractiveFilterTile<T>> {
diff --git a/lib/widgets/filter_grids/common/overlay.dart b/lib/widgets/filter_grids/common/overlay.dart
index c72362c8e..48651e9a7 100644
--- a/lib/widgets/filter_grids/common/overlay.dart
+++ b/lib/widgets/filter_grids/common/overlay.dart
@@ -19,7 +19,7 @@ class ChipHighlightOverlay extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ChipHighlightOverlayState createState() => _ChipHighlightOverlayState();
+  State<ChipHighlightOverlay> createState() => _ChipHighlightOverlayState();
 }
 
 class _ChipHighlightOverlayState extends State<ChipHighlightOverlay> {
diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart
index a94900d38..f1ccbce77 100644
--- a/lib/widgets/home_page.dart
+++ b/lib/widgets/home_page.dart
@@ -39,7 +39,7 @@ class HomePage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _HomePageState createState() => _HomePageState();
+  State<HomePage> createState() => _HomePageState();
 }
 
 class _HomePageState extends State<HomePage> {
diff --git a/lib/widgets/map/map_info_row.dart b/lib/widgets/map/map_info_row.dart
index 093acf11a..9670d26b9 100644
--- a/lib/widgets/map/map_info_row.dart
+++ b/lib/widgets/map/map_info_row.dart
@@ -77,7 +77,7 @@ class _AddressRow extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AddressRowState createState() => _AddressRowState();
+  State<_AddressRow> createState() => _AddressRowState();
 }
 
 class _AddressRowState extends State<_AddressRow> {
diff --git a/lib/widgets/map/map_page.dart b/lib/widgets/map/map_page.dart
index 3987bd2f1..4dfeb4a2f 100644
--- a/lib/widgets/map/map_page.dart
+++ b/lib/widgets/map/map_page.dart
@@ -78,7 +78,7 @@ class _Content extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ContentState createState() => _ContentState();
+  State<_Content> createState() => _ContentState();
 }
 
 class _ContentState extends State<_Content> with SingleTickerProviderStateMixin {
diff --git a/lib/widgets/search/search_page.dart b/lib/widgets/search/search_page.dart
index 26029a30a..fc730e171 100644
--- a/lib/widgets/search/search_page.dart
+++ b/lib/widgets/search/search_page.dart
@@ -17,7 +17,7 @@ class SearchPage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _SearchPageState createState() => _SearchPageState();
+  State<SearchPage> createState() => _SearchPageState();
 }
 
 class _SearchPageState extends State<SearchPage> {
diff --git a/lib/widgets/settings/accessibility/time_to_take_action.dart b/lib/widgets/settings/accessibility/time_to_take_action.dart
index ced0e082d..7de96d3f8 100644
--- a/lib/widgets/settings/accessibility/time_to_take_action.dart
+++ b/lib/widgets/settings/accessibility/time_to_take_action.dart
@@ -11,7 +11,7 @@ class TimeToTakeActionTile extends StatefulWidget {
   const TimeToTakeActionTile({Key? key}) : super(key: key);
 
   @override
-  _TimeToTakeActionTileState createState() => _TimeToTakeActionTileState();
+  State<TimeToTakeActionTile> createState() => _TimeToTakeActionTileState();
 }
 
 class _TimeToTakeActionTileState extends State<TimeToTakeActionTile> {
diff --git a/lib/widgets/settings/app_export/selection_dialog.dart b/lib/widgets/settings/app_export/selection_dialog.dart
index a02d0a311..34cea2020 100644
--- a/lib/widgets/settings/app_export/selection_dialog.dart
+++ b/lib/widgets/settings/app_export/selection_dialog.dart
@@ -15,7 +15,7 @@ class AppExportItemSelectionDialog extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _AppExportItemSelectionDialogState createState() => _AppExportItemSelectionDialogState();
+  State<AppExportItemSelectionDialog> createState() => _AppExportItemSelectionDialogState();
 }
 
 class _AppExportItemSelectionDialogState extends State<AppExportItemSelectionDialog> {
diff --git a/lib/widgets/settings/common/quick_actions/editor_page.dart b/lib/widgets/settings/common/quick_actions/editor_page.dart
index 874441321..a5cf517ac 100644
--- a/lib/widgets/settings/common/quick_actions/editor_page.dart
+++ b/lib/widgets/settings/common/quick_actions/editor_page.dart
@@ -75,7 +75,7 @@ class QuickActionEditorBody<T extends Object> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _QuickActionEditorBodyState createState() => _QuickActionEditorBodyState<T>();
+  State<QuickActionEditorBody<T>> createState() => _QuickActionEditorBodyState<T>();
 }
 
 class _QuickActionEditorBodyState<T extends Object> extends State<QuickActionEditorBody<T>> with AutomaticKeepAliveClientMixin {
diff --git a/lib/widgets/settings/navigation/drawer.dart b/lib/widgets/settings/navigation/drawer.dart
index 870852196..bd7adb4e2 100644
--- a/lib/widgets/settings/navigation/drawer.dart
+++ b/lib/widgets/settings/navigation/drawer.dart
@@ -39,7 +39,7 @@ class NavigationDrawerEditorPage extends StatefulWidget {
   const NavigationDrawerEditorPage({Key? key}) : super(key: key);
 
   @override
-  _NavigationDrawerEditorPageState createState() => _NavigationDrawerEditorPageState();
+  State<NavigationDrawerEditorPage> createState() => _NavigationDrawerEditorPageState();
 }
 
 class _NavigationDrawerEditorPageState extends State<NavigationDrawerEditorPage> {
diff --git a/lib/widgets/settings/navigation/drawer_tab_albums.dart b/lib/widgets/settings/navigation/drawer_tab_albums.dart
index d76bd2aa4..187d542f8 100644
--- a/lib/widgets/settings/navigation/drawer_tab_albums.dart
+++ b/lib/widgets/settings/navigation/drawer_tab_albums.dart
@@ -18,7 +18,7 @@ class DrawerAlbumTab extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _DrawerAlbumTabState createState() => _DrawerAlbumTabState();
+  State<DrawerAlbumTab> createState() => _DrawerAlbumTabState();
 }
 
 class _DrawerAlbumTabState extends State<DrawerAlbumTab> {
diff --git a/lib/widgets/settings/navigation/drawer_tab_fixed.dart b/lib/widgets/settings/navigation/drawer_tab_fixed.dart
index 3bef027dd..abc9f5110 100644
--- a/lib/widgets/settings/navigation/drawer_tab_fixed.dart
+++ b/lib/widgets/settings/navigation/drawer_tab_fixed.dart
@@ -20,7 +20,7 @@ class DrawerFixedListTab<T> extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _DrawerFixedListTabState<T> createState() => _DrawerFixedListTabState<T>();
+  State<DrawerFixedListTab<T>> createState() => _DrawerFixedListTabState<T>();
 }
 
 class _DrawerFixedListTabState<T> extends State<DrawerFixedListTab<T>> {
diff --git a/lib/widgets/settings/privacy/access_grants.dart b/lib/widgets/settings/privacy/access_grants.dart
index 2c08f9ada..7355c4175 100644
--- a/lib/widgets/settings/privacy/access_grants.dart
+++ b/lib/widgets/settings/privacy/access_grants.dart
@@ -31,7 +31,7 @@ class StorageAccessPage extends StatefulWidget {
   const StorageAccessPage({Key? key}) : super(key: key);
 
   @override
-  _StorageAccessPageState createState() => _StorageAccessPageState();
+  State<StorageAccessPage> createState() => _StorageAccessPageState();
 }
 
 class _StorageAccessPageState extends State<StorageAccessPage> {
diff --git a/lib/widgets/settings/privacy/file_picker/crumb_line.dart b/lib/widgets/settings/privacy/file_picker/crumb_line.dart
index 83da70732..6a1c79e8a 100644
--- a/lib/widgets/settings/privacy/file_picker/crumb_line.dart
+++ b/lib/widgets/settings/privacy/file_picker/crumb_line.dart
@@ -14,7 +14,7 @@ class CrumbLine extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _CrumbLineState createState() => _CrumbLineState();
+  State<CrumbLine> createState() => _CrumbLineState();
 }
 
 class _CrumbLineState extends State<CrumbLine> {
diff --git a/lib/widgets/settings/privacy/file_picker/file_picker.dart b/lib/widgets/settings/privacy/file_picker/file_picker.dart
index f8695b482..dd2ef7347 100644
--- a/lib/widgets/settings/privacy/file_picker/file_picker.dart
+++ b/lib/widgets/settings/privacy/file_picker/file_picker.dart
@@ -23,7 +23,7 @@ class FilePicker extends StatefulWidget {
   const FilePicker({Key? key}) : super(key: key);
 
   @override
-  _FilePickerState createState() => _FilePickerState();
+  State<FilePicker> createState() => _FilePickerState();
 }
 
 class _FilePickerState extends State<FilePicker> {
diff --git a/lib/widgets/settings/settings_page.dart b/lib/widgets/settings/settings_page.dart
index e5d1b610b..0e217194d 100644
--- a/lib/widgets/settings/settings_page.dart
+++ b/lib/widgets/settings/settings_page.dart
@@ -33,7 +33,7 @@ class SettingsPage extends StatefulWidget {
   const SettingsPage({Key? key}) : super(key: key);
 
   @override
-  _SettingsPageState createState() => _SettingsPageState();
+  State<SettingsPage> createState() => _SettingsPageState();
 }
 
 class _SettingsPageState extends State<SettingsPage> with FeedbackMixin {
diff --git a/lib/widgets/settings/viewer/entry_background.dart b/lib/widgets/settings/viewer/entry_background.dart
index 2786129bd..64fdf6b28 100644
--- a/lib/widgets/settings/viewer/entry_background.dart
+++ b/lib/widgets/settings/viewer/entry_background.dart
@@ -15,7 +15,7 @@ class EntryBackgroundSelector extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EntryBackgroundSelectorState createState() => _EntryBackgroundSelectorState();
+  State<EntryBackgroundSelector> createState() => _EntryBackgroundSelectorState();
 }
 
 class _EntryBackgroundSelectorState extends State<EntryBackgroundSelector> {
diff --git a/lib/widgets/settings/viewer/viewer.dart b/lib/widgets/settings/viewer/viewer.dart
index 3b684621a..794d64bd5 100644
--- a/lib/widgets/settings/viewer/viewer.dart
+++ b/lib/widgets/settings/viewer/viewer.dart
@@ -69,7 +69,7 @@ class _CutoutModeSwitch extends StatefulWidget {
   const _CutoutModeSwitch({Key? key}) : super(key: key);
 
   @override
-  _CutoutModeSwitchState createState() => _CutoutModeSwitchState();
+  State<_CutoutModeSwitch> createState() => _CutoutModeSwitchState();
 }
 
 class _CutoutModeSwitchState extends State<_CutoutModeSwitch> {
diff --git a/lib/widgets/viewer/debug/db.dart b/lib/widgets/viewer/debug/db.dart
index d94af86ee..6575c1389 100644
--- a/lib/widgets/viewer/debug/db.dart
+++ b/lib/widgets/viewer/debug/db.dart
@@ -17,7 +17,7 @@ class DbTab extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _DbTabState createState() => _DbTabState();
+  State<DbTab> createState() => _DbTabState();
 }
 
 class _DbTabState extends State<DbTab> {
diff --git a/lib/widgets/viewer/debug/metadata.dart b/lib/widgets/viewer/debug/metadata.dart
index 780f7c1a8..45c525d02 100644
--- a/lib/widgets/viewer/debug/metadata.dart
+++ b/lib/widgets/viewer/debug/metadata.dart
@@ -18,7 +18,7 @@ class MetadataTab extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _MetadataTabState createState() => _MetadataTabState();
+  State<MetadataTab> createState() => _MetadataTabState();
 }
 
 class _MetadataTabState extends State<MetadataTab> {
diff --git a/lib/widgets/viewer/entry_vertical_pager.dart b/lib/widgets/viewer/entry_vertical_pager.dart
index 72cebee21..ed28f6d7a 100644
--- a/lib/widgets/viewer/entry_vertical_pager.dart
+++ b/lib/widgets/viewer/entry_vertical_pager.dart
@@ -35,7 +35,7 @@ class ViewerVerticalPageView extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ViewerVerticalPageViewState createState() => _ViewerVerticalPageViewState();
+  State<ViewerVerticalPageView> createState() => _ViewerVerticalPageViewState();
 }
 
 class _ViewerVerticalPageViewState extends State<ViewerVerticalPageView> {
diff --git a/lib/widgets/viewer/entry_viewer_stack.dart b/lib/widgets/viewer/entry_viewer_stack.dart
index 67acd3bd7..a5836deaf 100644
--- a/lib/widgets/viewer/entry_viewer_stack.dart
+++ b/lib/widgets/viewer/entry_viewer_stack.dart
@@ -49,7 +49,7 @@ class EntryViewerStack extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EntryViewerStackState createState() => _EntryViewerStackState();
+  State<EntryViewerStack> createState() => _EntryViewerStackState();
 }
 
 class _EntryViewerStackState extends State<EntryViewerStack> with FeedbackMixin, SingleTickerProviderStateMixin, WidgetsBindingObserver {
diff --git a/lib/widgets/viewer/info/common.dart b/lib/widgets/viewer/info/common.dart
index bfb4461c5..f1c568c5c 100644
--- a/lib/widgets/viewer/info/common.dart
+++ b/lib/widgets/viewer/info/common.dart
@@ -61,7 +61,7 @@ class InfoRowGroup extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _InfoRowGroupState createState() => _InfoRowGroupState();
+  State<InfoRowGroup> createState() => _InfoRowGroupState();
 }
 
 class _InfoRowGroupState extends State<InfoRowGroup> {
diff --git a/lib/widgets/viewer/info/info_page.dart b/lib/widgets/viewer/info/info_page.dart
index d6036f936..79f789b8a 100644
--- a/lib/widgets/viewer/info/info_page.dart
+++ b/lib/widgets/viewer/info/info_page.dart
@@ -143,7 +143,7 @@ class _InfoPageContent extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _InfoPageContentState createState() => _InfoPageContentState();
+  State<_InfoPageContent> createState() => _InfoPageContentState();
 }
 
 class _InfoPageContentState extends State<_InfoPageContent> {
diff --git a/lib/widgets/viewer/info/location_section.dart b/lib/widgets/viewer/info/location_section.dart
index 767e0dd8b..cb6062516 100644
--- a/lib/widgets/viewer/info/location_section.dart
+++ b/lib/widgets/viewer/info/location_section.dart
@@ -31,7 +31,7 @@ class LocationSection extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _LocationSectionState createState() => _LocationSectionState();
+  State<LocationSection> createState() => _LocationSectionState();
 }
 
 class _LocationSectionState extends State<LocationSection> {
@@ -165,7 +165,7 @@ class _AddressInfoGroup extends StatefulWidget {
   const _AddressInfoGroup({required this.entry});
 
   @override
-  _AddressInfoGroupState createState() => _AddressInfoGroupState();
+  State<_AddressInfoGroup> createState() => _AddressInfoGroupState();
 }
 
 class _AddressInfoGroupState extends State<_AddressInfoGroup> {
diff --git a/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart b/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart
index 7d2864e32..477f7ec34 100644
--- a/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart
+++ b/lib/widgets/viewer/info/metadata/metadata_thumbnail.dart
@@ -15,7 +15,7 @@ class MetadataThumbnails extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _MetadataThumbnailsState createState() => _MetadataThumbnailsState();
+  State<MetadataThumbnails> createState() => _MetadataThumbnailsState();
 }
 
 class _MetadataThumbnailsState extends State<MetadataThumbnails> {
diff --git a/lib/widgets/viewer/info/metadata/xmp_structs.dart b/lib/widgets/viewer/info/metadata/xmp_structs.dart
index 9b81e4723..e447e45cc 100644
--- a/lib/widgets/viewer/info/metadata/xmp_structs.dart
+++ b/lib/widgets/viewer/info/metadata/xmp_structs.dart
@@ -25,7 +25,7 @@ class XmpStructArrayCard extends StatefulWidget {
   }
 
   @override
-  _XmpStructArrayCardState createState() => _XmpStructArrayCardState();
+  State<XmpStructArrayCard> createState() => _XmpStructArrayCardState();
 }
 
 class _XmpStructArrayCardState extends State<XmpStructArrayCard> {
diff --git a/lib/widgets/viewer/info/metadata/xmp_tile.dart b/lib/widgets/viewer/info/metadata/xmp_tile.dart
index 44b4ae3e9..74cc82ce2 100644
--- a/lib/widgets/viewer/info/metadata/xmp_tile.dart
+++ b/lib/widgets/viewer/info/metadata/xmp_tile.dart
@@ -25,7 +25,7 @@ class XmpDirTile extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _XmpDirTileState createState() => _XmpDirTileState();
+  State<XmpDirTile> createState() => _XmpDirTileState();
 }
 
 class _XmpDirTileState extends State<XmpDirTile> {
diff --git a/lib/widgets/viewer/info/owner.dart b/lib/widgets/viewer/info/owner.dart
index 07449ec14..fe01690cd 100644
--- a/lib/widgets/viewer/info/owner.dart
+++ b/lib/widgets/viewer/info/owner.dart
@@ -19,7 +19,7 @@ class OwnerProp extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _OwnerPropState createState() => _OwnerPropState();
+  State<OwnerProp> createState() => _OwnerPropState();
 }
 
 class _OwnerPropState extends State<OwnerProp> {
diff --git a/lib/widgets/viewer/overlay/bottom/multipage.dart b/lib/widgets/viewer/overlay/bottom/multipage.dart
index 5630a7fe1..3b2737b63 100644
--- a/lib/widgets/viewer/overlay/bottom/multipage.dart
+++ b/lib/widgets/viewer/overlay/bottom/multipage.dart
@@ -16,7 +16,7 @@ class MultiPageOverlay extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _MultiPageOverlayState createState() => _MultiPageOverlayState();
+  State<MultiPageOverlay> createState() => _MultiPageOverlayState();
 }
 
 class _MultiPageOverlayState extends State<MultiPageOverlay> {
diff --git a/lib/widgets/viewer/overlay/bottom/thumbnail_preview.dart b/lib/widgets/viewer/overlay/bottom/thumbnail_preview.dart
index d7888e712..18f736556 100644
--- a/lib/widgets/viewer/overlay/bottom/thumbnail_preview.dart
+++ b/lib/widgets/viewer/overlay/bottom/thumbnail_preview.dart
@@ -18,7 +18,7 @@ class ViewerThumbnailPreview extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ViewerThumbnailPreviewState createState() => _ViewerThumbnailPreviewState();
+  State<ViewerThumbnailPreview> createState() => _ViewerThumbnailPreviewState();
 }
 
 class _ViewerThumbnailPreviewState extends State<ViewerThumbnailPreview> {
diff --git a/lib/widgets/viewer/overlay/bottom/video.dart b/lib/widgets/viewer/overlay/bottom/video.dart
index 0d7b85e67..edfafaa41 100644
--- a/lib/widgets/viewer/overlay/bottom/video.dart
+++ b/lib/widgets/viewer/overlay/bottom/video.dart
@@ -383,7 +383,7 @@ class _PlayToggler extends StatefulWidget {
   });
 
   @override
-  _PlayTogglerState createState() => _PlayTogglerState();
+  State<_PlayToggler> createState() => _PlayTogglerState();
 }
 
 class _PlayTogglerState extends State<_PlayToggler> with SingleTickerProviderStateMixin {
diff --git a/lib/widgets/viewer/panorama_page.dart b/lib/widgets/viewer/panorama_page.dart
index 2ca1be7a2..b1de75d75 100644
--- a/lib/widgets/viewer/panorama_page.dart
+++ b/lib/widgets/viewer/panorama_page.dart
@@ -30,7 +30,7 @@ class PanoramaPage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _PanoramaPageState createState() => _PanoramaPageState();
+  State<PanoramaPage> createState() => _PanoramaPageState();
 }
 
 class _PanoramaPageState extends State<PanoramaPage> {
diff --git a/lib/widgets/viewer/source_viewer_page.dart b/lib/widgets/viewer/source_viewer_page.dart
index 36267056c..f486011ea 100644
--- a/lib/widgets/viewer/source_viewer_page.dart
+++ b/lib/widgets/viewer/source_viewer_page.dart
@@ -14,7 +14,7 @@ class SourceViewerPage extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _SourceViewerPageState createState() => _SourceViewerPageState();
+  State<SourceViewerPage> createState() => _SourceViewerPageState();
 }
 
 class _SourceViewerPageState extends State<SourceViewerPage> {
diff --git a/lib/widgets/viewer/visual/entry_page_view.dart b/lib/widgets/viewer/visual/entry_page_view.dart
index 02cb6c0f3..deedfaf74 100644
--- a/lib/widgets/viewer/visual/entry_page_view.dart
+++ b/lib/widgets/viewer/visual/entry_page_view.dart
@@ -45,7 +45,7 @@ class EntryPageView extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _EntryPageViewState createState() => _EntryPageViewState();
+  State<EntryPageView> createState() => _EntryPageViewState();
 }
 
 class _EntryPageViewState extends State<EntryPageView> {
diff --git a/lib/widgets/viewer/visual/error.dart b/lib/widgets/viewer/visual/error.dart
index e53ecc716..0c7a3bd5a 100644
--- a/lib/widgets/viewer/visual/error.dart
+++ b/lib/widgets/viewer/visual/error.dart
@@ -18,7 +18,7 @@ class ErrorView extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _ErrorViewState createState() => _ErrorViewState();
+  State<ErrorView> createState() => _ErrorViewState();
 }
 
 class _ErrorViewState extends State<ErrorView> {
diff --git a/lib/widgets/viewer/visual/raster.dart b/lib/widgets/viewer/visual/raster.dart
index f15a7df16..077df7188 100644
--- a/lib/widgets/viewer/visual/raster.dart
+++ b/lib/widgets/viewer/visual/raster.dart
@@ -28,7 +28,7 @@ class RasterImageView extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _RasterImageViewState createState() => _RasterImageViewState();
+  State<RasterImageView> createState() => _RasterImageViewState();
 }
 
 class _RasterImageViewState extends State<RasterImageView> {
@@ -345,7 +345,7 @@ class _RegionTile extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _RegionTileState createState() => _RegionTileState();
+  State<_RegionTile> createState() => _RegionTileState();
 
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
diff --git a/lib/widgets/viewer/visual/vector.dart b/lib/widgets/viewer/visual/vector.dart
index dc41b5708..cc0e1277e 100644
--- a/lib/widgets/viewer/visual/vector.dart
+++ b/lib/widgets/viewer/visual/vector.dart
@@ -28,7 +28,7 @@ class VectorImageView extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _VectorImageViewState createState() => _VectorImageViewState();
+  State<VectorImageView> createState() => _VectorImageViewState();
 }
 
 class _VectorImageViewState extends State<VectorImageView> {
@@ -300,7 +300,7 @@ class _RegionTile extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  _RegionTileState createState() => _RegionTileState();
+  State<_RegionTile> createState() => _RegionTileState();
 
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
diff --git a/lib/widgets/welcome_page.dart b/lib/widgets/welcome_page.dart
index d21f9c743..bd2e635d5 100644
--- a/lib/widgets/welcome_page.dart
+++ b/lib/widgets/welcome_page.dart
@@ -18,7 +18,7 @@ class WelcomePage extends StatefulWidget {
   const WelcomePage({Key? key}) : super(key: key);
 
   @override
-  _WelcomePageState createState() => _WelcomePageState();
+  State<WelcomePage> createState() => _WelcomePageState();
 }
 
 class _WelcomePageState extends State<WelcomePage> {