diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5fb784df..98a9583a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,6 +3,9 @@ name: CI
 on:
   - push
   - pull_request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   lint:
     name: Run linters
diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index 9156aa6e..c4025c05 100644
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -17,7 +17,7 @@ h2 a, h2 span {
 }
 
 pre {
-    line-height: 110%;
+    line-height: normal;
     background-color: white;
     border-radius: 0;
 }
@@ -56,6 +56,34 @@ pre {
     color: #999;
 }
 
+ul.dropdown-menu > li > form {
+    display: block;
+    width: 100%;
+}
+
+ul.dropdown-menu > li > form > button {
+    /* taken from bootstrap's styling for '.dropdown-menu > li > a' */
+    background: none;
+    border: none;
+    cursor: pointer;
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: 400;
+    line-height: 1.42857143;
+    color: #333;
+    white-space: nowrap;
+    width: 100%;
+    text-align: left;
+}
+
+ul.dropdown-menu > li > form > button:hover {
+    /* taken from bootstrap's styling for '.dropdown-menu > li > a:hover' */
+    color: #262626;
+    text-decoration: none;
+    background-color: #f5f5f5;
+}
+
 form {
     padding: 0em;
     margin: 0em;
@@ -354,15 +382,15 @@ button[class^=comment-action] {
 }
 
 .quote {
-    color: #007f00;
+    color: #365cb5;
 }
 
-span.p_header    { color: #2e8b57; font-weight: bold; }
-span.p_chunk    { color: #a52a2a; font-weight: bold; }
-span.p_context    { color: #a020f0; }
-span.p_add    { color: #008b8b; }
-span.p_del    { color: #6a5acd; }
-span.p_mod    { color: #0000ff; }
+span.p_header    { font-weight: bold; }
+span.p_chunk    { color: #329fb0; font-weight: bold; }
+span.p_context    { }
+span.p_add    { color: #1b9d09; background-color: #edffed; }
+span.p_del    { color: #c80101; background-color: #ffe2e2; }
+span.p_mod    { color: #a020f0; }
 
 .acked-by {
     color: #2d4566;
diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html
index 85e7be4b..e924934f 100644
--- a/patchwork/templates/patchwork/submission.html
+++ b/patchwork/templates/patchwork/submission.html
@@ -262,7 +262,7 @@ <h2>Message</h2>
     <span class="message-date">{{ submission.date }} UTC</span>
   </div>
   <pre class="content">
-  {{ submission|commentsyntax }}
+{{ submission|commentsyntax }}
   </pre>
 </div>
 
diff --git a/patchwork/tests/test_version.py b/patchwork/tests/test_version.py
index 8e512084..9cbb1305 100644
--- a/patchwork/tests/test_version.py
+++ b/patchwork/tests/test_version.py
@@ -32,4 +32,9 @@ def test_validate_version(self):
 
         # if the tag is missing from one, it should be missing from the other
         # (and vice versa)
-        self.assertEqual(bool(str_match.group(1)), bool(git_match.group(1)))
+        self.assertEqual(
+            bool(str_match.group(1)),
+            bool(git_match.group(1)),
+            f'mismatch between git and version.txt post-release metadata: '
+            f'git={git_match.group(1)!r}, version.txt={str_match.group(1)!r}',
+        )
diff --git a/releasenotes/notes/make-diff-colors-more-accessible-82eda58a89984d46.yaml b/releasenotes/notes/make-diff-colors-more-accessible-82eda58a89984d46.yaml
new file mode 100644
index 00000000..f65995e5
--- /dev/null
+++ b/releasenotes/notes/make-diff-colors-more-accessible-82eda58a89984d46.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    The patch diff color palette was modified to make it more accessible for
+    all users, including those with common color deficiencies.
diff --git a/templates/base.html b/templates/base.html
index 747da592..9519ecc5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -93,7 +93,12 @@
                 <li><a href="{% url 'admin:index' %}">Administration</a></li>
 {% endif %}
                 <li><a href="{% url 'user-profile' %}">View profile</a></li>
-                <li><a href="{% url 'auth_logout' %}">Logout</a></li>
+                <li>
+                  <form id="logout-form" method="post" action="{% url 'auth_logout' %}">
+                    {% csrf_token %}
+                    <button type="submit">Logout</button>
+                  </form>
+                </li>
               </ul>
             </li>
 {% else %}
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 0a55b54d..1136d8e4 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/getpatchwork/pyenv:latest
+FROM ghcr.io/getpatchwork/pyenv:stable-3.2
 
 ARG UID=1000
 ARG GID=1000
diff --git a/version.txt b/version.txt
index 944880fa..4f840312 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.2.0
+3.2.2.a.0