From 1557f29ece7fadc5b9157b5c7b6217286de0cecf Mon Sep 17 00:00:00 2001
From: Diego Beraldin <diego.beraldin@gmail.com>
Date: Wed, 7 Feb 2024 22:59:26 +0100
Subject: [PATCH] feat: configure comment bar width; prefer nicknames (#511)

---
 .../repository/DefaultThemeRepository.kt      |   9 +-
 .../appearance/repository/ThemeRepository.kt  |   6 +-
 .../commonui/lemmyui/CollapsedCommentCard.kt  |   2 +
 .../core/commonui/lemmyui/CommentCard.kt      |   5 +-
 .../lemmyui/CommunityAndCreatorInfo.kt        |   5 +-
 .../core/commonui/lemmyui/CommunityHeader.kt  |  11 +-
 .../core/commonui/lemmyui/CommunityItem.kt    |   9 +-
 .../core/commonui/lemmyui/InboxCard.kt        |   2 +
 .../commonui/lemmyui/InboxReplySubtitle.kt    |   5 +-
 .../core/commonui/lemmyui/PostCard.kt         |   7 ++
 .../core/commonui/lemmyui/UserHeader.kt       |   9 +-
 .../core/commonui/lemmyui/UserItem.kt         |   7 +-
 .../modals/CommentBarThicknessBottomSheet.kt  | 101 ++++++++++++++++++
 .../notifications/NotificationCenterEvent.kt  |   1 +
 .../core/persistence/data/SettingsModel.kt    |   2 +
 .../repository/DefaultSettingsRepository.kt   |  12 +++
 .../core/persistence/settings.sq              |  14 ++-
 .../commonMain/sqldelight/migrations/24.sqm   |   5 +
 .../domain/lemmy/data/CommunityModel.kt       |  11 +-
 .../domain/lemmy/data/UserModel.kt            |  11 +-
 .../feature/search/main/ExploreMviModel.kt    |   1 +
 .../feature/search/main/ExploreScreen.kt      |   4 +
 .../feature/search/main/ExploreViewModel.kt   |   1 +
 .../colors/SettingsColorAndFontMviModel.kt    |   1 +
 .../colors/SettingsColorAndFontScreen.kt      |  11 ++
 .../colors/SettingsColorAndFontViewModel.kt   |  21 +++-
 .../feature/settings/main/SettingsMviModel.kt |   2 +
 .../feature/settings/main/SettingsScreen.kt   |  11 ++
 .../settings/main/SettingsViewModel.kt        |  13 +++
 .../commonMain/resources/MR/base/strings.xml  |   2 +
 .../diegoberaldin/raccoonforlemmy/App.kt      |   9 +-
 .../unit/chat/InboxChatMviModel.kt            |   1 +
 .../unit/chat/InboxChatViewModel.kt           |   7 +-
 .../CommunityDetailMviModel.kt                |   1 +
 .../communitydetail/CommunityDetailScreen.kt  |   1 +
 .../CommunityDetailViewModel.kt               |   1 +
 .../communityinfo/CommunityInfoMviModel.kt    |   1 +
 .../unit/communityinfo/CommunityInfoScreen.kt |   5 +-
 .../createcomment/CreateCommentMviModel.kt    |   1 +
 .../unit/createcomment/CreateCommentScreen.kt |   2 +
 .../createcomment/CreateCommentViewModel.kt   |   1 +
 .../unit/createpost/CreatePostMviModel.kt     |   1 +
 .../unit/createpost/CreatePostScreen.kt       |   1 +
 .../unit/createpost/CreatePostViewModel.kt    |   4 +-
 .../unit/drawer/ModalDrawerContent.kt         |   1 +
 .../unit/drawer/ModalDrawerMviModel.kt        |   2 +-
 .../unit/drawer/ModalDrawerViewModel.kt       |   9 +-
 .../unit/instanceinfo/InstanceInfoMviModel.kt |   1 +
 .../unit/instanceinfo/InstanceInfoScreen.kt   |   1 +
 .../instanceinfo/InstanceInfoViewModel.kt     |   7 +-
 .../manageaccounts/ManageAccountsMviModel.kt  |   1 +
 .../manageaccounts/ManageAccountsViewModel.kt |   7 +-
 .../unit/manageban/ManageBanMviModel.kt       |   1 +
 .../unit/manageban/ManageBanScreen.kt         |   2 +
 .../unit/manageban/ManageBanViewModel.kt      |   7 +-
 .../ManageSubscriptionsMviModel.kt            |   1 +
 .../ManageSubscriptionsViewModel.kt           |   7 +-
 .../unit/mentions/InboxMentionsMviModel.kt    |   1 +
 .../unit/mentions/InboxMentionsScreen.kt      |   1 +
 .../unit/mentions/InboxMentionsViewModel.kt   |   1 +
 .../raccoonforlemmy/unit/messages/ChatCard.kt |   3 +-
 .../unit/messages/InboxMessagesMviModel.kt    |   1 +
 .../unit/messages/InboxMessagesViewModel.kt   |   7 +-
 .../unit/modlog/ModlogMviModel.kt             |   1 +
 .../unit/modlog/ModlogViewModel.kt            |   1 +
 .../unit/modlog/components/InnerModlogItem.kt |   5 +-
 .../unit/modlog/components/ModAddItem.kt      |   4 +-
 .../components/ModBanFromCommunityItem.kt     |   3 +-
 .../modlog/components/ModFeaturePostItem.kt   |   2 +
 .../unit/modlog/components/ModLockPostItem.kt |   2 +
 .../modlog/components/ModRemoveCommentItem.kt |   2 +
 .../modlog/components/ModRemovePostItem.kt    |   2 +
 .../components/ModTransferCommunityItem.kt    |   3 +-
 .../detail/MultiCommunityMviModel.kt          |   1 +
 .../detail/MultiCommunityScreen.kt            |   3 +-
 .../detail/MultiCommunityViewModel.kt         |   1 +
 .../editor/MultiCommunityEditorMviModel.kt    |   1 +
 .../editor/MultiCommunityEditorScreen.kt      |   1 +
 .../editor/MultiCommunityEditorViewModel.kt   |   7 +-
 .../unit/myaccount/ProfileLoggedMviModel.kt   |   1 +
 .../unit/myaccount/ProfileLoggedScreen.kt     |   1 +
 .../unit/myaccount/ProfileLoggedViewModel.kt  |   1 +
 .../unit/postdetail/PostDetailMviModel.kt     |   1 +
 .../unit/postdetail/PostDetailScreen.kt       |   4 +-
 .../unit/postdetail/PostDetailViewModel.kt    |   1 +
 .../unit/postlist/PostListMviModel.kt         |   1 +
 .../unit/postlist/PostListScreen.kt           |   5 +-
 .../unit/postlist/PostListViewModel.kt        |   1 +
 .../unit/replies/InboxRepliesMviModel.kt      |   1 +
 .../unit/replies/InboxRepliesScreen.kt        |   1 +
 .../unit/replies/InboxRepliesViewModel.kt     |   1 +
 .../unit/reportlist/ReportListMviModel.kt     |   1 +
 .../unit/reportlist/ReportListScreen.kt       |   2 +
 .../unit/reportlist/ReportListViewModel.kt    |   1 +
 .../components/CommentReportCard.kt           |   2 +
 .../reportlist/components/InnerReportCard.kt  |   5 +-
 .../reportlist/components/PostReportCard.kt   |   2 +
 .../unit/saveditems/SavedItemsMviModel.kt     |   1 +
 .../unit/saveditems/SavedItemsScreen.kt       |   2 +
 .../unit/saveditems/SavedItemsViewModel.kt    |   1 +
 .../selectcommunity/SelectCommunityDialog.kt  |   1 +
 .../SelectCommunityMviModel.kt                |   1 +
 .../SelectCommunityViewModel.kt               |   7 +-
 .../unit/userdetail/UserDetailMviModel.kt     |   1 +
 .../unit/userdetail/UserDetailScreen.kt       |   4 +-
 .../unit/userdetail/UserDetailViewModel.kt    |   1 +
 .../unit/userinfo/UserInfoMviModel.kt         |   1 +
 .../unit/userinfo/UserInfoScreen.kt           |   5 +-
 108 files changed, 425 insertions(+), 69 deletions(-)
 create mode 100644 core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThicknessBottomSheet.kt
 create mode 100644 core/persistence/src/commonMain/sqldelight/migrations/24.sqm

diff --git a/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/DefaultThemeRepository.kt b/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/DefaultThemeRepository.kt
index 1928d7197..e0683cb3e 100644
--- a/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/DefaultThemeRepository.kt
+++ b/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/DefaultThemeRepository.kt
@@ -24,6 +24,7 @@ internal class DefaultThemeRepository : ThemeRepository {
     override val saveColor = MutableStateFlow<Color?>(null)
     override val postLayout = MutableStateFlow<PostLayout>(PostLayout.Card)
     override val commentBarTheme = MutableStateFlow<CommentBarTheme>(CommentBarTheme.Blue)
+    override val commentBarThickness = MutableStateFlow(1)
 
     override fun changeUiTheme(value: UiTheme?) {
         uiTheme.value = value
@@ -66,11 +67,11 @@ internal class DefaultThemeRepository : ThemeRepository {
         customSeedColor.value = color
     }
 
-    override fun changeUpvoteColor(color: Color?) {
+    override fun changeUpVoteColor(color: Color?) {
         upVoteColor.value = color
     }
 
-    override fun changeDownvoteColor(color: Color?) {
+    override fun changeDownVoteColor(color: Color?) {
         downVoteColor.value = color
     }
 
@@ -128,4 +129,8 @@ internal class DefaultThemeRepository : ThemeRepository {
                 this += Color(0xFFFF0000)
             }
         }
+
+    override fun changeCommentBarThickness(value: Int) {
+        commentBarThickness.value = value
+    }
 }
\ No newline at end of file
diff --git a/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/ThemeRepository.kt b/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/ThemeRepository.kt
index 87423f31d..c571d7bbc 100644
--- a/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/ThemeRepository.kt
+++ b/core/appearance/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/appearance/repository/ThemeRepository.kt
@@ -25,6 +25,7 @@ interface ThemeRepository {
     val saveColor: StateFlow<Color?>
     val postLayout: StateFlow<PostLayout>
     val commentBarTheme: StateFlow<CommentBarTheme>
+    val commentBarThickness: StateFlow<Int>
 
     fun changeUiTheme(value: UiTheme?)
 
@@ -44,9 +45,9 @@ interface ThemeRepository {
 
     fun changeCustomSeedColor(color: Color?)
 
-    fun changeUpvoteColor(color: Color?)
+    fun changeUpVoteColor(color: Color?)
 
-    fun changeDownvoteColor(color: Color?)
+    fun changeDownVoteColor(color: Color?)
 
     fun changeReplyColor(color: Color?)
     fun changeSaveColor(color: Color?)
@@ -54,6 +55,7 @@ interface ThemeRepository {
     fun changePostLayout(value: PostLayout)
 
     fun changeCommentBarTheme(value: CommentBarTheme)
+    fun changeCommentBarThickness(value: Int)
 
     fun getCommentBarColors(commentBarTheme: CommentBarTheme): List<Color>
 }
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CollapsedCommentCard.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CollapsedCommentCard.kt
index df258f24b..d2c79ea29 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CollapsedCommentCard.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CollapsedCommentCard.kt
@@ -34,6 +34,7 @@ fun CollapsedCommentCard(
     modifier: Modifier = Modifier,
     voteFormat: VoteFormat = VoteFormat.Aggregated,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     showScores: Boolean = true,
     actionButtonsActive: Boolean = true,
     isOp: Boolean = false,
@@ -83,6 +84,7 @@ fun CollapsedCommentCard(
                     distinguished =  comment.distinguished,
                     isOp = isOp,
                     autoLoadImages = autoLoadImages,
+                    preferNicknames = preferNicknames,
                     onToggleExpanded = {
                         onToggleExpanded?.invoke()
                     },
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommentCard.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommentCard.kt
index 57d08e0de..f84bf4922 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommentCard.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommentCard.kt
@@ -50,6 +50,7 @@ fun CommentCard(
     hideCommunity: Boolean = true,
     hideIndent: Boolean = false,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     showScores: Boolean = true,
     actionButtonsActive: Boolean = true,
     isOp: Boolean = false,
@@ -71,6 +72,7 @@ fun CommentCard(
     val themeRepository = remember { getThemeRepository() }
     var commentHeight by remember { mutableStateOf(0f) }
     val commentBarTheme by themeRepository.commentBarTheme.collectAsState()
+    val commentBarThickness by themeRepository.commentBarThickness.collectAsState()
     val barColor = themeRepository.getCommentBarColor(
         depth = comment.depth,
         commentBarTheme = commentBarTheme,
@@ -103,6 +105,7 @@ fun CommentCard(
                     modifier = Modifier.padding(top = Spacing.xxs),
                     iconSize = IconSize.s,
                     autoLoadImages = autoLoadImages,
+                    preferNicknames = preferNicknames,
                     creator = comment.creator.takeIf { !hideAuthor },
                     community = comment.community.takeIf { !hideCommunity },
                     indicatorExpanded = comment.expanded,
@@ -170,7 +173,7 @@ fun CommentCard(
                 Box(
                     modifier = Modifier
                         .padding(top = Spacing.xxs)
-                        .width(barWidth)
+                        .width(barWidth * commentBarThickness)
                         .height(commentHeight.toLocalDp())
                         .background(color = barColor)
                 )
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityAndCreatorInfo.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityAndCreatorInfo.kt
index f95ebe033..548f453c6 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityAndCreatorInfo.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityAndCreatorInfo.kt
@@ -51,6 +51,7 @@ fun CommunityAndCreatorInfo(
     iconSize: Dp = IconSize.l,
     indicatorExpanded: Boolean? = null,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     community: CommunityModel? = null,
     creator: UserModel? = null,
     distinguished: Boolean = false,
@@ -65,9 +66,9 @@ fun CommunityAndCreatorInfo(
     onDoubleClick: (() -> Unit)? = null,
     onLongClick: (() -> Unit)? = null,
 ) {
-    val communityName = community?.readableName.orEmpty()
+    val communityName = community?.readableName(preferNicknames).orEmpty()
     val communityIcon = community?.icon.orEmpty()
-    val creatorName = creator?.readableName.orEmpty()
+    val creatorName = creator?.readableName(preferNicknames).orEmpty()
     val creatorAvatar = creator?.avatar.orEmpty()
     val fullColor = MaterialTheme.colorScheme.onBackground
     val ancillaryColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.75f)
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityHeader.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityHeader.kt
index c83b2be0c..a98169585 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityHeader.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityHeader.kt
@@ -35,8 +35,8 @@ import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.getPrettyNumber
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommunityModel
+import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableHandle
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableName
-import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableSimpleName
 import com.github.diegoberaldin.raccoonforlemmy.resources.MR
 import dev.icerock.moko.resources.compose.stringResource
 
@@ -45,6 +45,7 @@ fun CommunityHeader(
     community: CommunityModel,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     onOpenImage: ((String) -> Unit)? = null,
 ) {
     Box(
@@ -104,7 +105,7 @@ fun CommunityHeader(
             } else {
                 PlaceholderImage(
                     size = IconSize.xxl,
-                    title = community.readableName,
+                    title = community.readableName(preferNicknames),
                 )
             }
 
@@ -113,13 +114,13 @@ fun CommunityHeader(
                 verticalArrangement = Arrangement.spacedBy(Spacing.s),
             ) {
                 Text(
-                    text = community.readableName,
+                    text = community.readableName(preferNicknames),
                     style = MaterialTheme.typography.titleLarge,
                     color = MaterialTheme.colorScheme.onBackground,
                 )
-                if (community.readableSimpleName != community.readableName) {
+                if (community.readableHandle != community.readableName(preferNicknames)) {
                     Text(
-                        text = community.readableSimpleName,
+                        text = community.readableHandle,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
                         style = MaterialTheme.typography.titleSmall,
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityItem.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityItem.kt
index d29d63aa1..8930073a4 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityItem.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/CommunityItem.kt
@@ -41,8 +41,8 @@ import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallb
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.toLocalDp
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.toLocalPixel
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommunityModel
+import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableHandle
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableName
-import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableSimpleName
 
 @Composable
 fun CommunityItem(
@@ -50,13 +50,14 @@ fun CommunityItem(
     modifier: Modifier = Modifier,
     small: Boolean = false,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     showSubscribers: Boolean = false,
     showFavorite: Boolean = false,
     options: List<Option> = emptyList(),
     onOptionSelected: ((OptionId) -> Unit)? = null,
 ) {
-    val title = community.readableName
-    val communityName = community.readableSimpleName
+    val title = community.readableName(true)
+    val communityName = community.readableHandle
     val communityIcon = community.icon.orEmpty()
     val iconSize = if (small) IconSize.m else IconSize.l
     val fullColor = MaterialTheme.colorScheme.onBackground
@@ -81,7 +82,7 @@ fun CommunityItem(
         } else {
             PlaceholderImage(
                 size = iconSize,
-                title = community.name,
+                title = community.readableName(preferNicknames),
             )
         }
 
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxCard.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxCard.kt
index 648d33b65..b366eda85 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxCard.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxCard.kt
@@ -40,6 +40,7 @@ fun InboxCard(
     mention: PersonMentionModel,
     type: InboxCardType,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     showScores: Boolean = true,
     voteFormat: VoteFormat = VoteFormat.Aggregated,
     postLayout: PostLayout = PostLayout.Card,
@@ -110,6 +111,7 @@ fun InboxCard(
                 creator = mention.creator,
                 community = mention.community,
                 autoLoadImages = autoLoadImages,
+                preferNicknames = preferNicknames,
                 date = mention.publishDate,
                 score = mention.score,
                 showScores = showScores,
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxReplySubtitle.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxReplySubtitle.kt
index f84fa4b91..f7e5518ab 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxReplySubtitle.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/InboxReplySubtitle.kt
@@ -54,6 +54,7 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableName
 fun InboxReplySubtitle(
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     creator: UserModel? = null,
     community: CommunityModel? = null,
     iconSize: Dp = IconSize.s,
@@ -85,9 +86,9 @@ fun InboxReplySubtitle(
     Column(
         modifier = modifier,
     ) {
-        val communityName = community?.readableName.orEmpty()
+        val communityName = community?.readableName(preferNicknames).orEmpty()
         val communityIcon = community?.icon.orEmpty()
-        val creatorName = creator?.readableName.orEmpty()
+        val creatorName = creator?.readableName(preferNicknames).orEmpty()
         val creatorAvatar = creator?.avatar.orEmpty()
         if (communityName.isNotEmpty() || creatorName.isNotEmpty()) {
             Row(
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/PostCard.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/PostCard.kt
index c73be4f31..a585f1e25 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/PostCard.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/PostCard.kt
@@ -56,6 +56,7 @@ fun PostCard(
     post: PostModel,
     isFromModerator: Boolean = false,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     showScores: Boolean = true,
     hideAuthor: Boolean = false,
     postLayout: PostLayout = PostLayout.Card,
@@ -111,6 +112,7 @@ fun PostCard(
                 limitBodyHeight = limitBodyHeight,
                 voteFormat = voteFormat,
                 autoLoadImages = autoLoadImages,
+                preferNicknames = preferNicknames,
                 showScores = showScores,
                 roundedCornerImage = postLayout == PostLayout.Card,
                 fullHeightImage = fullHeightImage,
@@ -138,6 +140,7 @@ fun PostCard(
                 blurNsfw = blurNsfw,
                 voteFormat = voteFormat,
                 autoLoadImages = autoLoadImages,
+                preferNicknames = preferNicknames,
                 showScores = showScores,
                 actionButtonsActive = actionButtonsActive,
                 options = options,
@@ -164,6 +167,7 @@ private fun CompactPost(
     post: PostModel,
     isFromModerator: Boolean = false,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     showScores: Boolean = true,
     hideAuthor: Boolean,
     blurNsfw: Boolean,
@@ -212,6 +216,7 @@ private fun CompactPost(
                 onOpenCreator?.invoke(user, "")
             },
             autoLoadImages = autoLoadImages,
+            preferNicknames = preferNicknames,
             onDoubleClick = onDoubleClick,
             onLongClick = rememberCallback {
                 optionsMenuOpen.value = true
@@ -298,6 +303,7 @@ private fun ExtendedPost(
     post: PostModel,
     isFromModerator: Boolean = false,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     showScores: Boolean = true,
     hideAuthor: Boolean = false,
     blurNsfw: Boolean = true,
@@ -356,6 +362,7 @@ private fun ExtendedPost(
                 onOpenCreator?.invoke(user, "")
             },
             autoLoadImages = autoLoadImages,
+            preferNicknames = preferNicknames,
             onDoubleClick = onDoubleClick,
             onLongClick = rememberCallback {
                 optionsMenuOpen.value = true
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserHeader.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserHeader.kt
index dfacb7c7a..161d1e544 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserHeader.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserHeader.kt
@@ -39,8 +39,8 @@ import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallb
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.datetime.prettifyDate
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.getPrettyNumber
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel
+import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableHandle
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableName
-import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableSimpleName
 import com.github.diegoberaldin.raccoonforlemmy.resources.MR
 import dev.icerock.moko.resources.compose.stringResource
 
@@ -49,6 +49,7 @@ fun UserHeader(
     user: UserModel,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     onOpenImage: ((String) -> Unit)? = null,
 ) {
     Box(
@@ -113,13 +114,13 @@ fun UserHeader(
                 verticalArrangement = Arrangement.spacedBy(Spacing.s),
             ) {
                 Text(
-                    text = user.readableName,
+                    text = user.readableName(preferNicknames),
                     style = MaterialTheme.typography.titleLarge,
                     color = MaterialTheme.colorScheme.onBackground,
                 )
-                if (user.readableSimpleName != user.readableName) {
+                if (user.readableHandle != user.readableName(preferNicknames)) {
                     Text(
-                        text = user.readableSimpleName,
+                        text = user.readableHandle,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
                         style = MaterialTheme.typography.titleSmall,
diff --git a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserItem.kt b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserItem.kt
index 6f5ab1517..35f48371d 100644
--- a/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserItem.kt
+++ b/core/commonui/lemmyui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/lemmyui/UserItem.kt
@@ -36,14 +36,15 @@ import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.toLocalDp
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel
+import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableHandle
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableName
-import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableSimpleName
 
 @Composable
 fun UserItem(
     user: UserModel,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     options: List<Option> = emptyList(),
     onOptionSelected: ((OptionId) -> Unit)? = null,
 ) {
@@ -73,13 +74,13 @@ fun UserItem(
         } else {
             PlaceholderImage(
                 size = iconSize,
-                title = user.readableName,
+                title = user.readableName(preferNicknames),
             )
         }
 
         CustomizedContent {
             Text(
-                text = user.readableSimpleName,
+                text = user.readableHandle,
                 style = MaterialTheme.typography.bodySmall,
                 color = fullColor,
             )
diff --git a/core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThicknessBottomSheet.kt b/core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThicknessBottomSheet.kt
new file mode 100644
index 000000000..6dd2f5e13
--- /dev/null
+++ b/core/commonui/modals/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/modals/CommentBarThicknessBottomSheet.kt
@@ -0,0 +1,101 @@
+package com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import cafe.adriel.voyager.core.screen.Screen
+import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing
+import com.github.diegoberaldin.raccoonforlemmy.core.commonui.components.BottomSheetHandle
+import com.github.diegoberaldin.raccoonforlemmy.core.navigation.di.getNavigationCoordinator
+import com.github.diegoberaldin.raccoonforlemmy.core.notifications.NotificationCenterEvent
+import com.github.diegoberaldin.raccoonforlemmy.core.notifications.di.getNotificationCenter
+import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
+import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback
+import com.github.diegoberaldin.raccoonforlemmy.resources.MR
+import dev.icerock.moko.resources.compose.stringResource
+
+class CommentBarThicknessBottomSheet(
+    private val values: List<Int> = listOf(
+        1,
+        2,
+        3,
+    ),
+) : Screen {
+
+    @Composable
+    override fun Content() {
+        val navigationCoordinator = remember { getNavigationCoordinator() }
+        val notificationCenter = remember { getNotificationCenter() }
+        Column(
+            modifier = Modifier
+                .windowInsetsPadding(WindowInsets.navigationBars)
+                .padding(
+                    top = Spacing.s,
+                    start = Spacing.s,
+                    end = Spacing.s,
+                    bottom = Spacing.m,
+                ),
+            verticalArrangement = Arrangement.spacedBy(Spacing.s),
+        ) {
+            Column(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                BottomSheetHandle()
+                Text(
+                    modifier = Modifier.padding(
+                        start = Spacing.s,
+                        top = Spacing.s,
+                        end = Spacing.s,
+                    ),
+                    text = stringResource(MR.strings.settings_comment_bar_thickness),
+                    style = MaterialTheme.typography.titleLarge,
+                    color = MaterialTheme.colorScheme.onBackground,
+                )
+            }
+
+            Column(
+                modifier = Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
+                verticalArrangement = Arrangement.spacedBy(Spacing.xxxs),
+            ) {
+                for (value in values) {
+                    Row(
+                        modifier = Modifier
+                            .padding(
+                                horizontal = Spacing.s,
+                                vertical = Spacing.s,
+                            )
+                            .fillMaxWidth()
+                            .onClick(
+                                onClick = rememberCallback {
+                                    notificationCenter.send(
+                                        NotificationCenterEvent.ChangeCommentBarThickness(value)
+                                    )
+                                    navigationCoordinator.hideBottomSheet()
+                                },
+                            ),
+                    ) {
+                        Text(
+                            text = value.toString(),
+                            style = MaterialTheme.typography.bodyLarge,
+                            color = MaterialTheme.colorScheme.onBackground,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/core/notifications/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/notifications/NotificationCenterEvent.kt b/core/notifications/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/notifications/NotificationCenterEvent.kt
index 38d1a140e..a155ca67e 100644
--- a/core/notifications/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/notifications/NotificationCenterEvent.kt
+++ b/core/notifications/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/notifications/NotificationCenterEvent.kt
@@ -57,6 +57,7 @@ sealed interface NotificationCenterEvent {
     data class UserBannedPost(val postId: Int, val user: UserModel) : NotificationCenterEvent
     data class UserBannedComment(val commentId: Int, val user: UserModel) : NotificationCenterEvent
     data class ChangeCommentBarTheme(val value: CommentBarTheme) : NotificationCenterEvent
+    data class ChangeCommentBarThickness(val value: Int) : NotificationCenterEvent
     data class BlockActionSelected(
         val userId: Int? = null,
         val communityId: Int? = null,
diff --git a/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/data/SettingsModel.kt b/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/data/SettingsModel.kt
index b30f0d978..91ec3ac25 100644
--- a/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/data/SettingsModel.kt
+++ b/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/data/SettingsModel.kt
@@ -50,4 +50,6 @@ data class SettingsModel(
     val actionsOnSwipeToEndInbox: List<ActionOnSwipe> = ActionOnSwipe.DEFAULT_SWIPE_TO_END_INBOX,
     val opaqueSystemBars: Boolean = false,
     val showScores: Boolean = true,
+    val preferUserNicknames: Boolean = true,
+    val commentBarThickness: Int = 0,
 )
diff --git a/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/repository/DefaultSettingsRepository.kt b/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/repository/DefaultSettingsRepository.kt
index 9e231cad0..9db2817b0 100644
--- a/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/repository/DefaultSettingsRepository.kt
+++ b/core/persistence/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/persistence/repository/DefaultSettingsRepository.kt
@@ -50,6 +50,8 @@ private object KeyStoreKeys {
     const val INFINITE_SCROLL_ENABLED = "infiniteScrollEnabled"
     const val OPAQUE_SYSTEM_BARS = "opaqueSystemBars"
     const val SHOW_SCORES = "showScores"
+    const val PREFER_USER_NICKNAMES = "preferUserNicknames"
+    const val COMMENT_BAR_THICKNESS = "commentBarThickness"
 }
 
 internal class DefaultSettingsRepository(
@@ -115,6 +117,8 @@ internal class DefaultSettingsRepository(
                     .joinToString(","),
                 opaqueSystemBars = if (settings.opaqueSystemBars) 1L else 0L,
                 showScores = if (settings.showScores) 1L else 0L,
+                preferUserNicknames = if (settings.preferUserNicknames) 1L else 0L,
+                commentBarThickness = settings.commentBarThickness.toLong()
             )
         }
 
@@ -161,6 +165,8 @@ internal class DefaultSettingsRepository(
                     infiniteScrollEnabled = keyStore[KeyStoreKeys.INFINITE_SCROLL_ENABLED, true],
                     opaqueSystemBars = keyStore[KeyStoreKeys.OPAQUE_SYSTEM_BARS, false],
                     showScores = keyStore[KeyStoreKeys.SHOW_SCORES, true],
+                    preferUserNicknames = keyStore[KeyStoreKeys.PREFER_USER_NICKNAMES, true],
+                    commentBarThickness = keyStore[KeyStoreKeys.COMMENT_BAR_THICKNESS, 0],
                 )
             } else {
                 val entity = db.settingsQueries.getBy(accountId).executeAsOneOrNull()
@@ -247,6 +253,8 @@ internal class DefaultSettingsRepository(
                 keyStore.save(KeyStoreKeys.INFINITE_SCROLL_ENABLED, settings.infiniteScrollEnabled)
                 keyStore.save(KeyStoreKeys.OPAQUE_SYSTEM_BARS, settings.opaqueSystemBars)
                 keyStore.save(KeyStoreKeys.SHOW_SCORES, settings.showScores)
+                keyStore.save(KeyStoreKeys.PREFER_USER_NICKNAMES, settings.preferUserNicknames)
+                keyStore.save(KeyStoreKeys.COMMENT_BAR_THICKNESS, settings.commentBarThickness)
             } else {
                 db.settingsQueries.update(
                     theme = settings.theme?.toLong(),
@@ -300,6 +308,8 @@ internal class DefaultSettingsRepository(
                         .joinToString(","),
                     opaqueSystemBars = if (settings.opaqueSystemBars) 1L else 0L,
                     showScores = if (settings.showScores) 1L else 0L,
+                    preferUserNicknames = if (settings.preferUserNicknames) 1L else 0L,
+                    commentBarThickness = settings.commentBarThickness.toLong(),
                 )
             }
         }
@@ -367,4 +377,6 @@ private fun GetBy.toModel() = SettingsModel(
         ?: ActionOnSwipe.DEFAULT_SWIPE_TO_END_INBOX,
     opaqueSystemBars = opaqueSystemBars == 1L,
     showScores = showScores == 1L,
+    preferUserNicknames = preferUserNicknames == 1L,
+    commentBarThickness = commentBarThickness.toInt(),
 )
diff --git a/core/persistence/src/commonMain/sqldelight/com/github/diegoberaldin/raccoonforlemmy/core/persistence/settings.sq b/core/persistence/src/commonMain/sqldelight/com/github/diegoberaldin/raccoonforlemmy/core/persistence/settings.sq
index b5a8db1e3..17cd57a14 100644
--- a/core/persistence/src/commonMain/sqldelight/com/github/diegoberaldin/raccoonforlemmy/core/persistence/settings.sq
+++ b/core/persistence/src/commonMain/sqldelight/com/github/diegoberaldin/raccoonforlemmy/core/persistence/settings.sq
@@ -45,6 +45,8 @@ CREATE TABLE SettingsEntity (
     actionsOnSwipeToEndInbox TEXT DEFAULT NULL,
     opaqueSystemBars INTEGER DEFAULT NULL,
     showScores INTEGER NOT NULL DEFAULT 1,
+    preferUserNicknames INTEGER NOT NULL DEFAULT 1,
+    commentBarThickness INTEGER NOT NULL DEFAULT 0,
     FOREIGN KEY (account_id) REFERENCES AccountEntity(id) ON DELETE CASCADE,
     UNIQUE(account_id)
 );
@@ -95,6 +97,8 @@ INSERT OR IGNORE INTO SettingsEntity (
     actionsOnSwipeToEndInbox,
     opaqueSystemBars,
     showScores,
+    preferUserNicknames,
+    commentBarThickness,
     account_id
 ) VALUES (
     ?,
@@ -141,6 +145,8 @@ INSERT OR IGNORE INTO SettingsEntity (
     ?,
     ?,
     ?,
+    ?,
+    ?,
     ?
 );
 
@@ -189,7 +195,9 @@ SET theme = ?,
     actionsOnSwipeToStartInbox = ?,
     actionsOnSwipeToEndInbox = ?,
     opaqueSystemBars = ?,
-    showScores = ?
+    showScores = ?,
+    preferUserNicknames = ?,
+    commentBarThickness = ?
 WHERE account_id = ?;
 
 getBy:
@@ -238,6 +246,8 @@ SELECT
     actionsOnSwipeToStartInbox,
     actionsOnSwipeToEndInbox,
     opaqueSystemBars,
-    showScores
+    showScores,
+    preferUserNicknames,
+    commentBarThickness
 FROM SettingsEntity
 WHERE account_id = ?;
\ No newline at end of file
diff --git a/core/persistence/src/commonMain/sqldelight/migrations/24.sqm b/core/persistence/src/commonMain/sqldelight/migrations/24.sqm
new file mode 100644
index 000000000..e15c3d0a3
--- /dev/null
+++ b/core/persistence/src/commonMain/sqldelight/migrations/24.sqm
@@ -0,0 +1,5 @@
+ALTER TABLE SettingsEntity
+ADD COLUMN  preferUserNicknames INTEGER NOT NULL DEFAULT 1;
+
+ALTER TABLE SettingsEntity
+ADD COLUMN commentBarThickness INTEGER NOT NULL DEFAULT 1;
diff --git a/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/CommunityModel.kt b/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/CommunityModel.kt
index 5f9e8eab5..b7d0e4d40 100644
--- a/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/CommunityModel.kt
+++ b/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/CommunityModel.kt
@@ -24,10 +24,15 @@ data class CommunityModel(
     @Transient val favorite: Boolean = false,
 )
 
-val CommunityModel.readableName: String
-    get() = title.takeIf { it.isNotEmpty() }?.replace("&amp;", "&") ?: readableSimpleName
+fun CommunityModel.readableName(preferNickname: Boolean): String {
+    return if (preferNickname) {
+        title.takeIf { it.isNotEmpty() }?.replace("&amp;", "&") ?: readableHandle
+    } else {
+        readableHandle
+    }
+}
 
-val CommunityModel.readableSimpleName: String
+val CommunityModel.readableHandle: String
     get() = buildString {
         append(name)
         if (host.isNotEmpty()) {
diff --git a/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/UserModel.kt b/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/UserModel.kt
index 51b1f2718..54b5ea2b7 100644
--- a/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/UserModel.kt
+++ b/domain/lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/UserModel.kt
@@ -19,10 +19,15 @@ data class UserModel(
 
 fun List<UserModel>.containsId(value: Int?): Boolean = any { it.id == value }
 
-val UserModel.readableName: String
-    get() = displayName.takeIf { it.isNotEmpty() } ?: readableSimpleName
+fun UserModel.readableName(preferNickname: Boolean): String {
+    return if (preferNickname) {
+        displayName.takeIf { it.isNotEmpty() } ?: readableHandle
+    } else {
+        readableHandle
+    }
+}
 
-val UserModel.readableSimpleName: String
+val UserModel.readableHandle: String
     get() = buildString {
         append(name)
         if (host.isNotEmpty()) {
diff --git a/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreMviModel.kt b/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreMviModel.kt
index f125509c8..b96ba2ab9 100644
--- a/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreMviModel.kt
+++ b/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreMviModel.kt
@@ -48,6 +48,7 @@ interface ExploreMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val availableSortTypes: List<SortType> = emptyList(),
         val actionsOnSwipeToStartPosts: List<ActionOnSwipe> = emptyList(),
diff --git a/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreScreen.kt b/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreScreen.kt
index ee5b90335..fa847450c 100644
--- a/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreScreen.kt
+++ b/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreScreen.kt
@@ -336,6 +336,7 @@ class ExploreScreen : Screen {
                                         ),
                                         community = result.model,
                                         autoLoadImages = uiState.autoLoadImages,
+                                        preferNicknames = uiState.preferNicknames,
                                     )
                                 }
 
@@ -445,6 +446,7 @@ class ExploreScreen : Screen {
                                                 fullHeightImage = uiState.fullHeightImages,
                                                 voteFormat = uiState.voteFormat,
                                                 autoLoadImages = uiState.autoLoadImages,
+                                                preferNicknames = uiState.preferNicknames,
                                                 showScores = uiState.showScores,
                                                 blurNsfw = uiState.blurNsfw,
                                                 actionButtonsActive = uiState.isLogged,
@@ -632,6 +634,7 @@ class ExploreScreen : Screen {
                                                 comment = result.model,
                                                 voteFormat = uiState.voteFormat,
                                                 autoLoadImages = uiState.autoLoadImages,
+                                                preferNicknames = uiState.preferNicknames,
                                                 showScores = uiState.showScores,
                                                 hideIndent = true,
                                                 actionButtonsActive = uiState.isLogged,
@@ -719,6 +722,7 @@ class ExploreScreen : Screen {
                                             },
                                         ),
                                         user = result.model,
+                                        preferNicknames = uiState.preferNicknames,
                                     )
                                 }
                             }
diff --git a/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreViewModel.kt b/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreViewModel.kt
index 290254211..7d3f7590c 100644
--- a/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreViewModel.kt
+++ b/feature/search/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/search/main/ExploreViewModel.kt
@@ -73,6 +73,7 @@ class ExploreViewModel(
                         blurNsfw = settings.blurNsfw,
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         swipeActionsEnabled = settings.enableSwipeActions,
                         doubleTapActionEnabled = settings.enableDoubleTapAction,
diff --git a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontMviModel.kt b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontMviModel.kt
index 78f0f18da..1faca6d75 100644
--- a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontMviModel.kt
+++ b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontMviModel.kt
@@ -27,6 +27,7 @@ interface SettingsColorAndFontMviModel :
         val replyColor: Color? = null,
         val saveColor: Color? = null,
         val commentBarTheme: CommentBarTheme = CommentBarTheme.Blue,
+        val commentBarThickness: Int = 1,
         val uiFontScale: FontScale = FontScale.Normal,
         val uiFontFamily: UiFontFamily = UiFontFamily.Poppins,
         val contentFontScale: FontScale = FontScale.Normal,
diff --git a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontScreen.kt b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontScreen.kt
index a27d58361..f0ed66b0b 100644
--- a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontScreen.kt
+++ b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontScreen.kt
@@ -41,6 +41,7 @@ import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing
 import com.github.diegoberaldin.raccoonforlemmy.core.architecture.bindToLifecycle
 import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.SettingsRow
 import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.SettingsSwitchRow
+import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.CommentBarThicknessBottomSheet
 import com.github.diegoberaldin.raccoonforlemmy.core.navigation.di.getNavigationCoordinator
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback
@@ -214,6 +215,16 @@ class SettingsColorAndFontScreen : Screen {
                         }
                     )
 
+                    // comment bar thickness
+                    SettingsRow(
+                        title = stringResource(MR.strings.settings_comment_bar_thickness),
+                        value = uiState.commentBarThickness.toString(),
+                        onTap = rememberCallback {
+                            val screen = CommentBarThicknessBottomSheet()
+                            navigationCoordinator.showBottomSheet(screen)
+                        }
+                    )
+
                     // font family
                     SettingsRow(
                         title = stringResource(MR.strings.settings_ui_font_family),
diff --git a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontViewModel.kt b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontViewModel.kt
index b6cf3724a..f31e6bda5 100644
--- a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontViewModel.kt
+++ b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/colors/SettingsColorAndFontViewModel.kt
@@ -72,6 +72,9 @@ class SettingsColorAndFontViewModel(
             themeRepository.commentBarTheme.onEach { value ->
                 mvi.updateState { it.copy(commentBarTheme = value) }
             }.launchIn(this)
+            themeRepository.commentBarThickness.onEach { value ->
+                mvi.updateState { it.copy(commentBarThickness = value) }
+            }.launchIn(this)
 
             identityRepository.isLogged.onEach { logged ->
                 mvi.updateState { it.copy(isLogged = logged ?: false) }
@@ -100,6 +103,10 @@ class SettingsColorAndFontViewModel(
                 .onEach { evt ->
                     changeCommentBarTheme(evt.value)
                 }.launchIn(this)
+            notificationCenter.subscribe(NotificationCenterEvent.ChangeCommentBarThickness::class)
+                .onEach { evt ->
+                    changeCommentBarThickness(evt.value)
+                }.launchIn(this)
             notificationCenter.subscribe(NotificationCenterEvent.ChangeActionColor::class)
                 .onEach { evt ->
                     when (evt.actionType) {
@@ -186,7 +193,7 @@ class SettingsColorAndFontViewModel(
     }
 
     private fun changeUpVoteColor(value: Color?) {
-        themeRepository.changeUpvoteColor(value)
+        themeRepository.changeUpVoteColor(value)
         mvi.scope?.launch(Dispatchers.IO) {
             val settings = settingsRepository.currentSettings.value.copy(
                 upVoteColor = value?.toArgb()
@@ -196,7 +203,7 @@ class SettingsColorAndFontViewModel(
     }
 
     private fun changeDownVoteColor(value: Color?) {
-        themeRepository.changeDownvoteColor(value)
+        themeRepository.changeDownVoteColor(value)
         mvi.scope?.launch(Dispatchers.IO) {
             val settings = settingsRepository.currentSettings.value.copy(
                 downVoteColor = value?.toArgb()
@@ -235,6 +242,16 @@ class SettingsColorAndFontViewModel(
         }
     }
 
+    private fun changeCommentBarThickness(value: Int) {
+        themeRepository.changeCommentBarThickness(value)
+        mvi.scope?.launch(Dispatchers.IO) {
+            val settings = settingsRepository.currentSettings.value.copy(
+                commentBarThickness = value
+            )
+            saveSettings(settings)
+        }
+    }
+
     private suspend fun saveSettings(settings: SettingsModel) {
         val accountId = accountRepository.getActive()?.id
         settingsRepository.updateSettings(settings, accountId)
diff --git a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsMviModel.kt b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsMviModel.kt
index cf98bd121..6c20db067 100644
--- a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsMviModel.kt
+++ b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsMviModel.kt
@@ -41,6 +41,7 @@ interface SettingsMviModel :
         data class ChangeEdgeToEdge(val value: Boolean) : Intent
         data class ChangePostBodyMaxLines(val value: Int) : Intent
         data class ChangeInfiniteScrollDisabled(val value: Boolean) : Intent
+        data class ChangePreferUserNicknames(val value: Boolean) : Intent
     }
 
     data class UiState(
@@ -74,6 +75,7 @@ interface SettingsMviModel :
         val postBodyMaxLines: Int? = null,
         val infiniteScrollDisabled: Boolean = false,
         val opaqueSystemBars: Boolean = false,
+        val preferUserNicknames: Boolean = true,
     )
 
     sealed interface Effect
diff --git a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt
index f59274190..0507ff352 100644
--- a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt
+++ b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsScreen.kt
@@ -276,6 +276,17 @@ class SettingsScreen : Screen {
                         },
                     )
 
+                    // prefer user nicknames
+                    SettingsSwitchRow(
+                        title = stringResource(MR.strings.settings_prefer_user_nicknames),
+                        value = uiState.preferUserNicknames,
+                        onValueChanged = rememberCallbackArgs(model) { value ->
+                            model.reduce(
+                                SettingsMviModel.Intent.ChangePreferUserNicknames(value)
+                            )
+                        },
+                    )
+
                     // body max lines in full layout
                     if (uiState.postLayout == PostLayout.Full) {
                         SettingsRow(
diff --git a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsViewModel.kt b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsViewModel.kt
index 05102cd10..f768852c9 100644
--- a/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsViewModel.kt
+++ b/feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsViewModel.kt
@@ -156,6 +156,7 @@ class SettingsViewModel(
                 postBodyMaxLines = settings.postBodyMaxLines,
                 infiniteScrollDisabled = !settings.infiniteScrollEnabled,
                 opaqueSystemBars = settings.opaqueSystemBars,
+                preferUserNicknames = settings.preferUserNicknames,
             )
         }
     }
@@ -203,6 +204,8 @@ class SettingsViewModel(
             is SettingsMviModel.Intent.ChangePostBodyMaxLines -> changePostBodyMaxLines(intent.value)
             is SettingsMviModel.Intent.ChangeInfiniteScrollDisabled ->
                 changeInfiniteScrollDisabled(intent.value)
+
+            is SettingsMviModel.Intent.ChangePreferUserNicknames -> changePreferUserNicknames(intent.value)
         }
     }
 
@@ -464,6 +467,16 @@ class SettingsViewModel(
         }
     }
 
+    private fun changePreferUserNicknames(value: Boolean) {
+        mvi.updateState { it.copy(preferUserNicknames = value) }
+        mvi.scope?.launch(Dispatchers.IO) {
+            val settings = settingsRepository.currentSettings.value.copy(
+                preferUserNicknames = value
+            )
+            saveSettings(settings)
+        }
+    }
+
     private fun changePostBodyMaxLines(value: Int?) {
         mvi.updateState { it.copy(postBodyMaxLines = value) }
         mvi.scope?.launch(Dispatchers.IO) {
diff --git a/resources/src/commonMain/resources/MR/base/strings.xml b/resources/src/commonMain/resources/MR/base/strings.xml
index 1dd0d57ad..01ab5a25c 100755
--- a/resources/src/commonMain/resources/MR/base/strings.xml
+++ b/resources/src/commonMain/resources/MR/base/strings.xml
@@ -361,4 +361,6 @@
     <string name="settings_user_manual">User manual</string>
     <string name="settings_show_scores">Show scores</string>
     <string name="settings_vote_format_hidden">Hidden</string>
+    <string name="settings_comment_bar_thickness">Comment bar thickness</string>
+    <string name="settings_prefer_user_nicknames">Prefer user nicknames</string>
 </resources>
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/App.kt b/shared/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/App.kt
index 0ee33031b..2a5286970 100644
--- a/shared/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/App.kt
+++ b/shared/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/App.kt
@@ -116,10 +116,11 @@ fun App(onLoadingFinished: () -> Unit = {}) {
             changeUiFontFamily(currentSettings.uiFontFamily.toUiFontFamily())
             changeContentFontFamily(currentSettings.contentFontFamily.toUiFontFamily())
             changeCommentBarTheme(currentSettings.commentBarTheme.toCommentBarTheme())
+            changeCommentBarThickness(currentSettings.commentBarThickness)
 
             with(themeRepository) {
-                changeUpvoteColor(currentSettings.upVoteColor?.let { Color(it) })
-                changeDownvoteColor(currentSettings.downVoteColor?.let { Color(it) })
+                changeUpVoteColor(currentSettings.upVoteColor?.let { Color(it) })
+                changeDownVoteColor(currentSettings.downVoteColor?.let { Color(it) })
                 changeReplyColor(currentSettings.replyColor?.let { Color(it) })
                 changeSaveColor(currentSettings.saveColor?.let { Color(it) })
             }
@@ -153,8 +154,8 @@ fun App(onLoadingFinished: () -> Unit = {}) {
             changeContentFontFamily(settings.contentFontFamily.toUiFontFamily())
 
             with(themeRepository) {
-                changeUpvoteColor(settings.upVoteColor?.let { Color(it) })
-                changeDownvoteColor(settings.downVoteColor?.let { Color(it) })
+                changeUpVoteColor(settings.upVoteColor?.let { Color(it) })
+                changeDownVoteColor(settings.downVoteColor?.let { Color(it) })
                 changeReplyColor(settings.replyColor?.let { Color(it) })
                 changeSaveColor(settings.saveColor?.let { Color(it) })
             }
diff --git a/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatMviModel.kt b/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatMviModel.kt
index 35c4f70ad..8dac7721b 100644
--- a/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatMviModel.kt
+++ b/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatMviModel.kt
@@ -44,6 +44,7 @@ interface InboxChatMviModel :
         val otherUserAvatar: String? = null,
         val messages: List<PrivateMessageModel> = emptyList(),
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val editedMessageId: Int? = null,
     )
 
diff --git a/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatViewModel.kt b/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatViewModel.kt
index c83c8517e..1011f5e30 100644
--- a/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatViewModel.kt
+++ b/unit/chat/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/chat/InboxChatViewModel.kt
@@ -40,7 +40,12 @@ class InboxChatViewModel(
                 val auth = identityRepository.authToken.value.orEmpty()
 
                 settingsRepository.currentSettings.onEach { settings ->
-                    mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                    mvi.updateState {
+                        it.copy(
+                            autoLoadImages = settings.autoLoadImages,
+                            preferNicknames = settings.preferUserNicknames,
+                        )
+                    }
                 }.launchIn(this)
                 notificationCenter.subscribe(NotificationCenterEvent.Logout::class).onEach {
                     handleLogout()
diff --git a/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailMviModel.kt b/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailMviModel.kt
index 945b96748..bf65e707b 100644
--- a/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailMviModel.kt
+++ b/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailMviModel.kt
@@ -59,6 +59,7 @@ interface CommunityDetailMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val zombieModeActive: Boolean = false,
         val moderators: List<UserModel> = emptyList(),
diff --git a/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailScreen.kt b/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailScreen.kt
index c946e3403..729b7bbe2 100644
--- a/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailScreen.kt
+++ b/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailScreen.kt
@@ -654,6 +654,7 @@ class CommunityDetailScreen(
                                         fullHeightImage = uiState.fullHeightImages,
                                         voteFormat = uiState.voteFormat,
                                         autoLoadImages = uiState.autoLoadImages,
+                                        preferNicknames = uiState.preferNicknames,
                                         showScores = uiState.showScores,
                                         actionButtonsActive = uiState.isLogged,
                                         blurNsfw = when {
diff --git a/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailViewModel.kt b/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailViewModel.kt
index c71ea7d13..081c75e7d 100644
--- a/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailViewModel.kt
+++ b/unit/communitydetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communitydetail/CommunityDetailViewModel.kt
@@ -90,6 +90,7 @@ class CommunityDetailViewModel(
                         fullHeightImages = settings.fullHeightImages,
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         actionsOnSwipeToStartPosts = settings.actionsOnSwipeToStartPosts,
                         actionsOnSwipeToEndPosts = settings.actionsOnSwipeToEndPosts,
                         showScores = settings.showScores,
diff --git a/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoMviModel.kt b/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoMviModel.kt
index af326498d..9d376ee58 100644
--- a/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoMviModel.kt
+++ b/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoMviModel.kt
@@ -16,6 +16,7 @@ interface CommunityInfoMviModel :
     data class UiState(
         val community: CommunityModel = CommunityModel(),
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val moderators: List<UserModel> = emptyList(),
     )
 
diff --git a/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoScreen.kt b/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoScreen.kt
index a940ebb7b..8260c8a28 100644
--- a/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoScreen.kt
+++ b/unit/communityinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/communityinfo/CommunityInfoScreen.kt
@@ -19,7 +19,6 @@ import androidx.compose.material.icons.filled.CalendarViewWeek
 import androidx.compose.material.icons.filled.Group
 import androidx.compose.material.icons.filled.Padding
 import androidx.compose.material.icons.filled.Reply
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -56,7 +55,7 @@ import org.koin.core.parameter.parametersOf
 class CommunityInfoScreen(
     private val communityId: Int,
 ) : Screen {
-    @OptIn(ExperimentalMaterial3Api::class)
+
     @Composable
     override fun Content() {
         val model = getScreenModel<CommunityInfoMviModel>(
@@ -89,7 +88,7 @@ class CommunityInfoScreen(
                     ) {
                         Spacer(modifier = Modifier.weight(1f))
                         Text(
-                            text = uiState.community.readableName,
+                            text = uiState.community.readableName(uiState.preferNicknames),
                             style = MaterialTheme.typography.bodyLarge,
                             color = MaterialTheme.colorScheme.onBackground,
                         )
diff --git a/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentMviModel.kt b/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentMviModel.kt
index 5fa0f1b3e..fcfa46fbe 100644
--- a/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentMviModel.kt
+++ b/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentMviModel.kt
@@ -49,6 +49,7 @@ interface CreateCommentMviModel :
         val loading: Boolean = false,
         val section: CreatePostSection = CreatePostSection.Edit,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val currentInstance: String = "",
         val currentUser: String = "",
diff --git a/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentScreen.kt b/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentScreen.kt
index b5871b6cd..35de480b7 100644
--- a/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentScreen.kt
+++ b/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentScreen.kt
@@ -348,6 +348,7 @@ class CreateCommentScreen(
                         CommentCard(
                             modifier = referenceModifier,
                             comment = originalComment,
+                            preferNicknames = uiState.preferNicknames,
                             hideIndent = true,
                             voteFormat = uiState.voteFormat,
                             autoLoadImages = uiState.autoLoadImages,
@@ -379,6 +380,7 @@ class CreateCommentScreen(
                             includeFullBody = true,
                             voteFormat = uiState.voteFormat,
                             autoLoadImages = uiState.autoLoadImages,
+                            preferNicknames = uiState.preferNicknames,
                             showScores = uiState.showScores,
                             options = buildList {
                                 add(
diff --git a/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentViewModel.kt b/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentViewModel.kt
index 612503228..c13112efa 100644
--- a/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentViewModel.kt
+++ b/unit/createcomment/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createcomment/CreateCommentViewModel.kt
@@ -72,6 +72,7 @@ class CreateCommentViewModel(
                     it.copy(
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         showScores = settings.showScores,
                     )
diff --git a/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostMviModel.kt b/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostMviModel.kt
index 3ee87225e..c10a7a047 100644
--- a/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostMviModel.kt
+++ b/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostMviModel.kt
@@ -75,6 +75,7 @@ interface CreatePostMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val currentInstance: String = "",
         val currentUser: String = "",
diff --git a/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostScreen.kt b/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostScreen.kt
index 163590a15..2b661aeed 100644
--- a/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostScreen.kt
+++ b/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostScreen.kt
@@ -533,6 +533,7 @@ class CreatePostScreen(
                             includeFullBody = true,
                             voteFormat = uiState.voteFormat,
                             autoLoadImages = uiState.autoLoadImages,
+                            preferNicknames = uiState.preferNicknames,
                             showScores = uiState.showScores,
                         )
                     }
diff --git a/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostViewModel.kt b/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostViewModel.kt
index 1396acb50..c89a7955f 100644
--- a/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostViewModel.kt
+++ b/unit/createpost/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/createpost/CreatePostViewModel.kt
@@ -51,6 +51,7 @@ class CreatePostViewModel(
                     it.copy(
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         showScores = settings.showScores,
                     )
@@ -78,10 +79,11 @@ class CreatePostViewModel(
         when (intent) {
             is CreatePostMviModel.Intent.SetCommunity -> {
                 val community = intent.value
+                val preferNicknames = uiState.value.preferNicknames
                 mvi.updateState {
                     it.copy(
                         communityId = community.id,
-                        communityInfo = community.readableName,
+                        communityInfo = community.readableName(preferNicknames),
                     )
                 }
             }
diff --git a/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerContent.kt b/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerContent.kt
index 394e1359f..fe0f3cf52 100644
--- a/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerContent.kt
+++ b/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerContent.kt
@@ -224,6 +224,7 @@ object ModalDrawerContent : Tab {
                                 small = true,
                                 showFavorite = true,
                                 autoLoadImages = uiState.autoLoadImages,
+                                preferNicknames = uiState.preferNicknames,
                             )
                         }
                     }
diff --git a/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerMviModel.kt b/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerMviModel.kt
index fd7438f3b..053f91446 100644
--- a/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerMviModel.kt
+++ b/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerMviModel.kt
@@ -6,7 +6,6 @@ import com.github.diegoberaldin.raccoonforlemmy.core.architecture.MviModel
 import com.github.diegoberaldin.raccoonforlemmy.core.persistence.data.MultiCommunityModel
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommunityModel
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel
-import dev.icerock.moko.resources.desc.StringDesc
 
 @Stable
 interface ModalDrawerMviModel :
@@ -19,6 +18,7 @@ interface ModalDrawerMviModel :
     data class UiState(
         val user: UserModel? = null,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val refreshing: Boolean = false,
         val instance: String? = null,
         val communities: List<CommunityModel> = emptyList(),
diff --git a/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerViewModel.kt b/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerViewModel.kt
index 01d8baffe..7c75b04a5 100644
--- a/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerViewModel.kt
+++ b/unit/drawer/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/drawer/ModalDrawerViewModel.kt
@@ -10,8 +10,6 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository.ApiCo
 import com.github.diegoberaldin.raccoonforlemmy.domain.identity.repository.IdentityRepository
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.CommunityRepository
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.repository.SiteRepository
-import com.github.diegoberaldin.raccoonforlemmy.resources.MR
-import dev.icerock.moko.resources.desc.desc
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -57,7 +55,12 @@ class ModalDrawerViewModel(
                 refresh()
             }.launchIn(this)
             settingsRepository.currentSettings.onEach { settings ->
-                mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                mvi.updateState {
+                    it.copy(
+                        autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
+                    )
+                }
             }.launchIn(this)
 
             observeChangesInFavoriteCommunities()
diff --git a/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoMviModel.kt b/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoMviModel.kt
index 7ffe867c4..1fd250672 100644
--- a/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoMviModel.kt
+++ b/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoMviModel.kt
@@ -23,6 +23,7 @@ interface InstanceInfoMviModel :
         val canFetchMore: Boolean = true,
         val refreshing: Boolean = false,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val loading: Boolean = false,
         val sortType: SortType = SortType.Active,
         val communities: List<CommunityModel> = emptyList(),
diff --git a/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoScreen.kt b/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoScreen.kt
index 6e3405f9c..f79834683 100644
--- a/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoScreen.kt
+++ b/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoScreen.kt
@@ -219,6 +219,7 @@ class InstanceInfoScreen(
                             ),
                             community = community,
                             autoLoadImages = uiState.autoLoadImages,
+                            preferNicknames = uiState.preferNicknames,
                             showSubscribers = true,
                         )
                     }
diff --git a/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoViewModel.kt b/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoViewModel.kt
index d5691ccaa..a1126435f 100644
--- a/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoViewModel.kt
+++ b/unit/instanceinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/instanceinfo/InstanceInfoViewModel.kt
@@ -37,7 +37,12 @@ class InstanceInfoViewModel(
         mvi.onStarted()
         mvi.scope?.launch {
             settingsRepository.currentSettings.onEach { settings ->
-                mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                mvi.updateState {
+                    it.copy(
+                        autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
+                    )
+                }
             }.launchIn(this)
             notificationCenter.subscribe(NotificationCenterEvent.ChangeSortType::class)
                 .onEach { evt ->
diff --git a/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsMviModel.kt b/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsMviModel.kt
index da8e70e98..c2bd169eb 100644
--- a/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsMviModel.kt
+++ b/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsMviModel.kt
@@ -15,6 +15,7 @@ interface ManageAccountsMviModel :
     data class UiState(
         val accounts: List<AccountModel> = emptyList(),
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
     )
 
     sealed interface Effect {
diff --git a/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsViewModel.kt b/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsViewModel.kt
index dcce634f0..912656631 100644
--- a/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsViewModel.kt
+++ b/unit/manageaccounts/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageaccounts/ManageAccountsViewModel.kt
@@ -33,7 +33,12 @@ class ManageAccountsViewModel(
         if (uiState.value.accounts.isEmpty()) {
             mvi.scope?.launch {
                 settingsRepository.currentSettings.onEach { settings ->
-                    mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                    mvi.updateState {
+                        it.copy(
+                            autoLoadImages = settings.autoLoadImages,
+                            preferNicknames = settings.preferUserNicknames,
+                        )
+                    }
                 }.launchIn(this)
 
                 val accounts = accountRepository.getAll()
diff --git a/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanMviModel.kt b/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanMviModel.kt
index 89c3f78ec..d6f61690f 100644
--- a/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanMviModel.kt
+++ b/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanMviModel.kt
@@ -31,6 +31,7 @@ interface ManageBanMviModel :
         val refreshing: Boolean = false,
         val initial: Boolean = true,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val bannedUsers: List<UserModel> = emptyList(),
         val bannedCommunities: List<CommunityModel> = emptyList(),
         val bannedInstances: List<InstanceModel> = emptyList(),
diff --git a/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanScreen.kt b/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanScreen.kt
index 460f81c02..a3bcb38b4 100644
--- a/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanScreen.kt
+++ b/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanScreen.kt
@@ -186,6 +186,7 @@ class ManageBanScreen : Screen {
                                         UserItem(
                                             user = user,
                                             autoLoadImages = uiState.autoLoadImages,
+                                            preferNicknames = uiState.preferNicknames,
                                             options = buildList {
                                                 this += Option(
                                                     OptionId.Unban,
@@ -234,6 +235,7 @@ class ManageBanScreen : Screen {
                                         CommunityItem(
                                             community = community,
                                             autoLoadImages = uiState.autoLoadImages,
+                                            preferNicknames = uiState.preferNicknames,
                                             options = buildList {
                                                 this += Option(
                                                     OptionId.Unban,
diff --git a/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanViewModel.kt b/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanViewModel.kt
index a2ab10b35..0751d65fa 100644
--- a/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanViewModel.kt
+++ b/unit/manageban/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/manageban/ManageBanViewModel.kt
@@ -28,7 +28,12 @@ class ManageBanViewModel(
         mvi.onStarted()
         mvi.scope?.launch {
             settingsRepository.currentSettings.onEach { settings ->
-                mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                mvi.updateState {
+                    it.copy(
+                        autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
+                    )
+                }
             }.launchIn(this)
 
             withContext(Dispatchers.IO) {
diff --git a/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsMviModel.kt b/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsMviModel.kt
index 3d8a3e312..2863727b4 100644
--- a/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsMviModel.kt
+++ b/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsMviModel.kt
@@ -24,6 +24,7 @@ interface ManageSubscriptionsMviModel :
         val multiCommunities: List<MultiCommunityModel> = emptyList(),
         val communities: List<CommunityModel> = emptyList(),
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
     )
 
     sealed interface Effect
diff --git a/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsViewModel.kt b/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsViewModel.kt
index 79adaf32f..bdb99bd98 100644
--- a/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsViewModel.kt
+++ b/unit/managesubscriptions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/managesubscriptions/ManageSubscriptionsViewModel.kt
@@ -37,7 +37,12 @@ class ManageSubscriptionsViewModel(
         mvi.onStarted()
         mvi.scope?.launch {
             settingsRepository.currentSettings.onEach { settings ->
-                mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                mvi.updateState {
+                    it.copy(
+                        autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
+                    )
+                }
             }.launchIn(this)
             notificationCenter.subscribe(NotificationCenterEvent.MultiCommunityCreated::class)
                 .onEach { evt ->
diff --git a/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsMviModel.kt b/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsMviModel.kt
index 337935ef7..dd3a540d1 100644
--- a/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsMviModel.kt
+++ b/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsMviModel.kt
@@ -32,6 +32,7 @@ interface InboxMentionsMviModel :
         val swipeActionsEnabled: Boolean = true,
         val postLayout: PostLayout = PostLayout.Card,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val actionsOnSwipeToStartInbox: List<ActionOnSwipe> = emptyList(),
diff --git a/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsScreen.kt b/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsScreen.kt
index 8b14e618b..76c7b05e8 100644
--- a/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsScreen.kt
+++ b/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsScreen.kt
@@ -227,6 +227,7 @@ class InboxMentionsScreen : Tab {
                                 postLayout = uiState.postLayout,
                                 type = InboxCardType.Mention,
                                 autoLoadImages = uiState.autoLoadImages,
+                                preferNicknames = uiState.preferNicknames,
                                 showScores = uiState.showScores,
                                 voteFormat = uiState.voteFormat,
                                 onOpenPost = rememberCallbackArgs { post ->
diff --git a/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsViewModel.kt b/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsViewModel.kt
index 190ac24c2..be39beb64 100644
--- a/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsViewModel.kt
+++ b/unit/mentions/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/mentions/InboxMentionsViewModel.kt
@@ -55,6 +55,7 @@ class InboxMentionsViewModel(
                     it.copy(
                         swipeActionsEnabled = settings.enableSwipeActions,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         voteFormat = settings.voteFormat,
                         actionsOnSwipeToStartInbox = settings.actionsOnSwipeToStartInbox,
                         actionsOnSwipeToEndInbox = settings.actionsOnSwipeToEndInbox,
diff --git a/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/ChatCard.kt b/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/ChatCard.kt
index 4aefd9fb4..f80d551c6 100644
--- a/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/ChatCard.kt
+++ b/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/ChatCard.kt
@@ -50,6 +50,7 @@ import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.readableName
 internal fun ChatCard(
     user: UserModel?,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     read: Boolean = true,
     lastMessage: String,
     lastMessageDate: String? = null,
@@ -61,7 +62,7 @@ internal fun ChatCard(
 ) {
     var optionsExpanded by remember { mutableStateOf(false) }
     var optionsOffset by remember { mutableStateOf(Offset.Zero) }
-    val creatorName = user?.readableName.orEmpty()
+    val creatorName = user?.readableName(preferNicknames).orEmpty()
     val creatorAvatar = user?.avatar.orEmpty()
     val iconSize = IconSize.xl
     val ancillaryColor = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.75f)
diff --git a/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesMviModel.kt b/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesMviModel.kt
index 241f549f9..93e3c6b6f 100644
--- a/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesMviModel.kt
+++ b/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesMviModel.kt
@@ -24,6 +24,7 @@ interface InboxMessagesMviModel :
         val currentUserId: Int = 0,
         val chats: List<PrivateMessageModel> = emptyList(),
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
     )
 
     sealed interface Effect {
diff --git a/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesViewModel.kt b/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesViewModel.kt
index c43e10268..0e3bfebcf 100644
--- a/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesViewModel.kt
+++ b/unit/messages/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/messages/InboxMessagesViewModel.kt
@@ -44,7 +44,12 @@ class InboxMessagesViewModel(
                 }
             }.launchIn(this)
             settingsRepository.currentSettings.onEach { settings ->
-                mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                mvi.updateState {
+                    it.copy(
+                        autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
+                    )
+                }
             }.launchIn(this)
             notificationCenter.subscribe(NotificationCenterEvent.Logout::class).onEach {
                 handleLogout()
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogMviModel.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogMviModel.kt
index edc1d1ea5..6012ea47a 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogMviModel.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogMviModel.kt
@@ -20,6 +20,7 @@ interface ModlogMviModel :
         val canFetchMore: Boolean = true,
         val postLayout: PostLayout = PostLayout.Card,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val items: List<ModlogItem> = emptyList(),
     )
 
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogViewModel.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogViewModel.kt
index 805667b0b..087f30da7 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogViewModel.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/ModlogViewModel.kt
@@ -34,6 +34,7 @@ class ModlogViewModel(
                 mvi.updateState {
                     it.copy(
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                     )
                 }
             }
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/InnerModlogItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/InnerModlogItem.kt
index 703d3db47..30324f3a4 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/InnerModlogItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/InnerModlogItem.kt
@@ -60,6 +60,7 @@ internal fun InnerModlogItem(
     modifier: Modifier = Modifier,
     reason: String? = null,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     date: String? = null,
     moderator: UserModel? = null,
     postLayout: PostLayout = PostLayout.Card,
@@ -91,6 +92,7 @@ internal fun InnerModlogItem(
             ModlogHeader(
                 creator = moderator,
                 autoLoadImages = autoLoadImages,
+                preferNicknames = preferNicknames,
                 onOpenCreator = onOpenUser,
             )
             CustomizedContent {
@@ -130,10 +132,11 @@ private fun ModlogHeader(
     modifier: Modifier = Modifier,
     creator: UserModel? = null,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     iconSize: Dp = IconSize.s,
     onOpenCreator: ((UserModel) -> Unit)? = null,
 ) {
-    val creatorName = creator?.readableName.orEmpty()
+    val creatorName = creator?.readableName(preferNicknames).orEmpty()
     val creatorAvatar = creator?.avatar.orEmpty()
     if (creatorName.isNotEmpty()) {
         Row(
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModAddItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModAddItem.kt
index 97463d232..c5373d38b 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModAddItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModAddItem.kt
@@ -21,12 +21,14 @@ internal fun ModAddItem(
     item: ModlogItem.ModAdd,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     postLayout: PostLayout = PostLayout.Card,
     onOpenUser: ((UserModel) -> Unit)? = null,
 ) {
     InnerModlogItem(
         modifier = modifier,
         autoLoadImages = autoLoadImages,
+        preferNicknames = preferNicknames,
         date = item.date,
         postLayout = postLayout,
         moderator = item.moderator,
@@ -40,7 +42,7 @@ internal fun ModAddItem(
             Text(
                 text = buildAnnotatedString {
                     withStyle(style = SpanStyle(fontWeight = FontWeight.SemiBold)) {
-                        val name = item.user?.readableName.orEmpty()
+                        val name = item.user?.readableName(preferNicknames).orEmpty()
                         append(name)
                     }
                     append(" ")
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModBanFromCommunityItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModBanFromCommunityItem.kt
index 038b68679..7cd8a2719 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModBanFromCommunityItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModBanFromCommunityItem.kt
@@ -21,6 +21,7 @@ internal fun ModBanFromCommunityItem(
     item: ModlogItem.ModBanFromCommunity,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     postLayout: PostLayout = PostLayout.Card,
     onOpenUser: ((UserModel) -> Unit)? = null,
 ) {
@@ -40,7 +41,7 @@ internal fun ModBanFromCommunityItem(
             Text(
                 text = buildAnnotatedString {
                     withStyle(style = SpanStyle(fontWeight = FontWeight.SemiBold)) {
-                        val name = item.user?.readableName.orEmpty()
+                        val name = item.user?.readableName(preferNicknames).orEmpty()
                         append(name)
                     }
                     append(" ")
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModFeaturePostItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModFeaturePostItem.kt
index 71342a2c7..dfa7b6b92 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModFeaturePostItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModFeaturePostItem.kt
@@ -20,12 +20,14 @@ internal fun ModFeaturePostItem(
     item: ModlogItem.ModFeaturePost,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     postLayout: PostLayout = PostLayout.Card,
     onOpenUser: ((UserModel) -> Unit)? = null,
 ) {
     InnerModlogItem(
         modifier = modifier,
         autoLoadImages = autoLoadImages,
+        preferNicknames = preferNicknames,
         date = item.date,
         postLayout = postLayout,
         moderator = item.moderator,
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModLockPostItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModLockPostItem.kt
index 6644aeab9..f20bebd54 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModLockPostItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModLockPostItem.kt
@@ -20,12 +20,14 @@ internal fun ModLockPostItem(
     item: ModlogItem.ModLockPost,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     postLayout: PostLayout = PostLayout.Card,
     onOpenUser: ((UserModel) -> Unit)? = null,
 ) {
     InnerModlogItem(
         modifier = modifier,
         autoLoadImages = autoLoadImages,
+        preferNicknames = preferNicknames,
         date = item.date,
         postLayout = postLayout,
         moderator = item.moderator,
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemoveCommentItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemoveCommentItem.kt
index 0264a84d5..2c97b1fda 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemoveCommentItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemoveCommentItem.kt
@@ -20,12 +20,14 @@ internal fun ModRemoveCommentItem(
     item: ModlogItem.ModRemoveComment,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     postLayout: PostLayout = PostLayout.Card,
     onOpenUser: ((UserModel) -> Unit)? = null,
 ) {
     InnerModlogItem(
         modifier = modifier,
         autoLoadImages = autoLoadImages,
+        preferNicknames = preferNicknames,
         date = item.date,
         postLayout = postLayout,
         moderator = item.moderator,
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemovePostItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemovePostItem.kt
index a2c034096..354db7cdf 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemovePostItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModRemovePostItem.kt
@@ -20,12 +20,14 @@ internal fun ModRemovePostItem(
     item: ModlogItem.ModRemovePost,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     postLayout: PostLayout = PostLayout.Card,
     onOpenUser: ((UserModel) -> Unit)? = null,
 ) {
     InnerModlogItem(
         modifier = modifier,
         autoLoadImages = autoLoadImages,
+        preferNicknames = preferNicknames,
         date = item.date,
         postLayout = postLayout,
         moderator = item.moderator,
diff --git a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModTransferCommunityItem.kt b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModTransferCommunityItem.kt
index 79730b5e2..7071c616a 100644
--- a/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModTransferCommunityItem.kt
+++ b/unit/modlog/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/modlog/components/ModTransferCommunityItem.kt
@@ -21,6 +21,7 @@ internal fun ModTransferCommunityItem(
     item: ModlogItem.ModTransferCommunity,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     postLayout: PostLayout = PostLayout.Card,
     onOpenUser: ((UserModel) -> Unit)? = null,
 ) {
@@ -42,7 +43,7 @@ internal fun ModTransferCommunityItem(
                     append(stringResource(MR.strings.modlog_item_community_transfer))
                     append(" ")
                     withStyle(style = SpanStyle(fontWeight = FontWeight.SemiBold)) {
-                        val name = item.user?.readableName.orEmpty()
+                        val name = item.user?.readableName(preferNicknames).orEmpty()
                         append(name)
                     }
                 },
diff --git a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityMviModel.kt b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityMviModel.kt
index 08e8c9aa6..c321a3ef9 100644
--- a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityMviModel.kt
+++ b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityMviModel.kt
@@ -42,6 +42,7 @@ interface MultiCommunityMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val availableSortTypes: List<SortType> = emptyList(),
         val actionsOnSwipeToStartPosts: List<ActionOnSwipe> = emptyList(),
diff --git a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityScreen.kt b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityScreen.kt
index e21392a47..8a175d837 100644
--- a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityScreen.kt
+++ b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityScreen.kt
@@ -383,7 +383,8 @@ class MultiCommunityScreen(
                                     fullHeightImage = uiState.fullHeightImages,
                                     voteFormat = uiState.voteFormat,
                                     autoLoadImages = uiState.autoLoadImages,
-                                    showScores = uiState.autoLoadImages,
+                                    preferNicknames = uiState.preferNicknames,
+                                    showScores = uiState.showScores,
                                     blurNsfw = uiState.blurNsfw,
                                     onClick = rememberCallback {
                                         model.reduce(MultiCommunityMviModel.Intent.MarkAsRead(post.id))
diff --git a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityViewModel.kt b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityViewModel.kt
index f35e912f9..c95425f59 100644
--- a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityViewModel.kt
+++ b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/detail/MultiCommunityViewModel.kt
@@ -66,6 +66,7 @@ class MultiCommunityViewModel(
                         swipeActionsEnabled = settings.enableSwipeActions,
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         actionsOnSwipeToStartPosts = settings.actionsOnSwipeToStartPosts,
                         actionsOnSwipeToEndPosts = settings.actionsOnSwipeToEndPosts,
diff --git a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorMviModel.kt b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorMviModel.kt
index 3084ee7d2..6cc10d8e1 100644
--- a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorMviModel.kt
+++ b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorMviModel.kt
@@ -19,6 +19,7 @@ interface MultiCommunityEditorMviModel :
     data class UiState(
         val name: String = "",
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val nameError: StringDesc? = null,
         val icon: String? = null,
         val availableIcons: List<String> = emptyList(),
diff --git a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorScreen.kt b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorScreen.kt
index 8b62b3651..474550bf5 100644
--- a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorScreen.kt
+++ b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorScreen.kt
@@ -327,6 +327,7 @@ class MultiCommunityEditorScreen(
                                 modifier = Modifier.fillMaxWidth()
                                     .background(MaterialTheme.colorScheme.background),
                                 community = community,
+                                preferNicknames = uiState.preferNicknames,
                             )
                             Checkbox(
                                 checked = selected,
diff --git a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorViewModel.kt b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorViewModel.kt
index 029a0c69d..34346b957 100644
--- a/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorViewModel.kt
+++ b/unit/multicommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/multicommunity/editor/MultiCommunityEditorViewModel.kt
@@ -40,7 +40,12 @@ class MultiCommunityEditorViewModel(
         mvi.onStarted()
         mvi.scope?.launch {
             settingsRepository.currentSettings.onEach { settings ->
-                mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                mvi.updateState {
+                    it.copy(
+                        autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
+                    )
+                }
             }.launchIn(this)
         }
         if (communities.isEmpty()) {
diff --git a/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedMviModel.kt b/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedMviModel.kt
index d2c214157..1b7c12e95 100644
--- a/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedMviModel.kt
+++ b/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedMviModel.kt
@@ -43,6 +43,7 @@ interface ProfileLoggedMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
     )
 
diff --git a/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedScreen.kt b/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedScreen.kt
index de23b754a..355bf2b39 100644
--- a/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedScreen.kt
+++ b/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedScreen.kt
@@ -185,6 +185,7 @@ object ProfileLoggedScreen : Tab {
                                     fullHeightImage = uiState.fullHeightImages,
                                     voteFormat = uiState.voteFormat,
                                     autoLoadImages = uiState.autoLoadImages,
+                                    preferNicknames = uiState.preferNicknames,
                                     showScores = uiState.showScores,
                                     hideAuthor = true,
                                     blurNsfw = false,
diff --git a/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedViewModel.kt b/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedViewModel.kt
index d503fedee..c7f09c559 100644
--- a/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedViewModel.kt
+++ b/unit/myaccount/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/myaccount/ProfileLoggedViewModel.kt
@@ -77,6 +77,7 @@ class ProfileLoggedViewModel(
                     it.copy(
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         showScores = settings.showScores,
                     )
diff --git a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailMviModel.kt b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailMviModel.kt
index d8b05ef41..63b659526 100644
--- a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailMviModel.kt
+++ b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailMviModel.kt
@@ -57,6 +57,7 @@ interface PostDetailMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val moderators: List<UserModel> = emptyList(),
         val availableSortTypes: List<SortType> = emptyList(),
diff --git a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt
index 08721358d..02d0ebb49 100644
--- a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt
+++ b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailScreen.kt
@@ -318,6 +318,7 @@ class PostDetailScreen(
                                 includeFullBody = true,
                                 voteFormat = uiState.voteFormat,
                                 autoLoadImages = uiState.autoLoadImages,
+                                preferNicknames = uiState.preferNicknames,
                                 showScores = uiState.showScores,
                                 actionButtonsActive = uiState.isLogged,
                                 blurNsfw = false,
@@ -538,7 +539,7 @@ class PostDetailScreen(
                                         if (community != null) {
                                             val string = buildAnnotatedString {
                                                 withStyle(SpanStyle(textDecoration = TextDecoration.Underline)) {
-                                                    append(community.readableName)
+                                                    append(community.readableName(uiState.preferNicknames))
                                                 }
                                                 if (index < uiState.post.crossPosts.lastIndex) {
                                                     append(", ")
@@ -706,6 +707,7 @@ class PostDetailScreen(
                                                     isOp = comment.creator?.id == uiState.post.creator?.id,
                                                     voteFormat = uiState.voteFormat,
                                                     autoLoadImages = uiState.autoLoadImages,
+                                                    preferNicknames = uiState.preferNicknames,
                                                     showScores = uiState.showScores,
                                                     actionButtonsActive = uiState.isLogged,
                                                     onToggleExpanded = rememberCallback(model) {
diff --git a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailViewModel.kt b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailViewModel.kt
index 53163320d..ae7e620dd 100644
--- a/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailViewModel.kt
+++ b/unit/postdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postdetail/PostDetailViewModel.kt
@@ -106,6 +106,7 @@ class PostDetailViewModel(
                         doubleTapActionEnabled = settings.enableDoubleTapAction,
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         actionsOnSwipeToStartComments = settings.actionsOnSwipeToStartComments,
                         actionsOnSwipeToEndComments = settings.actionsOnSwipeToEndComments,
diff --git a/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListMviModel.kt b/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListMviModel.kt
index 83f451aaa..32c723bfd 100644
--- a/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListMviModel.kt
+++ b/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListMviModel.kt
@@ -51,6 +51,7 @@ interface PostListMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val zombieModeActive: Boolean = false,
         val availableSortTypes: List<SortType> = emptyList(),
diff --git a/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListScreen.kt b/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListScreen.kt
index a2576e729..2bcee2d24 100644
--- a/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListScreen.kt
+++ b/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListScreen.kt
@@ -425,6 +425,7 @@ class PostListScreen : Screen {
                                         fullHeightImage = uiState.fullHeightImages,
                                         voteFormat = uiState.voteFormat,
                                         autoLoadImages = uiState.autoLoadImages,
+                                        preferNicknames = uiState.preferNicknames,
                                         showScores = uiState.showScores,
                                         actionButtonsActive = uiState.isLogged,
                                         blurNsfw = uiState.blurNsfw,
@@ -595,9 +596,9 @@ class PostListScreen : Screen {
 
                                                 OptionId.Block -> {
                                                     val screen = BlockBottomSheet(
-                                                        userName = post.creator?.readableName,
+                                                        userName = post.creator?.readableName(uiState.preferNicknames),
                                                         userId = post.creator?.id,
-                                                        communityName = post.community?.readableName,
+                                                        communityName = post.community?.readableName(uiState.preferNicknames),
                                                         communityId = post.community?.id,
                                                         instanceName = post.community?.host,
                                                         instanceId = post.community?.instanceId,
diff --git a/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListViewModel.kt b/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListViewModel.kt
index f604886d0..09788a0f3 100644
--- a/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListViewModel.kt
+++ b/unit/postlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/postlist/PostListViewModel.kt
@@ -84,6 +84,7 @@ class PostListViewModel(
                         doubleTapActionEnabled = settings.enableDoubleTapAction,
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         actionsOnSwipeToStartPosts = settings.actionsOnSwipeToStartPosts,
                         actionsOnSwipeToEndPosts = settings.actionsOnSwipeToEndPosts,
diff --git a/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesMviModel.kt b/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesMviModel.kt
index 9bb9cd27b..b65eda4eb 100644
--- a/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesMviModel.kt
+++ b/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesMviModel.kt
@@ -32,6 +32,7 @@ interface InboxRepliesMviModel :
         val postLayout: PostLayout = PostLayout.Card,
         val swipeActionsEnabled: Boolean = true,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val actionsOnSwipeToStartInbox: List<ActionOnSwipe> = emptyList(),
diff --git a/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesScreen.kt b/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesScreen.kt
index ffd958f0f..6e59b8be3 100644
--- a/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesScreen.kt
+++ b/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesScreen.kt
@@ -223,6 +223,7 @@ class InboxRepliesScreen : Tab {
                                 postLayout = uiState.postLayout,
                                 type = InboxCardType.Reply,
                                 autoLoadImages = uiState.autoLoadImages,
+                                preferNicknames = uiState.preferNicknames,
                                 showScores = uiState.showScores,
                                 voteFormat = uiState.voteFormat,
                                 onOpenPost = rememberCallbackArgs { post ->
diff --git a/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesViewModel.kt b/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesViewModel.kt
index b3eddf03f..56cdb39ce 100644
--- a/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesViewModel.kt
+++ b/unit/replies/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/replies/InboxRepliesViewModel.kt
@@ -58,6 +58,7 @@ class InboxRepliesViewModel(
                     it.copy(
                         swipeActionsEnabled = settings.enableSwipeActions,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         voteFormat = settings.voteFormat,
                         actionsOnSwipeToStartInbox = settings.actionsOnSwipeToStartInbox,
                         actionsOnSwipeToEndInbox = settings.actionsOnSwipeToEndInbox,
diff --git a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListMviModel.kt b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListMviModel.kt
index b83f8351e..777fa60ce 100644
--- a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListMviModel.kt
+++ b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListMviModel.kt
@@ -34,6 +34,7 @@ interface ReportListMviModel :
         val asyncInProgress: Boolean = false,
         val swipeActionsEnabled: Boolean = true,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val postLayout: PostLayout = PostLayout.Card,
         val canFetchMore: Boolean = true,
         val postReports: List<PostReportModel> = emptyList(),
diff --git a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListScreen.kt b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListScreen.kt
index e2bb4a3b0..ba6169e9e 100644
--- a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListScreen.kt
+++ b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListScreen.kt
@@ -263,6 +263,7 @@ class ReportListScreen(
                                             report = report,
                                             postLayout = uiState.postLayout,
                                             autoLoadImages = uiState.autoLoadImages,
+                                            preferNicknames = uiState.preferNicknames,
                                             onOpen = rememberCallback {
                                                 detailOpener.openPostDetail(
                                                     post = PostModel(id = report.postId),
@@ -367,6 +368,7 @@ class ReportListScreen(
                                             report = report,
                                             postLayout = uiState.postLayout,
                                             autoLoadImages = uiState.autoLoadImages,
+                                            preferNicknames  = uiState.preferNicknames,
                                             onOpen = rememberCallback {
                                                 detailOpener.openPostDetail(
                                                     post = PostModel(id = report.postId),
diff --git a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListViewModel.kt b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListViewModel.kt
index e5c8c2be8..d3c0b8a2e 100644
--- a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListViewModel.kt
+++ b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/ReportListViewModel.kt
@@ -45,6 +45,7 @@ class ReportListViewModel(
                 mvi.updateState {
                     it.copy(
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         swipeActionsEnabled = settings.enableSwipeActions,
                     )
                 }
diff --git a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/CommentReportCard.kt b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/CommentReportCard.kt
index 467f2f716..6bf5f8477 100644
--- a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/CommentReportCard.kt
+++ b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/CommentReportCard.kt
@@ -18,6 +18,7 @@ internal fun CommentReportCard(
     modifier: Modifier = Modifier,
     options: List<Option> = emptyList(),
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     onOpen: (() -> Unit)? = null,
     onOpenImage: ((String) -> Unit)? = null,
     onOptionSelected: ((OptionId) -> Unit)? = null,
@@ -29,6 +30,7 @@ internal fun CommentReportCard(
         creator = report.creator,
         date = report.publishDate,
         autoLoadImages = autoLoadImages,
+        preferNicknames = preferNicknames,
         options = options,
         onOptionSelected = onOptionSelected,
         onOpen = onOpen,
diff --git a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/InnerReportCard.kt b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/InnerReportCard.kt
index 2eaf5a54c..c479619fa 100644
--- a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/InnerReportCard.kt
+++ b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/InnerReportCard.kt
@@ -61,6 +61,7 @@ internal fun InnerReportCard(
     modifier: Modifier = Modifier,
     reason: String,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     date: String? = null,
     creator: UserModel? = null,
     postLayout: PostLayout = PostLayout.Card,
@@ -94,6 +95,7 @@ internal fun InnerReportCard(
                 creator = creator,
                 autoLoadImages = autoLoadImages,
                 onOpenCreator = onOpenCreator,
+                preferNicknames = preferNicknames,
             )
             CustomizedContent {
                 PostCardBody(
@@ -132,10 +134,11 @@ private fun ReportHeader(
     modifier: Modifier = Modifier,
     creator: UserModel? = null,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     iconSize: Dp = IconSize.s,
     onOpenCreator: ((UserModel) -> Unit)? = null,
 ) {
-    val creatorName = creator?.readableName.orEmpty()
+    val creatorName = creator?.readableName(preferNicknames).orEmpty()
     val creatorAvatar = creator?.avatar.orEmpty()
     if (creatorName.isNotEmpty()) {
         Row(
diff --git a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/PostReportCard.kt b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/PostReportCard.kt
index 278eba6e5..7c875cd3d 100644
--- a/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/PostReportCard.kt
+++ b/unit/reportlist/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/reportlist/components/PostReportCard.kt
@@ -34,6 +34,7 @@ internal fun PostReportCard(
     postLayout: PostLayout = PostLayout.Card,
     modifier: Modifier = Modifier,
     autoLoadImages: Boolean = true,
+    preferNicknames: Boolean = true,
     onOpen: (() -> Unit)? = null,
     options: List<Option> = emptyList(),
     onOptionSelected: ((OptionId) -> Unit)? = null,
@@ -48,6 +49,7 @@ internal fun PostReportCard(
         creator = report.creator,
         date = report.publishDate,
         autoLoadImages = autoLoadImages,
+        preferNicknames = preferNicknames,
         options = options,
         onOptionSelected = onOptionSelected,
         onOpen = onOpen,
diff --git a/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsMviModel.kt b/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsMviModel.kt
index 5d10827fe..abdc56822 100644
--- a/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsMviModel.kt
+++ b/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsMviModel.kt
@@ -44,6 +44,7 @@ interface SavedItemsMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val availableSortTypes: List<SortType> = emptyList(),
     )
diff --git a/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsScreen.kt b/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsScreen.kt
index c7ffb2826..6930d2628 100644
--- a/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsScreen.kt
+++ b/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsScreen.kt
@@ -217,6 +217,7 @@ class SavedItemsScreen : Screen {
                                     fullHeightImage = uiState.fullHeightImages,
                                     voteFormat = uiState.voteFormat,
                                     autoLoadImages = uiState.autoLoadImages,
+                                    preferNicknames = uiState.preferNicknames,
                                     showScores = uiState.showScores,
                                     blurNsfw = uiState.blurNsfw,
                                     onClick = rememberCallback {
@@ -345,6 +346,7 @@ class SavedItemsScreen : Screen {
                                     comment = comment,
                                     voteFormat = uiState.voteFormat,
                                     autoLoadImages = uiState.autoLoadImages,
+                                    preferNicknames = uiState.preferNicknames,
                                     showScores = uiState.showScores,
                                     hideIndent = true,
                                     onClick = {
diff --git a/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsViewModel.kt b/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsViewModel.kt
index efd044ac6..5bb48bf24 100644
--- a/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsViewModel.kt
+++ b/unit/saveditems/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/saveditems/SavedItemsViewModel.kt
@@ -55,6 +55,7 @@ class SavedItemsViewModel(
                     it.copy(
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         showScores = settings.showScores,
                     )
diff --git a/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityDialog.kt b/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityDialog.kt
index 062eebbe5..7ea44bb94 100644
--- a/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityDialog.kt
+++ b/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityDialog.kt
@@ -135,6 +135,7 @@ class SelectCommunityDialog : Screen {
                                         },
                                     ),
                                 autoLoadImages = uiState.autoLoadImages,
+                                preferNicknames = uiState.preferNicknames,
                                 community = community,
                             )
                         }
diff --git a/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityMviModel.kt b/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityMviModel.kt
index 5f4e808f6..269d63e60 100644
--- a/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityMviModel.kt
+++ b/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityMviModel.kt
@@ -16,6 +16,7 @@ interface SelectCommunityMviModel :
         val communities: List<CommunityModel> = emptyList(),
         val searchText: String = "",
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
     )
 
     sealed interface Effect
diff --git a/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityViewModel.kt b/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityViewModel.kt
index d7ef670b3..0c42e549b 100644
--- a/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityViewModel.kt
+++ b/unit/selectcommunity/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/selectcommunity/SelectCommunityViewModel.kt
@@ -29,7 +29,12 @@ class SelectCommunityViewModel(
         mvi.onStarted()
         mvi.scope?.launch {
             settingsRepository.currentSettings.onEach { settings ->
-                mvi.updateState { it.copy(autoLoadImages = settings.autoLoadImages) }
+                mvi.updateState {
+                    it.copy(
+                        autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
+                    )
+                }
             }.launchIn(this)
         }
         if (communities.isEmpty()) {
diff --git a/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailMviModel.kt b/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailMviModel.kt
index 1223be75f..0f29af714 100644
--- a/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailMviModel.kt
+++ b/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailMviModel.kt
@@ -55,6 +55,7 @@ interface UserDetailMviModel :
         val fullHeightImages: Boolean = true,
         val voteFormat: VoteFormat = VoteFormat.Aggregated,
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val showScores: Boolean = true,
         val availableSortTypes: List<SortType> = emptyList(),
         val actionsOnSwipeToStartPosts: List<ActionOnSwipe> = emptyList(),
diff --git a/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailScreen.kt b/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailScreen.kt
index f22869550..f1f2eed66 100644
--- a/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailScreen.kt
+++ b/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailScreen.kt
@@ -194,7 +194,7 @@ class UserDetailScreen(
                 WindowInsets.navigationBars
             },
             topBar = {
-                val userName = uiState.user.readableName
+                val userName = uiState.user.readableName(uiState.preferNicknames)
                 val maxTopInset = Dimensions.topBarHeight.value.toInt()
                 var topInset by remember { mutableStateOf(maxTopInset) }
                 snapshotFlow { topAppBarState.collapsedFraction }.onEach {
@@ -558,6 +558,7 @@ class UserDetailScreen(
                                         blurNsfw = uiState.blurNsfw,
                                         voteFormat = uiState.voteFormat,
                                         autoLoadImages = uiState.autoLoadImages,
+                                        preferNicknames = uiState.preferNicknames,
                                         showScores = uiState.showScores,
                                         actionButtonsActive = uiState.isLogged,
                                         onClick = rememberCallback {
@@ -849,6 +850,7 @@ class UserDetailScreen(
                                         comment = comment,
                                         voteFormat = uiState.voteFormat,
                                         autoLoadImages = uiState.autoLoadImages,
+                                        preferNicknames = uiState.preferNicknames,
                                         showScores = uiState.showScores,
                                         hideCommunity = false,
                                         hideAuthor = true,
diff --git a/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailViewModel.kt b/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailViewModel.kt
index 5f033350c..94b608a83 100644
--- a/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailViewModel.kt
+++ b/unit/userdetail/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userdetail/UserDetailViewModel.kt
@@ -95,6 +95,7 @@ class UserDetailViewModel(
                         doubleTapActionEnabled = settings.enableDoubleTapAction,
                         voteFormat = settings.voteFormat,
                         autoLoadImages = settings.autoLoadImages,
+                        preferNicknames = settings.preferUserNicknames,
                         fullHeightImages = settings.fullHeightImages,
                         actionsOnSwipeToStartPosts = settings.actionsOnSwipeToStartPosts,
                         actionsOnSwipeToEndPosts = settings.actionsOnSwipeToEndPosts,
diff --git a/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoMviModel.kt b/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoMviModel.kt
index ee98366c8..7fa44ea73 100644
--- a/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoMviModel.kt
+++ b/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoMviModel.kt
@@ -16,6 +16,7 @@ interface UserInfoMviModel :
     data class UiState(
         val user: UserModel = UserModel(),
         val autoLoadImages: Boolean = true,
+        val preferNicknames: Boolean = true,
         val moderatedCommunities: List<CommunityModel> = emptyList(),
     )
 
diff --git a/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoScreen.kt b/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoScreen.kt
index a6e068563..14930bbbc 100644
--- a/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoScreen.kt
+++ b/unit/userinfo/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/unit/userinfo/UserInfoScreen.kt
@@ -17,7 +17,6 @@ import androidx.compose.material.icons.filled.Cake
 import androidx.compose.material.icons.filled.Padding
 import androidx.compose.material.icons.filled.Reply
 import androidx.compose.material.icons.filled.Shield
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -58,7 +57,7 @@ import org.koin.core.parameter.parametersOf
 class UserInfoScreen(
     private val userId: Int,
 ) : Screen {
-    @OptIn(ExperimentalMaterial3Api::class)
+
     @Composable
     override fun Content() {
         val model = getScreenModel<UserInfoMviModel> { parametersOf(userId) }
@@ -91,7 +90,7 @@ class UserInfoScreen(
                     ) {
                         Spacer(modifier = Modifier.weight(1f))
                         Text(
-                            text = uiState.user.readableName,
+                            text = uiState.user.readableName(uiState.preferNicknames),
                             style = MaterialTheme.typography.bodyLarge,
                             color = MaterialTheme.colorScheme.onBackground,
                         )