From ee44cc122309d205896ff08f3174dd5425b819ed Mon Sep 17 00:00:00 2001
From: Feichtmeier <frederik.feichtmeier@gmail.com>
Date: Sat, 5 Aug 2023 16:18:56 +0200
Subject: [PATCH] increase lints and fix warnings

---
 analysis_options.yaml                         | 27 ++++++--
 lib/app.dart                                  |  4 +-
 lib/l10n/l10n.dart                            |  2 +-
 lib/main.dart                                 |  2 +-
 lib/services/date_time_service.dart           |  8 +--
 .../display/display_dbus_service.dart         | 13 ++--
 lib/services/display/display_service.dart     | 18 +++---
 .../display/objects/dbus_displays_config.dart | 10 ++-
 lib/services/house_keeping_service.dart       |  8 +--
 lib/services/input_source_service.dart        | 12 ++--
 lib/services/locale_service.dart              |  4 +-
 lib/services/settings_service.dart            |  2 +-
 lib/utils.dart                                |  6 +-
 lib/view/duration_dropdown_button.dart        |  4 +-
 lib/view/link.dart                            |  3 +-
 .../accessibility/accessibility_model.dart    | 46 +++++++-------
 .../accessibility/accessibility_page.dart     |  2 +-
 .../pages/accessibility/global_section.dart   |  4 +-
 .../pages/accessibility/hearing_section.dart  | 12 ++--
 .../pointing_and_clicking_section.dart        | 18 +++---
 .../pages/accessibility/seeing_section.dart   | 47 +++++++-------
 .../pages/accessibility/typing_section.dart   | 42 ++++++-------
 .../pages/appearance/appearance_page.dart     |  2 +-
 lib/view/pages/appearance/dock_model.dart     | 14 ++---
 lib/view/pages/appearance/dock_section.dart   |  2 +-
 lib/view/pages/appearance/theme_section.dart  |  2 +-
 lib/view/pages/apps/apps_page.dart            |  2 +-
 .../bluetooth/bluetooth_device_model.dart     | 10 +--
 .../pages/bluetooth/bluetooth_device_row.dart |  8 +--
 lib/view/pages/bluetooth/bluetooth_model.dart | 18 +++---
 lib/view/pages/bluetooth/bluetooth_page.dart  |  6 +-
 lib/view/pages/color/color_page.dart          |  2 +-
 .../pages/connections/connections_page.dart   |  4 +-
 .../models/access_point_model.dart            | 16 ++---
 .../connections/models/wifi_device_model.dart | 24 +++----
 .../pages/connections/models/wifi_model.dart  | 18 +++---
 .../widgets/access_point_tile.dart            |  8 +--
 .../widgets/authentication_dialog.dart        |  9 ++-
 lib/view/pages/connections/wifi_content.dart  |  6 +-
 .../pages/date_and_time/date_time_model.dart  | 18 +++---
 .../pages/date_and_time/date_time_page.dart   | 10 +--
 .../pages/default_apps/default_apps_page.dart |  2 +-
 lib/view/pages/displays/displays_model.dart   | 22 +++----
 lib/view/pages/displays/displays_page.dart    |  4 +-
 lib/view/pages/displays/nightlight_model.dart | 12 ++--
 lib/view/pages/displays/nightlight_page.dart  |  4 +-
 .../displays/widgets/monitor_section.dart     |  8 +--
 lib/view/pages/info/info_page.dart            | 10 +--
 .../pages/keyboard/input_source_model.dart    | 20 +++---
 .../pages/keyboard/input_source_section.dart  |  2 +-
 .../input_source_selection_section.dart       | 13 ++--
 lib/view/pages/keyboard/keyboard_page.dart    |  2 +-
 .../keyboard/keyboard_settings_page.dart      |  4 +-
 .../pages/keyboard/keyboard_shortcut_row.dart |  8 +--
 .../keyboard/keyboard_shortcuts_model.dart    |  2 +-
 .../keyboard/keyboard_shortcuts_page.dart     |  2 +-
 .../keyboard/special_characters_model.dart    | 21 +++----
 .../keyboard/special_characters_section.dart  | 12 ++--
 .../mouse_and_touchpad/general_section.dart   |  2 +-
 .../mouse_and_touchpad_model.dart             | 16 ++---
 .../mouse_and_touchpad_page.dart              |  2 +-
 .../mouse_and_touchpad/mouse_section.dart     |  2 +-
 .../mouse_and_touchpad/touchpad_section.dart  |  2 +-
 .../multitasking/multi_tasking_model.dart     | 26 ++++----
 .../multitasking/multi_tasking_page.dart      |  6 +-
 .../app_notifications_section.dart            |  4 +-
 .../global_notifications_section.dart         |  6 +-
 .../notifications/notifications_model.dart    |  8 +--
 .../notifications/notifications_page.dart     |  2 +-
 .../online_accounts/online_accounts_page.dart |  2 +-
 lib/view/pages/power/battery_section.dart     |  2 +-
 lib/view/pages/power/battery_widgets.dart     |  6 +-
 lib/view/pages/power/lid_close_model.dart     |  2 +-
 lib/view/pages/power/lid_close_section.dart   |  2 +-
 lib/view/pages/power/power_page.dart          |  2 +-
 .../pages/power/power_profile_section.dart    |  4 +-
 .../pages/power/power_profile_widgets.dart    |  4 +-
 .../pages/power/power_settings_dialogs.dart   |  5 +-
 .../pages/power/power_settings_section.dart   |  4 +-
 lib/view/pages/power/suspend_section.dart     |  2 +-
 .../pages/privacy/connectivity_model.dart     |  4 +-
 lib/view/pages/privacy/connectivity_page.dart |  2 +-
 .../pages/privacy/house_keeping_page.dart     |  9 ++-
 lib/view/pages/privacy/location_model.dart    |  2 +-
 lib/view/pages/privacy/location_page.dart     |  2 +-
 lib/view/pages/privacy/privacy_model.dart     |  4 +-
 lib/view/pages/privacy/privacy_page.dart      |  2 +-
 lib/view/pages/privacy/reporting_model.dart   |  2 +-
 lib/view/pages/privacy/reporting_page.dart    |  2 +-
 .../pages/privacy/screen_saver_model.dart     |  6 +-
 lib/view/pages/privacy/screen_saver_page.dart |  2 +-
 .../region_and_language_model.dart            |  6 +-
 .../region_and_language_page.dart             | 12 ++--
 .../removable_media_model.dart                | 10 +--
 .../removable_media/removable_media_page.dart |  2 +-
 lib/view/pages/search/search_page.dart        |  2 +-
 lib/view/pages/settings_alert_dialog.dart     |  4 +-
 lib/view/pages/settings_page.dart             |  4 +-
 lib/view/pages/settings_simple_dialog.dart    |  4 +-
 lib/view/pages/sound/sound_model.dart         |  6 +-
 lib/view/pages/sound/sound_page.dart          |  8 +--
 lib/view/pages/users/users.dart               |  2 +-
 .../wallpaper/color_shading_option_row.dart   |  6 +-
 lib/view/pages/wallpaper/wallpaper_model.dart | 62 +++++++++----------
 lib/view/pages/wallpaper/wallpaper_page.dart  | 19 +++---
 lib/view/search_app_bar.dart                  |  4 +-
 lib/view/section_description.dart             |  3 +-
 lib/view/selectable_svg_image.dart            |  4 +-
 test/test_helper.dart                         |  2 +-
 test/widgets/app_theme_test.dart              | 11 ++--
 test/widgets/yaru_check_box_row_test.dart     |  2 +-
 test/widgets/yaru_extra_options_row_test.dart |  2 +-
 test/widgets/yaru_single_info_row_test.dart   |  2 +-
 test/widgets/yaru_switch_row_test.dart        |  2 +-
 .../widgets/yaru_togggle_button_row_test.dart |  4 +-
 115 files changed, 479 insertions(+), 473 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index e09a3f2f..15f4a4f6 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -10,9 +10,28 @@ analyzer:
 
 linter:
   rules:
-    avoid_print: true
-    cancel_subscriptions: true
     prefer_single_quotes: true
-    prefer_const_constructors: true
-    prefer_const_declarations: true
     require_trailing_commas: true
+    always_declare_return_types: true
+    avoid_catches_without_on_clauses: true
+    avoid_equals_and_hash_code_on_mutable_classes: true
+    avoid_types_on_closure_parameters: true
+    cancel_subscriptions: true
+    directives_ordering: true
+    eol_at_end_of_file: true
+    omit_local_variable_types: true
+    prefer_asserts_in_initializer_lists: true
+    prefer_const_constructors: true
+    prefer_final_in_for_each: true
+    prefer_final_locals: true
+    prefer_null_aware_method_calls: true
+    prefer_null_aware_operators: true
+    sort_constructors_first: true
+    sort_unnamed_constructors_first: true
+    sort_pub_dependencies: true
+    type_annotate_public_apis: true
+    unawaited_futures: true
+    unnecessary_lambdas: true
+    unnecessary_parenthesis: true
+    use_named_constants: true
+    use_super_parameters: true
diff --git a/lib/app.dart b/lib/app.dart
index c4f8b2f0..37cb02dd 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -8,8 +8,8 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class UbuntuSettingsApp extends StatefulWidget {
   const UbuntuSettingsApp({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<UbuntuSettingsApp> createState() => _UbuntuSettingsAppState();
diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart
index 4f6d51bf..d19e75fd 100644
--- a/lib/l10n/l10n.dart
+++ b/lib/l10n/l10n.dart
@@ -1,5 +1,5 @@
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 export 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
index 0572eca1..cd16751c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -87,7 +87,7 @@ void main() async {
         ),
         Provider<DisplayService>(
           create: (_) => DisplayService(),
-          dispose: (_, DisplayService service) => service.dispose(),
+          dispose: (_, service) => service.dispose(),
         ),
       ],
       child: const UbuntuSettingsApp(),
diff --git a/lib/services/date_time_service.dart b/lib/services/date_time_service.dart
index e9a66b52..a8c2bf9c 100644
--- a/lib/services/date_time_service.dart
+++ b/lib/services/date_time_service.dart
@@ -128,18 +128,18 @@ extension _DateTimeRemoteObject on DBusRemoteObject {
 
   Future<void> setTimeZone(String timezone) async {
     final args = [DBusString(timezone), const DBusBoolean(false)];
-    callMethod(_kDateTimeInterface, _kSetTimezoneMethodName, args);
+    await callMethod(_kDateTimeInterface, _kSetTimezoneMethodName, args);
   }
 
   Future<void> setTime(int time) async {
-    bool? ntp = await getNtp();
+    final ntp = await getNtp();
     if (ntp == null || ntp == true) return;
     final args = [
       DBusInt64(time),
       const DBusBoolean(false),
       const DBusBoolean(false)
     ];
-    callMethod(_kDateTimeInterface, _kSetTimeMethodName, args);
+    await callMethod(_kDateTimeInterface, _kSetTimeMethodName, args);
   }
 
   Future<DateTime?> getDateTime() async {
@@ -156,7 +156,7 @@ extension _DateTimeRemoteObject on DBusRemoteObject {
   Future<void> setNtp(bool? value) async {
     if (value == null) return;
     final args = [DBusBoolean(value), const DBusBoolean(false)];
-    callMethod(_kDateTimeInterface, _kSetNtpMethodName, args);
+    await callMethod(_kDateTimeInterface, _kSetNtpMethodName, args);
   }
 }
 
diff --git a/lib/services/display/display_dbus_service.dart b/lib/services/display/display_dbus_service.dart
index 44025905..3e1b2a2c 100644
--- a/lib/services/display/display_dbus_service.dart
+++ b/lib/services/display/display_dbus_service.dart
@@ -1,6 +1,6 @@
 import 'package:dbus/dbus.dart';
-import 'package:settings/services/display/objects/dbus_displays_config.dart';
 import 'package:settings/generated/dbus/display-config-remote-object.dart';
+import 'package:settings/services/display/objects/dbus_displays_config.dart';
 
 const _displaysInterface = 'org.gnome.Mutter.DisplayConfig';
 
@@ -24,8 +24,7 @@ const _displayPath = '/org/gnome/Mutter/DisplayConfig';
 class DisplayDBusService {
   DisplayDBusService() : _object = _createObject() {
     /// Listen to signal stream, when a change occur, we update our data
-    _object.monitorsChanged
-        .listen((OrgGnomeMutterDisplayConfigMonitorsChanged signal) {
+    _object.monitorsChanged.listen((signal) {
       if (signal.name == 'MonitorsChanged') {
         getCurrent();
       }
@@ -49,8 +48,8 @@ class DisplayDBusService {
   }
 
   Future<DBusDisplaysConfig> getCurrent() async {
-    List<DBusValue>? state = await _object.callGetCurrentState();
-    List<dynamic> list = state.map((e) => _toNative(e)).toList();
+    final state = await _object.callGetCurrentState();
+    final list = state.map(_toNative).toList();
     return DBusDisplaysConfig(list);
   }
 
@@ -73,9 +72,9 @@ class DisplayDBusService {
       output =
           value.map((key, value) => MapEntry(_toNative(key), _toNative(value)));
     } else if (value is Iterable) {
-      output = value.map((e) => _toNative(e)).toList();
+      output = value.map(_toNative).toList();
     } else if (value is DBusArray) {
-      output = value.toNative().map((e) => _toNative(e)).toList();
+      output = value.toNative().map(_toNative).toList();
     } else if (value is DBusValue) {
       output = value.toNative();
     } else {
diff --git a/lib/services/display/display_service.dart b/lib/services/display/display_service.dart
index 99915348..9ba84ce3 100644
--- a/lib/services/display/display_service.dart
+++ b/lib/services/display/display_service.dart
@@ -11,7 +11,7 @@ class DisplayService {
       : _displayDBusService = DisplayDBusService(),
         _currentNotifier = ValueNotifier(null),
         _initialNotifier = ValueNotifier(null) {
-    _loadState(notifyStream: true).then((DisplaysConfiguration value) {
+    _loadState(notifyStream: true).then((value) {
       _initialNotifier.value = value;
       _currentNotifier.value = value;
     });
@@ -54,13 +54,13 @@ class DisplayService {
     /// never pass here)
     if (_currentNotifier.value == null) {}
 
-    final DBusDisplaysConfig displayConfig =
+    final displayConfig =
         await _displayDBusService.getCurrent();
 
-    List<DBusStruct> logicalParameterValues = [];
+    final logicalParameterValues = <DBusStruct>[];
 
-    for (int i = 0; i < displayConfig.monitorsLength; i++) {
-      final DisplayMonitorConfiguration confMonitor =
+    for (var i = 0; i < displayConfig.monitorsLength; i++) {
+      final confMonitor =
           _currentNotifier.value!.configurations[i];
 
       // x ; y ; scale ; transform(rotation) ; primary ; monitors
@@ -106,7 +106,7 @@ class DisplayService {
   }
 
   Future<DisplaysConfiguration> _loadState({required bool notifyStream}) {
-    final Future<DisplaysConfiguration> future = _displayDBusService
+    final future = _displayDBusService
         .getCurrent()
         .then(_mapToModel)
         .then((value) => latest = value);
@@ -118,10 +118,10 @@ class DisplayService {
   }
 
   DisplaysConfiguration _mapToModel(DBusDisplaysConfig dbusConfiguration) {
-    final int monitorsCount = dbusConfiguration.monitorsLength;
-    final List<DisplayMonitorConfiguration> confs = [];
+    final monitorsCount = dbusConfiguration.monitorsLength;
+    final confs = <DisplayMonitorConfiguration>[];
 
-    for (int i = 0; i < monitorsCount; i++) {
+    for (var i = 0; i < monitorsCount; i++) {
       /// map data only if there's a current option
       /// if no current option
       ///   => monitor not used
diff --git a/lib/services/display/objects/dbus_displays_config.dart b/lib/services/display/objects/dbus_displays_config.dart
index 65fa6f82..a4c1b56b 100644
--- a/lib/services/display/objects/dbus_displays_config.dart
+++ b/lib/services/display/objects/dbus_displays_config.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: type_annotate_public_apis
+
 class DBusDisplaysConfig {
   DBusDisplaysConfig(List<dynamic> list)
       : serial = list[0],
@@ -26,10 +28,14 @@ class DBusDisplaysConfig {
 
   /// * a(siiddada{sv}) modes: available modes
   List<Option> availableOptions(index) =>
-      (_monitors[index][1] as List<dynamic>).map((e) => Option(e)).toList();
+      (_monitors[index][1] as List<dynamic>).map(
+        (e) {
+          return Option(e);
+        },
+      ).toList();
 
   Option? currentOption(index) {
-    final List<Option> options = availableOptions(index);
+    final options = availableOptions(index);
     bool predicate(Option option) => option.isCurrent;
     if (options.any(predicate)) {
       return options.where(predicate).first;
diff --git a/lib/services/house_keeping_service.dart b/lib/services/house_keeping_service.dart
index 33b6a7e7..e1c96c5a 100644
--- a/lib/services/house_keeping_service.dart
+++ b/lib/services/house_keeping_service.dart
@@ -10,9 +10,9 @@ const _kRemoveTempFiles = 'RemoveTempFiles';
 const _kRecentlyUsedFilePathSuffix = '/.local/share/recently-used.xbel';
 
 class HouseKeepingService {
-  final DBusRemoteObject _object;
 
   HouseKeepingService() : _object = _createObject();
+  final DBusRemoteObject _object;
 
   static DBusRemoteObject _createObject() {
     return DBusRemoteObject(
@@ -31,11 +31,11 @@ class HouseKeepingService {
   void removeTempFiles() => _object.removeTempFiles();
 
   void clearRecentlyUsed() {
-    final String path =
+    final path =
         Platform.environment['HOME']! + _kRecentlyUsedFilePathSuffix;
     if (Platform.environment['HOME'] == null) return;
-    var file = File(path);
-    var sink = file.openWrite();
+    final file = File(path);
+    final sink = file.openWrite();
     const cleanContent = '''<?xml version="1.0" encoding="UTF-8"?>
                             <xbel version="1.0" xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info">
                             </xbel>''';
diff --git a/lib/services/input_source_service.dart b/lib/services/input_source_service.dart
index ecec5f80..26759625 100644
--- a/lib/services/input_source_service.dart
+++ b/lib/services/input_source_service.dart
@@ -3,12 +3,12 @@ import 'dart:io';
 import 'package:xml/xml.dart';
 
 class InputSourceService {
-  static const pathToXml = '/usr/share/X11/xkb/rules/base.xml';
-  late final List<InputSource> inputSources;
 
   InputSourceService() {
     inputSources = _loadInputSources();
   }
+  static const pathToXml = '/usr/share/X11/xkb/rules/base.xml';
+  late final List<InputSource> inputSources;
 
   List<InputSource> _loadInputSources() {
     final document = XmlDocument.parse(File(pathToXml).readAsStringSync());
@@ -48,16 +48,16 @@ class InputSourceService {
 }
 
 class InputSource {
+
+  InputSource({this.name, this.description, required this.variants});
   final String? name;
   final String? description;
   final List<InputSourceVariant> variants;
-
-  InputSource({this.name, this.description, required this.variants});
 }
 
 class InputSourceVariant {
-  final String? name;
-  final String? description;
 
   InputSourceVariant({this.name, this.description});
+  final String? name;
+  final String? description;
 }
diff --git a/lib/services/locale_service.dart b/lib/services/locale_service.dart
index 51898ac3..52aa4a96 100644
--- a/lib/services/locale_service.dart
+++ b/lib/services/locale_service.dart
@@ -80,14 +80,14 @@ extension _LocaleRemoteObject on DBusRemoteObject {
   Future<void> setLocale(List<String?>? value) async {
     if (value == null) return;
     final children = <DBusString>[];
-    for (var string in value) {
+    for (final string in value) {
       if (string != null) {
         children.add(DBusString(string));
       }
     }
     final array = DBusArray(DBusSignature('s'), children);
     final args = [array, const DBusBoolean(false)];
-    callMethod(_kLocaleInterfaceName, _kSetLocaleMethodName, args);
+    await callMethod(_kLocaleInterfaceName, _kSetLocaleMethodName, args);
   }
 }
 
diff --git a/lib/services/settings_service.dart b/lib/services/settings_service.dart
index 5d958da0..65fd3d37 100644
--- a/lib/services/settings_service.dart
+++ b/lib/services/settings_service.dart
@@ -96,7 +96,7 @@ class Settings {
       return;
     }
     _values[key] = value;
-    _settings.set(key, DBusUint32(value));
+    await _settings.set(key, DBusUint32(value));
   }
 
   Future<void> resetValue(String key) {
diff --git a/lib/utils.dart b/lib/utils.dart
index bc78842e..c53c0c1a 100644
--- a/lib/utils.dart
+++ b/lib/utils.dart
@@ -11,7 +11,7 @@ Color colorFromHex(String hexString) {
 /// Darken a color by [percent] amount (100 = black)
 Color darken(Color c, [int percent = 10]) {
   assert(1 <= percent && percent <= 100);
-  var f = 1 - percent / 100;
+  final f = 1 - percent / 100;
   return Color.fromARGB(
     c.alpha,
     (c.red * f).round(),
@@ -23,7 +23,7 @@ Color darken(Color c, [int percent = 10]) {
 /// Lighten a color by [percent] amount (100 = white)
 Color lighten(Color c, [int percent = 10]) {
   assert(1 <= percent && percent <= 100);
-  var p = percent / 100;
+  final p = percent / 100;
   return Color.fromARGB(
     c.alpha,
     c.red + ((255 - c.red) * p).round(),
@@ -45,7 +45,7 @@ String camelCaseToSplitByDash(String value) {
   final beforeCapitalLetterRegex = RegExp(r'(?=[A-Z])');
   final parts = value.split(beforeCapitalLetterRegex);
   var newString = '';
-  for (var part in parts) {
+  for (final part in parts) {
     if (newString.isEmpty) {
       newString = part.toLowerCase();
     } else {
diff --git a/lib/view/duration_dropdown_button.dart b/lib/view/duration_dropdown_button.dart
index 94617a1b..d34e7e9c 100644
--- a/lib/view/duration_dropdown_button.dart
+++ b/lib/view/duration_dropdown_button.dart
@@ -5,12 +5,12 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class DurationDropdownButton extends StatelessWidget {
   const DurationDropdownButton({
-    Key? key,
+    super.key,
     required this.value,
     required this.values,
     required this.onChanged,
     this.zeroValueText,
-  }) : super(key: key);
+  });
 
   /// The current value of the [DropdownButton]
   final int? value;
diff --git a/lib/view/link.dart b/lib/view/link.dart
index 4b09bf25..bde7ce49 100644
--- a/lib/view/link.dart
+++ b/lib/view/link.dart
@@ -2,8 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class Link extends StatelessWidget {
-  const Link({Key? key, required this.url, required this.linkText})
-      : super(key: key);
+  const Link({super.key, required this.url, required this.linkText});
 
   final String url;
   final String linkText;
diff --git a/lib/view/pages/accessibility/accessibility_model.dart b/lib/view/pages/accessibility/accessibility_model.dart
index 681c105d..54ea4872 100644
--- a/lib/view/pages/accessibility/accessibility_model.dart
+++ b/lib/view/pages/accessibility/accessibility_model.dart
@@ -5,6 +5,28 @@ import 'package:settings/services/settings_service.dart';
 import 'package:settings/utils.dart';
 
 class AccessibilityModel extends ChangeNotifier {
+
+  AccessibilityModel(SettingsService service)
+      : _desktopA11Settings = service.lookup(schemaDesktopA11y),
+        _a11yAppsSettings = service.lookup(schemaA11yApps),
+        _a11yKeyboardSettings = service.lookup(schemaA11yKeyboard),
+        _a11yMagnifierSettings = service.lookup(schemaA11yMagnifier),
+        _a11yMouseSettings = service.lookup(schemaA11yMouse),
+        _wmPreferencesSettings = service.lookup(schemaWmPreferences),
+        _interfaceSettings = service.lookup(schemaInterface),
+        _peripheralsMouseSettings = service.lookup(schemaPeripheralsMouse),
+        _peripheralsKeyboardSettings =
+            service.lookup(schemaPeripheralsKeyboard) {
+    _desktopA11Settings?.addListener(notifyListeners);
+    _a11yAppsSettings?.addListener(notifyListeners);
+    _a11yKeyboardSettings?.addListener(notifyListeners);
+    _a11yMagnifierSettings?.addListener(notifyListeners);
+    _a11yMouseSettings?.addListener(notifyListeners);
+    _wmPreferencesSettings?.addListener(notifyListeners);
+    _interfaceSettings?.addListener(notifyListeners);
+    _peripheralsMouseSettings?.addListener(notifyListeners);
+    _peripheralsKeyboardSettings?.addListener(notifyListeners);
+  }
   static const _gtkThemeKey = 'gtk-theme';
   static const _iconThemeKey = 'icon-theme';
   static const _textScalingFactorKey = 'text-scaling-factor';
@@ -61,28 +83,6 @@ class AccessibilityModel extends ChangeNotifier {
   static const _dwellTimeKey = 'dwell-time';
   static const _dwellThresholdKey = 'dwell-threshold';
 
-  AccessibilityModel(SettingsService service)
-      : _desktopA11Settings = service.lookup(schemaDesktopA11y),
-        _a11yAppsSettings = service.lookup(schemaA11yApps),
-        _a11yKeyboardSettings = service.lookup(schemaA11yKeyboard),
-        _a11yMagnifierSettings = service.lookup(schemaA11yMagnifier),
-        _a11yMouseSettings = service.lookup(schemaA11yMouse),
-        _wmPreferencesSettings = service.lookup(schemaWmPreferences),
-        _interfaceSettings = service.lookup(schemaInterface),
-        _peripheralsMouseSettings = service.lookup(schemaPeripheralsMouse),
-        _peripheralsKeyboardSettings =
-            service.lookup(schemaPeripheralsKeyboard) {
-    _desktopA11Settings?.addListener(notifyListeners);
-    _a11yAppsSettings?.addListener(notifyListeners);
-    _a11yKeyboardSettings?.addListener(notifyListeners);
-    _a11yMagnifierSettings?.addListener(notifyListeners);
-    _a11yMouseSettings?.addListener(notifyListeners);
-    _wmPreferencesSettings?.addListener(notifyListeners);
-    _interfaceSettings?.addListener(notifyListeners);
-    _peripheralsMouseSettings?.addListener(notifyListeners);
-    _peripheralsKeyboardSettings?.addListener(notifyListeners);
-  }
-
   @override
   void dispose() {
     _desktopA11Settings?.removeListener(notifyListeners);
@@ -141,7 +141,7 @@ class AccessibilityModel extends ChangeNotifier {
   bool get largeText => _textScalingFactor != null && _textScalingFactor! > 1.0;
 
   void setLargeText(bool value) {
-    double factor = value ? 1.25 : 1.0;
+    final factor = value ? 1.25 : 1.0;
     _interfaceSettings?.setValue(_textScalingFactorKey, factor);
     notifyListeners();
   }
diff --git a/lib/view/pages/accessibility/accessibility_page.dart b/lib/view/pages/accessibility/accessibility_page.dart
index 28d4d12e..68432d66 100644
--- a/lib/view/pages/accessibility/accessibility_page.dart
+++ b/lib/view/pages/accessibility/accessibility_page.dart
@@ -11,7 +11,7 @@ import 'package:settings/view/pages/accessibility/typing_section.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class AccessibilityPage extends StatelessWidget {
-  const AccessibilityPage({Key? key}) : super(key: key);
+  const AccessibilityPage({super.key});
 
   static Widget create(BuildContext context) {
     final service = Provider.of<SettingsService>(context, listen: false);
diff --git a/lib/view/pages/accessibility/global_section.dart b/lib/view/pages/accessibility/global_section.dart
index cabfbd39..e58c1090 100644
--- a/lib/view/pages/accessibility/global_section.dart
+++ b/lib/view/pages/accessibility/global_section.dart
@@ -7,7 +7,7 @@ import 'package:settings/view/pages/accessibility/accessibility_model.dart';
 import 'package:settings/view/settings_section.dart';
 
 class GlobalSection extends StatelessWidget {
-  const GlobalSection({Key? key}) : super(key: key);
+  const GlobalSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -19,7 +19,7 @@ class GlobalSection extends StatelessWidget {
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.alwaysShowUniversalAccessMenu),
           value: model.universalAccessStatus,
-          onChanged: (value) => model.setUniversalAccessStatus(value),
+          onChanged: model.setUniversalAccessStatus,
         ),
       ],
     );
diff --git a/lib/view/pages/accessibility/hearing_section.dart b/lib/view/pages/accessibility/hearing_section.dart
index 9d9c2428..e499fbda 100644
--- a/lib/view/pages/accessibility/hearing_section.dart
+++ b/lib/view/pages/accessibility/hearing_section.dart
@@ -10,7 +10,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class HearingSection extends StatelessWidget {
-  const HearingSection({Key? key}) : super(key: key);
+  const HearingSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -25,7 +25,7 @@ class HearingSection extends StatelessWidget {
 }
 
 class _VisualAlerts extends StatelessWidget {
-  const _VisualAlerts({Key? key}) : super(key: key);
+  const _VisualAlerts();
 
   @override
   Widget build(BuildContext context) {
@@ -35,7 +35,7 @@ class _VisualAlerts extends StatelessWidget {
       actionLabel: context.l10n.visualAlerts,
       actionDescription: context.l10n.visualAlertsDescription,
       value: model.visualAlerts,
-      onChanged: (value) => model.setVisualAlerts(value),
+      onChanged: model.setVisualAlerts,
       onPressed: () => showDialog(
         context: context,
         builder: (_) => ChangeNotifierProvider.value(
@@ -48,7 +48,7 @@ class _VisualAlerts extends StatelessWidget {
 }
 
 class _VisualAlertsSettings extends StatelessWidget {
-  const _VisualAlertsSettings({Key? key}) : super(key: key);
+  const _VisualAlertsSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -63,7 +63,7 @@ class _VisualAlertsSettings extends StatelessWidget {
           leading: YaruRadio(
             value: 'frame-flash',
             groupValue: model.visualAlertsType,
-            onChanged: (String? value) => model.setVisualAlertsType(value!),
+            onChanged: (value) => model.setVisualAlertsType(value!),
           ),
         ),
         ListTile(
@@ -71,7 +71,7 @@ class _VisualAlertsSettings extends StatelessWidget {
           leading: YaruRadio(
             value: 'fullscreen-flash',
             groupValue: model.visualAlertsType,
-            onChanged: (String? value) => model.setVisualAlertsType(value!),
+            onChanged: (value) => model.setVisualAlertsType(value!),
           ),
         ),
       ],
diff --git a/lib/view/pages/accessibility/pointing_and_clicking_section.dart b/lib/view/pages/accessibility/pointing_and_clicking_section.dart
index 5c0317d6..1b436395 100644
--- a/lib/view/pages/accessibility/pointing_and_clicking_section.dart
+++ b/lib/view/pages/accessibility/pointing_and_clicking_section.dart
@@ -11,7 +11,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class PointingAndClickingSection extends StatelessWidget {
-  const PointingAndClickingSection({Key? key}) : super(key: key);
+  const PointingAndClickingSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -23,12 +23,12 @@ class PointingAndClickingSection extends StatelessWidget {
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.mouseKeys),
           value: model.mouseKeys,
-          onChanged: (value) => model.setMouseKeys(value),
+          onChanged: model.setMouseKeys,
         ),
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.locatePointer),
           value: model.locatePointer,
-          onChanged: (value) => model.setLocatePointer(value),
+          onChanged: model.setLocatePointer,
         ),
         const _ClickAssist(),
         YaruSliderRow(
@@ -37,7 +37,7 @@ class PointingAndClickingSection extends StatelessWidget {
           min: 100,
           max: 1000,
           defaultValue: 400,
-          onChanged: (value) => model.setDoubleClickDelay(value),
+          onChanged: model.setDoubleClickDelay,
         ),
       ],
     );
@@ -45,7 +45,7 @@ class PointingAndClickingSection extends StatelessWidget {
 }
 
 class _ClickAssist extends StatelessWidget {
-  const _ClickAssist({Key? key}) : super(key: key);
+  const _ClickAssist();
 
   @override
   Widget build(BuildContext context) {
@@ -61,7 +61,7 @@ class _ClickAssist extends StatelessWidget {
             width: 40,
             height: 40,
             child: OutlinedButton(
-              style: OutlinedButton.styleFrom(padding: const EdgeInsets.all(0)),
+              style: OutlinedButton.styleFrom(padding: EdgeInsets.zero),
               onPressed: () => showDialog(
                 context: context,
                 builder: (_) => ChangeNotifierProvider.value(
@@ -79,7 +79,7 @@ class _ClickAssist extends StatelessWidget {
 }
 
 class _ClickAssistSettings extends StatelessWidget {
-  const _ClickAssistSettings({Key? key}) : super(key: key);
+  const _ClickAssistSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -93,7 +93,7 @@ class _ClickAssistSettings extends StatelessWidget {
           trailingWidget: Text(context.l10n.simulatedSecondaryClick),
           actionDescription: context.l10n.simulatedSecondaryClickDescription,
           value: model.simulatedSecondaryClick,
-          onChanged: (value) => model.setSimulatedSecondaryClick(value),
+          onChanged: model.setSimulatedSecondaryClick,
         ),
         Padding(
           padding: const EdgeInsets.only(left: 16.0),
@@ -112,7 +112,7 @@ class _ClickAssistSettings extends StatelessWidget {
           trailingWidget: Text(context.l10n.hoverClick),
           actionDescription: context.l10n.hoverClickDescription,
           value: model.dwellClick,
-          onChanged: (value) => model.setDwellClick(value),
+          onChanged: model.setDwellClick,
         ),
         Padding(
           padding: const EdgeInsets.only(left: 16.0),
diff --git a/lib/view/pages/accessibility/seeing_section.dart b/lib/view/pages/accessibility/seeing_section.dart
index 0be55ed4..1775906a 100644
--- a/lib/view/pages/accessibility/seeing_section.dart
+++ b/lib/view/pages/accessibility/seeing_section.dart
@@ -16,7 +16,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class SeeingSection extends StatelessWidget {
-  const SeeingSection({Key? key}) : super(key: key);
+  const SeeingSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -28,19 +28,19 @@ class SeeingSection extends StatelessWidget {
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.highContrast),
           value: model.highContrast,
-          onChanged: (value) => model.setHighContrast(value),
+          onChanged: model.setHighContrast,
         ),
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.largeText),
           value: model.largeText,
-          onChanged: (value) => model.setLargeText(value),
+          onChanged: model.setLargeText,
         ),
         const _CursorSize(),
         YaruExtraOptionRow(
           iconData: YaruIcons.gear,
           actionLabel: context.l10n.zoom,
           value: model.zoom,
-          onChanged: (value) => model.setZoom(value),
+          onChanged: model.setZoom,
           onPressed: () => showDialog(
             context: context,
             builder: (_) => ChangeNotifierProvider.value(
@@ -53,13 +53,13 @@ class SeeingSection extends StatelessWidget {
           trailingWidget: Text(context.l10n.screenReader),
           actionDescription: context.l10n.screenReaderDescription,
           value: model.screenReader,
-          onChanged: (value) => model.setScreenReader(value),
+          onChanged: model.setScreenReader,
         ),
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.soundKeys),
           actionDescription: context.l10n.soundKeysDescription,
           value: model.toggleKeys,
-          onChanged: (value) => model.setToggleKeys(value),
+          onChanged: model.setToggleKeys,
         ),
       ],
     );
@@ -67,7 +67,7 @@ class SeeingSection extends StatelessWidget {
 }
 
 class _CursorSize extends StatelessWidget {
-  const _CursorSize({Key? key}) : super(key: key);
+  const _CursorSize();
 
   @override
   Widget build(BuildContext context) {
@@ -85,7 +85,7 @@ class _CursorSize extends StatelessWidget {
             width: 40,
             height: 40,
             child: OutlinedButton(
-              style: OutlinedButton.styleFrom(padding: const EdgeInsets.all(0)),
+              style: OutlinedButton.styleFrom(padding: EdgeInsets.zero),
               onPressed: () => showDialog(
                 context: context,
                 builder: (_) => ChangeNotifierProvider.value(
@@ -103,7 +103,7 @@ class _CursorSize extends StatelessWidget {
 }
 
 class _CursorSizeSettings extends StatelessWidget {
-  const _CursorSizeSettings({Key? key}) : super(key: key);
+  const _CursorSizeSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -145,11 +145,10 @@ class _CursorSizeSettings extends StatelessWidget {
 
 class _CursorButton extends StatelessWidget {
   const _CursorButton({
-    Key? key,
     required this.imageName,
     required this.onPressed,
     required this.selected,
-  }) : super(key: key);
+  });
 
   final String imageName;
   final VoidCallback onPressed;
@@ -180,7 +179,7 @@ class _CursorButton extends StatelessWidget {
 }
 
 class _ZoomSettings extends StatelessWidget {
-  const _ZoomSettings({Key? key}) : super(key: key);
+  const _ZoomSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -216,7 +215,7 @@ class _ZoomSettings extends StatelessWidget {
 }
 
 class _MagnifierOptions extends StatelessWidget {
-  const _MagnifierOptions({Key? key}) : super(key: key);
+  const _MagnifierOptions();
 
   @override
   Widget build(BuildContext context) {
@@ -240,7 +239,7 @@ class _MagnifierOptions extends StatelessWidget {
               step: 0.25,
               decimals: 2,
               value: model.magFactor ?? 2,
-              onChanged: (value) => model.setMagFactor(value),
+              onChanged: model.setMagFactor,
             ),
           ),
         ),
@@ -255,7 +254,7 @@ class _MagnifierOptions extends StatelessWidget {
 }
 
 class _MagnifierPositionOptions extends StatelessWidget {
-  const _MagnifierPositionOptions({Key? key}) : super(key: key);
+  const _MagnifierPositionOptions();
 
   @override
   Widget build(BuildContext context) {
@@ -269,14 +268,14 @@ class _MagnifierPositionOptions extends StatelessWidget {
             value: true,
             enabled: true,
             groupValue: model.lensMode,
-            onChanged: (bool? value) => model.setLensMode(value!),
+            onChanged: (value) => model.setLensMode(value!),
           ),
           _RadioRow(
             title: context.l10n.screenPart,
             enabled: true,
             value: false,
             groupValue: model.lensMode,
-            onChanged: (bool? value) => model.setLensMode(value!),
+            onChanged: (value) => model.setLensMode(value!),
             secondary: YaruPopupMenuButton<ScreenPosition>(
               enabled: model.screenPosition != null,
               initialValue: model.screenPosition,
@@ -311,21 +310,21 @@ class _MagnifierPositionOptions extends StatelessWidget {
                   title: context.l10n.keepMagnifierCursorCentered,
                   value: 'centered',
                   groupValue: model.mouseTracking,
-                  onChanged: (String? value) => model.setMouseTracking(value!),
+                  onChanged: (value) => model.setMouseTracking(value!),
                   enabled: model.screenPartEnabled,
                 ),
                 _RadioRow(
                   title: context.l10n.magnifierCursorPushesContentsAround,
                   value: 'push',
                   groupValue: model.mouseTracking,
-                  onChanged: (String? value) => model.setMouseTracking(value!),
+                  onChanged: (value) => model.setMouseTracking(value!),
                   enabled: model.screenPartEnabled,
                 ),
                 _RadioRow(
                   title: context.l10n.magnifierCursorMovesWithContents,
                   value: 'proportional',
                   groupValue: model.mouseTracking,
-                  onChanged: (String? value) => model.setMouseTracking(value!),
+                  onChanged: (value) => model.setMouseTracking(value!),
                   enabled: model.screenPartEnabled,
                 ),
               ],
@@ -339,14 +338,14 @@ class _MagnifierPositionOptions extends StatelessWidget {
 
 class _RadioRow<T> extends StatelessWidget {
   const _RadioRow({
-    Key? key,
+    super.key,
     required this.title,
     required this.value,
     required this.groupValue,
     required this.onChanged,
     required this.enabled,
     this.secondary,
-  }) : super(key: key);
+  });
 
   final String title;
   final T value;
@@ -384,7 +383,7 @@ class _RadioRow<T> extends StatelessWidget {
 }
 
 class _CrosshairsOptions extends StatelessWidget {
-  const _CrosshairsOptions({Key? key}) : super(key: key);
+  const _CrosshairsOptions();
 
   @override
   Widget build(BuildContext context) {
@@ -500,7 +499,7 @@ class _CrosshairsOptions extends StatelessWidget {
 }
 
 class _ColorEffectsOptions extends StatelessWidget {
-  const _ColorEffectsOptions({Key? key}) : super(key: key);
+  const _ColorEffectsOptions();
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/accessibility/typing_section.dart b/lib/view/pages/accessibility/typing_section.dart
index 180cd696..b672aacd 100644
--- a/lib/view/pages/accessibility/typing_section.dart
+++ b/lib/view/pages/accessibility/typing_section.dart
@@ -13,7 +13,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class TypingSection extends StatelessWidget {
-  const TypingSection({Key? key}) : super(key: key);
+  const TypingSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -25,7 +25,7 @@ class TypingSection extends StatelessWidget {
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.screenKeyboard),
           value: model.screenKeyboard,
-          onChanged: (value) => model.setScreenKeyboard(value),
+          onChanged: model.setScreenKeyboard,
         ),
         const _RepeatKeys(),
         const _CursorBlinking(),
@@ -36,7 +36,7 @@ class TypingSection extends StatelessWidget {
 }
 
 class _RepeatKeys extends StatelessWidget {
-  const _RepeatKeys({Key? key}) : super(key: key);
+  const _RepeatKeys();
 
   @override
   Widget build(BuildContext context) {
@@ -46,7 +46,7 @@ class _RepeatKeys extends StatelessWidget {
       actionLabel: context.l10n.repeatKeys,
       actionDescription: context.l10n.repeatKeysDescription,
       value: model.keyboardRepeat,
-      onChanged: (value) => model.setKeyboardRepeat(value),
+      onChanged: model.setKeyboardRepeat,
       onPressed: () => showDialog(
         context: context,
         builder: (_) => ChangeNotifierProvider.value(
@@ -59,7 +59,7 @@ class _RepeatKeys extends StatelessWidget {
 }
 
 class _RepeatKeysSettings extends StatelessWidget {
-  const _RepeatKeysSettings({Key? key}) : super(key: key);
+  const _RepeatKeysSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -76,7 +76,7 @@ class _RepeatKeysSettings extends StatelessWidget {
           min: 100,
           max: 2000,
           defaultValue: 500,
-          onChanged: (value) => model.setDelay(value),
+          onChanged: model.setDelay,
         ),
         YaruSliderRow(
           actionLabel: context.l10n.interval,
@@ -85,7 +85,7 @@ class _RepeatKeysSettings extends StatelessWidget {
           min: 0,
           max: 110,
           defaultValue: 30,
-          onChanged: (value) => model.setInterval(value),
+          onChanged: model.setInterval,
         ),
       ],
     );
@@ -93,7 +93,7 @@ class _RepeatKeysSettings extends StatelessWidget {
 }
 
 class _CursorBlinking extends StatelessWidget {
-  const _CursorBlinking({Key? key}) : super(key: key);
+  const _CursorBlinking();
 
   @override
   Widget build(BuildContext context) {
@@ -103,7 +103,7 @@ class _CursorBlinking extends StatelessWidget {
       actionLabel: context.l10n.cursorBlinking,
       actionDescription: context.l10n.cursorBlinkingDescription,
       value: model.cursorBlink,
-      onChanged: (value) => model.setCursorBlink(value),
+      onChanged: model.setCursorBlink,
       onPressed: () => showDialog(
         context: context,
         builder: (_) => ChangeNotifierProvider.value(
@@ -116,7 +116,7 @@ class _CursorBlinking extends StatelessWidget {
 }
 
 class _CursorBlinkingSettings extends StatelessWidget {
-  const _CursorBlinkingSettings({Key? key}) : super(key: key);
+  const _CursorBlinkingSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -133,7 +133,7 @@ class _CursorBlinkingSettings extends StatelessWidget {
           max: 2500,
           defaultValue: 1200,
           value: model.cursorBlinkTime,
-          onChanged: (value) => model.setCursorBlinkTime(value),
+          onChanged: model.setCursorBlinkTime,
         ),
       ],
     );
@@ -141,7 +141,7 @@ class _CursorBlinkingSettings extends StatelessWidget {
 }
 
 class _TypingAssist extends StatelessWidget {
-  const _TypingAssist({Key? key}) : super(key: key);
+  const _TypingAssist();
 
   @override
   Widget build(BuildContext context) {
@@ -158,7 +158,7 @@ class _TypingAssist extends StatelessWidget {
             width: 40,
             height: 40,
             child: OutlinedButton(
-              style: OutlinedButton.styleFrom(padding: const EdgeInsets.all(0)),
+              style: OutlinedButton.styleFrom(padding: EdgeInsets.zero),
               onPressed: () => showDialog(
                 context: context,
                 builder: (_) => ChangeNotifierProvider.value(
@@ -176,7 +176,7 @@ class _TypingAssist extends StatelessWidget {
 }
 
 class _TypingAssistSettings extends StatelessWidget {
-  const _TypingAssistSettings({Key? key}) : super(key: key);
+  const _TypingAssistSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -190,27 +190,27 @@ class _TypingAssistSettings extends StatelessWidget {
           trailingWidget: Text(context.l10n.enableByKeyboard),
           actionDescription: context.l10n.enableByKeyboardDescription,
           value: model.keyboardEnable,
-          onChanged: (value) => model.setKeyboardEnable(value),
+          onChanged: model.setKeyboardEnable,
         ),
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.stickyKeys),
           actionDescription: context.l10n.stickyKeysDescription,
           value: model.stickyKeys,
-          onChanged: (value) => model.setStickyKeys(value),
+          onChanged: model.setStickyKeys,
         ),
         const _StickyKeysSettings(),
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.slowKeys),
           actionDescription: context.l10n.slowKeysDescription,
           value: model.slowKeys,
-          onChanged: (value) => model.setSlowKeys(value),
+          onChanged: model.setSlowKeys,
         ),
         const _SlowKeysSettings(),
         YaruSwitchRow(
           trailingWidget: Text(context.l10n.bounceKeys),
           actionDescription: context.l10n.bounceKeysDescription,
           value: model.bounceKeys,
-          onChanged: (value) => model.setBounceKeys(value),
+          onChanged: model.setBounceKeys,
         ),
         const _BounceKeysSettings(),
       ],
@@ -219,7 +219,7 @@ class _TypingAssistSettings extends StatelessWidget {
 }
 
 class _StickyKeysSettings extends StatelessWidget {
-  const _StickyKeysSettings({Key? key}) : super(key: key);
+  const _StickyKeysSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -247,7 +247,7 @@ class _StickyKeysSettings extends StatelessWidget {
 }
 
 class _SlowKeysSettings extends StatelessWidget {
-  const _SlowKeysSettings({Key? key}) : super(key: key);
+  const _SlowKeysSettings();
 
   @override
   Widget build(BuildContext context) {
@@ -294,7 +294,7 @@ class _SlowKeysSettings extends StatelessWidget {
 }
 
 class _BounceKeysSettings extends StatelessWidget {
-  const _BounceKeysSettings({Key? key}) : super(key: key);
+  const _BounceKeysSettings();
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/appearance/appearance_page.dart b/lib/view/pages/appearance/appearance_page.dart
index 154bfd1d..0987f6a4 100644
--- a/lib/view/pages/appearance/appearance_page.dart
+++ b/lib/view/pages/appearance/appearance_page.dart
@@ -8,7 +8,7 @@ import 'package:settings/view/pages/appearance/theme_section.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class AppearancePage extends StatelessWidget {
-  const AppearancePage({Key? key}) : super(key: key);
+  const AppearancePage({super.key});
 
   static Widget create(BuildContext context) {
     final service = Provider.of<SettingsService>(context, listen: false);
diff --git a/lib/view/pages/appearance/dock_model.dart b/lib/view/pages/appearance/dock_model.dart
index 115483be..ef5fb2e6 100644
--- a/lib/view/pages/appearance/dock_model.dart
+++ b/lib/view/pages/appearance/dock_model.dart
@@ -5,6 +5,11 @@ import 'package:settings/services/settings_service.dart';
 import 'package:settings/utils.dart';
 
 class DockModel extends ChangeNotifier {
+
+  DockModel(SettingsService service)
+      : _dashToDockSettings = service.lookup(schemaDashToDock) {
+    _dashToDockSettings?.addListener(notifyListeners);
+  }
   static const _showTrashKey = 'show-trash';
   static const _dockFixedKey = 'dock-fixed';
   static const _extendHeightKey = 'extend-height';
@@ -13,11 +18,6 @@ class DockModel extends ChangeNotifier {
   static const _dockPositionKey = 'dock-position';
   static const _clickActionKey = 'click-action';
 
-  DockModel(SettingsService service)
-      : _dashToDockSettings = service.lookup(schemaDashToDock) {
-    _dashToDockSettings?.addListener(notifyListeners);
-  }
-
   @override
   void dispose() {
     _dashToDockSettings?.removeListener(notifyListeners);
@@ -79,7 +79,7 @@ class DockModel extends ChangeNotifier {
   }
 
   DockPosition? get dockPosition {
-    var positionString = _dashToDockSettings?.stringValue(_dockPositionKey);
+    final positionString = _dashToDockSettings?.stringValue(_dockPositionKey);
     switch (positionString) {
       case 'LEFT':
         return DockPosition.left;
@@ -118,7 +118,7 @@ class DockModel extends ChangeNotifier {
 
   set clickAction(DockClickAction? value) {
     if (value != null) {
-      String newString = camelCaseToSplitByDash(value.name);
+      final newString = camelCaseToSplitByDash(value.name);
       _dashToDockSettings?.setValue(_clickActionKey, newString);
       notifyListeners();
     }
diff --git a/lib/view/pages/appearance/dock_section.dart b/lib/view/pages/appearance/dock_section.dart
index 4e3738da..c4a0a134 100644
--- a/lib/view/pages/appearance/dock_section.dart
+++ b/lib/view/pages/appearance/dock_section.dart
@@ -12,7 +12,7 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class DockSection extends StatelessWidget {
-  const DockSection({Key? key}) : super(key: key);
+  const DockSection({super.key});
   static const assetHeight = 80.0;
   static const assetPadding = 20.0;
 
diff --git a/lib/view/pages/appearance/theme_section.dart b/lib/view/pages/appearance/theme_section.dart
index 20e5b982..32e651ba 100644
--- a/lib/view/pages/appearance/theme_section.dart
+++ b/lib/view/pages/appearance/theme_section.dart
@@ -10,7 +10,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class ThemeSection extends StatefulWidget {
-  const ThemeSection({Key? key}) : super(key: key);
+  const ThemeSection({super.key});
 
   @override
   State<ThemeSection> createState() => _ThemeSectionState();
diff --git a/lib/view/pages/apps/apps_page.dart b/lib/view/pages/apps/apps_page.dart
index 64a903a9..0e52dd5d 100644
--- a/lib/view/pages/apps/apps_page.dart
+++ b/lib/view/pages/apps/apps_page.dart
@@ -3,7 +3,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class AppsPage extends StatelessWidget {
-  const AppsPage({Key? key}) : super(key: key);
+  const AppsPage({super.key});
 
   static Widget create(BuildContext context) => const AppsPage();
 
diff --git a/lib/view/pages/bluetooth/bluetooth_device_model.dart b/lib/view/pages/bluetooth/bluetooth_device_model.dart
index 4b6add9f..18a83674 100644
--- a/lib/view/pages/bluetooth/bluetooth_device_model.dart
+++ b/lib/view/pages/bluetooth/bluetooth_device_model.dart
@@ -48,6 +48,11 @@ const yaruIcons = <String, IconData>{
 };
 
 class BluetoothDeviceModel extends SafeChangeNotifier {
+
+  BluetoothDeviceModel(this._device) {
+    updateFromClient();
+    errorMessage = '';
+  }
   final BlueZDevice _device;
   StreamSubscription? _deviceSubscription;
   late bool connected;
@@ -68,11 +73,6 @@ class BluetoothDeviceModel extends SafeChangeNotifier {
   late int txPower;
   late List<BlueZGattService> gattServices;
 
-  BluetoothDeviceModel(this._device) {
-    updateFromClient();
-    errorMessage = '';
-  }
-
   void init() {
     _deviceSubscription = _device.propertiesChanged.listen((event) {
       updateFromClient();
diff --git a/lib/view/pages/bluetooth/bluetooth_device_row.dart b/lib/view/pages/bluetooth/bluetooth_device_row.dart
index 8e0854f4..6f486d87 100644
--- a/lib/view/pages/bluetooth/bluetooth_device_row.dart
+++ b/lib/view/pages/bluetooth/bluetooth_device_row.dart
@@ -2,14 +2,13 @@ import 'package:bluez/bluez.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/bluetooth/bluetooth_device_model.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
-import 'package:settings/l10n/l10n.dart';
 
 class BluetoothDeviceRow extends StatefulWidget {
-  const BluetoothDeviceRow({Key? key, required this.removeDevice})
-      : super(key: key);
+  const BluetoothDeviceRow({super.key, required this.removeDevice});
 
   final AsyncCallback removeDevice;
 
@@ -74,8 +73,7 @@ class _BluetoothDeviceRowState extends State<BluetoothDeviceRow> {
 }
 
 class _BluetoothDeviceDialog extends StatelessWidget {
-  const _BluetoothDeviceDialog({Key? key, required this.removeDevice})
-      : super(key: key);
+  const _BluetoothDeviceDialog({required this.removeDevice});
 
   final AsyncCallback removeDevice;
 
diff --git a/lib/view/pages/bluetooth/bluetooth_model.dart b/lib/view/pages/bluetooth/bluetooth_model.dart
index a7d2f244..231b8dcb 100644
--- a/lib/view/pages/bluetooth/bluetooth_model.dart
+++ b/lib/view/pages/bluetooth/bluetooth_model.dart
@@ -4,6 +4,8 @@ import 'package:bluez/bluez.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 class BluetoothModel extends SafeChangeNotifier {
+
+  BluetoothModel(this._client);
   final BlueZClient _client;
 
   StreamSubscription<BlueZDevice>? _devicesAdded;
@@ -11,10 +13,8 @@ class BluetoothModel extends SafeChangeNotifier {
   StreamSubscription<BlueZAdapter>? _adaptersRemoved;
   StreamSubscription<BlueZAdapter>? _adaptersAdded;
 
-  BluetoothModel(this._client);
-
   bool get discovering {
-    for (var adapter in _client.adapters) {
+    for (final adapter in _client.adapters) {
       if (adapter.discovering) {
         return true;
       }
@@ -23,7 +23,7 @@ class BluetoothModel extends SafeChangeNotifier {
   }
 
   Future<void> startDiscovery() async {
-    for (var adapter in _client.adapters) {
+    for (final adapter in _client.adapters) {
       if (!adapter.discovering && adapter.powered) {
         await adapter.startDiscovery();
       }
@@ -32,7 +32,7 @@ class BluetoothModel extends SafeChangeNotifier {
   }
 
   Future<void> stopDiscovery() async {
-    for (var adapter in _client.adapters) {
+    for (final adapter in _client.adapters) {
       if (adapter.discovering && adapter.powered) {
         await adapter.stopDiscovery();
       }
@@ -41,14 +41,14 @@ class BluetoothModel extends SafeChangeNotifier {
   }
 
   bool get powered {
-    for (var adapter in _client.adapters) {
+    for (final adapter in _client.adapters) {
       return adapter.powered;
     }
     return false;
   }
 
   void setPowered(bool value) async {
-    for (var adapter in _client.adapters) {
+    for (final adapter in _client.adapters) {
       await adapter.setPowered(value);
     }
     notifyListeners();
@@ -86,7 +86,7 @@ class BluetoothModel extends SafeChangeNotifier {
   }
 
   Future<void> removeDevice(BlueZDevice device) async {
-    for (var adapter in _client.adapters) {
+    for (final adapter in _client.adapters) {
       await stopDiscovery();
       await adapter.removeDevice(device);
     }
@@ -96,7 +96,7 @@ class BluetoothModel extends SafeChangeNotifier {
 
   @override
   void dispose() {
-    for (var adapter in _client.adapters) {
+    for (final adapter in _client.adapters) {
       if (adapter.discovering && adapter.powered) {
         adapter.stopDiscovery();
       }
diff --git a/lib/view/pages/bluetooth/bluetooth_page.dart b/lib/view/pages/bluetooth/bluetooth_page.dart
index 1066ea00..55c35548 100644
--- a/lib/view/pages/bluetooth/bluetooth_page.dart
+++ b/lib/view/pages/bluetooth/bluetooth_page.dart
@@ -11,6 +11,8 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class BluetoothPage extends StatefulWidget {
+
+  const BluetoothPage({super.key});
   static bool searchMatches(String value, BuildContext context) =>
       value.isNotEmpty
           ? context.l10n.bluetoothPageTitle
@@ -21,8 +23,6 @@ class BluetoothPage extends StatefulWidget {
   static Widget createTitle(BuildContext context) =>
       Text(context.l10n.bluetoothPageTitle);
 
-  const BluetoothPage({Key? key}) : super(key: key);
-
   static Widget create(BuildContext context) {
     return ChangeNotifierProvider(
       create: (_) => BluetoothModel(context.read<BlueZClient>()),
@@ -56,7 +56,7 @@ class _BluetoothPageState extends State<BluetoothPage> {
                   : context.l10n.switchedOff,
             ),
             value: model.powered,
-            onChanged: (v) => model.setPowered(v),
+            onChanged: model.setPowered,
           ),
         ),
         SettingsSection(
diff --git a/lib/view/pages/color/color_page.dart b/lib/view/pages/color/color_page.dart
index 82171dda..3a5d67ab 100644
--- a/lib/view/pages/color/color_page.dart
+++ b/lib/view/pages/color/color_page.dart
@@ -3,7 +3,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class ColorPage extends StatelessWidget {
-  const ColorPage({Key? key}) : super(key: key);
+  const ColorPage({super.key});
 
   static Widget create(BuildContext context) => const ColorPage();
 
diff --git a/lib/view/pages/connections/connections_page.dart b/lib/view/pages/connections/connections_page.dart
index 7c1246c2..294ce9af 100644
--- a/lib/view/pages/connections/connections_page.dart
+++ b/lib/view/pages/connections/connections_page.dart
@@ -11,6 +11,8 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'models/wifi_model.dart';
 
 class ConnectionsPage extends StatelessWidget {
+
+  const ConnectionsPage({super.key});
   static Widget create(BuildContext context) {
     final service = Provider.of<NetworkManagerClient>(context, listen: false);
     return ChangeNotifierProvider<WifiModel>(
@@ -29,8 +31,6 @@ class ConnectionsPage extends StatelessWidget {
               .contains(value.toLowerCase())
           : false;
 
-  const ConnectionsPage({Key? key}) : super(key: key);
-
   @override
   Widget build(BuildContext context) {
     final wifiModel = context.watch<WifiModel>();
diff --git a/lib/view/pages/connections/models/access_point_model.dart b/lib/view/pages/connections/models/access_point_model.dart
index 957cef96..f2d931f5 100644
--- a/lib/view/pages/connections/models/access_point_model.dart
+++ b/lib/view/pages/connections/models/access_point_model.dart
@@ -9,6 +9,14 @@ enum ActiveConnectionState {
 }
 
 class AccessPointModel extends PropertyStreamNotifier {
+
+  AccessPointModel(
+    this._networkManagerAccessPoint,
+    this._networkManagerDeviceWireless,
+  ) {
+    addProperties(_networkManagerAccessPoint.propertiesChanged);
+    addPropertyListener('Strength', notifyListeners);
+  }
   final NetworkManagerAccessPoint _networkManagerAccessPoint;
   late final NetworkManagerDeviceWireless _networkManagerDeviceWireless;
 
@@ -26,14 +34,6 @@ class AccessPointModel extends PropertyStreamNotifier {
       WifiStrengthLevelX.fromStrength(strength);
 
   int get strength => _networkManagerAccessPoint.strength;
-
-  AccessPointModel(
-    this._networkManagerAccessPoint,
-    this._networkManagerDeviceWireless,
-  ) {
-    addProperties(_networkManagerAccessPoint.propertiesChanged);
-    addPropertyListener('Strength', notifyListeners);
-  }
 }
 
 enum WifiStrengthLevel {
diff --git a/lib/view/pages/connections/models/wifi_device_model.dart b/lib/view/pages/connections/models/wifi_device_model.dart
index a68bd884..9d118a16 100644
--- a/lib/view/pages/connections/models/wifi_device_model.dart
+++ b/lib/view/pages/connections/models/wifi_device_model.dart
@@ -1,6 +1,15 @@
 part of 'wifi_model.dart';
 
 class WifiDeviceModel extends PropertyStreamNotifier {
+
+  WifiDeviceModel(this._networkManagerDevice) {
+    _networkManagerDeviceWireless = _networkManagerDevice.wireless!;
+
+    addProperties(_networkManagerDeviceWireless.propertiesChanged);
+    addPropertyListener('AccessPoints', notifyListeners);
+    addPropertyListener('ActiveAccessPoint', notifyListeners);
+    addPropertyListener('LastScan', notifyListeners);
+  }
   final NetworkManagerDevice _networkManagerDevice;
   late final NetworkManagerDeviceWireless _networkManagerDeviceWireless;
 
@@ -9,7 +18,7 @@ class WifiDeviceModel extends PropertyStreamNotifier {
 
     /// filter duplicate access points
     // ignore: prefer_function_declarations_over_variables
-    final isAccessPointAlreadyAdded = (NetworkManagerAccessPoint newAP) {
+    final isAccessPointAlreadyAdded = (newAP) {
       return acceptedAccessPoints.any(
         (ap) =>
             // ap.hwAddress == newAP.hwAddress  &&
@@ -19,12 +28,12 @@ class WifiDeviceModel extends PropertyStreamNotifier {
 
     // filter hidden or empyty SSIDs
     // ignore: prefer_function_declarations_over_variables
-    final hasSsid = (List<int> ssid) {
+    final hasSsid = (ssid) {
       return ssid.isNotEmpty || String.fromCharCodes(ssid).trim().isNotEmpty;
     };
 
     // ignore: prefer_function_declarations_over_variables
-    final isAccessPointAccepted = (NetworkManagerAccessPoint accessPoint) {
+    final isAccessPointAccepted = (accessPoint) {
       if (hasSsid(accessPoint.ssid) &&
           !isAccessPointAlreadyAdded(accessPoint)) {
         acceptedAccessPoints.add(accessPoint);
@@ -46,13 +55,4 @@ class WifiDeviceModel extends PropertyStreamNotifier {
 
   String get driverName => _networkManagerDevice.driver;
   String get interface => _networkManagerDevice.interface;
-
-  WifiDeviceModel(this._networkManagerDevice) {
-    _networkManagerDeviceWireless = _networkManagerDevice.wireless!;
-
-    addProperties(_networkManagerDeviceWireless.propertiesChanged);
-    addPropertyListener('AccessPoints', notifyListeners);
-    addPropertyListener('ActiveAccessPoint', notifyListeners);
-    addPropertyListener('LastScan', notifyListeners);
-  }
 }
diff --git a/lib/view/pages/connections/models/wifi_model.dart b/lib/view/pages/connections/models/wifi_model.dart
index b1544a4c..3921879a 100644
--- a/lib/view/pages/connections/models/wifi_model.dart
+++ b/lib/view/pages/connections/models/wifi_model.dart
@@ -16,11 +16,19 @@ typedef OnAuthenticate = Future<Authentication?> Function(
 );
 
 class WifiModel extends PropertyStreamNotifier {
+
+  WifiModel(this._networkManagerClient) {
+    addProperties(_networkManagerClient.propertiesChanged);
+    addPropertyListener('Devices', notifyListeners);
+    addPropertyListener('WirelessEnabled', notifyListeners);
+    addPropertyListener('WirelessHardwareEnabled', notifyListeners);
+    addPropertyListener('NetworkingEnabled', notifyListeners);
+  }
   final NetworkManagerClient _networkManagerClient;
 
   List<WifiDeviceModel> get wifiDevices => _networkManagerClient.devices
       .where((device) => device.wireless != null)
-      .map((device) => WifiDeviceModel(device))
+      .map(WifiDeviceModel.new)
       .toList();
 
   bool get isWifiEnabled => _networkManagerClient.wirelessEnabled;
@@ -29,14 +37,6 @@ class WifiModel extends PropertyStreamNotifier {
       _networkManagerClient.wirelessHardwareEnabled &&
       _networkManagerClient.networkingEnabled;
 
-  WifiModel(this._networkManagerClient) {
-    addProperties(_networkManagerClient.propertiesChanged);
-    addPropertyListener('Devices', notifyListeners);
-    addPropertyListener('WirelessEnabled', notifyListeners);
-    addPropertyListener('WirelessHardwareEnabled', notifyListeners);
-    addPropertyListener('NetworkingEnabled', notifyListeners);
-  }
-
   String _errorMessage = '';
   set errorMessage(String value) {
     _errorMessage = value;
diff --git a/lib/view/pages/connections/widgets/access_point_tile.dart b/lib/view/pages/connections/widgets/access_point_tile.dart
index a9669f6d..6adf6357 100644
--- a/lib/view/pages/connections/widgets/access_point_tile.dart
+++ b/lib/view/pages/connections/widgets/access_point_tile.dart
@@ -5,13 +5,13 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 import '../models/wifi_model.dart';
 
 class AccessPointTile extends StatelessWidget {
-  final AccessPointModel accessPointModel;
-  final VoidCallback onTap;
   const AccessPointTile({
     required this.accessPointModel,
     required this.onTap,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
+  final AccessPointModel accessPointModel;
+  final VoidCallback onTap;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/connections/widgets/authentication_dialog.dart b/lib/view/pages/connections/widgets/authentication_dialog.dart
index b2608aee..f744ecd8 100644
--- a/lib/view/pages/connections/widgets/authentication_dialog.dart
+++ b/lib/view/pages/connections/widgets/authentication_dialog.dart
@@ -6,7 +6,7 @@ import '../data/authentication.dart';
 import '../models/wifi_model.dart';
 
 class AuthenticationDialog extends StatelessWidget {
-  AuthenticationDialog({Key? key}) : super(key: key);
+  AuthenticationDialog({super.key});
 
   final canShowPassword = ValueNotifier(false);
   final passwordController = TextEditingController();
@@ -115,13 +115,12 @@ class AuthenticationDialog extends StatelessWidget {
 }
 
 class _DialogRow extends StatelessWidget {
-  final Widget? title;
-  final Widget field;
   const _DialogRow({
     this.title,
     required this.field,
-    Key? key,
-  }) : super(key: key);
+  });
+  final Widget? title;
+  final Widget field;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/connections/wifi_content.dart b/lib/view/pages/connections/wifi_content.dart
index 4025a5ae..fd51b8bd 100644
--- a/lib/view/pages/connections/wifi_content.dart
+++ b/lib/view/pages/connections/wifi_content.dart
@@ -13,7 +13,7 @@ import 'widgets/access_point_tile.dart';
 import 'widgets/authentication_dialog.dart';
 
 class WifiDevicesContent extends StatelessWidget {
-  const WifiDevicesContent({Key? key}) : super(key: key);
+  const WifiDevicesContent({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -42,7 +42,7 @@ class WifiDevicesContent extends StatelessWidget {
                 )
               ],
             ),
-            onChanged: (newValue) => wifiModel.toggleWifi(newValue),
+            onChanged: wifiModel.toggleWifi,
             value: wifiModel.isWifiEnabled,
           ),
         ),
@@ -97,7 +97,7 @@ class WifiDevicesContent extends StatelessWidget {
 }
 
 class WifiAdaptorNotFound extends StatelessWidget {
-  const WifiAdaptorNotFound({Key? key}) : super(key: key);
+  const WifiAdaptorNotFound({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/date_and_time/date_time_model.dart b/lib/view/pages/date_and_time/date_time_model.dart
index 2aea8ef6..08faf520 100644
--- a/lib/view/pages/date_and_time/date_time_model.dart
+++ b/lib/view/pages/date_and_time/date_time_model.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/schemas/schemas.dart';
 import 'package:settings/services/date_time_service.dart';
 import 'package:settings/services/settings_service.dart';
-import 'package:intl/intl.dart';
 
 const _kAutomaticTimezone = 'automatic-timezone';
 const _kClockFormat = 'clock-format';
@@ -15,14 +15,6 @@ const _kClockShowWeekDay = 'clock-show-weekday';
 const _kCalendarShowWeekNumber = 'show-weekdate';
 
 class DateTimeModel extends SafeChangeNotifier {
-  final Settings? _dateTimeSettings;
-  final Settings? _interfaceSettings;
-  final Settings? _calendarSettings;
-  final DateTimeService _dateTimeService;
-  StreamSubscription<String?>? _timezoneSub;
-  StreamSubscription<bool?>? _ntpSyncSub;
-  Timer? _fetchDateTimeTimer;
-  DateTime? _dateTime;
 
   DateTimeModel({
     required DateTimeService dateTimeService,
@@ -35,6 +27,14 @@ class DateTimeModel extends SafeChangeNotifier {
     _interfaceSettings?.addListener(notifyListeners);
     _calendarSettings?.addListener(notifyListeners);
   }
+  final Settings? _dateTimeSettings;
+  final Settings? _interfaceSettings;
+  final Settings? _calendarSettings;
+  final DateTimeService _dateTimeService;
+  StreamSubscription<String?>? _timezoneSub;
+  StreamSubscription<bool?>? _ntpSyncSub;
+  Timer? _fetchDateTimeTimer;
+  DateTime? _dateTime;
 
   Future<void> init() {
     return _dateTimeService.init().then((_) async {
diff --git a/lib/view/pages/date_and_time/date_time_page.dart b/lib/view/pages/date_and_time/date_time_page.dart
index eb2b2bef..89439cf9 100644
--- a/lib/view/pages/date_and_time/date_time_page.dart
+++ b/lib/view/pages/date_and_time/date_time_page.dart
@@ -7,13 +7,13 @@ import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/common/yaru_switch_row.dart';
 import 'package:settings/view/pages/date_and_time/date_time_model.dart';
 import 'package:settings/view/pages/date_and_time/timezones.dart';
-import 'package:settings/view/pages/settings_page.dart';
 import 'package:settings/view/pages/settings_alert_dialog.dart';
+import 'package:settings/view/pages/settings_page.dart';
 import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class DateTimePage extends StatefulWidget {
-  const DateTimePage({Key? key}) : super(key: key);
+  const DateTimePage({super.key});
 
   static Widget create(BuildContext context) => ChangeNotifierProvider(
         create: (_) => DateTimeModel(
@@ -65,7 +65,7 @@ class _DateTimePageState extends State<DateTimePage> {
                             initialDate: model.dateTime ?? DateTime.now(),
                             firstDate: DateTime(2000),
                             lastDate: DateTime(2050),
-                          ).then((value) => model.setDate(value))
+                          ).then(model.setDate)
                       : null,
                   child: Text(model.getLocalDateName(context)),
                 ),
@@ -97,7 +97,7 @@ class _DateTimePageState extends State<DateTimePage> {
                         ? () => showTimePicker(
                               context: context,
                               initialTime: TimeOfDay.now(),
-                            ).then((value) => model.setTime(value))
+                            ).then(model.setTime)
                         : null,
                 child: Text(
                   model.clock,
@@ -155,7 +155,7 @@ class _DateTimePageState extends State<DateTimePage> {
 }
 
 class _TimezoneSelectDialog extends StatelessWidget {
-  const _TimezoneSelectDialog({Key? key}) : super(key: key);
+  const _TimezoneSelectDialog();
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/default_apps/default_apps_page.dart b/lib/view/pages/default_apps/default_apps_page.dart
index d1a51ab0..49367082 100644
--- a/lib/view/pages/default_apps/default_apps_page.dart
+++ b/lib/view/pages/default_apps/default_apps_page.dart
@@ -3,7 +3,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class DefaultAppsPage extends StatelessWidget {
-  const DefaultAppsPage({Key? key}) : super(key: key);
+  const DefaultAppsPage({super.key});
 
   static Widget create(BuildContext context) => const DefaultAppsPage();
 
diff --git a/lib/view/pages/displays/displays_model.dart b/lib/view/pages/displays/displays_model.dart
index ac6559bd..83494389 100644
--- a/lib/view/pages/displays/displays_model.dart
+++ b/lib/view/pages/displays/displays_model.dart
@@ -13,7 +13,7 @@ class DisplaysModel extends SafeChangeNotifier {
     /// listen display stream
     /// on each, re-set new configuration
     _subscription = _service.monitorStateStream
-        .listen((DisplaysConfiguration configuration) {
+        .listen((configuration) {
       _initialNotifier.value = configuration;
       _currentNotifier.value = configuration;
     });
@@ -54,21 +54,21 @@ class DisplaysModel extends SafeChangeNotifier {
 /// All setters to update current configurations
 extension DisplayModelSetters on DisplaysModel {
   void setResolution(int index, String resolution) {
-    final List<DisplayMonitorConfiguration> configurations =
+    final configurations =
         <DisplayMonitorConfiguration>[
       ..._currentNotifier.value!.configurations
     ];
 
-    final DisplayMonitorConfiguration configurationMonitorUpdate =
+    final configurationMonitorUpdate =
         configurations.removeAt(index);
 
-    DisplayMonitorConfiguration updated =
+    var updated =
         configurationMonitorUpdate.copyWith(resolution: resolution);
 
     final currentRefreshRate = double.parse(updated.refreshRate);
 
     /// select new refresh rate : choose the closest from current
-    final String newRefreshRate = updated.availableRefreshRates
+    final newRefreshRate = updated.availableRefreshRates
         .map(
       (rate) => MapEntry(rate, (double.parse(rate) - currentRefreshRate).abs()),
     )
@@ -96,11 +96,11 @@ extension DisplayModelSetters on DisplaysModel {
       return;
     }
 
-    final List<DisplayMonitorConfiguration> configurations =
+    final configurations =
         <DisplayMonitorConfiguration>[
       ..._currentNotifier.value!.configurations
     ];
-    final DisplayMonitorConfiguration configurationMonitorUpdate =
+    final configurationMonitorUpdate =
         configurations.removeAt(index);
 
     configurations.insert(
@@ -115,11 +115,11 @@ extension DisplayModelSetters on DisplaysModel {
   }
 
   void setOrientation(int index, LogicalMonitorOrientation orientation) {
-    final List<DisplayMonitorConfiguration> configurations =
+    final configurations =
         <DisplayMonitorConfiguration>[
       ..._currentNotifier.value!.configurations
     ];
-    final DisplayMonitorConfiguration configurationMonitorUpdate =
+    final configurationMonitorUpdate =
         configurations.removeAt(index);
 
     configurations.insert(
@@ -133,11 +133,11 @@ extension DisplayModelSetters on DisplaysModel {
   }
 
   void setScale(int index, double scale) {
-    final List<DisplayMonitorConfiguration> configurations =
+    final configurations =
         <DisplayMonitorConfiguration>[
       ..._currentNotifier.value!.configurations
     ];
-    final DisplayMonitorConfiguration configurationMonitorUpdate =
+    final configurationMonitorUpdate =
         configurations.removeAt(index);
 
     configurations.insert(
diff --git a/lib/view/pages/displays/displays_page.dart b/lib/view/pages/displays/displays_page.dart
index 6ef7dc8b..8b58b2df 100644
--- a/lib/view/pages/displays/displays_page.dart
+++ b/lib/view/pages/displays/displays_page.dart
@@ -13,7 +13,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 
 class DisplaysPage extends StatefulWidget {
   /// private as we have to pass from create method below
-  const DisplaysPage._({Key? key}) : super(key: key);
+  const DisplaysPage._();
 
   static Widget createTitle(BuildContext context) =>
       Text(context.l10n.displaysPageTitle);
@@ -45,7 +45,7 @@ class _DisplaysPageState extends State<DisplaysPage> {
     return ValueListenableBuilder<DisplaysConfiguration?>(
       valueListenable: model.configuration,
       builder:
-          (BuildContext context, DisplaysConfiguration? configurations, _) {
+          (context, configurations, _) {
         return TabbedPage(
           width: kDefaultWidth,
           tabIcons: DisplaysPageSection.values
diff --git a/lib/view/pages/displays/nightlight_model.dart b/lib/view/pages/displays/nightlight_model.dart
index 2bb76fee..bcf323f6 100644
--- a/lib/view/pages/displays/nightlight_model.dart
+++ b/lib/view/pages/displays/nightlight_model.dart
@@ -37,10 +37,10 @@ class NightlightModel extends SafeChangeNotifier {
   }
 
   DateTime getNightLightSchedule({required bool isFrom}) {
-    String key = isFrom ? _setNightlightScheduleFrom : _setNightlightScheduleTo;
-    double time = _nightlightSettings?.doubleValue(key) ?? 0;
-    int hours = time.truncate();
-    int minutes = ((time - hours) * 60).round();
+    final key = isFrom ? _setNightlightScheduleFrom : _setNightlightScheduleTo;
+    final time = _nightlightSettings?.doubleValue(key) ?? 0;
+    final hours = time.truncate();
+    final minutes = ((time - hours) * 60).round();
     return DateTime(0, 0, 0, hours, minutes);
   }
 
@@ -49,8 +49,8 @@ class NightlightModel extends SafeChangeNotifier {
     required bool isFrom,
     required bool isHours,
   }) {
-    String key = isFrom ? _setNightlightScheduleFrom : _setNightlightScheduleTo;
-    double time = isHours
+    final key = isFrom ? _setNightlightScheduleFrom : _setNightlightScheduleTo;
+    final time = isHours
         ? (value + getNightLightSchedule(isFrom: isFrom).minute / 60)
         : getNightLightSchedule(isFrom: isFrom).hour + (value / 60);
     _nightlightSettings?.setValue(
diff --git a/lib/view/pages/displays/nightlight_page.dart b/lib/view/pages/displays/nightlight_page.dart
index 329645d8..40b27d4f 100644
--- a/lib/view/pages/displays/nightlight_page.dart
+++ b/lib/view/pages/displays/nightlight_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/widgets.dart';
+import 'package:flutter_spinbox/material.dart';
 import 'package:provider/provider.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/services/settings_service.dart';
@@ -7,7 +8,6 @@ import 'package:settings/view/common/yaru_switch_row.dart';
 import 'package:settings/view/pages/displays/nightlight_model.dart';
 import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
-import 'package:flutter_spinbox/material.dart';
 
 class NightlightPage extends StatelessWidget {
   const NightlightPage({super.key});
@@ -71,8 +71,8 @@ class NightlightPage extends StatelessWidget {
 }
 
 class TimeSelector extends StatelessWidget {
-  final bool isFrom;
   const TimeSelector({super.key, required this.isFrom});
+  final bool isFrom;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/displays/widgets/monitor_section.dart b/lib/view/pages/displays/widgets/monitor_section.dart
index cfe45a57..10020209 100644
--- a/lib/view/pages/displays/widgets/monitor_section.dart
+++ b/lib/view/pages/displays/widgets/monitor_section.dart
@@ -10,9 +10,9 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class MonitorSection extends StatelessWidget {
   const MonitorSection({
-    Key? key,
+    super.key,
     required this.index,
-  }) : super(key: key);
+  });
 
   final int index;
 
@@ -29,7 +29,7 @@ class MonitorSection extends StatelessWidget {
     return ValueListenableBuilder<DisplaysConfiguration?>(
       valueListenable: model.configuration,
       builder: (context, value, child) {
-        final DisplayMonitorConfiguration config = value!.configurations[index];
+        final config = value!.configurations[index];
         return ConstrainedBox(
           constraints: const BoxConstraints(maxWidth: kDefaultWidth),
           child: SettingsSection(
@@ -131,7 +131,7 @@ class MonitorSection extends StatelessWidget {
                 enabled: false,
                 trailingWidget: Text(context.l10n.fractionalScaling),
                 actionDescription: context.l10n.fractionalScaling_description,
-                onChanged: (bool value) {},
+                onChanged: (value) {},
                 value: null,
               ),
             ],
diff --git a/lib/view/pages/info/info_page.dart b/lib/view/pages/info/info_page.dart
index be8a99af..e2220fc3 100644
--- a/lib/view/pages/info/info_page.dart
+++ b/lib/view/pages/info/info_page.dart
@@ -19,7 +19,7 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 import 'info_model.dart';
 
 class InfoPage extends StatefulWidget {
-  const InfoPage({Key? key}) : super(key: key);
+  const InfoPage({super.key});
 
   static Widget create(BuildContext context) {
     return ChangeNotifierProvider<InfoModel>(
@@ -61,7 +61,7 @@ class _InfoPageState extends State<InfoPage> {
         label: 'Open File',
         onPressed: () async {
           final dir = await getApplicationDocumentsDirectory();
-          launchUrl(Uri.file('${dir.path}/System Data.pdf'));
+          await launchUrl(Uri.file('${dir.path}/System Data.pdf'));
         },
       ),
     );
@@ -191,7 +191,7 @@ class _InfoPageState extends State<InfoPage> {
 }
 
 class _Computer extends StatelessWidget {
-  const _Computer({Key? key}) : super(key: key);
+  const _Computer();
 
   @override
   Widget build(BuildContext context) {
@@ -217,7 +217,7 @@ class _Computer extends StatelessWidget {
                 height: 40,
                 child: OutlinedButton(
                   style: OutlinedButton.styleFrom(
-                    padding: const EdgeInsets.all(0),
+                    padding: EdgeInsets.zero,
                   ),
                   onPressed: () => showDialog(
                     context: context,
@@ -238,7 +238,7 @@ class _Computer extends StatelessWidget {
 }
 
 class _HostnameSettings extends StatefulWidget {
-  const _HostnameSettings({Key? key}) : super(key: key);
+  const _HostnameSettings();
 
   @override
   State<_HostnameSettings> createState() => _HostnameSettingsState();
diff --git a/lib/view/pages/keyboard/input_source_model.dart b/lib/view/pages/keyboard/input_source_model.dart
index a93c5de9..b22df09c 100644
--- a/lib/view/pages/keyboard/input_source_model.dart
+++ b/lib/view/pages/keyboard/input_source_model.dart
@@ -8,11 +8,6 @@ import 'package:settings/services/input_source_service.dart';
 import 'package:settings/services/settings_service.dart';
 
 class InputSourceModel extends SafeChangeNotifier {
-  final Settings? _inputSourceSettings;
-  static const _perWindowKey = 'per-window';
-  static const _sourcesKey = 'sources';
-  static const _mruSourcesKey = 'mru-sources';
-  final List<InputSource> inputSources;
 
   InputSourceModel(
     SettingsService settingsService,
@@ -21,6 +16,11 @@ class InputSourceModel extends SafeChangeNotifier {
         inputSources = inputSourceService.inputSources {
     _inputSourceSettings?.addListener(notifyListeners);
   }
+  final Settings? _inputSourceSettings;
+  static const _perWindowKey = 'per-window';
+  static const _sourcesKey = 'sources';
+  static const _mruSourcesKey = 'mru-sources';
+  final List<InputSource> inputSources;
 
   @override
   void dispose() {
@@ -37,12 +37,12 @@ class InputSourceModel extends SafeChangeNotifier {
 
   Future<List<String>?> getInputSources() async {
     final settings = GSettings(schemaInputSources);
-    final List<String> inputTypes = [];
+    final inputTypes = <String>[];
 
-    final DBusArray dbusArray = await settings.get(_sourcesKey) as DBusArray;
+    final dbusArray = await settings.get(_sourcesKey) as DBusArray;
 
-    for (final DBusValue dbusArrayChild in dbusArray.children) {
-      final DBusStruct dbusStruct = dbusArrayChild as DBusStruct;
+    for (final dbusArrayChild in dbusArray.children) {
+      final dbusStruct = dbusArrayChild as DBusStruct;
       inputTypes.add((dbusStruct.children[1] as DBusString).value);
     }
 
@@ -54,7 +54,7 @@ class InputSourceModel extends SafeChangeNotifier {
   Future<void> setInputSources(List<String>? inputTypes) async {
     final settings = GSettings(schemaInputSources);
 
-    final DBusArray array = DBusArray(DBusSignature('(ss)'), [
+    final array = DBusArray(DBusSignature('(ss)'), [
       for (var inputType in inputTypes ?? [])
         DBusStruct([const DBusString('xkb'), DBusString(inputType)])
     ]);
diff --git a/lib/view/pages/keyboard/input_source_section.dart b/lib/view/pages/keyboard/input_source_section.dart
index 653b0e56..ea609f96 100644
--- a/lib/view/pages/keyboard/input_source_section.dart
+++ b/lib/view/pages/keyboard/input_source_section.dart
@@ -6,7 +6,7 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class InputSourceSection extends StatelessWidget {
-  const InputSourceSection({Key? key}) : super(key: key);
+  const InputSourceSection({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/keyboard/input_source_selection_section.dart b/lib/view/pages/keyboard/input_source_selection_section.dart
index 9cd7905a..c903122e 100644
--- a/lib/view/pages/keyboard/input_source_selection_section.dart
+++ b/lib/view/pages/keyboard/input_source_selection_section.dart
@@ -9,8 +9,8 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class InputSourceSelectionSection extends StatelessWidget {
   const InputSourceSelectionSection({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -56,14 +56,14 @@ class InputSourceSelectionSection extends StatelessWidget {
                     ),
                   ),
               ],
-              onReorder: (int oldIndex, int newIndex) async {
+              onReorder: (oldIndex, newIndex) async {
                 final sources = snapshot.data!;
                 if (oldIndex < newIndex) {
                   newIndex -= 1;
                 }
                 final item = snapshot.data!.removeAt(oldIndex);
                 sources.insert(newIndex, item);
-                model.setInputSources(sources);
+                await model.setInputSources(sources);
               },
             ),
           ],
@@ -75,9 +75,8 @@ class InputSourceSelectionSection extends StatelessWidget {
 
 class _InputTypeRow extends StatelessWidget {
   const _InputTypeRow({
-    Key? key,
     required this.inputType,
-  }) : super(key: key);
+  });
 
   final String inputType;
 
@@ -113,7 +112,7 @@ class _InputTypeRow extends StatelessWidget {
 }
 
 class _AddKeymapDialog extends StatefulWidget {
-  const _AddKeymapDialog({Key? key}) : super(key: key);
+  const _AddKeymapDialog();
 
   @override
   State<_AddKeymapDialog> createState() => _AddKeymapDialogState();
diff --git a/lib/view/pages/keyboard/keyboard_page.dart b/lib/view/pages/keyboard/keyboard_page.dart
index e8cc0191..3c740e0a 100644
--- a/lib/view/pages/keyboard/keyboard_page.dart
+++ b/lib/view/pages/keyboard/keyboard_page.dart
@@ -7,7 +7,7 @@ import 'package:settings/view/tabbed_page.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 
 class KeyboardPage extends StatefulWidget {
-  const KeyboardPage({Key? key}) : super(key: key);
+  const KeyboardPage({super.key});
 
   static Widget create(BuildContext context) => const KeyboardPage();
 
diff --git a/lib/view/pages/keyboard/keyboard_settings_page.dart b/lib/view/pages/keyboard/keyboard_settings_page.dart
index c4438b32..50c72d18 100644
--- a/lib/view/pages/keyboard/keyboard_settings_page.dart
+++ b/lib/view/pages/keyboard/keyboard_settings_page.dart
@@ -11,8 +11,8 @@ import 'package:settings/view/pages/settings_page.dart';
 
 class KeyboardSettingsPage extends StatelessWidget {
   const KeyboardSettingsPage({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/keyboard/keyboard_shortcut_row.dart b/lib/view/pages/keyboard/keyboard_shortcut_row.dart
index ec1f8aed..ee2bd147 100644
--- a/lib/view/pages/keyboard/keyboard_shortcut_row.dart
+++ b/lib/view/pages/keyboard/keyboard_shortcut_row.dart
@@ -6,10 +6,10 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class KeyboardShortcutRow extends StatefulWidget {
   const KeyboardShortcutRow({
-    Key? key,
+    super.key,
     required this.label,
     required this.shortcutId,
-  }) : super(key: key);
+  });
 
   final String label;
   final String shortcutId;
@@ -90,10 +90,10 @@ class _KeyboardShortcutRowState extends State<KeyboardShortcutRow> {
 
 class KeyboardShortcutDialog extends StatelessWidget {
   const KeyboardShortcutDialog({
-    Key? key,
+    super.key,
     required this.keys,
     required this.oldShortcut,
-  }) : super(key: key);
+  });
 
   final List<LogicalKeyboardKey> keys;
   final List<String> oldShortcut;
diff --git a/lib/view/pages/keyboard/keyboard_shortcuts_model.dart b/lib/view/pages/keyboard/keyboard_shortcuts_model.dart
index e96ec56d..d2f51713 100644
--- a/lib/view/pages/keyboard/keyboard_shortcuts_model.dart
+++ b/lib/view/pages/keyboard/keyboard_shortcuts_model.dart
@@ -3,7 +3,6 @@ import 'package:settings/services/keyboard_service.dart';
 import 'package:settings/services/settings_service.dart';
 
 class KeyboardShortcutsModel extends ChangeNotifier {
-  final String schemaId;
 
   KeyboardShortcutsModel({
     required KeyboardService keyboard,
@@ -13,6 +12,7 @@ class KeyboardShortcutsModel extends ChangeNotifier {
         _shortcutSettings = settings.lookup(schemaId) {
     _shortcutSettings?.addListener(notifyListeners);
   }
+  final String schemaId;
 
   @override
   void dispose() {
diff --git a/lib/view/pages/keyboard/keyboard_shortcuts_page.dart b/lib/view/pages/keyboard/keyboard_shortcuts_page.dart
index af667b1d..3ca5df92 100644
--- a/lib/view/pages/keyboard/keyboard_shortcuts_page.dart
+++ b/lib/view/pages/keyboard/keyboard_shortcuts_page.dart
@@ -10,7 +10,7 @@ import 'package:settings/view/pages/settings_page.dart';
 import 'package:settings/view/settings_section.dart';
 
 class KeyboardShortcutsPage extends StatelessWidget {
-  const KeyboardShortcutsPage({Key? key}) : super(key: key);
+  const KeyboardShortcutsPage({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/keyboard/special_characters_model.dart b/lib/view/pages/keyboard/special_characters_model.dart
index 19fc058a..47390739 100644
--- a/lib/view/pages/keyboard/special_characters_model.dart
+++ b/lib/view/pages/keyboard/special_characters_model.dart
@@ -6,13 +6,12 @@ import 'package:settings/schemas/schemas.dart';
 import 'package:settings/services/settings_service.dart';
 
 class SpecialCharactersModel extends SafeChangeNotifier {
-  final Settings? _inputSourceSettings;
-  static const _xkbOptionsKey = 'xkb-options';
-
   SpecialCharactersModel(SettingsService service)
       : _inputSourceSettings = service.lookup(schemaInputSources) {
     _inputSourceSettings?.addListener(notifyListeners);
   }
+  final Settings? _inputSourceSettings;
+  static const _xkbOptionsKey = 'xkb-options';
 
   @override
   void dispose() {
@@ -22,20 +21,20 @@ class SpecialCharactersModel extends SafeChangeNotifier {
 
   Future<List<String>> _getXkbOptions() async {
     final settings = GSettings(schemaInputSources);
-    final List<String> xkbOptions = [];
+    final xkbOptions = <String>[];
 
-    final DBusArray dbusArray = await settings.get(_xkbOptionsKey) as DBusArray;
+    final dbusArray = await settings.get(_xkbOptionsKey) as DBusArray;
 
-    for (final DBusValue dbusArrayChild in dbusArray.children) {
-      final DBusString dBusString = dbusArrayChild as DBusString;
+    for (final dbusArrayChild in dbusArray.children) {
+      final dBusString = dbusArrayChild as DBusString;
       xkbOptions.add(dBusString.value);
     }
 
     return xkbOptions;
   }
 
-  _setXkbOptions(List<String> xkbOptions) async {
-    _inputSourceSettings?.setValue(_xkbOptionsKey, xkbOptions);
+  Future<void> _setXkbOptions(List<String> xkbOptions) async {
+    await _inputSourceSettings?.setValue(_xkbOptionsKey, xkbOptions);
 
     notifyListeners();
   }
@@ -132,12 +131,12 @@ class SpecialCharactersModel extends SafeChangeNotifier {
     final options =
         (await _getXkbOptions()).where((element) => element.contains('lv3'));
 
-    for (var option in options) {
+    for (final option in options) {
       if (option.contains('lv3:ralt_alt') && options.length < 2) {
         return Lv3Options.none;
       }
     }
-    for (var option in options) {
+    for (final option in options) {
       if (option.contains('lv3:ralt_switch')) {
         return Lv3Options.rightAlt;
       }
diff --git a/lib/view/pages/keyboard/special_characters_section.dart b/lib/view/pages/keyboard/special_characters_section.dart
index cf4482c6..fa0eec61 100644
--- a/lib/view/pages/keyboard/special_characters_section.dart
+++ b/lib/view/pages/keyboard/special_characters_section.dart
@@ -11,8 +11,8 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class SpecialCharactersSection extends StatelessWidget {
   const SpecialCharactersSection({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -70,7 +70,7 @@ class SpecialCharactersSection extends StatelessWidget {
 }
 
 class _Lv3OptionsDialog extends StatelessWidget {
-  const _Lv3OptionsDialog({Key? key}) : super(key: key);
+  const _Lv3OptionsDialog();
 
   @override
   Widget build(BuildContext context) {
@@ -85,7 +85,7 @@ class _Lv3OptionsDialog extends StatelessWidget {
           YaruSwitchRow(
             trailingWidget: const Text('Use default value'),
             value: snapshot.data == null,
-            onChanged: (value) => model.removeLV3Options(value),
+            onChanged: model.removeLV3Options,
           ),
           const Divider(),
           ListTile(
@@ -117,9 +117,7 @@ class _Lv3OptionsDialog extends StatelessWidget {
 }
 
 class _ComposeOptionsDialog extends StatelessWidget {
-  const _ComposeOptionsDialog({
-    Key? key,
-  }) : super(key: key);
+  const _ComposeOptionsDialog();
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/mouse_and_touchpad/general_section.dart b/lib/view/pages/mouse_and_touchpad/general_section.dart
index 3cbefbeb..5a8b369d 100644
--- a/lib/view/pages/mouse_and_touchpad/general_section.dart
+++ b/lib/view/pages/mouse_and_touchpad/general_section.dart
@@ -7,7 +7,7 @@ import 'package:settings/view/settings_section.dart';
 import 'mouse_and_touchpad_model.dart';
 
 class GeneralSection extends StatelessWidget {
-  const GeneralSection({Key? key}) : super(key: key);
+  const GeneralSection({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.dart b/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.dart
index 0bf4e8b3..cd1712dc 100644
--- a/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.dart
+++ b/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.dart
@@ -3,6 +3,14 @@ import 'package:settings/schemas/schemas.dart';
 import 'package:settings/services/settings_service.dart';
 
 class MouseAndTouchpadModel extends ChangeNotifier {
+
+  MouseAndTouchpadModel(SettingsService service)
+      : _peripheralsMouseSettings = service.lookup(schemaPeripheralsMouse),
+        _peripheralsTouchpadSettings =
+            service.lookup(schemaPeripheralTouchpad) {
+    _peripheralsMouseSettings?.addListener(notifyListeners);
+    _peripheralsTouchpadSettings?.addListener(notifyListeners);
+  }
   static const _leftHanded = 'left-handed';
   static const _mouseSpeedKey = 'speed';
   static const _mouseNaturalScrollKey = 'natural-scroll';
@@ -13,14 +21,6 @@ class MouseAndTouchpadModel extends ChangeNotifier {
   static const _touchpadTwoFingerScrolling = 'two-finger-scrolling-enabled';
   static const _touchpadEdgeScrolling = 'edge-scrolling-enabled';
 
-  MouseAndTouchpadModel(SettingsService service)
-      : _peripheralsMouseSettings = service.lookup(schemaPeripheralsMouse),
-        _peripheralsTouchpadSettings =
-            service.lookup(schemaPeripheralTouchpad) {
-    _peripheralsMouseSettings?.addListener(notifyListeners);
-    _peripheralsTouchpadSettings?.addListener(notifyListeners);
-  }
-
   @override
   void dispose() {
     _peripheralsMouseSettings?.removeListener(notifyListeners);
diff --git a/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_page.dart b/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_page.dart
index 2efd81e7..85c92708 100644
--- a/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_page.dart
+++ b/lib/view/pages/mouse_and_touchpad/mouse_and_touchpad_page.dart
@@ -9,7 +9,7 @@ import 'package:settings/view/pages/mouse_and_touchpad/touchpad_section.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class MouseAndTouchpadPage extends StatelessWidget {
-  const MouseAndTouchpadPage({Key? key}) : super(key: key);
+  const MouseAndTouchpadPage({super.key});
 
   static Widget create(BuildContext context) {
     final service = Provider.of<SettingsService>(context, listen: false);
diff --git a/lib/view/pages/mouse_and_touchpad/mouse_section.dart b/lib/view/pages/mouse_and_touchpad/mouse_section.dart
index 9d4a116e..d96d464b 100644
--- a/lib/view/pages/mouse_and_touchpad/mouse_section.dart
+++ b/lib/view/pages/mouse_and_touchpad/mouse_section.dart
@@ -7,7 +7,7 @@ import 'package:settings/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.
 import 'package:settings/view/settings_section.dart';
 
 class MouseSection extends StatelessWidget {
-  const MouseSection({Key? key}) : super(key: key);
+  const MouseSection({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/mouse_and_touchpad/touchpad_section.dart b/lib/view/pages/mouse_and_touchpad/touchpad_section.dart
index 33ae77ff..155c24ca 100644
--- a/lib/view/pages/mouse_and_touchpad/touchpad_section.dart
+++ b/lib/view/pages/mouse_and_touchpad/touchpad_section.dart
@@ -7,7 +7,7 @@ import 'package:settings/view/pages/mouse_and_touchpad/mouse_and_touchpad_model.
 import 'package:settings/view/settings_section.dart';
 
 class TouchpadSection extends StatelessWidget {
-  const TouchpadSection({Key? key}) : super(key: key);
+  const TouchpadSection({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/pages/multitasking/multi_tasking_model.dart b/lib/view/pages/multitasking/multi_tasking_model.dart
index 90414581..a66caa51 100644
--- a/lib/view/pages/multitasking/multi_tasking_model.dart
+++ b/lib/view/pages/multitasking/multi_tasking_model.dart
@@ -3,6 +3,19 @@ import 'package:settings/schemas/schemas.dart';
 import 'package:settings/services/settings_service.dart';
 
 class MultiTaskingModel extends SafeChangeNotifier {
+
+  MultiTaskingModel(SettingsService service)
+      : _multiTaskingSettings = service.lookup(schemaInterface),
+        _mutterSettings = service.lookup(schemaMutter),
+        _appSwitchSettings = service.lookup(schemaGnomeShellAppSwitcher),
+        _wmSettings = service.lookup(schemaWmPreferences),
+        _dashToDockSettings = service.lookup(schemaDashToDock) {
+    _multiTaskingSettings?.addListener(notifyListeners);
+    _mutterSettings?.addListener(notifyListeners);
+    _appSwitchSettings?.addListener(notifyListeners);
+    _wmSettings?.addListener(notifyListeners);
+    _dashToDockSettings?.addListener(notifyListeners);
+  }
   final Settings? _multiTaskingSettings;
   final Settings? _mutterSettings;
   final Settings? _appSwitchSettings;
@@ -18,19 +31,6 @@ class MultiTaskingModel extends SafeChangeNotifier {
   static const _dockPositionKey = 'dock-position';
   static const _extendHeightKey = 'extend-height';
 
-  MultiTaskingModel(SettingsService service)
-      : _multiTaskingSettings = service.lookup(schemaInterface),
-        _mutterSettings = service.lookup(schemaMutter),
-        _appSwitchSettings = service.lookup(schemaGnomeShellAppSwitcher),
-        _wmSettings = service.lookup(schemaWmPreferences),
-        _dashToDockSettings = service.lookup(schemaDashToDock) {
-    _multiTaskingSettings?.addListener(notifyListeners);
-    _mutterSettings?.addListener(notifyListeners);
-    _appSwitchSettings?.addListener(notifyListeners);
-    _wmSettings?.addListener(notifyListeners);
-    _dashToDockSettings?.addListener(notifyListeners);
-  }
-
   @override
   void dispose() {
     _multiTaskingSettings?.removeListener(notifyListeners);
diff --git a/lib/view/pages/multitasking/multi_tasking_page.dart b/lib/view/pages/multitasking/multi_tasking_page.dart
index 2a47fdbc..e4a1fa90 100644
--- a/lib/view/pages/multitasking/multi_tasking_page.dart
+++ b/lib/view/pages/multitasking/multi_tasking_page.dart
@@ -13,7 +13,7 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class MultiTaskingPage extends StatelessWidget {
-  const MultiTaskingPage({Key? key}) : super(key: key);
+  const MultiTaskingPage({super.key});
 
   static Widget create(BuildContext context) {
     final service = Provider.of<SettingsService>(context, listen: false);
@@ -163,7 +163,7 @@ class MultiTaskingPage extends StatelessWidget {
               trailing: YaruRadio(
                 value: false,
                 groupValue: model.workSpaceOnlyOnPrimary,
-                onChanged: (bool? value) =>
+                onChanged: (value) =>
                     model.workSpaceOnlyOnPrimary = value,
               ),
               enabled: model.workSpaceOnlyOnPrimary != null,
@@ -193,7 +193,7 @@ class MultiTaskingPage extends StatelessWidget {
               trailing: YaruRadio(
                 value: true,
                 groupValue: model.workSpaceOnlyOnPrimary,
-                onChanged: (bool? value) =>
+                onChanged: (value) =>
                     model.workSpaceOnlyOnPrimary = value,
               ),
               enabled: model.workSpaceOnlyOnPrimary != null,
diff --git a/lib/view/pages/notifications/app_notifications_section.dart b/lib/view/pages/notifications/app_notifications_section.dart
index 00992896..a6d5f092 100644
--- a/lib/view/pages/notifications/app_notifications_section.dart
+++ b/lib/view/pages/notifications/app_notifications_section.dart
@@ -7,7 +7,7 @@ import 'package:settings/view/pages/notifications/notifications_model.dart';
 import 'package:settings/view/settings_section.dart';
 
 class AppNotificationsSection extends StatelessWidget {
-  const AppNotificationsSection({Key? key}) : super(key: key);
+  const AppNotificationsSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +28,7 @@ class AppNotificationsSection extends StatelessWidget {
 }
 
 class AppNotificationsSettingRow extends StatelessWidget {
-  const AppNotificationsSettingRow({Key? key}) : super(key: key);
+  const AppNotificationsSettingRow({super.key});
 
   static Widget create(BuildContext context, {required String appId}) {
     final service = Provider.of<SettingsService>(context, listen: false);
diff --git a/lib/view/pages/notifications/global_notifications_section.dart b/lib/view/pages/notifications/global_notifications_section.dart
index d751340a..c6bf978a 100644
--- a/lib/view/pages/notifications/global_notifications_section.dart
+++ b/lib/view/pages/notifications/global_notifications_section.dart
@@ -6,7 +6,7 @@ import 'package:settings/view/pages/notifications/notifications_model.dart';
 import 'package:settings/view/settings_section.dart';
 
 class GlobalNotificationsSection extends StatelessWidget {
-  const GlobalNotificationsSection({Key? key}) : super(key: key);
+  const GlobalNotificationsSection({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -19,12 +19,12 @@ class GlobalNotificationsSection extends StatelessWidget {
         YaruSwitchRow(
           trailingWidget: const Text('Do Not Disturb'),
           value: model.doNotDisturb,
-          onChanged: (value) => model.setDoNotDisturb(value),
+          onChanged: model.setDoNotDisturb,
         ),
         YaruSwitchRow(
           trailingWidget: const Text('Show Notifications On Lock Screen'),
           value: model.showOnLockScreen,
-          onChanged: (value) => model.setShowOnLockScreen(value),
+          onChanged: model.setShowOnLockScreen,
         ),
       ],
     );
diff --git a/lib/view/pages/notifications/notifications_model.dart b/lib/view/pages/notifications/notifications_model.dart
index 7ea16c64..8ec34efc 100644
--- a/lib/view/pages/notifications/notifications_model.dart
+++ b/lib/view/pages/notifications/notifications_model.dart
@@ -3,13 +3,13 @@ import 'package:settings/schemas/schemas.dart';
 import 'package:settings/services/settings_service.dart';
 
 class NotificationsModel extends ChangeNotifier {
-  static const _showBannersKey = 'show-banners';
-  static const _showInLockScreenKey = 'show-in-lock-screen';
 
   NotificationsModel(SettingsService service)
       : _notificationSettings = service.lookup(schemaNotifications) {
     _notificationSettings?.addListener(notifyListeners);
   }
+  static const _showBannersKey = 'show-banners';
+  static const _showInLockScreenKey = 'show-in-lock-screen';
 
   @override
   void dispose() {
@@ -47,14 +47,14 @@ class NotificationsModel extends ChangeNotifier {
 }
 
 class AppNotificationsModel extends ChangeNotifier {
-  static const _enableKey = 'enable';
-  static const _appSchemaId = '$schemaNotifications.application';
 
   AppNotificationsModel(this.appId, SettingsService service)
       : _appNotificationSettings =
             service.lookup(_appSchemaId, path: _getPath(appId)) {
     _appNotificationSettings?.addListener(notifyListeners);
   }
+  static const _enableKey = 'enable';
+  static const _appSchemaId = '$schemaNotifications.application';
 
   @override
   void dispose() {
diff --git a/lib/view/pages/notifications/notifications_page.dart b/lib/view/pages/notifications/notifications_page.dart
index 1585f16a..df96d6be 100644
--- a/lib/view/pages/notifications/notifications_page.dart
+++ b/lib/view/pages/notifications/notifications_page.dart
@@ -8,7 +8,7 @@ import 'package:settings/view/pages/notifications/notifications_model.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class NotificationsPage extends StatelessWidget {
-  const NotificationsPage({Key? key}) : super(key: key);
+  const NotificationsPage({super.key});
 
   static Widget create(BuildContext context) {
     final service = Provider.of<SettingsService>(context, listen: false);
diff --git a/lib/view/pages/online_accounts/online_accounts_page.dart b/lib/view/pages/online_accounts/online_accounts_page.dart
index e48c3805..34480c05 100644
--- a/lib/view/pages/online_accounts/online_accounts_page.dart
+++ b/lib/view/pages/online_accounts/online_accounts_page.dart
@@ -3,7 +3,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class OnlineAccountsPage extends StatelessWidget {
-  const OnlineAccountsPage({Key? key}) : super(key: key);
+  const OnlineAccountsPage({super.key});
 
   static Widget create(BuildContext context) => const OnlineAccountsPage();
 
diff --git a/lib/view/pages/power/battery_section.dart b/lib/view/pages/power/battery_section.dart
index a80c7bf7..3e831404 100644
--- a/lib/view/pages/power/battery_section.dart
+++ b/lib/view/pages/power/battery_section.dart
@@ -10,7 +10,7 @@ import 'package:yaru_colors/yaru_colors.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class BatterySection extends StatefulWidget {
-  const BatterySection({Key? key}) : super(key: key);
+  const BatterySection({super.key});
 
   static Widget create(BuildContext context) {
     return ChangeNotifierProvider<BatteryModel>(
diff --git a/lib/view/pages/power/battery_widgets.dart b/lib/view/pages/power/battery_widgets.dart
index 4de2bc2d..372f6106 100644
--- a/lib/view/pages/power/battery_widgets.dart
+++ b/lib/view/pages/power/battery_widgets.dart
@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
+import 'package:settings/l10n/l10n.dart';
 import 'package:settings/utils.dart';
 import 'package:upower/upower.dart';
-import 'package:settings/l10n/l10n.dart';
 
 class BatteryStateLabel extends StatelessWidget {
   const BatteryStateLabel({
-    Key? key,
+    super.key,
     required this.state,
     required this.percentage,
     required this.timeToFull,
     required this.timeToEmpty,
-  }) : super(key: key);
+  });
 
   final UPowerDeviceState? state;
   final double percentage;
diff --git a/lib/view/pages/power/lid_close_model.dart b/lib/view/pages/power/lid_close_model.dart
index e8178d58..eb9579a5 100644
--- a/lib/view/pages/power/lid_close_model.dart
+++ b/lib/view/pages/power/lid_close_model.dart
@@ -7,12 +7,12 @@ const _lidCloseBatteryActionKey = 'lid-close-battery-action';
 const _lidCloseAcActionKey = 'lid-close-ac-action';
 
 class LidCloseModel extends SafeChangeNotifier {
-  final Settings? _daemonSettings;
 
   LidCloseModel(SettingsService settings)
       : _daemonSettings = settings.lookup(schemaSettingsDaemonPowerPlugin) {
     _daemonSettings?.addListener(notifyListeners);
   }
+  final Settings? _daemonSettings;
 
   @override
   void dispose() {
diff --git a/lib/view/pages/power/lid_close_section.dart b/lib/view/pages/power/lid_close_section.dart
index 5811d4b1..b0c6215c 100644
--- a/lib/view/pages/power/lid_close_section.dart
+++ b/lib/view/pages/power/lid_close_section.dart
@@ -9,7 +9,7 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class LidCloseSection extends StatelessWidget {
-  const LidCloseSection({Key? key}) : super(key: key);
+  const LidCloseSection({super.key});
 
   static Widget create(BuildContext context) {
     return ChangeNotifierProvider(
diff --git a/lib/view/pages/power/power_page.dart b/lib/view/pages/power/power_page.dart
index 6108d23e..e2777845 100644
--- a/lib/view/pages/power/power_page.dart
+++ b/lib/view/pages/power/power_page.dart
@@ -9,7 +9,7 @@ import 'package:settings/view/pages/power/suspend_section.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class PowerPage extends StatelessWidget {
-  const PowerPage({Key? key}) : super(key: key);
+  const PowerPage({super.key});
 
   static Widget create(BuildContext context) => const PowerPage();
 
diff --git a/lib/view/pages/power/power_profile_section.dart b/lib/view/pages/power/power_profile_section.dart
index 124d405c..a4b17f61 100644
--- a/lib/view/pages/power/power_profile_section.dart
+++ b/lib/view/pages/power/power_profile_section.dart
@@ -10,7 +10,7 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class PowerProfileSection extends StatefulWidget {
-  const PowerProfileSection({Key? key}) : super(key: key);
+  const PowerProfileSection({super.key});
 
   static Widget create(BuildContext context) {
     return ChangeNotifierProvider<PowerProfileModel>(
@@ -49,7 +49,7 @@ class _PowerProfileSectionState extends State<PowerProfileSection> {
             leading: YaruRadio<PowerProfile?>(
               value: profile,
               groupValue: model.profile,
-              onChanged: (v) => model.setProfile(v),
+              onChanged: model.setProfile,
             ),
           ),
       ],
diff --git a/lib/view/pages/power/power_profile_widgets.dart b/lib/view/pages/power/power_profile_widgets.dart
index 9ea6c43d..95cd73c5 100644
--- a/lib/view/pages/power/power_profile_widgets.dart
+++ b/lib/view/pages/power/power_profile_widgets.dart
@@ -4,10 +4,10 @@ import 'package:settings/view/pages/power/power_profile_x.dart';
 
 class ProfileModeTitle extends StatelessWidget {
   const ProfileModeTitle({
-    Key? key,
+    super.key,
     required this.title,
     required this.powerProfile,
-  }) : super(key: key);
+  });
 
   final Widget title;
   final PowerProfile powerProfile;
diff --git a/lib/view/pages/power/power_settings_dialogs.dart b/lib/view/pages/power/power_settings_dialogs.dart
index 9941f17e..e98151a1 100644
--- a/lib/view/pages/power/power_settings_dialogs.dart
+++ b/lib/view/pages/power/power_settings_dialogs.dart
@@ -20,7 +20,7 @@ Future<void> showAutomaticSuspendDialog(BuildContext context) async {
 }
 
 class AutomaticSuspendDialog extends StatelessWidget {
-  const AutomaticSuspendDialog({Key? key}) : super(key: key);
+  const AutomaticSuspendDialog({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -59,13 +59,12 @@ class AutomaticSuspendDialog extends StatelessWidget {
 
 class _SuspendDelaySettingsRow extends StatelessWidget {
   const _SuspendDelaySettingsRow({
-    Key? key,
     required this.actionLabel,
     required this.suspend,
     required this.onSuspendChanged,
     required this.delay,
     required this.onDelayChanged,
-  }) : super(key: key);
+  });
 
   final String actionLabel;
   final bool? suspend;
diff --git a/lib/view/pages/power/power_settings_section.dart b/lib/view/pages/power/power_settings_section.dart
index 996cbc31..183976cb 100644
--- a/lib/view/pages/power/power_settings_section.dart
+++ b/lib/view/pages/power/power_settings_section.dart
@@ -17,7 +17,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class PowerSettingsSection extends StatefulWidget {
-  const PowerSettingsSection({Key? key}) : super(key: key);
+  const PowerSettingsSection({super.key});
 
   static Widget create(BuildContext context) {
     return ChangeNotifierProvider<SuspendModel>(
@@ -93,7 +93,7 @@ class _PowerSettingsSectionState extends State<PowerSettingsSection> {
             width: 40,
             height: 40,
             child: OutlinedButton(
-              style: OutlinedButton.styleFrom(padding: const EdgeInsets.all(0)),
+              style: OutlinedButton.styleFrom(padding: EdgeInsets.zero),
               onPressed: () => showAutomaticSuspendDialog(context),
               child: const Icon(YaruIcons.gear),
             ),
diff --git a/lib/view/pages/power/suspend_section.dart b/lib/view/pages/power/suspend_section.dart
index 68d95203..f1897898 100644
--- a/lib/view/pages/power/suspend_section.dart
+++ b/lib/view/pages/power/suspend_section.dart
@@ -10,7 +10,7 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class SuspendSection extends StatefulWidget {
-  const SuspendSection({Key? key}) : super(key: key);
+  const SuspendSection({super.key});
 
   static Widget create(BuildContext context) {
     return ChangeNotifierProvider<SuspendModel>(
diff --git a/lib/view/pages/privacy/connectivity_model.dart b/lib/view/pages/privacy/connectivity_model.dart
index 479c5a96..cc7eae75 100644
--- a/lib/view/pages/privacy/connectivity_model.dart
+++ b/lib/view/pages/privacy/connectivity_model.dart
@@ -2,6 +2,8 @@ import 'package:nm/nm.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 class ConnectivityModel extends SafeChangeNotifier {
+
+  ConnectivityModel(NetworkManagerClient client) : _client = client;
   final NetworkManagerClient _client;
 
   Future<void> init() {
@@ -9,8 +11,6 @@ class ConnectivityModel extends SafeChangeNotifier {
     return Future.wait([network]);
   }
 
-  ConnectivityModel(NetworkManagerClient client) : _client = client;
-
   bool? get checkConnectiviy => _client.connectivityCheckEnabled;
   set checkConnectiviy(bool? value) {
     if (value == null) return;
diff --git a/lib/view/pages/privacy/connectivity_page.dart b/lib/view/pages/privacy/connectivity_page.dart
index 34aff2b6..60767ba5 100644
--- a/lib/view/pages/privacy/connectivity_page.dart
+++ b/lib/view/pages/privacy/connectivity_page.dart
@@ -10,7 +10,7 @@ import 'package:settings/view/section_description.dart';
 import 'package:settings/view/settings_section.dart';
 
 class ConnectivityPage extends StatefulWidget {
-  const ConnectivityPage({Key? key}) : super(key: key);
+  const ConnectivityPage({super.key});
 
   static Widget create(BuildContext context) => ChangeNotifierProvider(
         create: (_) => ConnectivityModel(context.read<NetworkManagerClient>()),
diff --git a/lib/view/pages/privacy/house_keeping_page.dart b/lib/view/pages/privacy/house_keeping_page.dart
index c64fad03..90df2d9d 100644
--- a/lib/view/pages/privacy/house_keeping_page.dart
+++ b/lib/view/pages/privacy/house_keeping_page.dart
@@ -14,7 +14,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class HouseKeepingPage extends StatelessWidget {
-  const HouseKeepingPage({Key? key}) : super(key: key);
+  const HouseKeepingPage({super.key});
 
   static Widget create(BuildContext context) => ChangeNotifierProvider(
         create: (_) => PrivacyModel(
@@ -179,11 +179,10 @@ class HouseKeepingPage extends StatelessWidget {
 
 class _ConfirmationDialog extends StatefulWidget {
   const _ConfirmationDialog({
-    Key? key,
     this.onConfirm,
     required this.iconData,
     this.title,
-  }) : super(key: key);
+  });
 
   final Function()? onConfirm;
   final IconData iconData;
@@ -270,7 +269,7 @@ class _ConfirmationDialogState extends State<_ConfirmationDialog>
 }
 
 class _TrashButton extends StatelessWidget {
-  const _TrashButton({Key? key, required this.onPressed}) : super(key: key);
+  const _TrashButton({required this.onPressed});
 
   final void Function()? onPressed;
 
@@ -280,7 +279,7 @@ class _TrashButton extends StatelessWidget {
       height: 40,
       width: 40,
       child: OutlinedButton(
-        style: OutlinedButton.styleFrom(padding: const EdgeInsets.all(0)),
+        style: OutlinedButton.styleFrom(padding: EdgeInsets.zero),
         onPressed: onPressed,
         child:
             Icon(YaruIcons.trash, color: Theme.of(context).colorScheme.error),
diff --git a/lib/view/pages/privacy/location_model.dart b/lib/view/pages/privacy/location_model.dart
index 722984f9..7854fca5 100644
--- a/lib/view/pages/privacy/location_model.dart
+++ b/lib/view/pages/privacy/location_model.dart
@@ -5,12 +5,12 @@ import 'package:settings/services/settings_service.dart';
 const _enabledKey = 'enabled';
 
 class LocationModel extends SafeChangeNotifier {
-  final Settings? _locationSettings;
 
   LocationModel(SettingsService service)
       : _locationSettings = service.lookup(schemaLocation) {
     _locationSettings?.addListener(notifyListeners);
   }
+  final Settings? _locationSettings;
 
   bool? get enabled => _locationSettings?.getValue(_enabledKey);
   set enabled(bool? value) {
diff --git a/lib/view/pages/privacy/location_page.dart b/lib/view/pages/privacy/location_page.dart
index 99414cde..c04d0ed7 100644
--- a/lib/view/pages/privacy/location_page.dart
+++ b/lib/view/pages/privacy/location_page.dart
@@ -13,7 +13,7 @@ import 'package:settings/view/settings_section.dart';
 const kPrivacyUrl = 'https://location.services.mozilla.com/privacy';
 
 class LocationPage extends StatelessWidget {
-  const LocationPage({Key? key}) : super(key: key);
+  const LocationPage({super.key});
 
   static Widget create(BuildContext context) =>
       ChangeNotifierProvider<LocationModel>(
diff --git a/lib/view/pages/privacy/privacy_model.dart b/lib/view/pages/privacy/privacy_model.dart
index aa5264a9..efa72034 100644
--- a/lib/view/pages/privacy/privacy_model.dart
+++ b/lib/view/pages/privacy/privacy_model.dart
@@ -10,8 +10,6 @@ const _recentFilesMaxAgeKey = 'recent-files-max-age';
 const _oldFilesAgeKey = 'old-files-age';
 
 class PrivacyModel extends SafeChangeNotifier {
-  final Settings? _privacySettings;
-  final HouseKeepingService _houseKeepingService;
 
   PrivacyModel(
     SettingsService settingsService,
@@ -20,6 +18,8 @@ class PrivacyModel extends SafeChangeNotifier {
         _houseKeepingService = houseKeepingService {
     _privacySettings?.addListener(notifyListeners);
   }
+  final Settings? _privacySettings;
+  final HouseKeepingService _houseKeepingService;
 
   @override
   void dispose() {
diff --git a/lib/view/pages/privacy/privacy_page.dart b/lib/view/pages/privacy/privacy_page.dart
index 8097d1b0..fa61372f 100644
--- a/lib/view/pages/privacy/privacy_page.dart
+++ b/lib/view/pages/privacy/privacy_page.dart
@@ -11,7 +11,7 @@ import 'package:settings/view/tabbed_page.dart';
 import 'package:yaru_icons/yaru_icons.dart';
 
 class PrivacyPage extends StatelessWidget {
-  const PrivacyPage({Key? key}) : super(key: key);
+  const PrivacyPage({super.key});
 
   static Widget create(BuildContext context) => const PrivacyPage();
 
diff --git a/lib/view/pages/privacy/reporting_model.dart b/lib/view/pages/privacy/reporting_model.dart
index f726ff46..fe0e4f24 100644
--- a/lib/view/pages/privacy/reporting_model.dart
+++ b/lib/view/pages/privacy/reporting_model.dart
@@ -6,12 +6,12 @@ const _reportTechnicalProblemsKey = 'report-technical-problems';
 const _sendSoftwareUsageStatsKey = 'send-software-usage-stats';
 
 class ReportingModel extends SafeChangeNotifier {
-  final Settings? _privacySettings;
 
   ReportingModel(SettingsService settingsService)
       : _privacySettings = settingsService.lookup(schemaPrivacy) {
     _privacySettings?.addListener(notifyListeners);
   }
+  final Settings? _privacySettings;
 
   @override
   void dispose() {
diff --git a/lib/view/pages/privacy/reporting_page.dart b/lib/view/pages/privacy/reporting_page.dart
index a879534a..01123848 100644
--- a/lib/view/pages/privacy/reporting_page.dart
+++ b/lib/view/pages/privacy/reporting_page.dart
@@ -13,7 +13,7 @@ import 'package:settings/view/settings_section.dart';
 const kUbuntuReportingLink = 'https://ubuntu.com/legal/data-privacy';
 
 class ReportingPage extends StatelessWidget {
-  const ReportingPage({Key? key}) : super(key: key);
+  const ReportingPage({super.key});
 
   static Widget create(BuildContext context) => ChangeNotifierProvider(
         create: (_) => ReportingModel(
diff --git a/lib/view/pages/privacy/screen_saver_model.dart b/lib/view/pages/privacy/screen_saver_model.dart
index 1bd82f91..ccf557df 100644
--- a/lib/view/pages/privacy/screen_saver_model.dart
+++ b/lib/view/pages/privacy/screen_saver_model.dart
@@ -10,9 +10,6 @@ const _showInLockScreenKey = 'show-in-lock-screen';
 const _idleDelayKey = 'idle-delay';
 
 class ScreenSaverModel extends SafeChangeNotifier {
-  final Settings? _screenSaverSettings;
-  final Settings? _notificationSettings;
-  final Settings? _sessionSettings;
 
   ScreenSaverModel(SettingsService service)
       : _screenSaverSettings = service.lookup(schemaScreenSaver),
@@ -22,6 +19,9 @@ class ScreenSaverModel extends SafeChangeNotifier {
     _notificationSettings?.addListener(notifyListeners);
     _sessionSettings?.addListener(notifyListeners);
   }
+  final Settings? _screenSaverSettings;
+  final Settings? _notificationSettings;
+  final Settings? _sessionSettings;
 
   @override
   void dispose() {
diff --git a/lib/view/pages/privacy/screen_saver_page.dart b/lib/view/pages/privacy/screen_saver_page.dart
index fd406bdd..2758fb6f 100644
--- a/lib/view/pages/privacy/screen_saver_page.dart
+++ b/lib/view/pages/privacy/screen_saver_page.dart
@@ -13,7 +13,7 @@ import 'package:settings/view/settings_section.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class ScreenSaverPage extends StatelessWidget {
-  const ScreenSaverPage({Key? key}) : super(key: key);
+  const ScreenSaverPage({super.key});
 
   static Widget create(BuildContext context) =>
       ChangeNotifierProvider<ScreenSaverModel>(
diff --git a/lib/view/pages/region_and_language/region_and_language_model.dart b/lib/view/pages/region_and_language/region_and_language_model.dart
index f7dac684..98b09896 100644
--- a/lib/view/pages/region_and_language/region_and_language_model.dart
+++ b/lib/view/pages/region_and_language/region_and_language_model.dart
@@ -6,12 +6,12 @@ import 'package:safe_change_notifier/safe_change_notifier.dart';
 import 'package:settings/services/locale_service.dart';
 
 class RegionAndLanguageModel extends SafeChangeNotifier {
-  final LocaleService _localeService;
-  List<String?>? get locales => _localeService.locales;
-  List<String> installedLocales = [];
 
   RegionAndLanguageModel({required LocaleService localeService})
       : _localeService = localeService;
+  final LocaleService _localeService;
+  List<String?>? get locales => _localeService.locales;
+  List<String> installedLocales = [];
 
   StreamSubscription? _localeSub;
 
diff --git a/lib/view/pages/region_and_language/region_and_language_page.dart b/lib/view/pages/region_and_language/region_and_language_page.dart
index 96cb24c1..90243848 100644
--- a/lib/view/pages/region_and_language/region_and_language_page.dart
+++ b/lib/view/pages/region_and_language/region_and_language_page.dart
@@ -11,7 +11,7 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class RegionAndLanguagePage extends StatefulWidget {
-  const RegionAndLanguagePage({Key? key}) : super(key: key);
+  const RegionAndLanguagePage({super.key});
 
   static Widget create(BuildContext context) => ChangeNotifierProvider(
         create: (context) => RegionAndLanguageModel(
@@ -74,7 +74,7 @@ class _RegionAndLanguagePageState extends State<RegionAndLanguagePage> {
               title:
                   Text(context.l10n.regionAndLanguagePageManageLanguageAction),
               trailing: YaruOptionButton(
-                onPressed: () => model.openGnomeLanguageSelector(),
+                onPressed: model.openGnomeLanguageSelector,
                 child: const Icon(YaruIcons.download),
               ),
             ),
@@ -86,9 +86,7 @@ class _RegionAndLanguagePageState extends State<RegionAndLanguagePage> {
 }
 
 class _LocaleSelectDialog extends StatefulWidget {
-  const _LocaleSelectDialog({
-    Key? key,
-  }) : super(key: key);
+  const _LocaleSelectDialog();
 
   @override
   State<_LocaleSelectDialog> createState() => _LocaleSelectDialogState();
@@ -132,12 +130,12 @@ class _LocaleSelectDialogState extends State<_LocaleSelectDialog> {
                 model.installedLocales.length,
                 (index) => ListTile(
                   selected: _selectedIndex == index,
-                  onTap: (() {
+                  onTap: () {
                     setState(() {
                       _selectedIndex = index;
                     });
                     localeToBeSet = model.installedLocales[index];
-                  }),
+                  },
                   title: Text(
                     LocaleNames.of(context)!
                             .nameOf(model.installedLocales[index]) ??
diff --git a/lib/view/pages/removable_media/removable_media_model.dart b/lib/view/pages/removable_media/removable_media_model.dart
index 8ae08297..49cbfc36 100644
--- a/lib/view/pages/removable_media/removable_media_model.dart
+++ b/lib/view/pages/removable_media/removable_media_model.dart
@@ -24,6 +24,11 @@ enum MimeTypeBehavior {
 }
 
 class RemovableMediaModel extends SafeChangeNotifier {
+
+  RemovableMediaModel(SettingsService service)
+      : _removableMediaSettings = service.lookup(schemaMediaHandling) {
+    _removableMediaSettings?.addListener(notifyListeners);
+  }
   static const mimeTypes = <String, String>{
     'x-content/audio-cdda': 'Audio CD',
     'x-content/video-dvd': 'DVD-Video',
@@ -48,11 +53,6 @@ class RemovableMediaModel extends SafeChangeNotifier {
 
   final Settings? _removableMediaSettings;
 
-  RemovableMediaModel(SettingsService service)
-      : _removableMediaSettings = service.lookup(schemaMediaHandling) {
-    _removableMediaSettings?.addListener(notifyListeners);
-  }
-
   @override
   void dispose() {
     _removableMediaSettings?.removeListener(notifyListeners);
diff --git a/lib/view/pages/removable_media/removable_media_page.dart b/lib/view/pages/removable_media/removable_media_page.dart
index 910d8cfa..76f6ee20 100644
--- a/lib/view/pages/removable_media/removable_media_page.dart
+++ b/lib/view/pages/removable_media/removable_media_page.dart
@@ -9,7 +9,7 @@ import 'package:settings/view/pages/settings_page.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class RemovableMediaPage extends StatelessWidget {
-  const RemovableMediaPage({Key? key}) : super(key: key);
+  const RemovableMediaPage({super.key});
 
   static Widget create(BuildContext context) {
     final service = Provider.of<SettingsService>(context, listen: false);
diff --git a/lib/view/pages/search/search_page.dart b/lib/view/pages/search/search_page.dart
index 2e49c8fb..1fd1a676 100644
--- a/lib/view/pages/search/search_page.dart
+++ b/lib/view/pages/search/search_page.dart
@@ -3,7 +3,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class SearchPage extends StatelessWidget {
-  const SearchPage({Key? key}) : super(key: key);
+  const SearchPage({super.key});
 
   static Widget create(BuildContext context) => const SearchPage();
 
diff --git a/lib/view/pages/settings_alert_dialog.dart b/lib/view/pages/settings_alert_dialog.dart
index 91f716a5..c7cbf287 100644
--- a/lib/view/pages/settings_alert_dialog.dart
+++ b/lib/view/pages/settings_alert_dialog.dart
@@ -4,7 +4,7 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class SettingsAlertDialog extends StatelessWidget {
   const SettingsAlertDialog({
-    Key? key,
+    super.key,
     required this.title,
     required this.child,
     this.closeIconData,
@@ -15,7 +15,7 @@ class SettingsAlertDialog extends StatelessWidget {
     this.actions,
     this.contentPadding = EdgeInsets.zero,
     this.scrollable = false,
-  }) : super(key: key);
+  });
 
   /// The title of the dialog, displayed in a large font at the top of the [YaruDialogTitle].
   final String title;
diff --git a/lib/view/pages/settings_page.dart b/lib/view/pages/settings_page.dart
index 16e793f1..ec3900b6 100644
--- a/lib/view/pages/settings_page.dart
+++ b/lib/view/pages/settings_page.dart
@@ -6,11 +6,11 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 /// but can be set if wanted.
 class SettingsPage extends StatelessWidget {
   const SettingsPage({
-    Key? key,
+    super.key,
     required this.children,
     this.padding,
     this.controller,
-  }) : super(key: key);
+  });
 
   final List<Widget> children;
   final EdgeInsets? padding;
diff --git a/lib/view/pages/settings_simple_dialog.dart b/lib/view/pages/settings_simple_dialog.dart
index b3892281..4fbe6537 100644
--- a/lib/view/pages/settings_simple_dialog.dart
+++ b/lib/view/pages/settings_simple_dialog.dart
@@ -4,7 +4,7 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 class SettingsSimpleDialog extends StatelessWidget {
   /// Create a [SimpleDialog] with a close button
   const SettingsSimpleDialog({
-    Key? key,
+    super.key,
     required this.title,
     required this.closeIconData,
     required this.children,
@@ -12,7 +12,7 @@ class SettingsSimpleDialog extends StatelessWidget {
     this.alignment,
     required this.width,
     this.titleTextAlign = TextAlign.center,
-  }) : super(key: key);
+  });
 
   /// The title of the dialog, displayed in a large font at the top of the [YaruDialogTitle].
   final String title;
diff --git a/lib/view/pages/sound/sound_model.dart b/lib/view/pages/sound/sound_model.dart
index 123aab5e..e90cd789 100644
--- a/lib/view/pages/sound/sound_model.dart
+++ b/lib/view/pages/sound/sound_model.dart
@@ -3,14 +3,14 @@ import 'package:settings/schemas/schemas.dart';
 import 'package:settings/services/settings_service.dart';
 
 class SoundModel extends ChangeNotifier {
-  static const _allowAbove100Key = 'allow-volume-above-100-percent';
-  static const _eventSoundsKey = 'event-sounds';
-  static const _inputFeedbackSounds = 'input-feedback-sounds';
 
   SoundModel(SettingsService service)
       : _soundSettings = service.lookup(schemaSound) {
     _soundSettings?.addListener(notifyListeners);
   }
+  static const _allowAbove100Key = 'allow-volume-above-100-percent';
+  static const _eventSoundsKey = 'event-sounds';
+  static const _inputFeedbackSounds = 'input-feedback-sounds';
 
   @override
   void dispose() {
diff --git a/lib/view/pages/sound/sound_page.dart b/lib/view/pages/sound/sound_page.dart
index 10b9e7c1..7f2af5fb 100644
--- a/lib/view/pages/sound/sound_page.dart
+++ b/lib/view/pages/sound/sound_page.dart
@@ -9,7 +9,7 @@ import 'package:settings/view/pages/sound/sound_model.dart';
 import 'package:settings/view/settings_section.dart';
 
 class SoundPage extends StatelessWidget {
-  const SoundPage({Key? key}) : super(key: key);
+  const SoundPage({super.key});
 
   static Widget create(BuildContext context) {
     final service = Provider.of<SettingsService>(context, listen: false);
@@ -40,21 +40,21 @@ class SoundPage extends StatelessWidget {
             YaruSwitchRow(
               trailingWidget: const Text('Allow Volume Above 100%'),
               value: model.allowAbove100,
-              onChanged: (value) => model.setAllowAbove100(value),
+              onChanged: model.setAllowAbove100,
             ),
             YaruSwitchRow(
               trailingWidget: const Text('Event Sounds'),
               actionDescription:
                   'Notify of a system action, notification or event',
               value: model.eventSounds,
-              onChanged: (value) => model.setEventSounds(value),
+              onChanged: model.setEventSounds,
             ),
             YaruSwitchRow(
               trailingWidget: const Text('Input Feedback Sounds'),
               actionDescription: 'Feedback for user input events, '
                   'such as mouse clicks, or key presses',
               value: model.inputFeedbackSounds,
-              onChanged: (value) => model.setInputFeedbackSounds(value),
+              onChanged: model.setInputFeedbackSounds,
             ),
           ],
         ),
diff --git a/lib/view/pages/users/users.dart b/lib/view/pages/users/users.dart
index f4b6e167..32e90189 100644
--- a/lib/view/pages/users/users.dart
+++ b/lib/view/pages/users/users.dart
@@ -3,7 +3,7 @@ import 'package:settings/l10n/l10n.dart';
 import 'package:settings/view/pages/settings_page.dart';
 
 class UsersPage extends StatelessWidget {
-  const UsersPage({Key? key}) : super(key: key);
+  const UsersPage({super.key});
 
   static Widget create(BuildContext context) => const UsersPage();
 
diff --git a/lib/view/pages/wallpaper/color_shading_option_row.dart b/lib/view/pages/wallpaper/color_shading_option_row.dart
index b62fa8ba..879fb789 100644
--- a/lib/view/pages/wallpaper/color_shading_option_row.dart
+++ b/lib/view/pages/wallpaper/color_shading_option_row.dart
@@ -8,13 +8,13 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 
 class ColorShadingOptionRow extends StatelessWidget {
   const ColorShadingOptionRow({
-    Key? key,
+    super.key,
     required this.actionLabel,
     this.actionDescription,
     required this.value,
     required this.onDropDownChanged,
     this.width,
-  }) : super(key: key);
+  });
 
   final String actionLabel;
   final String? actionDescription;
@@ -78,7 +78,7 @@ class ColorShadingOptionRow extends StatelessWidget {
     final model = context.read<WallpaperModel>();
     return ColorPicker(
       color: colorFromHex(primary ? model.primaryColor : model.secondaryColor),
-      onColorChanged: (Color color) => {
+      onColorChanged: (color) => {
         if (primary)
           {model.primaryColor = '#${color.hex}'}
         else
diff --git a/lib/view/pages/wallpaper/wallpaper_model.dart b/lib/view/pages/wallpaper/wallpaper_model.dart
index 6d1495c2..c14197bd 100644
--- a/lib/view/pages/wallpaper/wallpaper_model.dart
+++ b/lib/view/pages/wallpaper/wallpaper_model.dart
@@ -1,17 +1,15 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
+import 'package:http/http.dart' as http;
 import 'package:mime/mime.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/schemas/schemas.dart';
 import 'package:settings/services/display/display_service.dart';
 import 'package:settings/services/settings_service.dart';
-
-import 'package:path_provider/path_provider.dart';
-import 'package:http/http.dart' as http;
-import 'dart:convert';
-
 import 'package:settings/view/pages/displays/displays_configuration.dart';
 
 const gnomeWallpaperSuffix = 'file://';
@@ -25,6 +23,14 @@ const _nasaUrl =
 const _unsplashUrl = 'https://source.unsplash.com/1920x1080/daily';
 
 class WallpaperModel extends SafeChangeNotifier {
+  WallpaperModel(
+    SettingsService wallpaperService,
+    DisplayService displayService,
+  ) : _wallpaperSettings = wallpaperService.lookup(schemaBackground) {
+    _wallpaperSettings?.addListener(notifyListeners);
+    _displaysConfigurationSubscription = displayService.monitorStateStream
+        .listen((configuration) => _displaysConfiguration = configuration);
+  }
   final Settings? _wallpaperSettings;
   static const _pictureUriKey = 'picture-uri';
   static const _pictureUriDarkKey = 'picture-uri-dark';
@@ -43,14 +49,6 @@ class WallpaperModel extends SafeChangeNotifier {
 
   DisplaysConfiguration? _displaysConfiguration;
   StreamSubscription? _displaysConfigurationSubscription;
-  WallpaperModel(
-    SettingsService wallpaperService,
-    DisplayService displayService,
-  ) : _wallpaperSettings = wallpaperService.lookup(schemaBackground) {
-    _wallpaperSettings?.addListener(notifyListeners);
-    _displaysConfigurationSubscription = displayService.monitorStateStream
-        .listen((configuration) => _displaysConfiguration = configuration);
-  }
 
   @override
   void dispose() {
@@ -87,11 +85,11 @@ class WallpaperModel extends SafeChangeNotifier {
   /// Will fallback to 16/9 if [_displaysConfiguration] is not loaded.
   double get aspectRatio {
     if (_displaysConfiguration != null) {
-      for (var configuration in _displaysConfiguration!.configurations) {
+      for (final configuration in _displaysConfiguration!.configurations) {
         if (configuration.primary == true) {
           final resolution = configuration.resolution.split('x');
-          double aspectRatio =
-              (int.parse(resolution.first) / int.parse(resolution.last));
+          final aspectRatio =
+              int.parse(resolution.first) / int.parse(resolution.last);
           return aspectRatio;
         }
       }
@@ -101,7 +99,7 @@ class WallpaperModel extends SafeChangeNotifier {
   }
 
   Future<void> copyToCollection(String picPathString) async {
-    File image = File(picPathString);
+    final image = File(picPathString);
     if (_userWallpapersDir == null) return;
     await image
         .copy(_userWallpapersDir! + File(picPathString).uri.pathSegments.last);
@@ -110,7 +108,7 @@ class WallpaperModel extends SafeChangeNotifier {
 
   Future<void> removeFromCollection(String picPathString) async {
     final purePath = picPathString.replaceAll(gnomeWallpaperSuffix, '');
-    File image = File(purePath);
+    final image = File(purePath);
     await image.delete();
     notifyListeners();
   }
@@ -187,7 +185,7 @@ class WallpaperModel extends SafeChangeNotifier {
         }
         break;
       case WallpaperMode.imageOfTheDay:
-        setUrlWallpaperProvider(imageOfTheDayProvider);
+        await setUrlWallpaperProvider(imageOfTheDayProvider);
         break;
     }
 
@@ -249,7 +247,7 @@ class WallpaperModel extends SafeChangeNotifier {
 
     //Get the url of the day using the apiUrl in the providers Map
     Future<ImageModel> getImageUrl() async {
-      ImageProvider currentProvider = getProvider(imageOfTheDayProvider);
+      final currentProvider = getProvider(imageOfTheDayProvider);
 
       if (currentProvider.isDirect) {
         return ImageModel(
@@ -257,21 +255,21 @@ class WallpaperModel extends SafeChangeNotifier {
           imageMetadata: currentProvider.getImageMetadata(),
         );
       }
-      http.Response imageMetadataResponse =
+      final imageMetadataResponse =
           await http.get(Uri.parse(currentProvider.apiUrl));
-      var decodedJson = json.decode(imageMetadataResponse.body);
+      final decodedJson = json.decode(imageMetadataResponse.body);
       return ImageModel(
         imageUrl: currentProvider.getImageUrl!(decodedJson),
         imageMetadata: currentProvider.getImageMetadata(decodedJson),
       );
     }
 
-    ImageModel image = await getImageUrl();
+    final image = await getImageUrl();
 
     //TODO: Save the images to a more suitable location
-    String path =
+    final path =
         '${directory.path}/ImageOfTheDay/${imageOfTheDayProvider.name}/';
-    bool exists = await Directory(path).exists();
+    final exists = await Directory(path).exists();
     if (!exists) {
       await Directory(path).create(recursive: true);
     }
@@ -281,7 +279,7 @@ class WallpaperModel extends SafeChangeNotifier {
     // Refetch if the image doesn't exist or the current image is older than a day
     if (!file.existsSync() ||
         file.lastModifiedSync().day != DateTime.now().day) {
-      var imageResponse = await http.get(Uri.parse(image.imageUrl));
+      final imageResponse = await http.get(Uri.parse(image.imageUrl));
       await file.writeAsBytes(imageResponse.bodyBytes);
     }
 
@@ -291,25 +289,25 @@ class WallpaperModel extends SafeChangeNotifier {
 }
 
 class ImageProvider {
-  final String apiUrl;
-  final Function? getImageUrl;
-  final Function getImageMetadata;
-  final bool isDirect;
   ImageProvider({
     required this.apiUrl,
     required this.getImageMetadata,
     this.getImageUrl,
     this.isDirect = false,
   });
+  final String apiUrl;
+  final Function? getImageUrl;
+  final Function getImageMetadata;
+  final bool isDirect;
 }
 
 class ImageModel {
-  final String imageUrl;
-  final String imageMetadata;
   ImageModel({
     required this.imageUrl,
     required this.imageMetadata,
   });
+  final String imageUrl;
+  final String imageMetadata;
 }
 
 enum ColorShadingType {
diff --git a/lib/view/pages/wallpaper/wallpaper_page.dart b/lib/view/pages/wallpaper/wallpaper_page.dart
index c7f4cafc..39275932 100644
--- a/lib/view/pages/wallpaper/wallpaper_page.dart
+++ b/lib/view/pages/wallpaper/wallpaper_page.dart
@@ -15,6 +15,8 @@ import 'package:yaru_icons/yaru_icons.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 class WallpaperPage extends StatelessWidget {
+
+  const WallpaperPage({super.key});
   static Widget createTitle(BuildContext context) =>
       Text(context.l10n.wallpaperPageTitle);
 
@@ -25,8 +27,6 @@ class WallpaperPage extends StatelessWidget {
               .contains(value.toLowerCase())
           : false;
 
-  const WallpaperPage({Key? key}) : super(key: key);
-
   static Widget create(BuildContext context) {
     final settingsService =
         Provider.of<SettingsService>(context, listen: false);
@@ -220,8 +220,7 @@ class WallpaperPage extends StatelessWidget {
 }
 
 class _WallpaperImage extends StatelessWidget {
-  const _WallpaperImage({Key? key, required this.path, this.height})
-      : super(key: key);
+  const _WallpaperImage({required this.path, this.height});
 
   final String path;
   final int? height;
@@ -238,7 +237,7 @@ class _WallpaperImage extends StatelessWidget {
 }
 
 class _AddWallpaperTile extends StatelessWidget {
-  const _AddWallpaperTile({Key? key}) : super(key: key);
+  const _AddWallpaperTile();
 
   @override
   Widget build(BuildContext context) {
@@ -263,7 +262,7 @@ class _AddWallpaperTile extends StatelessWidget {
             } else {
               model.pictureUriDark = picPath.path;
             }
-            model.copyToCollection(picPath.path);
+            await model.copyToCollection(picPath.path);
           }
         },
         child: Container(
@@ -288,10 +287,9 @@ class _AddWallpaperTile extends StatelessWidget {
 
 class _WallpaperGrid extends StatefulWidget {
   const _WallpaperGrid({
-    Key? key,
     required this.data,
     required this.customizableGrid,
-  }) : super(key: key);
+  });
 
   final List<String> data;
   final bool customizableGrid;
@@ -370,9 +368,8 @@ class _WallpaperGridState extends State<_WallpaperGrid> {
 
 class _RemoveWallpaperButton extends StatelessWidget {
   const _RemoveWallpaperButton({
-    Key? key,
     required this.path,
-  }) : super(key: key);
+  });
 
   final String path;
 
@@ -401,7 +398,7 @@ class _RemoveWallpaperButton extends StatelessWidget {
 }
 
 class _ColoredBackground extends StatelessWidget {
-  const _ColoredBackground({Key? key}) : super(key: key);
+  const _ColoredBackground();
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/view/search_app_bar.dart b/lib/view/search_app_bar.dart
index 33a6ba7d..e5c34596 100644
--- a/lib/view/search_app_bar.dart
+++ b/lib/view/search_app_bar.dart
@@ -22,7 +22,7 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 /// ```
 class SearchAppBar extends StatelessWidget {
   const SearchAppBar({
-    Key? key,
+    super.key,
     this.searchController,
     required this.onChanged,
     required this.onEscape,
@@ -32,7 +32,7 @@ class SearchAppBar extends StatelessWidget {
     this.textStyle,
     this.automaticallyImplyLeading = false,
     this.clearSearchIconData,
-  }) : super(key: key);
+  });
 
   /// An optional [TextEditingController].
   final TextEditingController? searchController;
diff --git a/lib/view/section_description.dart b/lib/view/section_description.dart
index 768090bb..be20e09f 100644
--- a/lib/view/section_description.dart
+++ b/lib/view/section_description.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 
 class SectionDescription extends StatelessWidget {
-  const SectionDescription({Key? key, required this.width, required this.text})
-      : super(key: key);
+  const SectionDescription({super.key, required this.width, required this.text});
 
   final double width;
   final String text;
diff --git a/lib/view/selectable_svg_image.dart b/lib/view/selectable_svg_image.dart
index 04c2bd06..3b6e2663 100644
--- a/lib/view/selectable_svg_image.dart
+++ b/lib/view/selectable_svg_image.dart
@@ -3,14 +3,14 @@ import 'package:flutter_svg/flutter_svg.dart';
 
 class SelectableSvgImage extends StatelessWidget {
   const SelectableSvgImage({
-    Key? key,
+    super.key,
     required this.path,
     this.onTap,
     required this.selected,
     required this.height,
     required this.selectedColor,
     this.padding,
-  }) : super(key: key);
+  });
 
   final String path;
   final VoidCallback? onTap;
diff --git a/test/test_helper.dart b/test/test_helper.dart
index 3d0764a7..b877d125 100644
--- a/test/test_helper.dart
+++ b/test/test_helper.dart
@@ -20,7 +20,7 @@ extension TesterExtension on WidgetTester {
     dynamic args,
     MockNavigator? navigator,
   }) async {
-    Widget toTest = widgetBuilder.call();
+    var toTest = widgetBuilder.call();
     if (args != null) {
       toTest = Navigator(
         onGenerateRoute: (_) {
diff --git a/test/widgets/app_theme_test.dart b/test/widgets/app_theme_test.dart
index 4aaeb72e..9659761c 100644
--- a/test/widgets/app_theme_test.dart
+++ b/test/widgets/app_theme_test.dart
@@ -1,19 +1,20 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/app_theme.dart';
 import 'package:yaru/yaru.dart';
+
 import 'app_theme_test.mocks.dart';
-import 'package:mockito/mockito.dart';
 
 @GenerateMocks([Settings])
 void main() {
   test(
     'App Theme Dark Mode Test',
     () {
-      Settings settings = MockSettings();
-      AppTheme theme = AppTheme(settings);
+      final Settings settings = MockSettings();
+      final theme = AppTheme(settings);
 
       when(settings.setValue('gtk-theme', 'Yaru-dark')).thenAnswer(
         (realInvocation) async {},
@@ -27,8 +28,8 @@ void main() {
   test(
     'App Theme Light Mode Test',
     () {
-      Settings settings = MockSettings();
-      AppTheme theme = AppTheme(settings);
+      final Settings settings = MockSettings();
+      final theme = AppTheme(settings);
 
       when(settings.setValue('gtk-theme', 'Yaru')).thenAnswer(
         (realInvocation) async {},
diff --git a/test/widgets/yaru_check_box_row_test.dart b/test/widgets/yaru_check_box_row_test.dart
index efbb15d6..f4f1f954 100644
--- a/test/widgets/yaru_check_box_row_test.dart
+++ b/test/widgets/yaru_check_box_row_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:settings/view/common/yaru_checkbox_row.dart';
 
 void main() {
-  testWidgets('YaruCheckboxRow Test', (WidgetTester tester) async {
+  testWidgets('YaruCheckboxRow Test', (tester) async {
     await tester.pumpWidget(
       MaterialApp(
         home: Scaffold(
diff --git a/test/widgets/yaru_extra_options_row_test.dart b/test/widgets/yaru_extra_options_row_test.dart
index 56f3f044..9741ad0f 100644
--- a/test/widgets/yaru_extra_options_row_test.dart
+++ b/test/widgets/yaru_extra_options_row_test.dart
@@ -6,7 +6,7 @@ import 'package:yaru_widgets/yaru_widgets.dart';
 void main() {
   testWidgets(
     'YaruExtraOptionRow widget build test',
-    (WidgetTester tester) async {
+    (tester) async {
       await tester.pumpWidget(
         MaterialApp(
           home: Scaffold(
diff --git a/test/widgets/yaru_single_info_row_test.dart b/test/widgets/yaru_single_info_row_test.dart
index 507eb6ee..64e2e8fc 100644
--- a/test/widgets/yaru_single_info_row_test.dart
+++ b/test/widgets/yaru_single_info_row_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:settings/view/common/yaru_single_info_row.dart';
 
 void main() {
-  testWidgets('- YaruSingleInfoRow Test', (WidgetTester tester) async {
+  testWidgets('- YaruSingleInfoRow Test', (tester) async {
     await tester.pumpWidget(
       const MaterialApp(
         home: Scaffold(
diff --git a/test/widgets/yaru_switch_row_test.dart b/test/widgets/yaru_switch_row_test.dart
index 35dab6a5..74eedeaf 100644
--- a/test/widgets/yaru_switch_row_test.dart
+++ b/test/widgets/yaru_switch_row_test.dart
@@ -4,7 +4,7 @@ import 'package:settings/view/common/yaru_switch_row.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
 void main() {
-  testWidgets('- YaruSwitchRow Test', (WidgetTester tester) async {
+  testWidgets('- YaruSwitchRow Test', (tester) async {
     await tester.pumpWidget(
       MaterialApp(
         home: Scaffold(
diff --git a/test/widgets/yaru_togggle_button_row_test.dart b/test/widgets/yaru_togggle_button_row_test.dart
index 3fc0f39f..09db7f56 100644
--- a/test/widgets/yaru_togggle_button_row_test.dart
+++ b/test/widgets/yaru_togggle_button_row_test.dart
@@ -3,13 +3,13 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:settings/view/common/yaru_toggle_buttons_row.dart';
 
 void main() {
-  testWidgets('- YaruToggleButtonsRow Test', (WidgetTester tester) async {
+  testWidgets('- YaruToggleButtonsRow Test', (tester) async {
     await tester.pumpWidget(
       MaterialApp(
         home: Scaffold(
           body: YaruToggleButtonsRow(
             actionLabel: 'Foo Label',
-            onPressed: (int x) {},
+            onPressed: (x) {},
             selectedValues: const [false],
             actionDescription: 'Foo Description',
             labels: const ['Label'],