diff --git a/.drone.yml b/.drone.yml
index 6a35e64..ef50a14 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,16 +5,29 @@ name: JustMusic
 trigger:
   event:
     - push
+  branch:
+    - master
 
 steps:
-#  - name: app-build
-#    image: cirrusci/flutter:stable
-#    commands:
-#      - cd ./Sources/justMUSIC/
-#      - flutter build apk
+  - name: app-build
+    image: ghcr.io/cirruslabs/flutter:3.13.9
+    commands:
+      - cd ./Sources/justMUSIC/
+      - flutter build apk
+
+  - name: build-web
+    image: ghcr.io/cirruslabs/flutter:3.13.9
+    environment:
+      FIREBASE_TOKEN:
+        from_secret: FIREBASE_TOKEN
+    commands:
+      - cd ./Sources/justMUSIC/
+      - flutter build web --web-renderer canvaskit
+      - curl -sL https://firebase.tools | bash
+      - firebase deploy --token $${FIREBASE_TOKEN}
 
   - name: code-analysis
-    image: cirrusci/flutter:stable 
+    image: ghcr.io/cirruslabs/flutter:3.13.9
     environment:
       SONAR_TOKEN:
         from_secret: SONAR_TOKEN
diff --git a/Sources/justMUSIC/.firebaserc b/Sources/justMUSIC/.firebaserc
new file mode 100644
index 0000000..3e57bea
--- /dev/null
+++ b/Sources/justMUSIC/.firebaserc
@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "justmusic-435d5"
+  }
+}
diff --git a/Sources/justMUSIC/.metadata b/Sources/justMUSIC/.metadata
index 45aa6a7..d22992e 100644
--- a/Sources/justMUSIC/.metadata
+++ b/Sources/justMUSIC/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "2524052335ec76bb03e04ede244b071f1b86d190"
+  revision: "db7ef5bf9f59442b0e200a90587e8fa5e0c6336a"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 2524052335ec76bb03e04ede244b071f1b86d190
-      base_revision: 2524052335ec76bb03e04ede244b071f1b86d190
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: android
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
     - platform: ios
-      create_revision: 2524052335ec76bb03e04ede244b071f1b86d190
-      base_revision: 2524052335ec76bb03e04ede244b071f1b86d190
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: linux
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: macos
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: web
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+    - platform: windows
+      create_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
+      base_revision: db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
 
   # User provided section
 
diff --git a/Sources/justMUSIC/firebase.json b/Sources/justMUSIC/firebase.json
new file mode 100644
index 0000000..60df67a
--- /dev/null
+++ b/Sources/justMUSIC/firebase.json
@@ -0,0 +1,17 @@
+{
+  "hosting": {
+    "site": "justmusic-435d5",
+    "public": "build/web",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
+}
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/components/top_nav_bar_component.dart b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart
index 2b36600..488ff0e 100644
--- a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart
+++ b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart
@@ -136,7 +136,7 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
   Widget build(BuildContext context) {
     choice = widget.choice;
     return SafeArea(top:true,child: Container(
-        padding: EdgeInsets.symmetric(horizontal: defaultPadding),
+        padding: EdgeInsets.symmetric(horizontal: defaultPadding, vertical: 20),
         width: double.infinity,
         height: 100,
         child: Row(
diff --git a/Sources/justMUSIC/lib/config/routes.dart b/Sources/justMUSIC/lib/config/routes.dart
index 7c4c5a0..a553584 100644
--- a/Sources/justMUSIC/lib/config/routes.dart
+++ b/Sources/justMUSIC/lib/config/routes.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/Material.dart';
+import 'package:flutter/material.dart';
 import 'package:justmusic/screens/add_friend_screen.dart';
 import 'package:justmusic/screens/capsule_historic_screen.dart';
 import 'package:justmusic/screens/change_password_screen.dart';
diff --git a/Sources/justMUSIC/lib/main.dart b/Sources/justMUSIC/lib/main.dart
index a371898..dcfbf4e 100644
--- a/Sources/justMUSIC/lib/main.dart
+++ b/Sources/justMUSIC/lib/main.dart
@@ -5,6 +5,7 @@ import 'package:firebase_auth/firebase_auth.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -26,8 +27,6 @@ import 'package:justmusic/view_model/UserViewModel.dart';
 import 'package:justmusic/model/User.dart' as userJustMusic;
 import 'firebase_options.dart';
 import 'package:timezone/data/latest.dart' as tz;
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
 import 'package:intl/date_symbol_data_local.dart';
 
 Future<void> main() async {
@@ -39,7 +38,9 @@ Future<void> main() async {
     options: DefaultFirebaseOptions.currentPlatform,
   );
   await initializeDateFormatting('fr_FR', null);
-  await FirebaseMessaging.instance.requestPermission(sound: true);
+  if (!kIsWeb) {
+    await FirebaseMessaging.instance.requestPermission(sound: true);
+  }
   runApp(const MyApp());
 }
 
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';
diff --git a/Sources/justMUSIC/lib/services/GeoApi.dart b/Sources/justMUSIC/lib/services/GeoApi.dart
index 1f5e55e..b911ba1 100644
--- a/Sources/justMUSIC/lib/services/GeoApi.dart
+++ b/Sources/justMUSIC/lib/services/GeoApi.dart
@@ -38,7 +38,7 @@ class GeoApi {
       Position position = await Geolocator.getCurrentPosition(
           desiredAccuracy: LocationAccuracy.high);
       String apiUrl =
-          'http://api.openweathermap.org/data/2.5/find?lat=${position.latitude}&lon=${position.longitude}&cnt=10&appid=$apiKey';
+          'https://api.openweathermap.org/data/2.5/find?lat=${position.latitude}&lon=${position.longitude}&cnt=10&appid=$apiKey';
       var response = await http.get(Uri.parse(apiUrl));
       if (response.statusCode == 200) {
         var data = json.decode(response.body);
diff --git a/Sources/justMUSIC/lib/values/keys.dart b/Sources/justMUSIC/lib/values/keys.dart
new file mode 100644
index 0000000..637b126
--- /dev/null
+++ b/Sources/justMUSIC/lib/values/keys.dart
@@ -0,0 +1,5 @@
+const geoKey = "85a2724ad38b3994c2b7ebe1d239bbff";
+const clientId = "d9b82921bbdf43efa15d0c34c28c6f93";
+const clientSecret = "ba01687f59ea4ab7ad00c769e89e44d8";
+const keyApiFirebase =
+    "AAAA56TmIPg:APA91bFeKMr_i6CbUuuUdFI1XkdaNE2A7OVHzxrPIsOSlDfhR6qzZwof7JNGxthWUKj1dRHQMheWNYaLbf3AtXUp9o4DX_gB2073yR4urqUEh9CjvnxVws_9g1cWMgmFS3EpaQEA3icC";
\ No newline at end of file
diff --git a/Sources/justMUSIC/pubspec.lock b/Sources/justMUSIC/pubspec.lock
index 854df36..c22310d 100644
--- a/Sources/justMUSIC/pubspec.lock
+++ b/Sources/justMUSIC/pubspec.lock
@@ -61,58 +61,58 @@ packages:
     dependency: "direct main"
     description:
       name: audioplayers
-      sha256: "61583554386721772f9309f509e17712865b38565a903c761f96b1115a979282"
+      sha256: c05c6147124cd63e725e861335a8b4d57300b80e6e92cea7c145c739223bbaef
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "5.2.1"
   audioplayers_android:
     dependency: transitive
     description:
       name: audioplayers_android
-      sha256: dbdc9b7f2aa2440314c638aa55aadd45c7705e8340d5eddf2e3fb8da32d4ae2c
+      sha256: b00e1a0e11365d88576320ec2d8c192bc21f1afb6c0e5995d1c57ae63156acb5
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.3"
   audioplayers_darwin:
     dependency: transitive
     description:
       name: audioplayers_darwin
-      sha256: "6aea96df1d12f7ad5a71d88c6d1b22a216211a9564219920124c16768e456e9d"
+      sha256: "3034e99a6df8d101da0f5082dcca0a2a99db62ab1d4ddb3277bed3f6f81afe08"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "5.0.2"
   audioplayers_linux:
     dependency: transitive
     description:
       name: audioplayers_linux
-      sha256: "396b62ac62c92dd26c3bc5106583747f57a8b325ebd2b41e5576f840cfc61338"
+      sha256: "60787e73fefc4d2e0b9c02c69885402177e818e4e27ef087074cf27c02246c9e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.1.0"
   audioplayers_platform_interface:
     dependency: transitive
     description:
       name: audioplayers_platform_interface
-      sha256: f7daaed4659143094151ecf6bacd927d29ab8acffba98c110c59f0b81ae51143
+      sha256: "365c547f1bb9e77d94dd1687903a668d8f7ac3409e48e6e6a3668a1ac2982adb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "6.1.0"
   audioplayers_web:
     dependency: transitive
     description:
       name: audioplayers_web
-      sha256: ec84fd46eed1577148ed4113f5998a36a18da4fce7170c37ce3e21b631393339
+      sha256: "22cd0173e54d92bd9b2c80b1204eb1eb159ece87475ab58c9788a70ec43c2a62"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "4.1.0"
   audioplayers_windows:
     dependency: transitive
     description:
       name: audioplayers_windows
-      sha256: "1d3aaac98a192b8488167711ba1e67d8b96333e8d0572ede4e2912e5bbce69a3"
+      sha256: "9536812c9103563644ada2ef45ae523806b0745f7a78e89d1b5fb1951de90e1a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "3.1.0"
   auto_size_text:
     dependency: "direct main"
     description:
@@ -628,10 +628,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
+      sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.4"
+    version: "6.1.0"
   google_identity_services_web:
     dependency: transitive
     description:
@@ -700,10 +700,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.6"
+    version: "1.1.0"
   http_parser:
     dependency: transitive
     description:
diff --git a/Sources/justMUSIC/pubspec.yaml b/Sources/justMUSIC/pubspec.yaml
index 7909850..a9f8bc1 100644
--- a/Sources/justMUSIC/pubspec.yaml
+++ b/Sources/justMUSIC/pubspec.yaml
@@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.18.2 <3.0.0'
+  sdk: '>=3.1.4 <4.0.0'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -31,13 +31,13 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  http: ^0.13.5
+  http: ^1.1.0
 
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
-  google_fonts: ^4.0.4
+  google_fonts: ^6.1.0
   gradiantbutton: ^0.0.1
   smooth_corner: ^1.1.0
   flutter_signin_button: ^2.0.0
@@ -50,7 +50,7 @@ dependencies:
   custom_draggable_widget: ^0.0.2
   modal_bottom_sheet: ^2.1.2
   flutter_animated_play_button: ^0.3.0
-  audioplayers: ^4.1.0
+  audioplayers: ^5.2.1
   ionicons: ^0.2.2
   top_snackbar_flutter: ^3.1.0
   firebase_core: ^2.15.0
diff --git a/Sources/justMUSIC/web/favicon.png b/Sources/justMUSIC/web/favicon.png
new file mode 100644
index 0000000..8aaa46a
Binary files /dev/null and b/Sources/justMUSIC/web/favicon.png differ
diff --git a/Sources/justMUSIC/web/icons/Icon-192.png b/Sources/justMUSIC/web/icons/Icon-192.png
new file mode 100644
index 0000000..b749bfe
Binary files /dev/null and b/Sources/justMUSIC/web/icons/Icon-192.png differ
diff --git a/Sources/justMUSIC/web/icons/Icon-512.png b/Sources/justMUSIC/web/icons/Icon-512.png
new file mode 100644
index 0000000..88cfd48
Binary files /dev/null and b/Sources/justMUSIC/web/icons/Icon-512.png differ
diff --git a/Sources/justMUSIC/web/icons/Icon-maskable-192.png b/Sources/justMUSIC/web/icons/Icon-maskable-192.png
new file mode 100644
index 0000000..eb9b4d7
Binary files /dev/null and b/Sources/justMUSIC/web/icons/Icon-maskable-192.png differ
diff --git a/Sources/justMUSIC/web/icons/Icon-maskable-512.png b/Sources/justMUSIC/web/icons/Icon-maskable-512.png
new file mode 100644
index 0000000..d69c566
Binary files /dev/null and b/Sources/justMUSIC/web/icons/Icon-maskable-512.png differ
diff --git a/Sources/justMUSIC/web/index.html b/Sources/justMUSIC/web/index.html
new file mode 100644
index 0000000..6067cfd
--- /dev/null
+++ b/Sources/justMUSIC/web/index.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+  <meta name="google-signin-client_id" content="994903990520-pravk8o6o9ehkhe6asjrao4fmlve0lel.apps.googleusercontent.com">
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="justmusic">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png"/>
+
+  <title>justmusic</title>
+  <link rel="manifest" href="manifest.json">
+
+  <script>
+    // The value below is injected by flutter build, do not touch.
+    const serviceWorkerVersion = null;
+  </script>
+  <!-- This script adds the flutter initialization JS code -->
+  <script src="flutter.js" defer></script>
+</head>
+<body>
+  <script>
+    window.addEventListener('load', function(ev) {
+      // Download main.dart.js
+      _flutter.loader.loadEntrypoint({
+        serviceWorker: {
+          serviceWorkerVersion: serviceWorkerVersion,
+        },
+        onEntrypointLoaded: function(engineInitializer) {
+          engineInitializer.initializeEngine().then(function(appRunner) {
+            appRunner.runApp();
+          });
+        }
+      });
+    });
+  </script>
+</body>
+</html>
diff --git a/Sources/justMUSIC/web/manifest.json b/Sources/justMUSIC/web/manifest.json
new file mode 100644
index 0000000..6c4b61e
--- /dev/null
+++ b/Sources/justMUSIC/web/manifest.json
@@ -0,0 +1,35 @@
+{
+    "name": "justmusic",
+    "short_name": "justmusic",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}