diff --git a/app.vue b/app.vue
index 166a3d9..a33a17b 100644
--- a/app.vue
+++ b/app.vue
@@ -19,7 +19,7 @@ provideHeadlessUseId(() => useId());
 const code = useRequestURL().searchParams.get("code");
 const appData = useAppData();
 const tokenData = useTokenData();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 const instance = useInstance();
 const description = useExtendedDescription(client);
 
@@ -28,12 +28,12 @@ useSeoMeta({
         return titleChunk ? `${titleChunk} · Lysand` : "Lysand";
     },
     title: computed(() => instance.value?.title ?? ""),
-    ogImage: computed(() => instance.value?.banner),
+    ogImage: computed(() => instance.value?.banner.url),
     twitterTitle: computed(() => instance.value?.title ?? ""),
     twitterDescription: computed(() =>
         convert(description.value?.content ?? ""),
     ),
-    twitterImage: computed(() => instance.value?.banner),
+    twitterImage: computed(() => instance.value?.banner.url),
     description: computed(() => convert(description.value?.content ?? "")),
     ogDescription: computed(() => convert(description.value?.content ?? "")),
     ogSiteName: "Lysand",
@@ -57,7 +57,7 @@ if (code) {
                 new URL("/", useRequestURL().origin).toString(),
             )
             .then((res) => {
-                tokenData.value = res;
+                tokenData.value = res.data;
 
                 // Remove code from URL
                 window.history.replaceState(
diff --git a/bun.lockb b/bun.lockb
index be20811..45324f7 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/components/composer/composer.vue b/components/composer/composer.vue
index a1d8d42..f1ab932 100644
--- a/components/composer/composer.vue
+++ b/components/composer/composer.vue
@@ -206,87 +206,64 @@ const canSubmit = computed(
         content.value?.trim().length <= characterLimit.value,
 );
 const tokenData = useTokenData();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 
 const send = async () => {
     loading.value = true;
-
-    if (respondingType.value === "edit") {
-        fetch(
-            new URL(
-                `/api/v1/statuses/${respondingTo.value?.id}`,
-                client.value?.baseUrl ?? "",
-            ).toString(),
-            {
-                method: "PUT",
-                headers: {
-                    "Content-Type": "application/json",
-                    Authorization: `Bearer ${tokenData.value?.access_token}`,
-                },
-                body: JSON.stringify({
-                    status: content.value?.trim() ?? "",
-                    content_type: markdown.value
-                        ? "text/markdown"
-                        : "text/plain",
-                    spoiler_text: cw.value ? cwContent.value.trim() : undefined,
-                    sensitive: cw.value,
-                    media_ids: files.value
-                        .filter((file) => !!file.api_id)
-                        .map((file) => file.api_id),
-                }),
-            },
-        )
-            .then(async (res) => {
-                if (!res.ok) {
-                    throw new Error("Failed to edit status");
-                }
-
-                content.value = "";
-                loading.value = false;
-                useEvent("composer:send-edit", await res.json());
-            })
-            .finally(() => {
-                useEvent("composer:close");
-            });
-        return;
+    if (!tokenData.value || !client.value) {
+        throw new Error("Not authenticated");
     }
 
-    fetch(new URL("/api/v1/statuses", client.value?.baseUrl ?? "").toString(), {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${tokenData.value?.access_token}`,
-        },
-        body: JSON.stringify({
+    if (respondingType.value === "edit" && respondingTo.value) {
+        const response = await client.value.editStatus(respondingTo.value.id, {
             status: content.value?.trim() ?? "",
             content_type: markdown.value ? "text/markdown" : "text/plain",
-            in_reply_to_id:
-                respondingType.value === "reply"
-                    ? respondingTo.value?.id
-                    : null,
-            quote_id:
-                respondingType.value === "quote"
-                    ? respondingTo.value?.id
-                    : null,
             spoiler_text: cw.value ? cwContent.value.trim() : undefined,
             sensitive: cw.value,
             media_ids: files.value
                 .filter((file) => !!file.api_id)
-                .map((file) => file.api_id),
-        }),
-    })
-        .then(async (res) => {
-            if (!res.ok) {
-                throw new Error("Failed to send status");
-            }
-
-            content.value = "";
-            loading.value = false;
-            useEvent("composer:send", await res.json());
-        })
-        .finally(() => {
-            useEvent("composer:close");
+                .map((file) => file.api_id) as string[],
         });
+
+        if (!response.data) {
+            throw new Error("Failed to edit status");
+        }
+
+        content.value = "";
+        loading.value = false;
+        useEvent("composer:send-edit", response.data);
+        useEvent("composer:close");
+        return;
+    }
+
+    const response = await client.value.postStatus(
+        content.value?.trim() ?? "",
+        {
+            content_type: markdown.value ? "text/markdown" : "text/plain",
+            in_reply_to_id:
+                respondingType.value === "reply"
+                    ? respondingTo.value?.id
+                    : undefined,
+            quote_id:
+                respondingType.value === "quote"
+                    ? respondingTo.value?.id
+                    : undefined,
+            spoiler_text: cw.value ? cwContent.value.trim() : undefined,
+            sensitive: cw.value,
+            media_ids: files.value
+                .filter((file) => !!file.api_id)
+                .map((file) => file.api_id) as string[],
+        },
+    );
+
+    if (!response.data) {
+        throw new Error("Failed to send status");
+    }
+
+    content.value = "";
+    loading.value = false;
+    useEvent("composer:send", response.data as Status);
+    useEvent("composer:close");
 };
 
 const characterLimit = computed(
diff --git a/components/composer/file-uploader.vue b/components/composer/file-uploader.vue
index e510dec..6cd36a8 100644
--- a/components/composer/file-uploader.vue
+++ b/components/composer/file-uploader.vue
@@ -74,7 +74,7 @@ const files = defineModel<
 });
 
 const tokenData = useTokenData();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 const fileInput = ref<HTMLInputElement | null>(null);
 
 const openFilePicker = () => {
diff --git a/components/sidebars/navigation.vue b/components/sidebars/navigation.vue
index 08a191b..d414159 100644
--- a/components/sidebars/navigation.vue
+++ b/components/sidebars/navigation.vue
@@ -175,7 +175,7 @@ const loadingAuth = ref(false);
 
 const appData = useAppData();
 const tokenData = useTokenData();
-const client = useMegalodon();
+const client = useClient();
 const me = useMe();
 
 const compose = () => {
@@ -191,18 +191,18 @@ const signIn = async () => {
         website: useBaseUrl().value,
     });
 
-    if (!output) {
+    if (!output?.data) {
         alert("Failed to create app");
         return;
     }
 
-    appData.value = output;
+    appData.value = output.data;
 
     const url = await client.value?.generateAuthUrl(
-        output.client_id,
-        output.client_secret,
+        output.data.client_id,
+        output.data.client_secret,
         {
-            scope: ["read", "write", "follow", "push"],
+            scopes: ["read", "write", "follow", "push"],
             redirect_uri: new URL("/", useRequestURL().origin).toString(),
         },
     );
diff --git a/components/social-elements/instance/Presentation.vue b/components/social-elements/instance/Presentation.vue
index e66c5b8..f020b0a 100644
--- a/components/social-elements/instance/Presentation.vue
+++ b/components/social-elements/instance/Presentation.vue
@@ -2,8 +2,8 @@
     <div class="flex flex-col p-10 gap-4 h-full">
         <div
             class="aspect-video shrink-0 w-full rounded ring-white/5 bg-dark-800 shadow overflow-hidden ring-1 hover:ring-2 duration-100">
-            <img class="object-cover w-full h-full duration-150 hover:scale-[102%] ease-in-out" v-if="instance?.banner"
-                alt="Instance banner" :src="instance.banner" />
+            <img class="object-cover w-full h-full duration-150 hover:scale-[102%] ease-in-out"
+                v-if="instance?.banner.url" alt="Instance banner" :src="instance.banner.url" />
         </div>
 
         <div class="prose prose-invert prose-sm">
@@ -11,15 +11,15 @@
             <div v-html="description?.content"></div>
         </div>
 
-        <div v-if="instance?.contact_account" class="flex flex-col gap-2 mt-auto">
+        <div v-if="instance?.contact.account" class="flex flex-col gap-2 mt-auto">
             <h2 class="text-gray-200 font-semibold uppercase text-xs">Administrator</h2>
-            <SocialElementsUsersSmallCard :account="instance.contact_account" />
+            <SocialElementsUsersSmallCard :account="instance.contact.account" />
         </div>
     </div>
 </template>
 
 <script lang="ts" setup>
-const client = useMegalodon();
+const client = useClient();
 const instance = useInstance();
 const description = useExtendedDescription(client);
 </script>
\ No newline at end of file
diff --git a/components/social-elements/notes/note.vue b/components/social-elements/notes/note.vue
index 02c60ae..25c9cbf 100644
--- a/components/social-elements/notes/note.vue
+++ b/components/social-elements/notes/note.vue
@@ -112,7 +112,7 @@ useListen("composer:send-edit", (note) => {
 const tokenData = useTokenData();
 const isSignedIn = useSignedIn();
 const me = useMe();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 const {
     loaded,
     note: outputtedNote,
diff --git a/components/social-elements/notes/reply-header.vue b/components/social-elements/notes/reply-header.vue
index f9090e2..7bd1402 100644
--- a/components/social-elements/notes/reply-header.vue
+++ b/components/social-elements/notes/reply-header.vue
@@ -16,6 +16,6 @@ const props = defineProps<{
 }>();
 
 const tokenData = useTokenData();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 const account = useAccount(client, props.account_id);
 </script>
\ No newline at end of file
diff --git a/components/social-elements/users/Account.vue b/components/social-elements/users/Account.vue
index 1bc4c78..8dc3eed 100644
--- a/components/social-elements/users/Account.vue
+++ b/components/social-elements/users/Account.vue
@@ -105,7 +105,7 @@ const props = defineProps<{
 const skeleton = computed(() => !props.account);
 const tokenData = useTokenData();
 const me = useMe();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 const accountId = computed(() => props.account?.id ?? null);
 const { relationship, isLoading } = useRelationship(client, accountId);
 
diff --git a/components/timelines/Account.vue b/components/timelines/Account.vue
index eacf4e2..69c3d6f 100644
--- a/components/timelines/Account.vue
+++ b/components/timelines/Account.vue
@@ -7,7 +7,7 @@ const props = defineProps<{
     id?: string;
 }>();
 
-const client = useMegalodon();
+const client = useClient();
 const timelineParameters = ref({});
 const { timeline, loadNext, loadPrev } = useAccountTimeline(
     client.value,
diff --git a/components/timelines/Home.vue b/components/timelines/Home.vue
index 9938ea7..2c5b3ec 100644
--- a/components/timelines/Home.vue
+++ b/components/timelines/Home.vue
@@ -4,7 +4,7 @@
 
 <script lang="ts" setup>
 const tokenData = useTokenData();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 const timelineParameters = ref({});
 const { timeline, loadNext, loadPrev } = useHomeTimeline(
     client.value,
diff --git a/components/timelines/Local.vue b/components/timelines/Local.vue
index 7892d32..dc8d8ae 100644
--- a/components/timelines/Local.vue
+++ b/components/timelines/Local.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts" setup>
-const client = useMegalodon();
+const client = useClient();
 const timelineParameters = ref({});
 const { timeline, loadNext, loadPrev } = useLocalTimeline(
     client.value,
diff --git a/components/timelines/Notifications.vue b/components/timelines/Notifications.vue
index 04b8a20..1593376 100644
--- a/components/timelines/Notifications.vue
+++ b/components/timelines/Notifications.vue
@@ -15,7 +15,7 @@
 
 <script lang="ts" setup>
 const tokenData = useTokenData();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 
 const isLoading = ref(true);
 
diff --git a/components/timelines/Public.vue b/components/timelines/Public.vue
index 6c390da..aa6dc47 100644
--- a/components/timelines/Public.vue
+++ b/components/timelines/Public.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts" setup>
-const client = useMegalodon();
+const client = useClient();
 const timelineParameters = ref({});
 const { timeline, loadNext, loadPrev } = usePublicTimeline(
     client.value,
diff --git a/composables/Account.ts b/composables/Account.ts
index 1e16fb8..a535873 100644
--- a/composables/Account.ts
+++ b/composables/Account.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Account } from "~/types/mastodon/account";
 
 export const useAccount = (
-    client: MaybeRef<Mastodon | null>,
+    client: MaybeRef<LysandClient | null>,
     accountId: MaybeRef<string | null>,
 ) => {
     if (!client) {
diff --git a/composables/AccountSearch.ts b/composables/AccountSearch.ts
index aaa2724..b6ab8c8 100644
--- a/composables/AccountSearch.ts
+++ b/composables/AccountSearch.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Account } from "~/types/mastodon/account";
 
 export const useAccountSearch = (
-    client: MaybeRef<Mastodon | null>,
+    client: MaybeRef<LysandClient | null>,
     q: string,
 ): Ref<Account[] | null> => {
     const output = ref(null as Account[] | null);
diff --git a/composables/AccountTimeline.ts b/composables/AccountTimeline.ts
index 1e3e2be..279184b 100644
--- a/composables/AccountTimeline.ts
+++ b/composables/AccountTimeline.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Status } from "~/types/mastodon/status";
 
 export const useAccountTimeline = (
-    client: Mastodon | null,
+    client: LysandClient | null,
     id: MaybeRef<string | null>,
     options: MaybeRef<{
         limit?: number | undefined;
diff --git a/composables/AppData.ts b/composables/AppData.ts
index ce4fbed..f65e129 100644
--- a/composables/AppData.ts
+++ b/composables/AppData.ts
@@ -1,8 +1,12 @@
+import type { LysandClient } from "@lysand-org/client";
 import { StorageSerializers } from "@vueuse/core";
-import type { OAuth } from "megalodon";
+
+export type ApplicationData = Awaited<
+    ReturnType<LysandClient["createApp"]>
+>["data"];
 
 export const useAppData = () => {
-    return useLocalStorage<OAuth.AppData | null>("lysand:app_data", null, {
+    return useLocalStorage<ApplicationData | null>("lysand:app_data", null, {
         serializer: StorageSerializers.object,
     });
 };
diff --git a/composables/CacheRefresh.ts b/composables/CacheRefresh.ts
index e46244c..11879c6 100644
--- a/composables/CacheRefresh.ts
+++ b/composables/CacheRefresh.ts
@@ -1,7 +1,6 @@
-import type { Mastodon } from "megalodon";
-import type { InstanceWithExtra } from "./Instance";
+import type { LysandClient } from "@lysand-org/client";
 
-export const useCacheRefresh = (client: MaybeRef<Mastodon | null>) => {
+export const useCacheRefresh = (client: MaybeRef<LysandClient | null>) => {
     if (process.server) return;
 
     const tokenData = useTokenData();
@@ -43,7 +42,7 @@ export const useCacheRefresh = (client: MaybeRef<Mastodon | null>) => {
         toValue(client)
             ?.getInstance()
             .then((res) => {
-                instance.value = res.data as InstanceWithExtra;
+                instance.value = res.data;
             });
     });
 };
diff --git a/composables/ExtendedDescription.ts b/composables/ExtendedDescription.ts
index b6931c0..c135e46 100644
--- a/composables/ExtendedDescription.ts
+++ b/composables/ExtendedDescription.ts
@@ -1,11 +1,13 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 
 type ExtendedDescription = {
     updated_at: string;
     content: string;
 };
 
-export const useExtendedDescription = (client: MaybeRef<Mastodon | null>) => {
+export const useExtendedDescription = (
+    client: MaybeRef<LysandClient | null>,
+) => {
     if (!ref(client).value) {
         return ref(null as ExtendedDescription | null);
     }
@@ -13,7 +15,7 @@ export const useExtendedDescription = (client: MaybeRef<Mastodon | null>) => {
     const output = ref(null as ExtendedDescription | null);
 
     ref(client)
-        .value?.client.get("/api/v1/instance/extended_description")
+        .value?.getInstanceExtendedDescription()
         .then((res) => {
             output.value = res.data;
         });
diff --git a/composables/HomeTimeline.ts b/composables/HomeTimeline.ts
index 67d4e0c..eafa939 100644
--- a/composables/HomeTimeline.ts
+++ b/composables/HomeTimeline.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Status } from "~/types/mastodon/status";
 
 export const useHomeTimeline = (
-    client: Mastodon | null,
+    client: LysandClient | null,
     options: MaybeRef<{
         local?: boolean;
         limit?: number;
diff --git a/composables/Instance.ts b/composables/Instance.ts
index e86bd0f..79f8221 100644
--- a/composables/Instance.ts
+++ b/composables/Instance.ts
@@ -1,26 +1,15 @@
+import type { LysandClient } from "@lysand-org/client";
 import { StorageSerializers } from "@vueuse/core";
-import type { Mastodon } from "megalodon";
-import type { Instance } from "~/types/mastodon/instance";
 
-export type InstanceWithExtra = Instance & {
-    banner: string | null;
-    lysand_version: string;
-    sso: {
-        forced: boolean;
-        providers: {
-            id: string;
-            name: string;
-            icon?: string;
-        }[];
-    };
-};
+// Return type of LysandClient.getInstance
+export type Instance = Awaited<ReturnType<LysandClient["getInstance"]>>["data"];
 
 export const useInstance = () => {
     if (process.server) {
         return ref(null);
     }
 
-    return useLocalStorage<InstanceWithExtra | null>("lysand:instance", null, {
+    return useLocalStorage<Instance | null>("lysand:instance", null, {
         serializer: StorageSerializers.object,
     });
 };
diff --git a/composables/LocalTimeline.ts b/composables/LocalTimeline.ts
index a096e70..0945c54 100644
--- a/composables/LocalTimeline.ts
+++ b/composables/LocalTimeline.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Status } from "~/types/mastodon/status";
 
 export const useLocalTimeline = (
-    client: Mastodon | null,
+    client: LysandClient | null,
     options: MaybeRef<
         Partial<{
             only_media: boolean;
diff --git a/composables/Megalodon.ts b/composables/Megalodon.ts
index 0f71d23..114c1f1 100644
--- a/composables/Megalodon.ts
+++ b/composables/Megalodon.ts
@@ -1,15 +1,18 @@
-import { Mastodon, type OAuth } from "megalodon";
+import { LysandClient, type Token } from "@lysand-org/client";
 
-export const useMegalodon = (
-    tokenData?: MaybeRef<OAuth.TokenData | null>,
+export const useClient = (
+    tokenData?: MaybeRef<Token | null>,
     disableOnServer = false,
-): Ref<Mastodon | null> => {
+): Ref<LysandClient | null> => {
     if (disableOnServer && process.server) {
         return ref(null);
     }
 
     return computed(
         () =>
-            new Mastodon(useBaseUrl().value, toValue(tokenData)?.access_token),
+            new LysandClient(
+                new URL(useBaseUrl().value),
+                toValue(tokenData)?.access_token,
+            ),
     );
 };
diff --git a/composables/Note.ts b/composables/Note.ts
index 4988e1b..51c8bf7 100644
--- a/composables/Note.ts
+++ b/composables/Note.ts
@@ -1,7 +1,10 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Status } from "~/types/mastodon/status";
 
-export const useNote = (client: MaybeRef<Mastodon | null>, noteId: string) => {
+export const useNote = (
+    client: MaybeRef<LysandClient | null>,
+    noteId: string,
+) => {
     if (!ref(client).value) {
         return ref(null as Status | null);
     }
diff --git a/composables/NoteContext.ts b/composables/NoteContext.ts
index af1e6aa..05eb941 100644
--- a/composables/NoteContext.ts
+++ b/composables/NoteContext.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Context } from "~/types/mastodon/context";
 
 export const useNoteContext = (
-    client: MaybeRef<Mastodon | null>,
+    client: MaybeRef<LysandClient | null>,
     noteId: MaybeRef<string | null>,
 ) => {
     if (!ref(client).value) {
diff --git a/composables/NoteData.ts b/composables/NoteData.ts
index e34dd03..9199d4a 100644
--- a/composables/NoteData.ts
+++ b/composables/NoteData.ts
@@ -1,9 +1,9 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Status } from "~/types/mastodon/status";
 
 export const useNoteData = (
     noteProp: MaybeRef<Status | undefined>,
-    client: Ref<Mastodon | null>,
+    client: Ref<LysandClient | null>,
 ) => {
     const isReply = computed(() => !!toValue(noteProp)?.in_reply_to_id);
     const isQuote = computed(() => !!toValue(noteProp)?.quote);
diff --git a/composables/NotificationTimeline.ts b/composables/NotificationTimeline.ts
index aeed69d..ee8d3fc 100644
--- a/composables/NotificationTimeline.ts
+++ b/composables/NotificationTimeline.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Notification } from "~/types/mastodon/notification";
 
 export const useNotificationTimeline = (
-    client: Mastodon | null,
+    client: LysandClient | null,
     options: MaybeRef<{
         limit?: number | undefined;
         max_id?: string | undefined;
diff --git a/composables/PublicTimeline.ts b/composables/PublicTimeline.ts
index 02cd4d9..da5e2c6 100644
--- a/composables/PublicTimeline.ts
+++ b/composables/PublicTimeline.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Status } from "~/types/mastodon/status";
 
 export const usePublicTimeline = (
-    client: Mastodon | null,
+    client: LysandClient | null,
     options: MaybeRef<{
         only_media?: boolean;
         limit?: number;
diff --git a/composables/Relationship.ts b/composables/Relationship.ts
index d76239d..94211e6 100644
--- a/composables/Relationship.ts
+++ b/composables/Relationship.ts
@@ -1,8 +1,8 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Relationship } from "~/types/mastodon/relationship";
 
 export const useRelationship = (
-    client: MaybeRef<Mastodon | null>,
+    client: MaybeRef<LysandClient | null>,
     accountId: MaybeRef<string | null>,
 ) => {
     const relationship = ref(null as Relationship | null);
diff --git a/composables/ResolveMentions.ts b/composables/ResolveMentions.ts
index 8e4be78..6807550 100644
--- a/composables/ResolveMentions.ts
+++ b/composables/ResolveMentions.ts
@@ -1,10 +1,10 @@
-import type { Mastodon } from "megalodon";
+import type { LysandClient } from "@lysand-org/client";
 import type { Account } from "~/types/mastodon/account";
 import type { Mention } from "~/types/mastodon/mention";
 
 export const useResolveMentions = (
     mentions: Ref<Mention[]>,
-    client: Mastodon | null,
+    client: LysandClient | null,
 ): Ref<Account[]> => {
     if (!client) {
         return ref([]);
diff --git a/composables/SSOConfig.ts b/composables/SSOConfig.ts
index d20dbca..93f4b2b 100644
--- a/composables/SSOConfig.ts
+++ b/composables/SSOConfig.ts
@@ -1,6 +1,6 @@
-import type { InstanceWithExtra } from "./Instance";
+import type { Instance } from "./Instance";
 
-export const useSSOConfig = (): Ref<InstanceWithExtra["sso"] | null> => {
+export const useSSOConfig = (): Ref<Instance["sso"] | null> => {
     const instance = useInstance();
 
     return computed(() => instance.value?.sso || null);
diff --git a/composables/Timeline.ts b/composables/Timeline.ts
index b7c43bd..dee060e 100644
--- a/composables/Timeline.ts
+++ b/composables/Timeline.ts
@@ -1,4 +1,4 @@
-import type { Mastodon, Response } from "megalodon";
+import type { LysandClient, Output } from "@lysand-org/client";
 
 interface BaseOptions {
     max_id?: string;
@@ -6,9 +6,9 @@ interface BaseOptions {
 }
 
 type FetchTimelineFunction<Element, Options> = (
-    client: Mastodon,
+    client: LysandClient,
     options: Options & BaseOptions,
-) => Promise<Response<Element[]>>;
+) => Promise<Output<Element[]>>;
 
 export const useTimeline = <
     Element extends {
@@ -16,7 +16,7 @@ export const useTimeline = <
     },
     Options,
 >(
-    client: Mastodon | null,
+    client: LysandClient | null,
     fetchTimeline: FetchTimelineFunction<Element, Options> | null | undefined,
     options: MaybeRef<Options & BaseOptions>,
 ): {
@@ -98,7 +98,7 @@ export const useIdTimeline = <
     },
     Options,
 >(
-    client: Mastodon | null,
+    client: LysandClient | null,
     id: MaybeRef<string | null>,
     fetchTimeline: FetchTimelineFunction<Element, Options> | null | undefined,
     options: MaybeRef<Options & BaseOptions>,
diff --git a/composables/TokenData.ts b/composables/TokenData.ts
index 8b3c911..83821a7 100644
--- a/composables/TokenData.ts
+++ b/composables/TokenData.ts
@@ -1,8 +1,8 @@
+import type { Token } from "@lysand-org/client";
 import { StorageSerializers } from "@vueuse/core";
-import type { OAuth } from "megalodon";
 
 export const useTokenData = () => {
-    return useLocalStorage<OAuth.TokenData | null>("lysand:token_data", null, {
+    return useLocalStorage<Token | null>("lysand:token_data", null, {
         serializer: StorageSerializers.object,
     });
 };
diff --git a/layouts/app.vue b/layouts/app.vue
index 723efc7..fef3b27 100644
--- a/layouts/app.vue
+++ b/layouts/app.vue
@@ -47,7 +47,7 @@ const { width } = useWindowSize();
 
 const { n, o_i_d_c } = useMagicKeys();
 const tokenData = useTokenData();
-const client = useMegalodon(tokenData);
+const client = useClient(tokenData);
 const providers = useSSOConfig();
 
 watchEffect(async () => {
@@ -71,7 +71,7 @@ watchEffect(async () => {
         }
 
         const response = await fetch(
-            new URL("/api/v1/sso", client.value?.baseUrl),
+            new URL("/api/v1/sso", client.value?.url),
             {
                 method: "POST",
                 headers: {
diff --git a/package.json b/package.json
index 2da367e..5dadcf3 100644
--- a/package.json
+++ b/package.json
@@ -25,10 +25,12 @@
         "generate": "nuxt generate",
         "preview": "nuxt preview",
         "postinstall": "nuxt prepare",
-        "lint": "bunx @biomejs/biome check ."
+        "lint": "bunx @biomejs/biome check .",
+        "check": "bunx tsc -p ."
     },
     "dependencies": {
-        "@ark-ui/vue": "^3.3.0",
+        "@ark-ui/vue": "^3.3.1",
+        "@lysand-org": "github:lysand-org/api#main",
         "@nuxt/fonts": "^0.7.0",
         "@tailwindcss/typography": "^0.5.13",
         "@vee-validate/nuxt": "^4.13.1",
@@ -39,7 +41,6 @@
         "html-to-text": "^9.0.5",
         "iconify-icon": "^2.1.0",
         "magic-regexp": "^0.8.0",
-        "megalodon": "^10.0.1",
         "mitt": "^3.0.1",
         "nanoid": "^5.0.7",
         "nuxt": "^3.11.2",
@@ -48,7 +49,7 @@
         "nuxt-shiki": "^0.3.0",
         "overlayscrollbars": "^2.8.3",
         "overlayscrollbars-vue": "^0.5.9",
-        "shiki": "^1.6.2",
+        "shiki": "^1.6.3",
         "vue": "^3.4.27",
         "vue-router": "^4.3.2",
         "zod": "^3.23.8"
@@ -59,7 +60,8 @@
         "@nuxtjs/tailwindcss": "^6.12.0",
         "@tailwindcss/forms": "^0.5.7",
         "@types/html-to-text": "^9.0.4",
-        "@vue-email/nuxt": "^0.8.19"
+        "@vue-email/nuxt": "^0.8.19",
+        "typescript": "^5.4.5"
     },
     "trustedDependencies": [
         "@biomejs/biome",
diff --git a/pages/[username]/[uuid].vue b/pages/[username]/[uuid].vue
index bd8d11a..b6272c2 100644
--- a/pages/[username]/[uuid].vue
+++ b/pages/[username]/[uuid].vue
@@ -20,7 +20,7 @@ definePageMeta({
 
 const element = ref<HTMLElement | null>(null);
 const route = useRoute();
-const client = useMegalodon();
+const client = useClient();
 const uuid = route.params.uuid as string;
 
 const note = useNote(client, uuid);
diff --git a/pages/[username]/index.vue b/pages/[username]/index.vue
index cd1f3dc..07df772 100644
--- a/pages/[username]/index.vue
+++ b/pages/[username]/index.vue
@@ -15,7 +15,7 @@ definePageMeta({
 });
 
 const route = useRoute();
-const client = useMegalodon(undefined, true);
+const client = useClient(undefined, true);
 const username = (route.params.username as string).replace("@", "");
 
 const accounts = useAccountSearch(client, username);
diff --git a/pages/home.vue b/pages/home.vue
index 21768a5..bbd541c 100644
--- a/pages/home.vue
+++ b/pages/home.vue
@@ -11,6 +11,4 @@
 definePageMeta({
     layout: "app",
 });
-
-const me = useMe();
 </script>
\ No newline at end of file
diff --git a/pages/oauth/code.vue b/pages/oauth/code.vue
index d30a77d..b0885cf 100644
--- a/pages/oauth/code.vue
+++ b/pages/oauth/code.vue
@@ -27,7 +27,6 @@
 <script setup lang="ts">
 import { useRoute } from "vue-router";
 
-const url = useRequestURL();
 const query = useRoute().query;
 
 const code = query.code;
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 92e730b..0030028 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -44,7 +44,7 @@
                     </VeeErrorMessage>
                 </VeeField>
 
-                <VeeField name="reason" as="div" v-slot="{ errors, field }" validate-on-change>
+                <VeeField name="reason" as="div" v-slot="{ errors }" validate-on-change>
                     <label for="reason" class="block text-sm font-medium leading-6 text-gray-50">Why do you want to
                         join?</label>
                     <div class="mt-2">
@@ -62,7 +62,7 @@
                         class="rounded disabled:hover:cursor-wait mr-1 align-middle mb-0.5 text-pink-700 !ring-0 !outline-none"
                         required />
                     <span class="text-sm text-gray-100">I agree to the terms and conditions of this server <a
-                            class="underline font-bold" target="_blank" :href="instance.uri">available here</a></span>
+                            class="underline font-bold" target="_blank" :href="'#'">available here</a></span>
                     <VeeErrorMessage name="tos" as="p" class="mt-2 text-sm text-red-600" v-slot="{ message }">
                         {{ message }}
                     </VeeErrorMessage>
@@ -88,6 +88,7 @@ import { toTypedSchema } from "@vee-validate/zod";
 import type { AxiosError } from "axios";
 import { z } from "zod";
 import LoginInput from "../../components/LoginInput.vue";
+// TODO: Add instance TOS link
 
 const schema = toTypedSchema(
     z
@@ -114,7 +115,7 @@ const schema = toTypedSchema(
         }),
 );
 
-const client = useMegalodon();
+const client = useClient();
 const instance = useInstance();
 
 const errors = ref<{