diff --git a/lib/main.dart b/lib/main.dart
index 0cee4a5..1d3f3b3 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -54,10 +54,8 @@ class _AppState extends State<App> {
             onSecondary: Colors.black,
             error: Colors.red,
             onError: Colors.white,
-            background: Colors.white,
-            onBackground: Colors.black,
             surface: Colors.white,
-            onSurface: Colors.black,
+            onSurface: Colors.black
           ));
           themeDark = ThemeData.from(
               colorScheme: const ColorScheme(
@@ -68,10 +66,8 @@ class _AppState extends State<App> {
             onSecondary: Colors.white,
             error: Colors.red,
             onError: Colors.black,
-            background: Colors.black,
-            onBackground: Colors.white,
             surface: Colors.black,
-            onSurface: Colors.white,
+            onSurface: Colors.white
           ));
           WidgetsBinding
               .instance.platformDispatcher.onPlatformBrightnessChanged = () {
@@ -80,16 +76,16 @@ class _AppState extends State<App> {
                 systemNavigationBarColor:
                     (MediaQuery.of(context).platformBrightness ==
                             Brightness.light)
-                        ? (themeDark ?? ThemeData.dark()).colorScheme.background
-                        : (theme ?? ThemeData()).colorScheme.background));
+                        ? (themeDark ?? ThemeData.dark()).colorScheme.surface
+                        : (theme ?? ThemeData()).colorScheme.surface));
           };
           // brightness changed function not run at first startup
           SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-              systemNavigationBarColor: (MediaQuery.of(context)
-                          .platformBrightness ==
-                      Brightness.light)
-                  ? (theme ?? ThemeData()).colorScheme.background
-                  : (themeDark ?? ThemeData.dark()).colorScheme.background));
+              systemNavigationBarColor:
+                  (MediaQuery.of(context).platformBrightness ==
+                          Brightness.light)
+                      ? (theme ?? ThemeData()).colorScheme.surface
+                      : (themeDark ?? ThemeData.dark()).colorScheme.surface));
           setState(() {});
         }
       },
@@ -306,7 +302,7 @@ class _MainAppState extends State<MainApp> {
                 theme: (MediaQuery.of(context).platformBrightness == Brightness.light)
                     ? DefaultChatTheme(
                         backgroundColor:
-                            (theme ?? ThemeData()).colorScheme.background,
+                            (theme ?? ThemeData()).colorScheme.surface,
                         primaryColor:
                             (theme ?? ThemeData()).colorScheme.primary,
                         attachmentButtonIcon:
@@ -314,27 +310,27 @@ class _MainAppState extends State<MainApp> {
                         sendButtonIcon: const Icon(Icons.send_rounded),
                         inputBackgroundColor: (theme ?? ThemeData())
                             .colorScheme
-                            .onBackground
+                            .onSurface
                             .withAlpha(10),
                         inputTextColor:
-                            (theme ?? ThemeData()).colorScheme.onBackground,
+                            (theme ?? ThemeData()).colorScheme.onSurface,
                         inputBorderRadius:
                             const BorderRadius.all(Radius.circular(64)),
                         inputPadding: const EdgeInsets.all(16),
                         inputMargin: EdgeInsets.only(
                             left: 8,
                             right: 8,
-                            bottom:
-                                (MediaQuery.of(context).viewInsets.bottom == 0.0)
-                                    ? 0
-                                    : 8))
+                            bottom: (MediaQuery.of(context).viewInsets.bottom == 0.0)
+                                ? 0
+                                : 8))
                     : DarkChatTheme(
-                        backgroundColor: (themeDark ?? ThemeData.dark()).colorScheme.background,
+                        backgroundColor:
+                            (themeDark ?? ThemeData.dark()).colorScheme.surface,
                         primaryColor: (themeDark ?? ThemeData.dark()).colorScheme.primary.withAlpha(40),
                         attachmentButtonIcon: const Icon(Icons.file_upload_rounded),
                         sendButtonIcon: const Icon(Icons.send_rounded),
-                        inputBackgroundColor: (themeDark ?? ThemeData()).colorScheme.onBackground.withAlpha(40),
-                        inputTextColor: (themeDark ?? ThemeData()).colorScheme.onBackground,
+                        inputBackgroundColor: (themeDark ?? ThemeData()).colorScheme.onSurface.withAlpha(40),
+                        inputTextColor: (themeDark ?? ThemeData()).colorScheme.onSurface,
                         inputBorderRadius: const BorderRadius.all(Radius.circular(64)),
                         inputPadding: const EdgeInsets.all(16),
                         inputMargin: EdgeInsets.only(left: 8, right: 8, bottom: (MediaQuery.of(context).viewInsets.bottom == 0.0) ? 0 : 8)))),
diff --git a/pubspec.lock b/pubspec.lock
index 77cd177..a84e93a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -202,10 +202,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "4.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -329,10 +329,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   json_annotation:
     dependency: transitive
     description:
@@ -345,26 +345,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   linkify:
     dependency: transitive
     description:
@@ -377,10 +377,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
   matcher:
     dependency: transitive
     description:
@@ -401,10 +401,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -590,10 +590,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -694,10 +694,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   web:
     dependency: transitive
     description:
@@ -710,10 +710,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.0"
+    version: "5.5.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -723,5 +723,5 @@ packages:
     source: hosted
     version: "1.0.4"
 sdks:
-  dart: ">=3.3.4 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.19.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index cdc081f..fbce53f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^3.0.0
+  flutter_lints: ^4.0.0
 
 flutter:
   uses-material-design: true