diff --git a/lib/screen_welcome.dart b/lib/screen_welcome.dart
index e4b2f0f..0e6e3e0 100644
--- a/lib/screen_welcome.dart
+++ b/lib/screen_welcome.dart
@@ -21,7 +21,8 @@ class _ScreenWelcomeState extends State<ScreenWelcome> {
   void initState() {
     super.initState();
 
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
+      await Future.delayed(const Duration(milliseconds: 10));
       WidgetsBinding.instance.platformDispatcher.onPlatformBrightnessChanged =
           () {
         // invert colors used, because brightness not updated yet
diff --git a/lib/settings/interface.dart b/lib/settings/interface.dart
index 13b6d43..3f1085d 100644
--- a/lib/settings/interface.dart
+++ b/lib/settings/interface.dart
@@ -240,9 +240,12 @@ class _ScreenSettingsInterfaceState extends State<ScreenSettingsInterface> {
                                   return Padding(
                                     padding: const EdgeInsets.all(16),
                                     child: Theme(
-                                      data: ThemeData.from(
-                                          colorScheme: ColorScheme.fromSeed(
-                                              seedColor: Colors.black)),
+                                      data: (prefs?.getBool("useDeviceTheme") ??
+                                              false)
+                                          ? Theme.of(context)
+                                          : ThemeData.from(
+                                              colorScheme: ColorScheme.fromSeed(
+                                                  seedColor: Colors.black)),
                                       child: DurationPicker(
                                           duration: Duration(
                                               seconds: int.parse(prefs!