diff --git a/src/actions/ai-import.ts b/src/actions/ai-import.ts
index 33ebf9f..a062d87 100644
--- a/src/actions/ai-import.ts
+++ b/src/actions/ai-import.ts
@@ -258,11 +258,16 @@ function fallbackParse(
     stops: stopKeywords,
   };
 
+  const escapeRegex = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const keywordPatterns: Record<string, RegExp> = {};
+  for (const [etype, kws] of Object.entries(keywordMaps)) {
+    keywordPatterns[etype] = new RegExp(kws.map(escapeRegex).join("|"));
+  }
+
   for (const header of h) {
-    for (const [etype, keywords] of Object.entries(keywordMaps)) {
-      for (const kw of keywords) {
-        if (header.includes(kw)) typeScores[etype] = (typeScores[etype] ?? 0) + 1;
-      }
+    for (const [etype, pattern] of Object.entries(keywordPatterns)) {
+      const matches = header.match(pattern);
+      if (matches) typeScores[etype] = (typeScores[etype] ?? 0) + matches.length;
     }
   }
 
@@ -309,10 +314,15 @@ function fallbackParse(
     notes: ["notes", "note", "special_instructions", "comments", "memo", "instruction"],
   };
 
+  const semanticPatterns: Record<string, RegExp> = {};
+  for (const [field, kws] of Object.entries(semanticMap)) {
+    semanticPatterns[field] = new RegExp(kws.map(escapeRegex).join("|"));
+  }
+
   for (let i = 0; i < h.length; i++) {
     const header = h[i];
-    for (const [field, keywords] of Object.entries(semanticMap)) {
-      if (keywords.some((kw) => header.includes(kw))) {
+    for (const [field, pattern] of Object.entries(semanticPatterns)) {
+      if (pattern.test(header)) {
         columnMappings[headers[i]] = field;
       }
     }
diff --git a/src/app/admin/launch-checklist/page.tsx b/src/app/admin/launch-checklist/page.tsx
index 133aa9f..5d1a2a3 100644
--- a/src/app/admin/launch-checklist/page.tsx
+++ b/src/app/admin/launch-checklist/page.tsx
@@ -122,13 +122,13 @@ export default function LaunchChecklistPage() {
             <div className="relative w-24 h-24">
               <svg className="w-24 h-24 -rotate-90" viewBox="0 0 36 36">
                 <path
-                  d="M18 2.0845 a 15.9155 15.9155 0 0 1 0 31.831 a 15.9155 15.9155 0 0 1 0 -31.831"
+                  d="M18 2.08 a 15.92 15.92 0 0 1 0 31.83 a 15.92 15.92 0 0 1 0 -31.83"
                   fill="none"
                   stroke="#f0f0f0"
                   strokeWidth="3"
                 />
                 <path
-                  d="M18 2.0845 a 15.9155 15.9155 0 0 1 0 31.831 a 15.9155 15.9155 0 0 1 0 -31.831"
+                  d="M18 2.08 a 15.92 15.92 0 0 1 0 31.83 a 15.92 15.92 0 0 1 0 -31.83"
                   fill="none"
                   stroke="#1a4d2e"
                   strokeWidth="3"
diff --git a/src/components/admin/AbandonedCartDashboard.tsx b/src/components/admin/AbandonedCartDashboard.tsx
index d908d7f..ccc2b39 100644
--- a/src/components/admin/AbandonedCartDashboard.tsx
+++ b/src/components/admin/AbandonedCartDashboard.tsx
@@ -191,8 +191,12 @@ export default function AbandonedCartDashboard({ brandId }: Props) {
 
       {/* Cart detail modal */}
       {cart && (
-        <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/40 backdrop-blur-sm"
-          onClick={() => setSelectedCart(null)}>
+        <button
+          type="button"
+          aria-label="Close abandoned cart details"
+          className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/40 backdrop-blur-sm border-0 cursor-default"
+          onClick={() => setSelectedCart(null)}
+        >
           <div className="bg-white border border-[var(--admin-border)] rounded-2xl w-full max-w-lg shadow-xl"
             onClick={e => e.stopPropagation()}>
             <div className="px-6 py-4 border-b border-[var(--admin-border)] flex items-center justify-between">
@@ -246,7 +250,7 @@ export default function AbandonedCartDashboard({ brandId }: Props) {
               )}
             </div>
           </div>
-        </div>
+        </button>
       )}
     </div>
   );
diff --git a/src/components/admin/AdminSidebar.tsx b/src/components/admin/AdminSidebar.tsx
index 1fba17b..102cba0 100644
--- a/src/components/admin/AdminSidebar.tsx
+++ b/src/components/admin/AdminSidebar.tsx
@@ -191,9 +191,10 @@ export default function AdminSidebar({
    * future iteration hides Harvest Reach for some role, the entire group
    * header goes away rather than rendering an empty section.
    */
+  const visibleItemSet = new Set(visibleItems);
   const visibleGroups: NavGroup[] = [];
   for (const group of NAV_GROUPS) {
-    const items = group.items.filter((item) => visibleItems.includes(item));
+    const items = group.items.filter((item) => visibleItemSet.has(item));
     if (items.length > 0) {
       visibleGroups.push({ ...group, items });
     }
diff --git a/src/components/admin/CardList.tsx b/src/components/admin/CardList.tsx
index 6484236..b5e0a9b 100644
--- a/src/components/admin/CardList.tsx
+++ b/src/components/admin/CardList.tsx
@@ -7,7 +7,7 @@ interface CardListProps {
 
 export function CardList({ children, ariaLabel }: CardListProps) {
   return (
-    <ul role="list" aria-label={ariaLabel} className="space-y-3 px-4 pb-24">
+    <ul aria-label={ariaLabel} className="space-y-3 px-4 pb-24">
       {children}
     </ul>
   );
diff --git a/src/components/admin/CommandPalette.tsx b/src/components/admin/CommandPalette.tsx
index 5f55739..b95e9a7 100644
--- a/src/components/admin/CommandPalette.tsx
+++ b/src/components/admin/CommandPalette.tsx
@@ -322,13 +322,8 @@ function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
             aria-label="Search command palette"
             spellCheck={false}
             autoComplete="off"
+            className="flex-1 min-w-0 border-none outline-none focus-visible:outline-2 focus-visible:outline-[var(--color-accent)] focus-visible:outline-offset-2 bg-transparent text-base"
             style={{
-              flex: 1,
-              minWidth: 0,
-              border: "none",
-              outline: "none",
-              background: "transparent",
-              fontSize: "1rem",
               lineHeight: 1.4,
               color: "var(--admin-text-primary)",
               fontFamily: "inherit",
@@ -424,7 +419,7 @@ function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
                   </span>
                   <span
                     style={{
-                      fontSize: "0.6875rem",
+                      fontSize: "0.75rem",
                       textTransform: "uppercase",
                       letterSpacing: "0.05em",
                       color: "var(--admin-text-muted)",
@@ -445,7 +440,7 @@ function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
           style={{
             padding: "0.5rem 1rem 0.625rem",
             borderTop: "1px solid var(--admin-border)",
-            fontSize: "0.6875rem",
+            fontSize: "0.75rem",
             color: "var(--admin-text-muted)",
             textAlign: "center",
             letterSpacing: "0.02em",
diff --git a/src/components/admin/ContactListPanel.tsx b/src/components/admin/ContactListPanel.tsx
index 0b8e1bf..5b64b02 100644
--- a/src/components/admin/ContactListPanel.tsx
+++ b/src/components/admin/ContactListPanel.tsx
@@ -355,7 +355,7 @@ export default function ContactListPanel({
                       <button type="button"
                         onClick={() => handleDelete(c.id)}
                         disabled={deleting === c.id}
-                        className="p-1.5 rounded-lg hover:bg-red-50 text-stone-400 hover:text-red-500 disabled:opacity-50 transition-colors"
+                        className="p-1.5 rounded-lg hover:bg-red-50 text-red-500 hover:text-red-700 disabled:opacity-50 transition-colors"
                         title="Delete contact"
                       >
                         {Icons.trash("h-4 w-4")}
@@ -386,7 +386,7 @@ export default function ContactListPanel({
                   <button type="button"
                     onClick={() => handleDelete(c.id)}
                     disabled={deleting === c.id}
-                    className="p-1.5 rounded-lg hover:bg-red-50 text-stone-400 hover:text-red-500 disabled:opacity-50"
+                    className="p-1.5 rounded-lg hover:bg-red-50 text-red-500 hover:text-red-700 disabled:opacity-50"
                   >
                     {Icons.trash("h-4 w-4")}
                   </button>
diff --git a/src/components/admin/HarvestReach/SegmentListSidebar.tsx b/src/components/admin/HarvestReach/SegmentListSidebar.tsx
index 3aaf3b7..1a758fd 100644
--- a/src/components/admin/HarvestReach/SegmentListSidebar.tsx
+++ b/src/components/admin/HarvestReach/SegmentListSidebar.tsx
@@ -89,7 +89,15 @@ export default function SegmentListSidebar({ segments, activeSegmentId, onSelect
               </div>
             ) : (
               <div
+                role="button"
+                tabIndex={0}
                 onClick={() => onSelect(segment)}
+                onKeyDown={(e) => {
+                  if (e.key === "Enter" || e.key === " ") {
+                    e.preventDefault();
+                    onSelect(segment);
+                  }
+                }}
                 className={`px-3 py-2.5 rounded-xl cursor-pointer flex items-center justify-between gap-2 transition-all ${
                   activeSegmentId === segment.id
                     ? "bg-[var(--admin-accent-light)] border border-[var(--admin-accent)]"
diff --git a/src/components/admin/ScheduleImportModal.tsx b/src/components/admin/ScheduleImportModal.tsx
index 11fe765..501016f 100644
--- a/src/components/admin/ScheduleImportModal.tsx
+++ b/src/components/admin/ScheduleImportModal.tsx
@@ -297,7 +297,7 @@ export default function ScheduleImportModal({ brandId, onClose, onComplete }: Pr
                       <td className="px-2 py-1.5">
                         <button type="button"
                           onClick={() => removeStop(idx)}
-                          className="flex h-6 w-6 items-center justify-center rounded-lg text-stone-400 hover:bg-red-50 hover:text-red-600 transition-colors"
+                          className="flex h-6 w-6 items-center justify-center rounded-lg text-red-500 hover:bg-red-50 hover:text-red-700 transition-colors"
                         >
                           <svg className="h-3.5 w-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
                             <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
diff --git a/src/components/admin/SideNavGroup.tsx b/src/components/admin/SideNavGroup.tsx
index b2aff24..d0af698 100644
--- a/src/components/admin/SideNavGroup.tsx
+++ b/src/components/admin/SideNavGroup.tsx
@@ -41,7 +41,7 @@ export default function SideNavGroup({
           </span>
         </div>
       )}
-      <ul className="space-y-1" role="list" hidden={collapsed}>
+      <ul className="space-y-1" hidden={collapsed}>
         {children}
       </ul>
     </section>
diff --git a/src/components/admin/stops/StopsDatePicker.tsx b/src/components/admin/stops/StopsDatePicker.tsx
index 2d98844..eb3dd82 100644
--- a/src/components/admin/stops/StopsDatePicker.tsx
+++ b/src/components/admin/stops/StopsDatePicker.tsx
@@ -55,10 +55,8 @@ export function StopsDatePicker({ value }: StopsDatePickerProps) {
           if (!newDate) return;
           router.push(`/admin/v2/stops?date=${newDate}`);
         }}
+        className="bg-transparent border-0 outline-none focus-visible:outline-2 focus-visible:outline-[var(--color-accent)] focus-visible:outline-offset-2"
         style={{
-          background: "transparent",
-          border: 0,
-          outline: "none",
           fontSize: "15px",
           fontWeight: 600,
           color: "var(--color-text)",
diff --git a/src/components/landing/HeroSection.tsx b/src/components/landing/HeroSection.tsx
index 8c51a47..ada2643 100644
--- a/src/components/landing/HeroSection.tsx
+++ b/src/components/landing/HeroSection.tsx
@@ -341,7 +341,7 @@ export default function HeroSection() {
                     background: "linear-gradient(135deg, #1a4d2e 0%, #166534 100%)",
                     color: "white",
                     boxShadow: "0 8px 32px rgba(26, 77, 46, 0.35), inset 0 1px 0 rgba(255, 255, 255, 0.15)",
-                    transition: "all 0.4s cubic-bezier(0.4, 0, 0.2, 1)",
+                    transition: "transform 0.4s cubic-bezier(0.4, 0, 0.2, 1), box-shadow 0.4s cubic-bezier(0.4, 0, 0.2, 1)",
                   }}
                   onMouseEnter={(e) => {
                     e.currentTarget.style.transform = "translateY(-3px)";
@@ -364,7 +364,7 @@ export default function HeroSection() {
                     color: "#1a4d2e",
                     borderColor: "#1a4d2e",
                     background: "rgba(26, 77, 46, 0.03)",
-                    transition: "all 0.3s ease",
+                    transition: "background 0.3s ease, color 0.3s ease",
                   }}
                   onMouseEnter={(e) => {
                     e.currentTarget.style.background = "#1a4d2e";
diff --git a/src/components/landing/TestimonialsAndCTA.tsx b/src/components/landing/TestimonialsAndCTA.tsx
index d93fca7..2f74c0c 100644
--- a/src/components/landing/TestimonialsAndCTA.tsx
+++ b/src/components/landing/TestimonialsAndCTA.tsx
@@ -480,7 +480,7 @@ export default function TestimonialsAndCTA() {
                     cursor: "pointer",
                     textDecoration: "none",
                     boxShadow: "0 8px 32px rgba(26, 77, 46, 0.35), inset 0 1px 0 rgba(255, 255, 255, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.1)",
-                    transition: "all 0.3s ease",
+                    transition: "background 0.3s ease, box-shadow 0.3s ease, transform 0.3s ease, border-color 0.3s ease",
                   }}
                   onMouseEnter={(e) => {
                     e.currentTarget.style.background = "rgba(45, 107, 79, 0.95)";
@@ -536,7 +536,7 @@ export default function TestimonialsAndCTA() {
                     cursor: "pointer",
                     textDecoration: "none",
                     boxShadow: "0 4px 16px rgba(0, 0, 0, 0.08), inset 0 1px 0 rgba(255, 255, 255, 0.5)",
-                    transition: "all 0.3s ease",
+                    transition: "background 0.3s ease, border-color 0.3s ease, box-shadow 0.3s ease, transform 0.3s ease",
                   }}
                   onMouseEnter={(e) => {
                     e.currentTarget.style.background = "rgba(255, 255, 255, 0.9)";
diff --git a/src/components/water/WaterFieldClient.tsx b/src/components/water/WaterFieldClient.tsx
index ab47a21..6dff106 100644
--- a/src/components/water/WaterFieldClient.tsx
+++ b/src/components/water/WaterFieldClient.tsx
@@ -555,7 +555,7 @@ function WaterFieldInner() {
             {t.selectHeadgate}
           </label>
           {isHeadgateLocked ? (
-            <div className="w-full rounded-xl border-2 border-amber-300 bg-amber-50 px-4 py-4 text-lg font-bold text-stone-900">
+            <div className="w-full rounded-xl border-2 border-amber-300 bg-amber-50 px-4 py-4 text-lg font-bold text-amber-900">
               <div className="flex items-center gap-2">
                 <svg className="w-5 h-5 text-amber-600" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
                   <path strokeLinecap="round" strokeLinejoin="round" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"/>
diff --git a/src/lib/supabase.ts b/src/lib/supabase.ts
index ec1860b..8fbfefc 100644
--- a/src/lib/supabase.ts
+++ b/src/lib/supabase.ts
@@ -173,6 +173,15 @@ class MockQueryBuilder<T extends Record<string, unknown> = Record<string, unknow
     let filtered: unknown[] = [];
 
     for (const filter of this.filters) {
+      const inSet = filter.op === "in" && Array.isArray(filter.value)
+        ? new Set(filter.value as unknown[])
+        : null;
+      const likeNeedle = filter.op === "like" && typeof filter.value === "string"
+        ? (filter.value as string).replace(/%/g, "")
+        : null;
+      const ilikeNeedle = filter.op === "ilike" && typeof filter.value === "string"
+        ? (filter.value as string).replace(/%/g, "").toLowerCase()
+        : null;
       filtered = filtered.filter((row) => {
         const r = row as Record<string, unknown>;
         const rowValue = r[filter.column];
@@ -196,17 +205,17 @@ class MockQueryBuilder<T extends Record<string, unknown> = Record<string, unknow
           case "like":
             return (
               typeof rowValue === "string" &&
-              rowValue.includes((filter.value as string).replace(/%/g, ""))
+              likeNeedle !== null &&
+              rowValue.includes(likeNeedle)
             );
           case "ilike":
             return (
               typeof rowValue === "string" &&
-              rowValue
-                .toLowerCase()
-                .includes((filter.value as string).replace(/%/g, "").toLowerCase())
+              ilikeNeedle !== null &&
+              rowValue.toLowerCase().includes(ilikeNeedle)
             );
           case "in":
-            return Array.isArray(filter.value) && filter.value.includes(rowValue);
+            return inSet !== null && inSet.has(rowValue);
           default:
             return true;
         }