diff --git a/app/src/main/java/com/example/login_v3/home/Message.kt b/app/src/main/java/com/example/login_v3/home/Message.kt
index 7f330f9..a7d69f9 100644
--- a/app/src/main/java/com/example/login_v3/home/Message.kt
+++ b/app/src/main/java/com/example/login_v3/home/Message.kt
@@ -68,7 +68,7 @@ fun Tg_Message() {
                 ),
                 modifier = Modifier
                     .background(
-                        color = Color.White.copy(alpha = 0.2f), // ⭐ 調低透明度
+                        color = MaterialTheme.colorScheme.primary, // ⭐ 調低透明度
                         shape = RoundedCornerShape(0.dp)
                     )
                     .border(
diff --git a/app/src/main/java/com/example/login_v3/home/setting/Setting_list_Screen.kt b/app/src/main/java/com/example/login_v3/home/setting/Setting_list_Screen.kt
index 30f3fb7..0255b26 100644
--- a/app/src/main/java/com/example/login_v3/home/setting/Setting_list_Screen.kt
+++ b/app/src/main/java/com/example/login_v3/home/setting/Setting_list_Screen.kt
@@ -102,12 +102,24 @@ fun SharedTransitionScope.setting_list_Screen(
                         .fillMaxSize()
                         .padding(6.dp)
                 ) {
-                    Box(modifier = Modifier.matchParentSize().blur(10.dp))
+                    //glass effect
                     Box(
                         modifier = Modifier
                             .matchParentSize()
-                            .background(Color.White.copy(alpha = 0.08f), RoundedCornerShape(16.dp))
-                            .border(1.dp, Color.White.copy(alpha = 0.3f), RoundedCornerShape(16.dp))
+                            .blur(10.dp)
+                    )
+                    Box(
+                        modifier = Modifier
+                            .matchParentSize()
+                            .background(
+                                color = MaterialTheme.colorScheme.primary,
+                                RoundedCornerShape(16.dp)
+                            )
+                            .border(
+                                1.dp,
+                                Color.White.copy(alpha = 0.3f),
+                                RoundedCornerShape(16.dp)
+                            )
                     )
 
                     Row(modifier = Modifier
diff --git a/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt b/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt
index 967f3c7..3bb43d9 100644
--- a/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt
+++ b/app/src/main/java/com/example/login_v3/home/setting/setting_detail_page/detail_UI/setting_Theme_Page.kt
@@ -37,12 +37,23 @@ fun setting_theme_page(
             .padding(10.dp)
     ) {
         //glass effect
-        Box(modifier = Modifier.matchParentSize().blur(10.dp))
         Box(
             modifier = Modifier
                 .matchParentSize()
-                .background(Color.White.copy(alpha = 0.08f), RoundedCornerShape(16.dp))
-                .border(1.dp, Color.White.copy(alpha = 0.3f), RoundedCornerShape(16.dp))
+                .blur(10.dp)
+        )
+        Box(
+            modifier = Modifier
+                .matchParentSize()
+                .background(
+                    color = MaterialTheme.colorScheme.primary,
+                    RoundedCornerShape(16.dp)
+                )
+                .border(
+                    1.dp,
+                    Color.White.copy(alpha = 0.3f),
+                    RoundedCornerShape(16.dp)
+                )
         )
 
 
@@ -51,7 +62,7 @@ fun setting_theme_page(
             Text(
                 text = "主題設定",
                 style = MaterialTheme.typography.headlineMedium,
-                color = MaterialTheme.colorScheme.primary
+                color = MaterialTheme.colorScheme.onBackground
             )
 
             Spacer(modifier = Modifier.height(8.dp))
diff --git a/app/src/main/java/com/example/login_v3/ui/theme/Color.kt b/app/src/main/java/com/example/login_v3/ui/theme/Color.kt
index 1b36dbd..a79efe8 100644
--- a/app/src/main/java/com/example/login_v3/ui/theme/Color.kt
+++ b/app/src/main/java/com/example/login_v3/ui/theme/Color.kt
@@ -14,4 +14,7 @@ val main_orange = Color(0xFFFF6700)
 val light_orange = Color(0xFFFFAD00)
 
 val WhiteGlass = Color(0x14FFFFFF)
-val DarkGlass = Color(0x14FFFFFF)
\ No newline at end of file
+val DarkGlass = Color(0x14000000)
+
+val WhiteText = Color(0xFFFFFFFF)
+val DarkText = Color(0xFF000000)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/login_v3/ui/theme/Theme.kt b/app/src/main/java/com/example/login_v3/ui/theme/Theme.kt
index 547a1a3..12fe660 100644
--- a/app/src/main/java/com/example/login_v3/ui/theme/Theme.kt
+++ b/app/src/main/java/com/example/login_v3/ui/theme/Theme.kt
@@ -14,13 +14,15 @@ import androidx.compose.ui.platform.LocalContext
 private val DarkColorScheme = darkColorScheme(
     primary = DarkGlass,
     secondary = light_orange,
-    tertiary = Pink80
+    tertiary = Pink80,
+    onBackground = DarkText
 )
 
 private val LightColorScheme = lightColorScheme(
     primary = WhiteGlass,
     secondary = light_orange,
-    tertiary = Pink40
+    tertiary = Pink40,
+    onBackground = WhiteText
 
     /* Other default colors to override
     background = Color(0xFFFFFBFE),