diff --git a/lib/components/dialogs/recording_dialog.dart b/lib/components/dialogs/recording_dialog.dart
index 12fcf7a..c1b33c0 100644
--- a/lib/components/dialogs/recording_dialog.dart
+++ b/lib/components/dialogs/recording_dialog.dart
@@ -80,7 +80,7 @@ class _RecordingDialogState extends State<RecordingDialog> {
           child: Text(
             I18n.of(context).cancel.toUpperCase(),
             style: TextStyle(
-              color: Theme.of(context).textTheme.body1.color.withAlpha(150),
+              color: Theme.of(context).textTheme.bodyText2.color.withAlpha(150),
             ),
           ),
           onPressed: () => Navigator.of(context).pop(),
diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index 5696143..93b97a3 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -58,7 +58,7 @@ class Message extends StatelessWidget {
 
     if (event.messageType == MessageTypes.Image) {
       color = Theme.of(context).scaffoldBackgroundColor.withOpacity(0.66);
-      textColor = Theme.of(context).textTheme.body1.color;
+      textColor = Theme.of(context).textTheme.bodyText2.color;
     } else if (ownMessage) {
       color = event.status == -1
           ? Colors.redAccent
diff --git a/lib/components/list_items/state_message.dart b/lib/components/list_items/state_message.dart
index b3f9a7b..ffe02f3 100644
--- a/lib/components/list_items/state_message.dart
+++ b/lib/components/list_items/state_message.dart
@@ -24,7 +24,7 @@ class StateMessage extends StatelessWidget {
           event.getLocalizedBody(I18n.of(context)),
           textAlign: TextAlign.center,
           style: TextStyle(
-            color: Theme.of(context).textTheme.body1.color,
+            color: Theme.of(context).textTheme.bodyText2.color,
             decoration: event.redacted ? TextDecoration.lineThrough : null,
           ),
         ),
diff --git a/lib/components/reply_content.dart b/lib/components/reply_content.dart
index df64112..3afed28 100644
--- a/lib/components/reply_content.dart
+++ b/lib/components/reply_content.dart
@@ -46,7 +46,7 @@ class ReplyContent extends StatelessWidget {
                 style: TextStyle(
                     color: lightText
                         ? Colors.white
-                        : Theme.of(context).textTheme.body1.color),
+                        : Theme.of(context).textTheme.bodyText2.color),
               ),
             ],
           ),
diff --git a/lib/components/theme_switcher.dart b/lib/components/theme_switcher.dart
index 8427deb..04afdc7 100644
--- a/lib/components/theme_switcher.dart
+++ b/lib/components/theme_switcher.dart
@@ -33,7 +33,7 @@ final ThemeData lightTheme = ThemeData(
     brightness: Brightness.light,
     color: Colors.white,
     textTheme: TextTheme(
-      title: TextStyle(
+      headline6: TextStyle(
         color: Colors.black,
         fontSize: 20,
       ),
@@ -68,7 +68,7 @@ final ThemeData darkTheme = ThemeData.dark().copyWith(
     brightness: Brightness.dark,
     color: Color(0xff1D1D1D),
     textTheme: TextTheme(
-      title: TextStyle(
+      headline6: TextStyle(
         color: Colors.white,
         fontSize: 20,
       ),
@@ -103,7 +103,7 @@ final ThemeData amoledTheme = ThemeData.dark().copyWith(
     brightness: Brightness.dark,
     color: Color(0xff1D1D1D),
     textTheme: TextTheme(
-      title: TextStyle(
+      headline6: TextStyle(
         color: Colors.white,
         fontSize: 20,
       ),
diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index f0b20d5..c56699e 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -407,7 +407,7 @@ class _ChatState extends State<_Chat> {
                 child: Icon(Icons.arrow_downward,
                     color: Theme.of(context).primaryColor),
                 onPressed: () => _scrollController.jumpTo(0),
-                foregroundColor: Theme.of(context).textTheme.body1.color,
+                foregroundColor: Theme.of(context).textTheme.bodyText2.color,
                 backgroundColor: Theme.of(context).scaffoldBackgroundColor,
                 mini: true,
               ),
diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart
index 20fa61b..4293de3 100644
--- a/lib/views/chat_details.dart
+++ b/lib/views/chat_details.dart
@@ -186,8 +186,11 @@ class _ChatDetailsState extends State<ChatDetails> {
               ],
               title: Text(widget.room.getLocalizedDisplayname(I18n.of(context)),
                   style: TextStyle(
-                      color:
-                          Theme.of(context).appBarTheme.textTheme.title.color)),
+                      color: Theme.of(context)
+                          .appBarTheme
+                          .textTheme
+                          .headline6
+                          .color)),
               backgroundColor: Theme.of(context).appBarTheme.color,
               flexibleSpace: FlexibleSpaceBar(
                 background: ContentBanner(widget.room.avatar,
@@ -223,7 +226,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                           linkStyle: TextStyle(color: Colors.blueAccent),
                           textStyle: TextStyle(
                             fontSize: 14,
-                            color: Theme.of(context).textTheme.body1.color,
+                            color: Theme.of(context).textTheme.bodyText2.color,
                           ),
                         ),
                         onTap: widget.room.canSendEvent("m.room.topic")
diff --git a/lib/views/chat_encryption_settings.dart b/lib/views/chat_encryption_settings.dart
index 4a0f3b6..598deb8 100644
--- a/lib/views/chat_encryption_settings.dart
+++ b/lib/views/chat_encryption_settings.dart
@@ -112,7 +112,8 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
                               .keys["ed25519:${deviceKeys[i].deviceId}"]
                               .beautified,
                           style: TextStyle(
-                              color: Theme.of(context).textTheme.body1.color),
+                              color:
+                                  Theme.of(context).textTheme.bodyText2.color),
                         ),
                         value: deviceKeys[i].verified,
                         onChanged: (bool newVal) {
diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index 44f1277..8875ef0 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -149,7 +149,11 @@ class _SettingsState extends State<Settings> {
               title: Text(
                 I18n.of(context).settings,
                 style: TextStyle(
-                    color: Theme.of(context).appBarTheme.textTheme.title.color),
+                    color: Theme.of(context)
+                        .appBarTheme
+                        .textTheme
+                        .headline6
+                        .color),
               ),
               background: ContentBanner(
                 profile?.avatarUrl,