diff --git a/customize.dist/src/less2/include/tokenfield.less b/customize.dist/src/less2/include/tokenfield.less
index faa302b0a..4445224e7 100644
--- a/customize.dist/src/less2/include/tokenfield.less
+++ b/customize.dist/src/less2/include/tokenfield.less
@@ -11,7 +11,6 @@
         .tools_unselectable();
         display: flex;
         flex-wrap: wrap;
-        justify-content: space-around;
         height: auto;
         min-height: 34px;
         padding-bottom: 0px;
@@ -29,6 +28,7 @@
             background-color: #ededed;
             white-space: nowrap;
             margin: 2px 0;
+            margin-right: 5px;
             height: 24px;
             vertical-align: middle;
             cursor: default;
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 122138614..a6c546b76 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -32,33 +32,61 @@
     .kanban-board-header {
         background-color: #c9c9c9;
     }
+    .kanban-board {
+        background-color: @board-bg;
+        color: @cryptpad_text_col;
+    }
 
     .cp-kanban-palette-nocolor {
         background-color: @palette0;
     }
     .cp-kanban-palette-color1 {
         background-color: @palette1;
+        &.kanban-board {
+            background-color: lighten(@palette1, 5%);
+        }
     }
     .cp-kanban-palette-color2 {
         background-color: @palette2;
+        &.kanban-board {
+            background-color: lighten(@palette2, 5%);
+        }
     }
     .cp-kanban-palette-color3 {
         background-color: @palette3;
+        &.kanban-board {
+            background-color: lighten(@palette3, 10%);
+        }
     }
     .cp-kanban-palette-color4 {
         background-color: @palette4;
+        &.kanban-board {
+            background-color: lighten(@palette4, 10%);
+        }
     }
     .cp-kanban-palette-color5 {
         background-color: @palette5;
+        &.kanban-board {
+            background-color: lighten(@palette5, 10%);
+        }
     }
     .cp-kanban-palette-color6 {
         background-color: @palette6;
+        &.kanban-board {
+            background-color: lighten(@palette6, 5%);
+        }
     }
     .cp-kanban-palette-color7 {
         background-color: @palette7;
+        &.kanban-board {
+            background-color: lighten(@palette7, 5%);
+        }
     }
     .cp-kanban-palette-color8 {
         background-color: @palette8;
+        &.kanban-board {
+            background-color: lighten(@palette8, 5%);
+        }
     }
 
     #cp-kanban-edit-body {
@@ -262,8 +290,6 @@
         }
 
         .kanban-board {
-            background-color: @board-bg;
-            color: @cryptpad_text_col;
             main {
                 min-height: 0;
                 padding: 0 10px;
diff --git a/www/kanban/jkanban.js b/www/kanban/jkanban.js
index a5d2d1062..f0515ddb8 100644
--- a/www/kanban/jkanban.js
+++ b/www/kanban/jkanban.js
@@ -419,6 +419,7 @@
                         if (/color/.test(board.color)) {
                             // Palette color
                             headerBoard.classList.add('cp-kanban-palette-'+board.color);
+                            boardNode.classList.add('cp-kanban-palette-'+board.color);
                         } else if (!/^[0-9a-f]{6}$/.test(board.color)) {
                             // "string" color (red, blue, etc.)
                             headerBoard.classList.add("kanban-header-" + board.color);