diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt b/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
index 609d855..d67ad64 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/atoms/MessageBox.kt
@@ -31,22 +31,36 @@ fun MessageBox(
     density: VisualDensity = VisualDensity.COMFORTABLE,
 ) {
     val isDark = rememberIsInDarkMode()
-    val containerColor = when (type) {
+    val containerColorDarkMode = when (type) {
         MessageType.ERROR -> MaterialTheme.colorScheme.errorContainer
         MessageType.INFO -> MaterialTheme.colorScheme.tertiaryContainer
         MessageType.SUCCESS -> Color.Green.copy(alpha = 0.3f)
         MessageType.WARNING -> Color.Yellow.copy(alpha = 0.3f)
         MessageType.SURFACE -> MaterialTheme.colorScheme.surfaceVariant
     }
-    val onContainerColor = when (type) {
-        MessageType.ERROR -> MaterialTheme.colorScheme.onError
+    val onContainerColorDarkMode = when (type) {
+        MessageType.ERROR -> MaterialTheme.colorScheme.onErrorContainer
         MessageType.INFO -> MaterialTheme.colorScheme.onTertiaryContainer
         MessageType.SUCCESS -> Color.Green
         MessageType.WARNING -> Color.Yellow
         MessageType.SURFACE -> MaterialTheme.colorScheme.onSurfaceVariant
     }
-    val textColor = if (isDark) onContainerColor else MaterialTheme.colorScheme.onSurface
-    val backgroundColor = if (isDark) containerColor else onContainerColor
+    val containerColorLightMode = when (type) {
+        MessageType.ERROR -> MaterialTheme.colorScheme.errorContainer
+        MessageType.INFO -> MaterialTheme.colorScheme.tertiaryContainer
+        MessageType.SUCCESS -> Color.Green
+        MessageType.WARNING -> Color.Yellow
+        MessageType.SURFACE -> MaterialTheme.colorScheme.onSurfaceVariant
+    }
+    val onContainerColorLightMode = when (type) {
+        MessageType.ERROR -> MaterialTheme.colorScheme.onErrorContainer
+        MessageType.INFO -> MaterialTheme.colorScheme.onTertiaryContainer
+        MessageType.SUCCESS -> MaterialTheme.colorScheme.onSurface
+        MessageType.WARNING -> MaterialTheme.colorScheme.onSurface
+        MessageType.SURFACE -> MaterialTheme.colorScheme.surfaceVariant
+    }
+    val textColor = if (isDark) onContainerColorDarkMode else onContainerColorLightMode
+    val backgroundColor = if (isDark) containerColorDarkMode else containerColorLightMode
 
     Row(
         verticalAlignment = Alignment.CenterVertically,