diff --git a/app/src/main/java/com/haman/daangnphoto/MainActivity.kt b/app/src/main/java/com/haman/daangnphoto/MainActivity.kt
index 33e83ae..e8c85af 100644
--- a/app/src/main/java/com/haman/daangnphoto/MainActivity.kt
+++ b/app/src/main/java/com/haman/daangnphoto/MainActivity.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.haman.core.designsystem.theme.DaangnPhotoTheme
 import com.haman.daangnphoto.ui.DaangnPhotoApp
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -15,9 +14,7 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            DaangnPhotoTheme {
-                DaangnPhotoApp(splashScreen)
-            }
+            DaangnPhotoApp(splashScreen)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/haman/daangnphoto/ui/DaangnPhotoApp.kt b/app/src/main/java/com/haman/daangnphoto/ui/DaangnPhotoApp.kt
index bac510e..a60d702 100644
--- a/app/src/main/java/com/haman/daangnphoto/ui/DaangnPhotoApp.kt
+++ b/app/src/main/java/com/haman/daangnphoto/ui/DaangnPhotoApp.kt
@@ -12,6 +12,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.haman.core.common.state.UiEvent
 import com.haman.core.designsystem.component.Toast
+import com.haman.core.designsystem.theme.DaangnPhotoTheme
 import com.haman.daangnphoto.MainViewModel
 import com.haman.daangnphoto.navigation.DaangnNavHost
 import kotlinx.coroutines.delay
@@ -39,13 +40,15 @@ fun DaangnPhotoApp(
         else timeOutSplashScreen.value.not()
     }
 
-    Scaffold {
-        Box(modifier = Modifier.fillMaxSize()) {
-            DaangnNavHost(
-                navController = navController,
-                mainViewModel = viewModel
-            )
-            Event(event = uiEvent.value)
+    DaangnPhotoTheme {
+        Scaffold {
+            Box(modifier = Modifier.fillMaxSize()) {
+                DaangnNavHost(
+                    navController = navController,
+                    mainViewModel = viewModel
+                )
+                Event(event = uiEvent.value)
+            }
         }
     }
 }
diff --git a/core/designsystem/src/main/java/com/haman/core/designsystem/theme/DanngnBlackTheme.kt b/core/designsystem/src/main/java/com/haman/core/designsystem/theme/DanngnBlackTheme.kt
index c2fb00e..9d0688d 100644
--- a/core/designsystem/src/main/java/com/haman/core/designsystem/theme/DanngnBlackTheme.kt
+++ b/core/designsystem/src/main/java/com/haman/core/designsystem/theme/DanngnBlackTheme.kt
@@ -1,11 +1,10 @@
 package com.haman.core.designsystem.theme
 
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.darkColors
 import androidx.compose.runtime.Composable
 
-private val ColorPalette = darkColors(
+private val DarkColorPalette = darkColors(
     primary = Orange800,
     onPrimary = White,
     background = Gray900,
@@ -15,9 +14,11 @@ private val ColorPalette = darkColors(
 )
 
 @Composable
-fun DaangnBlackTheme(content: @Composable () -> Unit) {
+fun DaangnBlackTheme(
+    content: @Composable () -> Unit
+) {
     MaterialTheme(
-        colors = ColorPalette,
+        colors = DarkColorPalette,
         typography = Typography,
         shapes = Shapes,
         content = content
diff --git a/feature/detail/src/main/java/com/haman/feature/detail/DetailScreen.kt b/feature/detail/src/main/java/com/haman/feature/detail/DetailScreen.kt
index 34f8039..6f8df22 100644
--- a/feature/detail/src/main/java/com/haman/feature/detail/DetailScreen.kt
+++ b/feature/detail/src/main/java/com/haman/feature/detail/DetailScreen.kt
@@ -3,6 +3,7 @@ package com.haman.feature.detail
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Icon
+import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
@@ -40,35 +41,39 @@ fun DetailScreen(
         }
     }
 
-    Box(
-        modifier = Modifier.fillMaxSize()
-    ) {
-        Icon(
+    Surface {
+        Box(
             modifier = Modifier
-                .align(Alignment.TopEnd)
-                .size(24.dp)
-                .clickable { onBackPressed() },
-            painter = painterResource(id = DaangnIcons.close),
-            contentDescription = "close button"
-        )
-        Column(
-            modifier = Modifier
-                .align(Alignment.Center)
-                .padding(vertical = 24.dp),
-            verticalArrangement = Arrangement.Center
+                .fillMaxSize()
         ) {
-            if (imageState.value?.author != null) {
-                SubTitle(
-                    modifier = Modifier.padding(8.dp),
-                    text = "by ${imageState.value?.author}"
-                )
-            }
-            imageState.value?.let {
-                AsyncImage(
-                    image = it,
-                    loadImage = viewModel::getImageByUrl,
-                    scaleType = ContentScale.FillWidth
-                )
+            Icon(
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .padding(12.dp)
+                    .size(24.dp)
+                    .clickable { onBackPressed() },
+                painter = painterResource(id = DaangnIcons.close),
+                contentDescription = "close button"
+            )
+            Column(
+                modifier = Modifier
+                    .align(Alignment.Center)
+                    .padding(vertical = 24.dp),
+                verticalArrangement = Arrangement.Center
+            ) {
+                if (imageState.value?.author != null) {
+                    SubTitle(
+                        modifier = Modifier.padding(8.dp),
+                        text = "by ${imageState.value?.author}"
+                    )
+                }
+                imageState.value?.let {
+                    AsyncImage(
+                        image = it,
+                        loadImage = viewModel::getImageByUrl,
+                        scaleType = ContentScale.FillWidth
+                    )
+                }
             }
         }
     }