diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/AppModules.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/AppModules.kt
index c05fa392c..ab83011f0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/AppModules.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/AppModules.kt
@@ -226,7 +226,7 @@ class AppModules(
     val relayStats = RelayStats(client)
 
     // Logs debug messages when needed
-    val detailedLogger = if (isDebug) RelayLogger(client, false, false) else null
+    val detailedLogger = if (isDebug) RelayLogger(client, debugSending = false, debugReceiving = false) else null
     val relayReqStats = if (isDebug) RelayReqStats(client) else null
     val logger = if (isDebug) RelaySpeedLogger(client) else null
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt
index e972fc750..949b92473 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Poll.kt
@@ -649,12 +649,12 @@ fun RenderPollGameResultsPreview() {
         Column(Modifier.padding(10.dp)) {
             RenderPoll(
                 note,
-                false,
-                true,
-                2,
-                remember { mutableStateOf(Color.Transparent) },
-                mockAccountViewModel(),
-                EmptyNav(),
+                makeItShort = false,
+                canPreview = true,
+                quotesLeft = 2,
+                backgroundColor = remember { mutableStateOf(Color.Transparent) },
+                accountViewModel = mockAccountViewModel(),
+                nav = EmptyNav(),
             )
         }
     }
@@ -758,12 +758,12 @@ fun RenderPollColorResultsPreview() {
         Column(Modifier.padding(10.dp)) {
             RenderPoll(
                 note,
-                false,
-                true,
-                2,
-                remember { mutableStateOf(Color.Transparent) },
-                mockAccountViewModel(),
-                EmptyNav(),
+                makeItShort = false,
+                canPreview = true,
+                quotesLeft = 2,
+                backgroundColor = remember { mutableStateOf(Color.Transparent) },
+                accountViewModel = mockAccountViewModel(),
+                nav = EmptyNav(),
             )
         }
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TorrentComment.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TorrentComment.kt
index 8b063890e..7c5442ff0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TorrentComment.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TorrentComment.kt
@@ -139,12 +139,12 @@ fun TorrentCommentPreview() {
         toPreview = {
             RenderTorrentComment(
                 comment,
-                false,
-                true,
-                3,
-                ReplyRenderType.FULL,
-                remember { mutableStateOf(Color.Transparent) },
-                EmptyState,
+                makeItShort = false,
+                canPreview = true,
+                quotesLeft = 3,
+                unPackReply = ReplyRenderType.FULL,
+                backgroundColor = remember { mutableStateOf(Color.Transparent) },
+                editState = EmptyState,
                 accountViewModel = accountViewModel,
                 nav = nav,
             )
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
index 8f6c73859..f1e4b5c51 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
@@ -357,10 +357,10 @@ class AccountViewModel(
 
         return if (isPostHidden || isDecryptedPostHidden) {
             // Spam + Blocked Users + Hidden Words + Sensitive Content
-            NoteComposeReportState(isPostHidden, false, false, isHiddenAuthor)
+            NoteComposeReportState(isPostHidden, isAcceptable = false, canPreview = false, isHiddenAuthor = isHiddenAuthor)
         } else if (isFromLoggedIn || isFromLoggedInFollow) {
             // No need to process if from trusted people
-            NoteComposeReportState(isPostHidden, true, true, isHiddenAuthor)
+            NoteComposeReportState(isPostHidden, isAcceptable = true, canPreview = true, isHiddenAuthor = isHiddenAuthor)
         } else {
             val newCanPreview = !note.hasAnyReports()
 
@@ -368,7 +368,7 @@ class AccountViewModel(
 
             if (newCanPreview && newIsAcceptable) {
                 // No need to process reports if nothing is wrong
-                NoteComposeReportState(isPostHidden, true, true, false)
+                NoteComposeReportState(isPostHidden, isAcceptable = true, canPreview = true, isHiddenAuthor = false)
             } else {
                 NoteComposeReportState(
                     isPostHidden,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/feed/types/RenderCreateChannelNote.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/feed/types/RenderCreateChannelNote.kt
index c717b982d..ac2453dec 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/feed/types/RenderCreateChannelNote.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/feed/types/RenderCreateChannelNote.kt
@@ -222,8 +222,8 @@ fun RenderRelayLinePreview() {
             "wss://nos.lol",
             "http://icon.com/icon.ico",
             Modifier,
-            true,
-            true,
+            showPicture = true,
+            loadRobohash = true,
         )
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DVMCard.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DVMCard.kt
index f75e7d737..6fa904415 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DVMCard.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip90DVMs/DVMCard.kt
@@ -189,7 +189,7 @@ fun RenderContentDVMThumb(
             card.personalized?.let {
                 var color = Color.DarkGray
                 var name = "generic"
-                if (card.personalized == true) {
+                if (card.personalized) {
                     color = MaterialTheme.colorScheme.bitcoinColor
                     name = "Personalized"
                 } else {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/SecurityFiltersScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/SecurityFiltersScreen.kt
index 5b6f0cdbb..21760c45e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/SecurityFiltersScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/SecurityFiltersScreen.kt
@@ -376,7 +376,7 @@ fun MutedWordActionOptions(
 ) {
     val isMutedWord by observeAccountIsHiddenWord(accountViewModel.account, word)
 
-    if (isMutedWord == true) {
+    if (isMutedWord) {
         ShowWordButton {
             if (!accountViewModel.isWriteable()) {
                 accountViewModel.toastManager.toast(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt
index fac25dca4..c86825e77 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt
@@ -635,12 +635,12 @@ private fun FullBleedNoteCompose(
                 } else if (noteEvent is InteractiveStoryBaseEvent) {
                     RenderInteractiveStory(
                         baseNote,
-                        false,
-                        true,
-                        3,
-                        backgroundColor,
-                        accountViewModel,
-                        nav,
+                        makeItShort = false,
+                        canPreview = true,
+                        quotesLeft = 3,
+                        backgroundColor = backgroundColor,
+                        accountViewModel = accountViewModel,
+                        nav = nav,
                     )
                 } else if (noteEvent is GitPatchEvent) {
                     RenderGitPatchEvent(baseNote, makeItShort = false, canPreview = true, quotesLeft = 3, backgroundColor = backgroundColor, accountViewModel = accountViewModel, nav = nav)