diff --git a/.changeset/five-pigs-talk.md b/.changeset/five-pigs-talk.md
deleted file mode 100644
index 8ab089ce40..0000000000
--- a/.changeset/five-pigs-talk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Organize provider settings into separate components
diff --git a/.changeset/pretty-peaches-bake.md b/.changeset/pretty-peaches-bake.md
deleted file mode 100644
index 046228ea50..0000000000
--- a/.changeset/pretty-peaches-bake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Split Cline.getEnvironmentDetails out into a standalone function
diff --git a/.changeset/three-rings-approve.md b/.changeset/three-rings-approve.md
deleted file mode 100644
index b928b40da0..0000000000
--- a/.changeset/three-rings-approve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Enable Gemini prompt caching by default
diff --git a/.changeset/v3.16.0.md b/.changeset/v3.16.0.md
deleted file mode 100644
index 63331e75bf..0000000000
--- a/.changeset/v3.16.0.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-"roo-cline": minor
----
-
-## New Features
-
-- Add Groq and Chutes API providers (thanks @shariqriazz!)
-- Clickable code references in model responses navigate to source lines (thanks @KJ7LNW!)
-
-## Improvements
-
-- Organize provider settings into separate components (thanks @cte!)
-- Move remaining provider settings into separate components (thanks @cte!)
-- Use Lucide icons and translations in the code block (thanks @mrubens!)
-- Improve accessibility of Auto-Approve Toggles (thanks @Deon588!)
-- Add support for tests that use ESM libraries (thanks @cte!)
-
-## Fixes
-
-- Requesty provider fixes (thanks @dtrugman!)
-- Fix migration and persistence of modeApiConfigs for per-mode API profiles (thanks @alasano!)
-
-## Code Quality
-
-- Webview message handler + terminal settings cleanup (thanks @cte!)
-- Tidy up the Cline class (thanks @cte!)
-- Move environment details to a separate module, add tests (thanks @cte!)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d32b9e54e5..4430283459 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Roo Code Changelog
 
+## [3.16.0] - 2025-05-06
+
+- Add vertical tab navigation to the settings (thanks @dlab-anton)
+- Add Groq and Chutes API providers (thanks @shariqriazz)
+- Clickable code references in code block (thanks @KJ7LNW)
+- Improve accessibility of ato-approve toggles (thanks @Deon588)
+- Requesty provider fixes (thanks @dtrugman)
+- Fix migration and persistence of per-mode API profiles (thanks @alasano)
+- Fix usage of `path.basename` in the extension webview (thanks @samhvw8)
+- Fix display issue of the programming language dropdown in the code block component (thanks @zhangtony239)
+- MCP server errors are now captured and shown in a new "Errors" tab (thanks @robertheadley)
+- Error logging will no longer break MCP functionality if the server is properly connected (thanks @ksze)
+- You can now toggle the `terminal.integrated.inheritEnv` VSCode setting directly for the Roo Code settings (thanks @KJ7LNW)
+- Add `gemini-2.5-pro-preview-05-06` to the Vertex and Gemini providers (thanks @zetaloop)
+- Ensure evals exercises are up-to-date before running evals (thanks @shariqriazz)
+- Lots of general UI improvements (thanks @elianiva)
+- Organize provider settings into separate components
+- Improved icons and translations for the code block component
+- Add support for tests that use ESM libraries
+- Move environment detail generation to a separate module
+- Enable prompt caching by default for supported Gemini models
+
 ## [3.15.5] - 2025-05-05
 
 - Update @google/genai to 0.12 (includes some streaming completion bug fixes)
diff --git a/package-lock.json b/package-lock.json
index 621a1e0186..752d3c5a51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "roo-cline",
-	"version": "3.15.5",
+	"version": "3.16.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "roo-cline",
-			"version": "3.15.5",
+			"version": "3.16.0",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.10.2",
 				"@anthropic-ai/sdk": "^0.37.0",
diff --git a/package.json b/package.json
index a8cff07011..8e71c861fc 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.15.5",
+	"version": "3.16.0",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",