--- ./pubspec.yaml.orig
+++ ./pubspec.yaml
@@ -71,6 +71,10 @@
     sdk: flutter
 
 dependency_overrides:
+  emoji_extension:
+    git:
+      url: https://github.com/TheOneWithTheBraid/emoji_extension.git
+      ref: braid/collection
   matrix:
     git:
       url: https://github.com/TheOneWithTheBraid/matrix-dart-sdk.git
--- ./pubspec.lock.orig
+++ ./pubspec.lock
@@ -141,10 +141,10 @@
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   cross_file:
     dependency: "direct main"
     description:
@@ -212,10 +212,11 @@
   emoji_extension:
     dependency: "direct main"
     description:
-      name: emoji_extension
-      sha256: "5faf105d162100675c07a3136274a055c3c9b9421217e40a81b8191423f8031a"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: "braid/collection"
+      resolved-ref: "46bdcfb60412035e113ed056fe7da2f1423a7a7d"
+      url: "https://github.com/TheOneWithTheBraid/emoji_extension.git"
+    source: git
     version: "1.1.1"
   enhanced_enum:
     dependency: transitive
@@ -705,18 +706,18 @@
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -794,10 +795,10 @@
     description:
       path: "."
       ref: "braid/command-runner"
-      resolved-ref: b0fab7921c8fd7095702f0bf399789f6b6c8d50a
+      resolved-ref: ac2f5c87dc28a8b4d5aaab11ba5494b4ed457150
       url: "https://github.com/TheOneWithTheBraid/matrix-dart-sdk.git"
     source: git
-    version: "0.33.0"
+    version: "0.35.0"
   matrix_homeserver_recommendations:
     dependency: "direct main"
     description:
@@ -1172,7 +1173,7 @@
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   slugify:
     dependency: transitive
     description:
@@ -1265,10 +1266,10 @@
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -1281,10 +1282,10 @@
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   synchronized:
     dependency: transitive
     description:
@@ -1305,10 +1306,10 @@
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   timezone:
     dependency: transitive
     description:
@@ -1506,10 +1507,10 @@
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
   volume_controller:
     dependency: transitive
     description: