diff --git a/apps/pwa/src/vite.ts b/apps/pwa/src/vite.ts
index 107e08f..962dce1 100644
--- a/apps/pwa/src/vite.ts
+++ b/apps/pwa/src/vite.ts
@@ -92,11 +92,6 @@ function emitIcons(): Plugin {
             attrs: { name: "apple-mobile-web-app-capable", content: "yes" },
             injectTo: "head",
           },
-          {
-            tag: "meta",
-            attrs: { name: "mobile-web-app-capable", content: "yes" },
-            injectTo: "head",
-          },
           {
             tag: "meta",
             attrs: {
diff --git a/apps/web/package.json b/apps/web/package.json
index e6b015e..9165eb8 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -24,7 +24,6 @@
     "@tensamin/chat": "workspace:*",
     "@tensamin/crypto": "workspace:*",
     "@tensamin/hotkeys": "workspace:*",
-    "@tensamin/markdown": "workspace:*",
     "@tensamin/mtp": "workspace:*",
     "@tensamin/notifications": "workspace:*",
     "@tensamin/onboarding": "workspace:*",
diff --git a/apps/web/src/components/callPopout.tsx b/apps/web/src/components/callPopout.tsx
deleted file mode 100644
index 79d5fb7..0000000
--- a/apps/web/src/components/callPopout.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { lazy, Suspense } from "react";
-
-import { useCall } from "@tensamin/call/state";
-
-const Popout = lazy(() => import("@tensamin/call/popout"));
-
-export default function CallPopout() {
-  const active = useCall((state) => state.state !== "closed");
-
-  return active ? (
-    <Suspense fallback={null}>
-      <Popout />
-    </Suspense>
-  ) : null;
-}
diff --git a/apps/web/src/components/callRuntimeInit.tsx b/apps/web/src/components/callRuntimeInit.tsx
deleted file mode 100644
index 296057d..0000000
--- a/apps/web/src/components/callRuntimeInit.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { useEffect, useState } from "react";
-
-import { useTheme } from "@methanium/ui";
-import { useIsSpeaking } from "@tensamin/call/speakingState";
-import { useCall, useInitializeCall } from "@tensamin/call/store";
-import { useStorage } from "@tensamin/storage/context";
-
-function createCallTrayIcon(color: string, speaking: boolean) {
-  const canvas = document.createElement("canvas");
-  canvas.width = 32;
-  canvas.height = 32;
-
-  const context = canvas.getContext("2d");
-  if (!context) return undefined;
-
-  context.globalAlpha = speaking ? 1 : 0.55;
-  context.fillStyle = color;
-  context.beginPath();
-  context.arc(16, 16, 13, 0, Math.PI * 2);
-  context.fill();
-
-  if (speaking) {
-    context.globalAlpha = 0.3;
-    context.fillStyle = "#ffffff";
-    context.fill();
-  }
-
-  return canvas.toDataURL("image/png");
-}
-
-export default function CallRuntimeInit() {
-  const callInvitePopup = useInitializeCall();
-  const { load } = useStorage();
-  const {
-    themeColor,
-    themePalette,
-    themePrimaryColor,
-    themePolarity,
-    themeTint,
-    themeCustomCss,
-  } = useTheme();
-  const [localUserId, setLocalUserId] = useState(-1);
-  const [primaryColor, setPrimaryColor] = useState("");
-  const inCall = useCall((state) => state.state === "open");
-  const speaking = useIsSpeaking(localUserId);
-
-  useEffect(() => {
-    let active = true;
-
-    load("user_id").then((userId) => {
-      if (active) setLocalUserId(userId);
-    });
-
-    return () => {
-      active = false;
-    };
-  }, [load]);
-
-  useEffect(() => {
-    const frame = requestAnimationFrame(() => {
-      setPrimaryColor(
-        getComputedStyle(document.documentElement)
-          .getPropertyValue("--primary")
-          .trim(),
-      );
-    });
-
-    return () => cancelAnimationFrame(frame);
-  }, [
-    themeColor,
-    themeCustomCss,
-    themePalette,
-    themePolarity,
-    themePrimaryColor,
-    themeTint,
-  ]);
-
-  useEffect(() => {
-    const iconDataUrl = primaryColor
-      ? createCallTrayIcon(primaryColor, speaking)
-      : undefined;
-
-    void window.tensaminDesktop?.call
-      ?.setStatus?.({
-        inCall,
-        speaking: inCall && speaking,
-        iconDataUrl: inCall ? iconDataUrl : undefined,
-      })
-      .catch((error: unknown) => {
-        console.error("Failed to update desktop call status", error);
-      });
-  }, [inCall, primaryColor, speaking]);
-
-  return callInvitePopup;
-}
diff --git a/apps/web/src/components/callSidebarBox.tsx b/apps/web/src/components/callSidebarBox.tsx
deleted file mode 100644
index 5480af2..0000000
--- a/apps/web/src/components/callSidebarBox.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { lazy, Suspense } from "react";
-
-import { useCall } from "@tensamin/call/state";
-
-const SidebarBox = lazy(() => import("@tensamin/call/sidebarBox"));
-
-export default function CallSidebarBox() {
-  const active = useCall((state) => state.state !== "closed");
-
-  return active ? (
-    <Suspense fallback={null}>
-      <SidebarBox />
-    </Suspense>
-  ) : null;
-}
diff --git a/apps/web/src/components/modals/profile.tsx b/apps/web/src/components/modals/profile.tsx
index f077783..1346b19 100644
--- a/apps/web/src/components/modals/profile.tsx
+++ b/apps/web/src/components/modals/profile.tsx
@@ -1,6 +1,6 @@
 import type { User } from "@tensamin/identity/context";
 import { Avatar, AvatarFallback, AvatarImage, Button } from "@methanium/ui";
-import Text from "@tensamin/markdown/text";
+import { Text } from "@methanium/ui/markdown";
 import { ChevronDown, ChevronUp } from "lucide-react";
 import { useState } from "react";
 
diff --git a/apps/web/src/components/navbar.tsx b/apps/web/src/components/navbar.tsx
index 19c367f..b92d30e 100644
--- a/apps/web/src/components/navbar.tsx
+++ b/apps/web/src/components/navbar.tsx
@@ -14,7 +14,7 @@ import {
   User,
 } from "lucide-react";
 import { useLocation, useNavigate, useSearch } from "@tanstack/react-router";
-import { useCall } from "@tensamin/call/state";
+import { joinCall, useCall } from "@tensamin/call/store";
 import Wrapper from "@tensamin/identity/wrapper";
 import { Skeleton } from "@methanium/ui";
 import {
@@ -27,7 +27,7 @@ import { displayCallId } from "@tensamin/call/utils";
 import { useState } from "react";
 import { SidebarTrigger, useSidebar } from "@methanium/ui";
 import { WindowControls as Controls } from "@methanium/ui";
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
 import Profile from "./modals/profile";
 
 export default function Navbar({ forMobile }: { forMobile: boolean }) {
@@ -140,9 +140,7 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
               <Button
                 disabled={callState !== "closed"}
                 onClick={() => {
-                  void import("@tensamin/call/store").then(({ joinCall }) =>
-                    joinCall(id),
-                  );
+                  void joinCall(id);
                 }}
                 className="w-9 h-9! aspect-square rounded-lg"
                 variant="outline"
@@ -153,12 +151,10 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
               <Button
                 disabled={callState !== "closed"}
                 onClick={() => {
-                  void import("@tensamin/call/store").then(({ joinCall }) =>
-                    joinCall(
-                      id,
-                      currentCalls[0].CallSecret,
-                      currentCalls[0].CallId,
-                    ),
+                  void joinCall(
+                    id,
+                    currentCalls[0].CallSecret,
+                    currentCalls[0].CallId,
                   );
                 }}
                 className="w-9 h-9! aspect-square rounded-lg"
@@ -186,10 +182,7 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
                         value={call.CallId}
                         key={call.CallId}
                         onSelect={() => {
-                          void import("@tensamin/call/store").then(
-                            ({ joinCall }) =>
-                              joinCall(id, call.CallSecret, call.CallId),
-                          );
+                          void joinCall(id, call.CallSecret, call.CallId);
                         }}
                       >
                         {displayCallId(call.CallId)}
diff --git a/apps/web/src/components/routeLoader.tsx b/apps/web/src/components/routeLoader.tsx
deleted file mode 100644
index 5bd0cba..0000000
--- a/apps/web/src/components/routeLoader.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Loader2 } from "lucide-react";
-
-export default function RouteLoader() {
-  return (
-    <div
-      className="flex h-full min-h-40 w-full items-center justify-center bg-background"
-      role="status"
-    >
-      <div className="flex items-center gap-2 text-sm text-muted-foreground">
-        <Loader2 className="size-5 animate-spin" />
-        <span>Loading...</span>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/components/sidebar.tsx b/apps/web/src/components/sidebar.tsx
index b9c05e6..9a9e857 100644
--- a/apps/web/src/components/sidebar.tsx
+++ b/apps/web/src/components/sidebar.tsx
@@ -1,6 +1,5 @@
 import Wrapper from "@tensamin/identity/wrapper";
 import { Basic, Loading } from "./modals/basic";
-import CallSidebarBox from "./callSidebarBox";
 import List from "@/features/conversation/list/body";
 
 import {
@@ -31,6 +30,7 @@ import {
 import { useIsMobile } from "@methanium/ui";
 import { MobileNavbar } from "./navbar";
 
+import SidebarBox from "@tensamin/call/sidebarBox";
 import { useShowMobileNavbar } from "@/routes/app/useShowMobileNavbar";
 import { Ellipsis, Check } from "lucide-react";
 import { useState } from "react";
@@ -285,7 +285,7 @@ export default function Sidebar() {
       )}
       {!isMobile && (
         <SidebarFooter>
-          <CallSidebarBox />
+          <SidebarBox />
         </SidebarFooter>
       )}
     </>
diff --git a/apps/web/src/features/conversation/list/body.tsx b/apps/web/src/features/conversation/list/body.tsx
index d413500..cc3baaf 100644
--- a/apps/web/src/features/conversation/list/body.tsx
+++ b/apps/web/src/features/conversation/list/body.tsx
@@ -5,7 +5,7 @@ import Switch from "./switch";
 import ConversationModal from "../modal/conversation";
 import CommunityModal from "../modal/community";
 import { Loader2 } from "lucide-react";
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
 
 export default function List() {
   const [category, setCategory] = useState<"conversations" | "communities">(
diff --git a/apps/web/src/index.tsx b/apps/web/src/index.tsx
index d0b9da2..d40d806 100644
--- a/apps/web/src/index.tsx
+++ b/apps/web/src/index.tsx
@@ -12,40 +12,45 @@ import "./index.css";
 import "@methanium/ui/index.css";
 
 import NotFound from "@/routes/404";
-import RouteLoader from "@/components/routeLoader";
 
+import AppLayout from "@/routes/app/layout";
 import { createSettingsRoute } from "@tensamin/settings";
+import OnboardingGate from "@tensamin/onboarding";
 
-import DeeplinkContext from "@tensamin/tauri/deeplinkHandler";
+import Home from "@/routes/app/home";
+import ChatScreen from "@tensamin/chat/screen";
+import CallScreen from "@tensamin/call/screen";
+import Login from "@/routes/screens/login";
+
+import ChatContext from "@tensamin/chat/context";
+import { useCall, useInitializeCall } from "@tensamin/call/store";
+import { useIsSpeaking } from "@tensamin/call/speakingState";
+import { Provider as MTPProvider } from "@tensamin/mtp";
+import UserProvider from "@tensamin/identity/context";
+import DeeplinkContext, { useDeeplinks } from "@tensamin/tauri/deeplinkHandler";
+import NotificationsProvider from "@tensamin/notifications/context";
 import PwaRuntime from "@tensamin/pwa/runtime";
 
+import TAuthWrapper from "@tensamin/tauth/context";
+
 import { ErrorScreen, ThemeProvider, useTheme } from "@methanium/ui";
 import z from "zod";
 
-import {
-  lazy,
-  Suspense,
-  useEffect,
-  useRef,
-  useState,
-  type ReactNode,
-} from "react";
+import { useEffect, useRef, useState, type ReactNode } from "react";
 
 import Storage from "@tensamin/storage/context";
+import Session from "@tensamin/storage/session";
+import Crypto from "@tensamin/crypto/context";
+import DesktopMediaProvider from "@tensamin/shared/desktopMedia";
 import { log } from "@tensamin/shared/log";
 
+import CacheSync from "@tensamin/cache/sync";
+
 import { useStorage } from "@tensamin/storage/context";
 import { useLocation, useNavigate } from "@tanstack/react-router";
 import { useIsMobile, Toaster, TooltipProvider } from "@methanium/ui";
 import { HotkeysProvider } from "@tensamin/hotkeys";
 
-const Home = lazy(() => import("@/routes/app/home"));
-const ChatScreen = lazy(() => import("@tensamin/chat/screen"));
-const CallScreen = lazy(() => import("@tensamin/call/screen"));
-const Login = lazy(() => import("@/routes/screens/login"));
-const appShellImport = import("@/routes/app/shell");
-const AppShell = lazy(() => appShellImport);
-
 const wrapper = document.getElementById("root");
 
 if (!wrapper) {
@@ -103,7 +108,7 @@ function LoginWrapper({ children }: { children: ReactNode }) {
   }, [load, location.pathname, navigate, secureStorage]);
 
   if (loggedIn !== true && location.pathname !== "/login") {
-    return <RouteLoader />;
+    return null;
   }
 
   return children;
@@ -260,9 +265,7 @@ function RootShell() {
               <HotkeysProvider>
                 <ThemeStorageBridge />
                 <LoginWrapper>
-                  <Suspense fallback={<RouteLoader />}>
-                    <Outlet />
-                  </Suspense>
+                  <Outlet />
                 </LoginWrapper>
               </HotkeysProvider>
             </Storage>
@@ -273,6 +276,155 @@ function RootShell() {
   );
 }
 
+function AppShell() {
+  return (
+    <OnboardingGate>
+      <Crypto>
+        <DesktopMediaProvider>
+          <MTPProvider>
+            <CacheSync />
+            <DeeplinkNavigator />
+            <Session>
+              <UserProvider>
+                <CallInit />
+                <TAuthWrapper>
+                  <AppLayout>
+                    <ChatContext>
+                      <NotificationsProvider>
+                        <Outlet />
+                      </NotificationsProvider>
+                    </ChatContext>
+                  </AppLayout>
+                </TAuthWrapper>
+              </UserProvider>
+            </Session>
+          </MTPProvider>
+        </DesktopMediaProvider>
+      </Crypto>
+    </OnboardingGate>
+  );
+}
+
+function DeeplinkNavigator() {
+  const { deeplinks } = useDeeplinks();
+  const navigate = useNavigate();
+  const handledCount = useRef(0);
+
+  useEffect(() => {
+    const links = deeplinks.slice(handledCount.current);
+    handledCount.current = deeplinks.length;
+
+    for (const link of links) {
+      try {
+        const url = new URL(link);
+        const id = Number(url.searchParams.get("id"));
+        if (
+          url.protocol === "tensamin:" &&
+          url.hostname === "chat" &&
+          Number.isSafeInteger(id) &&
+          id > 0
+        ) {
+          void navigate({ to: "/chat", search: { id } });
+        }
+      } catch {
+        // Ignore malformed URLs delivered by the platform.
+      }
+    }
+  }, [deeplinks, navigate]);
+
+  return null;
+}
+
+function createCallTrayIcon(color: string, speaking: boolean) {
+  const canvas = document.createElement("canvas");
+  canvas.width = 32;
+  canvas.height = 32;
+
+  const context = canvas.getContext("2d");
+  if (!context) return undefined;
+
+  context.globalAlpha = speaking ? 1 : 0.55;
+  context.fillStyle = color;
+  context.beginPath();
+  context.arc(16, 16, 13, 0, Math.PI * 2);
+  context.fill();
+
+  if (speaking) {
+    context.globalAlpha = 0.3;
+    context.fillStyle = "#ffffff";
+    context.fill();
+  }
+
+  return canvas.toDataURL("image/png");
+}
+
+function CallInit() {
+  const callInvitePopup = useInitializeCall();
+
+  const { load } = useStorage();
+  const {
+    themeColor,
+    themePalette,
+    themePrimaryColor,
+    themePolarity,
+    themeTint,
+    themeCustomCss,
+  } = useTheme();
+  const [localUserId, setLocalUserId] = useState(-1);
+  const [primaryColor, setPrimaryColor] = useState("");
+  const inCall = useCall((state) => state.state === "open");
+  const speaking = useIsSpeaking(localUserId);
+
+  useEffect(() => {
+    let active = true;
+
+    load("user_id").then((userId) => {
+      if (active) setLocalUserId(userId);
+    });
+
+    return () => {
+      active = false;
+    };
+  }, [load]);
+
+  useEffect(() => {
+    const frame = requestAnimationFrame(() => {
+      setPrimaryColor(
+        getComputedStyle(document.documentElement)
+          .getPropertyValue("--primary")
+          .trim(),
+      );
+    });
+
+    return () => cancelAnimationFrame(frame);
+  }, [
+    themeColor,
+    themeCustomCss,
+    themePalette,
+    themePolarity,
+    themePrimaryColor,
+    themeTint,
+  ]);
+
+  useEffect(() => {
+    const iconDataUrl = primaryColor
+      ? createCallTrayIcon(primaryColor, speaking)
+      : undefined;
+
+    void window.tensaminDesktop?.call
+      ?.setStatus?.({
+        inCall,
+        speaking: inCall && speaking,
+        iconDataUrl: inCall ? iconDataUrl : undefined,
+      })
+      .catch((error: unknown) => {
+        console.error("Failed to update desktop call status", error);
+      });
+  }, [inCall, primaryColor, speaking]);
+
+  return callInvitePopup;
+}
+
 const rootRoute = createRootRoute({
   component: RootShell,
   errorComponent: ({ error }: { error: Error }) => (
diff --git a/apps/web/src/routes/app/home.tsx b/apps/web/src/routes/app/home.tsx
index e556fd7..b46324f 100644
--- a/apps/web/src/routes/app/home.tsx
+++ b/apps/web/src/routes/app/home.tsx
@@ -17,7 +17,7 @@ import { log } from "@tensamin/shared/log";
 import { useState } from "react";
 import { Loader2 } from "lucide-react";
 import { isTauri } from "@tauri-apps/api/core";
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
 import { useStorage } from "@tensamin/storage/context";
 import { ShieldAlert } from "lucide-react";
 import { useUser } from "@tensamin/identity/context";
diff --git a/apps/web/src/routes/app/layout.tsx b/apps/web/src/routes/app/layout.tsx
index 046e199..9f165b4 100644
--- a/apps/web/src/routes/app/layout.tsx
+++ b/apps/web/src/routes/app/layout.tsx
@@ -2,8 +2,8 @@ import { type ReactNode } from "react";
 
 import Sidebar from "@/components/sidebar";
 import Navbar, { MobileNavbar } from "@/components/navbar";
-import CallPopout from "@/components/callPopout";
 import { useShowMobileNavbar } from "./useShowMobileNavbar";
+import CallPopout from "@tensamin/call/popout";
 
 import { useIsMobile, cn, SidebarProvider } from "@methanium/ui";
 
diff --git a/apps/web/src/routes/app/shell.tsx b/apps/web/src/routes/app/shell.tsx
deleted file mode 100644
index 6d0a66c..0000000
--- a/apps/web/src/routes/app/shell.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Suspense, useEffect, useRef } from "react";
-import { Outlet, useNavigate } from "@tanstack/react-router";
-
-import RouteLoader from "@/components/routeLoader";
-import AppLayout from "./layout";
-import CallInit from "@/components/callRuntimeInit";
-import CacheSync from "@tensamin/cache/sync";
-import ChatContext from "@tensamin/chat/context";
-import Crypto from "@tensamin/crypto/context";
-import UserProvider from "@tensamin/identity/context";
-import { Provider as MTPProvider } from "@tensamin/mtp";
-import NotificationsProvider from "@tensamin/notifications/context";
-import OnboardingGate from "@tensamin/onboarding";
-import DesktopMediaProvider from "@tensamin/shared/desktopMedia";
-import Session from "@tensamin/identity/session";
-import { useDeeplinks } from "@tensamin/tauri/deeplinkHandler";
-import TAuthWrapper from "@tensamin/tauth/context";
-
-function DeeplinkNavigator() {
-  const { deeplinks } = useDeeplinks();
-  const navigate = useNavigate();
-  const handledCount = useRef(0);
-
-  useEffect(() => {
-    const links = deeplinks.slice(handledCount.current);
-    handledCount.current = deeplinks.length;
-
-    for (const link of links) {
-      try {
-        const url = new URL(link);
-        const id = Number(url.searchParams.get("id"));
-        if (
-          url.protocol === "tensamin:" &&
-          url.hostname === "chat" &&
-          Number.isSafeInteger(id) &&
-          id > 0
-        ) {
-          void navigate({ to: "/chat", search: { id } });
-        }
-      } catch {
-        // Ignore malformed URLs delivered by the platform.
-      }
-    }
-  }, [deeplinks, navigate]);
-
-  return null;
-}
-
-export default function AppShell() {
-  return (
-    <OnboardingGate>
-      <Crypto>
-        <DesktopMediaProvider>
-          <MTPProvider>
-            <CacheSync />
-            <DeeplinkNavigator />
-            <Session>
-              <UserProvider>
-                <CallInit />
-                <TAuthWrapper>
-                  <AppLayout>
-                    <ChatContext>
-                      <NotificationsProvider>
-                        <Suspense fallback={<RouteLoader />}>
-                          <Outlet />
-                        </Suspense>
-                      </NotificationsProvider>
-                    </ChatContext>
-                  </AppLayout>
-                </TAuthWrapper>
-              </UserProvider>
-            </Session>
-          </MTPProvider>
-        </DesktopMediaProvider>
-      </Crypto>
-    </OnboardingGate>
-  );
-}
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index c158bad..ed9d218 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -124,35 +124,6 @@ export default defineConfig({
   build: {
     minify: !process.env.TAURI_ENV_DEBUG ? "esbuild" : false,
     sourcemap: !!process.env.TAURI_ENV_DEBUG,
-    chunkSizeWarningLimit: 550,
-    rolldownOptions: {
-      output: {
-        codeSplitting: {
-          groups: [
-            {
-              name: "codemirror-core",
-              test: /node_modules\/.pnpm\/@codemirror\+(?:state|view|language)@/,
-              priority: 20,
-            },
-            {
-              name: "codemirror-editor",
-              test: /node_modules\/.pnpm\/@codemirror\+(?:autocomplete|commands|lang-markdown)@|node_modules\/.pnpm\/codemirror@/,
-              priority: 20,
-            },
-            {
-              name: "livekit-client",
-              test: /node_modules\/.pnpm\/livekit-client@/,
-              priority: 20,
-            },
-            {
-              name: "livekit-support",
-              test: /node_modules\/.pnpm\/@livekit\+/,
-              priority: 20,
-            },
-          ],
-        },
-      },
-    },
   },
   plugins: [
     ...tensaminPwa(),
diff --git a/packages/call/package.json b/packages/call/package.json
index dcd16be..5aa70c9 100644
--- a/packages/call/package.json
+++ b/packages/call/package.json
@@ -5,7 +5,6 @@
   "type": "module",
   "exports": {
     "./store": "./src/store.tsx",
-    "./state": "./src/state.ts",
     "./speakingState": "./src/speakingState.ts",
     "./screen": "./src/screen.tsx",
     "./utils": "./src/utils.ts",
diff --git a/packages/call/src/components/buttons/invite.tsx b/packages/call/src/components/buttons/invite.tsx
index 1e91c8e..6ab4c1f 100644
--- a/packages/call/src/components/buttons/invite.tsx
+++ b/packages/call/src/components/buttons/invite.tsx
@@ -12,7 +12,7 @@ import Wrapper from "@tensamin/identity/wrapper";
 import { Mail } from "lucide-react";
 import { sendCallInvite, useCall } from "../../store";
 import { log, toast } from "@tensamin/shared/log";
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
 
 export default function InviteButton({
   className,
diff --git a/packages/call/src/state.ts b/packages/call/src/state.ts
deleted file mode 100644
index ebbf91a..0000000
--- a/packages/call/src/state.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import type { RefObject } from "react";
-import { create } from "zustand";
-
-import type { LocalMediaShareSession } from "./mediaShare/controller";
-
-export type CallView = "preview" | "focused" | "grid";
-
-export type WrappedCallSecret = {
-  secretId: string;
-  versionNumber: number;
-  encryptedSecret: Uint8Array;
-  kemCiphertext: Uint8Array;
-  wrappingScheme: string;
-};
-
-export type CallRuntime = {
-  navigate: (options: {
-    to: string;
-    search?: Record<string, unknown>;
-  }) => Promise<void>;
-  send: (
-    type: string,
-    data: Record<string, unknown>,
-  ) => Promise<{ data: unknown }>;
-  load: (key: string) => Promise<unknown>;
-  getPublicKey: (userId: number) => Promise<string>;
-};
-
-export const useCall = create<{
-  state: "closed" | "closing" | "connecting" | "open" | "encrypting";
-  view: CallView;
-  invitedUserId: number | null;
-  callId: string | null;
-  incomingCallInvite: {
-    callId: string;
-    callSecret: WrappedCallSecret;
-    senderId: number;
-  } | null;
-  callSecret: string | null;
-  livekitToken: string | null;
-  currentCallData: { UserIds: number[]; exists: boolean } | null;
-  deaf: boolean;
-  micEnabled: boolean;
-  cameraEnabled: boolean;
-  screenShareEnabled: boolean;
-  screenShareSession: LocalMediaShareSession | null;
-  cameraSession: LocalMediaShareSession | null;
-  disabledCameraParticipantIds: number[];
-  focusedParticipantId: number | null;
-  focusedParticipantType: "user" | "stream" | null;
-  usersInFocusedViewHidden: boolean;
-  watchedStreamParticipantIds: number[];
-  pendingWatchedParticipantIds: number[];
-  activeScreenShareParticipantIds: number[];
-  isEncrypted: boolean;
-  ownCallSecretInvitePending: boolean;
-  callIsFullscreen: boolean;
-  callIsPopout: boolean;
-  layoutVersion: number;
-  screenRef: RefObject<HTMLDivElement | null> | null;
-  runtime: CallRuntime | null;
-  lastFocusedParticipantId: number | null;
-}>(() => ({
-  state: "closed",
-  view: "preview",
-  invitedUserId: null,
-  callId: null,
-  incomingCallInvite: null,
-  callSecret: null,
-  livekitToken: null,
-  currentCallData: null,
-  deaf: false,
-  micEnabled: false,
-  cameraEnabled: false,
-  screenShareEnabled: false,
-  screenShareSession: null,
-  cameraSession: null,
-  disabledCameraParticipantIds: [],
-  focusedParticipantId: null,
-  focusedParticipantType: null,
-  usersInFocusedViewHidden: false,
-  watchedStreamParticipantIds: [],
-  pendingWatchedParticipantIds: [],
-  activeScreenShareParticipantIds: [],
-  isEncrypted: false,
-  ownCallSecretInvitePending: false,
-  callIsFullscreen: false,
-  callIsPopout: false,
-  layoutVersion: 0,
-  screenRef: null,
-  runtime: null,
-  lastFocusedParticipantId: null,
-}));
diff --git a/packages/call/src/store.tsx b/packages/call/src/store.tsx
index 35ec92e..7d88080 100644
--- a/packages/call/src/store.tsx
+++ b/packages/call/src/store.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef } from "react";
+import { create } from "zustand";
 import { useLocation, useNavigate } from "@tanstack/react-router";
 import { useMTP } from "@tensamin/mtp";
 import { log, toast } from "@tensamin/shared/log";
@@ -12,7 +13,7 @@ import {
   wrapCallSecret,
 } from "@tensamin/crypto/callSecret";
 import { useStorage } from "@tensamin/storage/context";
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
 import { useUser } from "@tensamin/identity/context";
 import { DeepFilterNoiseFilterProcessor } from "deepfilternet3-noise-filter";
 import {
@@ -32,6 +33,7 @@ import {
 import z from "zod";
 import {
   createMediaShareController,
+  type LocalMediaShareSession,
 } from "./mediaShare/controller";
 import type { MediaShareRequest } from "./mediaShare";
 import {
@@ -39,14 +41,6 @@ import {
   disposeSpeakingDetector,
 } from "./speakingIndicator";
 import InvitePopup from "./components/invitePopup";
-import {
-  useCall,
-  type CallRuntime as Runtime,
-  type CallView,
-  type WrappedCallSecret,
-} from "./state";
-
-export { useCall } from "./state";
 
 // logging
 setLogExtension(
@@ -57,9 +51,19 @@ setLogExtension(
   getLogger("tensamin"),
 );
 
+type CallView = "preview" | "focused" | "grid";
 type ProtocolCallSecret = NonNullable<
   z.infer<typeof mtp.CallInvite.response>["CallSecret"]
 >;
+type WrappedCallSecret = {
+  secretId: string;
+  versionNumber: number;
+  encryptedSecret: Uint8Array;
+  kemCiphertext: Uint8Array;
+  wrappingScheme: string;
+};
+type CurrentCallData =
+  (z.infer<typeof mtp.CallData.response> & { exists: boolean }) | null;
 
 type SendFn = (
   type: string,
@@ -68,6 +72,16 @@ type SendFn = (
 type LoadFn = (key: string) => Promise<unknown>;
 type RemoteVideoTrackSelector = Track.Kind | Track.Source;
 
+type Runtime = {
+  navigate: (options: {
+    to: string;
+    search?: Record<string, unknown>;
+  }) => Promise<void>;
+  send: SendFn;
+  load: LoadFn;
+  getPublicKey: (userId: number) => Promise<string>;
+};
+
 let _keyProvider: ExternalE2EEKeyProvider | null = null;
 let _e2eeWorker: Worker | null = null;
 let _room: Room | null = null;
@@ -618,7 +632,7 @@ export function setCallId(callId: string | null) {
 
 // Cache server call metadata used by the preview screen.
 export function setCurrentCallData(
-  currentCallData: { UserIds: number[]; exists: boolean },
+  currentCallData: CurrentCallData & { exists: boolean },
 ) {
   useCall.setState({ currentCallData });
 }
@@ -1139,6 +1153,72 @@ async function ensureNoiseFilter(
   }
 }
 
+export const useCall = create<{
+  state: "closed" | "closing" | "connecting" | "open" | "encrypting";
+  view: CallView;
+  invitedUserId: number | null;
+  callId: string | null;
+  incomingCallInvite: {
+    callId: string;
+    callSecret: WrappedCallSecret;
+    senderId: number;
+  } | null;
+  callSecret: string | null;
+  livekitToken: string | null;
+  currentCallData: CurrentCallData;
+  deaf: boolean;
+  micEnabled: boolean;
+  cameraEnabled: boolean;
+  screenShareEnabled: boolean;
+  screenShareSession: LocalMediaShareSession | null;
+  cameraSession: LocalMediaShareSession | null;
+  disabledCameraParticipantIds: number[];
+  focusedParticipantId: number | null;
+  focusedParticipantType: "user" | "stream" | null;
+  usersInFocusedViewHidden: boolean;
+  watchedStreamParticipantIds: number[];
+  pendingWatchedParticipantIds: number[];
+  activeScreenShareParticipantIds: number[];
+  isEncrypted: boolean;
+  ownCallSecretInvitePending: boolean;
+  callIsFullscreen: boolean;
+  callIsPopout: boolean;
+  layoutVersion: number;
+  screenRef: React.RefObject<HTMLDivElement | null> | null;
+  runtime: Runtime | null;
+  lastFocusedParticipantId: number | null;
+}>(() => ({
+  state: "closed",
+  view: "preview",
+  invitedUserId: null,
+  callId: null,
+  incomingCallInvite: null,
+  callSecret: null,
+  livekitToken: null,
+  currentCallData: null,
+  deaf: false,
+  micEnabled: false,
+  cameraEnabled: false,
+  screenShareEnabled: false,
+  screenShareSession: null,
+  cameraSession: null,
+  disabledCameraParticipantIds: [],
+  focusedParticipantId: null,
+  focusedParticipantType: null,
+  usersInFocusedViewHidden: false,
+  watchedStreamParticipantIds: [],
+  pendingWatchedParticipantIds: [],
+  activeScreenShareParticipantIds: [],
+  isEncrypted: false,
+  ownCallSecretInvitePending: false,
+  callIsFullscreen: false,
+  callIsPopout: false,
+  layoutVersion: 0,
+  screenRef: null,
+  runtime: null,
+  lastFocusedParticipantId: null,
+}));
+
 // Register app-level call listeners and wire React dependencies into the store.
 export function useInitializeCall() {
   const navigate = useNavigate();
diff --git a/packages/chat/package.json b/packages/chat/package.json
index b0d4be2..b87c50b 100644
--- a/packages/chat/package.json
+++ b/packages/chat/package.json
@@ -24,7 +24,6 @@
     "@tensamin/cache": "workspace:*",
     "@tensamin/crypto": "workspace:*",
     "@tensamin/hotkeys": "workspace:*",
-    "@tensamin/markdown": "workspace:*",
     "@tensamin/mtp": "workspace:*",
     "@tensamin/shared": "workspace:*",
     "@tensamin/storage": "workspace:*",
diff --git a/packages/chat/src/components/emoji/emojiPicker.tsx b/packages/chat/src/components/emoji/emojiPicker.tsx
index 7f7ff0e..ed8f2a1 100644
--- a/packages/chat/src/components/emoji/emojiPicker.tsx
+++ b/packages/chat/src/components/emoji/emojiPicker.tsx
@@ -1,5 +1,5 @@
 import { Button } from "@methanium/ui";
-import Emoji from "@tensamin/markdown/emoji";
+import { Emoji } from "@methanium/ui/markdown";
 import { getRecentEmojis, useEmojiRanks } from "./emojiRanks";
 
 export default function EmojiPicker({
diff --git a/packages/chat/src/components/emoji/emojiRanks.ts b/packages/chat/src/components/emoji/emojiRanks.ts
index 874c125..a30deb5 100644
--- a/packages/chat/src/components/emoji/emojiRanks.ts
+++ b/packages/chat/src/components/emoji/emojiRanks.ts
@@ -1,6 +1,6 @@
 import { useStorage } from "@tensamin/storage/context";
 import { useCallback, useEffect, useState } from "react";
-import { normalizeShortcode } from "@tensamin/markdown/emoji";
+import { normalizeShortcode } from "@methanium/ui/markdown";
 
 const RANKS_CHANGED_EVENT = "tensamin-reaction-ranks-changed";
 let recordQueue = Promise.resolve();
diff --git a/packages/chat/src/components/input.tsx b/packages/chat/src/components/input.tsx
index a605af6..04d3ab1 100644
--- a/packages/chat/src/components/input.tsx
+++ b/packages/chat/src/components/input.tsx
@@ -1,4 +1,4 @@
-import Input, { type InputController } from "@tensamin/markdown/input";
+import { Input, type InputController } from "@methanium/ui/markdown";
 import {
   Card,
   CardHeader,
@@ -10,14 +10,7 @@ import {
   PopoverTrigger,
 } from "@methanium/ui";
 import { useStorage } from "@tensamin/storage/context";
-import React, {
-  lazy,
-  Suspense,
-  useCallback,
-  useEffect,
-  useState,
-  useRef,
-} from "react";
+import React, { useCallback, useEffect, useState, useRef } from "react";
 import { Button } from "@methanium/ui";
 
 import { Plus, Laugh, FileVideo, SendHorizonal } from "lucide-react";
@@ -27,16 +20,15 @@ import { log, toast } from "@tensamin/shared/log";
 import { cn, useIsMobile } from "@methanium/ui";
 import { encryptChatText } from "@tensamin/crypto/chatSecret";
 
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
+import EmojiPicker from "./emoji/emojiPicker";
 import { useEmojiRanks, useRecordEmojiUse } from "./emoji/emojiRanks";
+import GifPicker from "./media/gifPicker";
 import ReplyBox from "./replyBox";
 import { useHotkey } from "@tensamin/hotkeys";
 import { editLastMessageHotkey } from "../hotkeys";
 import { useUser } from "@tensamin/identity/context";
 
-const EmojiPicker = lazy(() => import("./emoji/emojiPicker"));
-const GifPicker = lazy(() => import("./media/gifPicker"));
-
 export default function InputComponent({
   value,
   setValue,
@@ -359,15 +351,13 @@ export default function InputComponent({
                   )}
                 />
                 <PopoverContent className="w-auto p-0">
-                  <Suspense fallback={null}>
-                    <EmojiPicker
-                      onSelect={(shortcode) => {
-                        setValue(`${value}${shortcode} `);
-                        recordUse(shortcode);
-                        setEmojiPopoverOpen(false);
-                      }}
-                    />
-                  </Suspense>
+                  <EmojiPicker
+                    onSelect={(shortcode) => {
+                      setValue(`${value}${shortcode} `);
+                      recordUse(shortcode);
+                      setEmojiPopoverOpen(false);
+                    }}
+                  />
                 </PopoverContent>
               </Popover>
               {isMobile ? (
@@ -381,14 +371,12 @@ export default function InputComponent({
                   </DrawerTrigger>
                   <DrawerContent className="h-[80dvh]">
                     <div className="min-h-0 flex-1 p-3">
-                      <Suspense fallback={null}>
-                        <GifPicker
-                          onSelect={(url) => {
-                            void handleSubmit(url, true);
-                            setGifPopoverOpen(false);
-                          }}
-                        />
-                      </Suspense>
+                      <GifPicker
+                        onSelect={(url) => {
+                          void handleSubmit(url, true);
+                          setGifPopoverOpen(false);
+                        }}
+                      />
                     </div>
                   </DrawerContent>
                 </Drawer>
@@ -420,16 +408,14 @@ export default function InputComponent({
                       className="absolute left-0 top-0 z-10 h-4 w-4 cursor-nwse-resize"
                       onPointerDown={handleGifPopoverResizeStart}
                     />
-                    <Suspense fallback={null}>
-                      <GifPicker
-                        resizeHeight={gifPopoverSize?.height}
-                        resizeWidth={gifPopoverSize?.width}
-                        onSelect={(url) => {
-                          void handleSubmit(url, true);
-                          setGifPopoverOpen(false);
-                        }}
-                      />
-                    </Suspense>
+                    <GifPicker
+                      resizeHeight={gifPopoverSize?.height}
+                      resizeWidth={gifPopoverSize?.width}
+                      onSelect={(url) => {
+                        void handleSubmit(url, true);
+                        setGifPopoverOpen(false);
+                      }}
+                    />
                   </PopoverContent>
                 </Popover>
               )}
diff --git a/packages/chat/src/components/media/media.tsx b/packages/chat/src/components/media/media.tsx
index 4578642..ec0e673 100644
--- a/packages/chat/src/components/media/media.tsx
+++ b/packages/chat/src/components/media/media.tsx
@@ -1,4 +1,4 @@
-import Text from "@tensamin/markdown/text";
+import { Text } from "@methanium/ui/markdown";
 import { useStorage } from "@tensamin/storage/context";
 import {
   Avatar,
diff --git a/packages/chat/src/components/message.tsx b/packages/chat/src/components/message.tsx
index c9f8988..351e76f 100644
--- a/packages/chat/src/components/message.tsx
+++ b/packages/chat/src/components/message.tsx
@@ -19,9 +19,7 @@ import { requireRelaySuccess, useMTP } from "@tensamin/mtp";
 import { getMessage, useChat } from "../context";
 import { decryptChatText, encryptChatText } from "@tensamin/crypto/chatSecret";
 import { log, toast } from "@tensamin/shared/log";
-import Emoji, { normalizeShortcode } from "@tensamin/markdown/emoji";
-import Input from "@tensamin/markdown/input";
-import Text from "@tensamin/markdown/text";
+import { Emoji, Input, normalizeShortcode, Text } from "@methanium/ui/markdown";
 import { useRecordEmojiUse } from "./emoji/emojiRanks";
 import ReplyBox from "./replyBox";
 import { useHotkey } from "@tensamin/hotkeys";
diff --git a/packages/chat/src/components/messageContextMenu.tsx b/packages/chat/src/components/messageContextMenu.tsx
index c7cd2a2..2277aa1 100644
--- a/packages/chat/src/components/messageContextMenu.tsx
+++ b/packages/chat/src/components/messageContextMenu.tsx
@@ -44,7 +44,7 @@ import type {
   Ref,
 } from "react";
 import { useChat } from "../context";
-import Emoji from "@tensamin/markdown/emoji";
+import { Emoji } from "@methanium/ui/markdown";
 import EmojiPicker from "./emoji/emojiPicker";
 import { getRecentEmojis, useEmojiRanks } from "./emoji/emojiRanks";
 
diff --git a/packages/chat/src/components/replyBox.tsx b/packages/chat/src/components/replyBox.tsx
index c640086..7ee8990 100644
--- a/packages/chat/src/components/replyBox.tsx
+++ b/packages/chat/src/components/replyBox.tsx
@@ -6,7 +6,7 @@ import {
   cn,
   Skeleton,
 } from "@methanium/ui";
-import Text from "@tensamin/markdown/text";
+import { Text } from "@methanium/ui/markdown";
 import type { SelectedUser } from "@tensamin/identity/context";
 import Wrapper from "@tensamin/identity/wrapper";
 import { Forward, X } from "lucide-react";
diff --git a/packages/chat/src/context.tsx b/packages/chat/src/context.tsx
index f0c3065..c4328db 100644
--- a/packages/chat/src/context.tsx
+++ b/packages/chat/src/context.tsx
@@ -25,7 +25,7 @@ import {
 import { useStorage } from "@tensamin/storage/context";
 import { requireRelaySuccess, useMTP } from "@tensamin/mtp";
 import { log, toast } from "@tensamin/shared/log";
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
 import { useUser } from "@tensamin/identity/context";
 import { createCache, type ChatDraft } from "@tensamin/cache";
 import { secureValueCodec } from "@tensamin/storage/secure";
diff --git a/packages/identity/package.json b/packages/identity/package.json
index f70e4d8..e5293e2 100644
--- a/packages/identity/package.json
+++ b/packages/identity/package.json
@@ -5,7 +5,6 @@
   "type": "module",
   "exports": {
     "./context": "./src/context.tsx",
-    "./session": "./src/session.tsx",
     "./wrapper": "./src/wrapper.tsx",
     "./values": "./src/values.ts"
   },
diff --git a/packages/identity/src/context.tsx b/packages/identity/src/context.tsx
index e6eb204..de79a84 100644
--- a/packages/identity/src/context.tsx
+++ b/packages/identity/src/context.tsx
@@ -19,7 +19,7 @@ import {
 import type z from "zod";
 import { createCache } from "@tensamin/cache";
 import { useStorage } from "@tensamin/storage/context";
-import { useSession } from "./session";
+import { useSession } from "@tensamin/storage/session";
 import { getChangedUserFields, selectUserFields } from "./selection";
 
 export { getChangedUserFields, selectUserFields } from "./selection";
diff --git a/packages/markdown/src/text.tsx b/packages/markdown/src/text.tsx
index f4e80c6..ca65fe0 100644
--- a/packages/markdown/src/text.tsx
+++ b/packages/markdown/src/text.tsx
@@ -9,7 +9,6 @@ import {
 export type TextProps = {
   value: string;
   fontSize?: CSSProperties["fontSize"];
-  showEditedIndicator?: boolean;
 };
 
 /**
@@ -26,9 +25,6 @@ export default function Text(props: TextProps) {
   return (
     <div className="tm-md-root" style={{ fontSize: props.fontSize }}>
       {renderedBlocks}
-      {props.showEditedIndicator && (
-        <span className="ml-1 text-xs text-muted-foreground">(edited)</span>
-      )}
     </div>
   );
 }
diff --git a/packages/notifications/src/context.tsx b/packages/notifications/src/context.tsx
index 2839706..eef4e8b 100644
--- a/packages/notifications/src/context.tsx
+++ b/packages/notifications/src/context.tsx
@@ -11,7 +11,7 @@ import {
   requestPermission as requestTauriNotificationPermission,
   sendNotification as sendTauriNotification,
 } from "@tauri-apps/plugin-notification";
-import { useSession } from "@tensamin/identity/session";
+import { useSession } from "@tensamin/storage/session";
 import { useLocation, useNavigate } from "@tanstack/react-router";
 import { decryptChatText } from "@tensamin/crypto/chatSecret";
 import { log } from "@tensamin/shared/log";
diff --git a/packages/settings/package.json b/packages/settings/package.json
index 1eac2fe..0801243 100644
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -17,7 +17,6 @@
     "@tauri-apps/api": "^2.11.1",
     "@tensamin/cache": "workspace:*",
     "@tensamin/hotkeys": "workspace:*",
-    "@tensamin/markdown": "workspace:*",
     "@tensamin/mtp": "workspace:*",
     "@tensamin/shared": "workspace:*",
     "@tensamin/storage": "workspace:*",
diff --git a/packages/settings/src/manifest.ts b/packages/settings/src/manifest.ts
index abfb0cb..1afdd5a 100644
--- a/packages/settings/src/manifest.ts
+++ b/packages/settings/src/manifest.ts
@@ -1,20 +1,29 @@
-import { lazy } from "react";
+import Accessibility from "./pages/accessibility";
+import Cache from "./pages/cache";
+import Call from "./pages/call";
+import Chat from "./pages/chat";
+import Index from "./pages/index";
+import Licenses from "./pages/licenses";
+import Profile from "./pages/profile";
+import Security from "./pages/security";
+import Theme from "./pages/theme";
+import Hotkeys from "./pages/hotkeys";
 import { settingsNavigation } from "./navigation";
 
 const pageComponents = {
-  profile: lazy(() => import("./pages/profile")),
-  security: lazy(() => import("./pages/security")),
-  chat: lazy(() => import("./pages/chat")),
-  call: lazy(() => import("./pages/call")),
-  cache: lazy(() => import("./pages/cache")),
-  theme: lazy(() => import("./pages/theme")),
-  accessibility: lazy(() => import("./pages/accessibility")),
-  hotkeys: lazy(() => import("./pages/hotkeys")),
-  licenses: lazy(() => import("./pages/licenses")),
+  profile: Profile,
+  security: Security,
+  chat: Chat,
+  call: Call,
+  cache: Cache,
+  theme: Theme,
+  accessibility: Accessibility,
+  hotkeys: Hotkeys,
+  licenses: Licenses,
 } as const;
 
 export const settingsPages = [
-  { path: "/", component: lazy(() => import("./pages/index")) },
+  { path: "/", component: Index },
   ...settingsNavigation.map((page) => ({
     ...page,
     component: pageComponents[page.path],
diff --git a/packages/settings/src/pages/profile.tsx b/packages/settings/src/pages/profile.tsx
index 212a1fb..a3b8c37 100644
--- a/packages/settings/src/pages/profile.tsx
+++ b/packages/settings/src/pages/profile.tsx
@@ -1,4 +1,4 @@
-import MDInput from "@tensamin/markdown/input";
+import { Input as MDInput } from "@methanium/ui/markdown";
 import { useMTP } from "@tensamin/mtp";
 import { mtp } from "@tensamin/shared/data";
 import { useStorage } from "@tensamin/storage/context";
diff --git a/packages/storage/package.json b/packages/storage/package.json
index f610246..dce1554 100644
--- a/packages/storage/package.json
+++ b/packages/storage/package.json
@@ -4,6 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "exports": {
+    "./session": "./src/session.tsx",
     "./context": "./src/context.tsx",
     "./secure": "./src/secure.ts",
     "./browserSecure": "./src/browserSecure.ts",
@@ -17,6 +18,8 @@
   "dependencies": {
     "@methanium/ui": "*",
     "@tauri-apps/api": "^2.11.1",
+    "@tensamin/cache": "workspace:*",
+    "@tensamin/mtp": "workspace:*",
     "@tensamin/shared": "workspace:*",
     "react": "^19.2.8",
     "react-dom": "^19.2.8"
diff --git a/packages/identity/src/session.tsx b/packages/storage/src/session.tsx
similarity index 97%
rename from packages/identity/src/session.tsx
rename to packages/storage/src/session.tsx
index cb5b6ea..394718b 100644
--- a/packages/identity/src/session.tsx
+++ b/packages/storage/src/session.tsx
@@ -6,10 +6,10 @@ import {
   useContext,
   useEffect,
 } from "react";
-import { useStorage } from "@tensamin/storage/context";
+import { useStorage } from "./context";
 import type { Contacts, Communities, Calls } from "@tensamin/shared/data";
 import { createCache } from "@tensamin/cache";
-import { secureValueCodec } from "@tensamin/storage/secure";
+import { secureValueCodec } from "./secure";
 
 interface SessionContextType {
   contacts: Contacts;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aa563a3..ebc70b6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -201,9 +201,6 @@ importers:
       '@tensamin/identity':
         specifier: workspace:*
         version: link:../../packages/identity
-      '@tensamin/markdown':
-        specifier: workspace:*
-        version: link:../../packages/markdown
       '@tensamin/mtp':
         specifier: workspace:*
         version: link:../../packages/mtp
@@ -406,9 +403,6 @@ importers:
       '@tensamin/identity':
         specifier: workspace:*
         version: link:../identity
-      '@tensamin/markdown':
-        specifier: workspace:*
-        version: link:../markdown
       '@tensamin/mtp':
         specifier: workspace:*
         version: link:../mtp
@@ -645,9 +639,6 @@ importers:
       '@tensamin/identity':
         specifier: workspace:*
         version: link:../identity
-      '@tensamin/markdown':
-        specifier: workspace:*
-        version: link:../markdown
       '@tensamin/mtp':
         specifier: workspace:*
         version: link:../mtp
@@ -697,6 +688,12 @@ importers:
       '@tauri-apps/api':
         specifier: ^2.11.1
         version: 2.11.1
+      '@tensamin/cache':
+        specifier: workspace:*
+        version: link:../cache
+      '@tensamin/mtp':
+        specifier: workspace:*
+        version: link:../mtp
       '@tensamin/shared':
         specifier: workspace:*
         version: link:../shared