diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09b3037..2bd0a2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## 1.6.5
 
+* fix: resolve flutter 3.22.1 issues
+
+## 1.6.5
+
 * ci: add auto tag workflow
 * chore: upgrade internal dependencies
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 26128b9..9be3b33 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1 +1,6 @@
-include: package:lint/analysis_options.yaml
\ No newline at end of file
+include: package:lint/analysis_options.yaml
+linter:
+  rules:
+    public_member_api_docs: false
+    prefer_relative_imports: true
+    always_use_package_imports: false
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index ee5681d..5137a82 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -26,10 +26,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  integration_test: 13825b8a9334a850581300559b8839134b124670
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index ccd0948..b58c193 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -155,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index b52b2e6..e67b280 100644
--- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/lib/advanced_chat.dart b/example/lib/advanced_chat.dart
index e6a2d17..116a183 100644
--- a/example/lib/advanced_chat.dart
+++ b/example/lib/advanced_chat.dart
@@ -79,10 +79,8 @@ class _AdvancedChat extends State<AdvancedChat> {
       )
           .setOnHTMLWidgetPressed(
             () => {
-              "onLinkTap": (url, _, __, ___) =>
-                  debugPrint("onLinkTapped: $url"),
-              "onImageTap": (src, _, __, ___) =>
-                  debugPrint("onImageTapped: $src")
+              "onLinkTap": (url, _, __) => debugPrint("onLinkTapped: $url"),
+              "onImageTap": (src, _, __) => debugPrint("onImageTapped: $src")
             },
           )
           .setOnCarouselItemButtonPressed((item) => debugPrint(item.payload))
diff --git a/example/pubspec.lock b/example/pubspec.lock
index f8693f2..fe829ef 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   equatable:
     dependency: transitive
     description:
@@ -101,18 +101,18 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -127,18 +127,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_html
-      sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd"
+      sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0-alpha.6"
+    version: "3.0.0-beta.2"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "4.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -158,10 +158,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8
+      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.2.1"
   html:
     dependency: transitive
     description:
@@ -174,10 +174,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -203,10 +203,34 @@ packages:
     dependency: transitive
     description:
       name: jiffy
-      sha256: a7c15924e9e351faab7259a3c673e2796e5e811ebbeb6e6dc9037cdcded5f541
+      sha256: "3497caaa36d36a29033e66803c9739ce6bccbc7e241ca46070f76ee9e6f6eb0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "3.0.1"
   lint:
     dependency: transitive
     description:
@@ -219,74 +243,74 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
+  list_counter:
+    dependency: transitive
+    description:
+      name: list_counter
+      sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
-  numerus:
-    dependency: transitive
-    description:
-      name: numerus
-      sha256: "49cd96fe774dd1f574fc9117ed67e8a2b06a612f723e87ef3119456a7729d837"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.5"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -315,10 +339,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -331,10 +355,10 @@ packages:
     dependency: transitive
     description:
       name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.4"
+    version: "5.0.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -422,10 +446,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -438,26 +462,26 @@ packages:
     dependency: transitive
     description:
       name: url_launcher
-      sha256: d25bb0ca00432a5e1ee40e69c36c85863addf7cc45e433769d61bed3fe81fd96
+      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.3"
+    version: "6.2.6"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f"
+      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "6.3.3"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -470,26 +494,26 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
+      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -510,34 +534,34 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "11.10.0"
+    version: "14.2.1"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.1"
   webdriver:
     dependency: transitive
     description:
       name: webdriver
-      sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
+      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "5.5.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -547,5 +571,5 @@ packages:
     source: hosted
     version: "1.0.4"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.22.0"
diff --git a/lib/src/chat-message-list-items/carousel_widget.dart b/lib/src/chat-message-list-items/carousel_widget.dart
index c3dcfcf..94046a9 100644
--- a/lib/src/chat-message-list-items/carousel_widget.dart
+++ b/lib/src/chat-message-list-items/carousel_widget.dart
@@ -1,11 +1,12 @@
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:swifty_chat/src/chat.dart';
-import 'package:swifty_chat/src/extensions/theme_context.dart';
-import 'package:swifty_chat/src/protocols/has_avatar.dart';
 import 'package:swifty_chat_data/swifty_chat_data.dart';
 
+import '../chat.dart';
+import '../extensions/theme_context.dart';
+import '../protocols/has_avatar.dart';
+
 final class CarouselWidget extends StatelessWidget with HasAvatar {
   const CarouselWidget(this.chatMessage);
 
diff --git a/lib/src/chat-message-list-items/html_widget.dart b/lib/src/chat-message-list-items/html_widget.dart
index 905ec86..98be711 100644
--- a/lib/src/chat-message-list-items/html_widget.dart
+++ b/lib/src/chat-message-list-items/html_widget.dart
@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:swifty_chat/src/chat.dart';
-import 'package:swifty_chat/src/extensions/date_extensions.dart';
-import 'package:swifty_chat/src/extensions/theme_context.dart';
-import 'package:swifty_chat/src/protocols/has_avatar.dart';
 import 'package:swifty_chat_data/swifty_chat_data.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import '../chat.dart';
+import '../extensions/date_extensions.dart';
+import '../extensions/theme_context.dart';
+import '../protocols/has_avatar.dart';
+
 final class HTMLWidget extends StatelessWidget with HasAvatar {
   const HTMLWidget(this.chatMessage);
 
@@ -19,7 +20,6 @@ final class HTMLWidget extends StatelessWidget with HasAvatar {
     final functions =
         ChatStateContainer.of(context).onHtmlWidgetPressed?.call();
     final OnTap? onLinkTap = functions?["onLinkTap"];
-    final OnTap? onImageTap = functions?["onImageTap"];
     final Color htmlTextColor = context.theme.htmlTextColor;
     final String? htmlTextFontFamily = context.theme.htmlTextFontFamily;
     final htmlStyle = {
@@ -55,10 +55,9 @@ final class HTMLWidget extends StatelessWidget with HasAvatar {
               ),
               child: Html(
                 data: chatMessage.messageKind.htmlData,
-                onImageTap: onImageTap,
                 style: htmlStyle,
                 onLinkTap: onLinkTap ??
-                    (link, _, __, ___) async {
+                    (link, _, __) async {
                       if (await canLaunchUrl(Uri.parse(link!))) {
                         await launchUrl(
                           Uri.parse(link),
diff --git a/lib/src/chat-message-list-items/image_widget.dart b/lib/src/chat-message-list-items/image_widget.dart
index b1ec57a..7f325fe 100644
--- a/lib/src/chat-message-list-items/image_widget.dart
+++ b/lib/src/chat-message-list-items/image_widget.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:swifty_chat/src/chat.dart';
-import 'package:swifty_chat/src/extensions/date_extensions.dart';
-import 'package:swifty_chat/src/extensions/theme_context.dart';
-import 'package:swifty_chat/src/protocols/has_avatar.dart';
-import 'package:swifty_chat/src/protocols/incoming_outgoing_message_widgets.dart';
 import 'package:swifty_chat_data/swifty_chat_data.dart';
 
+import '../chat.dart';
+import '../extensions/date_extensions.dart';
+import '../extensions/theme_context.dart';
+import '../protocols/has_avatar.dart';
+import '../protocols/incoming_outgoing_message_widgets.dart';
+
 final class ImageMessageWidget extends StatelessWidget
     with HasAvatar, IncomingOutgoingMessageWidgets {
   const ImageMessageWidget(this._chatMessage);
diff --git a/lib/src/chat-message-list-items/quick_reply_widget.dart b/lib/src/chat-message-list-items/quick_reply_widget.dart
index 8704be2..eea1c85 100644
--- a/lib/src/chat-message-list-items/quick_reply_widget.dart
+++ b/lib/src/chat-message-list-items/quick_reply_widget.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:swifty_chat/src/chat.dart';
-import 'package:swifty_chat/src/extensions/theme_context.dart';
 import 'package:swifty_chat_data/swifty_chat_data.dart';
 
+import '../chat.dart';
+import '../extensions/theme_context.dart';
+
 final class QuickReplyWidget extends StatelessWidget {
   const QuickReplyWidget(this.chatMessage);
 
diff --git a/lib/src/chat-message-list-items/text_widget.dart b/lib/src/chat-message-list-items/text_widget.dart
index 86105b4..3923ded 100644
--- a/lib/src/chat-message-list-items/text_widget.dart
+++ b/lib/src/chat-message-list-items/text_widget.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:swifty_chat/src/extensions/date_extensions.dart';
-import 'package:swifty_chat/src/extensions/theme_context.dart';
-import 'package:swifty_chat/src/protocols/has_avatar.dart';
-import 'package:swifty_chat/src/protocols/incoming_outgoing_message_widgets.dart';
 import 'package:swifty_chat_data/swifty_chat_data.dart';
 
+import '../extensions/date_extensions.dart';
+import '../extensions/theme_context.dart';
+import '../protocols/has_avatar.dart';
+import '../protocols/incoming_outgoing_message_widgets.dart';
+
 final class TextMessageWidget extends StatelessWidget
     with HasAvatar, IncomingOutgoingMessageWidgets {
   TextMessageWidget(this._chatMessage);
diff --git a/lib/src/chat.dart b/lib/src/chat.dart
index 3bcb452..126de16 100644
--- a/lib/src/chat.dart
+++ b/lib/src/chat.dart
@@ -1,14 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_html/html_parser.dart';
+import 'package:flutter_html/flutter_html.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:swifty_chat/src/chat_list_item.dart';
-import 'package:swifty_chat/src/extensions/keys.dart';
-import 'package:swifty_chat/src/inherited_chat_theme.dart';
-import 'package:swifty_chat/src/message_cell_size_configurator.dart';
-import 'package:swifty_chat/src/theme/chat_theme.dart';
-import 'package:swifty_chat/src/theme/default_theme.dart';
 import 'package:swifty_chat_data/swifty_chat_data.dart';
 
+import 'chat_list_item.dart';
+import 'extensions/keys.dart';
+import 'inherited_chat_theme.dart';
+import 'message_cell_size_configurator.dart';
+import 'theme/chat_theme.dart';
+import 'theme/default_theme.dart';
+
 final class ChatStateContainer extends InheritedWidget {
   const ChatStateContainer({
     required this.messageCellSizeConfigurator,
diff --git a/lib/src/chat_input_field.dart b/lib/src/chat_input_field.dart
index 8851305..69488fb 100644
--- a/lib/src/chat_input_field.dart
+++ b/lib/src/chat_input_field.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:styled_widget/styled_widget.dart';
 
-import 'package:swifty_chat/src/extensions/keys.dart';
+import 'extensions/keys.dart';
 
 final class MessageInputField extends StatefulWidget {
   const MessageInputField({
diff --git a/lib/src/chat_list_item.dart b/lib/src/chat_list_item.dart
index b02a0f8..7d1eb10 100644
--- a/lib/src/chat_list_item.dart
+++ b/lib/src/chat_list_item.dart
@@ -1,14 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:swifty_chat/src/chat-message-list-items/carousel_widget.dart';
-import 'package:swifty_chat/src/chat-message-list-items/html_widget.dart';
-import 'package:swifty_chat/src/chat-message-list-items/image_widget.dart';
-import 'package:swifty_chat/src/chat-message-list-items/quick_reply_widget.dart';
-import 'package:swifty_chat/src/chat-message-list-items/text_widget.dart';
-import 'package:swifty_chat/src/chat.dart';
-import 'package:swifty_chat/src/extensions/theme_context.dart';
 import 'package:swifty_chat_data/swifty_chat_data.dart';
 
+import 'chat-message-list-items/carousel_widget.dart';
+import 'chat-message-list-items/html_widget.dart';
+import 'chat-message-list-items/image_widget.dart';
+import 'chat-message-list-items/quick_reply_widget.dart';
+import 'chat-message-list-items/text_widget.dart';
+import 'chat.dart';
+import 'extensions/theme_context.dart';
+
 final class ChatListItem extends StatelessWidget {
   const ChatListItem({required this.chatMessage});
 
diff --git a/lib/src/extensions/theme_context.dart b/lib/src/extensions/theme_context.dart
index 884c083..99cadca 100644
--- a/lib/src/extensions/theme_context.dart
+++ b/lib/src/extensions/theme_context.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import 'package:swifty_chat/src/inherited_chat_theme.dart';
-import 'package:swifty_chat/src/theme/chat_theme.dart';
+import '../inherited_chat_theme.dart';
+import '../theme/chat_theme.dart';
 
 extension ChatThemeContext on BuildContext {
   ChatTheme get theme => InheritedChatTheme.of(this).theme;
diff --git a/lib/src/inherited_chat_theme.dart b/lib/src/inherited_chat_theme.dart
index a2c7f6f..0a8d4d8 100644
--- a/lib/src/inherited_chat_theme.dart
+++ b/lib/src/inherited_chat_theme.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:swifty_chat/src/theme/chat_theme.dart';
+import 'theme/chat_theme.dart';
 
 /// Used to make provided [ChatTheme] class available through the whole package
 final class InheritedChatTheme extends InheritedWidget {
diff --git a/lib/src/theme/default_theme.dart b/lib/src/theme/default_theme.dart
index 16d00ff..c8acba2 100644
--- a/lib/src/theme/default_theme.dart
+++ b/lib/src/theme/default_theme.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:swifty_chat/src/theme/chat_theme.dart';
+import 'chat_theme.dart';
 
 /// Default chat theme which extends [ChatTheme]
 @immutable
@@ -107,9 +107,9 @@ final class DefaultChatTheme extends ChatTheme {
 
   @override
   ButtonStyle get quickReplyButtonStyle => ButtonStyle(
-        backgroundColor: MaterialStateProperty.all<Color>(neutral2),
-        foregroundColor: MaterialStateProperty.all<Color>(neutral0),
-        textStyle: MaterialStateProperty.all<TextStyle>(
+        backgroundColor: WidgetStateProperty.all<Color>(neutral2),
+        foregroundColor: WidgetStateProperty.all<Color>(neutral0),
+        textStyle: WidgetStateProperty.all<TextStyle>(
           const TextStyle(fontWeight: FontWeight.bold),
         ),
       );
@@ -227,9 +227,9 @@ class DarkChatTheme extends ChatTheme {
 
   @override
   ButtonStyle get quickReplyButtonStyle => ButtonStyle(
-        backgroundColor: MaterialStateProperty.all<Color>(secondaryDark),
-        foregroundColor: MaterialStateProperty.all<Color>(secondary),
-        textStyle: MaterialStateProperty.all<TextStyle>(
+        backgroundColor: WidgetStateProperty.all<Color>(secondaryDark),
+        foregroundColor: WidgetStateProperty.all<Color>(secondary),
+        textStyle: WidgetStateProperty.all<TextStyle>(
           const TextStyle(fontWeight: FontWeight.bold),
         ),
       );
diff --git a/packages/swifty_chat_mocked_data/lib/src/mock/mock_messages.dart b/packages/swifty_chat_mocked_data/lib/src/mock/mock_messages.dart
index f8f3865..d1bd4fb 100644
--- a/packages/swifty_chat_mocked_data/lib/src/mock/mock_messages.dart
+++ b/packages/swifty_chat_mocked_data/lib/src/mock/mock_messages.dart
@@ -105,7 +105,7 @@ MockMessage generateRandomMessage(
                   title: 'Select',
                   url: 'url',
                   payload: 'payload',
-                )
+                ),
               ],
             ),
           ),
diff --git a/pubspec.lock b/pubspec.lock
index 80de6a8..3b25ae6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -82,7 +82,7 @@ packages:
     source: hosted
     version: "1.3.1"
   faker:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: faker
       sha256: "746e59f91d8b06a389e74cf76e909a05ed69c12691768e2f93557fdf29200fd0"
@@ -98,10 +98,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_html
-      sha256: "342c7908f0a67bcec62b6e0f7cf23e23bafe7f64693665dd35be98d5e783bdfd"
+      sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0-alpha.6"
+    version: "3.0.0-beta.2"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -140,34 +140,34 @@ packages:
     dependency: "direct main"
     description:
       name: jiffy
-      sha256: a7c15924e9e351faab7259a3c673e2796e5e811ebbeb6e6dc9037cdcded5f541
+      sha256: "3497caaa36d36a29033e66803c9739ce6bccbc7e241ca46070f76ee9e6f6eb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "6.3.1"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lint:
     dependency: transitive
     description:
@@ -184,6 +184,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
+  list_counter:
+    dependency: transitive
+    description:
+      name: list_counter
+      sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   matcher:
     dependency: transitive
     description:
@@ -204,18 +212,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
-  numerus:
-    dependency: transitive
-    description:
-      name: numerus
-      sha256: "49cd96fe774dd1f574fc9117ed67e8a2b06a612f723e87ef3119456a7729d837"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
@@ -304,10 +304,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   typed_data:
     dependency: transitive
     description:
@@ -320,26 +320,26 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: d25bb0ca00432a5e1ee40e69c36c85863addf7cc45e433769d61bed3fe81fd96
+      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.3"
+    version: "6.2.6"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f"
+      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "6.3.3"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -352,26 +352,26 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
+      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -392,18 +392,18 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.1"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 28df3d6..4b1701d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: swifty_chat
 description: >-
   A Flutter package to quickly get started building Chat UIs
   with different type of message kinds.
-version: 1.6.5
+version: 1.6.6
 homepage: https://github.com/EnesKaraosman/swifty_chat
 repository: https://github.com/EnesKaraosman/swifty_chat
 
@@ -18,10 +18,10 @@ dependencies:
     sdk: flutter
 
   # https://pub.dev/packages/flutter_html
-  flutter_html: 3.0.0-alpha.6
+  flutter_html: 3.0.0-beta.2
 
   # https://pub.dev/packages/jiffy
-  jiffy: ^6.2.2
+  jiffy: ^6.3.1
 
   # https://pub.dev/packages/styled_widget
   styled_widget: ^0.4.1
@@ -30,9 +30,11 @@ dependencies:
   swifty_chat_data: ^0.1.1
 
   # https://pub.dev/packages/url_launcher
-  url_launcher: ^6.2.3
+  url_launcher: ^6.2.6
 
 dev_dependencies:
+  faker: any
+
   # https://pub.dev/packages/flutter_lints
   flutter_lints: ^4.0.0
 
diff --git a/test/swifty_chat_test.dart b/test/swifty_chat_test.dart
index bc5abcb..78bf8ac 100644
--- a/test/swifty_chat_test.dart
+++ b/test/swifty_chat_test.dart
@@ -242,8 +242,8 @@ void main() {
         chatMessageInputField: _messageInputField((_) {}),
       ).setOnHTMLWidgetPressed(
         () => {
-          "onLinkTap": (url, _, __, ___) => debugPrint("onLinkTap: $url"),
-          "onImageTap": (src, _, __, ___) => debugPrint("onImageTapped: $src"),
+          "onLinkTap": (url, _, __) => debugPrint("onLinkTap: $url"),
+          "onImageTap": (src, _, __) => debugPrint("onImageTapped: $src"),
         },
       );