diff --git a/app/api/me/route.ts b/app/api/me/route.ts
index 046a1593..b8bf6e94 100644
--- a/app/api/me/route.ts
+++ b/app/api/me/route.ts
@@ -1,28 +1,34 @@
 // app/api/me/route.ts
 import { NextResponse } from "next/server";
 
+/** Read a cookie value from a raw Cookie header string */
 function readCookie(name: string, cookieHeader: string) {
     const m = cookieHeader.match(new RegExp(`(?:^|;\\s*)${name}=([^;]+)`));
     return m?.[1] ?? null;
 }
 
 export async function GET(req: Request) {
-    const base = process.env.NEXT_PUBLIC_API_BASE_URL!;
-    const url  = `${base}/users/me?fields=id,username,display_name,first_name,last_name,email`;
+    // Prefer DIRECTUS_URL if present; fall back to NEXT_PUBLIC_API_BASE_URL
+    const base =
+    process.env.DIRECTUS_URL || process.env.NEXT_PUBLIC_API_BASE_URL || "";
+    const url = `${base.replace(/\/$/, "")}/users/me?fields=id,username,display_name,first_name,last_name,email`;
 
+    // Forward the incoming cookies (session), and also ma_at as Bearer (token setups)
     const cookieHeader = req.headers.get("cookie") ?? "";
     const ma_at = readCookie("ma_at", cookieHeader);
 
     const headers: Record<string, string> = { "cache-control": "no-store" };
-    if (cookieHeader) headers.cookie = cookieHeader;          // session cookie
-    if (ma_at) headers.authorization = `Bearer ${ma_at}`;     // direct token (if present)
+    if (cookieHeader) headers.cookie = cookieHeader;
+    if (ma_at) headers.authorization = `Bearer ${ma_at}`;
 
-    const res  = await fetch(url, { headers, cache: "no-store" });
-    const raw  = await res.json().catch(() => ({}));
-    const data = raw?.data ?? raw ?? null;                    // normalize
+    const res = await fetch(url, { headers, cache: "no-store" });
+    const body = await res.json().catch(() => ({}));
 
-    return NextResponse.json(
-        { data },
-        { status: res.status, headers: { "content-type": "application/json", "cache-control": "no-store" } }
-    );
+    return new NextResponse(JSON.stringify(body), {
+        status: res.status,
+        headers: {
+            "content-type": "application/json",
+            "cache-control": "no-store",
+        },
+    });
 }
diff --git a/app/api/options/laser_source/route.ts b/app/api/options/laser_source/route.ts
index db1c552f..2bc4d0cb 100644
--- a/app/api/options/laser_source/route.ts
+++ b/app/api/options/laser_source/route.ts
@@ -3,41 +3,39 @@ export const dynamic = "force-dynamic";
 
 import { NextRequest, NextResponse } from "next/server";
 
-const BASE =
-(process.env.DIRECTUS_URL || process.env.NEXT_PUBLIC_API_BASE_URL || "").replace(/\/$/, "");
+const BASE = (
+    process.env.DIRECTUS_URL || process.env.NEXT_PUBLIC_API_BASE_URL || ""
+).replace(/\/$/, "");
 
-function buildPath(target?: string | null) {
+function buildPath() {
+    // This collection uses make/model (no `name` field)
     const url = new URL(`${BASE}/items/laser_source`);
-    url.searchParams.set("fields", "id,name");
-    url.searchParams.set("sort", "name");
-    // if (target) url.searchParams.set("filter[target][_eq]", target);
+    url.searchParams.set("fields", "id,make,model");
+    url.searchParams.set("sort", "make,model");
     return String(url);
 }
 
-function readCookieFromHeader(name: string, cookieHeader: string) {
-    const m = cookieHeader.match(new RegExp(`(?:^|;\\s*)${name}=([^;]+)`));
-    return m?.[1] ?? null;
-}
-
-async function dFetch(token: string, target?: string | null) {
-    const res = await fetch(buildPath(target), {
-        headers: { Accept: "application/json", Authorization: `Bearer ${token}` },
+async function dFetch(bearer: string) {
+    const res = await fetch(buildPath(), {
+        headers: { Accept: "application/json", Authorization: `Bearer ${bearer}` },
         cache: "no-store",
     });
     const text = await res.text().catch(() => "");
     let json: any = null;
-    try { json = text ? JSON.parse(text) : null; } catch {}
+    try {
+        json = text ? JSON.parse(text) : null;
+    } catch {}
     return { res, json, text };
 }
 
 export async function GET(req: NextRequest) {
     try {
-        const cookieHeader = req.headers.get("cookie") ?? "";
-        const userAt = req.cookies.get("ma_at")?.value || readCookieFromHeader("ma_at", cookieHeader);
-        if (!userAt) return NextResponse.json({ error: "Not authenticated" }, { status: 401 });
+        const userAt = req.cookies.get("ma_at")?.value;
+        if (!userAt) {
+            return NextResponse.json({ error: "Not authenticated" }, { status: 401 });
+        }
 
-        const target = req.nextUrl.searchParams.get("target");
-        const r = await dFetch(userAt, target);
+        const r = await dFetch(userAt);
         if (!r.res.ok) {
             return NextResponse.json(
                 { error: `Directus ${r.res.status}: ${r.text || r.res.statusText}` },
@@ -45,14 +43,20 @@ export async function GET(req: NextRequest) {
             );
         }
 
-        const rows: Array<{ id: number | string; name?: string; label?: string; title?: string }> =
+        const rows: Array<{ id: string | number; make?: string; model?: string }> =
         r.json?.data ?? [];
-        const data = rows.map(({ id, name, label, title }) => ({
-            id,
-            name: name || label || title || "",
-        }));
+
+        // Compose human label from make + model
+        const data = rows.map(({ id, make, model }) => {
+            const label = [make, model].filter(Boolean).join(" ");
+            return { id, name: label, label };
+        });
+
         return NextResponse.json({ data });
     } catch (e: any) {
-        return NextResponse.json({ error: e?.message || "Failed to load laser sources" }, { status: 500 });
+        return NextResponse.json(
+            { error: e?.message || "Failed to load laser sources" },
+            { status: 500 }
+        );
     }
 }
diff --git a/app/api/options/lens/route.ts b/app/api/options/lens/route.ts
index 51a17bc8..43621906 100644
--- a/app/api/options/lens/route.ts
+++ b/app/api/options/lens/route.ts
@@ -3,38 +3,47 @@ export const dynamic = "force-dynamic";
 
 import { NextRequest, NextResponse } from "next/server";
 
-const BASE =
-(process.env.DIRECTUS_URL || process.env.NEXT_PUBLIC_API_BASE_URL || "").replace(/\/$/, "");
+const BASE = (
+  process.env.DIRECTUS_URL || process.env.NEXT_PUBLIC_API_BASE_URL || ""
+).replace(/\/$/, "");
 
 function buildPath(target?: string | null) {
+  // CO2 Gantry → focus lenses (name)
+  // everything else (Fiber/UV/CO2 Galvo) → scan lenses (field_size + focal_length)
+  const isGantry = target === "co2-gantry";
+
+  if (isGantry) {
+    const url = new URL(`${BASE}/items/laser_focus_lens`);
+    url.searchParams.set("fields", "id,name");
+    url.searchParams.set("sort", "name");
+    return String(url);
+  }
+
   const url = new URL(`${BASE}/items/laser_scan_lens`);
-  url.searchParams.set("fields", "id,name");
-  url.searchParams.set("sort", "name");
-  // if (target) url.searchParams.set("filter[target][_eq]", target);
+  url.searchParams.set("fields", "id,field_size,focal_length");
+  url.searchParams.set("sort", "field_size,focal_length");
   return String(url);
 }
 
-function readCookieFromHeader(name: string, cookieHeader: string) {
-  const m = cookieHeader.match(new RegExp(`(?:^|;\\s*)${name}=([^;]+)`));
-  return m?.[1] ?? null;
-}
-
-async function dFetch(token: string, target?: string | null) {
+async function dFetch(bearer: string, target?: string | null) {
   const res = await fetch(buildPath(target), {
-    headers: { Accept: "application/json", Authorization: `Bearer ${token}` },
+    headers: { Accept: "application/json", Authorization: `Bearer ${bearer}` },
     cache: "no-store",
   });
   const text = await res.text().catch(() => "");
   let json: any = null;
-  try { json = text ? JSON.parse(text) : null; } catch {}
+  try {
+    json = text ? JSON.parse(text) : null;
+  } catch {}
   return { res, json, text };
 }
 
 export async function GET(req: NextRequest) {
   try {
-    const cookieHeader = req.headers.get("cookie") ?? "";
-    const userAt = req.cookies.get("ma_at")?.value || readCookieFromHeader("ma_at", cookieHeader);
-    if (!userAt) return NextResponse.json({ error: "Not authenticated" }, { status: 401 });
+    const userAt = req.cookies.get("ma_at")?.value;
+    if (!userAt) {
+      return NextResponse.json({ error: "Not authenticated" }, { status: 401 });
+    }
 
     const target = req.nextUrl.searchParams.get("target");
     const r = await dFetch(userAt, target);
@@ -45,14 +54,32 @@ export async function GET(req: NextRequest) {
       );
     }
 
-    const rows: Array<{ id: number | string; name?: string; label?: string; title?: string }> =
-    r.json?.data ?? [];
-    const data = rows.map(({ id, name, label, title }) => ({
-      id,
-      name: name || label || title || "",
-    }));
+    const rows: any[] = r.json?.data ?? [];
+    const isGantry = target === "co2-gantry";
+
+    const data = rows.map((row) => {
+      if (isGantry) {
+        // Focus lens: label is just the stored name
+        return { id: row.id, name: row.name, label: row.name };
+      }
+      // Scan lens: label "300x300 mm | F420" etc
+      const fs =
+      row.field_size != null && row.field_size !== ""
+      ? `${row.field_size} mm`
+      : "";
+      const fl =
+      row.focal_length != null && row.focal_length !== ""
+      ? `F${row.focal_length}`
+      : "";
+      const label = [fs, fl].filter(Boolean).join(" | ");
+      return { id: row.id, name: label, label };
+    });
+
     return NextResponse.json({ data });
   } catch (e: any) {
-    return NextResponse.json({ error: e?.message || "Failed to load lenses" }, { status: 500 });
+    return NextResponse.json(
+      { error: e?.message || "Failed to load lenses" },
+      { status: 500 }
+    );
   }
 }
diff --git a/app/components/forms/SettingsSubmit.tsx b/app/components/forms/SettingsSubmit.tsx
index 948940c8..03e6641f 100644
--- a/app/components/forms/SettingsSubmit.tsx
+++ b/app/components/forms/SettingsSubmit.tsx
@@ -1,11 +1,15 @@
-// app/components/forms/SettingsSubmit.tsx
 "use client";
 
 import { useEffect, useMemo, useState } from "react";
 import { useForm, useFieldArray, type UseFormRegister } from "react-hook-form";
 import { useRouter, useSearchParams } from "next/navigation";
 
-type Target = "settings_fiber" | "settings_co2gan" | "settings_co2gal" | "settings_uv";
+type Target =
+| "settings_fiber"
+| "settings_co2gan"
+| "settings_co2gal"
+| "settings_uv";
+
 type Opt = { id: string; label: string };
 type Me = {
   id: string;
@@ -24,7 +28,9 @@ function useOptions(path: string) {
   useEffect(() => {
     let alive = true;
     setLoading(true);
-    const url = `/api/options/${path}${path.includes("?") ? "&" : "?"}q=${encodeURIComponent(q)}`;
+    const url = `/api/options/${path}${
+      path.includes("?") ? "&" : "?"
+    }q=${encodeURIComponent(q)}`;
     fetch(url, { cache: "no-store", credentials: "include" })
     .then((r) => r.json())
     .then((j) => {
@@ -34,7 +40,15 @@ function useOptions(path: string) {
       ? raw
       .map((x) => ({
         id: String(x?.id ?? x?.value ?? x?.key ?? ""),
-                   label: String(x?.label ?? x?.name ?? x?.title ?? x?.text ?? ""),
+                   // include `opacity` as a label fallback (fixes opacity IDs)
+                   label: String(
+                     x?.label ??
+                     x?.name ??
+                     x?.title ??
+                     x?.text ??
+                     x?.opacity ??
+                     ""
+                   ),
       }))
       .filter((o) => o.id && o.label)
       : [];
@@ -50,7 +64,14 @@ function useOptions(path: string) {
 }
 
 function FilterableSelect({
-  label, name, register, options, loading, onQuery, placeholder = "—", required = false,
+  label,
+  name,
+  register,
+  options,
+  loading,
+  onQuery,
+  placeholder = "—",
+  required = false,
 }: {
   label: string;
   name: string;
@@ -62,7 +83,9 @@ function FilterableSelect({
   required?: boolean;
 }) {
   const [filter, setFilter] = useState("");
-  useEffect(() => { onQuery?.(filter); }, [filter, onQuery]);
+  useEffect(() => {
+    onQuery?.(filter);
+  }, [filter, onQuery]);
 
   const filtered = useMemo(() => {
     if (!filter) return options;
@@ -81,18 +104,32 @@ function FilterableSelect({
     value={filter}
     onChange={(e) => setFilter(e.target.value)}
     />
-    <select className="w-full border rounded px-2 py-1" {...register(name, { required })}>
-    <option value="">{placeholder}{loading ? " (loading…)" : ""}</option>
+    <select
+    className="w-full border rounded px-2 py-1"
+    {...register(name, { required })}
+    >
+    <option value="">
+    {placeholder}
+    {loading ? " (loading…)" : ""}
+    </option>
     {filtered.map((o) => (
-      <option key={o.id} value={o.id}>{o.label}</option>
+      <option key={o.id} value={o.id}>
+      {o.label}
+      </option>
     ))}
     </select>
     </div>
   );
 }
 
-function BoolBox({ label, name, register }:{
-  label: string; name: string; register: UseFormRegister<any>;
+function BoolBox({
+  label,
+  name,
+  register,
+}: {
+  label: string;
+  name: string;
+  register: UseFormRegister<any>;
 }) {
   return (
     <label className="flex items-center gap-1 text-sm">
@@ -101,20 +138,30 @@ function BoolBox({ label, name, register }:{
   );
 }
 
-export default function SettingsSubmit({ initialTarget }: { initialTarget?: Target }) {
+export default function SettingsSubmit({
+  initialTarget,
+}: {
+  initialTarget?: Target;
+}) {
   const router = useRouter();
   const sp = useSearchParams();
-  const initialFromQuery = (sp.get("target") as Target) || initialTarget || "settings_fiber";
+  const initialFromQuery =
+  (sp.get("target") as Target) || initialTarget || "settings_fiber";
   const [target, setTarget] = useState<Target>(initialFromQuery);
 
-  // Map collection -> slug used by options endpoints (?target=)
+  // Map collection -> options slug used by API (?target=)
   const typeForOptions = useMemo(() => {
     switch (target) {
-      case "settings_fiber":  return "fiber";
-      case "settings_uv":     return "uv";
-      case "settings_co2gal": return "co2-galvo";
-      case "settings_co2gan": return "co2-gantry";
-      default:                return "fiber";
+      case "settings_fiber":
+        return "fiber";
+      case "settings_uv":
+        return "uv";
+      case "settings_co2gal":
+        return "co2-galvo";
+      case "settings_co2gan":
+        return "co2-gantry";
+      default:
+        return "fiber";
     }
   }, [target]);
 
@@ -124,10 +171,10 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
   const [photoPreview, setPhotoPreview] = useState<string>("");
   const [screenPreview, setScreenPreview] = useState<string>("");
 
-  // UX error for auth/submit
+  // UX errors
   const [submitErr, setSubmitErr] = useState<string | null>(null);
 
-  // Current signed-in user (banner only)
+  // Signed-in user (banner)
   const [me, setMe] = useState<Me | null>(null);
   const [meErr, setMeErr] = useState<string | null>(null);
 
@@ -135,53 +182,94 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
     let alive = true;
     fetch("/api/me", { cache: "no-store", credentials: "include" })
     .then((r) => (r.ok ? r.json() : Promise.reject(r)))
-    .then((j) => { if (alive) setMe(j?.data || j || null); })
-    .catch(() => { if (alive) setMeErr("not-signed-in"); });
-    return () => { alive = false; };
+    .then((j) => {
+      if (alive) setMe(j?.data || j || null);
+    })
+    .catch(() => {
+      if (alive) setMeErr("not-signed-in");
+    });
+      return () => {
+        alive = false;
+      };
   }, []);
 
-  // Prefer username specifically; then usual fallbacks
+  // prefer username specifically; then display_name, name, email, id
   const meLabel =
   (me?.username && me.username.trim()) ||
-  (me?.email && me.email.trim()) ||
-  ([me?.first_name, me?.last_name].filter(Boolean).join(" ").trim()) ||
   (me?.display_name && me.display_name.trim()) ||
+  [me?.first_name, me?.last_name].filter(Boolean).join(" ").trim() ||
+  (me?.email && me.email.trim()) ||
+  me?.id ||
   "Unknown user";
 
     // Options
-    const mats   = useOptions("material");
-    const coats  = useOptions("material_coating");
+    const mats = useOptions("material");
+    const coats = useOptions("material_coating");
     const colors = useOptions("material_color");
-    const opacs  = useOptions("material_opacity");
-    const soft   = useOptions("laser_software"); // required for ALL targets
-    const srcs   = useOptions(`laser_source?target=${typeForOptions}`);
-    const lens   = useOptions(`lens?target=${typeForOptions}`);
+    const opacs = useOptions("material_opacity");
+    const soft = useOptions("laser_software");
 
-    const { register, handleSubmit, control, reset, formState: { isSubmitting } } = useForm<any>({
+    // IMPORTANT: these expect ?target=slug
+    const srcs = useOptions(`laser_source?target=${typeForOptions}`);
+    const lens = useOptions(`lens?target=${typeForOptions}`);
+
+    // Repeater choices
+    const fillType = useOptions(
+      `repeater-choices?target=${target}&group=fill_settings&field=type`
+    );
+    const rasterType = useOptions(
+      `repeater-choices?target=${target}&group=raster_settings&field=type`
+    );
+    const rasterDither = useOptions(
+      `repeater-choices?target=${target}&group=raster_settings&field=dither`
+    );
+
+    const {
+      register,
+      handleSubmit,
+      control,
+      reset,
+      formState: { isSubmitting },
+    } = useForm<any>({
       defaultValues: {
         setting_title: "",
         setting_notes: "",
-        mat: "", mat_coat: "", mat_color: "", mat_opacity: "",
-        mat_thickness: "", source: "", lens: "", focus: "",
-        laser_soft: "", repeat_all: "",
-        fill_settings: [], line_settings: [], raster_settings: [],
+        mat: "",
+        mat_coat: "",
+        mat_color: "",
+        mat_opacity: "",
+        mat_thickness: "",
+        source: "",
+        lens: "",
+        focus: "",
+        laser_soft: "",
+        repeat_all: "", // now for ALL targets
+        fill_settings: [],
+        line_settings: [],
+        raster_settings: [],
       },
     });
 
-    const fills   = useFieldArray({ control, name: "fill_settings" });
-    const lines   = useFieldArray({ control, name: "line_settings" });
+    const fills = useFieldArray({ control, name: "fill_settings" });
+    const lines = useFieldArray({ control, name: "line_settings" });
     const rasters = useFieldArray({ control, name: "raster_settings" });
 
     const isGantry = target === "settings_co2gan";
 
-    function num(v: any) { return (v === "" || v == null) ? null : Number(v); }
+    function num(v: any) {
+      return v === "" || v == null ? null : Number(v);
+    }
     const bool = (v: any) => !!v;
 
     async function onSubmit(values: any) {
       setSubmitErr(null);
 
       if (!photoFile) {
-        (document.querySelector('input[type="file"][data-role="photo"]') as HTMLInputElement | null)?.focus();
+        (
+          document.querySelector(
+            'input[type="file"][data-role="photo"]'
+          ) as HTMLInputElement | null
+        )?.focus();
         return;
       }
 
@@ -197,8 +285,9 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
         source: values.source || null,
         lens: values.lens || null,
         focus: num(values.focus),
-        laser_soft: values.laser_soft || null,     // required for ALL targets
-        repeat_all: num(values.repeat_all),        // now sent for ALL targets
+        laser_soft: values.laser_soft || null, // required for all targets by the form
+        repeat_all: num(values.repeat_all), // required for all targets by the form
+
         fill_settings: (values.fill_settings || []).map((r: any) => ({
           name: r.name || "",
           power: num(r.power),
@@ -215,6 +304,7 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
                                                                      flood: bool(r.flood),
                                                                      air: bool(r.air),
         })),
+
         line_settings: (values.line_settings || []).map((r: any) => ({
           name: r.name || "",
           power: num(r.power),
@@ -230,6 +320,7 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
                                                                      step: num(r.step),
                                                                      size: num(r.size),
         })),
+
         raster_settings: (values.raster_settings || []).map((r: any) => ({
           name: r.name || "",
           power: num(r.power),
@@ -254,9 +345,15 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
         if (photoFile || screenFile) {
           const form = new FormData();
           form.set("payload", JSON.stringify(payload));
-          if (photoFile) form.set("photo", photoFile, photoFile.name || "photo");
-          if (screenFile) form.set("screen", screenFile, screenFile.name || "screen");
-          res = await fetch("/api/submit/settings", { method: "POST", body: form, credentials: "include" });
+          if (photoFile)
+            form.set("photo", photoFile, photoFile.name || "photo");
+          if (screenFile)
+            form.set("screen", screenFile, screenFile.name || "screen");
+          res = await fetch("/api/submit/settings", {
+            method: "POST",
+            body: form,
+            credentials: "include",
+          });
         } else {
           res = await fetch("/api/submit/settings", {
             method: "POST",
@@ -268,10 +365,12 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
 
         const data = await res.json().catch(() => ({}));
         if (!res.ok) {
-          if (res.status === 401 || res.status === 403) throw new Error("You must be signed in to submit settings.");
+          if (res.status === 401 || res.status === 403)
+            throw new Error("You must be signed in to submit settings.");
           throw new Error(data?.error || "Submission failed");
         }
 
+        // Reset form and previews
         reset();
         setPhotoFile(null);
         setScreenFile(null);
@@ -279,15 +378,26 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
         setScreenPreview("");
 
         const id = data?.id ? String(data.id) : "";
-        router.push(`/submit/settings/success?target=${encodeURIComponent(target)}&id=${encodeURIComponent(id)}`);
+        router.push(
+          `/submit/settings/success?target=${encodeURIComponent(
+            target
+          )}&id=${encodeURIComponent(id)}`
+        );
       } catch (e: any) {
         setSubmitErr(e?.message || "Submission failed");
       }
     }
 
-    function onPick(file: File | null, setFile: (f: File | null) => void, setPreview: (s: string) => void) {
+    function onPick(
+      file: File | null,
+      setFile: (f: File | null) => void,
+                    setPreview: (s: string) => void
+    ) {
       setFile(file);
-      if (!file) { setPreview(""); return; }
+      if (!file) {
+        setPreview("");
+        return;
+      }
       const reader = new FileReader();
       reader.onload = () => setPreview(String(reader.result || ""));
       reader.readAsDataURL(file);
@@ -336,117 +446,336 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
       ) : null}
 
       {submitErr ? (
-        <div className="border border-red-500 text-red-600 bg-red-50 rounded p-2 text-sm">{submitErr}</div>
+        <div className="border border-red-500 text-red-600 bg-red-50 rounded p-2 text-sm">
+        {submitErr}
+        </div>
       ) : null}
 
+      {/* Form */}
       <form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
       {/* Title */}
       <div className="grid md:grid-cols-2 gap-3">
       <div className="md:col-span-2">
-      <label className="block text-sm mb-1">Title <span className="text-red-600">*</span></label>
-      <input className="w-full border rounded px-2 py-1" {...register("setting_title", { required: true })} />
+      <label className="block text-sm mb-1">
+      Title <span className="text-red-600">*</span>
+      </label>
+      <input
+      className="w-full border rounded px-2 py-1"
+      {...register("setting_title", { required: true })}
+      />
       </div>
       </div>
 
       {/* Images */}
       <div className="grid md:grid-cols-2 gap-4">
       <div>
-      <label className="block text-sm mb-1">Result Photo <span className="text-red-600">*</span></label>
-      <input type="file" accept="image/*" data-role="photo" required
-      onChange={(e) => onPick(e.target.files?.[0] ?? null, setPhotoFile, setPhotoPreview)} />
+      <label className="block text-sm mb-1">
+      Result Photo <span className="text-red-600">*</span>
+      </label>
+      <input
+      type="file"
+      accept="image/*"
+      data-role="photo"
+      required
+      onChange={(e) =>
+        onPick(
+          e.target.files?.[0] ?? null,
+          setPhotoFile,
+          setPhotoPreview
+        )
+      }
+      />
       <p className="text-xs text-muted-foreground mt-1">
-      {photoFile ? <>Selected: <span className="font-mono">{photoFile.name}</span></> : "Max 25 MB. JPG/PNG/WebP recommended."}
+      {photoFile ? (
+        <>
+        Selected:{" "}
+        <span className="font-mono">{photoFile.name}</span>
+        </>
+      ) : (
+        "Max 25 MB. JPG/PNG/WebP recommended."
+      )}
       </p>
-      {photoPreview ? <img src={photoPreview} alt="Result preview" className="mt-2 rounded border" /> : null}
+      {photoPreview ? (
+        <img
+        src={photoPreview}
+        alt="Result preview"
+        className="mt-2 rounded border"
+        />
+      ) : null}
       </div>
       <div>
-      <label className="block text-sm mb-1">Settings Screenshot (optional)</label>
-      <input type="file" accept="image/*"
-      onChange={(e) => onPick(e.target.files?.[0] ?? null, setScreenFile, setScreenPreview)} />
+      <label className="block text-sm mb-1">
+      Settings Screenshot (optional)
+      </label>
+      <input
+      type="file"
+      accept="image/*"
+      onChange={(e) =>
+        onPick(
+          e.target.files?.[0] ?? null,
+          setScreenFile,
+          setScreenPreview
+        )
+      }
+      />
       <p className="text-xs text-muted-foreground mt-1">
-      {screenFile ? <>Selected: <span className="font-mono">{screenFile.name}</span></> : "Max 25 MB. JPG/PNG/WebP recommended."}
+      {screenFile ? (
+        <>
+        Selected:{" "}
+        <span className="font-mono">{screenFile.name}</span>
+        </>
+      ) : (
+        "Max 25 MB. JPG/PNG/WebP recommended."
+      )}
       </p>
-      {screenPreview ? <img src={screenPreview} alt="Settings preview" className="mt-2 rounded border" /> : null}
+      {screenPreview ? (
+        <img
+        src={screenPreview}
+        alt="Settings preview"
+        className="mt-2 rounded border"
+        />
+      ) : null}
       </div>
       </div>
 
       {/* Notes */}
       <div>
       <label className="block text-sm mb-1">Notes</label>
-      <textarea rows={4} className="w-full border rounded px-2 py-1" {...register("setting_notes")} />
-      </div>
+      <textarea
+      rows={4}
+      className="w-full border rounded px-2 py-1"
+      {...register("setting_notes")}
+      />
+      </div}
 
       {/* Material / Source / Lens */}
       <div className="grid md:grid-cols-2 gap-3">
-      <FilterableSelect label="Material"       name="mat"         register={register} options={mats.opts}   loading={mats.loading}   onQuery={mats.setQ}   required />
-      <FilterableSelect label="Coating"        name="mat_coat"    register={register} options={coats.opts}  loading={coats.loading}  onQuery={coats.setQ}  required />
-      <FilterableSelect label="Color"          name="mat_color"   register={register} options={colors.opts} loading={colors.loading} onQuery={colors.setQ} required />
-      <FilterableSelect label="Opacity"        name="mat_opacity" register={register} options={opacs.opts}  loading={opacs.loading}  onQuery={opacs.setQ}  required />
-      <FilterableSelect label="Laser Source"   name="source"      register={register} options={srcs.opts}   loading={srcs.loading}   onQuery={srcs.setQ}   required />
-      <FilterableSelect label="Lens"           name="lens"        register={register} options={lens.opts}   loading={lens.loading}   onQuery={lens.setQ}   required />
+      <FilterableSelect
+      label="Material"
+      name="mat"
+      register={register}
+      options={mats.opts}
+      loading={mats.loading}
+      onQuery={mats.setQ}
+      required
+      />
+      <FilterableSelect
+      label="Coating"
+      name="mat_coat"
+      register={register}
+      options={coats.opts}
+      loading={coats.loading}
+      onQuery={coats.setQ}
+      required
+      />
+      <FilterableSelect
+      label="Color"
+      name="mat_color"
+      register={register}
+      options={colors.opts}
+      loading={colors.loading}
+      onQuery={colors.setQ}
+      required
+      />
+      <FilterableSelect
+      label="Opacity"
+      name="mat_opacity"
+      register={register}
+      options={opacs.opts}
+      loading={opacs.loading}
+      onQuery={opacs.setQ}
+      required
+      />
+
+      {/* these now receive populated options */}
+      <FilterableSelect
+      label="Laser Source"
+      name="source"
+      register={register}
+      options={srcs.opts}
+      loading={srcs.loading}
+      onQuery={srcs.setQ}
+      required
+      />
+      <FilterableSelect
+      label="Lens"
+      name="lens"
+      register={register}
+      options={lens.opts}
+      loading={lens.loading}
+      onQuery={lens.setQ}
+      required
+      />
       </div>
 
-      {/* Focus, thickness, repeat_all */}
+      {/* Focus, thickness, repeat_all (now on all targets) */}
       <div className="grid md:grid-cols-3 gap-3">
       <div>
-      <label className="block text-sm mb-1">Material Thickness (mm)</label>
-      <input type="number" step="0.01" className="w-full border rounded px-2 py-1" {...register("mat_thickness")} />
+      <label className="block text-sm mb-1">
+      Material Thickness (mm)
+      </label>
+      <input
+      type="number"
+      step="0.01"
+      className="w-full border rounded px-2 py-1"
+      {...register("mat_thickness")}
+      />
       </div>
       <div>
-      <label className="block text-sm mb-1">Focus (mm) <span className="text-red-600">*</span></label>
-      <input type="number" min={-10} max={10} step="1" className="w-full border rounded px-2 py-1" {...register("focus", { required: true })} />
-      <p className="text-xs text-muted-foreground mt-1">0 = in focus. Negative = focus closer. Positive = focus further.</p>
+      <label className="block text-sm mb-1">
+      Focus (mm) <span className="text-red-600">*</span>
+      </label>
+      <input
+      type="number"
+      min={-10}
+      max={10}
+      step="1"
+      className="w-full border rounded px-2 py-1"
+      {...register("focus", { required: true })}
+      />
+      <p className="text-xs text-muted-foreground mt-1">
+      0 = in focus. Negative = focus closer. Positive = focus further.
+      </p>
       </div>
       <div>
-      <label className="block text-sm mb-1">Repeat All <span className="text-red-600">*</span></label>
-      <input type="number" step="1" className="w-full border rounded px-2 py-1" {...register("repeat_all", { required: true })} />
+      <label className="block text-sm mb-1">
+      Repeat All <span className="text-red-600">*</span>
+      </label>
+      <input
+      type="number"
+      step="1"
+      className="w-full border rounded px-2 py-1"
+      {...register("repeat_all", { required: true })}
+      />
       </div>
       </div>
 
-      {/* FILL / LINE / RASTER (unchanged) */}
-      {/* your existing repeaters stay as-is */}
       {/* FILL */}
       <fieldset className="border rounded p-3 space-y-2">
       <div className="flex items-center justify-between">
       <legend className="font-semibold">Fill Settings</legend>
-      <button type="button" className="px-2 py-1 border rounded" onClick={() => fills.append({})}>+ Add</button>
+      <button
+      type="button"
+      className="px-2 py-1 border rounded"
+      onClick={() => fills.append({})}
+      >
+      + Add
+      </button>
       </div>
       {fills.fields.map((f, i) => (
         <div key={f.id} className="grid md:grid-cols-4 gap-2">
-        <input placeholder="Name" className="border rounded px-2 py-1 md:col-span-2" {...register(`fill_settings.${i}.name`)} />
+        <input
+        placeholder="Name"
+        className="border rounded px-2 py-1 md:col-span-2"
+        {...register(`fill_settings.${i}.name`)}
+        />
         <FilterableSelect
         label="Type"
         name={`fill_settings.${i}.type`}
         register={register}
-        options={useOptions(`repeater-choices?target=${target}&group=fill_settings&field=type`).opts}
-        loading={false}
+        options={fillType.opts}
+        loading={fillType.loading}
+        onQuery={fillType.setQ}
         placeholder="Select type"
         />
+
         {!isGantry && (
           <>
-          <input placeholder="Frequency (kHz)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.frequency`)} />
-          <input placeholder="Pulse (ns)"      type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.pulse`)} />
+          <input
+          placeholder="Frequency (kHz)"
+          type="number"
+          step="0.1"
+          className="border rounded px-2 py-1"
+          {...register(`fill_settings.${i}.frequency`)}
+          />
+          <input
+          placeholder="Pulse (ns)"
+          type="number"
+          step="0.1"
+          className="border rounded px-2 py-1"
+          {...register(`fill_settings.${i}.pulse`)}
+          />
           </>
         )}
-        <input placeholder="Power (%)"       type="number" step="0.1"   className="border rounded px-2 py-1" {...register(`fill_settings.${i}.power`)} />
-        <input placeholder="Speed (mm/s)"    type="number" step="0.1"   className="border rounded px-2 py-1" {...register(`fill_settings.${i}.speed`)} />
-        <input placeholder="Interval (mm)"   type="number" step="0.001" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.interval`)} />
-        <input placeholder="Pass"            type="number" step="1"     className="border rounded px-2 py-1" {...register(`fill_settings.${i}.pass`)} />
+        <input
+        placeholder="Power (%)"
+        type="number"
+        step="0.1"
+        className="border rounded px-2 py-1"
+        {...register(`fill_settings.${i}.power`)}
+        />
+        <input
+        placeholder="Speed (mm/s)"
+        type="number"
+        step="0.1"
+        className="border rounded px-2 py-1"
+        {...register(`fill_settings.${i}.speed`)}
+        />
+        <input
+        placeholder="Interval (mm)"
+        type="number"
+        step="0.001"
+        className="border rounded px-2 py-1"
+        {...register(`fill_settings.${i}.interval`)}
+        />
+        <input
+        placeholder="Pass"
+        type="number"
+        step="1"
+        className="border rounded px-2 py-1"
+        {...register(`fill_settings.${i}.pass`)}
+        />
+
         {!isGantry && (
           <>
-          <input placeholder="Angle (°)"  type="number" step="1"     className="border rounded px-2 py-1" {...register(`fill_settings.${i}.angle`)} />
-          <input placeholder="Increment"  type="number" step="0.001" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.increment`)} />
+          <input
+          placeholder="Angle (°)"
+          type="number"
+          step="1"
+          className="border rounded px-2 py-1"
+          {...register(`fill_settings.${i}.angle`)}
+          />
+          <input
+          placeholder="Increment"
+          type="number"
+          step="0.001"
+          className="border rounded px-2 py-1"
+          {...register(`fill_settings.${i}.increment`)}
+          />
           <div className="flex items-center gap-3">
-          <BoolBox label="Auto"  name={`fill_settings.${i}.auto`}  register={register} />
-          <BoolBox label="Cross" name={`fill_settings.${i}.cross`} register={register} />
+          <BoolBox
+          label="Auto"
+          name={`fill_settings.${i}.auto`}
+          register={register}
+          />
+          <BoolBox
+          label="Cross"
+          name={`fill_settings.${i}.cross`}
+          register={register}
+          />
           </div>
           </>
         )}
         <div className="flex items-center gap-3">
-        <BoolBox label="Flood" name={`fill_settings.${i}.flood`} register={register} />
-        <BoolBox label="Air"   name={`fill_settings.${i}.air`}   register={register} />
+        <BoolBox
+        label="Flood"
+        name={`fill_settings.${i}.flood`}
+        register={register}
+        />
+        <BoolBox
+        label="Air"
+        name={`fill_settings.${i}.air`}
+        register={register}
+        />
         </div>
-        <button type="button" className="px-2 py-1 border rounded md:col-span-4" onClick={() => fills.remove(i)}>Remove</button>
+
+        <button
+        type="button"
+        className="px-2 py-1 border rounded md:col-span-4"
+        onClick={() => fills.remove(i)}
+        >
+        Remove
+        </button>
         </div>
       ))}
       </fieldset>
@@ -455,32 +784,113 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
       <fieldset className="border rounded p-3 space-y-2">
       <div className="flex items-center justify-between">
       <legend className="font-semibold">Line Settings</legend>
-      <button type="button" className="px-2 py-1 border rounded" onClick={() => lines.append({})}>+ Add</button>
+      <button
+      type="button"
+      className="px-2 py-1 border rounded"
+      onClick={() => lines.append({})}
+      >
+      + Add
+      </button>
       </div>
       {lines.fields.map((f, i) => (
         <div key={f.id} className="grid md:grid-cols-4 gap-2">
-        <input placeholder="Name" className="border rounded px-2 py-1 md:col-span-2" {...register(`line_settings.${i}.name`)} />
+        <input
+        placeholder="Name"
+        className="border rounded px-2 py-1 md:col-span-2"
+        {...register(`line_settings.${i}.name`)}
+        />
+
         {!isGantry && (
           <>
-          <input placeholder="Frequency (kHz)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.frequency`)} />
-          <input placeholder="Pulse (ns)"      type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.pulse`)} />
+          <input
+          placeholder="Frequency (kHz)"
+          type="number"
+          step="0.1"
+          className="border rounded px-2 py-1"
+          {...register(`line_settings.${i}.frequency`)}
+          />
+          <input
+          placeholder="Pulse (ns)"
+          type="number"
+          step="0.1"
+          className="border rounded px-2 py-1"
+          {...register(`line_settings.${i}.pulse`)}
+          />
           </>
         )}
-        <input placeholder="Power (%)"     type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.power`)} />
-        <input placeholder="Speed (mm/s)"  type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.speed`)} />
-        <input placeholder="Perf" className="border rounded px-2 py-1" {...register(`line_settings.${i}.perf`)} />
-        <input placeholder="Cut"  className="border rounded px-2 py-1" {...register(`line_settings.${i}.cut`)} />
-        <input placeholder="Skip" className="border rounded px-2 py-1" {...register(`line_settings.${i}.skip`)} />
-        <input placeholder="Pass" type="number" step="1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.pass`)} />
+
+        <input
+        placeholder="Power (%)"
+        type="number"
+        step="0.1"
+        className="border rounded px-2 py-1"
+        {...register(`line_settings.${i}.power`)}
+        />
+        <input
+        placeholder="Speed (mm/s)"
+        type="number"
+        step="0.1"
+        className="border rounded px-2 py-1"
+        {...register(`line_settings.${i}.speed`)}
+        />
+        <input
+        placeholder="Perf"
+        className="border rounded px-2 py-1"
+        {...register(`line_settings.${i}.perf`)}
+        />
+        <input
+        placeholder="Cut"
+        className="border rounded px-2 py-1"
+        {...register(`line_settings.${i}.cut`)}
+        />
+        <input
+        placeholder="Skip"
+        className="border rounded px-2 py-1"
+        {...register(`line_settings.${i}.skip`)}
+        />
+        <input
+        placeholder="Pass"
+        type="number"
+        step="1"
+        className="border rounded px-2 py-1"
+        {...register(`line_settings.${i}.pass`)}
+        />
         {!isGantry && (
           <>
-          <input placeholder="Step" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`line_settings.${i}.step`)} />
-          <input placeholder="Size" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`line_settings.${i}.size`)} />
-          <BoolBox label="Wobble" name={`line_settings.${i}.wobble`} register={register} />
+          <input
+          placeholder="Step"
+          type="number"
+          step="0.001"
+          className="border rounded px-2 py-1"
+          {...register(`line_settings.${i}.step`)}
+          />
+          <input
+          placeholder="Size"
+          type="number"
+          step="0.001"
+          className="border rounded px-2 py-1"
+          {...register(`line_settings.${i}.size`)}
+          />
+          <BoolBox
+          label="Wobble"
+          name={`line_settings.${i}.wobble`}
+          register={register}
+          />
           </>
         )}
-        <BoolBox label="Air" name={`line_settings.${i}.air`} register={register} />
-        <button type="button" className="px-2 py-1 border rounded md:col-span-4" onClick={() => lines.remove(i)}>Remove</button>
+        <BoolBox
+        label="Air"
+        name={`line_settings.${i}.air`}
+        register={register}
+        />
+
+        <button
+        type="button"
+        className="px-2 py-1 border rounded md:col-span-4"
+        onClick={() => lines.remove(i)}
+        >
+        Remove
+        </button>
         </div>
       ))}
       </fieldset>
@@ -489,54 +899,148 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
       <fieldset className="border rounded p-3 space-y-2">
       <div className="flex items-center justify-between">
       <legend className="font-semibold">Raster Settings</legend>
-      <button type="button" className="px-2 py-1 border rounded" onClick={() => rasters.append({})}>+ Add</button>
+      <button
+      type="button"
+      className="px-2 py-1 border rounded"
+      onClick={() => rasters.append({})}
+      >
+      + Add
+      </button>
       </div>
       {rasters.fields.map((f, i) => (
         <div key={f.id} className="grid md:grid-cols-4 gap-2">
-        <input placeholder="Name" className="border rounded px-2 py-1 md:col-span-2" {...register(`raster_settings.${i}.name`)} />
+        <input
+        placeholder="Name"
+        className="border rounded px-2 py-1 md:col-span-2"
+        {...register(`raster_settings.${i}.name`)}
+        />
+
         {!isGantry && (
           <>
-          <input placeholder="Frequency (kHz)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.frequency`)} />
-          <input placeholder="Pulse (ns)"      type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.pulse`)} />
+          <input
+          placeholder="Frequency (kHz)"
+          type="number"
+          step="0.1"
+          className="border rounded px-2 py-1"
+          {...register(`raster_settings.${i}.frequency`)}
+          />
+          <input
+          placeholder="Pulse (ns)"
+          type="number"
+          step="0.1"
+          className="border rounded px-2 py-1"
+          {...register(`raster_settings.${i}.pulse`)}
+          />
           </>
         )}
+
         <FilterableSelect
         label="Type"
         name={`raster_settings.${i}.type`}
         register={register}
-        options={useOptions(`repeater-choices?target=${target}&group=raster_settings&field=type`).opts}
-        loading={false}
+        options={rasterType.opts}
+        loading={rasterType.loading}
+        onQuery={rasterType.setQ}
         placeholder="Select type"
         />
         <FilterableSelect
         label="Dither"
         name={`raster_settings.${i}.dither`}
         register={register}
-        options={useOptions(`repeater-choices?target=${target}&group=raster_settings&field=dither`).opts}
-        loading={false}
+        options={rasterDither.opts}
+        loading={rasterDither.loading}
+        onQuery={rasterDither.setQ}
         placeholder="Select dither"
         />
-        <input placeholder="Power (%)"       type="number" step="0.1"   className="border rounded px-2 py-1" {...register(`raster_settings.${i}.power`)} />
-        <input placeholder="Speed (mm/s)"    type="number" step="0.1"   className="border rounded px-2 py-1" {...register(`raster_settings.${i}.speed`)} />
-        <input placeholder="Halftone Cell"   type="number" step="1"     className="border rounded px-2 py-1" {...register(`raster_settings.${i}.halftone_cell`)} />
-        <input placeholder="Halftone Angle"  type="number" step="1"     className="border rounded px-2 py-1" {...register(`raster_settings.${i}.halftone_angle`)} />
-        <input placeholder="Interval (mm)"   type="number" step="0.001" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.interval`)} />
-        <input placeholder="Dot"             type="number" step="0.1"   className="border rounded px-2 py-1" {...register(`raster_settings.${i}.dot`)} />
-        <input placeholder="Pass"            type="number" step="1"     className="border rounded px-2 py-1" {...register(`raster_settings.${i}.pass`)} />
-        {!isGantry && <BoolBox label="Cross" name={`raster_settings.${i}.cross`} register={register} />}
+
+        <input
+        placeholder="Power (%)"
+        type="number"
+        step="0.1"
+        className="border rounded px-2 py-1"
+        {...register(`raster_settings.${i}.power`)}
+        />
+        <input
+        placeholder="Speed (mm/s)"
+        type="number"
+        step="0.1"
+        className="border rounded px-2 py-1"
+        {...register(`raster_settings.${i}.speed`)}
+        />
+        <input
+        placeholder="Halftone Cell"
+        type="number"
+        step="1"
+        className="border rounded px-2 py-1"
+        {...register(`raster_settings.${i}.halftone_cell`)}
+        />
+        <input
+        placeholder="Halftone Angle"
+        type="number"
+        step="1"
+        className="border rounded px-2 py-1"
+        {...register(`raster_settings.${i}.halftone_angle`)}
+        />
+        <input
+        placeholder="Interval (mm)"
+        type="number"
+        step="0.001"
+        className="border rounded px-2 py-1"
+        {...register(`raster_settings.${i}.interval`)}
+        />
+        <input
+        placeholder="Dot"
+        type="number"
+        step="0.1"
+        className="border rounded px-2 py-1"
+        {...register(`raster_settings.${i}.dot`)}
+        />
+        <input
+        placeholder="Pass"
+        type="number"
+        step="1"
+        className="border rounded px-2 py-1"
+        {...register(`raster_settings.${i}.pass`)}
+        />
+
+        {!isGantry && (
+          <BoolBox
+          label="Cross"
+          name={`raster_settings.${i}.cross`}
+          register={register}
+          />
+        )}
         <div className="flex items-center gap-3">
-        <BoolBox label="Inversion" name={`raster_settings.${i}.inversion`} register={register} />
-        <BoolBox label="Air"       name={`raster_settings.${i}.air`}       register={register} />
+        <BoolBox
+        label="Inversion"
+        name={`raster_settings.${i}.inversion`}
+        register={register}
+        />
+        <BoolBox
+        label="Air"
+        name={`raster_settings.${i}.air`}
+        register={register}
+        />
         </div>
-        <button type="button" className="px-2 py-1 border rounded md:col-span-4" onClick={() => rasters.remove(i)}>Remove</button>
+
+        <button
+        type="button"
+        className="px-2 py-1 border rounded md:col-span-4"
+        onClick={() => rasters.remove(i)}
+        >
+        Remove
+        </button>
         </div>
       ))}
       </fieldset>
 
-      <button disabled={isSubmitting} className="px-3 py-2 border rounded bg-accent text-background hover:opacity-90 disabled:opacity-50">
+      <button
+      disabled={isSubmitting}
+      className="px-3 py-2 border rounded bg-accent text-background hover:opacity-90 disabled:opacity-50"
+      >
       {isSubmitting ? "Submitting…" : "Submit Settings"}
       </button>
       </form>
       </div>
     );
-}
+    }
diff --git a/makearmy-app.zip b/makearmy-app.zip
new file mode 100644
index 00000000..71180d84
Binary files /dev/null and b/makearmy-app.zip differ