diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08447caa..183b1d82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Ceiling] Unreleased
 
+## [Ceiling] 1.5.36 - 2026-08-23
+
+This release closes out the current maintenance queue with safer local state, more accurate usage and cost reporting, and better behavior across the desktop, CLI, and MCP server. It also adds multi-account CLI usage, restores detached Settings window geometry, and strengthens accessibility regression coverage.
+
+The Windows server token now rotates after unsafe exposure. Concurrent and corrupt settings files fail safely, startup ownership is respected, refresh intervals work as configured, and account or quota views no longer substitute misleading data.
+
 ### Security
 - **A leaked `serve.token` is rotated on Windows, not just Unix.** After SBS-953, a world-readable token was replaced on Unix, but Windows still tightened the DACL and reused the same secret. The ACL is now inspected before tightening; if anyone other than the current user, SYSTEM, or Administrators can read the file, the token is replaced. Closes SBS-1043.
 
diff --git a/Cargo.lock b/Cargo.lock
index 14bc2ecb..572904de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -664,7 +664,7 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "codexbar"
-version = "1.5.35"
+version = "1.5.36"
 dependencies = [
  "aes-gcm",
  "anyhow",
@@ -707,7 +707,7 @@ dependencies = [
 
 [[package]]
 name = "codexbar-desktop-tauri"
-version = "1.5.35"
+version = "1.5.36"
 dependencies = [
  "chrono",
  "chrono-tz",
diff --git a/apps/desktop-tauri/package.json b/apps/desktop-tauri/package.json
index b31d5832..ead3f861 100644
--- a/apps/desktop-tauri/package.json
+++ b/apps/desktop-tauri/package.json
@@ -1,7 +1,7 @@
 {
   "name": "desktop-tauri",
   "private": true,
-  "version": "1.5.35",
+  "version": "1.5.36",
   "packageManager": "pnpm@10.18.1",
   "type": "module",
   "scripts": {
diff --git a/apps/desktop-tauri/src-tauri/Cargo.toml b/apps/desktop-tauri/src-tauri/Cargo.toml
index 30cc9f90..3ab283e1 100644
--- a/apps/desktop-tauri/src-tauri/Cargo.toml
+++ b/apps/desktop-tauri/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "codexbar-desktop-tauri"
-version = "1.5.35"
+version = "1.5.36"
 edition = "2024"
 publish = false
 
diff --git a/apps/desktop-tauri/src-tauri/tauri.conf.json b/apps/desktop-tauri/src-tauri/tauri.conf.json
index a3b8df37..0873443f 100644
--- a/apps/desktop-tauri/src-tauri/tauri.conf.json
+++ b/apps/desktop-tauri/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Ceiling",
-  "version": "1.5.35",
+  "version": "1.5.36",
   "identifier": "io.github.tsouth89.ceiling",
   "build": {
     "beforeDevCommand": "pnpm run dev",
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index a35c2eec..d7c46abe 100755
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "codexbar"
-version = "1.5.35"
+version = "1.5.36"
 edition = "2024"
 authors = ["Ceiling Contributors"]
 description = "Local-first Windows companion for monitoring AI capacity and reset times"
diff --git a/version.env b/version.env
index 7420ed40..865bb7de 100755
--- a/version.env
+++ b/version.env
@@ -1,2 +1,2 @@
-MARKETING_VERSION=1.5.35
-BUILD_NUMBER=137
+MARKETING_VERSION=1.5.36
+BUILD_NUMBER=138