diff --git a/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/StartActivity.kt b/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/StartActivity.kt
index 2affffa..2d9687b 100644
--- a/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/StartActivity.kt
+++ b/app/src/main/java/org/unifiedpush/distributor/nextpush/activities/StartActivity.kt
@@ -106,7 +106,9 @@ class StartActivity : ComponentActivity() {
                          ) -> Unit ->
                 it.onActivityResult(activity, i, i1, intent, block)
             }
-            it.connect(this)
+            runOnUiThread {
+                it.connect(this)
+            }
         }
     }
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4cb09bc..7fd64fc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,3 +1,3 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.NextPush" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.NextPush" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
 </resources>
\ No newline at end of file