diff --git a/client/src/components/Assistant/cards/atlas/AtlasBucketCard.tsx b/client/src/components/Assistant/cards/atlas/AtlasBucketCard.tsx
index 6bc5aa3d7..0dde89d38 100644
--- a/client/src/components/Assistant/cards/atlas/AtlasBucketCard.tsx
+++ b/client/src/components/Assistant/cards/atlas/AtlasBucketCard.tsx
@@ -1,4 +1,4 @@
-import type { AssistantMessage, AtlasBucketCard as BucketCard, AtlasBucketEntry } from '@trek/shared';
+import type { AssistantMessage, AtlasBucketEntry, AtlasBucketCard as BucketCard } from '@trek/shared';
 import { CalendarDays, Check, NotebookPen, Star, Tag, TriangleAlert } from 'lucide-react';
 
 import { useTranslation } from '../../../../i18n';
diff --git a/client/src/components/Assistant/cards/journey/journeyCardModel.test.ts b/client/src/components/Assistant/cards/journey/journeyCardModel.test.ts
index 60e2f07e1..3f1f41d60 100644
--- a/client/src/components/Assistant/cards/journey/journeyCardModel.test.ts
+++ b/client/src/components/Assistant/cards/journey/journeyCardModel.test.ts
@@ -12,8 +12,8 @@ import { describe, expect, it } from 'vitest';
 
 import { CARD_RULES, ENTITY_LOOK, STEP_LOOKS, TOOL_LABELS, VERB_LOOK } from '../cardLooks';
 import { coverEntryOf, journalTarget, mergeJournalCards } from './journeyCardModel';
-import { flagOf, moodOf, stateOf, weatherOf } from './journeyTones';
 import { JOURNEY_LOOK } from './journeyLook';
+import { flagOf, moodOf, stateOf, weatherOf } from './journeyTones';
 
 function look(over: Partial<JourneyEntryLook> = {}): JourneyEntryLook {
   return {
diff --git a/client/src/components/Assistant/cards/packing/PackingListCard.tsx b/client/src/components/Assistant/cards/packing/PackingListCard.tsx
index f9d30f540..9102578d3 100644
--- a/client/src/components/Assistant/cards/packing/PackingListCard.tsx
+++ b/client/src/components/Assistant/cards/packing/PackingListCard.tsx
@@ -1,4 +1,4 @@
-import type { PackingCardGroup, PackingListCard as PackingCard } from '@trek/shared';
+import type { PackingListCard as PackingCard, PackingCardGroup } from '@trek/shared';
 import { Check } from 'lucide-react';
 
 import { useTranslation } from '../../../../i18n';
diff --git a/client/src/components/Assistant/cards/packing/TodoListCard.tsx b/client/src/components/Assistant/cards/packing/TodoListCard.tsx
index 08bc58a91..e617a8e2a 100644
--- a/client/src/components/Assistant/cards/packing/TodoListCard.tsx
+++ b/client/src/components/Assistant/cards/packing/TodoListCard.tsx
@@ -1,4 +1,4 @@
-import type { TodoCardGroup, TodoCardItem, TodoListCard as TodoCard } from '@trek/shared';
+import type { TodoListCard as TodoCard, TodoCardGroup, TodoCardItem } from '@trek/shared';
 import { CalendarDays, Flag, ListTodo, PencilLine, StickyNote, Tag, User } from 'lucide-react';
 
 import { useTranslation } from '../../../../i18n';
diff --git a/client/src/components/Assistant/cards/packing/checklistModel.ts b/client/src/components/Assistant/cards/packing/checklistModel.ts
index ba4b10bdf..e78717aac 100644
--- a/client/src/components/Assistant/cards/packing/checklistModel.ts
+++ b/client/src/components/Assistant/cards/packing/checklistModel.ts
@@ -10,7 +10,7 @@ import { Check, Circle, CircleDashed, type LucideIcon, PencilLine, Plus, Trash2,
 
 import { KAT_COLORS as PACKING_COLORS } from '../../../Packing/packingListPanel.constants';
 import { katColor as packingHashColor } from '../../../Packing/packingListPanel.helpers';
-import { katColor as todoHashColor, KAT_COLORS as TODO_COLORS } from '../../../Todo/todoListModel';
+import { KAT_COLORS as TODO_COLORS, katColor as todoHashColor } from '../../../Todo/todoListModel';
 import type { Tone } from '../parts/assistantTones';
 
 /**
diff --git a/client/src/components/Assistant/cards/tour/TourRouteHead.tsx b/client/src/components/Assistant/cards/tour/TourRouteHead.tsx
index 04c96defc..2e7162d97 100644
--- a/client/src/components/Assistant/cards/tour/TourRouteHead.tsx
+++ b/client/src/components/Assistant/cards/tour/TourRouteHead.tsx
@@ -12,7 +12,7 @@ import { tourDayRowIcon } from '../../../Tours/tourDayRowIcon';
 import { CardFacts } from '../parts/CardFacts';
 import RouteSketch from '../parts/RouteSketch';
 import { useCardFormat } from '../parts/useCardFormat';
-import { type FactKey, factKeysOf, factValue, percentText } from './tourRouteModel';
+import { factKeysOf, factValue, percentText, type FactKey } from './tourRouteModel';
 import { sketchOf } from './tourRouteSketchModel';
 import { routeName, SAC_WORDS, timeLabelKey, TOUR_TYPE_WORDS } from './tourRouteWords';
 
diff --git a/client/src/components/Assistant/cards/tour/TourRouteStops.tsx b/client/src/components/Assistant/cards/tour/TourRouteStops.tsx
index 42609eb80..1c01795c1 100644
--- a/client/src/components/Assistant/cards/tour/TourRouteStops.tsx
+++ b/client/src/components/Assistant/cards/tour/TourRouteStops.tsx
@@ -4,8 +4,8 @@ import { createElement } from 'react';
 
 import { useTranslation } from '../../../../i18n';
 import {
-  type DistanceIndexedProfileSample,
   focusRouteProfileAtDistance,
+  type DistanceIndexedProfileSample,
   type RouteProfileFocus,
 } from '../../../../utils/routeGeometry';
 import { TOUR_POI_LOOKS } from '../../../Map/poiCategories';
diff --git a/client/src/components/Tours/hike/HikeWaysList.tsx b/client/src/components/Tours/hike/HikeWaysList.tsx
index 54e5fdd3f..774c0538a 100644
--- a/client/src/components/Tours/hike/HikeWaysList.tsx
+++ b/client/src/components/Tours/hike/HikeWaysList.tsx
@@ -8,8 +8,8 @@ import { Tooltip } from '../../shared/Tooltip';
 import { bikePaintCss } from '../bike/bikePaint';
 import { FigureBadge } from '../paddle/FigureBadge';
 import { CardAction } from '../tourParts';
-import { HIKE_FACETS, type HikeFacet } from './hikeFacetSpecs';
 import { facetPaint, isUnknownClass, type FacetRow } from './hikeFacets';
+import { HIKE_FACETS, type HikeFacet } from './hikeFacetSpecs';
 import { hikePaintCss } from './hikePaint';
 import { sacStepOfClass } from './sacGrades';
 import { GradeChip } from './SacStepChip';
diff --git a/client/tests/unit/studio/studioStore.adoptRemote.test.ts b/client/tests/unit/studio/studioStore.adoptRemote.test.ts
index 728c4ec0e..7642b968a 100644
--- a/client/tests/unit/studio/studioStore.adoptRemote.test.ts
+++ b/client/tests/unit/studio/studioStore.adoptRemote.test.ts
@@ -1,5 +1,5 @@
-import { describe, it, expect, beforeEach } from 'vitest';
 import type { BookDocument, BookElement, BookSpread } from '@trek/shared';
+import { beforeEach, describe, expect, it } from 'vitest';
 import { useStudioStore } from '../../../src/store/studioStore';
 
 /**