diff --git a/app/(loggedInRoutes)/kanban/layout.tsx b/app/(loggedInRoutes)/kanban/layout.tsx
new file mode 100644
index 00000000..a113d3ad
--- /dev/null
+++ b/app/(loggedInRoutes)/kanban/layout.tsx
@@ -0,0 +1,25 @@
+import { TasksClient } from "@/app/_components/FeatureComponents/Checklists/TasksClient";
+import { getCategories } from "@/app/_server/actions/category";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { Modes } from "@/app/_types/enums";
+import { sanitizeUserForClient } from "@/app/_utils/user-sanitize-utils";
+
+export default async function KanbanLayout({
+    children,
+}: {
+    children: React.ReactNode;
+}) {
+    const [checklistCategories, userRecord] = await Promise.all([
+        getCategories(Modes.CHECKLISTS),
+        getCurrentUser(),
+    ]);
+
+    const categories = checklistCategories.data || [];
+    const user = sanitizeUserForClient(userRecord);
+
+    return (
+        <TasksClient categories={categories} user={user}>
+            {children}
+        </TasksClient>
+    );
+}
diff --git a/app/(loggedInRoutes)/kanban/page.tsx b/app/(loggedInRoutes)/kanban/page.tsx
new file mode 100644
index 00000000..676a44c3
--- /dev/null
+++ b/app/(loggedInRoutes)/kanban/page.tsx
@@ -0,0 +1,23 @@
+import { getUserChecklists } from "@/app/_server/actions/checklist";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { KanbanPageClient } from "@/app/_components/FeatureComponents/Kanban/KanbanPageClient";
+import { Checklist } from "@/app/_types";
+import { sanitizeUserForClient } from "@/app/_utils/user-sanitize-utils";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export default async function KanbanPage() {
+  const [listsResult, userRecord] = await Promise.all([
+    getUserChecklists(),
+    getCurrentUser(),
+  ]);
+
+  const lists = listsResult.success && listsResult.data ? listsResult.data : [];
+  const kanbanLists = lists.filter((list) =>
+    isKanbanType(list.type),
+  ) as Checklist[];
+  const user = sanitizeUserForClient(userRecord);
+
+  return <KanbanPageClient initialLists={kanbanLists} user={user} />;
+}
diff --git a/app/(loggedInRoutes)/tasks/page.tsx b/app/(loggedInRoutes)/tasks/page.tsx
index 17feb82b..40c60c6c 100644
--- a/app/(loggedInRoutes)/tasks/page.tsx
+++ b/app/(loggedInRoutes)/tasks/page.tsx
@@ -3,6 +3,7 @@ import { getCurrentUser } from "@/app/_server/actions/users";
 import { TasksPageClient } from "@/app/_components/FeatureComponents/Checklists/TasksPageClient";
 import { Checklist } from "@/app/_types";
 import { sanitizeUserForClient } from "@/app/_utils/user-sanitize-utils";
+import { isKanbanType } from "@/app/_types/enums";
 
 export const dynamic = "force-dynamic";
 
@@ -13,13 +14,10 @@ export default async function TasksPage() {
   ]);
 
   const lists = listsResult.success && listsResult.data ? listsResult.data : [];
-  const taskLists = lists.filter((list) => list.type === "task") as Checklist[];
+  const taskLists = lists.filter((list) =>
+    isKanbanType(list.type),
+  ) as Checklist[];
   const user = sanitizeUserForClient(userRecord);
 
-  return (
-    <TasksPageClient
-      initialLists={taskLists}
-      user={user}
-    />
-  );
+  return <TasksPageClient initialLists={taskLists} user={user} />;
 }
diff --git a/app/(loggedOutRoutes)/auth/login/page.tsx b/app/(loggedOutRoutes)/auth/login/page.tsx
index 1e898f19..059fcd28 100644
--- a/app/(loggedOutRoutes)/auth/login/page.tsx
+++ b/app/(loggedOutRoutes)/auth/login/page.tsx
@@ -4,28 +4,31 @@ import LoginForm from "@/app/_components/GlobalComponents/Auth/LoginForm";
 import { AuthShell } from "@/app/_components/GlobalComponents/Auth/AuthShell";
 import { getTranslations } from "next-intl/server";
 import { SsoOnlyLogin } from "@/app/_components/GlobalComponents/Auth/SsoOnlyLogin";
-import { isEnvEnabled } from "@/app/_utils/env-utils";
+import { isEnvEnabled, getAuthMode } from "@/app/_utils/env-utils";
 
 export const dynamic = "force-dynamic";
 
 export default async function LoginPage() {
   const t = await getTranslations("auth");
-  const ssoEnabled = process.env.SSO_MODE === "oidc";
+  const authMode = getAuthMode();
+  const ssoIsOidc = authMode === "oidc";
   const allowLocal = isEnvEnabled(process.env.SSO_FALLBACK_LOCAL);
 
   const hasExistingUsers = await hasUsers();
-  if ((!hasExistingUsers && !ssoEnabled) || (!hasExistingUsers && allowLocal)) {
+  if (!hasExistingUsers && !authMode) {
     redirect("/auth/setup");
   }
 
-  if (ssoEnabled && !allowLocal) {
+  if (ssoIsOidc && !allowLocal) {
     return <SsoOnlyLogin />;
   }
 
+  const showRegisterLink = allowLocal && !hasExistingUsers;
+
   return (
     <AuthShell>
       <div className="space-y-6">
-        <LoginForm ssoEnabled={ssoEnabled} />
+        <LoginForm ssoEnabled={ssoIsOidc} showRegisterLink={showRegisterLink} />
       </div>
     </AuthShell>
   );
diff --git a/app/(loggedOutRoutes)/auth/setup/page.tsx b/app/(loggedOutRoutes)/auth/setup/page.tsx
index 7399b7e2..0fb0935f 100644
--- a/app/(loggedOutRoutes)/auth/setup/page.tsx
+++ b/app/(loggedOutRoutes)/auth/setup/page.tsx
@@ -2,15 +2,14 @@ import { redirect } from "next/navigation";
 import { hasUsers } from "@/app/_server/actions/users";
 import SetupForm from "@/app/(loggedOutRoutes)/auth/setup/setup-form";
 import { AuthShell } from "@/app/_components/GlobalComponents/Auth/AuthShell";
-import { isEnvEnabled } from "@/app/_utils/env-utils";
+import { isEnvEnabled, getAuthMode } from "@/app/_utils/env-utils";
 
 export const dynamic = "force-dynamic";
 
 export default async function SetupPage() {
-  const ssoEnabled = process.env.SSO_MODE === "oidc";
   const allowLocal = isEnvEnabled(process.env.SSO_FALLBACK_LOCAL);
 
-  if (ssoEnabled && !allowLocal) {
+  if (getAuthMode() && !allowLocal) {
     redirect("/auth/login");
   }
 
diff --git a/app/_components/FeatureComponents/Checklists/Checklist.tsx b/app/_components/FeatureComponents/Checklists/Checklist.tsx
index a523ddf0..f6c7419f 100644
--- a/app/_components/FeatureComponents/Checklists/Checklist.tsx
+++ b/app/_components/FeatureComponents/Checklists/Checklist.tsx
@@ -2,7 +2,7 @@
 
 import { useState, useEffect } from "react";
 import { Checklist } from "@/app/_types";
-import { KanbanBoard } from "@/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanBoard";
+import { Kanban } from "@/app/_components/FeatureComponents/Kanban/Kanban";
 import { useChecklist } from "@/app/_hooks/useChecklist";
 import { ChecklistHeader } from "@/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistHeader";
 import { ChecklistHeading } from "@/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistHeading";
@@ -116,7 +116,7 @@ export const ChecklistView = ({
               ),
             },
           ]}
-          onRemove={() => {}}
+          onRemove={() => { }}
         ></ToastContainer>
       )}
 
@@ -136,7 +136,7 @@ export const ChecklistView = ({
               ),
             },
           ]}
-          onRemove={() => {}}
+          onRemove={() => { }}
         ></ToastContainer>
       )}
 
@@ -165,7 +165,7 @@ export const ChecklistView = ({
         />
       ) : (
         <div className="flex-1 overflow-hidden p-4">
-          <KanbanBoard checklist={localList} onUpdate={onUpdate} />
+          <Kanban checklist={localList} onUpdate={onUpdate} />
         </div>
       )}
 
diff --git a/app/_components/FeatureComponents/Checklists/ChecklistsPageClient.tsx b/app/_components/FeatureComponents/Checklists/ChecklistsPageClient.tsx
index 8af9b43c..dc037ddf 100644
--- a/app/_components/FeatureComponents/Checklists/ChecklistsPageClient.tsx
+++ b/app/_components/FeatureComponents/Checklists/ChecklistsPageClient.tsx
@@ -24,6 +24,7 @@ import { useSettings } from "@/app/_utils/settings-store";
 import { ChecklistListItem } from "@/app/_components/GlobalComponents/Cards/ChecklistListItem";
 import { ChecklistGridItem } from "@/app/_components/GlobalComponents/Cards/ChecklistGridItem";
 import { useChecklistsFilter } from "@/app/_components/FeatureComponents/Checklists/ChecklistsClient";
+import { isKanbanType } from "@/app/_types/enums";
 
 interface ChecklistsPageClientProps {
   initialLists: Checklist[];
@@ -34,7 +35,7 @@ export const ChecklistsPageClient = ({
   initialLists,
   user,
 }: ChecklistsPageClientProps) => {
-  const t = useTranslations('checklists');
+  const t = useTranslations("checklists");
   const router = useRouter();
   const { openCreateChecklistModal } = useShortcut();
   const { isInitialized } = useAppMode();
@@ -63,16 +64,16 @@ export const ChecklistsPageClient = ({
       filtered = filtered.filter(
         (list) =>
           list.items.length > 0 &&
-          list.items.every((item) => isItemCompleted(item, list.type))
+          list.items.every((item) => isItemCompleted(item, list.type)),
       );
     } else if (checklistFilter === "incomplete") {
       filtered = filtered.filter(
         (list) =>
           list.items.length === 0 ||
-          !list.items.every((item) => isItemCompleted(item, list.type))
+          !list.items.every((item) => isItemCompleted(item, list.type)),
       );
     } else if (checklistFilter === "task") {
-      filtered = filtered.filter((list) => list.type === "task");
+      filtered = filtered.filter((list) => isKanbanType(list.type));
     } else if (checklistFilter === "simple") {
       filtered = filtered.filter((list) => list.type === "simple");
     }
@@ -84,7 +85,7 @@ export const ChecklistsPageClient = ({
           return selectedCategories.some(
             (selected) =>
               listCategory === selected ||
-              listCategory.startsWith(selected + "/")
+              listCategory.startsWith(selected + "/"),
           );
         }
         return selectedCategories.includes(listCategory);
@@ -93,7 +94,7 @@ export const ChecklistsPageClient = ({
 
     return filtered.sort(
       (a, b) =>
-        new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+        new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
     );
   }, [
     initialLists,
@@ -103,7 +104,14 @@ export const ChecklistsPageClient = ({
     user?.pinnedLists,
   ]);
 
-  const { currentPage, totalPages, paginatedItems, goToPage, totalItems, handleItemsPerPageChange } = usePagination({
+  const {
+    currentPage,
+    totalPages,
+    paginatedItems,
+    goToPage,
+    totalItems,
+    handleItemsPerPageChange,
+  } = usePagination({
     items: filteredLists,
     itemsPerPage,
     onItemsPerPageChange: setItemsPerPage,
@@ -117,7 +125,14 @@ export const ChecklistsPageClient = ({
       onPageChange: goToPage,
       onItemsPerPageChange: handleItemsPerPageChange,
     });
-  }, [currentPage, totalPages, totalItems, goToPage, handleItemsPerPageChange, setPaginationInfo]);
+  }, [
+    currentPage,
+    totalPages,
+    totalItems,
+    goToPage,
+    handleItemsPerPageChange,
+    setPaginationInfo,
+  ]);
 
   const handleTogglePin = async (list: Checklist) => {
     if (!user || isTogglingPin === list.id) return;
@@ -127,7 +142,7 @@ export const ChecklistsPageClient = ({
       const result = await togglePin(
         list.id,
         list.category || "Uncategorized",
-        ItemTypes.CHECKLIST
+        ItemTypes.CHECKLIST,
       );
       if (result.success) {
         router.refresh();
@@ -149,7 +164,7 @@ export const ChecklistsPageClient = ({
     }, 0);
     const totalItems = initialLists.reduce(
       (acc, list) => acc + list.items.length,
-      0
+      0,
     );
     const completionRate =
       totalItems > 0 ? Math.round((completedItems / totalItems) * 100) : 0;
@@ -167,9 +182,9 @@ export const ChecklistsPageClient = ({
         icon={
           <CheckmarkSquare04Icon className="h-10 w-10 text-muted-foreground" />
         }
-        title={t('noChecklistsYet')}
-        description={t('createFirstChecklist')}
-        buttonText={t('newChecklist')}
+        title={t("noChecklistsYet")}
+        description={t("createFirstChecklist")}
+        buttonText={t("newChecklist")}
         onButtonClick={() => openCreateChecklistModal()}
       />
     );
@@ -187,7 +202,9 @@ export const ChecklistsPageClient = ({
               <div className="text-xl sm:text-2xl font-bold text-foreground">
                 {stats.totalLists}
               </div>
-              <div className="text-md lg:text-xs text-muted-foreground">{t('lists')}</div>
+              <div className="text-md lg:text-xs text-muted-foreground">
+                {t("lists")}
+              </div>
             </div>
           </div>
 
@@ -199,7 +216,9 @@ export const ChecklistsPageClient = ({
               <div className="text-xl sm:text-2xl font-bold text-foreground">
                 {stats.completedItems}
               </div>
-              <div className="text-md lg:text-xs text-muted-foreground">{t('completed')}</div>
+              <div className="text-md lg:text-xs text-muted-foreground">
+                {t("completed")}
+              </div>
             </div>
           </div>
 
@@ -211,7 +230,9 @@ export const ChecklistsPageClient = ({
               <div className="text-xl sm:text-2xl font-bold text-foreground">
                 {stats.completionRate}%
               </div>
-              <div className="text-md lg:text-xs text-muted-foreground">{t('progress')}</div>
+              <div className="text-md lg:text-xs text-muted-foreground">
+                {t("progress")}
+              </div>
             </div>
           </div>
 
@@ -223,7 +244,9 @@ export const ChecklistsPageClient = ({
               <div className="text-xl sm:text-2xl font-bold text-foreground">
                 {stats.totalItems}
               </div>
-              <div className="text-md lg:text-xs text-muted-foreground">{t('totalItems')}</div>
+              <div className="text-md lg:text-xs text-muted-foreground">
+                {t("totalItems")}
+              </div>
             </div>
           </div>
         </div>
@@ -233,15 +256,15 @@ export const ChecklistsPageClient = ({
         <div className="text-center py-12">
           <Folder01Icon className="h-12 w-12 text-muted-foreground mx-auto mb-4" />
           <h3 className="text-lg font-medium text-foreground mb-2">
-            {t('noChecklistsFound')}
+            {t("noChecklistsFound")}
           </h3>
           <p className="text-muted-foreground">
-            {t('tryAdjustingFiltersChecklist')}
+            {t("tryAdjustingFiltersChecklist")}
           </p>
         </div>
       ) : (
         <div className="mt-6">
-          {viewMode === 'card' && (
+          {viewMode === "card" && (
             <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
               {paginatedItems.map((list) => (
                 <ChecklistCard
@@ -252,7 +275,7 @@ export const ChecklistsPageClient = ({
                     router.push(`/checklist/${categoryPath}`);
                   }}
                   isPinned={user?.pinnedLists?.includes(
-                    `${list.category || "Uncategorized"}/${list.id}`
+                    `${list.category || "Uncategorized"}/${list.id}`,
                   )}
                   onTogglePin={() => handleTogglePin(list)}
                 />
@@ -260,7 +283,7 @@ export const ChecklistsPageClient = ({
             </div>
           )}
 
-          {viewMode === 'list' && (
+          {viewMode === "list" && (
             <div className="space-y-3">
               {paginatedItems.map((list) => (
                 <ChecklistListItem
@@ -271,7 +294,7 @@ export const ChecklistsPageClient = ({
                     router.push(`/checklist/${categoryPath}`);
                   }}
                   isPinned={user?.pinnedLists?.includes(
-                    `${list.category || "Uncategorized"}/${list.id}`
+                    `${list.category || "Uncategorized"}/${list.id}`,
                   )}
                   onTogglePin={() => handleTogglePin(list)}
                 />
@@ -279,7 +302,7 @@ export const ChecklistsPageClient = ({
             </div>
           )}
 
-          {viewMode === 'grid' && (
+          {viewMode === "grid" && (
             <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-4">
               {paginatedItems.map((list) => (
                 <ChecklistGridItem
@@ -290,7 +313,7 @@ export const ChecklistsPageClient = ({
                     router.push(`/checklist/${categoryPath}`);
                   }}
                   isPinned={user?.pinnedLists?.includes(
-                    `${list.category || "Uncategorized"}/${list.id}`
+                    `${list.category || "Uncategorized"}/${list.id}`,
                   )}
                   onTogglePin={() => handleTogglePin(list)}
                 />
diff --git a/app/_components/FeatureComponents/Checklists/Parts/ChecklistClient.tsx b/app/_components/FeatureComponents/Checklists/Parts/ChecklistClient.tsx
index d8f4c837..e6e1fa05 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/ChecklistClient.tsx
+++ b/app/_components/FeatureComponents/Checklists/Parts/ChecklistClient.tsx
@@ -4,7 +4,7 @@ import { useState, useEffect, useRef, useCallback } from "react";
 import { useRouter } from "next/navigation";
 import { Category, Checklist, SanitisedUser } from "@/app/_types";
 import { ChecklistView } from "@/app/_components/FeatureComponents/Checklists/Checklist";
-import { KanbanBoard } from "@/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanBoard";
+import { Kanban } from "@/app/_components/FeatureComponents/Kanban/Kanban";
 import { ChecklistHeader } from "@/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistHeader";
 import { ShareModal } from "@/app/_components/GlobalComponents/Modals/SharingModals/ShareModal";
 import { ConfirmModal } from "@/app/_components/GlobalComponents/Modals/ConfirmationModals/ConfirmModal";
@@ -15,7 +15,7 @@ import { CloneCategoryModal } from "@/app/_components/GlobalComponents/Modals/Co
 import { useNavigationGuard } from "@/app/_providers/NavigationGuardProvider";
 import { Layout } from "@/app/_components/GlobalComponents/Layout/Layout";
 import { useChecklist } from "@/app/_hooks/useChecklist";
-import { Modes } from "@/app/_types/enums";
+import { isKanbanType, Modes } from "@/app/_types/enums";
 import { useShortcut } from "@/app/_providers/ShortcutsProvider";
 import { toggleArchive } from "@/app/_server/actions/dashboard";
 import { buildCategoryPath } from "@/app/_utils/global-utils";
@@ -131,9 +131,9 @@ export const ChecklistClient = ({
   });
 
   const renderContent = () => {
-    if (localChecklist.type === "task") {
+    if (isKanbanType(localChecklist.type)) {
       return (
-        <div className="h-full flex flex-col bg-background">
+        <div className="h-full flex flex-col bg-background min-w-0">
           <ChecklistHeader
             checklist={localChecklist}
             onBack={handleBack}
@@ -144,7 +144,7 @@ export const ChecklistClient = ({
             onArchive={handleArchive}
             onClone={handleClone}
           />
-          <KanbanBoard checklist={localChecklist} onUpdate={handleUpdate} />
+          <Kanban checklist={localChecklist} onUpdate={handleUpdate} />
         </div>
       );
     }
@@ -193,11 +193,11 @@ export const ChecklistClient = ({
             currentType:
               localChecklist.type === "simple"
                 ? t("checklists.simpleChecklist")
-                : t("checklists.taskProject"),
+                : t("checklists.kanbanBoard"),
             newType:
               getNewType(localChecklist.type) === "simple"
                 ? t("checklists.simpleChecklist")
-                : t("checklists.taskProject"),
+                : t("checklists.kanbanBoard"),
           })}
           confirmText={t("checklists.convert")}
         />
diff --git a/app/_components/FeatureComponents/Checklists/Parts/ChecklistTypeSelector.tsx b/app/_components/FeatureComponents/Checklists/Parts/ChecklistTypeSelector.tsx
index 61ff38c3..f9fec8bf 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/ChecklistTypeSelector.tsx
+++ b/app/_components/FeatureComponents/Checklists/Parts/ChecklistTypeSelector.tsx
@@ -25,7 +25,7 @@ export const ChecklistTypeSelector = ({
       </label>
 
       <div className="grid grid-cols-2 gap-3">
-        {([ChecklistsTypes.SIMPLE, ChecklistsTypes.TASK] as const).map((type) => (
+        {([ChecklistsTypes.SIMPLE, ChecklistsTypes.KANBAN] as const).map((type) => (
           <button
             key={type}
             type="button"
@@ -45,7 +45,7 @@ export const ChecklistTypeSelector = ({
               <div className="font-medium text-sm">
                 {type === ChecklistsTypes.SIMPLE
                   ? t("checklists.simpleChecklist")
-                  : t("checklists.taskProject")}
+                  : t("checklists.kanbanBoard")}
               </div>
               <div className="text-md lg:text-xs text-muted-foreground">
                 {type === ChecklistsTypes.SIMPLE
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistHeader.tsx b/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistHeader.tsx
index 5818b1d6..69017b6c 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistHeader.tsx
+++ b/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistHeader.tsx
@@ -128,12 +128,12 @@ export const ChecklistHeader = ({
                 }}
                 className="h-10 w-10 p-0"
                 title={
-                  checklist.type === ChecklistsTypes.TASK
+                  checklist.type === ChecklistsTypes.KANBAN || checklist.type === ChecklistsTypes.TASK
                     ? t('checklists.convertToSimpleChecklist')
                     : t('checklists.convertToTaskProject')
                 }
               >
-                {checklist.type === ChecklistsTypes.TASK ? (
+                {checklist.type === ChecklistsTypes.KANBAN || checklist.type === ChecklistsTypes.TASK ? (
                   <CheckmarkSquare04Icon className="h-4 w-4 lg:h-5 lg:w-5" />
                 ) : (
                   <TaskDaily01Icon className="h-4 w-4 lg:h-5 lg:w-5" />
@@ -174,11 +174,11 @@ export const ChecklistHeader = ({
                       {
                         type: "item" as const,
                         label:
-                          checklist.type === ChecklistsTypes.TASK
-                            ? "Convert to Simple Checklist"
-                            : "Convert to Task Project",
+                          checklist.type === ChecklistsTypes.KANBAN || checklist.type === ChecklistsTypes.TASK
+                            ? t("checklists.convertToSimpleChecklist")
+                            : t("checklists.convertToKanbanBoard"),
                         icon:
-                          checklist.type === ChecklistsTypes.TASK ? (
+                          checklist.type === ChecklistsTypes.KANBAN || checklist.type === ChecklistsTypes.TASK ? (
                             <CheckmarkSquare04Icon className="h-4 w-4" />
                           ) : (
                             <TaskDaily01Icon className="h-4 w-4" />
@@ -194,7 +194,7 @@ export const ChecklistHeader = ({
                     ? [
                       {
                         type: "item" as const,
-                        label: "Clone",
+                        label: t("common.clone"),
                         icon: <Copy02Icon className="h-4 w-4" />,
                         onClick: onClone,
                       },
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistModals.tsx b/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistModals.tsx
index 01f66ace..8448e1d0 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistModals.tsx
+++ b/app/_components/FeatureComponents/Checklists/Parts/Common/ChecklistModals.tsx
@@ -1,7 +1,7 @@
 import { ShareModal } from "@/app/_components/GlobalComponents/Modals/SharingModals/ShareModal";
 import { ConfirmModal } from "@/app/_components/GlobalComponents/Modals/ConfirmationModals/ConfirmModal";
 import { BulkPasteModal } from "@/app/_components/GlobalComponents/Modals/BulkPasteModal/BulkPasteModal";
-import { Checklist } from "@/app/_types";
+import { Checklist, ChecklistType } from "@/app/_types";
 import { useRouter } from "next/navigation";
 import { useTranslations } from "next-intl";
 
@@ -16,7 +16,7 @@ interface ChecklistModalsProps {
   showBulkPasteModal: boolean;
   setShowBulkPasteModal: (show: boolean) => void;
   handleConfirmConversion: () => void;
-  getNewType: (type: "simple" | "task") => "simple" | "task";
+  getNewType: (type: ChecklistType) => ChecklistType;
   handleBulkPaste: (itemsText: string) => void;
   isLoading: boolean;
   DeleteModal: () => JSX.Element;
@@ -39,8 +39,8 @@ export const ChecklistModals = ({
   const router = useRouter();
   const t = useTranslations();
 
-  const currentType = localList.type === "simple" ? t("checklists.simpleChecklist") : t("checklists.taskProject");
-  const newType = getNewType(localList.type) === "simple" ? t("checklists.simpleChecklist") : t("checklists.taskProject");
+  const currentType = localList.type === "simple" ? t("checklists.simpleChecklist") : t("checklists.kanbanBoard");
+  const newType = getNewType(localList.type) === "simple" ? t("checklists.simpleChecklist") : t("checklists.kanbanBoard");
 
   return (
     <>
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanBoard.tsx b/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanBoard.tsx
deleted file mode 100644
index b75a367d..00000000
--- a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanBoard.tsx
+++ /dev/null
@@ -1,358 +0,0 @@
-"use client";
-
-import { useState, useEffect, useMemo } from "react";
-import {
-  DndContext,
-  DragOverlay,
-  PointerSensor,
-  KeyboardSensor,
-  useSensor,
-  useSensors,
-} from "@dnd-kit/core";
-import { Checklist, KanbanStatus } from "@/app/_types";
-import { KanbanColumn } from "./KanbanColumn";
-import { KanbanItem } from "./KanbanItem";
-import { ChecklistHeading } from "../Common/ChecklistHeading";
-import { BulkPasteModal } from "@/app/_components/GlobalComponents/Modals/BulkPasteModal/BulkPasteModal";
-import { StatusManagementModal } from "./StatusManagementModal";
-import { ArchivedItemsModal } from "./ArchivedItemsModal";
-import { useKanbanBoard } from "../../../../../_hooks/useKanbanBoard";
-import { ItemTypes, TaskStatus, TaskStatusLabels } from "@/app/_types/enums";
-import { ReferencedBySection } from "../../../Notes/Parts/ReferencedBySection";
-import { getReferences } from "@/app/_utils/indexes-utils";
-import { useAppMode } from "@/app/_providers/AppModeProvider";
-import { encodeCategoryPath } from "@/app/_utils/global-utils";
-import { usePermissions } from "@/app/_providers/PermissionsProvider";
-import { Settings01Icon, Archive02Icon } from "hugeicons-react";
-import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
-import { updateChecklistStatuses } from "@/app/_server/actions/checklist";
-import { unarchiveItem } from "@/app/_server/actions/checklist-item";
-import { useTranslations } from "next-intl";
-
-interface KanbanBoardProps {
-  checklist: Checklist;
-  onUpdate: (updatedChecklist: Checklist) => void;
-}
-
-const defaultStatuses: KanbanStatus[] = [
-  {
-    id: TaskStatus.TODO,
-    label: TaskStatusLabels.TODO,
-    order: 0,
-    autoComplete: false,
-  },
-  {
-    id: TaskStatus.IN_PROGRESS,
-    label: TaskStatusLabels.IN_PROGRESS,
-    order: 1,
-    autoComplete: false,
-  },
-  {
-    id: TaskStatus.COMPLETED,
-    label: TaskStatusLabels.COMPLETED,
-    order: 2,
-    autoComplete: true,
-  },
-  {
-    id: TaskStatus.PAUSED,
-    label: TaskStatusLabels.PAUSED,
-    order: 3,
-    autoComplete: false,
-  },
-];
-
-export const KanbanBoard = ({ checklist, onUpdate }: KanbanBoardProps) => {
-  const t = useTranslations();
-  const [isClient, setIsClient] = useState(false);
-  const [showStatusModal, setShowStatusModal] = useState(false);
-  const [showArchivedModal, setShowArchivedModal] = useState(false);
-  const { linkIndex, notes, checklists, appSettings, allSharedItems } =
-    useAppMode();
-  const encodedCategory = encodeCategoryPath(
-    checklist.category || "Uncategorized"
-  );
-  const isShared =
-    allSharedItems?.checklists.some(
-      (sharedChecklist) =>
-        sharedChecklist.id === checklist.id &&
-        sharedChecklist.category === encodedCategory
-    ) || false;
-  const { permissions } = usePermissions();
-  const {
-    localChecklist,
-    isLoading,
-    showBulkPasteModal,
-    setShowBulkPasteModal,
-    focusKey,
-    refreshChecklist,
-    getItemsByStatus,
-    handleDragStart,
-    handleDragEnd,
-    handleAddItem,
-    handleBulkPaste,
-    handleItemStatusUpdate,
-    activeItem,
-  } = useKanbanBoard({ checklist, onUpdate });
-
-  const statuses = useMemo(() => {
-    const currentStatuses = localChecklist.statuses || defaultStatuses;
-    return currentStatuses.map(status => {
-      if (status.id === TaskStatus.COMPLETED && status.autoComplete === undefined) {
-        return { ...status, autoComplete: true };
-      }
-      return status;
-    });
-  }, [localChecklist.statuses]);
-
-  const columns = statuses
-    .sort((a, b) => a.order - b.order)
-    .map((status) => ({
-      id: status.id,
-      title: status.label,
-      status: status.id,
-    }));
-
-  const handleSaveStatuses = async (newStatuses: KanbanStatus[]) => {
-    const formData = new FormData();
-    formData.append("uuid", localChecklist.uuid || "");
-    formData.append("statusesStr", JSON.stringify(newStatuses));
-
-    const result = await updateChecklistStatuses(formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      await refreshChecklist();
-    }
-  };
-
-  const itemsByStatus = statuses.reduce((acc, status) => {
-    acc[status.id] = localChecklist.items.filter(
-      (item) => item.status === status.id && !item.isArchived
-    ).length;
-    return acc;
-  }, {} as Record<string, number>);
-
-  const archivedItems = localChecklist.items.filter((item) => item.isArchived);
-
-  const handleUnarchive = async (itemId: string) => {
-    const formData = new FormData();
-    formData.append("listId", localChecklist.id);
-    formData.append("itemId", itemId);
-    formData.append("category", localChecklist.category || "Uncategorized");
-
-    const result = await unarchiveItem(formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      await refreshChecklist();
-    }
-  };
-
-  const handleToggleItem = async (itemId: string, completed: boolean) => {
-    const newStatus = completed ? TaskStatus.COMPLETED : TaskStatus.TODO;
-    await handleItemStatusUpdate(itemId, newStatus);
-  };
-
-  const sensors = useSensors(
-    useSensor(PointerSensor, {
-      activationConstraint: {
-        distance: 8,
-        delay: 100,
-        tolerance: 5,
-      },
-    }),
-    useSensor(KeyboardSensor)
-  );
-
-  useEffect(() => {
-    setIsClient(true);
-  }, []);
-
-  const referencingItems = useMemo(() => {
-    return getReferences(
-      linkIndex,
-      localChecklist.uuid,
-      localChecklist.category,
-      ItemTypes.CHECKLIST,
-      notes,
-      checklists
-    );
-  }, [
-    linkIndex,
-    localChecklist.uuid,
-    localChecklist.category,
-    checklists,
-    notes,
-  ]);
-
-  return (
-    <div className="h-full flex flex-col bg-background overflow-y-auto jotty-scrollable-content">
-      {permissions?.canEdit && (
-        <ChecklistHeading
-          key={focusKey}
-          checklist={checklist}
-          onSubmit={handleAddItem}
-          onToggleCompletedItem={handleToggleItem}
-          onBulkSubmit={() => setShowBulkPasteModal(true)}
-          isLoading={isLoading}
-          autoFocus={true}
-          focusKey={focusKey}
-          placeholder={t("checklists.addNewTask")}
-          submitButtonText={t("tasks.addTask")}
-        />
-      )}
-      <div className="flex gap-2 px-4 pt-4 pb-2 w-full justify-end">
-        {permissions?.canEdit && (
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => setShowStatusModal(true)}
-            className="text-md lg:text-xs"
-          >
-            <Settings01Icon className="h-3 w-3 mr-1" />
-            {t("tasks.manageStatuses")}
-          </Button>
-        )}
-        <Button
-          variant="outline"
-          size="sm"
-          onClick={() => setShowArchivedModal(true)}
-          className="text-md lg:text-xs"
-        >
-          <Archive02Icon className="h-3 w-3 mr-1" />
-          {t("tasks.viewArchived")}
-        </Button>
-      </div>
-      <div className="flex-1 pb-[8.5em]">
-        {isClient ? (
-          <DndContext
-            sensors={sensors}
-            onDragStart={handleDragStart}
-            onDragEnd={handleDragEnd}
-          >
-            <div
-              className={
-                columns.length <= 4
-                  ? "h-full grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 p-2 sm:p-4"
-                  : "h-full lg:flex lg:gap-4 p-2 sm:p-4 overflow-x-auto"
-              }
-            >
-              {columns.map((column) => {
-                const items = getItemsByStatus(column.status);
-                return (
-                  <div
-                    key={column.id}
-                    className={`${columns.length > 4
-                        ? "flex-shrink-0 min-w-[20%]"
-                        : "min-w-[24%] "
-                      }`}
-                  >
-                    <KanbanColumn
-                      checklist={localChecklist}
-                      id={column.id}
-                      title={column.title}
-                      items={items}
-                      status={column.status}
-                      checklistId={localChecklist.id}
-                      category={localChecklist.category || "Uncategorized"}
-                      onUpdate={refreshChecklist}
-                      isShared={isShared}
-                      statusColor={
-                        statuses.find((s) => s.id === column.id)?.color
-                      }
-                      statuses={statuses}
-                    />
-                  </div>
-                );
-              })}
-            </div>
-
-            <DragOverlay>
-              {activeItem ? (
-                <KanbanItem
-                  checklist={localChecklist}
-                  item={activeItem}
-                  isDragging
-                  checklistId={localChecklist.id}
-                  category={localChecklist.category || "Uncategorized"}
-                  onUpdate={refreshChecklist}
-                  isShared={isShared}
-                  statuses={statuses}
-                />
-              ) : null}
-            </DragOverlay>
-          </DndContext>
-        ) : (
-          <div
-            className={
-              columns.length <= 4
-                ? "h-full grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 p-2 sm:p-4"
-                : "h-full flex gap-4 p-2 sm:p-4 overflow-x-auto"
-            }
-          >
-            {columns.map((column) => {
-              const items = getItemsByStatus(column.status);
-              return (
-                <div
-                  key={column.id}
-                  className={columns.length > 4 ? "flex-shrink-0" : ""}
-                  style={columns.length > 4 ? { width: "320px" } : undefined}
-                >
-                  <KanbanColumn
-                    checklist={localChecklist}
-                    id={column.id}
-                    title={column.title}
-                    items={items}
-                    status={column.status}
-                    checklistId={localChecklist.id}
-                    category={localChecklist.category || "Uncategorized"}
-                    onUpdate={refreshChecklist}
-                    isShared={isShared}
-                    statusColor={
-                      statuses.find((s) => s.id === column.id)?.color
-                    }
-                    statuses={statuses}
-                  />
-                </div>
-              );
-            })}
-          </div>
-        )}
-
-        <div className="px-4 pt-4 pb-[100px] lg:pb-4">
-          {referencingItems.length > 0 &&
-            appSettings?.editor?.enableBilateralLinks && (
-              <ReferencedBySection referencingItems={referencingItems} />
-            )}
-        </div>
-      </div>
-
-      {showBulkPasteModal && (
-        <BulkPasteModal
-          isOpen={showBulkPasteModal}
-          onClose={() => setShowBulkPasteModal(false)}
-          onSubmit={handleBulkPaste}
-          isLoading={isLoading}
-        />
-      )}
-
-      {showStatusModal && (
-        <StatusManagementModal
-          isOpen={showStatusModal}
-          onClose={() => setShowStatusModal(false)}
-          currentStatuses={statuses}
-          onSave={handleSaveStatuses}
-          itemsByStatus={itemsByStatus}
-        />
-      )}
-
-      {showArchivedModal && (
-        <ArchivedItemsModal
-          isOpen={showArchivedModal}
-          onClose={() => setShowArchivedModal(false)}
-          archivedItems={archivedItems}
-          onUnarchive={handleUnarchive}
-          statuses={statuses}
-        />
-      )}
-    </div>
-  );
-};
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItemTimer.tsx b/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItemTimer.tsx
deleted file mode 100644
index 3a3f8b96..00000000
--- a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItemTimer.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-"use client";
-
-import { memo, useState } from "react";
-import { Clock01Icon, TimeQuarterIcon, Add01Icon } from "hugeicons-react";
-import { PauseCircleIcon } from "@hugeicons/core-free-icons";
-import { HugeiconsIcon } from "@hugeicons/react";
-import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
-import { usePermissions } from "@/app/_providers/PermissionsProvider";
-import { PromptModal } from "@/app/_components/GlobalComponents/Modals/ConfirmationModals/PromptModal";
-import { useTranslations } from "next-intl";
-
-interface KanbanItemTimerProps {
-  totalTime: number;
-  currentTime: number;
-  isRunning: boolean;
-  formatTimerTime: (seconds: number) => string;
-  onTimerToggle: () => void;
-  onAddManualTime: (minutes: number) => void;
-}
-
-const KanbanItemTimerComponent = ({
-  totalTime,
-  currentTime,
-  isRunning,
-  formatTimerTime,
-  onTimerToggle,
-  onAddManualTime,
-}: KanbanItemTimerProps) => {
-  const { permissions } = usePermissions();
-  const t = useTranslations();
-  const [showTimeModal, setShowTimeModal] = useState(false);
-
-  const handleAddTime = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    setShowTimeModal(true);
-  };
-
-  const confirmAddTime = (minutes: string) => {
-    if (minutes && !isNaN(Number(minutes))) {
-      onAddManualTime(Number(minutes));
-    }
-  };
-
-  return (
-    <div className="flex items-center justify-between text-sm lg:text-xs text-muted-foreground pt-1">
-      <div className="flex items-center gap-2">
-        <div className="flex items-center gap-1">
-          <Clock01Icon className="h-3 w-3" />
-          <span>{formatTimerTime(totalTime + currentTime)}</span>
-        </div>
-        <div className="flex" onPointerDown={(e) => e.stopPropagation()}>
-          <Button
-            variant="ghost"
-            size="sm"
-            className="h-5 w-5 p-0"
-            disabled={!permissions?.canEdit}
-            onClick={(e) => {
-              e.stopPropagation();
-              onTimerToggle();
-            }}
-          >
-            {isRunning ? (
-              <HugeiconsIcon icon={PauseCircleIcon} className="h-3 w-3" />
-            ) : (
-              <TimeQuarterIcon className="h-3 w-3" />
-            )}
-          </Button>
-          <Button
-            variant="ghost"
-            size="sm"
-            className="h-5 w-5 p-0"
-            disabled={!permissions?.canEdit}
-            onClick={handleAddTime}
-          >
-            <Add01Icon className="h-3 w-3" />
-          </Button>
-        </div>
-      </div>
-
-      <PromptModal
-        isOpen={showTimeModal}
-        onClose={() => setShowTimeModal(false)}
-        onConfirm={confirmAddTime}
-        title={t("checklists.addTime")}
-        message={t("checklists.enterTimeInMinutes")}
-        placeholder="15"
-        confirmText={t("common.confirm")}
-      />
-    </div>
-  );
-};
-
-export const KanbanItemTimer = memo(KanbanItemTimerComponent);
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/SubtaskModal.tsx b/app/_components/FeatureComponents/Checklists/Parts/Kanban/SubtaskModal.tsx
deleted file mode 100644
index 04c2d2a2..00000000
--- a/app/_components/FeatureComponents/Checklists/Parts/Kanban/SubtaskModal.tsx
+++ /dev/null
@@ -1,503 +0,0 @@
-"use client";
-
-import { useState, useEffect, useMemo } from "react";
-import { Modal } from "@/app/_components/GlobalComponents/Modals/Modal";
-import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
-import { Item, Checklist } from "@/app/_types";
-import {
-  createSubItem,
-  updateItem,
-  deleteItem,
-  bulkToggleItems,
-} from "@/app/_server/actions/checklist-item";
-import {
-  Add01Icon,
-  FloppyDiskIcon,
-  MultiplicationSignIcon,
-} from "hugeicons-react";
-import { NestedChecklistItem } from "@/app/_components/FeatureComponents/Checklists/Parts/Simple/NestedChecklistItem";
-import { convertMarkdownToHtml } from "@/app/_utils/markdown-utils";
-import { usePermissions } from "@/app/_providers/PermissionsProvider";
-import { usePreferredDateTime } from "@/app/_hooks/usePreferredDateTime";
-import { useTranslations } from "next-intl";
-
-interface SubtaskModalProps {
-  checklist: Checklist;
-  item: Item;
-  isOpen: boolean;
-  onClose: () => void;
-  onUpdate: (updatedChecklist: Checklist) => void;
-  checklistId: string;
-  category: string;
-  isShared: boolean;
-}
-
-const sanitizeDescription = (text: string): string => {
-  return text.replace(/\n/g, "\\n");
-};
-
-const unsanitizeDescription = (text: string): string => {
-  return text.replace(/\\n/g, "\n");
-};
-
-export const SubtaskModal = ({
-  checklist,
-  item: initialItem,
-  isOpen,
-  onClose,
-  onUpdate,
-  checklistId,
-  category,
-  isShared,
-}: SubtaskModalProps) => {
-  const t = useTranslations();
-  const { permissions } = usePermissions();
-  const { formatDateTimeString } = usePreferredDateTime();
-
-  const [item, setItem] = useState(initialItem);
-  const [isEditing, setIsEditing] = useState(false);
-  const [editText, setEditText] = useState(item.text);
-  const [editDescription, setEditDescription] = useState(
-    unsanitizeDescription(item.description || "")
-  );
-  const [newSubtaskText, setNewSubtaskText] = useState("");
-
-  useEffect(() => {
-    setItem(initialItem);
-    setEditText(initialItem.text);
-    setEditDescription(unsanitizeDescription(initialItem.description || ""));
-  }, [initialItem]);
-
-  const descriptionHtml = useMemo(() => {
-    const noDescText = `<p class="text-muted-foreground text-md lg:text-sm opacity-50">${t(
-      "checklists.noDescription"
-    )}</p>`;
-    if (!item.description) return noDescText;
-    const unsanitized = unsanitizeDescription(item.description);
-    const withLineBreaks = unsanitized.replace(/\n/g, "  \n");
-    return convertMarkdownToHtml(withLineBreaks) || noDescText;
-  }, [item.description, t]);
-
-  const findItemInChecklist = (
-    checklist: Checklist,
-    itemId: string
-  ): Item | null => {
-    const searchItems = (items: Item[]): Item | null => {
-      for (const item of items) {
-        if (item.id === itemId) return item;
-        if (item.children) {
-          const found = searchItems(item.children);
-          if (found) return found;
-        }
-      }
-      return null;
-    };
-    return searchItems(checklist.items);
-  };
-
-  const handleSave = async () => {
-    const sanitizedDescription = sanitizeDescription(editDescription.trim());
-    const currentUnsanitized = unsanitizeDescription(item.description || "");
-
-    if (
-      editText.trim() !== item.text ||
-      editDescription.trim() !== currentUnsanitized
-    ) {
-      const formData = new FormData();
-      formData.append("listId", checklistId);
-      formData.append("itemId", item.id);
-      formData.append("text", editText.trim());
-      formData.append("description", sanitizedDescription);
-      formData.append("category", category);
-
-      const result = await updateItem(checklist, formData);
-      if (result.success && result.data) {
-        onUpdate(result.data);
-        const updatedItem = findItemInChecklist(result.data, item.id);
-        if (updatedItem) {
-          setItem(updatedItem);
-          setEditText(updatedItem.text);
-          setEditDescription(
-            unsanitizeDescription(updatedItem.description || "")
-          );
-        }
-      }
-    }
-    setIsEditing(false);
-  };
-
-  const handleAddSubtask = async () => {
-    if (!newSubtaskText.trim()) return;
-
-    const formData = new FormData();
-    formData.append("listId", checklistId);
-    formData.append("parentId", item.id);
-    formData.append("text", newSubtaskText.trim());
-    formData.append("category", category);
-
-    const result = await createSubItem(formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      const updatedItem = findItemInChecklist(result.data, item.id);
-      if (updatedItem) {
-        setItem(updatedItem);
-      }
-      setNewSubtaskText("");
-    }
-  };
-
-  const handleAddNestedSubtask = async (parentId: string, text: string) => {
-    const formData = new FormData();
-    formData.append("listId", checklistId);
-    formData.append("parentId", parentId);
-    formData.append("text", text);
-    formData.append("category", category);
-
-    const result = await createSubItem(formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      const updatedItem = findItemInChecklist(result.data, item.id);
-      if (updatedItem) {
-        setItem(updatedItem);
-      }
-    }
-  };
-
-  const handleToggleSubtask = async (subtaskId: string, completed: boolean) => {
-    const formData = new FormData();
-    formData.append("listId", checklistId);
-    formData.append("itemId", subtaskId);
-    formData.append("completed", completed.toString());
-    formData.append("category", category);
-
-    const result = await updateItem(checklist, formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      const updatedItem = findItemInChecklist(result.data, item.id);
-      if (updatedItem) {
-        setItem(updatedItem);
-      }
-    }
-  };
-
-  const handleEditSubtask = async (subtaskId: string, text: string) => {
-    const formData = new FormData();
-    formData.append("listId", checklistId);
-    formData.append("itemId", subtaskId);
-    formData.append("text", text);
-    formData.append("category", category);
-
-    const result = await updateItem(checklist, formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      const updatedItem = findItemInChecklist(result.data, item.id);
-      if (updatedItem) {
-        setItem(updatedItem);
-      }
-    }
-  };
-
-  const handleDeleteSubtask = async (subtaskId: string) => {
-    const formData = new FormData();
-    formData.append("listId", checklistId);
-    formData.append("itemId", subtaskId);
-    formData.append("category", category);
-
-    const result = await deleteItem(formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      const updatedItem = findItemInChecklist(result.data, item.id);
-      if (updatedItem) {
-        setItem(updatedItem);
-      }
-    }
-  };
-
-  const handleToggleAll = async (completed: boolean) => {
-    if (!item.children?.length) return;
-
-    const findTargetItems = (items: Item[]): Item[] => {
-      const targets: Item[] = [];
-
-      items.forEach((subtask) => {
-        const shouldToggle = completed ? !subtask.completed : subtask.completed;
-        if (shouldToggle) {
-          targets.push(subtask);
-        }
-
-        if (subtask.children && subtask.children.length > 0) {
-          targets.push(...findTargetItems(subtask.children));
-        }
-      });
-
-      return targets;
-    };
-
-    const targetItems = findTargetItems(item.children);
-    if (targetItems.length === 0) return;
-
-    const formData = new FormData();
-    formData.append("listId", checklistId);
-    formData.append("completed", String(completed));
-    formData.append("itemIds", JSON.stringify(targetItems.map((t) => t.id)));
-    formData.append("category", category);
-
-    const result = await bulkToggleItems(formData);
-    if (result.success && result.data) {
-      onUpdate(result.data);
-      const updatedItem = findItemInChecklist(result.data, item.id);
-      if (updatedItem) {
-        setItem(updatedItem);
-      }
-    }
-  };
-
-  const renderMetadata = () => {
-    const metadata = [];
-
-    if (item.createdBy) {
-      metadata.push(
-        t("common.createdByOn", {
-          user: item.createdBy,
-          date: formatDateTimeString(item.createdAt!),
-        })
-      );
-    }
-
-    if (item.lastModifiedBy) {
-      metadata.push(
-        t("common.lastModifiedByOn", {
-          user: item.lastModifiedBy,
-          date: formatDateTimeString(item.lastModifiedAt!),
-        })
-      );
-    }
-
-    if (item.history?.length) {
-      metadata.push(t("common.statusChanges", { count: item.history.length }));
-    }
-
-    return metadata.length ? (
-      <div className="border-t border-border pt-4">
-        <div className="bg-muted/30 rounded-jotty p-3 border border-border/50">
-          <h5 className="text-md lg:text-xs font-semibold text-muted-foreground uppercase tracking-wide mb-2">
-            {t("auditLogs.metadata")}
-          </h5>
-          <div className="space-y-1.5">
-            {metadata.map((text, i) => (
-              <p
-                key={i}
-                className="text-md lg:text-xs text-muted-foreground flex items-start gap-2"
-              >
-                <span className="text-muted-foreground/40">•</span>
-                <span>{text}</span>
-              </p>
-            ))}
-          </div>
-        </div>
-      </div>
-    ) : null;
-  };
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onClose}
-      title={item.text || t("checklists.untitledTask")}
-      className="lg:!max-w-[80vw] lg:!w-full lg:!h-[80vh] !max-h-[80vh] overflow-y-auto"
-    >
-      <div className="space-y-6">
-        {isEditing ? (
-          <div className="space-y-4">
-            <div>
-              <label className="block text-md lg:text-sm font-medium text-foreground mb-2">
-                {t("tasks.taskTitle")}
-              </label>
-              <input
-                type="text"
-                value={editText}
-                onChange={(e) => setEditText(e.target.value)}
-                className="w-full px-3 py-2 bg-background border border-input rounded-jotty focus:outline-none focus:ring-none focus:ring-ring focus:border-ring transition-all text-base"
-                placeholder={t("checklists.enterTaskTitle")}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" && !e.shiftKey) {
-                    e.preventDefault();
-                    handleSave();
-                  } else if (e.key === "Escape") {
-                    e.preventDefault();
-                    setEditText(item.text);
-                    setEditDescription(
-                      unsanitizeDescription(item.description || "")
-                    );
-                    setIsEditing(false);
-                  }
-                }}
-              />
-            </div>
-            <div>
-              <label className="block text-md lg:text-sm font-medium text-foreground mb-2">
-                {t("common.description")}
-              </label>
-              <textarea
-                value={editDescription}
-                onChange={(e) => setEditDescription(e.target.value)}
-                className="w-full px-3 py-2 bg-background border border-input rounded-jotty focus:outline-none focus:ring-none focus:ring-ring focus:border-ring transition-all min-h-[120px] text-base resize-y"
-                placeholder={t("checklists.addDescriptionOptional")}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" && e.ctrlKey) {
-                    e.preventDefault();
-                    handleSave();
-                  } else if (e.key === "Escape") {
-                    e.preventDefault();
-                    setEditText(item.text);
-                    setEditDescription(
-                      unsanitizeDescription(item.description || "")
-                    );
-                    setIsEditing(false);
-                  }
-                }}
-              />
-              <p className="text-md lg:text-xs text-muted-foreground mt-2">
-                Press{" "}
-                <kbd className="px-1.5 py-0.5 bg-muted rounded text-[10px] border border-border">
-                  Enter
-                </kbd>{" "}
-                to save title,
-                <kbd className="px-1.5 py-0.5 bg-muted rounded text-[10px] border border-border mx-1">
-                  Ctrl+Enter
-                </kbd>{" "}
-                to save description,
-                <kbd className="px-1.5 py-0.5 bg-muted rounded text-[10px] border border-border ml-1">
-                  Esc
-                </kbd>{" "}
-                to cancel
-              </p>
-            </div>
-            <div className="flex justify-end gap-2 pt-2">
-              <Button
-                variant="ghost"
-                onClick={() => {
-                  setEditText(item.text);
-                  setEditDescription(
-                    unsanitizeDescription(item.description || "")
-                  );
-                  setIsEditing(false);
-                }}
-              >
-                <MultiplicationSignIcon className="h-4 w-4 mr-2" />
-                {t("common.cancel")}
-              </Button>
-              <Button onClick={handleSave}>
-                <FloppyDiskIcon className="h-4 w-4 mr-2" />
-                {t("admin.saveChanges")}
-              </Button>
-            </div>
-          </div>
-        ) : (
-          <div className="space-y-4">
-            <div
-              className={`bg-card border border-border rounded-jotty p-4 shadow-sm ${permissions?.canEdit ? "cursor-pointer" : ""
-                }`}
-              onClick={() => permissions?.canEdit && setIsEditing(true)}
-            >
-              <div
-                className="text-card-foreground prose leading-relaxed prose prose-sm dark:prose-invert max-w-none"
-                dangerouslySetInnerHTML={{ __html: descriptionHtml }}
-              />
-            </div>
-          </div>
-        )}
-
-        {!isEditing && (
-          <div className="border-t border-border pt-6">
-            <div className="flex items-center justify-between mb-4">
-              <h4 className="text-base font-semibold text-foreground flex items-center gap-2">
-                <span>{t("checklists.subtasks")}</span>
-                {item.children?.length ? (
-                  <span className="text-md lg:text-xs font-normal text-muted-foreground bg-muted px-2 py-0.5 rounded-full">
-                    {item.children.filter((s) => s.completed).length} /{" "}
-                    {item.children.length}
-                  </span>
-                ) : null}
-              </h4>
-              {permissions?.canEdit && (
-                <div className="flex gap-2">
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={() => handleToggleAll(true)}
-                    disabled={!item.children?.length}
-                    className="text-md lg:text-xs"
-                  >
-                    {t("common.completeAll")}
-                  </Button>
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    onClick={() => handleToggleAll(false)}
-                    disabled={!item.children?.length}
-                    className="text-md lg:text-xs"
-                  >
-                    {t("common.resetAll")}
-                  </Button>
-                </div>
-              )}
-            </div>
-
-            {item.children?.length ? (
-              <div className="space-y-2 mb-4 bg-background-secondary/50 rounded-jotty p-3 border border-border/50">
-                {item.children.map((subtask, index) => (
-                  <NestedChecklistItem
-                    isSubtask={true}
-                    key={subtask.id}
-                    item={subtask}
-                    index={index.toString()}
-                    level={1}
-                    onToggle={handleToggleSubtask}
-                    onDelete={handleDeleteSubtask}
-                    onEdit={handleEditSubtask}
-                    onAddSubItem={handleAddNestedSubtask}
-                    isDeletingItem={false}
-                    isDragDisabled={true}
-                    checklist={checklist}
-                  />
-                ))}
-              </div>
-            ) : (
-              <div className="text-center py-8 text-muted-foreground text-md lg:text-sm bg-muted/20 rounded-jotty border border-dashed border-border mb-4">
-                {t("checklists.noSubtasksYet")}
-              </div>
-            )}
-
-            {permissions?.canEdit && (
-              <div className="flex gap-2">
-                <input
-                  type="text"
-                  value={newSubtaskText}
-                  onChange={(e) => setNewSubtaskText(e.target.value)}
-                  placeholder={t("checklists.addSubtask")}
-                  className="flex-1 px-3 py-2 text-md lg:text-sm bg-background border border-input rounded-jotty focus:outline-none focus:ring-none focus:ring-ring focus:border-ring transition-all"
-                  onKeyDown={(e) => {
-                    if (e.key === "Enter" && !e.shiftKey) {
-                      e.preventDefault();
-                      handleAddSubtask();
-                    }
-                  }}
-                />
-                <Button
-                  onClick={() => handleAddSubtask()}
-                  disabled={!newSubtaskText.trim()}
-                  title={t("checklists.addSubItem")}
-                >
-                  <Add01Icon className="h-4 w-4" />
-                </Button>
-              </div>
-            )}
-          </div>
-        )}
-
-        {renderMetadata()}
-      </div>
-    </Modal>
-  );
-};
diff --git a/app/_components/FeatureComponents/Checklists/TasksClient.tsx b/app/_components/FeatureComponents/Checklists/TasksClient.tsx
index a0ccd559..cdf9c7b5 100644
--- a/app/_components/FeatureComponents/Checklists/TasksClient.tsx
+++ b/app/_components/FeatureComponents/Checklists/TasksClient.tsx
@@ -120,7 +120,7 @@ export const TasksClient = ({
             >
                 <MobileHeader user={user} onOpenSettings={openSettings} currentLocale={user?.preferredLocale || "en"} />
                 
-                <div className="w-full px-4 py-6 h-full overflow-y-auto jotty-scrollable-content">
+                <div className="w-full min-w-0 px-4 py-6 h-full overflow-y-auto jotty-scrollable-content">
                     {children}
                 </div>
             </Layout>
diff --git a/app/_components/FeatureComponents/Header/QuickNav.tsx b/app/_components/FeatureComponents/Header/QuickNav.tsx
index ecf04152..6950979e 100644
--- a/app/_components/FeatureComponents/Header/QuickNav.tsx
+++ b/app/_components/FeatureComponents/Header/QuickNav.tsx
@@ -17,6 +17,7 @@ import { cn, handleScroll } from "@/app/_utils/global-utils";
 import { NavigationGlobalIcon } from "../Navigation/Parts/NavigationGlobalIcon";
 import { NavigationSearchIcon } from "../Navigation/Parts/NavigationSearchIcon";
 import { UserDropdown } from "../Navigation/Parts/UserDropdown";
+import { NotificationBell } from "../Notifications/NotificationBell";
 import { logout } from "@/app/_server/actions/auth";
 import { useState, useEffect, useRef } from "react";
 import { useTranslations } from "next-intl";
@@ -97,6 +98,7 @@ export const QuickNav = ({
 
         <div className="hidden lg:flex lg:items-center lg:gap-2">
           <NavigationSearchIcon onModeChange={onModeChange} />
+          {user && <NotificationBell />}
 
           {user && onOpenSettings ? (
             <UserDropdown
diff --git a/app/_components/FeatureComponents/Home/Parts/ChecklistHome.tsx b/app/_components/FeatureComponents/Home/Parts/ChecklistHome.tsx
index 9f9b9f26..79d344e3 100644
--- a/app/_components/FeatureComponents/Home/Parts/ChecklistHome.tsx
+++ b/app/_components/FeatureComponents/Home/Parts/ChecklistHome.tsx
@@ -33,6 +33,7 @@ import { getChecklistsForDisplay } from "@/app/_server/actions/checklist";
 import { useInfiniteScroll } from "@/app/_hooks/useInfiniteScroll";
 import { FILTER_PAGE_SIZE } from "@/app/_consts/files";
 import { JottyIcon } from "@/app/_components/GlobalComponents/Layout/CustomIcons/JottyIcon";
+import { isKanbanType } from "@/app/_types/enums";
 
 interface ChecklistHomeProps {
   lists: Checklist[];
@@ -119,14 +120,14 @@ export const ChecklistHome = ({
   const filteredTaskLists = useMemo(() => {
     if (!selectedCategory) return taskLists;
     return displayLists
-      .filter((list) => list.type === "task")
+      .filter((list) => isKanbanType(list.type))
       .filter((list) => !pinned.some((p) => p.id === list.id));
   }, [taskLists, displayLists, selectedCategory, pinned]);
 
   const filteredSimpleLists = useMemo(() => {
     if (!selectedCategory) return simpleLists;
     return displayLists
-      .filter((list) => list.type !== "task")
+      .filter((list) => !isKanbanType(list.type))
       .filter((list) => !pinned.some((p) => p.id === list.id));
   }, [simpleLists, displayLists, selectedCategory, pinned]);
 
@@ -325,18 +326,18 @@ export const ChecklistHome = ({
                 <div className="flex items-center gap-3 mb-4 sm:mb-6">
                   <h2 className="text-xl sm:text-2xl font-bold text-foreground">
                     {selectedCategory
-                      ? t("tasks.title")
-                      : t("tasks.recentTasks")}
+                      ? t("kanban.title")
+                      : t("kanban.recentBoards")}
                   </h2>
                   <div className="flex-1 h-px bg-border"></div>
                   <Button
                     variant="outline"
-                    onClick={() => (window.location.href = "/tasks")}
+                    onClick={() => (window.location.href = "/kanban")}
                     size="sm"
                     className="ml-2"
                   >
                     <span className="hidden sm:inline">
-                      {t("tasks.showAllTasks")}
+                      {t("kanban.showAllBoards")}
                     </span>
                     <span className="sm:hidden">{t("common.all")}</span>
                     <ArrowRight04Icon className="h-4 w-4 ml-1 sm:ml-2" />
diff --git a/app/_components/FeatureComponents/Kanban/ArchivedItems.tsx b/app/_components/FeatureComponents/Kanban/ArchivedItems.tsx
new file mode 100644
index 00000000..35d3f9c9
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/ArchivedItems.tsx
@@ -0,0 +1,3 @@
+"use client";
+
+export { ArchivedItemsModal as ArchivedItems } from "./ArchivedItemsModal";
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/ArchivedItemsModal.tsx b/app/_components/FeatureComponents/Kanban/ArchivedItemsModal.tsx
similarity index 100%
rename from app/_components/FeatureComponents/Checklists/Parts/Kanban/ArchivedItemsModal.tsx
rename to app/_components/FeatureComponents/Kanban/ArchivedItemsModal.tsx
diff --git a/app/_components/FeatureComponents/Kanban/CalendarView.tsx b/app/_components/FeatureComponents/Kanban/CalendarView.tsx
new file mode 100644
index 00000000..dbc060a9
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/CalendarView.tsx
@@ -0,0 +1,186 @@
+"use client";
+
+import { Checklist, Item } from "@/app/_types";
+import { useCalendarView } from "@/app/_hooks/kanban/useCalendarView";
+import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
+import {
+  ArrowLeft01Icon,
+  ArrowRight01Icon,
+  Calendar03Icon,
+  Download04Icon,
+} from "hugeicons-react";
+import { cn } from "@/app/_utils/global-utils";
+import { getPriorityDotColor } from "@/app/_utils/kanban/index";
+import { useTranslations } from "next-intl";
+
+interface CalendarViewProps {
+  checklist: Checklist;
+  onItemClick?: (item: Item) => void;
+}
+
+const _getWeekdays = (t: (key: string) => string) => [
+  t("kanban.weekdaysSun"),
+  t("kanban.weekdaysMon"),
+  t("kanban.weekdaysTue"),
+  t("kanban.weekdaysWed"),
+  t("kanban.weekdaysThu"),
+  t("kanban.weekdaysFri"),
+  t("kanban.weekdaysSat"),
+];
+
+const _toLocalDate = (d: Date): string => {
+  const pad = (n: number) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+};
+
+export const CalendarView = ({ checklist, onItemClick }: CalendarViewProps) => {
+  const t = useTranslations();
+  const {
+    currentDate,
+    calendarGrid,
+    goToPreviousMonth,
+    goToNextMonth,
+    goToToday,
+    exportICS,
+    getEventsForDate,
+    unscheduledItems,
+  } = useCalendarView(checklist);
+
+  const weekdays = _getWeekdays(t);
+  const today = _toLocalDate(new Date());
+  const monthLabel = currentDate.toLocaleDateString(undefined, {
+    month: "long",
+    year: "numeric",
+  });
+
+  return (
+    <div className="space-y-4 min-w-0">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between min-w-0">
+        <div className="flex items-center gap-2 min-w-0 flex-wrap">
+          <Button variant="outline" size="sm" onClick={goToPreviousMonth} className="shrink-0">
+            <ArrowLeft01Icon className="h-4 w-4" />
+          </Button>
+          <h3 className="text-base sm:text-lg font-semibold min-w-0 flex-1 text-center truncate px-1">
+            {monthLabel}
+          </h3>
+          <Button variant="outline" size="sm" onClick={goToNextMonth} className="shrink-0">
+            <ArrowRight01Icon className="h-4 w-4" />
+          </Button>
+          <Button variant="outline" size="sm" onClick={goToToday} className="shrink-0">
+            {t("kanban.today")}
+          </Button>
+        </div>
+        <Button variant="outline" size="sm" onClick={exportICS} className="shrink-0 w-full sm:w-auto">
+          <Download04Icon className="h-4 w-4 mr-1" />
+          {t("kanban.exportIcs")}
+        </Button>
+      </div>
+
+      <div className="border border-border rounded-jotty overflow-hidden min-w-0">
+        <div className="grid grid-cols-7 min-w-0">
+          {weekdays.map((day) => (
+            <div
+              key={day}
+              className="p-2 text-center text-xs font-medium text-muted-foreground bg-muted border-b border-border"
+            >
+              {day}
+            </div>
+          ))}
+        </div>
+
+        {calendarGrid.map((week, weekIndex) => (
+          <div key={weekIndex} className="grid grid-cols-7">
+            {week.map((day, dayIndex) => {
+              if (!day) {
+                return (
+                  <div
+                    key={`empty-${dayIndex}`}
+                    className="min-h-[100px] p-1 border-b border-r border-border bg-muted/20"
+                  />
+                );
+              }
+
+              const dateStr = _toLocalDate(day);
+              const dayEvents = getEventsForDate(day);
+              const isToday = dateStr === today;
+
+              return (
+                <div
+                  key={dateStr}
+                  className={cn(
+                    "min-h-[100px] p-1 border-b border-r border-border transition-colors",
+                    isToday && "bg-primary/5",
+                  )}
+                >
+                  <div
+                    className={cn(
+                      "text-xs font-medium mb-1 w-6 h-6 flex items-center justify-center rounded-full",
+                      isToday && "bg-primary text-primary-foreground",
+                    )}
+                  >
+                    {day.getDate()}
+                  </div>
+                  <div className="space-y-0.5">
+                    {dayEvents.slice(0, 3).map((event) => (
+                      <div
+                        key={event.id}
+                        onClick={() => {
+                          const item = checklist.items.find(
+                            (i) => i.id === event.itemId,
+                          );
+                          if (item && onItemClick) onItemClick(item);
+                        }}
+                        className={cn(
+                          "text-[10px] px-1 py-0.5 rounded truncate cursor-pointer hover:opacity-80 transition-opacity flex items-center gap-1 bg-muted text-muted-foreground border-l-2",
+                          event.completed && "line-through opacity-60",
+                        )}
+                        style={{
+                          borderLeftColor: event.completed
+                            ? "#22c55e"
+                            : getPriorityDotColor(
+                                event.priority as Parameters<
+                                  typeof getPriorityDotColor
+                                >[0],
+                              ),
+                        }}
+                      >
+                        {event.title}
+                      </div>
+                    ))}
+                    {dayEvents.length > 3 && (
+                      <div className="text-[10px] text-muted-foreground px-1">
+                        {t("kanban.moreEvents", {
+                          count: dayEvents.length - 3,
+                        })}
+                      </div>
+                    )}
+                  </div>
+                </div>
+              );
+            })}
+          </div>
+        ))}
+      </div>
+
+      {unscheduledItems.length > 0 && (
+        <div className="border border-border rounded-jotty p-4">
+          <h4 className="text-sm font-medium text-muted-foreground mb-2 flex items-center gap-1.5">
+            <Calendar03Icon className="h-4 w-4" />
+            {t("kanban.unscheduled", { count: unscheduledItems.length })}
+          </h4>
+          <div className="flex flex-wrap gap-2">
+            {unscheduledItems.map((item) => (
+              <div
+                key={item.id}
+                onClick={() => onItemClick?.(item)}
+                className="text-xs px-2 py-1 rounded-jotty border border-border bg-muted/30 text-foreground cursor-pointer hover:bg-muted/50 transition-colors"
+              >
+                {item.text}
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/_components/FeatureComponents/Kanban/Kanban.tsx b/app/_components/FeatureComponents/Kanban/Kanban.tsx
new file mode 100644
index 00000000..3ec20522
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/Kanban.tsx
@@ -0,0 +1,442 @@
+"use client";
+
+import { useState, useEffect, useMemo, useCallback } from "react";
+import {
+  DndContext,
+  DragOverlay,
+  PointerSensor,
+  KeyboardSensor,
+  TouchSensor,
+  useSensor,
+  useSensors,
+  pointerWithin,
+  closestCorners,
+  CollisionDetection,
+  rectIntersection,
+} from "@dnd-kit/core";
+import { Checklist, KanbanStatus } from "@/app/_types";
+import { KanbanColumn } from "./KanbanColumn";
+import { KanbanCard } from "./KanbanCard";
+import { ChecklistHeading } from "../Checklists/Parts/Common/ChecklistHeading";
+import { BulkPasteModal } from "@/app/_components/GlobalComponents/Modals/BulkPasteModal/BulkPasteModal";
+import { StatusManager } from "./StatusManager";
+import { ArchivedItems } from "./ArchivedItems";
+import { useKanbanBoard } from "@/app/_hooks/kanban/useKanban";
+import { useKanbanReminders } from "@/app/_hooks/kanban/useKanbanReminders";
+import { ItemTypes, TaskStatus, TaskStatusLabels } from "@/app/_types/enums";
+import { ReferencedBySection } from "../Notes/Parts/ReferencedBySection";
+import { getReferences } from "@/app/_utils/indexes-utils";
+import { useAppMode } from "@/app/_providers/AppModeProvider";
+import { encodeCategoryPath } from "@/app/_utils/global-utils";
+import { usePermissions } from "@/app/_providers/PermissionsProvider";
+import { Settings01Icon, Archive02Icon, Calendar03Icon, TaskDaily01Icon, Search01Icon } from "hugeicons-react";
+import { CalendarView } from "./CalendarView";
+import { KanbanCardDetail } from "./KanbanCardDetail";
+import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
+import { updateChecklistStatuses } from "@/app/_server/actions/checklist";
+import { unarchiveItem } from "@/app/_server/actions/checklist-item";
+import { useTranslations } from "next-intl";
+import { DEFAULT_KANBAN_STATUSES } from "@/app/_consts/kanban";
+
+interface KanbanBoardProps {
+  checklist: Checklist;
+  onUpdate: (updatedChecklist: Checklist) => void;
+}
+
+export const Kanban = ({ checklist, onUpdate }: KanbanBoardProps) => {
+  const t = useTranslations();
+  const [isClient, setIsClient] = useState(false);
+  const [showStatusModal, setShowStatusModal] = useState(false);
+  const [showArchivedModal, setShowArchivedModal] = useState(false);
+  const [viewMode, setViewMode] = useState<"board" | "calendar">("board");
+  const [searchQuery, setSearchQuery] = useState("");
+  const [priorityFilter, setPriorityFilter] = useState("");
+  const [assigneeFilter, setAssigneeFilter] = useState("");
+  const [calendarSelectedItem, setCalendarSelectedItem] = useState<import("@/app/_types").Item | null>(null);
+  const { linkIndex, notes, checklists, appSettings, allSharedItems } =
+    useAppMode();
+  const encodedCategory = encodeCategoryPath(
+    checklist.category || "Uncategorized"
+  );
+  const isShared =
+    allSharedItems?.checklists.some(
+      (sharedChecklist) =>
+        sharedChecklist.id === checklist.id &&
+        sharedChecklist.category === encodedCategory
+    ) || false;
+  const { permissions } = usePermissions();
+  const {
+    localChecklist,
+    isLoading,
+    showBulkPasteModal,
+    setShowBulkPasteModal,
+    focusKey,
+    refreshChecklist,
+    handleItemUpdate,
+    getItemsByStatus,
+    handleDragStart,
+    handleDragOver,
+    handleDragEnd,
+    handleAddItem,
+    handleBulkPaste,
+    handleItemStatusUpdate,
+    activeItem,
+  } = useKanbanBoard({ checklist, onUpdate });
+
+  useKanbanReminders({
+    checklist: localChecklist,
+    checklistId: localChecklist.uuid || localChecklist.id,
+    category: localChecklist.category || "Uncategorized",
+    onUpdate: handleItemUpdate,
+  });
+
+  const statuses = useMemo(() => {
+    const currentStatuses = localChecklist.statuses || DEFAULT_KANBAN_STATUSES;
+    return currentStatuses.map(status => {
+      if (status.id === TaskStatus.COMPLETED && status.autoComplete === undefined) {
+        return { ...status, autoComplete: true };
+      }
+      return status;
+    });
+  }, [localChecklist.statuses]);
+
+  const columns = statuses
+    .sort((a, b) => a.order - b.order)
+    .map((status) => ({
+      id: status.id,
+      title: status.label,
+      status: status.id,
+    }));
+
+  const handleSaveStatuses = async (newStatuses: KanbanStatus[]) => {
+    const formData = new FormData();
+    formData.append("uuid", localChecklist.uuid || "");
+    formData.append("statusesStr", JSON.stringify(newStatuses));
+
+    const result = await updateChecklistStatuses(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      await refreshChecklist();
+    }
+  };
+
+  const itemsByStatus = statuses.reduce((acc, status) => {
+    acc[status.id] = localChecklist.items.filter(
+      (item) => item.status === status.id && !item.isArchived
+    ).length;
+    return acc;
+  }, {} as Record<string, number>);
+
+  const archivedItems = localChecklist.items.filter((item) => item.isArchived);
+
+  const handleUnarchive = async (itemId: string) => {
+    const formData = new FormData();
+    formData.append("listId", localChecklist.id);
+    formData.append("itemId", itemId);
+    formData.append("category", localChecklist.category || "Uncategorized");
+
+    const result = await unarchiveItem(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      await refreshChecklist();
+    }
+  };
+
+  const handleToggleItem = useCallback(async (itemId: string, completed: boolean) => {
+    const newStatus = completed ? TaskStatus.COMPLETED : TaskStatus.TODO;
+    await handleItemStatusUpdate(itemId, newStatus);
+  }, [handleItemStatusUpdate]);
+
+  const _hasFilters = searchQuery || priorityFilter || assigneeFilter;
+
+  const _filterItems = useCallback((items: import("@/app/_types").Item[]) => {
+    if (!_hasFilters) return items;
+    return items.filter((item) => {
+      if (searchQuery && !item.text.toLowerCase().includes(searchQuery.toLowerCase())) return false;
+      if (priorityFilter && item.priority !== priorityFilter) return false;
+      if (assigneeFilter && item.assignee !== assigneeFilter) return false;
+      return true;
+    });
+  }, [searchQuery, priorityFilter, assigneeFilter, _hasFilters]);
+
+  const _uniqueAssignees = useMemo(() => {
+    const assignees = new Set<string>();
+    localChecklist.items.forEach((item) => {
+      if (item.assignee) assignees.add(item.assignee);
+    });
+    return Array.from(assignees);
+  }, [localChecklist.items]);
+
+  const _renderColumns = useCallback(() => (
+    <div
+      className={
+        columns.length <= 6
+          ? "h-full min-w-0 kanban-grid gap-4 p-2 sm:p-4"
+          : "h-full min-w-0 flex gap-4 p-2 sm:p-4"
+      }
+      style={columns.length <= 6 ? {
+        "--kanban-col-count": columns.length,
+      } as React.CSSProperties : undefined}
+    >
+      {columns.map((column) => {
+        const items = _filterItems(getItemsByStatus(column.status));
+        return (
+          <div
+            key={column.id}
+            className={columns.length > 6 ? "flex-shrink-0" : "min-w-0"}
+            style={columns.length > 6 ? { width: "280px" } : undefined}
+          >
+            <KanbanColumn
+              checklist={localChecklist}
+              id={column.id}
+              title={column.title}
+              items={items}
+              status={column.status}
+              checklistId={localChecklist.id}
+              category={localChecklist.category || "Uncategorized"}
+              onUpdate={handleItemUpdate}
+              isShared={isShared}
+              statusColor={
+                statuses.find((s) => s.id === column.id)?.color
+              }
+              statuses={statuses}
+            />
+          </div>
+        );
+      })}
+    </div>
+  ), [columns, getItemsByStatus, _filterItems, localChecklist, handleItemUpdate, isShared, statuses]);
+
+  const _collisionDetection: CollisionDetection = useCallback((args) => {
+    const pointerCollisions = pointerWithin(args);
+    if (pointerCollisions.length > 0) return pointerCollisions;
+    return closestCorners(args);
+  }, []);
+
+  const sensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: {
+        distance: 8,
+        delay: 100,
+        tolerance: 5,
+      },
+    }),
+    useSensor(TouchSensor, {
+      activationConstraint: {
+        delay: 250,
+        tolerance: 5,
+      },
+    }),
+    useSensor(KeyboardSensor)
+  );
+
+  useEffect(() => {
+    setIsClient(true);
+  }, []);
+
+  const referencingItems = useMemo(() => {
+    return getReferences(
+      linkIndex,
+      localChecklist.uuid,
+      localChecklist.category,
+      ItemTypes.CHECKLIST,
+      notes,
+      checklists
+    );
+  }, [
+    linkIndex,
+    localChecklist.uuid,
+    localChecklist.category,
+    checklists,
+    notes,
+  ]);
+
+  return (
+    <div className="h-full flex flex-col bg-background overflow-y-auto overflow-x-hidden min-w-0 max-w-full jotty-scrollable-content">
+      {permissions?.canEdit && (
+        <ChecklistHeading
+          key={focusKey}
+          checklist={checklist}
+          onSubmit={handleAddItem}
+          onToggleCompletedItem={handleToggleItem}
+          onBulkSubmit={() => setShowBulkPasteModal(true)}
+          isLoading={isLoading}
+          autoFocus={true}
+          focusKey={focusKey}
+          placeholder={t("checklists.addNewTask")}
+          submitButtonText={t("kanban.addItem")}
+        />
+      )}
+      <div className="flex flex-wrap gap-2 items-center w-full min-w-0 px-2 sm:px-4 pt-4 pb-2">
+        <div className="flex gap-1 border border-border rounded-jotty p-0.5 shrink-0">
+          <Button
+            variant={viewMode === "board" ? "default" : "ghost"}
+            size="sm"
+            onClick={() => setViewMode("board")}
+            className="text-xs sm:text-md lg:text-xs h-7"
+          >
+            <TaskDaily01Icon className="h-3 w-3 mr-1 shrink-0" />
+            <span className="truncate">{t("kanban.title")}</span>
+          </Button>
+          <Button
+            variant={viewMode === "calendar" ? "default" : "ghost"}
+            size="sm"
+            onClick={() => setViewMode("calendar")}
+            className="text-xs sm:text-md lg:text-xs h-7"
+          >
+            <Calendar03Icon className="h-3 w-3 mr-1 shrink-0" />
+            <span className="truncate">{t("kanban.calendar")}</span>
+          </Button>
+        </div>
+        <div className="flex flex-wrap gap-2 justify-end min-w-0 flex-1">
+          {permissions?.canEdit && viewMode === "board" && (
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => setShowStatusModal(true)}
+              className="text-xs sm:text-md lg:text-xs shrink-0"
+              aria-label={t("kanban.manageStatuses")}
+            >
+              <Settings01Icon className="h-3 w-3 mr-1 shrink-0" />
+              <span className="hidden sm:inline">{t("kanban.manageStatuses")}</span>
+            </Button>
+          )}
+          {viewMode === "board" && (
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => setShowArchivedModal(true)}
+              className="text-xs sm:text-md lg:text-xs shrink-0"
+              aria-label={t("kanban.viewArchived")}
+            >
+              <Archive02Icon className="h-3 w-3 mr-1 shrink-0" />
+              <span className="hidden sm:inline">{t("kanban.viewArchived")}</span>
+            </Button>
+          )}
+        </div>
+      </div>
+      {viewMode === "board" && (
+        <div className="flex flex-wrap gap-2 items-center px-2 sm:px-4 pb-2">
+          <div className="relative flex-1 min-w-[150px] max-w-xs">
+            <Search01Icon className="absolute left-2 top-1/2 -translate-y-1/2 h-3 w-3 text-muted-foreground" />
+            <input
+              type="text"
+              value={searchQuery}
+              onChange={(e) => setSearchQuery(e.target.value)}
+              placeholder={t("kanban.searchPlaceholder")}
+              className="w-full pl-7 pr-2 py-1.5 text-xs bg-background border border-input rounded-jotty focus:outline-none focus:border-ring"
+            />
+          </div>
+          <select
+            value={priorityFilter}
+            onChange={(e) => setPriorityFilter(e.target.value)}
+            className="px-2 py-1.5 text-xs bg-background border border-input rounded-jotty focus:outline-none focus:border-ring"
+          >
+            <option value="">{t("kanban.allPriorities")}</option>
+            <option value="critical">{t("kanban.critical")}</option>
+            <option value="high">{t("kanban.high")}</option>
+            <option value="medium">{t("kanban.medium")}</option>
+            <option value="low">{t("kanban.low")}</option>
+          </select>
+          {isShared && _uniqueAssignees.length > 0 && (
+            <select
+              value={assigneeFilter}
+              onChange={(e) => setAssigneeFilter(e.target.value)}
+              className="px-2 py-1.5 text-xs bg-background border border-input rounded-jotty focus:outline-none focus:border-ring"
+            >
+              <option value="">{t("kanban.allAssignees")}</option>
+              {_uniqueAssignees.map((assignee) => (
+                <option key={assignee} value={assignee}>{assignee}</option>
+              ))}
+            </select>
+          )}
+        </div>
+      )}
+      <div className="flex-1 min-w-0 w-full max-w-full overflow-auto pb-[8.5em]">
+        {viewMode === "calendar" ? (
+          <div className="p-4">
+            <CalendarView
+              checklist={localChecklist}
+              onItemClick={(item) => setCalendarSelectedItem(item)}
+            />
+          </div>
+        ) : isClient ? (
+          <DndContext
+            sensors={sensors}
+            collisionDetection={_collisionDetection}
+            onDragStart={handleDragStart}
+            onDragOver={handleDragOver}
+            onDragEnd={handleDragEnd}
+          >
+            {_renderColumns()}
+
+            <DragOverlay>
+              {activeItem ? (
+                <KanbanCard
+                  checklist={localChecklist}
+                  item={activeItem}
+                  isDragging
+                  checklistId={localChecklist.id}
+                  category={localChecklist.category || "Uncategorized"}
+                  onUpdate={refreshChecklist}
+                  isShared={isShared}
+                  statuses={statuses}
+                />
+              ) : null}
+            </DragOverlay>
+          </DndContext>
+        ) : (
+          _renderColumns()
+        )}
+
+        <div className="px-4 pt-4 pb-[100px] lg:pb-4">
+          {referencingItems.length > 0 &&
+            appSettings?.editor?.enableBilateralLinks && (
+              <ReferencedBySection referencingItems={referencingItems} />
+            )}
+        </div>
+      </div>
+
+      {calendarSelectedItem && (
+        <KanbanCardDetail
+          checklist={localChecklist}
+          item={calendarSelectedItem}
+          isOpen={!!calendarSelectedItem}
+          onClose={() => setCalendarSelectedItem(null)}
+          onUpdate={handleItemUpdate}
+          checklistId={localChecklist.id}
+          category={localChecklist.category || "Uncategorized"}
+        />
+      )}
+
+      {showBulkPasteModal && (
+        <BulkPasteModal
+          isOpen={showBulkPasteModal}
+          onClose={() => setShowBulkPasteModal(false)}
+          onSubmit={handleBulkPaste}
+          isLoading={isLoading}
+        />
+      )}
+
+      {showStatusModal && (
+        <StatusManager
+          isOpen={showStatusModal}
+          onClose={() => setShowStatusModal(false)}
+          currentStatuses={statuses}
+          onSave={handleSaveStatuses}
+          itemsByStatus={itemsByStatus}
+        />
+      )}
+
+      {showArchivedModal && (
+        <ArchivedItems
+          isOpen={showArchivedModal}
+          onClose={() => setShowArchivedModal(false)}
+          archivedItems={archivedItems}
+          onUnarchive={handleUnarchive}
+          statuses={statuses}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItem.tsx b/app/_components/FeatureComponents/Kanban/KanbanCard.tsx
similarity index 59%
rename from app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItem.tsx
rename to app/_components/FeatureComponents/Kanban/KanbanCard.tsx
index c069895e..dcbca75b 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItem.tsx
+++ b/app/_components/FeatureComponents/Kanban/KanbanCard.tsx
@@ -6,24 +6,30 @@ import { Item, Checklist, KanbanStatus } from "@/app/_types";
 import { cn } from "@/app/_utils/global-utils";
 import { Dropdown } from "@/app/_components/GlobalComponents/Dropdowns/Dropdown";
 import { useState, useEffect, memo, useMemo, useCallback } from "react";
-import { TaskStatus, TaskStatusLabels } from "@/app/_types/enums";
-import { SubtaskModal } from "./SubtaskModal";
+import { TaskStatus } from "@/app/_types/enums";
+import { KanbanCardDetail } from "./KanbanCardDetail";
 import { useAppMode } from "@/app/_providers/AppModeProvider";
-import { useKanbanItem } from "@/app/_hooks/useKanbanItem";
+import { useKanbanItem } from "@/app/_hooks/kanban/useKanbanItem";
 import {
   formatTimerTime,
   getStatusColor,
   getStatusIcon,
-} from "@/app/_utils/kanban-utils";
+  getPriorityDotColor,
+  getPriorityLabel,
+} from "@/app/_utils/kanban/index";
 import { TimeEntriesAccordion } from "./TimeEntriesAccordion";
 import { KanbanItemTimer } from "./KanbanItemTimer";
 import { KanbanItemContent } from "./KanbanItemContent";
 import { getRecurrenceDescription } from "@/app/_utils/recurrence-utils";
 import { usePermissions } from "@/app/_providers/PermissionsProvider";
-import { CircleIcon } from "hugeicons-react";
+import { formatReminderTime } from "@/app/_utils/kanban/reminder-utils";
+import { CircleIcon, Notification03Icon, UserIcon } from "hugeicons-react";
 import { usePreferredDateTime } from "@/app/_hooks/usePreferredDateTime";
+import { useTranslations } from "next-intl";
+import { UserAvatar } from "../../GlobalComponents/User/UserAvatar";
+import { TimeEntriesModal } from "./TimeEntriesModal";
 
-interface KanbanItemProps {
+interface KanbanCardProps {
   checklist: Checklist;
   item: Item;
   isDragging?: boolean;
@@ -32,9 +38,10 @@ interface KanbanItemProps {
   onUpdate: (updatedChecklist: Checklist) => void;
   isShared: boolean;
   statuses: KanbanStatus[];
+  statusColor?: string;
 }
 
-const KanbanItemComponent = ({
+const KanbanCardComponent = ({
   checklist,
   item,
   isDragging,
@@ -43,7 +50,9 @@ const KanbanItemComponent = ({
   onUpdate,
   isShared,
   statuses,
-}: KanbanItemProps) => {
+  statusColor,
+}: KanbanCardProps) => {
+  const t = useTranslations();
   const { usersPublicData } = useAppMode();
   const { permissions } = usePermissions();
   const { formatDateString, formatDateTimeString, formatTimeString } =
@@ -52,17 +61,17 @@ const KanbanItemComponent = ({
   const getUserAvatarUrl = useCallback(
     (username: string) => {
       if (!usersPublicData) return "";
-
       return (
         usersPublicData.find(
-          (user) => user.username?.toLowerCase() === username?.toLowerCase()
+          (user) => user.username?.toLowerCase() === username?.toLowerCase(),
         )?.avatarUrl || ""
       );
     },
-    [usersPublicData]
+    [usersPublicData],
   );
 
-  const [showSubtaskModal, setShowSubtaskModal] = useState(false);
+  const [showDetailModal, setShowDetailModal] = useState(false);
+  const [showTimeEntriesModal, setShowTimeEntriesModal] = useState(false);
 
   const kanbanItemHook = useKanbanItem({
     checklist,
@@ -108,31 +117,44 @@ const KanbanItemComponent = ({
 
   return (
     <>
-      {showSubtaskModal && (
-        <SubtaskModal
+      {showTimeEntriesModal && item.timeEntries && (
+        <TimeEntriesModal
+          isOpen={showTimeEntriesModal}
+          onClose={() => setShowTimeEntriesModal(false)}
+          timeEntries={item.timeEntries}
+          checklistId={checklist.uuid || checklistId}
+          itemId={item.id}
+          category={category}
+          onUpdate={onUpdate}
+          usersPublicData={usersPublicData}
+        />
+      )}
+
+      {showDetailModal && (
+        <KanbanCardDetail
           checklist={checklist}
           item={item}
-          isShared={isShared}
-          isOpen={showSubtaskModal}
-          onClose={() => setShowSubtaskModal(false)}
+          isOpen={showDetailModal}
+          onClose={() => setShowDetailModal(false)}
           onUpdate={onUpdate}
           checklistId={checklistId}
           category={category}
         />
       )}
 
-      <div>
+      <div className="min-w-0">
         <div
           ref={setNodeRef}
           style={style}
           {...attributes}
           {...listeners}
-          onDoubleClick={() => setShowSubtaskModal(true)}
+          aria-label={item.text}
+          onDoubleClick={() => setShowDetailModal(true)}
           className={cn(
-            "group bg-background border rounded-jotty p-3 transition-all duration-200 hover:shadow-md cursor-grab active:cursor-grabbing",
+            "group bg-background border rounded-jotty p-3 transition-all duration-200 hover:shadow-md cursor-grab active:cursor-grabbing min-w-0",
             getStatusColor(item.status),
             (isDragging || isSortableDragging) &&
-            "opacity-50 scale-95 rotate-[4deg] shadow-lg z-50 transition-all duration-200"
+              "opacity-60 scale-[0.98] shadow-lg border-primary/40 z-50 transition-all duration-200",
           )}
         >
           <div className="space-y-2">
@@ -148,7 +170,7 @@ const KanbanItemComponent = ({
               onEditTextChange={kanbanItemHook.setEditText}
               onEditSave={kanbanItemHook.handleSave}
               onEditKeyDown={kanbanItemHook.handleKeyDown}
-              onShowSubtaskModal={() => setShowSubtaskModal(true)}
+              onShowSubtaskModal={() => setShowDetailModal(true)}
               onEdit={kanbanItemHook.handleEdit}
               onDelete={kanbanItemHook.handleDelete}
               onArchive={kanbanItemHook.handleArchive}
@@ -156,6 +178,51 @@ const KanbanItemComponent = ({
               formatDateTimeString={formatDateTimeString}
             />
 
+            <div className="flex flex-wrap gap-1.5">
+              {item.priority && item.priority !== "none" && (
+                <span className={cn(
+                  "text-[10px] font-medium px-1.5 py-0.5 rounded-jotty flex items-center gap-1",
+                  item.priority === "critical" && "bg-destructive/10 text-destructive",
+                  item.priority === "high" && "bg-warning/10 text-warning",
+                  item.priority !== "critical" && item.priority !== "high" && "bg-muted text-muted-foreground"
+                )}>
+                  <span
+                    className="w-2 h-2 rounded-jotty flex-shrink-0"
+                    style={{
+                      backgroundColor: getPriorityDotColor(item.priority),
+                    }}
+                  />
+                  {getPriorityLabel(item.priority, t)}
+                </span>
+              )}
+
+              {item.score !== undefined && (
+                <span className="text-[10px] font-medium px-1.5 py-0.5 rounded-jotty bg-muted text-muted-foreground">
+                  {t("kanban.scoreLabel", { score: item.score })}
+                </span>
+              )}
+
+              {item.reminder && !item.reminder.notified && (
+                <span className="text-[10px] font-medium px-1.5 py-0.5 rounded-jotty bg-muted text-muted-foreground flex items-center gap-0.5">
+                  <span className="w-4 h-4 rounded-full bg-warning flex items-center justify-center">
+                    <Notification03Icon className="h-2 w-2 text-white" />
+                  </span>
+                  {formatReminderTime(item.reminder.datetime)}
+                </span>
+              )}
+
+              {item.assignee && (
+                <span className="text-[10px] font-medium px-1.5 py-0.5 rounded-jotty bg-muted text-muted-foreground flex items-center gap-0.5">
+                  <UserAvatar
+                    username={item.assignee}
+                    size="xs"
+                    avatarUrl={getUserAvatarUrl(item.assignee) || ""}
+                  />
+                  {item.assignee}
+                </span>
+              )}
+            </div>
+
             <KanbanItemTimer
               totalTime={kanbanItemHook.totalTime}
               currentTime={kanbanItemHook.currentTime}
@@ -176,6 +243,7 @@ const KanbanItemComponent = ({
                   usersPublicData={usersPublicData}
                   formatDateString={formatDateString}
                   formatTimeString={formatTimeString}
+                  onOpenTimeEntries={() => setShowTimeEntriesModal(true)}
                 />
               </div>
             )}
@@ -211,4 +279,4 @@ const KanbanItemComponent = ({
   );
 };
 
-export const KanbanItem = memo(KanbanItemComponent);
+export const KanbanCard = memo(KanbanCardComponent);
diff --git a/app/_components/FeatureComponents/Kanban/KanbanCardDetail.tsx b/app/_components/FeatureComponents/Kanban/KanbanCardDetail.tsx
new file mode 100644
index 00000000..b7c10cf0
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/KanbanCardDetail.tsx
@@ -0,0 +1,488 @@
+"use client";
+
+import { useState, useEffect, useMemo } from "react";
+import { Modal } from "@/app/_components/GlobalComponents/Modals/Modal";
+import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
+import { Item, Checklist, KanbanPriority } from "@/app/_types";
+import {
+  createSubItem,
+  updateItem,
+  deleteItem,
+  bulkToggleItems,
+  updateItemStatus,
+} from "@/app/_server/actions/checklist-item";
+import { createNotificationForUser } from "@/app/_server/actions/notifications";
+import { getUsersWithAccess } from "@/app/_server/actions/sharing";
+import { getUsers } from "@/app/_server/actions/users";
+import { FloppyDiskIcon, MultiplicationSignIcon, ArrowDown01Icon, ArrowRight01Icon } from "hugeicons-react";
+import { convertMarkdownToHtml } from "@/app/_utils/markdown-utils";
+import { usePermissions } from "@/app/_providers/PermissionsProvider";
+import { usePreferredDateTime } from "@/app/_hooks/usePreferredDateTime";
+import { useTranslations } from "next-intl";
+import { KanbanPriorityLevel } from "@/app/_types/enums";
+import { KanbanCardDetailProperties } from "./KanbanCardDetailProperties";
+import { KanbanCardDetailSubtasks } from "./KanbanCardDetailSubtasks";
+
+interface KanbanCardDetailProps {
+  checklist: Checklist;
+  item: Item;
+  isOpen: boolean;
+  onClose: () => void;
+  onUpdate: (updatedChecklist: Checklist) => void;
+  checklistId: string;
+  category: string;
+}
+
+const _sanitizeDescription = (text: string): string => text.replace(/\n/g, "\\n");
+const _unsanitizeDescription = (text: string): string => text.replace(/\\n/g, "\n");
+
+const _toLocalDateTimeValue = (isoStr: string): string => {
+  if (!isoStr) return "";
+  const d = new Date(isoStr);
+  if (isNaN(d.getTime())) return "";
+  const pad = (n: number) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`;
+};
+
+const _toLocalDateValue = (isoStr: string): string => {
+  if (!isoStr) return "";
+  const d = new Date(isoStr);
+  if (isNaN(d.getTime())) return "";
+  const pad = (n: number) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+};
+
+const _findItemInChecklist = (checklist: Checklist, itemId: string): Item | null => {
+  const search = (items: Item[]): Item | null => {
+    for (const item of items) {
+      if (item.id === itemId) return item;
+      if (item.children) {
+        const found = search(item.children);
+        if (found) return found;
+      }
+    }
+    return null;
+  };
+  return search(checklist.items);
+};
+
+export const KanbanCardDetail = ({
+  checklist,
+  item: initialItem,
+  isOpen,
+  onClose,
+  onUpdate,
+  checklistId,
+  category,
+}: KanbanCardDetailProps) => {
+  const t = useTranslations();
+  const { permissions } = usePermissions();
+  const { formatDateTimeString } = usePreferredDateTime();
+
+  const [showHistory, setShowHistory] = useState(false);
+  const [item, setItem] = useState(initialItem);
+  const [isEditing, setIsEditing] = useState(false);
+  const [editText, setEditText] = useState(initialItem.text);
+  const [editDescription, setEditDescription] = useState(_unsanitizeDescription(initialItem.description || ""));
+  const [scoreInput, setScoreInput] = useState(initialItem.score?.toString() || "");
+  const [reminderInput, setReminderInput] = useState(initialItem.reminder?.datetime || "");
+  const [targetDateInput, setTargetDateInput] = useState(initialItem.targetDate || "");
+  const [priorityInput, setPriorityInput] = useState<KanbanPriority>(initialItem.priority || KanbanPriorityLevel.NONE);
+  const [assigneeInput, setAssigneeInput] = useState(initialItem.assignee || "");
+  const [estimatedTimeInput, setEstimatedTimeInput] = useState(initialItem.estimatedTime?.toString() || "");
+  const [availableUsers, setAvailableUsers] = useState<{ username: string; avatarUrl?: string }[]>([]);
+  const [boardIsShared, setBoardIsShared] = useState(false);
+
+  useEffect(() => {
+    setItem(initialItem);
+    setEditText(initialItem.text);
+    setEditDescription(_unsanitizeDescription(initialItem.description || ""));
+    setScoreInput(initialItem.score?.toString() || "");
+    setReminderInput(initialItem.reminder?.datetime || "");
+    setTargetDateInput(initialItem.targetDate || "");
+    setPriorityInput(initialItem.priority || KanbanPriorityLevel.NONE);
+    setAssigneeInput(initialItem.assignee || "");
+    setEstimatedTimeInput(initialItem.estimatedTime?.toString() || "");
+  }, [initialItem]);
+
+  useEffect(() => {
+    if (!isOpen) return;
+    const _loadUsers = async () => {
+      const sharedWithUsers = await getUsersWithAccess(checklistId, checklist.uuid);
+      if (sharedWithUsers.length === 0) {
+        setBoardIsShared(false);
+        return;
+      }
+      setBoardIsShared(true);
+      const allUsers = await getUsers();
+      const allowedUsernames = new Set(sharedWithUsers);
+      if (checklist.owner) allowedUsernames.add(checklist.owner);
+      const userMap = new Map<string, { username: string; avatarUrl?: string }>();
+      allUsers
+        .filter((u: { username: string }) => allowedUsernames.has(u.username))
+        .forEach((u: { username: string; avatarUrl?: string }) => {
+          userMap.set(u.username, { username: u.username, avatarUrl: u.avatarUrl });
+        });
+      allowedUsernames.forEach((username) => {
+        if (!userMap.has(username)) userMap.set(username, { username });
+      });
+      setAvailableUsers(Array.from(userMap.values()));
+    };
+    _loadUsers();
+  }, [isOpen, checklistId, checklist.uuid, checklist.owner]);
+
+  const descriptionHtml = useMemo(() => {
+    const noDescText = `<p class="text-muted-foreground text-sm opacity-50">${t("checklists.noDescription")}</p>`;
+    if (!item.description) return noDescText;
+    const unsanitized = _unsanitizeDescription(item.description);
+    return convertMarkdownToHtml(unsanitized.replace(/\n/g, "  \n")) || noDescText;
+  }, [item.description, t]);
+
+  const _saveField = async (fields: Record<string, string>) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", item.id);
+    formData.append("category", category);
+    Object.entries(fields).forEach(([key, value]) => formData.append(key, value));
+    const result = await updateItem(checklist, formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      const updatedItem = _findItemInChecklist(result.data, item.id);
+      if (updatedItem) setItem(updatedItem);
+    }
+  };
+
+  const handleSave = async () => {
+    const sanitizedDescription = _sanitizeDescription(editDescription.trim());
+    const currentUnsanitized = _unsanitizeDescription(item.description || "");
+    if (editText.trim() !== item.text || editDescription.trim() !== currentUnsanitized) {
+      const formData = new FormData();
+      formData.append("listId", checklistId);
+      formData.append("itemId", item.id);
+      formData.append("text", editText.trim());
+      formData.append("description", sanitizedDescription);
+      formData.append("category", category);
+      const result = await updateItem(checklist, formData);
+      if (result.success && result.data) {
+        onUpdate(result.data);
+        const updatedItem = _findItemInChecklist(result.data, item.id);
+        if (updatedItem) {
+          setItem(updatedItem);
+          setEditText(updatedItem.text);
+          setEditDescription(_unsanitizeDescription(updatedItem.description || ""));
+        }
+      }
+    }
+    setIsEditing(false);
+  };
+
+  const handleAddSubtask = async (text: string) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("parentId", item.id);
+    formData.append("text", text);
+    formData.append("category", category);
+    const result = await createSubItem(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      const updatedItem = _findItemInChecklist(result.data, item.id);
+      if (updatedItem) setItem(updatedItem);
+    }
+  };
+
+  const handleAddNestedSubtask = async (parentId: string, text: string) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("parentId", parentId);
+    formData.append("text", text);
+    formData.append("category", category);
+    const result = await createSubItem(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      const updatedItem = _findItemInChecklist(result.data, item.id);
+      if (updatedItem) setItem(updatedItem);
+    }
+  };
+
+  const _allChildrenComplete = (children: Item[]): boolean =>
+    children.every((child) =>
+      child.completed && (!child.children?.length || _allChildrenComplete(child.children))
+    );
+
+  const _autoCompleteStatus = useMemo(() => {
+    const statuses = checklist.statuses || [];
+    return statuses.find((s) => s.autoComplete);
+  }, [checklist.statuses]);
+
+  const handleToggleSubtask = async (subtaskId: string, completed: boolean) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", subtaskId);
+    formData.append("completed", completed.toString());
+    formData.append("category", category);
+    const result = await updateItem(checklist, formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      const updatedItem = _findItemInChecklist(result.data, item.id);
+      if (updatedItem) {
+        setItem(updatedItem);
+        if (_autoCompleteStatus && updatedItem.children?.length && _allChildrenComplete(updatedItem.children)) {
+          const statusFormData = new FormData();
+          statusFormData.append("listId", checklistId);
+          statusFormData.append("itemId", item.id);
+          statusFormData.append("status", _autoCompleteStatus.id);
+          statusFormData.append("category", category);
+          const statusResult = await updateItemStatus(statusFormData);
+          if (statusResult.success && statusResult.data) {
+            onUpdate(statusResult.data as import("@/app/_types").Checklist);
+          }
+        }
+      }
+    }
+  };
+
+  const handleEditSubtask = async (subtaskId: string, text: string) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", subtaskId);
+    formData.append("text", text);
+    formData.append("category", category);
+    const result = await updateItem(checklist, formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      const updatedItem = _findItemInChecklist(result.data, item.id);
+      if (updatedItem) setItem(updatedItem);
+    }
+  };
+
+  const handleDeleteSubtask = async (subtaskId: string) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", subtaskId);
+    formData.append("category", category);
+    const result = await deleteItem(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      const updatedItem = _findItemInChecklist(result.data, item.id);
+      if (updatedItem) setItem(updatedItem);
+    }
+  };
+
+  const handleToggleAll = async (completed: boolean) => {
+    if (!item.children?.length) return;
+    const _findTargetItems = (items: Item[]): Item[] => {
+      const targets: Item[] = [];
+      items.forEach((subtask) => {
+        const shouldToggle = completed ? !subtask.completed : subtask.completed;
+        if (shouldToggle) targets.push(subtask);
+        if (subtask.children?.length) targets.push(..._findTargetItems(subtask.children));
+      });
+      return targets;
+    };
+    const targetItems = _findTargetItems(item.children);
+    if (!targetItems.length) return;
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("completed", String(completed));
+    formData.append("itemIds", JSON.stringify(targetItems.map((t) => t.id)));
+    formData.append("category", category);
+    const result = await bulkToggleItems(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+      const updatedItem = _findItemInChecklist(result.data, item.id);
+      if (updatedItem) setItem(updatedItem);
+    }
+  };
+
+  const handlePriorityChange = async (priority: KanbanPriority) => {
+    setPriorityInput(priority);
+    await _saveField({ priority });
+  };
+
+  const handleScoreSave = async () => {
+    const score = parseInt(scoreInput);
+    if (isNaN(score)) return;
+    await _saveField({ score: score.toString() });
+  };
+
+  const handleReminderSave = async () => {
+    await _saveField({
+      reminder: reminderInput ? JSON.stringify({ datetime: new Date(reminderInput).toISOString() }) : "",
+    });
+  };
+
+  const handleTargetDateChange = async (value: string) => {
+    setTargetDateInput(value);
+    await _saveField({ targetDate: value ? new Date(value).toISOString() : "" });
+  };
+
+  const handleEstimatedTimeSave = async () => {
+    const hours = parseFloat(estimatedTimeInput);
+    if (isNaN(hours)) return;
+    await _saveField({ estimatedTime: hours.toString() });
+  };
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={onClose}
+      title={item.text || t("checklists.untitledTask")}
+      className="[&_.jotty-modal-header]:shrink-0 lg:!max-w-[80vw] lg:!w-full lg:!h-[80vh] lg:!max-h-[80vh] max-h-[min(90dvh,100dvh)] !flex !flex-col overflow-y-auto overscroll-contain lg:overflow-hidden"
+    >
+      <div className="flex flex-col lg:flex-row gap-6 lg:flex-1 lg:min-h-0 lg:overflow-hidden">
+        <div className="min-w-0 space-y-4 lg:flex-1 lg:min-h-0 lg:overflow-y-auto">
+          {isEditing ? (
+            <div className="space-y-4">
+              <div>
+                <label className="block text-sm font-medium text-foreground mb-2">
+                  {t("kanban.itemTitle")}
+                </label>
+                <input
+                  type="text"
+                  value={editText}
+                  onChange={(e) => setEditText(e.target.value)}
+                  className="w-full px-3 py-2 bg-background border border-input rounded-jotty focus:outline-none focus:border-ring transition-all text-base"
+                  placeholder={t("checklists.enterTaskTitle")}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter" && !e.shiftKey) { e.preventDefault(); handleSave(); }
+                    else if (e.key === "Escape") { e.preventDefault(); setEditText(item.text); setEditDescription(_unsanitizeDescription(item.description || "")); setIsEditing(false); }
+                  }}
+                />
+              </div>
+              <div>
+                <label className="block text-sm font-medium text-foreground mb-2">
+                  {t("common.description")}
+                </label>
+                <textarea
+                  value={editDescription}
+                  onChange={(e) => setEditDescription(e.target.value)}
+                  className="w-full px-3 py-2 bg-background border border-input rounded-jotty focus:outline-none focus:border-ring transition-all min-h-[120px] text-base resize-y"
+                  placeholder={t("checklists.addDescriptionOptional")}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter" && e.ctrlKey) { e.preventDefault(); handleSave(); }
+                    else if (e.key === "Escape") { e.preventDefault(); setEditText(item.text); setEditDescription(_unsanitizeDescription(item.description || "")); setIsEditing(false); }
+                  }}
+                />
+              </div>
+              <div className="flex justify-end gap-2">
+                <Button variant="ghost" onClick={() => { setEditText(item.text); setEditDescription(_unsanitizeDescription(item.description || "")); setIsEditing(false); }}>
+                  <MultiplicationSignIcon className="h-4 w-4 mr-2" />
+                  {t("common.cancel")}
+                </Button>
+                <Button onClick={handleSave}>
+                  <FloppyDiskIcon className="h-4 w-4 mr-2" />
+                  {t("admin.saveChanges")}
+                </Button>
+              </div>
+            </div>
+          ) : (
+            <div
+              className={`bg-card border border-border rounded-jotty p-4 shadow-sm ${permissions?.canEdit ? "cursor-pointer" : ""}`}
+              onClick={() => permissions?.canEdit && setIsEditing(true)}
+            >
+              <div
+                className="text-card-foreground prose prose-sm dark:prose-invert max-w-none leading-relaxed"
+                dangerouslySetInnerHTML={{ __html: descriptionHtml }}
+              />
+            </div>
+          )}
+
+          {!isEditing && item.history && item.history.length > 0 && (
+            <div className="border-t border-border pt-4">
+              <button
+                onClick={() => setShowHistory(!showHistory)}
+                className="flex items-center gap-2 text-sm font-medium text-muted-foreground hover:text-foreground transition-colors w-full"
+              >
+                {showHistory ? (
+                  <ArrowDown01Icon className="h-4 w-4" />
+                ) : (
+                  <ArrowRight01Icon className="h-4 w-4" />
+                )}
+                {t("common.statusChanges", { count: item.history.length })}
+              </button>
+              {showHistory && (
+                <div className="mt-2 space-y-1.5 max-h-48 overflow-y-auto">
+                  {item.history.map((change, i) => (
+                    <div
+                      key={i}
+                      className="flex items-center gap-2 text-xs text-muted-foreground bg-muted/30 rounded-jotty px-3 py-2"
+                    >
+                      <span className="font-medium text-foreground">{change.status}</span>
+                      <span className="text-muted-foreground/50">&bull;</span>
+                      <span>{change.user}</span>
+                      <span className="text-muted-foreground/50">&bull;</span>
+                      <span>{formatDateTimeString(change.timestamp)}</span>
+                    </div>
+                  ))}
+                </div>
+              )}
+            </div>
+          )}
+
+          {!isEditing && (
+            <div className="border-t border-border pt-4">
+              <KanbanCardDetailSubtasks
+                item={item}
+                checklist={checklist}
+                canEdit={!!permissions?.canEdit}
+                onToggle={handleToggleSubtask}
+                onEdit={handleEditSubtask}
+                onDelete={handleDeleteSubtask}
+                onAddSubtask={handleAddSubtask}
+                onAddNestedSubtask={handleAddNestedSubtask}
+                onToggleAll={handleToggleAll}
+              />
+            </div>
+          )}
+        </div>
+
+        <div className="lg:w-80 lg:flex-shrink-0 lg:border-l lg:border-border lg:pl-6 lg:min-h-0 lg:overflow-y-auto">
+          <KanbanCardDetailProperties
+            item={item}
+            priorityInput={priorityInput}
+            scoreInput={scoreInput}
+            assigneeInput={assigneeInput}
+            reminderInput={reminderInput}
+            targetDateInput={targetDateInput}
+            estimatedTimeInput={estimatedTimeInput}
+            availableUsers={availableUsers}
+            canEdit={!!permissions?.canEdit}
+            isShared={boardIsShared}
+            toLocalDateTimeValue={_toLocalDateTimeValue}
+            toLocalDateValue={_toLocalDateValue}
+            onPriorityChange={handlePriorityChange}
+            onScoreChange={setScoreInput}
+            onScoreSave={handleScoreSave}
+            onAssigneeChange={async (v) => {
+              setAssigneeInput(v);
+              await _saveField({ assignee: v });
+              if (v) {
+                await createNotificationForUser(v, {
+                  type: "assignment",
+                  title: t("notifications.assignmentTitle"),
+                  message: t("notifications.assignmentMessage", { task: item.text, board: checklist.title }),
+                  data: {
+                    itemId: checklist.uuid || checklistId,
+                    itemType: "checklist",
+                    taskId: item.id,
+                  },
+                });
+              }
+            }}
+            onReminderChange={async (v) => {
+              setReminderInput(v);
+              await _saveField({
+                reminder: v ? JSON.stringify({ datetime: new Date(v).toISOString() }) : "",
+              });
+            }}
+            onReminderSave={handleReminderSave}
+            onTargetDateChange={handleTargetDateChange}
+            onEstimatedTimeChange={setEstimatedTimeInput}
+            onEstimatedTimeSave={handleEstimatedTimeSave}
+            formatDateTimeString={formatDateTimeString}
+          />
+        </div>
+      </div>
+    </Modal>
+  );
+};
diff --git a/app/_components/FeatureComponents/Kanban/KanbanCardDetailProperties.tsx b/app/_components/FeatureComponents/Kanban/KanbanCardDetailProperties.tsx
new file mode 100644
index 00000000..5ccbd2a2
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/KanbanCardDetailProperties.tsx
@@ -0,0 +1,252 @@
+"use client";
+
+import { Dropdown } from "@/app/_components/GlobalComponents/Dropdowns/Dropdown";
+import { UserAvatar } from "@/app/_components/GlobalComponents/User/UserAvatar";
+import { DatePicker, DateTimePicker } from "@/app/_components/GlobalComponents/FormElements/DatePicker";
+import { Item, KanbanPriority } from "@/app/_types";
+import { KanbanPriorityLevel } from "@/app/_types/enums";
+import {
+  getPriorityDotColor,
+  getPriorityLabel,
+} from "@/app/_utils/kanban/index";
+import { UserIcon } from "hugeicons-react";
+import { useTranslations } from "next-intl";
+import { cn } from "@/app/_utils/global-utils";
+
+interface KanbanCardDetailPropertiesProps {
+  item: Item;
+  priorityInput: KanbanPriority;
+  scoreInput: string;
+  assigneeInput: string;
+  reminderInput: string;
+  targetDateInput: string;
+  estimatedTimeInput: string;
+  availableUsers: { username: string; avatarUrl?: string }[];
+  canEdit: boolean;
+  isShared: boolean;
+  toLocalDateTimeValue: (iso: string) => string;
+  toLocalDateValue: (iso: string) => string;
+  onPriorityChange: (p: KanbanPriority) => void;
+  onScoreChange: (v: string) => void;
+  onScoreSave: () => void;
+  onAssigneeChange: (v: string) => void;
+  onReminderChange: (v: string) => void;
+  onReminderSave: () => void;
+  onTargetDateChange: (v: string) => void;
+  onEstimatedTimeChange: (v: string) => void;
+  onEstimatedTimeSave: () => void;
+  formatDateTimeString: (v: string) => string;
+}
+
+export const KanbanCardDetailProperties = ({
+  item,
+  priorityInput,
+  scoreInput,
+  assigneeInput,
+  reminderInput,
+  targetDateInput,
+  estimatedTimeInput,
+  availableUsers,
+  canEdit,
+  isShared,
+  toLocalDateTimeValue,
+  toLocalDateValue,
+  onPriorityChange,
+  onScoreChange,
+  onScoreSave,
+  onAssigneeChange,
+  onReminderChange,
+  onReminderSave,
+  onTargetDateChange,
+  onEstimatedTimeChange,
+  onEstimatedTimeSave,
+  formatDateTimeString,
+}: KanbanCardDetailPropertiesProps) => {
+  const t = useTranslations();
+
+  const priorities: KanbanPriority[] = [
+    KanbanPriorityLevel.CRITICAL,
+    KanbanPriorityLevel.HIGH,
+    KanbanPriorityLevel.MEDIUM,
+    KanbanPriorityLevel.LOW,
+    KanbanPriorityLevel.NONE,
+  ];
+
+  const assigneeOptions = [
+    {
+      id: "",
+      name: (
+        <span className="flex items-center gap-2 text-muted-foreground">
+          <UserIcon className="h-4 w-4" />
+          {t("kanban.unassigned")}
+        </span>
+      ),
+    },
+    ...availableUsers.map((user) => ({
+      id: user.username,
+      name: (
+        <span className="flex items-center gap-2">
+          <UserAvatar
+            username={user.username}
+            avatarUrl={user.avatarUrl}
+            size="xs"
+          />
+          {user.username}
+        </span>
+      ),
+    })),
+  ];
+
+  const metadata = [];
+  if (item.createdBy) {
+    metadata.push(
+      t("common.createdByOn", {
+        user: item.createdBy,
+        date: formatDateTimeString(item.createdAt!),
+      }),
+    );
+  }
+  if (item.lastModifiedBy) {
+    metadata.push(
+      t("common.lastModifiedByOn", {
+        user: item.lastModifiedBy,
+        date: formatDateTimeString(item.lastModifiedAt!),
+      }),
+    );
+  }
+  if (item.history?.length) {
+    metadata.push(t("common.statusChanges", { count: item.history.length }));
+  }
+
+  return (
+    <div className="space-y-5">
+      {canEdit && (
+        <>
+          <div>
+            <label className="block text-xs font-medium text-muted-foreground mb-2">
+              {t("kanban.priority")}
+            </label>
+            <div className="flex flex-wrap gap-1.5">
+              {priorities.map((p) => (
+                <button
+                  key={p}
+                  onClick={() => onPriorityChange(p)}
+                  className={cn(
+                    "text-[11px] px-2.5 py-1.5 rounded-jotty border transition-all flex items-center gap-1.5",
+                    priorityInput === p
+                      ? "border-primary/50 bg-primary/5 text-foreground font-semibold"
+                      : "border-border text-muted-foreground hover:border-primary/30 hover:bg-muted/50",
+                  )}
+                >
+                  {p !== KanbanPriorityLevel.NONE && (
+                    <span
+                      className="w-1.5 h-1.5 rounded-full flex-shrink-0"
+                      style={{ backgroundColor: getPriorityDotColor(p) }}
+                    />
+                  )}
+                  {getPriorityLabel(p, t)}
+                </button>
+              ))}
+            </div>
+          </div>
+
+          <div>
+            <label className="block text-xs font-medium text-muted-foreground mb-2">
+              {t("kanban.score")}
+            </label>
+            <input
+              type="number"
+              min="0"
+              max="100"
+              value={scoreInput}
+              onChange={(e) => onScoreChange(e.target.value)}
+              onBlur={onScoreSave}
+              onKeyDown={(e) => e.key === "Enter" && onScoreSave()}
+              className="w-full px-3 py-2 text-sm bg-background border border-input rounded-jotty focus:outline-none focus:border-ring transition-colors"
+              placeholder="0"
+            />
+          </div>
+
+          {isShared && (
+            <div>
+              <label className="block text-xs font-medium text-muted-foreground mb-2">
+                {t("kanban.assignee")}
+              </label>
+              <Dropdown
+                value={assigneeInput}
+                options={assigneeOptions}
+                onChange={onAssigneeChange}
+                placeholder={t("kanban.unassigned")}
+              />
+            </div>
+          )}
+
+          <div>
+            <label className="block text-xs font-medium text-muted-foreground mb-2">
+              {t("kanban.reminder")}
+            </label>
+            <DateTimePicker
+              value={reminderInput}
+              onChange={onReminderChange}
+              onBlur={onReminderSave}
+            />
+          </div>
+
+          <div>
+            <label className="block text-xs font-medium text-muted-foreground mb-2">
+              {t("kanban.targetDate")}
+            </label>
+            <DatePicker
+              value={targetDateInput}
+              onChange={onTargetDateChange}
+            />
+          </div>
+
+          <div>
+            <label className="block text-xs font-medium text-muted-foreground mb-2">
+              {t("kanban.estimatedTime")}
+            </label>
+            <input
+              type="number"
+              min="0"
+              step="0.5"
+              value={estimatedTimeInput}
+              onChange={(e) => onEstimatedTimeChange(e.target.value)}
+              onBlur={onEstimatedTimeSave}
+              onKeyDown={(e) => e.key === "Enter" && onEstimatedTimeSave()}
+              className="w-full px-3 py-2 text-sm bg-background border border-input rounded-jotty focus:outline-none focus:border-ring transition-colors"
+              placeholder="0"
+            />
+            {item.estimatedTime && item.timeEntries && item.timeEntries.length > 0 && (
+              <p className="text-xs text-muted-foreground mt-1.5">
+                {t("kanban.actualVsEstimated", {
+                  actual: (item.timeEntries.reduce((sum, e) => sum + (e.duration || 0), 0) / 3600).toFixed(1) + "h",
+                  estimated: item.estimatedTime + "h",
+                })}
+              </p>
+            )}
+          </div>
+        </>
+      )}
+
+      {metadata.length > 0 && (
+        <div className={cn("pt-4", canEdit && "border-t border-border")}>
+          <h5 className="text-xs font-semibold text-muted-foreground uppercase tracking-wide mb-2">
+            {t("auditLogs.metadata")}
+          </h5>
+          <div className="space-y-1.5">
+            {metadata.map((text, i) => (
+              <p
+                key={i}
+                className="text-xs text-muted-foreground flex items-start gap-2"
+              >
+                <span className="text-muted-foreground/40">&bull;</span>
+                <span>{text}</span>
+              </p>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/_components/FeatureComponents/Kanban/KanbanCardDetailSubtasks.tsx b/app/_components/FeatureComponents/Kanban/KanbanCardDetailSubtasks.tsx
new file mode 100644
index 00000000..2d58ed9a
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/KanbanCardDetailSubtasks.tsx
@@ -0,0 +1,127 @@
+"use client";
+
+import { useState } from "react";
+import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
+import { Item, Checklist } from "@/app/_types";
+import { NestedChecklistItem } from "@/app/_components/FeatureComponents/Checklists/Parts/Simple/NestedChecklistItem";
+import { Add01Icon } from "hugeicons-react";
+import { useTranslations } from "next-intl";
+
+interface KanbanCardDetailSubtasksProps {
+  item: Item;
+  checklist: Checklist;
+  canEdit: boolean;
+  onToggle: (subtaskId: string, completed: boolean) => void;
+  onEdit: (subtaskId: string, text: string) => void;
+  onDelete: (subtaskId: string) => void;
+  onAddSubtask: (text: string) => void;
+  onAddNestedSubtask: (parentId: string, text: string) => void;
+  onToggleAll: (completed: boolean) => void;
+}
+
+export const KanbanCardDetailSubtasks = ({
+  item,
+  checklist,
+  canEdit,
+  onToggle,
+  onEdit,
+  onDelete,
+  onAddSubtask,
+  onAddNestedSubtask,
+  onToggleAll,
+}: KanbanCardDetailSubtasksProps) => {
+  const t = useTranslations();
+  const [newSubtaskText, setNewSubtaskText] = useState("");
+
+  const handleAdd = () => {
+    if (!newSubtaskText.trim()) return;
+    onAddSubtask(newSubtaskText.trim());
+    setNewSubtaskText("");
+  };
+
+  return (
+    <div>
+      <div className="flex items-center justify-between mb-3">
+        <h4 className="text-sm font-semibold text-foreground flex items-center gap-2">
+          {t("checklists.subtasks")}
+          {item.children?.length ? (
+            <span className="text-xs font-normal text-muted-foreground bg-muted px-2 py-0.5 rounded-full">
+              {item.children.filter((s) => s.completed).length} /{" "}
+              {item.children.length}
+            </span>
+          ) : null}
+        </h4>
+        {canEdit && item.children?.length ? (
+          <div className="flex gap-2">
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={() => onToggleAll(true)}
+              className="text-xs"
+            >
+              {t("common.completeAll")}
+            </Button>
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={() => onToggleAll(false)}
+              className="text-xs"
+            >
+              {t("common.resetAll")}
+            </Button>
+          </div>
+        ) : null}
+      </div>
+
+      {item.children?.length ? (
+        <div className="space-y-2 mb-3 bg-background-secondary/50 rounded-jotty p-3 border border-border/50">
+          {item.children.map((subtask, index) => (
+            <NestedChecklistItem
+              isSubtask={true}
+              key={subtask.id}
+              item={subtask}
+              index={index.toString()}
+              level={1}
+              onToggle={onToggle}
+              onDelete={onDelete}
+              onEdit={onEdit}
+              onAddSubItem={onAddNestedSubtask}
+              isDeletingItem={false}
+              isDragDisabled={true}
+              checklist={checklist}
+            />
+          ))}
+        </div>
+      ) : (
+        <div className="text-center py-6 text-muted-foreground text-sm bg-muted/20 rounded-jotty border border-dashed border-border mb-3">
+          {t("checklists.noSubtasksYet")}
+        </div>
+      )}
+
+      {canEdit && (
+        <div className="flex gap-2">
+          <input
+            type="text"
+            value={newSubtaskText}
+            onChange={(e) => setNewSubtaskText(e.target.value)}
+            placeholder={t("checklists.addSubtask")}
+            className="flex-1 px-3 py-2 text-sm bg-background border border-input rounded-jotty focus:outline-none focus:border-ring transition-all"
+            onKeyDown={(e) => {
+              if (e.key === "Enter" && !e.shiftKey) {
+                e.preventDefault();
+                handleAdd();
+              }
+            }}
+          />
+          <Button
+            onClick={handleAdd}
+            disabled={!newSubtaskText.trim()}
+            title={t("checklists.addSubItem")}
+          >
+            <Add01Icon className="h-4 w-4" />
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanColumn.tsx b/app/_components/FeatureComponents/Kanban/KanbanColumn.tsx
similarity index 74%
rename from app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanColumn.tsx
rename to app/_components/FeatureComponents/Kanban/KanbanColumn.tsx
index 684725b4..bb733034 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanColumn.tsx
+++ b/app/_components/FeatureComponents/Kanban/KanbanColumn.tsx
@@ -7,10 +7,11 @@ import {
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
 import { Item, Checklist, KanbanStatus } from "@/app/_types";
-import { KanbanItem } from "./KanbanItem";
+import { KanbanCard } from "./KanbanCard";
 import { cn } from "@/app/_utils/global-utils";
 import { TaskStatus } from "@/app/_types/enums";
 import { useTranslations } from "next-intl";
+import { TaskDaily01Icon } from "hugeicons-react";
 
 interface KanbanColumnProps {
   checklist: Checklist;
@@ -57,7 +58,7 @@ const KanbanColumnComponent = ({
   const color = statusColor || defaultColors[status] || "#6b7280";
 
   const { borderColor, bgColor } = useMemo(() => {
-    const hexToRgb = (hex: string) => {
+    const _hexToRgb = (hex: string) => {
       const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
       return result
         ? {
@@ -68,7 +69,7 @@ const KanbanColumnComponent = ({
         : null;
     };
 
-    const rgb = hexToRgb(color);
+    const rgb = _hexToRgb(color);
     return {
       borderColor: rgb ? `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.3)` : color,
       bgColor: rgb ? `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, 0.05)` : color,
@@ -76,25 +77,26 @@ const KanbanColumnComponent = ({
   }, [color]);
 
   return (
-    <div className="flex flex-col h-full my-4 lg:my-0">
-      <div className="flex items-center justify-between mb-3">
-        <div className="flex items-center gap-2">
+    <div className="flex flex-col h-full my-4 lg:my-0 min-w-0">
+      <div className="flex items-center justify-between mb-3 min-w-0">
+        <div className="flex items-center gap-2 min-w-0 overflow-hidden">
           <div
-            className="w-3 h-3 rounded-full"
+            className="w-3 h-3 rounded-full shrink-0"
             style={{ backgroundColor: color }}
           />
-          <h3 className="font-medium text-md lg:text-sm text-foreground">{title}</h3>
+          <h3 className="font-medium text-md lg:text-sm text-foreground truncate">{title}</h3>
         </div>
-        <span className="text-md lg:text-xs text-muted-foreground bg-muted px-2 py-1 rounded-full">
+        <span className="text-md lg:text-xs text-muted-foreground bg-muted px-2 py-1 rounded-full shrink-0">
           {items.length}
         </span>
       </div>
 
       <div
         ref={setNodeRef}
+        aria-label={`${title} column`}
         className={cn(
-          "flex-1 rounded-jotty border-2 border-dashed p-3 min-h-[200px] transition-colors",
-          isOver && "border-primary bg-primary/5"
+          "flex-1 min-w-0 rounded-jotty border-2 border-dashed p-3 min-h-[200px] transition-colors duration-200",
+          isOver && "border-primary/70 bg-primary/10 shadow-md"
         )}
         style={{
           borderColor: isOver ? undefined : borderColor,
@@ -107,7 +109,7 @@ const KanbanColumnComponent = ({
         >
           <div className="space-y-2">
             {items.map((item) => (
-              <KanbanItem
+              <KanbanCard
                 checklist={checklist}
                 key={item.id}
                 item={item}
@@ -116,11 +118,13 @@ const KanbanColumnComponent = ({
                 onUpdate={onUpdate}
                 isShared={isShared}
                 statuses={statuses}
+                statusColor={statusColor}
               />
             ))}
             {items.length === 0 && (
-              <div className="text-center text-muted-foreground text-md lg:text-sm py-8">
-                {t('checklists.noTasks')}
+              <div className="flex flex-col items-center justify-center text-muted-foreground/50 py-8 gap-2">
+                <TaskDaily01Icon className="h-8 w-8" />
+                <span className="text-md lg:text-sm">{t('checklists.noTasks')}</span>
               </div>
             )}
           </div>
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItemContent.tsx b/app/_components/FeatureComponents/Kanban/KanbanItemContent.tsx
similarity index 98%
rename from app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItemContent.tsx
rename to app/_components/FeatureComponents/Kanban/KanbanItemContent.tsx
index 2053786d..5eab1ea0 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/Kanban/KanbanItemContent.tsx
+++ b/app/_components/FeatureComponents/Kanban/KanbanItemContent.tsx
@@ -58,8 +58,8 @@ const KanbanItemContentComponent = ({
   };
 
   return (
-    <div className="space-y-2">
-      <div className="flex items-center gap-2">
+    <div className="space-y-2 min-w-0">
+      <div className="flex items-center gap-2 min-w-0">
         <div className="flex items-center gap-2 flex-1 min-w-0">
           {item.createdBy && isShared && (
             <div
diff --git a/app/_components/FeatureComponents/Kanban/KanbanItemTimer.tsx b/app/_components/FeatureComponents/Kanban/KanbanItemTimer.tsx
new file mode 100644
index 00000000..1194e743
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/KanbanItemTimer.tsx
@@ -0,0 +1,139 @@
+"use client";
+
+import { memo, useState, useRef, useEffect } from "react";
+import { Clock01Icon, TimeQuarterIcon, Add01Icon } from "hugeicons-react";
+import { PauseCircleIcon } from "@hugeicons/core-free-icons";
+import { HugeiconsIcon } from "@hugeicons/react";
+import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
+import { cn } from "@/app/_utils/global-utils";
+import { usePermissions } from "@/app/_providers/PermissionsProvider";
+import { useTranslations } from "next-intl";
+
+interface KanbanItemTimerProps {
+  totalTime: number;
+  currentTime: number;
+  isRunning: boolean;
+  formatTimerTime: (seconds: number) => string;
+  onTimerToggle: () => void;
+  onAddManualTime: (minutes: number) => void;
+}
+
+const KanbanItemTimerComponent = ({
+  totalTime,
+  currentTime,
+  isRunning,
+  formatTimerTime,
+  onTimerToggle,
+  onAddManualTime,
+}: KanbanItemTimerProps) => {
+  const { permissions } = usePermissions();
+  const t = useTranslations();
+  const [showTimeDropdown, setShowTimeDropdown] = useState(false);
+  const [customMinutes, setCustomMinutes] = useState("");
+  const dropdownRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    function _handleClickOutside(event: MouseEvent) {
+      if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
+        setShowTimeDropdown(false);
+      }
+    }
+    if (showTimeDropdown) {
+      document.addEventListener("mousedown", _handleClickOutside);
+    }
+    return () => document.removeEventListener("mousedown", _handleClickOutside);
+  }, [showTimeDropdown]);
+
+  function handleAddTime(e: React.MouseEvent) {
+    e.stopPropagation();
+    setShowTimeDropdown(!showTimeDropdown);
+  }
+
+  function _handlePreset(minutes: number) {
+    onAddManualTime(minutes);
+    setShowTimeDropdown(false);
+  }
+
+  function _handleCustomSubmit() {
+    if (customMinutes && !isNaN(Number(customMinutes))) {
+      onAddManualTime(Number(customMinutes));
+      setCustomMinutes("");
+      setShowTimeDropdown(false);
+    }
+  }
+
+  return (
+    <div className={cn(
+      "relative flex items-center justify-between text-sm lg:text-xs text-muted-foreground pt-1",
+      isRunning && "bg-primary/10 border border-primary/30 rounded-jotty p-1"
+    )}>
+      <div className="flex items-center gap-2">
+        <div className="flex items-center gap-1">
+          <Clock01Icon className={cn("h-3 w-3", isRunning && "animate-pulse")} />
+          <span>{formatTimerTime(totalTime + currentTime)}</span>
+        </div>
+        <div className="flex" onPointerDown={(e) => e.stopPropagation()}>
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-8 w-8 p-0"
+            disabled={!permissions?.canEdit}
+            title={isRunning ? "Pause timer" : "Start timer"}
+            aria-label={isRunning ? "Pause timer" : "Start timer"}
+            onClick={(e) => {
+              e.stopPropagation();
+              onTimerToggle();
+            }}
+          >
+            {isRunning ? (
+              <HugeiconsIcon icon={PauseCircleIcon} className="h-3 w-3" />
+            ) : (
+              <TimeQuarterIcon className="h-3 w-3" />
+            )}
+          </Button>
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-8 w-8 p-0"
+            disabled={!permissions?.canEdit}
+            title="Add manual time"
+            aria-label="Add manual time"
+            onClick={handleAddTime}
+          >
+            <Add01Icon className="h-3 w-3" />
+          </Button>
+        </div>
+      </div>
+
+      {showTimeDropdown && (
+        <div
+          ref={dropdownRef}
+          className="absolute bottom-full mb-1 right-0 z-50 bg-background border border-border rounded-jotty shadow-lg p-2 min-w-[160px]"
+          onPointerDown={(e) => e.stopPropagation()}
+        >
+          <div className="text-xs font-medium text-muted-foreground mb-1.5">{t("checklists.addTime")}</div>
+          <div className="grid grid-cols-2 gap-1 mb-2">
+            <Button variant="outline" size="sm" className="text-xs h-7" onClick={() => _handlePreset(15)}>15m</Button>
+            <Button variant="outline" size="sm" className="text-xs h-7" onClick={() => _handlePreset(30)}>30m</Button>
+            <Button variant="outline" size="sm" className="text-xs h-7" onClick={() => _handlePreset(60)}>1h</Button>
+            <Button variant="outline" size="sm" className="text-xs h-7" onClick={() => _handlePreset(120)}>2h</Button>
+          </div>
+          <div className="flex gap-1">
+            <input
+              type="number"
+              min="1"
+              value={customMinutes}
+              onChange={(e) => setCustomMinutes(e.target.value)}
+              onKeyDown={(e) => e.key === "Enter" && _handleCustomSubmit()}
+              placeholder={t("checklists.enterTimeInMinutes")}
+              className="flex-1 px-2 py-1 text-xs bg-background border border-input rounded-jotty focus:outline-none focus:border-ring min-w-0"
+            />
+            <Button variant="default" size="sm" className="text-xs h-7 px-2" onClick={_handleCustomSubmit}>{t("common.confirm")}</Button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export const KanbanItemTimer = memo(KanbanItemTimerComponent);
diff --git a/app/_components/FeatureComponents/Kanban/KanbanPageClient.tsx b/app/_components/FeatureComponents/Kanban/KanbanPageClient.tsx
new file mode 100644
index 00000000..8b9d8dd1
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/KanbanPageClient.tsx
@@ -0,0 +1,313 @@
+"use client";
+
+import { useMemo, useEffect } from "react";
+import { useRouter } from "next/navigation";
+import {
+  TaskDaily01Icon,
+  CheckmarkCircle04Icon,
+  TradeUpIcon,
+  AlertCircleIcon,
+  PlayCircleIcon,
+} from "hugeicons-react";
+import { Checklist, SanitisedUser } from "@/app/_types";
+import { TaskStatus } from "@/app/_types/enums";
+import { EmptyState } from "@/app/_components/GlobalComponents/Cards/EmptyState";
+import { ChecklistCard } from "@/app/_components/GlobalComponents/Cards/ChecklistCard";
+import { ChecklistListItem } from "@/app/_components/GlobalComponents/Cards/ChecklistListItem";
+import { ChecklistGridItem } from "@/app/_components/GlobalComponents/Cards/ChecklistGridItem";
+import { usePagination } from "@/app/_hooks/usePagination";
+import { useShortcut } from "@/app/_providers/ShortcutsProvider";
+import { useAppMode } from "@/app/_providers/AppModeProvider";
+import { isItemCompleted } from "@/app/_utils/checklist-utils";
+import { isOverdue, isDueThisWeek } from "@/app/_utils/kanban/reminder-utils";
+import { Logo } from "../../GlobalComponents/Layout/Logo/Logo";
+import { useTranslations } from "next-intl";
+import { useSettings } from "@/app/_utils/settings-store";
+import { useTasksFilter } from "../Checklists/TasksClient";
+
+interface KanbanPageClientProps {
+  initialLists: Checklist[];
+  user: SanitisedUser | null;
+}
+
+export const KanbanPageClient = ({
+  initialLists,
+  user,
+}: KanbanPageClientProps) => {
+  const t = useTranslations();
+  const router = useRouter();
+  const { openCreateChecklistModal } = useShortcut();
+  const { isInitialized } = useAppMode();
+  const { viewMode } = useSettings();
+
+  const {
+    taskFilter,
+    selectedCategories,
+    recursive,
+    itemsPerPage,
+    setItemsPerPage,
+    setPaginationInfo,
+  } = useTasksFilter();
+
+  const filteredLists = useMemo(() => {
+    let filtered = [...initialLists];
+
+    if (taskFilter === "pinned") {
+      const pinnedPaths = user?.pinnedLists || [];
+      filtered = filtered.filter((list) => {
+        const uuidPath = `${list.category || "Uncategorized"}/${list.uuid || list.id}`;
+        const idPath = `${list.category || "Uncategorized"}/${list.id}`;
+        return pinnedPaths.includes(uuidPath) || pinnedPaths.includes(idPath);
+      });
+    } else if (taskFilter === "completed") {
+      filtered = filtered.filter(
+        (list) =>
+          list.items.length > 0 &&
+          list.items.every((item) => isItemCompleted(item, list.type))
+      );
+    } else if (taskFilter === "incomplete") {
+      filtered = filtered.filter(
+        (list) =>
+          list.items.length === 0 ||
+          !list.items.every((item) => isItemCompleted(item, list.type))
+      );
+    } else if (taskFilter === "todo") {
+      filtered = filtered.filter((list) =>
+        list.items.some((item) => item.status === TaskStatus.TODO)
+      );
+    } else if (taskFilter === "in-progress") {
+      filtered = filtered.filter((list) =>
+        list.items.some((item) => item.status === TaskStatus.IN_PROGRESS)
+      );
+    }
+
+    if (selectedCategories.length > 0) {
+      filtered = filtered.filter((list) => {
+        const listCategory = list.category || "Uncategorized";
+        if (recursive) {
+          return selectedCategories.some(
+            (selected) =>
+              listCategory === selected ||
+              listCategory.startsWith(selected + "/")
+          );
+        }
+        return selectedCategories.includes(listCategory);
+      });
+    }
+
+    return filtered.sort(
+      (a, b) =>
+        new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
+    );
+  }, [initialLists, taskFilter, selectedCategories, recursive, user?.pinnedLists]);
+
+  const {
+    currentPage,
+    totalPages,
+    paginatedItems,
+    goToPage,
+    totalItems,
+    handleItemsPerPageChange,
+  } = usePagination({
+    items: filteredLists,
+    itemsPerPage,
+    onItemsPerPageChange: setItemsPerPage,
+  });
+
+  useEffect(() => {
+    setPaginationInfo({
+      currentPage,
+      totalPages,
+      totalItems,
+      onPageChange: goToPage,
+      onItemsPerPageChange: handleItemsPerPageChange,
+    });
+  }, [currentPage, totalPages, totalItems, goToPage, handleItemsPerPageChange, setPaginationInfo]);
+
+  const stats = useMemo(() => {
+    const allItems = initialLists.flatMap((list) =>
+      list.items.filter((item) => !item.isArchived)
+    );
+    const totalBoards = initialLists.length;
+    const totalItemCount = allItems.length;
+    const completedCount = allItems.filter(
+      (item) => item.status === TaskStatus.COMPLETED || item.completed
+    ).length;
+    const completionRate =
+      totalItemCount > 0 ? Math.round((completedCount / totalItemCount) * 100) : 0;
+    const todoCount = allItems.filter((item) => item.status === TaskStatus.TODO).length;
+    const inProgressCount = allItems.filter(
+      (item) => item.status === TaskStatus.IN_PROGRESS
+    ).length;
+
+    return {
+      totalBoards,
+      completedCount,
+      totalItemCount,
+      completionRate,
+      todoCount,
+      inProgressCount,
+    };
+  }, [initialLists]);
+
+  if (!isInitialized) {
+    return (
+      <div className="flex h-screen bg-background w-full">
+        <div className="flex-1 flex items-center justify-center">
+          <Logo />
+        </div>
+      </div>
+    );
+  }
+
+  if (initialLists.length === 0) {
+    return (
+      <EmptyState
+        icon={
+          <TaskDaily01Icon className="h-10 w-10 text-muted-foreground" />
+        }
+        title={t('kanban.noBoardsYet')}
+        description={t('kanban.createFirstBoard')}
+        buttonText={t('kanban.newBoard')}
+        onButtonClick={() => openCreateChecklistModal()}
+      />
+    );
+  }
+
+  const renderList = (list: Checklist) => {
+    const categoryPath = `${list.category || "Uncategorized"}/${list.id}`;
+    const isPinned = user?.pinnedLists?.includes(categoryPath);
+
+    if (viewMode === 'list') {
+      return (
+        <ChecklistListItem
+          key={list.id}
+          list={list}
+          onSelect={() => router.push(`/checklist/${categoryPath}`)}
+          isPinned={isPinned}
+          onTogglePin={() => {}}
+        />
+      );
+    }
+
+    if (viewMode === 'grid') {
+      return (
+        <ChecklistGridItem
+          key={list.id}
+          list={list}
+          onSelect={() => router.push(`/checklist/${categoryPath}`)}
+          isPinned={isPinned}
+          onTogglePin={() => {}}
+        />
+      );
+    }
+
+    return (
+      <ChecklistCard
+        key={list.id}
+        list={list}
+        onSelect={() => router.push(`/checklist/${categoryPath}`)}
+        isPinned={isPinned}
+        onTogglePin={() => {}}
+      />
+    );
+  };
+
+  return (
+    <>
+      <div className="bg-card border border-border rounded-jotty p-4 sm:p-6 mb-6">
+        <div className="grid grid-cols-2 lg:grid-cols-5 gap-4 sm:gap-6">
+          <div className="flex items-center gap-3">
+            <div className="p-2 bg-secondary rounded-jotty">
+              <TaskDaily01Icon className="h-4 w-4 sm:h-5 sm:w-5" />
+            </div>
+            <div>
+              <div className="text-xl sm:text-2xl font-bold text-foreground">
+                {stats.totalBoards}
+              </div>
+              <div className="text-md lg:text-xs text-muted-foreground">{t("kanban.boards")}</div>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-3">
+            <div className="p-2 bg-secondary rounded-jotty">
+              <CheckmarkCircle04Icon className="h-4 w-4 sm:h-5 sm:w-5" />
+            </div>
+            <div>
+              <div className="text-xl sm:text-2xl font-bold text-foreground">
+                {stats.completedCount}
+              </div>
+              <div className="text-md lg:text-xs text-muted-foreground">{t("kanban.completed")}</div>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-3">
+            <div className="p-2 bg-secondary rounded-jotty">
+              <TradeUpIcon className="h-4 w-4 sm:h-5 sm:w-5" />
+            </div>
+            <div>
+              <div className="text-xl sm:text-2xl font-bold text-foreground">
+                {stats.completionRate}%
+              </div>
+              <div className="text-md lg:text-xs text-muted-foreground">{t("checklists.progress")}</div>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-3">
+            <div className="p-2 bg-secondary rounded-jotty">
+              <AlertCircleIcon className="h-4 w-4 sm:h-5 sm:w-5" />
+            </div>
+            <div>
+              <div className="text-xl sm:text-2xl font-bold text-foreground">
+                {stats.todoCount}
+              </div>
+              <div className="text-md lg:text-xs text-muted-foreground">{t("kanban.todo")}</div>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-3">
+            <div className="p-2 bg-secondary rounded-jotty">
+              <PlayCircleIcon className="h-4 w-4 sm:h-5 sm:w-5" />
+            </div>
+            <div>
+              <div className="text-xl sm:text-2xl font-bold text-foreground">
+                {stats.inProgressCount}
+              </div>
+              <div className="text-md lg:text-xs text-muted-foreground">{t("kanban.inProgress")}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {paginatedItems.length === 0 ? (
+        <div className="text-center py-12">
+          <TaskDaily01Icon className="h-12 w-12 text-muted-foreground mx-auto mb-4" />
+          <h3 className="text-lg font-medium text-foreground mb-2">
+            {t("kanban.noBoards")}
+          </h3>
+          <p className="text-muted-foreground">
+            {t("kanban.tryAdjustingFilters")}
+          </p>
+        </div>
+      ) : (
+        <div className="mt-6">
+          {viewMode === 'card' && (
+            <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
+              {paginatedItems.map(renderList)}
+            </div>
+          )}
+          {viewMode === 'list' && (
+            <div className="space-y-3">
+              {paginatedItems.map(renderList)}
+            </div>
+          )}
+          {viewMode === 'grid' && (
+            <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-4">
+              {paginatedItems.map(renderList)}
+            </div>
+          )}
+        </div>
+      )}
+    </>
+  );
+};
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/StatusManagementModal.tsx b/app/_components/FeatureComponents/Kanban/StatusManagementModal.tsx
similarity index 100%
rename from app/_components/FeatureComponents/Checklists/Parts/Kanban/StatusManagementModal.tsx
rename to app/_components/FeatureComponents/Kanban/StatusManagementModal.tsx
diff --git a/app/_components/FeatureComponents/Kanban/StatusManager.tsx b/app/_components/FeatureComponents/Kanban/StatusManager.tsx
new file mode 100644
index 00000000..20adadb7
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/StatusManager.tsx
@@ -0,0 +1,3 @@
+"use client";
+
+export { StatusManagementModal as StatusManager } from "./StatusManagementModal";
diff --git a/app/_components/FeatureComponents/Checklists/Parts/Kanban/TimeEntriesAccordion.tsx b/app/_components/FeatureComponents/Kanban/TimeEntriesAccordion.tsx
similarity index 86%
rename from app/_components/FeatureComponents/Checklists/Parts/Kanban/TimeEntriesAccordion.tsx
rename to app/_components/FeatureComponents/Kanban/TimeEntriesAccordion.tsx
index 1cccd007..af6d0d83 100644
--- a/app/_components/FeatureComponents/Checklists/Parts/Kanban/TimeEntriesAccordion.tsx
+++ b/app/_components/FeatureComponents/Kanban/TimeEntriesAccordion.tsx
@@ -7,6 +7,7 @@ import {
   ArrowRight01Icon,
 } from "hugeicons-react";
 import { UserAvatar } from "@/app/_components/GlobalComponents/User/UserAvatar";
+import { useTranslations } from "next-intl";
 
 interface TimeEntriesAccordionProps {
   timeEntries: any[];
@@ -15,6 +16,7 @@ interface TimeEntriesAccordionProps {
   usersPublicData?: any[];
   formatDateString: (dateString: string) => string;
   formatTimeString: (dateString: string) => string;
+  onOpenTimeEntries?: () => void;
 }
 
 const TimeEntriesAccordionComponent = ({
@@ -24,7 +26,9 @@ const TimeEntriesAccordionComponent = ({
   usersPublicData,
   formatDateString,
   formatTimeString,
+  onOpenTimeEntries,
 }: TimeEntriesAccordionProps) => {
+  const t = useTranslations();
 
   const getUserAvatarUrl = (username: string) => {
     if (!usersPublicData) return "";
@@ -62,7 +66,7 @@ const TimeEntriesAccordionComponent = ({
       </button>
 
       {isOpen && (
-        <div className="border-t border-border/30 py-2 space-y-1.5 max-h-32 overflow-y-auto">
+        <div className="border-t border-border/30 py-2 space-y-1.5 max-h-64 overflow-y-auto">
           {timeEntries.map((entry, index) => (
             <div
               key={entry.id || index}
@@ -93,6 +97,14 @@ const TimeEntriesAccordionComponent = ({
               )}
             </div>
           ))}
+          {onOpenTimeEntries && (
+            <button
+              onClick={(e) => { e.stopPropagation(); onOpenTimeEntries(); }}
+              className="w-full text-center text-xs text-primary hover:text-primary/80 font-medium py-1.5 transition-colors"
+            >
+              {t("kanban.editSessions")}
+            </button>
+          )}
         </div>
       )}
     </div>
diff --git a/app/_components/FeatureComponents/Kanban/TimeEntriesModal.tsx b/app/_components/FeatureComponents/Kanban/TimeEntriesModal.tsx
new file mode 100644
index 00000000..c915e3f0
--- /dev/null
+++ b/app/_components/FeatureComponents/Kanban/TimeEntriesModal.tsx
@@ -0,0 +1,320 @@
+"use client";
+
+import { useState, memo } from "react";
+import { Modal } from "@/app/_components/GlobalComponents/Modals/Modal";
+import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
+import { TimeEntry, Checklist } from "@/app/_types";
+import { Delete03Icon, FloppyDiskIcon, Cancel01Icon } from "hugeicons-react";
+import { DateTimePicker } from "@/app/_components/GlobalComponents/FormElements/DatePicker";
+import { editTimeEntry, deleteTimeEntry } from "@/app/_server/actions/kanban";
+import { useTranslations } from "next-intl";
+import { ConfirmModal } from "@/app/_components/GlobalComponents/Modals/ConfirmationModals/ConfirmModal";
+import { UserAvatar } from "../../GlobalComponents/User/UserAvatar";
+
+interface TimeEntriesModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  timeEntries: TimeEntry[];
+  checklistId: string;
+  itemId: string;
+  category: string;
+  onUpdate: (updatedChecklist: Checklist) => void;
+  usersPublicData?: { username?: string; avatarUrl?: string }[];
+}
+
+const _toLocalDateTimeValue = (isoStr: string): string => {
+  if (!isoStr) return "";
+  const d = new Date(isoStr);
+  if (isNaN(d.getTime())) return "";
+  const pad = (n: number) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
+};
+
+const _formatDuration = (seconds: number): string => {
+  const h = Math.floor(seconds / 3600);
+  const m = Math.floor((seconds % 3600) / 60);
+  const s = seconds % 60;
+  const pad = (n: number) => String(n).padStart(2, "0");
+  return `${pad(h)}:${pad(m)}:${pad(s)}`;
+};
+
+const _getUserAvatarUrl = (
+  username: string,
+  usersPublicData?: { username?: string; avatarUrl?: string }[],
+): string => {
+  if (!usersPublicData) return "";
+  return (
+    usersPublicData.find(
+      (u) => u.username?.toLowerCase() === username?.toLowerCase(),
+    )?.avatarUrl || ""
+  );
+};
+
+interface EditingState {
+  entryId: string;
+  startTime: string;
+  endTime: string;
+}
+
+const TimeEntriesModalComponent = ({
+  isOpen,
+  onClose,
+  timeEntries,
+  checklistId,
+  itemId,
+  category,
+  onUpdate,
+  usersPublicData,
+}: TimeEntriesModalProps) => {
+  const t = useTranslations();
+  const [editing, setEditing] = useState<EditingState | null>(null);
+  const [deleteTarget, setDeleteTarget] = useState<string | null>(null);
+  const [saving, setSaving] = useState(false);
+
+  const totalSeconds = timeEntries.reduce(
+    (sum, e) => sum + (e.duration || 0),
+    0,
+  );
+
+  const handleStartEdit = (entry: TimeEntry) => {
+    setEditing({
+      entryId: entry.id,
+      startTime: _toLocalDateTimeValue(entry.startTime),
+      endTime: _toLocalDateTimeValue(entry.endTime || ""),
+    });
+  };
+
+  const handleSaveEdit = async () => {
+    if (!editing) return;
+    setSaving(true);
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", itemId);
+    formData.append("entryId", editing.entryId);
+    formData.append("category", category);
+    if (editing.startTime)
+      formData.append("startTime", new Date(editing.startTime).toISOString());
+    if (editing.endTime) {
+      formData.append("endTime", new Date(editing.endTime).toISOString());
+      const start = new Date(editing.startTime).getTime();
+      const end = new Date(editing.endTime).getTime();
+      if (end > start)
+        formData.append(
+          "duration",
+          Math.floor((end - start) / 1000).toString(),
+        );
+    }
+    const result = await editTimeEntry(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+    }
+    setEditing(null);
+    setSaving(false);
+  };
+
+  const handleDelete = async () => {
+    if (!deleteTarget) return;
+    setSaving(true);
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", itemId);
+    formData.append("entryId", deleteTarget);
+    formData.append("category", category);
+    const result = await deleteTimeEntry(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data);
+    }
+    setDeleteTarget(null);
+    setSaving(false);
+  };
+
+  const sorted = [...timeEntries].sort(
+    (a, b) => new Date(b.startTime).getTime() - new Date(a.startTime).getTime(),
+  );
+
+  return (
+    <>
+      <Modal
+        isOpen={isOpen}
+        onClose={onClose}
+        title={t("kanban.timeEntries")}
+        className="lg:!max-w-[600px] lg:!w-full !max-h-[80vh] overflow-y-auto"
+      >
+        <div className="space-y-3">
+          <div className="flex items-center justify-between text-sm text-muted-foreground border-b border-border pb-3">
+            <span>
+              {sorted.length}{" "}
+              {sorted.length === 1 ? t("kanban.session") : t("kanban.sessions")}
+            </span>
+            <span className="font-semibold text-foreground">
+              {_formatDuration(totalSeconds)}
+            </span>
+          </div>
+
+          <div className="space-y-2 max-h-[55vh] overflow-y-auto">
+            {sorted.map((entry) => {
+              const isEditing = editing?.entryId === entry.id;
+
+              return (
+                <div
+                  key={entry.id}
+                  className="border border-border rounded-jotty p-3 bg-card transition-colors hover:bg-muted/20"
+                >
+                  {isEditing ? (
+                    <div className="space-y-3">
+                      <div className="space-y-3">
+                        <div>
+                          <label className="block text-xs font-medium text-muted-foreground mb-1">
+                            {t("kanban.startTime")}
+                          </label>
+                          <DateTimePicker
+                            value={editing.startTime}
+                            onChange={(v) =>
+                              setEditing({ ...editing, startTime: v })
+                            }
+                          />
+                        </div>
+                        <div>
+                          <label className="block text-xs font-medium text-muted-foreground mb-1">
+                            {t("kanban.endTime")}
+                          </label>
+                          <DateTimePicker
+                            value={editing.endTime}
+                            onChange={(v) =>
+                              setEditing({ ...editing, endTime: v })
+                            }
+                          />
+                        </div>
+                      </div>
+                      {editing.startTime && editing.endTime && (
+                        <div className="text-xs text-muted-foreground">
+                          {_formatDuration(
+                            Math.max(
+                              0,
+                              Math.floor(
+                                (new Date(editing.endTime).getTime() -
+                                  new Date(editing.startTime).getTime()) /
+                                  1000,
+                              ),
+                            ),
+                          )}
+                        </div>
+                      )}
+                      <div className="flex justify-end gap-2">
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          onClick={() => setEditing(null)}
+                          disabled={saving}
+                        >
+                          <Cancel01Icon className="h-3 w-3 mr-1" />
+                          {t("common.cancel")}
+                        </Button>
+                        <Button
+                          size="sm"
+                          onClick={handleSaveEdit}
+                          disabled={saving}
+                        >
+                          <FloppyDiskIcon className="h-3 w-3 mr-1" />
+                          {t("admin.saveChanges")}
+                        </Button>
+                      </div>
+                    </div>
+                  ) : (
+                    <div
+                      className="flex items-center gap-3 cursor-pointer"
+                      onClick={() => handleStartEdit(entry)}
+                    >
+                      {entry.user && (
+                        <UserAvatar
+                          username={entry.user}
+                          size="xs"
+                          avatarUrl={_getUserAvatarUrl(
+                            entry.user,
+                            usersPublicData,
+                          )}
+                        />
+                      )}
+                      <div className="flex-1 min-w-0">
+                        <div className="flex items-baseline gap-2">
+                          <span className="text-sm font-semibold text-foreground">
+                            {_formatDuration(entry.duration || 0)}
+                          </span>
+                          {entry.user && (
+                            <span className="text-xs text-muted-foreground">
+                              {entry.user}
+                            </span>
+                          )}
+                        </div>
+                        <div className="text-xs text-muted-foreground mt-0.5">
+                          {new Date(entry.startTime).toLocaleDateString(
+                            undefined,
+                            {
+                              weekday: "short",
+                              month: "short",
+                              day: "numeric",
+                            },
+                          )}{" "}
+                          {new Date(entry.startTime).toLocaleTimeString(
+                            undefined,
+                            {
+                              hour: "2-digit",
+                              minute: "2-digit",
+                              second: "2-digit",
+                            },
+                          )}
+                          {entry.endTime && (
+                            <>
+                              {" → "}
+                              {new Date(entry.endTime).toLocaleTimeString(
+                                undefined,
+                                {
+                                  hour: "2-digit",
+                                  minute: "2-digit",
+                                  second: "2-digit",
+                                },
+                              )}
+                            </>
+                          )}
+                        </div>
+                      </div>
+                      <button
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          setDeleteTarget(entry.id);
+                        }}
+                        className="p-1.5 rounded-jotty hover:bg-destructive/10 transition-colors shrink-0"
+                      >
+                        <Delete03Icon className="h-4 w-4 text-muted-foreground hover:text-destructive" />
+                      </button>
+                    </div>
+                  )}
+                </div>
+              );
+            })}
+
+            {sorted.length === 0 && (
+              <div className="text-center text-muted-foreground text-sm py-8">
+                {t("kanban.noTimeEntries")}
+              </div>
+            )}
+          </div>
+        </div>
+      </Modal>
+
+      <ConfirmModal
+        isOpen={!!deleteTarget}
+        onClose={() => setDeleteTarget(null)}
+        onConfirm={handleDelete}
+        title={t("common.delete")}
+        message={t("common.confirmDeleteItem", {
+          itemTitle: t("common.thisEntry"),
+        })}
+        confirmText={t("common.delete")}
+        variant="destructive"
+      />
+    </>
+  );
+};
+
+export const TimeEntriesModal = memo(TimeEntriesModalComponent);
diff --git a/app/_components/FeatureComponents/Notes/Parts/NoteEditor/NoteEditorHeader.tsx b/app/_components/FeatureComponents/Notes/Parts/NoteEditor/NoteEditorHeader.tsx
index 239d6643..1609ce6c 100644
--- a/app/_components/FeatureComponents/Notes/Parts/NoteEditor/NoteEditorHeader.tsx
+++ b/app/_components/FeatureComponents/Notes/Parts/NoteEditor/NoteEditorHeader.tsx
@@ -532,7 +532,7 @@ export const NoteEditorHeader = ({
                         ? [
                           {
                             type: "item" as const,
-                            label: "Clone",
+                            label: t("common.clone"),
                             icon: <Copy02Icon className="h-4 w-4" />,
                             onClick: onClone,
                           },
@@ -544,7 +544,7 @@ export const NoteEditorHeader = ({
                             type: "item" as const,
                             label: !isInViewMode
                               ? t("settings.view")
-                              : "Hide",
+                              : t("common.hide"),
                             icon: !isInViewMode ? (
                               <ViewIcon className="h-4 w-4" />
                             ) : (
@@ -604,7 +604,7 @@ export const NoteEditorHeader = ({
                       },
                       {
                         type: "item" as const,
-                        label: "Print / Save as PDF",
+                        label: t("notes.printSaveAsPdf"),
                         icon: isPrinting ? (
                           <Orbit01Icon className="h-4 w-4 animate-spin" />
                         ) : (
@@ -624,7 +624,7 @@ export const NoteEditorHeader = ({
                         : []),
                       {
                         type: "item" as const,
-                        label: "Table of Contents",
+                        label: t("notes.tableOfContents"),
                         icon: <SidebarRightIcon className="h-4 w-4" />,
                         onClick: () => setShowTOC(!showTOC),
                         className: "hidden lg:flex",
diff --git a/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/InternalLinkComponent.tsx b/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/InternalLinkComponent.tsx
index 3c863baf..79bf16a9 100644
--- a/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/InternalLinkComponent.tsx
+++ b/app/_components/FeatureComponents/Notes/Parts/TipTap/CustomExtensions/InternalLinkComponent.tsx
@@ -22,7 +22,7 @@ import { useAppMode } from "@/app/_providers/AppModeProvider";
 import { NoteCard } from "@/app/_components/GlobalComponents/Cards/NoteCard";
 import { ChecklistCard } from "@/app/_components/GlobalComponents/Cards/ChecklistCard";
 import { Checklist, Note } from "@/app/_types";
-import { ItemTypes } from "@/app/_types/enums";
+import { isKanbanType, ItemTypes } from "@/app/_types/enums";
 import { encodeId } from "@/app/_utils/global-utils";
 import { useTranslations } from "next-intl";
 
@@ -49,8 +49,8 @@ const _returnNote = async (uuid: string, router: any, note?: Note) => {
     router.push(
       `/note/${buildCategoryPath(
         finalNote.category || "Uncategorized",
-        finalNote.id
-      )}`
+        finalNote.id,
+      )}`,
     );
     return;
   }
@@ -61,7 +61,7 @@ const _returnNote = async (uuid: string, router: any, note?: Note) => {
 const _returnChecklist = async (
   uuid: string,
   router: any,
-  checklist?: Checklist
+  checklist?: Checklist,
 ) => {
   const finalChecklist = checklist || (await getListById(uuid));
 
@@ -69,8 +69,8 @@ const _returnChecklist = async (
     router.push(
       `/checklist/${buildCategoryPath(
         finalChecklist.category || "Uncategorized",
-        finalChecklist.id
-      )}`
+        finalChecklist.id,
+      )}`,
     );
     return;
   }
@@ -87,7 +87,9 @@ export const InternalLinkComponent = ({
   const { href, title, uuid, itemId, type, category, convertToBidirectional } =
     node.attrs;
   const [showPopup, setShowPopup] = useState(false);
-  const [loadedFullItem, setLoadedFullItem] = useState<Note | Checklist | null>(null);
+  const [loadedFullItem, setLoadedFullItem] = useState<Note | Checklist | null>(
+    null,
+  );
   const [isLoadingItem, setIsLoadingItem] = useState(false);
   const potentialCategory = href
     ?.replace("/jotty/", "")
@@ -116,7 +118,8 @@ export const InternalLinkComponent = ({
 
     setIsLoadingItem(true);
     try {
-      const isChecklist = metadataItem && "type" in metadataItem && metadataItem.type;
+      const isChecklist =
+        metadataItem && "type" in metadataItem && metadataItem.type;
       if (isChecklist) {
         const checklist = await getListById(uuid);
         if (checklist) setLoadedFullItem(checklist);
@@ -146,13 +149,14 @@ export const InternalLinkComponent = ({
 
       if (fullItem && fullItem.id) {
         router.push(
-          `/${fullItem && "type" in fullItem && fullItem.type
-            ? ItemTypes.CHECKLIST
-            : ItemTypes.NOTE
+          `/${
+            fullItem && "type" in fullItem && fullItem.type
+              ? ItemTypes.CHECKLIST
+              : ItemTypes.NOTE
           }/${buildCategoryPath(
             fullItem.category || "Uncategorized",
-            fullItem.id
-          )}`
+            fullItem.id,
+          )}`,
         );
         return;
       }
@@ -187,7 +191,7 @@ export const InternalLinkComponent = ({
             : "/note/";
         const newHref = `${pathPrefix}${buildCategoryPath(
           fullItem.category || "Uncategorized",
-          fullItem.id
+          fullItem.id,
         )}`;
         updateAttributes({
           href: newHref,
@@ -221,13 +225,13 @@ export const InternalLinkComponent = ({
             (n) =>
               encodeId(n.id || "") === encodeId(itemId) &&
               encodeCategoryPath(n?.category || "") ===
-              encodeCategoryPath(category)
+                encodeCategoryPath(category),
           ) ||
           checklists.find(
             (c) =>
               encodeId(c.id || "") === encodeId(itemId) &&
               encodeCategoryPath(c?.category || "") ===
-              encodeCategoryPath(category)
+                encodeCategoryPath(category),
           );
 
         if (foundItem?.uuid) {
@@ -267,12 +271,17 @@ export const InternalLinkComponent = ({
               <div className="bg-card border border-border rounded-jotty p-4 text-muted-foreground text-sm">
                 Loading...
               </div>
-            ) : loadedFullItem && "type" in loadedFullItem && loadedFullItem.type ? (
-              <ChecklistCard list={loadedFullItem as Checklist} onSelect={() => { }} />
+            ) : loadedFullItem &&
+              "type" in loadedFullItem &&
+              loadedFullItem.type ? (
+              <ChecklistCard
+                list={loadedFullItem as Checklist}
+                onSelect={() => {}}
+              />
             ) : loadedFullItem ? (
               <NoteCard
                 note={loadedFullItem as Note}
-                onSelect={() => { }}
+                onSelect={() => {}}
                 fullScrollableContent
               />
             ) : (
@@ -285,7 +294,7 @@ export const InternalLinkComponent = ({
       <span className="flex-shrink-0">
         {fullItem && "type" in fullItem && fullItem.type ? (
           <>
-            {fullItem.type === "task" ? (
+            {isKanbanType(fullItem.type) ? (
               <TaskDaily01Icon className="h-5 w-5" />
             ) : (
               <CheckmarkSquare04Icon className="h-5 w-5" />
@@ -308,15 +317,18 @@ export const InternalLinkComponent = ({
       </span>
       {isEditable && (isPathBasedLink || canToggle) && (
         <div className="flex items-center gap-1.5 ml-2 pl-2 border-l border-border">
-          <span className="text-md lg:text-xs text-muted-foreground">{t('editor.linkType')}</span>
+          <span className="text-md lg:text-xs text-muted-foreground">
+            {t("editor.linkType")}
+          </span>
           <button
             onClick={handleToggleConversion}
-            className={`flex items-center gap-1.5 px-2.5 py-1 rounded-jotty text-sm lg:text-xs font-medium transition-all ${isJottyLink
+            className={`flex items-center gap-1.5 px-2.5 py-1 rounded-jotty text-sm lg:text-xs font-medium transition-all ${
+              isJottyLink
                 ? "bg-blue-500/20 text-blue-800 hover:bg-blue-500/30 border border-blue-500/30"
                 : convertToBidirectional
                   ? "bg-blue-500/20 text-blue-800 hover:bg-blue-500/30 border border-blue-500/30"
                   : "bg-muted text-muted-foreground hover:bg-muted/80 border border-border"
-              }`}
+            }`}
             title={
               isJottyLink
                 ? "Click to convert to path-based link (cross-platform compatible)"
@@ -328,12 +340,12 @@ export const InternalLinkComponent = ({
             {isJottyLink || convertToBidirectional ? (
               <>
                 <FileLinkIcon className="h-3.5 w-3.5" />
-                <span>{t('editor.bidirectional')}</span>
+                <span>{t("editor.bidirectional")}</span>
               </>
             ) : (
               <>
                 <Attachment01Icon className="h-3.5 w-3.5" />
-                <span>{t('editor.pathBased')}</span>
+                <span>{t("editor.pathBased")}</span>
               </>
             )}
           </button>
diff --git a/app/_components/FeatureComponents/Notifications/NotificationBell.tsx b/app/_components/FeatureComponents/Notifications/NotificationBell.tsx
new file mode 100644
index 00000000..2acb7f10
--- /dev/null
+++ b/app/_components/FeatureComponents/Notifications/NotificationBell.tsx
@@ -0,0 +1,113 @@
+"use client";
+
+import { useRef, useState, useEffect, useCallback } from "react";
+import { Notification03Icon, Delete02Icon, Tick02Icon } from "hugeicons-react";
+import { useNotifications } from "@/app/_hooks/useNotifications";
+import { useTranslations } from "next-intl";
+import { NotificationItem } from "./NotificationItem";
+
+export const NotificationBell = () => {
+  const t = useTranslations();
+  const dropdownRef = useRef<HTMLDivElement>(null);
+  const [isOpen, setIsOpen] = useState(false);
+  const {
+    notifications,
+    unreadCount,
+    markAsRead,
+    markAllAsRead,
+    removeNotification,
+    clearAll,
+  } = useNotifications();
+
+  const handleClose = useCallback(() => setIsOpen(false), []);
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        dropdownRef.current &&
+        !dropdownRef.current.contains(event.target as Node)
+      ) {
+        handleClose();
+      }
+    };
+    const handleEscape = (event: KeyboardEvent) => {
+      if (event.key === "Escape") handleClose();
+    };
+
+    if (isOpen) {
+      document.addEventListener("mousedown", handleClickOutside);
+      document.addEventListener("keydown", handleEscape);
+    }
+
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+      document.removeEventListener("keydown", handleEscape);
+    };
+  }, [isOpen, handleClose]);
+
+  return (
+    <div className="relative" ref={dropdownRef}>
+      <button
+        onClick={() => setIsOpen((prev) => !prev)}
+        className="relative flex items-center justify-center p-2 rounded-jotty hover:bg-accent transition-colors text-muted-foreground hover:text-accent-foreground"
+        aria-label={t("notifications.title")}
+      >
+        <Notification03Icon className="h-5 w-5" />
+        {unreadCount > 0 && (
+          <span className="absolute top-[2px] right-[2px] flex items-center justify-center w-4 h-4 text-[9px] font-bold rounded-full bg-primary text-primary-foreground">
+            {unreadCount > 9 ? "9+" : unreadCount}
+          </span>
+        )}
+      </button>
+
+      {isOpen && (
+        <div className="absolute right-0 top-full mt-1 w-80 bg-background border border-border rounded-jotty shadow-lg z-50 flex flex-col max-h-[420px]">
+          <div className="flex items-center justify-between px-3 py-2.5 border-b border-border flex-shrink-0">
+            <span className="text-sm font-semibold text-foreground">
+              {t("notifications.title")}
+            </span>
+            {notifications.length > 0 && (
+              <div className="flex items-center gap-1">
+                {unreadCount > 0 && (
+                  <button
+                    onClick={markAllAsRead}
+                    className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors px-1.5 py-1 rounded-jotty hover:bg-muted"
+                  >
+                    <Tick02Icon className="h-3 w-3" />
+                    {t("notifications.markAllRead")}
+                  </button>
+                )}
+                <button
+                  onClick={clearAll}
+                  className="flex items-center gap-1 text-xs text-muted-foreground hover:text-destructive transition-colors px-1.5 py-1 rounded-jotty hover:bg-muted"
+                >
+                  <Delete02Icon className="h-3 w-3" />
+                  {t("notifications.clearAll")}
+                </button>
+              </div>
+            )}
+          </div>
+
+          <div className="overflow-y-auto flex-1 divide-y divide-border/50">
+            {notifications.length === 0 ? (
+              <div className="flex flex-col items-center justify-center py-10 gap-2 text-muted-foreground">
+                <Notification03Icon className="h-8 w-8 opacity-30" />
+                <p className="text-sm">{t("notifications.empty")}</p>
+              </div>
+            ) : (
+              notifications.map((notification) => (
+                <NotificationItem
+                  key={notification.id}
+                  notification={notification}
+                  onRead={markAsRead}
+                  onRemove={removeNotification}
+                  onClose={handleClose}
+                />
+              ))
+            )}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/_components/FeatureComponents/Notifications/NotificationItem.tsx b/app/_components/FeatureComponents/Notifications/NotificationItem.tsx
new file mode 100644
index 00000000..33bd1ffc
--- /dev/null
+++ b/app/_components/FeatureComponents/Notifications/NotificationItem.tsx
@@ -0,0 +1,123 @@
+import {
+  AlarmClockIcon,
+  UserCheck01Icon,
+  Share05Icon,
+  AlertCircleIcon,
+  MultiplicationSignIcon,
+  ArrowRight01Icon,
+  Tick02Icon,
+} from "hugeicons-react";
+import { useRouter } from "next/navigation";
+import { AppNotification, NotificationType } from "@/app/_types";
+
+import { cn } from "@/app/_utils/global-utils";
+
+const _formatRelativeTime = (isoStr: string): string => {
+  const diff = Date.now() - new Date(isoStr).getTime();
+  if (diff < 60000) return "Just now";
+  if (diff < 3600000) return `${Math.floor(diff / 60000)}m ago`;
+  if (diff < 86400000) return `${Math.floor(diff / 3600000)}h ago`;
+  return `${Math.floor(diff / 86400000)}d ago`;
+};
+
+const _getTypeIcon = (type: NotificationType) => {
+  switch (type) {
+    case "reminder":
+      return (
+        <AlarmClockIcon className="h-4 w-4 text-amber-500 flex-shrink-0" />
+      );
+    case "assignment":
+      return (
+        <UserCheck01Icon className="h-4 w-4 text-blue-500 flex-shrink-0" />
+      );
+    case "sharing":
+      return <Share05Icon className="h-4 w-4 text-primary flex-shrink-0" />;
+    default:
+      return (
+        <AlertCircleIcon className="h-4 w-4 text-muted-foreground flex-shrink-0" />
+      );
+  }
+};
+
+interface NotificationItemProps {
+  notification: AppNotification;
+  onRead: (id: string) => void;
+  onRemove: (id: string) => void;
+  onClose: () => void;
+}
+
+export const NotificationItem = ({
+  notification,
+  onRead,
+  onRemove,
+  onClose,
+}: NotificationItemProps) => {
+  const router = useRouter();
+
+  const handleClick = () => {
+    if (notification.link) {
+      router.push(notification.link);
+      onClose();
+    }
+  };
+
+  return (
+    <div
+      className={cn(
+        "flex items-start gap-3 px-3 py-3 transition-colors",
+        !notification.readAt && "border-l-2 border-primary",
+        notification.link ? "cursor-pointer hover:bg-accent" : "cursor-default",
+      )}
+    >
+      <div
+        className="flex items-start gap-3 flex-1 min-w-0"
+        onClick={handleClick}
+      >
+        <span className="mt-0.5">{_getTypeIcon(notification.type)}</span>
+        <div className="flex-1 min-w-0">
+          <p className="text-sm font-medium text-foreground leading-snug">
+            {notification.title}
+          </p>
+          <p className="text-xs text-muted-foreground mt-0.5 leading-snug">
+            {notification.message}
+          </p>
+          <div className="flex items-center gap-2 mt-1">
+            <span className="text-[10px] text-muted-foreground/60">
+              {_formatRelativeTime(notification.createdAt)}
+            </span>
+            {notification.link && (
+              <span className="text-[10px] text-primary flex items-center gap-0.5">
+                <ArrowRight01Icon className="h-2.5 w-2.5" />
+                View
+              </span>
+            )}
+          </div>
+        </div>
+      </div>
+      <div className="flex flex-col gap-0.5 flex-shrink-0 mt-0.5">
+        {!notification.readAt && (
+          <button
+            onClick={(e) => {
+              e.stopPropagation();
+              onRead(notification.id);
+            }}
+            className="p-1 rounded-jotty hover:bg-muted transition-colors text-muted-foreground hover:text-foreground"
+            title="Mark as read"
+          >
+            <Tick02Icon className="h-3 w-3" />
+          </button>
+        )}
+        <button
+          onClick={(e) => {
+            e.stopPropagation();
+            onRemove(notification.id);
+          }}
+          className="p-1 rounded-jotty hover:bg-muted transition-colors text-muted-foreground hover:text-destructive"
+          title="Remove"
+        >
+          <MultiplicationSignIcon className="h-3 w-3" />
+        </button>
+      </div>
+    </div>
+  );
+};
diff --git a/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistBody.tsx b/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistBody.tsx
index 8458da86..209973ea 100644
--- a/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistBody.tsx
+++ b/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistBody.tsx
@@ -2,7 +2,7 @@ import { Checklist, Item } from "@/app/_types";
 import { CheckmarkSquare04Icon } from "hugeicons-react";
 import { TaskStatusSection } from "./TaskStatusSection";
 import { useMemo } from "react";
-import { TaskStatus } from "@/app/_types/enums";
+import { isKanbanType, TaskStatus } from "@/app/_types/enums";
 import { NestedChecklistItem } from "../../Checklists/Parts/Simple/NestedChecklistItem";
 import { useTranslations } from "next-intl";
 
@@ -21,7 +21,7 @@ export const PublicChecklistBody = ({
   }, [checklist.items]);
 
   const taskItemsByStatus = useMemo(() => {
-    if (checklist.type !== "task") return null;
+    if (!isKanbanType(checklist.type)) return null;
     const initialAcc: Record<string, Item[]> = {
       todo: [],
       in_progress: [],
@@ -42,14 +42,21 @@ export const PublicChecklistBody = ({
         <h3 className="text-lg font-medium text-foreground mb-2">
           {t("checklists.noItemsYet")}
         </h3>
-        <p className="text-muted-foreground">{t("checklists.emptyChecklist")}</p>
+        <p className="text-muted-foreground">
+          {t("checklists.emptyChecklist")}
+        </p>
       </div>
     );
   }
 
-  if (checklist.type === "task" && taskItemsByStatus) {
+  if (isKanbanType(checklist.type) && taskItemsByStatus) {
     return Object.entries(taskItemsByStatus).map(([status, items]) => (
-      <TaskStatusSection key={status} status={status} items={items} checklist={checklist} />
+      <TaskStatusSection
+        key={status}
+        status={status}
+        items={items}
+        checklist={checklist}
+      />
     ));
   }
 
@@ -61,8 +68,8 @@ export const PublicChecklistBody = ({
           item={item}
           index={index.toString()}
           level={0}
-          onToggle={() => { }}
-          onDelete={() => { }}
+          onToggle={() => {}}
+          onDelete={() => {}}
           isPublicView={true}
           isDeletingItem={false}
           isDragDisabled={true}
diff --git a/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistHeader.tsx b/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistHeader.tsx
index 76715675..936fc890 100644
--- a/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistHeader.tsx
+++ b/app/_components/FeatureComponents/PublicView/Parts/PublicChecklistHeader.tsx
@@ -7,6 +7,7 @@ import { ChecklistProgress } from "../../Checklists/Parts/Simple/ChecklistProgre
 import { Checklist, User } from "@/app/_types";
 import { UserAvatar } from "@/app/_components/GlobalComponents/User/UserAvatar";
 import { PublicUser } from "@/app/_utils/user-sanitize-utils";
+import { isKanbanType } from "@/app/_types/enums";
 
 interface PublicChecklistHeaderProps {
   checklist: Checklist;
@@ -23,7 +24,7 @@ export const PublicChecklistHeader = ({
 }: PublicChecklistHeaderProps) => (
   <header className="mb-8">
     <div className="flex items-center gap-3 mb-4">
-      {checklist.type === "task" ? (
+      {isKanbanType(checklist.type) ? (
         <TaskDaily01Icon className="h-8 w-8 text-primary" />
       ) : (
         <CheckmarkSquare04Icon className="h-8 w-8 text-primary" />
diff --git a/app/_components/FeatureComponents/Sidebar/Parts/SharedItemsList.tsx b/app/_components/FeatureComponents/Sidebar/Parts/SharedItemsList.tsx
index 1d1d3cf0..facac929 100644
--- a/app/_components/FeatureComponents/Sidebar/Parts/SharedItemsList.tsx
+++ b/app/_components/FeatureComponents/Sidebar/Parts/SharedItemsList.tsx
@@ -8,13 +8,14 @@ import {
   UserMultipleIcon,
   File02Icon,
   CheckmarkSquare04Icon,
+  TaskDaily01Icon,
 } from "hugeicons-react";
 import { cn, buildCategoryPath } from "@/app/_utils/global-utils";
 import { AppMode, Checklist, Note } from "@/app/_types";
 import { useAppMode } from "@/app/_providers/AppModeProvider";
 import { capitalize } from "lodash";
 import { UserAvatar } from "@/app/_components/GlobalComponents/User/UserAvatar";
-import { ItemTypes, Modes } from "@/app/_types/enums";
+import { isKanbanType, ItemTypes, Modes } from "@/app/_types/enums";
 import { useNavigationGuard } from "@/app/_providers/NavigationGuardProvider";
 import { useRouter } from "next/navigation";
 
@@ -178,7 +179,11 @@ export const SharedItemsList = ({
                           )}
                         >
                           {mode === "checklists" ? (
-                            <CheckmarkSquare04Icon className="h-4 w-4" />
+                            "type" in fullItem && isKanbanType(fullItem.type) ? (
+                              <TaskDaily01Icon className="h-4 w-4" />
+                            ) : (
+                              <CheckmarkSquare04Icon className="h-4 w-4" />
+                            )
                           ) : (
                             <File02Icon className="h-4 w-4" />
                           )}
diff --git a/app/_components/FeatureComponents/Sidebar/Parts/SidebarItem.tsx b/app/_components/FeatureComponents/Sidebar/Parts/SidebarItem.tsx
index ea959380..97c13b99 100644
--- a/app/_components/FeatureComponents/Sidebar/Parts/SidebarItem.tsx
+++ b/app/_components/FeatureComponents/Sidebar/Parts/SidebarItem.tsx
@@ -20,7 +20,7 @@ import { Button } from "@/app/_components/GlobalComponents/Buttons/Button";
 import { cn, buildCategoryPath } from "@/app/_utils/global-utils";
 import { DropdownMenu } from "@/app/_components/GlobalComponents/Dropdowns/DropdownMenu";
 import { AppMode, Checklist, Note } from "@/app/_types";
-import { ItemTypes, Modes } from "@/app/_types/enums";
+import { isKanbanType, ItemTypes, Modes } from "@/app/_types/enums";
 import { togglePin } from "@/app/_server/actions/dashboard";
 import { useState } from "react";
 import { useRouter } from "next/navigation";
@@ -64,7 +64,11 @@ export const SidebarItem = ({
   const [showShareModal, setShowShareModal] = useState(false);
   const { globalSharing, appSettings } = useAppMode();
   const encodedCategory = encodeCategoryPath(item.category || "Uncategorized");
-  const itemDetails = sharingInfo(globalSharing, item.uuid || item.id, encodedCategory);
+  const itemDetails = sharingInfo(
+    globalSharing,
+    item.uuid || item.id,
+    encodedCategory,
+  );
 
   const isPubliclyShared = itemDetails.isPublic;
   const isShared = itemDetails.exists && itemDetails.sharedWith.length > 0;
@@ -74,7 +78,7 @@ export const SidebarItem = ({
 
   const [isTogglingPin, setIsTogglingPin] = useState<string | null>(null);
 
-  const itemHref = `/${mode === Modes.NOTES ? ItemTypes.NOTE : ItemTypes.CHECKLIST}/${buildCategoryPath(item.category || 'Uncategorized', item.id)}`;
+  const itemHref = `/${mode === Modes.NOTES ? ItemTypes.NOTE : ItemTypes.CHECKLIST}/${buildCategoryPath(item.category || "Uncategorized", item.id)}`;
 
   const handleDeleteItem = async () => {
     const formData = new FormData();
@@ -107,7 +111,7 @@ export const SidebarItem = ({
       const result = await togglePin(
         item.uuid || item.id,
         item.category || "Uncategorized",
-        mode === Modes.CHECKLISTS ? ItemTypes.CHECKLIST : ItemTypes.NOTE
+        mode === Modes.CHECKLISTS ? ItemTypes.CHECKLIST : ItemTypes.NOTE,
       );
       if (result.success) {
         router.refresh();
@@ -150,9 +154,7 @@ export const SidebarItem = ({
           },
         ]
       : []),
-    ...(onEditItem || isShareable
-      ? [{ type: "divider" as const }]
-      : []),
+    ...(onEditItem || isShareable ? [{ type: "divider" as const }] : []),
     {
       label: isItemPinned() ? t("common.unpinFromHome") : t("common.pinToHome"),
       onClick: handleTogglePin,
@@ -209,30 +211,30 @@ export const SidebarItem = ({
           "flex items-center gap-2 px-3 py-2 text-md lg:text-sm rounded-jotty transition-colors flex-1 text-left truncate",
           isSelected
             ? "bg-primary/60 text-primary-foreground"
-            : "hover:bg-muted/50 text-foreground"
+            : "hover:bg-muted/50 text-foreground",
         )}
       >
         {mode === Modes.NOTES ? (
           <File02Icon
             className={cn(
               "h-5 w-5 lg:h-4 lg:w-4 text-foreground flex-shrink-0",
-              isSelected ? "text-primary-foreground" : "text-foreground"
+              isSelected ? "text-primary-foreground" : "text-foreground",
             )}
           />
         ) : (
           <>
-            {"type" in item && item.type === "task" ? (
+            {"type" in item && isKanbanType(item.type) ? (
               <TaskDaily01Icon
                 className={cn(
                   "h-5 w-5 lg:h-4 lg:w-4 text-foreground flex-shrink-0",
-                  isSelected ? "text-primary-foreground" : "text-foreground"
+                  isSelected ? "text-primary-foreground" : "text-foreground",
                 )}
               />
             ) : (
               <CheckmarkSquare04Icon
                 className={cn(
                   "h-5 w-5 lg:h-4 lg:w-4 text-foreground flex-shrink-0",
-                  isSelected ? "text-primary-foreground" : "text-foreground"
+                  isSelected ? "text-primary-foreground" : "text-foreground",
                 )}
               />
             )}
@@ -246,7 +248,7 @@ export const SidebarItem = ({
 
         <div className="flex items-center gap-1 flex-shrink-0">
           {mode === Modes.NOTES && "encrypted" in item && item.encrypted && (
-            <span title={t('editor.encryptedNote')}>
+            <span title={t("editor.encryptedNote")}>
               <LockKeyIcon className="h-4 w-4 text-primary" />
             </span>
           )}
@@ -256,7 +258,7 @@ export const SidebarItem = ({
             </span>
           )}
           {isPubliclyShared && (
-            <span title={t('checklists.publiclyShared')}>
+            <span title={t("checklists.publiclyShared")}>
               <Globe02Icon className="h-4 w-4 text-primary" />
             </span>
           )}
@@ -301,7 +303,10 @@ export const SidebarItem = ({
         >
           <ShareModal
             isOpen={showShareModal}
-            onClose={() => { setShowShareModal(false); router.refresh() }}
+            onClose={() => {
+              setShowShareModal(false);
+              router.refresh();
+            }}
           />
         </MetadataProvider>
       )}
diff --git a/app/_components/GlobalComponents/Auth/LoginForm.tsx b/app/_components/GlobalComponents/Auth/LoginForm.tsx
index 862b17f3..392d60a8 100644
--- a/app/_components/GlobalComponents/Auth/LoginForm.tsx
+++ b/app/_components/GlobalComponents/Auth/LoginForm.tsx
@@ -10,7 +10,13 @@ import { Orbit01Icon } from "hugeicons-react";
 import { Logo } from "@/app/_components/GlobalComponents/Layout/Logo/Logo";
 import { useTranslations } from "next-intl";
 
-export default function LoginForm({ ssoEnabled }: { ssoEnabled: boolean }) {
+export default function LoginForm({
+  ssoEnabled,
+  showRegisterLink = false,
+}: {
+  ssoEnabled: boolean;
+  showRegisterLink?: boolean;
+}) {
   const t = useTranslations('auth');
   const searchParams = useSearchParams();
   const [error, setError] = useState<string>("");
@@ -132,7 +138,7 @@ export default function LoginForm({ ssoEnabled }: { ssoEnabled: boolean }) {
         </div>
       )}
 
-      <form onSubmit={handleSubmit} className="space-y-4">
+      <form onSubmit={handleSubmit} method="POST" className="space-y-4">
         {error && (
           <div className="flex items-center gap-2 p-3 bg-destructive/10 border border-destructive/20 rounded-jotty">
             <span className="text-md lg:text-sm text-destructive">{error}</span>
@@ -200,6 +206,14 @@ export default function LoginForm({ ssoEnabled }: { ssoEnabled: boolean }) {
         </Button>
       </form>
 
+      {showRegisterLink && (
+        <div className="text-center">
+          <a href="/auth/setup" className="text-sm lg:text-xs text-muted-foreground hover:text-foreground underline">
+            {t('createAccount')}
+          </a>
+        </div>
+      )}
+
       {appVersion && (
         <div className="text-center text-sm lg:text-xs text-muted-foreground">
           <a target="_blank" href={`https://github.com/fccview/jotty/releases/tag/${appVersion}`}>{t('version', { version: appVersion })}</a>
diff --git a/app/_components/GlobalComponents/Cards/ChecklistCard.tsx b/app/_components/GlobalComponents/Cards/ChecklistCard.tsx
index 2e3a1bb9..bc536dc7 100644
--- a/app/_components/GlobalComponents/Cards/ChecklistCard.tsx
+++ b/app/_components/GlobalComponents/Cards/ChecklistCard.tsx
@@ -14,6 +14,7 @@ import { parseChecklistContent } from "@/app/_utils/client-parser-utils";
 import { useMemo } from "react";
 import { UserAvatar } from "@/app/_components/GlobalComponents/User/UserAvatar";
 import { useTranslations } from "next-intl";
+import { isKanbanType } from "@/app/_types/enums";
 
 interface ChecklistCardProps {
   list: Checklist;
@@ -58,16 +59,19 @@ export const ChecklistCard = ({
   const displayItems = parsedData?.items || list.items;
 
   const activeItems = displayItems?.filter((item) => !item.isArchived);
-  const { total: totalItems, completed: completedItems } = countItems(displayItems || [], list.type);
+  const { total: totalItems, completed: completedItems } = countItems(
+    displayItems || [],
+    list.type,
+  );
   const completionRate =
     totalItems > 0 ? Math.round((completedItems / totalItems) * 100) : 0;
 
   const style = isDragging
     ? { opacity: 0.4 }
     : {
-      transform: CSS.Transform.toString(transform),
-      transition,
-    };
+        transform: CSS.Transform.toString(transform),
+        transition,
+      };
 
   const cardStyle = {
     ...style,
@@ -82,8 +86,9 @@ export const ChecklistCard = ({
       ref={setNodeRef}
       style={cardStyle}
       {...(isDraggable ? { ...attributes, ...listeners } : {})}
-      className={`jotty-checklist-card bg-card border border-border rounded-jotty p-4 hover:shadow-md hover:border-primary/50 transition-shadow duration-200 group ${isDragging ? "border-primary/30" : ""
-        }`}
+      className={`jotty-checklist-card bg-card border border-border rounded-jotty p-4 hover:shadow-md hover:border-primary/50 transition-shadow duration-200 group ${
+        isDragging ? "border-primary/30" : ""
+      }`}
     >
       <div className="flex items-start justify-between mb-3">
         <div
@@ -103,8 +108,9 @@ export const ChecklistCard = ({
                 e.stopPropagation();
                 onTogglePin(list);
               }}
-              className={`${isPinned ? "opacity-100" : "opacity-0"
-                } group-hover:opacity-100 transition-opacity p-1 hover:bg-muted rounded`}
+              className={`${
+                isPinned ? "opacity-100" : "opacity-0"
+              } group-hover:opacity-100 transition-opacity p-1 hover:bg-muted rounded`}
               title={isPinned ? t("common.unpin") : t("common.pin")}
             >
               {isPinned ? (
@@ -124,7 +130,7 @@ export const ChecklistCard = ({
 
       <div className="mb-3">
         <div className="flex justify-between text-sm lg:text-xs text-muted-foreground mb-1">
-          <span>{t('checklists.progress')}</span>
+          <span>{t("checklists.progress")}</span>
           <span>{completionRate}%</span>
         </div>
         <div className="w-full bg-muted rounded-full h-2">
@@ -135,7 +141,7 @@ export const ChecklistCard = ({
         </div>
       </div>
 
-      {list.type === "task" && <TaskSpecificDetails items={activeItems} />}
+      {isKanbanType(list.type) && <TaskSpecificDetails items={activeItems} />}
 
       <div className="flex items-center justify-between text-sm lg:text-xs text-muted-foreground">
         <div className="flex items-center gap-2">
diff --git a/app/_components/GlobalComponents/Cards/ChecklistGridItem.tsx b/app/_components/GlobalComponents/Cards/ChecklistGridItem.tsx
index 73349dd7..80af0e76 100644
--- a/app/_components/GlobalComponents/Cards/ChecklistGridItem.tsx
+++ b/app/_components/GlobalComponents/Cards/ChecklistGridItem.tsx
@@ -12,6 +12,7 @@ import { parseChecklistContent } from "@/app/_utils/client-parser-utils";
 import { useMemo } from "react";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
+import { isKanbanType } from "@/app/_types/enums";
 
 interface ChecklistGridItemProps {
   list: Checklist;
@@ -56,7 +57,7 @@ export const ChecklistGridItem = ({
 
   const totalItems = activeItems?.length || 0;
   const completedItems = activeItems?.filter((item) =>
-    isItemCompleted(item, list.type)
+    isItemCompleted(item, list.type),
   ).length;
   const completionRate =
     totalItems > 0 ? Math.round((completedItems / totalItems) * 100) : 0;
@@ -65,14 +66,14 @@ export const ChecklistGridItem = ({
     return list?.category ? list?.category.split("/").pop() : null;
   }, [list?.category]);
 
-  const isTask = list.type === "task";
+  const isTask = isKanbanType(list.type);
 
   const style = isDragging
     ? { opacity: 0.4 }
     : {
-      transform: CSS.Transform.toString(transform),
-      transition,
-    };
+        transform: CSS.Transform.toString(transform),
+        transition,
+      };
 
   const itemStyle = {
     ...style,
@@ -92,8 +93,9 @@ export const ChecklistGridItem = ({
             e.stopPropagation();
             onTogglePin(list);
           }}
-          className={`absolute -top-1 -right-1 z-10 ${isPinned ? "opacity-100" : "opacity-0"
-            } group-hover:opacity-100 transition-opacity p-1 bg-background rounded-full border border-border`}
+          className={`absolute -top-1 -right-1 z-10 ${
+            isPinned ? "opacity-100" : "opacity-0"
+          } group-hover:opacity-100 transition-opacity p-1 bg-background rounded-full border border-border`}
         >
           {isPinned ? (
             <PinOffIcon className="h-3 w-3 text-muted-foreground" />
@@ -124,9 +126,13 @@ export const ChecklistGridItem = ({
 
         <div className="flex items-center gap-1 text-[10px] text-muted-foreground mt-0.5">
           {sharer && <span className="truncate">{sharer}</span>}
-          {!sharer && categoryName && <span className="truncate">{categoryName}</span>}
+          {!sharer && categoryName && (
+            <span className="truncate">{categoryName}</span>
+          )}
           {!sharer && !categoryName && (
-            <span>{completedItems}/{totalItems}</span>
+            <span>
+              {completedItems}/{totalItems}
+            </span>
           )}
         </div>
       </div>
diff --git a/app/_components/GlobalComponents/Cards/ChecklistListItem.tsx b/app/_components/GlobalComponents/Cards/ChecklistListItem.tsx
index 7b1479bd..6fa23041 100644
--- a/app/_components/GlobalComponents/Cards/ChecklistListItem.tsx
+++ b/app/_components/GlobalComponents/Cards/ChecklistListItem.tsx
@@ -12,6 +12,7 @@ import { parseChecklistContent } from "@/app/_utils/client-parser-utils";
 import { useMemo } from "react";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
+import { isKanbanType } from "@/app/_types/enums";
 
 interface ChecklistListItemProps {
   list: Checklist;
@@ -56,7 +57,7 @@ export const ChecklistListItem = ({
 
   const totalItems = activeItems?.length || 0;
   const completedItems = activeItems?.filter((item) =>
-    isItemCompleted(item, list.type)
+    isItemCompleted(item, list.type),
   ).length;
   const completionRate =
     totalItems > 0 ? Math.round((completedItems / totalItems) * 100) : 0;
@@ -65,14 +66,14 @@ export const ChecklistListItem = ({
     return list?.category ? list?.category.split("/").pop() : null;
   }, [list?.category]);
 
-  const isTask = list.type === "task";
+  const isTask = isKanbanType(list.type);
 
   const style = isDragging
     ? { opacity: 0.4 }
     : {
-      transform: CSS.Transform.toString(transform),
-      transition,
-    };
+        transform: CSS.Transform.toString(transform),
+        transition,
+      };
 
   const itemStyle = {
     ...style,
@@ -103,11 +104,11 @@ export const ChecklistListItem = ({
             {displayTitle}
           </h3>
           <div className="flex items-center gap-2 text-sm lg:text-xs text-muted-foreground">
-            {categoryName && (
-              <span className="truncate">{categoryName}</span>
-            )}
+            {categoryName && <span className="truncate">{categoryName}</span>}
             {categoryName && <span>•</span>}
-            <span>{completedItems}/{totalItems} items</span>
+            <span>
+              {completedItems}/{totalItems} items
+            </span>
           </div>
         </div>
 
@@ -124,8 +125,9 @@ export const ChecklistListItem = ({
                 e.stopPropagation();
                 onTogglePin(list);
               }}
-              className={`${isPinned ? "opacity-100" : "opacity-0"
-                } group-hover:opacity-100 transition-opacity p-1.5 rounded-jotty flex-shrink-0`}
+              className={`${
+                isPinned ? "opacity-100" : "opacity-0"
+              } group-hover:opacity-100 transition-opacity p-1.5 rounded-jotty flex-shrink-0`}
             >
               {isPinned ? (
                 <PinOffIcon className="h-4 w-4 text-muted-foreground" />
diff --git a/app/_components/GlobalComponents/Dropdowns/DropdownMenu.tsx b/app/_components/GlobalComponents/Dropdowns/DropdownMenu.tsx
index 25233be7..db0d0eb7 100644
--- a/app/_components/GlobalComponents/Dropdowns/DropdownMenu.tsx
+++ b/app/_components/GlobalComponents/Dropdowns/DropdownMenu.tsx
@@ -95,7 +95,7 @@ export const DropdownMenu = ({
       {isOpen && (
         <div
           className={cn(
-            "absolute w-56 bg-background border border-border rounded-jotty shadow-lg z-50 py-1",
+            "absolute min-w-56 w-fit bg-background border border-border rounded-jotty shadow-lg z-50 py-1",
             openUpward ? "bottom-full mb-1" : "top-full mt-1",
             align === "right" ? "right-0" : "left-0"
           )}
diff --git a/app/_components/GlobalComponents/FormElements/DatePicker.tsx b/app/_components/GlobalComponents/FormElements/DatePicker.tsx
new file mode 100644
index 00000000..783a014b
--- /dev/null
+++ b/app/_components/GlobalComponents/FormElements/DatePicker.tsx
@@ -0,0 +1,175 @@
+"use client";
+
+import { useState, useRef, useEffect, memo } from "react";
+import { DayPicker } from "react-day-picker";
+import { Calendar03Icon } from "hugeicons-react";
+import { cn } from "@/app/_utils/global-utils";
+
+interface DatePickerProps {
+  value: string;
+  onChange: (value: string) => void;
+  onBlur?: () => void;
+  className?: string;
+  placeholder?: string;
+  disabled?: boolean;
+}
+
+const _formatDateDisplay = (dateStr: string): string => {
+  if (!dateStr) return "";
+  const d = new Date(dateStr);
+  if (isNaN(d.getTime())) return "";
+  return d.toLocaleDateString(undefined, {
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+  });
+};
+
+const _toDateValue = (dateStr: string): Date | undefined => {
+  if (!dateStr) return undefined;
+  const d = new Date(dateStr);
+  return isNaN(d.getTime()) ? undefined : d;
+};
+
+const DatePickerComponent = ({
+  value,
+  onChange,
+  onBlur,
+  className,
+  placeholder = "Select date",
+  disabled,
+}: DatePickerProps) => {
+  const [open, setOpen] = useState(false);
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const _handleClickOutside = (e: MouseEvent) => {
+      if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
+        setOpen(false);
+        onBlur?.();
+      }
+    };
+    if (open) document.addEventListener("mousedown", _handleClickOutside);
+    return () => document.removeEventListener("mousedown", _handleClickOutside);
+  }, [open, onBlur]);
+
+  function _handleSelect(day: Date | undefined) {
+    if (!day) return;
+    const pad = (n: number) => String(n).padStart(2, "0");
+    const iso = `${day.getFullYear()}-${pad(day.getMonth() + 1)}-${pad(day.getDate())}`;
+    onChange(iso);
+    setOpen(false);
+  }
+
+  return (
+    <div ref={containerRef} className="relative">
+      <button
+        type="button"
+        disabled={disabled}
+        onClick={() => setOpen(!open)}
+        className={cn(
+          "w-full flex items-center justify-between px-3 py-2 text-sm bg-background border border-input rounded-jotty focus:outline-none focus:border-ring transition-colors text-left",
+          !value && "text-muted-foreground",
+          className,
+        )}
+      >
+        <span className="truncate">{value ? _formatDateDisplay(value) : placeholder}</span>
+        <Calendar03Icon className="h-4 w-4 text-muted-foreground shrink-0 ml-2" />
+      </button>
+
+      {open && (
+        <div className="absolute z-50 mt-1 right-0 bg-popover border border-border rounded-jotty shadow-lg p-3 animate-in fade-in-0 zoom-in-95">
+          <DayPicker
+            mode="single"
+            selected={_toDateValue(value)}
+            onSelect={_handleSelect}
+            defaultMonth={_toDateValue(value)}
+            classNames={{
+              root: "text-sm",
+              months: "flex flex-col",
+              month_caption: "flex justify-center items-center h-8",
+              caption_label: "text-sm font-medium text-foreground",
+              nav: "flex items-center gap-1",
+              button_previous: "absolute left-1 top-3 h-7 w-7 flex items-center justify-center rounded-jotty border border-border hover:bg-muted text-foreground transition-colors",
+              button_next: "absolute right-1 top-3 h-7 w-7 flex items-center justify-center rounded-jotty border border-border hover:bg-muted text-foreground transition-colors",
+              weekdays: "flex",
+              weekday: "w-8 text-center text-xs font-medium text-muted-foreground py-1",
+              week: "flex",
+              day: "w-8 h-8 text-center text-sm",
+              day_button: "w-full h-full flex items-center justify-center rounded-jotty transition-colors hover:bg-muted text-foreground cursor-pointer",
+              selected: "rounded-jotty",
+              today: "font-bold text-primary",
+              outside: "text-muted-foreground/40",
+              disabled: "text-muted-foreground/30 cursor-not-allowed",
+            }}
+          />
+        </div>
+      )}
+    </div>
+  );
+};
+
+export const DatePicker = memo(DatePickerComponent);
+
+interface DateTimePickerProps {
+  value: string;
+  onChange: (value: string) => void;
+  onBlur?: () => void;
+  className?: string;
+  disabled?: boolean;
+}
+
+const DateTimePickerComponent = ({
+  value,
+  onChange,
+  onBlur,
+  className,
+  disabled,
+}: DateTimePickerProps) => {
+  const dateVal = value ? value.split("T")[0] || "" : "";
+  const timeVal = (() => {
+    if (!value) return "";
+    const d = new Date(value);
+    if (isNaN(d.getTime())) return "";
+    const pad = (n: number) => String(n).padStart(2, "0");
+    return `${pad(d.getHours())}:${pad(d.getMinutes())}`;
+  })();
+
+  function _handleDateChange(newDate: string) {
+    if (!newDate) {
+      onChange("");
+      return;
+    }
+    const time = timeVal || "00:00";
+    onChange(`${newDate}T${time}`);
+  }
+
+  function _handleTimeChange(e: React.ChangeEvent<HTMLInputElement>) {
+    const newTime = e.target.value;
+    if (!dateVal) return;
+    onChange(`${dateVal}T${newTime}`);
+  }
+
+  return (
+    <div className={cn("flex gap-2", className)}>
+      <div className="flex-1">
+        <DatePicker
+          value={dateVal}
+          onChange={_handleDateChange}
+          onBlur={onBlur}
+          disabled={disabled}
+        />
+      </div>
+      <input
+        type="time"
+        value={timeVal}
+        onChange={_handleTimeChange}
+        onBlur={onBlur}
+        disabled={disabled || !dateVal}
+        className="w-24 px-2 py-2 text-sm bg-background border border-input rounded-jotty focus:outline-none focus:border-ring transition-colors"
+      />
+    </div>
+  );
+};
+
+export const DateTimePicker = memo(DateTimePickerComponent);
diff --git a/app/_components/GlobalComponents/Layout/MobileHeader.tsx b/app/_components/GlobalComponents/Layout/MobileHeader.tsx
index 5c4c02a8..988f8b7c 100644
--- a/app/_components/GlobalComponents/Layout/MobileHeader.tsx
+++ b/app/_components/GlobalComponents/Layout/MobileHeader.tsx
@@ -11,6 +11,7 @@ import { useEffect, useRef, useState } from "react";
 import { cn, handleScroll } from "@/app/_utils/global-utils";
 import { useTranslations } from "next-intl";
 import { ConnectionIndicator } from "@/app/_components/GlobalComponents/Indicators/ConnectionIndicator";
+import { NotificationBell } from "../../FeatureComponents/Notifications/NotificationBell";
 
 interface MobileHeaderProps {
   user: SanitisedUser | null;
@@ -62,7 +63,9 @@ export const MobileHeader = ({
       <a href="/" className="flex items-center gap-3">
         <div className="relative">
           <DynamicLogo className="h-10 w-10" size="32x32" />
-          <ConnectionIndicator borderColor={scrollPos < 150 ? "border-background" : "border-muted"} />
+          <ConnectionIndicator
+            borderColor={scrollPos < 150 ? "border-background" : "border-muted"}
+          />
         </div>
         <div className="flex items-center gap-2">
           <AppName
@@ -73,12 +76,15 @@ export const MobileHeader = ({
       </a>
 
       {user ? (
-        <UserDropdown
-          username={user.username}
-          avatarUrl={user.avatarUrl}
-          onOpenSettings={onOpenSettings}
-          currentLocale={currentLocale}
-        />
+        <div className="flex items-center gap-2">
+          <UserDropdown
+            username={user.username}
+            avatarUrl={user.avatarUrl}
+            onOpenSettings={onOpenSettings}
+            currentLocale={currentLocale}
+          />
+          <NotificationBell />
+        </div>
       ) : (
         <Button
           variant="destructive"
diff --git a/app/_components/GlobalComponents/Statistics/NoteFooterStats.tsx b/app/_components/GlobalComponents/Statistics/NoteFooterStats.tsx
index 6cb8eeb0..a07c6185 100644
--- a/app/_components/GlobalComponents/Statistics/NoteFooterStats.tsx
+++ b/app/_components/GlobalComponents/Statistics/NoteFooterStats.tsx
@@ -1,12 +1,14 @@
 "use client";
 
 import { useMemo } from "react";
+import { useTranslations } from "next-intl";
 
 interface NoteFooterStatsProps {
   content: string;
 }
 
 export const NoteFooterStats = ({ content }: NoteFooterStatsProps) => {
+  const t = useTranslations();
   const stats = useMemo(() => {
     let contentWithoutMetadata = content.replace(/^---\n[\s\S]*?\n---\n/, "");
 
@@ -70,22 +72,9 @@ export const NoteFooterStats = ({ content }: NoteFooterStatsProps) => {
   return (
     <div className="mt-8 pt-4 border-t border-border no-print">
       <div className="flex flex-wrap gap-4 text-md lg:text-sm text-muted-foreground">
-        <div className="flex items-center gap-1.5">
-          <span className="font-medium">
-            {stats.wordCount.toLocaleString()}
-          </span>
-          <span>{stats.wordCount === 1 ? "word" : "words"}</span>
-        </div>
-        <div className="flex items-center gap-1.5">
-          <span className="font-medium">
-            {stats.charCount.toLocaleString()}
-          </span>
-          <span>{stats.charCount === 1 ? "character" : "characters"}</span>
-        </div>
-        <div className="flex items-center gap-1.5">
-          <span className="font-medium">{stats.readingTime}</span>
-          <span>{stats.readingTime === 1 ? "minute" : "minutes"} read</span>
-        </div>
+        <span>{t("notes.wordCount", { count: stats.wordCount })}</span>
+        <span>{t("notes.charCount", { count: stats.charCount })}</span>
+        <span>{t("notes.readingTime", { count: stats.readingTime })}</span>
       </div>
     </div>
   );
diff --git a/app/_consts/files.ts b/app/_consts/files.ts
index 01b58fc5..2b0b1c6f 100644
--- a/app/_consts/files.ts
+++ b/app/_consts/files.ts
@@ -41,6 +41,10 @@ export const SESSION_DATA_FILE = path.join(USERS_DIR, "session-data.json");
 export const SHARED_ITEMS_FILE = path.join(SHARING_DIR, "shared-items.json");
 export const EXPORT_TEMP_DIR = path.join(DATA_DIR, "temp_exports");
 
+export const NOTIFICATIONS_DIR = path.join(DATA_DIR, "notifications");
+export const NOTIFICATIONS_FILE = (username: string) =>
+  path.join(NOTIFICATIONS_DIR, `${username}.json`);
+
 export const LOGS_DIR = "data/logs";
 export const getUserLogsDir = (username: string) =>
   path.join(LOGS_DIR, username);
diff --git a/app/_consts/kanban.ts b/app/_consts/kanban.ts
new file mode 100644
index 00000000..584810e2
--- /dev/null
+++ b/app/_consts/kanban.ts
@@ -0,0 +1,29 @@
+import { KanbanStatus } from "@/app/_types";
+import { TaskStatus, TaskStatusLabels } from "@/app/_types/enums";
+
+export const DEFAULT_KANBAN_STATUSES: KanbanStatus[] = [
+  {
+    id: TaskStatus.TODO,
+    label: TaskStatusLabels.TODO,
+    order: 0,
+    autoComplete: false,
+  },
+  {
+    id: TaskStatus.IN_PROGRESS,
+    label: TaskStatusLabels.IN_PROGRESS,
+    order: 1,
+    autoComplete: false,
+  },
+  {
+    id: TaskStatus.COMPLETED,
+    label: TaskStatusLabels.COMPLETED,
+    order: 2,
+    autoComplete: true,
+  },
+  {
+    id: TaskStatus.PAUSED,
+    label: TaskStatusLabels.PAUSED,
+    order: 3,
+    autoComplete: false,
+  },
+];
diff --git a/app/_hooks/kanban/index.tsx b/app/_hooks/kanban/index.tsx
new file mode 100644
index 00000000..f2de4f93
--- /dev/null
+++ b/app/_hooks/kanban/index.tsx
@@ -0,0 +1,4 @@
+export { useKanbanBoard } from "./useKanban";
+export { useKanbanItem } from "./useKanbanItem";
+export { useCalendarView } from "./useCalendarView";
+export { useKanbanReminders } from "./useKanbanReminders";
diff --git a/app/_hooks/kanban/useCalendarView.ts b/app/_hooks/kanban/useCalendarView.ts
new file mode 100644
index 00000000..79d04195
--- /dev/null
+++ b/app/_hooks/kanban/useCalendarView.ts
@@ -0,0 +1,91 @@
+"use client";
+
+import { useState, useMemo, useCallback } from "react";
+import { Item, Checklist } from "@/app/_types";
+import {
+  parseItemsForCalendar,
+  generateICS,
+  getCalendarGrid,
+  getItemsGroupedByDate,
+  CalendarEvent,
+} from "@/app/_utils/kanban/calendar-utils";
+
+type CalendarViewMode = "month" | "week" | "day";
+
+export const useCalendarView = (checklist: Checklist) => {
+  const [currentDate, setCurrentDate] = useState(new Date());
+  const [viewMode, setViewMode] = useState<CalendarViewMode>("month");
+
+  const events = useMemo(
+    () => parseItemsForCalendar(checklist.items),
+    [checklist.items]
+  );
+
+  const itemsByDate = useMemo(
+    () => getItemsGroupedByDate(checklist.items),
+    [checklist.items]
+  );
+
+  const calendarGrid = useMemo(
+    () => getCalendarGrid(currentDate.getFullYear(), currentDate.getMonth()),
+    [currentDate]
+  );
+
+  const unscheduledItems = useMemo(
+    () => checklist.items.filter((item) => !item.targetDate && !item.isArchived),
+    [checklist.items]
+  );
+
+  const _navigateMonth = useCallback((direction: number) => {
+    setCurrentDate((prev) => {
+      const next = new Date(prev);
+      next.setMonth(next.getMonth() + direction);
+      return next;
+    });
+  }, []);
+
+  const goToPreviousMonth = useCallback(() => _navigateMonth(-1), [_navigateMonth]);
+  const goToNextMonth = useCallback(() => _navigateMonth(1), [_navigateMonth]);
+  const goToToday = useCallback(() => setCurrentDate(new Date()), []);
+
+  const exportICS = useCallback(() => {
+    const icsContent = generateICS(checklist.items, checklist.title);
+    const blob = new Blob([icsContent], { type: "text/calendar;charset=utf-8" });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement("a");
+    link.href = url;
+    link.download = `${checklist.title.replace(/[^a-zA-Z0-9]/g, "-")}.ics`;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    URL.revokeObjectURL(url);
+  }, [checklist]);
+
+  const getEventsForDate = useCallback(
+    (date: Date): CalendarEvent[] => {
+      const pad = (n: number) => String(n).padStart(2, "0");
+      const localDateStr = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+      return events.filter((e) => {
+        const eventDate = new Date(e.date);
+        const eventLocalStr = `${eventDate.getFullYear()}-${pad(eventDate.getMonth() + 1)}-${pad(eventDate.getDate())}`;
+        return eventLocalStr === localDateStr;
+      });
+    },
+    [events]
+  );
+
+  return {
+    currentDate,
+    viewMode,
+    setViewMode,
+    events,
+    itemsByDate,
+    calendarGrid,
+    unscheduledItems,
+    goToPreviousMonth,
+    goToNextMonth,
+    goToToday,
+    exportICS,
+    getEventsForDate,
+  };
+};
diff --git a/app/_hooks/kanban/useKanban.ts b/app/_hooks/kanban/useKanban.ts
new file mode 100644
index 00000000..0d045c74
--- /dev/null
+++ b/app/_hooks/kanban/useKanban.ts
@@ -0,0 +1,337 @@
+"use client";
+
+import { useState, useEffect, useCallback, useRef } from "react";
+import {
+  DragEndEvent,
+  DragOverEvent,
+  DragStartEvent,
+} from "@dnd-kit/core";
+import { arrayMove } from "@dnd-kit/sortable";
+import { Checklist, KanbanStatus, RecurrenceRule, Result } from "@/app/_types";
+import {
+  createItem,
+  updateItemStatus,
+  createBulkItems,
+  reorderItems,
+} from "@/app/_server/actions/checklist-item";
+import { getListById } from "@/app/_server/actions/checklist";
+import { TaskStatus } from "@/app/_types/enums";
+import { getCurrentUser, getUserByChecklist } from "@/app/_server/actions/users";
+import { DEFAULT_KANBAN_STATUSES } from "@/app/_consts/kanban";
+
+interface UseKanbanBoardProps {
+  checklist: Checklist;
+  onUpdate: (updatedChecklist: Checklist) => void;
+}
+
+export const useKanbanBoard = ({
+  checklist,
+  onUpdate,
+}: UseKanbanBoardProps) => {
+  const [activeId, setActiveId] = useState<string | null>(null);
+  const [overId, setOverId] = useState<string | null>(null);
+  const [localChecklist, setLocalChecklist] = useState(checklist);
+  const [isLoading, setIsLoading] = useState(false);
+  const [showBulkPasteModal, setShowBulkPasteModal] = useState(false);
+  const [focusKey, setFocusKey] = useState(0);
+
+  const dragOriginalStatusRef = useRef<string | null>(null);
+
+  const validStatusIds = (localChecklist.statuses || DEFAULT_KANBAN_STATUSES).map(
+    (s) => s.id
+  );
+
+  useEffect(() => {
+    if (checklist.id !== localChecklist.id || checklist.updatedAt !== localChecklist.updatedAt) {
+      setLocalChecklist(checklist);
+      setFocusKey((prev) => prev + 1);
+    }
+  }, [checklist.id, checklist.updatedAt, localChecklist.id, localChecklist.updatedAt]);
+
+  const refreshChecklist = useCallback(async () => {
+    const checklistOwner = await getUserByChecklist(
+      localChecklist.id,
+      localChecklist.category || "Uncategorized"
+    );
+    const updatedChecklist = await getListById(
+      localChecklist.id,
+      checklistOwner?.data?.username,
+      localChecklist.category
+    );
+    if (updatedChecklist) {
+      setLocalChecklist(updatedChecklist);
+      onUpdate(updatedChecklist);
+    }
+  }, [localChecklist.id, localChecklist.category, onUpdate]);
+
+  const getItemsByStatus = useCallback((status: string) => {
+    const firstStatus = (localChecklist.statuses || DEFAULT_KANBAN_STATUSES)
+      .sort((a, b) => a.order - b.order)[0]?.id || TaskStatus.TODO;
+    return localChecklist.items.filter((item) => {
+      if (item.isArchived) return false;
+      if (item.status === status) return true;
+      if (status === firstStatus) {
+        const hasValidStatus = validStatusIds.includes(item.status || "");
+        return !hasValidStatus;
+      }
+      return false;
+    });
+  }, [localChecklist.items, localChecklist.statuses, validStatusIds]);
+
+  const handleDragStart = useCallback((event: DragStartEvent) => {
+    const id = event.active.id as string;
+    setActiveId(id);
+
+    const item = localChecklist.items.find((i) => i.id === id);
+    dragOriginalStatusRef.current = item?.status || TaskStatus.TODO;
+  }, [localChecklist.items]);
+
+  const handleDragOver = useCallback((event: DragOverEvent) => {
+    const { over } = event;
+    setOverId(over ? (over.id as string) : null);
+
+    if (!over || !activeId) return;
+
+    const activeItem = localChecklist.items.find((item) => item.id === activeId);
+    if (!activeItem) return;
+
+    const overIdStr = over.id as string;
+
+    let targetStatus: string | null = null;
+    if (validStatusIds.includes(overIdStr)) {
+      targetStatus = overIdStr;
+    } else {
+      const overItem = localChecklist.items.find((item) => item.id === overIdStr);
+      if (overItem) targetStatus = overItem.status || TaskStatus.TODO;
+    }
+
+    if (targetStatus && activeItem.status !== targetStatus) {
+      setLocalChecklist((prev) => ({
+        ...prev,
+        items: prev.items.map((item) =>
+          item.id === activeId ? { ...item, status: targetStatus } : item
+        ),
+      }));
+    }
+  }, [activeId, localChecklist.items, validStatusIds]);
+
+  const handleDragEnd = useCallback(async (event: DragEndEvent) => {
+    const { active, over } = event;
+    const origStatus = dragOriginalStatusRef.current;
+    setActiveId(null);
+    setOverId(null);
+    dragOriginalStatusRef.current = null;
+
+    if (!over) {
+      if (origStatus) {
+        setLocalChecklist((prev) => ({
+          ...prev,
+          items: prev.items.map((item) =>
+            item.id === (active.id as string) ? { ...item, status: origStatus } : item
+          ),
+        }));
+      }
+      return;
+    }
+
+    const activeIdStr = active.id as string;
+    const overIdStr = over.id as string;
+
+    const droppedOnColumn = validStatusIds.includes(overIdStr);
+    const targetStatus = droppedOnColumn
+      ? overIdStr
+      : (localChecklist.items.find((item) => item.id === overIdStr)?.status || TaskStatus.TODO);
+
+    const isCrossColumn = origStatus !== targetStatus;
+
+    const columnItems = localChecklist.items.filter(
+      (item) => item.status === targetStatus && !item.isArchived && item.id !== activeIdStr
+    );
+
+    const isDraggingDown = (() => {
+      if (isCrossColumn) return false;
+      const allColumnItems = localChecklist.items.filter(
+        (item) => item.status === targetStatus && !item.isArchived
+      );
+      const activeOrigIdx = allColumnItems.findIndex((item) => item.id === activeIdStr);
+      const overOrigIdx = allColumnItems.findIndex((item) => item.id === overIdStr);
+      return activeOrigIdx < overOrigIdx;
+    })();
+
+    let insertIndex: number;
+    if (droppedOnColumn) {
+      insertIndex = columnItems.length;
+    } else {
+      const overIndex = columnItems.findIndex((item) => item.id === overIdStr);
+      if (overIndex === -1) {
+        insertIndex = columnItems.length;
+      } else if (isCrossColumn) {
+        const overRect = over.rect;
+        const dragY = event.activatorEvent && "clientY" in event.activatorEvent
+          ? (event.activatorEvent as PointerEvent).clientY + (event.delta?.y || 0)
+          : 0;
+        const overMidY = overRect ? overRect.top + overRect.height / 2 : 0;
+        insertIndex = dragY > overMidY ? overIndex + 1 : overIndex;
+      } else {
+        insertIndex = isDraggingDown ? overIndex + 1 : overIndex;
+      }
+    }
+
+    const activeItem = localChecklist.items.find((item) => item.id === activeIdStr);
+    if (!activeItem) return;
+
+    const updatedActiveItem = { ...activeItem, status: targetStatus };
+    const newColumnItems = [...columnItems];
+    newColumnItems.splice(insertIndex, 0, updatedActiveItem);
+
+    const otherItems = localChecklist.items.filter(
+      (item) => (item.status !== targetStatus || item.isArchived) && item.id !== activeIdStr
+    );
+    const allItems = [...otherItems, ...newColumnItems];
+
+    setLocalChecklist((prev) => ({
+      ...prev,
+      items: allItems,
+      updatedAt: new Date().toISOString(),
+    }));
+
+    if (isCrossColumn) {
+      await _handleItemStatusUpdate(activeIdStr, targetStatus);
+
+      if (!droppedOnColumn) {
+        const reorderFormData = new FormData();
+        reorderFormData.append("listId", localChecklist.id);
+        reorderFormData.append("activeItemId", activeIdStr);
+        reorderFormData.append("overItemId", overIdStr);
+        reorderFormData.append("category", localChecklist.category || "Uncategorized");
+        const overIdx = columnItems.findIndex((item) => item.id === overIdStr);
+        if (insertIndex > overIdx) {
+          reorderFormData.append("position", "after");
+        }
+
+        await reorderItems(reorderFormData);
+      }
+
+      await refreshChecklist();
+    } else {
+      if (droppedOnColumn || activeIdStr === overIdStr) return;
+
+      const formData = new FormData();
+      formData.append("listId", localChecklist.id);
+      formData.append("activeItemId", activeIdStr);
+      formData.append("overItemId", overIdStr);
+      formData.append("category", localChecklist.category || "Uncategorized");
+      if (isDraggingDown) {
+        formData.append("position", "after");
+      }
+
+      const result = await reorderItems(formData);
+      if (result.success) {
+        await refreshChecklist();
+      }
+    }
+  }, [localChecklist, validStatusIds, refreshChecklist]);
+
+  const _handleItemStatusUpdate = async (itemId: string, newStatus: string) => {
+    const formData = new FormData();
+    formData.append("listId", localChecklist.id);
+    formData.append("itemId", itemId);
+    formData.append("status", newStatus);
+    formData.append("category", localChecklist.category || "Uncategorized");
+
+    const result = await updateItemStatus(formData);
+
+    if (result.success && result.data) {
+      setLocalChecklist(result.data as Checklist);
+      onUpdate(result.data as Checklist);
+    } else {
+      await refreshChecklist();
+    }
+  };
+
+  const handleAddItem = async (text: string, recurrence?: RecurrenceRule) => {
+    setIsLoading(true);
+    const formData = new FormData();
+    formData.append("listId", localChecklist.id);
+    formData.append("text", text);
+    formData.append("category", localChecklist.category || "Uncategorized");
+
+    const currentUser = await getCurrentUser();
+
+    if (recurrence) {
+      formData.append("recurrence", JSON.stringify(recurrence));
+    }
+
+    const result = await createItem(
+      localChecklist,
+      formData,
+      currentUser?.username
+    );
+
+    const checklistOwner = await getUserByChecklist(
+      localChecklist.id,
+      localChecklist.category || "Uncategorized"
+    );
+
+    const updatedList = await getListById(
+      localChecklist.id,
+      checklistOwner?.data?.username,
+      localChecklist.category
+    );
+    if (updatedList) {
+      setLocalChecklist(updatedList);
+      onUpdate(updatedList);
+    }
+    setIsLoading(false);
+
+    if (result.success && result.data) {
+      setFocusKey((prev) => prev + 1);
+    }
+  };
+
+  const handleBulkPaste = async (itemsText: string) => {
+    setIsLoading(true);
+    const formData = new FormData();
+    formData.append("listId", localChecklist.id);
+    formData.append("itemsText", itemsText);
+    formData.append("category", localChecklist.category || "Uncategorized");
+    const result = await createBulkItems(formData);
+    setIsLoading(false);
+
+    if (result.success && result.data) {
+      setLocalChecklist(result.data as Checklist);
+      onUpdate(result.data as Checklist);
+    }
+  };
+
+  const handleItemUpdate = useCallback((updatedChecklist: Checklist) => {
+    setLocalChecklist(updatedChecklist);
+    onUpdate(updatedChecklist);
+    refreshChecklist();
+  }, [onUpdate, refreshChecklist]);
+
+  const activeItem = activeId
+    ? localChecklist.items.find((item) => item.id === activeId)
+    : null;
+
+  return {
+    activeId,
+    overId,
+    localChecklist,
+    isLoading,
+    showBulkPasteModal,
+    setShowBulkPasteModal,
+    focusKey,
+    setFocusKey,
+    refreshChecklist,
+    handleItemUpdate,
+    getItemsByStatus,
+    handleDragStart,
+    handleDragOver,
+    handleDragEnd,
+    handleAddItem,
+    handleBulkPaste,
+    handleItemStatusUpdate: _handleItemStatusUpdate,
+    activeItem,
+  };
+};
diff --git a/app/_hooks/useKanbanItem.tsx b/app/_hooks/kanban/useKanbanItem.tsx
similarity index 66%
rename from app/_hooks/useKanbanItem.tsx
rename to app/_hooks/kanban/useKanbanItem.tsx
index 82df3329..7dafe4a8 100644
--- a/app/_hooks/useKanbanItem.tsx
+++ b/app/_hooks/kanban/useKanbanItem.tsx
@@ -2,7 +2,7 @@
 
 import { useState, useEffect, useRef } from "react";
 import { useTranslations } from "next-intl";
-import { Item, Checklist } from "@/app/_types";
+import { Item, Checklist, KanbanPriority, KanbanReminder } from "@/app/_types";
 import {
   updateItem,
   deleteItem,
@@ -10,6 +10,10 @@ import {
   archiveItem,
 } from "@/app/_server/actions/checklist-item";
 import { ConfirmModal } from "@/app/_components/GlobalComponents/Modals/ConfirmationModals/ConfirmModal";
+import { useToast } from "@/app/_providers/ToastProvider";
+
+const TIMER_STORAGE_KEY = (checklistId: string, itemId: string) =>
+  `jotty-timer-${checklistId}-${itemId}`;
 
 interface UseKanbanItemProps {
   item: Item;
@@ -27,6 +31,7 @@ export const useKanbanItem = ({
   onUpdate,
 }: UseKanbanItemProps) => {
   const t = useTranslations();
+  const { showToast } = useToast();
   const [isRunning, setIsRunning] = useState(false);
   const [currentTime, setCurrentTime] = useState(0);
   const [startTime, setStartTime] = useState<Date | null>(null);
@@ -49,6 +54,33 @@ export const useKanbanItem = ({
     setTotalTime(Math.floor(existingTime / 1000));
   }, [item.timeEntries]);
 
+  useEffect(() => {
+    const storageKey = TIMER_STORAGE_KEY(checklistId, item.id);
+    try {
+      const stored = localStorage.getItem(storageKey);
+      if (stored) {
+        const { startTime: storedStart, isRunning: storedRunning } = JSON.parse(stored);
+        if (storedRunning && storedStart) {
+          setStartTime(new Date(storedStart));
+          setIsRunning(true);
+          setCurrentTime(Math.floor((Date.now() - new Date(storedStart).getTime()) / 1000));
+        }
+      }
+    } catch {}
+  }, [checklistId, item.id]);
+
+  useEffect(() => {
+    const storageKey = TIMER_STORAGE_KEY(checklistId, item.id);
+    if (isRunning && startTime) {
+      localStorage.setItem(storageKey, JSON.stringify({
+        startTime: startTime.toISOString(),
+        isRunning: true,
+      }));
+    } else {
+      localStorage.removeItem(storageKey);
+    }
+  }, [isRunning, startTime, checklistId, item.id]);
+
   useEffect(() => {
     let interval: NodeJS.Timeout;
     if (isRunning && startTime) {
@@ -66,7 +98,7 @@ export const useKanbanItem = ({
     }
   }, [isEditing]);
 
-  const saveTimerEntry = async (start: Date, end: Date) => {
+  const _saveTimerEntry = async (start: Date, end: Date) => {
     const newTimeEntry = {
       id: Date.now().toString(),
       startTime: start.toISOString(),
@@ -93,12 +125,12 @@ export const useKanbanItem = ({
     return result;
   };
 
-  const handleTimerToggle = async () => {
+  function handleTimerToggle() {
     if (isRunning) {
       setIsRunning(false);
       if (startTime) {
         const endTime = new Date();
-        await saveTimerEntry(startTime, endTime);
+        _saveTimerEntry(startTime, endTime);
       }
       setStartTime(null);
       setCurrentTime(0);
@@ -107,20 +139,7 @@ export const useKanbanItem = ({
       setStartTime(new Date());
       setCurrentTime(0);
     }
-  };
-
-  const handleResetTimer = async () => {
-    const formData = new FormData();
-    formData.append("listId", checklistId);
-    formData.append("itemId", item.id);
-    formData.append("timeEntries", JSON.stringify([]));
-    formData.append("category", category || "Uncategorized");
-    const result = await updateItemStatus(formData);
-    setTotalTime(0);
-    if (result.success && result.data) {
-      onUpdate(result.data as Checklist);
-    }
-  };
+  }
 
   const handleAddManualTime = async (minutes: number) => {
     const now = new Date();
@@ -148,17 +167,17 @@ export const useKanbanItem = ({
   const stopTimerOnDrag = async () => {
     if (isRunning && startTime) {
       const endTime = new Date();
-      await saveTimerEntry(startTime, endTime);
+      await _saveTimerEntry(startTime, endTime);
       setIsRunning(false);
       setStartTime(null);
       setCurrentTime(0);
     }
   };
 
-  const handleEdit = () => {
+  function handleEdit() {
     setIsEditing(true);
     setEditText(item.text);
-  };
+  }
 
   const handleSave = async () => {
     setIsEditing(false);
@@ -176,12 +195,12 @@ export const useKanbanItem = ({
     }
   };
 
-  const handleCancel = () => {
+  function handleCancel() {
     setEditText(item.text);
     setIsEditing(false);
-  };
+  }
 
-  const handleKeyDown = (e: React.KeyboardEvent) => {
+  function handleKeyDown(e: React.KeyboardEvent) {
     if (e.key === "Enter") {
       e.preventDefault();
       e.stopPropagation();
@@ -191,7 +210,7 @@ export const useKanbanItem = ({
       e.stopPropagation();
       handleCancel();
     }
-  };
+  }
 
   const handleStatusChange = async (newStatus: string) => {
     const formData = new FormData();
@@ -200,12 +219,61 @@ export const useKanbanItem = ({
     formData.append("status", newStatus);
     formData.append("category", category || "Uncategorized");
     const result = await updateItemStatus(formData);
+    if (result.success && result.data) {
+      onUpdate(result.data as Checklist);
+      showToast({ type: "success", title: t("common.success"), message: t("kanban.statusUpdated") });
+    }
+  };
+
+  const handlePriorityChange = async (priority: KanbanPriority) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", item.id);
+    formData.append("priority", priority);
+    formData.append("category", category || "Uncategorized");
+    const result = await updateItem(checklist, formData);
+    if (result.success && result.data) {
+      onUpdate(result.data as Checklist);
+    }
+  };
+
+  const handleScoreChange = async (score: number) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", item.id);
+    formData.append("score", score.toString());
+    formData.append("category", category || "Uncategorized");
+    const result = await updateItem(checklist, formData);
+    if (result.success && result.data) {
+      onUpdate(result.data as Checklist);
+    }
+  };
+
+  const handleAssigneeChange = async (assignee: string) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", item.id);
+    formData.append("assignee", assignee);
+    formData.append("category", category || "Uncategorized");
+    const result = await updateItem(checklist, formData);
+    if (result.success && result.data) {
+      onUpdate(result.data as Checklist);
+    }
+  };
+
+  const handleReminderSet = async (reminder: KanbanReminder | null) => {
+    const formData = new FormData();
+    formData.append("listId", checklistId);
+    formData.append("itemId", item.id);
+    formData.append("reminder", reminder ? JSON.stringify(reminder) : "");
+    formData.append("category", category || "Uncategorized");
+    const result = await updateItem(checklist, formData);
     if (result.success && result.data) {
       onUpdate(result.data as Checklist);
     }
   };
 
-  const confirmDelete = async () => {
+  const _confirmDelete = async () => {
     const formData = new FormData();
     formData.append("listId", checklistId);
     formData.append("itemId", item.id);
@@ -213,10 +281,11 @@ export const useKanbanItem = ({
 
     const result = await deleteItem(formData);
     if (result.success) {
+      showToast({ type: "success", title: t("common.success"), message: t("kanban.itemDeleted") });
       onUpdate({
         id: checklistId,
         title: "",
-        type: "task",
+        type: "kanban",
         items: [],
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
@@ -236,6 +305,7 @@ export const useKanbanItem = ({
     const result = await archiveItem(formData);
     if (result.success && result.data) {
       onUpdate(result.data as Checklist);
+      showToast({ type: "success", title: t("common.success"), message: t("kanban.itemArchived") });
     }
   };
 
@@ -244,7 +314,6 @@ export const useKanbanItem = ({
     currentTime,
     totalTime,
     handleTimerToggle,
-    handleResetTimer,
     handleAddManualTime,
     stopTimerOnDrag,
     isEditing,
@@ -256,13 +325,17 @@ export const useKanbanItem = ({
     handleCancel,
     handleKeyDown,
     handleStatusChange,
+    handlePriorityChange,
+    handleScoreChange,
+    handleAssigneeChange,
+    handleReminderSet,
     handleDelete: () => setShowDeleteModal(true),
     handleArchive,
     DeleteModal: () => (
       <ConfirmModal
         isOpen={showDeleteModal}
         onClose={() => setShowDeleteModal(false)}
-        onConfirm={confirmDelete}
+        onConfirm={_confirmDelete}
         title={t("common.delete")}
         message={t("common.confirmDeleteItem", { itemTitle: item.text })}
         confirmText={t("common.delete")}
diff --git a/app/_hooks/kanban/useKanbanReminders.ts b/app/_hooks/kanban/useKanbanReminders.ts
new file mode 100644
index 00000000..5bb78ddb
--- /dev/null
+++ b/app/_hooks/kanban/useKanbanReminders.ts
@@ -0,0 +1,63 @@
+"use client";
+
+import { useEffect, useRef, useCallback } from "react";
+import { Checklist } from "@/app/_types";
+import { getDueReminders } from "@/app/_utils/kanban/reminder-utils";
+import { createNotification } from "@/app/_server/actions/notifications";
+import { markReminderNotified } from "@/app/_server/actions/kanban";
+import { useTranslations } from "next-intl";
+
+const REMINDER_CHECK_INTERVAL = 60000;
+
+interface UseKanbanRemindersParams {
+  checklist: Checklist;
+  checklistId: string;
+  category: string;
+  onUpdate: (updatedChecklist: Checklist) => void;
+}
+
+export const useKanbanReminders = ({
+  checklist,
+  checklistId,
+  category,
+  onUpdate,
+}: UseKanbanRemindersParams) => {
+  const t = useTranslations();
+  const notifiedRef = useRef<Set<string>>(new Set());
+
+  const checkReminders = useCallback(async () => {
+    const dueItems = getDueReminders(checklist.items);
+
+    for (const item of dueItems) {
+      if (notifiedRef.current.has(item.id)) continue;
+      notifiedRef.current.add(item.id);
+
+      await createNotification({
+        type: "reminder",
+        title: t("notifications.reminderTitle"),
+        message: t("notifications.reminderMessage", {
+          task: item.text,
+          board: checklist.title,
+        }),
+        data: {
+          itemId: checklist.uuid || checklistId,
+          itemType: "checklist",
+          taskId: item.id,
+        },
+      });
+
+      const formData = new FormData();
+      formData.append("listId", checklistId);
+      formData.append("itemId", item.id);
+      formData.append("category", category);
+      const result = await markReminderNotified(formData);
+      if (result.success && result.data) onUpdate(result.data);
+    }
+  }, [checklist.items, checklist.title, checklistId, category, onUpdate]);
+
+  useEffect(() => {
+    checkReminders();
+    const interval = setInterval(checkReminders, REMINDER_CHECK_INTERVAL);
+    return () => clearInterval(interval);
+  }, [checkReminders]);
+};
diff --git a/app/_hooks/useChecklist.tsx b/app/_hooks/useChecklist.tsx
index 0db3bbe3..751fa70a 100644
--- a/app/_hooks/useChecklist.tsx
+++ b/app/_hooks/useChecklist.tsx
@@ -10,7 +10,7 @@ import {
   useSensor,
   useSensors,
 } from "@dnd-kit/core";
-import { Checklist, Item, RecurrenceRule } from "@/app/_types";
+import { Checklist, ChecklistType, Item, RecurrenceRule } from "@/app/_types";
 import {
   deleteList,
   convertChecklistType,
@@ -577,8 +577,8 @@ export const useChecklist = ({
     setShowConversionModal(true);
   };
 
-  const getNewType = (currentType: "simple" | "task"): "simple" | "task" => {
-    return currentType === "simple" ? "task" : "simple";
+  const getNewType = (currentType: ChecklistType): ChecklistType => {
+    return currentType === "simple" ? "kanban" : "simple";
   };
 
   const handleConfirmConversion = async () => {
diff --git a/app/_hooks/useChecklistHome.tsx b/app/_hooks/useChecklistHome.tsx
index c6025d21..3feb52c3 100644
--- a/app/_hooks/useChecklistHome.tsx
+++ b/app/_hooks/useChecklistHome.tsx
@@ -16,7 +16,7 @@ import { Checklist, SanitisedUser } from "@/app/_types";
 import { isItemCompleted } from "@/app/_utils/checklist-utils";
 import { useHomeFilter } from "@/app/_utils/home-filter-store";
 import { togglePin, updatePinnedOrder } from "@/app/_server/actions/dashboard";
-import { ItemTypes } from "../_types/enums";
+import { isKanbanType, ItemTypes } from "../_types/enums";
 import { useTranslations } from "next-intl";
 import { HOMEPAGE_ITEMS_LIMIT } from "@/app/_consts/files";
 
@@ -195,7 +195,7 @@ export const useChecklistHome = ({ lists, user }: UseChecklistHomeProps) => {
         items?.filter((item) => isItemCompleted(item, list.type)).length || 0;
     });
 
-    const taskLists = lists.filter((list) => list.type === "task").length;
+    const taskLists = lists.filter((list) => isKanbanType(list.type)).length;
 
     return { totalLists, totalItems, completedItems, taskLists };
   }, [lists]);
@@ -207,7 +207,7 @@ export const useChecklistHome = ({ lists, user }: UseChecklistHomeProps) => {
 
   const pinned = getPinnedLists();
   const recent = getRecentLists();
-  const taskLists = recent.filter((list) => list.type === "task");
+  const taskLists = recent.filter((list) => isKanbanType(list.type));
   const simpleLists = recent.filter((list) => list.type === "simple");
 
   const filterOptions = [
diff --git a/app/_hooks/useKanbanBoard.tsx b/app/_hooks/useKanbanBoard.tsx
deleted file mode 100644
index 1b8c0837..00000000
--- a/app/_hooks/useKanbanBoard.tsx
+++ /dev/null
@@ -1,267 +0,0 @@
-"use client";
-
-import { useState, useEffect } from "react";
-import { DragEndEvent, DragStartEvent } from "@dnd-kit/core";
-import { arrayMove } from "@dnd-kit/sortable";
-import { Checklist, KanbanStatus, RecurrenceRule, Result } from "@/app/_types";
-import {
-  createItem,
-  updateItemStatus,
-  createBulkItems,
-  reorderItems,
-} from "@/app/_server/actions/checklist-item";
-import {
-  getListById,
-  getUserChecklists,
-} from "@/app/_server/actions/checklist";
-import { TaskStatus, TaskStatusLabels } from "@/app/_types/enums";
-import { getCurrentUser, getUserByChecklist } from "../_server/actions/users";
-
-interface UseKanbanBoardProps {
-  checklist: Checklist;
-  onUpdate: (updatedChecklist: Checklist) => void;
-}
-
-const defaultStatuses: KanbanStatus[] = [
-  {
-    id: TaskStatus.TODO,
-    label: TaskStatusLabels.TODO,
-    order: 0,
-  },
-  {
-    id: TaskStatus.IN_PROGRESS,
-    label: TaskStatusLabels.IN_PROGRESS,
-    order: 1,
-  },
-  {
-    id: TaskStatus.COMPLETED,
-    label: TaskStatusLabels.COMPLETED,
-    order: 2,
-  },
-  {
-    id: TaskStatus.PAUSED,
-    label: TaskStatusLabels.PAUSED,
-    order: 3,
-  },
-];
-
-export const useKanbanBoard = ({
-  checklist,
-  onUpdate,
-}: UseKanbanBoardProps) => {
-  const [activeId, setActiveId] = useState<string | null>(null);
-  const [localChecklist, setLocalChecklist] = useState(checklist);
-  const [isLoading, setIsLoading] = useState(false);
-  const [showBulkPasteModal, setShowBulkPasteModal] = useState(false);
-  const [focusKey, setFocusKey] = useState(0);
-
-  const validStatusIds = (localChecklist.statuses || defaultStatuses).map(
-    (s) => s.id
-  );
-
-  useEffect(() => {
-    if (checklist.id !== localChecklist.id || checklist.updatedAt !== localChecklist.updatedAt) {
-      setLocalChecklist(checklist);
-      setFocusKey((prev) => prev + 1);
-    }
-  }, [checklist.id, checklist.updatedAt, localChecklist.id, localChecklist.updatedAt]);
-
-  const refreshChecklist = async () => {
-    const result = (await getUserChecklists()) as Result<Checklist[]>;
-    if (result.success && result.data) {
-      const updatedChecklist = result.data.find(
-        (list) => list.id === checklist.id
-      );
-      if (updatedChecklist) {
-        setLocalChecklist(updatedChecklist);
-        onUpdate(updatedChecklist);
-      }
-    }
-  };
-
-  const getItemsByStatus = (status: string) => {
-    return localChecklist.items.filter(
-      (item) => item.status === status && !item.isArchived
-    );
-  };
-
-  const handleDragStart = (event: DragStartEvent) => {
-    setActiveId(event.active.id as string);
-  };
-
-  const handleDragEnd = async (event: DragEndEvent) => {
-    const { active, over } = event;
-    setActiveId(null);
-
-    if (!over) return;
-
-    const activeId = active.id as string;
-    const overId = over.id as string;
-
-    if (activeId === overId) return;
-
-    const activeItem = localChecklist.items.find(
-      (item) => item.id === activeId
-    );
-    if (!activeItem) return;
-
-    let newStatus: string;
-    let isReordering = false;
-
-    if (validStatusIds.includes(overId)) {
-      newStatus = overId;
-    } else {
-      const overItem = localChecklist.items.find((item) => item.id === overId);
-      if (!overItem) return;
-      newStatus = overItem.status || TaskStatus.TODO;
-
-      if (activeItem.status === newStatus) {
-        isReordering = true;
-      }
-    }
-
-    if (isReordering) {
-      const itemsWithStatus = localChecklist.items.filter(
-        (item) => item.status === newStatus
-      );
-      const oldIndex = itemsWithStatus.findIndex(
-        (item) => item.id === activeId
-      );
-      const newIndex = itemsWithStatus.findIndex((item) => item.id === overId);
-
-      if (oldIndex === -1 || newIndex === -1) return;
-
-      const reorderedItems = arrayMove(itemsWithStatus, oldIndex, newIndex);
-
-      const otherItems = localChecklist.items.filter(
-        (item) => item.status !== newStatus
-      );
-
-      const allItems = [...otherItems, ...reorderedItems];
-
-      const optimisticChecklist = {
-        ...localChecklist,
-        items: allItems,
-        updatedAt: new Date().toISOString(),
-      };
-      setLocalChecklist(optimisticChecklist);
-
-      const formData = new FormData();
-      formData.append("listId", localChecklist.id);
-      formData.append("activeItemId", activeId);
-      formData.append("overItemId", overId);
-      formData.append("category", localChecklist.category || "Uncategorized");
-
-      const result = await reorderItems(formData);
-
-      if (result.success) {
-        await refreshChecklist();
-      }
-    } else {
-      await handleItemStatusUpdate(activeId, newStatus);
-    }
-  };
-
-  const handleAddItem = async (text: string, recurrence?: RecurrenceRule) => {
-    setIsLoading(true);
-    const formData = new FormData();
-    formData.append("listId", localChecklist.id);
-    formData.append("text", text);
-    formData.append("category", localChecklist.category || "Uncategorized");
-
-    const currentUser = await getCurrentUser();
-
-    if (recurrence) {
-      formData.append("recurrence", JSON.stringify(recurrence));
-    }
-
-    const result = await createItem(
-      localChecklist,
-      formData,
-      currentUser?.username
-    );
-
-    const checklistOwner = await getUserByChecklist(
-      localChecklist.id,
-      localChecklist.category || "Uncategorized"
-    );
-
-    const updatedList = await getListById(
-      localChecklist.id,
-      checklistOwner?.data?.username,
-      localChecklist.category
-    );
-    if (updatedList) {
-      setLocalChecklist(updatedList);
-      onUpdate(updatedList);
-    }
-    setIsLoading(false);
-
-    if (result.success && result.data) {
-      setFocusKey((prev) => prev + 1);
-    } else {
-      console.error("Failed to create item:", result.error);
-    }
-  };
-
-  const handleBulkPaste = async (itemsText: string) => {
-    setIsLoading(true);
-    const formData = new FormData();
-    formData.append("listId", localChecklist.id);
-    formData.append("itemsText", itemsText);
-    formData.append("category", localChecklist.category || "Uncategorized");
-    const result = await createBulkItems(formData);
-    setIsLoading(false);
-
-    if (result.success && result.data) {
-      setLocalChecklist(result.data as Checklist);
-      onUpdate(result.data as Checklist);
-    }
-  };
-
-  const activeItem = activeId
-    ? localChecklist.items.find((item) => item.id === activeId)
-    : null;
-
-  const handleItemStatusUpdate = async (itemId: string, newStatus: string) => {
-    const item = localChecklist.items.find((item) => item.id === itemId);
-    if (!item) {
-      return;
-    }
-
-    if (item.status === newStatus) {
-      return;
-    }
-
-    const formData = new FormData();
-    formData.append("listId", localChecklist.id);
-    formData.append("itemId", itemId);
-    formData.append("status", newStatus);
-    formData.append("category", localChecklist.category || "Uncategorized");
-
-    const result = await updateItemStatus(formData);
-
-    if (result.success && result.data) {
-      setLocalChecklist(result.data as Checklist);
-      onUpdate(result.data as Checklist);
-    }
-  };
-
-  return {
-    activeId,
-    localChecklist,
-    isLoading,
-    showBulkPasteModal,
-    setShowBulkPasteModal,
-    focusKey,
-    setFocusKey,
-    refreshChecklist,
-    getItemsByStatus,
-    handleDragStart,
-    handleDragEnd,
-    handleAddItem,
-    handleBulkPaste,
-    handleItemStatusUpdate,
-    activeItem,
-  };
-};
diff --git a/app/_hooks/useNotifications.ts b/app/_hooks/useNotifications.ts
new file mode 100644
index 00000000..4b6a35bc
--- /dev/null
+++ b/app/_hooks/useNotifications.ts
@@ -0,0 +1,67 @@
+"use client";
+
+import { useState, useEffect, useCallback } from "react";
+import { AppNotification } from "@/app/_types";
+import {
+  getNotifications,
+  markNotificationRead,
+  markAllNotificationsRead,
+  removeNotification,
+  clearNotifications,
+} from "@/app/_server/actions/notifications";
+import { useWebSocket } from "@/app/_providers/WebSocketProvider";
+
+export const useNotifications = () => {
+  const [notifications, setNotifications] = useState<AppNotification[]>([]);
+  const { subscribe } = useWebSocket();
+
+  const fetch = useCallback(async () => {
+    const data = await getNotifications();
+    setNotifications(data);
+  }, []);
+
+  useEffect(() => {
+    fetch();
+  }, [fetch]);
+
+  useEffect(() => {
+    return subscribe((event) => {
+      if (event.type === "notification") fetch();
+    });
+  }, [subscribe, fetch]);
+
+  const handleMarkAsRead = useCallback(async (id: string) => {
+    setNotifications((prev) =>
+      prev.map((n) => (n.id === id ? { ...n, readAt: new Date().toISOString() } : n)),
+    );
+    await markNotificationRead(id);
+  }, []);
+
+  const handleMarkAllAsRead = useCallback(async () => {
+    const readAt = new Date().toISOString();
+    setNotifications((prev) => prev.map((n) => (n.readAt ? n : { ...n, readAt })));
+    await markAllNotificationsRead();
+  }, []);
+
+  const handleRemoveNotification = useCallback(async (id: string) => {
+    setNotifications((prev) => prev.filter((n) => n.id !== id));
+    await removeNotification(id);
+  }, []);
+
+  const handleClearAll = useCallback(async () => {
+    setNotifications([]);
+    await clearNotifications();
+  }, []);
+
+  const unreadCount = notifications.filter((n) => !n.readAt).length;
+
+  return {
+    notifications,
+    unreadCount,
+    markAsRead: handleMarkAsRead,
+    markAllAsRead: handleMarkAllAsRead,
+    removeNotification: handleRemoveNotification,
+    clearAll: handleClearAll,
+    refresh: fetch,
+  };
+};
diff --git a/app/_providers/WebSocketProvider.tsx b/app/_providers/WebSocketProvider.tsx
index 21b9a027..218e4796 100644
--- a/app/_providers/WebSocketProvider.tsx
+++ b/app/_providers/WebSocketProvider.tsx
@@ -16,10 +16,14 @@ import type { WsEvent } from "@/app/_types";
 
 interface WebSocketContextType {
   isConnected: boolean;
+  subscribe: (handler: (event: WsEvent) => void) => () => void;
 }
 
+const _noop = () => () => {};
+
 const WebSocketContext = createContext<WebSocketContextType>({
   isConnected: false,
+  subscribe: _noop,
 });
 
 export const useWebSocket = () => useContext(WebSocketContext);
@@ -39,9 +43,15 @@ export const WebSocketProvider = ({ children }: { children: ReactNode }) => {
   const hasPendingUpdates = useRef(false);
   const refreshTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const mountedRef = useRef(true);
+  const listenersRef = useRef<Set<(event: WsEvent) => void>>(new Set());
 
   const isEditorActive = useEditorActivityStore((s) => s.isActive);
 
+  const subscribe = useCallback((handler: (event: WsEvent) => void) => {
+    listenersRef.current.add(handler);
+    return () => { listenersRef.current.delete(handler); };
+  }, []);
+
   const debouncedRefresh = useCallback(() => {
     if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current);
     refreshTimerRef.current = setTimeout(() => {
@@ -52,13 +62,18 @@ export const WebSocketProvider = ({ children }: { children: ReactNode }) => {
   const handleMessage = useCallback(
     (event: MessageEvent) => {
       try {
-        const data = JSON.parse(event.data);
+        const raw = JSON.parse(event.data) as Record<string, unknown>;
 
-        if (data.type === "connected") {
-          connectionIdRef.current = data.connectionId;
+        if (raw.type === "connected") {
+          connectionIdRef.current = (raw.connectionId as string) ?? null;
           return;
         }
 
+        const data = raw as unknown as WsEvent;
+        listenersRef.current.forEach((handler) => handler(data));
+
+        if (data.type === "notification") return;
+
         if (isEditorActive()) {
           hasPendingUpdates.current = true;
           return;
@@ -136,7 +151,7 @@ export const WebSocketProvider = ({ children }: { children: ReactNode }) => {
   }, [isEditorActive, debouncedRefresh]);
 
   return (
-    <WebSocketContext.Provider value={{ isConnected }}>
+    <WebSocketContext.Provider value={{ isConnected, subscribe }}>
       {children}
     </WebSocketContext.Provider>
   );
diff --git a/app/_schemas/user-schemas.ts b/app/_schemas/user-schemas.ts
index 2209580e..0464711f 100644
--- a/app/_schemas/user-schemas.ts
+++ b/app/_schemas/user-schemas.ts
@@ -27,9 +27,21 @@ export const editorSettingsSchema = z.object({
   disableRichEditor: z.enum(["enable", "disable"], {
     message: "Disable rich editor must be either 'enable' or 'disable'",
   }),
-  markdownTheme: z.enum(["prism", "prism-dark", "prism-funky", "prism-okaidia", "prism-tomorrow", "prism-twilight", "prism-coy", "prism-solarizedlight"], {
-    message: "Markdown theme must be a valid Prism theme",
-  }),
+  markdownTheme: z.enum(
+    [
+      "prism",
+      "prism-dark",
+      "prism-funky",
+      "prism-okaidia",
+      "prism-tomorrow",
+      "prism-twilight",
+      "prism-coy",
+      "prism-solarizedlight",
+    ],
+    {
+      message: "Markdown theme must be a valid Prism theme",
+    },
+  ),
   defaultNoteFilter: z.enum(["all", "recent", "pinned"], {
     message: "Default note filter must be 'all', 'recent', or 'pinned'",
   }),
@@ -49,9 +61,13 @@ export const checklistSettingsSchema = z.object({
   showCompletedSuggestions: z.enum(["enable", "disable"], {
     message: "Show completed suggestions must be either 'enable' or 'disable'",
   }),
-  defaultChecklistFilter: z.enum(["all", "completed", "incomplete", "pinned", "task", "simple"], {
-    message: "Default checklist filter must be 'all', 'completed', 'incomplete', 'pinned', 'task', or 'simple'",
-  }),
+  defaultChecklistFilter: z.enum(
+    ["all", "completed", "incomplete", "pinned", "task", "simple"],
+    {
+      message:
+        "Default checklist filter must be 'all', 'completed', 'incomplete', 'pinned', 'kanban', or 'simple'",
+    },
+  ),
 });
 
 export const fileSettingsSchema = z.object({
@@ -71,12 +87,16 @@ export const generalSettingsSchema = z.object({
   }),
   preferredDateFormat: z.enum(["dd/mm/yyyy", "mm/dd/yyyy", "yyyy/mm/dd"]),
   preferredTimeFormat: z.enum(["12-hours", "24-hours"]),
-  handedness: z.enum(["right-handed", "left-handed"], {
-    message: "Handedness must be either 'right-handed' or 'left-handed'",
-  }).optional(),
-  hideConnectionIndicator: z.enum(["enable", "disable"], {
-    message: "Hide connection indicator must be either 'enable' or 'disable'",
-  }).optional(),
+  handedness: z
+    .enum(["right-handed", "left-handed"], {
+      message: "Handedness must be either 'right-handed' or 'left-handed'",
+    })
+    .optional(),
+  hideConnectionIndicator: z
+    .enum(["enable", "disable"], {
+      message: "Hide connection indicator must be either 'enable' or 'disable'",
+    })
+    .optional(),
 });
 
 export type UserSettingsInput = z.infer<typeof userSettingsSchema>;
diff --git a/app/_server/actions/auth/index.ts b/app/_server/actions/auth/index.ts
index d14e6f67..9ea9f069 100644
--- a/app/_server/actions/auth/index.ts
+++ b/app/_server/actions/auth/index.ts
@@ -2,7 +2,7 @@
 
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
-import { createHash } from "crypto";
+import { createHash, randomBytes } from "crypto";
 import path from "path";
 import { lock, unlock } from "proper-lockfile";
 import {
@@ -23,8 +23,14 @@ import { CHECKLISTS_FOLDER } from "@/app/_consts/checklists";
 import fs from "fs/promises";
 import { CHECKLISTS_DIR, NOTES_DIR, USERS_FILE } from "@/app/_consts/files";
 import { logAuthEvent } from "../log";
-import { getUsername } from "../users";
-import { isEnvEnabled } from "@/app/_utils/env-utils";
+import { getUsername, ensureUser } from "../users";
+import {
+  isSecureEnv,
+  getAuthMode,
+  getSessionCookieName,
+  getMfaPendingCookieName,
+} from "@/app/_utils/env-utils";
+import { ldapLogin } from "./ldap";
 
 interface User {
   username: string;
@@ -33,12 +39,93 @@ interface User {
   isSuperAdmin?: boolean;
   createdAt?: string;
   lastLogin?: string;
+  failedLoginAttempts?: number;
+  nextAllowedLoginAttempt?: string;
+  mfaEnabled?: boolean;
 }
 
 const hashPassword = (password: string): string => {
   return createHash("sha256").update(password).digest("hex");
 };
 
+const _generateSessionId = (): string => randomBytes(32).toString("hex");
+
+async function _setSessionCookie(
+  sessionId: string,
+  cookieName: string,
+  maxAge: number,
+) {
+  (await cookies()).set(cookieName, sessionId, {
+    httpOnly: true,
+    secure: isSecureEnv(),
+    sameSite: "lax",
+    maxAge,
+    path: "/",
+  });
+}
+
+async function _handleFailedLogin(
+  users: User[],
+  username: string,
+  bruteforceProtectionDisabled: boolean,
+) {
+  const user = users.find(
+    (u: User) => u.username.toLowerCase() === username.toLowerCase(),
+  );
+
+  if (user && !bruteforceProtectionDisabled) {
+    const userIndex = users.findIndex(
+      (u: User) => u.username.toLowerCase() === username.toLowerCase(),
+    );
+
+    if (userIndex !== -1) {
+      const failedAttempts =
+        (users[userIndex].failedLoginAttempts || 0) + 1;
+      users[userIndex].failedLoginAttempts = failedAttempts;
+
+      const delayMs = _youShallNotPass(failedAttempts);
+      let lockedUntil: string | undefined;
+      if (delayMs > 0) {
+        lockedUntil = new Date(Date.now() + delayMs).toISOString();
+        users[userIndex].nextAllowedLoginAttempt = lockedUntil;
+      } else {
+        users[userIndex].nextAllowedLoginAttempt = undefined;
+      }
+
+      await writeJsonFile(users, USERS_FILE);
+
+      await logAuthEvent(
+        "login",
+        username,
+        false,
+        `Invalid credentials - attempt ${failedAttempts}`,
+      );
+
+      const attemptsRemaining = Math.max(0, 4 - failedAttempts);
+      const waitSeconds = delayMs > 0 ? Math.ceil(delayMs / 1000) : 0;
+
+      return {
+        error:
+          delayMs > 0
+            ? "Too many failed attempts"
+            : "Invalid username or password",
+        attemptsRemaining,
+        failedAttempts,
+        ...(lockedUntil && { lockedUntil, waitSeconds }),
+      };
+    }
+  }
+
+  await logAuthEvent("login", username, false, "Invalid username or password");
+  return {
+    error: "Invalid username or password",
+    attemptsRemaining: undefined as number | undefined,
+    failedAttempts: undefined as number | undefined,
+    lockedUntil: undefined as string | undefined,
+    waitSeconds: undefined as number | undefined,
+  };
+}
+
 /**
  * 🧙‍♂️
  */
@@ -87,9 +174,7 @@ export const register = async (formData: FormData) => {
   users.push(newUser);
   await writeJsonFile(users, USERS_FILE);
 
-  const sessionId = createHash("sha256")
-    .update(Math.random().toString())
-    .digest("hex");
+  const sessionId = _generateSessionId();
 
   let sessions = await readSessions();
 
@@ -103,19 +188,7 @@ export const register = async (formData: FormData) => {
 
   await writeSessions(sessions);
 
-  const cookieName =
-    process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-      ? "__Host-session"
-      : "session";
-
-  (await cookies()).set(cookieName, sessionId, {
-    httpOnly: true,
-    secure:
-      process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS),
-    sameSite: "lax",
-    maxAge: 30 * 24 * 60 * 60,
-    path: "/",
-  });
+  await _setSessionCookie(sessionId, getSessionCookieName(), 30 * 24 * 60 * 60);
 
   const userChecklistDir = path.join(
     process.cwd(),
@@ -142,10 +215,13 @@ export const login = async (formData: FormData) => {
   }
 
   const usersFile = path.join(process.cwd(), "data", "users", "users.json");
+  await fs.mkdir(path.dirname(usersFile), { recursive: true });
+  try { await fs.access(usersFile); } catch { await fs.writeFile(usersFile, "[]", "utf-8"); }
   await lock(usersFile);
+  let lockReleased = false;
 
   try {
-    const users = await readJsonFile(USERS_FILE);
+    const users = (await readJsonFile(USERS_FILE)) || [];
     const user = users.find(
       (u: User) => u.username.toLowerCase() === username.toLowerCase(),
     );
@@ -176,79 +252,44 @@ export const login = async (formData: FormData) => {
       }
     }
 
-    if (!user || user.passwordHash !== hashPassword(password)) {
-      if (user && !bruteforceProtectionDisabled) {
-        const userIndex = users.findIndex(
-          (u: User) => u.username.toLowerCase() === username.toLowerCase(),
-        );
+    if (getAuthMode() === "ldap") {
+      const ldapResult = await ldapLogin(username, password);
+
+      if (!ldapResult.ok) {
+        if (ldapResult.kind === "connection_error") {
+          await logAuthEvent("login", username, false, "LDAP connection error");
+          return { error: "Authentication service unavailable" };
+        }
 
-        if (userIndex !== -1) {
-          const failedAttempts =
-            (users[userIndex].failedLoginAttempts || 0) + 1;
-          users[userIndex].failedLoginAttempts = failedAttempts;
-
-          const delayMs = _youShallNotPass(failedAttempts);
-          let lockedUntil: string | undefined;
-          if (delayMs > 0) {
-            lockedUntil = new Date(Date.now() + delayMs).toISOString();
-            users[userIndex].nextAllowedLoginAttempt = lockedUntil;
-          } else {
-            users[userIndex].nextAllowedLoginAttempt = undefined;
-          }
-
-          await writeJsonFile(users, USERS_FILE);
-
-          await logAuthEvent(
-            "login",
-            username,
-            false,
-            `Invalid credentials - attempt ${failedAttempts}`,
-          );
-
-          const attemptsRemaining = Math.max(0, 4 - failedAttempts);
-          const waitSeconds = delayMs > 0 ? Math.ceil(delayMs / 1000) : 0;
-
-          return {
-            error:
-              delayMs > 0
-                ? "Too many failed attempts"
-                : "Invalid username or password",
-            attemptsRemaining,
-            failedAttempts,
-            ...(lockedUntil && { lockedUntil, waitSeconds }),
-          };
+        if (ldapResult.kind === "unauthorized") {
+          lockReleased = true;
+          await unlock(usersFile);
+          redirect("/auth/login?error=unauthorized");
         }
+
+        return await _handleFailedLogin(users, username, bruteforceProtectionDisabled);
       }
 
-      await logAuthEvent(
-        "login",
-        username,
-        false,
-        "Invalid username or password",
-      );
-      return { error: "Invalid username or password" };
+      lockReleased = true;
+      await unlock(usersFile);
+
+      await ensureUser(ldapResult.username, ldapResult.isAdmin);
+
+      const ldapSessionId = _generateSessionId();
+      await createSession(ldapSessionId, ldapResult.username, "ldap");
+      await _setSessionCookie(ldapSessionId, getSessionCookieName(), 30 * 24 * 60 * 60);
+      await logAuthEvent("login", ldapResult.username, true);
+
+      redirect("/");
     }
 
-    if (user.mfaEnabled) {
-      const pendingSessionId = createHash("sha256")
-        .update(`pending-mfa-${Math.random().toString()}`)
-        .digest("hex");
-
-      const cookieName =
-        process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-          ? "__Host-mfa-pending"
-          : "mfa-pending";
-
-      (await cookies()).set(cookieName, pendingSessionId, {
-        httpOnly: true,
-        secure:
-          process.env.NODE_ENV === "production" &&
-          isEnvEnabled(process.env.HTTPS),
-        sameSite: "lax",
-        maxAge: 10 * 60,
-        path: "/",
-      });
+    if (!user || user.passwordHash !== hashPassword(password)) {
+      return await _handleFailedLogin(users, username, bruteforceProtectionDisabled);
+    }
 
+    if (user.mfaEnabled) {
+      const pendingSessionId = _generateSessionId();
+      await _setSessionCookie(pendingSessionId, getMfaPendingCookieName(), 10 * 60);
       await createSession(pendingSessionId, user.username, "pending-mfa");
 
       redirect("/auth/verify-mfa");
@@ -264,47 +305,27 @@ export const login = async (formData: FormData) => {
       await writeJsonFile(users, USERS_FILE);
     }
 
-    const sessionId = createHash("sha256")
-      .update(Math.random().toString())
-      .digest("hex");
+    const sessionId = _generateSessionId();
     const sessions = await readSessions();
     sessions[sessionId] = user.username;
 
     await writeSessions(sessions);
 
     await createSession(sessionId, user.username, "local");
-
-    const cookieName =
-      process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-        ? "__Host-session"
-        : "session";
-
-    (await cookies()).set(cookieName, sessionId, {
-      httpOnly: true,
-      secure:
-        process.env.NODE_ENV === "production" &&
-        isEnvEnabled(process.env.HTTPS),
-      sameSite: "lax",
-      maxAge: 30 * 24 * 60 * 60,
-      path: "/",
-    });
-
+    await _setSessionCookie(sessionId, getSessionCookieName(), 30 * 24 * 60 * 60);
     await logAuthEvent("login", user.username, true);
 
     redirect("/");
   } finally {
-    await unlock(usersFile);
+    if (!lockReleased) {
+      await unlock(usersFile);
+    }
   }
 };
 
 export const logout = async () => {
   const username = await getUsername();
-
-  const cookieName =
-    process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-      ? "__Host-session"
-      : "session";
-
+  const cookieName = getSessionCookieName();
   const sessionId = (await cookies()).get(cookieName)?.value;
 
   if (sessionId) {
@@ -324,7 +345,7 @@ export const logout = async () => {
 
   await logAuthEvent("logout", username || "unknown", true);
 
-  if (process.env.SSO_MODE === "oidc") {
+  if (getAuthMode() === "oidc") {
     redirect("/api/oidc/logout");
   } else {
     redirect("/auth/login");
@@ -339,10 +360,7 @@ export const verifyMfaLogin = async (formData: FormData) => {
     return { error: "Code is required" };
   }
 
-  const pendingCookieName =
-    process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-      ? "__Host-mfa-pending"
-      : "mfa-pending";
+  const pendingCookieName = getMfaPendingCookieName();
 
   const pendingSessionId = (await cookies()).get(pendingCookieName)?.value;
 
@@ -406,9 +424,7 @@ export const verifyMfaLogin = async (formData: FormData) => {
     await writeJsonFile(users, USERS_FILE);
   }
 
-  const sessionId = createHash("sha256")
-    .update(Math.random().toString())
-    .digest("hex");
+  const sessionId = _generateSessionId();
 
   sessions[sessionId] = username;
   delete sessions[pendingSessionId];
@@ -418,20 +434,7 @@ export const verifyMfaLogin = async (formData: FormData) => {
   await createSession(sessionId, username, "local");
 
   (await cookies()).delete(pendingCookieName);
-
-  const cookieName =
-    process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-      ? "__Host-session"
-      : "session";
-
-  (await cookies()).set(cookieName, sessionId, {
-    httpOnly: true,
-    secure:
-      process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS),
-    sameSite: "lax",
-    maxAge: 30 * 24 * 60 * 60,
-    path: "/",
-  });
+  await _setSessionCookie(sessionId, getSessionCookieName(), 30 * 24 * 60 * 60);
 
   await logAuthEvent("login", username, true);
 
diff --git a/app/_server/actions/auth/ldap.ts b/app/_server/actions/auth/ldap.ts
new file mode 100644
index 00000000..3059a3a0
--- /dev/null
+++ b/app/_server/actions/auth/ldap.ts
@@ -0,0 +1,129 @@
+import { Client } from "ldapts";
+import { getEnvOrFile } from "@/app/_server/actions/file";
+
+export type LdapLoginResult =
+  | { ok: true; username: string; isAdmin: boolean }
+  | { ok: false; kind: "invalid_credentials" }
+  | { ok: false; kind: "unauthorized" }
+  | { ok: false; kind: "connection_error" };
+
+function escapeLdapFilter(value: string): string {
+  return value
+    .replace(/\\/g, "\\5c")
+    .replace(/\*/g, "\\2a")
+    .replace(/\(/g, "\\28")
+    .replace(/\)/g, "\\29")
+    .replace(/\0/g, "\\00");
+}
+
+export async function ldapLogin(
+  username: string,
+  password: string,
+): Promise<LdapLoginResult> {
+  const url = process.env.LDAP_URL;
+  const bindDN = process.env.LDAP_BIND_DN;
+  const bindPassword = await getEnvOrFile(
+    "LDAP_BIND_PASSWORD",
+    "LDAP_BIND_PASSWORD_FILE",
+  );
+  const baseDN = process.env.LDAP_BASE_DN;
+  const userAttribute = process.env.LDAP_USER_ATTRIBUTE || "uid";
+
+  if (!url || !bindDN || !bindPassword || !baseDN) {
+    if (process.env.DEBUGGER) {
+      console.error("LDAP - Missing required configuration:", {
+        url: !!url,
+        bindDN: !!bindDN,
+        bindPassword: !!bindPassword,
+        baseDN: !!baseDN,
+      });
+    }
+    return { ok: false, kind: "connection_error" };
+  }
+
+  const client = new Client({ url });
+
+  try {
+    try {
+      await client.bind(bindDN, bindPassword);
+    } catch (err) {
+      if (process.env.DEBUGGER) {
+        console.error("LDAP - Service account bind failed:", err);
+      }
+      return { ok: false, kind: "connection_error" };
+    }
+
+    let userDN = "";
+    let memberOf: string[] = [];
+
+    try {
+      const { searchEntries } = await client.search(baseDN, {
+        filter: `(${userAttribute}=${escapeLdapFilter(username)})`,
+        attributes: ["dn", "memberOf"],
+      });
+
+      if (searchEntries.length === 0) {
+        return { ok: false, kind: "invalid_credentials" };
+      }
+
+      const entry = searchEntries[0];
+      userDN = entry.dn;
+
+      const raw = entry["memberOf"];
+      if (Array.isArray(raw)) {
+        memberOf = raw as string[];
+      } else if (typeof raw === "string") {
+        memberOf = [raw];
+      }
+    } catch (err) {
+      if (process.env.DEBUGGER) {
+        console.error("LDAP - User search failed:", err);
+      }
+      return { ok: false, kind: "connection_error" };
+    }
+
+    try {
+      await client.bind(userDN, password);
+    } catch (err) {
+      return { ok: false, kind: "invalid_credentials" };
+    }
+
+    const adminGroupList = (process.env.LDAP_ADMIN_GROUPS || "")
+      .split("|")
+      .map((g) => g.trim())
+      .filter(Boolean);
+
+    const userGroupList = (process.env.LDAP_USER_GROUPS || "")
+      .split("|")
+      .map((g) => g.trim())
+      .filter(Boolean);
+
+    const isAdmin =
+      adminGroupList.length > 0 &&
+      adminGroupList.some((g) => memberOf.includes(g));
+
+    if (userGroupList.length > 0) {
+      const isInUserGroup = userGroupList.some((g) => memberOf.includes(g));
+      if (!isInUserGroup && !isAdmin) {
+        if (process.env.DEBUGGER) {
+          console.log("LDAP - User not in allowed groups:", {
+            username,
+            requiredGroups: process.env.LDAP_USER_GROUPS,
+            memberOf,
+          });
+        }
+        return { ok: false, kind: "unauthorized" };
+      }
+    }
+
+    if (process.env.DEBUGGER) {
+      console.log("LDAP - Login successful:", { username, isAdmin });
+    }
+
+    return { ok: true, username, isAdmin };
+  } finally {
+    try {
+      await client.unbind();
+    } catch {}
+  }
+}
diff --git a/app/_server/actions/checklist-item/bulk-operations.ts b/app/_server/actions/checklist-item/bulk-operations.ts
index 67876186..fb4d36ea 100644
--- a/app/_server/actions/checklist-item/bulk-operations.ts
+++ b/app/_server/actions/checklist-item/bulk-operations.ts
@@ -22,6 +22,7 @@ import {
   Modes,
   PermissionTypes,
   TaskStatus,
+  isKanbanType,
 } from "@/app/_types/enums";
 import { checkUserPermission } from "../sharing";
 import { broadcast } from "@/app/_server/ws/broadcast";
@@ -75,7 +76,7 @@ export const createBulkItems = async (
       createdAt: now,
       lastModifiedBy: currentUser,
       lastModifiedAt: now,
-      ...(list.type === "task" && {
+      ...(isKanbanType(list.type) && {
         status: TaskStatus.TODO,
         timeEntries: [],
         history: [
diff --git a/app/_server/actions/checklist-item/crud.ts b/app/_server/actions/checklist-item/crud.ts
index 9b0c9b98..e45592a2 100644
--- a/app/_server/actions/checklist-item/crud.ts
+++ b/app/_server/actions/checklist-item/crud.ts
@@ -14,12 +14,15 @@ import {
 } from "@/app/_server/actions/checklist";
 import {
   listToMarkdown,
-  areAllItemsCompleted
+  areAllItemsCompleted,
 } from "@/app/_utils/checklist-utils";
-import { extractHashtagsFromContent, normalizeTag } from "@/app/_utils/tag-utils";
+import {
+  extractHashtagsFromContent,
+  normalizeTag,
+} from "@/app/_utils/tag-utils";
 import { isAdmin, getUsername } from "@/app/_server/actions/users";
 import { CHECKLISTS_FOLDER } from "@/app/_consts/checklists";
-import { Checklist, Result } from "@/app/_types";
+import { Checklist, Item, KanbanPriority, Result } from "@/app/_types";
 import {
   ItemTypes,
   Modes,
@@ -28,17 +31,19 @@ import {
 } from "@/app/_types/enums";
 import { checkUserPermission } from "../sharing";
 import { broadcast } from "@/app/_server/ws/broadcast";
+import { updateAllChildren } from "@/app/_utils/item-tree-utils";
+import { isKanbanType } from "@/app/_types/enums";
 
 export const updateItem = async (
   checklist: Checklist,
   formData: FormData,
   username?: string,
-  skipRevalidation = false
+  skipRevalidation = false,
 ): Promise<Result<Checklist>> => {
   try {
     const listId = formData.get("listId") as string;
     const itemId = formData.get("itemId") as string;
-    const completed = formData.get("completed") === "true";
+    const completedRaw = formData.get("completed");
     const text = formData.get("text") as string;
     const description = formData.get("description") as string;
     const category = formData.get("category") as string;
@@ -50,88 +55,70 @@ export const updateItem = async (
       category || "Uncategorized",
       ItemTypes.CHECKLIST,
       currentUser,
-      PermissionTypes.EDIT
+      PermissionTypes.EDIT,
     );
 
     if (!canEdit) {
       throw new Error("Permission denied");
     }
 
-    const updateAllChildren = (items: any[], completed: boolean): any[] => {
-      return items.map((item) => ({
-        ...item,
-        completed,
-        children: item.children
-          ? updateAllChildren(item.children, completed)
-          : undefined,
-      }));
-    };
-
-    const updateParentBasedOnChildren = (parent: any): any => {
-      if (!parent || (parent.children || []).length < 1) {
-        return parent;
-      }
-
-      return {
-        ...parent,
-        completed: areAllItemsCompleted(parent.children)
-      };
+    const _updateParentBasedOnChildren = (parent: Item): Item => {
+      if ((parent.children || []).length < 1) return parent;
+      return { ...parent, completed: areAllItemsCompleted(parent.children!) };
     };
 
-    const findAndUpdateItem = (
-      items: any[],
-      itemId: string,
-      updates: any
-    ): any[] => {
-      return items.map((item) => {
+    const _findAndUpdateItem = (items: Item[], itemId: string, updates: Partial<Item>): Item[] =>
+      items.map((item) => {
         if (item.id === itemId) {
           let updatedItem = { ...item, ...updates };
-
           if (updates.completed && item.children && item.children.length > 0) {
             updatedItem.children = updateAllChildren(item.children, true);
-          } else if (
-            updates.completed === false &&
-            item.children &&
-            item.children.length > 0
-          ) {
+          } else if (updates.completed === false && item.children && item.children.length > 0) {
             updatedItem.children = updateAllChildren(item.children, false);
           }
-
           return updatedItem;
         }
-
         if (item.children && item.children.length > 0) {
-          const updatedChildren = findAndUpdateItem(
-            item.children,
-            itemId,
-            updates
-          );
-          const updatedItem = updateParentBasedOnChildren({
+          return _updateParentBasedOnChildren({
             ...item,
-            children: updatedChildren,
+            children: _findAndUpdateItem(item.children, itemId, updates),
           });
-          return updatedItem;
         }
-
         return item;
       });
-    };
 
     const now = new Date().toISOString();
 
     const textInlineTags = text ? extractHashtagsFromContent(text) : [];
     const existingTags = checklist.tags || [];
     const mergedTags = text
-      ? Array.from(new Set([...existingTags.map(normalizeTag), ...textInlineTags])).filter(Boolean)
+      ? Array.from(
+          new Set([...existingTags.map(normalizeTag), ...textInlineTags]),
+        ).filter(Boolean)
       : existingTags;
 
+    const priority = formData.get("priority") as string | null;
+    const score = formData.get("score") as string | null;
+    const assignee = formData.get("assignee") as string | null;
+    const reminder = formData.get("reminder") as string | null;
+    const targetDate = formData.get("targetDate") as string | null;
+    const estimatedTime = formData.get("estimatedTime") as string | null;
+
     const updatedList = {
       ...checklist,
-      items: findAndUpdateItem(checklist.items, itemId, {
-        completed,
+      items: _findAndUpdateItem(checklist.items, itemId, {
+        ...(completedRaw !== null && { completed: completedRaw === "true" }),
         ...(text && { text }),
         ...(description !== null &&
           description !== undefined && { description }),
+        ...(priority !== null && { priority: (priority || undefined) as KanbanPriority | undefined }),
+        ...(score !== null && { score: score ? parseInt(score) : undefined }),
+        ...(assignee !== null && { assignee: assignee || undefined }),
+        ...(reminder !== null && {
+          reminder: reminder ? JSON.parse(reminder) : undefined,
+        }),
+        ...(targetDate !== null && { targetDate: targetDate || undefined }),
+        ...(estimatedTime !== null && { estimatedTime: estimatedTime ? parseFloat(estimatedTime) : undefined }),
         lastModifiedBy: currentUser,
         lastModifiedAt: now,
       }),
@@ -143,11 +130,11 @@ export const updateItem = async (
       process.cwd(),
       "data",
       CHECKLISTS_FOLDER,
-      checklist.owner!
+      checklist.owner!,
     );
     const categoryDir = path.join(
       ownerDir,
-      checklist.category || "Uncategorized"
+      checklist.category || "Uncategorized",
     );
     await ensureDir(categoryDir);
 
@@ -162,22 +149,27 @@ export const updateItem = async (
       } catch (error) {
         console.warn(
           "Cache revalidation failed, but data was saved successfully:",
-          error
+          error,
         );
       }
     }
 
-    await broadcast({ type: "checklist", action: "updated", entityId: listId, username: currentUser });
+    await broadcast({
+      type: "checklist",
+      action: "updated",
+      entityId: listId,
+      username: currentUser,
+    });
 
     return { success: true, data: updatedList as Checklist };
   } catch (error) {
     console.error(
       "Error updating item:",
-      error instanceof Error ? error.stack : "No stack trace"
+      error instanceof Error ? error.stack : "No stack trace",
     );
     console.error(
       "Error updating item:",
-      error instanceof Error ? error.message : String(error)
+      error instanceof Error ? error.message : String(error),
     );
     return { success: false, error: "Failed to update item" };
   }
@@ -187,7 +179,7 @@ export const createItem = async (
   list: Checklist,
   formData: FormData,
   username?: string,
-  skipRevalidation = false
+  skipRevalidation = false,
 ) => {
   try {
     const listId = formData.get("listId") as string;
@@ -204,7 +196,7 @@ export const createItem = async (
       category || "Uncategorized",
       ItemTypes.CHECKLIST,
       currentUser,
-      PermissionTypes.EDIT
+      PermissionTypes.EDIT,
     );
 
     if (!canEdit) {
@@ -229,12 +221,11 @@ export const createItem = async (
         recurrence = JSON.parse(recurrenceStr);
 
         if (recurrence && !recurrence.nextDue) {
-          const { calculateNextOccurrence } = await import(
-            "@/app/_utils/recurrence-utils"
-          );
+          const { calculateNextOccurrence } =
+            await import("@/app/_utils/recurrence-utils");
           recurrence.nextDue = calculateNextOccurrence(
             recurrence.rrule,
-            recurrence.dtstart
+            recurrence.dtstart,
           );
         }
       } catch (e) {
@@ -248,7 +239,7 @@ export const createItem = async (
 
       if (list.statuses && list.statuses.length > 0) {
         const sortedStatuses = [...list.statuses].sort(
-          (a, b) => a.order - b.order
+          (a, b) => a.order - b.order,
         );
         return sortedStatuses[0].id as TaskStatus;
       }
@@ -256,7 +247,16 @@ export const createItem = async (
       return TaskStatus.TODO;
     };
 
-    const defaultStatus = list.type === "task" ? getDefaultStatus() : undefined;
+    const defaultStatus = isKanbanType(list.type)
+      ? getDefaultStatus()
+      : undefined;
+
+    let isSharedBoard = false;
+    if (isKanbanType(list.type)) {
+      const { getUsersWithAccess } = await import("@/app/_server/actions/sharing");
+      const sharedUsers = await getUsersWithAccess(listId, list.uuid);
+      isSharedBoard = sharedUsers.length > 0;
+    }
 
     const shiftedItems = list.items.map((item) => ({
       ...item,
@@ -273,25 +273,26 @@ export const createItem = async (
       createdAt: now,
       lastModifiedBy: currentUser,
       lastModifiedAt: now,
-      ...(list.type === "task" &&
+      ...(isKanbanType(list.type) &&
         defaultStatus && {
-        status: defaultStatus,
-        timeEntries,
-        history: [
-          {
-            status: defaultStatus,
-            timestamp: now,
-            user: currentUser,
-          },
-        ],
-      }),
+          status: defaultStatus,
+          timeEntries,
+          history: [
+            {
+              status: defaultStatus,
+              timestamp: now,
+              user: currentUser,
+            },
+          ],
+        }),
+      ...(isSharedBoard && { assignee: currentUser }),
       ...(recurrence && { recurrence }),
     };
 
     const inlineTags = extractHashtagsFromContent(text);
     const existingTags = list.tags || [];
     const mergedTags = Array.from(
-      new Set([...existingTags.map(normalizeTag), ...inlineTags])
+      new Set([...existingTags.map(normalizeTag), ...inlineTags]),
     ).filter(Boolean);
 
     const updatedList = {
@@ -305,7 +306,7 @@ export const createItem = async (
       process.cwd(),
       "data",
       CHECKLISTS_FOLDER,
-      list.owner!
+      list.owner!,
     );
     const categoryDir = path.join(ownerDir, list.category || "Uncategorized");
 
@@ -322,25 +323,30 @@ export const createItem = async (
       } catch (error) {
         console.warn(
           "Cache revalidation failed, but data was saved successfully:",
-          error
+          error,
         );
       }
     }
 
-    await broadcast({ type: "checklist", action: "updated", entityId: listId, username: currentUser });
+    await broadcast({
+      type: "checklist",
+      action: "updated",
+      entityId: listId,
+      username: currentUser,
+    });
 
     return { success: true, data: newItem };
   } catch (error) {
     console.error(
       "Error creating item:",
-      error instanceof Error ? error.stack : "No stack trace"
+      error instanceof Error ? error.stack : "No stack trace",
     );
     return { success: false, error: "Failed to create item" };
   }
 };
 
 export const deleteItem = async (
-  formData: FormData
+  formData: FormData,
 ): Promise<Result<Checklist>> => {
   try {
     const listId = formData.get("listId") as string;
@@ -353,7 +359,7 @@ export const deleteItem = async (
     }
 
     const list = lists.data.find(
-      (l) => l.id === listId && (!category || l.category === category)
+      (l) => l.id === listId && (!category || l.category === category),
     );
     if (!list) {
       throw new Error("List not found");
@@ -365,7 +371,7 @@ export const deleteItem = async (
       category || "Uncategorized",
       ItemTypes.CHECKLIST,
       currentUser,
-      PermissionTypes.DELETE
+      PermissionTypes.DELETE,
     );
 
     if (!canDelete) {
@@ -391,11 +397,12 @@ export const deleteItem = async (
           const children = item.children
             ? filterOutItem(item.children, itemId)
             : undefined;
-          const completed = (
+          const completed =
             children && children.length > 0 && areAllItemsCompleted(children)
-          ) ? true : item.completed;
+              ? true
+              : item.completed;
 
-          return {...item, children, completed};
+          return { ...item, children, completed };
         })
         .filter((item) => item.children?.length > 0 || item.id !== undefined);
     };
@@ -418,19 +425,19 @@ export const deleteItem = async (
         process.cwd(),
         "data",
         CHECKLISTS_FOLDER,
-        list.owner!
+        list.owner!,
       );
       filePath = path.join(
         ownerDir,
         list.category || "Uncategorized",
-        `${listId}.md`
+        `${listId}.md`,
       );
     } else {
       const userDir = await getUserModeDir(Modes.CHECKLISTS);
       filePath = path.join(
         userDir,
         list.category || "Uncategorized",
-        `${listId}.md`
+        `${listId}.md`,
       );
     }
 
@@ -442,11 +449,16 @@ export const deleteItem = async (
     } catch (error) {
       console.warn(
         "Cache revalidation failed, but data was saved successfully:",
-        error
+        error,
       );
     }
 
-    await broadcast({ type: "checklist", action: "updated", entityId: listId, username: currentUser });
+    await broadcast({
+      type: "checklist",
+      action: "updated",
+      entityId: listId,
+      username: currentUser,
+    });
 
     return { success: true, data: updatedList as Checklist };
   } catch (error) {
diff --git a/app/_server/actions/checklist-item/status.ts b/app/_server/actions/checklist-item/status.ts
index 8e77447a..ebc93917 100644
--- a/app/_server/actions/checklist-item/status.ts
+++ b/app/_server/actions/checklist-item/status.ts
@@ -19,6 +19,45 @@ import {
 } from "@/app/_types/enums";
 import { checkUserPermission } from "../sharing";
 import { broadcast } from "@/app/_server/ws/broadcast";
+import { updateItem, updateAllChildren } from "@/app/_utils/item-tree-utils";
+import { KanbanStatus, Item } from "@/app/_types";
+
+const _findParent = (items: Item[], childId: string): Item | null => {
+  for (const item of items) {
+    if (item.children?.some((c) => c.id === childId)) return item;
+    if (item.children) {
+      const found = _findParent(item.children, childId);
+      if (found) return found;
+    }
+  }
+  return null;
+};
+
+const _autoCompleteParent = (
+  items: Item[],
+  childId: string,
+  statuses: KanbanStatus[] | undefined,
+  username: string,
+  now: string
+): Item[] => {
+  const parent = _findParent(items, childId);
+  if (!parent || !parent.children) return items;
+
+  const allChildrenCompleted = parent.children.every((c) => c.completed);
+  if (!allChildrenCompleted) return items;
+
+  const autoCompleteStatus = statuses?.find((s) => s.autoComplete);
+  if (!autoCompleteStatus) return items;
+
+  return updateItem(items, parent.id, (p) => ({
+    ...p,
+    completed: true,
+    status: autoCompleteStatus.id,
+    lastModifiedBy: username,
+    lastModifiedAt: now,
+    history: [...(p.history || []), { status: autoCompleteStatus.id, timestamp: now, user: username }],
+  }));
+};
 
 export const updateItemStatus = async (
   formData: FormData,
@@ -65,93 +104,53 @@ export const updateItemStatus = async (
 
     const now = new Date().toISOString();
 
-    const updateAllChildren = (
-      items: any[],
-      completed: boolean,
-      username: string,
-      now: string
-    ): any[] => {
-      return items.map((item) => ({
-        ...item,
-        completed,
-        lastModifiedBy: username,
-        lastModifiedAt: now,
-        children: item.children
-          ? updateAllChildren(item.children, completed, username, now)
-          : undefined,
-      }));
-    };
+    const updatedItems = updateItem(list.items, itemId, (item) => {
+      const updates: Partial<typeof item> & { history?: typeof item.history; timeEntries?: typeof item.timeEntries } = {};
 
-    const findAndUpdateItemStatus = (items: any[], itemId: string): any[] => {
-      return items.map((item) => {
-        if (item.id === itemId) {
-          const updates: any = {};
-          if (status) {
-            updates.status = status;
-            updates.lastModifiedBy = username;
-            updates.lastModifiedAt = now;
-
-            const targetStatus = list.statuses?.find((s) => s.id === status);
-            if (targetStatus?.autoComplete) {
-              updates.completed = true;
-              if (item.children && item.children.length > 0) {
-                updates.children = updateAllChildren(
-                  item.children,
-                  true,
-                  username,
-                  now
-                );
-              }
-            } else if (item.completed && status !== item.status) {
-              updates.completed = false;
-              if (item.children && item.children.length > 0) {
-                updates.children = updateAllChildren(
-                  item.children,
-                  false,
-                  username,
-                  now
-                );
-              }
-            }
-
-            if (status !== item.status) {
-              const history = item.history || [];
-              history.push({
-                status,
-                timestamp: now,
-                user: username,
-              });
-              updates.history = history;
-            }
-          }
-          if (timeEntriesStr) {
-            try {
-              const timeEntries = JSON.parse(timeEntriesStr);
-              updates.timeEntries = timeEntries.map((entry: any) => ({
-                ...entry,
-                user: entry.user || username,
-              }));
-            } catch (e) {
-              console.error("Failed to parse timeEntries:", e);
-            }
+      if (status) {
+        updates.status = status;
+        updates.lastModifiedBy = username;
+        updates.lastModifiedAt = now;
+
+        const targetStatus = list.statuses?.find((s) => s.id === status);
+        if (targetStatus?.autoComplete) {
+          updates.completed = true;
+          if (item.children && item.children.length > 0) {
+            updates.children = updateAllChildren(item.children, true, username, now);
           }
-          return { ...item, ...updates };
+        } else if (item.completed && status !== item.status) {
+          updates.completed = false;
         }
 
-        if (item.children && item.children.length > 0) {
-          return {
-            ...item,
-            children: findAndUpdateItemStatus(item.children, itemId),
-          };
+        if (status !== item.status) {
+          const history = [...(item.history || [])];
+          history.push({ status, timestamp: now, user: username });
+          updates.history = history;
+        }
+      }
+
+      if (timeEntriesStr) {
+        try {
+          const timeEntries = JSON.parse(timeEntriesStr);
+          updates.timeEntries = timeEntries.map((entry: { user?: string }) => ({
+            ...entry,
+            user: entry.user || username,
+          }));
+        } catch (e) {
+          console.error("Failed to parse timeEntries:", e);
         }
+      }
 
-        return item;
-      });
-    };
+      return { ...item, ...updates };
+    });
+
+    const itemsWithParentAutoComplete = _autoCompleteParent(
+      updatedItems, itemId, list.statuses, username, now
+    );
 
     const updatedList = {
       ...list,
-      items: findAndUpdateItemStatus(list.items, itemId),
+      items: itemsWithParentAutoComplete,
       updatedAt: now,
     };
 
diff --git a/app/_server/actions/checklist-item/sub-items.ts b/app/_server/actions/checklist-item/sub-items.ts
index c8c7251a..0795b95c 100644
--- a/app/_server/actions/checklist-item/sub-items.ts
+++ b/app/_server/actions/checklist-item/sub-items.ts
@@ -18,6 +18,7 @@ import {
   ItemTypes,
   PermissionTypes,
   TaskStatus,
+  isKanbanType,
 } from "@/app/_types/enums";
 import { checkUserPermission } from "../sharing";
 import { broadcast } from "@/app/_server/ws/broadcast";
@@ -94,7 +95,7 @@ export const createSubItem = async (
       lastModifiedAt: now,
     };
 
-    if (list.type === "task") {
+    if (isKanbanType(list.type)) {
       newSubItem.status = TaskStatus.TODO;
       newSubItem.timeEntries = [];
       newSubItem.history = [
diff --git a/app/_server/actions/checklist/converters.ts b/app/_server/actions/checklist/converters.ts
index 44a912dd..dca85830 100644
--- a/app/_server/actions/checklist/converters.ts
+++ b/app/_server/actions/checklist/converters.ts
@@ -8,6 +8,7 @@ import {
   Modes,
   PermissionTypes,
   TaskStatus,
+  isKanbanType,
 } from "@/app/_types/enums";
 import { getCurrentUser } from "@/app/_server/actions/users";
 import { getUserModeDir, serverWriteFile } from "@/app/_server/actions/file";
@@ -74,14 +75,35 @@ export const convertChecklistType = async (formData: FormData) => {
 
     let convertedItems: any[];
 
-    if (newType === "task") {
-      convertedItems = (list.items || []).map((item) => ({
-        ...item,
-        status:
-          item.status ||
-          (item.completed ? TaskStatus.COMPLETED : TaskStatus.TODO),
-        timeEntries: item.timeEntries || [],
-      }));
+    if (isKanbanType(newType)) {
+      const statuses = list.statuses || [];
+      const completionStatus =
+        statuses.find((s) => s.autoComplete) ||
+        statuses.find((s) => s.id === TaskStatus.COMPLETED);
+      const completionStatusId = completionStatus?.id || TaskStatus.COMPLETED;
+      const sortedStatuses = [...statuses].sort((a, b) => a.order - b.order);
+      const firstStatusId = sortedStatuses[0]?.id || TaskStatus.TODO;
+
+      convertedItems = (list.items || []).map((item) => {
+        let status = item.status;
+        if (!status) {
+          status = item.completed ? completionStatusId : firstStatusId;
+        } else if (
+          statuses.length > 0 &&
+          !statuses.some((s) => s.id === status)
+        ) {
+          status = item.completed ? completionStatusId : firstStatusId;
+        }
+        return {
+          ...item,
+          status,
+          completed:
+            item.completed ||
+            (completionStatus?.autoComplete && status === completionStatusId) ||
+            false,
+          timeEntries: item.timeEntries || [],
+        };
+      });
     } else {
       convertedItems = (list.items || []).map((item) => ({
         ...item,
@@ -100,6 +122,8 @@ export const convertChecklistType = async (formData: FormData) => {
       type: newType,
       items: convertedItems as Item[],
       updatedAt: new Date().toISOString(),
+      ...(list.statuses && { statuses: list.statuses }),
+      ...(list.tags && { tags: list.tags }),
     };
 
     await serverWriteFile(filePath, listToMarkdown(updatedList));
diff --git a/app/_server/actions/checklist/parsers.ts b/app/_server/actions/checklist/parsers.ts
index 62d84534..9a941523 100644
--- a/app/_server/actions/checklist/parsers.ts
+++ b/app/_server/actions/checklist/parsers.ts
@@ -9,8 +9,8 @@ import {
 } from "@/app/_utils/recurrence-utils";
 
 export const getChecklistType = (content: string): ChecklistType => {
-  if (content.includes("checklistType: task")) {
-    return "task";
+  if (content.includes("checklistType: task") || content.includes("checklistType: kanban")) {
+    return "kanban";
   }
 
   return "simple";
diff --git a/app/_server/actions/checklist/queries.ts b/app/_server/actions/checklist/queries.ts
index be51fbac..b5c5bb5d 100644
--- a/app/_server/actions/checklist/queries.ts
+++ b/app/_server/actions/checklist/queries.ts
@@ -325,8 +325,8 @@ export const getListById = async (
       await import("@/app/_server/actions/sharing");
     const sharedData = await getAllSharedItemsForUser(username);
     for (const sharedItem of sharedData.checklists) {
-      const itemIdentifier = sharedItem.uuid || sharedItem.id;
-      if (!itemIdentifier) continue;
+      if (!sharedItem.uuid && !sharedItem.id) continue;
+      if (sharedItem.uuid !== id && sharedItem.id !== id) continue;
 
       const sharerDir = path.join(
         process.cwd(),
diff --git a/app/_server/actions/checklist/readers.ts b/app/_server/actions/checklist/readers.ts
index d6f54662..60ab2390 100644
--- a/app/_server/actions/checklist/readers.ts
+++ b/app/_server/actions/checklist/readers.ts
@@ -23,6 +23,7 @@ import { grepExtractFrontmatter } from "@/app/_utils/grep-utils";
 import type { FileStatsEntry } from "@/app/_server/actions/file";
 import { getChecklistType } from "./parsers";
 import { isDebugFlag } from "@/app/_utils/env-utils";
+import { isKanbanType } from "@/app/_types/enums";
 
 const execAsync = promisify(exec);
 
@@ -70,7 +71,10 @@ export const readListsRecursively = async (
       });
       const metaLines = metaOut.stdout.split("\n").filter(Boolean);
       if (debugCrud && metaLines.length) {
-        console.warn("[tags grep] sample (first 40 lines):", metaLines.slice(0, 40));
+        console.warn(
+          "[tags grep] sample (first 40 lines):",
+          metaLines.slice(0, 40),
+        );
       }
       const inFrontmatter = new Map<string, boolean>();
       let inTagsFile = "";
@@ -81,7 +85,13 @@ export const readListsRecursively = async (
         const rest = line.slice(colonIdx + 1);
         if (rest.trim() === "---") {
           inFrontmatter.set(filePath, !inFrontmatter.get(filePath));
-          if (debugCrud) console.warn("[tags grep] --- seen, filePath:", filePath, "inFrontmatter:", inFrontmatter.get(filePath));
+          if (debugCrud)
+            console.warn(
+              "[tags grep] --- seen, filePath:",
+              filePath,
+              "inFrontmatter:",
+              inFrontmatter.get(filePath),
+            );
           continue;
         }
         if (!inFrontmatter.get(filePath)) continue;
@@ -89,7 +99,13 @@ export const readListsRecursively = async (
           if (inTagsFile === filePath) {
             const tag = rest.replace(/^\s+-\s+/, "").trim();
             if (tag) {
-              if (debugCrud) console.warn("[tags grep] adding tag:", JSON.stringify(tag.slice(0, 50)), "filePath:", filePath);
+              if (debugCrud)
+                console.warn(
+                  "[tags grep] adding tag:",
+                  JSON.stringify(tag.slice(0, 50)),
+                  "filePath:",
+                  filePath,
+                );
               if (!metadataCache!.has(filePath))
                 metadataCache!.set(filePath, {});
               const entry = metadataCache!.get(filePath)!;
@@ -187,11 +203,9 @@ export const readListsRecursively = async (
               uuid:
                 typeof metadata?.uuid === "string" ? metadata.uuid : undefined,
               title: typeof metadata?.title === "string" ? metadata.title : id,
-              type:
-                metadata?.checklistType === "task" ||
-                metadata?.checklistType === "simple"
-                  ? metadata.checklistType
-                  : "simple",
+              type: isKanbanType(metadata?.checklistType as string)
+                ? "kanban"
+                : "simple",
               category: categoryPath,
               items: [],
               createdAt: toIso(stats.birthtime),
diff --git a/app/_server/actions/kanban/calendar.ts b/app/_server/actions/kanban/calendar.ts
new file mode 100644
index 00000000..b0b51d6e
--- /dev/null
+++ b/app/_server/actions/kanban/calendar.ts
@@ -0,0 +1,36 @@
+"use server";
+
+import { getFormData } from "@/app/_utils/global-utils";
+import { getListById } from "@/app/_server/actions/checklist";
+import { generateICS } from "@/app/_utils/kanban/calendar-utils";
+import { parseItemsForCalendar, CalendarEvent } from "@/app/_utils/kanban/calendar-utils";
+
+export const exportBoardAsICS = async (formData: FormData) => {
+  try {
+    const { listId, category } = getFormData(formData, ["listId", "category"]);
+
+    const list = await getListById(listId, undefined, category);
+    if (!list) return { error: "Board not found" };
+
+    const icsContent = generateICS(list.items, list.title);
+    return { success: true, data: icsContent };
+  } catch (error) {
+    console.error("Error exporting calendar:", error);
+    return { error: "Failed to export calendar" };
+  }
+};
+
+export const getCalendarEvents = async (formData: FormData) => {
+  try {
+    const { listId, category } = getFormData(formData, ["listId", "category"]);
+
+    const list = await getListById(listId, undefined, category);
+    if (!list) return { error: "Board not found" };
+
+    const events: CalendarEvent[] = parseItemsForCalendar(list.items);
+    return { success: true, data: events };
+  } catch (error) {
+    console.error("Error fetching calendar events:", error);
+    return { error: "Failed to fetch calendar events" };
+  }
+};
diff --git a/app/_server/actions/kanban/index.ts b/app/_server/actions/kanban/index.ts
new file mode 100644
index 00000000..351d91b8
--- /dev/null
+++ b/app/_server/actions/kanban/index.ts
@@ -0,0 +1,25 @@
+export {
+  updateKanbanItemPriority,
+  updateKanbanItemScore,
+  assignKanbanItem,
+  setKanbanItemReminder,
+  markReminderNotified,
+} from "./items";
+
+export {
+  exportBoardAsICS,
+  getCalendarEvents,
+} from "./calendar";
+
+export {
+  editTimeEntry,
+  deleteTimeEntry,
+} from "./time-entries";
+
+export {
+  searchKanbanItems,
+} from "./search";
+
+export {
+  getTempoData,
+} from "./tempo";
diff --git a/app/_server/actions/kanban/items.ts b/app/_server/actions/kanban/items.ts
new file mode 100644
index 00000000..3d634ad9
--- /dev/null
+++ b/app/_server/actions/kanban/items.ts
@@ -0,0 +1,246 @@
+"use server";
+
+import path from "path";
+import { Checklist, KanbanPriority, KanbanReminder } from "@/app/_types";
+import { CHECKLISTS_FOLDER } from "@/app/_consts/checklists";
+import { ItemTypes, Modes, PermissionTypes } from "@/app/_types/enums";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { getUserModeDir, serverWriteFile } from "@/app/_server/actions/file";
+import { revalidatePath } from "next/cache";
+import { listToMarkdown } from "@/app/_utils/checklist-utils";
+import { getFormData } from "@/app/_utils/global-utils";
+import { checkUserPermission } from "@/app/_server/actions/sharing";
+import { broadcast } from "@/app/_server/ws/broadcast";
+import { getListById } from "@/app/_server/actions/checklist";
+import { createNotificationForUser } from "@/app/_server/actions/notifications";
+import { findItem, updateItem } from "@/app/_utils/item-tree-utils";
+
+const _getFilePath = async (list: Checklist): Promise<string> => {
+  const categoryDir = list.category || "Uncategorized";
+  const filename = `${list.id}.md`;
+
+  if (list.owner) {
+    return path.join(
+      process.cwd(), "data", CHECKLISTS_FOLDER, list.owner, categoryDir, filename
+    );
+  }
+
+  const userDir = await getUserModeDir(Modes.CHECKLISTS);
+  return path.join(userDir, categoryDir, filename);
+};
+
+async function _saveAndBroadcast(list: Checklist, username: string) {
+  const filePath = await _getFilePath(list);
+  await serverWriteFile(filePath, listToMarkdown(list));
+
+  await broadcast({
+    type: "checklist",
+    action: "updated",
+    entityId: list.uuid || list.id,
+    username,
+  });
+
+  try {
+    revalidatePath("/");
+  } catch { }
+}
+
+export const updateKanbanItemPriority = async (formData: FormData) => {
+  try {
+    const { listId, itemId, priority, category } = getFormData(formData, [
+      "listId", "itemId", "priority", "category",
+    ]);
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const canEdit = await checkUserPermission(
+      list.uuid || listId, category, ItemTypes.CHECKLIST, currentUser.username, PermissionTypes.EDIT
+    );
+    if (!canEdit) return { error: "Permission denied" };
+
+    const now = new Date().toISOString();
+    const updatedList: Checklist = {
+      ...list,
+      items: updateItem(list.items, itemId, (item) => ({
+        ...item,
+        priority: priority as KanbanPriority,
+        lastModifiedBy: currentUser.username,
+        lastModifiedAt: now,
+      })),
+      updatedAt: now,
+    };
+
+    await _saveAndBroadcast(updatedList, currentUser.username);
+    return { success: true, data: updatedList };
+  } catch (error) {
+    console.error("Error updating priority:", error);
+    return { error: "Failed to update priority" };
+  }
+};
+
+export const updateKanbanItemScore = async (formData: FormData) => {
+  try {
+    const { listId, itemId, score, category } = getFormData(formData, [
+      "listId", "itemId", "score", "category",
+    ]);
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const canEdit = await checkUserPermission(
+      list.uuid || listId, category, ItemTypes.CHECKLIST, currentUser.username, PermissionTypes.EDIT
+    );
+    if (!canEdit) return { error: "Permission denied" };
+
+    const now = new Date().toISOString();
+    const updatedList: Checklist = {
+      ...list,
+      items: updateItem(list.items, itemId, (item) => ({
+        ...item,
+        score: parseInt(score),
+        lastModifiedBy: currentUser.username,
+        lastModifiedAt: now,
+      })),
+      updatedAt: now,
+    };
+
+    await _saveAndBroadcast(updatedList, currentUser.username);
+    return { success: true, data: updatedList };
+  } catch (error) {
+    console.error("Error updating score:", error);
+    return { error: "Failed to update score" };
+  }
+};
+
+export const assignKanbanItem = async (formData: FormData) => {
+  try {
+    const { listId, itemId, assignee, category } = getFormData(formData, [
+      "listId", "itemId", "assignee", "category",
+    ]);
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const canEdit = await checkUserPermission(
+      list.uuid || listId, category, ItemTypes.CHECKLIST, currentUser.username, PermissionTypes.EDIT
+    );
+    if (!canEdit) return { error: "Permission denied" };
+
+    const now = new Date().toISOString();
+    const updatedList: Checklist = {
+      ...list,
+      items: updateItem(list.items, itemId, (item) => ({
+        ...item,
+        assignee: assignee || undefined,
+        lastModifiedBy: currentUser.username,
+        lastModifiedAt: now,
+      })),
+      updatedAt: now,
+    };
+
+    await _saveAndBroadcast(updatedList, currentUser.username);
+
+    if (assignee && assignee !== currentUser.username) {
+      const assignedItem = findItem(updatedList.items, itemId);
+      await createNotificationForUser(assignee, {
+        type: "assignment",
+        title: assignedItem?.text || "New task assigned",
+        message: `${currentUser.username} assigned you to a task in "${updatedList.title}"`,
+        data: { itemId: updatedList.uuid || listId, itemType: "checklist", taskId: itemId },
+      });
+    }
+
+    return { success: true, data: updatedList };
+  } catch (error) {
+    console.error("Error assigning item:", error);
+    return { error: "Failed to assign item" };
+  }
+};
+
+export const setKanbanItemReminder = async (formData: FormData) => {
+  try {
+    const { listId, itemId, reminder: reminderStr, category } = getFormData(formData, [
+      "listId", "itemId", "reminder", "category",
+    ]);
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const canEdit = await checkUserPermission(
+      list.uuid || listId, category, ItemTypes.CHECKLIST, currentUser.username, PermissionTypes.EDIT
+    );
+    if (!canEdit) return { error: "Permission denied" };
+
+    let reminder: KanbanReminder | undefined;
+    if (reminderStr) {
+      try {
+        reminder = JSON.parse(reminderStr);
+      } catch {
+        reminder = { datetime: reminderStr };
+      }
+    }
+
+    const now = new Date().toISOString();
+    const updatedList: Checklist = {
+      ...list,
+      items: updateItem(list.items, itemId, (item) => ({
+        ...item,
+        reminder,
+        lastModifiedBy: currentUser.username,
+        lastModifiedAt: now,
+      })),
+      updatedAt: now,
+    };
+
+    await _saveAndBroadcast(updatedList, currentUser.username);
+    return { success: true, data: updatedList };
+  } catch (error) {
+    console.error("Error setting reminder:", error);
+    return { error: "Failed to set reminder" };
+  }
+};
+
+export const markReminderNotified = async (formData: FormData) => {
+  try {
+    const { listId, itemId, category } = getFormData(formData, [
+      "listId", "itemId", "category",
+    ]);
+
+    const list = await getListById(listId, undefined, category);
+    if (!list) return { error: "List not found" };
+
+    const updatedList: Checklist = {
+      ...list,
+      items: updateItem(list.items, itemId, (item) => ({
+        ...item,
+        reminder: item.reminder
+          ? { ...item.reminder, notified: true }
+          : undefined,
+      })),
+      updatedAt: new Date().toISOString(),
+    };
+
+    await _saveAndBroadcast(updatedList, list.owner || "");
+    return { success: true, data: updatedList };
+  } catch (error) {
+    console.error("Error marking reminder:", error);
+    return { error: "Failed to mark reminder" };
+  }
+};
diff --git a/app/_server/actions/kanban/search.ts b/app/_server/actions/kanban/search.ts
new file mode 100644
index 00000000..791e03f9
--- /dev/null
+++ b/app/_server/actions/kanban/search.ts
@@ -0,0 +1,75 @@
+"use server";
+
+import { Checklist, Item, KanbanPriority } from "@/app/_types";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { getListById } from "@/app/_server/actions/checklist";
+import { getFormData } from "@/app/_utils/global-utils";
+
+const _matchesText = (item: Item, query: string): boolean => {
+  const lower = query.toLowerCase();
+  return (
+    item.text.toLowerCase().includes(lower) ||
+    (item.description?.toLowerCase().includes(lower) ?? false)
+  );
+};
+
+const _matchesPriority = (item: Item, priority: KanbanPriority): boolean =>
+  item.priority === priority;
+
+const _matchesAssignee = (item: Item, assignee: string): boolean =>
+  item.assignee === assignee;
+
+const _filterItems = (
+  items: Item[],
+  query?: string,
+  priority?: KanbanPriority,
+  assignee?: string
+): Item[] =>
+  items.reduce<Item[]>((acc, item) => {
+    const childMatches = item.children
+      ? _filterItems(item.children, query, priority, assignee)
+      : [];
+
+    const selfMatches =
+      (!query || _matchesText(item, query)) &&
+      (!priority || _matchesPriority(item, priority)) &&
+      (!assignee || _matchesAssignee(item, assignee));
+
+    if (selfMatches || childMatches.length > 0) {
+      acc.push({
+        ...item,
+        children: selfMatches ? item.children : childMatches,
+      });
+    }
+
+    return acc;
+  }, []);
+
+export const searchKanbanItems = async (formData: FormData) => {
+  try {
+    const { listId, category } = getFormData(formData, ["listId", "category"]);
+    const query = formData.get("query") as string | null;
+    const priority = formData.get("priority") as KanbanPriority | null;
+    const assignee = formData.get("assignee") as string | null;
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const filtered = _filterItems(
+      list.items,
+      query || undefined,
+      priority || undefined,
+      assignee || undefined,
+    );
+
+    return { success: true, data: filtered };
+  } catch (error) {
+    console.error("Error searching kanban items:", error);
+    return { error: "Failed to search items" };
+  }
+};
diff --git a/app/_server/actions/kanban/tempo.ts b/app/_server/actions/kanban/tempo.ts
new file mode 100644
index 00000000..6ddbb772
--- /dev/null
+++ b/app/_server/actions/kanban/tempo.ts
@@ -0,0 +1,100 @@
+"use server";
+
+import { Item, TimeEntry } from "@/app/_types";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { getListById } from "@/app/_server/actions/checklist";
+import { getFormData } from "@/app/_utils/global-utils";
+
+interface TempoData {
+  itemId: string;
+  itemText: string;
+  entries: Record<string, { totalMinutes: number; entries: TimeEntry[] }>;
+}
+
+const _isWithinRange = (
+  entryTime: string,
+  startDate: string,
+  endDate: string
+): boolean => {
+  const t = new Date(entryTime).getTime();
+  return t >= new Date(startDate).getTime() && t <= new Date(endDate).getTime();
+};
+
+const _getDateKey = (isoString: string): string =>
+  new Date(isoString).toISOString().split("T")[0];
+
+const _getEntryMinutes = (entry: TimeEntry): number => {
+  if (entry.duration) return entry.duration;
+  if (entry.startTime && entry.endTime) {
+    return Math.round(
+      (new Date(entry.endTime).getTime() - new Date(entry.startTime).getTime()) / 60000
+    );
+  }
+  return 0;
+};
+
+const _collectItems = (items: Item[]): Item[] =>
+  items.reduce<Item[]>((acc, item) => {
+    acc.push(item);
+    if (item.children) {
+      acc.push(..._collectItems(item.children));
+    }
+    return acc;
+  }, []);
+
+const _aggregateForItem = (
+  item: Item,
+  startDate: string,
+  endDate: string
+): TempoData | null => {
+  const matching = (item.timeEntries || []).filter((e) =>
+    _isWithinRange(e.startTime, startDate, endDate)
+  );
+
+  if (matching.length === 0) return null;
+
+  const entries = matching.reduce<
+    Record<string, { totalMinutes: number; entries: TimeEntry[] }>
+  >((acc, entry) => {
+    const key = _getDateKey(entry.startTime);
+    if (!acc[key]) {
+      acc[key] = { totalMinutes: 0, entries: [] };
+    }
+    acc[key].totalMinutes += _getEntryMinutes(entry);
+    acc[key].entries.push(entry);
+    return acc;
+  }, {});
+
+  return { itemId: item.id, itemText: item.text, entries };
+};
+
+export const getTempoData = async (formData: FormData) => {
+  try {
+    const { listId, category } = getFormData(formData, ["listId", "category"]);
+    const startDate = formData.get("startDate") as string;
+    const endDate = formData.get("endDate") as string;
+
+    if (!startDate || !endDate) return { error: "Start and end dates are required" };
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const allItems = _collectItems(list.items);
+
+    const data = allItems.reduce<TempoData[]>((acc, item) => {
+      const result = _aggregateForItem(item, startDate, endDate);
+      if (result) acc.push(result);
+      return acc;
+    }, []);
+
+    return { success: true, data };
+  } catch (error) {
+    console.error("Error fetching tempo data:", error);
+    return { error: "Failed to fetch tempo data" };
+  }
+};
diff --git a/app/_server/actions/kanban/time-entries.ts b/app/_server/actions/kanban/time-entries.ts
new file mode 100644
index 00000000..08ed17fc
--- /dev/null
+++ b/app/_server/actions/kanban/time-entries.ts
@@ -0,0 +1,144 @@
+"use server";
+
+import { Checklist, TimeEntry } from "@/app/_types";
+import { ItemTypes, PermissionTypes } from "@/app/_types/enums";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { getListById } from "@/app/_server/actions/checklist";
+import { checkUserPermission } from "@/app/_server/actions/sharing";
+import { getFormData } from "@/app/_utils/global-utils";
+import { updateItem, findItem } from "@/app/_utils/item-tree-utils";
+import path from "path";
+import { CHECKLISTS_FOLDER } from "@/app/_consts/checklists";
+import { getUserModeDir, serverWriteFile } from "@/app/_server/actions/file";
+import { listToMarkdown } from "@/app/_utils/checklist-utils";
+import { Modes } from "@/app/_types/enums";
+import { revalidatePath } from "next/cache";
+import { broadcast } from "@/app/_server/ws/broadcast";
+
+const _getFilePath = async (list: Checklist): Promise<string> => {
+  const categoryDir = list.category || "Uncategorized";
+  const filename = `${list.id}.md`;
+
+  if (list.owner) {
+    return path.join(
+      process.cwd(), "data", CHECKLISTS_FOLDER, list.owner, categoryDir, filename
+    );
+  }
+
+  const userDir = await getUserModeDir(Modes.CHECKLISTS);
+  return path.join(userDir, categoryDir, filename);
+};
+
+async function _saveAndBroadcast(list: Checklist, username: string) {
+  const filePath = await _getFilePath(list);
+  await serverWriteFile(filePath, listToMarkdown(list));
+
+  await broadcast({
+    type: "checklist",
+    action: "updated",
+    entityId: list.uuid || list.id,
+    username,
+  });
+
+  try {
+    revalidatePath("/");
+  } catch {}
+}
+
+export const editTimeEntry = async (formData: FormData) => {
+  try {
+    const { listId, itemId, entryId, category } = getFormData(formData, [
+      "listId", "itemId", "entryId", "category",
+    ]);
+
+    const startTime = formData.get("startTime") as string;
+    const endTime = formData.get("endTime") as string;
+    const duration = formData.get("duration") as string;
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const canEdit = await checkUserPermission(
+      list.uuid || listId, category, ItemTypes.CHECKLIST, currentUser.username, PermissionTypes.EDIT
+    );
+    if (!canEdit) return { error: "Permission denied" };
+
+    const existingItem = findItem(list.items, itemId);
+    if (!existingItem) return { error: "Item not found" };
+
+    const entryIndex = existingItem.timeEntries?.findIndex((e) => e.id === entryId);
+    if (entryIndex === undefined || entryIndex === -1) return { error: "Time entry not found" };
+
+    const now = new Date().toISOString();
+    const updatedList: Checklist = {
+      ...list,
+      items: updateItem(list.items, itemId, (item) => ({
+        ...item,
+        timeEntries: (item.timeEntries || []).map((entry) => {
+          if (entry.id !== entryId) return entry;
+          const updated: TimeEntry = { ...entry };
+          if (startTime) updated.startTime = startTime;
+          if (endTime) updated.endTime = endTime;
+          if (duration) updated.duration = parseInt(duration);
+          return updated;
+        }),
+        lastModifiedBy: currentUser.username,
+        lastModifiedAt: now,
+      })),
+      updatedAt: now,
+    };
+
+    await _saveAndBroadcast(updatedList, currentUser.username);
+    return { success: true, data: updatedList };
+  } catch (error) {
+    console.error("Error editing time entry:", error);
+    return { error: "Failed to edit time entry" };
+  }
+};
+
+export const deleteTimeEntry = async (formData: FormData) => {
+  try {
+    const { listId, itemId, entryId, category } = getFormData(formData, [
+      "listId", "itemId", "entryId", "category",
+    ]);
+
+    const [currentUser, list] = await Promise.all([
+      getCurrentUser(),
+      getListById(listId, undefined, category),
+    ]);
+
+    if (!currentUser) return { error: "Not authenticated" };
+    if (!list) return { error: "List not found" };
+
+    const canEdit = await checkUserPermission(
+      list.uuid || listId, category, ItemTypes.CHECKLIST, currentUser.username, PermissionTypes.EDIT
+    );
+    if (!canEdit) return { error: "Permission denied" };
+
+    const existingItem = findItem(list.items, itemId);
+    if (!existingItem) return { error: "Item not found" };
+
+    const now = new Date().toISOString();
+    const updatedList: Checklist = {
+      ...list,
+      items: updateItem(list.items, itemId, (item) => ({
+        ...item,
+        timeEntries: (item.timeEntries || []).filter((entry) => entry.id !== entryId),
+        lastModifiedBy: currentUser.username,
+        lastModifiedAt: now,
+      })),
+      updatedAt: now,
+    };
+
+    await _saveAndBroadcast(updatedList, currentUser.username);
+    return { success: true, data: updatedList };
+  } catch (error) {
+    console.error("Error deleting time entry:", error);
+    return { error: "Failed to delete time entry" };
+  }
+};
diff --git a/app/_server/actions/note/queries.ts b/app/_server/actions/note/queries.ts
index 70a073c7..b1b7628c 100644
--- a/app/_server/actions/note/queries.ts
+++ b/app/_server/actions/note/queries.ts
@@ -57,6 +57,8 @@ export const getNoteById = async (
   const { grepFindFileByUuid } = await import("@/app/_utils/grep-utils");
   const { serverReadFile } = await import("@/app/_server/actions/file");
 
+  console.log("getNoteById", id, category, username);
+
   if (!username) {
     const { getUserByNoteUuid } = await import("@/app/_server/actions/users");
     const userByUuid = await getUserByNoteUuid(id);
@@ -92,6 +94,11 @@ export const getNoteById = async (
     }
   }
 
+  console.log("filePath", filePath);
+  console.log("category", category);
+  console.log("id", id);
+  console.log("absUserDir", absUserDir);
+
   if (!filePath && category) {
     const directPath = path.join(absUserDir, category, `${id}.md`);
     try {
@@ -119,8 +126,8 @@ export const getNoteById = async (
       await import("@/app/_server/actions/sharing");
     const sharedData = await getAllSharedItemsForUser(username);
     for (const sharedItem of sharedData.notes) {
-      const itemIdentifier = sharedItem.uuid || sharedItem.id;
-      if (!itemIdentifier) continue;
+      if (!sharedItem.uuid && !sharedItem.id) continue;
+      if (sharedItem.uuid !== id && sharedItem.id !== id) continue;
 
       const sharerDir = path.join(process.cwd(), NOTES_DIR(sharedItem.sharer));
       const found = isUuid && (await grepFindFileByUuid(sharerDir, id));
@@ -147,6 +154,8 @@ export const getNoteById = async (
     }
   }
 
+  console.log("filePath", filePath);
+
   if (!filePath) {
     return undefined;
   }
@@ -171,6 +180,15 @@ export const getNoteById = async (
     }
   }
 
+  console.log("finalUuid", finalUuid);
+  console.log("ownerUsername", ownerUsername);
+  console.log("isShared", isShared);
+  console.log("parsedData", parsedData);
+  console.log("noteCategory", noteCategory);
+  console.log("stats", stats);
+  console.log("toIso(stats.birthtime)", toIso(stats.birthtime));
+  console.log("toIso(stats.mtime)", toIso(stats.mtime));
+
   return {
     id: noteId,
     uuid: finalUuid,
diff --git a/app/_server/actions/notifications/index.ts b/app/_server/actions/notifications/index.ts
new file mode 100644
index 00000000..41d43124
--- /dev/null
+++ b/app/_server/actions/notifications/index.ts
@@ -0,0 +1,159 @@
+"use server";
+
+import path from "path";
+import { AppNotification, AppNotificationData } from "@/app/_types";
+import { NOTIFICATIONS_FILE } from "@/app/_consts/files";
+import { getCurrentUser } from "@/app/_server/actions/users";
+import { readJsonFile, writeJsonFile, ensureDir } from "@/app/_server/actions/file";
+import { broadcast } from "@/app/_server/ws/broadcast";
+import { getListById } from "@/app/_server/actions/checklist";
+import { getNoteById } from "@/app/_server/actions/note";
+
+const DEDUP_WINDOW_MS = 60 * 60 * 1000;
+
+const _getPath = (username: string): string => NOTIFICATIONS_FILE(username);
+
+const _read = async (username: string): Promise<AppNotification[]> => {
+  const data = await readJsonFile(_getPath(username));
+  return Array.isArray(data) ? data : [];
+};
+
+const _write = async (username: string, notifications: AppNotification[]): Promise<void> => {
+  const filePath = _getPath(username);
+  await ensureDir(path.join(process.cwd(), path.dirname(filePath)));
+  await writeJsonFile(notifications, filePath);
+};
+
+const _isDuplicate = (
+  existing: AppNotification[],
+  type: AppNotification["type"],
+  data?: AppNotificationData,
+): boolean => {
+  if (type === "assignment") return false;
+
+  const cutoff = Date.now() - DEDUP_WINDOW_MS;
+  const key = type === "reminder" ? data?.taskId : data?.itemId;
+  if (!key) return false;
+
+  return existing.some((n) => {
+    if (n.type !== type) return false;
+    if (new Date(n.createdAt).getTime() <= cutoff) return false;
+    const nKey = type === "reminder" ? n.data?.taskId : n.data?.itemId;
+    return nKey === key;
+  });
+};
+
+const _buildNotification = (
+  data: Omit<AppNotification, "id" | "createdAt">,
+): AppNotification => ({
+  ...data,
+  link: undefined,
+  id: `${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
+  createdAt: new Date().toISOString(),
+});
+
+const _resolveLink = async (data?: AppNotificationData): Promise<string | undefined> => {
+  if (!data?.itemId || !data?.itemType) return undefined;
+
+  try {
+    if (data.itemType === "checklist") {
+      const list = await getListById(data.itemId);
+      if (list) return `/checklist/${list.category}/${list.id}`;
+    }
+    if (data.itemType === "note") {
+      const note = await getNoteById(data.itemId);
+      if (note) return `/note/${note.category}/${note.id}`;
+    }
+  } catch {}
+
+  return undefined;
+};
+
+export const createNotificationForUser = async (
+  username: string,
+  data: Omit<AppNotification, "id" | "createdAt" | "link">,
+): Promise<{ success: boolean }> => {
+  try {
+    const existing = await _read(username);
+    if (_isDuplicate(existing, data.type, data.data)) return { success: true };
+
+    await _write(username, [_buildNotification(data), ...existing]);
+    await broadcast({ type: "notification", action: "created", username });
+    return { success: true };
+  } catch (error) {
+    console.error("[notifications] createNotificationForUser failed:", error);
+    return { success: false };
+  }
+};
+
+export const createNotification = async (
+  data: Omit<AppNotification, "id" | "createdAt" | "link">,
+): Promise<{ success: boolean }> => {
+  const user = await getCurrentUser();
+  if (!user?.username) return { success: false };
+  return createNotificationForUser(user.username, data);
+};
+
+export const getNotifications = async (): Promise<AppNotification[]> => {
+  const user = await getCurrentUser();
+  if (!user?.username) return [];
+
+  const notifications = await _read(user.username);
+
+  return Promise.all(
+    notifications.map(async (n) => ({
+      ...n,
+      link: await _resolveLink(n.data),
+    })),
+  );
+};
+
+export const markNotificationRead = async (id: string): Promise<{ success: boolean }> => {
+  try {
+    const user = await getCurrentUser();
+    if (!user?.username) return { success: false };
+    const notifications = await _read(user.username);
+    await _write(user.username, notifications.map((n) =>
+      n.id === id ? { ...n, readAt: new Date().toISOString() } : n,
+    ));
+    return { success: true };
+  } catch {
+    return { success: false };
+  }
+};
+
+export const markAllNotificationsRead = async (): Promise<{ success: boolean }> => {
+  try {
+    const user = await getCurrentUser();
+    if (!user?.username) return { success: false };
+    const readAt = new Date().toISOString();
+    const notifications = await _read(user.username);
+    await _write(user.username, notifications.map((n) => (n.readAt ? n : { ...n, readAt })));
+    return { success: true };
+  } catch {
+    return { success: false };
+  }
+};
+
+export const removeNotification = async (id: string): Promise<{ success: boolean }> => {
+  try {
+    const user = await getCurrentUser();
+    if (!user?.username) return { success: false };
+    const notifications = await _read(user.username);
+    await _write(user.username, notifications.filter((n) => n.id !== id));
+    return { success: true };
+  } catch {
+    return { success: false };
+  }
+};
+
+export const clearNotifications = async (): Promise<{ success: boolean }> => {
+  try {
+    const user = await getCurrentUser();
+    if (!user?.username) return { success: false };
+    await _write(user.username, []);
+    return { success: true };
+  } catch {
+    return { success: false };
+  }
+};
diff --git a/app/_server/actions/session/index.ts b/app/_server/actions/session/index.ts
index 3c16bc21..c5b91b18 100644
--- a/app/_server/actions/session/index.ts
+++ b/app/_server/actions/session/index.ts
@@ -7,7 +7,7 @@ import { readJsonFile, writeJsonFile } from "../file";
 import { SESSION_DATA_FILE, SESSIONS_FILE } from "@/app/_consts/files";
 import { getCurrentUser } from "../users";
 import { logAuthEvent } from "@/app/_server/actions/log";
-import { isEnvEnabled } from "@/app/_utils/env-utils";
+import { getSessionCookieName } from "@/app/_utils/env-utils";
 
 export interface SessionData {
   id: string;
@@ -16,7 +16,7 @@ export interface SessionData {
   ipAddress: string;
   createdAt: string;
   lastActivity: string;
-  loginType?: "local" | "sso" | "pending-mfa";
+  loginType?: "local" | "sso" | "ldap" | "pending-mfa";
 }
 
 export interface Session {
@@ -48,7 +48,7 @@ export const readSessions = async (): Promise<Session> => {
 export const createSession = async (
   sessionId: string,
   username: string,
-  loginType: "local" | "sso" | "pending-mfa",
+  loginType: "local" | "sso" | "pending-mfa" | "ldap",
 ): Promise<void> => {
   const headersList = await headers();
   const userAgent = headersList.get("user-agent") || "Unknown";
@@ -104,14 +104,12 @@ export const getSessionsForUser = async (
 
 export const getSessionId = async (): Promise<string> => {
   const cookieName =
-    process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-      ? "__Host-session"
-      : "session";
+getSessionCookieName();
   return (await cookies()).get(cookieName)?.value || "";
 };
 
 export const getLoginType = async (): Promise<
-  "local" | "sso" | "pending-mfa" | undefined
+  "local" | "sso" | "pending-mfa" | "ldap" | undefined
 > => {
   const sessionId = await getSessionId();
   if (!sessionId) return undefined;
@@ -214,11 +212,7 @@ export const terminateAllOtherSessions = async (): Promise<Result<null>> => {
       };
     }
 
-    const cookieName =
-      process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-        ? "__Host-session"
-        : "session";
-    const sessionId = (await cookies()).get(cookieName)?.value;
+    const sessionId = (await cookies()).get(getSessionCookieName())?.value;
 
     await removeAllSessionsForUser(currentUser.username, sessionId);
 
diff --git a/app/_server/actions/sharing/index.ts b/app/_server/actions/sharing/index.ts
index f7ef7e8e..91d6cce7 100644
--- a/app/_server/actions/sharing/index.ts
+++ b/app/_server/actions/sharing/index.ts
@@ -18,6 +18,7 @@ export {
 export {
   getAllSharedItemsForUser,
   getAllSharedItems,
+  getUsersWithAccess,
 } from "./queries";
 
 export {
diff --git a/app/_server/actions/sharing/queries.ts b/app/_server/actions/sharing/queries.ts
index bf0dab98..31106522 100644
--- a/app/_server/actions/sharing/queries.ts
+++ b/app/_server/actions/sharing/queries.ts
@@ -16,6 +16,29 @@ export const getAllSharedItemsForUser = async (
   };
 };
 
+export const getUsersWithAccess = async (
+  checklistId: string,
+  checklistUuid?: string
+): Promise<string[]> => {
+  const sharingData = await readShareFile(ItemTypes.CHECKLIST);
+  const users: string[] = [];
+
+  for (const [username, entries] of Object.entries(sharingData)) {
+    if (username === "public") continue;
+    for (const entry of entries) {
+      if (
+        (checklistUuid && entry.uuid === checklistUuid) ||
+        (entry.id === checklistId)
+      ) {
+        users.push(username);
+        break;
+      }
+    }
+  }
+
+  return users;
+};
+
 export const getAllSharedItems = async (): Promise<{
   notes: Array<{ id: string; category: string }>;
   checklists: Array<{ id: string; category: string }>;
diff --git a/app/_server/actions/sharing/share-operations.ts b/app/_server/actions/sharing/share-operations.ts
index 68812f03..8ac7ebbc 100644
--- a/app/_server/actions/sharing/share-operations.ts
+++ b/app/_server/actions/sharing/share-operations.ts
@@ -9,6 +9,8 @@ import { getItemUuid } from "./helpers";
 import { readShareFile, writeShareFile } from "./io";
 import { SharedItemEntry } from "./types";
 import { revalidateTag } from "next/cache";
+import { getTranslations } from "next-intl/server";
+import { createNotificationForUser } from "@/app/_server/actions/notifications";
 
 export const shareWith = async (
   item: string,
@@ -74,6 +76,15 @@ export const shareWith = async (
 
     await broadcast({ type: "sharing", action: "updated", entityId: item, username: sharerUsername });
 
+    const itemTypeLabel = itemType === ItemTypes.CHECKLIST ? "checklist" : "note";
+    const t = await getTranslations("notifications");
+    await createNotificationForUser(receiverUsername, {
+      type: "sharing",
+      title: t("sharingTitle", { user: sharerUsername, type: itemTypeLabel }),
+      message: t("sharingMessage", { type: itemTypeLabel }),
+      data: { itemId: itemUuid, itemType: itemTypeLabel },
+    });
+
     return { success: true, data: null };
   } catch (error) {
     await logAudit({
diff --git a/app/_server/actions/stats/index.ts b/app/_server/actions/stats/index.ts
index 5136f402..495b2fe9 100644
--- a/app/_server/actions/stats/index.ts
+++ b/app/_server/actions/stats/index.ts
@@ -3,141 +3,156 @@
 import { getUserNotes } from "@/app/_server/actions/note";
 import { getUserChecklists } from "@/app/_server/actions/checklist";
 import { getCurrentUser } from "@/app/_server/actions/users";
-import { TaskStatus } from "@/app/_types/enums";
+import { isKanbanType, TaskStatus } from "@/app/_types/enums";
 import { Checklist, Result } from "@/app/_types";
 
 export interface UserStats {
-    username: string;
-    notes: {
-        total: number;
-        categories: Record<string, number>;
-    };
-    checklists: {
-        total: number;
-        categories: Record<string, number>;
-        types: Record<string, number>;
-    };
-    items: {
-        total: number;
-        completed: number;
-        pending: number;
-        completionRate: number;
-    };
-    tasks: {
-        total: number;
-        completed: number;
-        inProgress: number;
-        todo: number;
-        completionRate: number;
-    };
+  username: string;
+  notes: {
+    total: number;
+    categories: Record<string, number>;
+  };
+  checklists: {
+    total: number;
+    categories: Record<string, number>;
+    types: Record<string, number>;
+  };
+  items: {
+    total: number;
+    completed: number;
+    pending: number;
+    completionRate: number;
+  };
+  tasks: {
+    total: number;
+    completed: number;
+    inProgress: number;
+    todo: number;
+    completionRate: number;
+  };
 }
 
-export const getUserStats = async (username?: string): Promise<Result<UserStats>> => {
-    try {
-        const currentUser = await getCurrentUser();
-        if (!currentUser) {
-            return { success: false, error: "Not authenticated" };
-        }
+export const getUserStats = async (
+  username?: string,
+): Promise<Result<UserStats>> => {
+  try {
+    const currentUser = await getCurrentUser();
+    if (!currentUser) {
+      return { success: false, error: "Not authenticated" };
+    }
 
-        const targetUsername = username || currentUser.username;
+    const targetUsername = username || currentUser.username;
 
-        const notesResult = await getUserNotes({ username: targetUsername });
-        if (!notesResult.success || !notesResult.data) {
-            return { success: false, error: notesResult.error || "Failed to fetch notes" };
-        }
+    const notesResult = await getUserNotes({ username: targetUsername });
+    if (!notesResult.success || !notesResult.data) {
+      return {
+        success: false,
+        error: notesResult.error || "Failed to fetch notes",
+      };
+    }
 
-        const userNotes = notesResult.data.filter(
-            (note) => note.owner === targetUsername
-        );
+    const userNotes = notesResult.data.filter(
+      (note) => note.owner === targetUsername,
+    );
 
-        const listsResult = await getUserChecklists({ username: targetUsername }) as Result<Checklist[]>;
-        if (!listsResult.success || !listsResult.data) {
-            return { success: false, error: listsResult.error || "Failed to fetch checklists" };
-        }
+    const listsResult = (await getUserChecklists({
+      username: targetUsername,
+    })) as Result<Checklist[]>;
+    if (!listsResult.success || !listsResult.data) {
+      return {
+        success: false,
+        error: listsResult.error || "Failed to fetch checklists",
+      };
+    }
 
-        const userLists = listsResult.data.filter(
-            (list) => list.owner === targetUsername
-        );
+    const userLists = listsResult.data.filter(
+      (list) => list.owner === targetUsername,
+    );
 
-        let totalItems = 0;
-        let completedItems = 0;
-        let totalTasks = 0;
-        let completedTasks = 0;
-        let inProgressTasks = 0;
-        let todoTasks = 0;
+    let totalItems = 0;
+    let completedItems = 0;
+    let totalTasks = 0;
+    let completedTasks = 0;
+    let inProgressTasks = 0;
+    let todoTasks = 0;
 
-        userLists.forEach((list) => {
-            totalItems += list.items.length;
+    userLists.forEach((list) => {
+      totalItems += list.items.length;
 
-            list.items.forEach((item) => {
-                if (item.completed) {
-                    completedItems++;
-                }
+      list.items.forEach((item) => {
+        if (item.completed) {
+          completedItems++;
+        }
 
-                if (list.type === "task" && item.status) {
-                    totalTasks++;
-                    switch (item.status) {
-                        case TaskStatus.COMPLETED:
-                            completedTasks++;
-                            break;
-                        case TaskStatus.IN_PROGRESS:
-                            inProgressTasks++;
-                            break;
-                        case TaskStatus.TODO:
-                            todoTasks++;
-                            break;
-                    }
-                }
-            });
-        });
+        if (isKanbanType(list.type) && item.status) {
+          totalTasks++;
+          switch (item.status) {
+            case TaskStatus.COMPLETED:
+              completedTasks++;
+              break;
+            case TaskStatus.IN_PROGRESS:
+              inProgressTasks++;
+              break;
+            case TaskStatus.TODO:
+              todoTasks++;
+              break;
+          }
+        }
+      });
+    });
 
-        const stats: UserStats = {
-            username: targetUsername,
-            notes: {
-                total: userNotes.length,
-                categories: userNotes.reduce((acc, note) => {
-                    const category = note.category || "Uncategorized";
-                    acc[category] = (acc[category] || 0) + 1;
-                    return acc;
-                }, {} as Record<string, number>),
-            },
-            checklists: {
-                total: userLists.length,
-                categories: userLists.reduce((acc, list) => {
-                    const category = list.category || "Uncategorized";
-                    acc[category] = (acc[category] || 0) + 1;
-                    return acc;
-                }, {} as Record<string, number>),
-                types: userLists.reduce((acc, list) => {
-                    const type = list.type || "simple";
-                    acc[type] = (acc[type] || 0) + 1;
-                    return acc;
-                }, {} as Record<string, number>),
-            },
-            items: {
-                total: totalItems,
-                completed: completedItems,
-                pending: totalItems - completedItems,
-                completionRate:
-                    totalItems > 0
-                        ? Math.round((completedItems / totalItems) * 100)
-                        : 0,
-            },
-            tasks: {
-                total: totalTasks,
-                completed: completedTasks,
-                inProgress: inProgressTasks,
-                todo: todoTasks,
-                completionRate:
-                    totalTasks > 0
-                        ? Math.round((completedTasks / totalTasks) * 100)
-                        : 0,
-            },
-        };
+    const stats: UserStats = {
+      username: targetUsername,
+      notes: {
+        total: userNotes.length,
+        categories: userNotes.reduce(
+          (acc, note) => {
+            const category = note.category || "Uncategorized";
+            acc[category] = (acc[category] || 0) + 1;
+            return acc;
+          },
+          {} as Record<string, number>,
+        ),
+      },
+      checklists: {
+        total: userLists.length,
+        categories: userLists.reduce(
+          (acc, list) => {
+            const category = list.category || "Uncategorized";
+            acc[category] = (acc[category] || 0) + 1;
+            return acc;
+          },
+          {} as Record<string, number>,
+        ),
+        types: userLists.reduce(
+          (acc, list) => {
+            const type = list.type || "simple";
+            acc[type] = (acc[type] || 0) + 1;
+            return acc;
+          },
+          {} as Record<string, number>,
+        ),
+      },
+      items: {
+        total: totalItems,
+        completed: completedItems,
+        pending: totalItems - completedItems,
+        completionRate:
+          totalItems > 0 ? Math.round((completedItems / totalItems) * 100) : 0,
+      },
+      tasks: {
+        total: totalTasks,
+        completed: completedTasks,
+        inProgress: inProgressTasks,
+        todo: todoTasks,
+        completionRate:
+          totalTasks > 0 ? Math.round((completedTasks / totalTasks) * 100) : 0,
+      },
+    };
 
-        return { success: true, data: stats };
-    } catch (error) {
-        console.error("Error getting user stats:", error);
-        return { success: false, error: "Failed to get user stats" };
-    }
+    return { success: true, data: stats };
+  } catch (error) {
+    console.error("Error getting user stats:", error);
+    return { success: false, error: "Failed to get user stats" };
+  }
 };
diff --git a/app/_server/actions/users/ensure-user.ts b/app/_server/actions/users/ensure-user.ts
new file mode 100644
index 00000000..fffefd00
--- /dev/null
+++ b/app/_server/actions/users/ensure-user.ts
@@ -0,0 +1,91 @@
+"use server";
+import { lock, unlock } from "proper-lockfile";
+import { CHECKLISTS_FOLDER } from "@/app/_consts/checklists";
+import { NOTES_FOLDER } from "@/app/_consts/notes";
+import { isDebugFlag } from "@/app/_utils/env-utils";
+import fs from "fs/promises";
+import path from "path";
+
+const debugProxy = isDebugFlag("proxy");
+
+export async function ensureUser(
+  username: string,
+  isAdmin: boolean,
+): Promise<void> {
+  const usersFile = path.join(process.cwd(), "data", "users", "users.json");
+  await fs.mkdir(path.dirname(usersFile), { recursive: true });
+
+  await lock(usersFile);
+  try {
+    let users: any[] = [];
+    try {
+      const content = await fs.readFile(usersFile, "utf-8");
+      if (content) {
+        users = JSON.parse(content);
+      }
+    } catch {}
+
+    if (users.length === 0) {
+      users.push({
+        username,
+        passwordHash: "",
+        isAdmin: true,
+        isSuperAdmin: true,
+        createdAt: new Date().toISOString(),
+      });
+      if (debugProxy) {
+        console.log(
+          "SSO CALLBACK - Created first user as super admin:",
+          username,
+        );
+      }
+    } else {
+      const existing = users.find((u) => u.username === username);
+      if (!existing) {
+        users.push({
+          username,
+          passwordHash: "",
+          isAdmin,
+          createdAt: new Date().toISOString(),
+        });
+        if (debugProxy) {
+          console.log("SSO CALLBACK - Created new user:", {
+            username,
+            isAdmin,
+          });
+        }
+      } else {
+        const wasAdmin = existing.isAdmin;
+        if (isAdmin && !existing.isAdmin) {
+          existing.isAdmin = true;
+          if (debugProxy) {
+            console.log("SSO CALLBACK - Updated existing user to admin:", {
+              username,
+              wasAdmin,
+              nowAdmin: true,
+            });
+          }
+        } else if (debugProxy) {
+          console.log("SSO CALLBACK - User already exists:", {
+            username,
+            currentIsAdmin: existing.isAdmin,
+            requestedAdmin: isAdmin,
+          });
+        }
+      }
+    }
+    await fs.writeFile(usersFile, JSON.stringify(users, null, 2));
+  } finally {
+    await unlock(usersFile);
+  }
+
+  const checklistDir = path.join(
+    process.cwd(),
+    "data",
+    CHECKLISTS_FOLDER,
+    username,
+  );
+  const notesDir = path.join(process.cwd(), "data", NOTES_FOLDER, username);
+  await fs.mkdir(checklistDir, { recursive: true });
+  await fs.mkdir(notesDir, { recursive: true });
+}
diff --git a/app/_server/actions/users/index.ts b/app/_server/actions/users/index.ts
index 46a7b55b..3ba4f4a7 100644
--- a/app/_server/actions/users/index.ts
+++ b/app/_server/actions/users/index.ts
@@ -1,5 +1,7 @@
 export type { UserUpdatePayload } from "./crud";
 
+export { ensureUser } from "./ensure-user";
+
 export {
   createUser,
   deleteUser,
@@ -20,15 +22,9 @@ export {
   getUserByNote,
 } from "./queries";
 
-export {
-  isAuthenticated,
-  isAdmin,
-  canAccessAllContent,
-} from "./auth";
+export { isAuthenticated, isAdmin, canAccessAllContent } from "./auth";
 
-export {
-  updateUserSettings,
-} from "./settings";
+export { updateUserSettings } from "./settings";
 
 export {
   getUserIndex,
diff --git a/app/_styles/globals.css b/app/_styles/globals.css
index 0c5f223c..9ee8ceaf 100644
--- a/app/_styles/globals.css
+++ b/app/_styles/globals.css
@@ -53,6 +53,24 @@ svg {
     }
 }
 
+.kanban-grid {
+    display: grid;
+    grid-template-columns: 1fr;
+    min-width: 0;
+}
+
+@media (min-width: 640px) {
+    .kanban-grid {
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+}
+
+@media (min-width: 1024px) {
+    .kanban-grid {
+        grid-template-columns: repeat(var(--kanban-col-count), minmax(0, 1fr));
+    }
+}
+
 @media (max-width: 768px) {
     html {
         scroll-padding-bottom: 20px;
@@ -805,4 +823,4 @@ pre.text-foreground span,
     font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
     font-size: 14px;
     line-height: 21px;
-}
\ No newline at end of file
+}
diff --git a/app/_translations/de.json b/app/_translations/de.json
index f46c43c7..db208f1e 100644
--- a/app/_translations/de.json
+++ b/app/_translations/de.json
@@ -240,7 +240,13 @@
     "copiedToClipboard": "In die Zwischenablage kopiert",
     "offline": "Offline",
     "connected": "Verbunden",
-    "reconnecting": "Verbindung wird wieder hergestellt..."
+    "reconnecting": "Verbindung wird wieder hergestellt...",
+    "hide": "Ausblenden",
+    "continue": "Weiter",
+    "history": "Verlauf",
+    "disable": "Deaktivieren",
+    "items": "Elemente",
+    "thisEntry": "diesen Eintrag"
   },
   "auth": {
     "loginTitle": "Anmelden",
@@ -273,7 +279,9 @@
     "createAdminAccountDescription": "Erstelle dein Admin-Konto um zu beginnen",
     "version": "Version {version}",
     "createUser": "Benutzer erstellen",
-    "notAuthorized": "Du bist nicht berechtigt, auf diese Anwendung zuzugreifen. Kontaktiere deinen Administrator."
+    "notAuthorized": "Du bist nicht berechtigt, auf diese Anwendung zuzugreifen. Kontaktiere deinen Administrator.",
+    "attemptsRemaining": "Warnung: Noch {count, plural, one {# Versuch} other {# Versuche}} bis zur Kontosperre",
+    "accountLocked": "Zu viele fehlgeschlagene Versuche. Bitte versuche es in {seconds} {seconds, plural, one {Sekunde} other {Sekunden}} erneut."
   },
   "mfa": {
     "title": "Zwei-Faktor-Authentifizierung",
@@ -373,7 +381,12 @@
     "tags": "Tags",
     "noTagsFound": "Keine Tags gefunden",
     "searchTags": "Tags suchen...",
-    "copyRawContent": "Markdown kopieren"
+    "copyRawContent": "Markdown kopieren",
+    "printSaveAsPdf": "Drucken / Als PDF speichern",
+    "tableOfContents": "Inhaltsverzeichnis",
+    "wordCount": "{count, plural, one {# Wort} other {# Wörter}}",
+    "charCount": "{count, plural, one {# Zeichen} other {# Zeichen}}",
+    "readingTime": "{count, plural, one {# Minute Lesezeit} other {# Minuten Lesezeit}}"
   },
   "checklists": {
     "title": "Aufgabenlisten",
@@ -472,7 +485,21 @@
     "noItemsYet": "Noch keine Elemente",
     "addFirstItem": "Füge dein erstes Element hinzu um zu beginnen!",
     "noTasks": "Keine Aufgaben",
-    "noSubtasksYet": "Noch keine Unteraufgaben. Füge unten eine hinzu um zu beginnen."
+    "noSubtasksYet": "Noch keine Unteraufgaben. Füge unten eine hinzu um zu beginnen.",
+    "addTime": "Zeit hinzufügen",
+    "enterTimeInMinutes": "Zeit in Minuten eingeben",
+    "checkAll": "Alle abhaken",
+    "checkAllConfirmTitle": "Alle Einträge abhaken?",
+    "checkAllConfirmMessage": "Möchtest du wirklich alle {count} Einträge und Untereinträge abhaken? Sie werden als erledigt markiert.",
+    "uncheckAll": "Alle Haken entfernen",
+    "uncheckAllConfirmTitle": "Alle Haken entfernen?",
+    "uncheckAllConfirmMessage": "Möchtest du wirklich alle {count} Einträge und Untereinträge deaktivieren? Sie werden als unerledigt markiert.",
+    "clearAll": "Alle löschen",
+    "clearAllConfirmTitle": "Alle Einträge löschen?",
+    "clearAllCompletedConfirmMessage": "Möchtest du wirklich alle {count} erledigten Einträge und Untereinträge löschen? Dies kann nicht rückgängig gemacht werden.",
+    "clearAllIncompleteConfirmMessage": "Möchtest du wirklich alle {count} unerledigten Einträge und Untereinträge löschen? Dies kann nicht rückgängig gemacht werden.",
+    "convertToKanbanBoard": "In Kanban-Board umwandeln",
+    "kanbanBoard": "Kanban-Board"
   },
   "tasks": {
     "title": "Aufgaben",
@@ -515,6 +542,66 @@
     "addStatus": "Status hinzufügen",
     "autoComplete": "Automatische Vervollständigung"
   },
+  "kanban": {
+    "priority": "Priorität",
+    "score": "Punktzahl",
+    "assignee": "Zugewiesen an",
+    "reminder": "Erinnerung",
+    "usernamePlaceholder": "Benutzername",
+    "scoreLabel": "Punktzahl: {score}",
+    "today": "Heute",
+    "exportIcs": ".ics exportieren",
+    "unscheduled": "Ungeplant ({count})",
+    "moreEvents": "+{count} weitere",
+    "critical": "Kritisch",
+    "high": "Hoch",
+    "medium": "Mittel",
+    "low": "Niedrig",
+    "none": "Keine",
+    "weekdaysSun": "So",
+    "weekdaysMon": "Mo",
+    "weekdaysTue": "Di",
+    "weekdaysWed": "Mi",
+    "weekdaysThu": "Do",
+    "weekdaysFri": "Fr",
+    "weekdaysSat": "Sa",
+    "title": "Kanban",
+    "calendar": "Kalender",
+    "boards": "Boards",
+    "addItem": "Element hinzufügen",
+    "itemTitle": "Elementtitel",
+    "manageStatuses": "Status verwalten",
+    "viewArchived": "Archivierte anzeigen",
+    "noBoards": "Keine Boards gefunden",
+    "noBoardsYet": "Noch keine Kanban-Boards",
+    "createFirstBoard": "Erstelle dein erstes Kanban-Board, um deine Projekte zu verwalten.",
+    "newBoard": "Neues Board",
+    "tryAdjustingFilters": "Passe deine Filter an oder erstelle ein neues Board.",
+    "completed": "Erledigt",
+    "todo": "Zu erledigen",
+    "inProgress": "In Bearbeitung",
+    "recentBoards": "Letzte Boards",
+    "showAllBoards": "Alle Boards anzeigen",
+    "unassigned": "Nicht zugewiesen",
+    "targetDate": "Zieldatum",
+    "statusUpdated": "Status aktualisiert",
+    "itemArchived": "Element archiviert",
+    "itemDeleted": "Element gelöscht",
+    "estimatedTime": "Geschätzte Zeit (Stunden)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "Keine Elemente entsprechen den aktuellen Filtern",
+    "searchPlaceholder": "Elemente suchen...",
+    "allPriorities": "Alle Prioritäten",
+    "allAssignees": "Alle Zuständigen",
+    "timeEntries": "Zeiteinträge",
+    "noTimeEntries": "Noch keine Zeiteinträge",
+    "editSessions": "Sitzungen bearbeiten",
+    "session": "Sitzung",
+    "sessions": "Sitzungen",
+    "startTime": "Start",
+    "endTime": "Ende"
+  },
   "profile": {
     "userProfile": "Benutzer",
     "manageAccount": "Verwalte deine Kontoeinstellungen und Präferenzen",
@@ -923,7 +1010,13 @@
     "updatingTags": "Aktualisiere...",
     "updateTagsTitle": "Notizen nach Hashtags durchsuchen und Frontmatter aktualisieren",
     "tagsUpdated": "{processed} Dateien verarbeitet, {updated} mit neuen Tags aktualisiert",
-    "failedToUpdateTags": "Tags konnten nicht aktualisiert werden"
+    "failedToUpdateTags": "Tags konnten nicht aktualisiert werden",
+    "historyEnabled": "Notizverlauf",
+    "historyDescription": "Versionsverlauf für Notizen. Ermöglicht die Wiederherstellung früherer Versionen. Nur manuelles Speichern erstellt Verlaufspunkte (nicht Autosave).",
+    "disableHistory": "Verlauf deaktivieren",
+    "disableHistoryWarning": "Das Deaktivieren des Verlaufs löscht dauerhaft alle gespeicherten Versionen für alle Nutzer. Dies kann nicht rückgängig gemacht werden.",
+    "historyDisabled": "Der Notizverlauf wurde deaktiviert und alle Verlaufsdaten gelöscht.",
+    "failedToDisableHistory": "Verlauf konnte nicht deaktiviert werden"
   },
   "errors": {
     "notFound": "Nicht gefunden",
@@ -1115,8 +1208,19 @@
     "drawioDescription": "Visueller Diagramm-Editor",
     "excalidrawDescription": "Editor für Diagramme im Zeichenstil",
     "noLanguagesFound": "Keine Sprachen gefunden",
-    "ruler": "Herrscher",
-    "lineNumbers": "Zeilennummern"
+    "ruler": "Lineal",
+    "lineNumbers": "Zeilennummern",
+    "addLink": "Link hinzufügen",
+    "enterURL": "URL eingeben",
+    "addImage": "Bild hinzufügen",
+    "enterImageURL": "Bild-URL eingeben",
+    "callout": "Hinweis",
+    "createCallout": "Hinweisblock erstellen",
+    "changeCalloutType": "Hinweistyp ändern",
+    "calloutInfo": "Info",
+    "calloutWarning": "Warnung",
+    "calloutSuccess": "Erfolg",
+    "calloutDanger": "Gefahr"
   },
   "sharing": {
     "share": "Freigeben",
@@ -1482,5 +1586,25 @@
     "actionDelete": "Gelöscht",
     "actionInit": "Initialisiert",
     "actionUnknown": "Geändert"
+  },
+  "notifications": {
+    "title": "Benachrichtigungen",
+    "markAllRead": "Alles als gelesen markieren",
+    "clearAll": "Alles löschen",
+    "empty": "Keine Benachrichtigungen",
+    "assignmentTitle": "Ihnen zugewiesene Aufgabe",
+    "assignmentMessage": "„{task}“ in „{board}“",
+    "reminderTitle": "Aufgabe überfällig",
+    "reminderMessage": "„{task}“ in „{board}“ ist abgelaufen",
+    "unread": "ungelesen",
+    "sharingTitle": "{user} hat ein {type} mit dir geteilt",
+    "sharingMessage": "Öffnen, um das geteilte {type} anzuzeigen"
+  },
+  "notFound": {
+    "title": "Seite nicht gefunden",
+    "newHaiku": "Neues Haiku",
+    "goHome": "Zur Startseite",
+    "seenCount": "Du hast {count} {count, plural, one {Haiku} other {Haikus}} gesehen",
+    "imNoPoet": "Ich bin kein Dichter, und Jotty auch nicht. Das sind zufällige Wörter in Folge."
   }
 }
diff --git a/app/_translations/en.json b/app/_translations/en.json
index 91b340fc..140e3720 100644
--- a/app/_translations/en.json
+++ b/app/_translations/en.json
@@ -244,7 +244,9 @@
     "copiedToClipboard": "Copied to clipboard",
     "offline": "Offline",
     "connected": "Connected",
-    "reconnecting": "Reconnecting..."
+    "reconnecting": "Reconnecting...",
+    "hide": "Hide",
+    "thisEntry": "this entry"
   },
   "history": {
     "noteHistory": "Note History",
@@ -402,6 +404,11 @@
     "unarchiveNote": "Unarchive Note",
     "enterNoteName": "Enter note name...",
     "updateNote": "Update Note",
+    "printSaveAsPdf": "Print / Save as PDF",
+    "tableOfContents": "Table of Contents",
+    "wordCount": "{count, plural, one {# word} other {# words}}",
+    "charCount": "{count, plural, one {# character} other {# characters}}",
+    "readingTime": "{count, plural, one {# minute read} other {# minutes read}}",
     "tags": "Tags",
     "noTagsFound": "No tags found",
     "searchTags": "Search tags..."
@@ -462,6 +469,7 @@
     "checklistType": "Checklist Type",
     "simpleChecklist": "Simple Checklist",
     "taskProject": "Task Project",
+    "kanbanBoard": "Kanban Board",
     "basicTodoItems": "Basic todo items",
     "withTimeTracking": "With time tracking",
     "noDescription": "No description",
@@ -505,6 +513,7 @@
     "convert": "Convert",
     "convertToSimpleChecklist": "Convert to simple checklist",
     "convertToTaskProject": "Convert to task project",
+    "convertToKanbanBoard": "Convert to Kanban Board",
     "pasteYourList": "Paste your list (one item per line)",
     "addItems": "Add {count} Items",
     "itemsWillBeAdded": "{count} items will be added",
@@ -558,6 +567,66 @@
     "addStatus": "Add status",
     "autoComplete": "Auto complete"
   },
+  "kanban": {
+    "priority": "Priority",
+    "score": "Score",
+    "assignee": "Assignee",
+    "reminder": "Reminder",
+    "usernamePlaceholder": "username",
+    "scoreLabel": "Score: {score}",
+    "today": "Today",
+    "exportIcs": "Export .ics",
+    "unscheduled": "Unscheduled ({count})",
+    "moreEvents": "+{count} more",
+    "critical": "Critical",
+    "high": "High",
+    "medium": "Medium",
+    "low": "Low",
+    "none": "None",
+    "weekdaysSun": "Sun",
+    "weekdaysMon": "Mon",
+    "weekdaysTue": "Tue",
+    "weekdaysWed": "Wed",
+    "weekdaysThu": "Thu",
+    "weekdaysFri": "Fri",
+    "weekdaysSat": "Sat",
+    "title": "Kanban",
+    "calendar": "Calendar",
+    "boards": "Boards",
+    "addItem": "Add Item",
+    "itemTitle": "Item Title",
+    "manageStatuses": "Manage Statuses",
+    "viewArchived": "View Archived",
+    "noBoards": "No boards found",
+    "noBoardsYet": "No kanban boards yet",
+    "createFirstBoard": "Create your first kanban board to start managing your projects.",
+    "newBoard": "New Board",
+    "tryAdjustingFilters": "Try adjusting your filters or create a new board.",
+    "completed": "Completed",
+    "todo": "To Do",
+    "inProgress": "In Progress",
+    "recentBoards": "Recent Boards",
+    "showAllBoards": "Show all boards",
+    "unassigned": "Unassigned",
+    "targetDate": "Target Date",
+    "statusUpdated": "Status updated",
+    "itemArchived": "Item archived",
+    "itemDeleted": "Item deleted",
+    "estimatedTime": "Estimated Time (hours)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "No items match the current filters",
+    "searchPlaceholder": "Search items...",
+    "allPriorities": "All priorities",
+    "allAssignees": "All assignees",
+    "timeEntries": "Time Entries",
+    "noTimeEntries": "No time entries yet",
+    "editSessions": "Edit sessions",
+    "session": "session",
+    "sessions": "sessions",
+    "startTime": "Start",
+    "endTime": "End"
+  },
   "profile": {
     "userProfile": "User",
     "manageAccount": "Manage your account settings and preferences",
@@ -1523,5 +1592,18 @@
     "goHome": "Go Home",
     "seenCount": "You've seen {count} {count, plural, one {haiku} other {haikus}}",
     "imNoPoet": "I am no poet, and nor is Jotty. These are random words in sequence."
+  },
+  "notifications": {
+    "title": "Notifications",
+    "unread": "unread",
+    "markAllRead": "Mark all read",
+    "clearAll": "Clear all",
+    "empty": "No notifications",
+    "assignmentTitle": "Task assigned to you",
+    "assignmentMessage": "\"{task}\" in \"{board}\"",
+    "reminderTitle": "Task overdue",
+    "reminderMessage": "\"{task}\" in \"{board}\" is past its reminder",
+    "sharingTitle": "{user} shared a {type} with you",
+    "sharingMessage": "Open to view the shared {type}"
   }
 }
diff --git a/app/_translations/es.json b/app/_translations/es.json
index b96f8997..77065d64 100644
--- a/app/_translations/es.json
+++ b/app/_translations/es.json
@@ -240,7 +240,13 @@
     "copiedToClipboard": "Copiado al portapapeles",
     "offline": "Desconectado",
     "connected": "Conectado",
-    "reconnecting": "Reconectando..."
+    "reconnecting": "Reconectando...",
+    "hide": "Ocultar",
+    "disable": "Desactivar",
+    "history": "Historial",
+    "items": "Elementos",
+    "noResults": "Sin resultados",
+    "thisEntry": "esta entrada"
   },
   "auth": {
     "loginTitle": "Iniciar sesión",
@@ -274,7 +280,8 @@
     "version": "Versión {version}",
     "createUser": "Crear usuario",
     "attemptsRemaining": "Advertencia: {count, plural, one {# intento} other {# intentos}} restantes antes del bloqueo de cuenta",
-    "accountLocked": "Demasiados intentos fallidos. Por favor, inténtelo de nuevo en {seconds} {seconds, plural, one {segundo} other {segundos}}"
+    "accountLocked": "Demasiados intentos fallidos. Por favor, inténtelo de nuevo en {seconds} {seconds, plural, one {segundo} other {segundos}}",
+    "notAuthorized": "No estás autorizado para acceder a esta aplicación. Ponte en contacto con tu administrador."
   },
   "mfa": {
     "title": "Autenticación de dos factores",
@@ -374,7 +381,12 @@
     "tags": "Etiquetas",
     "noTagsFound": "No se encontraron etiquetas",
     "searchTags": "Buscar etiquetas...",
-    "copyRawContent": "Copiar markdown"
+    "copyRawContent": "Copiar markdown",
+    "printSaveAsPdf": "Imprimir / Guardar como PDF",
+    "tableOfContents": "Tabla de contenidos",
+    "wordCount": "{count, plural, one {# palabra} other {# palabras}}",
+    "charCount": "{count, plural, one {# carácter} other {# caracteres}}",
+    "readingTime": "{count, plural, one {# minuto de lectura} other {# minutos de lectura}}"
   },
   "checklists": {
     "title": "Listas",
@@ -485,7 +497,9 @@
     "noTasks": "Sin tareas",
     "noSubtasksYet": "Aún no hay subtareas. Agregue una abajo para comenzar.",
     "addTime": "Agregar hora",
-    "enterTimeInMinutes": "Ingresa tu tiempo en minutos"
+    "enterTimeInMinutes": "Ingresa tu tiempo en minutos",
+    "convertToKanbanBoard": "Convertir en tablero Kanban",
+    "kanbanBoard": "Tablero Kanban"
   },
   "tasks": {
     "title": "Tareas",
@@ -528,6 +542,66 @@
     "addStatus": "Agregar estado",
     "autoComplete": "Autocompletar"
   },
+  "kanban": {
+    "priority": "Prioridad",
+    "score": "Puntuación",
+    "assignee": "Asignado a",
+    "reminder": "Recordatorio",
+    "usernamePlaceholder": "nombre de usuario",
+    "scoreLabel": "Puntuación: {score}",
+    "today": "Hoy",
+    "exportIcs": "Exportar .ics",
+    "unscheduled": "Sin programar ({count})",
+    "moreEvents": "+{count} más",
+    "critical": "Crítico",
+    "high": "Alto",
+    "medium": "Medio",
+    "low": "Bajo",
+    "none": "Ninguno",
+    "weekdaysSun": "Dom",
+    "weekdaysMon": "Lun",
+    "weekdaysTue": "Mar",
+    "weekdaysWed": "Mié",
+    "weekdaysThu": "Jue",
+    "weekdaysFri": "Vie",
+    "weekdaysSat": "Sáb",
+    "title": "Kanban",
+    "calendar": "Calendario",
+    "boards": "Tableros",
+    "addItem": "Añadir elemento",
+    "itemTitle": "Título del elemento",
+    "manageStatuses": "Gestionar estados",
+    "viewArchived": "Ver archivados",
+    "noBoards": "No se encontraron tableros",
+    "noBoardsYet": "Aún no hay tableros Kanban",
+    "createFirstBoard": "Cree su primer tablero Kanban para empezar a gestionar sus proyectos.",
+    "newBoard": "Nuevo tablero",
+    "tryAdjustingFilters": "Pruebe a ajustar los filtros o crear un nuevo tablero.",
+    "completed": "Completado",
+    "todo": "Por hacer",
+    "inProgress": "En progreso",
+    "recentBoards": "Tableros recientes",
+    "showAllBoards": "Mostrar todos los tableros",
+    "unassigned": "Sin asignar",
+    "targetDate": "Fecha objetivo",
+    "statusUpdated": "Estado actualizado",
+    "itemArchived": "Elemento archivado",
+    "itemDeleted": "Elemento eliminado",
+    "estimatedTime": "Tiempo estimado (horas)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "Ningún elemento coincide con los filtros actuales",
+    "searchPlaceholder": "Buscar elementos...",
+    "allPriorities": "Todas las prioridades",
+    "allAssignees": "Todos los asignados",
+    "timeEntries": "Registros de tiempo",
+    "noTimeEntries": "Aún no hay registros de tiempo",
+    "editSessions": "Editar sesiones",
+    "session": "sesión",
+    "sessions": "sesiones",
+    "startTime": "Inicio",
+    "endTime": "Fin"
+  },
   "profile": {
     "userProfile": "Usuario",
     "manageAccount": "Gestione la configuración y preferencias de su cuenta",
@@ -936,7 +1010,13 @@
     "updatingTags": "Actualizando...",
     "updateTagsTitle": "Escanear notas en busca de hashtags y actualizar frontmatter",
     "tagsUpdated": "{processed} archivos procesados, {updated} actualizados con nuevas etiquetas",
-    "failedToUpdateTags": "Error al actualizar las etiquetas"
+    "failedToUpdateTags": "Error al actualizar las etiquetas",
+    "historyEnabled": "Historial de notas",
+    "historyDescription": "Registra el historial de versiones de las notas. Permite restaurar versiones anteriores. Solo los guardados manuales crean puntos de historial (no el autoguardado).",
+    "disableHistory": "Desactivar historial",
+    "disableHistoryWarning": "Al desactivar el historial se borrarán permanentemente todas las versiones guardadas de todos los usuarios. No se puede deshacer.",
+    "historyDisabled": "El historial de notas se desactivó y se eliminaron todos los datos de historial.",
+    "failedToDisableHistory": "No se pudo desactivar el historial"
   },
   "errors": {
     "notFound": "No encontrado",
@@ -1133,7 +1213,14 @@
     "excalidrawDescription": "Editor de diagramas tipo boceto",
     "noLanguagesFound": "No se encontraron idiomas",
     "ruler": "Gobernante",
-    "lineNumbers": "Números de línea"
+    "lineNumbers": "Números de línea",
+    "callout": "Aviso",
+    "createCallout": "Crear un bloque de aviso",
+    "changeCalloutType": "Cambiar tipo de aviso",
+    "calloutInfo": "Información",
+    "calloutWarning": "Advertencia",
+    "calloutSuccess": "Éxito",
+    "calloutDanger": "Peligro"
   },
   "sharing": {
     "share": "Compartir",
@@ -1319,7 +1406,8 @@
     "invalidPrivateKeyFormat": "Formato de clave privada inválido. Debe ser una clave PGP ASCII-armada.",
     "keysImportedSuccessfully": "Claves importadas exitosamente",
     "failedToImportKeys": "Error al importar claves",
-    "created": "Cifrado creado"
+    "created": "Cifrado creado",
+    "decrypted": "Descifrado"
   },
   "settingsModal": {
     "sessionOnlyPrefix": "Estas opciones solo se aplican a la sesión actual del navegador. Para configuraciones permanentes, por favor revise sus",
@@ -1505,5 +1593,18 @@
     "actionDelete": "Eliminado",
     "actionInit": "Inicializado",
     "actionUnknown": "Cambiado"
+  },
+  "notifications": {
+    "title": "Notificaciones",
+    "markAllRead": "Marcar todo como leído",
+    "clearAll": "Borrar todo",
+    "empty": "Sin notificaciones",
+    "assignmentTitle": "Tarea asignada a ti",
+    "assignmentMessage": "\"{task}\" en \"{board}\"",
+    "reminderTitle": "Tarea vencida",
+    "reminderMessage": "\"{task}\" en \"{board}\" ya pasó su recordatorio",
+    "unread": "sin leer",
+    "sharingTitle": "{user} compartió un {type} contigo",
+    "sharingMessage": "Abre para ver el {type} compartido"
   }
 }
diff --git a/app/_translations/fr.json b/app/_translations/fr.json
index 2893d9fe..6d7dd057 100644
--- a/app/_translations/fr.json
+++ b/app/_translations/fr.json
@@ -240,7 +240,13 @@
     "copiedToClipboard": "Copié dans le presse-papiers",
     "offline": "Hors ligne",
     "connected": "Connecté",
-    "reconnecting": "Reconnexion..."
+    "reconnecting": "Reconnexion...",
+    "hide": "Masquer",
+    "disable": "Désactiver",
+    "history": "Historique",
+    "items": "Éléments",
+    "noResults": "Aucun résultat",
+    "thisEntry": "cette entrée"
   },
   "auth": {
     "loginTitle": "Connexion",
@@ -274,7 +280,8 @@
     "version": "Version {version}",
     "createUser": "Créer un utilisateur",
     "attemptsRemaining": "Attention : {count, plural, one {# tentative} other {# tentatives}} restantes avant le verrouillage du compte",
-    "accountLocked": "Trop de tentatives échouées. Veuillez réessayer dans {seconds} {seconds, plural, one {seconde} other {secondes}}"
+    "accountLocked": "Trop de tentatives échouées. Veuillez réessayer dans {seconds} {seconds, plural, one {seconde} other {secondes}}",
+    "notAuthorized": "Vous n’êtes pas autorisé à accéder à cette application. Contactez votre administrateur."
   },
   "mfa": {
     "title": "Authentification à deux facteurs",
@@ -374,7 +381,12 @@
     "tags": "Tags",
     "noTagsFound": "Aucun tag trouvé",
     "searchTags": "Rechercher des tags...",
-    "copyRawContent": "Copier markdown"
+    "copyRawContent": "Copier markdown",
+    "printSaveAsPdf": "Imprimer / Enregistrer en PDF",
+    "tableOfContents": "Table des matières",
+    "wordCount": "{count, plural, one {# mot} other {# mots}}",
+    "charCount": "{count, plural, one {# caractère} other {# caractères}}",
+    "readingTime": "{count, plural, one {# minute de lecture} other {# minutes de lecture}}"
   },
   "checklists": {
     "title": "Listes",
@@ -485,7 +497,9 @@
     "noTasks": "Aucune tâche",
     "noSubtasksYet": "Aucune sous‑tâche pour le moment. Ajoutez‑en une ci‑dessous pour commencer.",
     "addTime": "Ajouter du Temps",
-    "enterTimeInMinutes": "Entrez votre temps en minutes"
+    "enterTimeInMinutes": "Entrez votre temps en minutes",
+    "convertToKanbanBoard": "Convertir en tableau Kanban",
+    "kanbanBoard": "Tableau Kanban"
   },
   "tasks": {
     "title": "Tâches",
@@ -528,6 +542,66 @@
     "addStatus": "Ajouter un statut",
     "autoComplete": "Complétion automatique"
   },
+  "kanban": {
+    "priority": "Priorité",
+    "score": "Score",
+    "assignee": "Assigné à",
+    "reminder": "Rappel",
+    "usernamePlaceholder": "nom d'utilisateur",
+    "scoreLabel": "Score : {score}",
+    "today": "Aujourd'hui",
+    "exportIcs": "Exporter .ics",
+    "unscheduled": "Non planifié ({count})",
+    "moreEvents": "+{count} de plus",
+    "critical": "Critique",
+    "high": "Élevé",
+    "medium": "Moyen",
+    "low": "Faible",
+    "none": "Aucun",
+    "weekdaysSun": "Dim",
+    "weekdaysMon": "Lun",
+    "weekdaysTue": "Mar",
+    "weekdaysWed": "Mer",
+    "weekdaysThu": "Jeu",
+    "weekdaysFri": "Ven",
+    "weekdaysSat": "Sam",
+    "title": "Kanban",
+    "calendar": "Calendrier",
+    "boards": "Tableaux",
+    "addItem": "Ajouter un élément",
+    "itemTitle": "Titre de l'élément",
+    "manageStatuses": "Gérer les statuts",
+    "viewArchived": "Voir les archivés",
+    "noBoards": "Aucun tableau trouvé",
+    "noBoardsYet": "Pas encore de tableaux Kanban",
+    "createFirstBoard": "Créez votre premier tableau Kanban pour gérer vos projets.",
+    "newBoard": "Nouveau tableau",
+    "tryAdjustingFilters": "Essayez d'ajuster vos filtres ou créez un nouveau tableau.",
+    "completed": "Terminé",
+    "todo": "À faire",
+    "inProgress": "En cours",
+    "recentBoards": "Tableaux récents",
+    "showAllBoards": "Afficher tous les tableaux",
+    "unassigned": "Non assigné",
+    "targetDate": "Date cible",
+    "statusUpdated": "Statut mis à jour",
+    "itemArchived": "Élément archivé",
+    "itemDeleted": "Élément supprimé",
+    "estimatedTime": "Temps estimé (heures)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "Aucun élément ne correspond aux filtres actuels",
+    "searchPlaceholder": "Rechercher des éléments...",
+    "allPriorities": "Toutes les priorités",
+    "allAssignees": "Tous les assignés",
+    "timeEntries": "Entrées de temps",
+    "noTimeEntries": "Pas encore d’entrées de temps",
+    "editSessions": "Modifier les sessions",
+    "session": "session",
+    "sessions": "sessions",
+    "startTime": "Début",
+    "endTime": "Fin"
+  },
   "profile": {
     "userProfile": "Utilisateur",
     "manageAccount": "Gérez les paramètres et préférences de votre compte",
@@ -936,7 +1010,13 @@
     "updatingTags": "Mise à jour...",
     "updateTagsTitle": "Analyser les notes pour les hashtags et mettre à jour le frontmatter",
     "tagsUpdated": "{processed} fichiers traités, {updated} mis à jour avec de nouveaux tags",
-    "failedToUpdateTags": "Échec de la mise à jour des tags"
+    "failedToUpdateTags": "Échec de la mise à jour des tags",
+    "historyEnabled": "Historique des notes",
+    "historyDescription": "Conserve l’historique des versions des notes. Permet de restaurer des versions antérieures. Seules les sauvegardes manuelles créent des points d’historique (pas l’enregistrement automatique).",
+    "disableHistory": "Désactiver l’historique",
+    "disableHistoryWarning": "Désactiver l’historique supprimera définitivement toutes les versions enregistrées pour tous les utilisateurs. Action irréversible.",
+    "historyDisabled": "L’historique des notes a été désactivé et toutes les données d’historique ont été supprimées.",
+    "failedToDisableHistory": "Échec de la désactivation de l’historique"
   },
   "errors": {
     "notFound": "Introuvable",
@@ -1133,7 +1213,14 @@
     "excalidrawDescription": "Éditeur de diagrammes style croquis",
     "noLanguagesFound": "Aucun langage trouvé",
     "ruler": "Règle",
-    "lineNumbers": "Numéros de ligne"
+    "lineNumbers": "Numéros de ligne",
+    "callout": "Encadré",
+    "createCallout": "Créer un encadré",
+    "changeCalloutType": "Modifier le type d’encadré",
+    "calloutInfo": "Info",
+    "calloutWarning": "Avertissement",
+    "calloutSuccess": "Succès",
+    "calloutDanger": "Danger"
   },
   "sharing": {
     "share": "Partager",
@@ -1505,5 +1592,18 @@
     "actionDelete": "Supprimé",
     "actionInit": "Initialisé",
     "actionUnknown": "Modifié"
+  },
+  "notifications": {
+    "title": "Notifications",
+    "markAllRead": "Marquer tout comme lu",
+    "clearAll": "Tout effacer",
+    "empty": "Aucune notification",
+    "assignmentTitle": "Tâche qui vous est assignée",
+    "assignmentMessage": "\"{task}\" dans \"{board}\"",
+    "reminderTitle": "Tâche en retard",
+    "reminderMessage": "\"{task}\" dans \"{board}\" a dépassé son rappel",
+    "unread": "non lu(s)",
+    "sharingTitle": "{user} a partagé un {type} avec vous",
+    "sharingMessage": "Ouvrez pour voir le {type} partagé"
   }
 }
diff --git a/app/_translations/it.json b/app/_translations/it.json
index 9b9db7e5..fd233420 100644
--- a/app/_translations/it.json
+++ b/app/_translations/it.json
@@ -240,7 +240,13 @@
     "copiedToClipboard": "Copiato negli appunti",
     "offline": "Non in linea",
     "connected": "Collegato",
-    "reconnecting": "Riconnessione..."
+    "reconnecting": "Riconnessione...",
+    "hide": "Nascondi",
+    "disable": "Disattiva",
+    "history": "Cronologia",
+    "items": "Elementi",
+    "noResults": "Nessun risultato",
+    "thisEntry": "questa voce"
   },
   "auth": {
     "loginTitle": "Accedi",
@@ -274,7 +280,8 @@
     "version": "Versione {version}",
     "createUser": "Crea Utente",
     "attemptsRemaining": "Attenzione: {count, plural, one {# tentativo} other {# tentativi}} rimanenti prima del blocco dell'account",
-    "accountLocked": "Troppi tentativi falliti. Riprova tra {seconds} {seconds, plural, one {secondo} other {secondi}}"
+    "accountLocked": "Troppi tentativi falliti. Riprova tra {seconds} {seconds, plural, one {secondo} other {secondi}}",
+    "notAuthorized": "Non sei autorizzato ad accedere a questa applicazione. Contatta l’amministratore."
   },
   "mfa": {
     "title": "Autenticazione a Due Fattori",
@@ -374,7 +381,12 @@
     "tags": "Tag",
     "noTagsFound": "Nessun tag trovato",
     "searchTags": "Cerca tag...",
-    "copyRawContent": "Copia il markdown"
+    "copyRawContent": "Copia il markdown",
+    "printSaveAsPdf": "Stampa / Salva come PDF",
+    "tableOfContents": "Indice",
+    "wordCount": "{count, plural, one {# parola} other {# parole}}",
+    "charCount": "{count, plural, one {# carattere} other {# caratteri}}",
+    "readingTime": "{count, plural, one {# minuto di lettura} other {# minuti di lettura}}"
   },
   "checklists": {
     "title": "Checklist",
@@ -485,7 +497,9 @@
     "noTasks": "Nessun task",
     "noSubtasksYet": "Nessuna attività secondaria. Aggiungine una qui sotto per iniziare.",
     "addTime": "Aggiungi tempo",
-    "enterTimeInMinutes": "Inserisci il tuo tempo in minuti"
+    "enterTimeInMinutes": "Inserisci il tuo tempo in minuti",
+    "convertToKanbanBoard": "Converti in bacheca Kanban",
+    "kanbanBoard": "Bacheca Kanban"
   },
   "tasks": {
     "title": "Attività",
@@ -528,6 +542,66 @@
     "addStatus": "Aggiungi stato",
     "autoComplete": "Complete automaticamente"
   },
+  "kanban": {
+    "priority": "Priorità",
+    "score": "Punteggio",
+    "assignee": "Assegnato a",
+    "reminder": "Promemoria",
+    "usernamePlaceholder": "nome utente",
+    "scoreLabel": "Punteggio: {score}",
+    "today": "Oggi",
+    "exportIcs": "Esporta .ics",
+    "unscheduled": "Non programmato ({count})",
+    "moreEvents": "+{count} altri",
+    "critical": "Critico",
+    "high": "Alto",
+    "medium": "Medio",
+    "low": "Basso",
+    "none": "Nessuno",
+    "weekdaysSun": "Dom",
+    "weekdaysMon": "Lun",
+    "weekdaysTue": "Mar",
+    "weekdaysWed": "Mer",
+    "weekdaysThu": "Gio",
+    "weekdaysFri": "Ven",
+    "weekdaysSat": "Sab",
+    "title": "Kanban",
+    "calendar": "Calendario",
+    "boards": "Board",
+    "addItem": "Aggiungi elemento",
+    "itemTitle": "Titolo elemento",
+    "manageStatuses": "Gestisci stati",
+    "viewArchived": "Visualizza archiviati",
+    "noBoards": "Nessuna board trovata",
+    "noBoardsYet": "Nessuna board Kanban ancora",
+    "createFirstBoard": "Crea la tua prima board Kanban per gestire i tuoi progetti.",
+    "newBoard": "Nuova board",
+    "tryAdjustingFilters": "Prova a modificare i filtri o crea una nuova board.",
+    "completed": "Completato",
+    "todo": "Da fare",
+    "inProgress": "In corso",
+    "recentBoards": "Board recenti",
+    "showAllBoards": "Mostra tutte le board",
+    "unassigned": "Non assegnato",
+    "targetDate": "Data obiettivo",
+    "statusUpdated": "Stato aggiornato",
+    "itemArchived": "Elemento archiviato",
+    "itemDeleted": "Elemento eliminato",
+    "estimatedTime": "Tempo stimato (ore)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "Nessun elemento corrisponde ai filtri attuali",
+    "searchPlaceholder": "Cerca elementi...",
+    "allPriorities": "Tutte le priorità",
+    "allAssignees": "Tutti gli assegnatari",
+    "timeEntries": "Registrazioni tempo",
+    "noTimeEntries": "Nessuna registrazione tempo",
+    "editSessions": "Modifica sessioni",
+    "session": "sessione",
+    "sessions": "sessioni",
+    "startTime": "Inizio",
+    "endTime": "Fine"
+  },
   "profile": {
     "userProfile": "Utente",
     "manageAccount": "Gestisci le impostazioni e preferenze del tuo account",
@@ -936,7 +1010,13 @@
     "updatingTags": "Aggiornamento...",
     "updateTagsTitle": "Scansiona le note per hashtag e aggiorna frontmatter",
     "tagsUpdated": "{processed} file elaborati, {updated} aggiornati con nuovi tag",
-    "failedToUpdateTags": "Impossibile aggiornare i tag"
+    "failedToUpdateTags": "Impossibile aggiornare i tag",
+    "historyEnabled": "Cronologia note",
+    "historyDescription": "Tiene traccia della cronologia delle versioni delle note. Consente di ripristinare versioni precedenti. Solo i salvataggi manuali creano punti nella cronologia (non il salvataggio automatico).",
+    "disableHistory": "Disattiva cronologia",
+    "disableHistoryWarning": "La disattivazione elimina in modo permanente tutte le versioni salvate per tutti gli utenti. Operazione irreversibile.",
+    "historyDisabled": "La cronologia delle note è stata disattivata e tutti i dati di cronologia sono stati eliminati.",
+    "failedToDisableHistory": "Impossibile disattivare la cronologia"
   },
   "errors": {
     "notFound": "Non Trovato",
@@ -1133,7 +1213,14 @@
     "excalidrawDescription": "Editor di diagrammi in stile schizzo",
     "noLanguagesFound": "Nessun linguaggio trovato",
     "ruler": "Righello",
-    "lineNumbers": "Numeri di riga"
+    "lineNumbers": "Numeri di riga",
+    "callout": "Riquadro",
+    "createCallout": "Crea un riquadro informativo",
+    "changeCalloutType": "Cambia tipo di riquadro",
+    "calloutInfo": "Info",
+    "calloutWarning": "Avviso",
+    "calloutSuccess": "Successo",
+    "calloutDanger": "Pericolo"
   },
   "sharing": {
     "share": "Condividi",
@@ -1506,5 +1593,18 @@
     "actionDelete": "Eliminato",
     "actionInit": "Inizializzato",
     "actionUnknown": "Modificato"
+  },
+  "notifications": {
+    "title": "Notifiche",
+    "markAllRead": "Segna tutto letto",
+    "clearAll": "Cancella tutto",
+    "empty": "Nessuna notifica",
+    "assignmentTitle": "Compito assegnato a te",
+    "assignmentMessage": "\"{task}\" in \"{board}\"",
+    "reminderTitle": "Compito in ritardo",
+    "reminderMessage": "\"{task}\" in \"{board}\" ha superato il promemoria",
+    "unread": "non letto",
+    "sharingTitle": "{user} ha condiviso un {type} con te",
+    "sharingMessage": "Apri per vedere il {type} condiviso"
   }
 }
diff --git a/app/_translations/klingon.json b/app/_translations/klingon.json
index 857f4f8b..cd25f309 100644
--- a/app/_translations/klingon.json
+++ b/app/_translations/klingon.json
@@ -243,7 +243,10 @@
     "copiedToClipboard": "De' lI'lu'pu'",
     "offline": "Offline",
     "connected": "Connected",
-    "reconnecting": "Reconnecting..."
+    "reconnecting": "Reconnecting...",
+    "hide": "So'",
+    "items": "chelmey",
+    "thisEntry": "this entry"
   },
   "history": {
     "noteHistory": "ghItlh Qu' tetlh",
@@ -403,7 +406,12 @@
     "updateNote": "ghItlh yIchoH",
     "tags": "meq",
     "noTagsFound": "meqmey tu'be'lu'",
-    "searchTags": "meqmey yInej..."
+    "searchTags": "meqmey yInej...",
+    "printSaveAsPdf": "nagh / PDF rur pol",
+    "tableOfContents": "De'wI' tetlh",
+    "wordCount": "{count, plural, one {# mu'} other {# mu'mey}}",
+    "charCount": "{count, plural, one {# Degh} other {# Deghmey}}",
+    "readingTime": "{count, plural, one {# tup laD} other {# tupmey laD}}"
   },
   "checklists": {
     "title": "tetlhmey",
@@ -514,7 +522,9 @@
     "noTasks": "Qu'mey tu'be'lu'",
     "noSubtasksYet": "Qu'Hommey tu'be'lu'. bItaghmeH wa' yIchel.",
     "addTime": "poH yIchel",
-    "enterTimeInMinutes": "tupmey yIghItlh"
+    "enterTimeInMinutes": "tupmey yIghItlh",
+    "convertToKanbanBoard": "Kanban beQ DachoH",
+    "kanbanBoard": "Kanban beQ"
   },
   "tasks": {
     "title": "Qu'mey",
@@ -557,6 +567,66 @@
     "addStatus": "ghu' yIchel",
     "autoComplete": "nIteb rIn"
   },
+  "kanban": {
+    "priority": "nom mIw",
+    "score": "pong",
+    "assignee": "ghu' ghoS",
+    "reminder": "qeq",
+    "usernamePlaceholder": "lo'wI' pong",
+    "scoreLabel": "pong: {score}",
+    "today": "DaHjaj",
+    "exportIcs": ".ics choH",
+    "unscheduled": "qen wa' ({count})",
+    "moreEvents": "+{count} latlh",
+    "critical": "tIn",
+    "high": "tIn",
+    "medium": "bIng",
+    "low": "bIng",
+    "none": "not",
+    "weekdaysSun": "Sun",
+    "weekdaysMon": "Mon",
+    "weekdaysTue": "Tue",
+    "weekdaysWed": "Wed",
+    "weekdaysThu": "Thu",
+    "weekdaysFri": "Fri",
+    "weekdaysSat": "Sat",
+    "title": "Kanban",
+    "calendar": "jaj qen",
+    "boards": "beQmey",
+    "addItem": "chel yIchel",
+    "itemTitle": "chel pong",
+    "manageStatuses": "ghu'mey yIvu'",
+    "viewArchived": "Pol yIlegh",
+    "noBoards": "beQmey lutu'lu'be'",
+    "noBoardsYet": "Kanban beQmey not yet",
+    "createFirstBoard": "Kanban beQ wa' yIchel 'ej QInmey yIvu'.",
+    "newBoard": "beQ chu'",
+    "tryAdjustingFilters": "Filter yIchoH pagh beQ chu' yIchel.",
+    "completed": "rIn",
+    "todo": "yInob",
+    "inProgress": "QaQ",
+    "recentBoards": "Kanban beQmey rIn",
+    "showAllBoards": "Hoch beQmey yIcha'",
+    "unassigned": "ghu' ghoSbe'",
+    "targetDate": "jaj target",
+    "statusUpdated": "choH pIt",
+    "itemArchived": "Pol",
+    "itemDeleted": "Qaw'pu'",
+    "estimatedTime": "pIq chartoq (rep)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "DoS",
+    "noItemsFound": "vI' pe'mey Hutlh",
+    "searchPlaceholder": "chel yInej...",
+    "allPriorities": "Hoch nom mIw",
+    "allAssignees": "Hoch ghu' ghoS",
+    "timeEntries": "pIq De'",
+    "noTimeEntries": "pIq De' pagh",
+    "editSessions": "meeting yIchoH",
+    "session": "meeting wa'",
+    "sessions": "meeting",
+    "startTime": "qaStaHvIS",
+    "endTime": "bav"
+  },
   "profile": {
     "userProfile": "lo'wI'",
     "manageAccount": "QIn tIghmey yIvu'",
@@ -1526,5 +1596,18 @@
     "goHome": "juH yIghoS",
     "seenCount": "{count} haiku Dalegh",
     "imNoPoet": "bomwI' jIHbe'. mu'mey neH."
+  },
+  "notifications": {
+    "title": "Notifications",
+    "markAllRead": "Mark all read",
+    "clearAll": "Clear all",
+    "empty": "No notifications",
+    "assignmentTitle": "Task assigned to you",
+    "assignmentMessage": "\"{task}\" in \"{board}\"",
+    "reminderTitle": "Task overdue",
+    "reminderMessage": "\"{task}\" in \"{board}\" is past its reminder",
+    "unread": "laDlu'be'",
+    "sharingTitle": "{user} {type} Dajach",
+    "sharingMessage": "{type} yIleghmeH yI'el"
   }
 }
diff --git a/app/_translations/ko.json b/app/_translations/ko.json
index 81d97322..33e6bccb 100644
--- a/app/_translations/ko.json
+++ b/app/_translations/ko.json
@@ -239,7 +239,14 @@
     "retry": "다시 시도",
     "offline": "오프라인",
     "connected": "연결됨",
-    "reconnecting": "다시 연결하는 중..."
+    "reconnecting": "다시 연결하는 중...",
+    "hide": "숨기기",
+    "items": "항목",
+    "clone": "복제",
+    "cloneItem": "{item} 복제",
+    "selectCategoryForClone": "이 항목을 복사할 카테고리를 선택하세요:",
+    "copiedToClipboard": "클립보드에 복사됨",
+    "thisEntry": "이 항목"
   },
   "history": {
     "noteHistory": "노트 기록",
@@ -395,7 +402,16 @@
     "noteNotFound": "노트를 찾을 수 없습니다",
     "unarchiveNote": "노트 보관 해제",
     "enterNoteName": "노트 이름 입력...",
-    "updateNote": "노트 업데이트"
+    "updateNote": "노트 업데이트",
+    "printSaveAsPdf": "인쇄 / PDF로 저장",
+    "tableOfContents": "목차",
+    "wordCount": "{count, plural, one {# 단어} other {# 단어}}",
+    "charCount": "{count, plural, one {# 글자} other {# 글자}}",
+    "readingTime": "{count, plural, one {# 분 읽기} other {# 분 읽기}}",
+    "copyRawContent": "마크다운 복사",
+    "noTagsFound": "태그가 없습니다",
+    "searchTags": "태그 검색...",
+    "tags": "태그"
   },
   "checklists": {
     "title": "체크리스트",
@@ -506,7 +522,9 @@
     "noTasks": "작업이 없습니다",
     "noSubtasksYet": "하위 작업이 없습니다. 아래에서 추가해보세요.",
     "addTime": "시간 추가",
-    "enterTimeInMinutes": "시간을 분 단위로 입력하세요"
+    "enterTimeInMinutes": "시간을 분 단위로 입력하세요",
+    "kanbanBoard": "칸반 보드",
+    "convertToKanbanBoard": "칸반 보드로 변환"
   },
   "tasks": {
     "title": "작업",
@@ -549,6 +567,66 @@
     "addStatus": "상태 추가",
     "autoComplete": "자동 완료"
   },
+  "kanban": {
+    "priority": "우선순위",
+    "score": "점수",
+    "assignee": "담당자",
+    "reminder": "알림",
+    "usernamePlaceholder": "사용자 이름",
+    "scoreLabel": "점수: {score}",
+    "today": "오늘",
+    "exportIcs": ".ics 내보내기",
+    "unscheduled": "일정 없음 ({count})",
+    "moreEvents": "+{count}개 더",
+    "critical": "긴급",
+    "high": "높음",
+    "medium": "보통",
+    "low": "낮음",
+    "none": "없음",
+    "weekdaysSun": "일",
+    "weekdaysMon": "월",
+    "weekdaysTue": "화",
+    "weekdaysWed": "수",
+    "weekdaysThu": "목",
+    "weekdaysFri": "금",
+    "weekdaysSat": "토",
+    "title": "칸반",
+    "calendar": "캘린더",
+    "boards": "보드",
+    "addItem": "항목 추가",
+    "itemTitle": "항목 제목",
+    "manageStatuses": "상태 관리",
+    "viewArchived": "보관된 항목 보기",
+    "noBoards": "보드를 찾을 수 없습니다",
+    "noBoardsYet": "아직 칸반 보드가 없습니다",
+    "createFirstBoard": "프로젝트 관리를 위해 첫 번째 칸반 보드를 만드세요.",
+    "newBoard": "새 보드",
+    "tryAdjustingFilters": "필터를 조정하거나 새 보드를 만드세요.",
+    "completed": "완료",
+    "todo": "할 일",
+    "inProgress": "진행 중",
+    "recentBoards": "최근 보드",
+    "showAllBoards": "모든 보드 표시",
+    "unassigned": "미할당",
+    "targetDate": "목표일",
+    "statusUpdated": "상태가 업데이트됨",
+    "itemArchived": "항목이 보관됨",
+    "itemDeleted": "항목이 삭제됨",
+    "estimatedTime": "예상 시간(시간)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "템포",
+    "noItemsFound": "현재 필터와 일치하는 항목이 없습니다",
+    "searchPlaceholder": "항목 검색...",
+    "allPriorities": "모든 우선순위",
+    "allAssignees": "모든 담당자",
+    "timeEntries": "시간 기록",
+    "noTimeEntries": "시간 기록이 아직 없습니다",
+    "editSessions": "세션 편집",
+    "session": "세션",
+    "sessions": "세션",
+    "startTime": "시작",
+    "endTime": "종료"
+  },
   "profile": {
     "userProfile": "사용자",
     "manageAccount": "계정 설정과 환경설정을 관리하세요",
@@ -956,7 +1034,14 @@
     "deleteUserConfirmAdmin": "사용자 \"{username}\"을(를) 삭제하시겠습니까? 되돌릴 수 없습니다.",
     "failedToUnsharePublicItem": "공개 항목 공유 해제 실패",
     "deleteAccountWarning": "경고: 이 작업은 되돌릴 수 없습니다",
-    "enterPasswordToConfirm": "확인을 위해 비밀번호를 입력하세요"
+    "enterPasswordToConfirm": "확인을 위해 비밀번호를 입력하세요",
+    "tags": "태그",
+    "tagsDescription": "에디터에서 # 트리거로 해시태그 자동 완성을 활성화합니다",
+    "updateTags": "태그 업데이트",
+    "updatingTags": "업데이트 중...",
+    "updateTagsTitle": "노트에서 해시태그를 검색하고 프론트매터를 업데이트합니다",
+    "tagsUpdated": "{processed}개 파일 처리, {updated}개에 새 태그 반영",
+    "failedToUpdateTags": "태그 업데이트에 실패했습니다"
   },
   "errors": {
     "notFound": "찾을 수 없음",
@@ -1511,5 +1596,18 @@
     "goHome": "홈으로 이동",
     "seenCount": "{count} {count, plural, one {하이쿠} other {하이쿠}} 를 보았습니다",
     "imNoPoet": "저는 시인이 아니며 Jotty도 마찬가지입니다. 이는 무작위로 나열된 단어들입니다."
+  },
+  "notifications": {
+    "title": "알림",
+    "markAllRead": "모두 읽은 것으로 표시",
+    "clearAll": "모두 지우기",
+    "empty": "알림 없음",
+    "assignmentTitle": "귀하에게 할당된 작업",
+    "assignmentMessage": "\"{task}\"의 \"{board}\"",
+    "reminderTitle": "작업 기한이 초과됨",
+    "reminderMessage": "\"{board}\"의 \"{task}\"이(가) 알림을 지나갔습니다.",
+    "unread": "읽지 않음",
+    "sharingTitle": "{user} 님이 {type}을(를) 공유했습니다",
+    "sharingMessage": "공유된 {type}을(를) 보려면 열기"
   }
 }
diff --git a/app/_translations/nl.json b/app/_translations/nl.json
index 30c8665a..49b2e10b 100644
--- a/app/_translations/nl.json
+++ b/app/_translations/nl.json
@@ -239,7 +239,14 @@
     "copiedToClipboard": "Gekopieerd naar klembord",
     "offline": "Offline",
     "connected": "Aangesloten",
-    "reconnecting": "Opnieuw verbinding maken..."
+    "reconnecting": "Opnieuw verbinding maken...",
+    "hide": "Verbergen",
+    "disable": "Uitschakelen",
+    "history": "Geschiedenis",
+    "items": "Items",
+    "restoring": "Herstellen...",
+    "retry": "Opnieuw proberen",
+    "thisEntry": "deze invoer"
   },
   "auth": {
     "loginTitle": "Inloggen",
@@ -374,7 +381,12 @@
     "tags": "Tags",
     "noTagsFound": "Geen tags gevonden",
     "searchTags": "Tags zoeken...",
-    "copyRawContent": "Kopieer markdown"
+    "copyRawContent": "Kopieer markdown",
+    "printSaveAsPdf": "Afdrukken / Opslaan als PDF",
+    "tableOfContents": "Inhoudsopgave",
+    "wordCount": "{count, plural, one {# woord} other {# woorden}}",
+    "charCount": "{count, plural, one {# teken} other {# tekens}}",
+    "readingTime": "{count, plural, one {# minuut leestijd} other {# minuten leestijd}}"
   },
   "checklists": {
     "title": "Checklists",
@@ -485,7 +497,9 @@
     "noTasks": "Geen taken",
     "noSubtasksYet": "Nog geen subtaken. Voeg er hieronder een toe om te beginnen.",
     "addTime": "Tijd toevoegen",
-    "enterTimeInMinutes": "Voer uw tijd in minuten in"
+    "enterTimeInMinutes": "Voer uw tijd in minuten in",
+    "convertToKanbanBoard": "Omzetten naar Kanban-bord",
+    "kanbanBoard": "Kanban-bord"
   },
   "tasks": {
     "title": "Taken",
@@ -528,6 +542,66 @@
     "addStatus": "Status toevoegen",
     "autoComplete": "Automatisch voltooien"
   },
+  "kanban": {
+    "priority": "Prioriteit",
+    "score": "Score",
+    "assignee": "Toegewezen aan",
+    "reminder": "Herinnering",
+    "usernamePlaceholder": "gebruikersnaam",
+    "scoreLabel": "Score: {score}",
+    "today": "Vandaag",
+    "exportIcs": "Exporteer .ics",
+    "unscheduled": "Niet gepland ({count})",
+    "moreEvents": "+{count} meer",
+    "critical": "Kritiek",
+    "high": "Hoog",
+    "medium": "Gemiddeld",
+    "low": "Laag",
+    "none": "Geen",
+    "weekdaysSun": "Zo",
+    "weekdaysMon": "Ma",
+    "weekdaysTue": "Di",
+    "weekdaysWed": "Wo",
+    "weekdaysThu": "Do",
+    "weekdaysFri": "Vr",
+    "weekdaysSat": "Za",
+    "title": "Kanban",
+    "calendar": "Kalender",
+    "boards": "Borden",
+    "addItem": "Item toevoegen",
+    "itemTitle": "Itemtitel",
+    "manageStatuses": "Statussen beheren",
+    "viewArchived": "Gearchiveerde bekijken",
+    "noBoards": "Geen borden gevonden",
+    "noBoardsYet": "Nog geen Kanban-borden",
+    "createFirstBoard": "Maak je eerste Kanban-bord om je projecten te beheren.",
+    "newBoard": "Nieuw bord",
+    "tryAdjustingFilters": "Pas je filters aan of maak een nieuw bord.",
+    "completed": "Voltooid",
+    "todo": "Te doen",
+    "inProgress": "Bezig",
+    "recentBoards": "Recente borden",
+    "showAllBoards": "Alle borden tonen",
+    "unassigned": "Niet toegewezen",
+    "targetDate": "Doeldatum",
+    "statusUpdated": "Status bijgewerkt",
+    "itemArchived": "Item gearchiveerd",
+    "itemDeleted": "Item verwijderd",
+    "estimatedTime": "Geschatte tijd (uur)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "Geen items komen overeen met de huidige filters",
+    "searchPlaceholder": "Items zoeken...",
+    "allPriorities": "Alle prioriteiten",
+    "allAssignees": "Alle toegewezen personen",
+    "timeEntries": "Tijdsregistraties",
+    "noTimeEntries": "Nog geen tijdsregistraties",
+    "editSessions": "Sessies bewerken",
+    "session": "sessie",
+    "sessions": "sessies",
+    "startTime": "Start",
+    "endTime": "Einde"
+  },
   "profile": {
     "userProfile": "Gebruiker",
     "manageAccount": "Beheer uw accountinstellingen en voorkeuren",
@@ -936,7 +1010,13 @@
     "updatingTags": "Bijwerken...",
     "updateTagsTitle": "Scan notities op hashtags en update frontmatter",
     "tagsUpdated": "{processed} bestanden verwerkt, {updated} bijgewerkt met nieuwe tags",
-    "failedToUpdateTags": "Tags bijwerken mislukt"
+    "failedToUpdateTags": "Tags bijwerken mislukt",
+    "historyEnabled": "Notitiegeschiedenis",
+    "historyDescription": "Houdt versiegeschiedenis voor notities bij. Hiermee kunt u eerdere versies herstellen. Alleen handmatig opslaan maakt geschiedenispunten (niet autosave).",
+    "disableHistory": "Geschiedenis uitschakelen",
+    "disableHistoryWarning": "Het uitschakelen van de geschiedenis verwijdert permanent alle opgeslagen versies voor alle gebruikers. Dit kan niet ongedaan worden gemaakt.",
+    "historyDisabled": "De notitiegeschiedenis is uitgeschakeld en alle geschiedenisgegevens zijn verwijderd.",
+    "failedToDisableHistory": "Geschiedenis uitschakelen mislukt"
   },
   "errors": {
     "notFound": "Niet gevonden",
@@ -1133,7 +1213,14 @@
     "excalidrawDescription": "Schets-stijl diagrameditor",
     "noLanguagesFound": "Geen talen gevonden",
     "ruler": "Liniaal",
-    "lineNumbers": "Lijnnummers"
+    "lineNumbers": "Lijnnummers",
+    "callout": "Callout",
+    "createCallout": "Calloutblok maken",
+    "changeCalloutType": "Callouttype wijzigen",
+    "calloutInfo": "Info",
+    "calloutWarning": "Waarschuwing",
+    "calloutSuccess": "Gelukt",
+    "calloutDanger": "Gevaar"
   },
   "sharing": {
     "share": "Delen",
@@ -1481,5 +1568,43 @@
     "goHome": "Naar home",
     "seenCount": "U heeft {count} {count, plural, one {haiku} other {haiku's}} gezien",
     "imNoPoet": "Ik ben geen dichter, en Jotty ook niet. Dit zijn willekeurige woorden op een rij."
+  },
+  "notifications": {
+    "title": "Meldingen",
+    "markAllRead": "Markeer alles als gelezen",
+    "clearAll": "Alles wissen",
+    "empty": "Geen meldingen",
+    "assignmentTitle": "Taak die aan jou is toegewezen",
+    "assignmentMessage": "\"{taak}\" in \"{bord}\"",
+    "reminderTitle": "Taak achterstallig",
+    "reminderMessage": "\"{task}\" in \"{board}\" is voorbij de herinnering",
+    "unread": "ongelezen",
+    "sharingTitle": "{user} heeft een {type} met je gedeeld",
+    "sharingMessage": "Open om het gedeelde {type} te bekijken"
+  },
+  "history": {
+    "noteHistory": "Notitiegeschiedenis",
+    "restore": "Herstellen",
+    "restoreVersion": "Versie herstellen",
+    "restoreConfirm": "Deze versie herstellen? De huidige inhoud wordt vervangen.",
+    "noHistory": "Geen geschiedenis beschikbaar",
+    "noHistoryDescription": "Sla je notitie op om een geschiedenispunt aan te maken.",
+    "loadMore": "Meer laden",
+    "featureDisabled": "Geschiedenis uitgeschakeld",
+    "disabledAdmin": "Notitiegeschiedenis is momenteel uitgeschakeld. Je kunt dit inschakelen in Beheerdersinstellingen > Editor.",
+    "disabledUser": "Notitiegeschiedenis is momenteel uitgeschakeld. Neem contact op met je beheerder om deze functie in te schakelen.",
+    "goToSettings": "Naar instellingen",
+    "manualSavesOnly": "Geschiedenis wordt alleen bij handmatig opslaan aangemaakt, niet bij automatisch opslaan.",
+    "fetchError": "Geschiedenis laden mislukt",
+    "restoreError": "Versie herstellen mislukt",
+    "viewContent": "Inhoud bekijken",
+    "viewDiff": "Wijzigingen bekijken",
+    "actionCreate": "Aangemaakt",
+    "actionUpdate": "Bijgewerkt",
+    "actionRename": "Hernoemd",
+    "actionMove": "Verplaatst",
+    "actionDelete": "Verwijderd",
+    "actionInit": "Geïnitialiseerd",
+    "actionUnknown": "Gewijzigd"
   }
 }
diff --git a/app/_translations/pirate.json b/app/_translations/pirate.json
index 881be235..b82c8388 100644
--- a/app/_translations/pirate.json
+++ b/app/_translations/pirate.json
@@ -243,7 +243,10 @@
     "copiedToClipboard": "Scribed to hook",
     "offline": "Offline",
     "connected": "Connected",
-    "reconnecting": "Reconnecting..."
+    "reconnecting": "Reconnecting...",
+    "hide": "Stow away",
+    "items": "Cargo bits",
+    "thisEntry": "this entry"
   },
   "history": {
     "noteHistory": "Log History",
@@ -403,7 +406,12 @@
     "updateNote": "Overhaul Log",
     "tags": "Flags",
     "noTagsFound": "No flags hoist",
-    "searchTags": "Spy for flags..."
+    "searchTags": "Spy for flags...",
+    "printSaveAsPdf": "Print / Save as treasure map",
+    "tableOfContents": "Ship's manifest",
+    "wordCount": "{count, plural, one {# word} other {# words}}",
+    "charCount": "{count, plural, one {# character} other {# characters}}",
+    "readingTime": "{count, plural, one {# minute o' readin'} other {# minutes o' readin'}}"
   },
   "checklists": {
     "title": "Manifests",
@@ -514,7 +522,9 @@
     "noTasks": "No chores",
     "noSubtasksYet": "No small chores yet.",
     "addTime": "Add Sand",
-    "enterTimeInMinutes": "Minutes of sand"
+    "enterTimeInMinutes": "Minutes of sand",
+    "convertToKanbanBoard": "Turn it into a Kanban chart",
+    "kanbanBoard": "Kanban chart"
   },
   "tasks": {
     "title": "Chores",
@@ -557,6 +567,66 @@
     "addStatus": "Add Condition",
     "autoComplete": "Auto finish"
   },
+  "kanban": {
+    "priority": "What matters most",
+    "score": "Booty score",
+    "assignee": "Crew hand",
+    "reminder": "Ship's bell",
+    "usernamePlaceholder": "matey name",
+    "scoreLabel": "Booty: {score}",
+    "today": "This day",
+    "exportIcs": "Export .ics",
+    "unscheduled": "No voyage set ({count})",
+    "moreEvents": "+{count} more",
+    "critical": "All hands!",
+    "high": "High",
+    "medium": "Fair",
+    "low": "Low",
+    "none": "Nay",
+    "weekdaysSun": "Sun",
+    "weekdaysMon": "Mon",
+    "weekdaysTue": "Tue",
+    "weekdaysWed": "Wed",
+    "weekdaysThu": "Thu",
+    "weekdaysFri": "Fri",
+    "weekdaysSat": "Sat",
+    "title": "Kanban",
+    "calendar": "Voyage log",
+    "boards": "Boards",
+    "addItem": "Add cargo",
+    "itemTitle": "Cargo title",
+    "manageStatuses": "Manage conditions",
+    "viewArchived": "Spy the hold",
+    "noBoards": "No boards in sight",
+    "noBoardsYet": "No Kanban boards yet",
+    "createFirstBoard": "Create yer first Kanban board to chart yer projects.",
+    "newBoard": "New board",
+    "tryAdjustingFilters": "Try adjustin' yer filters or make a new board.",
+    "completed": "Done",
+    "todo": "To do",
+    "inProgress": "Under way",
+    "recentBoards": "Recent boards",
+    "showAllBoards": "Show all boards",
+    "unassigned": "No crew assigned",
+    "targetDate": "Target date",
+    "statusUpdated": "Status be updated",
+    "itemArchived": "Item sent to Davy Jones’s hold",
+    "itemDeleted": "Item walked the plank",
+    "estimatedTime": "Estimated hours o’ toil",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "No cargo matches yer filters",
+    "searchPlaceholder": "Search the hold...",
+    "allPriorities": "All priorities",
+    "allAssignees": "All hands",
+    "timeEntries": "Time log entries",
+    "noTimeEntries": "No time entries in the log yet",
+    "editSessions": "Edit watches",
+    "session": "watch",
+    "sessions": "watches",
+    "startTime": "Start o’ bell",
+    "endTime": "End o’ bell"
+  },
   "profile": {
     "userProfile": "Deckhand",
     "manageAccount": "Manage yer papers",
@@ -1523,5 +1593,18 @@
     "goHome": "Sail Home",
     "seenCount": "Ye've heard {count} shanties",
     "imNoPoet": "I ain't no bard, just a pirate."
+  },
+  "notifications": {
+    "title": "Notifications",
+    "markAllRead": "Mark all read",
+    "clearAll": "Clear all",
+    "empty": "No notifications",
+    "assignmentTitle": "Task assigned to you",
+    "assignmentMessage": "\"{task}\" in \"{board}\"",
+    "reminderTitle": "Task overdue",
+    "reminderMessage": "\"{task}\" in \"{board}\" is past its reminder",
+    "unread": "unread",
+    "sharingTitle": "{user} shared a {type} with ye",
+    "sharingMessage": "Open to eyeball the shared {type}"
   }
 }
diff --git a/app/_translations/pl.json b/app/_translations/pl.json
index afb1f8e2..02218a3f 100644
--- a/app/_translations/pl.json
+++ b/app/_translations/pl.json
@@ -241,7 +241,12 @@
     "copiedToClipboard": "Skopiowano do schowka",
     "offline": "Nieaktywny",
     "connected": "Połączony",
-    "reconnecting": "Ponowne łączenie..."
+    "reconnecting": "Ponowne łączenie...",
+    "hide": "Ukryj",
+    "disable": "Wyłącz",
+    "history": "Historia",
+    "items": "Elementy",
+    "thisEntry": "ten wpis"
   },
   "auth": {
     "loginTitle": "Logowanie",
@@ -275,7 +280,8 @@
     "version": "Wersja {version}",
     "createUser": "Utwórz użytkownika",
     "attemptsRemaining": "Uwaga: {count, plural, one {# próba} few {# próby} other {# prób}} pozostało przed zablokowaniem konta",
-    "accountLocked": "Zbyt wiele nieudanych prób. Spróbuj ponownie za {seconds} {seconds, plural, one {sekundę} few {sekundy} other {sekund}}"
+    "accountLocked": "Zbyt wiele nieudanych prób. Spróbuj ponownie za {seconds} {seconds, plural, one {sekundę} few {sekundy} other {sekund}}",
+    "notAuthorized": "Nie masz uprawnień dostępu do tej aplikacji. Skontaktuj się z administratorem."
   },
   "mfa": {
     "title": "Autoryzacja dwuskładnikowa",
@@ -375,7 +381,12 @@
     "tags": "Tagi",
     "noTagsFound": "Nie znaleziono tagów",
     "searchTags": "Szukaj tagów...",
-    "copyRawContent": "Skopiuj markdown"
+    "copyRawContent": "Skopiuj markdown",
+    "printSaveAsPdf": "Drukuj / Zapisz jako PDF",
+    "tableOfContents": "Spis treści",
+    "wordCount": "{count, plural, one {# słowo} few {# słowa} many {# słów} other {# słów}}",
+    "charCount": "{count, plural, one {# znak} few {# znaki} many {# znaków} other {# znaków}}",
+    "readingTime": "{count, plural, one {# minuta czytania} few {# minuty czytania} many {# minut czytania} other {# minut czytania}}"
   },
   "checklists": {
     "title": "Listy",
@@ -486,7 +497,9 @@
     "noTasks": "Brak zadań",
     "noSubtasksYet": "Brak podzadań. Dodaj jedno poniżej, aby zacząć.",
     "addTime": "Dodaj Czas",
-    "enterTimeInMinutes": "Wprowadź czas w minutach"
+    "enterTimeInMinutes": "Wprowadź czas w minutach",
+    "convertToKanbanBoard": "Konwertuj na tablicę Kanban",
+    "kanbanBoard": "Tablica Kanban"
   },
   "tasks": {
     "title": "Zadania",
@@ -529,6 +542,66 @@
     "addStatus": "Dodaj status",
     "autoComplete": "Automatyczne uzupełnienie"
   },
+  "kanban": {
+    "priority": "Priorytet",
+    "score": "Punkty",
+    "assignee": "Przypisany do",
+    "reminder": "Przypomnienie",
+    "usernamePlaceholder": "nazwa użytkownika",
+    "scoreLabel": "Punkty: {score}",
+    "today": "Dzisiaj",
+    "exportIcs": "Eksportuj .ics",
+    "unscheduled": "Niezaplanowane ({count})",
+    "moreEvents": "+{count} więcej",
+    "critical": "Krytyczny",
+    "high": "Wysoki",
+    "medium": "Średni",
+    "low": "Niski",
+    "none": "Brak",
+    "weekdaysSun": "Nd",
+    "weekdaysMon": "Pn",
+    "weekdaysTue": "Wt",
+    "weekdaysWed": "Śr",
+    "weekdaysThu": "Cz",
+    "weekdaysFri": "Pt",
+    "weekdaysSat": "Sb",
+    "title": "Kanban",
+    "calendar": "Kalendarz",
+    "boards": "Tablice",
+    "addItem": "Dodaj element",
+    "itemTitle": "Tytuł elementu",
+    "manageStatuses": "Zarządzaj statusami",
+    "viewArchived": "Pokaż zarchiwizowane",
+    "noBoards": "Nie znaleziono tablic",
+    "noBoardsYet": "Brak tablic Kanban",
+    "createFirstBoard": "Utwórz pierwszą tablicę Kanban, aby zarządzać projektami.",
+    "newBoard": "Nowa tablica",
+    "tryAdjustingFilters": "Dostosuj filtry lub utwórz nową tablicę.",
+    "completed": "Ukończono",
+    "todo": "Do zrobienia",
+    "inProgress": "W trakcie",
+    "recentBoards": "Ostatnie tablice",
+    "showAllBoards": "Pokaż wszystkie tablice",
+    "unassigned": "Nieprzypisany",
+    "targetDate": "Data docelowa",
+    "statusUpdated": "Status zaktualizowany",
+    "itemArchived": "Element zarchiwizowany",
+    "itemDeleted": "Element usunięty",
+    "estimatedTime": "Szacowany czas (godziny)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "Żaden element nie pasuje do bieżących filtrów",
+    "searchPlaceholder": "Szukaj elementów...",
+    "allPriorities": "Wszystkie priorytety",
+    "allAssignees": "Wszyscy przypisani",
+    "timeEntries": "Wpisy czasu",
+    "noTimeEntries": "Brak wpisów czasu",
+    "editSessions": "Edytuj sesje",
+    "session": "sesja",
+    "sessions": "sesje",
+    "startTime": "Początek",
+    "endTime": "Koniec"
+  },
   "profile": {
     "userProfile": "Użytkownik",
     "manageAccount": "Zarządzaj ustawieniami konta i preferencjami",
@@ -937,7 +1010,13 @@
     "updatingTags": "Aktualizowanie...",
     "updateTagsTitle": "Przeskanuj notatki w poszukiwaniu hashtagów i zaktualizuj frontmatter",
     "tagsUpdated": "Przetworzono {processed} plików, zaktualizowano {updated} z nowymi tagami",
-    "failedToUpdateTags": "Nie udało się zaktualizować tagów"
+    "failedToUpdateTags": "Nie udało się zaktualizować tagów",
+    "historyEnabled": "Historia notatek",
+    "historyDescription": "Śledzi historię wersji notatek. Umożliwia przywracanie wcześniejszych wersji. Punkty historii tworzy tylko ręczny zapis (nie autozapis).",
+    "disableHistory": "Wyłącz historię",
+    "disableHistoryWarning": "Wyłączenie historii trwale usunie wszystkie zapisane wersje dla wszystkich użytkowników. Tej operacji nie cofniesz.",
+    "historyDisabled": "Historia notatek została wyłączona, a wszystkie dane historii usunięte.",
+    "failedToDisableHistory": "Nie udało się wyłączyć historii"
   },
   "errors": {
     "notFound": "Nie znaleziono",
@@ -1134,7 +1213,14 @@
     "excalidrawDescription": "Edytor szkicowy",
     "noLanguagesFound": "Nie znaleziono języków",
     "ruler": "Linijka",
-    "lineNumbers": "Numery linii"
+    "lineNumbers": "Numery linii",
+    "callout": "Ramka",
+    "createCallout": "Utwórz blok ramki",
+    "changeCalloutType": "Zmień typ ramki",
+    "calloutInfo": "Informacja",
+    "calloutWarning": "Ostrzeżenie",
+    "calloutSuccess": "Sukces",
+    "calloutDanger": "Zagrożenie"
   },
   "sharing": {
     "share": "Udostępnij",
@@ -1462,7 +1548,8 @@
     "mfaverificationfailed": "Weryfikacja MFA nie powiodła się",
     "mfabackupcodeused": "Użyto kodu kopii zapasowej MFA",
     "mfabackupcodefailed": "Nie udało się użyć kodu kopii zapasowej MFA",
-    "mfabackupcodesregenerated": "Wygenerowano kody kopii zapasowych MFA"
+    "mfabackupcodesregenerated": "Wygenerowano kody kopii zapasowych MFA",
+    "usersettingsupdated": "Zaktualizowano ustawienia użytkownika"
   },
   "help": {
     "howTo": "Jak to zrobić",
@@ -1509,5 +1596,18 @@
     "actionDelete": "Usunięto",
     "actionInit": "Zainicjowano",
     "actionUnknown": "Zmieniono"
+  },
+  "notifications": {
+    "title": "Powiadomienia",
+    "markAllRead": "Zaznacz wszystkie jako przeczytane",
+    "clearAll": "Wyczyść wszystko",
+    "empty": "Brak powiadomień",
+    "assignmentTitle": "Zadanie przydzielone Tobie",
+    "assignmentMessage": "„{task}” w „{board}”",
+    "reminderTitle": "Zadanie przeterminowane",
+    "reminderMessage": "Przypomnienie o zadaniu „{task}” w „{board}” minęło",
+    "unread": "nieprzeczyt.",
+    "sharingTitle": "{user} udostępnił(a) ci {type}",
+    "sharingMessage": "Otwórz, aby zobaczyć udostępniony {type}"
   }
 }
diff --git a/app/_translations/ru.json b/app/_translations/ru.json
index da47f6d4..cd08a3b7 100644
--- a/app/_translations/ru.json
+++ b/app/_translations/ru.json
@@ -240,10 +240,13 @@
     "disable": "Отключить",
     "restoring": "Восстановление...",
     "retry": "Повторить",
+    "hide": "Скрыть",
     "copiedToClipboard": "Скопировано в буфер обмена",
     "offline": "Не в сети",
     "connected": "Подключено",
-    "reconnecting": "Переподключение..."
+    "reconnecting": "Переподключение...",
+    "items": "Элементы",
+    "thisEntry": "эта запись"
   },
   "history": {
     "noteHistory": "История заметки",
@@ -401,6 +404,11 @@
     "unarchiveNote": "Разархивировать заметку",
     "enterNoteName": "Введите название заметки...",
     "updateNote": "Обновить заметку",
+    "printSaveAsPdf": "Печать / Сохранить как PDF",
+    "tableOfContents": "Оглавление",
+    "wordCount": "{count, plural, one {# слово} few {# слова} many {# слов} other {# слов}}",
+    "charCount": "{count, plural, one {# символ} few {# символа} many {# символов} other {# символов}}",
+    "readingTime": "{count, plural, one {# минута чтения} few {# минуты чтения} many {# минут чтения} other {# минут чтения}}",
     "tags": "Теги",
     "noTagsFound": "Теги не найдены",
     "searchTags": "Поиск тегов..."
@@ -514,7 +522,9 @@
     "noTasks": "Нет задач",
     "noSubtasksYet": "Пока нет подзадач. Добавьте одну ниже, чтобы начать.",
     "addTime": "Добавить время",
-    "enterTimeInMinutes": "Введите время в минутах"
+    "enterTimeInMinutes": "Введите время в минутах",
+    "convertToKanbanBoard": "Преобразовать в Kanban-доску",
+    "kanbanBoard": "Kanban-доска"
   },
   "tasks": {
     "title": "Задачи",
@@ -557,6 +567,66 @@
     "addStatus": "Добавить статус",
     "autoComplete": "Автозавершение"
   },
+  "kanban": {
+    "priority": "Приоритет",
+    "score": "Оценка",
+    "assignee": "Исполнитель",
+    "reminder": "Напоминание",
+    "usernamePlaceholder": "имя пользователя",
+    "scoreLabel": "Оценка: {score}",
+    "today": "Сегодня",
+    "exportIcs": "Экспорт .ics",
+    "unscheduled": "Без даты ({count})",
+    "moreEvents": "+{count} ещё",
+    "critical": "Критический",
+    "high": "Высокий",
+    "medium": "Средний",
+    "low": "Низкий",
+    "none": "Нет",
+    "weekdaysSun": "Вс",
+    "weekdaysMon": "Пн",
+    "weekdaysTue": "Вт",
+    "weekdaysWed": "Ср",
+    "weekdaysThu": "Чт",
+    "weekdaysFri": "Пт",
+    "weekdaysSat": "Сб",
+    "title": "Канбан",
+    "calendar": "Календарь",
+    "boards": "Доски",
+    "addItem": "Добавить элемент",
+    "itemTitle": "Название элемента",
+    "manageStatuses": "Управление статусами",
+    "viewArchived": "Просмотр архивных",
+    "noBoards": "Доски не найдены",
+    "noBoardsYet": "Пока нет досок Канбан",
+    "createFirstBoard": "Создайте первую доску Канбан для управления проектами.",
+    "newBoard": "Новая доска",
+    "tryAdjustingFilters": "Измените фильтры или создайте новую доску.",
+    "completed": "Завершено",
+    "todo": "К выполнению",
+    "inProgress": "В процессе",
+    "recentBoards": "Недавние доски",
+    "showAllBoards": "Показать все доски",
+    "unassigned": "Не назначено",
+    "targetDate": "Целевая дата",
+    "statusUpdated": "Статус обновлён",
+    "itemArchived": "Элемент архивирован",
+    "itemDeleted": "Элемент удалён",
+    "estimatedTime": "Оценка времени (часы)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Темп",
+    "noItemsFound": "Нет элементов по текущим фильтрам",
+    "searchPlaceholder": "Поиск элементов...",
+    "allPriorities": "Все приоритеты",
+    "allAssignees": "Все исполнители",
+    "timeEntries": "Записи времени",
+    "noTimeEntries": "Записей времени пока нет",
+    "editSessions": "Редактировать сессии",
+    "session": "сессия",
+    "sessions": "сессии",
+    "startTime": "Начало",
+    "endTime": "Конец"
+  },
   "profile": {
     "userProfile": "Пользователь",
     "manageAccount": "Управляйте настройками и предпочтениями аккаунта",
@@ -1522,5 +1592,18 @@
     "goHome": "На главную",
     "seenCount": "Вы видели {count} {count, plural, one {хайку} few {хайку} many {хайку} other {хайку}}",
     "imNoPoet": "Я не поэт, и Jotty тоже. Это случайные слова в последовательности."
+  },
+  "notifications": {
+    "title": "Уведомления",
+    "markAllRead": "Отметить все прочитанными",
+    "clearAll": "Очистить все",
+    "empty": "Нет уведомлений",
+    "assignmentTitle": "Задача, порученная вам",
+    "assignmentMessage": "«{task}» на «{board}»",
+    "reminderTitle": "Задача просрочена",
+    "reminderMessage": "Напоминание о задаче \"{task}\" на \"{board}\" прошло.",
+    "unread": "непрочит.",
+    "sharingTitle": "{user} поделился(-ась) с вами: {type}",
+    "sharingMessage": "Откройте, чтобы посмотреть общий {type}"
   }
 }
diff --git a/app/_translations/tr.json b/app/_translations/tr.json
index b772b1dd..543b1763 100644
--- a/app/_translations/tr.json
+++ b/app/_translations/tr.json
@@ -240,7 +240,13 @@
     "disable": "Devre Dışı Bırak",
     "restoring": "Geri yükleniyor...",
     "retry": "Tekrar Dene",
-    "copiedToClipboard": "Panoya kopyalandı"
+    "copiedToClipboard": "Panoya kopyalandı",
+    "hide": "Gizle",
+    "items": "Öğeler",
+    "connected": "Bağlı",
+    "offline": "Çevrimdışı",
+    "reconnecting": "Yeniden bağlanıyor...",
+    "thisEntry": "bu giriş"
   },
   "history": {
     "noteHistory": "Not Geçmişi",
@@ -400,7 +406,12 @@
     "updateNote": "Notu Güncelle",
     "tags": "Etiketler",
     "noTagsFound": "Etiket bulunamadı",
-    "searchTags": "Etiketlerde ara..."
+    "searchTags": "Etiketlerde ara...",
+    "printSaveAsPdf": "Yazdır / PDF olarak kaydet",
+    "tableOfContents": "İçindekiler",
+    "wordCount": "{count, plural, one {# kelime} other {# kelime}}",
+    "charCount": "{count, plural, one {# karakter} other {# karakter}}",
+    "readingTime": "{count, plural, one {# dakika okuma} other {# dakika okuma}}"
   },
   "checklists": {
     "title": "Listeleri",
@@ -511,7 +522,9 @@
     "noTasks": "Görev yok",
     "noSubtasksYet": "Henüz alt görev yok. Başlamak için aşağıdan bir tane ekleyin.",
     "addTime": "Süre Ekle",
-    "enterTimeInMinutes": "Süreyi dakika cinsinden girin"
+    "enterTimeInMinutes": "Süreyi dakika cinsinden girin",
+    "convertToKanbanBoard": "Kanban panosuna dönüştür",
+    "kanbanBoard": "Kanban panosu"
   },
   "tasks": {
     "title": "Görevler",
@@ -554,6 +567,66 @@
     "addStatus": "Durum ekle",
     "autoComplete": "Otomatik tamamla"
   },
+  "kanban": {
+    "priority": "Öncelik",
+    "score": "Puan",
+    "assignee": "Atanan",
+    "reminder": "Hatırlatıcı",
+    "usernamePlaceholder": "kullanıcı adı",
+    "scoreLabel": "Puan: {score}",
+    "today": "Bugün",
+    "exportIcs": ".ics dışa aktar",
+    "unscheduled": "Planlanmamış ({count})",
+    "moreEvents": "+{count} daha",
+    "critical": "Kritik",
+    "high": "Yüksek",
+    "medium": "Orta",
+    "low": "Düşük",
+    "none": "Yok",
+    "weekdaysSun": "Paz",
+    "weekdaysMon": "Pzt",
+    "weekdaysTue": "Sal",
+    "weekdaysWed": "Çar",
+    "weekdaysThu": "Per",
+    "weekdaysFri": "Cum",
+    "weekdaysSat": "Cmt",
+    "title": "Kanban",
+    "calendar": "Takvim",
+    "boards": "Panolar",
+    "addItem": "Öğe ekle",
+    "itemTitle": "Öğe başlığı",
+    "manageStatuses": "Durumları yönet",
+    "viewArchived": "Arşivlenenleri görüntüle",
+    "noBoards": "Pano bulunamadı",
+    "noBoardsYet": "Henüz Kanban panosu yok",
+    "createFirstBoard": "Projelerinizi yönetmek için ilk Kanban panonuzu oluşturun.",
+    "newBoard": "Yeni pano",
+    "tryAdjustingFilters": "Filtrelerinizi ayarlayın veya yeni bir pano oluşturun.",
+    "completed": "Tamamlandı",
+    "todo": "Yapılacak",
+    "inProgress": "Devam ediyor",
+    "recentBoards": "Son panolar",
+    "showAllBoards": "Tüm panoları göster",
+    "unassigned": "Atanmamış",
+    "targetDate": "Hedef tarih",
+    "statusUpdated": "Durum güncellendi",
+    "itemArchived": "Öğe arşivlendi",
+    "itemDeleted": "Öğe silindi",
+    "estimatedTime": "Tahmini süre (saat)",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "Tempo",
+    "noItemsFound": "Mevcut filtrelere uyan öğe yok",
+    "searchPlaceholder": "Öğe ara...",
+    "allPriorities": "Tüm öncelikler",
+    "allAssignees": "Tüm atananlar",
+    "timeEntries": "Zaman kayıtları",
+    "noTimeEntries": "Henüz zaman kaydı yok",
+    "editSessions": "Oturumları düzenle",
+    "session": "oturum",
+    "sessions": "oturum",
+    "startTime": "Başlangıç",
+    "endTime": "Bitiş"
+  },
   "profile": {
     "userProfile": "Kullanıcı Profili",
     "manageAccount": "Hesap ayarlarınızı ve tercihlerinizi yönetin",
@@ -778,7 +851,12 @@
     "codeBlockChoice": "Kod bloğu stilini seçin",
     "themedCodeBlock": "Temalı kod bloğu",
     "defaultCodeBlock": "Kodlayıcı (varsayılan)",
-    "codeBlockChoiceDescription": "Codepen benzeri varsayılan kod bloğu stili veya temalı kod bloğu stili arasında seçim yapın."
+    "codeBlockChoiceDescription": "Codepen benzeri varsayılan kod bloğu stili veya temalı kod bloğu stili arasında seçim yapın.",
+    "hideConnectionIndicatorDescription": "Logo alanındaki websocket bağlantı göstergesini gizler. Bu ayara bakılmadan, çevrimdışıysenız kırmızı noktayı görmeye devam edersiniz.",
+    "selectConnectionIndicator": "Bağlantı göstergesi durumunu seçin",
+    "showIndicator": "Göstergeyi göster",
+    "hideIndicator": "Göstergeyi gizle",
+    "hideConnectionIndicator": "Logodaki bağlantı göstergesini gizle"
   },
   "admin": {
     "title": "Yönetici",
@@ -1167,7 +1245,9 @@
     "calloutInfo": "Bilgi",
     "calloutWarning": "Uyarı",
     "calloutSuccess": "Başarılı",
-    "calloutDanger": "Tehlike"
+    "calloutDanger": "Tehlike",
+    "lineNumbers": "Satır numaraları",
+    "ruler": "Cetvel"
   },
   "sharing": {
     "share": "Paylaş",
@@ -1514,5 +1594,18 @@
     "goHome": "Ana Sayfaya Git",
     "seenCount": "{count} adet {count, plural, one {haiku} other {haiku}} gördünüz",
     "imNoPoet": "Ben bir şair değilim, Jotty de değil. Bunlar sadece sırayla dizilmiş rastgele kelimelerdir."
+  },
+  "notifications": {
+    "title": "Bildirimler",
+    "markAllRead": "Tümünü okundu olarak işaretle",
+    "clearAll": "Tümünü temizle",
+    "empty": "Bildirim yok",
+    "assignmentTitle": "Size verilen görev",
+    "assignmentMessage": "\"{board}\" içindeki \"{task}\"",
+    "reminderTitle": "Görev gecikti",
+    "reminderMessage": "\"{board}\" içindeki \"{task}\" hatırlatıcısının tarihi geçti",
+    "unread": "okunmadı",
+    "sharingTitle": "{user} sizinle bir {type} paylaştı",
+    "sharingMessage": "Paylaşılan {type} öğesini görmek için açın"
   }
 }
diff --git a/app/_translations/zh.json b/app/_translations/zh.json
index 80d65e3b..e03d6422 100644
--- a/app/_translations/zh.json
+++ b/app/_translations/zh.json
@@ -243,7 +243,10 @@
     "copiedToClipboard": "已复制到剪贴板",
     "offline": "离线",
     "connected": "已连接",
-    "reconnecting": "正在重新连接..."
+    "reconnecting": "正在重新连接...",
+    "hide": "隐藏",
+    "items": "项目",
+    "thisEntry": "这个条目"
   },
   "history": {
     "noteHistory": "笔记历史",
@@ -403,7 +406,12 @@
     "tags": "标签",
     "noTagsFound": "未找到标签",
     "searchTags": "搜索标签...",
-    "copyRawContent": "复制降价"
+    "copyRawContent": "复制降价",
+    "printSaveAsPdf": "打印 / 另存为PDF",
+    "tableOfContents": "目录",
+    "wordCount": "{count, plural, one {# 个字} other {# 个字}}",
+    "charCount": "{count, plural, one {# 个字符} other {# 个字符}}",
+    "readingTime": "{count, plural, one {# 分钟阅读} other {# 分钟阅读}}"
   },
   "checklists": {
     "title": "清单",
@@ -514,7 +522,9 @@
     "noTasks": "无任务",
     "noSubtasksYet": "暂无子任务。在下方添加一个以开始。",
     "addTime": "添加时间",
-    "enterTimeInMinutes": "输入时间（分钟）"
+    "enterTimeInMinutes": "输入时间（分钟）",
+    "convertToKanbanBoard": "转换为看板",
+    "kanbanBoard": "看板"
   },
   "tasks": {
     "title": "任务",
@@ -557,6 +567,66 @@
     "addStatus": "添加状态",
     "autoComplete": "自动完成"
   },
+  "kanban": {
+    "priority": "优先级",
+    "score": "分数",
+    "assignee": "负责人",
+    "reminder": "提醒",
+    "usernamePlaceholder": "用户名",
+    "scoreLabel": "分数：{score}",
+    "today": "今天",
+    "exportIcs": "导出 .ics",
+    "unscheduled": "未安排（{count}）",
+    "moreEvents": "+{count} 更多",
+    "critical": "紧急",
+    "high": "高",
+    "medium": "中",
+    "low": "低",
+    "none": "无",
+    "weekdaysSun": "日",
+    "weekdaysMon": "一",
+    "weekdaysTue": "二",
+    "weekdaysWed": "三",
+    "weekdaysThu": "四",
+    "weekdaysFri": "五",
+    "weekdaysSat": "六",
+    "title": "看板",
+    "calendar": "日历",
+    "boards": "看板",
+    "addItem": "添加项目",
+    "itemTitle": "项目标题",
+    "manageStatuses": "管理状态",
+    "viewArchived": "查看已归档",
+    "noBoards": "未找到看板",
+    "noBoardsYet": "暂无看板",
+    "createFirstBoard": "创建您的第一个看板以开始管理项目。",
+    "newBoard": "新建看板",
+    "tryAdjustingFilters": "尝试调整筛选条件或创建新看板。",
+    "completed": "已完成",
+    "todo": "待办",
+    "inProgress": "进行中",
+    "recentBoards": "最近看板",
+    "showAllBoards": "显示所有看板",
+    "unassigned": "未分配",
+    "targetDate": "目标日期",
+    "statusUpdated": "状态已更新",
+    "itemArchived": "项目已归档",
+    "itemDeleted": "项目已删除",
+    "estimatedTime": "预估时间（小时）",
+    "actualVsEstimated": "{actual} / {estimated}",
+    "tempo": "节拍",
+    "noItemsFound": "没有符合当前筛选条件的项目",
+    "searchPlaceholder": "搜索项目...",
+    "allPriorities": "所有优先级",
+    "allAssignees": "所有负责人",
+    "timeEntries": "时间记录",
+    "noTimeEntries": "还没有时间记录",
+    "editSessions": "编辑记录时段",
+    "session": "记录",
+    "sessions": "记录",
+    "startTime": "开始",
+    "endTime": "结束"
+  },
   "profile": {
     "userProfile": "用户",
     "manageAccount": "管理您的账户设置和偏好",
@@ -1526,5 +1596,18 @@
     "goHome": "回首页",
     "seenCount": "您已看过 {count} {count, plural, one {首俳句} other {首俳句}}",
     "imNoPoet": "我非诗人，Jotty 亦非。此乃随机词序。"
+  },
+  "notifications": {
+    "title": "通知",
+    "markAllRead": "标记全部已读",
+    "clearAll": "全部清除",
+    "empty": "没有通知",
+    "assignmentTitle": "分配给您的任务",
+    "assignmentMessage": "“{board}”中的“{task}”",
+    "reminderTitle": "任务逾期",
+    "reminderMessage": "“{board}”中的“{task}”已超过提醒时间",
+    "unread": "未读",
+    "sharingTitle": "{user} 与你共享了{type}",
+    "sharingMessage": "打开以查看共享的{type}"
   }
 }
diff --git a/app/_types/checklist.ts b/app/_types/checklist.ts
index 6790b654..3c2c0f75 100644
--- a/app/_types/checklist.ts
+++ b/app/_types/checklist.ts
@@ -1,12 +1,20 @@
 import { ItemTypes } from "./enums";
 
-export type ChecklistType = "simple" | "task";
+export type ChecklistType = "simple" | "task" | "kanban";
+
+export type KanbanPriority = "critical" | "high" | "medium" | "low" | "none";
+
+export interface KanbanReminder {
+  datetime: string;
+  notified?: boolean;
+}
 
 export interface TimeEntry {
   id: string;
   startTime: string;
   endTime?: string;
   duration?: number;
+  user?: string;
 }
 
 export interface RecurrenceRule {
@@ -53,6 +61,10 @@ export interface Item {
   archivedAt?: string;
   archivedBy?: string;
   previousStatus?: string;
+  priority?: KanbanPriority;
+  score?: number;
+  assignee?: string;
+  reminder?: KanbanReminder;
 }
 
 export interface List {
diff --git a/app/_types/enums.ts b/app/_types/enums.ts
index 4284a079..a8e45ce5 100644
--- a/app/_types/enums.ts
+++ b/app/_types/enums.ts
@@ -13,6 +13,22 @@ export enum ItemTypes {
 export enum ChecklistsTypes {
   SIMPLE = "simple",
   TASK = "task",
+  KANBAN = "kanban",
+}
+
+/**
+ * @fccview here, we need to @deprecate "task" eventually, it's unused in all create/edit operations but it's still used
+ * in read operation for backward compatibility with old kanban data.
+ */
+export const isKanbanType = (type?: string): boolean =>
+  type === "kanban" || type === "task";
+
+export enum KanbanPriorityLevel {
+  CRITICAL = "critical",
+  HIGH = "high",
+  MEDIUM = "medium",
+  LOW = "low",
+  NONE = "none",
 }
 
 export enum TaskStatus {
@@ -54,4 +70,4 @@ export enum ProfileTabs {
   ENCRYPTION = "encryption",
   USER_PREFERENCES = "userPreferences",
   AUDIT_LOGS = "audit_logs",
-}
\ No newline at end of file
+}
diff --git a/app/_types/index.ts b/app/_types/index.ts
index 044a351b..57fc2c21 100644
--- a/app/_types/index.ts
+++ b/app/_types/index.ts
@@ -2,6 +2,8 @@ export type { ItemType, Result, SharingPermissions } from "./core";
 
 export type {
   ChecklistType,
+  KanbanPriority,
+  KanbanReminder,
   TimeEntry,
   RecurrenceRule,
   StatusChange,
@@ -88,3 +90,5 @@ export type { AppMode, ContentFilter, AppModeContextType } from "./context";
 export type { WsEvent } from "./websocket";
 
 export type { GetNotesOptions, GetChecklistsOptions } from "./options";
+
+export type { AppNotification, AppNotificationData, NotificationType } from "./notifications";
diff --git a/app/_types/notifications.ts b/app/_types/notifications.ts
new file mode 100644
index 00000000..9748b930
--- /dev/null
+++ b/app/_types/notifications.ts
@@ -0,0 +1,18 @@
+export type NotificationType = "reminder" | "assignment" | "sharing" | "system";
+
+export interface AppNotificationData {
+  itemId: string;
+  itemType: "checklist" | "note";
+  taskId?: string;
+}
+
+export interface AppNotification {
+  id: string;
+  type: NotificationType;
+  title: string;
+  message: string;
+  createdAt: string;
+  readAt?: string;
+  link?: string;
+  data?: AppNotificationData;
+}
diff --git a/app/_types/user.ts b/app/_types/user.ts
index 56b0e40e..e0883aba 100644
--- a/app/_types/user.ts
+++ b/app/_types/user.ts
@@ -83,7 +83,7 @@ export interface Session {
   ipAddress: string;
   lastActivity: string;
   isCurrent: boolean;
-  loginType?: "local" | "sso" | "pending-mfa";
+  loginType?: "local" | "sso" | "pending-mfa" | "ldap";
 }
 
 export type SanitisedUser = Omit<
diff --git a/app/_types/websocket.ts b/app/_types/websocket.ts
index a183aa5b..ae9bc2d7 100644
--- a/app/_types/websocket.ts
+++ b/app/_types/websocket.ts
@@ -1,5 +1,5 @@
 export interface WsEvent {
-  type: "checklist" | "note" | "category" | "settings" | "sharing";
+  type: "checklist" | "note" | "category" | "settings" | "sharing" | "notification";
   action: "created" | "updated" | "deleted";
   entityId?: string;
   username: string;
diff --git a/app/_utils/checklist-utils.ts b/app/_utils/checklist-utils.ts
index 4194aaf3..dbf2963e 100644
--- a/app/_utils/checklist-utils.ts
+++ b/app/_utils/checklist-utils.ts
@@ -1,7 +1,7 @@
 import path from "path";
-import { Item } from "@/app/_types";
+import { Item, KanbanPriority, KanbanReminder } from "@/app/_types";
 import { Checklist, ChecklistType } from "@/app/_types";
-import { ChecklistsTypes, TaskStatus } from "@/app/_types/enums";
+import { ChecklistsTypes, isKanbanType, TaskStatus } from "@/app/_types/enums";
 import {
   parseRecurrenceFromMarkdown,
   recurrenceToMarkdown,
@@ -16,7 +16,10 @@ import {
 import { extractHashtagsFromContent, normalizeTag } from "./tag-utils";
 
 export const isItemCompleted = (item: Item, checklistType: string): boolean => {
-  if (checklistType === ChecklistsTypes.TASK) {
+  if (
+    checklistType === ChecklistsTypes.KANBAN ||
+    checklistType === ChecklistsTypes.TASK
+  ) {
     return item.status === TaskStatus.COMPLETED || !!item.completed;
   }
   return !!item.completed;
@@ -41,28 +44,33 @@ export const formatTime = (seconds: number): string => {
 
 export const countItems = (
   items: Item[],
-  checklistType?: string
+  checklistType?: string,
 ): { total: number; completed: number } =>
-  items.reduce((acc, item) => {
-    if (item.isArchived) return acc;
+  items.reduce(
+    (acc, item) => {
+      if (item.isArchived) return acc;
+
+      if (item.children && item.children.length > 0) {
+        const childCounts = countItems(item.children, checklistType);
+        return {
+          total: acc.total + childCounts.total,
+          completed: acc.completed + childCounts.completed,
+        };
+      }
 
-    if (item.children && item.children.length > 0) {
-      const childCounts = countItems(item.children, checklistType);
       return {
-        total: acc.total + childCounts.total,
-        completed: acc.completed + childCounts.completed,
+        total: acc.total + 1,
+        completed: isItemCompleted(item, checklistType || "")
+          ? acc.completed + 1
+          : acc.completed,
       };
-    }
-
-    return {
-      total: acc.total + 1,
-      completed: isItemCompleted(item, checklistType || "") ? acc.completed + 1 : acc.completed,
-    };
-  }, { total: 0, completed: 0 });
+    },
+    { total: 0, completed: 0 },
+  );
 
 export const getCompletionRate = (
   items: Item[],
-  checklistType?: string
+  checklistType?: string,
 ): number => {
   const { total, completed } = countItems(items, checklistType);
   if (total === 0) return 0;
@@ -76,23 +84,23 @@ export const parseMarkdown = (
   owner?: string,
   isShared?: boolean,
   fileStats?: { birthtime: Date; mtime: Date },
-  fileName?: string
+  fileName?: string,
 ): Checklist => {
   const { metadata, contentWithoutMetadata } = extractYamlMetadata(content);
 
   let title = extractTitle(
     content,
-    fileName ? path.basename(fileName, ".md") : undefined
+    fileName ? path.basename(fileName, ".md") : undefined,
   );
 
   const type = extractChecklistType(content);
 
   const checklistType =
-    type === "task" ? ChecklistsTypes.TASK : ChecklistsTypes.SIMPLE;
+    type === "kanban" ? ChecklistsTypes.KANBAN : ChecklistsTypes.SIMPLE;
 
   const lines = contentWithoutMetadata.split("\n");
   const itemLines = lines.filter(
-    (line) => line.trim().startsWith("- [") || /^\s*- \[/.test(line)
+    (line) => line.trim().startsWith("- [") || /^\s*- \[/.test(line),
   );
 
   let globalItemCounter = 0;
@@ -104,7 +112,7 @@ export const parseMarkdown = (
     lines: string[],
     startIndex: number = 0,
     parentLevel: number = 0,
-    itemIndex: number = 0
+    itemIndex: number = 0,
   ): { items: Item[]; nextIndex: number } => {
     const items: Item[] = [];
     let currentIndex = startIndex;
@@ -158,7 +166,7 @@ export const parseMarkdown = (
         let item: Item;
         let recurrence = undefined;
 
-        if (type === "task" && text.includes(" | ")) {
+        if (type === "kanban" && text.includes(" | ")) {
           const parts = text.split(" | ");
           const itemText = parts[0].replace(/∣/g, "|");
           const metadata = parts.slice(1);
@@ -169,6 +177,10 @@ export const parseMarkdown = (
           let targetDate: string | undefined;
           let description: string | undefined;
           let itemMetadata: Record<string, any> = {};
+          let priority: KanbanPriority | undefined;
+          let score: number | undefined;
+          let assignee: string | undefined;
+          let reminder: KanbanReminder | undefined;
 
           metadata.forEach((meta) => {
             if (meta.startsWith("status:")) {
@@ -196,6 +208,18 @@ export const parseMarkdown = (
               }
             } else if (meta.startsWith("recurrence:")) {
               recurrence = parseRecurrenceFromMarkdown([meta]);
+            } else if (meta.startsWith("priority:")) {
+              priority = meta.substring(9) as KanbanPriority;
+            } else if (meta.startsWith("score:")) {
+              score = parseInt(meta.substring(6));
+            } else if (meta.startsWith("assignee:")) {
+              assignee = meta.substring(9);
+            } else if (meta.startsWith("reminder:")) {
+              try {
+                reminder = JSON.parse(meta.substring(9));
+              } catch {
+                reminder = { datetime: meta.substring(9) };
+              }
             }
           });
 
@@ -211,6 +235,10 @@ export const parseMarkdown = (
             description,
             ...itemMetadata,
             ...(recurrence ? { recurrence } : {}),
+            ...(priority ? { priority } : {}),
+            ...(score !== undefined ? { score } : {}),
+            ...(assignee ? { assignee } : {}),
+            ...(reminder ? { reminder } : {}),
           };
         } else {
           let itemText = text.replace(/∣/g, "|");
@@ -253,7 +281,7 @@ export const parseMarkdown = (
           lines,
           currentIndex + 1,
           parentLevel + 1,
-          0
+          0,
         );
         if (nestedResult.items.length > 0) {
           item.children = nestedResult.items;
@@ -327,13 +355,13 @@ export const parseMarkdown = (
 const generateItemMarkdown = (
   item: Item,
   type: ChecklistType,
-  indentLevel: number = 0
+  indentLevel: number = 0,
 ): string => {
   const indent = "  ".repeat(indentLevel);
   const escapedText = item.text.replace(/\|/g, "∣");
 
   let itemLine: string;
-  if (type === "task") {
+  if (isKanbanType(type)) {
     const metadata: string[] = [];
 
     if (item.status && item.status !== TaskStatus.TODO) {
@@ -387,12 +415,29 @@ const generateItemMarkdown = (
       metadata.push(...recurrenceParts);
     }
 
+    if (item.priority && item.priority !== "none") {
+      metadata.push(`priority:${item.priority}`);
+    }
+
+    if (item.score !== undefined) {
+      metadata.push(`score:${item.score}`);
+    }
+
+    if (item.assignee) {
+      metadata.push(`assignee:${item.assignee}`);
+    }
+
+    if (item.reminder) {
+      metadata.push(`reminder:${JSON.stringify(item.reminder)}`);
+    }
+
     if (Object.keys(itemMetadata).length > 0) {
       metadata.push(`metadata:${JSON.stringify(itemMetadata)}`);
     }
 
-    itemLine = `${indent}- [${item.completed ? "x" : " "
-      }] ${escapedText} | ${metadata.join(" | ")}`;
+    itemLine = `${indent}- [${
+      item.completed ? "x" : " "
+    }] ${escapedText} | ${metadata.join(" | ")}`;
   } else {
     const itemMetadata: Record<string, any> = {};
     if (item.id) {
@@ -427,6 +472,18 @@ const generateItemMarkdown = (
     if (item.targetDate) {
       itemMetadata.targetDate = item.targetDate;
     }
+    if (item.priority && item.priority !== "none") {
+      itemMetadata.priority = item.priority;
+    }
+    if (item.score !== undefined) {
+      itemMetadata.score = item.score;
+    }
+    if (item.assignee) {
+      itemMetadata.assignee = item.assignee;
+    }
+    if (item.reminder) {
+      itemMetadata.reminder = item.reminder;
+    }
 
     const metadata: string[] = [];
 
@@ -443,8 +500,9 @@ const generateItemMarkdown = (
       metadata.push(...recurrenceParts);
     }
 
-    itemLine = `${indent}- [${item.completed ? "x" : " "}] ${escapedText}${metadata.length ? ` | ${metadata.join(" | ")}` : ""
-      }`;
+    itemLine = `${indent}- [${item.completed ? "x" : " "}] ${escapedText}${
+      metadata.length ? ` | ${metadata.join(" | ")}` : ""
+    }`;
   }
 
   if (item.children && item.children.length > 0) {
@@ -462,7 +520,9 @@ export const listToMarkdown = (list: Checklist): string => {
   const metadata: any = {};
   metadata.uuid = list.uuid || generateUuid();
   metadata.title = list.title || "Untitled Checklist";
-  if (list.type === ChecklistsTypes.TASK) metadata.checklistType = "task";
+  if (list.type === ChecklistsTypes.KANBAN) metadata.checklistType = "kanban";
+  else if (list.type === ChecklistsTypes.TASK)
+    metadata.checklistType = "kanban";
   else if (list.type === ChecklistsTypes.SIMPLE)
     metadata.checklistType = "simple";
 
diff --git a/app/_utils/client-parser-utils.ts b/app/_utils/client-parser-utils.ts
index 5003655b..996468f8 100644
--- a/app/_utils/client-parser-utils.ts
+++ b/app/_utils/client-parser-utils.ts
@@ -4,15 +4,17 @@ import {
   Item,
   ChecklistType,
   KanbanStatus,
+  KanbanPriority,
+  KanbanReminder,
 } from "@/app/_types";
 
-import { TaskStatus } from "@/app/_types/enums";
+import { ChecklistsTypes, isKanbanType, TaskStatus } from "@/app/_types/enums";
 import { parseRecurrenceFromMarkdown } from "@/app/_utils/recurrence-utils";
 import { extractYamlMetadata } from "./yaml-metadata-utils";
 
 export const parseChecklistContent = (
   rawContent: string,
-  id: string
+  id: string,
 ): {
   title: string;
   items: Item[];
@@ -31,18 +33,20 @@ export const parseChecklistContent = (
 
   const checklistType =
     metadata?.checklistType ||
-    (rawContent.includes("<!-- type:task -->") ? "task" : "simple");
+    (rawContent.includes("<!-- type:task -->")
+      ? ChecklistsTypes.TASK
+      : ChecklistsTypes.SIMPLE);
 
   const lines = contentWithoutMetadata.split("\n");
   const itemLines = lines.filter(
-    (line) => line.trim().startsWith("- [") || /^\s*- \[/.test(line)
+    (line) => line.trim().startsWith("- [") || /^\s*- \[/.test(line),
   );
 
   const buildNestedItems = (
     lines: string[],
     startIndex: number = 0,
     parentLevel: number = 0,
-    itemIndex: number = 0
+    itemIndex: number = 0,
   ): { items: Item[]; nextIndex: number } => {
     const items: Item[] = [];
     let currentIndex = startIndex;
@@ -96,7 +100,7 @@ export const parseChecklistContent = (
         let item: Item;
         let recurrence = undefined;
 
-        const isTask = checklistType === "task";
+        const isTask = isKanbanType(checklistType);
 
         if (isTask && text.includes(" | ")) {
           const parts = text.split(" | ");
@@ -108,7 +112,11 @@ export const parseChecklistContent = (
           let estimatedTime: number | undefined;
           let targetDate: string | undefined;
           let description: string | undefined;
-          let itemMetadata: Record<string, any> = {};
+          let itemMetadata: Record<string, unknown> = {};
+          let priority: KanbanPriority | undefined;
+          let score: number | undefined;
+          let assignee: string | undefined;
+          let reminder: KanbanReminder | undefined;
 
           metadataParts.forEach((meta) => {
             if (meta.startsWith("status:")) {
@@ -130,17 +138,33 @@ export const parseChecklistContent = (
               description = meta.substring(12).replace(/∣/g, "|");
             } else if (meta.startsWith("metadata:")) {
               try {
-                itemMetadata = JSON.parse(meta.substring(9));
+                itemMetadata = JSON.parse(meta.substring(9)) as Record<
+                  string,
+                  unknown
+                >;
               } catch (e) {
                 console.warn("Failed to parse item metadata:", e);
               }
             } else if (meta.startsWith("recurrence:")) {
               recurrence = parseRecurrenceFromMarkdown([meta]);
+            } else if (meta.startsWith("priority:")) {
+              priority = meta.substring(9) as KanbanPriority;
+            } else if (meta.startsWith("score:")) {
+              const parsed = parseInt(meta.substring(6), 10);
+              if (!Number.isNaN(parsed)) score = parsed;
+            } else if (meta.startsWith("assignee:")) {
+              assignee = meta.substring(9) || undefined;
+            } else if (meta.startsWith("reminder:")) {
+              try {
+                reminder = JSON.parse(meta.substring(9)) as KanbanReminder;
+              } catch {
+                reminder = { datetime: meta.substring(9) };
+              }
             }
           });
 
           item = {
-            id: itemMetadata.id || `${id}-${currentItemIndex}`,
+            id: (itemMetadata.id as string) || `${id}-${currentItemIndex}`,
             text: itemText,
             completed,
             order: currentItemIndex,
@@ -151,6 +175,10 @@ export const parseChecklistContent = (
             description,
             ...itemMetadata,
             ...(recurrence ? { recurrence } : {}),
+            ...(priority ? { priority } : {}),
+            ...(score !== undefined ? { score } : {}),
+            ...(assignee ? { assignee } : {}),
+            ...(reminder ? { reminder } : {}),
           };
         } else {
           let itemText = text.replace(/∣/g, "|");
@@ -193,7 +221,7 @@ export const parseChecklistContent = (
           lines,
           currentIndex + 1,
           parentLevel + 1,
-          0
+          0,
         );
         if (nestedResult.items.length > 0) {
           (item as any).children = nestedResult.items;
@@ -234,8 +262,15 @@ export const parseChecklistContent = (
 
 export const parseNoteContent = (
   rawContent: string,
-  id: string
-): { title: string; content: string; uuid?: string; encrypted?: boolean; encryptionMethod?: "pgp" | "xchacha"; tags?: string[] } => {
+  id: string,
+): {
+  title: string;
+  content: string;
+  uuid?: string;
+  encrypted?: boolean;
+  encryptionMethod?: "pgp" | "xchacha";
+  tags?: string[];
+} => {
   const { metadata, contentWithoutMetadata } = extractYamlMetadata(rawContent);
 
   const tags = Array.isArray(metadata.tags) ? metadata.tags : undefined;
diff --git a/app/_utils/env-utils.ts b/app/_utils/env-utils.ts
index 156db588..c5d927c1 100644
--- a/app/_utils/env-utils.ts
+++ b/app/_utils/env-utils.ts
@@ -8,6 +8,19 @@ export function isEnvEnabled(value: string | boolean | undefined): boolean {
   return lower !== "no" && lower !== "false" && lower !== "0";
 }
 
+export const isSecureEnv = (): boolean =>
+  process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS);
+
+export const getSessionCookieName = (): string =>
+  isSecureEnv() ? "__Host-session" : "session";
+
+export const getMfaPendingCookieName = (): string =>
+  isSecureEnv() ? "__Host-mfa-pending" : "mfa-pending";
+
+// @deprecated SSO_MODE is deprecated, use AUTH_MODE instead
+export const getAuthMode = (): string | undefined =>
+  process.env.AUTH_MODE || process.env.SSO_MODE;
+
 export function isDebugFlag(flag: string): boolean {
   const v = process.env.DEBUGGER;
   if (!v || typeof v !== "string") return false;
diff --git a/app/_utils/item-tree-utils.ts b/app/_utils/item-tree-utils.ts
new file mode 100644
index 00000000..2caba44d
--- /dev/null
+++ b/app/_utils/item-tree-utils.ts
@@ -0,0 +1,47 @@
+import { Item } from "@/app/_types";
+
+export const findItem = (items: Item[], itemId: string): Item | null => {
+  for (const item of items) {
+    if (item.id === itemId) return item;
+    if (item.children) {
+      const found = findItem(item.children, itemId);
+      if (found) return found;
+    }
+  }
+  return null;
+};
+
+export const updateItem = (items: Item[], itemId: string, updater: (item: Item) => Item): Item[] =>
+  items.map((item) => {
+    if (item.id === itemId) return updater(item);
+    if (item.children) {
+      return { ...item, children: updateItem(item.children, itemId, updater) };
+    }
+    return item;
+  });
+
+export const updateAllChildren = (
+  items: Item[],
+  completed: boolean,
+  username?: string,
+  now?: string
+): Item[] =>
+  items.map((item) => ({
+    ...item,
+    completed,
+    ...(username && { lastModifiedBy: username }),
+    ...(now && { lastModifiedAt: now }),
+    children: item.children
+      ? updateAllChildren(item.children, completed, username, now)
+      : undefined,
+  }));
+
+export const filterItems = (items: Item[], predicate: (item: Item) => boolean): Item[] =>
+  items
+    .filter(predicate)
+    .map((item) => ({
+      ...item,
+      children: item.children
+        ? filterItems(item.children, predicate)
+        : undefined,
+    }));
diff --git a/app/_utils/kanban/api-transforms.ts b/app/_utils/kanban/api-transforms.ts
new file mode 100644
index 00000000..0103df31
--- /dev/null
+++ b/app/_utils/kanban/api-transforms.ts
@@ -0,0 +1,49 @@
+import { Item, Checklist } from "@/app/_types";
+import { TaskStatus } from "@/app/_types/enums";
+import { DEFAULT_KANBAN_STATUSES } from "@/app/_consts/kanban";
+
+interface TransformedItem {
+  id: string;
+  index: number;
+  text: string;
+  status: string;
+  completed: boolean;
+  priority?: string;
+  score?: number;
+  assignee?: string;
+  reminder?: { datetime: string; notified?: boolean };
+  children?: TransformedItem[];
+}
+
+export const transformItem = (item: Item, index: number): TransformedItem => {
+  const baseItem: TransformedItem = {
+    id: item.id,
+    index,
+    text: item.text,
+    status: item.status || TaskStatus.TODO,
+    completed: item.completed,
+    priority: item.priority,
+    score: item.score,
+    assignee: item.assignee,
+    reminder: item.reminder,
+  };
+
+  if (item.children && item.children.length > 0) {
+    baseItem.children = item.children.map(
+      (child: Item, childIndex: number) =>
+        transformItem(child, childIndex),
+    );
+  }
+
+  return baseItem;
+};
+
+export const transformBoard = (list: Checklist) => ({
+  id: list.uuid || list.id,
+  title: list.title,
+  category: list.category || "Uncategorized",
+  statuses: list.statuses || DEFAULT_KANBAN_STATUSES,
+  items: list.items.map((item, index) => transformItem(item, index)),
+  createdAt: list.createdAt,
+  updatedAt: list.updatedAt,
+});
diff --git a/app/_utils/kanban/calendar-utils.ts b/app/_utils/kanban/calendar-utils.ts
new file mode 100644
index 00000000..cb05f667
--- /dev/null
+++ b/app/_utils/kanban/calendar-utils.ts
@@ -0,0 +1,120 @@
+import { Item, KanbanStatus } from "@/app/_types";
+
+export interface CalendarEvent {
+  id: string;
+  title: string;
+  date: string;
+  status?: string;
+  priority?: string;
+  completed: boolean;
+  itemId: string;
+}
+
+export const parseItemsForCalendar = (items: Item[]): CalendarEvent[] =>
+  items
+    .filter((item) => item.targetDate && !item.isArchived)
+    .map((item) => ({
+      id: item.id,
+      title: item.text,
+      date: item.targetDate!,
+      status: item.status,
+      priority: item.priority,
+      completed: item.completed,
+      itemId: item.id,
+    }));
+
+const _escapeICS = (text: string): string =>
+  text.replace(/\\/g, "\\\\").replace(/;/g, "\\;").replace(/,/g, "\\,").replace(/\n/g, "\\n");
+
+const _formatICSDate = (dateStr: string): string => {
+  const d = new Date(dateStr);
+  return d.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}/, "");
+};
+
+export const generateVEVENT = (item: Item, boardTitle: string): string => {
+  if (!item.targetDate) return "";
+
+  const dtstart = _formatICSDate(item.targetDate);
+  const dtend = _formatICSDate(
+    new Date(new Date(item.targetDate).getTime() + 3600000).toISOString()
+  );
+  const now = _formatICSDate(new Date().toISOString());
+
+  const lines = [
+    "BEGIN:VEVENT",
+    `UID:${item.id}@jotty`,
+    `DTSTAMP:${now}`,
+    `DTSTART:${dtstart}`,
+    `DTEND:${dtend}`,
+    `SUMMARY:${_escapeICS(item.text)}`,
+    `DESCRIPTION:${_escapeICS(`Board: ${boardTitle}${item.description ? `\\n${item.description}` : ""}`)}`,
+    item.status ? `STATUS:${item.completed ? "COMPLETED" : "NEEDS-ACTION"}` : "",
+    "END:VEVENT",
+  ];
+
+  return lines.filter(Boolean).join("\r\n");
+};
+
+export const generateICS = (items: Item[], boardTitle: string): string => {
+  const events = items
+    .filter((item) => item.targetDate && !item.isArchived)
+    .map((item) => generateVEVENT(item, boardTitle))
+    .filter(Boolean);
+
+  return [
+    "BEGIN:VCALENDAR",
+    "VERSION:2.0",
+    "PRODID:-//Jotty//Kanban//EN",
+    `X-WR-CALNAME:${_escapeICS(boardTitle)}`,
+    "CALSCALE:GREGORIAN",
+    "METHOD:PUBLISH",
+    ...events,
+    "END:VCALENDAR",
+  ].join("\r\n");
+};
+
+export const getItemsGroupedByDate = (items: Item[]): Record<string, Item[]> => {
+  const grouped: Record<string, Item[]> = {};
+
+  items
+    .filter((item) => item.targetDate && !item.isArchived)
+    .forEach((item) => {
+      const date = item.targetDate!.split("T")[0];
+      if (!grouped[date]) grouped[date] = [];
+      grouped[date].push(item);
+    });
+
+  return grouped;
+};
+
+export const getDaysInMonth = (year: number, month: number): Date[] => {
+  const days: Date[] = [];
+  const date = new Date(year, month, 1);
+  while (date.getMonth() === month) {
+    days.push(new Date(date));
+    date.setDate(date.getDate() + 1);
+  }
+  return days;
+};
+
+export const getCalendarGrid = (year: number, month: number): (Date | null)[][] => {
+  const days = getDaysInMonth(year, month);
+  const firstDay = days[0].getDay();
+  const grid: (Date | null)[][] = [];
+  let week: (Date | null)[] = new Array(firstDay).fill(null);
+
+  days.forEach((day) => {
+    week.push(day);
+    if (week.length === 7) {
+      grid.push(week);
+      week = [];
+    }
+  });
+
+  if (week.length > 0) {
+    while (week.length < 7) week.push(null);
+    grid.push(week);
+  }
+
+  return grid;
+};
diff --git a/app/_utils/kanban-utils.tsx b/app/_utils/kanban/index.tsx
similarity index 51%
rename from app/_utils/kanban-utils.tsx
rename to app/_utils/kanban/index.tsx
index 7e349de0..79e7244d 100644
--- a/app/_utils/kanban-utils.tsx
+++ b/app/_utils/kanban/index.tsx
@@ -1,5 +1,6 @@
 import { Clock01Icon, TimeQuarterIcon } from "hugeicons-react";
 import { TaskStatus } from "@/app/_types/enums";
+import { Item, KanbanPriority } from "@/app/_types";
 
 import type { JSX } from "react";
 
@@ -16,7 +17,11 @@ export const formatTimerTime = (seconds: number): string => {
   return `${minutes}:${secs.toString().padStart(2, "0")}`;
 };
 
-export const getStatusColor = (status?: string): string => {
+export const getStatusColor = (status?: string, customColor?: string): string => {
+  if (customColor) {
+    return `bg-[${customColor}]/10 border-[${customColor}]/30`;
+  }
+
   switch (status) {
     case TaskStatus.TODO:
       return "bg-background/50 border-border";
@@ -47,3 +52,25 @@ export const getStatusIcon = (status?: string): JSX.Element | null => {
       return null;
   }
 };
+
+const PRIORITY_CONFIG: Record<KanbanPriority, { dotColor: string; translationKey: string; sortOrder: number }> = {
+  critical: { dotColor: "#ef4444", translationKey: "kanban.critical", sortOrder: 0 },
+  high: { dotColor: "#f97316", translationKey: "kanban.high", sortOrder: 1 },
+  medium: { dotColor: "#eab308", translationKey: "kanban.medium", sortOrder: 2 },
+  low: { dotColor: "#3b82f6", translationKey: "kanban.low", sortOrder: 3 },
+  none: { dotColor: "transparent", translationKey: "kanban.none", sortOrder: 4 },
+};
+
+export const getPriorityDotColor = (priority?: KanbanPriority): string =>
+  PRIORITY_CONFIG[priority || "none"].dotColor;
+
+export const getPriorityLabel = (priority: KanbanPriority | undefined, t: (key: string) => string): string =>
+  t(PRIORITY_CONFIG[priority || "none"].translationKey);
+
+export const _getPrioritySortOrder = (priority?: KanbanPriority): number =>
+  PRIORITY_CONFIG[priority || "none"].sortOrder;
+
+export const sortByPriority = (items: Item[]): Item[] =>
+  [...items].sort((a, b) =>
+    _getPrioritySortOrder(a.priority) - _getPrioritySortOrder(b.priority)
+  );
diff --git a/app/_utils/kanban/reminder-utils.ts b/app/_utils/kanban/reminder-utils.ts
new file mode 100644
index 00000000..457763ee
--- /dev/null
+++ b/app/_utils/kanban/reminder-utils.ts
@@ -0,0 +1,39 @@
+import { Item } from "@/app/_types";
+
+export const getDueReminders = (items: Item[]): Item[] =>
+  items.filter((item) => {
+    if (!item.reminder || item.reminder.notified || item.isArchived) return false;
+    return new Date(item.reminder.datetime) <= new Date();
+  });
+
+export const formatReminderTime = (datetime: string): string => {
+  const date = new Date(datetime);
+  const now = new Date();
+  const diff = date.getTime() - now.getTime();
+
+  if (diff < 0) return "Overdue";
+  if (diff < 60000) return "Due now";
+  if (diff < 3600000) return `In ${Math.ceil(diff / 60000)}m`;
+  if (diff < 86400000) return `In ${Math.ceil(diff / 3600000)}h`;
+  return date.toLocaleDateString();
+};
+
+export const isOverdue = (item: Item): boolean => {
+  if (!item.targetDate) return false;
+  return new Date(item.targetDate) < new Date() && !item.completed;
+};
+
+export const isDueToday = (item: Item): boolean => {
+  if (!item.targetDate) return false;
+  const today = new Date().toISOString().split("T")[0];
+  return item.targetDate.startsWith(today) && !item.completed;
+};
+
+export const isDueThisWeek = (item: Item): boolean => {
+  if (!item.targetDate) return false;
+  const now = new Date();
+  const weekEnd = new Date(now);
+  weekEnd.setDate(weekEnd.getDate() + (7 - weekEnd.getDay()));
+  const target = new Date(item.targetDate);
+  return target >= now && target <= weekEnd && !item.completed;
+};
diff --git a/app/_utils/yaml-metadata-utils.ts b/app/_utils/yaml-metadata-utils.ts
index e3eb9932..da971939 100644
--- a/app/_utils/yaml-metadata-utils.ts
+++ b/app/_utils/yaml-metadata-utils.ts
@@ -1,9 +1,8 @@
 import yaml from "js-yaml";
 import { v4 as uuidv4 } from "uuid";
+import { ChecklistsTypes, isKanbanType } from "../_types/enums";
 
-export const toIso = (
-  d: Date | string | number | undefined | null,
-): string => {
+export const toIso = (d: Date | string | number | undefined | null): string => {
   if (d == null) return new Date(0).toISOString();
   const date = d instanceof Date ? d : new Date(d as string | number);
   return Number.isFinite(date.getTime())
@@ -14,14 +13,14 @@ export const toIso = (
 export interface DocumentMetadata {
   uuid?: string;
   title?: string;
-  checklistType?: "task" | "simple";
+  checklistType?: "task" | "simple" | "kanban";
   [key: string]: any;
 }
 
 const YAML_FRONTMATTER_REGEX = /^\uFEFF?---\r?\n([\s\S]*?)\r?\n---(?:\r?\n)?/;
 
 export const extractYamlMetadata = (
-  content: string
+  content: string,
 ): {
   metadata: DocumentMetadata;
   contentWithoutMetadata: string;
@@ -78,7 +77,7 @@ export const generateYamlFrontmatter = (metadata: DocumentMetadata): string => {
 export const updateYamlMetadata = (
   content: string,
   metadata: Partial<DocumentMetadata>,
-  preserveExisting: boolean = true
+  preserveExisting: boolean = true,
 ): string => {
   const { metadata: existingMetadata, contentWithoutMetadata } =
     extractYamlMetadata(content);
@@ -112,18 +111,22 @@ export const extractTitle = (content: string, filename?: string): string => {
   return "Untitled";
 };
 
-export const extractChecklistType = (content: string): "task" | "simple" => {
+export const extractChecklistType = (content: string): "kanban" | "simple" => {
   const { metadata, contentWithoutMetadata } = extractYamlMetadata(content);
 
   if (metadata.checklistType) {
-    return metadata.checklistType;
+    if (isKanbanType(metadata.checklistType)) {
+      return ChecklistsTypes.KANBAN;
+    }
+
+    return ChecklistsTypes.SIMPLE;
   }
 
   if (contentWithoutMetadata.includes("<!-- type:task -->")) {
-    return "task";
+    return ChecklistsTypes.KANBAN;
   }
 
-  return "simple";
+  return ChecklistsTypes.SIMPLE;
 };
 
 /**
@@ -143,7 +146,7 @@ export const generateUuid = (): string => {
 export const migrateToYamlMetadata = (
   content: string,
   generateNewUuid: boolean = true,
-  isChecklist: boolean = false
+  isChecklist: boolean = false,
 ): string => {
   const { metadata, contentWithoutMetadata } = extractYamlMetadata(content);
 
diff --git a/app/api/auth/check-session/route.ts b/app/api/auth/check-session/route.ts
index c0d5daa7..7fb3158f 100644
--- a/app/api/auth/check-session/route.ts
+++ b/app/api/auth/check-session/route.ts
@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 import { cookies } from "next/headers";
 import { readSessions } from "@/app/_server/actions/session";
-import { isEnvEnabled } from "@/app/_utils/env-utils";
+import { getSessionCookieName } from "@/app/_utils/env-utils";
 
 type Session = Record<string, string>;
 
@@ -10,11 +10,7 @@ export const dynamic = "force-dynamic";
 export async function GET() {
   try {
     const cookieStore = await cookies();
-    const cookieName =
-      process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-        ? "__Host-session"
-        : "session";
-    const sessionId = cookieStore.get(cookieName)?.value;
+    const sessionId = cookieStore.get(getSessionCookieName())?.value;
 
     if (!sessionId) {
       return new NextResponse(JSON.stringify({ error: "No session cookie" }), {
diff --git a/app/api/checklists/[listId]/route.ts b/app/api/checklists/[listId]/route.ts
index a4b8ce73..7d77b373 100644
--- a/app/api/checklists/[listId]/route.ts
+++ b/app/api/checklists/[listId]/route.ts
@@ -59,6 +59,7 @@ export async function DELETE(request: NextRequest, props: { params: Promise<{ li
 
       const formData = new FormData();
       formData.append("id", list.id);
+      if (list.uuid) formData.append("uuid", list.uuid);
       formData.append("category", list.category || "Uncategorized");
       formData.append("apiUser", JSON.stringify(user));
 
diff --git a/app/api/checklists/route.ts b/app/api/checklists/route.ts
index 33da8e67..b327e99d 100644
--- a/app/api/checklists/route.ts
+++ b/app/api/checklists/route.ts
@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { withApiAuth } from "@/app/_utils/api-utils";
 import { getUserChecklists, createList } from "@/app/_server/actions/checklist";
-import { TaskStatus } from "@/app/_types/enums";
+import { ChecklistsTypes, isKanbanType, TaskStatus } from "@/app/_types/enums";
 import { Checklist, Result } from "@/app/_types";
 
 export const dynamic = "force-dynamic";
@@ -10,15 +10,17 @@ export async function GET(request: NextRequest) {
   return withApiAuth(request, async (user) => {
     try {
       const { searchParams } = new URL(request.url);
-      const category = searchParams.get('category');
-      const type = searchParams.get('type');
-      const search = searchParams.get('q');
+      const category = searchParams.get("category");
+      const type = searchParams.get("type");
+      const search = searchParams.get("q");
 
-      const lists = await getUserChecklists({ username: user.username }) as Result<Checklist[]>;
+      const lists = (await getUserChecklists({
+        username: user.username,
+      })) as Result<Checklist[]>;
       if (!lists.success || !lists.data) {
         return NextResponse.json(
           { error: lists.error || "Failed to fetch checklists" },
-          { status: 500 }
+          { status: 500 },
         );
       }
 
@@ -32,13 +34,20 @@ export async function GET(request: NextRequest) {
       }
       if (search) {
         const searchLower = search.toLowerCase();
-        userLists = userLists.filter((list) =>
-          list.title?.toLowerCase().includes(searchLower) ||
-          list.items.some(item => item.text.toLowerCase().includes(searchLower))
+        userLists = userLists.filter(
+          (list) =>
+            list.title?.toLowerCase().includes(searchLower) ||
+            list.items.some((item) =>
+              item.text.toLowerCase().includes(searchLower),
+            ),
         );
       }
 
-      const transformItem = (item: any, index: number, listType: string): any => {
+      const transformItem = (
+        item: any,
+        index: number,
+        listType: string,
+      ): any => {
         const baseItem: any = {
           id: item.id,
           index,
@@ -46,7 +55,7 @@ export async function GET(request: NextRequest) {
           completed: item.completed,
         };
 
-        if (listType === "task") {
+        if (isKanbanType(listType)) {
           baseItem.status = item.status || TaskStatus.TODO;
           baseItem.time =
             item.timeEntries && item.timeEntries.length > 0
@@ -55,8 +64,9 @@ export async function GET(request: NextRequest) {
         }
 
         if (item.children && item.children.length > 0) {
-          baseItem.children = item.children.map((child: any, childIndex: number) =>
-            transformItem(child, childIndex, listType)
+          baseItem.children = item.children.map(
+            (child: any, childIndex: number) =>
+              transformItem(child, childIndex, listType),
           );
         }
 
@@ -68,7 +78,9 @@ export async function GET(request: NextRequest) {
         title: list.title,
         category: list.category || "Uncategorized",
         type: list.type || "simple",
-        items: list.items.map((item, index) => transformItem(item, index, list.type)),
+        items: list.items.map((item, index) =>
+          transformItem(item, index, list.type),
+        ),
         createdAt: list.createdAt,
         updatedAt: list.updatedAt,
       }));
@@ -82,7 +94,7 @@ export async function GET(request: NextRequest) {
               ? error.message
               : "Failed to fetch checklists",
         },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
@@ -97,14 +109,14 @@ export async function POST(request: NextRequest) {
       if (!title) {
         return NextResponse.json(
           { error: "Title is required" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
-      if (type !== "simple" && type !== "task") {
+      if (type !== ChecklistsTypes.SIMPLE && !isKanbanType(type)) {
         return NextResponse.json(
-          { error: "Type must be 'simple' or 'task'" },
-          { status: 400 }
+          { error: "Type must be 'simple' or 'kanban'" },
+          { status: 400 },
         );
       }
 
@@ -118,7 +130,10 @@ export async function POST(request: NextRequest) {
 
       if (result.error || !result.data) {
         console.error("Create list error:", result.error);
-        return NextResponse.json({ error: result.error || "Failed to create checklist" }, { status: 400 });
+        return NextResponse.json(
+          { error: result.error || "Failed to create checklist" },
+          { status: 400 },
+        );
       }
 
       const transformedChecklist = {
@@ -135,8 +150,11 @@ export async function POST(request: NextRequest) {
     } catch (error) {
       console.error("API Error:", error);
       return NextResponse.json(
-        { error: error instanceof Error ? error.message : "Internal server error" },
-        { status: 500 }
+        {
+          error:
+            error instanceof Error ? error.message : "Internal server error",
+        },
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/kanban/[boardId]/calendar/route.ts b/app/api/kanban/[boardId]/calendar/route.ts
new file mode 100644
index 00000000..2a3ec06e
--- /dev/null
+++ b/app/api/kanban/[boardId]/calendar/route.ts
@@ -0,0 +1,53 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import { getListById } from "@/app/_server/actions/checklist";
+import {
+  generateICS,
+  parseItemsForCalendar,
+} from "@/app/_utils/kanban/calendar-utils";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export async function GET(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const accept = request.headers.get("accept") || "";
+
+      if (accept.includes("text/calendar")) {
+        const ics = generateICS(board.items, board.title || "Kanban Board");
+        return new NextResponse(ics, {
+          headers: {
+            "Content-Type": "text/calendar; charset=utf-8",
+            "Content-Disposition": `attachment; filename="${board.title || "board"}.ics"`,
+          },
+        });
+      }
+
+      const events = parseItemsForCalendar(board.items);
+      return NextResponse.json({ events });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/[boardId]/items/[itemId]/assign/route.ts b/app/api/kanban/[boardId]/items/[itemId]/assign/route.ts
new file mode 100644
index 00000000..b4077506
--- /dev/null
+++ b/app/api/kanban/[boardId]/items/[itemId]/assign/route.ts
@@ -0,0 +1,52 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import { getListById } from "@/app/_server/actions/checklist";
+import { assignKanbanItem } from "@/app/_server/actions/kanban/items";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export async function PUT(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string; itemId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { assignee } = body;
+
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("listId", board.uuid || board.id);
+      formData.append("itemId", params.itemId);
+      formData.append("assignee", assignee || "");
+      formData.append("category", board.category || "Uncategorized");
+
+      const result = await assignKanbanItem(formData);
+
+      if (result.error) {
+        return NextResponse.json({ error: result.error }, { status: 400 });
+      }
+
+      return NextResponse.json({ success: true, data: result.data });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/[boardId]/items/[itemId]/reminder/route.ts b/app/api/kanban/[boardId]/items/[itemId]/reminder/route.ts
new file mode 100644
index 00000000..c502e008
--- /dev/null
+++ b/app/api/kanban/[boardId]/items/[itemId]/reminder/route.ts
@@ -0,0 +1,101 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import { getListById } from "@/app/_server/actions/checklist";
+import { setKanbanItemReminder } from "@/app/_server/actions/kanban/items";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export async function PUT(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string; itemId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { datetime } = body;
+
+      if (!datetime) {
+        return NextResponse.json(
+          { error: "Datetime is required" },
+          { status: 400 },
+        );
+      }
+
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("listId", board.uuid || board.id);
+      formData.append("itemId", params.itemId);
+      formData.append("reminder", JSON.stringify({ datetime }));
+      formData.append("category", board.category || "Uncategorized");
+
+      const result = await setKanbanItemReminder(formData);
+
+      if (result.error) {
+        return NextResponse.json({ error: result.error }, { status: 400 });
+      }
+
+      return NextResponse.json({ success: true, data: result.data });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
+
+export async function DELETE(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string; itemId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("listId", board.uuid || board.id);
+      formData.append("itemId", params.itemId);
+      formData.append("reminder", "");
+      formData.append("category", board.category || "Uncategorized");
+
+      const result = await setKanbanItemReminder(formData);
+
+      if (result.error) {
+        return NextResponse.json({ error: result.error }, { status: 400 });
+      }
+
+      return NextResponse.json({ success: true });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/[boardId]/items/[itemId]/route.ts b/app/api/kanban/[boardId]/items/[itemId]/route.ts
new file mode 100644
index 00000000..4b4ae783
--- /dev/null
+++ b/app/api/kanban/[boardId]/items/[itemId]/route.ts
@@ -0,0 +1,104 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import { getListById } from "@/app/_server/actions/checklist";
+import { updateItem, deleteItem } from "@/app/_server/actions/checklist-item";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export async function PUT(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string; itemId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { text, priority, score, assignee, reminder } = body;
+
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (board.type !== "kanban" && board.type !== "task") {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("listId", board.id);
+      formData.append("itemId", params.itemId);
+      formData.append("category", board.category || "Uncategorized");
+      if (text !== undefined) formData.append("text", text);
+      if (priority !== undefined) formData.append("priority", priority);
+      if (score !== undefined) formData.append("score", String(score));
+      if (assignee !== undefined) formData.append("assignee", assignee);
+      if (reminder !== undefined)
+        formData.append("reminder", JSON.stringify(reminder));
+
+      const result = await updateItem(board, formData, user.username);
+
+      if (!result.success) {
+        return NextResponse.json(
+          { error: result.error || "Failed to update item" },
+          { status: 400 },
+        );
+      }
+
+      return NextResponse.json({ success: true, data: result.data });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
+
+export async function DELETE(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string; itemId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("listId", board.id);
+      formData.append("itemId", params.itemId);
+      formData.append("category", board.category || "Uncategorized");
+
+      const result = await deleteItem(formData);
+
+      if (!result.success) {
+        return NextResponse.json(
+          { error: result.error || "Failed to delete item" },
+          { status: 400 },
+        );
+      }
+
+      return NextResponse.json({ success: true });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/[boardId]/items/[itemId]/status/route.ts b/app/api/kanban/[boardId]/items/[itemId]/status/route.ts
new file mode 100644
index 00000000..bc8125ef
--- /dev/null
+++ b/app/api/kanban/[boardId]/items/[itemId]/status/route.ts
@@ -0,0 +1,63 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import { getListById } from "@/app/_server/actions/checklist";
+import { updateItemStatus } from "@/app/_server/actions/checklist-item";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export async function PUT(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string; itemId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { status } = body;
+
+      if (!status) {
+        return NextResponse.json(
+          { error: "Status is required" },
+          { status: 400 },
+        );
+      }
+
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("listId", board.id);
+      formData.append("itemId", params.itemId);
+      formData.append("status", status);
+      formData.append("category", board.category || "Uncategorized");
+      formData.append("username", user.username);
+
+      const result = await updateItemStatus(formData, user.username);
+
+      if (!result.success) {
+        return NextResponse.json(
+          { error: result.error || "Failed to update status" },
+          { status: 400 },
+        );
+      }
+
+      return NextResponse.json({ success: true, data: result.data });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/[boardId]/items/route.ts b/app/api/kanban/[boardId]/items/route.ts
new file mode 100644
index 00000000..1404ec92
--- /dev/null
+++ b/app/api/kanban/[boardId]/items/route.ts
@@ -0,0 +1,66 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import { getListById } from "@/app/_server/actions/checklist";
+import { createItem } from "@/app/_server/actions/checklist-item";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export async function POST(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { text, status, description } = body;
+
+      if (!text) {
+        return NextResponse.json(
+          { error: "Text is required" },
+          { status: 400 },
+        );
+      }
+
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("listId", board.id);
+      formData.append("text", text);
+      formData.append("category", board.category || "Uncategorized");
+      if (status) formData.append("status", status);
+      if (description) formData.append("description", description);
+
+      const result = await createItem(board, formData, user.username);
+
+      if (!result.success || !result.data) {
+        return NextResponse.json(
+          { error: result.error || "Failed to create item" },
+          { status: 400 },
+        );
+      }
+
+      return NextResponse.json({ success: true, data: result.data });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        {
+          error:
+            error instanceof Error ? error.message : "Internal server error",
+        },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/[boardId]/route.ts b/app/api/kanban/[boardId]/route.ts
new file mode 100644
index 00000000..4eb35c29
--- /dev/null
+++ b/app/api/kanban/[boardId]/route.ts
@@ -0,0 +1,129 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import {
+  getListById,
+  updateList,
+  deleteList,
+} from "@/app/_server/actions/checklist";
+import { isKanbanType } from "@/app/_types/enums";
+import { transformBoard } from "@/app/_utils/kanban/api-transforms";
+
+export const dynamic = "force-dynamic";
+
+export async function GET(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      return NextResponse.json({ board: transformBoard(board) });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
+
+export async function PUT(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { title, category } = body;
+
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("id", board.id);
+      formData.append("title", title ?? board.title);
+      formData.append(
+        "category",
+        category ?? board.category ?? "Uncategorized",
+      );
+      formData.append("originalCategory", board.category || "Uncategorized");
+      formData.append("apiUser", JSON.stringify(user));
+
+      const result = await updateList(formData);
+      if (result.error) {
+        return NextResponse.json({ error: result.error }, { status: 400 });
+      }
+
+      return NextResponse.json({ success: true, data: result.data ? transformBoard(result.data) : null });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
+
+export async function DELETE(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("id", board.id);
+      formData.append("category", board.category || "Uncategorized");
+      formData.append("apiUser", JSON.stringify(user));
+
+      const result = await deleteList(formData);
+      if (result.error) {
+        return NextResponse.json({ error: result.error }, { status: 400 });
+      }
+
+      return NextResponse.json({ success: true });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/[boardId]/statuses/route.ts b/app/api/kanban/[boardId]/statuses/route.ts
new file mode 100644
index 00000000..56a40e11
--- /dev/null
+++ b/app/api/kanban/[boardId]/statuses/route.ts
@@ -0,0 +1,61 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import {
+  getListById,
+  updateChecklistStatuses,
+} from "@/app/_server/actions/checklist";
+import { isKanbanType } from "@/app/_types/enums";
+
+export const dynamic = "force-dynamic";
+
+export async function PUT(
+  request: NextRequest,
+  props: { params: Promise<{ boardId: string }> },
+) {
+  const params = await props.params;
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { statuses } = body;
+
+      if (!statuses || !Array.isArray(statuses)) {
+        return NextResponse.json(
+          { error: "Statuses array is required" },
+          { status: 400 },
+        );
+      }
+
+      const board = await getListById(params.boardId, user.username);
+      if (!board) {
+        return NextResponse.json({ error: "Board not found" }, { status: 404 });
+      }
+
+      if (!isKanbanType(board.type)) {
+        return NextResponse.json(
+          { error: "Not a kanban board" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("id", board.id);
+      formData.append("statuses", JSON.stringify(statuses));
+      formData.append("category", board.category || "Uncategorized");
+      formData.append("apiUser", JSON.stringify(user));
+
+      const result = await updateChecklistStatuses(formData);
+
+      if (result.error) {
+        return NextResponse.json({ error: result.error }, { status: 400 });
+      }
+
+      return NextResponse.json({ success: true, data: result.data });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/kanban/route.ts b/app/api/kanban/route.ts
new file mode 100644
index 00000000..8b6dbdec
--- /dev/null
+++ b/app/api/kanban/route.ts
@@ -0,0 +1,111 @@
+import { NextRequest, NextResponse } from "next/server";
+import { withApiAuth } from "@/app/_utils/api-utils";
+import { getUserChecklists, createList } from "@/app/_server/actions/checklist";
+import { isKanbanType } from "@/app/_types/enums";
+import { Checklist, Result } from "@/app/_types";
+import { transformBoard } from "@/app/_utils/kanban/api-transforms";
+
+export const dynamic = "force-dynamic";
+
+export async function GET(request: NextRequest) {
+  return withApiAuth(request, async (user) => {
+    try {
+      const { searchParams } = new URL(request.url);
+      const category = searchParams.get("category");
+      const status = searchParams.get("status");
+      const search = searchParams.get("q");
+
+      const lists = (await getUserChecklists({
+        username: user.username,
+      })) as Result<Checklist[]>;
+      if (!lists.success || !lists.data) {
+        return NextResponse.json(
+          { error: lists.error || "Failed to fetch boards" },
+          { status: 500 },
+        );
+      }
+
+      let boards = lists.data.filter(
+        (list) => list.owner === user.username && isKanbanType(list.type),
+      );
+
+      if (category) {
+        boards = boards.filter((list) => list.category === category);
+      }
+      if (status) {
+        boards = boards.filter((list) =>
+          list.items.some((item) => item.status === status),
+        );
+      }
+      if (search) {
+        const searchLower = search.toLowerCase();
+        boards = boards.filter(
+          (list) =>
+            list.title?.toLowerCase().includes(searchLower) ||
+            list.items.some((item) =>
+              item.text.toLowerCase().includes(searchLower),
+            ),
+        );
+      }
+
+      const data = boards.map((list) => transformBoard(list));
+
+      return NextResponse.json({ boards: data });
+    } catch (error) {
+      return NextResponse.json(
+        {
+          error:
+            error instanceof Error ? error.message : "Failed to fetch boards",
+        },
+        { status: 500 },
+      );
+    }
+  });
+}
+
+export async function POST(request: NextRequest) {
+  return withApiAuth(request, async (user) => {
+    try {
+      const body = await request.json();
+      const { title, category = "Uncategorized", statuses } = body;
+
+      if (!title) {
+        return NextResponse.json(
+          { error: "Title is required" },
+          { status: 400 },
+        );
+      }
+
+      const formData = new FormData();
+      formData.append("title", title);
+      formData.append("category", category);
+      formData.append("type", "kanban");
+      formData.append("user", JSON.stringify(user));
+
+      if (statuses) {
+        formData.append("statuses", JSON.stringify(statuses));
+      }
+
+      const result = await createList(formData);
+
+      if (result.error || !result.data) {
+        console.error("Create board error:", result.error);
+        return NextResponse.json(
+          { error: result.error || "Failed to create board" },
+          { status: 400 },
+        );
+      }
+
+      return NextResponse.json({ success: true, data: transformBoard(result.data) });
+    } catch (error) {
+      console.error("API Error:", error);
+      return NextResponse.json(
+        {
+          error:
+            error instanceof Error ? error.message : "Internal server error",
+        },
+        { status: 500 },
+      );
+    }
+  });
+}
diff --git a/app/api/notes/[noteId]/route.ts b/app/api/notes/[noteId]/route.ts
index f0f58063..488a2cbc 100644
--- a/app/api/notes/[noteId]/route.ts
+++ b/app/api/notes/[noteId]/route.ts
@@ -4,6 +4,39 @@ import { updateNote, deleteNote } from "@/app/_server/actions/note";
 
 export const dynamic = "force-dynamic";
 
+export async function GET(request: NextRequest, props: { params: Promise<{ noteId: string }> }) {
+    const params = await props.params;
+    return withApiAuth(request, async (user) => {
+        try {
+            const { getNoteById } = await import("@/app/_server/actions/note");
+            const note = await getNoteById(params.noteId, undefined, user.username);
+
+            if (!note) {
+                return NextResponse.json({ error: "Note not found" }, { status: 404 });
+            }
+
+            return NextResponse.json({
+                success: true,
+                data: {
+                    id: note.uuid || note.id,
+                    title: note.title,
+                    category: note.category || "Uncategorized",
+                    content: note.content,
+                    createdAt: note.createdAt,
+                    updatedAt: note.updatedAt,
+                    owner: note.owner,
+                },
+            });
+        } catch (error) {
+            console.error("API Error:", error);
+            return NextResponse.json(
+                { error: "Internal server error" },
+                { status: 500 }
+            );
+        }
+    });
+}
+
 export async function PUT(request: NextRequest, props: { params: Promise<{ noteId: string }> }) {
     const params = await props.params;
     return withApiAuth(request, async (user) => {
diff --git a/app/api/oidc/callback/route.ts b/app/api/oidc/callback/route.ts
index 112a6739..74dc8d15 100644
--- a/app/api/oidc/callback/route.ts
+++ b/app/api/oidc/callback/route.ts
@@ -3,9 +3,9 @@ import crypto from "crypto";
 import fs from "fs/promises";
 import path from "path";
 import { getEnvOrFile } from "@/app/_server/actions/file";
-import { CHECKLISTS_FOLDER } from "@/app/_consts/checklists";
-import { NOTES_FOLDER } from "@/app/_consts/notes";
 import { lock, unlock } from "proper-lockfile";
+import { getAuthMode } from "@/app/_utils/env-utils";
+import { ensureUser } from "@/app/_server/actions/users";
 import { jwtVerify, createRemoteJWKSet, decodeJwt } from "jose";
 import { createSession } from "@/app/_server/actions/session";
 import {
@@ -14,7 +14,7 @@ import {
 } from "@/app/_server/actions/file";
 import { USERS_FILE } from "@/app/_consts/files";
 import { logAudit } from "@/app/_server/actions/log";
-import { isEnvEnabled, isDebugFlag } from "@/app/_utils/env-utils";
+import { isDebugFlag, isSecureEnv, getSessionCookieName } from "@/app/_utils/env-utils";
 
 const debugProxy = isDebugFlag("proxy");
 
@@ -49,89 +49,11 @@ function checkClaims(
   return isAllowed;
 }
 
-async function ensureUser(username: string, isAdmin: boolean) {
-  const usersFile = path.join(process.cwd(), "data", "users", "users.json");
-  await fs.mkdir(path.dirname(usersFile), { recursive: true });
-
-  await lock(usersFile);
-  try {
-    let users: any[] = [];
-    try {
-      const content = await fs.readFile(usersFile, "utf-8");
-      if (content) {
-        users = JSON.parse(content);
-      }
-    } catch {}
-
-    if (users.length === 0) {
-      users.push({
-        username,
-        passwordHash: "",
-        isAdmin: true,
-        isSuperAdmin: true,
-        createdAt: new Date().toISOString(),
-      });
-      if (debugProxy) {
-        console.log(
-          "SSO CALLBACK - Created first user as super admin:",
-          username,
-        );
-      }
-    } else {
-      const existing = users.find((u) => u.username === username);
-      if (!existing) {
-        users.push({
-          username,
-          passwordHash: "",
-          isAdmin,
-          createdAt: new Date().toISOString(),
-        });
-        if (debugProxy) {
-          console.log("SSO CALLBACK - Created new user:", {
-            username,
-            isAdmin,
-          });
-        }
-      } else {
-        const wasAdmin = existing.isAdmin;
-        if (isAdmin && !existing.isAdmin) {
-          existing.isAdmin = true;
-          if (debugProxy) {
-            console.log("SSO CALLBACK - Updated existing user to admin:", {
-              username,
-              wasAdmin,
-              nowAdmin: true,
-            });
-          }
-        } else if (debugProxy) {
-          console.log("SSO CALLBACK - User already exists:", {
-            username,
-            currentIsAdmin: existing.isAdmin,
-            requestedAdmin: isAdmin,
-          });
-        }
-      }
-    }
-    await fs.writeFile(usersFile, JSON.stringify(users, null, 2));
-  } finally {
-    await unlock(usersFile);
-  }
-
-  const checklistDir = path.join(
-    process.cwd(),
-    "data",
-    CHECKLISTS_FOLDER,
-    username,
-  );
-  const notesDir = path.join(process.cwd(), "data", NOTES_FOLDER, username);
-  await fs.mkdir(checklistDir, { recursive: true });
-  await fs.mkdir(notesDir, { recursive: true });
-}
 
 export async function GET(request: NextRequest) {
   const appUrl = process.env.APP_URL || request.nextUrl.origin;
 
-  if (process.env.SSO_MODE !== "oidc") {
+  if (getAuthMode() !== "oidc") {
     return NextResponse.redirect(`${appUrl}/auth/login`);
   }
 
@@ -429,15 +351,10 @@ export async function GET(request: NextRequest) {
   await ensureUser(username, isAdmin);
 
   const sessionId = base64UrlEncode(crypto.randomBytes(32));
-  const cookieName =
-    process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-      ? "__Host-session"
-      : "session";
   const response = NextResponse.redirect(`${appUrl}/`);
-  response.cookies.set(cookieName, sessionId, {
+  response.cookies.set(getSessionCookieName(), sessionId, {
     httpOnly: true,
-    secure:
-      process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS),
+    secure: isSecureEnv(),
     sameSite: "lax",
     path: "/",
     maxAge: 30 * 24 * 60 * 60,
diff --git a/app/api/oidc/login/route.ts b/app/api/oidc/login/route.ts
index f6930d3d..f376f1c7 100644
--- a/app/api/oidc/login/route.ts
+++ b/app/api/oidc/login/route.ts
@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import crypto from "crypto";
 import { getEnvOrFile } from "@/app/_server/actions/file";
-import { isEnvEnabled, isDebugFlag } from "@/app/_utils/env-utils";
+import { isEnvEnabled, isDebugFlag, getAuthMode } from "@/app/_utils/env-utils";
 
 const debugProxy = isDebugFlag("proxy");
 
@@ -20,10 +20,10 @@ function sha256(input: string) {
 }
 
 export async function GET(request: NextRequest) {
-  const ssoMode = process.env.SSO_MODE;
+  const authMode = getAuthMode();
   const appUrl = process.env.APP_URL || request.nextUrl.origin;
 
-  if (ssoMode && ssoMode?.toLowerCase() !== "oidc") {
+  if (authMode && authMode?.toLowerCase() !== "oidc") {
     if (debugProxy) {
       console.log("SSO LOGIN - ssoMode is not oidc");
     }
diff --git a/app/api/oidc/logout/route.ts b/app/api/oidc/logout/route.ts
index 74be6e5a..4cbc346a 100644
--- a/app/api/oidc/logout/route.ts
+++ b/app/api/oidc/logout/route.ts
@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from "next/server";
-import { isDebugFlag } from "@/app/_utils/env-utils";
+import { isDebugFlag, getAuthMode } from "@/app/_utils/env-utils";
 
 const debugProxy = isDebugFlag("proxy");
 
@@ -14,7 +14,8 @@ export async function GET(request: NextRequest) {
     console.log("OIDC LOGOUT - appUrl:", appUrl);
   }
 
-  if (process.env.SSO_MODE && process.env.SSO_MODE?.toLowerCase() !== "oidc") {
+  const authMode = getAuthMode();
+  if (authMode && authMode?.toLowerCase() !== "oidc") {
     if (debugProxy) {
       console.log("SSO LOGOUT - ssoMode is not oidc, redirecting to login");
     }
diff --git a/app/api/summary/route.ts b/app/api/summary/route.ts
index 48b16c4d..ac347284 100644
--- a/app/api/summary/route.ts
+++ b/app/api/summary/route.ts
@@ -3,7 +3,7 @@ import { withApiAuth } from "@/app/_utils/api-utils";
 import { getUserNotes } from "@/app/_server/actions/note";
 import { getUserChecklists } from "@/app/_server/actions/checklist";
 import { Checklist, Result } from "@/app/_types";
-import { TaskStatus } from "@/app/_types/enums";
+import { isKanbanType, TaskStatus } from "@/app/_types/enums";
 
 export const dynamic = "force-dynamic";
 
@@ -19,7 +19,7 @@ export async function GET(request: NextRequest) {
             {
               error: "Only administrators can query other users' summary data",
             },
-            { status: 403 }
+            { status: 403 },
           );
         }
       }
@@ -30,24 +30,26 @@ export async function GET(request: NextRequest) {
       if (!notesResult.success || !notesResult.data) {
         return NextResponse.json(
           { error: notesResult.error || "Failed to fetch notes" },
-          { status: 500 }
+          { status: 500 },
         );
       }
 
       const userNotes = notesResult.data.filter(
-        (note) => note.owner === username
+        (note) => note.owner === username,
       );
 
-      const listsResult = await getUserChecklists({ username }) as Result<Checklist[]>;
+      const listsResult = (await getUserChecklists({ username })) as Result<
+        Checklist[]
+      >;
       if (!listsResult.success || !listsResult.data) {
         return NextResponse.json(
           { error: listsResult.error || "Failed to fetch checklists" },
-          { status: 500 }
+          { status: 500 },
         );
       }
 
       const userLists = listsResult.data.filter(
-        (list) => list.owner === username
+        (list) => list.owner === username,
       );
 
       let totalItems = 0;
@@ -65,7 +67,7 @@ export async function GET(request: NextRequest) {
             completedItems++;
           }
 
-          if (list.type === "task" && item.status) {
+          if (isKanbanType(list.type) && item.status) {
             totalTasks++;
             switch (item.status) {
               case TaskStatus.COMPLETED:
@@ -86,24 +88,33 @@ export async function GET(request: NextRequest) {
         username,
         notes: {
           total: userNotes.length,
-          categories: userNotes.reduce((acc, note) => {
-            const category = note.category || "Uncategorized";
-            acc[category] = (acc[category] || 0) + 1;
-            return acc;
-          }, {} as Record<string, number>),
+          categories: userNotes.reduce(
+            (acc, note) => {
+              const category = note.category || "Uncategorized";
+              acc[category] = (acc[category] || 0) + 1;
+              return acc;
+            },
+            {} as Record<string, number>,
+          ),
         },
         checklists: {
           total: userLists.length,
-          categories: userLists.reduce((acc, list) => {
-            const category = list.category || "Uncategorized";
-            acc[category] = (acc[category] || 0) + 1;
-            return acc;
-          }, {} as Record<string, number>),
-          types: userLists.reduce((acc, list) => {
-            const type = list.type || "simple";
-            acc[type] = (acc[type] || 0) + 1;
-            return acc;
-          }, {} as Record<string, number>),
+          categories: userLists.reduce(
+            (acc, list) => {
+              const category = list.category || "Uncategorized";
+              acc[category] = (acc[category] || 0) + 1;
+              return acc;
+            },
+            {} as Record<string, number>,
+          ),
+          types: userLists.reduce(
+            (acc, list) => {
+              const type = list.type || "simple";
+              acc[type] = (acc[type] || 0) + 1;
+              return acc;
+            },
+            {} as Record<string, number>,
+          ),
         },
         items: {
           total: totalItems,
@@ -131,7 +142,7 @@ export async function GET(request: NextRequest) {
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/tasks/[taskId]/items/[itemIndex]/route.ts b/app/api/tasks/[taskId]/items/[itemIndex]/route.ts
index 507b2c1f..be4453e8 100644
--- a/app/api/tasks/[taskId]/items/[itemIndex]/route.ts
+++ b/app/api/tasks/[taskId]/items/[itemIndex]/route.ts
@@ -4,6 +4,7 @@ import { getListById } from "@/app/_server/actions/checklist";
 import { listToMarkdown } from "@/app/_utils/checklist-utils";
 import { serverWriteFile } from "@/app/_server/actions/file";
 import path from "path";
+import { isKanbanType } from "@/app/_types/enums";
 
 const CHECKLISTS_FOLDER = "checklists";
 
@@ -11,7 +12,7 @@ export const dynamic = "force-dynamic";
 
 export async function DELETE(
   request: NextRequest,
-  props: { params: Promise<{ taskId: string; itemIndex: string }> }
+  props: { params: Promise<{ taskId: string; itemIndex: string }> },
 ) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
@@ -21,17 +22,20 @@ export async function DELETE(
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
-        return NextResponse.json({ error: "Not a task checklist" }, { status: 400 });
+      if (!isKanbanType(task.type)) {
+        return NextResponse.json(
+          { error: "Not a task checklist" },
+          { status: 400 },
+        );
       }
 
-      const indexPath = params.itemIndex.split('.').map(i => parseInt(i));
+      const indexPath = params.itemIndex.split(".").map((i) => parseInt(i));
 
       for (const idx of indexPath) {
         if (isNaN(idx) || idx < 0) {
           return NextResponse.json(
             { error: "Invalid item index" },
-            { status: 400 }
+            { status: 400 },
           );
         }
       }
@@ -43,7 +47,7 @@ export async function DELETE(
         if (idx >= currentItems.length) {
           return NextResponse.json(
             { error: "Item index out of range" },
-            { status: 400 }
+            { status: 400 },
           );
         }
         item = currentItems[idx];
@@ -51,20 +55,22 @@ export async function DELETE(
       }
 
       if (!item) {
-        return NextResponse.json(
-          { error: "Item not found" },
-          { status: 404 }
-        );
+        return NextResponse.json({ error: "Item not found" }, { status: 404 });
       }
 
       const filterOutItem = (items: any[], itemId: string): any[] => {
         return items
           .filter((item) => item.id !== itemId)
           .map((item) => {
-            const filteredChildren = item.children ? filterOutItem(item.children, itemId) : undefined;
+            const filteredChildren = item.children
+              ? filterOutItem(item.children, itemId)
+              : undefined;
             return {
               ...item,
-              children: filteredChildren && filteredChildren.length > 0 ? filteredChildren : undefined,
+              children:
+                filteredChildren && filteredChildren.length > 0
+                  ? filteredChildren
+                  : undefined,
             };
           });
       };
@@ -79,12 +85,12 @@ export async function DELETE(
         process.cwd(),
         "data",
         CHECKLISTS_FOLDER,
-        task.owner!
+        task.owner!,
       );
       const filePath = path.join(
         ownerDir,
         task.category || "Uncategorized",
-        `${task.id}.md`
+        `${task.id}.md`,
       );
 
       await serverWriteFile(filePath, listToMarkdown(updatedTask as any));
@@ -94,7 +100,7 @@ export async function DELETE(
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/tasks/[taskId]/items/[itemIndex]/status/route.ts b/app/api/tasks/[taskId]/items/[itemIndex]/status/route.ts
index 63d6d709..e065ea14 100644
--- a/app/api/tasks/[taskId]/items/[itemIndex]/status/route.ts
+++ b/app/api/tasks/[taskId]/items/[itemIndex]/status/route.ts
@@ -2,12 +2,13 @@ import { NextRequest, NextResponse } from "next/server";
 import { withApiAuth } from "@/app/_utils/api-utils";
 import { getListById } from "@/app/_server/actions/checklist";
 import { updateItemStatus } from "@/app/_server/actions/checklist-item";
+import { isKanbanType } from "@/app/_types/enums";
 
 export const dynamic = "force-dynamic";
 
 export async function PUT(
   request: NextRequest,
-  props: { params: Promise<{ taskId: string; itemIndex: string }> }
+  props: { params: Promise<{ taskId: string; itemIndex: string }> },
 ) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
@@ -18,7 +19,7 @@ export async function PUT(
       if (!status) {
         return NextResponse.json(
           { error: "Status is required" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
@@ -27,10 +28,10 @@ export async function PUT(
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
+      if (!isKanbanType(task.type)) {
         return NextResponse.json(
           { error: "Not a task checklist" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
@@ -40,7 +41,7 @@ export async function PUT(
         if (isNaN(idx) || idx < 0) {
           return NextResponse.json(
             { error: "Invalid item index" },
-            { status: 400 }
+            { status: 400 },
           );
         }
       }
@@ -52,7 +53,7 @@ export async function PUT(
         if (idx >= currentItems.length) {
           return NextResponse.json(
             { error: "Item index out of range" },
-            { status: 400 }
+            { status: 400 },
           );
         }
         item = currentItems[idx];
@@ -75,7 +76,7 @@ export async function PUT(
       if (!result.success) {
         return NextResponse.json(
           { error: result.error || "Failed to update item status" },
-          { status: 500 }
+          { status: 500 },
         );
       }
 
@@ -84,7 +85,7 @@ export async function PUT(
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/tasks/[taskId]/items/route.ts b/app/api/tasks/[taskId]/items/route.ts
index 71d51131..e87eec40 100644
--- a/app/api/tasks/[taskId]/items/route.ts
+++ b/app/api/tasks/[taskId]/items/route.ts
@@ -4,14 +4,17 @@ import { createItem } from "@/app/_server/actions/checklist-item";
 import { getListById } from "@/app/_server/actions/checklist";
 import { listToMarkdown } from "@/app/_utils/checklist-utils";
 import { serverWriteFile } from "@/app/_server/actions/file";
-import { TaskStatus } from "@/app/_types/enums";
+import { isKanbanType, TaskStatus } from "@/app/_types/enums";
 import path from "path";
 
 const CHECKLISTS_FOLDER = "checklists";
 
 export const dynamic = "force-dynamic";
 
-export async function POST(request: NextRequest, props: { params: Promise<{ taskId: string }> }) {
+export async function POST(
+  request: NextRequest,
+  props: { params: Promise<{ taskId: string }> },
+) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
     try {
@@ -21,7 +24,7 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
       if (!text) {
         return NextResponse.json(
           { error: "Text is required" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
@@ -30,12 +33,18 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
-        return NextResponse.json({ error: "Not a task checklist" }, { status: 400 });
+      if (!isKanbanType(task.type)) {
+        return NextResponse.json(
+          { error: "Not a task checklist" },
+          { status: 400 },
+        );
       }
 
       if (parentIndex !== undefined) {
-        const indexPath = parentIndex.toString().split('.').map((i: string) => parseInt(i));
+        const indexPath = parentIndex
+          .toString()
+          .split(".")
+          .map((i: string) => parseInt(i));
         let parentItem: any = null;
         let currentItems = task.items;
 
@@ -43,7 +52,7 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
           if (idx >= currentItems.length) {
             return NextResponse.json(
               { error: "Parent item not found" },
-              { status: 404 }
+              { status: 404 },
             );
           }
           parentItem = currentItems[idx];
@@ -53,7 +62,7 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
         if (!parentItem) {
           return NextResponse.json(
             { error: "Parent item not found" },
-            { status: 404 }
+            { status: 404 },
           );
         }
 
@@ -65,7 +74,10 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
           order: 0,
         };
 
-        const addSubItemToParent = (items: any[], parentId: string): boolean => {
+        const addSubItemToParent = (
+          items: any[],
+          parentId: string,
+        ): boolean => {
           for (let item of items) {
             if (item.id === parentId) {
               if (!item.children) {
@@ -85,7 +97,7 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
         if (!addSubItemToParent(updatedItems, parentItem.id)) {
           return NextResponse.json(
             { error: "Failed to add sub-item" },
-            { status: 500 }
+            { status: 500 },
           );
         }
 
@@ -99,12 +111,12 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
           process.cwd(),
           "data",
           CHECKLISTS_FOLDER,
-          task.owner!
+          task.owner!,
         );
         const filePath = path.join(
           ownerDir,
           task.category || "Uncategorized",
-          `${task.id}.md`
+          `${task.id}.md`,
         );
 
         await serverWriteFile(filePath, listToMarkdown(updatedTask as any));
@@ -123,16 +135,19 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
       if (!result.success) {
         return NextResponse.json(
           { error: result.error || "Failed to create item" },
-          { status: 500 }
+          { status: 500 },
         );
       }
 
-      return NextResponse.json({ success: true, data: { id: result.data?.id } });
+      return NextResponse.json({
+        success: true,
+        data: { id: result.data?.id },
+      });
     } catch (error) {
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/tasks/[taskId]/route.ts b/app/api/tasks/[taskId]/route.ts
index 762f1278..b9591195 100644
--- a/app/api/tasks/[taskId]/route.ts
+++ b/app/api/tasks/[taskId]/route.ts
@@ -1,11 +1,18 @@
 import { NextRequest, NextResponse } from "next/server";
 import { withApiAuth } from "@/app/_utils/api-utils";
-import { getListById, updateList, deleteList } from "@/app/_server/actions/checklist";
-import { TaskStatus } from "@/app/_types/enums";
+import {
+  getListById,
+  updateList,
+  deleteList,
+} from "@/app/_server/actions/checklist";
+import { isKanbanType, TaskStatus } from "@/app/_types/enums";
 
 export const dynamic = "force-dynamic";
 
-export async function GET(request: NextRequest, props: { params: Promise<{ taskId: string }> }) {
+export async function GET(
+  request: NextRequest,
+  props: { params: Promise<{ taskId: string }> },
+) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
     try {
@@ -14,8 +21,11 @@ export async function GET(request: NextRequest, props: { params: Promise<{ taskI
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
-        return NextResponse.json({ error: "Not a task checklist" }, { status: 400 });
+      if (!isKanbanType(task.type)) {
+        return NextResponse.json(
+          { error: "Not a task checklist" },
+          { status: 400 },
+        );
       }
 
       const transformItem = (item: any, index: number): any => {
@@ -28,8 +38,9 @@ export async function GET(request: NextRequest, props: { params: Promise<{ taskI
         };
 
         if (item.children && item.children.length > 0) {
-          baseItem.children = item.children.map((child: any, childIndex: number) =>
-            transformItem(child, childIndex)
+          baseItem.children = item.children.map(
+            (child: any, childIndex: number) =>
+              transformItem(child, childIndex),
           );
         }
 
@@ -55,13 +66,16 @@ export async function GET(request: NextRequest, props: { params: Promise<{ taskI
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
 }
 
-export async function PUT(request: NextRequest, props: { params: Promise<{ taskId: string }> }) {
+export async function PUT(
+  request: NextRequest,
+  props: { params: Promise<{ taskId: string }> },
+) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
     try {
@@ -73,8 +87,11 @@ export async function PUT(request: NextRequest, props: { params: Promise<{ taskI
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
-        return NextResponse.json({ error: "Not a task checklist" }, { status: 400 });
+      if (!isKanbanType(task.type)) {
+        return NextResponse.json(
+          { error: "Not a task checklist" },
+          { status: 400 },
+        );
       }
 
       const formData = new FormData();
@@ -107,13 +124,16 @@ export async function PUT(request: NextRequest, props: { params: Promise<{ taskI
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
 }
 
-export async function DELETE(request: NextRequest, props: { params: Promise<{ taskId: string }> }) {
+export async function DELETE(
+  request: NextRequest,
+  props: { params: Promise<{ taskId: string }> },
+) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
     try {
@@ -122,8 +142,11 @@ export async function DELETE(request: NextRequest, props: { params: Promise<{ ta
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
-        return NextResponse.json({ error: "Not a task checklist" }, { status: 400 });
+      if (!isKanbanType(task.type)) {
+        return NextResponse.json(
+          { error: "Not a task checklist" },
+          { status: 400 },
+        );
       }
 
       const formData = new FormData();
@@ -141,7 +164,7 @@ export async function DELETE(request: NextRequest, props: { params: Promise<{ ta
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/tasks/[taskId]/statuses/[statusId]/route.ts b/app/api/tasks/[taskId]/statuses/[statusId]/route.ts
index a4b14202..3d2af5cf 100644
--- a/app/api/tasks/[taskId]/statuses/[statusId]/route.ts
+++ b/app/api/tasks/[taskId]/statuses/[statusId]/route.ts
@@ -4,6 +4,7 @@ import { getListById } from "@/app/_server/actions/checklist";
 import { listToMarkdown } from "@/app/_utils/checklist-utils";
 import { serverWriteFile } from "@/app/_server/actions/file";
 import path from "path";
+import { isKanbanType } from "@/app/_types/enums";
 
 const CHECKLISTS_FOLDER = "checklists";
 
@@ -11,7 +12,7 @@ export const dynamic = "force-dynamic";
 
 export async function PUT(
   request: NextRequest,
-  props: { params: Promise<{ taskId: string; statusId: string }> }
+  props: { params: Promise<{ taskId: string; statusId: string }> },
 ) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
@@ -24,8 +25,11 @@ export async function PUT(
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
-        return NextResponse.json({ error: "Not a task checklist" }, { status: 400 });
+      if (!isKanbanType(task.type)) {
+        return NextResponse.json(
+          { error: "Not a task checklist" },
+          { status: 400 },
+        );
       }
 
       const currentStatuses = task.statuses || [
@@ -34,20 +38,25 @@ export async function PUT(
         { id: "completed", label: "Completed", order: 2 },
       ];
 
-      const statusIndex = currentStatuses.findIndex((s) => s.id === params.statusId);
+      const statusIndex = currentStatuses.findIndex(
+        (s) => s.id === params.statusId,
+      );
       if (statusIndex === -1) {
-        return NextResponse.json({ error: "Status not found" }, { status: 404 });
+        return NextResponse.json(
+          { error: "Status not found" },
+          { status: 404 },
+        );
       }
 
       const updatedStatuses = currentStatuses.map((s) =>
         s.id === params.statusId
           ? {
-            ...s,
-            label: label ?? s.label,
-            color: color !== undefined ? color : s.color,
-            order: order !== undefined ? order : s.order,
-          }
-          : s
+              ...s,
+              label: label ?? s.label,
+              color: color !== undefined ? color : s.color,
+              order: order !== undefined ? order : s.order,
+            }
+          : s,
       );
 
       const updatedTask = {
@@ -60,22 +69,25 @@ export async function PUT(
         process.cwd(),
         "data",
         CHECKLISTS_FOLDER,
-        task.owner!
+        task.owner!,
       );
       const filePath = path.join(
         ownerDir,
         task.category || "Uncategorized",
-        `${task.id}.md`
+        `${task.id}.md`,
       );
 
       await serverWriteFile(filePath, listToMarkdown(updatedTask as any));
 
-      return NextResponse.json({ success: true, data: updatedStatuses.find((s) => s.id === params.statusId) });
+      return NextResponse.json({
+        success: true,
+        data: updatedStatuses.find((s) => s.id === params.statusId),
+      });
     } catch (error) {
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
@@ -83,7 +95,7 @@ export async function PUT(
 
 export async function DELETE(
   request: NextRequest,
-  props: { params: Promise<{ taskId: string; statusId: string }> }
+  props: { params: Promise<{ taskId: string; statusId: string }> },
 ) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
@@ -93,8 +105,11 @@ export async function DELETE(
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
-        return NextResponse.json({ error: "Not a task checklist" }, { status: 400 });
+      if (task.type !== "kanban" && task.type !== "task") {
+        return NextResponse.json(
+          { error: "Not a task checklist" },
+          { status: 400 },
+        );
       }
 
       const currentStatuses = task.statuses || [
@@ -103,15 +118,24 @@ export async function DELETE(
         { id: "completed", label: "Completed", order: 2 },
       ];
 
-      const statusIndex = currentStatuses.findIndex((s) => s.id === params.statusId);
+      const statusIndex = currentStatuses.findIndex(
+        (s) => s.id === params.statusId,
+      );
       if (statusIndex === -1) {
-        return NextResponse.json({ error: "Status not found" }, { status: 404 });
+        return NextResponse.json(
+          { error: "Status not found" },
+          { status: 404 },
+        );
       }
 
-      const updatedStatuses = currentStatuses.filter((s) => s.id !== params.statusId);
+      const updatedStatuses = currentStatuses.filter(
+        (s) => s.id !== params.statusId,
+      );
 
-      const sortedStatuses = [...updatedStatuses].sort((a, b) => a.order - b.order);
-      const defaultStatusId = sortedStatuses[0]?.id || 'todo';
+      const sortedStatuses = [...updatedStatuses].sort(
+        (a, b) => a.order - b.order,
+      );
+      const defaultStatusId = sortedStatuses[0]?.id || "todo";
 
       const updateItemStatus = (items: any[]): any[] => {
         return items.map((item) => {
@@ -137,12 +161,12 @@ export async function DELETE(
         process.cwd(),
         "data",
         CHECKLISTS_FOLDER,
-        task.owner!
+        task.owner!,
       );
       const filePath = path.join(
         ownerDir,
         task.category || "Uncategorized",
-        `${task.id}.md`
+        `${task.id}.md`,
       );
 
       await serverWriteFile(filePath, listToMarkdown(updatedTask as any));
@@ -152,7 +176,7 @@ export async function DELETE(
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/tasks/[taskId]/statuses/route.ts b/app/api/tasks/[taskId]/statuses/route.ts
index 27f437c4..031f8f1f 100644
--- a/app/api/tasks/[taskId]/statuses/route.ts
+++ b/app/api/tasks/[taskId]/statuses/route.ts
@@ -5,12 +5,16 @@ import { listToMarkdown } from "@/app/_utils/checklist-utils";
 import { serverWriteFile } from "@/app/_server/actions/file";
 import path from "path";
 import { KanbanStatus } from "@/app/_types";
+import { isKanbanType } from "@/app/_types/enums";
 
 const CHECKLISTS_FOLDER = "checklists";
 
 export const dynamic = "force-dynamic";
 
-export async function GET(request: NextRequest, props: { params: Promise<{ taskId: string }> }) {
+export async function GET(
+  request: NextRequest,
+  props: { params: Promise<{ taskId: string }> },
+) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
     try {
@@ -19,10 +23,10 @@ export async function GET(request: NextRequest, props: { params: Promise<{ taskI
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
+      if (!isKanbanType(task.type)) {
         return NextResponse.json(
           { error: "Not a task checklist" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
@@ -37,13 +41,16 @@ export async function GET(request: NextRequest, props: { params: Promise<{ taskI
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
 }
 
-export async function POST(request: NextRequest, props: { params: Promise<{ taskId: string }> }) {
+export async function POST(
+  request: NextRequest,
+  props: { params: Promise<{ taskId: string }> },
+) {
   const params = await props.params;
   return withApiAuth(request, async (user) => {
     try {
@@ -53,7 +60,7 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
       if (!id || !label) {
         return NextResponse.json(
           { error: "Status id and label are required" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
@@ -62,10 +69,10 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
         return NextResponse.json({ error: "Task not found" }, { status: 404 });
       }
 
-      if (task.type !== "task") {
+      if (task.type !== "kanban" && task.type !== "task") {
         return NextResponse.json(
           { error: "Not a task checklist" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
@@ -78,7 +85,7 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
       if (currentStatuses.some((s) => s.id === id)) {
         return NextResponse.json(
           { error: "Status with this id already exists" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
@@ -102,12 +109,12 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
         process.cwd(),
         "data",
         CHECKLISTS_FOLDER,
-        task.owner!
+        task.owner!,
       );
       const filePath = path.join(
         ownerDir,
         task.category || "Uncategorized",
-        `${task.id}.md`
+        `${task.id}.md`,
       );
 
       await serverWriteFile(filePath, listToMarkdown(updatedTask as any));
@@ -117,7 +124,7 @@ export async function POST(request: NextRequest, props: { params: Promise<{ task
       console.error("API Error:", error);
       return NextResponse.json(
         { error: "Internal server error" },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
diff --git a/app/api/tasks/route.ts b/app/api/tasks/route.ts
index 64bd3330..301eb0d5 100644
--- a/app/api/tasks/route.ts
+++ b/app/api/tasks/route.ts
@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { withApiAuth } from "@/app/_utils/api-utils";
 import { getUserChecklists, createList } from "@/app/_server/actions/checklist";
-import { TaskStatus } from "@/app/_types/enums";
+import { isKanbanType, TaskStatus } from "@/app/_types/enums";
 import { Checklist, Result } from "@/app/_types";
 
 export const dynamic = "force-dynamic";
@@ -10,20 +10,22 @@ export async function GET(request: NextRequest) {
   return withApiAuth(request, async (user) => {
     try {
       const { searchParams } = new URL(request.url);
-      const category = searchParams.get('category');
-      const status = searchParams.get('status');
-      const search = searchParams.get('q');
+      const category = searchParams.get("category");
+      const status = searchParams.get("status");
+      const search = searchParams.get("q");
 
-      const lists = await getUserChecklists({ username: user.username }) as Result<Checklist[]>;
+      const lists = (await getUserChecklists({
+        username: user.username,
+      })) as Result<Checklist[]>;
       if (!lists.success || !lists.data) {
         return NextResponse.json(
           { error: lists.error || "Failed to fetch tasks" },
-          { status: 500 }
+          { status: 500 },
         );
       }
 
       let userTasks = lists.data.filter(
-        (list) => list.owner === user.username && list.type === "task"
+        (list) => list.owner === user.username && isKanbanType(list.type),
       );
 
       if (category) {
@@ -31,14 +33,17 @@ export async function GET(request: NextRequest) {
       }
       if (status) {
         userTasks = userTasks.filter((list) =>
-          list.items.some(item => item.status === status)
+          list.items.some((item) => item.status === status),
         );
       }
       if (search) {
         const searchLower = search.toLowerCase();
-        userTasks = userTasks.filter((list) =>
-          list.title?.toLowerCase().includes(searchLower) ||
-          list.items.some(item => item.text.toLowerCase().includes(searchLower))
+        userTasks = userTasks.filter(
+          (list) =>
+            list.title?.toLowerCase().includes(searchLower) ||
+            list.items.some((item) =>
+              item.text.toLowerCase().includes(searchLower),
+            ),
         );
       }
 
@@ -52,8 +57,9 @@ export async function GET(request: NextRequest) {
         };
 
         if (item.children && item.children.length > 0) {
-          baseItem.children = item.children.map((child: any, childIndex: number) =>
-            transformItem(child, childIndex)
+          baseItem.children = item.children.map(
+            (child: any, childIndex: number) =>
+              transformItem(child, childIndex),
           );
         }
 
@@ -79,11 +85,9 @@ export async function GET(request: NextRequest) {
       return NextResponse.json(
         {
           error:
-            error instanceof Error
-              ? error.message
-              : "Failed to fetch tasks",
+            error instanceof Error ? error.message : "Failed to fetch tasks",
         },
-        { status: 500 }
+        { status: 500 },
       );
     }
   });
@@ -98,14 +102,14 @@ export async function POST(request: NextRequest) {
       if (!title) {
         return NextResponse.json(
           { error: "Title is required" },
-          { status: 400 }
+          { status: 400 },
         );
       }
 
       const formData = new FormData();
       formData.append("title", title);
       formData.append("category", category);
-      formData.append("type", "task");
+      formData.append("type", "kanban");
       formData.append("user", JSON.stringify(user));
 
       if (statuses) {
@@ -116,7 +120,10 @@ export async function POST(request: NextRequest) {
 
       if (result.error || !result.data) {
         console.error("Create task error:", result.error);
-        return NextResponse.json({ error: result.error || "Failed to create task" }, { status: 400 });
+        return NextResponse.json(
+          { error: result.error || "Failed to create task" },
+          { status: 400 },
+        );
       }
 
       const transformedTask = {
@@ -137,8 +144,11 @@ export async function POST(request: NextRequest) {
     } catch (error) {
       console.error("API Error:", error);
       return NextResponse.json(
-        { error: error instanceof Error ? error.message : "Internal server error" },
-        { status: 500 }
+        {
+          error:
+            error instanceof Error ? error.message : "Internal server error",
+        },
+        { status: 500 },
       );
     }
   });
diff --git a/docker-compose.yml b/docker-compose.yml
index a53f6879..4e564798 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       #- INTERNAL_API_URL=http://localhost:3000
       #- SERVE_PUBLIC_IMAGES=yes
       #- SERVE_PUBLIC_FILES=yes
-      #- SSO_MODE=oidc
+      #- AUTH_MODE=oidc
       #- OIDC_ISSUER=<YOUR_SSO_ISSUER>
       #- OIDC_CLIENT_ID=<YOUR_SSO_CLIENT_ID>
       #- OIDC_CLIENT_SECRET=your_client_secret
diff --git a/howto/DOCKER.md b/howto/DOCKER.md
index 9d835206..ef5ae3a8 100644
--- a/howto/DOCKER.md
+++ b/howto/DOCKER.md
@@ -102,7 +102,7 @@ environment:
   - SERVE_PUBLIC_IMAGES=yes
   - SERVE_PUBLIC_FILES=yes
   - STOP_CHECK_UPDATES=no
-  - SSO_MODE=oidc
+  - AUTH_MODE=oidc
   - OIDC_ISSUER=<YOUR_SSO_ISSUER>
   - OIDC_CLIENT_ID=<YOUR_SSO_CLIENT_ID>
   - APP_URL=https://your-jotty-domain.com
@@ -124,7 +124,7 @@ environment:
 
 ### SSO Configuration (Optional)
 
-- `- SSO_MODE=oidc` Enables OIDC (OpenID Connect) single sign-on authentication.
+- `- AUTH_MODE=oidc` Enables OIDC (OpenID Connect) single sign-on authentication. (Previously `SSO_MODE`, which still works as a fallback.)
 - `- OIDC_ISSUER=<YOUR_SSO_ISSUER>` URL of your OIDC provider (e.g., Authentik, Auth0, Keycloak).
 - `- OIDC_CLIENT_ID=<YOUR_SSO_CLIENT_ID>` Client ID from your OIDC provider configuration.
 - `- OIDC_CLIENT_SECRET=your_client_secret` Optional. Client secret for confidential OIDC client authentication.
diff --git a/howto/ENV-VARIABLES.md b/howto/ENV-VARIABLES.md
index 97299050..9de0e1ef 100644
--- a/howto/ENV-VARIABLES.md
+++ b/howto/ENV-VARIABLES.md
@@ -9,7 +9,7 @@ HTTPS=true
 SERVE_PUBLIC_IMAGES=yes
 SERVE_PUBLIC_FILES=yes
 STOP_CHECK_UPDATES=no
-SSO_MODE=oidc
+AUTH_MODE=oidc
 OIDC_ISSUER=<YOUR_SSO_ISSUER>
 OIDC_CLIENT_ID=<YOUR_SSO_CLIENT_ID>
 APP_URL=https://your-jotty-domain.com
@@ -43,7 +43,7 @@ OIDC_ADMIN_GROUPS=admins
 ### Mandatory
 
 - `APP_URL=https://your-jotty-domain.com` Tells the OIDC of your choice what url you are trying to authenticate against.
-- `SSO_MODE=oidc` Enables OIDC (OpenID Connect) single sign-on authentication.
+- `AUTH_MODE=oidc` Enables OIDC (OpenID Connect) single sign-on authentication. (Previously `SSO_MODE`, which still works as a fallback.)
 - `OIDC_ISSUER=<YOUR_SSO_ISSUER>` URL of your OIDC provider (e.g., Authentik, Auth0, Keycloak).
 - `OIDC_CLIENT_ID=<YOUR_SSO_CLIENT_ID>` Client ID from your OIDC provider configuration.
 
diff --git a/howto/LDAP.md b/howto/LDAP.md
new file mode 100644
index 00000000..d3fcfb89
--- /dev/null
+++ b/howto/LDAP.md
@@ -0,0 +1,176 @@
+# LDAP Authentication
+
+`jotty·page` supports authenticating users directly against an LDAP or Active Directory server. Users enter their usual username and password in the standard login form — no browser redirects.
+
+## Requirements
+
+- An LDAP server reachable from the container (OpenLDAP, LLDAP, Active Directory, FreeIPA, etc.)
+- A service account DN ("bind user") and password with search access to the user tree
+- For group-based access control or admin promotion: the **`memberof` overlay** must be enabled on the LDAP server. Without it, `LDAP_USER_GROUPS` and `LDAP_ADMIN_GROUPS` will silently have no effect (all authenticated users will be allowed in, none will be promoted to admin).
+
+## Quick Start
+
+```yaml
+services:
+  jotty:
+    environment:
+      - AUTH_MODE=ldap
+      - LDAP_URL=ldap://ldap.example.com:389
+      - LDAP_BIND_DN=cn=service,dc=example,dc=com
+      - LDAP_BIND_PASSWORD=service-account-password
+      - LDAP_BASE_DN=ou=users,dc=example,dc=com
+```
+
+## Environment Variables
+
+### Required
+
+- `AUTH_MODE=ldap` — Enables LDAP authentication. The standard username/password form is used; the OIDC "Sign in with SSO" button is not shown. (Previously `SSO_MODE=ldap`, which still works as a fallback.)
+- `LDAP_URL=ldap://ldap.example.com:389` — URL of your LDAP server. Use `ldaps://` on port `636` for TLS.
+- `LDAP_BIND_DN=cn=service,dc=example,dc=com` — Distinguished name of the service account used to search the directory.
+- `LDAP_BIND_PASSWORD=secret` — Password of the service account. See [Docker Secrets](#docker-secrets) for storing this securely.
+- `LDAP_BASE_DN=ou=users,dc=example,dc=com` — Base DN under which to search for users.
+
+### Optional
+
+- `SSO_FALLBACK_LOCAL=yes` — Allow both LDAP and local password login simultaneously. When set, the standard form accepts both LDAP credentials and local accounts. Useful for a local admin fallback.
+- `LDAP_USER_ATTRIBUTE=uid` — The LDAP attribute matched against the submitted username. Defaults to `uid`. Use `sAMAccountName` for Active Directory.
+- `LDAP_ADMIN_GROUPS=cn=admins,ou=groups,dc=example,dc=com` — Pipe-separated list of group DNs. Users whose `memberOf` attribute contains any of these DNs are granted admin rights on first login. **Note:** DNs contain commas, so groups must be separated with `|`, not `,`.
+- `LDAP_USER_GROUPS=cn=jotty,ou=groups,dc=example,dc=com` — Pipe-separated list of group DNs. When set, only members of these groups (or admin groups) can log in. Users not in any listed group are rejected with an "unauthorized" error.
+- `LDAP_BIND_PASSWORD_FILE=/run/secrets/ldap_password` — Path to a file containing the service account password. Takes priority over `LDAP_BIND_PASSWORD` if both are set. See [Docker Secrets](#docker-secrets).
+
+## Group-Based Access Control
+
+Both `LDAP_USER_GROUPS` and `LDAP_ADMIN_GROUPS` are matched against the `memberOf` attribute of the authenticated user's LDAP entry. This is a multi-value attribute listing all group DNs the user belongs to, for example:
+
+```
+uid: alice
+memberOf: cn=admins,ou=groups,dc=example,dc=com
+memberOf: cn=jotty,ou=groups,dc=example,dc=com
+```
+
+**Access logic:**
+- If `LDAP_USER_GROUPS` is set: the user must be in at least one listed group, **or** in an `LDAP_ADMIN_GROUPS` group. Admin group membership bypasses the user group check.
+- If `LDAP_USER_GROUPS` is not set: all successfully authenticated LDAP users are allowed in.
+- Admin status (`LDAP_ADMIN_GROUPS`) is applied on first login and can be promoted later (e.g. by also adding the user to the admin group). It is never automatically revoked.
+
+**Requirement:** The `memberof` overlay must be enabled on your LDAP server. On OpenLDAP this is the `memberof` module. Active Directory supports this natively. FreeIPA supports it with the `memberof` plugin. If the overlay is absent, `memberOf` will not appear on user entries and group checks will not work.
+
+## Active Directory Notes
+
+For Active Directory, set:
+
+```yaml
+- LDAP_USER_ATTRIBUTE=sAMAccountName
+- LDAP_URL=ldap://dc.example.com:389
+- LDAP_BASE_DN=CN=Users,DC=example,DC=com
+- LDAP_BIND_DN=CN=service,CN=Users,DC=example,DC=com
+```
+
+`memberOf` is supported natively in Active Directory — no extra configuration needed for group-based access control.
+
+## LDAPS (TLS)
+
+Use `ldaps://` and port `636`:
+
+```yaml
+- LDAP_URL=ldaps://ldap.example.com:636
+```
+
+`ldapts` validates the server certificate against the system CA store by default. If you are using a self-signed certificate, you need to add your CA certificate to the container. The recommended approach is to mount it and set `NODE_EXTRA_CA_CERTS`:
+
+```yaml
+services:
+  jotty:
+    environment:
+      - NODE_EXTRA_CA_CERTS=/app/config/ldap-ca.crt
+    volumes:
+      - ./ldap-ca.crt:/app/config/ldap-ca.crt:ro
+```
+
+## Docker Secrets
+
+<details>
+<summary>Storing the service account password securely</summary>
+
+To prevent the service account password from appearing in `docker inspect` output, use a secrets file:
+
+```yaml
+services:
+  jotty:
+    environment:
+      - AUTH_MODE=ldap
+      - LDAP_URL=ldap://ldap.example.com:389
+      - LDAP_BIND_DN=cn=service,dc=example,dc=com
+      - LDAP_BIND_PASSWORD_FILE=/run/secrets/ldap_password
+      - LDAP_BASE_DN=ou=users,dc=example,dc=com
+    secrets:
+      - ldap_password
+
+secrets:
+  ldap_password:
+    file: ./secrets/ldap_password.txt
+```
+
+```bash
+mkdir secrets
+echo "your-service-account-password" > secrets/ldap_password.txt
+chmod 600 secrets/ldap_password.txt
+```
+
+</details>
+
+## Limitations
+
+jotty·page manages a **local copy** of user accounts. LDAP is only consulted at login time. This means:
+
+- Changing a user's password or deleting a user in jotty's admin panel does **not** propagate to the LDAP server.
+- Changing a password in jotty's personal settings has no effect on LDAP login — the user always authenticates against LDAP.
+- Deleting a user in jotty removes their local notes and checklists, but does not remove them from the directory.
+- Admin status is set from `LDAP_ADMIN_GROUPS` on first login. Removing a user from the admin group in LDAP will not revoke their admin status in jotty (though a jotty admin can do so manually).
+
+## Troubleshooting
+
+### Disclaimer
+
+LDAP support was implemented with the help of Claude code. It was tested under the following conditions:
+  * LDAP server: [lldap](https://github.com/lldap/lldap)
+  * Environment variables: all where tested except `LDAP_BIND_PASSWORD_FILE` and `LDAP_USER_ATTRIBUTE`.
+  * Group-based access control: the logic described above was verified.
+  * Correct first start behaviour was verified.
+
+Other LDAP servers have not been tested, yet.
+
+### Login fails with "Authentication service unavailable"
+
+The service account bind or the LDAP search failed (connection refused, DNS failure, wrong URL). Set `DEBUGGER=true` in your environment to log the underlying error to stdout:
+
+```yaml
+- DEBUGGER=true
+```
+
+### Login fails with "Invalid username or password" but credentials are correct
+
+- Check that `LDAP_USER_ATTRIBUTE` matches the attribute used for login. OpenLDAP typically uses `uid`; Active Directory uses `sAMAccountName`.
+- Check that `LDAP_BASE_DN` covers the user's location in the directory tree.
+- Verify the service account has read access to the base DN.
+
+### Login fails with "You are not authorized"
+
+The user authenticated successfully but is not a member of any group listed in `LDAP_USER_GROUPS`. Either add the user to a permitted group in the directory, or remove `LDAP_USER_GROUPS` to allow all authenticated users.
+
+### Group membership is not being detected
+
+Ensure the `memberof` overlay is enabled on your LDAP server. You can verify by checking the user's entry directly:
+
+```bash
+ldapsearch -x -H ldap://ldap.example.com \
+  -D "cn=service,dc=example,dc=com" -w secret \
+  -b "ou=users,dc=example,dc=com" "(uid=alice)" memberOf
+```
+
+If `memberOf` does not appear in the output, the overlay is not active.
+
+### First LDAP user is not getting admin rights
+
+`LDAP_ADMIN_GROUPS` is only evaluated when a user's `memberOf` contains a matching DN. If no admin groups are configured, no LDAP user will be automatically promoted to admin. You can manually grant admin rights from jotty's admin panel, or set `SSO_FALLBACK_LOCAL=yes` and create a local admin account during initial setup.
diff --git a/howto/SSO.md b/howto/SSO.md
index 9ef921c6..499ad498 100644
--- a/howto/SSO.md
+++ b/howto/SSO.md
@@ -27,7 +27,7 @@
 services:
   jotty:
     environment:
-      - SSO_MODE=oidc
+      - AUTH_MODE=oidc
       - OIDC_ISSUER=https://YOUR_SSO_HOST/issuer/path
       - OIDC_CLIENT_ID=your_client_id
       - APP_URL=https://your-jotty-domain.com # if not set defaults to http://localhost:<port>
@@ -131,7 +131,7 @@ For enhanced security in production environments, you can store OIDC credentials
 services:
   jotty:
     environment:
-      - SSO_MODE=oidc
+      - AUTH_MODE=oidc
       - OIDC_ISSUER=https://YOUR_SSO_HOST/issuer/path
       - OIDC_CLIENT_ID_FILE=/run/secrets/oidc_client_id
       - OIDC_CLIENT_SECRET_FILE=/run/secrets/oidc_client_secret
diff --git a/next.config.mjs b/next.config.mjs
index 3f70759b..5b039ebf 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -6,10 +6,15 @@ const withNextIntl = createNextIntlPlugin("./i18n.ts");
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   output: "standalone",
-  serverExternalPackages: ["ws"],
+  serverExternalPackages: ["ws", "libsodium-wrappers-sumo"],
   serverActions: {
     bodySizeLimit: "100mb",
   },
+  experimental: {
+    serverActions: {
+      bodySizeLimit: "100mb",
+    },
+  },
   images: {
     unoptimized: true,
   },
diff --git a/package.json b/package.json
index 908319f0..eef8764b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jotty.page",
-  "version": "1.21.1",
+  "version": "1.22.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -11,7 +11,10 @@
     "test:run": "vitest run",
     "test:coverage": "vitest run --coverage",
     "mock:data:lists": "tsx tests/mock-data/checklist-generator.ts",
-    "mock:data:notes": "tsx tests/mock-data/note-generator.ts"
+    "mock:data:notes": "tsx tests/mock-data/note-generator.ts",
+    "docker:test": "docker compose -f docker-compose.test.yml down && docker compose -f docker-compose.test.yml build && docker compose -f docker-compose.test.yml up -d",
+    "docker:test:logs": "docker compose -f docker-compose.test.yml logs -f",
+    "docker:test:restart": "docker compose -f docker-compose.test.yml down && docker compose -f docker-compose.test.yml up -d"
   },
   "dependencies": {
     "@dnd-kit/core": "^6.3.1",
@@ -52,11 +55,12 @@
     "diff": "^5.2.2",
     "dompurify": "^3.3.0",
     "hast-util-to-html": "^9.0.5",
-    "hugeicons-react": "^0.3.0",
+    "hugeicons-react": "0.3.0",
     "jose": "^6.1.0",
     "js-beautify": "^1.15.4",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^9.0.2",
+    "ldapts": "^8.1.7",
     "libsodium-wrappers-sumo": "^0.7.15",
     "mermaid": "^11.12.1",
     "next": "16.1.6",
@@ -67,6 +71,7 @@
     "proper-lockfile": "^4.1.2",
     "qrcode": "^1.5.4",
     "react": "19.2.4",
+    "react-day-picker": "^9.14.0",
     "react-dom": "19.2.4",
     "react-markdown": "^10.1.0",
     "react-masonry-css": "^1.0.16",
@@ -98,7 +103,6 @@
     "lodash-es": "^4.17.23",
     "lodash": "^4.17.23",
     "nanoid": "^3.3.8",
-    "**/mermaid": "^11.12.1",
     "@types/react": "19.2.13",
     "@types/react-dom": "19.2.3",
     "@isaacs/brace-expansion": "^5.0.1",
diff --git a/proxy.ts b/proxy.ts
index 56e56c86..67ecb2e4 100644
--- a/proxy.ts
+++ b/proxy.ts
@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 import type { NextRequest } from "next/server";
-import { isEnvEnabled, isDebugFlag } from "./app/_utils/env-utils";
+import { isDebugFlag, getSessionCookieName } from "./app/_utils/env-utils";
 
 const debugProxy = isDebugFlag("proxy");
 
@@ -59,11 +59,7 @@ export const proxy = async (request: NextRequest) => {
     return NextResponse.next();
   }
 
-  const cookieName =
-    process.env.NODE_ENV === "production" && isEnvEnabled(process.env.HTTPS)
-      ? "__Host-session"
-      : "session";
-  const sessionId = request.cookies.get(cookieName)?.value;
+  const sessionId = request.cookies.get(getSessionCookieName())?.value;
 
   if (debugProxy) {
     console.log(
@@ -106,7 +102,7 @@ export const proxy = async (request: NextRequest) => {
 
     if (!valid) {
       const redirectResponse = NextResponse.redirect(loginUrl);
-      redirectResponse.cookies.delete(cookieName);
+      redirectResponse.cookies.delete(getSessionCookieName());
 
       if (debugProxy) {
         console.log("MIDDLEWARE - session is not ok");
diff --git a/scripts/translations/README.md b/scripts/translations/README.md
new file mode 100644
index 00000000..65cd0ebc
--- /dev/null
+++ b/scripts/translations/README.md
@@ -0,0 +1,9 @@
+# What on earth is this?
+
+Hi, fccview here.
+This is a bit of a convoluted way I came up with to make sure translations stay up to date.
+Translations are 100% user made and I only add languages that contributors created PRs for.
+
+HOWEVER I am using AI to maintain languages when I create new features, this means that you may see stuff that is not properly translated at times, so please create a pull request with adjustments if needed.
+
+These scripts compare all translation files and allow me to ask AI to create patch files to just update them in batches, so I don't go crazy about it.
\ No newline at end of file
diff --git a/scripts/translations/apply-locale-patches.js b/scripts/translations/apply-locale-patches.js
new file mode 100644
index 00000000..b100d658
--- /dev/null
+++ b/scripts/translations/apply-locale-patches.js
@@ -0,0 +1,34 @@
+const fs = require("fs");
+const path = require("path");
+const { patches } = require("./locale-patches.cjs");
+
+const deepMerge = (target, source) => {
+  for (const key of Object.keys(source)) {
+    const sv = source[key];
+    const tv = target[key];
+    if (
+      sv !== null &&
+      typeof sv === "object" &&
+      !Array.isArray(sv) &&
+      tv !== null &&
+      typeof tv === "object" &&
+      !Array.isArray(tv)
+    ) {
+      deepMerge(tv, sv);
+    } else {
+      target[key] = sv;
+    }
+  }
+  return target;
+};
+
+const translationsDir = path.join(__dirname, "..", "app", "_translations");
+
+for (const [locale, patch] of Object.entries(patches)) {
+  const filePath = path.join(translationsDir, `${locale}.json`);
+  const data = JSON.parse(fs.readFileSync(filePath, "utf8"));
+  deepMerge(data, patch);
+  fs.writeFileSync(filePath, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+}
+
+process.stdout.write(`Patched: ${Object.keys(patches).sort().join(", ")}\n`);
diff --git a/scripts/translations/compare-translations.js b/scripts/translations/compare-translations.js
new file mode 100644
index 00000000..26dc72f1
--- /dev/null
+++ b/scripts/translations/compare-translations.js
@@ -0,0 +1,157 @@
+const fs = require("fs");
+const path = require("path");
+
+const isPlainObject = (value) =>
+  value !== null && typeof value === "object" && !Array.isArray(value);
+
+const collectLeafPaths = (node, prefix = "") => {
+  const paths = [];
+  if (!isPlainObject(node)) {
+    if (prefix) paths.push(prefix);
+    return paths;
+  }
+  for (const key of Object.keys(node).sort()) {
+    const next = prefix ? `${prefix}.${key}` : key;
+    paths.push(...collectLeafPaths(node[key], next));
+  }
+  return paths;
+};
+
+const parseArgs = (argv) => {
+  const defaultBase = "en";
+  const translationsDir = path.join("app", "_translations");
+  let onlyLocale = null;
+  let showExtra = false;
+  let out = defaultBase;
+  let dir = translationsDir;
+  for (let i = 2; i < argv.length; i += 1) {
+    const a = argv[i];
+    if (a === "--base" && argv[i + 1]) {
+      out = argv[i + 1].replace(/\.json$/i, "");
+      i += 1;
+    } else if (a === "--dir" && argv[i + 1]) {
+      dir = argv[i + 1];
+      i += 1;
+    } else if (a === "--locale" && argv[i + 1]) {
+      onlyLocale = argv[i + 1].replace(/\.json$/i, "");
+      i += 1;
+    } else if (a === "--extra") {
+      showExtra = true;
+    } else if (a === "--help" || a === "-h") {
+      process.stdout.write(
+        [
+          "Usage: node scripts/compare-translations.js [options]",
+          "",
+          "Compares locale JSON files to a baseline and lists missing translation keys.",
+          "",
+          "Options:",
+          "  --base <code>   Baseline locale file name without .json (default: en)",
+          "  --dir <path>    Translations directory (default: app/_translations)",
+          "  --locale <code> Only compare this locale",
+          "  --extra         Also list keys present only in non-baseline files",
+          "",
+        ].join("\n")
+      );
+      process.exit(0);
+    }
+  }
+  return { base: out, dir, onlyLocale, showExtra };
+};
+
+const loadLocaleJson = (filePath) => {
+  const raw = fs.readFileSync(filePath, "utf8");
+  return JSON.parse(raw);
+};
+
+const main = () => {
+  const cwd = process.cwd();
+  const { base, dir, onlyLocale, showExtra } = parseArgs(process.argv);
+  const absDir = path.isAbsolute(dir) ? dir : path.join(cwd, dir);
+
+  if (!fs.existsSync(absDir)) {
+    process.stderr.write(`Translations directory not found: ${absDir}\n`);
+    process.exit(1);
+  }
+
+  const baseFile = path.join(absDir, `${base}.json`);
+  if (!fs.existsSync(baseFile)) {
+    process.stderr.write(`Baseline file not found: ${baseFile}\n`);
+    process.exit(1);
+  }
+
+  const baseJson = loadLocaleJson(baseFile);
+  const basePaths = collectLeafPaths(baseJson);
+  const baseSet = new Set(basePaths);
+
+  const files = fs
+    .readdirSync(absDir)
+    .filter((f) => f.endsWith(".json"))
+    .map((f) => f.replace(/\.json$/i, ""))
+    .filter((code) => code !== base);
+
+  const targets = onlyLocale
+    ? files.filter((c) => c === onlyLocale)
+    : files;
+
+  if (onlyLocale && targets.length === 0) {
+    process.stderr.write(
+      `Locale "${onlyLocale}" not found or is the baseline.\n`
+    );
+    process.exit(1);
+  }
+
+  let hadMissing = false;
+
+  for (const locale of targets.sort()) {
+    const filePath = path.join(absDir, `${locale}.json`);
+    const json = loadLocaleJson(filePath);
+    const localePaths = collectLeafPaths(json);
+    const localeSet = new Set(localePaths);
+
+    const missing = basePaths.filter((p) => !localeSet.has(p));
+    const extra = showExtra
+      ? localePaths.filter((p) => !baseSet.has(p))
+      : [];
+
+    const hasIssue =
+      missing.length > 0 || (showExtra && extra.length > 0);
+    if (!hasIssue) {
+      continue;
+    }
+
+    process.stdout.write(`\n=== ${locale}.json (vs ${base}.json) ===\n`);
+
+    if (missing.length > 0) {
+      hadMissing = true;
+      process.stdout.write(`Missing ${missing.length} key(s):\n`);
+      for (const key of missing) {
+        process.stdout.write(`  - ${key}\n`);
+      }
+    }
+
+    if (showExtra && extra.length > 0) {
+      process.stdout.write(
+        `\nExtra ${extra.length} key(s) (not in ${base}.json):\n`
+      );
+      for (const key of extra) {
+        process.stdout.write(`  + ${key}\n`);
+      }
+    }
+  }
+
+  if (!hadMissing) {
+    if (targets.length === 0) {
+      process.stdout.write(
+        `No locales to compare (only baseline ${base}.json found).\n`
+      );
+    } else {
+      process.stdout.write(
+        `All checked locales match ${base}.json leaf keys.\n`
+      );
+    }
+  }
+
+  process.exit(hadMissing ? 1 : 0);
+};
+
+main();
diff --git a/tests/api/checklists.test.ts b/tests/api/checklists.test.ts
index be226bc3..d4a240a5 100644
--- a/tests/api/checklists.test.ts
+++ b/tests/api/checklists.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest"
+import { describe, it, expect, beforeEach } from "vitest";
 import {
   mockUser,
   mockAuthenticateApiKey,
@@ -10,16 +10,16 @@ import {
   resetApiMocks,
   createMockRequest,
   getResponseJson,
-} from "./setup"
+} from "./setup";
 
-import { GET, POST } from "@/app/api/checklists/route"
-import { PUT, DELETE } from "@/app/api/checklists/[listId]/route"
+import { GET, POST } from "@/app/api/checklists/route";
+import { PUT, DELETE } from "@/app/api/checklists/[listId]/route";
 
 describe("Checklists API", () => {
   beforeEach(() => {
-    resetApiMocks()
-    mockAuthenticateApiKey.mockResolvedValue(mockUser)
-  })
+    resetApiMocks();
+    mockAuthenticateApiKey.mockResolvedValue(mockUser);
+  });
 
   describe("GET /api/checklists", () => {
     it("should return checklists array", async () => {
@@ -35,77 +35,152 @@ describe("Checklists API", () => {
           createdAt: "2024-01-01T00:00:00.000Z",
           updatedAt: "2024-01-01T00:00:00.000Z",
         },
-      ]
-      mockGetUserChecklists.mockResolvedValue({ success: true, data: mockChecklists })
-
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists")
-      const response = await GET(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(200)
-      expect(Array.isArray(data.checklists)).toBe(true)
-      expect(data.checklists).toHaveLength(1)
-      expect(data.checklists[0].title).toBe("Test Checklist")
-    })
+      ];
+      mockGetUserChecklists.mockResolvedValue({
+        success: true,
+        data: mockChecklists,
+      });
+
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists",
+      );
+      const response = await GET(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(200);
+      expect(Array.isArray(data.checklists)).toBe(true);
+      expect(data.checklists).toHaveLength(1);
+      expect(data.checklists[0].title).toBe("Test Checklist");
+    });
 
     it("should filter checklists by category", async () => {
       const mockChecklists = [
-        { id: "1", uuid: "uuid-1", title: "Work List", category: "Work", type: "simple", items: [], owner: "testuser" },
-        { id: "2", uuid: "uuid-2", title: "Personal List", category: "Personal", type: "simple", items: [], owner: "testuser" },
-      ]
-      mockGetUserChecklists.mockResolvedValue({ success: true, data: mockChecklists })
-
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists?category=Work")
-      const response = await GET(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(200)
-      expect(data.checklists).toHaveLength(1)
-      expect(data.checklists[0].category).toBe("Work")
-    })
+        {
+          id: "1",
+          uuid: "uuid-1",
+          title: "Work List",
+          category: "Work",
+          type: "simple",
+          items: [],
+          owner: "testuser",
+        },
+        {
+          id: "2",
+          uuid: "uuid-2",
+          title: "Personal List",
+          category: "Personal",
+          type: "simple",
+          items: [],
+          owner: "testuser",
+        },
+      ];
+      mockGetUserChecklists.mockResolvedValue({
+        success: true,
+        data: mockChecklists,
+      });
+
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists?category=Work",
+      );
+      const response = await GET(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(200);
+      expect(data.checklists).toHaveLength(1);
+      expect(data.checklists[0].category).toBe("Work");
+    });
 
     it("should filter checklists by type", async () => {
       const mockChecklists = [
-        { id: "1", uuid: "uuid-1", title: "Simple List", category: "Work", type: "simple", items: [], owner: "testuser" },
-        { id: "2", uuid: "uuid-2", title: "Task List", category: "Work", type: "task", items: [], owner: "testuser" },
-      ]
-      mockGetUserChecklists.mockResolvedValue({ success: true, data: mockChecklists })
-
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists?type=simple")
-      const response = await GET(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(200)
-      expect(data.checklists).toHaveLength(1)
-      expect(data.checklists[0].type).toBe("simple")
-    })
+        {
+          id: "1",
+          uuid: "uuid-1",
+          title: "Simple List",
+          category: "Work",
+          type: "simple",
+          items: [],
+          owner: "testuser",
+        },
+        {
+          id: "2",
+          uuid: "uuid-2",
+          title: "Task List",
+          category: "Work",
+          type: "task",
+          items: [],
+          owner: "testuser",
+        },
+      ];
+      mockGetUserChecklists.mockResolvedValue({
+        success: true,
+        data: mockChecklists,
+      });
+
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists?type=simple",
+      );
+      const response = await GET(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(200);
+      expect(data.checklists).toHaveLength(1);
+      expect(data.checklists[0].type).toBe("simple");
+    });
 
     it("should search checklists", async () => {
       const mockChecklists = [
-        { id: "1", uuid: "uuid-1", title: "Shopping List", category: "Work", type: "simple", items: [{ text: "Buy milk" }], owner: "testuser" },
-        { id: "2", uuid: "uuid-2", title: "Todo List", category: "Work", type: "simple", items: [], owner: "testuser" },
-      ]
-      mockGetUserChecklists.mockResolvedValue({ success: true, data: mockChecklists })
-
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists?q=Shopping")
-      const response = await GET(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(200)
-      expect(data.checklists.length).toBeGreaterThanOrEqual(1)
-    })
+        {
+          id: "1",
+          uuid: "uuid-1",
+          title: "Shopping List",
+          category: "Work",
+          type: "simple",
+          items: [{ text: "Buy milk" }],
+          owner: "testuser",
+        },
+        {
+          id: "2",
+          uuid: "uuid-2",
+          title: "Todo List",
+          category: "Work",
+          type: "simple",
+          items: [],
+          owner: "testuser",
+        },
+      ];
+      mockGetUserChecklists.mockResolvedValue({
+        success: true,
+        data: mockChecklists,
+      });
+
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists?q=Shopping",
+      );
+      const response = await GET(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(200);
+      expect(data.checklists.length).toBeGreaterThanOrEqual(1);
+    });
 
     it("should return 401 for unauthorized requests", async () => {
-      mockAuthenticateApiKey.mockResolvedValue(null)
+      mockAuthenticateApiKey.mockResolvedValue(null);
 
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists")
-      const response = await GET(request)
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists",
+      );
+      const response = await GET(request);
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(401)
-      expect(data.error).toBe("Unauthorized")
-    })
-  })
+      expect(response.status).toBe(401);
+      expect(data.error).toBe("Unauthorized");
+    });
+  });
 
   describe("POST /api/checklists", () => {
     it("should create a checklist", async () => {
@@ -119,58 +194,74 @@ describe("Checklists API", () => {
         owner: "testuser",
         createdAt: "2024-01-01T00:00:00.000Z",
         updatedAt: "2024-01-01T00:00:00.000Z",
-      }
-      mockCreateList.mockResolvedValue({ success: true, data: newChecklist })
+      };
+      mockCreateList.mockResolvedValue({ success: true, data: newChecklist });
 
-      const request = createMockRequest("POST", "http://localhost:3000/api/checklists", {
-        title: "Test Checklist - API",
-        category: "API Tests",
-        type: "simple",
-      })
-      const response = await POST(request)
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/checklists",
+        {
+          title: "Test Checklist - API",
+          category: "API Tests",
+          type: "simple",
+        },
+      );
+      const response = await POST(request);
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(200)
-      expect(data.success).toBe(true)
-      expect(data.data.title).toBe("Test Checklist - API")
-    })
+      expect(response.status).toBe(200);
+      expect(data.success).toBe(true);
+      expect(data.data.title).toBe("Test Checklist - API");
+    });
 
     it("should return 400 when title is missing", async () => {
-      const request = createMockRequest("POST", "http://localhost:3000/api/checklists", {
-        category: "API Tests",
-      })
-      const response = await POST(request)
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/checklists",
+        {
+          category: "API Tests",
+        },
+      );
+      const response = await POST(request);
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Title is required")
-    })
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Title is required");
+    });
 
     it("should return 400 for invalid type", async () => {
-      const request = createMockRequest("POST", "http://localhost:3000/api/checklists", {
-        title: "Test",
-        type: "invalid",
-      })
-      const response = await POST(request)
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/checklists",
+        {
+          title: "Test",
+          type: "invalid",
+        },
+      );
+      const response = await POST(request);
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Type must be 'simple' or 'task'")
-    })
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Type must be 'simple' or 'kanban'");
+    });
 
     it("should return 401 for unauthorized requests", async () => {
-      mockAuthenticateApiKey.mockResolvedValue(null)
+      mockAuthenticateApiKey.mockResolvedValue(null);
 
-      const request = createMockRequest("POST", "http://localhost:3000/api/checklists", {
-        title: "Test Checklist",
-      })
-      const response = await POST(request)
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/checklists",
+        {
+          title: "Test Checklist",
+        },
+      );
+      const response = await POST(request);
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(401)
-      expect(data.error).toBe("Unauthorized")
-    })
-  })
+      expect(response.status).toBe(401);
+      expect(data.error).toBe("Unauthorized");
+    });
+  });
 
   describe("PUT /api/checklists/:id", () => {
     it("should update a checklist", async () => {
@@ -182,54 +273,72 @@ describe("Checklists API", () => {
         type: "simple",
         items: [],
         owner: "testuser",
-      }
+      };
       const updatedList = {
         ...existingList,
         title: "Updated Test Checklist - API",
         category: "API Tests Updated",
-      }
+      };
 
-      mockGetListById.mockResolvedValue(existingList)
-      mockUpdateList.mockResolvedValue({ success: true, data: updatedList })
+      mockGetListById.mockResolvedValue(existingList);
+      mockUpdateList.mockResolvedValue({ success: true, data: updatedList });
 
-      const request = createMockRequest("PUT", "http://localhost:3000/api/checklists/uuid-1", {
-        title: "Updated Test Checklist - API",
-        category: "API Tests Updated",
-      })
-      const response = await PUT(request, { params: Promise.resolve({ listId: "uuid-1" }) })
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "PUT",
+        "http://localhost:3000/api/checklists/uuid-1",
+        {
+          title: "Updated Test Checklist - API",
+          category: "API Tests Updated",
+        },
+      );
+      const response = await PUT(request, {
+        params: Promise.resolve({ listId: "uuid-1" }),
+      });
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(200)
-      expect(data.success).toBe(true)
-      expect(data.data.title).toBe("Updated Test Checklist - API")
-    })
+      expect(response.status).toBe(200);
+      expect(data.success).toBe(true);
+      expect(data.data.title).toBe("Updated Test Checklist - API");
+    });
 
     it("should return 404 for non-existent checklist", async () => {
-      mockGetListById.mockResolvedValue(null)
+      mockGetListById.mockResolvedValue(null);
 
-      const request = createMockRequest("PUT", "http://localhost:3000/api/checklists/nonexistent", {
-        title: "Updated Title",
-      })
-      const response = await PUT(request, { params: Promise.resolve({ listId: "nonexistent" }) })
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "PUT",
+        "http://localhost:3000/api/checklists/nonexistent",
+        {
+          title: "Updated Title",
+        },
+      );
+      const response = await PUT(request, {
+        params: Promise.resolve({ listId: "nonexistent" }),
+      });
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(404)
-      expect(data.error).toBe("Checklist not found")
-    })
+      expect(response.status).toBe(404);
+      expect(data.error).toBe("Checklist not found");
+    });
 
     it("should return 401 for unauthorized requests", async () => {
-      mockAuthenticateApiKey.mockResolvedValue(null)
+      mockAuthenticateApiKey.mockResolvedValue(null);
 
-      const request = createMockRequest("PUT", "http://localhost:3000/api/checklists/uuid-1", {
-        title: "Updated Title",
-      })
-      const response = await PUT(request, { params: Promise.resolve({ listId: "uuid-1" }) })
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "PUT",
+        "http://localhost:3000/api/checklists/uuid-1",
+        {
+          title: "Updated Title",
+        },
+      );
+      const response = await PUT(request, {
+        params: Promise.resolve({ listId: "uuid-1" }),
+      });
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(401)
-      expect(data.error).toBe("Unauthorized")
-    })
-  })
+      expect(response.status).toBe(401);
+      expect(data.error).toBe("Unauthorized");
+    });
+  });
 
   describe("DELETE /api/checklists/:id", () => {
     it("should delete a checklist", async () => {
@@ -241,39 +350,54 @@ describe("Checklists API", () => {
         type: "simple",
         items: [],
         owner: "testuser",
-      }
+      };
 
-      mockGetListById.mockResolvedValue(existingList)
-      mockDeleteList.mockResolvedValue({ success: true })
+      mockGetListById.mockResolvedValue(existingList);
+      mockDeleteList.mockResolvedValue({ success: true });
 
-      const request = createMockRequest("DELETE", "http://localhost:3000/api/checklists/uuid-1")
-      const response = await DELETE(request, { params: Promise.resolve({ listId: "uuid-1" }) })
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "DELETE",
+        "http://localhost:3000/api/checklists/uuid-1",
+      );
+      const response = await DELETE(request, {
+        params: Promise.resolve({ listId: "uuid-1" }),
+      });
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(200)
-      expect(data.success).toBe(true)
-    })
+      expect(response.status).toBe(200);
+      expect(data.success).toBe(true);
+    });
 
     it("should return 404 for non-existent checklist", async () => {
-      mockGetListById.mockResolvedValue(null)
+      mockGetListById.mockResolvedValue(null);
 
-      const request = createMockRequest("DELETE", "http://localhost:3000/api/checklists/nonexistent")
-      const response = await DELETE(request, { params: Promise.resolve({ listId: "nonexistent" }) })
-      const data = await getResponseJson(response)
+      const request = createMockRequest(
+        "DELETE",
+        "http://localhost:3000/api/checklists/nonexistent",
+      );
+      const response = await DELETE(request, {
+        params: Promise.resolve({ listId: "nonexistent" }),
+      });
+      const data = await getResponseJson(response);
 
-      expect(response.status).toBe(404)
-      expect(data.error).toBe("Checklist not found")
-    })
+      expect(response.status).toBe(404);
+      expect(data.error).toBe("Checklist not found");
+    });
 
     it("should return 401 for unauthorized requests", async () => {
-      mockAuthenticateApiKey.mockResolvedValue(null)
-
-      const request = createMockRequest("DELETE", "http://localhost:3000/api/checklists/uuid-1")
-      const response = await DELETE(request, { params: Promise.resolve({ listId: "uuid-1" }) })
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(401)
-      expect(data.error).toBe("Unauthorized")
-    })
-  })
-})
+      mockAuthenticateApiKey.mockResolvedValue(null);
+
+      const request = createMockRequest(
+        "DELETE",
+        "http://localhost:3000/api/checklists/uuid-1",
+      );
+      const response = await DELETE(request, {
+        params: Promise.resolve({ listId: "uuid-1" }),
+      });
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(401);
+      expect(data.error).toBe("Unauthorized");
+    });
+  });
+});
diff --git a/tests/api/error-handling.test.ts b/tests/api/error-handling.test.ts
index 1e1e3bdc..99ccd97f 100644
--- a/tests/api/error-handling.test.ts
+++ b/tests/api/error-handling.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest"
+import { describe, it, expect, beforeEach } from "vitest";
 import {
   mockUser,
   mockAuthenticateApiKey,
@@ -7,58 +7,75 @@ import {
   resetApiMocks,
   createMockRequest,
   getResponseJson,
-} from "./setup"
+} from "./setup";
 
-import { GET as GET_CHECKLISTS, POST as POST_CHECKLIST } from "@/app/api/checklists/route"
-import { PUT as CHECK_ITEM } from "@/app/api/checklists/[listId]/items/[itemIndex]/check/route"
-import { POST as POST_NOTE } from "@/app/api/notes/route"
-import { POST as POST_ITEM } from "@/app/api/checklists/[listId]/items/route"
+import {
+  GET as GET_CHECKLISTS,
+  POST as POST_CHECKLIST,
+} from "@/app/api/checklists/route";
+import { PUT as CHECK_ITEM } from "@/app/api/checklists/[listId]/items/[itemIndex]/check/route";
+import { POST as POST_NOTE } from "@/app/api/notes/route";
+import { POST as POST_ITEM } from "@/app/api/checklists/[listId]/items/route";
 
 describe("Error Handling", () => {
   beforeEach(() => {
-    resetApiMocks()
-    mockAuthenticateApiKey.mockResolvedValue(mockUser)
-  })
+    resetApiMocks();
+    mockAuthenticateApiKey.mockResolvedValue(mockUser);
+  });
 
   describe("Authentication Errors", () => {
     it("should return 401 for invalid API key", async () => {
-      mockAuthenticateApiKey.mockResolvedValue(null)
-
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists", null, {
-        "x-api-key": "invalid",
-      })
-      const response = await GET_CHECKLISTS(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(401)
-      expect(data.error).toBe("Unauthorized")
-    })
+      mockAuthenticateApiKey.mockResolvedValue(null);
+
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists",
+        null,
+        {
+          "x-api-key": "invalid",
+        },
+      );
+      const response = await GET_CHECKLISTS(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(401);
+      expect(data.error).toBe("Unauthorized");
+    });
 
     it("should return 401 for missing API key", async () => {
-      mockAuthenticateApiKey.mockResolvedValue(null)
-
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists", null, {
-        "x-api-key": "",
-      })
-      const response = await GET_CHECKLISTS(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(401)
-      expect(data.error).toBe("Unauthorized")
-    })
-  })
+      mockAuthenticateApiKey.mockResolvedValue(null);
+
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists",
+        null,
+        {
+          "x-api-key": "",
+        },
+      );
+      const response = await GET_CHECKLISTS(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(401);
+      expect(data.error).toBe("Unauthorized");
+    });
+  });
 
   describe("Validation Errors", () => {
     it("should return 400 for missing note title", async () => {
-      const request = createMockRequest("POST", "http://localhost:3000/api/notes", {
-        content: "No title provided",
-      })
-      const response = await POST_NOTE(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Title is required")
-    })
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/notes",
+        {
+          content: "No title provided",
+        },
+      );
+      const response = await POST_NOTE(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Title is required");
+    });
 
     it("should return 400 for missing item text", async () => {
       const mockList = {
@@ -69,53 +86,72 @@ describe("Error Handling", () => {
         type: "simple",
         owner: "testuser",
         items: [],
-      }
-      mockGetListById.mockResolvedValue(mockList)
-
-      const request = createMockRequest("POST", "http://localhost:3000/api/checklists/uuid-1/items", {})
-      const response = await POST_ITEM(request, { params: Promise.resolve({ listId: "uuid-1" }) })
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Text is required")
-    })
+      };
+      mockGetListById.mockResolvedValue(mockList);
+
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/checklists/uuid-1/items",
+        {},
+      );
+      const response = await POST_ITEM(request, {
+        params: Promise.resolve({ listId: "uuid-1" }),
+      });
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Text is required");
+    });
 
     it("should return 400 for missing checklist title", async () => {
-      const request = createMockRequest("POST", "http://localhost:3000/api/checklists", {
-        category: "API Tests",
-      })
-      const response = await POST_CHECKLIST(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Title is required")
-    })
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/checklists",
+        {
+          category: "API Tests",
+        },
+      );
+      const response = await POST_CHECKLIST(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Title is required");
+    });
 
     it("should return 400 for invalid checklist type", async () => {
-      const request = createMockRequest("POST", "http://localhost:3000/api/checklists", {
-        title: "Test",
-        type: "invalid",
-      })
-      const response = await POST_CHECKLIST(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Type must be 'simple' or 'task'")
-    })
-  })
+      const request = createMockRequest(
+        "POST",
+        "http://localhost:3000/api/checklists",
+        {
+          title: "Test",
+          type: "invalid",
+        },
+      );
+      const response = await POST_CHECKLIST(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Type must be 'simple' or 'kanban'");
+    });
+  });
 
   describe("Not Found Errors", () => {
     it("should return 404 for non-existent list", async () => {
-      mockGetListById.mockResolvedValue(null)
-
-      const request = createMockRequest("PUT", "http://localhost:3000/api/checklists/nonexistent/items/0/check")
-      const response = await CHECK_ITEM(request, { params: Promise.resolve({ listId: "nonexistent", itemIndex: "0" }) })
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(404)
-      expect(data.error).toBe("List not found")
-    })
-  })
+      mockGetListById.mockResolvedValue(null);
+
+      const request = createMockRequest(
+        "PUT",
+        "http://localhost:3000/api/checklists/nonexistent/items/0/check",
+      );
+      const response = await CHECK_ITEM(request, {
+        params: Promise.resolve({ listId: "nonexistent", itemIndex: "0" }),
+      });
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(404);
+      expect(data.error).toBe("List not found");
+    });
+  });
 
   describe("Range Errors", () => {
     it("should return 400 for item index out of range", async () => {
@@ -126,19 +162,22 @@ describe("Error Handling", () => {
         category: "Work",
         type: "simple",
         owner: "testuser",
-        items: [
-          { id: "item-1", text: "Item 1", completed: false },
-        ],
-      }
-      mockGetListById.mockResolvedValue(mockList)
-
-      const request = createMockRequest("PUT", "http://localhost:3000/api/checklists/uuid-1/items/999/check")
-      const response = await CHECK_ITEM(request, { params: Promise.resolve({ listId: "uuid-1", itemIndex: "999" }) })
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Item index out of range")
-    })
+        items: [{ id: "item-1", text: "Item 1", completed: false }],
+      };
+      mockGetListById.mockResolvedValue(mockList);
+
+      const request = createMockRequest(
+        "PUT",
+        "http://localhost:3000/api/checklists/uuid-1/items/999/check",
+      );
+      const response = await CHECK_ITEM(request, {
+        params: Promise.resolve({ listId: "uuid-1", itemIndex: "999" }),
+      });
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Item index out of range");
+    });
 
     it("should return 400 for invalid item index format", async () => {
       const mockList = {
@@ -148,31 +187,40 @@ describe("Error Handling", () => {
         category: "Work",
         type: "simple",
         owner: "testuser",
-        items: [
-          { id: "item-1", text: "Item 1", completed: false },
-        ],
-      }
-      mockGetListById.mockResolvedValue(mockList)
-
-      const request = createMockRequest("PUT", "http://localhost:3000/api/checklists/uuid-1/items/-1/check")
-      const response = await CHECK_ITEM(request, { params: Promise.resolve({ listId: "uuid-1", itemIndex: "-1" }) })
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(400)
-      expect(data.error).toBe("Invalid item index")
-    })
-  })
+        items: [{ id: "item-1", text: "Item 1", completed: false }],
+      };
+      mockGetListById.mockResolvedValue(mockList);
+
+      const request = createMockRequest(
+        "PUT",
+        "http://localhost:3000/api/checklists/uuid-1/items/-1/check",
+      );
+      const response = await CHECK_ITEM(request, {
+        params: Promise.resolve({ listId: "uuid-1", itemIndex: "-1" }),
+      });
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(400);
+      expect(data.error).toBe("Invalid item index");
+    });
+  });
 
   describe("Server Errors", () => {
     it("should return 500 for internal server errors", async () => {
-      mockGetUserChecklists.mockResolvedValue({ success: false, error: "Database error" })
-
-      const request = createMockRequest("GET", "http://localhost:3000/api/checklists")
-      const response = await GET_CHECKLISTS(request)
-      const data = await getResponseJson(response)
-
-      expect(response.status).toBe(500)
-      expect(data.error).toBeDefined()
-    })
-  })
-})
+      mockGetUserChecklists.mockResolvedValue({
+        success: false,
+        error: "Database error",
+      });
+
+      const request = createMockRequest(
+        "GET",
+        "http://localhost:3000/api/checklists",
+      );
+      const response = await GET_CHECKLISTS(request);
+      const data = await getResponseJson(response);
+
+      expect(response.status).toBe(500);
+      expect(data.error).toBeDefined();
+    });
+  });
+});
diff --git a/tests/mock-data/constants.ts b/tests/mock-data/constants.ts
index c433cdb7..58c62aad 100644
--- a/tests/mock-data/constants.ts
+++ b/tests/mock-data/constants.ts
@@ -1,4 +1,4 @@
-export const NUM_FILES = 300;
+export const NUM_FILES = 10;
 export const TAG_POOL_SIZE = 80;
 export const SEED = 42;
 export const NUM_CATEGORIES = 7;
diff --git a/tests/server-actions/auth.test.ts b/tests/server-actions/auth.test.ts
index b1e7e235..ce9a9ff4 100644
--- a/tests/server-actions/auth.test.ts
+++ b/tests/server-actions/auth.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
 import {
   mockCookies,
   mockRedirect,
@@ -31,16 +31,26 @@ vi.mock('@/app/_server/actions/log', () => ({
 
 vi.mock('@/app/_server/actions/users', () => ({
   getUsername: vi.fn().mockResolvedValue('testuser'),
+  ensureUser: vi.fn().mockResolvedValue(undefined),
+}))
+
+vi.mock('@/app/_server/actions/auth/ldap', () => ({
+  ldapLogin: vi.fn(),
 }))
 
 import { register, login, logout } from '@/app/_server/actions/auth'
 import { readJsonFile, writeJsonFile } from '@/app/_server/actions/file'
-import { readSessions, writeSessions } from '@/app/_server/actions/session'
+import { readSessions, writeSessions, createSession } from '@/app/_server/actions/session'
+import { ensureUser } from '@/app/_server/actions/users'
+import { ldapLogin } from '@/app/_server/actions/auth/ldap'
 
 const mockReadJsonFile = readJsonFile as ReturnType<typeof vi.fn>
 const mockWriteJsonFile = writeJsonFile as ReturnType<typeof vi.fn>
 const mockReadSessions = readSessions as ReturnType<typeof vi.fn>
 const mockWriteSessions = writeSessions as ReturnType<typeof vi.fn>
+const mockCreateSession = createSession as ReturnType<typeof vi.fn>
+const mockEnsureUser = ensureUser as ReturnType<typeof vi.fn>
+const mockLdapLogin = ldapLogin as ReturnType<typeof vi.fn>
 
 describe('Auth Actions', () => {
   beforeEach(() => {
@@ -242,6 +252,145 @@ describe('Auth Actions', () => {
     })
   })
 
+  describe('login() with AUTH_MODE=ldap', () => {
+    const ldapUser = {
+      username: 'alice',
+      passwordHash: '',
+      isAdmin: false,
+      failedLoginAttempts: 0,
+    }
+
+    beforeEach(() => {
+      process.env.AUTH_MODE = 'ldap'
+      process.env.DISABLE_BRUTEFORCE_PROTECTION = 'true'
+      mockReadJsonFile.mockResolvedValue([ldapUser])
+    })
+
+    afterEach(() => {
+      delete process.env.AUTH_MODE
+      delete process.env.DISABLE_BRUTEFORCE_PROTECTION
+    })
+
+    it('delegates to ldapLogin instead of checking the local password hash', async () => {
+      mockLdapLogin.mockResolvedValue({ ok: true, username: 'alice', isAdmin: false })
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      try { await login(formData) } catch {}
+
+      expect(mockLdapLogin).toHaveBeenCalledWith('alice', 'secret')
+    })
+
+    it('returns an error and does NOT call createSession on invalid_credentials', async () => {
+      mockLdapLogin.mockResolvedValue({ ok: false, kind: 'invalid_credentials' })
+
+      const formData = createFormData({ username: 'alice', password: 'wrong' })
+      const result = await login(formData)
+
+      expect(result).toMatchObject({ error: 'Invalid username or password' })
+      expect(mockCreateSession).not.toHaveBeenCalled()
+    })
+
+    it('increments the brute-force counter on invalid_credentials when user exists', async () => {
+      delete process.env.DISABLE_BRUTEFORCE_PROTECTION
+      mockLdapLogin.mockResolvedValue({ ok: false, kind: 'invalid_credentials' })
+      mockReadJsonFile.mockResolvedValue([{ ...ldapUser, failedLoginAttempts: 0 }])
+
+      const formData = createFormData({ username: 'alice', password: 'wrong' })
+      await login(formData)
+
+      expect(mockWriteJsonFile).toHaveBeenCalledWith(
+        expect.arrayContaining([
+          expect.objectContaining({ failedLoginAttempts: 1 }),
+        ]),
+        expect.any(String)
+      )
+    })
+
+    it('returns a generic error and does NOT increment the brute-force counter on connection_error', async () => {
+      delete process.env.DISABLE_BRUTEFORCE_PROTECTION
+      mockLdapLogin.mockResolvedValue({ ok: false, kind: 'connection_error' })
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      const result = await login(formData)
+
+      expect(result).toMatchObject({ error: 'Authentication service unavailable' })
+      expect(mockWriteJsonFile).not.toHaveBeenCalled()
+    })
+
+    it('redirects to /auth/login?error=unauthorized on unauthorized result', async () => {
+      mockLdapLogin.mockResolvedValue({ ok: false, kind: 'unauthorized' })
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      try {
+        await login(formData)
+      } catch (e: any) {
+        expect(e.message).toContain('REDIRECT:/auth/login?error=unauthorized')
+      }
+    })
+
+    it('calls ensureUser with the username and isAdmin flag on success', async () => {
+      mockLdapLogin.mockResolvedValue({ ok: true, username: 'alice', isAdmin: true })
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      try { await login(formData) } catch {}
+
+      expect(mockEnsureUser).toHaveBeenCalledWith('alice', true)
+    })
+
+    it('calls createSession with loginType "ldap" on success', async () => {
+      mockLdapLogin.mockResolvedValue({ ok: true, username: 'alice', isAdmin: false })
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      try { await login(formData) } catch {}
+
+      expect(mockCreateSession).toHaveBeenCalledWith(
+        expect.any(String),
+        'alice',
+        'ldap'
+      )
+    })
+
+    it('sets the session cookie on success', async () => {
+      mockLdapLogin.mockResolvedValue({ ok: true, username: 'alice', isAdmin: false })
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      try { await login(formData) } catch {}
+
+      expect(mockCookies.set).toHaveBeenCalledWith(
+        'session',
+        expect.any(String),
+        expect.objectContaining({ httpOnly: true, path: '/' })
+      )
+    })
+
+    it('redirects to / on success', async () => {
+      mockLdapLogin.mockResolvedValue({ ok: true, username: 'alice', isAdmin: false })
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      try {
+        await login(formData)
+      } catch (e: any) {
+        expect(e.message).toContain('REDIRECT:/')
+      }
+    })
+
+    it('still applies the brute-force lockout check before contacting LDAP', async () => {
+      delete process.env.DISABLE_BRUTEFORCE_PROTECTION
+      const lockedUser = {
+        ...ldapUser,
+        failedLoginAttempts: 10,
+        nextAllowedLoginAttempt: new Date(Date.now() + 60_000).toISOString(),
+      }
+      mockReadJsonFile.mockResolvedValue([lockedUser])
+
+      const formData = createFormData({ username: 'alice', password: 'secret' })
+      const result = await login(formData)
+
+      expect(result).toMatchObject({ error: 'Too many failed attempts' })
+      expect(mockLdapLogin).not.toHaveBeenCalled()
+    })
+  })
+
   describe('logout', () => {
     it('should delete session cookie', async () => {
       mockCookies.get.mockReturnValue({ value: 'session-id-123' })
diff --git a/tests/server-actions/checklist-item.test.ts b/tests/server-actions/checklist-item.test.ts
index ce2e3863..275d6daa 100644
--- a/tests/server-actions/checklist-item.test.ts
+++ b/tests/server-actions/checklist-item.test.ts
@@ -8,6 +8,7 @@ const mockGetUsername = vi.fn();
 const mockGetCurrentUser = vi.fn();
 const mockIsAdmin = vi.fn();
 const mockCheckUserPermission = vi.fn();
+const mockGetUsersWithAccess = vi.fn();
 const mockGetUserChecklists = vi.fn();
 const mockGetListById = vi.fn();
 const mockGetAllLists = vi.fn();
@@ -27,6 +28,7 @@ vi.mock("@/app/_server/actions/users", () => ({
 
 vi.mock("@/app/_server/actions/sharing", () => ({
   checkUserPermission: (...args: any[]) => mockCheckUserPermission(...args),
+  getUsersWithAccess: (...args: any[]) => mockGetUsersWithAccess(...args),
 }));
 
 vi.mock("@/app/_server/actions/checklist", () => ({
@@ -111,6 +113,7 @@ describe("Checklist Item Actions - Comprehensive Tests", () => {
     mockGetCurrentUser.mockResolvedValue({ username: "testuser" });
     mockIsAdmin.mockResolvedValue(false);
     mockCheckUserPermission.mockResolvedValue(true);
+    mockGetUsersWithAccess.mockResolvedValue([]);
     mockGetUserChecklists.mockResolvedValue({
       success: true,
       data: [structuredClone(mockChecklist)],
diff --git a/tests/server-actions/checklist.test.ts b/tests/server-actions/checklist.test.ts
index 6e0e6fdb..d6f2ce97 100644
--- a/tests/server-actions/checklist.test.ts
+++ b/tests/server-actions/checklist.test.ts
@@ -1,21 +1,26 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { mockFs, mockRevalidatePath, resetAllMocks, createFormData } from '../setup'
-
-const mockGetUserModeDir = vi.fn()
-const mockEnsureDir = vi.fn()
-const mockServerWriteFile = vi.fn()
-const mockServerDeleteFile = vi.fn()
-const mockServerReadDir = vi.fn()
-const mockServerReadFile = vi.fn()
-const mockReadOrderFile = vi.fn()
-const mockGetCurrentUser = vi.fn()
-const mockCheckUserPermission = vi.fn()
-const mockLogContentEvent = vi.fn()
-const mockParseInternalLinks = vi.fn()
-const mockUpdateIndexForItem = vi.fn()
-const mockRemoveItemFromIndex = vi.fn()
-
-vi.mock('@/app/_server/actions/file', () => ({
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import {
+  mockFs,
+  mockRevalidatePath,
+  resetAllMocks,
+  createFormData,
+} from "../setup";
+
+const mockGetUserModeDir = vi.fn();
+const mockEnsureDir = vi.fn();
+const mockServerWriteFile = vi.fn();
+const mockServerDeleteFile = vi.fn();
+const mockServerReadDir = vi.fn();
+const mockServerReadFile = vi.fn();
+const mockReadOrderFile = vi.fn();
+const mockGetCurrentUser = vi.fn();
+const mockCheckUserPermission = vi.fn();
+const mockLogContentEvent = vi.fn();
+const mockParseInternalLinks = vi.fn();
+const mockUpdateIndexForItem = vi.fn();
+const mockRemoveItemFromIndex = vi.fn();
+
+vi.mock("@/app/_server/actions/file", () => ({
   getUserModeDir: (...args: any[]) => mockGetUserModeDir(...args),
   ensureDir: (...args: any[]) => mockEnsureDir(...args),
   serverWriteFile: (...args: any[]) => mockServerWriteFile(...args),
@@ -24,218 +29,234 @@ vi.mock('@/app/_server/actions/file', () => ({
   serverReadFile: (...args: any[]) => mockServerReadFile(...args),
   readOrderFile: (...args: any[]) => mockReadOrderFile(...args),
   readJsonFile: vi.fn().mockResolvedValue([]),
-}))
+}));
 
-vi.mock('@/app/_server/actions/users', () => ({
+vi.mock("@/app/_server/actions/users", () => ({
   getCurrentUser: (...args: any[]) => mockGetCurrentUser(...args),
   isAdmin: vi.fn().mockResolvedValue(false),
-  getUsername: vi.fn().mockResolvedValue('testuser'),
-}))
+  getUsername: vi.fn().mockResolvedValue("testuser"),
+}));
 
-vi.mock('@/app/_server/actions/sharing', () => ({
+vi.mock("@/app/_server/actions/sharing", () => ({
   checkUserPermission: (...args: any[]) => mockCheckUserPermission(...args),
-  getAllSharedItemsForUser: vi.fn().mockResolvedValue({ notes: [], checklists: [] }),
+  getAllSharedItemsForUser: vi
+    .fn()
+    .mockResolvedValue({ notes: [], checklists: [] }),
   updateSharingData: vi.fn().mockResolvedValue(undefined),
-}))
+}));
 
-vi.mock('@/app/_server/actions/log', () => ({
+vi.mock("@/app/_server/actions/log", () => ({
   logContentEvent: (...args: any[]) => mockLogContentEvent(...args),
-}))
+}));
 
-vi.mock('@/app/_server/actions/link', () => ({
+vi.mock("@/app/_server/actions/link", () => ({
   parseInternalLinks: (...args: any[]) => mockParseInternalLinks(...args),
   updateIndexForItem: (...args: any[]) => mockUpdateIndexForItem(...args),
   removeItemFromIndex: (...args: any[]) => mockRemoveItemFromIndex(...args),
   rebuildLinkIndex: vi.fn().mockResolvedValue(undefined),
   updateItemCategory: vi.fn().mockResolvedValue(undefined),
-}))
+}));
 
-vi.mock('@/app/_utils/checklist-utils', () => ({
+vi.mock("@/app/_utils/checklist-utils", () => ({
   parseMarkdown: vi.fn().mockReturnValue({
-    id: 'test-list',
-    title: 'Test List',
+    id: "test-list",
+    title: "Test List",
     items: [],
-    category: 'TestCategory',
+    category: "TestCategory",
   }),
-  listToMarkdown: vi.fn().mockReturnValue('# Test List\n'),
-}))
-
-vi.mock('@/app/_utils/filename-utils', () => ({
-  generateUniqueFilename: vi.fn().mockResolvedValue('test-list.md'),
-  sanitizeFilename: vi.fn().mockReturnValue('test-list'),
-}))
-
-vi.mock('@/app/_utils/yaml-metadata-utils', () => ({
-  generateUuid: vi.fn().mockReturnValue('test-uuid-123'),
-  generateYamlFrontmatter: vi.fn().mockReturnValue('---\nuuid: test-uuid-123\n---\n'),
-  extractYamlMetadata: vi.fn().mockReturnValue({ metadata: { uuid: 'test-uuid-123' }, contentWithoutMetadata: '' }),
-  updateYamlMetadata: vi.fn().mockReturnValue('---\nuuid: test-uuid-123\n---\n'),
-  extractChecklistType: vi.fn().mockReturnValue('simple'),
-}))
-
-import { createList, deleteList } from '@/app/_server/actions/checklist'
-
-describe('Checklist Actions', () => {
+  listToMarkdown: vi.fn().mockReturnValue("# Test List\n"),
+}));
+
+vi.mock("@/app/_utils/filename-utils", () => ({
+  generateUniqueFilename: vi.fn().mockResolvedValue("test-list.md"),
+  sanitizeFilename: vi.fn().mockReturnValue("test-list"),
+}));
+
+vi.mock("@/app/_utils/yaml-metadata-utils", () => ({
+  generateUuid: vi.fn().mockReturnValue("test-uuid-123"),
+  generateYamlFrontmatter: vi
+    .fn()
+    .mockReturnValue("---\nuuid: test-uuid-123\n---\n"),
+  extractYamlMetadata: vi
+    .fn()
+    .mockReturnValue({
+      metadata: { uuid: "test-uuid-123" },
+      contentWithoutMetadata: "",
+    }),
+  updateYamlMetadata: vi
+    .fn()
+    .mockReturnValue("---\nuuid: test-uuid-123\n---\n"),
+  extractChecklistType: vi.fn().mockReturnValue("simple"),
+}));
+
+import { createList, deleteList } from "@/app/_server/actions/checklist";
+
+describe("Checklist Actions", () => {
   beforeEach(() => {
-    resetAllMocks()
-    mockGetUserModeDir.mockResolvedValue('/data/checklists/testuser')
-    mockEnsureDir.mockResolvedValue(undefined)
-    mockServerWriteFile.mockResolvedValue(undefined)
-    mockServerDeleteFile.mockResolvedValue(undefined)
-    mockServerReadDir.mockResolvedValue([])
-    mockServerReadFile.mockResolvedValue('')
-    mockReadOrderFile.mockResolvedValue(null)
-    mockGetCurrentUser.mockResolvedValue({ username: 'testuser', fileRenameMode: 'minimal' })
-    mockCheckUserPermission.mockResolvedValue(true)
-    mockLogContentEvent.mockResolvedValue(undefined)
-    mockParseInternalLinks.mockResolvedValue([])
-    mockUpdateIndexForItem.mockResolvedValue(undefined)
-    mockRemoveItemFromIndex.mockResolvedValue(undefined)
-  })
-
-  describe('createList', () => {
-    it('should create a new checklist successfully', async () => {
+    resetAllMocks();
+    mockGetUserModeDir.mockResolvedValue("/data/checklists/testuser");
+    mockEnsureDir.mockResolvedValue(undefined);
+    mockServerWriteFile.mockResolvedValue(undefined);
+    mockServerDeleteFile.mockResolvedValue(undefined);
+    mockServerReadDir.mockResolvedValue([]);
+    mockServerReadFile.mockResolvedValue("");
+    mockReadOrderFile.mockResolvedValue(null);
+    mockGetCurrentUser.mockResolvedValue({
+      username: "testuser",
+      fileRenameMode: "minimal",
+    });
+    mockCheckUserPermission.mockResolvedValue(true);
+    mockLogContentEvent.mockResolvedValue(undefined);
+    mockParseInternalLinks.mockResolvedValue([]);
+    mockUpdateIndexForItem.mockResolvedValue(undefined);
+    mockRemoveItemFromIndex.mockResolvedValue(undefined);
+  });
+
+  describe("createList", () => {
+    it("should create a new checklist successfully", async () => {
       const formData = createFormData({
-        title: 'My New List',
-        category: 'TestCategory',
-        type: 'simple',
-      })
-
-      const result = await createList(formData)
-
-      expect(result.success).toBe(true)
-      expect(result.data).toBeDefined()
-      expect(result.data?.title).toBe('My New List')
-      expect(result.data?.category).toBe('TestCategory')
-      expect(result.data?.type).toBe('simple')
-      expect(mockEnsureDir).toHaveBeenCalled()
-      expect(mockServerWriteFile).toHaveBeenCalled()
-    })
-
-    it('should default to Uncategorized when no category provided', async () => {
+        title: "My New List",
+        category: "TestCategory",
+        type: "simple",
+      });
+
+      const result = await createList(formData);
+
+      expect(result.success).toBe(true);
+      expect(result.data).toBeDefined();
+      expect(result.data?.title).toBe("My New List");
+      expect(result.data?.category).toBe("TestCategory");
+      expect(result.data?.type).toBe("simple");
+      expect(mockEnsureDir).toHaveBeenCalled();
+      expect(mockServerWriteFile).toHaveBeenCalled();
+    });
+
+    it("should default to Uncategorized when no category provided", async () => {
       const formData = createFormData({
-        title: 'Uncategorized List',
-        type: 'simple',
-      })
+        title: "Uncategorized List",
+        type: "simple",
+      });
 
-      const result = await createList(formData)
+      const result = await createList(formData);
 
-      expect(result.success).toBe(true)
-      expect(result.data?.category).toBe('Uncategorized')
-    })
+      expect(result.success).toBe(true);
+      expect(result.data?.category).toBe("Uncategorized");
+    });
 
-    it('should create a task checklist', async () => {
+    it("should create a task checklist", async () => {
       const formData = createFormData({
-        title: 'Task List',
-        category: 'Tasks',
-        type: 'task',
-      })
+        title: "Task List",
+        category: "Tasks",
+        type: "kanban",
+      });
 
-      const result = await createList(formData)
+      const result = await createList(formData);
 
-      expect(result.success).toBe(true)
-      expect(result.data?.type).toBe('task')
-    })
+      expect(result.success).toBe(true);
+      expect(result.data?.type).toBe("kanban");
+    });
 
-    it('should log content event on creation', async () => {
+    it("should log content event on creation", async () => {
       const formData = createFormData({
-        title: 'Logged List',
-        category: 'TestCategory',
-        type: 'simple',
-      })
+        title: "Logged List",
+        category: "TestCategory",
+        type: "simple",
+      });
 
-      await createList(formData)
+      await createList(formData);
 
       expect(mockLogContentEvent).toHaveBeenCalledWith(
-        'checklist_created',
-        'checklist',
+        "checklist_created",
+        "checklist",
         expect.any(String),
-        'Logged List',
+        "Logged List",
         true,
-        expect.objectContaining({ category: 'TestCategory' })
-      )
-    })
+        expect.objectContaining({ category: "TestCategory" }),
+      );
+    });
 
-    it('should update link index after creation', async () => {
+    it("should update link index after creation", async () => {
       const formData = createFormData({
-        title: 'Linked List',
-        category: 'TestCategory',
-        type: 'simple',
-      })
+        title: "Linked List",
+        category: "TestCategory",
+        type: "simple",
+      });
 
-      await createList(formData)
+      await createList(formData);
 
-      expect(mockUpdateIndexForItem).toHaveBeenCalled()
-    })
+      expect(mockUpdateIndexForItem).toHaveBeenCalled();
+    });
 
-    it('should handle creation errors gracefully', async () => {
-      mockServerWriteFile.mockRejectedValue(new Error('Write failed'))
+    it("should handle creation errors gracefully", async () => {
+      mockServerWriteFile.mockRejectedValue(new Error("Write failed"));
 
       const formData = createFormData({
-        title: 'Failed List',
-        category: 'TestCategory',
-        type: 'simple',
-      })
+        title: "Failed List",
+        category: "TestCategory",
+        type: "simple",
+      });
 
-      const result = await createList(formData)
+      const result = await createList(formData);
 
-      expect(result.error).toBe('Failed to create list')
-    })
-  })
+      expect(result.error).toBe("Failed to create list");
+    });
+  });
 
-  describe('deleteList', () => {
+  describe("deleteList", () => {
     beforeEach(() => {
-      vi.doMock('@/app/_server/actions/checklist', async (importOriginal) => {
-        const original = await importOriginal() as any
+      vi.doMock("@/app/_server/actions/checklist", async (importOriginal) => {
+        const original = (await importOriginal()) as any;
         return {
           ...original,
           getListById: vi.fn().mockResolvedValue({
-            id: 'test-list',
-            uuid: 'test-uuid-123',
-            title: 'Test List',
-            category: 'TestCategory',
-            owner: 'testuser',
+            id: "test-list",
+            uuid: "test-uuid-123",
+            title: "Test List",
+            category: "TestCategory",
+            owner: "testuser",
             items: [],
           }),
           getUserChecklists: vi.fn().mockResolvedValue({
             success: true,
-            data: [{
-              id: 'test-list',
-              uuid: 'test-uuid-123',
-              title: 'Test List',
-              category: 'TestCategory',
-              owner: 'testuser',
-              items: [],
-            }],
+            data: [
+              {
+                id: "test-list",
+                uuid: "test-uuid-123",
+                title: "Test List",
+                category: "TestCategory",
+                owner: "testuser",
+                items: [],
+              },
+            ],
           }),
-        }
-      })
-    })
+        };
+      });
+    });
 
-    it('should return error when not authenticated', async () => {
-      mockGetCurrentUser.mockResolvedValue(null)
+    it("should return error when not authenticated", async () => {
+      mockGetCurrentUser.mockResolvedValue(null);
 
       const formData = createFormData({
-        id: 'test-list',
-        category: 'TestCategory',
-      })
+        id: "test-list",
+        category: "TestCategory",
+      });
 
-      const result = await deleteList(formData)
+      const result = await deleteList(formData);
 
-      expect(result.error).toBe('Not authenticated')
-    })
+      expect(result.error).toBe("Not authenticated");
+    });
 
-    it('should return error when permission denied', async () => {
-      mockCheckUserPermission.mockResolvedValue(false)
+    it("should return error when permission denied", async () => {
+      mockCheckUserPermission.mockResolvedValue(false);
 
       const formData = createFormData({
-        id: 'test-list',
-        category: 'TestCategory',
-      })
+        id: "test-list",
+        category: "TestCategory",
+      });
 
-      const result = await deleteList(formData)
+      const result = await deleteList(formData);
 
-      expect(result.error).toBeDefined()
-    })
-  })
-})
+      expect(result.error).toBeDefined();
+    });
+  });
+});
diff --git a/tests/server-actions/ldap.test.ts b/tests/server-actions/ldap.test.ts
new file mode 100644
index 00000000..4d90fe89
--- /dev/null
+++ b/tests/server-actions/ldap.test.ts
@@ -0,0 +1,208 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { Client } from "ldapts";
+import { resetAllMocks } from "../setup";
+
+const MockClient = vi.mocked(Client);
+
+const mockGetEnvOrFile = vi.fn();
+
+vi.mock("@/app/_server/actions/file", () => ({
+  getEnvOrFile: (...args: any[]) => mockGetEnvOrFile(...args),
+}));
+
+import { ldapLogin } from "@/app/_server/actions/auth/ldap";
+
+const BASE_ENV = {
+  LDAP_URL: "ldap://ldap.example.com:389",
+  LDAP_BIND_DN: "cn=service,dc=example,dc=com",
+  LDAP_BASE_DN: "ou=users,dc=example,dc=com",
+};
+
+const DEFAULT_ENTRY = {
+  dn: "uid=alice,ou=users,dc=example,dc=com",
+  memberOf: [] as string[],
+};
+
+function setupClient({
+  serviceBindError,
+  searchEntries = [DEFAULT_ENTRY],
+  searchError,
+  userBindError,
+}: {
+  serviceBindError?: Error;
+  searchEntries?: any[];
+  searchError?: Error;
+  userBindError?: Error;
+} = {}) {
+  let bindCalls = 0;
+  const mockBind = vi.fn().mockImplementation(async () => {
+    bindCalls++;
+    if (bindCalls === 1 && serviceBindError) throw serviceBindError;
+    if (bindCalls >= 2 && userBindError) throw userBindError;
+  });
+  const mockSearch = vi.fn().mockImplementation(async () => {
+    if (searchError) throw searchError;
+    return { searchEntries };
+  });
+  const mockUnbind = vi.fn().mockResolvedValue(undefined);
+
+  MockClient.mockImplementation(function () {
+    return { bind: mockBind, search: mockSearch, unbind: mockUnbind };
+  } as any);
+
+  return { mockBind, mockSearch, mockUnbind };
+}
+
+describe("ldapLogin()", () => {
+  beforeEach(() => {
+    resetAllMocks();
+    Object.assign(process.env, BASE_ENV);
+    delete process.env.LDAP_USER_ATTRIBUTE;
+    delete process.env.LDAP_ADMIN_GROUPS;
+    delete process.env.LDAP_USER_GROUPS;
+    mockGetEnvOrFile.mockResolvedValue("service-password");
+    setupClient();
+  });
+
+  afterEach(() => {
+    for (const key of [
+      "LDAP_URL",
+      "LDAP_BIND_DN",
+      "LDAP_BASE_DN",
+      "LDAP_USER_ATTRIBUTE",
+      "LDAP_ADMIN_GROUPS",
+      "LDAP_USER_GROUPS",
+    ]) {
+      delete process.env[key];
+    }
+  });
+
+  it("returns invalid_credentials when user is not found in the directory", async () => {
+    setupClient({ searchEntries: [] });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: false, kind: "invalid_credentials" });
+  });
+
+  it("returns invalid_credentials when the user bind fails (wrong password)", async () => {
+    setupClient({ userBindError: new Error("Invalid credentials") });
+    const result = await ldapLogin("alice", "wrongpassword");
+    expect(result).toEqual({ ok: false, kind: "invalid_credentials" });
+  });
+
+  it("returns { ok: true } on successful bind with no group restrictions configured", async () => {
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: true, username: "alice", isAdmin: false });
+  });
+
+  it("returns connection_error when the service account bind throws a network error", async () => {
+    setupClient({ serviceBindError: new Error("ECONNREFUSED") });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: false, kind: "connection_error" });
+  });
+
+  it("returns connection_error when the search throws (e.g. timeout)", async () => {
+    setupClient({ searchError: new Error("Timeout") });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: false, kind: "connection_error" });
+  });
+
+  it("returns unauthorized when LDAP_USER_GROUPS is set and user has no matching memberOf", async () => {
+    process.env.LDAP_USER_GROUPS = "cn=jotty,ou=groups,dc=example,dc=com";
+    setupClient({
+      searchEntries: [{ dn: DEFAULT_ENTRY.dn, memberOf: [] }],
+    });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: false, kind: "unauthorized" });
+  });
+
+  it("returns { ok: true } when user is in LDAP_USER_GROUPS", async () => {
+    process.env.LDAP_USER_GROUPS = "cn=jotty,ou=groups,dc=example,dc=com";
+    setupClient({
+      searchEntries: [
+        {
+          dn: DEFAULT_ENTRY.dn,
+          memberOf: "cn=jotty,ou=groups,dc=example,dc=com",
+        },
+      ],
+    });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toMatchObject({ ok: true, username: "alice" });
+  });
+
+  it("returns { ok: true } with isAdmin=false when in LDAP_USER_GROUPS but not LDAP_ADMIN_GROUPS", async () => {
+    process.env.LDAP_USER_GROUPS = "cn=jotty,ou=groups,dc=example,dc=com";
+    process.env.LDAP_ADMIN_GROUPS = "cn=admins,ou=groups,dc=example,dc=com";
+    setupClient({
+      searchEntries: [
+        {
+          dn: DEFAULT_ENTRY.dn,
+          memberOf: ["cn=jotty,ou=groups,dc=example,dc=com"],
+        },
+      ],
+    });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: true, username: "alice", isAdmin: false });
+  });
+
+  it("returns { ok: true } with isAdmin=true when user memberOf matches LDAP_ADMIN_GROUPS", async () => {
+    process.env.LDAP_ADMIN_GROUPS = "cn=admins,ou=groups,dc=example,dc=com";
+    setupClient({
+      searchEntries: [
+        {
+          dn: DEFAULT_ENTRY.dn,
+          memberOf: ["cn=admins,ou=groups,dc=example,dc=com"],
+        },
+      ],
+    });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: true, username: "alice", isAdmin: true });
+  });
+
+  it("returns { ok: true } for an admin user even when LDAP_USER_GROUPS is set and they are not in it", async () => {
+    process.env.LDAP_USER_GROUPS = "cn=jotty,ou=groups,dc=example,dc=com";
+    process.env.LDAP_ADMIN_GROUPS = "cn=admins,ou=groups,dc=example,dc=com";
+    setupClient({
+      searchEntries: [
+        {
+          dn: DEFAULT_ENTRY.dn,
+          memberOf: ["cn=admins,ou=groups,dc=example,dc=com"],
+        },
+      ],
+    });
+    const result = await ldapLogin("alice", "password");
+    expect(result).toEqual({ ok: true, username: "alice", isAdmin: true });
+  });
+
+  it("uses uid as the default search attribute when LDAP_USER_ATTRIBUTE is not set", async () => {
+    const { mockSearch } = setupClient();
+    await ldapLogin("alice", "password");
+    expect(mockSearch).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.objectContaining({ filter: "(uid=alice)" }),
+    );
+  });
+
+  it("uses LDAP_USER_ATTRIBUTE when set (e.g. sAMAccountName)", async () => {
+    process.env.LDAP_USER_ATTRIBUTE = "sAMAccountName";
+    const { mockSearch } = setupClient();
+    await ldapLogin("alice", "password");
+    expect(mockSearch).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.objectContaining({ filter: "(sAMAccountName=alice)" }),
+    );
+  });
+
+  it("calls unbind after a successful authentication", async () => {
+    const { mockUnbind } = setupClient();
+    await ldapLogin("alice", "password");
+    expect(mockUnbind).toHaveBeenCalledOnce();
+  });
+
+  it("calls unbind even when the user bind fails", async () => {
+    const { mockUnbind } = setupClient({
+      userBindError: new Error("Invalid credentials"),
+    });
+    await ldapLogin("alice", "wrongpassword");
+    expect(mockUnbind).toHaveBeenCalledOnce();
+  });
+});
diff --git a/tests/server-actions/sharing.test.ts b/tests/server-actions/sharing.test.ts
index b80032f3..372b3335 100644
--- a/tests/server-actions/sharing.test.ts
+++ b/tests/server-actions/sharing.test.ts
@@ -10,6 +10,21 @@ const mockGetUserByChecklist = vi.fn()
 const mockGetUserByNote = vi.fn()
 const mockGetUserByChecklistUuid = vi.fn()
 const mockGetUserByNoteUuid = vi.fn()
+const mockGetTranslations = vi.fn()
+const mockCreateNotificationForUser = vi.fn()
+const mockBroadcast = vi.fn()
+
+vi.mock('next-intl/server', () => ({
+  getTranslations: (...args: unknown[]) => mockGetTranslations(...args),
+}))
+
+vi.mock('@/app/_server/actions/notifications', () => ({
+  createNotificationForUser: (...args: unknown[]) => mockCreateNotificationForUser(...args),
+}))
+
+vi.mock('@/app/_server/ws/broadcast', () => ({
+  broadcast: (...args: unknown[]) => mockBroadcast(...args),
+}))
 
 vi.mock('@/app/_server/actions/file', () => ({
   readJsonFile: (...args: any[]) => mockReadJsonFile(...args),
@@ -67,6 +82,9 @@ describe('Sharing Actions', () => {
     mockGetUserByNote.mockResolvedValue({ success: false })
     mockGetUserByChecklistUuid.mockResolvedValue({ success: false })
     mockGetUserByNoteUuid.mockResolvedValue({ success: false })
+    mockGetTranslations.mockResolvedValue((key: string) => key)
+    mockCreateNotificationForUser.mockResolvedValue(undefined)
+    mockBroadcast.mockResolvedValue(undefined)
     mockFs.readFile.mockResolvedValue('---\nuuid: test-uuid-123\n---\nContent')
     mockFs.access.mockRejectedValue(new Error('ENOENT'))
   })
diff --git a/tests/server-actions/users.test.ts b/tests/server-actions/users.test.ts
index 78d1ea6f..34eab3d7 100644
--- a/tests/server-actions/users.test.ts
+++ b/tests/server-actions/users.test.ts
@@ -32,6 +32,7 @@ import {
   deleteUser,
   getUsers,
   updateUserSettings,
+  ensureUser,
 } from '@/app/_server/actions/users'
 
 describe('Users Actions', () => {
@@ -285,6 +286,83 @@ describe('Users Actions', () => {
     })
   })
 
+  describe('ensureUser()', () => {
+    beforeEach(() => {
+      mockFs.mkdir.mockResolvedValue(undefined)
+      mockFs.writeFile.mockResolvedValue(undefined)
+      mockLock.mockResolvedValue(undefined)
+      mockUnlock.mockResolvedValue(undefined)
+    })
+
+    it('creates the first user as both admin and superAdmin', async () => {
+      mockFs.readFile.mockResolvedValue('[]')
+      await ensureUser('alice', false)
+      const written = JSON.parse(mockFs.writeFile.mock.calls[0][1])
+      expect(written).toHaveLength(1)
+      expect(written[0]).toMatchObject({ username: 'alice', isAdmin: true, isSuperAdmin: true })
+    })
+
+    it('creates a subsequent user with isAdmin=false when false is passed', async () => {
+      mockFs.readFile.mockResolvedValue(JSON.stringify([
+        { username: 'existing', passwordHash: '', isAdmin: true, isSuperAdmin: true },
+      ]))
+      await ensureUser('bob', false)
+      const written = JSON.parse(mockFs.writeFile.mock.calls[0][1])
+      const bob = written.find((u: any) => u.username === 'bob')
+      expect(bob).toBeDefined()
+      expect(bob.isAdmin).toBe(false)
+      expect(bob.isSuperAdmin).toBeUndefined()
+    })
+
+    it('creates a subsequent user with isAdmin=true when true is passed', async () => {
+      mockFs.readFile.mockResolvedValue(JSON.stringify([
+        { username: 'existing', passwordHash: '', isAdmin: true, isSuperAdmin: true },
+      ]))
+      await ensureUser('bob', true)
+      const written = JSON.parse(mockFs.writeFile.mock.calls[0][1])
+      const bob = written.find((u: any) => u.username === 'bob')
+      expect(bob.isAdmin).toBe(true)
+    })
+
+    it('promotes an existing non-admin user to admin when isAdmin=true', async () => {
+      mockFs.readFile.mockResolvedValue(JSON.stringify([
+        { username: 'existing', passwordHash: '', isAdmin: true, isSuperAdmin: true },
+        { username: 'alice', passwordHash: '', isAdmin: false },
+      ]))
+      await ensureUser('alice', true)
+      const written = JSON.parse(mockFs.writeFile.mock.calls[0][1])
+      const alice = written.find((u: any) => u.username === 'alice')
+      expect(alice.isAdmin).toBe(true)
+    })
+
+    it('does NOT demote an existing admin user when isAdmin=false', async () => {
+      mockFs.readFile.mockResolvedValue(JSON.stringify([
+        { username: 'alice', passwordHash: '', isAdmin: true },
+      ]))
+      await ensureUser('alice', false)
+      const written = JSON.parse(mockFs.writeFile.mock.calls[0][1])
+      const alice = written.find((u: any) => u.username === 'alice')
+      expect(alice.isAdmin).toBe(true)
+    })
+
+    it('does not create a duplicate entry if called with an existing username', async () => {
+      mockFs.readFile.mockResolvedValue(JSON.stringify([
+        { username: 'alice', passwordHash: '', isAdmin: false },
+      ]))
+      await ensureUser('alice', false)
+      const written = JSON.parse(mockFs.writeFile.mock.calls[0][1])
+      expect(written.filter((u: any) => u.username === 'alice')).toHaveLength(1)
+    })
+
+    it('creates the checklist and notes directories for the user', async () => {
+      mockFs.readFile.mockResolvedValue('[]')
+      await ensureUser('alice', false)
+      const mkdirPaths = mockFs.mkdir.mock.calls.map((c: any[]) => c[0] as string)
+      expect(mkdirPaths.some((p) => p.includes('checklists') && p.includes('alice'))).toBe(true)
+      expect(mkdirPaths.some((p) => p.includes('notes') && p.includes('alice'))).toBe(true)
+    })
+  })
+
   describe('updateUserSettings', () => {
     it('should return error when not authenticated', async () => {
       mockGetSessionId.mockResolvedValue(null)
diff --git a/tests/setup.ts b/tests/setup.ts
index 0b0bc033..dd6fa54b 100644
--- a/tests/setup.ts
+++ b/tests/setup.ts
@@ -145,6 +145,16 @@ vi.mock("speakeasy", () => ({
   },
 }));
 
+vi.mock("ldapts", () => ({
+  Client: vi.fn().mockImplementation(function () {
+    return {
+      bind: vi.fn().mockResolvedValue(undefined),
+      search: vi.fn().mockResolvedValue({ searchEntries: [] }),
+      unbind: vi.fn().mockResolvedValue(undefined),
+    };
+  }),
+}))
+
 vi.mock("qrcode", () => ({
   default: {
     toDataURL: vi.fn().mockResolvedValue("data:image/png;base64,mock"),
diff --git a/yarn.lock b/yarn.lock
index 80983e80..136fc046 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -184,6 +184,11 @@
   resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.2.tgz#6110f918d273fe2af8ea1c4398a88774bb9fc12f"
   integrity sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==
 
+"@braintree/sanitize-url@^6.0.1":
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783"
+  integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==
+
 "@braintree/sanitize-url@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-7.1.1.tgz#15e19737d946559289b915e5dad3b4c28407735e"
@@ -221,6 +226,11 @@
   resolved "https://registry.yarnpkg.com/@chevrotain/utils/-/utils-11.0.3.tgz#e39999307b102cff3645ec4f5b3665f5297a2224"
   integrity sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==
 
+"@date-fns/tz@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@date-fns/tz/-/tz-1.4.1.tgz#2d905f282304630e07bef6d02d2e7dbf3f0cc4e4"
+  integrity sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==
+
 "@dnd-kit/accessibility@^3.1.1":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz#3b4202bd6bb370a0730f6734867785919beac6af"
@@ -2013,6 +2023,11 @@
   dependencies:
     "@swc/counter" "^0.1.3"
 
+"@tabby_ai/hijri-converter@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@tabby_ai/hijri-converter/-/hijri-converter-1.0.5.tgz#b664994892348a402ae7529e648c819eee39208b"
+  integrity sha512-r5bClKrcIusDoo049dSL8CawnHR6mRdDwhlQuIgZRNty68q0x8k3Lf1BtPAMxRf/GgnHBnIO4ujd3+GQdLWzxQ==
+
 "@tiptap/core@^3.13.0":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-3.13.0.tgz#ae3fe6fe7732f36b6ea8a2198e1fc53a4ad0d0d2"
@@ -2425,7 +2440,7 @@
   resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#dc6d4f9a98376f18ea50bad6c39537f1b5463c39"
   integrity sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==
 
-"@types/d3-scale@*", "@types/d3-scale@^4.0.2", "@types/d3-scale@^4.0.8":
+"@types/d3-scale@*", "@types/d3-scale@^4.0.2", "@types/d3-scale@^4.0.3", "@types/d3-scale@^4.0.8":
   version "4.0.9"
   resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.9.tgz#57a2f707242e6fe1de81ad7bfcccaaf606179afb"
   integrity sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==
@@ -2609,6 +2624,13 @@
     "@types/linkify-it" "^5"
     "@types/mdurl" "^2"
 
+"@types/mdast@^3.0.0":
+  version "3.0.15"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.15.tgz#49c524a263f30ffa28b71ae282f813ed000ab9f5"
+  integrity sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==
+  dependencies:
+    "@types/unist" "^2"
+
 "@types/mdast@^4.0.0":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-4.0.4.tgz#7ccf72edd2f1aa7dd3437e180c64373585804dd6"
@@ -2712,7 +2734,7 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.3.tgz#acaab0f919ce69cce629c2d4ed2eb4adc1b6c20c"
   integrity sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==
 
-"@types/unist@^2.0.0":
+"@types/unist@^2", "@types/unist@^2.0.0":
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
   integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
@@ -3662,6 +3684,11 @@ cytoscape-fcose@^2.2.0:
   dependencies:
     cose-base "^2.2.0"
 
+cytoscape@^3.28.1:
+  version "3.33.2"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.33.2.tgz#3a58906b4002b7c237f54dfc9b971983757da791"
+  integrity sha512-sj4HXd3DokGhzZAdjDejGvTPLqlt84vNFN8m7bGsOzDY5DyVcxIb2ejIXat2Iy7HxWhdT/N1oKyheJ5YdpsGuw==
+
 cytoscape@^3.29.3:
   version "3.33.1"
   resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.33.1.tgz#449e05d104b760af2912ab76482d24c01cdd4c97"
@@ -3945,7 +3972,7 @@ d3-zoom@3:
     d3-selection "2 - 3"
     d3-transition "2 - 3"
 
-d3@^7.9.0:
+d3@^7.4.0, d3@^7.8.2, d3@^7.9.0:
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/d3/-/d3-7.9.0.tgz#579e7acb3d749caf8860bd1741ae8d371070cd5d"
   integrity sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==
@@ -3981,6 +4008,14 @@ d3@^7.9.0:
     d3-transition "3"
     d3-zoom "3"
 
+dagre-d3-es@7.0.10:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.10.tgz#19800d4be674379a3cd8c86a8216a2ac6827cadc"
+  integrity sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==
+  dependencies:
+    d3 "^7.8.2"
+    lodash-es "^4.17.21"
+
 dagre-d3-es@7.0.13:
   version "7.0.13"
   resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.13.tgz#acfb4b449f6dcdd48d8ea8081a6d8c59bc8128c3"
@@ -4021,11 +4056,26 @@ data-view-byte-offset@^1.0.1:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
+date-fns-jalali@4.1.0-0:
+  version "4.1.0-0"
+  resolved "https://registry.yarnpkg.com/date-fns-jalali/-/date-fns-jalali-4.1.0-0.tgz#9c7fb286004fab267a300d3e9f1ada9f10b4b6b0"
+  integrity sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==
+
+date-fns@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-4.1.0.tgz#64b3d83fff5aa80438f5b1a633c2e83b8a1c2d14"
+  integrity sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==
+
 dayjs@^1.11.18:
   version "1.11.19"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.19.tgz#15dc98e854bb43917f12021806af897c58ae2938"
   integrity sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==
 
+dayjs@^1.11.7:
+  version "1.11.20"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.20.tgz#88d919fd639dc991415da5f4cb6f1b6650811938"
+  integrity sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==
+
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -4124,7 +4174,7 @@ didyoumean@^1.2.2:
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
   integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
 
-diff@^5.2.2:
+diff@^5.0.0, diff@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.2.tgz#0a4742797281d09cfa699b79ea32d27723623bad"
   integrity sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==
@@ -4167,6 +4217,11 @@ domhandler@^5.0.2, domhandler@^5.0.3:
   dependencies:
     domelementtype "^2.3.0"
 
+"dompurify@^3.0.5 <3.1.7":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.6.tgz#43c714a94c6a7b8801850f82e756685300a027e2"
+  integrity sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==
+
 dompurify@^3.2.5, dompurify@^3.3.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.3.1.tgz#c7e1ddebfe3301eacd6c0c12a4af284936dbbb86"
@@ -4219,6 +4274,11 @@ electron-to-chromium@^1.5.263:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
   integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
 
+elkjs@^0.9.0:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.3.tgz#16711f8ceb09f1b12b99e971b138a8384a529161"
+  integrity sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -5209,7 +5269,7 @@ htmlparser2@^8.0.0:
     domutils "^3.0.1"
     entities "^4.4.0"
 
-hugeicons-react@^0.3.0:
+hugeicons-react@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/hugeicons-react/-/hugeicons-react-0.3.0.tgz#a788db21b116f16062b75ccf3a3633575722ec9f"
   integrity sha512-znmC+uX7xVqcIs0q09LvwEvJkjX0U3xgT05BSiRV19farS4lPONOKjYT0JkcQG5cvfV0rXHSEAEVNjbHAu81rg==
@@ -5748,6 +5808,13 @@ katex@^0.16.22:
   dependencies:
     commander "^8.3.0"
 
+katex@^0.16.9:
+  version "0.16.45"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.45.tgz#ba60d39c54746b6b8d39ce0e7f6eace07143149c"
+  integrity sha512-pQpZbdBu7wCTmQUh7ufPmLr0pFoObnGUoL/yhtwJDgmmQpbkg/0HSVti25Fu4rmd1oCR6NGWe9vqTWuWv3GcNA==
+  dependencies:
+    commander "^8.3.0"
+
 keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
@@ -5755,11 +5822,16 @@ keyv@^4.5.4:
   dependencies:
     json-buffer "3.0.1"
 
-khroma@^2.1.0:
+khroma@^2.0.0, khroma@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.1.0.tgz#45f2ce94ce231a437cf5b63c2e886e6eb42bbbb1"
   integrity sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==
 
+kleur@^4.0.3:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
+  integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
+
 kolorist@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
@@ -5805,6 +5877,13 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
+ldapts@^8.1.7:
+  version "8.1.7"
+  resolved "https://registry.yarnpkg.com/ldapts/-/ldapts-8.1.7.tgz#8e358914de1966d631c9a46bd5a69f21c4331f5b"
+  integrity sha512-TJl6T92eIwMf/OJ0hDfKVa6ISwzo+lqCWCI5Mf//ARlKa3LKQZaSrme/H2rCRBhW0DZCQlrsV+fgoW5YHRNLUw==
+  dependencies:
+    strict-event-emitter-types "2.0.0"
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -6010,6 +6089,24 @@ mdast-util-find-and-replace@^3.0.0:
     unist-util-is "^6.0.0"
     unist-util-visit-parents "^6.0.0"
 
+mdast-util-from-markdown@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz#9421a5a247f10d31d2faed2a30df5ec89ceafcf0"
+  integrity sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    decode-named-character-reference "^1.0.0"
+    mdast-util-to-string "^3.1.0"
+    micromark "^3.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-decode-string "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    unist-util-stringify-position "^3.0.0"
+    uvu "^0.5.0"
+
 mdast-util-from-markdown@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz#4850390ca7cf17413a9b9a0fbefcd1bc0eb4160a"
@@ -6173,6 +6270,13 @@ mdast-util-to-markdown@^2.0.0:
     unist-util-visit "^5.0.0"
     zwitch "^2.0.0"
 
+mdast-util-to-string@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz#66f7bb6324756741c5f47a53557f0cbf16b6f789"
+  integrity sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+
 mdast-util-to-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz#7a5121475556a04e7eddeb67b264aae79d312814"
@@ -6190,7 +6294,33 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-mermaid@10.9.3, mermaid@^11.12.1:
+mermaid@10.9.3:
+  version "10.9.3"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.9.3.tgz#90bc6f15c33dbe5d9507fed31592cc0d88fee9f7"
+  integrity sha512-V80X1isSEvAewIL3xhmz/rVmc27CVljcsbWxkxlWJWY/1kQa4XOABqpDl2qQLGKzpKm6WbTfUEKImBlUfFYArw==
+  dependencies:
+    "@braintree/sanitize-url" "^6.0.1"
+    "@types/d3-scale" "^4.0.3"
+    "@types/d3-scale-chromatic" "^3.0.0"
+    cytoscape "^3.28.1"
+    cytoscape-cose-bilkent "^4.1.0"
+    d3 "^7.4.0"
+    d3-sankey "^0.12.3"
+    dagre-d3-es "7.0.10"
+    dayjs "^1.11.7"
+    dompurify "^3.0.5 <3.1.7"
+    elkjs "^0.9.0"
+    katex "^0.16.9"
+    khroma "^2.0.0"
+    lodash-es "^4.17.21"
+    mdast-util-from-markdown "^1.3.0"
+    non-layered-tidy-tree-layout "^2.0.2"
+    stylis "^4.1.3"
+    ts-dedent "^2.2.0"
+    uuid "^9.0.0"
+    web-worker "^1.2.0"
+
+mermaid@^11.12.1:
   version "11.12.2"
   resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-11.12.2.tgz#48bbdb9f724bc2191e2128e1403bf964fff2bc3d"
   integrity sha512-n34QPDPEKmaeCG4WDMGy0OT6PSyxKCfy2pJgShP+Qow2KLrvWjclwbc3yXfSIf4BanqWEhQEpngWwNp/XhZt6w==
@@ -6216,6 +6346,28 @@ mermaid@10.9.3, mermaid@^11.12.1:
     ts-dedent "^2.2.0"
     uuid "^11.1.0"
 
+micromark-core-commonmark@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz#1386628df59946b2d39fb2edfd10f3e8e0a75bb8"
+  integrity sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-factory-destination "^1.0.0"
+    micromark-factory-label "^1.0.0"
+    micromark-factory-space "^1.0.0"
+    micromark-factory-title "^1.0.0"
+    micromark-factory-whitespace "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-classify-character "^1.0.0"
+    micromark-util-html-tag-name "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
 micromark-core-commonmark@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-2.0.3.tgz#c691630e485021a68cf28dbc2b2ca27ebf678cd4"
@@ -6317,6 +6469,15 @@ micromark-extension-gfm@^3.0.0:
     micromark-util-combine-extensions "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-factory-destination@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz#eb815957d83e6d44479b3df640f010edad667b9f"
+  integrity sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
 micromark-factory-destination@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz#8fef8e0f7081f0474fbdd92deb50c990a0264639"
@@ -6326,6 +6487,16 @@ micromark-factory-destination@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-factory-label@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz#cc95d5478269085cfa2a7282b3de26eb2e2dec68"
+  integrity sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
 micromark-factory-label@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz#5267efa97f1e5254efc7f20b459a38cb21058ba1"
@@ -6336,6 +6507,14 @@ micromark-factory-label@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-factory-space@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz#c8f40b0640a0150751d3345ed885a080b0d15faf"
+  integrity sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-types "^1.0.0"
+
 micromark-factory-space@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz#36d0212e962b2b3121f8525fc7a3c7c029f334fc"
@@ -6344,6 +6523,16 @@ micromark-factory-space@^2.0.0:
     micromark-util-character "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-factory-title@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz#dd0fe951d7a0ac71bdc5ee13e5d1465ad7f50ea1"
+  integrity sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
 micromark-factory-title@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz#237e4aa5d58a95863f01032d9ee9b090f1de6e94"
@@ -6354,6 +6543,16 @@ micromark-factory-title@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-factory-whitespace@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz#798fb7489f4c8abafa7ca77eed6b5745853c9705"
+  integrity sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
 micromark-factory-whitespace@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz#06b26b2983c4d27bfcc657b33e25134d4868b0b1"
@@ -6364,6 +6563,14 @@ micromark-factory-whitespace@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-util-character@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.2.0.tgz#4fedaa3646db249bc58caeb000eb3549a8ca5dcc"
+  integrity sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
 micromark-util-character@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-2.1.1.tgz#2f987831a40d4c510ac261e89852c4e9703ccda6"
@@ -6372,6 +6579,13 @@ micromark-util-character@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-util-chunked@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz#37a24d33333c8c69a74ba12a14651fd9ea8a368b"
+  integrity sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
 micromark-util-chunked@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz#47fbcd93471a3fccab86cff03847fc3552db1051"
@@ -6379,6 +6593,15 @@ micromark-util-chunked@^2.0.0:
   dependencies:
     micromark-util-symbol "^2.0.0"
 
+micromark-util-classify-character@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz#6a7f8c8838e8a120c8e3c4f2ae97a2bff9190e9d"
+  integrity sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
 micromark-util-classify-character@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz#d399faf9c45ca14c8b4be98b1ea481bced87b629"
@@ -6388,6 +6611,14 @@ micromark-util-classify-character@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-util-combine-extensions@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz#192e2b3d6567660a85f735e54d8ea6e3952dbe84"
+  integrity sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-types "^1.0.0"
+
 micromark-util-combine-extensions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz#2a0f490ab08bff5cc2fd5eec6dd0ca04f89b30a9"
@@ -6396,6 +6627,13 @@ micromark-util-combine-extensions@^2.0.0:
     micromark-util-chunked "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-util-decode-numeric-character-reference@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz#b1e6e17009b1f20bc652a521309c5f22c85eb1c6"
+  integrity sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
 micromark-util-decode-numeric-character-reference@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz#fcf15b660979388e6f118cdb6bf7d79d73d26fe5"
@@ -6403,6 +6641,16 @@ micromark-util-decode-numeric-character-reference@^2.0.0:
   dependencies:
     micromark-util-symbol "^2.0.0"
 
+micromark-util-decode-string@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz#dc12b078cba7a3ff690d0203f95b5d5537f2809c"
+  integrity sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
 micromark-util-decode-string@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz#6cb99582e5d271e84efca8e61a807994d7161eb2"
@@ -6413,16 +6661,33 @@ micromark-util-decode-string@^2.0.0:
     micromark-util-decode-numeric-character-reference "^2.0.0"
     micromark-util-symbol "^2.0.0"
 
+micromark-util-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz#92e4f565fd4ccb19e0dcae1afab9a173bbeb19a5"
+  integrity sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==
+
 micromark-util-encode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz#0d51d1c095551cfaac368326963cf55f15f540b8"
   integrity sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==
 
+micromark-util-html-tag-name@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz#48fd7a25826f29d2f71479d3b4e83e94829b3588"
+  integrity sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==
+
 micromark-util-html-tag-name@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz#e40403096481986b41c106627f98f72d4d10b825"
   integrity sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==
 
+micromark-util-normalize-identifier@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz#7a73f824eb9f10d442b4d7f120fecb9b38ebf8b7"
+  integrity sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
 micromark-util-normalize-identifier@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz#c30d77b2e832acf6526f8bf1aa47bc9c9438c16d"
@@ -6430,6 +6695,13 @@ micromark-util-normalize-identifier@^2.0.0:
   dependencies:
     micromark-util-symbol "^2.0.0"
 
+micromark-util-resolve-all@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz#4652a591ee8c8fa06714c9b54cd6c8e693671188"
+  integrity sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==
+  dependencies:
+    micromark-util-types "^1.0.0"
+
 micromark-util-resolve-all@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz#e1a2d62cdd237230a2ae11839027b19381e31e8b"
@@ -6437,6 +6709,15 @@ micromark-util-resolve-all@^2.0.0:
   dependencies:
     micromark-util-types "^2.0.0"
 
+micromark-util-sanitize-uri@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz#613f738e4400c6eedbc53590c67b197e30d7f90d"
+  integrity sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
 micromark-util-sanitize-uri@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz#ab89789b818a58752b73d6b55238621b7faa8fd7"
@@ -6446,6 +6727,16 @@ micromark-util-sanitize-uri@^2.0.0:
     micromark-util-encode "^2.0.0"
     micromark-util-symbol "^2.0.0"
 
+micromark-util-subtokenize@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz#941c74f93a93eaf687b9054aeb94642b0e92edb1"
+  integrity sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
 micromark-util-subtokenize@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-2.1.0.tgz#d8ade5ba0f3197a1cf6a2999fbbfe6357a1a19ee"
@@ -6456,16 +6747,49 @@ micromark-util-subtokenize@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-util-symbol@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz#813cd17837bdb912d069a12ebe3a44b6f7063142"
+  integrity sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==
+
 micromark-util-symbol@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz#e5da494e8eb2b071a0d08fb34f6cefec6c0a19b8"
   integrity sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==
 
+micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.1.0.tgz#e6676a8cae0bb86a2171c498167971886cb7e283"
+  integrity sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==
+
 micromark-util-types@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.2.tgz#f00225f5f5a0ebc3254f96c36b6605c4b393908e"
   integrity sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==
 
+micromark@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.2.0.tgz#1af9fef3f995ea1ea4ac9c7e2f19c48fd5c006e9"
+  integrity sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==
+  dependencies:
+    "@types/debug" "^4.0.0"
+    debug "^4.0.0"
+    decode-named-character-reference "^1.0.0"
+    micromark-core-commonmark "^1.0.1"
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-combine-extensions "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-sanitize-uri "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
 micromark@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/micromark/-/micromark-4.0.2.tgz#91395a3e1884a198e62116e33c9c568e39936fdb"
@@ -6524,6 +6848,11 @@ mlly@^1.7.4, mlly@^1.8.0:
     pkg-types "^1.3.1"
     ufo "^1.6.1"
 
+mri@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
 ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -6621,6 +6950,11 @@ node-releases@^2.0.27:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
   integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
 
+non-layered-tidy-tree-layout@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz#57d35d13c356643fc296a55fb11ac15e74da7804"
+  integrity sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==
+
 nopt@^7.2.1:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"
@@ -7261,6 +7595,16 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+react-day-picker@^9.14.0:
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-9.14.0.tgz#b2975b48366d0c3a180520e1a4063b5a7d6c5a57"
+  integrity sha512-tBaoDWjPwe0M5pGrum4H0SR6Lyk+BO9oHnp9JbKpGKW2mlraNPgP9BMfsg5pWpwrssARmeqk7YBl2oXutZTaHA==
+  dependencies:
+    "@date-fns/tz" "^1.4.1"
+    "@tabby_ai/hijri-converter" "1.0.5"
+    date-fns "^4.1.0"
+    date-fns-jalali "4.1.0-0"
+
 react-dom@19.2.4:
   version "19.2.4"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.4.tgz#6fac6bd96f7db477d966c7ec17c1a2b1ad8e6591"
@@ -7650,6 +7994,13 @@ rw@1:
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
   integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
 
+sade@^1.7.3:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
+  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
+  dependencies:
+    mri "^1.1.0"
+
 safe-array-concat@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
@@ -7942,6 +8293,11 @@ streamx@^2.15.0:
     fast-fifo "^1.3.2"
     text-decoder "^1.1.0"
 
+strict-event-emitter-types@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz#05e15549cb4da1694478a53543e4e2f4abcf277f"
+  integrity sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==
+
 "string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -8111,7 +8467,7 @@ styled-jsx@5.1.6:
   dependencies:
     client-only "0.0.1"
 
-stylis@^4.3.6:
+stylis@^4.1.3, stylis@^4.3.6:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.6.tgz#7c7b97191cb4f195f03ecab7d52f7902ed378320"
   integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
@@ -8453,6 +8809,13 @@ unist-util-position@^5.0.0:
   dependencies:
     "@types/unist" "^3.0.0"
 
+unist-util-stringify-position@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz#03ad3348210c2d930772d64b489580c13a7db39d"
+  integrity sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
 unist-util-stringify-position@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
@@ -8563,6 +8926,21 @@ uuid@^11.1.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912"
   integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==
 
+uuid@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+
+uvu@^0.5.0:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df"
+  integrity sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==
+  dependencies:
+    dequal "^2.0.0"
+    diff "^5.0.0"
+    kleur "^4.0.3"
+    sade "^1.7.3"
+
 vfile-location@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-5.0.3.tgz#cb9eacd20f2b6426d19451e0eafa3d0a846225c3"
@@ -8692,6 +9070,11 @@ web-namespaces@^2.0.0:
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.1.tgz#1010ff7c650eccb2592cebeeaf9a1b253fd40692"
   integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==
 
+web-worker@^1.2.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.5.0.tgz#71b2b0fbcc4293e8f0aa4f6b8a3ffebff733dcc5"
+  integrity sha512-RiMReJrTAiA+mBjGONMnjVDP2u3p9R1vkcGz6gDIrOMT3oGuYwX2WRMYI9ipkphSuE5XKEhydbhNEJh4NY9mlw==
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"