diff --git a/web/.last_build_id b/web/.last_build_id
index 4fcc30491..09b147c79 100644
--- a/web/.last_build_id
+++ b/web/.last_build_id
@@ -1 +1 @@
-bdf7ea50a652d9ee7fb8c883484fadbc
\ No newline at end of file
+3bfe7b4ba161ae047907f405e6be9c1f
\ No newline at end of file
diff --git a/web/flutter_service_worker.js b/web/flutter_service_worker.js
index d504fbe44..0bd1fc58a 100644
--- a/web/flutter_service_worker.js
+++ b/web/flutter_service_worker.js
@@ -3,92 +3,92 @@ const MANIFEST = 'flutter-app-manifest';
 const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 
-const RESOURCES = {"splash/img/light-2x.png": "9371a9e18df59f2bbe9b32e04c3fc5d4",
-"splash/img/dark-3x.png": "da261be18bbda768fa1462fd8a8cef46",
-"splash/img/dark-1x.png": "db5b72b7f4b38640c974f20d9c90f464",
-"splash/img/light-3x.png": "da261be18bbda768fa1462fd8a8cef46",
-"splash/img/dark-2x.png": "9371a9e18df59f2bbe9b32e04c3fc5d4",
-"splash/img/light-1x.png": "db5b72b7f4b38640c974f20d9c90f464",
-"splash/img/light-4x.png": "e0346148103c17a87682a35525499afe",
-"splash/img/dark-4x.png": "e0346148103c17a87682a35525499afe",
-"splash/style.css": "d284d01cad91aeea699e23fe4698ccf1",
-"icons/Icon-192.png": "839e87c4f6800df757bb28180f8e2949",
-"icons/Icon-512.png": "f57dad4f6efa0339b50d5c65f36dc03c",
-"index.html": "64ee060d7dc8457a1a5a844141c1d5f4",
-"/": "64ee060d7dc8457a1a5a844141c1d5f4",
-"flutter.js": "6fef97aeca90b426343ba6c5c9dc5d4a",
-"manifest.json": "cc4b6aa791018840b65fd0b0e325b201",
-"favicon.png": "a409751f0ecf6dee76fb350d7402f9be",
-"assets/fonts/NotoEmoji/NotoColorEmoji.ttf": "ed84f46d3d5564a08541cd64bddd495c",
-"assets/fonts/MaterialIcons-Regular.otf": "bb43a40268987ebbab896d666851e10e",
-"assets/fonts/Roboto/RobotoMono-Regular.ttf": "7e173cf37bb8221ac504ceab2acfb195",
-"assets/fonts/Roboto/Roboto-Bold.ttf": "b8e42971dec8d49207a8c8e2b919a6ac",
-"assets/fonts/Roboto/Roboto-Italic.ttf": "cebd892d1acfcc455f5e52d4104f2719",
-"assets/fonts/Roboto/Roboto-Regular.ttf": "8a36205bd9b83e03af0591a004bc97f4",
-"assets/shaders/ink_sparkle.frag": "f8b80e740d33eb157090be4e995febdf",
-"assets/AssetManifest.bin": "5b4f7d3d06b0759095428ce4691dcbc5",
-"assets/assets/favicon.ico": "58c583a47977a32782a8706d5a84533c",
-"assets/assets/sas-emoji.json": "b9d99fc6dda6a3250af57af969b4a02d",
-"assets/assets/banner.png": "4a005db27a8787aea061537223dabb7d",
+const RESOURCES = {"assets/assets/backup.png": "9c1f3ddbb59cee5be2c72ae4eabead1e",
 "assets/assets/typing.svg": "fac23aaad793ddae0aae89dc7f8bd843",
-"assets/assets/share.png": "6d8b7e3179bea3d8b7ea1287594289bd",
+"assets/assets/login_wallpaper.png": "05f9f8c2f3a51c757f0a7914096b3bdb",
 "assets/assets/sounds/call.ogg": "7e8c646f83fba83bfb9084dc1bfec31e",
-"assets/assets/sounds/phone.ogg": "5c8fb947eb92ca55229cb6bbf533c40f",
 "assets/assets/sounds/WoodenBeaver_stereo_message-new-instant.ogg": "88fb9823caeb64edffd343530fae9e8b",
-"assets/assets/banner_dark.png": "6310493efdf749239c991ec8cf2ac366",
-"assets/assets/backup.png": "9c1f3ddbb59cee5be2c72ae4eabead1e",
-"assets/assets/login_wallpaper.png": "05f9f8c2f3a51c757f0a7914096b3bdb",
+"assets/assets/sounds/phone.ogg": "5c8fb947eb92ca55229cb6bbf533c40f",
 "assets/assets/logo.svg": "d042b70cf11a41f2764028e85b07a00a",
+"assets/assets/verification.png": "cfafe6d01ed9f2b08312157bc2fd36d3",
+"assets/assets/info-logo.svg": "ccabf48173356d141e75117a97217944",
 "assets/assets/chat.svg": "eedd029d2f9f923ffbc09aeb5cf9b1f2",
-"assets/assets/js/package/olm.js": "6791929a85ecc6c063ccd8c0ea2360de",
 "assets/assets/js/package/olm.wasm": "7b6d9296035ed9cd01846571ba244f51",
+"assets/assets/js/package/olm.js": "6791929a85ecc6c063ccd8c0ea2360de",
 "assets/assets/js/package/olm_legacy.js": "14d8e3c9941694be62a0fc855cfa4abf",
-"assets/assets/banner_transparent.png": "364e2030f739bf0c7ed1c061c4cb5901",
-"assets/assets/verification.png": "cfafe6d01ed9f2b08312157bc2fd36d3",
 "assets/assets/typing.gif": "c64522db9f8f84611d53b0e4ba5fee4e",
-"assets/assets/info-logo.png": "9d1d72596564e6639fd984fea2dfd048",
+"assets/assets/share.png": "6d8b7e3179bea3d8b7ea1287594289bd",
+"assets/assets/favicon.ico": "58c583a47977a32782a8706d5a84533c",
 "assets/assets/favicon.png": "3ea6cdc2aeab08defd0659bad734a69b",
-"assets/assets/info-logo.svg": "ccabf48173356d141e75117a97217944",
+"assets/assets/info-logo.png": "9d1d72596564e6639fd984fea2dfd048",
 "assets/assets/logo.png": "d329be9cd7af685717f68e03561f96c0",
+"assets/assets/banner_dark.png": "6310493efdf749239c991ec8cf2ac366",
+"assets/assets/sas-emoji.json": "b9d99fc6dda6a3250af57af969b4a02d",
+"assets/assets/banner_transparent.png": "364e2030f739bf0c7ed1c061c4cb5901",
+"assets/assets/banner.png": "4a005db27a8787aea061537223dabb7d",
+"assets/fonts/NotoEmoji/NotoColorEmoji.ttf": "ed84f46d3d5564a08541cd64bddd495c",
+"assets/fonts/Roboto/Roboto-Italic.ttf": "cebd892d1acfcc455f5e52d4104f2719",
+"assets/fonts/Roboto/Roboto-Bold.ttf": "b8e42971dec8d49207a8c8e2b919a6ac",
+"assets/fonts/Roboto/RobotoMono-Regular.ttf": "7e173cf37bb8221ac504ceab2acfb195",
+"assets/fonts/Roboto/Roboto-Regular.ttf": "8a36205bd9b83e03af0591a004bc97f4",
+"assets/fonts/MaterialIcons-Regular.otf": "bb43a40268987ebbab896d666851e10e",
+"assets/AssetManifest.json": "9c26250c72a47b712511a80cf0e0d5b4",
+"assets/packages/wakelock_web/assets/no_sleep.js": "7748a45cd593f33280669b29c2c8919a",
+"assets/packages/handy_window/assets/handy-window-dark.css": "212d71b05065406d3c6c72c059a4ed9d",
+"assets/packages/handy_window/assets/handy-window.css": "135b89011bc9f52823260e9da2b0c31d",
 "assets/packages/cupertino_icons/assets/CupertinoIcons.ttf": "93093093a45cb6163cfd11296d98be40",
-"assets/packages/flutter_map/lib/assets/flutter_map_logo.png": "208d63cc917af9713fc9572bd5c09362",
 "assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Math-BoldItalic.ttf": "946a26954ab7fbd7ea78df07795a6cbc",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_AMS-Regular.ttf": "657a5353a553777e270827bd1630e467",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Size2-Regular.ttf": "959972785387fe35f7d47dbfb0385bc4",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Typewriter-Regular.ttf": "87f56927f1ba726ce0591955c8b3b42d",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Size3-Regular.ttf": "e87212c26bb86c21eb028aba2ac53ec3",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Main-Bold.ttf": "9eef86c1f9efa78ab93d41a0551948f7",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Main-BoldItalic.ttf": "e3c361ea8d1c215805439ce0941a1c8d",
 "assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Size4-Regular.ttf": "85554307b465da7eb785fd3ce52ad282",
 "assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Caligraphic-Regular.ttf": "7ec92adfa4fe03eb8e9bfb60813df1fa",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Fraktur-Regular.ttf": "dede6f2c7dad4402fa205644391b3a94",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Script-Regular.ttf": "55d2dcd4778875a53ff09320a85a5296",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Size1-Regular.ttf": "1e6a3368d660edc3a2fbbe72edfeaa85",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_SansSerif-Bold.ttf": "ad0a28f28f736cf4c121bcb0e719b88a",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Main-Regular.ttf": "5a5766c715ee765aa1398997643f1589",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_SansSerif-Italic.ttf": "d89b80e7bdd57d238eeaa80ed9a1013a",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Math-Italic.ttf": "a7732ecb5840a15be39e1eda377bc21d",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Main-BoldItalic.ttf": "e3c361ea8d1c215805439ce0941a1c8d",
 "assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Fraktur-Bold.ttf": "46b41c4de7a936d099575185a94855c4",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Main-Regular.ttf": "5a5766c715ee765aa1398997643f1589",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Size1-Regular.ttf": "1e6a3368d660edc3a2fbbe72edfeaa85",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Fraktur-Regular.ttf": "dede6f2c7dad4402fa205644391b3a94",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_AMS-Regular.ttf": "657a5353a553777e270827bd1630e467",
 "assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Main-Italic.ttf": "ac3b1882325add4f148f05db8cafd401",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Typewriter-Regular.ttf": "87f56927f1ba726ce0591955c8b3b42d",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Size3-Regular.ttf": "e87212c26bb86c21eb028aba2ac53ec3",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_SansSerif-Regular.ttf": "b5f967ed9e4933f1c3165a12fe3436df",
 "assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Caligraphic-Bold.ttf": "a9c8e437146ef63fcd6fae7cf65ca859",
-"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Main-Bold.ttf": "9eef86c1f9efa78ab93d41a0551948f7",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_SansSerif-Bold.ttf": "ad0a28f28f736cf4c121bcb0e719b88a",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_SansSerif-Regular.ttf": "b5f967ed9e4933f1c3165a12fe3436df",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Math-Italic.ttf": "a7732ecb5840a15be39e1eda377bc21d",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_SansSerif-Italic.ttf": "d89b80e7bdd57d238eeaa80ed9a1013a",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Size2-Regular.ttf": "959972785387fe35f7d47dbfb0385bc4",
+"assets/packages/flutter_math_fork/lib/katex_fonts/fonts/KaTeX_Script-Regular.ttf": "55d2dcd4778875a53ff09320a85a5296",
+"assets/packages/flutter_map/lib/assets/flutter_map_logo.png": "208d63cc917af9713fc9572bd5c09362",
 "assets/packages/wakelock_plus/assets/no_sleep.js": "7748a45cd593f33280669b29c2c8919a",
-"assets/packages/wakelock_web/assets/no_sleep.js": "7748a45cd593f33280669b29c2c8919a",
-"assets/packages/handy_window/assets/handy-window.css": "135b89011bc9f52823260e9da2b0c31d",
-"assets/packages/handy_window/assets/handy-window-dark.css": "212d71b05065406d3c6c72c059a4ed9d",
-"assets/AssetManifest.json": "9c26250c72a47b712511a80cf0e0d5b4",
-"assets/NOTICES": "0b8520d300ce59122eb7713ecff7a6b7",
+"assets/shaders/ink_sparkle.frag": "f8b80e740d33eb157090be4e995febdf",
+"assets/AssetManifest.bin": "5b4f7d3d06b0759095428ce4691dcbc5",
 "assets/FontManifest.json": "1114a5860d5e995c8dc48419a7a6a9e7",
+"assets/NOTICES": "0b8520d300ce59122eb7713ecff7a6b7",
+"auth.html": "f03ff41ec673844136dfbd81be79aa80",
+"splash/style.css": "d284d01cad91aeea699e23fe4698ccf1",
+"splash/img/dark-3x.png": "da261be18bbda768fa1462fd8a8cef46",
+"splash/img/dark-2x.png": "9371a9e18df59f2bbe9b32e04c3fc5d4",
+"splash/img/light-1x.png": "db5b72b7f4b38640c974f20d9c90f464",
+"splash/img/dark-1x.png": "db5b72b7f4b38640c974f20d9c90f464",
+"splash/img/light-4x.png": "e0346148103c17a87682a35525499afe",
+"splash/img/light-2x.png": "9371a9e18df59f2bbe9b32e04c3fc5d4",
+"splash/img/dark-4x.png": "e0346148103c17a87682a35525499afe",
+"splash/img/light-3x.png": "da261be18bbda768fa1462fd8a8cef46",
 "version.json": "3d2c5936ebd30d387213be0f97763677",
+"manifest.json": "cc4b6aa791018840b65fd0b0e325b201",
+"index.html": "6d549ee235c9ab3260a024d70749b0f2",
+"/": "6d549ee235c9ab3260a024d70749b0f2",
+"favicon.png": "a409751f0ecf6dee76fb350d7402f9be",
+"flutter.js": "6fef97aeca90b426343ba6c5c9dc5d4a",
+"icons/Icon-192.png": "839e87c4f6800df757bb28180f8e2949",
+"icons/Icon-512.png": "f57dad4f6efa0339b50d5c65f36dc03c",
 "main.dart.js": "c197fe007aae38a342a31f1bc7ad4cd4",
-"auth.html": "f03ff41ec673844136dfbd81be79aa80",
-"canvaskit/canvaskit.js": "5caccb235fad20e9b72ea6da5a0094e6",
+"canvaskit/canvaskit.wasm": "d9f69e0f428f695dc3d66b3a83a4aa8e",
 "canvaskit/skwasm.wasm": "d1fde2560be92c0b07ad9cf9acb10d05",
-"canvaskit/skwasm.js": "95f16c6690f955a45b2317496983dbe9",
+"canvaskit/canvaskit.js": "5caccb235fad20e9b72ea6da5a0094e6",
 "canvaskit/skwasm.worker.js": "51253d3321b11ddb8d73fa8aa87d3b15",
-"canvaskit/chromium/canvaskit.js": "ffb2bb6484d5689d91f393b60664d530",
 "canvaskit/chromium/canvaskit.wasm": "393ec8fb05d94036734f8104fa550a67",
-"canvaskit/canvaskit.wasm": "d9f69e0f428f695dc3d66b3a83a4aa8e"};
+"canvaskit/chromium/canvaskit.js": "ffb2bb6484d5689d91f393b60664d530",
+"canvaskit/skwasm.js": "95f16c6690f955a45b2317496983dbe9"};
 // The application shell files that are downloaded before a service worker can
 // start.
 const CORE = ["main.dart.js",
diff --git a/web/index.html b/web/index.html
index 42a486db1..8ed6c8e94 100644
--- a/web/index.html
+++ b/web/index.html
@@ -11,6 +11,9 @@
 
     For more details:
     * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
   -->
   <base href="/web/">
 
@@ -30,80 +33,39 @@
   <title>FluffyChat</title>
   <link rel="manifest" href="manifest.json">
   <link rel="stylesheet" type="text/css" href="splash/style.css">
-</head>
 
-<body style="position: fixed; inset: 0px; overflow: hidden; padding: 0px; margin: 0px; user-select: none; touch-action: none; font: 14px sans-serif; color: red;">
-  <!-- This script installs service_worker.js to provide PWA functionality to
-       application. For more information, see:
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
   <script>
-    const serviceWorkerVersion = "3501589146";
-    var scriptLoaded = false;
-    function loadMainDartJs() {
-      if (scriptLoaded) {
-        return;
-      }
-      scriptLoaded = true;
-      var scriptTag = document.createElement('script');
-      scriptTag.src = 'main.dart.js';
-      scriptTag.type = 'application/javascript';
-      document.body.append(scriptTag);
-    }
+    // The value below is injected by flutter build, do not touch.
+    const serviceWorkerVersion = "2633002572";
+  </script>
+  <!-- This script adds the flutter initialization JS code -->
+  <script src="flutter.js" defer></script>
+  <script src="assets/assets/js/package/olm.js"></script>
+</head>
 
-    if ('serviceWorker' in navigator) {
-      // Service workers are supported. Use them.
-      window.addEventListener('load', function () {
-        // Wait for registration to finish before dropping the <script> tag.
-        // Otherwise, the browser will load the script multiple times,
-        // potentially different versions.
-        var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
-        navigator.serviceWorker.register(serviceWorkerUrl)
-          .then((reg) => {
-            function waitForActivation(serviceWorker) {
-              serviceWorker.addEventListener('statechange', () => {
-                if (serviceWorker.state == 'activated') {
-                  console.log('Installed new service worker.');
-                  loadMainDartJs();
-                }
-              });
-            }
-            if (!reg.active && (reg.installing || reg.waiting)) {
-              // No active web worker and we have installed or are installing
-              // one for the first time. Simply wait for it to activate.
-              waitForActivation(reg.installing ?? reg.waiting);
-            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
-              // When the app updates the serviceWorkerVersion changes, so we
-              // need to ask the service worker to update.
-              console.log('New service worker available.');
-              reg.update();
-              waitForActivation(reg.installing);
-            } else {
-              // Existing service worker is still good.
-              console.log('Loading app from service worker.');
-              loadMainDartJs();
-            }
+<body>
+  <script>
+    window.addEventListener('load', function (ev) {
+      // Download main.dart.js
+      _flutter.loader.loadEntrypoint({
+        serviceWorker: {
+          serviceWorkerVersion: serviceWorkerVersion,
+        },
+        onEntrypointLoaded: function (engineInitializer) {
+          engineInitializer.initializeEngine().then(function (appRunner) {
+            appRunner.runApp();
           });
-
-        // If service worker doesn't succeed in a reasonable amount of time,
-        // fallback to plaint <script> tag.
-        setTimeout(() => {
-          if (!scriptLoaded) {
-            console.warn(
-              'Failed to load app from service worker. Falling back to plain <script> tag.',
-            );
-            loadMainDartJs();
-          }
-        }, 4000);
+        }
       });
-    } else {
-      // Service workers not supported. Just drop the <script> tag.
-      loadMainDartJs();
-    }
+    });
   </script>
-  <script src="assets/assets/js/package/olm.js"></script>
   <picture id="splash">
-    <source srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x" media="(prefers-color-scheme: light) or (prefers-color-scheme: no-preference)">
-    <source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
+    <source
+      srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x"
+      media="(prefers-color-scheme: light) or (prefers-color-scheme: no-preference)">
+    <source
+      srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x"
+      media="(prefers-color-scheme: dark)">
     <img class="center" src="splash/img/light-1x.png" />
   </picture>
 </body>