diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
index ac031e4..91c7565 100644
Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
index 29eb6c3..2deac4c 100644
Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
index e29b3b5..3107d37 100644
Binary files a/android/app/src/main/res/drawable-v21/background.png and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index 3fe6b2e..3cc4948 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
index 77f1f6c..262b728 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
index 8760df6..16d1866 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
index 7cfca57..d5b4de6 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
index e29b3b5..3107d37 100644
Binary files a/android/app/src/main/res/drawable/background.png and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 3fe6b2e..3cc4948 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -6,4 +6,4 @@
     <item>
         <bitmap android:gravity="center" android:src="@drawable/splash"/>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 0000000..a3653cb
--- /dev/null
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 3db14bb..5eb2eda 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 0000000..d0a68e9
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index e929412..0fdc703 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,7 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -16,4 +19,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json
deleted file mode 100644
index 1271227..0000000
--- a/ios/Runner/Assets.xcassets/BrandingImage.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "BrandingImage.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "BrandingImage@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "BrandingImage@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
index e29b3b5..3107d37 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 29eb6c3..2deac4c 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 77f1f6c..262b728 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 8760df6..16d1866 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index 28f9d1b..8d2b7d5 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -41,4 +41,4 @@
         <image name="LaunchImage" width="1024" height="1024"/>
         <image name="LaunchBackground" width="1" height="1"/>
     </resources>
-</document>
\ No newline at end of file
+</document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index aaa2ce3..17f32dd 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -46,4 +46,4 @@
 		<key>UIStatusBarHidden</key>
 		<false/>
 	</dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/lib/main.dart b/lib/main.dart
index 030eede..83db470 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -42,37 +42,37 @@ class MyApp extends StatelessWidget {
           brightness: Brightness.light,
         ),
         textTheme: const TextTheme(
-          headline1: TextStyle(
+          displayLarge: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.bold,
             fontSize: 32,
             color: Color(0xFF464646),
           ),
-          headline2: TextStyle(
+          displayMedium: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w700,
             fontSize: 18,
             color: Color(0xFF464646),
           ),
-          headline3: TextStyle(
+          displaySmall: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 18,
             color: Color(0xFF464646),
           ),
-          headline4: TextStyle(
+          headlineMedium: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 18,
             color: Color(0xFFBDBDBD),
           ),
-          headline5: TextStyle(
+          headlineSmall: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 12,
             color: Color(0xFFBDBDBD),
           ),
-          headline6: TextStyle(
+          titleLarge: TextStyle(
             fontStyle: FontStyle.normal,
             fontWeight: FontWeight.w400,
             fontSize: 14,
diff --git a/lib/mqtt/mqtt.dart b/lib/mqtt/mqtt.dart
new file mode 100644
index 0000000..d72c7e9
--- /dev/null
+++ b/lib/mqtt/mqtt.dart
@@ -0,0 +1,118 @@
+import 'dart:convert';
+import 'dart:ffi';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:mqtt_client/mqtt_client.dart';
+import 'package:mqtt_client/mqtt_server_client.dart';
+
+class MqttHandler with ChangeNotifier {
+  final ValueNotifier<String> data = ValueNotifier<String>("");
+  late MqttServerClient client;
+
+  Future<Object> connect() async {
+    client = MqttServerClient.withPort(
+        'broker.hivemq.com', 'smartpump239834893453920938', 1883);
+    client.logging(on: true);
+    client.onConnected = onConnected;
+    client.onDisconnected = onDisconnected;
+    client.onUnsubscribed = onUnsubscribed;
+    client.onSubscribed = onSubscribed;
+    client.onSubscribeFail = onSubscribeFail;
+    client.pongCallback = pong;
+    client.keepAlivePeriod = 60;
+    client.logging(on: true);
+
+    /// Set the correct MQTT protocol for mosquito
+    client.setProtocolV311();
+
+    final connMessage = MqttConnectMessage()
+        .withWillTopic('willtopic')
+        .withWillMessage('Will message')
+        .startClean()
+        .withWillQos(MqttQos.atLeastOnce);
+
+    print('MQTT_LOGS::Mosquitto client connecting....');
+
+    client.connectionMessage = connMessage;
+    try {
+      await client.connect();
+    } catch (e) {
+      print('Exception: $e');
+      client.disconnect();
+    }
+
+    if (client.connectionStatus!.state == MqttConnectionState.connected) {
+      print('MQTT_LOGS::Mosquitto client connected');
+    } else {
+      print(
+          'MQTT_LOGS::ERROR Mosquitto client connection failed - disconnecting, status is ${client.connectionStatus}');
+      client.disconnect();
+      return -1;
+    }
+
+    //wil be used to determine water tank status
+    print('MQTT_LOGS::Subscribing to the pump/current topic');
+    const topic = 'pump/current';
+    client.subscribe(topic, MqttQos.atMostOnce);
+
+    client.updates!.listen((List<MqttReceivedMessage<MqttMessage?>>? c) {
+      final recMess = c![0].payload as MqttPublishMessage;
+      final pt =
+          MqttPublishPayload.bytesToStringAsString(recMess.payload.message);
+
+      data.value = pt;
+      notifyListeners();
+      print(
+          'MQTT_LOGS:: New data arrived: topic is <${c[0].topic}>, payload is $pt');
+      print('');
+    });
+
+    return client;
+  }
+
+  void onConnected() {
+    print('MQTT_LOGS:: Connected');
+  }
+
+  void onDisconnected() {
+    print('MQTT_LOGS:: Disconnected');
+  }
+
+  void onSubscribed(String topic) {
+    print('MQTT_LOGS:: Subscribed topic: $topic');
+  }
+
+  void onSubscribeFail(String topic) {
+    print('MQTT_LOGS:: Failed to subscribe $topic');
+  }
+
+  void onUnsubscribed(String? topic) {
+    print('MQTT_LOGS:: Unsubscribed topic: $topic');
+  }
+
+  void pong() {
+    print('MQTT_LOGS:: Ping response client callback invoked');
+  }
+
+  void pumpTrigger(bool state) {
+    const pubTopic = 'trigger/pump';
+    final builder = MqttClientPayloadBuilder();
+    builder.addBool(val: state);
+    if (client.connectionStatus?.state == MqttConnectionState.connected) {
+      client.publishMessage(pubTopic, MqttQos.atMostOnce, builder.payload!);
+    }
+  }
+
+  void updateConfig(String nextRun, UnsignedInt duration, bool auto) {
+    const pubTopic = 'update/config';
+    final builder = MqttClientPayloadBuilder();
+    builder.addString(jsonEncode({
+      "next_run": nextRun,
+      "interval": duration,
+      "auto": auto,
+    }));
+    if (client.connectionStatus?.state == MqttConnectionState.connected) {
+      client.publishMessage(pubTopic, MqttQos.atMostOnce, builder.payload!);
+    }
+  }
+}
diff --git a/lib/popups/popup_widgets/popup_filled_button.dart b/lib/popups/popup_widgets/popup_filled_button.dart
index aac664d..db74fa2 100644
--- a/lib/popups/popup_widgets/popup_filled_button.dart
+++ b/lib/popups/popup_widgets/popup_filled_button.dart
@@ -14,13 +14,13 @@ class PopupFilledButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return TextButton(
       onPressed: onPressed,
+      style: ButtonStyle(
+        backgroundColor: MaterialStateProperty.all(const Color(0xFF464646)),
+      ),
       child: Text(
         text,
         style: const TextStyle(color: Colors.white),
       ),
-      style: ButtonStyle(
-        backgroundColor: MaterialStateProperty.all(const Color(0xFF464646)),
-      ),
     );
   }
 }
diff --git a/lib/popups/popup_widgets/popup_outlined_button.dart b/lib/popups/popup_widgets/popup_outlined_button.dart
index f6f0eca..1fb4c8e 100644
--- a/lib/popups/popup_widgets/popup_outlined_button.dart
+++ b/lib/popups/popup_widgets/popup_outlined_button.dart
@@ -14,10 +14,6 @@ class PopupOutlinedButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return OutlinedButton(
       onPressed: onPressed,
-      child: Text(
-        text,
-        style: const TextStyle(color: Color(0xFF464646)),
-      ),
       style: ButtonStyle(
         side: MaterialStateProperty.all(
           const BorderSide(
@@ -26,6 +22,10 @@ class PopupOutlinedButton extends StatelessWidget {
           ),
         ),
       ),
+      child: Text(
+        text,
+        style: const TextStyle(color: Color(0xFF464646)),
+      ),
     );
   }
 }
diff --git a/lib/src/screens/about_screen/about_us_screen.dart b/lib/src/screens/about_screen/about_us_screen.dart
index 7765763..447c868 100644
--- a/lib/src/screens/about_screen/about_us_screen.dart
+++ b/lib/src/screens/about_screen/about_us_screen.dart
@@ -20,10 +20,10 @@ class AboutUs extends StatelessWidget {
           trailing: SvgPicture.asset('assets/icons/svg/info.svg')
           // Icon(Icons.info, color: Colors.black, size: 32,),
         ),
-        Padding(
-          padding: const EdgeInsets.only(top: 12),
+        const Padding(
+          padding: EdgeInsets.only(top: 12),
           child: Center(child: Column(
-            children: const [
+            children: [
               Text('Domus',style: TextStyle(fontFamily: 'Lexend',
                 fontSize: 48,
                 fontWeight: FontWeight.w700
diff --git a/lib/src/screens/edit_profile/components/image_picker.dart b/lib/src/screens/edit_profile/components/image_picker.dart
index 7ba4be8..9af02cf 100644
--- a/lib/src/screens/edit_profile/components/image_picker.dart
+++ b/lib/src/screens/edit_profile/components/image_picker.dart
@@ -55,11 +55,11 @@ class _UploadImageState extends State<UploadImage> {
                 getImageFromGallery();
               },
               child: ClipRRect(
+                borderRadius: BorderRadius.circular(35),
                 child: Image.file(
                   _image!,
                   fit: BoxFit.cover,
                 ),
-                borderRadius: BorderRadius.circular(35),
               ),
             ),
     );
diff --git a/lib/src/screens/favourites_screen/components/favourite_tile.dart b/lib/src/screens/favourites_screen/components/favourite_tile.dart
index 74898bf..4b9cb7b 100644
--- a/lib/src/screens/favourites_screen/components/favourite_tile.dart
+++ b/lib/src/screens/favourites_screen/components/favourite_tile.dart
@@ -75,7 +75,7 @@ class FavouriteTile extends StatelessWidget {
                   Text(
                     device,
                     textAlign: TextAlign.left,
-                    style: Theme.of(context).textTheme.headline2!.copyWith(
+                    style: Theme.of(context).textTheme.displayMedium!.copyWith(
                       color: Colors.black,
                       // color: itsOn ? Colors.white : Colors.black,
                     ),
@@ -84,6 +84,7 @@ class FavouriteTile extends StatelessWidget {
                     width: getProportionateScreenWidth(100),
                   ),
                   GestureDetector(
+                    onTap: switchButton,
                     child: Container(
                       width: 48,
                       height: 25.6,
@@ -113,7 +114,6 @@ class FavouriteTile extends StatelessWidget {
                         ],
                       ),
                     ),
-                    onTap: switchButton,
                   ),
                   const SizedBox(width: 15,)
                 ],
@@ -141,7 +141,7 @@ class FavouriteTile extends StatelessWidget {
                   Text(
                     itsOn ? 'On' : 'Off',
                     textAlign: TextAlign.left,
-                    style: Theme.of(context).textTheme.headline2!.copyWith(
+                    style: Theme.of(context).textTheme.displayMedium!.copyWith(
                       color: Colors.black,
                       // color: itsOn ? Colors.white : Colors.black,
                     ),
diff --git a/lib/src/screens/favourites_screen/favourites_screen.dart b/lib/src/screens/favourites_screen/favourites_screen.dart
index 5f639e2..e317eeb 100644
--- a/lib/src/screens/favourites_screen/favourites_screen.dart
+++ b/lib/src/screens/favourites_screen/favourites_screen.dart
@@ -31,7 +31,7 @@ class _FavouritesState extends State<Favourites> {
             children: [
               Text(
                 'Favourites',
-                style: Theme.of(context).textTheme.headline1,
+                style: Theme.of(context).textTheme.displayLarge,
               ),
               Container(
                 width: 50,
diff --git a/lib/src/screens/home_screen/components/add_device_widget.dart b/lib/src/screens/home_screen/components/add_device_widget.dart
index 2acf68d..9299dd3 100644
--- a/lib/src/screens/home_screen/components/add_device_widget.dart
+++ b/lib/src/screens/home_screen/components/add_device_widget.dart
@@ -31,7 +31,7 @@ class AddNewDevice extends StatelessWidget {
               ),
               Text(
                 'Add New Device',
-                style: Theme.of(context).textTheme.headline4,
+                style: Theme.of(context).textTheme.headlineMedium,
               ),
             ],
           ),
diff --git a/lib/src/screens/home_screen/components/dark_container.dart b/lib/src/screens/home_screen/components/dark_container.dart
index f09dfc5..0eef4ea 100644
--- a/lib/src/screens/home_screen/components/dark_container.dart
+++ b/lib/src/screens/home_screen/components/dark_container.dart
@@ -79,7 +79,7 @@ class DarkContainer extends StatelessWidget {
                   Text(
                     device,
                     textAlign: TextAlign.left,
-                    style: Theme.of(context).textTheme.headline2!.copyWith(
+                    style: Theme.of(context).textTheme.displayMedium!.copyWith(
                           color: itsOn ? Colors.white : Colors.black,
                         ),
                   ),
@@ -101,7 +101,7 @@ class DarkContainer extends StatelessWidget {
                   Text(
                     itsOn ? 'On' : 'Off',
                     textAlign: TextAlign.left,
-                    style: Theme.of(context).textTheme.headline2!.copyWith(
+                    style: Theme.of(context).textTheme.displayMedium!.copyWith(
                           color: itsOn ? Colors.white : Colors.black,
                         ),
                   ),
diff --git a/lib/src/screens/home_screen/components/music_widget.dart b/lib/src/screens/home_screen/components/music_widget.dart
index 261fe06..9e87900 100644
--- a/lib/src/screens/home_screen/components/music_widget.dart
+++ b/lib/src/screens/home_screen/components/music_widget.dart
@@ -41,11 +41,11 @@ class MusicWidget extends StatelessWidget {
               children: [
                 Text(
                   'Music',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
                 Text(
                   'Give a Little Bit',
-                  style: Theme.of(context).textTheme.headline4,
+                  style: Theme.of(context).textTheme.headlineMedium,
                 ),
               ],
             ),
diff --git a/lib/src/screens/home_screen/components/reusable_container.dart b/lib/src/screens/home_screen/components/reusable_container.dart
index 4f02748..0e4c334 100644
--- a/lib/src/screens/home_screen/components/reusable_container.dart
+++ b/lib/src/screens/home_screen/components/reusable_container.dart
@@ -49,7 +49,7 @@ class ReusableCard extends StatelessWidget {
               onTap: onTap,
               child: Text(
                 title,
-                style: Theme.of(context).textTheme.headline2,
+                style: Theme.of(context).textTheme.displayMedium,
               ),
             ),
           ],
diff --git a/lib/src/screens/home_screen/components/savings_container.dart b/lib/src/screens/home_screen/components/savings_container.dart
index 0c52971..1806a2f 100644
--- a/lib/src/screens/home_screen/components/savings_container.dart
+++ b/lib/src/screens/home_screen/components/savings_container.dart
@@ -31,14 +31,14 @@ class SavingsContainer extends StatelessWidget {
                   children: [
                     Text(
                       'Energy Saving',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 10,
                     ),
                     Text(
                       '+35%',
-                      style: Theme.of(context).textTheme.headline1!.copyWith(
+                      style: Theme.of(context).textTheme.displayLarge!.copyWith(
                             color: Colors.green,
                           ),
                     ),
@@ -47,7 +47,7 @@ class SavingsContainer extends StatelessWidget {
                     ),
                     Text(
                       '23.5 kWh',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     ),
                   ],
                 ),
diff --git a/lib/src/screens/home_screen/components/weather_container.dart b/lib/src/screens/home_screen/components/weather_container.dart
index 10d1d34..5759b81 100644
--- a/lib/src/screens/home_screen/components/weather_container.dart
+++ b/lib/src/screens/home_screen/components/weather_container.dart
@@ -34,22 +34,22 @@ class WeatherContainer extends StatelessWidget {
                   children: [
                     Text(
                       '28°C',
-                      style: Theme.of(context).textTheme.headline1,
+                      style: Theme.of(context).textTheme.displayLarge,
                     ),
                     Text(
                       'Cloudy',
-                      style: Theme.of(context).textTheme.headline1,
+                      style: Theme.of(context).textTheme.displayLarge,
                     ),
                     SizedBox(
                       height: getProportionateScreenHeight(5),
                     ),
                     Text(
                       '27 Mar 2022',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     ),
                     Text(
                       'Jagakarsa,Jakarta',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
diff --git a/lib/src/screens/home_screen/home_screen.dart b/lib/src/screens/home_screen/home_screen.dart
index cbda9c6..7bafd52 100644
--- a/lib/src/screens/home_screen/home_screen.dart
+++ b/lib/src/screens/home_screen/home_screen.dart
@@ -40,7 +40,7 @@ class HomeScreen extends StatelessWidget {
                     children: [
                       Text(
                         'Hi, Lex',
-                        style: Theme.of(context).textTheme.headline1,
+                        style: Theme.of(context).textTheme.displayLarge,
                       ),
                       SizedBox(
                         width: getProportionateScreenWidth(60),
@@ -99,6 +99,11 @@ class HomeScreen extends StatelessWidget {
                   ),
                 ),
                 bottom: PreferredSize(
+                  preferredSize: Size.fromHeight(
+                    getProportionateScreenHeight(
+                      35,
+                    ),
+                  ),
                   child: TabBar(
                       isScrollable: true,
                       unselectedLabelColor: Colors.white.withOpacity(0.3),
@@ -107,27 +112,22 @@ class HomeScreen extends StatelessWidget {
                         Tab(
                           child: Text(
                             'Living Room',
-                            style: Theme.of(context).textTheme.headline3,
+                            style: Theme.of(context).textTheme.displaySmall,
                           ),
                         ),
                         Tab(
                           child: Text(
                             'Dining',
-                            style: Theme.of(context).textTheme.headline4,
+                            style: Theme.of(context).textTheme.headlineMedium,
                           ),
                         ),
                         Tab(
                           child: Text(
                             'Kitchen',
-                            style: Theme.of(context).textTheme.headline4,
+                            style: Theme.of(context).textTheme.headlineMedium,
                           ),
                         ),
                       ]),
-                  preferredSize: Size.fromHeight(
-                    getProportionateScreenHeight(
-                      35,
-                    ),
-                  ),
                 ),
               ),
               drawer: SizedBox(
@@ -141,7 +141,7 @@ class HomeScreen extends StatelessWidget {
                   Center(
                     child: Text(
                       'To be Built Soon',
-                      style: Theme.of(context).textTheme.headline3,
+                      style: Theme.of(context).textTheme.displaySmall,
                     ),
                   ),
                   const Center(
diff --git a/lib/src/screens/login_screen/components/body.dart b/lib/src/screens/login_screen/components/body.dart
index 5394800..0e29c9e 100644
--- a/lib/src/screens/login_screen/components/body.dart
+++ b/lib/src/screens/login_screen/components/body.dart
@@ -26,8 +26,8 @@ class Body extends StatelessWidget {
 				        crossAxisAlignment: CrossAxisAlignment.start,
 
 				      children: [
-				      	Text('SMART',style: Theme.of(context).textTheme.headline2!.copyWith(color: Colors.black, fontSize: 33),),
-					      Text('HOME', style:  Theme.of(context).textTheme.headline1!.copyWith(color: Colors.black, fontSize: 64),)
+				      	Text('SMART',style: Theme.of(context).textTheme.displayMedium!.copyWith(color: Colors.black, fontSize: 33),),
+					      Text('HOME', style:  Theme.of(context).textTheme.displayLarge!.copyWith(color: Colors.black, fontSize: 64),)
 				      ],
 		        )),
 	        ],
@@ -75,8 +75,8 @@ class Body extends StatelessWidget {
 		          padding: const EdgeInsets.all(16.0),
 		          decoration:BoxDecoration(
 			          color: const Color(0xFF464646),
-			          borderRadius:BorderRadius.circular(70.0), ),
-		          child: const Text('Get Started', style: TextStyle(color: Colors.white),),alignment: Alignment.center,),
+			          borderRadius:BorderRadius.circular(70.0), ),alignment: Alignment.center,
+		          child: const Text('Get Started', style: TextStyle(color: Colors.white),),),
 	            ),
 	          ),
 	          SizedBox(height: getProportionateScreenHeight(10)),
diff --git a/lib/src/screens/settings_screen/settings_screen.dart b/lib/src/screens/settings_screen/settings_screen.dart
index 109b76b..92969d2 100644
--- a/lib/src/screens/settings_screen/settings_screen.dart
+++ b/lib/src/screens/settings_screen/settings_screen.dart
@@ -10,11 +10,11 @@ class SettingScreen extends StatelessWidget {
     return Material(
         color: const Color.fromRGBO(250, 250, 250, 1),
         child: ListView(
-          children: [
+          children: const [
             Padding(
-              padding: const EdgeInsets.fromLTRB(32, 64, 48, 20),
+              padding: EdgeInsets.fromLTRB(32, 64, 48, 20),
               child: Row(
-                children: const [
+                children: [
                   Text(
                     "Settings",
                     style: TextStyle(
@@ -34,12 +34,12 @@ class SettingScreen extends StatelessWidget {
                 ],
               ),
             ),
-            const SettingTile(),
-            const SwitchTiles(),
-            const SizedBox(
+            SettingTile(),
+            SwitchTiles(),
+            SizedBox(
               height: 24.44,
             ),
-            const SettingTile(),
+            SettingTile(),
           ],
         ));
   }
diff --git a/lib/src/screens/smart_ac/components/body.dart b/lib/src/screens/smart_ac/components/body.dart
index 4bd8b72..f63387d 100644
--- a/lib/src/screens/smart_ac/components/body.dart
+++ b/lib/src/screens/smart_ac/components/body.dart
@@ -35,14 +35,14 @@ class Body extends StatelessWidget {
                   children: [
                     Text(
                       'Air\nConditioner',
-                      style: Theme.of(context).textTheme.headline1!.copyWith(
+                      style: Theme.of(context).textTheme.displayLarge!.copyWith(
                             fontSize: 45,
                             color: const Color(0xFFBDBDBD).withOpacity(0.5),
                           ),
                     ),
                     Text(
                       'Living\nRoom',
-                      style: Theme.of(context).textTheme.headline1,
+                      style: Theme.of(context).textTheme.displayLarge,
                     ),
                   ],
                 ),
@@ -96,11 +96,11 @@ class Body extends StatelessWidget {
                     children: [
                       Text(
                         '${value.toInt()}°',
-                        style: Theme.of(context).textTheme.headline1,
+                        style: Theme.of(context).textTheme.displayLarge,
                       ),
                       Text(
                         'Celcius',
-                        style: Theme.of(context).textTheme.headline3,
+                        style: Theme.of(context).textTheme.displaySmall,
                       ),
                     ],
                   ),
@@ -119,14 +119,14 @@ class Body extends StatelessWidget {
                 children: [
                   Text(
                     'Samsung AC',
-                    style: Theme.of(context).textTheme.headline2,
+                    style: Theme.of(context).textTheme.displayMedium,
                   ),
                   const SizedBox(
                     height: 5,
                   ),
                   Text(
                     'Connected',
-                    style: Theme.of(context).textTheme.headline5,
+                    style: Theme.of(context).textTheme.headlineSmall,
                   )
                 ],
               ),
@@ -153,7 +153,7 @@ class Body extends StatelessWidget {
           // ),
           Text(
             'Mode',
-            style: Theme.of(context).textTheme.headline2,
+            style: Theme.of(context).textTheme.displayMedium,
           ),
           SizedBox(
             height: getProportionateScreenHeight(20),
@@ -171,8 +171,12 @@ class Body extends StatelessWidget {
               borderRadius: BorderRadius.circular(15),
               textStyle: Theme.of(context)
                   .textTheme
-                  .headline2!
+                  .displayMedium!
                   .copyWith(color: Colors.white),
+              onPressed: (int index) {
+                model.onToggleTapped(index);
+              },
+              isSelected: model.isSelected,
               children: <Widget>[
                 SizedBox(
                   width: getProportionateScreenWidth(70),
@@ -259,10 +263,6 @@ class Body extends StatelessWidget {
                   ),
                 ),
               ],
-              onPressed: (int index) {
-                model.onToggleTapped(index);
-              },
-              isSelected: model.isSelected,
             ),
           ),
           SizedBox(
diff --git a/lib/src/screens/smart_ac/components/expandable_bottom_sheet.dart b/lib/src/screens/smart_ac/components/expandable_bottom_sheet.dart
index 0536945..42cce89 100644
--- a/lib/src/screens/smart_ac/components/expandable_bottom_sheet.dart
+++ b/lib/src/screens/smart_ac/components/expandable_bottom_sheet.dart
@@ -45,14 +45,14 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Schedule',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'Set schedule room ac',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
@@ -80,11 +80,11 @@ class ExpandableBottomSheet extends StatelessWidget {
               children: [
                 Text(
                   'Timer',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
                 Text(
                   '${model.timerHours.toInt()}H',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
               ],
             ),
@@ -110,23 +110,23 @@ class ExpandableBottomSheet extends StatelessWidget {
               children: [
                 Text(
                   '2H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '4H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '6H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '8H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '10H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
               ],
             ),
diff --git a/lib/src/screens/smart_fan/components/body.dart b/lib/src/screens/smart_fan/components/body.dart
index 2c9aa88..e285f8f 100644
--- a/lib/src/screens/smart_fan/components/body.dart
+++ b/lib/src/screens/smart_fan/components/body.dart
@@ -102,7 +102,7 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
                               'Living\nRoom',
                               style: Theme.of(context)
                                   .textTheme
-                                  .headline1!
+                                  .displayLarge!
                                   .copyWith(
                                     fontSize: 45,
                                     color: const Color(0xFFBDBDBD)
@@ -111,7 +111,7 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
                             ),
                             Text(
                               'Smart\nFan',
-                              style: Theme.of(context).textTheme.headline1,
+                              style: Theme.of(context).textTheme.displayLarge,
                             ),
                           ],
                         ),
@@ -120,7 +120,7 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
                         ),
                         Text(
                           'Power',
-                          style: Theme.of(context).textTheme.headline2,
+                          style: Theme.of(context).textTheme.displayMedium,
                         ),
                         SizedBox(
                           height: getProportionateScreenHeight(4),
@@ -192,7 +192,7 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
             children: [
               Text(
                 'Mode',
-                style: Theme.of(context).textTheme.headline2,
+                style: Theme.of(context).textTheme.displayMedium,
               ),
               SizedBox(
                 height: getProportionateScreenHeight(9),
@@ -209,8 +209,12 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
                   borderRadius: BorderRadius.circular(15),
                   textStyle: Theme.of(context)
                       .textTheme
-                      .headline2!
+                      .displayMedium!
                       .copyWith(color: Colors.white),
+                  onPressed: (int index) {
+                    widget.model.onToggleTapped(index);
+                  },
+                  isSelected: widget.model.isSelected,
                   children: <Widget>[
                     SizedBox(
                       width: getProportionateScreenWidth(76),
@@ -234,10 +238,6 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
                       ),
                     ),
                   ],
-                  onPressed: (int index) {
-                    widget.model.onToggleTapped(index);
-                  },
-                  isSelected: widget.model.isSelected,
                 ),
               ),
               SizedBox(
@@ -248,11 +248,11 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
                 children: [
                   Text(
                     'Speed',
-                    style: Theme.of(context).textTheme.headline2,
+                    style: Theme.of(context).textTheme.displayMedium,
                   ),
                   Text(
                     '${widget.model.speed.toInt()}',
-                    style: Theme.of(context).textTheme.headline2,
+                    style: Theme.of(context).textTheme.displayMedium,
                   ),
                 ],
               ),
@@ -279,11 +279,11 @@ class _BodyState extends State<Body> with TickerProviderStateMixin {
                 children: [
                   Text(
                     'Off',
-                    style: Theme.of(context).textTheme.bodyText1,
+                    style: Theme.of(context).textTheme.bodyLarge,
                   ),
                   Text(
                     '100%',
-                    style: Theme.of(context).textTheme.bodyText1,
+                    style: Theme.of(context).textTheme.bodyLarge,
                   ),
                 ],
               ),
diff --git a/lib/src/screens/smart_fan/components/expandable_bottom_sheet.dart b/lib/src/screens/smart_fan/components/expandable_bottom_sheet.dart
index ce450d1..ada22da 100644
--- a/lib/src/screens/smart_fan/components/expandable_bottom_sheet.dart
+++ b/lib/src/screens/smart_fan/components/expandable_bottom_sheet.dart
@@ -45,14 +45,14 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Schedule',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'Set schedule room fan',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
@@ -80,11 +80,11 @@ class ExpandableBottomSheet extends StatelessWidget {
               children: [
                 Text(
                   'Timer',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
                 Text(
                   'time',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
               ],
             ),
@@ -93,23 +93,23 @@ class ExpandableBottomSheet extends StatelessWidget {
               children: [
                 Text(
                   '2H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '4H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '6H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '8H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '10H',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
               ],
             ),
diff --git a/lib/src/screens/smart_light/components/advance_setting_container.dart b/lib/src/screens/smart_light/components/advance_setting_container.dart
index 9f4b9d8..7012699 100644
--- a/lib/src/screens/smart_light/components/advance_setting_container.dart
+++ b/lib/src/screens/smart_light/components/advance_setting_container.dart
@@ -22,7 +22,7 @@ class AdvanceSettings extends StatelessWidget {
           children: [
             Text(
               'Tone & intensity',
-              style: Theme.of(context).textTheme.headline2,
+              style: Theme.of(context).textTheme.displayMedium,
             ),
             const Icon(Icons.arrow_forward_ios_outlined)
           ],
diff --git a/lib/src/screens/smart_light/components/body.dart b/lib/src/screens/smart_light/components/body.dart
index e4099d3..bacb3bb 100644
--- a/lib/src/screens/smart_light/components/body.dart
+++ b/lib/src/screens/smart_light/components/body.dart
@@ -44,7 +44,7 @@ class Body extends StatelessWidget {
                               'Living\nRoom',
                               style: Theme.of(context)
                                   .textTheme
-                                  .headline1!
+                                  .displayLarge!
                                   .copyWith(
                                     fontSize: 45,
                                     color: const Color(0xFFBDBDBD)
@@ -53,7 +53,7 @@ class Body extends StatelessWidget {
                             ),
                             Text(
                               'Living\nRoom',
-                              style: Theme.of(context).textTheme.headline1,
+                              style: Theme.of(context).textTheme.displayLarge,
                             ),
                           ],
                         ),
@@ -62,7 +62,7 @@ class Body extends StatelessWidget {
                         ),
                         Text(
                           'Power',
-                          style: Theme.of(context).textTheme.headline2,
+                          style: Theme.of(context).textTheme.displayMedium,
                         ),
                         SizedBox(
                           height: getProportionateScreenHeight(4),
@@ -82,7 +82,7 @@ class Body extends StatelessWidget {
                         ),
                         Text(
                           'Color',
-                          style: Theme.of(context).textTheme.headline2,
+                          style: Theme.of(context).textTheme.displayMedium,
                         ),
                         SizedBox(
                           height: getProportionateScreenHeight(7),
@@ -140,7 +140,7 @@ class Body extends StatelessWidget {
             children: [
               Text(
                 'Tone Glow',
-                style: Theme.of(context).textTheme.headline2,
+                style: Theme.of(context).textTheme.displayMedium,
               ),
               SizedBox(
                 height: getProportionateScreenHeight(9),
@@ -157,8 +157,12 @@ class Body extends StatelessWidget {
                   borderRadius: BorderRadius.circular(15),
                   textStyle: Theme.of(context)
                       .textTheme
-                      .headline2!
+                      .displayMedium!
                       .copyWith(color: Colors.white),
+                  onPressed: (int index) {
+                    model.onToggleTapped(index);
+                  },
+                  isSelected: model.isSelected,
                   children: <Widget>[
                     SizedBox(
                       width: getProportionateScreenWidth(115),
@@ -175,10 +179,6 @@ class Body extends StatelessWidget {
                       ),
                     ),
                   ],
-                  onPressed: (int index) {
-                    model.onToggleTapped(index);
-                  },
-                  isSelected: model.isSelected,
                 ),
               ),
               SizedBox(
@@ -189,11 +189,11 @@ class Body extends StatelessWidget {
                 children: [
                   Text(
                     'Intensity',
-                    style: Theme.of(context).textTheme.headline2,
+                    style: Theme.of(context).textTheme.displayMedium,
                   ),
                   Text(
                     '${model.lightIntensity.toInt()}%',
-                    style: Theme.of(context).textTheme.headline2,
+                    style: Theme.of(context).textTheme.displayMedium,
                   ),
                 ],
               ),
@@ -219,11 +219,11 @@ class Body extends StatelessWidget {
                 children: [
                   Text(
                     'Off',
-                    style: Theme.of(context).textTheme.bodyText1,
+                    style: Theme.of(context).textTheme.bodyLarge,
                   ),
                   Text(
                     '100%',
-                    style: Theme.of(context).textTheme.bodyText1,
+                    style: Theme.of(context).textTheme.bodyLarge,
                   ),
                 ],
               ),
diff --git a/lib/src/screens/smart_light/components/color_pick_sheet.dart b/lib/src/screens/smart_light/components/color_pick_sheet.dart
index 0c731c2..36bcf1f 100644
--- a/lib/src/screens/smart_light/components/color_pick_sheet.dart
+++ b/lib/src/screens/smart_light/components/color_pick_sheet.dart
@@ -43,14 +43,14 @@ class ColorPickerSheet extends StatelessWidget {
               children: [
                 Text(
                   'Color',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
                 const SizedBox(
                   height: 5,
                 ),
                 Text(
                   'Pick Light Color',
-                  style: Theme.of(context).textTheme.headline5,
+                  style: Theme.of(context).textTheme.headlineSmall,
                 ),
               ],
             ),
diff --git a/lib/src/screens/smart_light/components/date_container.dart b/lib/src/screens/smart_light/components/date_container.dart
index cfcb0b7..143407b 100644
--- a/lib/src/screens/smart_light/components/date_container.dart
+++ b/lib/src/screens/smart_light/components/date_container.dart
@@ -33,7 +33,7 @@ class DateContainer extends StatelessWidget {
           child: Center(
             child: Text(
               ' $date\n$day',
-              style: Theme.of(context).textTheme.headline2!.copyWith(
+              style: Theme.of(context).textTheme.displayMedium!.copyWith(
                     color: active ? Colors.white : const Color(0xFFBDBDBD),
                   ),
             ),
diff --git a/lib/src/screens/smart_light/components/expandable_bottom_sheet.dart b/lib/src/screens/smart_light/components/expandable_bottom_sheet.dart
index 2d838da..b4ec2aa 100644
--- a/lib/src/screens/smart_light/components/expandable_bottom_sheet.dart
+++ b/lib/src/screens/smart_light/components/expandable_bottom_sheet.dart
@@ -49,14 +49,14 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Schedule',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'Set schedule room light',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
@@ -87,19 +87,19 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'January 2022',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'Select the desired date',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
-                Row(
-                  children: const [
+                const Row(
+                  children: [
                     Icon(Icons.arrow_back_ios_outlined),
                     SizedBox(
                       width: 20,
@@ -112,10 +112,10 @@ class ExpandableBottomSheet extends StatelessWidget {
             SizedBox(
               height: getProportionateScreenHeight(10),
             ),
-            SingleChildScrollView(
+            const SingleChildScrollView(
               scrollDirection: Axis.horizontal,
               child: Row(
-                children: const [
+                children: [
                   DateContainer(date: '01', day: 'Sat', active: true),
                   DateContainer(date: '02', day: 'Sun', active: false),
                   DateContainer(date: '03', day: 'Mon', active: false),
@@ -128,7 +128,7 @@ class ExpandableBottomSheet extends StatelessWidget {
             ),
             Text(
               'Select the desired time',
-              style: Theme.of(context).textTheme.headline5,
+              style: Theme.of(context).textTheme.headlineSmall,
             ),
             SizedBox(
               height: getProportionateScreenHeight(10),
@@ -141,7 +141,7 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'On Time',
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(
                       height: 10,
@@ -155,7 +155,7 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Off Time',
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(
                       height: 10,
@@ -171,7 +171,7 @@ class ExpandableBottomSheet extends StatelessWidget {
             ),
             Text(
               'Advance setting',
-              style: Theme.of(context).textTheme.headline2,
+              style: Theme.of(context).textTheme.displayMedium,
             ),
             const SizedBox(
               height: 20,
diff --git a/lib/src/screens/smart_light/components/reusable_buttons.dart b/lib/src/screens/smart_light/components/reusable_buttons.dart
index 5cf359e..2d7c5cc 100644
--- a/lib/src/screens/smart_light/components/reusable_buttons.dart
+++ b/lib/src/screens/smart_light/components/reusable_buttons.dart
@@ -17,12 +17,6 @@ class ResuableButton extends StatelessWidget {
     return active
         ? ElevatedButton(
             onPressed: onPress,
-            child: Text(
-              buttonText,
-              style: Theme.of(context).textTheme.headline2!.copyWith(
-                    color: Colors.white,
-                  ),
-            ),
             style: ElevatedButton.styleFrom(
               //primary: const Color(0xFF464646),
               padding: const EdgeInsets.symmetric(vertical: 15),
@@ -30,13 +24,15 @@ class ResuableButton extends StatelessWidget {
                 borderRadius: BorderRadius.circular(12), // <-- Radius
               ),
             ),
-          )
-        : OutlinedButton(
-            onPressed: onPress,
             child: Text(
               buttonText,
-              style: Theme.of(context).textTheme.headline2,
+              style: Theme.of(context).textTheme.displayMedium!.copyWith(
+                    color: Colors.white,
+                  ),
             ),
+          )
+        : OutlinedButton(
+            onPressed: onPress,
             style: OutlinedButton.styleFrom(
               // primary: const Color(0xFF464646),
               padding: const EdgeInsets.symmetric(vertical: 15),
@@ -44,6 +40,10 @@ class ResuableButton extends StatelessWidget {
                 borderRadius: BorderRadius.circular(12),
               ),
             ),
+            child: Text(
+              buttonText,
+              style: Theme.of(context).textTheme.displayMedium,
+            ),
           );
   }
 }
diff --git a/lib/src/screens/smart_light/components/time_container.dart b/lib/src/screens/smart_light/components/time_container.dart
index e04d990..4b14053 100644
--- a/lib/src/screens/smart_light/components/time_container.dart
+++ b/lib/src/screens/smart_light/components/time_container.dart
@@ -30,7 +30,7 @@ class TimeContainer extends StatelessWidget {
         children: [
           Text(
             time,
-            style: Theme.of(context).textTheme.headline2!.copyWith(
+            style: Theme.of(context).textTheme.displayMedium!.copyWith(
                 color:
                     active ? const Color(0xFF464646) : const Color(0xFFBDBDBD)),
           ),
@@ -40,7 +40,7 @@ class TimeContainer extends StatelessWidget {
           ),
           Text(
             meridiem,
-            style: Theme.of(context).textTheme.headline2!.copyWith(
+            style: Theme.of(context).textTheme.displayMedium!.copyWith(
                 color:
                     active ? const Color(0xFF464646) : const Color(0xFFBDBDBD)),
           ),
diff --git a/lib/src/screens/smart_speaker/components/body.dart b/lib/src/screens/smart_speaker/components/body.dart
index 39011c4..e1da741 100644
--- a/lib/src/screens/smart_speaker/components/body.dart
+++ b/lib/src/screens/smart_speaker/components/body.dart
@@ -34,14 +34,14 @@ class Body extends StatelessWidget {
                   children: [
                     Text(
                       'Smart\nSpeaker',
-                      style: Theme.of(context).textTheme.headline1!.copyWith(
+                      style: Theme.of(context).textTheme.displayLarge!.copyWith(
                             fontSize: 45,
                             color: const Color(0xFFBDBDBD).withOpacity(0.5),
                           ),
                     ),
                     Text(
                       'Living\nRoom',
-                      style: Theme.of(context).textTheme.headline1,
+                      style: Theme.of(context).textTheme.displayLarge,
                     ),
                   ],
                 ),
@@ -110,18 +110,18 @@ class Body extends StatelessWidget {
               children: [
                 Text(
                   '3:15 | 4:26',
-                  style: Theme.of(context).textTheme.headline3,
+                  style: Theme.of(context).textTheme.displaySmall,
                 ),
                 SizedBox(
                   height: getProportionateScreenHeight(10),
                 ),
                 Text(
                   'STAY',
-                  style: Theme.of(context).textTheme.headline1,
+                  style: Theme.of(context).textTheme.displayLarge,
                 ),
                 Text(
                   'Justin Bieber Ft. Kid Laroi',
-                  style: Theme.of(context).textTheme.headline4,
+                  style: Theme.of(context).textTheme.headlineMedium,
                 ),
                 const SizedBox(
                   height: 15,
@@ -137,42 +137,42 @@ class Body extends StatelessWidget {
                   children: [
                     ElevatedButton(
                       onPressed: () {},
+                      style: ElevatedButton.styleFrom(
+                        elevation: 0.0,
+                        shape: const CircleBorder(),
+                        padding: const EdgeInsets.all(10),
+                      ),
                       child: const Icon(
                         Icons.first_page_rounded,
                         size: 30,
                         color: Color(0xFF464646),
                       ),
+                    ),
+                    ElevatedButton(
+                      onPressed: () {},
                       style: ElevatedButton.styleFrom(
                         elevation: 0.0,
                         shape: const CircleBorder(),
-                        padding: const EdgeInsets.all(10),
+                        padding: const EdgeInsets.all(8),
                       ),
-                    ),
-                    ElevatedButton(
-                      onPressed: () {},
                       child: const Icon(
                         Icons.play_arrow_rounded,
                         size: 35,
                         color: Color(0xFFF2F2F2),
                       ),
+                    ),
+                    ElevatedButton(
+                      onPressed: () {},
                       style: ElevatedButton.styleFrom(
                         elevation: 0.0,
                         shape: const CircleBorder(),
-                        padding: const EdgeInsets.all(8),
+                        padding: const EdgeInsets.all(10),
                       ),
-                    ),
-                    ElevatedButton(
-                      onPressed: () {},
                       child: const Icon(
                         Icons.last_page_rounded,
                         size: 30,
                         color: Color(0xFF464646),
                       ),
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0.0,
-                        shape: const CircleBorder(),
-                        padding: const EdgeInsets.all(10),
-                      ),
                     )
                   ],
                 ),
@@ -187,68 +187,68 @@ class Body extends StatelessWidget {
             children: [
               ElevatedButton(
                 onPressed: () {},
+                style: ElevatedButton.styleFrom(
+                  elevation: 0.0,
+                  shape: const CircleBorder(),
+                  padding: const EdgeInsets.all(10),
+                ),
                 child: const Icon(
                   Icons.playlist_play_rounded,
                   size: 30,
                   color: Color(0xFF464646),
                 ),
+              ),
+              ElevatedButton(
+                onPressed: () {},
                 style: ElevatedButton.styleFrom(
                   elevation: 0.0,
                   shape: const CircleBorder(),
                   padding: const EdgeInsets.all(10),
                 ),
-              ),
-              ElevatedButton(
-                onPressed: () {},
                 child: const Icon(
                   Icons.shuffle_rounded,
                   size: 25,
                   color: Color(0xFF464646),
                 ),
+              ),
+              ElevatedButton(
+                onPressed: () {},
                 style: ElevatedButton.styleFrom(
                   elevation: 0.0,
                   shape: const CircleBorder(),
                   padding: const EdgeInsets.all(10),
                 ),
-              ),
-              ElevatedButton(
-                onPressed: () {},
                 child: const Icon(
                   Icons.repeat_rounded,
                   size: 25,
                   color: Color(0xFF464646),
                 ),
+              ),
+              ElevatedButton(
+                onPressed: () {},
                 style: ElevatedButton.styleFrom(
                   elevation: 0.0,
                   shape: const CircleBorder(),
                   padding: const EdgeInsets.all(10),
                 ),
-              ),
-              ElevatedButton(
-                onPressed: () {},
                 child: const Icon(
                   Icons.equalizer_rounded,
                   size: 25,
                   color: Color(0xFF464646),
                 ),
+              ),
+              ElevatedButton(
+                onPressed: () {},
                 style: ElevatedButton.styleFrom(
                   elevation: 0.0,
                   shape: const CircleBorder(),
                   padding: const EdgeInsets.all(10),
                 ),
-              ),
-              ElevatedButton(
-                onPressed: () {},
                 child: const Icon(
                   Icons.favorite_rounded,
                   size: 25,
                   color: Color(0xFF464646),
                 ),
-                style: ElevatedButton.styleFrom(
-                  elevation: 0.0,
-                  shape: const CircleBorder(),
-                  padding: const EdgeInsets.all(10),
-                ),
               )
             ],
           ),
@@ -263,14 +263,14 @@ class Body extends StatelessWidget {
                 children: [
                   Text(
                     'Kakao Mini C',
-                    style: Theme.of(context).textTheme.headline2,
+                    style: Theme.of(context).textTheme.displayMedium,
                   ),
                   const SizedBox(
                     height: 5,
                   ),
                   Text(
                     'Connected',
-                    style: Theme.of(context).textTheme.headline5,
+                    style: Theme.of(context).textTheme.headlineSmall,
                   )
                 ],
               ),
diff --git a/lib/src/screens/smart_speaker/components/connect_speaker.dart b/lib/src/screens/smart_speaker/components/connect_speaker.dart
index c21986b..da30d3e 100644
--- a/lib/src/screens/smart_speaker/components/connect_speaker.dart
+++ b/lib/src/screens/smart_speaker/components/connect_speaker.dart
@@ -26,33 +26,29 @@ class ConnectSpeaker extends StatelessWidget {
           ),
           Text(
             'Kakao Mini C',
-            style: Theme.of(context).textTheme.headline1,
+            style: Theme.of(context).textTheme.displayLarge,
           ),
           Text(
             'Smart Speaker',
-            style: Theme.of(context).textTheme.headline3,
+            style: Theme.of(context).textTheme.displaySmall,
           ),
           SizedBox(
             height: getProportionateScreenHeight(40),
           ),
           Material(
+            color: Colors.transparent,
             child: Image.asset(
               'assets/images/kakao_mini.png',
               height: getProportionateScreenHeight(300),
               width: getProportionateScreenWidth(150),
               fit: BoxFit.contain,
             ),
-            color: Colors.transparent,
           ),
           SizedBox(
             height: getProportionateScreenHeight(40),
           ),
           OutlinedButton(
             onPressed: () {},
-            child: Text(
-              'Connect',
-              style: Theme.of(context).textTheme.headline3,
-            ),
             style: OutlinedButton.styleFrom(
               padding: EdgeInsets.symmetric(
                 horizontal: getProportionateScreenWidth(80),
@@ -60,6 +56,10 @@ class ConnectSpeaker extends StatelessWidget {
               ),
               shape: const StadiumBorder(),
             ),
+            child: Text(
+              'Connect',
+              style: Theme.of(context).textTheme.displaySmall,
+            ),
           )
         ],
       ),
diff --git a/lib/src/screens/smart_speaker/components/expandable_bottom_sheet.dart b/lib/src/screens/smart_speaker/components/expandable_bottom_sheet.dart
index 7bf2020..0347205 100644
--- a/lib/src/screens/smart_speaker/components/expandable_bottom_sheet.dart
+++ b/lib/src/screens/smart_speaker/components/expandable_bottom_sheet.dart
@@ -45,14 +45,14 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Schedule',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'Set schedule speaker',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
@@ -80,11 +80,11 @@ class ExpandableBottomSheet extends StatelessWidget {
               children: [
                 Text(
                   'Volume',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
                 Text(
                   '${model.speakerVolume.toInt()}%',
-                  style: Theme.of(context).textTheme.headline2,
+                  style: Theme.of(context).textTheme.displayMedium,
                 ),
               ],
             ),
@@ -110,11 +110,11 @@ class ExpandableBottomSheet extends StatelessWidget {
               children: [
                 Text(
                   'Off',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
                 Text(
                   '100%',
-                  style: Theme.of(context).textTheme.bodyText1,
+                  style: Theme.of(context).textTheme.bodyLarge,
                 ),
               ],
             ),
@@ -129,14 +129,14 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Marshell sound dock',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'on',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
@@ -163,14 +163,14 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Bass',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'off',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
diff --git a/lib/src/screens/smart_tv/components/body.dart b/lib/src/screens/smart_tv/components/body.dart
index e94c6b7..f7a5068 100644
--- a/lib/src/screens/smart_tv/components/body.dart
+++ b/lib/src/screens/smart_tv/components/body.dart
@@ -58,7 +58,7 @@ class Body extends StatelessWidget {
                               'Living\nRoom',
                               style: Theme.of(context)
                                   .textTheme
-                                  .headline1!
+                                  .displayLarge!
                                   .copyWith(
                                 fontSize: 45,
                                 color: const Color(0xFFBDBDBD)
@@ -67,7 +67,7 @@ class Body extends StatelessWidget {
                             ),
                             Text(
                               'Smart\nTv',
-                              style: Theme.of(context).textTheme.headline1,
+                              style: Theme.of(context).textTheme.displayLarge,
                             ),
                           ],
                         ),
@@ -76,7 +76,7 @@ class Body extends StatelessWidget {
                         ),
                         Text(
                           'Power',
-                          style: Theme.of(context).textTheme.headline2,
+                          style: Theme.of(context).textTheme.displayMedium,
                         ),
                         SizedBox(
                           height: getProportionateScreenHeight(4),
diff --git a/lib/src/screens/smart_tv/components/expandable_bottom_sheet.dart b/lib/src/screens/smart_tv/components/expandable_bottom_sheet.dart
index 63ea61a..13e1455 100644
--- a/lib/src/screens/smart_tv/components/expandable_bottom_sheet.dart
+++ b/lib/src/screens/smart_tv/components/expandable_bottom_sheet.dart
@@ -45,14 +45,14 @@ class ExpandableBottomSheet extends StatelessWidget {
                   children: [
                     Text(
                       'Night Mode',
-                      style: Theme.of(context).textTheme.headline2,
+                      style: Theme.of(context).textTheme.displayMedium,
                     ),
                     const SizedBox(
                       height: 5,
                     ),
                     Text(
                       'Set room light',
-                      style: Theme.of(context).textTheme.headline5,
+                      style: Theme.of(context).textTheme.headlineSmall,
                     )
                   ],
                 ),
diff --git a/lib/src/screens/smart_tv/components/intensity_slider.dart b/lib/src/screens/smart_tv/components/intensity_slider.dart
index 5a36e3d..991b622 100644
--- a/lib/src/screens/smart_tv/components/intensity_slider.dart
+++ b/lib/src/screens/smart_tv/components/intensity_slider.dart
@@ -23,11 +23,11 @@ class Intensity extends StatelessWidget {
             children: [
               Text(
                 'Intensity',
-                style: Theme.of(context).textTheme.headline2,
+                style: Theme.of(context).textTheme.displayMedium,
               ),
               Text(
                 '${model.lightIntensity.toInt()}%',
-                style: Theme.of(context).textTheme.headline2,
+                style: Theme.of(context).textTheme.displayMedium,
               ),
             ],
           ),
@@ -60,11 +60,11 @@ class Intensity extends StatelessWidget {
             children: [
               Text(
                 'Off',
-                style: Theme.of(context).textTheme.bodyText1,
+                style: Theme.of(context).textTheme.bodyLarge,
               ),
               Text(
                 '100%',
-                style: Theme.of(context).textTheme.bodyText1,
+                style: Theme.of(context).textTheme.bodyLarge,
               ),
             ],
           ),
diff --git a/lib/src/screens/smart_tv/components/mood_toggle_buttons.dart b/lib/src/screens/smart_tv/components/mood_toggle_buttons.dart
index 45ad65a..7190606 100644
--- a/lib/src/screens/smart_tv/components/mood_toggle_buttons.dart
+++ b/lib/src/screens/smart_tv/components/mood_toggle_buttons.dart
@@ -21,7 +21,7 @@ class MoodToggleButtons extends StatelessWidget {
         children: [
           Text(
             'Mood',
-            style: Theme.of(context).textTheme.headline2,
+            style: Theme.of(context).textTheme.displayMedium,
           ),
           SizedBox(
             height: getProportionateScreenHeight(9),
@@ -36,6 +36,10 @@ class MoodToggleButtons extends StatelessWidget {
               fillColor: const Color(0xFF464646),
               renderBorder: false,
               borderRadius: BorderRadius.circular(15),
+              onPressed: (int index) {
+                model.onToggleTapped(index,context);
+              },
+              isSelected: model.isSelected,
               children: <Widget>[
                 SizedBox(
                   width: getProportionateScreenWidth(80),
@@ -68,10 +72,6 @@ class MoodToggleButtons extends StatelessWidget {
                   ),
                 ),
               ],
-              onPressed: (int index) {
-                model.onToggleTapped(index,context);
-              },
-              isSelected: model.isSelected,
             ),
           ),
           SizedBox(
diff --git a/lib/src/screens/splash_screen/components/body.dart b/lib/src/screens/splash_screen/components/body.dart
index 3d9a3db..0c09259 100644
--- a/lib/src/screens/splash_screen/components/body.dart
+++ b/lib/src/screens/splash_screen/components/body.dart
@@ -22,18 +22,18 @@ class Body extends StatelessWidget {
             height: getProportionateScreenHeight(20),
           ),
           Material(
-            child: Image.asset('assets/images/splash_img.png'),
             color: Colors.transparent,
+            child: Image.asset('assets/images/splash_img.png'),
           ),
           Text(
             'Sweet & Smart Home',
-            style: Theme.of(context).textTheme.headline1!.copyWith(
+            style: Theme.of(context).textTheme.displayLarge!.copyWith(
                   color: Colors.white,
                 ),
           ),
           Text(
             'Smart Home can change\nway you live in the future',
-            style: Theme.of(context).textTheme.headline3!.copyWith(
+            style: Theme.of(context).textTheme.displaySmall!.copyWith(
                   color: const Color(0xFFBDBDBD),
                 ),
           ),
@@ -41,10 +41,6 @@ class Body extends StatelessWidget {
             onPressed: () {
 	            Navigator.of(context).pushReplacementNamed(LoginScreen.routeName);
             },
-            child: Text(
-              'Get Started',
-              style: Theme.of(context).textTheme.headline2,
-            ),
             style: ElevatedButton.styleFrom(
               elevation: 0,
               padding: EdgeInsets.symmetric(
@@ -55,6 +51,10 @@ class Body extends StatelessWidget {
                 borderRadius: BorderRadius.circular(20), // <-- Radius
               ),
             ),
+            child: Text(
+              'Get Started',
+              style: Theme.of(context).textTheme.displayMedium,
+            ),
           )
         ],
       ),
diff --git a/lib/src/screens/stats_screen/components/stats_device_consumption_chart.dart b/lib/src/screens/stats_screen/components/stats_device_consumption_chart.dart
index 17d3a67..c686861 100644
--- a/lib/src/screens/stats_screen/components/stats_device_consumption_chart.dart
+++ b/lib/src/screens/stats_screen/components/stats_device_consumption_chart.dart
@@ -9,9 +9,9 @@ class StatsDeviceConsumptionChart extends StatelessWidget {
   Widget build(BuildContext context) {
     return StatsChart(
       title: 'Consumption by device',
-      subtitle: Row(
+      subtitle: const Row(
         crossAxisAlignment: CrossAxisAlignment.end,
-        children: const [
+        children: [
           Icon(
             Icons.warning,
             size: 18,
diff --git a/lib/src/screens/stats_screen/stats_screen.dart b/lib/src/screens/stats_screen/stats_screen.dart
index d0da107..76fe37c 100644
--- a/lib/src/screens/stats_screen/stats_screen.dart
+++ b/lib/src/screens/stats_screen/stats_screen.dart
@@ -37,8 +37,8 @@ class StatsScreen extends StatelessWidget {
         ],
         elevation: 0,
       ),
-      body: Column(
-        children: const [
+      body: const Column(
+        children: [
           TypeSelection(),
           SizedBox(height: 15),
           Expanded(
diff --git a/pubspec.lock b/pubspec.lock
index bc41a8f..d7142a1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+      sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.7"
+    version: "3.4.9"
   args:
     dependency: transitive
     description:
@@ -45,26 +45,26 @@ packages:
     dependency: "direct main"
     description:
       name: cached_network_image
-      sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15
+      sha256: f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.3"
+    version: "3.3.0"
   cached_network_image_platform_interface:
     dependency: transitive
     description:
       name: cached_network_image_platform_interface
-      sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7
+      sha256: "56aa42a7a01e3c9db8456d9f3f999931f1e05535b5a424271e9a38cabf066613"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   cached_network_image_web:
     dependency: transitive
     description:
       name: cached_network_image_web
-      sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0
+      sha256: "759b9a9f8f6ccbb66c185df805fac107f05730b1dab9c64626d1008cca532257"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   characters:
     dependency: transitive
     description:
@@ -85,10 +85,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
+      sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+4"
+    version: "0.3.3+6"
   crypto:
     dependency: transitive
     description:
@@ -125,18 +125,26 @@ packages:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
   dotted_border:
     dependency: "direct main"
     description:
       name: dotted_border
-      sha256: "07a5c5e8d4e6e992279e190e0352be8faa5b8f96d81c77a78b2d42f060279840"
+      sha256: "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0+3"
+    version: "2.1.0"
+  event_bus:
+    dependency: transitive
+    description:
+      name: event_bus
+      sha256: "44baa799834f4c803921873e7446a2add0f3efa45e101a054b1f0ab9b95f8edc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   fake_async:
     dependency: transitive
     description:
@@ -149,111 +157,103 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   file_selector_linux:
     dependency: transitive
     description:
       name: file_selector_linux
-      sha256: "770eb1ab057b5ae4326d1c24cc57710758b9a46026349d021d6311bd27580046"
+      sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.2"
+    version: "0.9.2+1"
   file_selector_macos:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: "7a6f1ae6107265664f3f7f89a66074882c4d506aef1441c9af313c1f7e6f41ce"
+      sha256: b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.9.3+3"
   file_selector_platform_interface:
     dependency: transitive
     description:
       name: file_selector_platform_interface
-      sha256: "412705a646a0ae90f33f37acfae6a0f7cbc02222d6cd34e479421c3e74d3853c"
+      sha256: "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.1"
   file_selector_windows:
     dependency: transitive
     description:
       name: file_selector_windows
-      sha256: "1372760c6b389842b77156203308940558a2817360154084368608413835fc26"
+      sha256: d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.9.3+1"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_blurhash:
-    dependency: transitive
-    description:
-      name: flutter_blurhash
-      sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.0"
   flutter_cache_manager:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3"
+      sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.3.1"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   flutter_native_splash:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: ba45d8cfbd778478a74696b012f33ffb6b1760c9bc531b21e2964444a4870dae
+      sha256: d93394f22f73e810bda59e11ebe83329c5511d6460b6b7509c4e1f3c92d6d625
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.5"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
+      sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.0.17"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      sha256: "1b61f8c4cbf965104b6ca7160880ff1af6755aad7fec70b58444245132453745"
+      sha256: "8cf100b8e4973dc570b6415a2090b0bfaa8756ad333db46939efc3e774ee100d"
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.4"
+    version: "5.9.0"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338"
+      sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.9"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -268,18 +268,18 @@ packages:
     dependency: "direct main"
     description:
       name: font_awesome_flutter
-      sha256: "959ef4add147753f990b4a7c6cccb746d5792dbdc81b1cde99e62e7edb31b206"
+      sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08"
       url: "https://pub.dev"
     source: hosted
-    version: "10.4.0"
+    version: "10.6.0"
   get_it:
     dependency: "direct main"
     description:
       name: get_it
-      sha256: "529de303c739fca98cd7ece5fca500d8ff89649f1bb4b4e94fb20954abcd7468"
+      sha256: f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3
       url: "https://pub.dev"
     source: hosted
-    version: "7.6.0"
+    version: "7.6.4"
   html:
     dependency: transitive
     description:
@@ -292,10 +292,10 @@ packages:
     dependency: transitive
     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:
@@ -308,74 +308,74 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
+      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.17"
+    version: "4.1.3"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: b6951e25b795d053a6ba03af5f710069c99349de9341af95155d52665cb4607c
+      sha256: "7d7f2768df2a8b0a3cefa5ef4f84636121987d403130e70b17ef7e2cf650ba84"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.9"
+    version: "1.0.4"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: d2bab152deb2547ea6f53d82ebca9b7e77386bb706e5789e815d37e08ea475bb
+      sha256: d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.7+3"
+    version: "0.8.8+2"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
+      sha256: "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "3.0.1"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: b3e2f21feb28b24dd73a35d7ad6e83f568337c70afab5eabac876e23803f264b
+      sha256: "76ec722aeea419d03aa915c2c96bf5b47214b053899088c9abb4086ceecf97a7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.8"
+    version: "0.8.8+4"
   image_picker_linux:
     dependency: transitive
     description:
       name: image_picker_linux
-      sha256: "02cbc21fe1706b97942b575966e5fbbeaac535e76deef70d3a242e4afb857831"
+      sha256: "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.1+1"
   image_picker_macos:
     dependency: transitive
     description:
       name: image_picker_macos
-      sha256: cee2aa86c56780c13af2c77b5f2f72973464db204569e1ba2dd744459a065af4
+      sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.1+1"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "7c7b96bb9413a9c28229e717e6fd1e3edd1cc5569c1778fcca060ecf729b65ee"
+      sha256: ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.9.1"
   image_picker_windows:
     dependency: transitive
     description:
       name: image_picker_windows
-      sha256: c3066601ea42113922232c7b7b3330a2d86f029f685bba99d82c30e799914952
+      sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1"
+    version: "0.2.1+1"
   intl:
     dependency: transitive
     description:
@@ -396,42 +396,42 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.0"
   lottie:
     dependency: "direct main"
     description:
       name: lottie
-      sha256: f461105d3a35887b27089abf9c292334478dd292f7b47ecdccb6ae5c37a22c80
+      sha256: a93542cc2d60a7057255405f62252533f8e8956e7e06754955669fd32fb4b216
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.7.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -440,6 +440,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  mqtt_client:
+    dependency: "direct main"
+    description:
+      name: mqtt_client
+      sha256: "873c124f6485c17b5ca085047880068f3c5acc9db54317995d752a3253f95a72"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
   nested:
     dependency: transitive
     description:
@@ -452,10 +460,10 @@ packages:
     dependency: transitive
     description:
       name: octo_image
-      sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143"
+      sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "2.0.0"
   path:
     dependency: transitive
     description:
@@ -484,82 +492,74 @@ packages:
     dependency: transitive
     description:
       name: path_provider
-      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
+      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.1.1"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
+      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.27"
+    version: "2.2.1"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "1995d88ec2948dac43edf8fe58eb434d35d22a2940ecee1a9fefcd62beee6eb3"
+      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.2.1"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.1"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.1"
+    version: "2.2.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "6.0.1"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.3"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.7"
   pointycastle:
     dependency: transitive
     description:
@@ -568,22 +568,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.7.3"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.4"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.5"
+    version: "6.1.1"
   rxdart:
     dependency: transitive
     description:
@@ -625,42 +617,50 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "7.0.0"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
-      sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
+      sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.8+4"
+    version: "2.3.0"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f"
+      sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5+1"
+    version: "2.5.0+2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -673,18 +673,18 @@ packages:
     dependency: "direct main"
     description:
       name: syncfusion_flutter_charts
-      sha256: "806ee3e7b4870e37afde0ee29294d0d5b687d469715fd63ae8fa39d6503b0c23"
+      sha256: "300afb7ffb157207d88c489728bb043e3de2e3a399a34835babacf7841cab897"
       url: "https://pub.dev"
     source: hosted
-    version: "22.1.34"
+    version: "23.1.44"
   syncfusion_flutter_core:
     dependency: transitive
     description:
       name: syncfusion_flutter_core
-      sha256: "952f5ee970bc3fba2db95a8dac71a295d9a70ad2c0993c7279e3a883c3e1459f"
+      sha256: "6f3056c548f4e039a8994904836881753c4c7643cd2142d3c226fcb45ec200fe"
       url: "https://pub.dev"
     source: hosted
-    version: "22.1.34"
+    version: "23.1.44"
   synchronized:
     dependency: transitive
     description:
@@ -713,10 +713,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.1"
   typed_data:
     dependency: transitive
     description:
@@ -737,34 +737,34 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "4.2.1"
   vector_graphics:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f"
+      sha256: "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.7"
+    version: "1.1.9+1"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f"
+      sha256: "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.7"
+    version: "1.1.9+1"
   vector_graphics_compiler:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e"
+      sha256: d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.7"
+    version: "1.1.9+1"
   vector_math:
     dependency: transitive
     description:
@@ -773,30 +773,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "1414f27dd781737e51afa9711f2ac2ace6ab4498ee98e20863fa5505aa00c58c"
+      sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.4"
+    version: "5.1.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
+      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.3"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.4.2"
   yaml:
     dependency: transitive
     description:
@@ -806,5 +814,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.13.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 83db534..7776abc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,16 +16,17 @@ dependencies:
   flutter_svg: ^2.0.7
   font_awesome_flutter: ^10.4.0
   get_it: ^7.2.0
-  image_picker: ^0.8.4+11
+  image_picker: ^1.0.4
   lottie: ^2.4.0
   provider: ^6.0.2
   sleek_circular_slider: ^2.0.1
   sliding_up_panel: ^2.0.0+1
-  syncfusion_flutter_charts: ^22.1.34
+  syncfusion_flutter_charts: ^23.1.44
   table_calendar: ^3.0.4
+  mqtt_client: ^10.0.0
 
 dev_dependencies:
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
   flutter_native_splash: ^2.3.1
   flutter_test: