diff --git a/CHANGELOG.md b/CHANGELOG.md
index b27be7019..a28502768 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac)
 
-# Upcoming WeKan ® release
+# v6.18 2022-04-08 WeKan ® release
 
 This release adds the following new features:
 
@@ -13,7 +13,9 @@ and fixes the following bugs:
 
 - [Fix Card Description on dark theme is too dark](https://github.com/wekan/wekan/pull/4466).
   Thanks to TheExo.
-- [Removed browser contect policy so that attachments would be visible](https://github.com/wekan/wekan/commit/8a39a52d5d4d151dd90604091e35e51b6744e599).
+- Removed browser contect policy so that attachments would be visible.
+  [Part 1](https://github.com/wekan/wekan/commit/8a39a52d5d4d151dd90604091e35e51b6744e599),
+  [Part 2](https://github.com/wekan/wekan/commit/12448ab473c08a2c3c873d7ffa2b78e7630dc87a).
   Thanks to xet7.
 
 Thanks to above GitHub users for their contributions and translators for their translations.
diff --git a/Stackerfile.yml b/Stackerfile.yml
index 9449f7c8f..80a6a9b1e 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v6.17.0"
+appVersion: "v6.18.0"
 files:
   userUploads:
     - README.md
diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml
index 16068f8cc..9836fd932 100644
--- a/helm/wekan/Chart.yaml
+++ b/helm/wekan/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "6.17"
+appVersion: "6.18"
 dependencies:
   - condition: mongodb.enabled
     name: mongodb
diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml
index 4cfd6f782..4ab573615 100644
--- a/helm/wekan/values.yaml
+++ b/helm/wekan/values.yaml
@@ -14,7 +14,7 @@ serviceAccounts:
 ##
 image:
   repository: quay.io/wekan/wekan
-  tag: v6.17
+  tag: v6.18
   pullPolicy: IfNotPresent
 
 ## Configuration for wekan component
diff --git a/package-lock.json b/package-lock.json
index 62057ccc5..20cb8f524 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v6.17.0",
+  "version": "v6.18.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b59d4df0c..ecd321389 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v6.17.0",
+  "version": "v6.18.0",
   "description": "Open-Source kanban",
   "private": true,
   "repository": {
diff --git a/public/api/wekan.html b/public/api/wekan.html
index 95548b327..032c2ac07 100644
--- a/public/api/wekan.html
+++ b/public/api/wekan.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v6.17</title>
+    <title>Wekan REST API v6.18</title>
 
     <style>
     </style>
@@ -1558,7 +1558,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v6.17">Wekan REST API v6.17</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v6.18">Wekan REST API v6.18</a>
             
           </li>
         
@@ -2156,7 +2156,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v6.17</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v6.18</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>
@@ -19325,6 +19325,10 @@ UserSecurity
 <td>moderndark</td>
 </tr>
 <tr>
+<td>color</td>
+<td>exodark</td>
+</tr>
+<tr>
 <td>presentParentTask</td>
 <td>prefix-with-full-path</td>
 </tr>
diff --git a/public/api/wekan.yml b/public/api/wekan.yml
index 20245b5d1..02f5f6e04 100644
--- a/public/api/wekan.yml
+++ b/public/api/wekan.yml
@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v6.17
+  version: v6.18
   description: |
     The REST API allows you to control and extend Wekan with ease.
 
@@ -2795,6 +2795,7 @@ definitions:
           - natural
           - modern
           - moderndark
+          - exodark
       description:
         description: |
            The description of the board
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 35a1867c3..42d63bc0a 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 617,
+    appVersion = 618,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "6.17.0~2022-04-06"),
+    appMarketingVersion = (defaultText = "6.18.0~2022-04-08"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 300d4e3ab..a3a91cf7c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: wekan
-version: '6.17'
+version: '6.18'
 summary: Open Source kanban
 description: |
    WeKan ® is an Open Source and collaborative kanban board application.