diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..3d4dd46
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,10 @@
+{
+	"editor.defaultFormatter": "biomejs.biome",
+	"[typescript]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"[typescriptreact]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"editor.formatOnSave": true
+}
diff --git a/biome.json b/biome.json
new file mode 100644
index 0000000..decb4ed
--- /dev/null
+++ b/biome.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.5.3/schema.json",
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  }
+}
diff --git a/bun.lockb b/bun.lockb
index 03048d9..9521d23 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 02432f0..f3a7498 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,9 @@
     "dev": "vite",
     "build": "vite build",
     "serve": "vite preview",
-    "tauri": "tauri"
+    "tauri": "tauri",
+    "lint": "bunx @biomejs/biome lint .",
+    "format": "bunx @biomejs/biome format . --write"
   },
   "license": "MIT",
   "dependencies": {
@@ -18,6 +20,7 @@
     "solid-js": "^1.9.3"
   },
   "devDependencies": {
+    "@biomejs/biome": "^1.9.4",
     "@tauri-apps/cli": "^2",
     "autoprefixer": "^10.4.20",
     "postcss": "^8.5.3",
diff --git a/src/App.tsx b/src/App.tsx
index 83f5be7..6d150fa 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,45 +1,45 @@
+import { TitleBar } from "./components/TitleBar";
 import { FolderPicker } from "./components/FolderPicker";
 import { listen } from "@tauri-apps/api/event";
 import { createEffect, createSignal } from "solid-js";
-import { TitleBar } from "./components/TitleBar";
 
 function App() {
-  const [latestImage, setLatestImage] = createSignal<string | null>(null);
+	const [latestImage, setLatestImage] = createSignal<string | null>(null);
 
-  createEffect(() => {
-    // Listen for PNG processing events
-    const unlisten = listen("png-processed", (event) => {
-      console.log("Received processed PNG");
-      const base64Data = event.payload as string;
-      setLatestImage(`data:image/png;base64,${base64Data}`);
-    });
+	createEffect(() => {
+		// Listen for PNG processing events
+		const unlisten = listen("png-processed", (event) => {
+			console.log("Received processed PNG");
+			const base64Data = event.payload as string;
+			setLatestImage(`data:image/png;base64,${base64Data}`);
+		});
 
-    return () => {
-      unlisten.then((fn) => fn()); // Cleanup listener
-    };
-  });
+		return () => {
+			unlisten.then((fn) => fn()); // Cleanup listener
+		};
+	});
 
-  return (
-    <>
-      <TitleBar />
-      <main class="container pt-8">
-        <h1>Pick screenshots folder</h1>
-        <FolderPicker />
+	return (
+		<>
+			<TitleBar />
+			<main class="container pt-8">
+				<h1>Pick screenshots folder</h1>
+				<FolderPicker />
 
-        {/* Display the latest processed image */}
-        {latestImage() && (
-          <div class="mt-4">
-            <h3>Latest Processed Image:</h3>
-            <img
-              src={latestImage() || undefined}
-              alt="Latest processed"
-              class="max-w-md"
-            />
-          </div>
-        )}
-      </main>
-    </>
-  );
+				{/* Display the latest processed image */}
+				{latestImage() && (
+					<div class="mt-4">
+						<h3>Latest Processed Image:</h3>
+						<img
+							src={latestImage() || undefined}
+							alt="Latest processed"
+							class="max-w-md"
+						/>
+					</div>
+				)}
+			</main>
+		</>
+	);
 }
 
 export default App;
diff --git a/src/components/FolderPicker.tsx b/src/components/FolderPicker.tsx
index 20ed44b..585fbbe 100644
--- a/src/components/FolderPicker.tsx
+++ b/src/components/FolderPicker.tsx
@@ -29,6 +29,7 @@ export function FolderPicker() {
   return (
     <div class="flex flex-col items-center gap-4">
       <button
+        type="button"
         onClick={handleFolderSelect}
         class="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600 transition-colors"
       >
diff --git a/src/components/TitleBar.tsx b/src/components/TitleBar.tsx
index 9f4d85d..77441af 100644
--- a/src/components/TitleBar.tsx
+++ b/src/components/TitleBar.tsx
@@ -1,7 +1,7 @@
 export function TitleBar() {
-  return (
-    <div class="h-8 bg-[#1a1a1a] flex items-center px-4" data-tauri-drag-region>
-      <div class="text-white text-sm">Haystack</div>
-    </div>
-  );
+	return (
+		<div class="h-8 bg-[#1a1a1a] flex items-center px-4" data-tauri-drag-region>
+			<div class="text-white text-sm">Haystack</div>
+		</div>
+	);
 }