diff --git a/lib/model/actions/slideshow.dart b/lib/model/actions/slideshow.dart
index 55d40847f..17fe7e22f 100644
--- a/lib/model/actions/slideshow.dart
+++ b/lib/model/actions/slideshow.dart
@@ -1,6 +1,6 @@
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 enum SlideshowAction {
   resume,
diff --git a/lib/model/entry/extensions/info.dart b/lib/model/entry/extensions/info.dart
index 743b8cc1e..04b064a1d 100644
--- a/lib/model/entry/extensions/info.dart
+++ b/lib/model/entry/extensions/info.dart
@@ -13,7 +13,7 @@ import 'package:aves/theme/text.dart';
 import 'package:aves/widgets/viewer/info/metadata/metadata_dir.dart';
 import 'package:aves_model/aves_model.dart';
 import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
 extension ExtraAvesEntryInfo on AvesEntry {
diff --git a/lib/model/filters/coordinate.dart b/lib/model/filters/coordinate.dart
index 389364c17..5a92264e6 100644
--- a/lib/model/filters/coordinate.dart
+++ b/lib/model/filters/coordinate.dart
@@ -7,7 +7,6 @@ import 'package:aves/model/settings/settings.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves_map/aves_map.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/model/filters/favourite.dart b/lib/model/filters/favourite.dart
index 413da4c86..3b5ff0333 100644
--- a/lib/model/filters/favourite.dart
+++ b/lib/model/filters/favourite.dart
@@ -5,7 +5,7 @@ import 'package:aves/theme/colors.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
 class FavouriteFilter extends CollectionFilter {
diff --git a/lib/model/filters/query.dart b/lib/model/filters/query.dart
index 9df1f55f6..d48c72602 100644
--- a/lib/model/filters/query.dart
+++ b/lib/model/filters/query.dart
@@ -4,7 +4,6 @@ import 'package:aves/theme/colors.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/file_utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
diff --git a/lib/model/filters/recent.dart b/lib/model/filters/recent.dart
index d8cfb3e78..a30e6cfbc 100644
--- a/lib/model/filters/recent.dart
+++ b/lib/model/filters/recent.dart
@@ -1,7 +1,7 @@
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 class RecentlyAddedFilter extends CollectionFilter {
   static const type = 'recently_added';
diff --git a/lib/model/filters/trash.dart b/lib/model/filters/trash.dart
index c995f95b2..3957254b7 100644
--- a/lib/model/filters/trash.dart
+++ b/lib/model/filters/trash.dart
@@ -2,7 +2,7 @@ import 'package:aves/model/entry/entry.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 class TrashFilter extends CollectionFilter {
   static const type = 'trash';
diff --git a/lib/model/geotiff.dart b/lib/model/geotiff.dart
index a557039ae..1f6923ecf 100644
--- a/lib/model/geotiff.dart
+++ b/lib/model/geotiff.dart
@@ -8,7 +8,8 @@ import 'package:aves/ref/geotiff.dart';
 import 'package:aves/utils/math_utils.dart';
 import 'package:aves_map/aves_map.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/painting.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:proj4dart/proj4dart.dart' as proj4;
 
@@ -49,7 +50,7 @@ class MappedGeoTiff with MapOverlay {
   static final tileImagePaint = Paint();
   static final tileMissingPaint = Paint()
     ..style = PaintingStyle.fill
-    ..color = Colors.black;
+    ..color = const Color(0xFF000000);
 
   MappedGeoTiff({
     required GeoTiffInfo info,
diff --git a/lib/model/naming_pattern.dart b/lib/model/naming_pattern.dart
index e24e5221f..2fd502291 100644
--- a/lib/model/naming_pattern.dart
+++ b/lib/model/naming_pattern.dart
@@ -1,6 +1,6 @@
 import 'package:aves/model/entry/entry.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
 
 @immutable
diff --git a/lib/model/settings/defaults.dart b/lib/model/settings/defaults.dart
index 9edcf1400..1c18f3d89 100644
--- a/lib/model/settings/defaults.dart
+++ b/lib/model/settings/defaults.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:aves/model/actions/entry.dart';
 import 'package:aves/model/actions/entry_set.dart';
 import 'package:aves/model/filters/recent.dart';
@@ -5,10 +7,10 @@ import 'package:aves/model/naming_pattern.dart';
 import 'package:aves/model/settings/enums/enums.dart';
 import 'package:aves/model/source/enums/enums.dart';
 import 'package:aves/ref/mime_types.dart';
+import 'package:aves/utils/colors.dart';
 import 'package:aves/widgets/filter_grids/albums_page.dart';
 import 'package:aves/widgets/filter_grids/countries_page.dart';
 import 'package:aves/widgets/filter_grids/tags_page.dart';
-import 'package:flutter/material.dart';
 
 class SettingsDefaults {
   // app
@@ -104,8 +106,8 @@ class SettingsDefaults {
   static const subtitleTextAlignment = TextAlign.center;
   static const subtitleTextPosition = SubtitlePosition.bottom;
   static const subtitleShowOutline = true;
-  static const subtitleTextColor = Colors.white;
-  static const subtitleBackgroundColor = Colors.transparent;
+  static const subtitleTextColor = Color(0xFFFFFFFF);
+  static const subtitleBackgroundColor = ColorUtils.transparentBlack;
 
   // info
   static const infoMapZoom = 12.0;
diff --git a/lib/model/settings/enums/entry_background.dart b/lib/model/settings/enums/entry_background.dart
index b4fc3a636..f5c29dc82 100644
--- a/lib/model/settings/enums/entry_background.dart
+++ b/lib/model/settings/enums/entry_background.dart
@@ -1,5 +1,6 @@
+import 'dart:ui';
+
 import 'package:aves/model/settings/enums/enums.dart';
-import 'package:flutter/material.dart';
 
 extension ExtraEntryBackground on EntryBackground {
   bool get isColor {
@@ -15,10 +16,10 @@ extension ExtraEntryBackground on EntryBackground {
   Color get color {
     switch (this) {
       case EntryBackground.white:
-        return Colors.white;
+        return const Color(0xFFFFFFFF);
       case EntryBackground.black:
       default:
-        return Colors.black;
+        return const Color(0xFF000000);
     }
   }
 }
diff --git a/lib/model/settings/settings.dart b/lib/model/settings/settings.dart
index 147323ef2..0b57d64f5 100644
--- a/lib/model/settings/settings.dart
+++ b/lib/model/settings/settings.dart
@@ -26,8 +26,8 @@ import 'package:aves_map/aves_map.dart';
 import 'package:aves_utils/aves_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:latlong2/latlong.dart';
 
 final Settings settings = Settings._private();
diff --git a/lib/model/source/media_store_source.dart b/lib/model/source/media_store_source.dart
index 4e1c17f2d..0f8e6b352 100644
--- a/lib/model/source/media_store_source.dart
+++ b/lib/model/source/media_store_source.dart
@@ -13,7 +13,7 @@ import 'package:aves/model/vaults/vaults.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 
 class MediaStoreSource extends CollectionSource {
   SourceInitializationState _initState = SourceInitializationState.none;
diff --git a/lib/model/wallpaper_target.dart b/lib/model/wallpaper_target.dart
index 882bfb9b8..344c386eb 100644
--- a/lib/model/wallpaper_target.dart
+++ b/lib/model/wallpaper_target.dart
@@ -1,5 +1,5 @@
 import 'package:aves/widgets/common/extensions/build_context.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 enum WallpaperTarget { home, lock, homeLock }
 
diff --git a/lib/services/metadata/svg_metadata_service.dart b/lib/services/metadata/svg_metadata_service.dart
index 882b3527b..677bb97dc 100644
--- a/lib/services/metadata/svg_metadata_service.dart
+++ b/lib/services/metadata/svg_metadata_service.dart
@@ -1,10 +1,11 @@
 import 'dart:convert';
+import 'dart:ui';
 
 import 'package:aves/model/entry/entry.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/string_utils.dart';
 import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:xml/xml.dart';
 
 class SvgMetadataService {
diff --git a/lib/theme/styles.dart b/lib/theme/styles.dart
index 03864dc49..bd8b584f2 100644
--- a/lib/theme/styles.dart
+++ b/lib/theme/styles.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:flutter/material.dart';
+import 'package:flutter/painting.dart';
 
 class AStyles {
   // as of Flutter v2.8.0, overflowing `Text` miscalculates height and some text (e.g. 'Å') is clipped
@@ -22,7 +22,7 @@ class AStyles {
 
   static const embossShadows = [
     Shadow(
-      color: Colors.black,
+      color: Color(0xFF000000),
       offset: Offset(0.5, 1.0),
     )
   ];