diff --git a/lib/functions/snackbar.dart b/lib/functions/snackbar.dart
index b332fcd..d0d7bc0 100644
--- a/lib/functions/snackbar.dart
+++ b/lib/functions/snackbar.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:adguard_home_manager/providers/app_config_provider.dart';
 import 'package:adguard_home_manager/config/globals.dart';
 
-void showSnacbkar({
+void showSnackbar({
   required AppConfigProvider appConfigProvider,
   required String label, 
   required Color color,
diff --git a/lib/models/filtering.dart b/lib/models/filtering.dart
index 7b521d2..5e43bf4 100644
--- a/lib/models/filtering.dart
+++ b/lib/models/filtering.dart
@@ -63,7 +63,7 @@ class Filter {
   Map<String, dynamic> toJson() => {
     "url": url,
     "name": name,
-    "last_updated": lastUpdated != null ? lastUpdated!.toIso8601String() : null,
+    "last_updated": lastUpdated?.toIso8601String(),
     "id": id,
     "rules_count": rulesCount,
     "enabled": enabled,
diff --git a/lib/models/filtering_status.dart b/lib/models/filtering_status.dart
index bfd219d..83908c3 100644
--- a/lib/models/filtering_status.dart
+++ b/lib/models/filtering_status.dart
@@ -65,7 +65,7 @@ class Filter {
     Map<String, dynamic> toJson() => {
         "url": url,
         "name": name,
-        "last_updated": lastUpdated != null ? lastUpdated!.toIso8601String() : null,
+        "last_updated": lastUpdated?.toIso8601String(),
         "id": id,
         "rules_count": rulesCount,
         "enabled": enabled,
diff --git a/lib/models/logs.dart b/lib/models/logs.dart
index 9ba3738..b4991be 100644
--- a/lib/models/logs.dart
+++ b/lib/models/logs.dart
@@ -30,7 +30,7 @@ class LogsData {
 
   Map<String, dynamic> toJson() => {
     "data": List<dynamic>.from(data.map((x) => x.toJson())),
-    "oldest": oldest != null ? oldest!.toIso8601String() : null,
+    "oldest": oldest?.toIso8601String(),
   };
 }
 
diff --git a/lib/providers/app_config_provider.dart b/lib/providers/app_config_provider.dart
index afdc467..3b843b9 100644
--- a/lib/providers/app_config_provider.dart
+++ b/lib/providers/app_config_provider.dart
@@ -33,7 +33,7 @@ class AppConfigProvider with ChangeNotifier {
   int _selectedTheme = 0;
   bool _useDynamicColor = true;
   int _staticColor = 0;
-  bool _useThemeColorForStatus = false;
+  final bool _useThemeColorForStatus = false;
 
   int _selectedClientsTab = 0;
   int _selectedFiltersTab = 0;
diff --git a/lib/screens/clients/added_list.dart b/lib/screens/clients/added_list.dart
index 0bb668b..2cceaab 100644
--- a/lib/screens/clients/added_list.dart
+++ b/lib/screens/clients/added_list.dart
@@ -82,14 +82,14 @@ class _AddedListState extends State<AddedList> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientUpdatedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientNotUpdated, 
           color: Colors.red
@@ -109,14 +109,14 @@ class _AddedListState extends State<AddedList> {
         if (widget.splitView == true) {
           Navigator.of(clientsNavigatorKey.currentContext!).popUntil((route) => false);
         }
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientDeletedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientNotDeleted, 
           color: Colors.red
diff --git a/lib/screens/clients/client/client_placeholder.dart b/lib/screens/clients/client/client_placeholder.dart
index cf4f485..0e8f018 100644
--- a/lib/screens/clients/client/client_placeholder.dart
+++ b/lib/screens/clients/client/client_placeholder.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 
 class ClientPlaceholder extends StatelessWidget {
-  const ClientPlaceholder({Key? key}) : super(key: key);
+  const ClientPlaceholder({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Center(
+    return const Center(
       child: Text("Select a client"),
     );
   }
diff --git a/lib/screens/clients/client/remove_client_modal.dart b/lib/screens/clients/client/remove_client_modal.dart
index 4427d22..b531540 100644
--- a/lib/screens/clients/client/remove_client_modal.dart
+++ b/lib/screens/clients/client/remove_client_modal.dart
@@ -5,9 +5,9 @@ class RemoveClientModal extends StatelessWidget {
   final void Function() onConfirm;
 
   const RemoveClientModal({
-    Key? key,
+    super.key,
     required this.onConfirm
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/clients/client/safe_search_modal.dart b/lib/screens/clients/client/safe_search_modal.dart
index 1be694c..1d539be 100644
--- a/lib/screens/clients/client/safe_search_modal.dart
+++ b/lib/screens/clients/client/safe_search_modal.dart
@@ -11,11 +11,11 @@ class SafeSearchModal extends StatefulWidget {
   final void Function(SafeSearch) onConfirm;
   
   const SafeSearchModal({
-    Key? key,
+    super.key,
     required this.safeSearch,
     required this.disabled,
     required this.onConfirm
-  }) : super(key: key);
+  });
 
   @override
   State<SafeSearchModal> createState() => _SafeSearchModalState();
diff --git a/lib/screens/clients/client/services_modal.dart b/lib/screens/clients/client/services_modal.dart
index 1a98275..b8f69dc 100644
--- a/lib/screens/clients/client/services_modal.dart
+++ b/lib/screens/clients/client/services_modal.dart
@@ -10,10 +10,10 @@ class ServicesModal extends StatefulWidget {
   final void Function(List<String>) onConfirm;
 
   const ServicesModal({
-    Key? key,
+    super.key,
     required this.blockedServices,
     required this.onConfirm,
-  }) : super(key: key);
+  });
 
   @override
   State<ServicesModal> createState() => _ServicesModalStateWidget();
diff --git a/lib/screens/clients/fab.dart b/lib/screens/clients/fab.dart
index a46b89a..383a2f3 100644
--- a/lib/screens/clients/fab.dart
+++ b/lib/screens/clients/fab.dart
@@ -33,14 +33,14 @@ class ClientsFab extends StatelessWidget {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAddedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientNotAdded, 
           color: Colors.red
diff --git a/lib/screens/clients/search_clients.dart b/lib/screens/clients/search_clients.dart
index e5b1451..2654c24 100644
--- a/lib/screens/clients/search_clients.dart
+++ b/lib/screens/clients/search_clients.dart
@@ -95,14 +95,14 @@ class _SearchClientsState extends State<SearchClients> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientDeletedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientNotDeleted, 
           color: Colors.red
@@ -119,14 +119,14 @@ class _SearchClientsState extends State<SearchClients> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientUpdatedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientNotUpdated, 
           color: Colors.red
@@ -205,7 +205,7 @@ class _SearchClientsState extends State<SearchClients> {
             height: 1,
             decoration: BoxDecoration(
               color: showDivider == true
-                ? Theme.of(context).colorScheme.surfaceVariant
+                ? Theme.of(context).colorScheme.surfaceContainerHighest
                 : Colors.transparent
             ),
           ),
diff --git a/lib/screens/connect/fab.dart b/lib/screens/connect/fab.dart
index 05ed1a2..f826485 100644
--- a/lib/screens/connect/fab.dart
+++ b/lib/screens/connect/fab.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:adguard_home_manager/widgets/add_server/add_server_functions.dart';
 
 class FabConnect extends StatelessWidget {
-  const FabConnect({Key? key}) : super(key: key);
+  const FabConnect({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/filters/add_button.dart b/lib/screens/filters/add_button.dart
index be9f0f4..2eca7d4 100644
--- a/lib/screens/filters/add_button.dart
+++ b/lib/screens/filters/add_button.dart
@@ -42,14 +42,14 @@ class AddFiltersButton extends StatelessWidget {
 
       if (!context.mounted) return;
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.ruleAddedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.ruleNotAdded, 
           color: Colors.red
@@ -67,14 +67,14 @@ class AddFiltersButton extends StatelessWidget {
 
       if (!context.mounted) return;
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.customRulesUpdatedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.customRulesNotUpdated, 
           color: Colors.red
@@ -146,28 +146,28 @@ class AddFiltersButton extends StatelessWidget {
 
       if (!context.mounted) return;
       if (result['success'] == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: "${AppLocalizations.of(context)!.listAdded} ${result['data']}.", 
           color: Colors.green
         );
       }
       else if (result['success'] == false && result['error'] == 'invalid_url') {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listUrlInvalid, 
           color: Colors.red
         );
       }
       else if (result['success'] == false && result['error'] == 'url_exists') {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listAlreadyAdded, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listNotAdded, 
           color: Colors.red
diff --git a/lib/screens/filters/custom_rules_list.dart b/lib/screens/filters/custom_rules_list.dart
index 25a1d4c..304972f 100644
--- a/lib/screens/filters/custom_rules_list.dart
+++ b/lib/screens/filters/custom_rules_list.dart
@@ -163,7 +163,7 @@ class _CustomRulesListState extends State<CustomRulesList> {
               onPressed: () async {
                 final result = await filteringProvider.fetchFilters();
                 if (result == false) {
-                  showSnacbkar(
+                  showSnackbar(
                     appConfigProvider: appConfigProvider,
                     label: AppLocalizations.of(context)!.errorLoadFilters, 
                     color: Colors.red
@@ -203,7 +203,7 @@ class _CustomRulesListState extends State<CustomRulesList> {
       onRefresh: () async {
         final result = await filteringProvider.fetchFilters();
         if (result == false) {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider,
             label: AppLocalizations.of(context)!.errorLoadFilters, 
             color: Colors.red
diff --git a/lib/screens/filters/details/list_details_screen.dart b/lib/screens/filters/details/list_details_screen.dart
index 95da744..188854c 100644
--- a/lib/screens/filters/details/list_details_screen.dart
+++ b/lib/screens/filters/details/list_details_screen.dart
@@ -94,14 +94,14 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
       );
       processModal.close();
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listDataUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listDataNotUpdated, 
           color: Colors.red
@@ -175,6 +175,7 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
                           _Content(
                             isDialog: widget.dialog,
                             list: list,
+                            type: widget.type,
                           )
                         ],
                       ),
@@ -216,6 +217,7 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
                     _Content(
                       isDialog: widget.dialog,
                       list: list,
+                      type: widget.type,
                     )
                   ],
                 ),
@@ -261,10 +263,12 @@ class _ListDetailsScreenState extends State<ListDetailsScreen> {
 class _Content extends StatelessWidget {
   final Filter list;
   final bool isDialog;
+  final String type;
 
   const _Content({
     required this.list,
-    required this.isDialog
+    required this.isDialog,
+    required this.type,
   });
 
   @override
@@ -339,7 +343,7 @@ class _Content extends StatelessWidget {
         CustomListTile(
           icon: Icons.shield_rounded, 
           title: AppLocalizations.of(context)!.listType, 
-          subtitle: isDialog == 'whitelist'
+          subtitle: type == 'whitelist'
             ? AppLocalizations.of(context)!.whitelist
             : AppLocalizations.of(context)!.blacklist,
           padding: isDialog == true
@@ -431,7 +435,7 @@ class _Actions extends StatelessWidget {
                   );
                   processModal.close();
                   if (result == true) {
-                    showSnacbkar(
+                    showSnackbar(
                       appConfigProvider: appConfigProvider,
                       label: AppLocalizations.of(context)!.listDeleted, 
                       color: Colors.green
@@ -439,7 +443,7 @@ class _Actions extends StatelessWidget {
                     Navigator.pop(context);
                   }
                   else {
-                    showSnacbkar(
+                    showSnackbar(
                       appConfigProvider: appConfigProvider,
                       label: AppLocalizations.of(context)!.listNotDeleted, 
                       color: Colors.red
diff --git a/lib/screens/filters/filters.dart b/lib/screens/filters/filters.dart
index 2ab49a3..ab624e0 100644
--- a/lib/screens/filters/filters.dart
+++ b/lib/screens/filters/filters.dart
@@ -24,7 +24,7 @@ import 'package:adguard_home_manager/constants/enums.dart';
 import 'package:adguard_home_manager/models/clients.dart';
 
 class Filters extends StatefulWidget {
-  const Filters({Key? key}) : super(key: key);
+  const Filters({super.key});
 
   @override
   State<Filters> createState() => _FiltersState();
@@ -57,14 +57,14 @@ class _FiltersState extends State<Filters> {
       if (!mounted) return;
       processModal.close();
       if (result['success'] == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: "${result['data']['updated']} ${AppLocalizations.of(context)!.listsUpdated}", 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listsNotUpdated, 
           color: Colors.red
@@ -109,14 +109,14 @@ class _FiltersState extends State<Filters> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.filteringStatusUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.filteringStatusNotUpdated, 
           color: Colors.red
@@ -133,14 +133,14 @@ class _FiltersState extends State<Filters> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.updateFrequencyChanged, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.updateFrequencyNotChanged, 
           color: Colors.red
@@ -163,14 +163,14 @@ class _FiltersState extends State<Filters> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar( 
+        showSnackbar( 
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.ruleRemovedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.ruleNotRemoved, 
           color: Colors.red
diff --git a/lib/screens/filters/filters_list.dart b/lib/screens/filters/filters_list.dart
index f4cca03..b9d4617 100644
--- a/lib/screens/filters/filters_list.dart
+++ b/lib/screens/filters/filters_list.dart
@@ -27,13 +27,13 @@ class FiltersList extends StatefulWidget {
   final void Function(Filter, String) onOpenDetailsScreen;
 
   const FiltersList({
-    Key? key,
+    super.key,
     required this.loadStatus,
     required this.scrollController,
     required this.data,
     required this.type,
     required this.onOpenDetailsScreen
-  }) : super(key: key);
+  });
 
   @override
   State<FiltersList> createState() => _FiltersListState();
@@ -133,7 +133,7 @@ class _FiltersListState extends State<FiltersList> {
               onPressed: () async {
                 final result = await filteringProvider.fetchFilters();
                 if (result == false && mounted) {
-                  showSnacbkar(
+                  showSnackbar(
                     appConfigProvider: appConfigProvider,
                     label: AppLocalizations.of(context)!.errorLoadFilters, 
                     color: Colors.red
@@ -173,7 +173,7 @@ class _FiltersListState extends State<FiltersList> {
       onRefresh: () async {
         final result = await filteringProvider.fetchFilters();
         if (result == false && mounted) {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider,
             label: AppLocalizations.of(context)!.errorLoadFilters, 
             color: Colors.red
diff --git a/lib/screens/filters/filters_triple_column.dart b/lib/screens/filters/filters_triple_column.dart
index 686ee15..a659fa8 100644
--- a/lib/screens/filters/filters_triple_column.dart
+++ b/lib/screens/filters/filters_triple_column.dart
@@ -84,7 +84,7 @@ class FiltersTripleColumn extends StatelessWidget {
             onPressed: () async {
               final result = await filteringProvider.fetchFilters();
               if (result == false && context.mounted) {
-                showSnacbkar(
+                showSnackbar(
                   appConfigProvider: appConfigProvider,
                   label: AppLocalizations.of(context)!.errorLoadFilters, 
                   color: Colors.red
diff --git a/lib/screens/filters/list_options_menu.dart b/lib/screens/filters/list_options_menu.dart
index c35d080..4d2f57f 100644
--- a/lib/screens/filters/list_options_menu.dart
+++ b/lib/screens/filters/list_options_menu.dart
@@ -59,14 +59,14 @@ class ListOptionsMenu extends StatelessWidget {
       
       if (!context.mounted) return;
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listDataUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.listDataNotUpdated, 
           color: Colors.red
diff --git a/lib/screens/filters/modals/blocked_services_screen.dart b/lib/screens/filters/modals/blocked_services_screen.dart
index c62950d..ac54c61 100644
--- a/lib/screens/filters/modals/blocked_services_screen.dart
+++ b/lib/screens/filters/modals/blocked_services_screen.dart
@@ -68,14 +68,14 @@ class _BlockedServicesScreenStateWidget extends State<BlockedServicesScreen> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.blockedServicesUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.blockedServicesNotUpdated, 
           color: Colors.red
diff --git a/lib/screens/filters/modals/remove_custom_rule_modal.dart b/lib/screens/filters/modals/remove_custom_rule_modal.dart
index f1c4352..ec281f7 100644
--- a/lib/screens/filters/modals/remove_custom_rule_modal.dart
+++ b/lib/screens/filters/modals/remove_custom_rule_modal.dart
@@ -5,9 +5,9 @@ class RemoveCustomRule extends StatelessWidget {
   final void Function() onConfirm;
 
   const RemoveCustomRule({
-    Key? key,
+    super.key,
     required this.onConfirm
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/filters/modals/update_interval_lists_modal.dart b/lib/screens/filters/modals/update_interval_lists_modal.dart
index f6504a5..ce7058b 100644
--- a/lib/screens/filters/modals/update_interval_lists_modal.dart
+++ b/lib/screens/filters/modals/update_interval_lists_modal.dart
@@ -235,10 +235,10 @@ class _Content extends StatelessWidget {
                   }
                   : null,
                 style: ButtonStyle(
-                  overlayColor: MaterialStateProperty.all(
+                  overlayColor: WidgetStateProperty.all(
                     Theme.of(context).colorScheme.primary.withOpacity(0.1)
                   ),
-                  foregroundColor: MaterialStateProperty.all(
+                  foregroundColor: WidgetStateProperty.all(
                     selectedOption != null
                       ? Theme.of(context).colorScheme.primary
                       : Colors.grey,
diff --git a/lib/screens/filters/selection/delete_selection_modal.dart b/lib/screens/filters/selection/delete_selection_modal.dart
index 944d515..ecf77e5 100644
--- a/lib/screens/filters/selection/delete_selection_modal.dart
+++ b/lib/screens/filters/selection/delete_selection_modal.dart
@@ -9,11 +9,11 @@ class DeleteSelectionModal extends StatefulWidget {
   final void Function() onDelete;
 
   const DeleteSelectionModal({
-    Key? key,
+    super.key,
     required this.selectedBlacklists,
     required this.selectedWhitelists,
     required this.onDelete,
-  }) : super(key: key);
+  });
 
   @override
   State<DeleteSelectionModal> createState() => _DeleteSelectionModalState();
diff --git a/lib/screens/filters/selection/enable_disable_selection_modal.dart b/lib/screens/filters/selection/enable_disable_selection_modal.dart
index fdb809c..d14fe7c 100644
--- a/lib/screens/filters/selection/enable_disable_selection_modal.dart
+++ b/lib/screens/filters/selection/enable_disable_selection_modal.dart
@@ -9,11 +9,11 @@ class EnableDisableSelectionModal extends StatefulWidget {
   final void Function() onDelete;
 
   const EnableDisableSelectionModal({
-    Key? key,
+    super.key,
     required this.selectedBlacklists,
     required this.selectedWhitelists,
     required this.onDelete,
-  }) : super(key: key);
+  });
 
   @override
   State<EnableDisableSelectionModal> createState() => _EnableDisableSelectionModalState();
diff --git a/lib/screens/filters/selection/selection_lists.dart b/lib/screens/filters/selection/selection_lists.dart
index b423f77..a7988e9 100644
--- a/lib/screens/filters/selection/selection_lists.dart
+++ b/lib/screens/filters/selection/selection_lists.dart
@@ -13,13 +13,13 @@ class SelectionList extends StatelessWidget {
   final void Function() unselectAll;
 
   const SelectionList({
-    Key? key,
+    super.key,
     required this.lists,
     required this.selectedLists,
     required this.onSelect,
     required this.selectAll,
     required this.unselectAll,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -231,11 +231,10 @@ class _CheckboxTile extends StatelessWidget {
   final bool isSelected;
 
   const _CheckboxTile({
-    Key? key,
     required this.list,
     required this.onSelect,
     required this.isSelected,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/filters/selection/selection_screen.dart b/lib/screens/filters/selection/selection_screen.dart
index 1475454..5907012 100644
--- a/lib/screens/filters/selection/selection_screen.dart
+++ b/lib/screens/filters/selection/selection_screen.dart
@@ -82,8 +82,8 @@ class _SelectionScreenState extends State<SelectionScreen> with TickerProviderSt
               blacklists: _selectedBlacklists, 
               whitelists: _selectedWhitelists
             );
-            if (!mounted) return;
             processModal.close();
+            if (!context.mounted) return;
             showDialog(
               context: context, 
               builder: (ctx) => SelectionResultModal(
@@ -113,8 +113,8 @@ class _SelectionScreenState extends State<SelectionScreen> with TickerProviderSt
               blacklists: _selectedBlacklists, 
               whitelists: _selectedWhitelists
             );
-            if (!mounted) return;
             processModal.close();
+            if (!context.mounted) return;
             showDialog(
               context: context, 
               builder: (ctx) => SelectionResultModal(
diff --git a/lib/screens/home/combined_chart.dart b/lib/screens/home/combined_chart.dart
index 89519db..f951cea 100644
--- a/lib/screens/home/combined_chart.dart
+++ b/lib/screens/home/combined_chart.dart
@@ -37,7 +37,7 @@ class CombinedChartItem {
 }
 
 class CombinedHomeChart extends StatelessWidget {
-  const CombinedHomeChart({Key? key}) : super(key: key);
+  const CombinedHomeChart({super.key});
 
   List<int>? removeZero(List<int> list) {
     final removed = list.where((i) => i > 0);
@@ -266,12 +266,11 @@ class _Legend extends StatelessWidget {
   final String? secondaryValue;
 
   const _Legend({
-    Key? key,
     required this.label,
     required this.color,
     required this.primaryValue,
     this.secondaryValue
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/home/fab.dart b/lib/screens/home/fab.dart
index bd77be7..7e465be 100644
--- a/lib/screens/home/fab.dart
+++ b/lib/screens/home/fab.dart
@@ -7,7 +7,7 @@ import 'package:adguard_home_manager/providers/status_provider.dart';
 import 'package:adguard_home_manager/constants/enums.dart';
 
 class HomeFab extends StatelessWidget {
-  const HomeFab({Key? key}) : super(key: key);
+  const HomeFab({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/home/home.dart b/lib/screens/home/home.dart
index b74e959..7a60115 100644
--- a/lib/screens/home/home.dart
+++ b/lib/screens/home/home.dart
@@ -93,7 +93,7 @@ class _HomeState extends State<Home> {
                     onRefresh: () async {
                       final result = await statusProvider.getServerStatus();
                       if (mounted && result == false) {
-                        showSnacbkar(
+                        showSnackbar(
                           appConfigProvider: appConfigProvider, 
                           label: AppLocalizations.of(context)!.serverStatusNotRefreshed, 
                           color: Colors.red
diff --git a/lib/screens/home/management_modal/management_modal.dart b/lib/screens/home/management_modal/management_modal.dart
index b18586b..5a931ad 100644
--- a/lib/screens/home/management_modal/management_modal.dart
+++ b/lib/screens/home/management_modal/management_modal.dart
@@ -82,7 +82,7 @@ class _ManagementModalState extends State<ManagementModal> with SingleTickerProv
         time: time
       );
       if (mounted && result == false) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.invalidUsernamePassword, 
           color: Colors.red
diff --git a/lib/screens/home/management_modal/small_switch.dart b/lib/screens/home/management_modal/small_switch.dart
index 4e34d68..192360c 100644
--- a/lib/screens/home/management_modal/small_switch.dart
+++ b/lib/screens/home/management_modal/small_switch.dart
@@ -8,13 +8,13 @@ class SmallSwitch extends StatelessWidget {
   final bool disabled;
 
   const SmallSwitch({
-    Key? key,
+    super.key,
     required this.label,
     required this.icon,
     required this.value,
     required this.onChange,
     required this.disabled,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/home/top_items/top_items_lists.dart b/lib/screens/home/top_items/top_items_lists.dart
index 7c24bd3..3ca6e24 100644
--- a/lib/screens/home/top_items/top_items_lists.dart
+++ b/lib/screens/home/top_items/top_items_lists.dart
@@ -83,14 +83,14 @@ class TopItemsLists extends StatelessWidget {
 
       if (!context.mounted) return;
       if (rules == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.userFilteringRulesUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated, 
           color: Colors.red
@@ -121,21 +121,21 @@ class TopItemsLists extends StatelessWidget {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAddedSuccessfully, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.content == 'client_another_list') {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAnotherList, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: newList == AccessSettingsList.allowed || newList == AccessSettingsList.disallowed
             ? AppLocalizations.of(context)!.clientNotRemoved
diff --git a/lib/screens/home/top_items/top_items_screen.dart b/lib/screens/home/top_items/top_items_screen.dart
index 1070953..94675ad 100644
--- a/lib/screens/home/top_items/top_items_screen.dart
+++ b/lib/screens/home/top_items/top_items_screen.dart
@@ -348,7 +348,7 @@ class _Content extends StatelessWidget {
                           percent: screenData[index].values.toList()[0]/total,
                           barRadius: const Radius.circular(5),
                           progressColor: Theme.of(context).colorScheme.primary,
-                          backgroundColor: Theme.of(context).colorScheme.surfaceVariant,
+                          backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
                         ),
                       ),
                       const SizedBox(width: 10),
diff --git a/lib/screens/logs/details/log_details_screen.dart b/lib/screens/logs/details/log_details_screen.dart
index d0a80e9..5ffe18e 100644
--- a/lib/screens/logs/details/log_details_screen.dart
+++ b/lib/screens/logs/details/log_details_screen.dart
@@ -52,14 +52,14 @@ class LogDetailsScreen extends StatelessWidget {
       processModal.close();
 
       if (rules == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.userFilteringRulesUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated, 
           color: Colors.red
@@ -139,7 +139,6 @@ class LogDetailsScreen extends StatelessWidget {
       );
     }
     else {
-      print(twoColumns);
       return Scaffold(
         body: NestedScrollView(
           headerSliverBuilder: (context, innerBoxIsScrolled) => [
diff --git a/lib/screens/logs/log_tile.dart b/lib/screens/logs/log_tile.dart
index 2a6a720..bed2e40 100644
--- a/lib/screens/logs/log_tile.dart
+++ b/lib/screens/logs/log_tile.dart
@@ -108,14 +108,14 @@ class LogTile extends StatelessWidget {
 
       if (!context.mounted) return;
       if (rules == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.userFilteringRulesUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.userFilteringRulesNotUpdated, 
           color: Colors.red
@@ -134,14 +134,14 @@ class LogTile extends StatelessWidget {
       if (!context.mounted) return;
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAddedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientNotAdded, 
           color: Colors.red
@@ -163,7 +163,7 @@ class LogTile extends StatelessWidget {
 
       if (!context.mounted) return;
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: isDomainBlocked(log.reason) == true 
             ? AppLocalizations.of(context)!.domainUnblockedThisClient(log.question.name!)
@@ -172,7 +172,7 @@ class LogTile extends StatelessWidget {
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.ruleNotAdded, 
           color: Colors.red
@@ -199,21 +199,21 @@ class LogTile extends StatelessWidget {
       
       if (!context.mounted) return;
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAddedSuccessfully, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.content == 'client_another_list') {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAnotherList, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.changesNotSaved,
           color: Colors.red
diff --git a/lib/screens/logs/logs_list.dart b/lib/screens/logs/logs_list.dart
index e50847a..4281af0 100644
--- a/lib/screens/logs/logs_list.dart
+++ b/lib/screens/logs/logs_list.dart
@@ -42,7 +42,7 @@ class _LogsListWidgetState extends State<LogsListWidget> {
 
     final result = await statusProvider.getFilteringRules();
     if (mounted && result == false) {
-      showSnacbkar(
+      showSnackbar(
         appConfigProvider: appConfigProvider, 
         label: AppLocalizations.of(context)!.couldntGetFilteringStatus, 
         color: Colors.red
@@ -56,7 +56,7 @@ class _LogsListWidgetState extends State<LogsListWidget> {
 
     final result = await clientsProvider.fetchClients();
     if (mounted && result == false) {
-      showSnacbkar(
+      showSnackbar(
         appConfigProvider: appConfigProvider, 
         label: AppLocalizations.of(context)!.couldntGetFilteringStatus, 
         color: Colors.red
diff --git a/lib/screens/settings/access_settings/clients_list.dart b/lib/screens/settings/access_settings/clients_list.dart
index 0b83a4d..bf2c4d4 100644
--- a/lib/screens/settings/access_settings/clients_list.dart
+++ b/lib/screens/settings/access_settings/clients_list.dart
@@ -71,7 +71,7 @@ class _ClientsListState extends State<ClientsList> {
     Future refetchClients() async {
       final result = await clientsProvider.fetchClients();
       if (result == false && mounted) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientsNotLoaded, 
           color: Colors.red
@@ -104,21 +104,21 @@ class _ClientsListState extends State<ClientsList> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientRemovedSuccessfully, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.content == 'client_another_list') {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAnotherList, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: type == AccessSettingsList.allowed || type == AccessSettingsList.disallowed
             ? AppLocalizations.of(context)!.clientNotRemoved
@@ -137,21 +137,21 @@ class _ClientsListState extends State<ClientsList> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAddedSuccessfully, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.content == 'client_another_list') {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.clientAnotherList, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: type == AccessSettingsList.allowed || type == AccessSettingsList.disallowed
             ? AppLocalizations.of(context)!.clientNotRemoved
diff --git a/lib/screens/settings/advanced_setings.dart b/lib/screens/settings/advanced_setings.dart
index 9483cd8..6026082 100644
--- a/lib/screens/settings/advanced_setings.dart
+++ b/lib/screens/settings/advanced_setings.dart
@@ -26,14 +26,14 @@ class AdvancedSettings extends StatelessWidget {
       final result = await function(newStatus);
       if (!context.mounted) return;
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.settingsUpdatedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.cannotUpdateSettings, 
           color: Colors.red
diff --git a/lib/screens/settings/customization/color_item.dart b/lib/screens/settings/customization/color_item.dart
index d753bf5..00873d0 100644
--- a/lib/screens/settings/customization/color_item.dart
+++ b/lib/screens/settings/customization/color_item.dart
@@ -31,7 +31,7 @@ class ColorItem extends StatelessWidget {
         child: InkWell(
           onTap: () => onChanged(numericValue),
           borderRadius: BorderRadius.circular(50),
-          overlayColor: const MaterialStatePropertyAll(Colors.grey),
+          overlayColor: const WidgetStatePropertyAll(Colors.grey),
           child: Container(
             width: 50,
             height: 50,
diff --git a/lib/screens/settings/customization/theme_mode_button.dart b/lib/screens/settings/customization/theme_mode_button.dart
index df3f8d1..e48a511 100644
--- a/lib/screens/settings/customization/theme_mode_button.dart
+++ b/lib/screens/settings/customization/theme_mode_button.dart
@@ -9,14 +9,14 @@ class ThemeModeButton extends StatelessWidget {
   final bool? disabled;
 
   const ThemeModeButton({
-    Key? key,
+    super.key,
     required this.icon,
     required this.value,
     required this.selected,
     required this.label,
     required this.onChanged,
     this.disabled
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -32,19 +32,19 @@ class ThemeModeButton extends StatelessWidget {
         ? () => onChanged(value)
         : null,
       style: ButtonStyle(
-        elevation: MaterialStateProperty.all(0),
-        shape: MaterialStateProperty.all(
+        elevation: WidgetStateProperty.all(0),
+        shape: WidgetStateProperty.all(
           RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(30),
           )
         ),
-        backgroundColor: MaterialStateProperty.all(
+        backgroundColor: WidgetStateProperty.all(
           value == selected
             ? disabled == null || disabled == false
               ? Theme.of(context).colorScheme.primary
               : greyBackgroundColor
             : disabled == null || disabled == false
-              ? Theme.of(context).colorScheme.surfaceVariant
+              ? Theme.of(context).colorScheme.surfaceContainerHighest
               : greyBackgroundColor,
         )
       ),
diff --git a/lib/screens/settings/dhcp/delete_static_lease_modal.dart b/lib/screens/settings/dhcp/delete_static_lease_modal.dart
index 77ad241..f797e89 100644
--- a/lib/screens/settings/dhcp/delete_static_lease_modal.dart
+++ b/lib/screens/settings/dhcp/delete_static_lease_modal.dart
@@ -5,9 +5,9 @@ class DeleteStaticLeaseModal extends StatelessWidget {
   final void Function() onConfirm;
 
   const DeleteStaticLeaseModal({
-    Key? key,
+    super.key,
     required this.onConfirm
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/dhcp/dhcp.dart b/lib/screens/settings/dhcp/dhcp.dart
index f7facd6..449b063 100644
--- a/lib/screens/settings/dhcp/dhcp.dart
+++ b/lib/screens/settings/dhcp/dhcp.dart
@@ -221,14 +221,14 @@ class _DhcpScreenState extends State<DhcpScreen> {
       if (!mounted) return;
       processModal.close();
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.settingsSaved, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.settingsNotSaved, 
           color: Colors.red
@@ -245,14 +245,14 @@ class _DhcpScreenState extends State<DhcpScreen> {
         processModal.close();
         if (result.successful == true) {
           clearAll();
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider,
             label: AppLocalizations.of(context)!.configRestored, 
             color: Colors.green
           );
         }
         else {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider,
             label: AppLocalizations.of(context)!.configNotRestored, 
             color: Colors.red
@@ -276,14 +276,14 @@ class _DhcpScreenState extends State<DhcpScreen> {
           data.dhcpStatus!.leases = [];
           dhcpProvider.setDhcpData(data);
 
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider,
             label: AppLocalizations.of(context)!.leasesRestored, 
             color: Colors.green
           );
         }
         else {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider,
             label: AppLocalizations.of(context)!.leasesNotRestored, 
             color: Colors.red
diff --git a/lib/screens/settings/dhcp/dhcp_leases.dart b/lib/screens/settings/dhcp/dhcp_leases.dart
index 9bb1fe3..7b90d13 100644
--- a/lib/screens/settings/dhcp/dhcp_leases.dart
+++ b/lib/screens/settings/dhcp/dhcp_leases.dart
@@ -43,14 +43,14 @@ class DhcpLeases extends StatelessWidget {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.staticLeaseDeleted, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.staticLeaseNotDeleted, 
           color: Colors.red
@@ -67,28 +67,28 @@ class DhcpLeases extends StatelessWidget {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.staticLeaseCreated, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.content == "already_exists") {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.staticLeaseExists, 
           color: Colors.red
         );
       }
       else if (result.successful == false && result.content == "server_not_configured") {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.serverNotConfigured, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.staticLeaseNotCreated, 
           color: Colors.red
diff --git a/lib/screens/settings/dns/bootstrap_dns.dart b/lib/screens/settings/dns/bootstrap_dns.dart
index c970f34..833396d 100644
--- a/lib/screens/settings/dns/bootstrap_dns.dart
+++ b/lib/screens/settings/dns/bootstrap_dns.dart
@@ -80,21 +80,21 @@ class _BootstrapDnsScreenState extends State<BootstrapDnsScreen> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigSaved, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.statusCode == 400) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.someValueNotValid, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigNotSaved, 
           color: Colors.red
@@ -197,7 +197,7 @@ class _BootstrapDnsScreenState extends State<BootstrapDnsScreen> {
                   )
                 ],
               ),
-            )).toList(),
+            )),
             Row(
               mainAxisAlignment: MainAxisAlignment.center,
               mainAxisSize: MainAxisSize.min,
diff --git a/lib/screens/settings/dns/cache_config.dart b/lib/screens/settings/dns/cache_config.dart
index 40a99f8..e2edb4d 100644
--- a/lib/screens/settings/dns/cache_config.dart
+++ b/lib/screens/settings/dns/cache_config.dart
@@ -86,21 +86,21 @@ class _CacheConfigDnsScreenState extends State<CacheConfigDnsScreen> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigSaved, 
           color: Colors.green
         );
       }
       else if (result.successful== false && result.statusCode == 400) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.someValueNotValid, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigNotSaved, 
           color: Colors.red
@@ -139,14 +139,14 @@ class _CacheConfigDnsScreenState extends State<CacheConfigDnsScreen> {
     void clearCache() async {
       final result = await clearDnsCache(context, serversProvider.selectedServer!);
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.dnsCacheCleared, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.dnsCacheNotCleared, 
           color: Colors.red
diff --git a/lib/screens/settings/dns/dns.dart b/lib/screens/settings/dns/dns.dart
index baba9fa..564fff2 100644
--- a/lib/screens/settings/dns/dns.dart
+++ b/lib/screens/settings/dns/dns.dart
@@ -66,14 +66,14 @@ class _DnsSettingsState extends State<DnsSettings> {
     void clearCache() async {
       final result = await clearDnsCache(context, serversProvider.selectedServer!);
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.dnsCacheCleared, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.dnsCacheNotCleared, 
           color: Colors.red
diff --git a/lib/screens/settings/dns/dns_server_settings.dart b/lib/screens/settings/dns/dns_server_settings.dart
index a4b7369..fc74d88 100644
--- a/lib/screens/settings/dns/dns_server_settings.dart
+++ b/lib/screens/settings/dns/dns_server_settings.dart
@@ -183,21 +183,21 @@ class _DnsServerSettingsScreenState extends State<DnsServerSettingsScreen> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigSaved, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.statusCode == 400) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.someValueNotValid, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigNotSaved, 
           color: Colors.red
diff --git a/lib/screens/settings/dns/fallback_dns.dart b/lib/screens/settings/dns/fallback_dns.dart
index 849eb4d..19040ed 100644
--- a/lib/screens/settings/dns/fallback_dns.dart
+++ b/lib/screens/settings/dns/fallback_dns.dart
@@ -91,21 +91,21 @@ class _FallbackDnsScreenState extends State<FallbackDnsScreen> {
 
       if (!context.mounted) return;
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigSaved, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.statusCode == 400) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.someValueNotValid, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigNotSaved, 
           color: Colors.red
diff --git a/lib/screens/settings/dns/private_reverse_servers.dart b/lib/screens/settings/dns/private_reverse_servers.dart
index a9419e9..1ea4cc3 100644
--- a/lib/screens/settings/dns/private_reverse_servers.dart
+++ b/lib/screens/settings/dns/private_reverse_servers.dart
@@ -112,21 +112,21 @@ class _PrivateReverseDnsServersScreenState extends State<PrivateReverseDnsServer
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigSaved, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.statusCode == 400) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.someValueNotValid, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigNotSaved, 
           color: Colors.red
diff --git a/lib/screens/settings/dns/upstream_dns.dart b/lib/screens/settings/dns/upstream_dns.dart
index c99c9bc..33818a1 100644
--- a/lib/screens/settings/dns/upstream_dns.dart
+++ b/lib/screens/settings/dns/upstream_dns.dart
@@ -152,21 +152,21 @@ class _UpstreamDnsScreenState extends State<UpstreamDnsScreen> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigSaved, 
           color: Colors.green
         );
       }
       else if (result.successful == false && result.statusCode == 400) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.someValueNotValid, 
           color: Colors.red
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsConfigNotSaved, 
           color: Colors.red
diff --git a/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart b/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart
index fb2c705..be6b7b4 100644
--- a/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart
+++ b/lib/screens/settings/dns_rewrites/delete_dns_rewrite.dart
@@ -5,9 +5,9 @@ class DeleteDnsRewrite extends StatelessWidget {
   final void Function() onConfirm;
 
   const DeleteDnsRewrite({
-    Key? key,
+    super.key,
     required this.onConfirm
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/dns_rewrites/dns_rewrites.dart b/lib/screens/settings/dns_rewrites/dns_rewrites.dart
index 301c3a1..ad38c44 100644
--- a/lib/screens/settings/dns_rewrites/dns_rewrites.dart
+++ b/lib/screens/settings/dns_rewrites/dns_rewrites.dart
@@ -67,14 +67,14 @@ class _DnsRewritesScreenState extends State<DnsRewritesScreen> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsRewriteRuleDeleted, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsRewriteRuleNotDeleted, 
           color: Colors.red
@@ -91,14 +91,14 @@ class _DnsRewritesScreenState extends State<DnsRewritesScreen> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsRewriteRuleAdded, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsRewriteRuleNotAdded, 
           color: Colors.red
@@ -115,14 +115,14 @@ class _DnsRewritesScreenState extends State<DnsRewritesScreen> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsRewriteRuleUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.dnsRewriteRuleNotUpdated, 
           color: Colors.red
@@ -169,7 +169,7 @@ class _DnsRewritesScreenState extends State<DnsRewritesScreen> {
                         onRefresh: () async {
                           final result = await rewriteRulesProvider.fetchRules();
                           if (result == false) {
-                            showSnacbkar(
+                            showSnackbar(
                               appConfigProvider: appConfigProvider,
                               label: AppLocalizations.of(context)!.rewriteRulesNotLoaded, 
                               color: Colors.red
diff --git a/lib/screens/settings/encryption/config_error_modal.dart b/lib/screens/settings/encryption/config_error_modal.dart
index 1e2cfd0..4fdcec3 100644
--- a/lib/screens/settings/encryption/config_error_modal.dart
+++ b/lib/screens/settings/encryption/config_error_modal.dart
@@ -5,9 +5,9 @@ class EncryptionErrorModal extends StatelessWidget {
   final String error;
 
   const EncryptionErrorModal({
-    Key? key,
+    super.key,
     required this.error,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/encryption/custom_text_field.dart b/lib/screens/settings/encryption/custom_text_field.dart
index 6a1cac8..1290104 100644
--- a/lib/screens/settings/encryption/custom_text_field.dart
+++ b/lib/screens/settings/encryption/custom_text_field.dart
@@ -12,7 +12,7 @@ class EncryptionTextField extends StatelessWidget {
   final String? helperText;
 
   const EncryptionTextField({
-    Key? key,
+    super.key,
     required this.enabled,
     required this.controller,
     required this.icon,
@@ -22,7 +22,7 @@ class EncryptionTextField extends StatelessWidget {
     this.keyboardType,
     this.multiline,
     this.helperText,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/encryption/encryption.dart b/lib/screens/settings/encryption/encryption.dart
index 4e48f6c..764f303 100644
--- a/lib/screens/settings/encryption/encryption.dart
+++ b/lib/screens/settings/encryption/encryption.dart
@@ -233,14 +233,14 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.encryptionConfigSaved, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.encryptionConfigNotSaved, 
           color: Colors.red
@@ -282,14 +282,14 @@ class _EncryptionSettingsState extends State<EncryptionSettings> {
       processModal.close();
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.configurationResetSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.configurationResetError, 
           color: Colors.red
diff --git a/lib/screens/settings/encryption/error_message.dart b/lib/screens/settings/encryption/error_message.dart
index be132d8..01dc221 100644
--- a/lib/screens/settings/encryption/error_message.dart
+++ b/lib/screens/settings/encryption/error_message.dart
@@ -5,9 +5,9 @@ class ErrorMessageEncryption extends StatelessWidget {
   final String errorMessage;
 
   const ErrorMessageEncryption({
-    Key? key,
+    super.key,
     required this.errorMessage,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/encryption/master_switch.dart b/lib/screens/settings/encryption/master_switch.dart
index f13c4fa..474c0f9 100644
--- a/lib/screens/settings/encryption/master_switch.dart
+++ b/lib/screens/settings/encryption/master_switch.dart
@@ -6,10 +6,10 @@ class EncryptionMasterSwitch extends StatelessWidget {
   final void Function(bool) onChange;
 
   const EncryptionMasterSwitch({
-    Key? key,
+    super.key,
     required this.value,
     required this.onChange
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/encryption/status.dart b/lib/screens/settings/encryption/status.dart
index eb344ae..0c11f5a 100644
--- a/lib/screens/settings/encryption/status.dart
+++ b/lib/screens/settings/encryption/status.dart
@@ -8,10 +8,10 @@ class Status extends StatelessWidget {
   final String label;
 
   const Status({
-    Key? key,
+    super.key,
     required this.valid,
     required this.label
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/general_settings/general_settings.dart b/lib/screens/settings/general_settings/general_settings.dart
index 936bd8b..0029752 100644
--- a/lib/screens/settings/general_settings/general_settings.dart
+++ b/lib/screens/settings/general_settings/general_settings.dart
@@ -49,14 +49,14 @@ class _GeneralSettingsState extends State<GeneralSettings> {
     }) async {
       final result = await function(newStatus);
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.settingsUpdatedSuccessfully, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.cannotUpdateSettings, 
           color: Colors.red
diff --git a/lib/screens/settings/general_settings/top_items_list/top_items_list_settings.dart b/lib/screens/settings/general_settings/top_items_list/top_items_list_settings.dart
index 9e9c836..89b1613 100644
--- a/lib/screens/settings/general_settings/top_items_list/top_items_list_settings.dart
+++ b/lib/screens/settings/general_settings/top_items_list/top_items_list_settings.dart
@@ -43,14 +43,14 @@ class _TopItemsListSettingsState extends State<TopItemsListSettings> with Ticker
       final result = await appConfigProvider.setHomeTopItemsOrder(persistHomeTopItemsList);
       if (!context.mounted) return;
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.settingsSaved, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.settingsNotSaved, 
           color: Colors.red
diff --git a/lib/screens/settings/logs_settings/logs_settings.dart b/lib/screens/settings/logs_settings/logs_settings.dart
index cd723c7..0d55ce5 100644
--- a/lib/screens/settings/logs_settings/logs_settings.dart
+++ b/lib/screens/settings/logs_settings/logs_settings.dart
@@ -102,17 +102,17 @@ class _LogsSettingsState extends State<LogsSettings> {
 
       processModal.close();
 
-      if (!mounted) return;
+      if (!context.mounted) return;
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.logsCleared, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.logsNotCleared, 
           color: Colors.red
@@ -135,17 +135,17 @@ class _LogsSettingsState extends State<LogsSettings> {
       
       processModal.close();
 
-      if (!mounted) return;
+      if (!context.mounted) return;
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.logsConfigUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.logsConfigNotUpdated, 
           color: Colors.red
diff --git a/lib/screens/settings/safe_search_settings.dart b/lib/screens/settings/safe_search_settings.dart
index 793a1c2..c9d5eef 100644
--- a/lib/screens/settings/safe_search_settings.dart
+++ b/lib/screens/settings/safe_search_settings.dart
@@ -90,7 +90,7 @@ class _SafeSearchSettingsScreenState extends State<SafeSearchSettingsScreen> {
       processModal.close();
 
       if (result == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.settingsUpdatedSuccessfully,
           color: Colors.green,
@@ -98,7 +98,7 @@ class _SafeSearchSettingsScreenState extends State<SafeSearchSettingsScreen> {
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.settingsNotSaved,
           color: Colors.red,
diff --git a/lib/screens/settings/statistics_settings/statistics_settings.dart b/lib/screens/settings/statistics_settings/statistics_settings.dart
index 27e4570..67a2989 100644
--- a/lib/screens/settings/statistics_settings/statistics_settings.dart
+++ b/lib/screens/settings/statistics_settings/statistics_settings.dart
@@ -148,14 +148,14 @@ class _StatisticsSettingsState extends State<StatisticsSettings> {
       if (!context.mounted) return;
 
       if (result.successful == true) {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.statisticsConfigUpdated, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider,
           label: AppLocalizations.of(context)!.statisticsConfigNotUpdated, 
           color: Colors.red
diff --git a/lib/screens/settings/update_server/autoupdate_unavailable.dart b/lib/screens/settings/update_server/autoupdate_unavailable.dart
index 9846448..1ba4ae7 100644
--- a/lib/screens/settings/update_server/autoupdate_unavailable.dart
+++ b/lib/screens/settings/update_server/autoupdate_unavailable.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class AutoUpdateUnavailableModal extends StatelessWidget {
-  const AutoUpdateUnavailableModal({Key? key}) : super(key: key);
+  const AutoUpdateUnavailableModal({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/settings/update_server/update.dart b/lib/screens/settings/update_server/update.dart
index d1f8d95..de951b7 100644
--- a/lib/screens/settings/update_server/update.dart
+++ b/lib/screens/settings/update_server/update.dart
@@ -41,7 +41,7 @@ class UpdateScreen extends StatelessWidget {
       
       if (result.successful == true) {
         serversProvider.recheckPeriodServerUpdated();
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.requestStartUpdateSuccessful,
           color: Colors.green,
@@ -49,7 +49,7 @@ class UpdateScreen extends StatelessWidget {
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.requestStartUpdateFailed,
           color: Colors.red,
@@ -203,7 +203,7 @@ class UpdateScreen extends StatelessWidget {
       body: Column(
         children: [
           Container(
-            color: Theme.of(context).colorScheme.surfaceVariant,
+            color: Theme.of(context).colorScheme.surfaceContainerHighest,
             child: SafeArea(
               child: headerPortrait()
             )
diff --git a/lib/screens/settings/update_server/update_screen.dart b/lib/screens/settings/update_server/update_screen.dart
index 5386ad8..4ddc959 100644
--- a/lib/screens/settings/update_server/update_screen.dart
+++ b/lib/screens/settings/update_server/update_screen.dart
@@ -88,7 +88,7 @@ class _UpdateScreenState extends State<UpdateScreen> {
       if (!context.mounted) return;
       if (result.successful == true) {
         serversProvider.recheckPeriodServerUpdated();
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.requestStartUpdateSuccessful,
           color: Colors.green,
@@ -96,7 +96,7 @@ class _UpdateScreenState extends State<UpdateScreen> {
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.requestStartUpdateFailed,
           color: Colors.red,
@@ -220,7 +220,7 @@ class _Header extends SliverPersistentHeaderDelegate {
     return LayoutBuilder(
       builder: (context, constraints) => Container(
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceVariant,
+          color: Theme.of(context).colorScheme.surfaceContainerHighest,
         ),
         child: Align(
           alignment: Alignment.topLeft,
diff --git a/lib/widgets/add_server/add_server_modal.dart b/lib/widgets/add_server/add_server_modal.dart
index e6888da..ec00ff6 100644
--- a/lib/widgets/add_server/add_server_modal.dart
+++ b/lib/widgets/add_server/add_server_modal.dart
@@ -157,7 +157,7 @@ class _AddServerModalState extends State<AddServerModal> {
       if (result != AuthStatus.success) {
         cancelConnecting();
         if (mounted) {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider, 
             label: getErrorMessage(result), 
             color: Colors.red
@@ -206,7 +206,7 @@ class _AddServerModalState extends State<AddServerModal> {
       if (serverCreated != null) {
         if (mounted) setState(() => isConnecting = false);
         if (mounted) {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider, 
             label: AppLocalizations.of(context)!.connectionNotCreated, 
             color: Colors.red
@@ -256,7 +256,7 @@ class _AddServerModalState extends State<AddServerModal> {
       if (result != AuthStatus.success) {
         cancelConnecting();
         if (mounted) {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider, 
             label: getErrorMessage(result), 
             color: Colors.red
@@ -306,7 +306,7 @@ class _AddServerModalState extends State<AddServerModal> {
           )
         );
         if (mounted) {
-          showSnacbkar(
+          showSnackbar(
             appConfigProvider: appConfigProvider, 
             label: AppLocalizations.of(context)!.connectionNotCreated, 
             color: Colors.red
diff --git a/lib/widgets/add_server/form_text_field.dart b/lib/widgets/add_server/form_text_field.dart
index 0fb6f94..72d410b 100644
--- a/lib/widgets/add_server/form_text_field.dart
+++ b/lib/widgets/add_server/form_text_field.dart
@@ -13,7 +13,7 @@ class FormTextField extends StatelessWidget {
   final bool isConnecting;
 
   const FormTextField({
-    Key? key,
+    super.key,
     required this.label,
     required this.controller,
     this.error,
@@ -24,7 +24,7 @@ class FormTextField extends StatelessWidget {
     this.hintText,
     this.helperText,
     required this.isConnecting
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/combined_line_chart.dart b/lib/widgets/combined_line_chart.dart
index 6f3a87f..9aceb67 100644
--- a/lib/widgets/combined_line_chart.dart
+++ b/lib/widgets/combined_line_chart.dart
@@ -15,12 +15,12 @@ class CustomCombinedLineChart extends StatelessWidget {
   final bool daysInterval;
 
   const CustomCombinedLineChart({
-    Key? key,
+    super.key,
     required this.inputData,
     required this.context,
     required this.dates,
     required this.daysInterval
-  }) : super(key: key);
+  });
 
   LineChartData mainData(Map<String, dynamic> data, ThemeMode selectedTheme) {
     String chartDate(DateTime date) {
@@ -55,11 +55,11 @@ class CustomCombinedLineChart extends StatelessWidget {
     }
 
     return LineChartData(
-      gridData: FlGridData(
+      gridData: const FlGridData(
         show: false,
         drawVerticalLine: false,
       ),
-      titlesData: FlTitlesData(
+      titlesData: const FlTitlesData(
         show: false,
       ),
       borderData: FlBorderData(
@@ -73,7 +73,7 @@ class CustomCombinedLineChart extends StatelessWidget {
           barWidth: 2,
           isStrokeCapRound: true,
           preventCurveOverShooting: true,
-          dotData: FlDotData(
+          dotData: const FlDotData(
             show: false,
           ),
           belowBarData: BarAreaData(
diff --git a/lib/widgets/confirm_action_modal.dart b/lib/widgets/confirm_action_modal.dart
index d0bb314..4ed9cd7 100644
--- a/lib/widgets/confirm_action_modal.dart
+++ b/lib/widgets/confirm_action_modal.dart
@@ -8,12 +8,12 @@ class ConfirmActionModal extends StatelessWidget {
   final void Function() onConfirm;
 
   const ConfirmActionModal({
-    Key? key,
+    super.key,
     required this.icon,
     required this.title,
     required this.message,
     required this.onConfirm
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/custom_checkbox_list_tile.dart b/lib/widgets/custom_checkbox_list_tile.dart
index be14a3c..39c4cdf 100644
--- a/lib/widgets/custom_checkbox_list_tile.dart
+++ b/lib/widgets/custom_checkbox_list_tile.dart
@@ -9,14 +9,14 @@ class CustomCheckboxListTile extends StatelessWidget {
   final EdgeInsets? padding;
 
   const CustomCheckboxListTile({
-    Key? key,
+    super.key,
     required this.value,
     required this.onChanged,
     required this.title,
     this.disabled,
     this.subtitle,
     this.padding
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/custom_list_tile.dart b/lib/widgets/custom_list_tile.dart
index 0523468..5bf1e42 100644
--- a/lib/widgets/custom_list_tile.dart
+++ b/lib/widgets/custom_list_tile.dart
@@ -14,7 +14,7 @@ class CustomListTile extends StatelessWidget {
   final Color? color;
 
   const CustomListTile({
-    Key? key,
+    super.key,
     required this.title,
     this.subtitle,
     this.subtitleWidget,
@@ -26,7 +26,7 @@ class CustomListTile extends StatelessWidget {
     this.disabled,
     this.onHover,
     this.color,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/custom_radio.dart b/lib/widgets/custom_radio.dart
index f8f2a08..5058316 100644
--- a/lib/widgets/custom_radio.dart
+++ b/lib/widgets/custom_radio.dart
@@ -7,12 +7,12 @@ class CustomRadio extends StatelessWidget {
   final Color backgroundColor;
 
   const CustomRadio({
-    Key? key,
+    super.key,
     required this.value,
     required this.groupValue,
     this.onChange,
     required this.backgroundColor,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/custom_radio_list_tile.dart b/lib/widgets/custom_radio_list_tile.dart
index 4d59b3c..0469bc9 100644
--- a/lib/widgets/custom_radio_list_tile.dart
+++ b/lib/widgets/custom_radio_list_tile.dart
@@ -11,14 +11,14 @@ class CustomRadioListTile extends StatelessWidget {
   final void Function(String) onChanged;
 
   const CustomRadioListTile({
-    Key? key,
+    super.key,
     required this.groupValue,
     required this.value,
     required this.radioBackgroundColor,
     required this.title,
     this.subtitle,
     required this.onChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/custom_radio_toggle.dart b/lib/widgets/custom_radio_toggle.dart
index 59cb9e9..2698243 100644
--- a/lib/widgets/custom_radio_toggle.dart
+++ b/lib/widgets/custom_radio_toggle.dart
@@ -7,12 +7,12 @@ class CustomRadioToggle extends StatelessWidget {
   final void Function(String) onTap;
 
   const CustomRadioToggle({
-    Key? key,
+    super.key,
     required this.groupSelected,
     required this.value,
     required this.label,
     required this.onTap,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/line_chart.dart b/lib/widgets/line_chart.dart
index 5ac8bdd..f6899d1 100644
--- a/lib/widgets/line_chart.dart
+++ b/lib/widgets/line_chart.dart
@@ -13,13 +13,13 @@ class CustomLineChart extends StatelessWidget {
   final BuildContext context;
 
   const CustomLineChart({
-    Key? key,
+    super.key,
     required this.data,
     required this.color,
     required this.dates,
     required this.daysInterval,
     required this.context
-  }) : super(key: key);
+  });
 
   String chartDate(DateTime date) {
     String twoDigits(int number) => number.toString().padLeft(2, '0');
@@ -55,11 +55,11 @@ class CustomLineChart extends StatelessWidget {
 
   LineChartData mainData(Map<String, dynamic> data, ThemeMode selectedTheme) {
     return LineChartData(
-      gridData: FlGridData(
+      gridData: const FlGridData(
         show: false,
         drawVerticalLine: false,
       ),
-      titlesData: FlTitlesData(
+      titlesData: const FlTitlesData(
         show: false,
       ),
       borderData: FlBorderData(
@@ -73,7 +73,7 @@ class CustomLineChart extends StatelessWidget {
           barWidth: 2,
           isStrokeCapRound: true,
           preventCurveOverShooting: true,
-          dotData: FlDotData(
+          dotData: const FlDotData(
             show: false,
           ),
           belowBarData: BarAreaData(
diff --git a/lib/widgets/menu_bar.dart b/lib/widgets/menu_bar.dart
index 0151b87..fe80446 100644
--- a/lib/widgets/menu_bar.dart
+++ b/lib/widgets/menu_bar.dart
@@ -11,9 +11,9 @@ class CustomMenuBar extends StatelessWidget {
   final Widget child;
 
   const CustomMenuBar({
-    Key? key,
+    super.key,
     required this.child
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/option_box.dart b/lib/widgets/option_box.dart
index f19a88f..e8514ef 100644
--- a/lib/widgets/option_box.dart
+++ b/lib/widgets/option_box.dart
@@ -7,12 +7,12 @@ class OptionBox extends StatelessWidget {
   final String label;
 
   const OptionBox({
-    Key? key,
+    super.key,
     required this.optionsValue,
     required this.itemValue,
     required this.onTap,
     required this.label,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/process_dialog.dart b/lib/widgets/process_dialog.dart
index 0c91442..f7f85a9 100644
--- a/lib/widgets/process_dialog.dart
+++ b/lib/widgets/process_dialog.dart
@@ -4,9 +4,9 @@ class ProcessDialog extends StatelessWidget {
   final String message;
 
   const ProcessDialog({
-    Key? key,
+    super.key,
     required this.message,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/section_label.dart b/lib/widgets/section_label.dart
index c1f767a..1e3980f 100644
--- a/lib/widgets/section_label.dart
+++ b/lib/widgets/section_label.dart
@@ -5,10 +5,10 @@ class SectionLabel extends StatelessWidget {
   final EdgeInsets? padding;
 
   const SectionLabel({
-    Key? key,
+    super.key,
     required this.label,
     this.padding
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/servers_list/delete_modal.dart b/lib/widgets/servers_list/delete_modal.dart
index dbf169d..4067d18 100644
--- a/lib/widgets/servers_list/delete_modal.dart
+++ b/lib/widgets/servers_list/delete_modal.dart
@@ -13,9 +13,9 @@ class DeleteModal extends StatelessWidget {
   final Server serverToDelete;
 
   const DeleteModal({
-    Key? key,
+    super.key,
     required this.serverToDelete,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -34,14 +34,14 @@ class DeleteModal extends StatelessWidget {
           appConfigProvider.setSelectedScreen(0);
         }
 
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.connectionRemoved, 
           color: Colors.green
         );
       }
       else {
-        showSnacbkar(
+        showSnackbar(
           appConfigProvider: appConfigProvider, 
           label: AppLocalizations.of(context)!.connectionCannotBeRemoved, 
           color: Colors.red
diff --git a/lib/widgets/servers_list/server_tile_functions.dart b/lib/widgets/servers_list/server_tile_functions.dart
index ec3c92e..06dbaee 100644
--- a/lib/widgets/servers_list/server_tile_functions.dart
+++ b/lib/widgets/servers_list/server_tile_functions.dart
@@ -50,14 +50,15 @@ void showDeleteModal({
   required BuildContext context,
   required Server server
 }) async {
-  await Future.delayed(const Duration(seconds: 0), () => {
+  await Future.delayed(const Duration(seconds: 0), () {
+    if (!context.mounted) return;
     showDialog(
       context: context, 
       builder: (context) => DeleteModal(
         serverToDelete: server,
       ),
       barrierDismissible: false
-    )
+    );
   });
 }
 
@@ -133,7 +134,7 @@ void connectToServer({
     process.close();
     if (!context.mounted) return;
     final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
-    showSnacbkar(
+    showSnackbar(
       appConfigProvider: appConfigProvider, 
       label: AppLocalizations.of(context)!.cannotConnect, 
       color: Colors.red
@@ -150,14 +151,14 @@ void setDefaultServer({
   if (!context.mounted) return;
   final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
   if (result == null) {
-    showSnacbkar(
+    showSnackbar(
       appConfigProvider: appConfigProvider, 
       label: AppLocalizations.of(context)!.connectionDefaultSuccessfully, 
       color: Colors.green
     );
   }
   else {
-    showSnacbkar(
+    showSnackbar(
       appConfigProvider: appConfigProvider, 
       label: AppLocalizations.of(context)!.connectionDefaultFailed, 
       color: Colors.red
diff --git a/lib/widgets/servers_list/servers_list.dart b/lib/widgets/servers_list/servers_list.dart
index 8e530f2..d5a8d1b 100644
--- a/lib/widgets/servers_list/servers_list.dart
+++ b/lib/widgets/servers_list/servers_list.dart
@@ -16,13 +16,13 @@ class ServersList extends StatelessWidget {
   final double breakingWidth;
 
   const ServersList({
-    Key? key,
+    super.key,
     required this.context,
     required this.controllers,
     required this.onChange,
     required this.scrollController,
     required this.breakingWidth
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/servers_list/servers_list_item.dart b/lib/widgets/servers_list/servers_list_item.dart
index 47ca6fe..29b11a5 100644
--- a/lib/widgets/servers_list/servers_list_item.dart
+++ b/lib/widgets/servers_list/servers_list_item.dart
@@ -68,7 +68,7 @@ class _ServersListItemState extends State<ServersListItem> with SingleTickerProv
       decoration: BoxDecoration(
         border: Border(
           bottom: BorderSide(
-            color: Theme.of(context).colorScheme.surfaceVariant,
+            color: Theme.of(context).colorScheme.surfaceContainerHighest,
             width: 1
           )
         )
diff --git a/lib/widgets/update_modal.dart b/lib/widgets/update_modal.dart
index 5b99b66..8cedd2e 100644
--- a/lib/widgets/update_modal.dart
+++ b/lib/widgets/update_modal.dart
@@ -11,10 +11,10 @@ class UpdateModal extends StatefulWidget {
   final void Function(String, String) onDownload;
 
   const UpdateModal({
-    Key? key,
+    super.key,
     required this.gitHubRelease,
     required this.onDownload,
-  }) : super(key: key);
+  });
 
   @override
   State<UpdateModal> createState() => _UpdateModalState();
diff --git a/lib/widgets/version_warning_modal.dart b/lib/widgets/version_warning_modal.dart
index f2230b0..72dbe4d 100644
--- a/lib/widgets/version_warning_modal.dart
+++ b/lib/widgets/version_warning_modal.dart
@@ -5,9 +5,9 @@ class VersionWarningModal extends StatelessWidget {
   final String version;
 
   const VersionWarningModal({
-    Key? key,
+    super.key,
     required this.version,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {