diff --git a/lib/widgets/filebubble.dart b/lib/widgets/filebubble.dart
index 99905abe..ac151618 100644
--- a/lib/widgets/filebubble.dart
+++ b/lib/widgets/filebubble.dart
@@ -238,25 +238,37 @@ class FileBubbleState extends State<FileBubble> {
               bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadius),
             ),
           ),
-          child: Padding(
-            padding: EdgeInsets.all(9.0),
-            child: Column(
-                crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
-                mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  wdgSender,
-                  isPreview
-                      ? Container(
-                          width: 0,
-                          padding: EdgeInsets.zero,
-                          margin: EdgeInsets.zero,
-                        )
-                      : wdgMessage,
-                  wdgDecorations,
-                  messageStatusWidget
-                ]),
-          ));
+          child: Theme(
+              data: Theme.of(context).copyWith(
+                textSelectionTheme: TextSelectionThemeData(
+                    cursorColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                    selectionColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                    selectionHandleColor: Provider.of<Settings>(context).theme.messageSelectionColor),
+
+                // Horrifying Hack: Flutter doesn't give us direct control over system menus but instead picks BG color from TextButtonThemeData ¯\_(ツ)_/¯
+                textButtonTheme: TextButtonThemeData(
+                  style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.menuBackgroundColor)),
+                ),
+              ),
+              child: Padding(
+                padding: EdgeInsets.all(9.0),
+                child: Column(
+                    crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+                    mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      wdgSender,
+                      isPreview
+                          ? Container(
+                              width: 0,
+                              padding: EdgeInsets.zero,
+                              margin: EdgeInsets.zero,
+                            )
+                          : wdgMessage,
+                      wdgDecorations,
+                      messageStatusWidget
+                    ]),
+              )));
     });
   }
 
diff --git a/lib/widgets/invitationbubble.dart b/lib/widgets/invitationbubble.dart
index 74e2af51..97489f86 100644
--- a/lib/widgets/invitationbubble.dart
+++ b/lib/widgets/invitationbubble.dart
@@ -100,33 +100,47 @@ class InvitationBubbleState extends State<InvitationBubble> {
       //print(constraints.toString()+", "+constraints.maxWidth.toString());
       return Center(
           widthFactor: 1.0,
-          child: Container(
-              decoration: BoxDecoration(
-                color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor,
-                border: Border.all(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor, width: 1),
-                borderRadius: BorderRadius.only(
-                  topLeft: Radius.circular(borderRadiousEh),
-                  topRight: Radius.circular(borderRadiousEh),
-                  bottomLeft: fromMe ? Radius.circular(borderRadiousEh) : Radius.zero,
-                  bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadiousEh),
+          child: Theme(
+              data: Theme.of(context).copyWith(
+                textSelectionTheme: TextSelectionThemeData(
+                    cursorColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                    selectionColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                    selectionHandleColor: Provider.of<Settings>(context).theme.messageSelectionColor),
+
+                // Horrifying Hack: Flutter doesn't give us direct control over system menus but instead picks BG color from TextButtonThemeData ¯\_(ツ)_/¯
+                textButtonTheme: TextButtonThemeData(
+                  style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.menuBackgroundColor)),
                 ),
               ),
-              child: Center(
-                  widthFactor: 1.0,
-                  child: Padding(
-                      padding: EdgeInsets.all(9.0),
-                      child: Wrap(runAlignment: WrapAlignment.spaceEvenly, alignment: WrapAlignment.spaceEvenly, runSpacing: 1.0, crossAxisAlignment: WrapCrossAlignment.center, children: [
-                        Center(
-                            widthFactor: 1, child: Padding(padding: EdgeInsets.all(10.0), child: Icon(isGroup && !showGroupInvite ? CwtchIcons.enable_experiments : CwtchIcons.send_invite, size: 32))),
-                        Center(
-                          widthFactor: 1.0,
-                          child: Column(
-                              crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
-                              mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
-                              mainAxisSize: MainAxisSize.min,
-                              children: fromMe ? [wdgMessage, wdgDecorations] : [wdgSender, wdgMessage, wdgDecorations]),
-                        )
-                      ])))));
+              child: Container(
+                  decoration: BoxDecoration(
+                    color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor,
+                    border:
+                        Border.all(color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeBackgroundColor : Provider.of<Settings>(context).theme.messageFromOtherBackgroundColor, width: 1),
+                    borderRadius: BorderRadius.only(
+                      topLeft: Radius.circular(borderRadiousEh),
+                      topRight: Radius.circular(borderRadiousEh),
+                      bottomLeft: fromMe ? Radius.circular(borderRadiousEh) : Radius.zero,
+                      bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadiousEh),
+                    ),
+                  ),
+                  child: Center(
+                      widthFactor: 1.0,
+                      child: Padding(
+                          padding: EdgeInsets.all(9.0),
+                          child: Wrap(runAlignment: WrapAlignment.spaceEvenly, alignment: WrapAlignment.spaceEvenly, runSpacing: 1.0, crossAxisAlignment: WrapCrossAlignment.center, children: [
+                            Center(
+                                widthFactor: 1,
+                                child: Padding(padding: EdgeInsets.all(10.0), child: Icon(isGroup && !showGroupInvite ? CwtchIcons.enable_experiments : CwtchIcons.send_invite, size: 32))),
+                            Center(
+                              widthFactor: 1.0,
+                              child: Column(
+                                  crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+                                  mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: fromMe ? [wdgMessage, wdgDecorations] : [wdgSender, wdgMessage, wdgDecorations]),
+                            )
+                          ]))))));
     });
   }
 
diff --git a/lib/widgets/quotedmessage.dart b/lib/widgets/quotedmessage.dart
index d50792fb..afcc07bf 100644
--- a/lib/widgets/quotedmessage.dart
+++ b/lib/widgets/quotedmessage.dart
@@ -143,11 +143,23 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
                   ),
                   child: Padding(
                       padding: EdgeInsets.all(9.0),
-                      child: Column(
-                          crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
-                          mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
-                          mainAxisSize: MainAxisSize.min,
-                          children: fromMe ? [wdgQuote, wdgMessage, wdgDecorations] : [wdgSender, wdgQuote, wdgMessage, wdgDecorations])))));
+                      child: Theme(
+                          data: Theme.of(context).copyWith(
+                            textSelectionTheme: TextSelectionThemeData(
+                                cursorColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                                selectionColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                                selectionHandleColor: Provider.of<Settings>(context).theme.messageSelectionColor),
+
+                            // Horrifying Hack: Flutter doesn't give us direct control over system menus but instead picks BG color from TextButtonThemeData ¯\_(ツ)_/¯
+                            textButtonTheme: TextButtonThemeData(
+                              style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.menuBackgroundColor)),
+                            ),
+                          ),
+                          child: Column(
+                              crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+                              mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
+                              mainAxisSize: MainAxisSize.min,
+                              children: fromMe ? [wdgQuote, wdgMessage, wdgDecorations] : [wdgSender, wdgQuote, wdgMessage, wdgDecorations]))))));
     });
   }
 }