diff --git a/Sources/justMUSIC/lib/components/back_button.dart b/Sources/justMUSIC/lib/components/back_button.dart
index 5e771fa..9baf5bd 100644
--- a/Sources/justMUSIC/lib/components/back_button.dart
+++ b/Sources/justMUSIC/lib/components/back_button.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 
 import '../values/constants.dart';
 
diff --git a/Sources/justMUSIC/lib/components/buttonPostComponent.dart b/Sources/justMUSIC/lib/components/buttonPostComponent.dart
index 28c4587..52be309 100644
--- a/Sources/justMUSIC/lib/components/buttonPostComponent.dart
+++ b/Sources/justMUSIC/lib/components/buttonPostComponent.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:ionicons/ionicons.dart';
 import 'package:tuple/tuple.dart';
diff --git a/Sources/justMUSIC/lib/components/button_play_component.dart b/Sources/justMUSIC/lib/components/button_play_component.dart
index a8b45bb..0afc61c 100644
--- a/Sources/justMUSIC/lib/components/button_play_component.dart
+++ b/Sources/justMUSIC/lib/components/button_play_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 
 import '../main.dart';
 import '../model/Music.dart';
diff --git a/Sources/justMUSIC/lib/components/city_list_component.dart b/Sources/justMUSIC/lib/components/city_list_component.dart
index 59a2100..cfcaa24 100644
--- a/Sources/justMUSIC/lib/components/city_list_component.dart
+++ b/Sources/justMUSIC/lib/components/city_list_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:justmusic/values/constants.dart';
 import 'package:tuple/tuple.dart';
diff --git a/Sources/justMUSIC/lib/components/editable_post_component.dart b/Sources/justMUSIC/lib/components/editable_post_component.dart
index 91a9fe1..03ec905 100644
--- a/Sources/justMUSIC/lib/components/editable_post_component.dart
+++ b/Sources/justMUSIC/lib/components/editable_post_component.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'package:animated_appear/animated_appear.dart';
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
diff --git a/Sources/justMUSIC/lib/components/historic_component.dart b/Sources/justMUSIC/lib/components/historic_component.dart
index db18e71..52a8fd6 100644
--- a/Sources/justMUSIC/lib/components/historic_component.dart
+++ b/Sources/justMUSIC/lib/components/historic_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:justmusic/main.dart';
diff --git a/Sources/justMUSIC/lib/components/little_post_recap_component.dart b/Sources/justMUSIC/lib/components/little_post_recap_component.dart
index 2134adc..95c5ab4 100644
--- a/Sources/justMUSIC/lib/components/little_post_recap_component.dart
+++ b/Sources/justMUSIC/lib/components/little_post_recap_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 import '../values/constants.dart';
diff --git a/Sources/justMUSIC/lib/components/music_list_component.dart b/Sources/justMUSIC/lib/components/music_list_component.dart
index e4b6b2d..966a729 100644
--- a/Sources/justMUSIC/lib/components/music_list_component.dart
+++ b/Sources/justMUSIC/lib/components/music_list_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:justmusic/components/play_button_component.dart';
 import 'package:text_scroll/text_scroll.dart';
diff --git a/Sources/justMUSIC/lib/components/play_button_component.dart b/Sources/justMUSIC/lib/components/play_button_component.dart
index 9f4b21d..4aaff75 100644
--- a/Sources/justMUSIC/lib/components/play_button_component.dart
+++ b/Sources/justMUSIC/lib/components/play_button_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_animated_play_button/flutter_animated_play_button.dart';
 import 'package:ionicons/ionicons.dart';
 
diff --git a/Sources/justMUSIC/lib/components/post_button_component.dart b/Sources/justMUSIC/lib/components/post_button_component.dart
index a82dd98..a6ea2ce 100644
--- a/Sources/justMUSIC/lib/components/post_button_component.dart
+++ b/Sources/justMUSIC/lib/components/post_button_component.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class PostButtonComponent extends StatefulWidget {
diff --git a/Sources/justMUSIC/lib/components/profil_picture_component.dart b/Sources/justMUSIC/lib/components/profil_picture_component.dart
index 48b734a..d35a8d8 100644
--- a/Sources/justMUSIC/lib/components/profil_picture_component.dart
+++ b/Sources/justMUSIC/lib/components/profil_picture_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import '../config/routes.dart';
 import '../model/User.dart';
 
diff --git a/Sources/justMUSIC/lib/components/profile_list_component.dart b/Sources/justMUSIC/lib/components/profile_list_component.dart
index 9201a0c..1dd56e9 100644
--- a/Sources/justMUSIC/lib/components/profile_list_component.dart
+++ b/Sources/justMUSIC/lib/components/profile_list_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:justmusic/components/profil_picture_component.dart';
diff --git a/Sources/justMUSIC/lib/components/recap_component.dart b/Sources/justMUSIC/lib/components/recap_component.dart
index d7ce67e..386484b 100644
--- a/Sources/justMUSIC/lib/components/recap_component.dart
+++ b/Sources/justMUSIC/lib/components/recap_component.dart
@@ -1,5 +1,4 @@
-import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import '../main.dart';
 import '../model/User.dart' as justMusic;
diff --git a/Sources/justMUSIC/lib/components/search_bar_component.dart b/Sources/justMUSIC/lib/components/search_bar_component.dart
index ca7cf9b..cca7594 100644
--- a/Sources/justMUSIC/lib/components/search_bar_component.dart
+++ b/Sources/justMUSIC/lib/components/search_bar_component.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 import '../values/constants.dart';
diff --git a/Sources/justMUSIC/lib/screens/add_friend_screen.dart b/Sources/justMUSIC/lib/screens/add_friend_screen.dart
index 246e514..e5973de 100644
--- a/Sources/justMUSIC/lib/screens/add_friend_screen.dart
+++ b/Sources/justMUSIC/lib/screens/add_friend_screen.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:justmusic/values/constants.dart';
diff --git a/Sources/justMUSIC/lib/screens/capsule_historic_screen.dart b/Sources/justMUSIC/lib/screens/capsule_historic_screen.dart
index f1f7646..6187694 100644
--- a/Sources/justMUSIC/lib/screens/capsule_historic_screen.dart
+++ b/Sources/justMUSIC/lib/screens/capsule_historic_screen.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 import '../components/historic_component.dart';
diff --git a/Sources/justMUSIC/lib/screens/change_password_screen.dart b/Sources/justMUSIC/lib/screens/change_password_screen.dart
index d9d8beb..8a89fca 100644
--- a/Sources/justMUSIC/lib/screens/change_password_screen.dart
+++ b/Sources/justMUSIC/lib/screens/change_password_screen.dart
@@ -1,6 +1,6 @@
 import 'package:firebase_auth/firebase_auth.dart';
 
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
diff --git a/Sources/justMUSIC/lib/screens/detail_post_screen.dart b/Sources/justMUSIC/lib/screens/detail_post_screen.dart
index 98615c0..cc95607 100644
--- a/Sources/justMUSIC/lib/screens/detail_post_screen.dart
+++ b/Sources/justMUSIC/lib/screens/detail_post_screen.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
diff --git a/Sources/justMUSIC/lib/screens/forget_password_screen.dart b/Sources/justMUSIC/lib/screens/forget_password_screen.dart
index f43c889..9863270 100644
--- a/Sources/justMUSIC/lib/screens/forget_password_screen.dart
+++ b/Sources/justMUSIC/lib/screens/forget_password_screen.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
 
diff --git a/Sources/justMUSIC/lib/screens/launching_rocker_screen.dart b/Sources/justMUSIC/lib/screens/launching_rocker_screen.dart
index 2195c80..fa45c7e 100644
--- a/Sources/justMUSIC/lib/screens/launching_rocker_screen.dart
+++ b/Sources/justMUSIC/lib/screens/launching_rocker_screen.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:justmusic/config/routes.dart';
 import 'package:lottie/lottie.dart';
 
diff --git a/Sources/justMUSIC/lib/screens/loading_screen.dart b/Sources/justMUSIC/lib/screens/loading_screen.dart
index e9bb106..777fbd6 100644
--- a/Sources/justMUSIC/lib/screens/loading_screen.dart
+++ b/Sources/justMUSIC/lib/screens/loading_screen.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 
 import '../values/constants.dart';
 
diff --git a/Sources/justMUSIC/lib/screens/post_screen.dart b/Sources/justMUSIC/lib/screens/post_screen.dart
index fb6dbed..a256406 100644
--- a/Sources/justMUSIC/lib/screens/post_screen.dart
+++ b/Sources/justMUSIC/lib/screens/post_screen.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'dart:ui';
 import 'package:animations/animations.dart';
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:justmusic/components/back_button.dart';
 import 'package:justmusic/screens/launching_rocker_screen.dart';
diff --git a/Sources/justMUSIC/lib/screens/search_location_screen.dart b/Sources/justMUSIC/lib/screens/search_location_screen.dart
index 82d8261..080dcc2 100644
--- a/Sources/justMUSIC/lib/screens/search_location_screen.dart
+++ b/Sources/justMUSIC/lib/screens/search_location_screen.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 
 import '../components/city_list_component.dart';
diff --git a/Sources/justMUSIC/lib/screens/search_song_screen.dart b/Sources/justMUSIC/lib/screens/search_song_screen.dart
index a20355c..3813a43 100644
--- a/Sources/justMUSIC/lib/screens/search_song_screen.dart
+++ b/Sources/justMUSIC/lib/screens/search_song_screen.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:ui';
 
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
diff --git a/Sources/justMUSIC/lib/screens/user_screen.dart b/Sources/justMUSIC/lib/screens/user_screen.dart
index 30eb974..187584a 100644
--- a/Sources/justMUSIC/lib/screens/user_screen.dart
+++ b/Sources/justMUSIC/lib/screens/user_screen.dart
@@ -1,8 +1,5 @@
 import 'dart:io';
-
-import 'package:firebase_auth/firebase_auth.dart';
-import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
diff --git a/Sources/justMUSIC/lib/screens/verify_email_screen.dart b/Sources/justMUSIC/lib/screens/verify_email_screen.dart
index 63b0e16..23d2438 100644
--- a/Sources/justMUSIC/lib/screens/verify_email_screen.dart
+++ b/Sources/justMUSIC/lib/screens/verify_email_screen.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:justmusic/main.dart';