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 900181e..41e603e 100644
--- a/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt
+++ b/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt
@@ -1,6 +1,5 @@
 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
@@ -18,8 +17,6 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CheckboxDefaults
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.RadioButtonDefaults
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -36,9 +33,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import de.webidsolutions.metaplugindemo.R
 
-enum class ThemingChoice(val useXml: Boolean) {
-    COMPOSE(false),
-    XML(true)
+enum class ThemingChoice() {
+    COMPOSE,
+    XML
 }
 
 @Composable
@@ -56,7 +53,7 @@ fun MetaPluginDemoScreen(
     var usePayOnServer by remember { mutableStateOf(false) }
     var useEidOnServer by remember { mutableStateOf(false) }
     var useVideo by remember { mutableStateOf(false) }
-    var useXmlTheming by remember { mutableStateOf(false) }
+    var useXmlTheming by remember { mutableStateOf(ThemingChoice.COMPOSE) }
 
     Column(
         modifier = Modifier
@@ -108,13 +105,25 @@ fun MetaPluginDemoScreen(
 
         Spacer(modifier = Modifier.height(10.dp))
 
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
+        Column {
             CheckboxWithLabel(
-                checked = useXmlTheming,
-                onCheckedChange = { useXmlTheming = it },
-                label = "XML-Theming"
+                checked = useXmlTheming == ThemingChoice.COMPOSE,
+                onCheckedChange = { isChecked ->
+                    if (isChecked) {
+                        useXmlTheming = ThemingChoice.COMPOSE
+                    }
+                },
+                label = "Standard-Theme"
+            )
+
+            CheckboxWithLabel(
+                checked = useXmlTheming == ThemingChoice.XML,
+                onCheckedChange = { isChecked ->
+                    if (isChecked) {
+                        useXmlTheming = ThemingChoice.XML
+                    }
+                },
+                label = "Custom Theme (XML)"
             )
         }
 
@@ -157,17 +166,13 @@ fun MetaPluginDemoScreen(
 
             Button(
                 onClick = {
-                    val themingChoice = if (useXmlTheming) {
-                        ThemingChoice.XML
-                    } else {
-                        ThemingChoice.COMPOSE
-                    }
+
                     onStartClicked(
                         useAutoIdent,
                         usePayOnServer,
                         useEidOnServer,
                         useVideo,
-                        themingChoice
+                        useXmlTheming
                     )
                 },
                 modifier = Modifier
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 14db9e9..eaa02e6 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">Theme auswählen:</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 03817eb..ba49d68 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -9,5 +9,5 @@
     <string name="core_sdk_creation_successful">Core SDK creado correctamente</string>
     <string name="validate_action_id">Validar número de operación…</string>
     <string name="action_id_not_valid">Error: El número de operación («action-ID») no se ha establecido en una secuencia numérica de 9 dígitos en el archivo «MainActivity.kt».</string>
-    <string name="choose_theming">Seleccionar tema</string>
+    <string name="choose_theming">Elige un tema</string>
 </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 eb5a654..757d2c6 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 A Theme:</string>
 </resources>
\ No newline at end of file