diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env
index 7ad54f1f..2fd07e8a 100644
--- a/.github/workflows/versions.env
+++ b/.github/workflows/versions.env
@@ -1,2 +1,2 @@
-FLUTTER_VERSION=3.13.9
+FLUTTER_VERSION=3.16.0
 JAVA_VERSION=17
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 8b2b21cb..bb2b26b8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -197,10 +197,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   console:
     dependency: transitive
     description:
@@ -465,10 +465,11 @@ packages:
   flutter_blurhash:
     dependency: "direct main"
     description:
-      name: flutter_blurhash
-      sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: eb9565f9d5731d4729bd7605510cec0f9e172e5f
+      resolved-ref: eb9565f9d5731d4729bd7605510cec0f9e172e5f
+      url: "https://github.com/Craftplacer/flutter_blurhash.git"
+    source: git
     version: "0.7.0"
   flutter_cache_manager:
     dependency: "direct main"
@@ -627,10 +628,11 @@ packages:
   flutter_math_fork:
     dependency: "direct main"
     description:
-      name: flutter_math_fork
-      sha256: a143a3a89131b578043ecbdb5e759c1033a1b3e9174f5cd1b979d93f4a7fb41c
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: "3442b36a436880ce1c023e25c868d6f4004c4c24"
+      resolved-ref: "3442b36a436880ce1c023e25c868d6f4004c4c24"
+      url: "https://github.com/The-Redhat/flutter_math_fork.git"
+    source: git
     version: "0.7.1"
   flutter_native_splash:
     dependency: "direct dev"
@@ -1185,10 +1187,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mgrs_dart:
     dependency: transitive
     description:
@@ -1385,10 +1387,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.2"
   platform_detect:
     dependency: transitive
     description:
@@ -1734,18 +1736,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -1790,10 +1792,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   timezone:
     dependency: transitive
     description:
@@ -2094,10 +2096,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f
+      sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
       url: "https://pub.dev"
     source: hosted
-    version: "11.7.1"
+    version: "11.10.0"
   wakelock_platform_interface:
     dependency: transitive
     description:
@@ -2143,10 +2145,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   webdriver:
     dependency: transitive
     description:
@@ -2220,5 +2222,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.1.0 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.13.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 64017f11..0b5d4680 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -146,6 +146,16 @@ msix_config:
   install_certificate: false
 
 dependency_overrides:
+  # https://github.com/fluttercommunity/flutter_blurhash/pull/58
+  flutter_blurhash:
+    git:
+      url: https://github.com/Craftplacer/flutter_blurhash.git
+      ref: eb9565f9d5731d4729bd7605510cec0f9e172e5f
+  # https://github.com/simpleclub-extended/flutter_math_fork/pull/87
+  flutter_math_fork:
+    git:
+      url: https://github.com/The-Redhat/flutter_math_fork.git
+      ref: 3442b36a436880ce1c023e25c868d6f4004c4c24
   # Until https://github.com/mogol/flutter_secure_storage/issues/616 is fixed
   flutter_secure_storage_linux: 1.1.3
   geolocator_android: