diff --git a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/MainActivity.kt b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/MainActivity.kt
index 848443a..db20da5 100644
--- a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/MainActivity.kt
+++ b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/MainActivity.kt
@@ -23,6 +23,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.pr0ph0z.fgoaccountswitcher.components.AccountDeleteDialog
@@ -88,7 +90,8 @@ class MainActivity : ComponentActivity() {
                         }) {
                             Icon(Icons.Default.Add, contentDescription = "Add")
                         }
-                    }
+                    },
+                    containerColor = Color(ContextCompat.getColor(applicationContext, R.color.bg))
                 ) { innerPadding ->
                     Column(modifier = Modifier.padding(innerPadding)) {
                         ListView(
diff --git a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/AppBar.kt b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/AppBar.kt
index 4527b25..ba1340e 100644
--- a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/AppBar.kt
+++ b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/AppBar.kt
@@ -34,7 +34,7 @@ fun DefaultTopBar(title: String) {
         title = { Text(title) },
         colors = TopAppBarDefaults.topAppBarColors(
             containerColor = Color(0xff191c20),
-            titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+            titleContentColor = Color.White,
         )
     )
 }
diff --git a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/Dialog.kt b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/Dialog.kt
index f423f44..4bad3a2 100644
--- a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/Dialog.kt
+++ b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/Dialog.kt
@@ -17,11 +17,16 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.currentCompositionLocalContext
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
+import androidx.core.content.ContextCompat
 import com.pr0ph0z.fgoaccountswitcher.FormMode
+import com.pr0ph0z.fgoaccountswitcher.R
 
 @Composable
 fun AccountFormDialog(
@@ -36,12 +41,13 @@ fun AccountFormDialog(
                 .fillMaxWidth()
                 .padding(16.dp),
             shape = MaterialTheme.shapes.medium,
-            color = MaterialTheme.colorScheme.surface
+            color = Color(0xFF191C20)
         ) {
             Column(modifier = Modifier.padding(16.dp)) {
                 Text(
                     "${if (formMode == FormMode.CREATE) "Add New" else "Edit"} Account",
-                    style = MaterialTheme.typography.headlineSmall
+                    style = MaterialTheme.typography.headlineSmall,
+                    color = Color.White
                 )
                 Spacer(modifier = Modifier.height(16.dp))
                 OutlinedTextField(
diff --git a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/List.kt b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/List.kt
index 8602935..831906c 100644
--- a/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/List.kt
+++ b/app/src/main/java/com/pr0ph0z/fgoaccountswitcher/components/List.kt
@@ -1,5 +1,6 @@
 package com.pr0ph0z.fgoaccountswitcher.components
 
+import android.content.res.Resources
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -22,6 +23,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.pr0ph0z.fgoaccountswitcher.Account
+import com.pr0ph0z.fgoaccountswitcher.R
 
 @Composable
 fun ListItem(account: Account, onItemClick: (Account) -> Unit) {
@@ -54,10 +56,12 @@ fun ListItem(
             .padding(16.dp)
     ) {
         Column {
-            Text(text = account.name)
+            Text(text = account.name, color = Color.White)
             Text(text = "(${account.userID.dropLast(1).replace(Regex(".{3}")){
                 "${it.value},"
-            } + account.userID.last()})", fontSize = 13.sp, color = Color.White.copy(alpha = 0.5f))
+            } + account.userID.last()})",
+                fontSize = 13.sp,
+                color = Color.White.copy(alpha = 0.5f))
         }
     }
 }
@@ -77,7 +81,8 @@ fun ListView(
             Text(
                 text = "No data",
                 style = MaterialTheme.typography.headlineMedium,
-                textAlign = TextAlign.Center
+                textAlign = TextAlign.Center,
+                color = Color.White
             )
         }
     } else {
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1a53b5a..37ccd02 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,4 +12,5 @@
     <color name="colorAccent">#03DAC5</color>
     <color name="background">#1B1B1D</color>
     <color name="muted">#80FFFFFF</color>
+    <color name="bg">#FF191C20</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1af408f..5c83158 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,9 @@
     <string name="app_name">FGO Account Switcher</string>
     <string name="app_name_debug">FGO Account Switcher Debug</string>
     <string name="minimize">Minimize</string>
+    <string name="no_data">No data</string>
+    <string name="add">Add</string>
+    <string name="root_granted">Root granted</string>
+    <string name="root_not_granted">Root is not granted</string>
+    <string name="overlay_permission_denied">Overlay Permission Denied</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3cf3fc3..4dd3b3a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.FGOAccountSwitcher" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.FGOAccountSwitcher" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+    </style>
+
 </resources>
\ No newline at end of file