diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f3c6e3..af44cdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.21.0
+ - Update to Flutter 3.22.0
+
 # 0.20.0
  - feat: adding different frames to `NesDialog`s
  - feat: allow `NesFileExplorer` to have custom icons
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 47f1bf4..ddff926 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -119,10 +119,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mini_sprite:
     dependency: "direct main"
     description:
diff --git a/lib/src/theme.dart b/lib/src/theme.dart
index 4e3d83f..1f21e85 100644
--- a/lib/src/theme.dart
+++ b/lib/src/theme.dart
@@ -843,7 +843,7 @@ ThemeData flutterNesTheme({
   final toolTipTheme = nesTooltipTheme ??
       NesTooltipTheme(
         background: textTheme.bodyMedium?.color ?? Colors.black,
-        textColor: themeData.colorScheme.background,
+        textColor: themeData.colorScheme.surface,
       );
 
   final containerTheme = nesContainerTheme ??
diff --git a/lib/src/widgets/dialogs/nes_input_dialog.dart b/lib/src/widgets/dialogs/nes_input_dialog.dart
index 4320009..1ce87ab 100644
--- a/lib/src/widgets/dialogs/nes_input_dialog.dart
+++ b/lib/src/widgets/dialogs/nes_input_dialog.dart
@@ -81,7 +81,7 @@ class _NesInputDialogState extends State<NesInputDialog> {
               type: NesButtonType.warning,
               child: Text(widget.cancelLabel),
               onPressed: () {
-                Navigator.of(context).pop(null);
+                Navigator.of(context).pop();
               },
             ),
             const SizedBox(width: 16),