diff --git a/.changeset/true-horses-design.md b/.changeset/true-horses-design.md
deleted file mode 100644
index 1a28fc8..0000000
--- a/.changeset/true-horses-design.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@simple-photo-gallery/common": patch
-"simple-photo-gallery": patch
-"@simple-photo-gallery/theme-modern": patch
----
-
-Improve robustness, performance and correctness
diff --git a/common/CHANGELOG.md b/common/CHANGELOG.md
new file mode 100644
index 0000000..a3474f8
--- /dev/null
+++ b/common/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @simple-photo-gallery/common
+
+## 2.1.8
+
+### Patch Changes
+
+- 9903210: Improve robustness, performance and correctness
diff --git a/common/package.json b/common/package.json
index 9e6bd49..490da2f 100644
--- a/common/package.json
+++ b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@simple-photo-gallery/common",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Shared utilities and types for Simple Photo Gallery",
   "license": "MIT",
   "author": "Vladimir Haltakov, Tomasz Rusin",
diff --git a/gallery/CHANGELOG.md b/gallery/CHANGELOG.md
new file mode 100644
index 0000000..6dce7d2
--- /dev/null
+++ b/gallery/CHANGELOG.md
@@ -0,0 +1,10 @@
+# simple-photo-gallery
+
+## 2.1.8
+
+### Patch Changes
+
+- 9903210: Improve robustness, performance and correctness
+- Updated dependencies [9903210]
+  - @simple-photo-gallery/common@2.1.8
+  - @simple-photo-gallery/theme-modern@2.1.8
diff --git a/gallery/package.json b/gallery/package.json
index bec4080..00c597b 100644
--- a/gallery/package.json
+++ b/gallery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-photo-gallery",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Simple Photo Gallery CLI",
   "license": "MIT",
   "author": "Vladimir Haltakov, Tomasz Rusin",
diff --git a/themes/modern/CHANGELOG.md b/themes/modern/CHANGELOG.md
new file mode 100644
index 0000000..3c8e8e8
--- /dev/null
+++ b/themes/modern/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @simple-photo-gallery/theme-modern
+
+## 2.1.8
+
+### Patch Changes
+
+- 9903210: Improve robustness, performance and correctness
diff --git a/themes/modern/package.json b/themes/modern/package.json
index 7c1e0a3..9478beb 100644
--- a/themes/modern/package.json
+++ b/themes/modern/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@simple-photo-gallery/theme-modern",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Modern theme for Simple Photo Gallery",
   "license": "MIT",
   "author": "Vladimir Haltakov, Tomasz Rusin",