diff --git a/.github/workflows/fleather.yml b/.github/workflows/fleather.yml
index 8d20acbb..0b8f9073 100644
--- a/.github/workflows/fleather.yml
+++ b/.github/workflows/fleather.yml
@@ -10,10 +10,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.44.0"
+          flutter-version: "3.47.0"
           cache: true
           # Manually Update this `key`
-          cache-key: "3.44.0"
+          cache-key: "3.47.0"
       - run: dart pub global activate coverage
 
       #
diff --git a/packages/fleather/analysis_options.yaml b/packages/fleather/analysis_options.yaml
index 429a9600..b5deda9e 100644
--- a/packages/fleather/analysis_options.yaml
+++ b/packages/fleather/analysis_options.yaml
@@ -3,6 +3,13 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   exclude:
     - '**.g.dart'
+    - build/**
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
 
 linter:
   rules:
diff --git a/packages/fleather/example/integration_test/editing_performance_test.dart b/packages/fleather/example/integration_test/editing_performance_test.dart
index 80dfba6d..87ea5b46 100644
--- a/packages/fleather/example/integration_test/editing_performance_test.dart
+++ b/packages/fleather/example/integration_test/editing_performance_test.dart
@@ -1,5 +1,5 @@
 import 'package:fleather/fleather.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_test_robots/flutter_test_robots.dart';
 import 'package:integration_test/integration_test.dart';
@@ -22,12 +22,12 @@ void main() {
         await tester.tap(find.byType(RawEditor));
         controller.updateSelection(const TextSelection.collapsed(offset: 0));
         await tester.pump();
-        await tester.ime.typeText(iputText, finder: find.byType(RawEditor));
+        await tester.ime.typeText(iputText);
         await tester.pump();
         controller.updateSelection(
             TextSelection.collapsed(offset: document.length - 1));
         await tester.pump();
-        await tester.ime.typeText(iputText, finder: find.byType(RawEditor));
+        await tester.ime.typeText(iputText);
       },
       reportKey: 'timeline',
     );
diff --git a/packages/fleather/example/integration_test/scrolling_performance_test.dart b/packages/fleather/example/integration_test/scrolling_performance_test.dart
index fbdae232..d4a43134 100644
--- a/packages/fleather/example/integration_test/scrolling_performance_test.dart
+++ b/packages/fleather/example/integration_test/scrolling_performance_test.dart
@@ -1,5 +1,5 @@
 import 'package:fleather/fleather.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:parchment/codecs.dart';
diff --git a/packages/fleather/example/lib/main.dart b/packages/fleather/example/lib/main.dart
index 30e1c19d..c7fc2b04 100644
--- a/packages/fleather/example/lib/main.dart
+++ b/packages/fleather/example/lib/main.dart
@@ -3,9 +3,10 @@ import 'dart:io';
 
 import 'package:fleather/fleather.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_localizations/flutter_localizations.dart'
+    hide GlobalMaterialLocalizations;
 import 'package:image_picker/image_picker.dart';
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/packages/fleather/example/pubspec.yaml b/packages/fleather/example/pubspec.yaml
index 0efdd1b4..018990fa 100644
--- a/packages/fleather/example/pubspec.yaml
+++ b/packages/fleather/example/pubspec.yaml
@@ -15,6 +15,7 @@ dependencies:
     sdk: flutter
   url_launcher: ^6.3.2
   image_picker: ^1.2.1
+  material_ui: ^1.0.1
   fleather:
     path: ../
   parchment:
@@ -32,7 +33,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   flutter_lints: ^6.0.0
-  flutter_test_robots: ^1.0.0
+  flutter_test_robots: ^1.2.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/fleather/lib/src/rendering/editable_text_line.dart b/packages/fleather/lib/src/rendering/editable_text_line.dart
index 6e1dd0e7..189739e4 100644
--- a/packages/fleather/lib/src/rendering/editable_text_line.dart
+++ b/packages/fleather/lib/src/rendering/editable_text_line.dart
@@ -2,7 +2,7 @@ import 'dart:math' as math;
 import 'dart:ui' as ui;
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/rendering.dart';
 import 'package:parchment/parchment.dart';
 
diff --git a/packages/fleather/lib/src/rendering/editor.dart b/packages/fleather/lib/src/rendering/editor.dart
index 0be71fab..ea0a27e2 100644
--- a/packages/fleather/lib/src/rendering/editor.dart
+++ b/packages/fleather/lib/src/rendering/editor.dart
@@ -1,6 +1,6 @@
 import 'dart:math' as math;
 
-import 'package:flutter/cupertino.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/rendering.dart';
diff --git a/packages/fleather/lib/src/services/spell_check_suggestions_toolbar.dart b/packages/fleather/lib/src/services/spell_check_suggestions_toolbar.dart
index c430ec97..1fe824e9 100644
--- a/packages/fleather/lib/src/services/spell_check_suggestions_toolbar.dart
+++ b/packages/fleather/lib/src/services/spell_check_suggestions_toolbar.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 
diff --git a/packages/fleather/lib/src/widgets/checkbox.dart b/packages/fleather/lib/src/widgets/checkbox.dart
index 27e8a272..e963c597 100644
--- a/packages/fleather/lib/src/widgets/checkbox.dart
+++ b/packages/fleather/lib/src/widgets/checkbox.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 
 /// A Material Design checkbox.
 ///
diff --git a/packages/fleather/lib/src/widgets/controller.dart b/packages/fleather/lib/src/widgets/controller.dart
index 49b33956..9b5c648d 100644
--- a/packages/fleather/lib/src/widgets/controller.dart
+++ b/packages/fleather/lib/src/widgets/controller.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:collection/collection.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
 import 'package:parchment/parchment.dart';
 
 import '../../util.dart';
diff --git a/packages/fleather/lib/src/widgets/editable_text_block.dart b/packages/fleather/lib/src/widgets/editable_text_block.dart
index 80b0928d..ee1b9100 100644
--- a/packages/fleather/lib/src/widgets/editable_text_block.dart
+++ b/packages/fleather/lib/src/widgets/editable_text_block.dart
@@ -1,5 +1,5 @@
 import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:parchment/parchment.dart';
 
 import '../../util.dart';
diff --git a/packages/fleather/lib/src/widgets/editable_text_line.dart b/packages/fleather/lib/src/widgets/editable_text_line.dart
index bc31ce4c..6963db67 100644
--- a/packages/fleather/lib/src/widgets/editable_text_line.dart
+++ b/packages/fleather/lib/src/widgets/editable_text_line.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:parchment/parchment.dart';
 
 import '../rendering/editable_box.dart';
diff --git a/packages/fleather/lib/src/widgets/editor.dart b/packages/fleather/lib/src/widgets/editor.dart
index 3b0dacca..2d0d9693 100644
--- a/packages/fleather/lib/src/widgets/editor.dart
+++ b/packages/fleather/lib/src/widgets/editor.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:math' as math;
 import 'dart:math';
 
-import 'package:flutter/cupertino.dart' hide SystemContextMenu;
+import 'package:cupertino_ui/cupertino_ui.dart' hide SystemContextMenu;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart' hide SystemContextMenu;
+import 'package:material_ui/material_ui.dart' hide SystemContextMenu;
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
diff --git a/packages/fleather/lib/src/widgets/editor_selection_delegate_mixin.dart b/packages/fleather/lib/src/widgets/editor_selection_delegate_mixin.dart
index 73ff013b..dd7a56c0 100644
--- a/packages/fleather/lib/src/widgets/editor_selection_delegate_mixin.dart
+++ b/packages/fleather/lib/src/widgets/editor_selection_delegate_mixin.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:flutter/cupertino.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
 import 'package:flutter/rendering.dart';
 
 import '../fast_diff.dart';
diff --git a/packages/fleather/lib/src/widgets/editor_toolbar.dart b/packages/fleather/lib/src/widgets/editor_toolbar.dart
index 91d0a5c3..7f4f16d4 100644
--- a/packages/fleather/lib/src/widgets/editor_toolbar.dart
+++ b/packages/fleather/lib/src/widgets/editor_toolbar.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:fleather/util.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:parchment/parchment.dart';
 
 import 'controller.dart';
diff --git a/packages/fleather/lib/src/widgets/field.dart b/packages/fleather/lib/src/widgets/field.dart
index de8080eb..31e528bf 100644
--- a/packages/fleather/lib/src/widgets/field.dart
+++ b/packages/fleather/lib/src/widgets/field.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:parchment/parchment.dart';
 
 import '../services/clipboard_manager.dart';
diff --git a/packages/fleather/lib/src/widgets/keyboard_listener.dart b/packages/fleather/lib/src/widgets/keyboard_listener.dart
index dc76ca15..241667d9 100644
--- a/packages/fleather/lib/src/widgets/keyboard_listener.dart
+++ b/packages/fleather/lib/src/widgets/keyboard_listener.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 
 class FleatherPressedKeys extends ChangeNotifier {
diff --git a/packages/fleather/lib/src/widgets/link.dart b/packages/fleather/lib/src/widgets/link.dart
index 6a31a75e..0d0862c0 100644
--- a/packages/fleather/lib/src/widgets/link.dart
+++ b/packages/fleather/lib/src/widgets/link.dart
@@ -1,6 +1,6 @@
-import 'package:flutter/cupertino.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:parchment/parchment.dart';
 
 import '../../l10n/l10n.dart';
diff --git a/packages/fleather/lib/src/widgets/shortcuts.dart b/packages/fleather/lib/src/widgets/shortcuts.dart
index 8877e630..8ad772d6 100644
--- a/packages/fleather/lib/src/widgets/shortcuts.dart
+++ b/packages/fleather/lib/src/widgets/shortcuts.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 import 'package:parchment/parchment.dart';
 
diff --git a/packages/fleather/lib/src/widgets/text_line.dart b/packages/fleather/lib/src/widgets/text_line.dart
index 7cf3e2e2..30b37af1 100644
--- a/packages/fleather/lib/src/widgets/text_line.dart
+++ b/packages/fleather/lib/src/widgets/text_line.dart
@@ -1,7 +1,7 @@
-import 'package:flutter/cupertino.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 import 'package:parchment/parchment.dart';
 
diff --git a/packages/fleather/lib/src/widgets/text_selection.dart b/packages/fleather/lib/src/widgets/text_selection.dart
index da8bed6f..26f4380c 100644
--- a/packages/fleather/lib/src/widgets/text_selection.dart
+++ b/packages/fleather/lib/src/widgets/text_selection.dart
@@ -4,7 +4,7 @@ import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 
diff --git a/packages/fleather/lib/src/widgets/theme.dart b/packages/fleather/lib/src/widgets/theme.dart
index 637e64f4..6c9f245a 100644
--- a/packages/fleather/lib/src/widgets/theme.dart
+++ b/packages/fleather/lib/src/widgets/theme.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:parchment/parchment.dart';
 
 /// Applies a Fleather editor theme to descendant widgets.
diff --git a/packages/fleather/pubspec.yaml b/packages/fleather/pubspec.yaml
index 83dc16f8..f4a4c392 100644
--- a/packages/fleather/pubspec.yaml
+++ b/packages/fleather/pubspec.yaml
@@ -27,6 +27,8 @@ dependencies:
   collection: ^1.19.1
   parchment_delta: ^1.0.0
   parchment: ^1.27.0
+  cupertino_ui: ^1.0.0
+  material_ui: ^1.0.1
   intl: ">=0.19.0 <0.21.0"
 
 dependency_overrides:
diff --git a/packages/fleather/test/rendering/editable_text_line_test.dart b/packages/fleather/test/rendering/editable_text_line_test.dart
index ac1ce035..05a3eadd 100644
--- a/packages/fleather/test/rendering/editable_text_line_test.dart
+++ b/packages/fleather/test/rendering/editable_text_line_test.dart
@@ -6,7 +6,7 @@ import 'package:fleather/fleather.dart';
 import 'package:fleather/src/rendering/editable_text_line.dart';
 import 'package:fleather/src/rendering/paragraph_proxy.dart';
 import 'package:fleather/util.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/fleather/test/testing.dart b/packages/fleather/test/testing.dart
index 96d8bbbf..81c91733 100644
--- a/packages/fleather/test/testing.dart
+++ b/packages/fleather/test/testing.dart
@@ -1,7 +1,7 @@
 import 'package:fleather/fleather.dart';
 import 'package:fleather/src/widgets/editor_input_client_mixin.dart';
 import 'package:fleather/src/widgets/text_selection.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/fleather/test/widgets/controller_test.dart b/packages/fleather/test/widgets/controller_test.dart
index 4d8e429d..dce6a7d4 100644
--- a/packages/fleather/test/widgets/controller_test.dart
+++ b/packages/fleather/test/widgets/controller_test.dart
@@ -1,7 +1,7 @@
 import 'package:fake_async/fake_async.dart';
 import 'package:fleather/fleather.dart';
 import 'package:fleather/util.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
diff --git a/packages/fleather/test/widgets/editor_input_client_mixin_deltas_test.dart b/packages/fleather/test/widgets/editor_input_client_mixin_deltas_test.dart
index 3c6baa19..4f858493 100644
--- a/packages/fleather/test/widgets/editor_input_client_mixin_deltas_test.dart
+++ b/packages/fleather/test/widgets/editor_input_client_mixin_deltas_test.dart
@@ -1,6 +1,6 @@
 import 'package:fleather/fleather.dart';
 import 'package:fleather/src/widgets/editor_input_client_mixin.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/fleather/test/widgets/editor_input_client_mixin_test.dart b/packages/fleather/test/widgets/editor_input_client_mixin_test.dart
index a17753b4..476ee3c8 100644
--- a/packages/fleather/test/widgets/editor_input_client_mixin_test.dart
+++ b/packages/fleather/test/widgets/editor_input_client_mixin_test.dart
@@ -1,6 +1,6 @@
 import 'package:fleather/fleather.dart';
 import 'package:fleather/src/widgets/editor_input_client_mixin.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/fleather/test/widgets/editor_test.dart b/packages/fleather/test/widgets/editor_test.dart
index 42fd34a5..e633e2a6 100644
--- a/packages/fleather/test/widgets/editor_test.dart
+++ b/packages/fleather/test/widgets/editor_test.dart
@@ -4,9 +4,9 @@ import 'package:fleather/src/widgets/checkbox.dart';
 import 'package:fleather/src/widgets/keyboard_listener.dart';
 import 'package:fleather/src/widgets/system_context_menu.dart';
 import 'package:fleather/src/widgets/text_selection.dart';
-import 'package:flutter/cupertino.dart' hide SystemContextMenu;
+import 'package:cupertino_ui/cupertino_ui.dart' hide SystemContextMenu;
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart' hide SystemContextMenu;
+import 'package:material_ui/material_ui.dart' hide SystemContextMenu;
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/fleather/test/widgets/editor_text_selection_controllers_test.dart b/packages/fleather/test/widgets/editor_text_selection_controllers_test.dart
index 4ebe749c..a596050c 100644
--- a/packages/fleather/test/widgets/editor_text_selection_controllers_test.dart
+++ b/packages/fleather/test/widgets/editor_text_selection_controllers_test.dart
@@ -1,7 +1,7 @@
 import 'dart:math' as math;
 
 import 'package:fleather/fleather.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 class MyTextSelectionHandle extends StatefulWidget {
diff --git a/packages/fleather/test/widgets/editor_toolbar_test.dart b/packages/fleather/test/widgets/editor_toolbar_test.dart
index c0c1697e..c5e98810 100644
--- a/packages/fleather/test/widgets/editor_toolbar_test.dart
+++ b/packages/fleather/test/widgets/editor_toolbar_test.dart
@@ -1,6 +1,6 @@
 import 'package:fleather/fleather.dart';
 import 'package:fleather/util.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import '../testing.dart';
diff --git a/packages/fleather/test/widgets/history_test.dart b/packages/fleather/test/widgets/history_test.dart
index 996ed892..0873a36f 100644
--- a/packages/fleather/test/widgets/history_test.dart
+++ b/packages/fleather/test/widgets/history_test.dart
@@ -1,6 +1,6 @@
 import 'package:fleather/fleather.dart';
 import 'package:fleather/src/widgets/history.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/fleather/test/widgets/shortcuts_test.dart b/packages/fleather/test/widgets/shortcuts_test.dart
index 3e5a8298..16e512b2 100644
--- a/packages/fleather/test/widgets/shortcuts_test.dart
+++ b/packages/fleather/test/widgets/shortcuts_test.dart
@@ -1,5 +1,5 @@
 import 'package:fleather/fleather.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
diff --git a/packages/fleather/test/widgets/theme_test.dart b/packages/fleather/test/widgets/theme_test.dart
index 801032c3..7f4b7ba0 100644
--- a/packages/fleather/test/widgets/theme_test.dart
+++ b/packages/fleather/test/widgets/theme_test.dart
@@ -1,5 +1,5 @@
 import 'package:fleather/fleather.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {