diff --git a/flutter_client/lib/app.dart b/flutter_client/lib/app.dart
index f6884573..4f6b2d65 100644
--- a/flutter_client/lib/app.dart
+++ b/flutter_client/lib/app.dart
@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'shared/routing.dart';
 import 'theme/theme_data.dart';
+import 'theme/theme_mode_provider.dart';
 
 class MinstrelApp extends ConsumerWidget {
   const MinstrelApp({super.key});
@@ -10,9 +11,12 @@ class MinstrelApp extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final router = ref.watch(routerProvider);
+    final mode = ref.watch(themeModeProvider).value ?? AppThemeMode.system;
     return MaterialApp.router(
       title: 'Minstrel',
-      theme: buildThemeData(),
+      theme: buildLightTheme(),
+      darkTheme: buildDarkTheme(),
+      themeMode: mode.materialMode,
       routerConfig: router,
     );
   }