diff --git a/.changes/jni-0.21.md b/.changes/jni-0.21.md
new file mode 100644
index 000000000..e92e0916d
--- /dev/null
+++ b/.changes/jni-0.21.md
@@ -0,0 +1,5 @@
+---
+"tao": minor
+---
+
+Update jni to 0.21.
diff --git a/.changes/removed-feats.md b/.changes/removed-feats.md
new file mode 100644
index 000000000..a8a5e20cc
--- /dev/null
+++ b/.changes/removed-feats.md
@@ -0,0 +1,13 @@
+---
+"tao": "minor"
+---
+
+This release contains a number of **breaking changes** that aimed at removing menus, system-tray and global-shortcuts features which have been moved to different crates, [`muda`](https://github.com/tauri-apps/muda/), [`tray-icon`](https://github.com/tauri-apps/tray-icon/) and [`global-hotkey`](https://github.com/tauri-apps/global-hotkey) and here is a summary of the changes:
+
+- Removed `tray` crago feature flag.
+- Removed `accelerator`, `menu`, `system_tray` and `global_shortcut` modules and all associated types.
+- Removed `Event::MenuEvent`, `Event::TrayEvent`, `Event::GlobalShortcutEvent`, `TrayEvent` and `Rectangle` types.
+- Added `EventLoopBuilder` type.
+- Removed `EventLoop::with_user_event`, instead use `EventLoopBuilder::<T>::with_user_event().build()`.
+- Removed `EventLoopExtWindows`, `EventLoopExtMacOS` and `EventLoopExtUnix`, instead use `EventLoopBuilderExtWindows`, `EventLoopBuilderExtMacOS` and `EventLoopBuilderExtUnix`.
+- Changed `WindowExtWindows::hinstance`, `WindowExtWindows::hwnd` and `MonitorHandleExtWindow::hmonitor` to return `isize` instead of `*const c_void`
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3356e881d..827f1a8e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,18 +1,5 @@
 # Changelog
 
-## \[0.22.0]
-
-- [`06b617ea`](https://github.com/tauri-apps/tao/commit/06b617eaa2cea7039e9b71b8322b517486e3b1e5)([#776](https://github.com/tauri-apps/tao/pull/776)) Update jni to 0.21.
-- [`d0b20c94`](https://github.com/tauri-apps/tao/commit/d0b20c94eaf555ba27f3cfbbf2636e3f3b036a97)([#778](https://github.com/tauri-apps/tao/pull/778)) This release contains a number of **breaking changes** that aimed at removing menus, system-tray and global-shortcuts features which have been moved to different crates, [`muda`](https://github.com/tauri-apps/muda/), [`tray-icon`](https://github.com/tauri-apps/tray-icon/) and [`global-hotkey`](https://github.com/tauri-apps/global-hotkey) and here is a summary of the changes:
-
-  - Removed `tray` crago feature flag.
-  - Removed `accelerator`, `menu`, `system_tray` and `global_shortcut` modules and all associated types.
-  - Removed `Event::MenuEvent`, `Event::TrayEvent`, `Event::GlobalShortcutEvent`, `TrayEvent` and `Rectangle` types.
-  - Added `EventLoopBuilder` type.
-  - Removed `EventLoop::with_user_event`, instead use `EventLoopBuilder::<T>::with_user_event().build()`.
-  - Removed `EventLoopExtWindows`, `EventLoopExtMacOS` and `EventLoopExtUnix`, instead use `EventLoopBuilderExtWindows`, `EventLoopBuilderExtMacOS` and `EventLoopBuilderExtUnix`.
-  - Changed `WindowExtWindows::hinstance`, `WindowExtWindows::hwnd` and `MonitorHandleExtWindow::hmonitor` to return `isize` instead of `*const c_void`
-
 ## \[0.21.1]
 
 - [`9a320882`](https://github.com/tauri-apps/tao/commit/9a320882ed824d18f9e20f8a9af7a97f51805c87)([#761](https://github.com/tauri-apps/tao/pull/761)) On Android, use a lockfree queue (crossbeam channel) to prevent deadlocks inside send_event.
diff --git a/Cargo.toml b/Cargo.toml
index c5ba931f3..c290fd74a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "tao"
-version = "0.22.0"
+version = "0.21.1"
 description = "Cross-platform window manager library."
 authors = [
   "Tauri Programme within The Commons Conservancy",
-  "The winit contributors"
+  "The winit contributors",
 ]
 edition = "2021"
 rust-version = "1.56"
@@ -13,25 +13,25 @@ license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/tauri-apps/tao"
 documentation = "https://docs.rs/tao"
-categories = [ "gui" ]
+categories = ["gui"]
 
 [package.metadata.docs.rs]
-features = [ "serde", "dox" ]
+features = ["serde", "dox"]
 default-target = "x86_64-unknown-linux-gnu"
 targets = [
   "i686-pc-windows-msvc",
   "x86_64-pc-windows-msvc",
   "i686-unknown-linux-gnu",
   "x86_64-unknown-linux-gnu",
-  "x86_64-apple-darwin"
+  "x86_64-apple-darwin",
 ]
 
 [workspace]
-members = [ "tao-macros" ]
+members = ["tao-macros"]
 
 [features]
-default = [ ]
-dox = [ "gtk/dox" ]
+default = []
+dox = ["gtk/dox"]
 
 [build-dependencies]
 cc = "1"
@@ -41,7 +41,7 @@ instant = "0.1"
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
-serde = { version = "1", optional = true, features = [ "serde_derive" ] }
+serde = { version = "1", optional = true, features = ["serde_derive"] }
 raw-window-handle = "0.5"
 bitflags = "1"
 crossbeam-channel = "0.5"
@@ -104,7 +104,7 @@ windows-implement = "0.48.0"
   "Win32_UI_Input_Touch",
   "Win32_UI_Shell",
   "Win32_UI_TextServices",
-  "Win32_UI_WindowsAndMessaging"
+  "Win32_UI_WindowsAndMessaging",
 ]
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]