diff --git a/packages/chatty/lib/main.dart b/packages/chatty/lib/main.dart
index 22323d6..dc85cb1 100644
--- a/packages/chatty/lib/main.dart
+++ b/packages/chatty/lib/main.dart
@@ -40,7 +40,8 @@ class MyApp extends StatelessWidget {
                 streamChatThemeData:
                     StreamChatThemeData.fromTheme(Theme.of(context)).copyWith(
                   ownMessageTheme: MessageThemeData(
-                    messageBackgroundColor: Theme.of(context).accentColor,
+                    messageBackgroundColor:
+                        Theme.of(context).colorScheme.secondary,
                     messageTextStyle: TextStyle(color: Colors.white),
                   ),
                 ),
diff --git a/packages/chatty/lib/ui/common/my_channel_preview.dart b/packages/chatty/lib/ui/common/my_channel_preview.dart
index ea83412..9156d83 100644
--- a/packages/chatty/lib/ui/common/my_channel_preview.dart
+++ b/packages/chatty/lib/ui/common/my_channel_preview.dart
@@ -214,7 +214,6 @@ class MyChannelPreview extends StatelessWidget {
         ],
       );
     }
-    // TODO
     return TypingIndicator(
       channel: channel,
       alternativeWidget: _buildLastMessage(context),
diff --git a/packages/chatty/lib/ui/home/chat/chat_view.dart b/packages/chatty/lib/ui/home/chat/chat_view.dart
index 911a7db..b0a2099 100644
--- a/packages/chatty/lib/ui/home/chat/chat_view.dart
+++ b/packages/chatty/lib/ui/home/chat/chat_view.dart
@@ -5,7 +5,7 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 class ChatView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final textColor = Theme.of(context).appBarTheme.color;
+    final textColor = Theme.of(context).appBarTheme.backgroundColor;
     return Scaffold(
       backgroundColor: Theme.of(context).canvasColor,
       appBar: AppBar(
diff --git a/packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart b/packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart
index 3fdb50b..76f0088 100644
--- a/packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart
+++ b/packages/chatty/lib/ui/home/chat/selection/friends_selection_view.dart
@@ -25,8 +25,8 @@ class FriendsSelectionView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final textColor = Theme.of(context).appBarTheme.color;
-    final accentColor = Theme.of(context).accentColor;
+    final textColor = Theme.of(context).appBarTheme.backgroundColor;
+    final accentColor = Theme.of(context).colorScheme.secondary;
     return MultiBlocProvider(
       providers: [
         BlocProvider(
diff --git a/packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart b/packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart
index 42f65e5..3c9bc34 100644
--- a/packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart
+++ b/packages/chatty/lib/ui/home/chat/selection/group_selection_view.dart
@@ -48,7 +48,7 @@ class GroupSelectionView extends StatelessWidget {
                 'New Group',
                 style: TextStyle(
                   fontSize: 24,
-                  color: Theme.of(context).appBarTheme.color,
+                  color: Theme.of(context).appBarTheme.backgroundColor,
                   fontWeight: FontWeight.w800,
                 ),
               ),
diff --git a/packages/chatty/lib/ui/home/settings/settings_view.dart b/packages/chatty/lib/ui/home/settings/settings_view.dart
index cd12ada..f62067b 100644
--- a/packages/chatty/lib/ui/home/settings/settings_view.dart
+++ b/packages/chatty/lib/ui/home/settings/settings_view.dart
@@ -44,7 +44,6 @@ class SettingsView extends StatelessWidget {
             child: Column(
               children: [
                 AvatarImageView(
-                  //TODO: implement change avatar
                   onTap: () => null,
                   child: image != null
                       ? Image.network(
diff --git a/packages/chatty/lib/ui/profile_verify/profile_verify_view.dart b/packages/chatty/lib/ui/profile_verify/profile_verify_view.dart
index 6b6c2bd..aedc2ba 100644
--- a/packages/chatty/lib/ui/profile_verify/profile_verify_view.dart
+++ b/packages/chatty/lib/ui/profile_verify/profile_verify_view.dart
@@ -82,7 +82,7 @@ class ProfileVerifyView extends StatelessWidget {
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(10),
                       ),
-                      color: Theme.of(context).accentColor,
+                      color: Theme.of(context).colorScheme.secondary,
                       child: InkWell(
                           onTap: () {
                             context.read<ProfileVerifyCubit>().startChatting();
diff --git a/packages/chatty/lib/ui/themes.dart b/packages/chatty/lib/ui/themes.dart
index ef9412b..ab1bb45 100644
--- a/packages/chatty/lib/ui/themes.dart
+++ b/packages/chatty/lib/ui/themes.dart
@@ -10,7 +10,8 @@ class Themes {
   static final themeLight = ThemeData.light().copyWith(
       backgroundColor: backgroundLightColor,
       // selected color
-      accentColor: primaryColor,
+      colorScheme:
+          ThemeData.light().colorScheme.copyWith(secondary: primaryColor),
       // floating action button
       floatingActionButtonTheme: FloatingActionButtonThemeData(
         backgroundColor: primaryColor,
@@ -32,7 +33,8 @@ class Themes {
   static final themeDark = ThemeData.dark().copyWith(
       backgroundColor: backgroundDarkColor,
       // selected color
-      accentColor: primaryColor,
+      colorScheme:
+          ThemeData.dark().colorScheme.copyWith(secondary: primaryColor),
       // floating action button
       floatingActionButtonTheme: FloatingActionButtonThemeData(
         backgroundColor: primaryColor,
diff --git a/packages/chatty/pubspec.yaml b/packages/chatty/pubspec.yaml
index 28aaaa3..50682b9 100644
--- a/packages/chatty/pubspec.yaml
+++ b/packages/chatty/pubspec.yaml
@@ -11,14 +11,14 @@ dependencies:
     sdk: flutter
 
   flutter_bloc: ^7.1.0
-  stream_chat_flutter: ^3.0.0
+  stream_chat_flutter: ^2.0.0
   uuid: ^3.0.5
 
-  firebase_core: ^1.7.0
-  google_sign_in: ^5.1.1
-  firebase_auth: ^3.1.2
-  firebase_storage: ^10.0.4
-  shared_preferences: ^2.0.8
+  firebase_core: ^1.2.0
+  google_sign_in: ^5.0.3
+  firebase_auth: ^1.2.0
+  firebase_storage: ^8.1.0
+  shared_preferences: ^2.0.5
   http: any
   collection: ^1.15.0