diff --git a/app/src/main/java/eu/project/sia/MainActivity.kt b/app/src/main/java/eu/project/sia/MainActivity.kt
index 7193ac5..297ab0e 100644
--- a/app/src/main/java/eu/project/sia/MainActivity.kt
+++ b/app/src/main/java/eu/project/sia/MainActivity.kt
@@ -59,12 +59,13 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
 
         installSplashScreen().setKeepOnScreenCondition {
             applicationViewModel.applicationStartupState.value is ApplicationStartupState.Pending
         }
 
+        enableEdgeToEdge()
+
         setContent {
 
             val applicationStartupState by applicationViewModel.applicationStartupState.collectAsStateWithLifecycle()
diff --git a/scaffold/src/main/java/eu/project/scaffold/ApplicationScaffold.kt b/scaffold/src/main/java/eu/project/scaffold/ApplicationScaffold.kt
index 54d054e..6f60957 100644
--- a/scaffold/src/main/java/eu/project/scaffold/ApplicationScaffold.kt
+++ b/scaffold/src/main/java/eu/project/scaffold/ApplicationScaffold.kt
@@ -15,6 +15,7 @@ import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
 import eu.project.authenticate.welcomeScreen.impl.welcomeImpl
 import eu.project.common.navigation.Navigation
+import eu.project.design_system.theme.SiaTheme
 import eu.project.floatingActionButton.impl.floatingActionButtonImpl
 import eu.project.home.impl.homeImpl
 import eu.project.saved.exportResult.impl.exportResultImpl
@@ -22,7 +23,6 @@ import eu.project.saved.exportWords.impl.exportWordsImpl
 import eu.project.saved.savedWords.impl.savedWordsImpl
 import eu.project.topBar.impl.topBarImpl
 import eu.project.transcribe.selectAudio.impl.selectAudioImpl
-import eu.project.ui.theme.Background
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -33,7 +33,7 @@ fun ApplicationScaffold(startRoute: Navigation) {
     Scaffold(
         modifier = Modifier
             .fillMaxSize(),
-        containerColor = Background,
+        containerColor = SiaTheme.color.surface.background,
         contentWindowInsets = WindowInsets.statusBars,
         floatingActionButtonPosition = FabPosition.Center,
         topBar = {