diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index c9496a45..d014e390 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -231,7 +231,8 @@ class MessageInputState extends State<MessageInput> {
                   Padding(
                     padding: const EdgeInsets.all(8.0),
                     child: StreamSvgIcon.reply(
-                      color: Colors.black.withOpacity(0.2),
+                      color:
+                          StreamChatTheme.of(context).colorTheme.greyGainsboro,
                     ),
                   ),
                   Text(
@@ -263,7 +264,7 @@ class MessageInputState extends State<MessageInput> {
     );
     if (widget.editMessage == null) {
       child = Material(
-        color: Colors.white,
+        color: StreamChatTheme.of(context).colorTheme.white,
         elevation: 8,
         child: child,
       );
diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index f5545e50..14a49255 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -825,7 +825,7 @@ class _MessageListViewState extends State<MessageListView> {
       child = Swipeable(
         onSwipeEnd: () => widget.onMessageSwiped(message),
         backgroundIcon: StreamSvgIcon.reply(
-          color: StreamChatTheme.of(context).accentColor,
+          color: StreamChatTheme.of(context).colorTheme.accentBlue,
         ),
         child: child,
       );
diff --git a/lib/src/reply_message_widget.dart b/lib/src/reply_message_widget.dart
index c335906b..1a4348f3 100644
--- a/lib/src/reply_message_widget.dart
+++ b/lib/src/reply_message_widget.dart
@@ -131,9 +131,11 @@ class ReplyToMessageWidget extends StatelessWidget {
         minHeight: 48.0,
       ),
       decoration: BoxDecoration(
-        color: _getBackgroundColor(),
+        color: _getBackgroundColor(context),
         border: showBorder
-            ? Border.all(color: Colors.black.withOpacity(0.08))
+            ? Border.all(
+                color: StreamChatTheme.of(context).colorTheme.greyGainsboro,
+              )
             : null,
         borderRadius: BorderRadius.only(
           topRight: Radius.circular(12),
@@ -232,9 +234,7 @@ class ReplyToMessageWidget extends StatelessWidget {
   ShapeBorder _getDefaultShape(BuildContext context) {
     return RoundedRectangleBorder(
       side: BorderSide(
-        color: Theme.of(context).brightness == Brightness.dark
-            ? Colors.white.withAlpha(24)
-            : Colors.black.withAlpha(24),
+        color: StreamChatTheme.of(context).colorTheme.greyWhisper,
       ),
       borderRadius: BorderRadius.circular(8),
     );
@@ -308,9 +308,9 @@ class ReplyToMessageWidget extends StatelessWidget {
     };
   }
 
-  Color _getBackgroundColor() {
+  Color _getBackgroundColor(BuildContext context) {
     if (_containsScrapeUrl) {
-      return Color(0xFFE9F2FF);
+      return StreamChatTheme.of(context).colorTheme.blueAlice;
     }
     return messageTheme.messageBackgroundColor;
   }
diff --git a/lib/src/swipeable.dart b/lib/src/swipeable.dart
index c2279e63..8280bf24 100644
--- a/lib/src/swipeable.dart
+++ b/lib/src/swipeable.dart
@@ -2,6 +2,8 @@ import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 
+import 'stream_chat_theme.dart';
+
 ///
 class Swipeable extends StatefulWidget {
   final Widget child;
@@ -139,7 +141,9 @@ class _SwipeableState extends State<Swipeable> with TickerProviderStateMixin {
                     decoration: BoxDecoration(
                       shape: BoxShape.circle,
                       border: Border.all(
-                        color: Colors.black.withOpacity(0.08),
+                        color: StreamChatTheme.of(context)
+                            .colorTheme
+                            .greyGainsboro,
                       ),
                     ),
                     child: widget.backgroundIcon,