diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 47bf58d7..02e476b4 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -16,7 +16,7 @@ on:
         default: false
 
 env:
-    VNOTE_VER: 3.17.0
+    VNOTE_VER: 3.18.0
     CMAKE_VER: 3.24.3
 
 jobs:
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index eb7dab05..1c3f8b96 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -16,7 +16,7 @@ on:
         default: false
 
 env:
-    VNOTE_VER: 3.17.0
+    VNOTE_VER: 3.18.0
     CMAKE_VER: 3.24.3
 
 jobs:
diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
index 1ef07933..8eac6283 100644
--- a/.github/workflows/ci-win.yml
+++ b/.github/workflows/ci-win.yml
@@ -16,7 +16,7 @@ on:
         default: false
 
 env:
-    VNOTE_VER: 3.17.0
+    VNOTE_VER: 3.18.0
 
 jobs:
   build:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb1aa805..eb824592 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.20)
 set(CMAKE_OSX_DEPLOYMENT_TARGET "12.1" CACHE STRING "Minimum OS X deployment version")
 
 project(VNote
-    VERSION 3.17.0
+    VERSION 3.18.0
     DESCRIPTION "A pleasant note-taking platform"
     HOMEPAGE_URL "https://app.vnote.fun"
     LANGUAGES C CXX)
diff --git a/changes.md b/changes.md
index dff3b21f..48154190 100644
--- a/changes.md
+++ b/changes.md
@@ -1,4 +1,12 @@
 # Changes
+## v3.18.0
+* Upgrade to Qt6
+* Support MacOS universal build
+* Upgrade Mermaid, Flowchart.js, and markdown-it
+* Markdown-it
+    * Fix XSS protection and turn it on by default
+    * Support mark by `==xx==`
+
 ## v3.17.0
 * Quick note: create note in given scheme (@feloxx)
 * MarkdownEditor: support inserting multiple images (@feloxx)
diff --git a/scripts/update_version.py b/scripts/update_version.py
index 7f873002..08f61c09 100644
--- a/scripts/update_version.py
+++ b/scripts/update_version.py
@@ -9,6 +9,11 @@ if len(sys.argv) < 2:
 newVersion = sys.argv[1]
 print("New version: {0}".format(newVersion))
 
+# CMakeList
+regExp = re.compile('(\\s+)VERSION \\S+')
+for line in fileinput.input(['CMakeLists.txt'], inplace = True):
+    print(regExp.sub('\\1VERSION ' + newVersion, line), end='')
+
 # vnotex.json
 regExp = re.compile('(\\s+)"version" : "\\S+"')
 for line in fileinput.input(['src/data/core/vnotex.json'], inplace = True):
diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist
index 86e7f456..c90f6a3b 100644
--- a/src/data/core/Info.plist
+++ b/src/data/core/Info.plist
@@ -27,7 +27,7 @@
     <key>CFBundleShortVersionString</key>
     <string>3.17</string>
     <key>CFBundleVersion</key>
-    <string>3.17.0</string>
+    <string>3.18.0</string>
     <key>NSHumanReadableCopyright</key>
     <string>Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun</string>
     <key>CFBundleIconFile</key>
diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json
index 98ef3826..78aec143 100644
--- a/src/data/core/vnotex.json
+++ b/src/data/core/vnotex.json
@@ -3,7 +3,7 @@
     "metadata" : {
         "//comment": "When releasing new version, please go through the following configs to check if override is needed.",
         "//Comment": "markdown_editor#override_viewer_resource",
-        "version" : "3.17.0"
+        "version" : "3.18.0"
     },
     "core" : {
         "theme" : "pure",
diff --git a/src/data/extra/docs/en/welcome.md b/src/data/extra/docs/en/welcome.md
index 65a5f43b..a92f5c36 100644
--- a/src/data/extra/docs/en/welcome.md
+++ b/src/data/extra/docs/en/welcome.md
@@ -11,4 +11,4 @@ For more information, please visit [**VNote's Home Page**](https://vnotex.github
 * Feedbacks are appreciated! Please [post an issue](https://github.com/vnotex/vnote/issues) on GitHub if there is any.
 
 ### Windows Users
-* if VNote hangs frequently or behaves unexpectedly in interface, please check the **OpenGL** option. [Details here](https://github.com/vnotex/vnote/issues/853).
+* If VNote hangs frequently or behaves unexpectedly in interface, please check the **OpenGL** option. Check details [here](https://github.com/vnotex/vnote/issues/853).