diff --git a/lib/config/theme.dart b/lib/config/theme.dart
index 7391677..a78a14a 100644
--- a/lib/config/theme.dart
+++ b/lib/config/theme.dart
@@ -1,64 +1,7 @@
 import 'package:flutter/material.dart';
 
-ThemeData lightTheme(ColorScheme? dynamicColorScheme) => ThemeData(
+final baseTheme = ThemeData(
   useMaterial3: true,
-  colorScheme: dynamicColorScheme,
-  snackBarTheme: SnackBarThemeData(
-    behavior: SnackBarBehavior.floating,
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(5)
-    ),
-    elevation: 4,
-  ),
-  brightness: Brightness.light,  listTileTheme: ListTileThemeData(
-    tileColor: Colors.transparent,
-    textColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
-    iconColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
-  ),
-  androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
-);
-
-ThemeData darkTheme(ColorScheme? dynamicColorScheme) => ThemeData(
-  useMaterial3: true,
-  colorScheme: dynamicColorScheme,
-  snackBarTheme: SnackBarThemeData(
-    behavior: SnackBarBehavior.floating,
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(5)
-    ),
-    elevation: 4,
-  ),
-  brightness: Brightness.dark, 
-  listTileTheme: ListTileThemeData(
-    tileColor: Colors.transparent,
-    textColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
-    iconColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
-  ),
-  androidOverscrollIndicator: AndroidOverscrollIndicator.stretch,
-);
-
-ThemeData lightThemeOldVersions(MaterialColor primaryColor) => ThemeData(
-  useMaterial3: true,
-  colorSchemeSeed: primaryColor,
-  snackBarTheme: SnackBarThemeData(
-    behavior: SnackBarBehavior.floating,
-    shape: RoundedRectangleBorder(
-      borderRadius: BorderRadius.circular(5)
-    ),
-    elevation: 4,
-  ),
-  listTileTheme: const ListTileThemeData(
-    tileColor: Colors.transparent,
-    textColor: Color.fromRGBO(117, 117, 117, 1),
-    iconColor: Color.fromRGBO(117, 117, 117, 1),
-  ),
-  brightness: Brightness.light,
-  androidOverscrollIndicator: AndroidOverscrollIndicator.stretch
-);
-
-ThemeData darkThemeOldVersions(MaterialColor primaryColor) => ThemeData(
-  useMaterial3: true,
-  colorSchemeSeed: primaryColor,
   snackBarTheme: SnackBarThemeData(
     contentTextStyle: const TextStyle(
       color: Colors.white
@@ -69,11 +12,44 @@ ThemeData darkThemeOldVersions(MaterialColor primaryColor) => ThemeData(
     ),
     elevation: 4,
   ),
+);
+
+ThemeData lightTheme(ColorScheme? dynamicColorScheme) => baseTheme.copyWith(
+  colorScheme: dynamicColorScheme,
+  brightness: Brightness.light,  
+  listTileTheme: ListTileThemeData(
+    tileColor: Colors.transparent,
+    textColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
+    iconColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(117, 117, 117, 1),
+  ),
+);
+
+ThemeData darkTheme(ColorScheme? dynamicColorScheme) => baseTheme.copyWith(
+  colorScheme: dynamicColorScheme,
+  brightness: Brightness.dark, 
+  listTileTheme: ListTileThemeData(
+    tileColor: Colors.transparent,
+    textColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
+    iconColor: dynamicColorScheme != null ? dynamicColorScheme.onSurfaceVariant : const Color.fromRGBO(187, 187, 187, 1),
+  ),
+);
+
+ThemeData lightThemeOldVersions(MaterialColor primaryColor) => baseTheme.copyWith(
+  colorScheme: ColorScheme.fromSeed(seedColor: primaryColor),
+  listTileTheme: const ListTileThemeData(
+    tileColor: Colors.transparent,
+    textColor: Color.fromRGBO(117, 117, 117, 1),
+    iconColor: Color.fromRGBO(117, 117, 117, 1),
+  ),
+  brightness: Brightness.light,
+);
+
+ThemeData darkThemeOldVersions(MaterialColor primaryColor) => baseTheme.copyWith(
+  colorScheme: ColorScheme.fromSeed(seedColor: primaryColor),
   listTileTheme: const ListTileThemeData(
     tileColor: Colors.transparent,
     textColor: Color.fromRGBO(187, 187, 187, 1),
     iconColor: Color.fromRGBO(187, 187, 187, 1),
   ),
   brightness: Brightness.dark,
-  androidOverscrollIndicator: AndroidOverscrollIndicator.stretch
 );
\ No newline at end of file