diff --git a/apps/desktop/src/components/right-panel/hooks/useChatLogic.ts b/apps/desktop/src/components/right-panel/hooks/useChatLogic.ts
index 344ae20bb9..c90e00ee2a 100644
--- a/apps/desktop/src/components/right-panel/hooks/useChatLogic.ts
+++ b/apps/desktop/src/components/right-panel/hooks/useChatLogic.ts
@@ -241,14 +241,14 @@ export function useChatLogic({
       return;
     }
 
-    if (messages.length >= 14 && !getLicense.data?.valid) {
+    if (messages.length >= 6 && !getLicense.data?.valid) {
       if (userId) {
         await analyticsCommands.event({
           event: "pro_license_required_chat",
           distinct_id: userId,
         });
       }
-      await message("7 messages are allowed per conversation for free users.", {
+      await message("3 messages are allowed per conversation for free users.", {
         title: "Pro License Required",
         kind: "info",
       });
diff --git a/apps/desktop/src/components/settings/components/ai/llm-custom-view.tsx b/apps/desktop/src/components/settings/components/ai/llm-custom-view.tsx
index 842dac404c..4934d706d3 100644
--- a/apps/desktop/src/components/settings/components/ai/llm-custom-view.tsx
+++ b/apps/desktop/src/components/settings/components/ai/llm-custom-view.tsx
@@ -24,6 +24,7 @@ const openaiModels = [
   "gpt-4o-mini",
   "gpt-4.1-nano",
   "gpt-4.1",
+  "gpt-5-chat-latest",
   "chatgpt-4o-latest",
 ];
 
diff --git a/apps/desktop/src/components/settings/views/ai.tsx b/apps/desktop/src/components/settings/views/ai.tsx
index c5cd0a11e8..4ebf11ecd8 100644
--- a/apps/desktop/src/components/settings/views/ai.tsx
+++ b/apps/desktop/src/components/settings/views/ai.tsx
@@ -2,6 +2,8 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { Trans } from "@lingui/react/macro";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { openPath } from "@tauri-apps/plugin-opener";
+import { open } from "@tauri-apps/plugin-shell";
+import { InfoIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
@@ -13,6 +15,7 @@ import { commands as dbCommands } from "@hypr/plugin-db";
 import { commands as localLlmCommands, SupportedModel } from "@hypr/plugin-local-llm";
 
 import { commands as localSttCommands } from "@hypr/plugin-local-stt";
+import { Button } from "@hypr/ui/components/ui/button";
 import {
   Form,
   FormControl,
@@ -23,6 +26,7 @@ import {
   FormMessage,
 } from "@hypr/ui/components/ui/form";
 import { Tabs, TabsList, TabsTrigger } from "@hypr/ui/components/ui/tabs";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@hypr/ui/components/ui/tooltip";
 import { cn } from "@hypr/ui/lib/utils";
 import { showLlmModelDownloadToast, showSttModelDownloadToast } from "../../toast/shared";
 
@@ -824,9 +828,26 @@ export default function LocalAI() {
                       name="aiSpecificity"
                       render={({ field }) => (
                         <FormItem>
-                          <FormLabel className="text-sm font-medium">
-                            <Trans>Autonomy Selector</Trans>
-                          </FormLabel>
+                          <div className="flex items-center gap-2">
+                            <FormLabel className="text-sm font-medium">
+                              <Trans>Autonomy Selector</Trans>
+                            </FormLabel>
+                            <Tooltip>
+                              <TooltipTrigger asChild>
+                                <Button
+                                  size="icon"
+                                  variant="ghost"
+                                  onClick={() => open("https://docs.hyprnote.com/features/ai-autonomy")}
+                                  className="h-8 w-8"
+                                >
+                                  <InfoIcon className="w-4 h-4" />
+                                </Button>
+                              </TooltipTrigger>
+                              <TooltipContent>
+                                <Trans>Learn more about AI autonomy</Trans>
+                              </TooltipContent>
+                            </Tooltip>
+                          </div>
                           <FormDescription className="text-xs">
                             <Trans>Control how autonomous the AI enhancement should be</Trans>
                           </FormDescription>
diff --git a/apps/desktop/src/components/settings/views/templates.tsx b/apps/desktop/src/components/settings/views/templates.tsx
index a7f42f0e81..753185a003 100644
--- a/apps/desktop/src/components/settings/views/templates.tsx
+++ b/apps/desktop/src/components/settings/views/templates.tsx
@@ -1,7 +1,8 @@
 import { Trans } from "@lingui/react/macro";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { message } from "@tauri-apps/plugin-dialog";
-import { ArrowLeftIcon, CheckIcon, Loader2Icon, PlusIcon } from "lucide-react";
+import { open } from "@tauri-apps/plugin-shell";
+import { ArrowLeftIcon, CheckIcon, InfoIcon, Loader2Icon, PlusIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 
 import { useHypr } from "@/contexts";
@@ -11,6 +12,7 @@ import { commands as analyticsCommands } from "@hypr/plugin-analytics";
 import { type Template } from "@hypr/plugin-db";
 import { commands as dbCommands } from "@hypr/plugin-db";
 import { Button } from "@hypr/ui/components/ui/button";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@hypr/ui/components/ui/tooltip";
 import { cn } from "@hypr/ui/lib/utils";
 import TemplateEditor from "./template";
 
@@ -248,8 +250,25 @@ export default function TemplatesView() {
         {/* Header */}
         <div className="flex items-center justify-between">
           <div className="space-y-0.5">
-            <div className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
-              <Trans>Your Templates</Trans>
+            <div className="flex items-center gap-2">
+              <div className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+                <Trans>Your Templates</Trans>
+              </div>
+              <Tooltip>
+                <TooltipTrigger asChild>
+                  <Button
+                    size="icon"
+                    variant="ghost"
+                    onClick={() => open("https://docs.hyprnote.com/features/templates.mdx")}
+                    className="h-8 w-8"
+                  >
+                    <InfoIcon className="w-4 h-4" />
+                  </Button>
+                </TooltipTrigger>
+                <TooltipContent>
+                  <Trans>Learn more about templates</Trans>
+                </TooltipContent>
+              </Tooltip>
             </div>
             <div className="text-sm text-muted-foreground">
               <Trans>Select a template to enhance your meeting notes</Trans>
diff --git a/apps/desktop/src/locales/en/messages.po b/apps/desktop/src/locales/en/messages.po
index 5e1dbab744..75c4b12f87 100644
--- a/apps/desktop/src/locales/en/messages.po
+++ b/apps/desktop/src/locales/en/messages.po
@@ -256,7 +256,7 @@ msgstr "(Beta) Detect meetings automatically"
 msgid "(Beta) Upcoming meeting notifications"
 msgstr "(Beta) Upcoming meeting notifications"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:602
+#: src/components/settings/components/ai/llm-custom-view.tsx:603
 msgid "(Optional for localhost)"
 msgstr "(Optional for localhost)"
 
@@ -267,7 +267,7 @@ msgstr "(Optional)"
 #. placeholder {0}: isViewingTemplate ? "Back" : "Save and close"
 #. placeholder {0}: lang.language
 #. placeholder {0}: disabled ? "Wait..." : isHovered ? "Resume" : "Ended"
-#: src/components/settings/views/templates.tsx:215
+#: src/components/settings/views/templates.tsx:217
 #: src/components/settings/components/wer-modal.tsx:116
 #: src/components/editor-area/note-header/listen-button.tsx:216
 #: src/components/editor-area/note-header/listen-button.tsx:238
@@ -324,7 +324,7 @@ msgstr "Access granted"
 msgid "Access Granted"
 msgstr "Access Granted"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:467
+#: src/components/settings/components/ai/llm-custom-view.tsx:468
 msgid "Access multiple AI models through OpenRouter with your API key"
 msgstr "Access multiple AI models through OpenRouter with your API key"
 
@@ -399,7 +399,7 @@ msgid "Anyone with the link can view this page"
 msgstr "Anyone with the link can view this page"
 
 #: src/components/welcome-modal/custom-endpoint-view.tsx:498
-#: src/components/settings/components/ai/llm-custom-view.tsx:577
+#: src/components/settings/components/ai/llm-custom-view.tsx:578
 msgid "API Base URL"
 msgstr "API Base URL"
 
@@ -408,10 +408,10 @@ msgstr "API Base URL"
 #: src/components/welcome-modal/custom-endpoint-view.tsx:438
 #: src/components/welcome-modal/custom-endpoint-view.tsx:518
 #: src/components/settings/views/integrations.tsx:197
-#: src/components/settings/components/ai/llm-custom-view.tsx:285
-#: src/components/settings/components/ai/llm-custom-view.tsx:381
-#: src/components/settings/components/ai/llm-custom-view.tsx:487
-#: src/components/settings/components/ai/llm-custom-view.tsx:599
+#: src/components/settings/components/ai/llm-custom-view.tsx:286
+#: src/components/settings/components/ai/llm-custom-view.tsx:382
+#: src/components/settings/components/ai/llm-custom-view.tsx:488
+#: src/components/settings/components/ai/llm-custom-view.tsx:600
 msgid "API Key"
 msgstr "API Key"
 
@@ -440,7 +440,7 @@ msgstr "Audio Permissions"
 #~ msgid "Auto (Default)"
 #~ msgstr "Auto (Default)"
 
-#: src/components/settings/views/ai.tsx:828
+#: src/components/settings/views/ai.tsx:833
 msgid "Autonomy Selector"
 msgstr "Autonomy Selector"
 
@@ -465,7 +465,7 @@ msgstr "Base URL"
 #~ msgid "Billing features are currently under development and will be available in a future update."
 #~ msgstr "Billing features are currently under development and will be available in a future update."
 
-#: src/components/settings/views/templates.tsx:300
+#: src/components/settings/views/templates.tsx:319
 #: src/components/settings/components/templates-sidebar.tsx:68
 msgid "Built-in Templates"
 msgstr "Built-in Templates"
@@ -566,7 +566,7 @@ msgstr "Configure Your LLM"
 #~ msgid "Connect"
 #~ msgstr "Connect"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:557
+#: src/components/settings/components/ai/llm-custom-view.tsx:558
 msgid "Connect to a self-hosted or third-party LLM endpoint (OpenAI API compatible)"
 msgstr "Connect to a self-hosted or third-party LLM endpoint (OpenAI API compatible)"
 
@@ -615,7 +615,7 @@ msgstr "Continue"
 #~ msgid "Continue Setup"
 #~ msgstr "Continue Setup"
 
-#: src/components/settings/views/ai.tsx:831
+#: src/components/settings/views/ai.tsx:852
 msgid "Control how autonomous the AI enhancement should be"
 msgstr "Control how autonomous the AI enhancement should be"
 
@@ -644,7 +644,7 @@ msgstr "Create new note"
 msgid "Create Note"
 msgstr "Create Note"
 
-#: src/components/settings/views/templates.tsx:290
+#: src/components/settings/views/templates.tsx:309
 msgid "Create your first template to get started"
 msgstr "Create your first template to get started"
 
@@ -660,7 +660,7 @@ msgstr "Create your first template to get started"
 #~ msgid "Custom Endpoint"
 #~ msgstr "Custom Endpoint"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:234
+#: src/components/settings/components/ai/llm-custom-view.tsx:235
 msgid "Custom Endpoints"
 msgstr "Custom Endpoints"
 
@@ -758,7 +758,7 @@ msgstr "Enter a section title"
 #~ msgid "Enter the API key for your custom LLM endpoint"
 #~ msgstr "Enter the API key for your custom LLM endpoint"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:580
+#: src/components/settings/components/ai/llm-custom-view.tsx:581
 msgid "Enter the base URL for your custom LLM endpoint"
 msgstr "Enter the base URL for your custom LLM endpoint"
 
@@ -835,7 +835,7 @@ msgstr "Generating title..."
 msgid "Get Started"
 msgstr "Get Started"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:357
+#: src/components/settings/components/ai/llm-custom-view.tsx:358
 msgid "Google Gemini"
 msgstr "Google Gemini"
 
@@ -932,10 +932,18 @@ msgstr "Join meeting"
 #~ msgid "Language"
 #~ msgstr "Language"
 
+#: src/components/settings/views/ai.tsx:847
+msgid "Learn more about AI autonomy"
+msgstr "Learn more about AI autonomy"
+
 #: src/components/settings/views/billing.tsx:200
 #~ msgid "Learn more about our pricing plans"
 #~ msgstr "Learn more about our pricing plans"
 
+#: src/components/settings/views/templates.tsx:269
+msgid "Learn more about templates"
+msgstr "Learn more about templates"
+
 #: src/routes/app.settings.tsx:82
 msgid "License"
 msgstr "License"
@@ -948,15 +956,15 @@ msgstr "LinkedIn username"
 #~ msgid "Live summary of the meeting"
 #~ msgstr "Live summary of the meeting"
 
-#: src/components/settings/views/ai.tsx:804
+#: src/components/settings/views/ai.tsx:808
 msgid "LLM - Custom"
 msgstr "LLM - Custom"
 
-#: src/components/settings/views/ai.tsx:801
+#: src/components/settings/views/ai.tsx:805
 msgid "LLM - Local"
 msgstr "LLM - Local"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:636
+#: src/components/settings/components/ai/llm-custom-view.tsx:637
 msgid "Loading available models..."
 msgstr "Loading available models..."
 
@@ -968,7 +976,7 @@ msgstr "Loading events..."
 msgid "Loading models..."
 msgstr "Loading models..."
 
-#: src/components/settings/views/templates.tsx:238
+#: src/components/settings/views/templates.tsx:240
 msgid "Loading templates..."
 msgstr "Loading templates..."
 
@@ -1013,14 +1021,14 @@ msgstr "Microphone Access"
 #: src/components/welcome-modal/custom-endpoint-view.tsx:315
 #: src/components/welcome-modal/custom-endpoint-view.tsx:382
 #: src/components/welcome-modal/custom-endpoint-view.tsx:459
-#: src/components/settings/components/ai/llm-custom-view.tsx:305
-#: src/components/settings/components/ai/llm-custom-view.tsx:401
-#: src/components/settings/components/ai/llm-custom-view.tsx:507
+#: src/components/settings/components/ai/llm-custom-view.tsx:306
+#: src/components/settings/components/ai/llm-custom-view.tsx:402
+#: src/components/settings/components/ai/llm-custom-view.tsx:508
 msgid "Model"
 msgstr "Model"
 
 #: src/components/welcome-modal/custom-endpoint-view.tsx:544
-#: src/components/settings/components/ai/llm-custom-view.tsx:624
+#: src/components/settings/components/ai/llm-custom-view.tsx:625
 msgid "Model Name"
 msgstr "Model Name"
 
@@ -1097,7 +1105,7 @@ msgstr "No recent notes for this organization"
 msgid "No Template (Default)"
 msgstr "No Template (Default)"
 
-#: src/components/settings/views/templates.tsx:287
+#: src/components/settings/views/templates.tsx:306
 msgid "No templates yet"
 msgstr "No templates yet"
 
@@ -1148,11 +1156,11 @@ msgstr "Open in new window"
 #~ msgid "Open Note"
 #~ msgstr "Open Note"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:261
+#: src/components/settings/components/ai/llm-custom-view.tsx:262
 msgid "OpenAI"
 msgstr "OpenAI"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:463
+#: src/components/settings/components/ai/llm-custom-view.tsx:464
 msgid "OpenRouter"
 msgstr "OpenRouter"
 
@@ -1164,7 +1172,7 @@ msgstr "Optional base folder path within your Obsidian vault."
 msgid "Optional for participant suggestions"
 msgstr "Optional for participant suggestions"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:554
+#: src/components/settings/components/ai/llm-custom-view.tsx:555
 msgid "Others"
 msgstr "Others"
 
@@ -1305,7 +1313,7 @@ msgstr "Search..."
 msgid "Sections"
 msgstr "Sections"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:627
+#: src/components/settings/components/ai/llm-custom-view.tsx:628
 msgid "Select a model from the dropdown (if available) or manually enter the model name required by your endpoint."
 msgstr "Select a model from the dropdown (if available) or manually enter the model name required by your endpoint."
 
@@ -1313,7 +1321,7 @@ msgstr "Select a model from the dropdown (if available) or manually enter the mo
 msgid "Select a provider above to configure"
 msgstr "Select a provider above to configure"
 
-#: src/components/settings/views/templates.tsx:255
+#: src/components/settings/views/templates.tsx:274
 msgid "Select a template to enhance your meeting notes"
 msgstr "Select a template to enhance your meeting notes"
 
@@ -1506,7 +1514,7 @@ msgstr "Toggle widget panel"
 msgid "Transcribing"
 msgstr "Transcribing"
 
-#: src/components/settings/views/ai.tsx:798
+#: src/components/settings/views/ai.tsx:802
 msgid "Transcription"
 msgstr "Transcription"
 
@@ -1546,11 +1554,11 @@ msgstr "Upcoming Events"
 #~ msgid "Upgrade"
 #~ msgstr "Upgrade"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:361
+#: src/components/settings/components/ai/llm-custom-view.tsx:362
 msgid "Use Google's Gemini models with your API key"
 msgstr "Use Google's Gemini models with your API key"
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:265
+#: src/components/settings/components/ai/llm-custom-view.tsx:266
 msgid "Use OpenAI's GPT models with your API key"
 msgstr "Use OpenAI's GPT models with your API key"
 
@@ -1651,7 +1659,7 @@ msgstr "Your LinkedIn username (the part after linkedin.com/in/)"
 msgid "Your Name"
 msgstr "Your Name"
 
-#: src/components/settings/views/templates.tsx:252
+#: src/components/settings/views/templates.tsx:255
 #: src/components/settings/components/templates-sidebar.tsx:45
 msgid "Your Templates"
 msgstr "Your Templates"
diff --git a/apps/desktop/src/locales/ko/messages.po b/apps/desktop/src/locales/ko/messages.po
index 3590d22138..32249a4ac6 100644
--- a/apps/desktop/src/locales/ko/messages.po
+++ b/apps/desktop/src/locales/ko/messages.po
@@ -256,7 +256,7 @@ msgstr ""
 msgid "(Beta) Upcoming meeting notifications"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:602
+#: src/components/settings/components/ai/llm-custom-view.tsx:603
 msgid "(Optional for localhost)"
 msgstr ""
 
@@ -267,7 +267,7 @@ msgstr ""
 #. placeholder {0}: isViewingTemplate ? "Back" : "Save and close"
 #. placeholder {0}: lang.language
 #. placeholder {0}: disabled ? "Wait..." : isHovered ? "Resume" : "Ended"
-#: src/components/settings/views/templates.tsx:215
+#: src/components/settings/views/templates.tsx:217
 #: src/components/settings/components/wer-modal.tsx:116
 #: src/components/editor-area/note-header/listen-button.tsx:216
 #: src/components/editor-area/note-header/listen-button.tsx:238
@@ -324,7 +324,7 @@ msgstr ""
 msgid "Access Granted"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:467
+#: src/components/settings/components/ai/llm-custom-view.tsx:468
 msgid "Access multiple AI models through OpenRouter with your API key"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgid "Anyone with the link can view this page"
 msgstr ""
 
 #: src/components/welcome-modal/custom-endpoint-view.tsx:498
-#: src/components/settings/components/ai/llm-custom-view.tsx:577
+#: src/components/settings/components/ai/llm-custom-view.tsx:578
 msgid "API Base URL"
 msgstr ""
 
@@ -408,10 +408,10 @@ msgstr ""
 #: src/components/welcome-modal/custom-endpoint-view.tsx:438
 #: src/components/welcome-modal/custom-endpoint-view.tsx:518
 #: src/components/settings/views/integrations.tsx:197
-#: src/components/settings/components/ai/llm-custom-view.tsx:285
-#: src/components/settings/components/ai/llm-custom-view.tsx:381
-#: src/components/settings/components/ai/llm-custom-view.tsx:487
-#: src/components/settings/components/ai/llm-custom-view.tsx:599
+#: src/components/settings/components/ai/llm-custom-view.tsx:286
+#: src/components/settings/components/ai/llm-custom-view.tsx:382
+#: src/components/settings/components/ai/llm-custom-view.tsx:488
+#: src/components/settings/components/ai/llm-custom-view.tsx:600
 msgid "API Key"
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr ""
 #~ msgid "Auto (Default)"
 #~ msgstr ""
 
-#: src/components/settings/views/ai.tsx:828
+#: src/components/settings/views/ai.tsx:833
 msgid "Autonomy Selector"
 msgstr ""
 
@@ -465,7 +465,7 @@ msgstr ""
 #~ msgid "Billing features are currently under development and will be available in a future update."
 #~ msgstr ""
 
-#: src/components/settings/views/templates.tsx:300
+#: src/components/settings/views/templates.tsx:319
 #: src/components/settings/components/templates-sidebar.tsx:68
 msgid "Built-in Templates"
 msgstr ""
@@ -566,7 +566,7 @@ msgstr ""
 #~ msgid "Connect"
 #~ msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:557
+#: src/components/settings/components/ai/llm-custom-view.tsx:558
 msgid "Connect to a self-hosted or third-party LLM endpoint (OpenAI API compatible)"
 msgstr ""
 
@@ -615,7 +615,7 @@ msgstr ""
 #~ msgid "Continue Setup"
 #~ msgstr ""
 
-#: src/components/settings/views/ai.tsx:831
+#: src/components/settings/views/ai.tsx:852
 msgid "Control how autonomous the AI enhancement should be"
 msgstr ""
 
@@ -644,7 +644,7 @@ msgstr ""
 msgid "Create Note"
 msgstr ""
 
-#: src/components/settings/views/templates.tsx:290
+#: src/components/settings/views/templates.tsx:309
 msgid "Create your first template to get started"
 msgstr ""
 
@@ -660,7 +660,7 @@ msgstr ""
 #~ msgid "Custom Endpoint"
 #~ msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:234
+#: src/components/settings/components/ai/llm-custom-view.tsx:235
 msgid "Custom Endpoints"
 msgstr ""
 
@@ -758,7 +758,7 @@ msgstr ""
 #~ msgid "Enter the API key for your custom LLM endpoint"
 #~ msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:580
+#: src/components/settings/components/ai/llm-custom-view.tsx:581
 msgid "Enter the base URL for your custom LLM endpoint"
 msgstr ""
 
@@ -835,7 +835,7 @@ msgstr ""
 msgid "Get Started"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:357
+#: src/components/settings/components/ai/llm-custom-view.tsx:358
 msgid "Google Gemini"
 msgstr ""
 
@@ -932,10 +932,18 @@ msgstr ""
 #~ msgid "Language"
 #~ msgstr ""
 
+#: src/components/settings/views/ai.tsx:847
+msgid "Learn more about AI autonomy"
+msgstr ""
+
 #: src/components/settings/views/billing.tsx:200
 #~ msgid "Learn more about our pricing plans"
 #~ msgstr ""
 
+#: src/components/settings/views/templates.tsx:269
+msgid "Learn more about templates"
+msgstr ""
+
 #: src/routes/app.settings.tsx:82
 msgid "License"
 msgstr ""
@@ -948,15 +956,15 @@ msgstr ""
 #~ msgid "Live summary of the meeting"
 #~ msgstr ""
 
-#: src/components/settings/views/ai.tsx:804
+#: src/components/settings/views/ai.tsx:808
 msgid "LLM - Custom"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:801
+#: src/components/settings/views/ai.tsx:805
 msgid "LLM - Local"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:636
+#: src/components/settings/components/ai/llm-custom-view.tsx:637
 msgid "Loading available models..."
 msgstr ""
 
@@ -968,7 +976,7 @@ msgstr ""
 msgid "Loading models..."
 msgstr ""
 
-#: src/components/settings/views/templates.tsx:238
+#: src/components/settings/views/templates.tsx:240
 msgid "Loading templates..."
 msgstr ""
 
@@ -1013,14 +1021,14 @@ msgstr ""
 #: src/components/welcome-modal/custom-endpoint-view.tsx:315
 #: src/components/welcome-modal/custom-endpoint-view.tsx:382
 #: src/components/welcome-modal/custom-endpoint-view.tsx:459
-#: src/components/settings/components/ai/llm-custom-view.tsx:305
-#: src/components/settings/components/ai/llm-custom-view.tsx:401
-#: src/components/settings/components/ai/llm-custom-view.tsx:507
+#: src/components/settings/components/ai/llm-custom-view.tsx:306
+#: src/components/settings/components/ai/llm-custom-view.tsx:402
+#: src/components/settings/components/ai/llm-custom-view.tsx:508
 msgid "Model"
 msgstr ""
 
 #: src/components/welcome-modal/custom-endpoint-view.tsx:544
-#: src/components/settings/components/ai/llm-custom-view.tsx:624
+#: src/components/settings/components/ai/llm-custom-view.tsx:625
 msgid "Model Name"
 msgstr ""
 
@@ -1097,7 +1105,7 @@ msgstr ""
 msgid "No Template (Default)"
 msgstr ""
 
-#: src/components/settings/views/templates.tsx:287
+#: src/components/settings/views/templates.tsx:306
 msgid "No templates yet"
 msgstr ""
 
@@ -1148,11 +1156,11 @@ msgstr ""
 #~ msgid "Open Note"
 #~ msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:261
+#: src/components/settings/components/ai/llm-custom-view.tsx:262
 msgid "OpenAI"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:463
+#: src/components/settings/components/ai/llm-custom-view.tsx:464
 msgid "OpenRouter"
 msgstr ""
 
@@ -1164,7 +1172,7 @@ msgstr ""
 msgid "Optional for participant suggestions"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:554
+#: src/components/settings/components/ai/llm-custom-view.tsx:555
 msgid "Others"
 msgstr ""
 
@@ -1305,7 +1313,7 @@ msgstr ""
 msgid "Sections"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:627
+#: src/components/settings/components/ai/llm-custom-view.tsx:628
 msgid "Select a model from the dropdown (if available) or manually enter the model name required by your endpoint."
 msgstr ""
 
@@ -1313,7 +1321,7 @@ msgstr ""
 msgid "Select a provider above to configure"
 msgstr ""
 
-#: src/components/settings/views/templates.tsx:255
+#: src/components/settings/views/templates.tsx:274
 msgid "Select a template to enhance your meeting notes"
 msgstr ""
 
@@ -1506,7 +1514,7 @@ msgstr ""
 msgid "Transcribing"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:798
+#: src/components/settings/views/ai.tsx:802
 msgid "Transcription"
 msgstr ""
 
@@ -1546,11 +1554,11 @@ msgstr ""
 #~ msgid "Upgrade"
 #~ msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:361
+#: src/components/settings/components/ai/llm-custom-view.tsx:362
 msgid "Use Google's Gemini models with your API key"
 msgstr ""
 
-#: src/components/settings/components/ai/llm-custom-view.tsx:265
+#: src/components/settings/components/ai/llm-custom-view.tsx:266
 msgid "Use OpenAI's GPT models with your API key"
 msgstr ""
 
@@ -1651,7 +1659,7 @@ msgstr ""
 msgid "Your Name"
 msgstr ""
 
-#: src/components/settings/views/templates.tsx:252
+#: src/components/settings/views/templates.tsx:255
 #: src/components/settings/components/templates-sidebar.tsx:45
 msgid "Your Templates"
 msgstr ""
diff --git a/owhisper/schema.json b/owhisper/schema.json
index 312b686f3c..970a5f2704 100644
--- a/owhisper/schema.json
+++ b/owhisper/schema.json
@@ -47,8 +47,11 @@
             "type"
           ],
           "properties": {
-            "access_key_id": {
-              "type": "string"
+            "type": {
+              "type": "string",
+              "enum": [
+                "aws"
+              ]
             },
             "id": {
               "type": "string"
@@ -56,14 +59,11 @@
             "region": {
               "type": "string"
             },
-            "secret_access_key": {
+            "access_key_id": {
               "type": "string"
             },
-            "type": {
-              "type": "string",
-              "enum": [
-                "aws"
-              ]
+            "secret_access_key": {
+              "type": "string"
             }
           }
         },
@@ -74,6 +74,15 @@
             "type"
           ],
           "properties": {
+            "type": {
+              "type": "string",
+              "enum": [
+                "deepgram"
+              ]
+            },
+            "id": {
+              "type": "string"
+            },
             "api_key": {
               "type": [
                 "string",
@@ -85,15 +94,6 @@
                 "string",
                 "null"
               ]
-            },
-            "id": {
-              "type": "string"
-            },
-            "type": {
-              "type": "string",
-              "enum": [
-                "deepgram"
-              ]
             }
           }
         },
@@ -105,17 +105,17 @@
             "type"
           ],
           "properties": {
-            "assets_dir": {
-              "type": "string"
-            },
-            "id": {
-              "type": "string"
-            },
             "type": {
               "type": "string",
               "enum": [
                 "whisper-cpp"
               ]
+            },
+            "id": {
+              "type": "string"
+            },
+            "assets_dir": {
+              "type": "string"
             }
           }
         },
@@ -128,8 +128,11 @@
             "type"
           ],
           "properties": {
-            "assets_dir": {
-              "type": "string"
+            "type": {
+              "type": "string",
+              "enum": [
+                "moonshine"
+              ]
             },
             "id": {
               "type": "string"
@@ -137,11 +140,8 @@
             "size": {
               "$ref": "#/definitions/MoonshineModelSize"
             },
-            "type": {
-              "type": "string",
-              "enum": [
-                "moonshine"
-              ]
+            "assets_dir": {
+              "type": "string"
             }
           }
         }