diff --git a/lib/screens/settings/components/theme/components/widget_list_tile_dynamic_colors.dart b/lib/screens/settings/components/dynamic_colors/widget_list_tile_dynamic_colors.dart
similarity index 100%
rename from lib/screens/settings/components/theme/components/widget_list_tile_dynamic_colors.dart
rename to lib/screens/settings/components/dynamic_colors/widget_list_tile_dynamic_colors.dart
diff --git a/lib/screens/settings/components/theme/widget_settings_theme.dart b/lib/screens/settings/components/theme/widget_settings_theme.dart
deleted file mode 100644
index 5d72ca3..0000000
--- a/lib/screens/settings/components/theme/widget_settings_theme.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lightmeter/data/models/dynamic_colors_state.dart';
-import 'package:provider/provider.dart';
-
-import 'components/widget_list_tile_dynamic_colors.dart';
-import 'components/widget_list_tile_theme_type.dart';
-
-class ThemeSettings extends StatelessWidget {
-  const ThemeSettings({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        const ThemeTypeListTile(),
-        const DynamicColorsListTile(),
-      ],
-    );
-  }
-}
diff --git a/lib/screens/settings/components/theme/components/widget_list_tile_theme_type.dart b/lib/screens/settings/components/theme_type/widget_list_tile_theme_type.dart
similarity index 100%
rename from lib/screens/settings/components/theme/components/widget_list_tile_theme_type.dart
rename to lib/screens/settings/components/theme_type/widget_list_tile_theme_type.dart
diff --git a/lib/screens/settings/screen_settings.dart b/lib/screens/settings/screen_settings.dart
index 9a7797a..9a1a9c9 100644
--- a/lib/screens/settings/screen_settings.dart
+++ b/lib/screens/settings/screen_settings.dart
@@ -6,8 +6,8 @@ import 'components/haptics/provider_list_tile_haptics.dart';
 import 'components/report_issue/widget_list_tile_report_issue.dart';
 import 'components/shared/settings_section/widget_settings_section.dart';
 import 'components/source_code/widget_list_tile_source_code.dart';
-import 'components/theme/components/widget_list_tile_dynamic_colors.dart';
-import 'components/theme/components/widget_list_tile_theme_type.dart';
+import 'components/dynamic_colors/widget_list_tile_dynamic_colors.dart';
+import 'components/theme_type/widget_list_tile_theme_type.dart';
 import 'components/version/widget_list_tile_version.dart';
 import 'components/widget_list_tile_fractional_stops.dart';
 
@@ -45,14 +45,14 @@ class SettingsScreen extends StatelessWidget {
                 <SettingsSection>[
                   SettingsSection(
                     title: S.of(context).metering,
-                    children: [
-                      const StopTypeListTile(),
+                    children: const [
+                      StopTypeListTile(),
                     ],
                   ),
                   SettingsSection(
                     title: S.of(context).general,
-                    children: [
-                      const HapticsListTileProvider(),
+                    children: const [
+                      HapticsListTileProvider(),
                     ],
                   ),
                   SettingsSection(