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 eefc195..900181e 100644
--- a/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt
+++ b/app/src/main/java/de/webidsolutions/metaplugindemo/scenes/MetaPluginDemoScene.kt
@@ -111,15 +111,11 @@ fun MetaPluginDemoScreen(
         Row(
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            RadioButton(
-                selected = useXmlTheming,
-                onClick = { useXmlTheming = !useXmlTheming },
-                colors = RadioButtonDefaults.colors(
-                        selectedColor = Color(0xFF05B1FB),
+            CheckboxWithLabel(
+                checked = useXmlTheming,
+                onCheckedChange = { useXmlTheming = it },
+                label = "XML-Theming"
             )
-            )
-            Spacer(modifier = Modifier.width(4.dp))
-            Text(text = "XML-Theming")
         }
 
         Spacer(modifier = Modifier.height(10.dp))
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fcb901b..e42f96d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,46 +3,18 @@
 
     <style name="WebId.PluginTheme" parent="Theme.AppCompat.Light.NoActionBar">
 
-        <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 -->
+        <item name="actionPrimary">#FFD32D1F</item>           <!-- Deep Orange 400 -->
+        <item name="actionPrimaryPressed">#FF8A1E15</item>    <!-- Deep Orange 600 -->
+        <item name="actionPrimaryHover">#FFE57373</item>      <!-- Deep Orange 300 -->
+        <item name="actionPrimaryInvert">#FFFFFFFF</item>     <!-- White -->
+        <item name="actionDisabled">#FFBDBDBD</item>          <!-- Grey 400 -->
 
+        <item name="brandPrimary">#FFD32D1F</item>
+        <item name="brandSecondary">#FF8A1E15</item>
         <!-- ===== Background Colors ===== -->
-        <item name="backgroundPrimary">#00FFFF</item>       <!-- Cyan -->
-        <item name="backgroundSecondary">#FFA500</item>     <!-- Orange -->
+        <item name="backgroundPrimary">#FFFFFFFF</item>       <!-- Light Cyan (Cyan 50) -->
+        <item name="backgroundSecondary">#FFFFFF</item>     <!-- White -->
 
-        <!-- ===== Text Colors ===== -->
-        <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">#A52A2A</item>           <!-- Brown -->
-        <item name="borderSecondary">#2F4F4F</item>         <!-- DarkSlateGray -->
-
-        <!-- ===== Signal Colors ===== -->
-        <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 -->
-
-        <item name="headlineMediumFontSize">24sp</item>
-        <item name="headlineSmallFontSize">20sp</item>
-        <item name="subheadlineFontSize">18sp</item>
-        <item name="bodyXLargeFontSize">16sp</item>
-        <item name="bodyLargeFontSize">14sp</item>
-        <item name="bodyMediumFontSize">12sp</item>
-        <item name="bodySmallFontSize">10sp</item>
-        <item name="buttonFontSize">14sp</item>
-        <item name="buttonSmallFontSize">12sp</item>
-        <item name="captionFontSize">10sp</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b947776..dfbb943 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,51 +3,17 @@
 
     <style name="WebId.PluginTheme" parent="Theme.AppCompat.Light.NoActionBar">
 
-        <!-- ===== Action Colors ===== -->
-        <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 -->
+        <item name="actionPrimary">#FFD32D1F</item>           <!-- Deep Orange 400 -->
+        <item name="actionPrimaryPressed">#FF8A1E15</item>    <!-- Deep Orange 600 -->
+        <item name="actionPrimaryHover">#FFE57373</item>      <!-- Deep Orange 300 -->
+        <item name="actionPrimaryInvert">#FFFFFFFF</item>     <!-- White -->
+        <item name="actionDisabled">#FFBDBDBD</item>          <!-- Grey 400 -->
 
+        <item name="brandPrimary">#FFD32D1F</item>
+        <item name="brandSecondary">#FF8A1E15</item>
         <!-- ===== Background Colors ===== -->
-        <item name="backgroundPrimary">#00FFFF</item>       <!-- Cyan -->
-        <item name="backgroundSecondary">#FFA500</item>     <!-- Orange -->
-
-        <!-- ===== Text Colors ===== -->
-        <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">#A52A2A</item>           <!-- Brown -->
-        <item name="borderSecondary">#2F4F4F</item>         <!-- DarkSlateGray -->
-
-        <!-- ===== Signal Colors ===== -->
-        <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 -->
-
-        <item name="headlineMediumFontSize">24sp</item>
-        <item name="headlineSmallFontSize">20sp</item>
-        <item name="subheadlineFontSize">18sp</item>
-        <item name="bodyXLargeFontSize">16sp</item>
-        <item name="bodyLargeFontSize">14sp</item>
-        <item name="bodyMediumFontSize">12sp</item>
-        <item name="bodySmallFontSize">10sp</item>
-        <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>
+        <item name="backgroundPrimary">#FFFFFFFF</item>       <!-- Light Cyan (Cyan 50) -->
+        <item name="backgroundSecondary">#FFFFFF</item>     <!-- White -->
     </style>
 
 </resources>