diff --git a/.planning/ROADMAP.md b/.planning/ROADMAP.md
index 630ce13..201938f 100644
--- a/.planning/ROADMAP.md
+++ b/.planning/ROADMAP.md
@@ -450,7 +450,7 @@ Plans:
 | 14. Desktop E2E Coverage         | v1.1 | 1/1 | Complete    | 2026-06-12 |
 | 15. Doc-Only CI Skip + MD Lint   | v1.1 | 3/3 | Complete    | 2026-06-12 |
 | 16. CI Dep Audit, Sec & Img Hyg  | v1.1 | 6/6 | Complete    | 2026-06-13 |
-| 17. UI Optimization & Polish     | v1.1 | 6/6 | Complete   | 2026-06-18 |
+| 17. UI Optimization & Polish     | v1.1 | 6/6 | Complete    | 2026-06-18 |
 | 18. Auto Timezone Detection      | v1.1 | 4/4 | Complete    | 2026-06-14 |
 | 19. Local Auth (No-OIDC Mode)    | v1.1 | 5/5 | Complete    | 2026-06-17 |
 
@@ -460,7 +460,7 @@ Plans:
 
 **Goal:** [Captured for future planning] Abstract the calendar backend behind a provider interface so Fastmail/CalDAV is one implementation among potentially many. Shipping with a single provider is fine, but the broker, sync, and event-expansion layers should be structured so additional providers (e.g. other CalDAV hosts, Google Calendar, generic ICS feeds) can be added without rework. Captures the "provider" seam as an explicit architectural concern.
 **Requirements:** TBD
-**Plans:** 7/7 plans complete
+**Plans:** 6/6 plans complete
 
 Plans:
 
diff --git a/.planning/STATE.md b/.planning/STATE.md
index 73f71f4..a17be3b 100644
--- a/.planning/STATE.md
+++ b/.planning/STATE.md
@@ -2,19 +2,19 @@
 gsd_state_version: 1.0
 milestone: v1.1
 milestone_name: Operability & Polish
-current_phase: 17
-current_phase_name: ui-optimization-polish
+current_phase: 18
+current_phase_name: Auto timezone detection and ability to change timezone
 status: executing
 stopped_at: Phase 17 UI-SPEC approved
-last_updated: "2026-06-18T16:09:11.585Z"
+last_updated: "2026-06-18T17:11:30.158Z"
 last_activity: 2026-06-18
-last_activity_desc: Phase 17 execution started
+last_activity_desc: Phase 17 complete, transitioned to Phase 18
 progress:
   total_phases: 26
-  completed_phases: 11
+  completed_phases: 12
   total_plans: 55
-  completed_plans: 48
-  percent: 42
+  completed_plans: 54
+  percent: 46
 ---
 
 # Project State
@@ -28,10 +28,10 @@ See: .planning/PROJECT.md (updated 2026-06-16)
 
 ## Current Position
 
-Phase: 17 (ui-optimization-polish) — EXECUTING
-Plan: 1 of 6
+Phase: 18 — Auto timezone detection and ability to change timezone
+Plan: Not started
 Status: Executing Phase 17
-Last activity: 2026-06-18 — Phase 17 execution started
+Last activity: 2026-06-18 — Phase 17 complete, transitioned to Phase 18
 
 ### ✅ Resolved Checkpoint — Phase 15 Plan 15-03 Task 2 (human-action)
 
@@ -41,7 +41,7 @@ Done 2026-06-12. Gitea branch protection on `main` now requires EXACTLY `CI / fa
 
 **Velocity:**
 
-- Total plans completed: 60
+- Total plans completed: 66
 - Average duration: -
 - Total execution time: 0 hours
 
@@ -61,6 +61,7 @@ Done 2026-06-12. Gitea branch protection on `main` now requires EXACTLY `CI / fa
 | 11 | 5 | - | - |
 | 12 | 7 | - | - |
 | 19 | 5 | - | - |
+| 17 | 6 | - | - |
 
 **Recent Trend:**