diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b4efe13..50972bd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,9 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.0] - 2026-05-28
+## [0.4.0] - 2026-05-28
+
+Theme system milestone (epic #37). Git tag **`0.4.0`** — use this release for binaries; earlier tag `0.3.0` was a pre-PR snapshot.
 
 ### Added
 
diff --git a/docs/roadmap.md b/docs/roadmap.md
index 2155d6d3..30a36187 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -4,7 +4,7 @@ Living document for planned work. Not a commitment order; adjust as priorities c
 
 ## Theme system
 
-- **Shipped in 0.3.0 (epic #37):** runtime themes, VS Code `colors` + `tokenColors` import, SQL/JSON
+- **Shipped in 0.4.0 (epic #37):** runtime themes, VS Code `colors` + `tokenColors` import, SQL/JSON
   highlighting, P0 workbench migration, Preferences, tests, docs — [theme.md](theme.md).
 - **Optional:** Preferences → **Animate theme changes** (off by default).
 - **Later:** P2 Mongo/Redis token colors; `re_editor` if perf gap; LSP epic per
diff --git a/docs/theme.md b/docs/theme.md
index bf4a381d..f310fbf5 100644
--- a/docs/theme.md
+++ b/docs/theme.md
@@ -5,7 +5,7 @@ editor syntax tokens, and optional import of community `.json` / `.jsonc` themes
 
 ## Milestone status
 
-**Theme system epic ([#37](https://github.com/QueryaHub/Querya-Desktop/issues/37)) — complete on `dev` (2026-05-28).**
+**Theme system epic ([#37](https://github.com/QueryaHub/Querya-Desktop/issues/37)) — shipped in **0.4.0** (2026-05-28).**
 
 Delivered: models (#38), JSONC parser (#39), `ThemeController` (#40–41), Preferences +
 import (#43–45), `tokenColors` → syntax highlight (#46–47, #49–50), P0 workbench tokens
diff --git a/pubspec.yaml b/pubspec.yaml
index 252517f8..2e8cecdb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: querya_desktop
 description: Lightweight desktop SQL/NoSQL client. Flutter (Dart).
-version: 0.3.1+5
+version: 0.4.0+6