diff --git a/lib/components/CIDRField.dart b/lib/components/CIDRField.dart
index d85356d..ae584ca 100644
--- a/lib/components/CIDRField.dart
+++ b/lib/components/CIDRField.dart
@@ -8,7 +8,7 @@ import 'IPField.dart';
 //TODO: Support initialValue
 class CIDRField extends StatefulWidget {
   const CIDRField({
-    Key? key,
+    super.key,
     this.ipHelp = "ip address",
     this.autoFocus = false,
     this.focusNode,
@@ -17,7 +17,7 @@ class CIDRField extends StatefulWidget {
     this.textInputAction,
     this.ipController,
     this.bitsController,
-  }) : super(key: key);
+  });
 
   final String ipHelp;
   final bool autoFocus;
diff --git a/lib/components/CIDRFormField.dart b/lib/components/CIDRFormField.dart
index 915f28d..9f11dec 100644
--- a/lib/components/CIDRFormField.dart
+++ b/lib/components/CIDRFormField.dart
@@ -6,21 +6,18 @@ import 'package:mobile_nebula/validators/ipValidator.dart';
 class CIDRFormField extends FormField<CIDR> {
   //TODO: onSaved, validator, auto-validate, enabled?
   CIDRFormField({
-    Key? key,
+    super.key,
     autoFocus = false,
     enableIPV6 = false,
     focusNode,
     nextFocusNode,
     ValueChanged<CIDR>? onChanged,
-    FormFieldSetter<CIDR>? onSaved,
+    super.onSaved,
     textInputAction,
-    CIDR? initialValue,
+    super.initialValue,
     this.ipController,
     this.bitsController,
   }) : super(
-         key: key,
-         initialValue: initialValue,
-         onSaved: onSaved,
          validator: (cidr) {
            if (cidr == null) {
              return "Please fill out this field";
diff --git a/lib/components/DangerButton.dart b/lib/components/DangerButton.dart
index bbc029b..592ae07 100644
--- a/lib/components/DangerButton.dart
+++ b/lib/components/DangerButton.dart
@@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class DangerButton extends StatelessWidget {
-  const DangerButton({Key? key, required this.child, this.onPressed}) : super(key: key);
+  const DangerButton({super.key, required this.child, this.onPressed});
 
   final Widget child;
   final GestureTapCallback? onPressed;
diff --git a/lib/components/FormPage.dart b/lib/components/FormPage.dart
index b471718..298e24b 100644
--- a/lib/components/FormPage.dart
+++ b/lib/components/FormPage.dart
@@ -6,14 +6,14 @@ import 'package:mobile_nebula/services/utils.dart';
 /// SimplePage with a form and built in validation and confirmation to discard changes if any are made
 class FormPage extends StatefulWidget {
   const FormPage({
-    Key? key,
+    super.key,
     required this.title,
     required this.child,
     required this.onSave,
     required this.changed,
     this.hideSave = false,
     this.scrollController,
-  }) : super(key: key);
+  });
 
   final String title;
   final Function onSave;
diff --git a/lib/components/IPAndPortField.dart b/lib/components/IPAndPortField.dart
index 3d71955..3f48722 100644
--- a/lib/components/IPAndPortField.dart
+++ b/lib/components/IPAndPortField.dart
@@ -8,7 +8,7 @@ import 'IPField.dart';
 //TODO: Support initialValue
 class IPAndPortField extends StatefulWidget {
   const IPAndPortField({
-    Key? key,
+    super.key,
     this.ipOnly = false,
     this.ipHelp = "ip address",
     this.autoFocus = false,
@@ -20,7 +20,7 @@ class IPAndPortField extends StatefulWidget {
     this.ipTextAlign,
     this.ipController,
     this.portController,
-  }) : super(key: key);
+  });
 
   final String ipHelp;
   final bool ipOnly;
diff --git a/lib/components/IPAndPortFormField.dart b/lib/components/IPAndPortFormField.dart
index 416fb3d..c9f5ec7 100644
--- a/lib/components/IPAndPortFormField.dart
+++ b/lib/components/IPAndPortFormField.dart
@@ -8,7 +8,7 @@ import 'IPAndPortField.dart';
 class IPAndPortFormField extends FormField<IPAndPort> {
   //TODO: onSaved, validator, auto-validate, enabled?
   IPAndPortFormField({
-    Key? key,
+    super.key,
     ipOnly = false,
     enableIPV6 = false,
     ipHelp = "ip address",
@@ -16,17 +16,14 @@ class IPAndPortFormField extends FormField<IPAndPort> {
     focusNode,
     nextFocusNode,
     ValueChanged<IPAndPort>? onChanged,
-    FormFieldSetter<IPAndPort>? onSaved,
+    super.onSaved,
     textInputAction,
-    IPAndPort? initialValue,
+    super.initialValue,
     noBorder,
     ipTextAlign = TextAlign.center,
     this.ipController,
     this.portController,
   }) : super(
-         key: key,
-         initialValue: initialValue,
-         onSaved: onSaved,
          validator: (ipAndPort) {
            if (ipAndPort == null) {
              return "Please fill out this field";
diff --git a/lib/components/IPField.dart b/lib/components/IPField.dart
index 96c38c6..7db45ff 100644
--- a/lib/components/IPField.dart
+++ b/lib/components/IPField.dart
@@ -17,7 +17,7 @@ class IPField extends StatelessWidget {
   final textAlign;
 
   const IPField({
-    Key? key,
+    super.key,
     this.ipOnly = false,
     this.help = "ip address",
     this.autoFocus = false,
@@ -28,7 +28,7 @@ class IPField extends StatelessWidget {
     this.textInputAction,
     this.controller,
     this.textAlign = TextAlign.center,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/components/IPFormField.dart b/lib/components/IPFormField.dart
index bde80d5..80ff14a 100644
--- a/lib/components/IPFormField.dart
+++ b/lib/components/IPFormField.dart
@@ -9,7 +9,7 @@ import 'IPField.dart';
 class IPFormField extends FormField<String> {
   //TODO: validator, auto-validate, enabled?
   IPFormField({
-    Key? key,
+    super.key,
     ipOnly = false,
     enableIPV6 = false,
     help = "ip address",
@@ -17,7 +17,7 @@ class IPFormField extends FormField<String> {
     focusNode,
     nextFocusNode,
     ValueChanged<String>? onChanged,
-    FormFieldSetter<String>? onSaved,
+    super.onSaved,
     textPadding = const EdgeInsets.all(6.0),
     textInputAction,
     initialValue,
@@ -25,9 +25,7 @@ class IPFormField extends FormField<String> {
     crossAxisAlignment = CrossAxisAlignment.center,
     textAlign = TextAlign.center,
   }) : super(
-         key: key,
          initialValue: initialValue,
-         onSaved: onSaved,
          validator: (ip) {
            if (ip == null || ip == "") {
              return "Please fill out this field";
diff --git a/lib/components/PlatformTextFormField.dart b/lib/components/PlatformTextFormField.dart
index 624d78a..026ed25 100644
--- a/lib/components/PlatformTextFormField.dart
+++ b/lib/components/PlatformTextFormField.dart
@@ -6,7 +6,7 @@ import 'package:mobile_nebula/components/SpecialTextField.dart';
 class PlatformTextFormField extends FormField<String> {
   //TODO: auto-validate, enabled?
   PlatformTextFormField({
-    Key? key,
+    super.key,
     widgetKey,
     this.controller,
     focusNode,
@@ -28,11 +28,9 @@ class PlatformTextFormField extends FormField<String> {
     String? initialValue,
     String? placeholder,
     FormFieldValidator<String>? validator,
-    ValueChanged<String?>? onSaved,
+    super.onSaved,
   }) : super(
-         key: key,
          initialValue: controller != null ? controller.text : (initialValue ?? ''),
-         onSaved: onSaved,
          validator: (str) {
            if (validator != null) {
              return validator(str);
diff --git a/lib/components/SimplePage.dart b/lib/components/SimplePage.dart
index 78d584d..f1cc6d4 100644
--- a/lib/components/SimplePage.dart
+++ b/lib/components/SimplePage.dart
@@ -6,7 +6,7 @@ enum SimpleScrollable { none, vertical, horizontal, both }
 
 class SimplePage extends StatelessWidget {
   const SimplePage({
-    Key? key,
+    super.key,
     required this.title,
     required this.child,
     this.leadingAction,
@@ -19,7 +19,7 @@ class SimplePage extends StatelessWidget {
     this.onLoading,
     this.alignment,
     this.refreshController,
-  }) : super(key: key);
+  });
 
   final Widget title;
   final Widget child;
diff --git a/lib/components/SiteItem.dart b/lib/components/SiteItem.dart
index d1d8d4f..9bf11f2 100644
--- a/lib/components/SiteItem.dart
+++ b/lib/components/SiteItem.dart
@@ -6,7 +6,7 @@ import 'package:mobile_nebula/models/Site.dart';
 import 'package:mobile_nebula/services/utils.dart';
 
 class SiteItem extends StatelessWidget {
-  const SiteItem({Key? key, required this.site, this.onPressed}) : super(key: key);
+  const SiteItem({super.key, required this.site, this.onPressed});
 
   final Site site;
   final onPressed;
diff --git a/lib/components/SiteTitle.dart b/lib/components/SiteTitle.dart
index f85f476..12f3c2f 100644
--- a/lib/components/SiteTitle.dart
+++ b/lib/components/SiteTitle.dart
@@ -4,7 +4,7 @@ import 'package:flutter_svg/svg.dart';
 import '../models/Site.dart';
 
 class SiteTitle extends StatelessWidget {
-  const SiteTitle({Key? key, required this.site}) : super(key: key);
+  const SiteTitle({super.key, required this.site});
 
   final Site site;
 
diff --git a/lib/components/SpecialButton.dart b/lib/components/SpecialButton.dart
index 0779531..aa6ab47 100644
--- a/lib/components/SpecialButton.dart
+++ b/lib/components/SpecialButton.dart
@@ -5,8 +5,14 @@ import 'package:flutter/material.dart';
 
 // This is a button that pushes the bare minimum onto you, it doesn't even respect button themes - unless you tell it to
 class SpecialButton extends StatefulWidget {
-  const SpecialButton({Key? key, this.child, this.color, this.onPressed, this.useButtonTheme = false, this.decoration})
-    : super(key: key);
+  const SpecialButton({
+    super.key,
+    this.child,
+    this.color,
+    this.onPressed,
+    this.useButtonTheme = false,
+    this.decoration,
+  });
 
   final Widget? child;
   final Color? color;
diff --git a/lib/components/SpecialTextField.dart b/lib/components/SpecialTextField.dart
index 1912aac..c1632b0 100644
--- a/lib/components/SpecialTextField.dart
+++ b/lib/components/SpecialTextField.dart
@@ -5,7 +5,7 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 /// A normal TextField or CupertinoTextField that looks the same on all platforms
 class SpecialTextField extends StatefulWidget {
   const SpecialTextField({
-    Key? key,
+    super.key,
     this.placeholder,
     this.suffix,
     this.controller,
@@ -28,7 +28,7 @@ class SpecialTextField extends StatefulWidget {
     this.keyboardAppearance,
     this.textAlignVertical,
     this.inputFormatters,
-  }) : super(key: key);
+  });
 
   final String? placeholder;
   final TextEditingController? controller;
diff --git a/lib/components/buttons/PrimaryButton.dart b/lib/components/buttons/PrimaryButton.dart
index 449d523..21a253a 100644
--- a/lib/components/buttons/PrimaryButton.dart
+++ b/lib/components/buttons/PrimaryButton.dart
@@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class PrimaryButton extends StatelessWidget {
-  const PrimaryButton({Key? key, required this.child, this.onPressed}) : super(key: key);
+  const PrimaryButton({super.key, required this.child, this.onPressed});
 
   final Widget child;
   final GestureTapCallback? onPressed;
diff --git a/lib/components/config/ConfigButtonItem.dart b/lib/components/config/ConfigButtonItem.dart
index de484f2..fb9a23e 100644
--- a/lib/components/config/ConfigButtonItem.dart
+++ b/lib/components/config/ConfigButtonItem.dart
@@ -5,7 +5,7 @@ import 'package:mobile_nebula/services/utils.dart';
 
 // A config item that detects tapping and calls back on a tap
 class ConfigButtonItem extends StatelessWidget {
-  const ConfigButtonItem({Key? key, this.content, this.onPressed}) : super(key: key);
+  const ConfigButtonItem({super.key, this.content, this.onPressed});
 
   final Widget? content;
   final onPressed;
diff --git a/lib/components/config/ConfigCheckboxItem.dart b/lib/components/config/ConfigCheckboxItem.dart
index 7d37c8b..f059ec7 100644
--- a/lib/components/config/ConfigCheckboxItem.dart
+++ b/lib/components/config/ConfigCheckboxItem.dart
@@ -4,13 +4,13 @@ import 'package:mobile_nebula/services/utils.dart';
 
 class ConfigCheckboxItem extends StatelessWidget {
   const ConfigCheckboxItem({
-    Key? key,
+    super.key,
     this.label,
     this.content,
     this.labelWidth = 100,
     this.onChanged,
     this.checked = false,
-  }) : super(key: key);
+  });
 
   final Widget? label;
   final Widget? content;
diff --git a/lib/components/config/ConfigHeader.dart b/lib/components/config/ConfigHeader.dart
index 032e147..6154a3f 100644
--- a/lib/components/config/ConfigHeader.dart
+++ b/lib/components/config/ConfigHeader.dart
@@ -9,7 +9,7 @@ TextStyle basicTextStyle(BuildContext context) =>
 const double _headerFontSize = 13.0;
 
 class ConfigHeader extends StatelessWidget {
-  const ConfigHeader({Key? key, required this.label, this.color}) : super(key: key);
+  const ConfigHeader({super.key, required this.label, this.color});
 
   final String label;
   final Color? color;
diff --git a/lib/components/config/ConfigItem.dart b/lib/components/config/ConfigItem.dart
index 81b0667..92078ee 100644
--- a/lib/components/config/ConfigItem.dart
+++ b/lib/components/config/ConfigItem.dart
@@ -6,12 +6,12 @@ import 'package:mobile_nebula/services/utils.dart';
 
 class ConfigItem extends StatelessWidget {
   const ConfigItem({
-    Key? key,
+    super.key,
     this.label,
     required this.content,
     this.labelWidth = 100,
     this.crossAxisAlignment = CrossAxisAlignment.center,
-  }) : super(key: key);
+  });
 
   final Widget? label;
   final Widget content;
diff --git a/lib/components/config/ConfigPageItem.dart b/lib/components/config/ConfigPageItem.dart
index 1b93839..0e29760 100644
--- a/lib/components/config/ConfigPageItem.dart
+++ b/lib/components/config/ConfigPageItem.dart
@@ -7,14 +7,14 @@ import 'package:mobile_nebula/services/utils.dart';
 
 class ConfigPageItem extends StatelessWidget {
   const ConfigPageItem({
-    Key? key,
+    super.key,
     this.label,
     this.content,
     this.labelWidth = 100,
     this.onPressed,
     this.disabled = false,
     this.crossAxisAlignment = CrossAxisAlignment.center,
-  }) : super(key: key);
+  });
 
   final Widget? label;
   final Widget? content;
diff --git a/lib/components/config/ConfigSection.dart b/lib/components/config/ConfigSection.dart
index 58cf3da..d681cee 100644
--- a/lib/components/config/ConfigSection.dart
+++ b/lib/components/config/ConfigSection.dart
@@ -4,8 +4,7 @@ import 'package:mobile_nebula/services/utils.dart';
 import 'ConfigHeader.dart';
 
 class ConfigSection extends StatelessWidget {
-  const ConfigSection({Key? key, this.label, required this.children, this.borderColor, this.labelColor})
-    : super(key: key);
+  const ConfigSection({super.key, this.label, required this.children, this.borderColor, this.labelColor});
 
   final List<Widget> children;
   final String? label;
diff --git a/lib/components/config/ConfigTextItem.dart b/lib/components/config/ConfigTextItem.dart
index 577f559..663e4ed 100644
--- a/lib/components/config/ConfigTextItem.dart
+++ b/lib/components/config/ConfigTextItem.dart
@@ -2,11 +2,11 @@ import 'package:flutter/cupertino.dart';
 
 class ConfigTextItem extends StatelessWidget {
   const ConfigTextItem({
-    Key? key,
+    super.key,
     this.placeholder,
     this.controller,
     this.style = const TextStyle(fontFamily: 'RobotoMono'),
-  }) : super(key: key);
+  });
 
   final String? placeholder;
   final TextEditingController? controller;
diff --git a/lib/screens/AboutScreen.dart b/lib/screens/AboutScreen.dart
index 1f4655c..1c7c8ba 100644
--- a/lib/screens/AboutScreen.dart
+++ b/lib/screens/AboutScreen.dart
@@ -10,7 +10,7 @@ import 'package:mobile_nebula/services/utils.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 class AboutScreen extends StatefulWidget {
-  const AboutScreen({Key? key}) : super(key: key);
+  const AboutScreen({super.key});
 
   @override
   _AboutScreenState createState() => _AboutScreenState();
diff --git a/lib/screens/HostInfoScreen.dart b/lib/screens/HostInfoScreen.dart
index 3a899e9..7fb85b3 100644
--- a/lib/screens/HostInfoScreen.dart
+++ b/lib/screens/HostInfoScreen.dart
@@ -15,14 +15,14 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class HostInfoScreen extends StatefulWidget {
   const HostInfoScreen({
-    Key? key,
+    super.key,
     required this.hostInfo,
     required this.isLighthouse,
     required this.pending,
     this.onChanged,
     required this.site,
     required this.supportsQRScanning,
-  }) : super(key: key);
+  });
 
   final bool isLighthouse;
   final bool pending;
diff --git a/lib/screens/MainScreen.dart b/lib/screens/MainScreen.dart
index a61fe5f..1b326e4 100644
--- a/lib/screens/MainScreen.dart
+++ b/lib/screens/MainScreen.dart
@@ -60,7 +60,7 @@ MAIH7gzreMGgrH/yR6rZpIHR3DxJ3E0aHtEI
 };
 
 class MainScreen extends StatefulWidget {
-  const MainScreen(this.dnEnrollStream, {Key? key}) : super(key: key);
+  const MainScreen(this.dnEnrollStream, {super.key});
 
   final StreamController dnEnrollStream;
 
diff --git a/lib/screens/SiteDetailScreen.dart b/lib/screens/SiteDetailScreen.dart
index d99505d..ba71481 100644
--- a/lib/screens/SiteDetailScreen.dart
+++ b/lib/screens/SiteDetailScreen.dart
@@ -23,8 +23,7 @@ import '../components/SiteTitle.dart';
 //TODO: ios is now the problem with connecting screwing our ability to query the hostmap (its a race)
 
 class SiteDetailScreen extends StatefulWidget {
-  const SiteDetailScreen({Key? key, required this.site, this.onChanged, required this.supportsQRScanning})
-    : super(key: key);
+  const SiteDetailScreen({super.key, required this.site, this.onChanged, required this.supportsQRScanning});
 
   final Site site;
   final Function? onChanged;
diff --git a/lib/screens/SiteLogsScreen.dart b/lib/screens/SiteLogsScreen.dart
index a3269ed..0131ff1 100644
--- a/lib/screens/SiteLogsScreen.dart
+++ b/lib/screens/SiteLogsScreen.dart
@@ -15,7 +15,7 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 import '../components/SiteTitle.dart';
 
 class SiteLogsScreen extends StatefulWidget {
-  const SiteLogsScreen({Key? key, required this.site}) : super(key: key);
+  const SiteLogsScreen({super.key, required this.site});
 
   final Site site;
 
diff --git a/lib/screens/SiteTunnelsScreen.dart b/lib/screens/SiteTunnelsScreen.dart
index 51ba6df..a15ddc0 100644
--- a/lib/screens/SiteTunnelsScreen.dart
+++ b/lib/screens/SiteTunnelsScreen.dart
@@ -11,13 +11,13 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 class SiteTunnelsScreen extends StatefulWidget {
   const SiteTunnelsScreen({
-    Key? key,
+    super.key,
     required this.site,
     required this.tunnels,
     required this.pending,
     required this.onChanged,
     required this.supportsQRScanning,
-  }) : super(key: key);
+  });
 
   final Site site;
   final List<HostInfo> tunnels;
diff --git a/lib/screens/siteConfig/AddCertificateScreen.dart b/lib/screens/siteConfig/AddCertificateScreen.dart
index c803fc4..e2d9784 100644
--- a/lib/screens/siteConfig/AddCertificateScreen.dart
+++ b/lib/screens/siteConfig/AddCertificateScreen.dart
@@ -26,13 +26,13 @@ class CertificateResult {
 
 class AddCertificateScreen extends StatefulWidget {
   const AddCertificateScreen({
-    Key? key,
+    super.key,
     this.onSave,
     this.onReplace,
     required this.pubKey,
     required this.privKey,
     required this.supportsQRScanning,
-  }) : super(key: key);
+  });
 
   // onSave will pop a new CertificateDetailsScreen.
   // If onSave is null, onReplace must be set.
diff --git a/lib/screens/siteConfig/AdvancedScreen.dart b/lib/screens/siteConfig/AdvancedScreen.dart
index fa886c6..e59c2ab 100644
--- a/lib/screens/siteConfig/AdvancedScreen.dart
+++ b/lib/screens/siteConfig/AdvancedScreen.dart
@@ -40,7 +40,7 @@ class Advanced {
 }
 
 class AdvancedScreen extends StatefulWidget {
-  const AdvancedScreen({Key? key, required this.site, required this.onSave}) : super(key: key);
+  const AdvancedScreen({super.key, required this.site, required this.onSave});
 
   final Site site;
   final ValueChanged<Advanced> onSave;
diff --git a/lib/screens/siteConfig/CAListScreen.dart b/lib/screens/siteConfig/CAListScreen.dart
index 689af17..e252784 100644
--- a/lib/screens/siteConfig/CAListScreen.dart
+++ b/lib/screens/siteConfig/CAListScreen.dart
@@ -18,7 +18,7 @@ import 'package:mobile_nebula/services/utils.dart';
 //TODO: In addition you will want to think about re-generation while the site is still active (This means storing multiple keys in secure storage)
 
 class CAListScreen extends StatefulWidget {
-  const CAListScreen({Key? key, required this.cas, this.onSave, required this.supportsQRScanning}) : super(key: key);
+  const CAListScreen({super.key, required this.cas, this.onSave, required this.supportsQRScanning});
 
   final List<CertificateInfo> cas;
   final ValueChanged<List<CertificateInfo>>? onSave;
diff --git a/lib/screens/siteConfig/CertificateDetailsScreen.dart b/lib/screens/siteConfig/CertificateDetailsScreen.dart
index e601fe2..5770c06 100644
--- a/lib/screens/siteConfig/CertificateDetailsScreen.dart
+++ b/lib/screens/siteConfig/CertificateDetailsScreen.dart
@@ -11,7 +11,7 @@ import 'package:mobile_nebula/services/utils.dart';
 /// Displays the details of a CertificateInfo object. Respects incomplete objects (missing validity or rawCert)
 class CertificateDetailsScreen extends StatefulWidget {
   const CertificateDetailsScreen({
-    Key? key,
+    super.key,
     required this.certInfo,
     this.onDelete,
     this.onSave,
@@ -19,7 +19,7 @@ class CertificateDetailsScreen extends StatefulWidget {
     this.pubKey,
     this.privKey,
     required this.supportsQRScanning,
-  }) : super(key: key);
+  });
 
   final CertificateInfo certInfo;
 
diff --git a/lib/screens/siteConfig/CipherScreen.dart b/lib/screens/siteConfig/CipherScreen.dart
index fdcc399..1f4715c 100644
--- a/lib/screens/siteConfig/CipherScreen.dart
+++ b/lib/screens/siteConfig/CipherScreen.dart
@@ -6,7 +6,7 @@ import 'package:mobile_nebula/components/config/ConfigCheckboxItem.dart';
 import 'package:mobile_nebula/components/config/ConfigSection.dart';
 
 class CipherScreen extends StatefulWidget {
-  const CipherScreen({Key? key, required this.cipher, required this.onSave}) : super(key: key);
+  const CipherScreen({super.key, required this.cipher, required this.onSave});
 
   final String cipher;
   final ValueChanged<String> onSave;
diff --git a/lib/screens/siteConfig/LogVerbosityScreen.dart b/lib/screens/siteConfig/LogVerbosityScreen.dart
index bf1ca07..ec66693 100644
--- a/lib/screens/siteConfig/LogVerbosityScreen.dart
+++ b/lib/screens/siteConfig/LogVerbosityScreen.dart
@@ -6,7 +6,7 @@ import 'package:mobile_nebula/components/config/ConfigCheckboxItem.dart';
 import 'package:mobile_nebula/components/config/ConfigSection.dart';
 
 class LogVerbosityScreen extends StatefulWidget {
-  const LogVerbosityScreen({Key? key, required this.verbosity, required this.onSave}) : super(key: key);
+  const LogVerbosityScreen({super.key, required this.verbosity, required this.onSave});
 
   final String verbosity;
   final ValueChanged<String> onSave;
diff --git a/lib/screens/siteConfig/RenderedConfigScreen.dart b/lib/screens/siteConfig/RenderedConfigScreen.dart
index fb6de2d..4ac0c48 100644
--- a/lib/screens/siteConfig/RenderedConfigScreen.dart
+++ b/lib/screens/siteConfig/RenderedConfigScreen.dart
@@ -7,7 +7,7 @@ class RenderedConfigScreen extends StatelessWidget {
   final String config;
   final String name;
 
-  RenderedConfigScreen({Key? key, required this.config, required this.name}) : super(key: key);
+  RenderedConfigScreen({super.key, required this.config, required this.name});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/siteConfig/SiteConfigScreen.dart b/lib/screens/siteConfig/SiteConfigScreen.dart
index 1e274eb..391f317 100644
--- a/lib/screens/siteConfig/SiteConfigScreen.dart
+++ b/lib/screens/siteConfig/SiteConfigScreen.dart
@@ -23,8 +23,7 @@ import 'package:mobile_nebula/services/utils.dart';
 //TODO: Enforce a name
 
 class SiteConfigScreen extends StatefulWidget {
-  const SiteConfigScreen({Key? key, this.site, required this.onSave, required this.supportsQRScanning})
-    : super(key: key);
+  const SiteConfigScreen({super.key, this.site, required this.onSave, required this.supportsQRScanning});
 
   final Site? site;
 
diff --git a/lib/screens/siteConfig/StaticHostmapScreen.dart b/lib/screens/siteConfig/StaticHostmapScreen.dart
index 1e06009..1050757 100644
--- a/lib/screens/siteConfig/StaticHostmapScreen.dart
+++ b/lib/screens/siteConfig/StaticHostmapScreen.dart
@@ -21,14 +21,13 @@ class _IPAndPort {
 
 class StaticHostmapScreen extends StatefulWidget {
   StaticHostmapScreen({
-    Key? key,
+    super.key,
     this.nebulaIp = '',
     destinations,
     this.lighthouse = false,
     this.onDelete,
     required this.onSave,
-  }) : this.destinations = destinations ?? [],
-       super(key: key);
+  }) : this.destinations = destinations ?? [];
 
   final List<IPAndPort> destinations;
   final String nebulaIp;
diff --git a/lib/screens/siteConfig/StaticHostsScreen.dart b/lib/screens/siteConfig/StaticHostsScreen.dart
index a442d8b..0678f83 100644
--- a/lib/screens/siteConfig/StaticHostsScreen.dart
+++ b/lib/screens/siteConfig/StaticHostsScreen.dart
@@ -22,7 +22,7 @@ class _Hostmap {
 }
 
 class StaticHostsScreen extends StatefulWidget {
-  const StaticHostsScreen({Key? key, required this.hostmap, required this.onSave}) : super(key: key);
+  const StaticHostsScreen({super.key, required this.hostmap, required this.onSave});
 
   final Map<String, StaticHost> hostmap;
   final ValueChanged<Map<String, StaticHost>>? onSave;
diff --git a/lib/screens/siteConfig/UnsafeRouteScreen.dart b/lib/screens/siteConfig/UnsafeRouteScreen.dart
index 9b16120..2d31107 100644
--- a/lib/screens/siteConfig/UnsafeRouteScreen.dart
+++ b/lib/screens/siteConfig/UnsafeRouteScreen.dart
@@ -10,7 +10,7 @@ import 'package:mobile_nebula/models/UnsafeRoute.dart';
 import 'package:mobile_nebula/services/utils.dart';
 
 class UnsafeRouteScreen extends StatefulWidget {
-  const UnsafeRouteScreen({Key? key, required this.route, required this.onSave, this.onDelete}) : super(key: key);
+  const UnsafeRouteScreen({super.key, required this.route, required this.onSave, this.onDelete});
 
   final UnsafeRoute route;
   final ValueChanged<UnsafeRoute> onSave;
diff --git a/lib/screens/siteConfig/UnsafeRoutesScreen.dart b/lib/screens/siteConfig/UnsafeRoutesScreen.dart
index 48c51f6..47f8727 100644
--- a/lib/screens/siteConfig/UnsafeRoutesScreen.dart
+++ b/lib/screens/siteConfig/UnsafeRoutesScreen.dart
@@ -8,7 +8,7 @@ import 'package:mobile_nebula/screens/siteConfig/UnsafeRouteScreen.dart';
 import 'package:mobile_nebula/services/utils.dart';
 
 class UnsafeRoutesScreen extends StatefulWidget {
-  const UnsafeRoutesScreen({Key? key, required this.unsafeRoutes, required this.onSave}) : super(key: key);
+  const UnsafeRoutesScreen({super.key, required this.unsafeRoutes, required this.onSave});
 
   final List<UnsafeRoute> unsafeRoutes;
   final ValueChanged<List<UnsafeRoute>>? onSave;