diff --git a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
index 73211014..af05d74c 100644
--- a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
+++ b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
@@ -596,7 +596,7 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
       elevation: 2,
       clipBehavior: Clip.hardEdge,
       isScrollControlled: true,
-      backgroundColor: StreamChatTheme.of(context).colorTheme.white,
+      backgroundColor: StreamChatTheme.of(context).channelTheme.inputBackground,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.only(
           topLeft: Radius.circular(16),
diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index d24d51f7..97e0374e 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -234,64 +234,66 @@ class MessageInputState extends State<MessageInput> {
 
   @override
   Widget build(BuildContext context) {
-    Widget child = SafeArea(
-      child: GestureDetector(
-        onPanUpdate: (details) {
-          if (details.delta.dy > 0) {
-            _focusNode.unfocus();
-            if (_openFilePickerSection) {
-              setState(() {
-                _openFilePickerSection = false;
-              });
+    Widget child = Container(
+      color: StreamChatTheme.of(context).channelTheme.inputBackground,
+      child: SafeArea(
+        child: GestureDetector(
+          onPanUpdate: (details) {
+            if (details.delta.dy > 0) {
+              _focusNode.unfocus();
+              if (_openFilePickerSection) {
+                setState(() {
+                  _openFilePickerSection = false;
+                });
+              }
             }
-          }
-        },
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            if (_hasQuotedMessage)
-              Padding(
-                padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.all(8.0),
-                      child: StreamSvgIcon.reply(
-                        color: StreamChatTheme.of(context)
-                            .colorTheme
-                            .greyGainsboro,
+          },
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              if (_hasQuotedMessage)
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(8, 8, 8, 0),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: StreamSvgIcon.reply(
+                          color: StreamChatTheme.of(context)
+                              .colorTheme
+                              .greyGainsboro,
+                        ),
                       ),
-                    ),
-                    Text(
-                      'Reply to Message',
-                      style: TextStyle(fontWeight: FontWeight.bold),
-                    ),
-                    IconButton(
-                      visualDensity: VisualDensity.compact,
-                      icon: StreamSvgIcon.closeSmall(),
-                      onPressed: widget.onQuotedMessageCleared,
-                    ),
-                  ],
+                      Text(
+                        'Reply to Message',
+                        style: TextStyle(fontWeight: FontWeight.bold),
+                      ),
+                      IconButton(
+                        visualDensity: VisualDensity.compact,
+                        icon: StreamSvgIcon.closeSmall(),
+                        onPressed: widget.onQuotedMessageCleared,
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-            Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: _buildTextField(context),
-            ),
-            if (widget.parentMessage != null)
               Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                child: _buildDmCheckbox(),
+                padding: const EdgeInsets.all(8.0),
+                child: _buildTextField(context),
               ),
-            _buildFilePickerSection(),
-          ],
+              if (widget.parentMessage != null)
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                  child: _buildDmCheckbox(),
+                ),
+              _buildFilePickerSection(),
+            ],
+          ),
         ),
       ),
     );
     if (widget.editMessage == null) {
       child = Material(
-        color: StreamChatTheme.of(context).colorTheme.white,
         elevation: 8,
         child: child,
       );
diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index 1c5c8061..ad868fa0 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -885,7 +885,7 @@ class _MessageListViewState extends State<MessageListView> {
       padding: const EdgeInsets.symmetric(horizontal: 8.0),
       showInChannelIndicator: showInChannelIndicator,
       showThreadReplyIndicator: showThreadReplyIndicator,
-      showUsername: showUsername,
+      showUsername: true,
       showTimestamp: showTimeStamp,
       showSendingIndicator: showSendingIndicator,
       showUserAvatar: showUserAvatar,
diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index eed3d90b..91c53566 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -578,9 +578,7 @@ class _MessageWidgetState extends State<MessageWidget>
       if (showUsername)
         Text(
           widget.message.user.name,
-          style: widget.messageTheme.replies.copyWith(
-            color: widget.messageTheme.createdAt.color,
-          ),
+          style: widget.messageTheme.messageAuthor,
         ),
       if (showTimeStamp)
         Text(
diff --git a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
index be69e366..50549822 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
@@ -206,6 +206,7 @@ class StreamChatThemeData {
         inputBackground: colorTheme.white.withAlpha(12),
       ),
       ownMessageTheme: MessageTheme(
+        messageAuthor: textTheme.footnote.copyWith(color: colorTheme.grey),
         messageText: textTheme.body,
         createdAt: textTheme.footnote.copyWith(color: colorTheme.grey),
         replies: textTheme.footnoteBold.copyWith(color: accentColor),
@@ -231,6 +232,7 @@ class StreamChatThemeData {
         reactionsMaskColor: colorTheme.whiteSnow,
         messageText: textTheme.body,
         createdAt: textTheme.footnote.copyWith(color: colorTheme.grey),
+        messageAuthor: textTheme.footnote.copyWith(color: colorTheme.grey),
         replies: textTheme.footnoteBold.copyWith(color: accentColor),
         messageLinks: TextStyle(
           color: accentColor,