diff --git a/lib/src/utils/regex.dart b/lib/src/utils/regex.dart
index 21452ab..1b66e35 100644
--- a/lib/src/utils/regex.dart
+++ b/lib/src/utils/regex.dart
@@ -6,9 +6,9 @@ import 'package:linkfy_text/src/enum.dart';
 String urlRegExp =
     r'((https?://)?(www\.)?[a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*))';
 
-String hashtagRegExp = r'(#+[a-zA-Z0-9(_)]{1,})';
+String hashtagRegExp = r'#[a-zA-Z\u00C0-\u01B4\w_\u1EA0-\u1EF9!$%^&]{1,}(?=\s|$)';
 
-String userTagRegExp = r'(?<![\w@])@([\w@]+(?:[.!][\w@]+)*)';
+String userTagRegExp = r'@[a-zA-Z\u00C0-\u01B4\w_\u1EA0-\u1EF9!$%^&]{1,}(?=\s|$)';
 String phoneRegExp =
     r'\s*(?:\+?(\d{1,3}))?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})(?: *x(\d+))?\s*';
 String emailRegExp =