diff --git a/website/app/assets/css/main.css b/website/app/assets/css/main.css
index 93e94cd..2f81a51 100644
--- a/website/app/assets/css/main.css
+++ b/website/app/assets/css/main.css
@@ -14,15 +14,37 @@
 }
 
 @keyframes shake {
-    0% { transform: translate(1px, 1px) rotate(0deg); }
-    10% { transform: translate(-1px, -2px) rotate(-1deg); }
-    20% { transform: translate(-3px, 0px) rotate(1deg); }
-    30% { transform: translate(3px, 2px) rotate(0deg); }
-    40% { transform: translate(1px, -1px) rotate(1deg); }
-    50% { transform: translate(-1px, 2px) rotate(-1deg); }
-    60% { transform: translate(-3px, 1px) rotate(0deg); }
-    70% { transform: translate(3px, 1px) rotate(-1deg); }
-    80% { transform: translate(-1px, -1px) rotate(1deg); }
-    90% { transform: translate(1px, 2px) rotate(0deg); }
-    100% { transform: translate(1px, -2px) rotate(-1deg); }
-}
\ No newline at end of file
+    0% {
+        transform: translate(1px, 1px) rotate(0deg);
+    }
+    10% {
+        transform: translate(-1px, -2px) rotate(-1deg);
+    }
+    20% {
+        transform: translate(-3px, 0px) rotate(1deg);
+    }
+    30% {
+        transform: translate(3px, 2px) rotate(0deg);
+    }
+    40% {
+        transform: translate(1px, -1px) rotate(1deg);
+    }
+    50% {
+        transform: translate(-1px, 2px) rotate(-1deg);
+    }
+    60% {
+        transform: translate(-3px, 1px) rotate(0deg);
+    }
+    70% {
+        transform: translate(3px, 1px) rotate(-1deg);
+    }
+    80% {
+        transform: translate(-1px, -1px) rotate(1deg);
+    }
+    90% {
+        transform: translate(1px, 2px) rotate(0deg);
+    }
+    100% {
+        transform: translate(1px, -2px) rotate(-1deg);
+    }
+}
diff --git a/website/app/components/KavitaModal.vue b/website/app/components/KavitaModal.vue
new file mode 100644
index 0000000..6546d83
--- /dev/null
+++ b/website/app/components/KavitaModal.vue
@@ -0,0 +1,51 @@
+<template>
+    <UModal v-bind="$props" title="Connect Kavita">
+        <template #body>
+            <UFormField label="URL">
+                <UInput v-model="requestData.url" placeholder="https://" class="w-full" :disabled="busy" />
+            </UFormField>
+            <UFormField label="Username">
+                <UInput v-model="requestData.username" class="w-full" :disabled="busy" />
+            </UFormField>
+            <UFormField label="Password">
+                <UInput v-model="requestData.password" type="password" class="w-full" :disabled="busy" />
+            </UFormField>
+            <UButton
+                icon="i-lucide-link"
+                :class="['mt-2 float-right', success == false ? 'animate-[shake_0.2s] bg-error' : '']"
+                :loading="busy"
+                :disabled="busy || !allowSend"
+                @click="connect"
+                >Connect</UButton
+            >
+        </template>
+    </UModal>
+</template>
+
+<script setup lang="ts">
+import type { components } from '#open-fetch-schemas/api';
+type CreateLibraryConnectorRecord = components['schemas']['CreateLibraryConnectorRecord'];
+const { $api } = useNuxtApp();
+
+const requestData = ref<CreateLibraryConnectorRecord>({ libraryType: 'Kavita', url: '', username: '', password: '' });
+
+const allowSend = computed(() => requestData.value.url && requestData.value.username && requestData.value.password);
+
+const busy = ref<boolean>(false);
+const success = ref<boolean | undefined>(undefined);
+const emit = defineEmits<{ close: [boolean] }>();
+const connect = async () => {
+    busy.value = true;
+    try {
+        await $api('/v2/LibraryConnector', { method: 'PUT', body: requestData.value });
+        await refreshNuxtData(FetchKeys.Libraries.All);
+        emit('close', false);
+        success.value = true;
+    } catch {
+        success.value = false;
+        setTimeout(() => (success.value = undefined), 200);
+    } finally {
+        busy.value = false;
+    }
+};
+</script>
diff --git a/website/app/components/KomgaModal.vue b/website/app/components/KomgaModal.vue
index 8de0bb9..3299fdf 100644
--- a/website/app/components/KomgaModal.vue
+++ b/website/app/components/KomgaModal.vue
@@ -10,7 +10,14 @@
             <UFormField label="Password">
                 <UInput v-model="requestData.password" type="password" class="w-full" :disabled="busy" />
             </UFormField>
-            <UButton icon="i-lucide-link" :class="['mt-2 float-right', success == false ? 'animate-[shake_0.2s] bg-error' : '' ]" :loading="busy" :disabled="busy || !allowSend" @click="connect">Connect</UButton>
+            <UButton
+                icon="i-lucide-link"
+                :class="['mt-2 float-right', success == false ? 'animate-[shake_0.2s] bg-error' : '']"
+                :loading="busy"
+                :disabled="busy || !allowSend"
+                @click="connect"
+                >Connect</UButton
+            >
         </template>
     </UModal>
 </template>
@@ -20,30 +27,25 @@ import type { components } from '#open-fetch-schemas/api';
 type CreateLibraryConnectorRecord = components['schemas']['CreateLibraryConnectorRecord'];
 const { $api } = useNuxtApp();
 
-const requestData = ref<CreateLibraryConnectorRecord>({
-    libraryType: 'Komga',
-    url: '',
-    username: '',
-    password: ''
-});
+const requestData = ref<CreateLibraryConnectorRecord>({ libraryType: 'Komga', url: '', username: '', password: '' });
 
 const allowSend = computed(() => requestData.value.url && requestData.value.username && requestData.value.password);
 
 const busy = ref<boolean>(false);
 const success = ref<boolean | undefined>(undefined);
-const emit = defineEmits<{ close: [boolean] }>()
+const emit = defineEmits<{ close: [boolean] }>();
 const connect = async () => {
     busy.value = true;
     try {
-        await $api("/v2/LibraryConnector", { method: "PUT", body: requestData.value });
+        await $api('/v2/LibraryConnector', { method: 'PUT', body: requestData.value });
         await refreshNuxtData(FetchKeys.Libraries.All);
         emit('close', false);
         success.value = true;
-    }catch {
+    } catch {
         success.value = false;
-        setTimeout(() => success.value = undefined, 200);
-    }finally {
+        setTimeout(() => (success.value = undefined), 200);
+    } finally {
         busy.value = false;
     }
-}
+};
 </script>
diff --git a/website/app/pages/settings.vue b/website/app/pages/settings.vue
index 21c94d4..d11aab2 100644
--- a/website/app/pages/settings.vue
+++ b/website/app/pages/settings.vue
@@ -9,9 +9,18 @@
                     <div class="flex flex-row gap-2">
                         <UButton icon="i-lucide-plus" class="w-fit" @click="addLibraryModal.open()">Add</UButton>
                         <UTooltip :text="komgaConnected ? 'Disconnect Komga' : 'Connect Komga'">
-                            <UButton :icon="komgaConnected ? 'i-lucide-unlink' : 'i-lucide-link'" class="w-fit" @click="onKomgaClick"
-                            >Komga</UButton
-                            >
+                            <UButton
+                                :icon="komgaConnected ? 'i-lucide-unlink' : 'i-lucide-link'"
+                                class="w-fit"
+                                label="Komga"
+                                @click="onKomgaClick" />
+                        </UTooltip>
+                        <UTooltip :text="kavitaConnected ? 'Disconnect Kavita' : 'Connect Kavita'">
+                            <UButton
+                                :icon="kavitaConnected ? 'i-lucide-unlink' : 'i-lucide-link'"
+                                class="w-fit"
+                                label="Kavita"
+                                @click="onKavitaClick" />
                         </UTooltip>
                     </div>
                 </template>
@@ -34,7 +43,7 @@
 </template>
 
 <script setup lang="ts">
-import { LazyAddLibraryModal, LazyKomgaModal } from '#components';
+import { LazyAddLibraryModal, LazyKavitaModal, LazyKomgaModal } from '#components';
 import FileLibraries from '~/components/FileLibraries.vue';
 import { refreshNuxtData } from '#app';
 const overlay = useOverlay();
@@ -42,6 +51,7 @@ const { $api } = useNuxtApp();
 
 const addLibraryModal = overlay.create(LazyAddLibraryModal);
 const komgaModal = overlay.create(LazyKomgaModal);
+const kavitaModal = overlay.create(LazyKavitaModal);
 
 const config = useRuntimeConfig();
 const apiUrl = ref(config.public.openFetch.api.baseURL);
@@ -62,12 +72,21 @@ const cleanUpDatabase = async () => {
 };
 
 const { data: libraries } = useApi('/v2/LibraryConnector', { key: FetchKeys.Libraries.All });
-const komgaConnected = computed(() => libraries.value?.find((l) => l.type === "Komga")?.key);
+const komgaConnected = computed(() => libraries.value?.find((l) => l.type === 'Komga')?.key);
 const onKomgaClick = async () => {
     if (!komgaConnected.value) {
         komgaModal.open();
-    }else{
-        await $api("/v2/LibraryConnector/{LibraryConnectorId}", { method: "DELETE", path: { LibraryConnectorId: komgaConnected.value } });
+    } else {
+        await $api('/v2/LibraryConnector/{LibraryConnectorId}', { method: 'DELETE', path: { LibraryConnectorId: komgaConnected.value } });
+        await refreshNuxtData(FetchKeys.Libraries.All);
+    }
+};
+const kavitaConnected = computed(() => libraries.value?.find((l) => l.type === 'Kavita')?.key);
+const onKavitaClick = async () => {
+    if (!kavitaConnected.value) {
+        kavitaModal.open();
+    } else {
+        await $api('/v2/LibraryConnector/{LibraryConnectorId}', { method: 'DELETE', path: { LibraryConnectorId: kavitaConnected.value } });
         await refreshNuxtData(FetchKeys.Libraries.All);
     }
 };