diff --git a/app/build.gradle b/app/build.gradle
index 1fe0962..4a504d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.compose.material3:material3:1.4.0'
+    implementation 'androidx.compose.foundation:foundation-layout:1.9.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt b/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt
index 2dc0b03..bdc113f 100644
--- a/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt
+++ b/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt
@@ -1,5 +1,7 @@
 package de.webidsolutions.metaplugindemo.scenes
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -62,12 +64,13 @@ fun MetaPluginDemoScreen(
     ) {
         Text(
             text = stringResource(R.string.choose_plugins),
-            style = MaterialTheme.typography.bodyLarge
+            style = MaterialTheme.typography.headlineSmall,
+            modifier = Modifier.padding(start = 10.dp)
         )
 
         Spacer(modifier = Modifier.height(10.dp))
 
-        Column(modifier = Modifier.padding(start = 10.dp)) {
+        Column {
             CheckboxWithLabel(
                 checked = useAutoIdent,
                 onCheckedChange = { useAutoIdent = it },
@@ -97,18 +100,17 @@ fun MetaPluginDemoScreen(
 
         Text(
             text = stringResource(R.string.choose_theming),
-            style = MaterialTheme.typography.bodyLarge,
+            style = MaterialTheme.typography.headlineSmall,
+            modifier = Modifier.padding(start = 10.dp)
         )
 
         Spacer(modifier = Modifier.height(10.dp))
 
-        Column (
-            modifier = Modifier.padding(start = 10.dp),
-        ) {
+        Column {
             CheckboxWithLabel(
                 checked = themingChoice == ThemingChoice.COMPOSE,
                 onCheckedChange = { themingChoice = ThemingChoice.COMPOSE },
-                label = "Code-Theming"
+                label = "Compose-Theming"
             )
 
             CheckboxWithLabel(
@@ -122,18 +124,17 @@ fun MetaPluginDemoScreen(
 
         Text(
             text = stringResource(R.string.log_headline),
-            style = MaterialTheme.typography.bodyLarge,
+            style = MaterialTheme.typography.headlineSmall,
+            modifier = Modifier.padding(start = 10.dp)
         )
 
         Spacer(modifier = Modifier.height(10.dp))
 
-        Surface(
+        Box(
             modifier = Modifier
                 .weight(1f)
                 .fillMaxWidth()
-                .padding(horizontal = 10.dp),
-            color = MaterialTheme.colorScheme.surfaceVariant,
-            shape = MaterialTheme.shapes.small
+                .padding(horizontal = 10.dp)
         ) {
             val scrollState = rememberScrollState()
 
@@ -141,40 +142,44 @@ fun MetaPluginDemoScreen(
                 scrollState.animateScrollTo(scrollState.maxValue)
             }
 
-            Text(
-                text = logText.ifEmpty { stringResource(R.string.log_placeholder) },
-                modifier = Modifier
-                    .fillMaxSize()
-                    .verticalScroll(scrollState)
-                    .padding(16.dp),
-                style = MaterialTheme.typography.bodyMedium
-            )
-        }
-
-        Spacer(modifier = Modifier.height(10.dp))
-
-        Button(
-            onClick = {
-                onStartClicked(
-                    useAutoIdent,
-                    usePayOnServer,
-                    useEidOnServer,
-                    useVideo,
-                    themingChoice
+            Surface(
+                modifier = Modifier.fillMaxSize(),
+                shape = MaterialTheme.shapes.small
+            ) {
+                Text(
+                    text = logText.ifEmpty { stringResource(R.string.log_placeholder) },
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .verticalScroll(scrollState)
+                        .padding(16.dp)
+                        .padding(bottom = 80.dp),
+                    style = MaterialTheme.typography.bodyMedium
                 )
-            },
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(60.dp)
-                .padding(horizontal = 10.dp),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = Color(0xFF05B1FB)
-            )
-        ) {
-            Text(
-                text = stringResource(R.string.start_button),
-                color = Color.White
-            )
+            }
+
+            Button(
+                onClick = {
+                    onStartClicked(
+                        useAutoIdent,
+                        usePayOnServer,
+                        useEidOnServer,
+                        useVideo,
+                        themingChoice
+                    )
+                },
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .fillMaxWidth()
+                    .height(60.dp),
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = Color(0xFF05B1FB)
+                )
+            ) {
+                Text(
+                    text = stringResource(R.string.start_button),
+                    color = Color.White
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6d97809..14db9e9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,5 +9,5 @@
     <string name="core_sdk_creation_successful">Core SDK erfolgreich erstellt</string>
     <string name="validate_action_id">Validiere Vorgangsnummer…</string>
     <string name="action_id_not_valid">Fehler: Die Vorgangsnummer (Action-ID) wurde in der Datei „MainActivity.kt“ nicht auf eine 9-stellige Zahlenfolge gesetzt.</string>
-    <string name="choose_theming">Designauswahl</string>
+    <string name="choose_theming">Designauswahl:</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 71bedef..fcb901b 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,47 +3,36 @@
 
     <style name="WebId.PluginTheme" parent="Theme.AppCompat.Light.NoActionBar">
 
-        <!-- ===== Action Colors ===== -->
-        <item name="actionPrimary">#FF3B30</item>
-        <item name="actionPrimaryPressed">#FF3B30</item>
-        <item name="actionPrimaryHover">#FF3B30</item>
-        <item name="actionPrimaryInvert">#FF3B30</item>
-        <item name="actionDisabled">#FF3B30</item>
+        <item name="actionPrimary">#FF0000</item>           <!-- Rot -->
+        <item name="actionPrimaryPressed">#00FF00</item>    <!-- Grün -->
+        <item name="actionPrimaryHover">#0000FF</item>      <!-- Blau -->
+        <item name="actionPrimaryInvert">#FFFF00</item>     <!-- Gelb -->
+        <item name="actionDisabled">#FF00FF</item>          <!-- Magenta -->
 
         <!-- ===== Background Colors ===== -->
-        <item name="backgroundPrimary">#FF3B30</item>
-        <item name="backgroundSecondary">#FF3B30</item>
+        <item name="backgroundPrimary">#00FFFF</item>       <!-- Cyan -->
+        <item name="backgroundSecondary">#FFA500</item>     <!-- Orange -->
 
         <!-- ===== Text Colors ===== -->
-        <item name="textHeadline">@color/white</item>
-        <item name="textSubtitle">@color/white</item>
-        <item name="textBodyPrimary">@color/white</item>
-        <item name="textBodySecondary">@color/white</item>
-        <item name="textBodyTertiary">@color/white</item>
-
-        <!-- ===== Brand Colors ===== -->
-        <item name="brandPrimary">#FF3B30</item>
-        <item name="brandSecondary">#FF3B30</item>
-        <item name="brandInvert">#FF3B30</item>
+        <item name="textHeadline">#FFFFFF</item>            <!-- Weiß -->
+        <item name="textSubtitle">#000000</item>            <!-- Schwarz -->
+        <item name="textBodyPrimary">#808080</item>         <!-- Grau -->
+        <item name="textBodySecondary">#800000</item>       <!-- Dunkelrot -->
 
         <!-- ===== Border Colors ===== -->
-        <item name="borderPrimary">@color/white</item>
-        <item name="borderSecondary">@color/white</item>
+        <item name="borderPrimary">#A52A2A</item>           <!-- Brown -->
+        <item name="borderSecondary">#2F4F4F</item>         <!-- DarkSlateGray -->
 
         <!-- ===== Signal Colors ===== -->
-        <item name="signalDefault">#FF3B30</item>
-        <item name="signalPositive">#FF3B30</item>
-        <item name="signalPositiveText">#FF3B30</item>
-        <item name="signalNegative">#FF3B30</item>
-        <item name="signalNegativeText">#FF3B30</item>
-        <item name="signalWarning">#FF3B30</item>
-        <item name="signalWarningText">#FF3B30</item>
-        <item name="signalInvert">#FF3B30</item>
+        <item name="signalDefault">#FFD700</item>           <!-- Gold -->
+        <item name="signalPositive">#7CFC00</item>          <!-- LawnGreen -->
+        <item name="signalPositiveText">#006400</item>      <!-- DarkGreen -->
+        <item name="signalNegative">#8B0000</item>          <!-- DarkRed -->
+        <item name="signalNegativeText">#FF4500</item>      <!-- OrangeRed -->
+        <item name="signalWarning">#FF8C00</item>           <!-- DarkOrange -->
+        <item name="signalWarningText">#B8860B</item>       <!-- DarkGoldenRod -->
+        <item name="signalInvert">#F5FFFA</item>            <!-- MintCream -->
 
-        <!-- Global font family -->
-        <!--        <item name="fontFamily">@string/font_family</item>-->
-
-        <!-- Font sizes -->
         <item name="headlineMediumFontSize">24sp</item>
         <item name="headlineSmallFontSize">20sp</item>
         <item name="subheadlineFontSize">18sp</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76c378c..eb5a654 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,5 +8,5 @@
     <string name="core_sdk_creation_successful">Core SDK creation successful</string>
     <string name="validate_action_id">Validate Action-ID…</string>
     <string name="action_id_not_valid">Failure: The transaction number (Action-ID) was not set to 9-digit number string in MainActivity.kt file.</string>
-    <string name="choose_theming">Choose theming</string>
+    <string name="choose_theming">Choose Theming:</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 0050300..b947776 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -44,6 +44,10 @@
         <item name="buttonFontSize">14sp</item>
         <item name="buttonSmallFontSize">12sp</item>
         <item name="captionFontSize">10sp</item>
+
+        <item name="FontFamily">casual</item>
+        <item name="headlineFontFamily">casual</item>
+        <item name="fontFamily">casual</item>
     </style>
 
 </resources>