diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt
index 9df366786..03c64c9a3 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/layouts/LeftPictureLayout.kt
@@ -57,10 +57,7 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText
 @Composable
 @Preview
 fun LeftPictureLayoutPreview() {
-    ThemeComparisonColumn(
-        onDark = { LeftPictureLayoutPreviewCard() },
-        onLight = { LeftPictureLayoutPreviewCard() },
-    )
+    ThemeComparisonColumn { LeftPictureLayoutPreviewCard() }
 }
 
 @Composable
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt
index 878dec216..4e3f206d1 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/BlankNote.kt
@@ -54,10 +54,7 @@ import kotlinx.collections.immutable.persistentSetOf
 @Composable
 @Preview
 fun BlankNotePreview() {
-    ThemeComparisonColumn(
-        onDark = { BlankNote() },
-        onLight = { BlankNote() },
-    )
+    ThemeComparisonColumn { BlankNote() }
 }
 
 @Composable
@@ -106,15 +103,7 @@ fun HiddenNotePreview() {
     val nav: (String) -> Unit = {}
 
     ThemeComparisonColumn(
-        onDark = {
-            HiddenNote(
-                reports = persistentSetOf<Note>(),
-                isHiddenAuthor = true,
-                accountViewModel = accountViewModel,
-                nav = nav,
-            ) {}
-        },
-        onLight = {
+        toPreview = {
             HiddenNote(
                 reports = persistentSetOf<Note>(),
                 isHiddenAuthor = true,
@@ -194,8 +183,7 @@ fun HiddenNote(
 @Composable
 fun HiddenNoteByMePreview() {
     ThemeComparisonColumn(
-        onDark = { HiddenNoteByMe {} },
-        onLight = { HiddenNoteByMe {} },
+        toPreview = { HiddenNoteByMe {} },
     )
 }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt
index f00c680f8..6af37c656 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapTheDevsCard.kt
@@ -186,22 +186,13 @@ fun ZapTheDevsCardPreview() {
         accountViewModel,
     ) { releaseNote ->
         if (releaseNote != null) {
-            ThemeComparisonColumn(
-                onDark = {
-                    ZapTheDevsCard(
-                        releaseNote,
-                        accountViewModel,
-                        nav = {},
-                    )
-                },
-                onLight = {
-                    ZapTheDevsCard(
-                        releaseNote,
-                        accountViewModel,
-                        nav = {},
-                    )
-                },
-            )
+            ThemeComparisonColumn {
+                ZapTheDevsCard(
+                    releaseNote,
+                    accountViewModel,
+                    nav = {},
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt
index 9ec25686a..e926d6421 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/AddRemoveButtons.kt
@@ -40,34 +40,19 @@ import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
 @Composable
 @Preview
 fun AddButtonPreview() {
-    ThemeComparisonColumn(
-        onDark = {
-            Row {
-                Column {
-                    AddButton(isActive = true) {}
-                    AddButton(isActive = false) {}
-                }
-
-                Column {
-                    RemoveButton(isActive = true) {}
-                    RemoveButton(isActive = false) {}
-                }
+    ThemeComparisonColumn {
+        Row {
+            Column {
+                AddButton(isActive = true) {}
+                AddButton(isActive = false) {}
             }
-        },
-        onLight = {
-            Row {
-                Column {
-                    AddButton(isActive = true) {}
-                    AddButton(isActive = false) {}
-                }
 
-                Column {
-                    RemoveButton(isActive = true) {}
-                    RemoveButton(isActive = false) {}
-                }
+            Column {
+                RemoveButton(isActive = true) {}
+                RemoveButton(isActive = false) {}
             }
-        },
-    )
+        }
+    }
 }
 
 @Composable
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt
index 842dc8c5e..3f627ef88 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayPoW.kt
@@ -34,8 +34,7 @@ import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
 @Preview
 fun DisplayPoWPreview() {
     ThemeComparisonColumn(
-        onDark = { DisplayPoW(pow = 24) },
-        onLight = { DisplayPoW(pow = 24) },
+        toPreview = { DisplayPoW(pow = 24) },
     )
 }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
index 9ca328593..0f9b5f595 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
@@ -872,48 +872,26 @@ private fun RenderWikiHeaderForThreadPreview() {
     }
 
     LoadNote(baseNoteHex = "277f982a4cd3f67cc47ad9282176acabee1713848f547d6021e0c155572078e1", accountViewModel = accountViewModel) { baseNote ->
-        ThemeComparisonColumn(
-            onDark = {
-                val bg = MaterialTheme.colorScheme.background
-                val backgroundColor =
-                    remember {
-                        mutableStateOf(bg)
-                    }
-
-                Column {
-                    RenderWikiHeaderForThread(noteEvent = event, accountViewModel = accountViewModel, nav)
-                    RenderTextEvent(
-                        baseNote!!,
-                        false,
-                        true,
-                        backgroundColor,
-                        editState,
-                        accountViewModel,
-                        nav,
-                    )
+        ThemeComparisonColumn {
+            val bg = MaterialTheme.colorScheme.background
+            val backgroundColor =
+                remember {
+                    mutableStateOf(bg)
                 }
-            },
-            onLight = {
-                val bg = MaterialTheme.colorScheme.background
-                val backgroundColor =
-                    remember {
-                        mutableStateOf(bg)
-                    }
 
-                Column {
-                    RenderWikiHeaderForThread(noteEvent = event, accountViewModel = accountViewModel, nav)
-                    RenderTextEvent(
-                        baseNote!!,
-                        false,
-                        true,
-                        backgroundColor,
-                        editState,
-                        accountViewModel,
-                        nav,
-                    )
-                }
-            },
-        )
+            Column {
+                RenderWikiHeaderForThread(noteEvent = event, accountViewModel = accountViewModel, nav)
+                RenderTextEvent(
+                    baseNote!!,
+                    false,
+                    true,
+                    backgroundColor,
+                    editState,
+                    accountViewModel,
+                    nav,
+                )
+            }
+        }
     }
 }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
index 24c5a7ede..c6e785572 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
@@ -228,8 +228,7 @@ fun HomeFeeds(
 @Composable
 fun HomeFeedEmptyPreview() {
     ThemeComparisonRow(
-        onDark = { HomeFeedEmpty {} },
-        onLight = { HomeFeedEmpty {} },
+        toPreview = { HomeFeedEmpty {} },
     )
 }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
index f4cd1395e..936251823 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt
@@ -115,10 +115,7 @@ fun LoginPage() {
     val accountViewModel: AccountStateViewModel = viewModel()
 
     ThemeComparisonRow(
-        onDark = {
-            LoginPage(accountViewModel, true) {}
-        },
-        onLight = {
+        toPreview = {
             LoginPage(accountViewModel, true) {}
         },
     )
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt
index cd37006e3..b92faa5be 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/SignUpScreen.kt
@@ -83,10 +83,7 @@ fun SignUpPage() {
     val accountViewModel: AccountStateViewModel = viewModel()
 
     ThemeComparisonRow(
-        onDark = {
-            SignUpPage(accountViewModel) {}
-        },
-        onLight = {
+        toPreview = {
             SignUpPage(accountViewModel) {}
         },
     )
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
index 4bfebcc01..1088062c0 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
@@ -451,16 +451,13 @@ fun AmethystTheme(
 }
 
 @Composable
-fun ThemeComparisonColumn(
-    onDark: @Composable () -> Unit,
-    onLight: @Composable () -> Unit,
-) {
+fun ThemeComparisonColumn(toPreview: @Composable () -> Unit) {
     Column {
         Box {
             val darkTheme: SharedPreferencesViewModel = viewModel()
             darkTheme.updateTheme(ThemeType.DARK)
             AmethystTheme(darkTheme) {
-                Surface(color = MaterialTheme.colorScheme.background) { onDark() }
+                Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
             }
         }
 
@@ -468,23 +465,20 @@ fun ThemeComparisonColumn(
             val lightTheme: SharedPreferencesViewModel = viewModel()
             lightTheme.updateTheme(ThemeType.LIGHT)
             AmethystTheme(lightTheme) {
-                Surface(color = MaterialTheme.colorScheme.background) { onLight() }
+                Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
             }
         }
     }
 }
 
 @Composable
-fun ThemeComparisonRow(
-    onDark: @Composable () -> Unit,
-    onLight: @Composable () -> Unit,
-) {
+fun ThemeComparisonRow(toPreview: @Composable () -> Unit) {
     Row {
         Box(modifier = Modifier.weight(1f)) {
             val darkTheme: SharedPreferencesViewModel = viewModel()
             darkTheme.updateTheme(ThemeType.DARK)
             AmethystTheme(darkTheme) {
-                Surface(color = MaterialTheme.colorScheme.background) { onDark() }
+                Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
             }
         }
 
@@ -492,7 +486,7 @@ fun ThemeComparisonRow(
             val lightTheme: SharedPreferencesViewModel = viewModel()
             lightTheme.updateTheme(ThemeType.LIGHT)
             AmethystTheme(lightTheme) {
-                Surface(color = MaterialTheme.colorScheme.background) { onLight() }
+                Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
             }
         }
     }