diff --git a/apps/desktop/src/session/components/note-input/header.tsx b/apps/desktop/src/session/components/note-input/header.tsx
index dd3171dba0..110be6252a 100644
--- a/apps/desktop/src/session/components/note-input/header.tsx
+++ b/apps/desktop/src/session/components/note-input/header.tsx
@@ -434,6 +434,8 @@ function CreateOtherFormatButton({
       created_at: string;
       title: string;
       description: string;
+      category?: string;
+      targets?: string[];
       sections: Array<{ title: string; description: string }>;
     }) => p.id,
     (p: {
@@ -442,11 +444,15 @@ function CreateOtherFormatButton({
       created_at: string;
       title: string;
       description: string;
+      category?: string;
+      targets?: string[];
       sections: Array<{ title: string; description: string }>;
     }) => ({
       user_id: p.user_id,
       title: p.title,
       description: p.description,
+      category: p.category,
+      targets: p.targets ? JSON.stringify(p.targets) : undefined,
       sections: JSON.stringify(p.sections),
     }),
     [],
@@ -511,6 +517,8 @@ function CreateOtherFormatButton({
         created_at: now,
         title: template.title,
         description: template.description,
+        category: template.category,
+        targets: template.targets,
         sections: template.sections ?? [],
       });
 
@@ -578,21 +586,34 @@ function CreateOtherFormatButton({
     [meetingContent, suggestedTemplates],
   );
 
+  const favoriteTemplates = useMemo(
+    () => sortFavoriteTemplates(userTemplates),
+    [userTemplates],
+  );
+  const otherTemplates = useMemo(
+    () => sortOtherTemplates(userTemplates),
+    [userTemplates],
+  );
+
   const filteredFavoriteTemplates = useMemo(() => {
-    const sortedTemplates = [...userTemplates].sort((a, b) =>
-      (a.title || "").localeCompare(b.title || ""),
+    if (!searchQuery) {
+      return favoriteTemplates;
+    }
+
+    return favoriteTemplates.filter((template) =>
+      matchesTemplateSearch(template, searchQuery),
     );
+  }, [favoriteTemplates, searchQuery]);
 
+  const filteredOtherTemplates = useMemo(() => {
     if (!searchQuery) {
-      return sortedTemplates;
+      return otherTemplates;
     }
 
-    return sortedTemplates.filter(
-      (template) =>
-        template.title?.toLowerCase().includes(searchQuery) ||
-        template.description?.toLowerCase().includes(searchQuery),
+    return otherTemplates.filter((template) =>
+      matchesTemplateSearch(template, searchQuery),
     );
-  }, [searchQuery, userTemplates]);
+  }, [otherTemplates, searchQuery]);
 
   const filteredSuggestedTemplates = useMemo(() => {
     if (!searchQuery) {
@@ -622,6 +643,7 @@ function CreateOtherFormatButton({
         key: string;
         title: string;
         description?: string;
+        tags?: string[];
         onClick: () => void;
       }>;
     }>
@@ -635,6 +657,7 @@ function CreateOtherFormatButton({
             key: template.slug || `suggested-${index}`,
             title: template.title || "Untitled",
             description: template.description,
+            tags: getTemplateTags(template),
             onClick: () => handleSuggestedTemplateClick(template),
           })),
           emptyMessage: isSuggestedTemplatesLoading
@@ -648,10 +671,23 @@ function CreateOtherFormatButton({
             key: template.id,
             title: template.title || "Untitled",
             description: template.description,
+            tags: getTemplateTags(template),
             onClick: () => handleUseTemplate(template.id),
           })),
           emptyMessage: "No favorite templates yet",
         },
+        {
+          key: "mine",
+          title: "My templates",
+          items: filteredOtherTemplates.map((template) => ({
+            key: template.id,
+            title: template.title || "Untitled",
+            description: template.description,
+            tags: getTemplateTags(template),
+            onClick: () => handleUseTemplate(template.id),
+          })),
+          emptyMessage: "No other templates yet",
+        },
       ];
     }
 
@@ -678,6 +714,7 @@ function CreateOtherFormatButton({
                 key: template.slug || `suggested-${index}`,
                 title: template.title || "Untitled",
                 description: template.description,
+                tags: getTemplateTags(template),
                 onClick: () => handleSuggestedTemplateClick(template),
               })),
             },
@@ -692,6 +729,22 @@ function CreateOtherFormatButton({
                 key: template.id,
                 title: template.title || "Untitled",
                 description: template.description,
+                tags: getTemplateTags(template),
+                onClick: () => handleUseTemplate(template.id),
+              })),
+            },
+          ]
+        : []),
+      ...(filteredOtherTemplates.length > 0
+        ? [
+            {
+              key: "mine",
+              title: "My templates",
+              items: filteredOtherTemplates.map((template) => ({
+                key: template.id,
+                title: template.title || "Untitled",
+                description: template.description,
+                tags: getTemplateTags(template),
                 onClick: () => handleUseTemplate(template.id),
               })),
             },
@@ -700,6 +753,7 @@ function CreateOtherFormatButton({
     ];
   }, [
     filteredFavoriteTemplates,
+    filteredOtherTemplates,
     filteredSuggestedTemplates,
     handleCreateTemplate,
     handleSuggestedTemplateClick,
@@ -825,6 +879,7 @@ function CreateOtherFormatButton({
                             }}
                             title={item.title}
                             description={item.description}
+                            tags={item.tags}
                             onClick={item.onClick}
                             onKeyDown={(e) => handleResultKeyDown(e, itemIndex)}
                           />
@@ -1111,6 +1166,55 @@ type WebTemplate = {
   sections: Array<{ title: string; description: string }>;
 };
 
+function getTemplateTags(template: { category?: string; targets?: string[] }) {
+  return [
+    ...new Set([
+      ...(template.category ? [template.category] : []),
+      ...(template.targets ?? []),
+    ]),
+  ];
+}
+
+function matchesTemplateSearch(
+  template: {
+    title?: string;
+    description?: string;
+    category?: string;
+    targets?: string[];
+  },
+  query: string,
+) {
+  return (
+    template.title?.toLowerCase().includes(query) ||
+    template.description?.toLowerCase().includes(query) ||
+    template.category?.toLowerCase().includes(query) ||
+    template.targets?.some((target) => target.toLowerCase().includes(query))
+  );
+}
+
+function sortFavoriteTemplates<
+  T extends { pinned?: boolean; pin_order?: number; title?: string },
+>(templates: T[]) {
+  return [...templates]
+    .filter((template) => template.pinned)
+    .sort((a, b) => {
+      const orderA = a.pin_order ?? Infinity;
+      const orderB = b.pin_order ?? Infinity;
+      if (orderA !== orderB) {
+        return orderA - orderB;
+      }
+      return (a.title || "").localeCompare(b.title || "");
+    });
+}
+
+function sortOtherTemplates<T extends { pinned?: boolean; title?: string }>(
+  templates: T[],
+) {
+  return [...templates]
+    .filter((template) => !template.pinned)
+    .sort((a, b) => (a.title || "").localeCompare(b.title || ""));
+}
+
 const TEMPLATE_SUGGESTION_STOP_WORDS = new Set([
   "about",
   "after",
@@ -1297,12 +1401,14 @@ function TemplateResultButton({
   buttonRef,
   title,
   description,
+  tags,
   onClick,
   onKeyDown,
 }: {
   buttonRef?: React.Ref<HTMLButtonElement>;
   title: string;
   description?: string;
+  tags?: string[];
   onClick: () => void;
   onKeyDown?: (e: React.KeyboardEvent<HTMLButtonElement>) => void;
 }) {
@@ -1324,6 +1430,18 @@ function TemplateResultButton({
           {description}
         </span>
       ) : null}
+      {tags && tags.length > 0 ? (
+        <span className="mt-1 flex flex-wrap gap-1">
+          {tags.map((tag, index) => (
+            <span
+              key={`${tag}-${index}`}
+              className="rounded-xs bg-neutral-100 px-1.5 py-0.5 text-[11px] text-neutral-500"
+            >
+              {tag}
+            </span>
+          ))}
+        </span>
+      ) : null}
     </button>
   );
 }
diff --git a/apps/desktop/src/shared/ui/resource-list/preview-header.tsx b/apps/desktop/src/shared/ui/resource-list/preview-header.tsx
index d93f34b2d2..d5a0d747e7 100644
--- a/apps/desktop/src/shared/ui/resource-list/preview-header.tsx
+++ b/apps/desktop/src/shared/ui/resource-list/preview-header.tsx
@@ -23,38 +23,38 @@ export function ResourcePreviewHeader({
   children?: ReactNode;
 }) {
   return (
-    <div className="border-b border-neutral-200 px-6 py-4">
-      <div className="flex items-center justify-between">
-        <div className="min-w-0 flex-1">
-          <h2 className="truncate text-lg font-semibold">
-            {title || "Untitled"}
-          </h2>
-          {description && (
-            <p className="mt-1 text-sm text-neutral-500">{description}</p>
-          )}
+    <div className="pt-1 pr-1 pb-4 pl-3">
+      <div className="flex items-center justify-between gap-3">
+        <div className="min-w-0">
+          {category ? (
+            <span className="font-mono text-xs text-stone-400">{category}</span>
+          ) : null}
         </div>
-        <Button onClick={onClone} size="sm" className="ml-4 shrink-0">
+        <Button onClick={onClone} size="sm" className="shrink-0">
           {actionIcon ?? <Copy className="mr-2 h-4 w-4" />}
           {actionLabel}
         </Button>
       </div>
-      {category && (
-        <div className="mt-2">
-          <span className="font-mono text-xs text-stone-400">({category})</span>
-        </div>
-      )}
-      {targets && targets.length > 0 && (
-        <div className="mt-2 flex flex-wrap items-center gap-2">
-          {targets.map((target, index) => (
-            <span
-              key={index}
-              className="rounded-xs bg-neutral-100 px-2 py-0.5 text-xs text-neutral-600"
-            >
-              {target}
-            </span>
-          ))}
-        </div>
-      )}
+      <div className="mt-3 min-w-0 px-3">
+        <h2 className="truncate text-lg font-semibold">
+          {title || "Untitled"}
+        </h2>
+        {description && (
+          <p className="mt-1 text-sm text-neutral-500">{description}</p>
+        )}
+        {targets && targets.length > 0 && (
+          <div className="mt-2 flex flex-wrap items-center gap-2">
+            {targets.map((target, index) => (
+              <span
+                key={index}
+                className="rounded-xs bg-neutral-100 px-2 py-0.5 text-xs text-neutral-600"
+              >
+                {target}
+              </span>
+            ))}
+          </div>
+        )}
+      </div>
       {children}
     </div>
   );
diff --git a/apps/desktop/src/store/tinybase/store/main.ts b/apps/desktop/src/store/tinybase/store/main.ts
index 106b0b0226..af7d0c5b9f 100644
--- a/apps/desktop/src/store/tinybase/store/main.ts
+++ b/apps/desktop/src/store/tinybase/store/main.ts
@@ -138,6 +138,10 @@ export const StoreComponent = () => {
           ({ select }) => {
             select("title");
             select("description");
+            select("pinned");
+            select("pin_order");
+            select("category");
+            select("targets");
             select("sections");
           },
         )
@@ -194,6 +198,10 @@ export const StoreComponent = () => {
           ({ select, where, param }) => {
             select("title");
             select("description");
+            select("pinned");
+            select("pin_order");
+            select("category");
+            select("targets");
             select("sections");
             select("user_id");
             where("user_id", (param("user_id") as string) ?? "");
diff --git a/apps/desktop/src/templates/components/details.tsx b/apps/desktop/src/templates/components/details.tsx
index f97186247e..6d8d007742 100644
--- a/apps/desktop/src/templates/components/details.tsx
+++ b/apps/desktop/src/templates/components/details.tsx
@@ -24,15 +24,19 @@ export function TemplateDetailsColumn({
   selectedMineId,
   selectedWebTemplate,
   handleDeleteTemplate,
+  handleDuplicateTemplate,
   handleCloneTemplate,
 }: {
   isWebMode: boolean;
   selectedMineId: string | null;
   selectedWebTemplate: WebTemplate | null;
   handleDeleteTemplate: (id: string) => void;
+  handleDuplicateTemplate: (id: string) => void;
   handleCloneTemplate: (template: {
     title: string;
     description: string;
+    category?: string;
+    targets?: string[];
     sections: TemplateSection[];
   }) => void;
 }) {
@@ -57,6 +61,7 @@ export function TemplateDetailsColumn({
       key={selectedMineId}
       id={selectedMineId}
       handleDeleteTemplate={handleDeleteTemplate}
+      handleDuplicateTemplate={handleDuplicateTemplate}
     />
   );
 }
@@ -69,6 +74,8 @@ function WebTemplatePreview({
   onClone: (template: {
     title: string;
     description: string;
+    category?: string;
+    targets?: string[];
     sections: TemplateSection[];
   }) => void;
 }) {
@@ -85,6 +92,8 @@ function WebTemplatePreview({
           onClone({
             title: template.title ?? "",
             description: template.description ?? "",
+            category: template.category,
+            targets: template.targets,
             sections: template.sections ?? [],
           })
         }
diff --git a/apps/desktop/src/templates/components/template-form.tsx b/apps/desktop/src/templates/components/template-form.tsx
index ca7bed9dab..cb08ec0d33 100644
--- a/apps/desktop/src/templates/components/template-form.tsx
+++ b/apps/desktop/src/templates/components/template-form.tsx
@@ -1,10 +1,21 @@
 import { useForm } from "@tanstack/react-form";
+import { HeartIcon, MoreHorizontalIcon } from "lucide-react";
+import { useState } from "react";
 
 import type { Template, TemplateSection, TemplateStorage } from "@hypr/store";
+import { Button } from "@hypr/ui/components/ui/button";
+import {
+  AppFloatingPanel,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@hypr/ui/components/ui/dropdown-menu";
 import { Input } from "@hypr/ui/components/ui/input";
 import { Textarea } from "@hypr/ui/components/ui/textarea";
 import { cn } from "@hypr/utils";
 
+import { useToggleTemplateFavorite } from "../shared";
 import { RelatedSessions } from "./related-sessions";
 import { SectionsList } from "./sections-editor";
 
@@ -50,6 +61,10 @@ function normalizeTemplatePayload(template: unknown): Template {
     title: typeof record.title === "string" ? record.title : "",
     description:
       typeof record.description === "string" ? record.description : "",
+    pinned: Boolean(record.pinned),
+    pin_order:
+      typeof record.pin_order === "number" ? record.pin_order : undefined,
+    category: typeof record.category === "string" ? record.category : undefined,
     sections,
     targets,
   };
@@ -58,12 +73,16 @@ function normalizeTemplatePayload(template: unknown): Template {
 export function TemplateForm({
   id,
   handleDeleteTemplate,
+  handleDuplicateTemplate,
 }: {
   id: string;
   handleDeleteTemplate: (id: string) => void;
+  handleDuplicateTemplate: (id: string) => void;
 }) {
   const row = main.UI.useRow("templates", id, main.STORE_ID);
   const value = row ? normalizeTemplatePayload(row) : undefined;
+  const toggleTemplateFavorite = useToggleTemplateFavorite();
+  const [actionsOpen, setActionsOpen] = useState(false);
 
   const selectedTemplateId = settings.UI.useValue(
     "selected_template_id",
@@ -124,55 +143,120 @@ export function TemplateForm({
 
   return (
     <div className="flex h-full flex-1 flex-col">
-      <div className="border-b border-neutral-200 px-6 py-4">
-        <div className="flex items-center gap-2">
+      <div className="pt-1 pr-1 pb-4 pl-3">
+        <div className="flex items-center justify-between gap-3">
+          <div className="min-w-0">
+            {value.category ? (
+              <span className="font-mono text-xs text-stone-400">
+                {value.category}
+              </span>
+            ) : null}
+          </div>
+          <div className="flex items-center gap-1">
+            <Button
+              type="button"
+              size="sm"
+              variant="ghost"
+              onClick={setSelectedTemplateId}
+              title={isDefault ? "Remove as default" : "Set as default"}
+              className={cn([
+                "shrink-0 px-0 hover:bg-transparent",
+                isDefault
+                  ? "text-sky-600 hover:text-sky-700"
+                  : "text-neutral-500 hover:text-neutral-700",
+              ])}
+            >
+              {isDefault ? "Current default" : "Set as default"}
+            </Button>
+            <Button
+              type="button"
+              size="icon"
+              variant="ghost"
+              onClick={() => toggleTemplateFavorite(id)}
+              className={cn([
+                "text-neutral-500 hover:text-neutral-800",
+                value.pinned && "text-rose-500 hover:text-rose-600",
+              ])}
+              title={value.pinned ? "Unfavorite template" : "Favorite template"}
+              aria-label={
+                value.pinned ? "Unfavorite template" : "Favorite template"
+              }
+            >
+              <HeartIcon
+                className="size-4"
+                fill={value.pinned ? "currentColor" : "none"}
+              />
+            </Button>
+            <DropdownMenu open={actionsOpen} onOpenChange={setActionsOpen}>
+              <DropdownMenuTrigger asChild>
+                <Button
+                  type="button"
+                  size="icon"
+                  variant="ghost"
+                  className={cn([
+                    "text-neutral-500 hover:text-neutral-800",
+                    actionsOpen &&
+                      "bg-neutral-100 text-neutral-800 hover:bg-neutral-100",
+                  ])}
+                  aria-label="Template actions"
+                >
+                  <MoreHorizontalIcon className="size-4" />
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent variant="app" align="end">
+                <AppFloatingPanel className="overflow-hidden p-1">
+                  <DropdownMenuItem
+                    onClick={() => handleDuplicateTemplate(id)}
+                    className="cursor-pointer"
+                  >
+                    Duplicate
+                  </DropdownMenuItem>
+                  <DropdownMenuItem
+                    onClick={() => handleDeleteTemplate(id)}
+                    className="cursor-pointer text-red-600 focus:text-red-600"
+                  >
+                    Delete
+                  </DropdownMenuItem>
+                </AppFloatingPanel>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </div>
+        </div>
+        <div className="mt-3 min-w-0 px-3">
           <form.Field name="title">
             {(field) => (
               <Input
                 value={field.state.value}
                 onChange={(e) => field.handleChange(e.target.value)}
                 placeholder="Enter template title"
-                className="h-8 flex-1 border-0 px-0 text-lg font-semibold shadow-none focus-visible:ring-0"
+                className="h-auto border-0 px-0 py-0 text-lg font-semibold shadow-none focus-visible:ring-0 md:text-lg"
               />
             )}
           </form.Field>
-          <button
-            type="button"
-            onClick={setSelectedTemplateId}
-            title={isDefault ? "Remove as default" : "Set as default"}
-            className={cn([
-              "shrink-0 rounded border px-2 py-0.5 text-xs transition-colors",
-              isDefault
-                ? "border-neutral-800 bg-neutral-800 text-white"
-                : "border-neutral-300 text-neutral-500 hover:border-neutral-500 hover:text-neutral-700",
-            ])}
-          >
-            {isDefault ? "Default" : "Set default"}
-          </button>
+          <form.Field name="description">
+            {(field) => (
+              <Textarea
+                value={field.state.value}
+                onChange={(e) => field.handleChange(e.target.value)}
+                placeholder="Describe the template purpose..."
+                className="mt-1 min-h-[24px] resize-none border-0 px-0 py-0 text-sm text-neutral-500 shadow-none focus-visible:ring-0"
+                rows={1}
+              />
+            )}
+          </form.Field>
+          {value.targets && value.targets.length > 0 ? (
+            <div className="mt-2 flex flex-wrap items-center gap-2">
+              {value.targets.map((target, index) => (
+                <span
+                  key={index}
+                  className="rounded-xs bg-neutral-100 px-2 py-0.5 text-xs text-neutral-600"
+                >
+                  {target}
+                </span>
+              ))}
+            </div>
+          ) : null}
         </div>
-        <form.Field name="description">
-          {(field) => (
-            <Textarea
-              value={field.state.value}
-              onChange={(e) => field.handleChange(e.target.value)}
-              placeholder="Describe the template purpose..."
-              className="min-h-[40px] resize-none border-0 px-0 text-sm text-neutral-600 shadow-none focus-visible:ring-0"
-              rows={2}
-            />
-          )}
-        </form.Field>
-        {value.targets && value.targets.length > 0 && (
-          <div className="mt-2 flex flex-wrap items-center gap-2">
-            {value.targets.map((target, index) => (
-              <span
-                key={index}
-                className="rounded-xs bg-neutral-100 px-2 py-0.5 text-xs text-neutral-600"
-              >
-                {target}
-              </span>
-            ))}
-          </div>
-        )}
       </div>
 
       <div className="flex-1 overflow-y-auto">
diff --git a/apps/desktop/src/templates/index.tsx b/apps/desktop/src/templates/index.tsx
index b3865979bf..834d36eb6b 100644
--- a/apps/desktop/src/templates/index.tsx
+++ b/apps/desktop/src/templates/index.tsx
@@ -107,6 +107,8 @@ function TemplateView({ tab }: { tab: Extract<Tab, { type: "templates" }> }) {
     (template: {
       title: string;
       description: string;
+      category?: string;
+      targets?: string[];
       sections: TemplateSection[];
     }) => {
       const id = createTemplate({
@@ -120,6 +122,22 @@ function TemplateView({ tab }: { tab: Extract<Tab, { type: "templates" }> }) {
     [createTemplate, setSelectedMineId],
   );
 
+  const handleDuplicateTemplate = useCallback(
+    (id: string) => {
+      const template = userTemplates.find((item) => item.id === id);
+      if (!template) return;
+
+      handleCloneTemplate({
+        title: template.title,
+        description: template.description,
+        category: template.category,
+        targets: template.targets,
+        sections: template.sections,
+      });
+    },
+    [handleCloneTemplate, userTemplates],
+  );
+
   return (
     <div className="h-full">
       <TemplateDetailsColumn
@@ -127,6 +145,7 @@ function TemplateView({ tab }: { tab: Extract<Tab, { type: "templates" }> }) {
         selectedMineId={selectedMineId}
         selectedWebTemplate={selectedWebTemplate}
         handleDeleteTemplate={handleDeleteTemplate}
+        handleDuplicateTemplate={handleDuplicateTemplate}
         handleCloneTemplate={handleCloneTemplate}
       />
     </div>
diff --git a/apps/desktop/src/templates/shared.ts b/apps/desktop/src/templates/shared.ts
index 9274f545ed..c9b134c584 100644
--- a/apps/desktop/src/templates/shared.ts
+++ b/apps/desktop/src/templates/shared.ts
@@ -18,6 +18,8 @@ export type UserTemplate = Template & { id: string };
 type TemplateDraft = {
   title: string;
   description: string;
+  category?: string;
+  targets?: string[];
   sections: TemplateSection[];
 };
 
@@ -115,6 +117,8 @@ export function useCreateTemplate() {
       created_at: string;
       title: string;
       description: string;
+      category?: string;
+      targets?: string[];
       sections: TemplateSection[];
     }) => p.id,
     (p: {
@@ -123,12 +127,18 @@ export function useCreateTemplate() {
       created_at: string;
       title: string;
       description: string;
+      category?: string;
+      targets?: string[];
       sections: TemplateSection[];
     }) =>
       ({
         user_id: p.user_id,
         title: p.title,
         description: p.description,
+        pinned: false,
+        pin_order: undefined,
+        category: p.category,
+        targets: p.targets ? JSON.stringify(p.targets) : undefined,
         sections: JSON.stringify(p.sections),
       }) satisfies TemplateStorage,
     [],
@@ -148,6 +158,8 @@ export function useCreateTemplate() {
         created_at: now,
         title: template.title,
         description: template.description,
+        category: template.category,
+        targets: template.targets,
         sections: template.sections.map((section) => ({ ...section })),
       });
 
@@ -157,7 +169,46 @@ export function useCreateTemplate() {
   );
 }
 
-function normalizeTemplatePayload(template: unknown): Template {
+export function useToggleTemplateFavorite() {
+  const store = main.UI.useStore(main.STORE_ID);
+
+  return useCallback(
+    (templateId: string) => {
+      if (!store) return;
+
+      const isPinned = Boolean(
+        store.getCell("templates", templateId, "pinned"),
+      );
+      if (isPinned) {
+        store.setPartialRow("templates", templateId, {
+          pinned: false,
+          pin_order: 0,
+        });
+        return;
+      }
+
+      const allTemplates = store.getTable("templates");
+      const maxPinOrder = Object.entries(allTemplates).reduce(
+        (max, [id, template]) => {
+          if (id === templateId) return max;
+
+          const order =
+            typeof template.pin_order === "number" ? template.pin_order : 0;
+          return Math.max(max, order);
+        },
+        0,
+      );
+
+      store.setPartialRow("templates", templateId, {
+        pinned: true,
+        pin_order: maxPinOrder + 1,
+      });
+    },
+    [store],
+  );
+}
+
+export function normalizeTemplatePayload(template: unknown): Template {
   const record = (
     template && typeof template === "object" ? template : {}
   ) as Record<string, unknown>;
@@ -178,6 +229,29 @@ function normalizeTemplatePayload(template: unknown): Template {
     title: typeof record.title === "string" ? record.title : "",
     description:
       typeof record.description === "string" ? record.description : "",
+    pinned: Boolean(record.pinned),
+    pin_order:
+      typeof record.pin_order === "number" ? record.pin_order : undefined,
+    category: typeof record.category === "string" ? record.category : undefined,
+    targets:
+      typeof record.targets === "string"
+        ? (() => {
+            try {
+              const parsed = JSON.parse(record.targets);
+              return Array.isArray(parsed)
+                ? parsed.filter(
+                    (target): target is string => typeof target === "string",
+                  )
+                : undefined;
+            } catch {
+              return undefined;
+            }
+          })()
+        : Array.isArray(record.targets)
+          ? record.targets.filter(
+              (target): target is string => typeof target === "string",
+            )
+          : undefined,
     sections,
   };
 }
diff --git a/apps/desktop/src/templates/sidebar-content.tsx b/apps/desktop/src/templates/sidebar-content.tsx
index ba816110df..9a6d52f9b7 100644
--- a/apps/desktop/src/templates/sidebar-content.tsx
+++ b/apps/desktop/src/templates/sidebar-content.tsx
@@ -14,6 +14,7 @@ import { cn } from "@hypr/utils";
 import {
   resolveTemplateTabSelection,
   useCreateTemplate,
+  useToggleTemplateFavorite,
   useUserTemplates,
   type UserTemplate,
   type WebTemplate,
@@ -36,6 +37,7 @@ export function TemplatesSidebarContent({
   const [sortOption, setSortOption] = useState<SortOption>("alphabetical");
   const userTemplates = useUserTemplates();
   const createTemplate = useCreateTemplate();
+  const toggleTemplateFavorite = useToggleTemplateFavorite();
   const { data: webTemplates = [], isLoading: isWebLoading } =
     useWebResources<WebTemplate>("templates");
   const deleteTemplateFromStore = main.UI.useDelRowCallback(
@@ -97,6 +99,8 @@ export function TemplatesSidebarContent({
       const id = createTemplate({
         title: getDuplicatedTemplateTitle(template.title),
         description: template.description ?? "",
+        category: template.category,
+        targets: template.targets,
         sections: template.sections.map((section) => ({ ...section })),
       });
 
@@ -118,19 +122,37 @@ export function TemplatesSidebarContent({
     [deleteTemplateFromStore, effectiveSelectedMineId, setSelectedMineId],
   );
 
+  const handleToggleFavorite = useCallback(
+    (id: string) => {
+      toggleTemplateFavorite(id);
+    },
+    [toggleTemplateFavorite],
+  );
+
   const sortedUserTemplates = useMemo(() => {
-    const sorted = [...userTemplates];
+    const favorites = userTemplates
+      .filter((template) => template.pinned)
+      .sort((a, b) => {
+        const orderA = a.pin_order ?? Infinity;
+        const orderB = b.pin_order ?? Infinity;
+        if (orderA !== orderB) {
+          return orderA - orderB;
+        }
+        return (a.title || "").localeCompare(b.title || "");
+      });
+
+    const others = userTemplates.filter((template) => !template.pinned);
     switch (sortOption) {
       case "alphabetical":
-        return sorted.sort((a, b) =>
-          (a.title || "").localeCompare(b.title || ""),
-        );
+        others.sort((a, b) => (a.title || "").localeCompare(b.title || ""));
+        break;
       case "reverse-alphabetical":
       default:
-        return sorted.sort((a, b) =>
-          (b.title || "").localeCompare(a.title || ""),
-        );
+        others.sort((a, b) => (b.title || "").localeCompare(a.title || ""));
+        break;
     }
+
+    return [...favorites, ...others];
   }, [userTemplates, sortOption]);
 
   const filteredMine = useMemo(() => {
@@ -139,7 +161,9 @@ export function TemplatesSidebarContent({
     return sortedUserTemplates.filter(
       (template) =>
         template.title?.toLowerCase().includes(q) ||
-        template.description?.toLowerCase().includes(q),
+        template.description?.toLowerCase().includes(q) ||
+        template.category?.toLowerCase().includes(q) ||
+        template.targets?.some((target) => target.toLowerCase().includes(q)),
     );
   }, [sortedUserTemplates, search]);
 
@@ -275,6 +299,7 @@ export function TemplatesSidebarContent({
                       !isWebMode && effectiveSelectedMineId === template.id
                     }
                     onSelect={setSelectedMineId}
+                    onToggleFavorite={handleToggleFavorite}
                     onDuplicate={handleDuplicateTemplate}
                     onDelete={handleDeleteTemplate}
                   />
@@ -344,17 +369,25 @@ function TemplateListItem({
   template,
   selected,
   onSelect,
+  onToggleFavorite,
   onDuplicate,
   onDelete,
 }: {
   template: UserTemplate;
   selected: boolean;
   onSelect: (id: string) => void;
+  onToggleFavorite: (id: string) => void;
   onDuplicate: (template: UserTemplate) => void;
   onDelete: (id: string) => void;
 }) {
   const contextMenu = useMemo(
     () => [
+      {
+        id: `favorite-template-${template.id}`,
+        text: template.pinned ? "Unfavorite" : "Favorite",
+        action: () => onToggleFavorite(template.id),
+      },
+      { separator: true as const },
       {
         id: `duplicate-template-${template.id}`,
         text: "Duplicate",
@@ -366,7 +399,7 @@ function TemplateListItem({
         action: () => onDelete(template.id),
       },
     ],
-    [onDelete, onDuplicate, template],
+    [onDelete, onDuplicate, onToggleFavorite, template],
   );
   const showContextMenu = useNativeContextMenu(contextMenu);
 
diff --git a/packages/store/src/tinybase.ts b/packages/store/src/tinybase.ts
index 4455153461..e3607d4663 100644
--- a/packages/store/src/tinybase.ts
+++ b/packages/store/src/tinybase.ts
@@ -118,6 +118,10 @@ export const tableSchemaForTinybase = {
     user_id: { type: "string" },
     title: { type: "string" },
     description: { type: "string" },
+    pinned: { type: "boolean" },
+    pin_order: { type: "number" },
+    category: { type: "string" },
+    targets: { type: "string" },
     sections: { type: "string" },
   } as const satisfies InferTinyBaseSchema<typeof templateSchema>,
   chat_groups: {
diff --git a/packages/store/src/zod.ts b/packages/store/src/zod.ts
index 1e3fe0d95a..03c5bce9d8 100644
--- a/packages/store/src/zod.ts
+++ b/packages/store/src/zod.ts
@@ -171,6 +171,8 @@ export const templateSchema = z.object({
   user_id: z.string(),
   title: z.string(),
   description: z.string(),
+  pinned: z.preprocess((val) => val ?? false, z.boolean()),
+  pin_order: z.preprocess((val) => val ?? undefined, z.number().optional()),
   category: z.preprocess((val) => val ?? undefined, z.string().optional()),
   targets: z.preprocess(
     (val) => val ?? undefined,