diff --git a/src/components/Comment.jsx b/src/components/Comment.jsx
index 4b014d9..49f7127 100644
--- a/src/components/Comment.jsx
+++ b/src/components/Comment.jsx
@@ -57,8 +57,8 @@ function Comment({ comment, nav, isolated = false }) {
         marginLeft: isolated
           ? 0
           : comment.reply_post_id != comment.parent_post_id
-          ? 20
-          : 0,
+            ? 20
+            : 0,
       }}
       onLayout={event => {
         setWidth(event.nativeEvent.layout.width);
@@ -78,22 +78,46 @@ function Comment({ comment, nav, isolated = false }) {
             hideGroup={true}
             borderRadius={BORDER_RADIUS}
           />
-          {comment.reply_comment_alias && (
+          <View
+            style={{
+              justifyContent: 'center',
+              flexDirection: 'column',
+              flex: 1,
+            }}>
+            {comment.identity.name != 'Anonymous' &&
+              comment?.identity?.posted_with_username && (
+                <Text
+                  variant="labelMedium"
+                  style={{ marginLeft: 10, opacity: 0.75 }}>
+                  @{comment.identity.name}
+                </Text>
+              )}
+            {comment.reply_comment_alias && (
+              <Text
+                variant="titleMedium"
+                style={{
+                  marginLeft: 10,
+                  paddingRight: 10,
+                  color: colors.onSurfaceDisabled,
+                  borderRightColor: colors.surfaceVariant,
+                  borderRightWidth: 1,
+                }}>
+                ▶ {comment.reply_comment_alias}
+              </Text>
+            )}
+            {!comment?.identity?.posted_with_username && (
+              <Text variant="labelLarge" style={{ marginLeft: 10 }}>
+                {timesago(comment.created_at)}
+              </Text>
+            )}
+          </View>
+          {comment?.identity?.posted_with_username && (
             <Text
-              variant="titleMedium"
-              style={{
-                marginLeft: 10,
-                paddingRight: 10,
-                color: colors.onSurfaceDisabled,
-                borderRightColor: colors.surfaceVariant,
-                borderRightWidth: 1,
-              }}>
-              ▶ {comment.reply_comment_alias}
+              variant="labelLarge"
+              style={{ marginLeft: 10, flex: 1, textAlign: 'right' }}>
+              {timesago(comment.created_at)}
             </Text>
           )}
-          <Text variant="labelLarge" style={{ marginLeft: 10, flex: 1 }}>
-            {timesago(comment.created_at)}
-          </Text>
           {comment.authored_by_user && (
             <IconButton
               icon="delete"
diff --git a/src/components/Post.jsx b/src/components/Post.jsx
index a596f4e..7b73b70 100644
--- a/src/components/Post.jsx
+++ b/src/components/Post.jsx
@@ -87,7 +87,7 @@ function Post({
             </Text>
             {post.identity.name != 'Anonymous' && (
               <Text
-                variant="labelSmall"
+                variant="labelMedium"
                 style={{ marginLeft: 10, opacity: 0.75 }}>
                 @{post.identity.name}
               </Text>
diff --git a/src/screens/MessagesScreen.jsx b/src/screens/MessagesScreen.jsx
index 4b09c90..394b308 100644
--- a/src/screens/MessagesScreen.jsx
+++ b/src/screens/MessagesScreen.jsx
@@ -83,7 +83,7 @@ function MessageScreen({ navigation }) {
                 color={colors.primary}
               />
               <View>
-                <Text style={{ color: 'white' }} variant="bodyLarge">
+                <Text style={{ color: colors.onSurface }} variant="bodyLarge">
                   {item.messages[item.messages.length - 1].text}
                 </Text>
                 <Text
diff --git a/src/screens/ThreadScreen.jsx b/src/screens/ThreadScreen.jsx
index f602dc8..cfc425b 100644
--- a/src/screens/ThreadScreen.jsx
+++ b/src/screens/ThreadScreen.jsx
@@ -136,7 +136,7 @@ function ThreadScreen({ navigation, route }) {
                   : colors.elevation.level1,
               }}
               mode="flat">
-              <Text style={{ color: 'white' }} variant="bodyLarge">
+              <Text style={{ color: colors.onSurface }} variant="bodyLarge">
                 {item.text}
               </Text>
               <Text