diff --git a/chrome-extension/src/background.js b/chrome-extension/src/background.js
index 1d5fc1a..0ea61bb 100644
--- a/chrome-extension/src/background.js
+++ b/chrome-extension/src/background.js
@@ -1,286 +1,295 @@
 import { Ollama } from "ollama/browser";
-
-const ollama_schema = {
-  type: "object",
-  properties: {
-    tags: {
-      type: "array",
-      items: { type: "string" },
-    },
-  },
-  required: ["tags"],
-};
+import { ollama_schema } from "./schema";
 
 // Initialize Ollama client
 let ollamaClient = null;
+let ollamaTemperature = 0.3;
 
 chrome.runtime.onInstalled.addListener(async () => {
-  chrome.contextMenus.create({
-    id: "saveWithTags",
-    title: "Save with Tags",
-    contexts: ["action"],
-  });
-
-  // Initialize Ollama client on install
-  await initOllamaClient();
+	chrome.contextMenus.create({
+		id: "saveWithTags",
+		title: "Save with Tags",
+		contexts: ["action"],
+	});
+
+	// Initialize Ollama client on install
+	await initOllamaClient();
 });
 
 // Add listener for tab activation and update events
 chrome.tabs.onActivated.addListener((activeInfo) => {
-  console.log("Tab activated:", activeInfo.tabId);
-  checkIfBookmarked(activeInfo.tabId);
+	console.log("Tab activated:", activeInfo.tabId);
+	checkIfBookmarked(activeInfo.tabId);
 });
 
 chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
-  // Only run when the page has finished loading
-  if (changeInfo.status === "complete") {
-    checkIfBookmarked(tabId);
-  }
+	// Only run when the page has finished loading
+	if (changeInfo.status === "complete") {
+		checkIfBookmarked(tabId);
+	}
 });
 
 async function checkIfBookmarked(tabId) {
-  chrome.tabs.sendMessage(
-    tabId,
-    { action: "getPageInfo" },
-    async function (tab_reponse) {
-      if (chrome.runtime.lastError) {
-        console.error("Could not connect to page");
-        return;
-      }
-
-      try {
-        // Get the API token
-        const { apiToken } = await chrome.storage.sync.get(["apiToken"]);
-        if (!apiToken) {
-          // Can't check without API token
-          return;
-        }
-
-        // Check if the URL is bookmarked
-        const response = await fetch(
-          `http://localhost:1990/api/bookmarks?url=${encodeURIComponent(
-            tab_reponse.url,
-          )}`,
-          {
-            method: "GET",
-            headers: {
-              Authorization: `Bearer ${apiToken}`,
-            },
-          },
-        );
-
-        console.log("Response status:", response.status);
-
-        if (response.ok) {
-          // URL is bookmarked
-          setFilledIcon();
-        } else if (response.status === 404) {
-          // URL is not bookmarked
-          setDefaultIcon();
-        } else {
-          // Error occurred
-          console.error("Error checking bookmark status:", response.statusText);
-          setDefaultIcon();
-        }
-      } catch (error) {
-        console.error("Error in checkIfBookmarked:", error);
-        setDefaultIcon();
-      }
-    },
-  );
+	chrome.tabs.sendMessage(
+		tabId,
+		{ action: "getPageInfo" },
+		async function (tab_reponse) {
+			if (chrome.runtime.lastError) {
+				console.error("Could not connect to page");
+				return;
+			}
+
+			try {
+				// Get the API token
+				const { apiToken } = await chrome.storage.sync.get([
+					"apiToken",
+				]);
+				if (!apiToken) {
+					// Can't check without API token
+					return;
+				}
+
+				// Check if the URL is bookmarked
+				const response = await fetch(
+					`http://localhost:1990/api/bookmarks?url=${
+						encodeURIComponent(
+							tab_reponse.url,
+						)
+					}`,
+					{
+						method: "GET",
+						headers: {
+							Authorization: `Bearer ${apiToken}`,
+						},
+					},
+				);
+
+				console.log("Response status:", response.status);
+
+				if (response.ok) {
+					// URL is bookmarked
+					setFilledIcon();
+				} else if (response.status === 404) {
+					// URL is not bookmarked
+					setDefaultIcon();
+				} else {
+					// Error occurred
+					console.error(
+						"Error checking bookmark status:",
+						response.statusText,
+					);
+					setDefaultIcon();
+				}
+			} catch (error) {
+				console.error("Error in checkIfBookmarked:", error);
+				setDefaultIcon();
+			}
+		},
+	);
 }
 
 async function initOllamaClient() {
-  try {
-    const { ollamaEndpoint, ollamaModel } = await chrome.storage.sync.get([
-      "ollamaEndpoint",
-      "ollamaModel",
-    ]);
-
-    // Default to local Ollama instance and a general model if not configured
-    const endpoint = ollamaEndpoint || "http://localhost:11434";
-    const model = ollamaModel || "gemma:7b";
-
-    ollamaClient = new Ollama({
-      host: endpoint,
-    });
-
-    console.log("Ollama client initialized");
-  } catch (error) {
-    console.error("Error initializing Ollama client:", error);
-  }
+	try {
+		const {
+			ollamaEndpoint,
+			ollamaModel,
+			ollamaTemperature: temperature,
+		} = await chrome.storage.sync.get([
+			"ollamaEndpoint",
+			"ollamaModel",
+			"ollamaTemperature",
+		]);
+
+		// Default to local Ollama instance and a general model if not configured
+		const endpoint = ollamaEndpoint || "http://localhost:11434";
+		const model = ollamaModel || "gemma:7b";
+
+		ollamaClient = new Ollama({
+			host: endpoint,
+		});
+
+		ollamaTemperature = temperature;
+
+		console.log("Ollama client initialized");
+	} catch (error) {
+		console.error("Error initializing Ollama client:", error);
+	}
 }
 
 chrome.action.onClicked.addListener((tab) => {
-  quickSave(tab);
+	quickSave(tab);
 });
 
 chrome.contextMenus.onClicked.addListener(async (info, tab) => {
-  if (info.menuItemId === "saveWithTags") {
-    // First get the page info
-    try {
-      const response = await chrome.tabs.sendMessage(tab.id, {
-        action: "getPageInfo",
-      });
-      // Store the data temporarily
-      await chrome.storage.local.set({ tempPageInfo: response });
-
-      // Open the popup with the tab id
-      chrome.windows.create({
-        url: "popup.html",
-        type: "popup",
-        width: 400,
-        height: 500,
-      });
-    } catch (error) {
-      console.error("Error getting page info:", error);
-    }
-  }
+	if (info.menuItemId === "saveWithTags") {
+		// First get the page info
+		try {
+			const response = await chrome.tabs.sendMessage(tab.id, {
+				action: "getPageInfo",
+			});
+			// Store the data temporarily
+			await chrome.storage.local.set({ tempPageInfo: response });
+
+			// Open the popup with the tab id
+			chrome.windows.create({
+				url: "popup.html",
+				type: "popup",
+				width: 400,
+				height: 500,
+			});
+		} catch (error) {
+			console.error("Error getting page info:", error);
+		}
+	}
 });
 
-async function generateTagsWithOllama(title, description) {
-  if (!ollamaClient) {
-    await initOllamaClient();
-
-    if (!ollamaClient) {
-      console.error("Failed to initialize Ollama client");
-      return [];
-    }
-  }
-
-  try {
-    const { ollamaModel, ollamaPrompt } = await chrome.storage.sync.get([
-      "ollamaModel",
-      "ollamaPrompt",
-    ]);
-    const model = ollamaModel || "gemma:7b";
-
-    // Use custom prompt if available, otherwise use default
-    let promptTemplate =
-      ollamaPrompt ||
-      `Generate 3 or more relevant tags for this content.
+async function generateTagsWithOllama(url, title, description) {
+	if (!ollamaClient) {
+		await initOllamaClient();
+
+		if (!ollamaClient) {
+			console.error("Failed to initialize Ollama client");
+			return [];
+		}
+	}
+
+	try {
+		const { ollamaModel, ollamaPrompt } = await chrome.storage.sync.get([
+			"ollamaModel",
+			"ollamaPrompt",
+		]);
+		const model = ollamaModel || "gemma:7b";
+
+		// Use custom prompt if available, otherwise use default
+		let promptTemplate = ollamaPrompt ||
+			`Generate 3 or more relevant tags for this content.
       return as JSON
 
       Title: {{title}}
+	  URL: {{url}}
       Description: {{description}}`;
 
-    // Replace placeholders with actual content
-    const prompt = promptTemplate
-      .replace(/{{title}}/g, title)
-      .replace(/{{description}}/g, description);
-
-    const response = await ollamaClient.generate({
-      model: model,
-      prompt: prompt,
-      options: {
-        temperature: 0.3,
-      },
-      format: ollama_schema,
-    });
-
-    return JSON.parse(response.response).tags;
-  } catch (error) {
-    console.error("Error generating tags with Ollama:", error);
-    return [];
-  }
+		// Replace placeholders with actual content
+		const prompt = promptTemplate
+			.replace(/{{url}}/g, url)
+			.replace(/{{title}}/g, title)
+			.replace(/{{description}}/g, description);
+
+		const response = await ollamaClient.generate({
+			model: model,
+			prompt: prompt,
+			options: {
+				temperature: ollamaTemperature,
+			},
+			format: ollama_schema,
+		});
+
+		return JSON.parse(response.response).tags;
+	} catch (error) {
+		console.error("Error generating tags with Ollama:", error);
+		return [];
+	}
 }
 
 async function quickSave(tab) {
-  try {
-    // Check for token
-    const { apiToken, enableAutoTagging } = await chrome.storage.sync.get([
-      "apiToken",
-      "enableAutoTagging",
-    ]);
-    if (!apiToken) {
-      chrome.runtime.openOptionsPage();
-      return;
-    }
-
-    // Get page info from content script
-    chrome.tabs.sendMessage(
-      tab.id,
-      { action: "getPageInfo" },
-      async function (response) {
-        if (chrome.runtime.lastError) {
-          console.error("Could not connect to page");
-          return;
-        }
-
-        // Generate tags using Ollama only if auto-tagging is enabled
-        let autoTags = [];
-        if (enableAutoTagging !== false) {
-          // Default to enabled if not set
-          autoTags = await generateTagsWithOllama(
-            response.title,
-            response.description,
-          );
-        }
-
-        // Prepare bookmark data
-        const bookmark = {
-          Url: response.url,
-          Title: response.title,
-          Description: response.description,
-          Tags: autoTags || [], // Use generated tags
-        };
-
-        try {
-          // Send to API
-          const apiResponse = await fetch(
-            "http://localhost:1990/api/bookmarks",
-            {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json",
-                Authorization: `Bearer ${apiToken}`,
-              },
-              body: JSON.stringify(bookmark),
-            },
-          );
-
-          if (!apiResponse.ok) {
-            throw new Error(`HTTP error! status: ${apiResponse.status}`);
-          }
-
-          // Show success badge
-          chrome.action.setBadgeText({ text: "✓" });
-          chrome.action.setBadgeBackgroundColor({ color: "#4CAF50" });
-          setTimeout(() => {
-            chrome.action.setBadgeText({ text: "" });
-          }, 2000);
-        } catch (error) {
-          console.error("Error:", error);
-          // Show error badge
-          chrome.action.setBadgeText({ text: "!" });
-          chrome.action.setBadgeBackgroundColor({ color: "#F44336" });
-          setTimeout(() => {
-            chrome.action.setBadgeText({ text: "" });
-          }, 2000);
-        }
-      },
-    );
-  } catch (error) {
-    console.error("Error:", error);
-  }
+	try {
+		// Check for token
+		const { apiToken, enableAutoTagging } = await chrome.storage.sync.get([
+			"apiToken",
+			"enableAutoTagging",
+		]);
+		if (!apiToken) {
+			chrome.runtime.openOptionsPage();
+			return;
+		}
+
+		// Get page info from content script
+		chrome.tabs.sendMessage(
+			tab.id,
+			{ action: "getPageInfo" },
+			async function (response) {
+				if (chrome.runtime.lastError) {
+					console.error("Could not connect to page");
+					return;
+				}
+
+				// Generate tags using Ollama only if auto-tagging is enabled
+				let autoTags = [];
+				if (enableAutoTagging !== false) {
+					// Default to enabled if not set
+					autoTags = await generateTagsWithOllama(
+						response.url,
+						response.title,
+						response.description,
+					);
+				}
+
+				// Prepare bookmark data
+				const bookmark = {
+					Url: response.url,
+					Title: response.title,
+					Description: response.description,
+					Tags: autoTags || [], // Use generated tags
+				};
+
+				try {
+					// Send to API
+					const apiResponse = await fetch(
+						"http://localhost:1990/api/bookmarks",
+						{
+							method: "POST",
+							headers: {
+								"Content-Type": "application/json",
+								Authorization: `Bearer ${apiToken}`,
+							},
+							body: JSON.stringify(bookmark),
+						},
+					);
+
+					if (!apiResponse.ok) {
+						throw new Error(
+							`HTTP error! status: ${apiResponse.status}`,
+						);
+					}
+
+					// Show success badge
+					chrome.action.setBadgeText({ text: "✓" });
+					chrome.action.setBadgeBackgroundColor({ color: "#4CAF50" });
+					setTimeout(() => {
+						chrome.action.setBadgeText({ text: "" });
+					}, 2000);
+				} catch (error) {
+					console.error("Error:", error);
+					// Show error badge
+					chrome.action.setBadgeText({ text: "!" });
+					chrome.action.setBadgeBackgroundColor({ color: "#F44336" });
+					setTimeout(() => {
+						chrome.action.setBadgeText({ text: "" });
+					}, 2000);
+				}
+			},
+		);
+	} catch (error) {
+		console.error("Error:", error);
+	}
 }
 
 function setFilledIcon() {
-  chrome.action.setIcon({
-    path: {
-      16: "icon_filled16.png",
-      48: "icon_filled48.png",
-      128: "icon_filled128.png",
-    },
-  });
+	chrome.action.setIcon({
+		path: {
+			16: "icon_filled16.png",
+			48: "icon_filled48.png",
+			128: "icon_filled128.png",
+		},
+	});
 }
 
 function setDefaultIcon() {
-  chrome.action.setIcon({
-    path: {
-      16: "icon16.png",
-      48: "icon48.png",
-      128: "icon128.png",
-    },
-  });
+	chrome.action.setIcon({
+		path: {
+			16: "icon16.png",
+			48: "icon48.png",
+			128: "icon128.png",
+		},
+	});
 }
diff --git a/chrome-extension/src/options.html b/chrome-extension/src/options.html
index a0898e1..eaa1ee8 100644
--- a/chrome-extension/src/options.html
+++ b/chrome-extension/src/options.html
@@ -92,6 +92,17 @@
                         placeholder="gemma:7b"
                     />
                 </div>
+                <div class="field">
+                    <label for="ollamaTemperature">Ollama Temperature:</label>
+                    <input
+                        type="number"
+                        id="ollamaTemperature"
+                        placeholder="0.3"
+                        min="0"
+                        max="1"
+                        step="0.1"
+                    />
+                </div>
                 <div class="field">
                     <label for="ollamaPrompt">Custom Prompt Template:</label>
                     <textarea
diff --git a/chrome-extension/src/options.js b/chrome-extension/src/options.js
index d6843ac..067d53b 100644
--- a/chrome-extension/src/options.js
+++ b/chrome-extension/src/options.js
@@ -1,219 +1,215 @@
 import { Ollama } from "ollama/browser";
+import { ollama_schema } from "./schema";
 
 document.addEventListener("DOMContentLoaded", function () {
-  // Load saved settings
-  chrome.storage.sync.get(
-    [
-      "apiToken",
-      "ollamaEndpoint",
-      "ollamaModel",
-      "ollamaPrompt",
-      "enableAutoTagging",
-    ],
-    function (result) {
-      if (result.apiToken) {
-        document.getElementById("tokenInput").value = result.apiToken;
-      }
-
-      if (result.ollamaEndpoint) {
-        document.getElementById("ollamaEndpoint").value = result.ollamaEndpoint;
-      }
-
-      if (result.ollamaModel) {
-        document.getElementById("ollamaModel").value = result.ollamaModel;
-      }
-
-      if (result.ollamaPrompt) {
-        document.getElementById("ollamaPrompt").value = result.ollamaPrompt;
-      } else {
-        // Set default prompt if not already set
-        document.getElementById("ollamaPrompt").value =
-          `Generate 3-5 relevant tags for this content. Return only the tags as a JSON array of strings. No additional explanation needed.
+	// Load saved settings
+	chrome.storage.sync.get(
+		[
+			"apiToken",
+			"ollamaEndpoint",
+			"ollamaModel",
+			"ollamaPrompt",
+			"ollamaTemperature",
+			"enableAutoTagging",
+		],
+		function (result) {
+			console.log(result);
+			if (result.apiToken) {
+				document.getElementById("tokenInput").value = result.apiToken;
+			}
+
+			if (result.ollamaEndpoint) {
+				document.getElementById("ollamaEndpoint").value =
+					result.ollamaEndpoint;
+			}
+
+			if (result.ollamaModel) {
+				document.getElementById("ollamaModel").value =
+					result.ollamaModel;
+			}
+
+			if (result.ollamaTemperature) {
+				document.getElementById("ollamaTemperature").value =
+					result.ollamaTemperature;
+			}
+
+			if (result.ollamaPrompt) {
+				document.getElementById("ollamaPrompt").value =
+					result.ollamaPrompt;
+			} else {
+				// Set default prompt if not already set
+				document.getElementById("ollamaPrompt").value =
+					`Generate 3-5 relevant tags for this content. Return only the tags as a JSON array of strings. No additional explanation needed.
 
 Title: {{title}}
+URL: {{url}}
 Description: {{description}}`;
-      }
-
-      // Set auto-tagging checkbox
-      document.getElementById("enableAutoTagging").checked =
-        result.enableAutoTagging !== false; // Default to true
-    },
-  );
-
-  // Save settings
-  document
-    .getElementById("saveSettings")
-    .addEventListener("click", function () {
-      const token = document.getElementById("tokenInput").value;
-      const ollamaEndpoint =
-        document.getElementById("ollamaEndpoint").value ||
-        "http://localhost:11434";
-      const ollamaModel =
-        document.getElementById("ollamaModel").value || "gemma:7b";
-      const ollamaPrompt =
-        document.getElementById("ollamaPrompt").value ||
-        `Generate 3-5 relevant tags for this content. Return only the tags as a JSON array of strings. No additional explanation needed.
+			}
+
+			// Set auto-tagging checkbox
+			document.getElementById("enableAutoTagging").checked =
+				result.enableAutoTagging !== false; // Default to true
+		},
+	);
+
+	// Save settings
+	document
+		.getElementById("saveSettings")
+		.addEventListener("click", function () {
+			const token = document.getElementById("tokenInput").value;
+			const ollamaEndpoint =
+				document.getElementById("ollamaEndpoint").value ||
+				"http://localhost:11434";
+			const ollamaModel = document.getElementById("ollamaModel").value ||
+				"gemma:7b";
+			const ollamaPrompt =
+				document.getElementById("ollamaPrompt").value ||
+				`Generate 3-5 relevant tags for this content. Return only the tags as a JSON array of strings. No additional explanation needed.
 
 Title: {{title}}
+URL: {{url}}
 Description: {{description}}`;
-
-      const enableAutoTagging =
-        document.getElementById("enableAutoTagging").checked;
-
-      chrome.storage.sync.set(
-        {
-          apiToken: token,
-          ollamaEndpoint: ollamaEndpoint,
-          ollamaModel: ollamaModel,
-          ollamaPrompt: ollamaPrompt,
-          enableAutoTagging: enableAutoTagging,
-        },
-        function () {
-          updateStatus("Settings saved successfully!");
-        },
-      );
-    });
-
-  // Test Ollama connection
-  document
-    .getElementById("testOllama")
-    .addEventListener("click", async function () {
-      try {
-        updateStatus("Testing Ollama connection...");
-
-        const endpoint =
-          document.getElementById("ollamaEndpoint").value ||
-          "http://localhost:11434";
-        const model =
-          document.getElementById("ollamaModel").value || "gemma:7b";
-
-        const ollama = new Ollama({
-          host: endpoint,
-        });
-
-        // Try to get the list of models to verify connection
-        const models = await ollama.list();
-
-        // Check if the specified model is available
-        const modelExists = models.models.some((m) => m.name === model);
-
-        if (modelExists) {
-          updateStatus(`Connection successful! Model "${model}" is available.`);
-        } else {
-          updateStatus(
-            `Connection successful, but model "${model}" was not found. Available models: ${models.models.map((m) => m.name).join(", ")}`,
-          );
-        }
-      } catch (error) {
-        updateStatus(`Error connecting to Ollama: ${error.message}`);
-        console.error(error);
-      }
-    });
-
-  // Test prompt for tag generation
-  document
-    .getElementById("testPrompt")
-    .addEventListener("click", async function () {
-      try {
-        updateStatus("Testing tag generation...");
-
-        const endpoint =
-          document.getElementById("ollamaEndpoint").value ||
-          "http://localhost:11434";
-        const model =
-          document.getElementById("ollamaModel").value || "gemma:7b";
-        const promptTemplate = document.getElementById("ollamaPrompt").value;
-
-        // Sample data for testing
-        const sampleTitle = "Understanding Machine Learning Algorithms";
-        const sampleDescription =
-          "An overview of common machine learning algorithms including supervised and unsupervised learning approaches, with examples of practical applications.";
-
-        // Replace placeholders with sample data
-        const prompt = promptTemplate
-          .replace(/{{title}}/g, sampleTitle)
-          .replace(/{{description}}/g, sampleDescription);
-
-        const ollama = new Ollama({
-          host: endpoint,
-        });
-
-        const response = await ollama.generate({
-          model: model,
-          prompt: prompt,
-          options: {
-            temperature: 0.3,
-          },
-        });
-
-        // Try to parse the response as JSON
-        try {
-          // The response might include markdown backticks or other text
-          // Try to extract just the JSON array
-          const jsonMatch = response.response.match(/\[.*\]/);
-          let tags = [];
-
-          if (jsonMatch) {
-            tags = JSON.parse(jsonMatch[0]);
-          } else {
-            // If parsing fails, try to extract tags using regex
-            const tagsPattern =
-              /"([^"]+)"|'([^']+)'|`([^`]+)`|([a-zA-Z0-9-_]+)/g;
-            let match;
-
-            while ((match = tagsPattern.exec(response.response)) !== null) {
-              // Take the first capturing group that matched
-              const tag = match[1] || match[2] || match[3] || match[4];
-              if (tag) tags.push(tag);
-            }
-          }
-
-          // Display the results
-          const resultsDiv = document.getElementById("promptTestResults");
-          resultsDiv.style.display = "block";
-
-          const tagsDiv = document.getElementById("generatedTags");
-          if (tags.length > 0) {
-            tagsDiv.innerHTML = tags
-              .map(
-                (tag) =>
-                  `<span style="display: inline-block; background: #e0e0e0; padding: 4px 8px; border-radius: 4px; margin: 2px; font-size: 14px;">${tag}</span>`,
-              )
-              .join("");
-            updateStatus("Tag generation successful!");
-          } else {
-            tagsDiv.innerHTML =
-              "<p>No tags could be parsed from the response.</p>";
-            tagsDiv.innerHTML +=
-              "<p><strong>Raw response:</strong> " + response.response + "</p>";
-            updateStatus("Warning: Could not parse tags from the response.");
-          }
-        } catch (parseError) {
-          console.error("Error parsing tags:", parseError);
-          updateStatus("Error parsing tags from Ollama response.");
-
-          // Still show the raw response
-          const resultsDiv = document.getElementById("promptTestResults");
-          resultsDiv.style.display = "block";
-
-          const tagsDiv = document.getElementById("generatedTags");
-          tagsDiv.innerHTML = "<p>Error parsing response.</p>";
-          tagsDiv.innerHTML +=
-            "<p><strong>Raw response:</strong> " + response.response + "</p>";
-        }
-      } catch (error) {
-        updateStatus(`Error testing prompt: ${error.message}`);
-        console.error(error);
-      }
-    });
+			const ollamaTemperature = new Number(
+				document.getElementById("ollamaTemperature").value,
+			) || 0.3;
+			const enableAutoTagging =
+				document.getElementById("enableAutoTagging").checked;
+
+			chrome.storage.sync.set(
+				{
+					apiToken: token,
+					ollamaEndpoint: ollamaEndpoint,
+					ollamaModel: ollamaModel,
+					ollamaPrompt: ollamaPrompt,
+					ollamaTemperature: ollamaTemperature.valueOf(),
+					enableAutoTagging: enableAutoTagging,
+				},
+				function () {
+					updateStatus("Settings saved successfully!");
+				},
+			);
+		});
+
+	// Test Ollama connection
+	document
+		.getElementById("testOllama")
+		.addEventListener("click", async function () {
+			try {
+				updateStatus("Testing Ollama connection...");
+
+				const endpoint =
+					document.getElementById("ollamaEndpoint").value ||
+					"http://localhost:11434";
+				const model = document.getElementById("ollamaModel").value ||
+					"gemma:7b";
+
+				const ollama = new Ollama({
+					host: endpoint,
+				});
+
+				// Try to get the list of models to verify connection
+				const models = await ollama.list();
+
+				// Check if the specified model is available
+				const modelExists = models.models.some((m) => m.name === model);
+
+				if (modelExists) {
+					updateStatus(
+						`Connection successful! Model "${model}" is available.`,
+					);
+				} else {
+					updateStatus(
+						`Connection successful, but model "${model}" was not found. Available models: ${
+							models.models.map((m) => m.name).join(", ")
+						}`,
+					);
+				}
+			} catch (error) {
+				updateStatus(`Error connecting to Ollama: ${error.message}`);
+				console.error(error);
+			}
+		});
+
+	// Test prompt for tag generation
+	document
+		.getElementById("testPrompt")
+		.addEventListener("click", async function () {
+			try {
+				updateStatus("Testing tag generation...");
+
+				const endpoint =
+					document.getElementById("ollamaEndpoint").value ||
+					"http://localhost:11434";
+				const model = document.getElementById("ollamaModel").value ||
+					"llama3.2:3b";
+				const promptTemplate =
+					document.getElementById("ollamaPrompt").value;
+				const ollamaTemperature = new Number(
+					document.getElementById("ollamaTemperature").value,
+				) || 0.3;
+
+				// Sample data for testing
+				const sampleTitle = "Understanding Machine Learning Algorithms";
+				const sampleDescription =
+					"An overview of common machine learning algorithms including supervised and unsupervised learning approaches, with examples of practical applications.";
+				const sampleURL =
+					"https://example.com/posts/2022/7/1/Understanding-Machine-Learning";
+
+				// Replace placeholders with sample data
+				const prompt = promptTemplate
+					.replace(/{{title}}/g, sampleTitle)
+					.replace(/{{url}}/g, sampleURL)
+					.replace(/{{description}}/g, sampleDescription);
+
+				const ollama = new Ollama({
+					host: endpoint,
+				});
+
+				const response = await ollama.generate({
+					model: model,
+					prompt: prompt,
+					options: {
+						temperature: ollamaTemperature,
+					},
+					format: ollama_schema,
+				});
+
+				let tags = JSON.parse(response.response).tags;
+				// Display the results
+				const resultsDiv = document.getElementById("promptTestResults");
+				resultsDiv.style.display = "block";
+
+				const tagsDiv = document.getElementById("generatedTags");
+				if (tags.length > 0) {
+					tagsDiv.innerHTML = tags
+						.map(
+							(tag) =>
+								`<span style="display: inline-block; background: #e0e0e0; padding: 4px 8px; border-radius: 4px; margin: 2px; font-size: 14px;">${tag}</span>`,
+						)
+						.join("");
+					updateStatus("Tag generation successful!");
+				} else {
+					tagsDiv.innerHTML =
+						"<p>No tags could be parsed from the response.</p>";
+					tagsDiv.innerHTML += "<p><strong>Raw response:</strong> " +
+						response.response + "</p>";
+					updateStatus(
+						"Warning: Could not parse tags from the response.",
+					);
+				}
+			} catch (error) {
+				updateStatus(`Error testing prompt: ${error.message}`);
+				console.error(error);
+			}
+		});
 });
 
 function updateStatus(message) {
-  const status = document.getElementById("status");
-  status.textContent = message;
-  setTimeout(() => {
-    if (status.textContent === message) {
-      status.textContent = "";
-    }
-  }, 5000);
+	const status = document.getElementById("status");
+	status.textContent = message;
+	setTimeout(() => {
+		if (status.textContent === message) {
+			status.textContent = "";
+		}
+	}, 5000);
 }
diff --git a/chrome-extension/src/popup.html b/chrome-extension/src/popup.html
index 57f35fc..b24e3ce 100644
--- a/chrome-extension/src/popup.html
+++ b/chrome-extension/src/popup.html
@@ -97,7 +97,7 @@
         <div class="container">
             <div class="field">
                 <label for="title">Title</label>
-                <input type="text" id="title" readonly />
+                <input type="text" id="title" />
             </div>
             <div class="field">
                 <label for="description">Description</label>
diff --git a/chrome-extension/src/popup.js b/chrome-extension/src/popup.js
index 0756169..821b01f 100644
--- a/chrome-extension/src/popup.js
+++ b/chrome-extension/src/popup.js
@@ -1,208 +1,212 @@
 import { Ollama } from "ollama/browser";
-
-const ollama_schema = {
-  type: "object",
-  properties: {
-    tags: {
-      type: "array",
-      items: { type: "string" },
-    },
-  },
-  required: ["tags"],
-};
+import { ollama_schema } from "./schema";
 
 function createTagElement(tag) {
-  const tagElement = document.createElement("span");
-  tagElement.className = "tag";
+	const tagElement = document.createElement("span");
+	tagElement.className = "tag";
 
-  const tagText = document.createTextNode(tag);
-  const removeButton = document.createElement("button");
-  removeButton.innerHTML = "&times;";
-  removeButton.addEventListener("click", () => removeTag(tag, tagElement));
+	const tagText = document.createTextNode(tag);
+	const removeButton = document.createElement("button");
+	removeButton.innerHTML = "&times;";
+	removeButton.addEventListener("click", () => removeTag(tag, tagElement));
 
-  tagElement.appendChild(tagText);
-  tagElement.appendChild(removeButton);
+	tagElement.appendChild(tagText);
+	tagElement.appendChild(removeButton);
 
-  return tagElement;
+	return tagElement;
 }
 
 function addTag(tag) {
-  if (tags.has(tag)) return;
+	if (tags.has(tag)) return;
 
-  tags.add(tag);
-  const tagElement = createTagElement(tag);
-  const container = document.getElementById("tagsContainer");
-  container.insertBefore(tagElement, document.getElementById("tagInput"));
+	tags.add(tag);
+	const tagElement = createTagElement(tag);
+	const container = document.getElementById("tagsContainer");
+	container.insertBefore(tagElement, document.getElementById("tagInput"));
 }
 
 function removeTag(tag, element) {
-  tags.delete(tag);
-  element.remove();
+	tags.delete(tag);
+	element.remove();
 }
 
 function updateStatus(message) {
-  const status = document.getElementById("status");
-  status.textContent = message;
+	const status = document.getElementById("status");
+	status.textContent = message;
 }
 
-async function generateTagsWithOllama(title, description) {
-  try {
-    // Show loading indicator
-    document.getElementById("tagsLoading").style.display = "flex";
-
-    // Get Ollama settings
-    const { ollamaEndpoint, ollamaModel, ollamaPrompt } =
-      await chrome.storage.sync.get([
-        "ollamaEndpoint",
-        "ollamaModel",
-        "ollamaPrompt",
-      ]);
-
-    const endpoint = ollamaEndpoint || "http://localhost:11434";
-    const model = ollamaModel || "gemma:7b";
-
-    // Use custom prompt if available, otherwise use default
-    let promptTemplate =
-      ollamaPrompt ||
-      `Generate 3 or more relevant tags for this content.
+async function generateTagsWithOllama(url, title, description) {
+	try {
+		// Show loading indicator
+		document.getElementById("tagsLoading").style.display = "flex";
+
+		// Get Ollama settings
+		const {
+			ollamaEndpoint,
+			ollamaModel,
+			ollamaPrompt,
+			ollamaTemperature: temperature,
+		} = await chrome.storage.sync.get([
+			"ollamaEndpoint",
+			"ollamaModel",
+			"ollamaPrompt",
+			"ollamaTemperature",
+		]);
+
+		const endpoint = ollamaEndpoint || "http://localhost:11434";
+		const model = ollamaModel || "gemma:7b";
+
+		// Use custom prompt if available, otherwise use default
+		let promptTemplate = ollamaPrompt ||
+			`Generate 3 or more relevant tags for this content.
       return as JSON
 
       Title: {{title}}
+	  URL: {{url}}
       Description: {{description}}`;
 
-    // Replace placeholders with actual content
-    const prompt = promptTemplate
-      .replace(/{{title}}/g, title)
-      .replace(/{{description}}/g, description);
-
-    // Initialize Ollama client
-    const ollamaClient = new Ollama({
-      host: endpoint,
-    });
-
-    const response = await ollamaClient.generate({
-      model: model,
-      prompt: prompt,
-      options: {
-        temperature: 0.3,
-      },
-      format: ollama_schema,
-    });
-
-    // Hide loading indicator
-    document.getElementById("tagsLoading").style.display = "none";
-
-    console.log(response);
-    let tags = JSON.parse(response.response).tags;
-
-    return tags;
-  } catch (error) {
-    // Hide loading indicator
-    document.getElementById("tagsLoading").style.display = "none";
-
-    console.error("Error generating tags with Ollama:", error);
-    updateStatus(`Error generating tags: ${error.message}`);
-    return [];
-  }
+		// Replace placeholders with actual content
+		const prompt = promptTemplate
+			.replace(/{{title}}/g, title)
+			.replace(/{{url}}/g, url)
+			.replace(/{{description}}/g, description);
+
+		// Initialize Ollama client
+		const ollamaClient = new Ollama({
+			host: endpoint,
+		});
+
+		const response = await ollamaClient.generate({
+			model: model,
+			prompt: prompt,
+			options: {
+				temperature: temperature || 0.3,
+			},
+			format: ollama_schema,
+		});
+
+		// Hide loading indicator
+		document.getElementById("tagsLoading").style.display = "none";
+
+		console.log(response);
+		let tags = JSON.parse(response.response).tags;
+
+		return tags;
+	} catch (error) {
+		// Hide loading indicator
+		document.getElementById("tagsLoading").style.display = "none";
+
+		console.error("Error generating tags with Ollama:", error);
+		updateStatus(`Error generating tags: ${error.message}`);
+		return [];
+	}
 }
 
 let pageInfo = null;
 let tags = new Set();
 
 async function initializeDetailedSave() {
-  try {
-    // Get the stored page info
-    const data = await chrome.storage.local.get("tempPageInfo");
-    if (data.tempPageInfo) {
-      pageInfo = data.tempPageInfo;
-      document.getElementById("title").value = pageInfo.title;
-      document.getElementById("description").value = pageInfo.description;
-
-      // Clean up the stored data
-      chrome.storage.local.remove("tempPageInfo");
-    } else {
-      updateStatus("Error: No page data available");
-    }
-  } catch (error) {
-    updateStatus("Error: Could not load page data");
-    console.error(error);
-  }
-
-  // Handle tag input
-  const tagInput = document.getElementById("tagInput");
-  tagInput.addEventListener("keydown", (e) => {
-    if (e.key === "Enter" && e.target.value.trim()) {
-      e.preventDefault();
-      addTag(e.target.value.trim());
-      e.target.value = "";
-    }
-  });
-
-  // Handle manual tag generation
-  document
-    .getElementById("generateTags")
-    .addEventListener("click", async () => {
-      if (!pageInfo) {
-        updateStatus("Error: Page information not available");
-        return;
-      }
-
-      const generatedTags = await generateTagsWithOllama(
-        pageInfo.title,
-        document.getElementById("description").value,
-      );
-
-      if (generatedTags && generatedTags.length > 0) {
-        // Add each generated tag
-        generatedTags.forEach((tag) => addTag(tag));
-        updateStatus(`Generated ${generatedTags.length} tags`);
-      } else {
-        updateStatus("No tags could be generated");
-      }
-    });
-
-  // Handle save
-  document
-    .getElementById("saveBookmark")
-    .addEventListener("click", async () => {
-      try {
-        const { apiToken } = await chrome.storage.sync.get(["apiToken"]);
-        if (!apiToken) {
-          updateStatus("Please set your API token in extension options");
-          return;
-        }
-
-        if (!pageInfo) {
-          updateStatus("Error: Page information not available");
-          return;
-        }
-
-        const bookmark = {
-          Url: pageInfo.url,
-          Title: pageInfo.title,
-          Description: document.getElementById("description").value,
-          Tags: Array.from(tags),
-        };
-
-        const response = await fetch("http://localhost:1990/api/bookmarks", {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${apiToken}`,
-          },
-          body: JSON.stringify(bookmark),
-        });
-
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-
-        updateStatus("Saved successfully!");
-        setTimeout(() => window.close(), 1000);
-      } catch (error) {
-        updateStatus(`Error: ${error.message}`);
-      }
-    });
+	try {
+		// Get the stored page info
+		const data = await chrome.storage.local.get("tempPageInfo");
+		if (data.tempPageInfo) {
+			pageInfo = data.tempPageInfo;
+			document.getElementById("title").value = pageInfo.title;
+			document.getElementById("description").value = pageInfo.description;
+
+			// Clean up the stored data
+			chrome.storage.local.remove("tempPageInfo");
+		} else {
+			updateStatus("Error: No page data available");
+		}
+	} catch (error) {
+		updateStatus("Error: Could not load page data");
+		console.error(error);
+	}
+
+	// Handle tag input
+	const tagInput = document.getElementById("tagInput");
+	tagInput.addEventListener("keydown", (e) => {
+		if (e.key === "Enter" && e.target.value.trim()) {
+			e.preventDefault();
+			addTag(e.target.value.trim());
+			e.target.value = "";
+		}
+	});
+
+	// Handle manual tag generation
+	document
+		.getElementById("generateTags")
+		.addEventListener("click", async () => {
+			if (!pageInfo) {
+				updateStatus("Error: Page information not available");
+				return;
+			}
+
+			const generatedTags = await generateTagsWithOllama(
+				pageInfo.title,
+				pageInfo.url,
+				document.getElementById("description").value,
+			);
+
+			if (generatedTags && generatedTags.length > 0) {
+				// Add each generated tag
+				generatedTags.forEach((tag) => addTag(tag));
+				updateStatus(`Generated ${generatedTags.length} tags`);
+			} else {
+				updateStatus("No tags could be generated");
+			}
+		});
+
+	// Handle save
+	document
+		.getElementById("saveBookmark")
+		.addEventListener("click", async () => {
+			try {
+				const { apiToken } = await chrome.storage.sync.get([
+					"apiToken",
+				]);
+				if (!apiToken) {
+					updateStatus(
+						"Please set your API token in extension options",
+					);
+					return;
+				}
+
+				if (!pageInfo) {
+					updateStatus("Error: Page information not available");
+					return;
+				}
+
+				const bookmark = {
+					Url: pageInfo.url,
+					Title: document.getElementById("title").value,
+					Description: document.getElementById("description").value,
+					Tags: Array.from(tags),
+				};
+
+				const response = await fetch(
+					"http://localhost:1990/api/bookmarks",
+					{
+						method: "POST",
+						headers: {
+							"Content-Type": "application/json",
+							Authorization: `Bearer ${apiToken}`,
+						},
+						body: JSON.stringify(bookmark),
+					},
+				);
+
+				if (!response.ok) {
+					throw new Error(`HTTP error! status: ${response.status}`);
+				}
+
+				updateStatus("Saved successfully!");
+				setTimeout(() => window.close(), 1000);
+			} catch (error) {
+				updateStatus(`Error: ${error.message}`);
+			}
+		});
 }
 
 document.addEventListener("DOMContentLoaded", initializeDetailedSave);
diff --git a/chrome-extension/src/schema.js b/chrome-extension/src/schema.js
new file mode 100644
index 0000000..64d639f
--- /dev/null
+++ b/chrome-extension/src/schema.js
@@ -0,0 +1,10 @@
+export const ollama_schema = {
+  type: "object",
+  properties: {
+    tags: {
+      type: "array",
+      items: { type: "string" },
+    },
+  },
+  required: ["tags"],
+};