diff --git a/website/site/content/docs/feed/scanmailbox.png b/website/site/content/docs/feed/scanmailbox.png
index 5662c263..b434286b 100644
Binary files a/website/site/content/docs/feed/scanmailbox.png and b/website/site/content/docs/feed/scanmailbox.png differ
diff --git a/website/site/content/docs/feed/web-upload.png b/website/site/content/docs/feed/web-upload.png
index 046457db..8dd66aed 100644
Binary files a/website/site/content/docs/feed/web-upload.png and b/website/site/content/docs/feed/web-upload.png differ
diff --git a/website/site/content/docs/webapp/curate.md b/website/site/content/docs/webapp/curate.md
index ed46747f..86d95a1b 100644
--- a/website/site/content/docs/webapp/curate.md
+++ b/website/site/content/docs/webapp/curate.md
@@ -12,31 +12,26 @@ amend with existing data.
 After files have been uploaded and the job executor created the
 corresponding items, they will show up on the main page. All items the
 job executor has just created are initially marked as *New*. The
-option *only New* in the left search menu can be used to select only
-new items:
+option *Inbox* in the left search menu can be used to select only new
+items:
 
-{{ figure(file="docspell-curate-1.jpg") }}
+{{ figure(file="docspell-curate-1.png") }}
 
 Then you can go through all new items and check their metadata: Click
 on the first item to open the detail view. This shows the documents
 and the meta data in the header.
 
-# Check selected items
-
-To change something, click the *Edit* button in the menu above the
-document view. This will open a form next to your documents.
-
-{{ figure(file="docspell-curate-2.jpg") }}
-
 
 # Modify if necessary
 
 You can compare the data with the documents and change as you like.
 Since the item status is *New*, you'll see the suggestions docspell
 found during processing. If there were multiple candidates, you can
-select another one by clicking its name in the suggestion list.
+select another one by clicking its name in the suggestion list. In
+state *New* the left menu is fully expanded so you see all suggestions
+immediatly.
 
-{{ figure(file="docspell-curate-3.jpg") }}
+{{ figure(file="docspell-curate-3.png") }}
 
 
 When you change something in the form, it is immediatly applied.
@@ -54,11 +49,12 @@ drag&drop.
 
 If everything looks good, click the *Confirm* button to confirm the
 current data. The *New* status goes away and also the suggestions are
-hidden in this state. You can always go back by clicking the
-*Unconfirm* button.
+hidden in this state. All metadata form fields are folded as they were
+before. You can always go back by clicking the *Unconfirm* button at
+the right of the menu bar.
 
 
-{{ figure(file="docspell-curate-5.jpg") }}
+{{ figure(file="docspell-curate-5.png") }}
 
 
 # Proceed with next item
@@ -69,4 +65,4 @@ keep the current view, so you can continue checking the data. If you
 are on the last item, the view switches to the listing view when
 clicking *Next*.
 
-{{ figure(file="docspell-curate-6.jpg") }}
+{{ figure(file="docspell-curate-6.png") }}
diff --git a/website/site/content/docs/webapp/custom-fields-01-dark.png b/website/site/content/docs/webapp/custom-fields-01-dark.png
new file mode 100644
index 00000000..1b93aee9
Binary files /dev/null and b/website/site/content/docs/webapp/custom-fields-01-dark.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-01.png b/website/site/content/docs/webapp/custom-fields-01.png
index 49de46e4..b7107e11 100644
Binary files a/website/site/content/docs/webapp/custom-fields-01.png and b/website/site/content/docs/webapp/custom-fields-01.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-02-dark.png b/website/site/content/docs/webapp/custom-fields-02-dark.png
new file mode 100644
index 00000000..c9290abe
Binary files /dev/null and b/website/site/content/docs/webapp/custom-fields-02-dark.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-02.png b/website/site/content/docs/webapp/custom-fields-02.png
index 80f6af77..aef251c9 100644
Binary files a/website/site/content/docs/webapp/custom-fields-02.png and b/website/site/content/docs/webapp/custom-fields-02.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-03-dark.png b/website/site/content/docs/webapp/custom-fields-03-dark.png
new file mode 100644
index 00000000..990d9906
Binary files /dev/null and b/website/site/content/docs/webapp/custom-fields-03-dark.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-03.png b/website/site/content/docs/webapp/custom-fields-03.png
index 732f8001..c8df0ef4 100644
Binary files a/website/site/content/docs/webapp/custom-fields-03.png and b/website/site/content/docs/webapp/custom-fields-03.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-04-dark.png b/website/site/content/docs/webapp/custom-fields-04-dark.png
new file mode 100644
index 00000000..2ec94a01
Binary files /dev/null and b/website/site/content/docs/webapp/custom-fields-04-dark.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-04.png b/website/site/content/docs/webapp/custom-fields-04.png
index f0f32633..1b607bb9 100644
Binary files a/website/site/content/docs/webapp/custom-fields-04.png and b/website/site/content/docs/webapp/custom-fields-04.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-05.png b/website/site/content/docs/webapp/custom-fields-05.png
index 4d9591f0..6b1a9915 100644
Binary files a/website/site/content/docs/webapp/custom-fields-05.png and b/website/site/content/docs/webapp/custom-fields-05.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-06.png b/website/site/content/docs/webapp/custom-fields-06.png
index 42e83130..5fb6521f 100644
Binary files a/website/site/content/docs/webapp/custom-fields-06.png and b/website/site/content/docs/webapp/custom-fields-06.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-07.png b/website/site/content/docs/webapp/custom-fields-07.png
index 737da4cd..40b6702b 100644
Binary files a/website/site/content/docs/webapp/custom-fields-07.png and b/website/site/content/docs/webapp/custom-fields-07.png differ
diff --git a/website/site/content/docs/webapp/custom-fields-08.png b/website/site/content/docs/webapp/custom-fields-08.png
deleted file mode 100644
index 160a4378..00000000
Binary files a/website/site/content/docs/webapp/custom-fields-08.png and /dev/null differ
diff --git a/website/site/content/docs/webapp/customfields.md b/website/site/content/docs/webapp/customfields.md
index 14fc07b5..d1d1669a 100644
--- a/website/site/content/docs/webapp/customfields.md
+++ b/website/site/content/docs/webapp/customfields.md
@@ -74,7 +74,7 @@ multiple fields. Only one value is allowed to set per item and field.
 The example below shows a text field and a money field:
 
 <div class="columns is-centered">
-    <div class="column is-three-quarters">
+    <div class="column">
     {{ figure(file="custom-fields-03.png") }}
     </div>
 </div>
@@ -92,7 +92,7 @@ next to an input, the value is removed from the item.
 The item card also shows custom fields, in the same place as tags:
 
 <div class="columns is-centered">
-    <div class="column is-half">
+    <div class="column is-one-quarter">
     {{ imgnormal(file="custom-fields-05.png", width=300) }}
     </div>
 </div>
@@ -107,7 +107,7 @@ The search menu shows the same dropdown for selecting a custom field.
 Then you can set values that are matched against your items.
 
 <div class="columns is-centered">
-    <div class="column is-three-quarters">
+    <div class="column">
     {{ figure(file="custom-fields-06.png") }}
     </div>
 </div>
@@ -118,13 +118,9 @@ a wildcard at beginning and/or end to do a substring match:
 
 {{ figure(file="custom-fields-07.png") }}
 
-It is possible to use it for numeric fields, too. Just be aware that
-this is text-based matching.
+For all numeric and money values, a little summary is displayed next
+to the overall item count at the top of the page.
 
-<div class="columns is-centered">
-    <div class="column is-three-quarters">
-    {{ figure(file="custom-fields-08.png") }}
-    </div>
-</div>
-
-Using a single `*` allows to find items that have any value set.
+A wildcard can be used with all fields. Just be aware that this is
+always text-based matching. Using a single `*` allows to find items
+that have any value set.
diff --git a/website/site/content/docs/webapp/docspell-curate-1-dark.png b/website/site/content/docs/webapp/docspell-curate-1-dark.png
new file mode 100644
index 00000000..8e9d8879
Binary files /dev/null and b/website/site/content/docs/webapp/docspell-curate-1-dark.png differ
diff --git a/website/site/content/docs/webapp/docspell-curate-1.jpg b/website/site/content/docs/webapp/docspell-curate-1.jpg
deleted file mode 100644
index fd38d959..00000000
Binary files a/website/site/content/docs/webapp/docspell-curate-1.jpg and /dev/null differ
diff --git a/website/site/content/docs/webapp/docspell-curate-1.png b/website/site/content/docs/webapp/docspell-curate-1.png
new file mode 100644
index 00000000..454e5677
Binary files /dev/null and b/website/site/content/docs/webapp/docspell-curate-1.png differ
diff --git a/website/site/content/docs/webapp/docspell-curate-2.jpg b/website/site/content/docs/webapp/docspell-curate-2.jpg
deleted file mode 100644
index 6710f3d9..00000000
Binary files a/website/site/content/docs/webapp/docspell-curate-2.jpg and /dev/null differ
diff --git a/website/site/content/docs/webapp/docspell-curate-3.jpg b/website/site/content/docs/webapp/docspell-curate-3.jpg
deleted file mode 100644
index 00f49aa2..00000000
Binary files a/website/site/content/docs/webapp/docspell-curate-3.jpg and /dev/null differ
diff --git a/website/site/content/docs/webapp/docspell-curate-3.png b/website/site/content/docs/webapp/docspell-curate-3.png
new file mode 100644
index 00000000..62982bc6
Binary files /dev/null and b/website/site/content/docs/webapp/docspell-curate-3.png differ
diff --git a/website/site/content/docs/webapp/docspell-curate-5-dark.png b/website/site/content/docs/webapp/docspell-curate-5-dark.png
new file mode 100644
index 00000000..ef1f172a
Binary files /dev/null and b/website/site/content/docs/webapp/docspell-curate-5-dark.png differ
diff --git a/website/site/content/docs/webapp/docspell-curate-5.jpg b/website/site/content/docs/webapp/docspell-curate-5.jpg
deleted file mode 100644
index d78eb02f..00000000
Binary files a/website/site/content/docs/webapp/docspell-curate-5.jpg and /dev/null differ
diff --git a/website/site/content/docs/webapp/docspell-curate-5.png b/website/site/content/docs/webapp/docspell-curate-5.png
new file mode 100644
index 00000000..21177f1a
Binary files /dev/null and b/website/site/content/docs/webapp/docspell-curate-5.png differ
diff --git a/website/site/content/docs/webapp/docspell-curate-6-dark.png b/website/site/content/docs/webapp/docspell-curate-6-dark.png
new file mode 100644
index 00000000..f9257e7a
Binary files /dev/null and b/website/site/content/docs/webapp/docspell-curate-6-dark.png differ
diff --git a/website/site/content/docs/webapp/docspell-curate-6.jpg b/website/site/content/docs/webapp/docspell-curate-6.jpg
deleted file mode 100644
index 9f2a9008..00000000
Binary files a/website/site/content/docs/webapp/docspell-curate-6.jpg and /dev/null differ
diff --git a/website/site/content/docs/webapp/docspell-curate-6.png b/website/site/content/docs/webapp/docspell-curate-6.png
new file mode 100644
index 00000000..bcdfa377
Binary files /dev/null and b/website/site/content/docs/webapp/docspell-curate-6.png differ
diff --git a/website/site/content/docs/webapp/drop-tag.png b/website/site/content/docs/webapp/drop-tag.png
index 95b210c0..f29aad46 100644
Binary files a/website/site/content/docs/webapp/drop-tag.png and b/website/site/content/docs/webapp/drop-tag.png differ
diff --git a/website/site/content/docs/webapp/multiedit-01-dark.png b/website/site/content/docs/webapp/multiedit-01-dark.png
new file mode 100644
index 00000000..f60531a2
Binary files /dev/null and b/website/site/content/docs/webapp/multiedit-01-dark.png differ
diff --git a/website/site/content/docs/webapp/multiedit-01.png b/website/site/content/docs/webapp/multiedit-01.png
index 4651ed0a..3b2eb8a4 100644
Binary files a/website/site/content/docs/webapp/multiedit-01.png and b/website/site/content/docs/webapp/multiedit-01.png differ
diff --git a/website/site/content/docs/webapp/multiedit-02-dark.png b/website/site/content/docs/webapp/multiedit-02-dark.png
new file mode 100644
index 00000000..ca2029f2
Binary files /dev/null and b/website/site/content/docs/webapp/multiedit-02-dark.png differ
diff --git a/website/site/content/docs/webapp/multiedit-02.png b/website/site/content/docs/webapp/multiedit-02.png
index 005c4706..4d92894d 100644
Binary files a/website/site/content/docs/webapp/multiedit-02.png and b/website/site/content/docs/webapp/multiedit-02.png differ
diff --git a/website/site/content/docs/webapp/multiedit-03-dark.png b/website/site/content/docs/webapp/multiedit-03-dark.png
new file mode 100644
index 00000000..9ebf9263
Binary files /dev/null and b/website/site/content/docs/webapp/multiedit-03-dark.png differ
diff --git a/website/site/content/docs/webapp/multiedit-03.png b/website/site/content/docs/webapp/multiedit-03.png
index 2ded046f..0451180a 100644
Binary files a/website/site/content/docs/webapp/multiedit-03.png and b/website/site/content/docs/webapp/multiedit-03.png differ
diff --git a/website/site/content/docs/webapp/multiedit-04-dark.png b/website/site/content/docs/webapp/multiedit-04-dark.png
new file mode 100644
index 00000000..5b2f2372
Binary files /dev/null and b/website/site/content/docs/webapp/multiedit-04-dark.png differ
diff --git a/website/site/content/docs/webapp/multiedit-04.png b/website/site/content/docs/webapp/multiedit-04.png
index 7bb88c85..c0151a58 100644
Binary files a/website/site/content/docs/webapp/multiedit-04.png and b/website/site/content/docs/webapp/multiedit-04.png differ
diff --git a/website/site/content/docs/webapp/multiedit-05.png b/website/site/content/docs/webapp/multiedit-05.png
deleted file mode 100644
index c8dff52d..00000000
Binary files a/website/site/content/docs/webapp/multiedit-05.png and /dev/null differ
diff --git a/website/site/content/docs/webapp/multiedit-06.png b/website/site/content/docs/webapp/multiedit-06.png
index f068a5d7..589087b6 100644
Binary files a/website/site/content/docs/webapp/multiedit-06.png and b/website/site/content/docs/webapp/multiedit-06.png differ
diff --git a/website/site/content/docs/webapp/multiedit.md b/website/site/content/docs/webapp/multiedit.md
index f251d18e..e4fd1e4a 100644
--- a/website/site/content/docs/webapp/multiedit.md
+++ b/website/site/content/docs/webapp/multiedit.md
@@ -8,8 +8,9 @@ Docspell allows to edit and delete multiple items at once.
 ## Toggle Selection Mode
 
 Search the items you want to edit or delete and then select them by
-changing into "select mode". This changes the view slightly by adding
-a menu to the main area and the item cards have a dashed border:
+changing into "select mode". This changes the view slightly by
+changing the menu to the main area and the item cards have a dashed
+border:
 
 {{ figure(file="multiedit-01.png") }}
 
@@ -36,10 +37,8 @@ selected items. You can change the selection anytime.
 {{ figure(file="multiedit-04.png") }}
 
 
-If you are done, just click on the icon from the beginning to go back
-to "normal" mode.
-
-{{ figure(file="multiedit-05.png") }}
+If you are done, just click on the *Close* button or the icon from the
+beginning to go back to "normal" mode.
 
 
 ### Tags
diff --git a/website/site/content/docs/webapp/sources-edit.png b/website/site/content/docs/webapp/sources-edit.png
index 23804991..dcf04cb3 100644
Binary files a/website/site/content/docs/webapp/sources-edit.png and b/website/site/content/docs/webapp/sources-edit.png differ
diff --git a/website/site/content/docs/webapp/sources-form.png b/website/site/content/docs/webapp/sources-form.png
index b8792dc4..12b00344 100644
Binary files a/website/site/content/docs/webapp/sources-form.png and b/website/site/content/docs/webapp/sources-form.png differ
diff --git a/website/site/static/img/fts-feature.png b/website/site/static/img/fts-feature.png
index 0c5ffb4d..7e098146 100644
Binary files a/website/site/static/img/fts-feature.png and b/website/site/static/img/fts-feature.png differ