diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index b52e08f35..16538820d 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -28,9 +28,10 @@ include-labels:
 replacers: # Changes "Feature: Update checker" to "Update checker"
   - search: '/Feature:|Feat:|\[feature\]/gi'
     replace: ''
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+category-template: '### $TITLE'
+change-template: '- $TITLE [@$AUTHOR](https://github.com/$AUTHOR) ([#$NUMBER]($URL))'
 change-title-escapes: '\<*_&#@'
 template: |
-  # Changelog
+  ## paperless-ngx $RESOLVED_VERSION
 
   $CHANGES
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed2b264ff..e3571e8b5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -334,3 +334,21 @@ jobs:
           asset_path: ./paperless-ngx.tar.xz
           asset_name: paperless-ngx-${{ steps.get_version.outputs.version }}.tar.xz
           asset_content_type: application/x-xz
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: main
+      -
+        name: Append Changelog to docs
+        id: append-Changelog
+        working-directory: docs
+        run: |
+          echo -e "# Changelog\n\n${{ steps.create-release.outputs.body }}\n" > changelog-new.md
+          CURRENT_CHANGELOG=`tail --lines +2 changelog.md`
+          echo -e "$CURRENT_CHANGELOG" >> changelog-new.md
+          mv changelog-new.md changelog.md
+          git config --global user.name "github-actions"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git commit -am "Changelog ${{ steps.get_version.outputs.version }} - GHA"
+          git push origin HEAD:main
diff --git a/.gitignore b/.gitignore
index c21ad4de0..2ba27f9b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,8 @@ target/
 
 # VS Code
 .vscode
+/src-ui/.vscode
+/docs/.vscode
 
 # Other stuff that doesn't belong
 .virtualenv
@@ -84,8 +86,9 @@ scripts/nuke
 /paperless.conf
 /consume/
 /export/
-/src-ui/.vscode
 
 # this is where the compiled frontend is moved to.
 /src/documents/static/frontend/
-/docs/.vscode/settings.json
+
+# mac os
+.DS_Store
diff --git a/Dockerfile b/Dockerfile
index 2c4bbefe5..b1ff73181 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ COPY ./src-ui /src/src-ui
 WORKDIR /src/src-ui
 RUN set -eux \
   && npm update npm -g \
-  && npm ci --no-optional
+  && npm ci --omit=optional
 RUN set -eux \
   && ./node_modules/.bin/ng build --configuration production
 
diff --git a/Pipfile b/Pipfile
index 0ab6775e6..a4dfe7cd4 100644
--- a/Pipfile
+++ b/Pipfile
@@ -34,7 +34,7 @@ psycopg2 = "*"
 redis = "*"
 # Pinned because aarch64 wheels and updates cause warnings when loading the classifier model.
 scikit-learn="==1.0.2"
-whitenoise = "~=6.0.0"
+whitenoise = "~=6.1.0"
 watchdog = "~=2.1.0"
 whoosh="~=2.7.4"
 inotifyrecursive = "~=0.3"
@@ -69,3 +69,5 @@ sphinx_rtd_theme = "*"
 tox = "*"
 black = "*"
 pre-commit = "*"
+sphinx-autobuild = "*"
+myst-parser = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index b81373e4a..7edea98f2 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "9573af313c811561d467d814c52c6bd1439bc48e3b31d7f56afed5f0ebe4b648"
+            "sha256": "cfdddfe8f71308f6eb7f1bec53518644758e0299cc23de3c6ee6f3fa5bf80ed0"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -113,10 +113,11 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
-                "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
+                "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7",
+                "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
             ],
-            "version": "==2021.10.8"
+            "markers": "python_version >= '3.6'",
+            "version": "==2022.5.18.1"
         },
         "cffi": {
             "hashes": [
@@ -194,7 +195,7 @@
                 "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597",
                 "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"
             ],
-            "markers": "python_version >= '3.5'",
+            "markers": "python_full_version >= '3.5.0'",
             "version": "==2.0.12"
         },
         "click": {
@@ -639,29 +640,31 @@
         },
         "numpy": {
             "hashes": [
-                "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676",
-                "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4",
-                "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce",
-                "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123",
-                "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1",
-                "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e",
-                "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5",
-                "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d",
-                "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a",
-                "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab",
-                "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75",
-                "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168",
-                "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4",
-                "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f",
-                "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18",
-                "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62",
-                "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe",
-                "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430",
-                "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802",
-                "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"
+                "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207",
+                "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887",
+                "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e",
+                "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802",
+                "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077",
+                "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af",
+                "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74",
+                "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5",
+                "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1",
+                "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0",
+                "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0",
+                "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e",
+                "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c",
+                "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c",
+                "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3",
+                "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72",
+                "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd",
+                "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6",
+                "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76",
+                "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32",
+                "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa",
+                "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.22.3"
+            "version": "==1.22.4"
         },
         "ocrmypdf": {
             "hashes": [
@@ -739,47 +742,47 @@
         },
         "pillow": {
             "hashes": [
-                "sha256:01ce45deec9df310cbbee11104bae1a2a43308dd9c317f99235b6d3080ddd66e",
-                "sha256:0c51cb9edac8a5abd069fd0758ac0a8bfe52c261ee0e330f363548aca6893595",
-                "sha256:17869489de2fce6c36690a0c721bd3db176194af5f39249c1ac56d0bb0fcc512",
-                "sha256:21dee8466b42912335151d24c1665fcf44dc2ee47e021d233a40c3ca5adae59c",
-                "sha256:25023a6209a4d7c42154073144608c9a71d3512b648a2f5d4465182cb93d3477",
-                "sha256:255c9d69754a4c90b0ee484967fc8818c7ff8311c6dddcc43a4340e10cd1636a",
-                "sha256:35be4a9f65441d9982240e6966c1eaa1c654c4e5e931eaf580130409e31804d4",
-                "sha256:3f42364485bfdab19c1373b5cd62f7c5ab7cc052e19644862ec8f15bb8af289e",
-                "sha256:3fddcdb619ba04491e8f771636583a7cc5a5051cd193ff1aa1ee8616d2a692c5",
-                "sha256:463acf531f5d0925ca55904fa668bb3461c3ef6bc779e1d6d8a488092bdee378",
-                "sha256:4fe29a070de394e449fd88ebe1624d1e2d7ddeed4c12e0b31624561b58948d9a",
-                "sha256:55dd1cf09a1fd7c7b78425967aacae9b0d70125f7d3ab973fadc7b5abc3de652",
-                "sha256:5a3ecc026ea0e14d0ad7cd990ea7f48bfcb3eb4271034657dc9d06933c6629a7",
-                "sha256:5cfca31ab4c13552a0f354c87fbd7f162a4fafd25e6b521bba93a57fe6a3700a",
-                "sha256:66822d01e82506a19407d1afc104c3fcea3b81d5eb11485e593ad6b8492f995a",
-                "sha256:69e5ddc609230d4408277af135c5b5c8fe7a54b2bdb8ad7c5100b86b3aab04c6",
-                "sha256:6b6d4050b208c8ff886fd3db6690bf04f9a48749d78b41b7a5bf24c236ab0165",
-                "sha256:7a053bd4d65a3294b153bdd7724dce864a1d548416a5ef61f6d03bf149205160",
-                "sha256:82283af99c1c3a5ba1da44c67296d5aad19f11c535b551a5ae55328a317ce331",
-                "sha256:8782189c796eff29dbb37dd87afa4ad4d40fc90b2742704f94812851b725964b",
-                "sha256:8d79c6f468215d1a8415aa53d9868a6b40c4682165b8cb62a221b1baa47db458",
-                "sha256:97bda660702a856c2c9e12ec26fc6d187631ddfd896ff685814ab21ef0597033",
-                "sha256:a325ac71914c5c043fa50441b36606e64a10cd262de12f7a179620f579752ff8",
-                "sha256:a336a4f74baf67e26f3acc4d61c913e378e931817cd1e2ef4dfb79d3e051b481",
-                "sha256:a598d8830f6ef5501002ae85c7dbfcd9c27cc4efc02a1989369303ba85573e58",
-                "sha256:a5eaf3b42df2bcda61c53a742ee2c6e63f777d0e085bbc6b2ab7ed57deb13db7",
-                "sha256:aea7ce61328e15943d7b9eaca87e81f7c62ff90f669116f857262e9da4057ba3",
-                "sha256:af79d3fde1fc2e33561166d62e3b63f0cc3e47b5a3a2e5fea40d4917754734ea",
-                "sha256:c24f718f9dd73bb2b31a6201e6db5ea4a61fdd1d1c200f43ee585fc6dcd21b34",
-                "sha256:c5b0ff59785d93b3437c3703e3c64c178aabada51dea2a7f2c5eccf1bcf565a3",
-                "sha256:c7110ec1701b0bf8df569a7592a196c9d07c764a0a74f65471ea56816f10e2c8",
-                "sha256:c870193cce4b76713a2b29be5d8327c8ccbe0d4a49bc22968aa1e680930f5581",
-                "sha256:c9efef876c21788366ea1f50ecb39d5d6f65febe25ad1d4c0b8dff98843ac244",
-                "sha256:de344bcf6e2463bb25179d74d6e7989e375f906bcec8cb86edb8b12acbc7dfef",
-                "sha256:eb1b89b11256b5b6cad5e7593f9061ac4624f7651f7a8eb4dfa37caa1dfaa4d0",
-                "sha256:ed742214068efa95e9844c2d9129e209ed63f61baa4d54dbf4cf8b5e2d30ccf2",
-                "sha256:f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97",
-                "sha256:fb89397013cf302f282f0fc998bb7abf11d49dcff72c8ecb320f76ea6e2c5717"
+                "sha256:088df396b047477dd1bbc7de6e22f58400dae2f21310d9e2ec2933b2ef7dfa4f",
+                "sha256:09e67ef6e430f90caa093528bd758b0616f8165e57ed8d8ce014ae32df6a831d",
+                "sha256:0b4d5ad2cd3a1f0d1df882d926b37dbb2ab6c823ae21d041b46910c8f8cd844b",
+                "sha256:0b525a356680022b0af53385944026d3486fc8c013638cf9900eb87c866afb4c",
+                "sha256:1d4331aeb12f6b3791911a6da82de72257a99ad99726ed6b63f481c0184b6fb9",
+                "sha256:20d514c989fa28e73a5adbddd7a171afa5824710d0ab06d4e1234195d2a2e546",
+                "sha256:2b291cab8a888658d72b575a03e340509b6b050b62db1f5539dd5cd18fd50578",
+                "sha256:3f6c1716c473ebd1649663bf3b42702d0d53e27af8b64642be0dd3598c761fb1",
+                "sha256:42dfefbef90eb67c10c45a73a9bc1599d4dac920f7dfcbf4ec6b80cb620757fe",
+                "sha256:488f3383cf5159907d48d32957ac6f9ea85ccdcc296c14eca1a4e396ecc32098",
+                "sha256:4d45dbe4b21a9679c3e8b3f7f4f42a45a7d3ddff8a4a16109dff0e1da30a35b2",
+                "sha256:53c27bd452e0f1bc4bfed07ceb235663a1df7c74df08e37fd6b03eb89454946a",
+                "sha256:55e74faf8359ddda43fee01bffbc5bd99d96ea508d8a08c527099e84eb708f45",
+                "sha256:59789a7d06c742e9d13b883d5e3569188c16acb02eeed2510fd3bfdbc1bd1530",
+                "sha256:5b650dbbc0969a4e226d98a0b440c2f07a850896aed9266b6fedc0f7e7834108",
+                "sha256:66daa16952d5bf0c9d5389c5e9df562922a59bd16d77e2a276e575d32e38afd1",
+                "sha256:6e760cf01259a1c0a50f3c845f9cad1af30577fd8b670339b1659c6d0e7a41dd",
+                "sha256:7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0",
+                "sha256:769a7f131a2f43752455cc72f9f7a093c3ff3856bf976c5fb53a59d0ccc704f6",
+                "sha256:7c150dbbb4a94ea4825d1e5f2c5501af7141ea95825fadd7829f9b11c97aaf6c",
+                "sha256:8844217cdf66eabe39567118f229e275f0727e9195635a15e0e4b9227458daaf",
+                "sha256:8a66fe50386162df2da701b3722781cbe90ce043e7d53c1fd6bd801bca6b48d4",
+                "sha256:9370d6744d379f2de5d7fa95cdbd3a4d92f0b0ef29609b4b1687f16bc197063d",
+                "sha256:937a54e5694684f74dcbf6e24cc453bfc5b33940216ddd8f4cd8f0f79167f765",
+                "sha256:9c857532c719fb30fafabd2371ce9b7031812ff3889d75273827633bca0c4602",
+                "sha256:a4165205a13b16a29e1ac57efeee6be2dfd5b5408122d59ef2145bc3239fa340",
+                "sha256:b3fe2ff1e1715d4475d7e2c3e8dabd7c025f4410f79513b4ff2de3d51ce0fa9c",
+                "sha256:b6617221ff08fbd3b7a811950b5c3f9367f6e941b86259843eab77c8e3d2b56b",
+                "sha256:b761727ed7d593e49671d1827044b942dd2f4caae6e51bab144d4accf8244a84",
+                "sha256:baf3be0b9446a4083cc0c5bb9f9c964034be5374b5bc09757be89f5d2fa247b8",
+                "sha256:c17770a62a71718a74b7548098a74cd6880be16bcfff5f937f900ead90ca8e92",
+                "sha256:c67db410508b9de9c4694c57ed754b65a460e4812126e87f5052ecf23a011a54",
+                "sha256:d78ca526a559fb84faaaf84da2dd4addef5edb109db8b81677c0bb1aad342601",
+                "sha256:e9ed59d1b6ee837f4515b9584f3d26cf0388b742a11ecdae0d9237a94505d03a",
+                "sha256:f054b020c4d7e9786ae0404278ea318768eb123403b18453e28e47cdb7a0a4bf",
+                "sha256:f372d0f08eff1475ef426344efe42493f71f377ec52237bf153c5713de987251",
+                "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a",
+                "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"
             ],
             "index": "pypi",
-            "version": "==9.1.0"
+            "version": "==9.1.1"
         },
         "pluggy": {
             "hashes": [
@@ -890,11 +893,11 @@
         },
         "python-gnupg": {
             "hashes": [
-                "sha256:93a521501d6c2785d96b190aec7125ba89c1c2fe708b0c98af3fb32b59026ab8",
-                "sha256:b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7"
+                "sha256:012960bde4d25dad631bb7650f563dda5e7271248a73f3584240063a293d99d8",
+                "sha256:aaa748795572591aaf127b4ac8985684f3673ff82b39f370c836b006e68fc537"
             ],
             "index": "pypi",
-            "version": "==0.4.8"
+            "version": "==0.4.9"
         },
         "python-levenshtein": {
             "hashes": [
@@ -904,11 +907,11 @@
         },
         "python-magic": {
             "hashes": [
-                "sha256:1a2c81e8f395c744536369790bd75094665e9644110a6623bcc3bbea30f03973",
-                "sha256:21f5f542aa0330f5c8a64442528542f6215c8e18d2466b399b0d9d39356d83fc"
+                "sha256:8262c13001f904ad5b724d38b5e5b5f17ec0450ae249def398a62e4e33108a50",
+                "sha256:b978c4b69a20510d133a7f488910c2f07e7796f1f31703e61c241973f2bbf5fb"
             ],
             "index": "pypi",
-            "version": "==0.4.25"
+            "version": "==0.4.26"
         },
         "pytz": {
             "hashes": [
@@ -1150,32 +1153,32 @@
         },
         "scipy": {
             "hashes": [
-                "sha256:011d4386b53b933142f58a652aa0f149c9b9242abd4f900b9f4ea5fbafc86b89",
-                "sha256:16e09ef68b352d73befa8bcaf3ebe25d3941fe1a58c82909d5589856e6bc8174",
-                "sha256:31d4f2d6b724bc9a98e527b5849b8a7e589bf1ea630c33aa563eda912c9ff0bd",
-                "sha256:38aa39b6724cb65271e469013aeb6f2ce66fd44f093e241c28a9c6bc64fd79ed",
-                "sha256:3d573228c10a3a8c32b9037be982e6440e411b443a6267b067cac72f690b8d56",
-                "sha256:3d9dd6c8b93a22bf9a3a52d1327aca7e092b1299fb3afc4f89e8eba381be7b59",
-                "sha256:559a8a4c03a5ba9fe3232f39ed24f86457e4f3f6c0abbeae1fb945029f092720",
-                "sha256:5e73343c5e0d413c1f937302b2e04fb07872f5843041bcfd50699aef6e95e399",
-                "sha256:723b9f878095ed994756fa4ee3060c450e2db0139c5ba248ee3f9628bd64e735",
-                "sha256:87b01c7d5761e8a266a0fbdb9d88dcba0910d63c1c671bdb4d99d29f469e9e03",
-                "sha256:8f4d059a97b29c91afad46b1737274cb282357a305a80bdd9e8adf3b0ca6a3f0",
-                "sha256:92b2c2af4183ed09afb595709a8ef5783b2baf7f41e26ece24e1329c109691a7",
-                "sha256:937d28722f13302febde29847bbe554b89073fbb924a30475e5ed7b028898b5f",
-                "sha256:a279e27c7f4566ef18bab1b1e2c37d168e365080974758d107e7d237d3f0f484",
-                "sha256:ad5be4039147c808e64f99c0e8a9641eb5d2fa079ff5894dcd8240e94e347af4",
-                "sha256:ae3e327da323d82e918e593460e23babdce40d7ab21490ddf9fc06dec6b91a18",
-                "sha256:bb7088e89cd751acf66195d2f00cf009a1ea113f3019664032d9075b1e727b6c",
-                "sha256:c17a1878d00a5dd2797ccd73623ceca9d02375328f6218ee6d921e1325e61aff",
-                "sha256:c2bae431d127bf0b1da81fc24e4bba0a84d058e3a96b9dd6475dfcb3c5e8761e",
-                "sha256:de2e80ee1d925984c2504812a310841c241791c5279352be4707cdcd7c255039",
-                "sha256:e6f0cd9c0bd374ef834ee1e0f0999678d49dcc400ea6209113d81528958f97c7",
-                "sha256:f3720d0124aced49f6f2198a6900304411dbbeed12f56951d7c66ebef05e3df6",
-                "sha256:f4a6d3b9f9797eb2d43938ac2c5d96d02aed17ef170c8b38f11798717523ddba"
+                "sha256:02b567e722d62bddd4ac253dafb01ce7ed8742cf8031aea030a41414b86c1125",
+                "sha256:1166514aa3bbf04cb5941027c6e294a000bba0cf00f5cdac6c77f2dad479b434",
+                "sha256:1da52b45ce1a24a4a22db6c157c38b39885a990a566748fc904ec9f03ed8c6ba",
+                "sha256:23b22fbeef3807966ea42d8163322366dd89da9bebdc075da7034cee3a1441ca",
+                "sha256:28d2cab0c6ac5aa131cc5071a3a1d8e1366dad82288d9ec2ca44df78fb50e649",
+                "sha256:2ef0fbc8bcf102c1998c1f16f15befe7cffba90895d6e84861cd6c6a33fb54f6",
+                "sha256:3b69b90c9419884efeffaac2c38376d6ef566e6e730a231e15722b0ab58f0328",
+                "sha256:4b93ec6f4c3c4d041b26b5f179a6aab8f5045423117ae7a45ba9710301d7e462",
+                "sha256:4e53a55f6a4f22de01ffe1d2f016e30adedb67a699a310cdcac312806807ca81",
+                "sha256:6311e3ae9cc75f77c33076cb2794fb0606f14c8f1b1c9ff8ce6005ba2c283621",
+                "sha256:65b77f20202599c51eb2771d11a6b899b97989159b7975e9b5259594f1d35ef4",
+                "sha256:6cc6b33139eb63f30725d5f7fa175763dc2df6a8f38ddf8df971f7c345b652dc",
+                "sha256:70de2f11bf64ca9921fda018864c78af7147025e467ce9f4a11bc877266900a6",
+                "sha256:70ebc84134cf0c504ce6a5f12d6db92cb2a8a53a49437a6bb4edca0bc101f11c",
+                "sha256:83606129247e7610b58d0e1e93d2c5133959e9cf93555d3c27e536892f1ba1f2",
+                "sha256:93d07494a8900d55492401917a119948ed330b8c3f1d700e0b904a578f10ead4",
+                "sha256:9c4e3ae8a716c8b3151e16c05edb1daf4cb4d866caa385e861556aff41300c14",
+                "sha256:9dd4012ac599a1e7eb63c114d1eee1bcfc6dc75a29b589ff0ad0bb3d9412034f",
+                "sha256:9e3fb1b0e896f14a85aa9a28d5f755daaeeb54c897b746df7a55ccb02b340f33",
+                "sha256:a0aa8220b89b2e3748a2836fbfa116194378910f1a6e78e4675a095bcd2c762d",
+                "sha256:d3b3c8924252caaffc54d4a99f1360aeec001e61267595561089f8b5900821bb",
+                "sha256:e013aed00ed776d790be4cb32826adb72799c61e318676172495383ba4570aa4",
+                "sha256:f3e7a8867f307e3359cc0ed2c63b61a1e33a19080f92fe377bc7d49f646f2ec1"
             ],
             "markers": "python_version < '3.11' and python_version >= '3.8'",
-            "version": "==1.8.0"
+            "version": "==1.8.1"
         },
         "service-identity": {
             "hashes": [
@@ -1186,11 +1189,11 @@
         },
         "setuptools": {
             "hashes": [
-                "sha256:5534570b9980fc650d45c62877ff603c7aaaf24893371708736cc016bd221c3c",
-                "sha256:ca6ba73b7fd5f734ae70ece8c4c1f7062b07f3352f6428f6277e27c8f5c64237"
+                "sha256:68e45d17c9281ba25dc0104eadd2647172b3472d9e01f911efa57965e8d51a36",
+                "sha256:a43bdedf853c670e5fed28e5623403bad2f73cf02f9a2774e91def6bda8265a7"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==62.2.0"
+            "version": "==62.3.2"
         },
         "six": {
             "hashes": [
@@ -1205,7 +1208,7 @@
                 "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663",
                 "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"
             ],
-            "markers": "python_version >= '3.5'",
+            "markers": "python_full_version >= '3.5.0'",
             "version": "==1.2.0"
         },
         "sqlparse": {
@@ -1213,7 +1216,7 @@
                 "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae",
                 "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d"
             ],
-            "markers": "python_version >= '3.5'",
+            "markers": "python_full_version >= '3.5.0'",
             "version": "==0.4.2"
         },
         "threadpoolctl": {
@@ -1422,11 +1425,11 @@
         },
         "whitenoise": {
             "hashes": [
-                "sha256:08c42bc535f9777eea1a599289d9433f081921f97887eaf6f559446b2a080374",
-                "sha256:5a4aff543ee860fbe40d743e556adf92ccd41b7df45697cae074afdf657056b9"
+                "sha256:2067fe9008a3cd7d0d75f75c9240b54f5f59996ca285cbeab18fc1e89949e30d",
+                "sha256:6ccc6d1ad6fb688a398ea65d97db47f018ea0be7da75e146e8f2e837a04ba590"
             ],
             "index": "pypi",
-            "version": "==6.0.0"
+            "version": "==6.1.0"
         },
         "whoosh": {
             "hashes": [
@@ -1559,10 +1562,11 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
-                "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
+                "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7",
+                "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
             ],
-            "version": "==2021.10.8"
+            "markers": "python_version >= '3.6'",
+            "version": "==2022.5.18.1"
         },
         "cfgv": {
             "hashes": [
@@ -1577,7 +1581,7 @@
                 "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597",
                 "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"
             ],
-            "markers": "python_version >= '3.5'",
+            "markers": "python_full_version >= '3.5.0'",
             "version": "==2.0.12"
         },
         "click": {
@@ -1588,53 +1592,63 @@
             "markers": "python_version >= '3.7'",
             "version": "==8.1.3"
         },
-        "coverage": {
-            "extras": [],
+        "colorama": {
             "hashes": [
-                "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8",
-                "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d",
-                "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31",
-                "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879",
-                "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69",
-                "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3",
-                "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7",
-                "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81",
-                "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579",
-                "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c",
-                "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53",
-                "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4",
-                "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9",
-                "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d",
-                "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3",
-                "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293",
-                "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20",
-                "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9",
-                "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579",
-                "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548",
-                "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d",
-                "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284",
-                "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b",
-                "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a",
-                "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572",
-                "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f",
-                "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9",
-                "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63",
-                "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94",
-                "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d",
-                "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2",
-                "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a",
-                "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130",
-                "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0",
-                "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe",
-                "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73",
-                "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8",
-                "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738",
-                "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e",
-                "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8",
-                "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"
+                "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b",
+                "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
+            "version": "==0.4.4"
+        },
+        "coverage": {
+            "extras": [
+                "toml"
+            ],
+            "hashes": [
+                "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a",
+                "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6",
+                "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383",
+                "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f",
+                "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f",
+                "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f",
+                "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c",
+                "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018",
+                "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720",
+                "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3",
+                "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf",
+                "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211",
+                "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39",
+                "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95",
+                "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41",
+                "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c",
+                "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166",
+                "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49",
+                "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce",
+                "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088",
+                "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6",
+                "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426",
+                "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df",
+                "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632",
+                "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3",
+                "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08",
+                "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65",
+                "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea",
+                "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701",
+                "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5",
+                "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311",
+                "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7",
+                "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d",
+                "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61",
+                "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c",
+                "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a",
+                "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055",
+                "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740",
+                "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45",
+                "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052",
+                "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==6.3.3"
+            "version": "==6.4"
         },
         "coveralls": {
             "hashes": [
@@ -1699,11 +1713,11 @@
         },
         "identify": {
             "hashes": [
-                "sha256:3acfe15a96e4272b4ec5662ee3e231ceba976ef63fd9980ed2ce9cc415df393f",
-                "sha256:c83af514ea50bf2be2c4a3f2fb349442b59dc87284558ae9ff54191bff3541d2"
+                "sha256:0dca2ea3e4381c435ef9c33ba100a78a9b40c0bab11189c7cf121f75815efeaa",
+                "sha256:3d11b16f3fe19f52039fb7e39c9c884b21cb1b586988114fbe42671f03de3e82"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==2.5.0"
+            "version": "==2.5.1"
         },
         "idna": {
             "hashes": [
@@ -1723,11 +1737,11 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6",
-                "sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539"
+                "sha256:5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700",
+                "sha256:c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec"
             ],
             "markers": "python_version < '3.10'",
-            "version": "==4.11.3"
+            "version": "==4.11.4"
         },
         "iniconfig": {
             "hashes": [
@@ -1744,6 +1758,20 @@
             "markers": "python_version >= '3.7'",
             "version": "==3.1.2"
         },
+        "livereload": {
+            "hashes": [
+                "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"
+            ],
+            "version": "==2.6.3"
+        },
+        "markdown-it-py": {
+            "hashes": [
+                "sha256:93de681e5c021a432c63147656fe21790bc01231e0cd2da73626f1aa3ac0fe27",
+                "sha256:cf7e59fed14b5ae17c0006eff14a2d9a00ed5f3a846148153899a0224e2c07da"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==2.1.0"
+        },
         "markupsafe": {
             "hashes": [
                 "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003",
@@ -1790,6 +1818,22 @@
             "markers": "python_version >= '3.7'",
             "version": "==2.1.1"
         },
+        "mdit-py-plugins": {
+            "hashes": [
+                "sha256:b1279701cee2dbf50e188d3da5f51fee8d78d038cdf99be57c6b9d1aa93b4073",
+                "sha256:ecc24f51eeec6ab7eecc2f9724e8272c2fb191c2e93cf98109120c2cace69750"
+            ],
+            "markers": "python_version ~= '3.6'",
+            "version": "==0.3.0"
+        },
+        "mdurl": {
+            "hashes": [
+                "sha256:6a8f6804087b7128040b2fb2ebe242bdc2affaeaa034d5fc9feeed30b443651b",
+                "sha256:f79c9709944df218a4cdb0fcc0b0c7ead2f44594e3e84dc566606f04ad749c20"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.1.1"
+        },
         "mypy-extensions": {
             "hashes": [
                 "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d",
@@ -1797,6 +1841,14 @@
             ],
             "version": "==0.4.3"
         },
+        "myst-parser": {
+            "hashes": [
+                "sha256:1635ce3c18965a528d6de980f989ff64d6a1effb482e1f611b1bfb79e38f3d98",
+                "sha256:4c076d649e066f9f5c7c661bae2658be1ca06e76b002bb97f02a09398707686c"
+            ],
+            "index": "pypi",
+            "version": "==0.17.2"
+        },
         "nodeenv": {
             "hashes": [
                 "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b",
@@ -2013,6 +2065,14 @@
             "index": "pypi",
             "version": "==4.5.0"
         },
+        "sphinx-autobuild": {
+            "hashes": [
+                "sha256:8fe8cbfdb75db04475232f05187c776f46f6e9e04cacf1e49ce81bdac649ccac",
+                "sha256:de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05"
+            ],
+            "index": "pypi",
+            "version": "==2021.3.14"
+        },
         "sphinx-rtd-theme": {
             "hashes": [
                 "sha256:4d35a56f4508cfee4c4fb604373ede6feae2a306731d533f409ef5c3496fdbd8",
@@ -2091,6 +2151,53 @@
             "markers": "python_version < '3.11'",
             "version": "==2.0.1"
         },
+        "tornado": {
+            "hashes": [
+                "sha256:0a00ff4561e2929a2c37ce706cb8233b7907e0cdc22eab98888aca5dd3775feb",
+                "sha256:0d321a39c36e5f2c4ff12b4ed58d41390460f798422c4504e09eb5678e09998c",
+                "sha256:1e8225a1070cd8eec59a996c43229fe8f95689cb16e552d130b9793cb570a288",
+                "sha256:20241b3cb4f425e971cb0a8e4ffc9b0a861530ae3c52f2b0434e6c1b57e9fd95",
+                "sha256:25ad220258349a12ae87ede08a7b04aca51237721f63b1808d39bdb4b2164558",
+                "sha256:33892118b165401f291070100d6d09359ca74addda679b60390b09f8ef325ffe",
+                "sha256:33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791",
+                "sha256:3447475585bae2e77ecb832fc0300c3695516a47d46cefa0528181a34c5b9d3d",
+                "sha256:34ca2dac9e4d7afb0bed4677512e36a52f09caa6fded70b4e3e1c89dbd92c326",
+                "sha256:3e63498f680547ed24d2c71e6497f24bca791aca2fe116dbc2bd0ac7f191691b",
+                "sha256:548430be2740e327b3fe0201abe471f314741efcb0067ec4f2d7dcfb4825f3e4",
+                "sha256:6196a5c39286cc37c024cd78834fb9345e464525d8991c21e908cc046d1cc02c",
+                "sha256:61b32d06ae8a036a6607805e6720ef00a3c98207038444ba7fd3d169cd998910",
+                "sha256:6286efab1ed6e74b7028327365cf7346b1d777d63ab30e21a0f4d5b275fc17d5",
+                "sha256:65d98939f1a2e74b58839f8c4dab3b6b3c1ce84972ae712be02845e65391ac7c",
+                "sha256:66324e4e1beede9ac79e60f88de548da58b1f8ab4b2f1354d8375774f997e6c0",
+                "sha256:6c77c9937962577a6a76917845d06af6ab9197702a42e1346d8ae2e76b5e3675",
+                "sha256:70dec29e8ac485dbf57481baee40781c63e381bebea080991893cd297742b8fd",
+                "sha256:7250a3fa399f08ec9cb3f7b1b987955d17e044f1ade821b32e5f435130250d7f",
+                "sha256:748290bf9112b581c525e6e6d3820621ff020ed95af6f17fedef416b27ed564c",
+                "sha256:7da13da6f985aab7f6f28debab00c67ff9cbacd588e8477034c0652ac141feea",
+                "sha256:8f959b26f2634a091bb42241c3ed8d3cedb506e7c27b8dd5c7b9f745318ddbb6",
+                "sha256:9de9e5188a782be6b1ce866e8a51bc76a0fbaa0e16613823fc38e4fc2556ad05",
+                "sha256:a48900ecea1cbb71b8c71c620dee15b62f85f7c14189bdeee54966fbd9a0c5bd",
+                "sha256:b87936fd2c317b6ee08a5741ea06b9d11a6074ef4cc42e031bc6403f82a32575",
+                "sha256:c77da1263aa361938476f04c4b6c8916001b90b2c2fdd92d8d535e1af48fba5a",
+                "sha256:cb5ec8eead331e3bb4ce8066cf06d2dfef1bfb1b2a73082dfe8a161301b76e37",
+                "sha256:cc0ee35043162abbf717b7df924597ade8e5395e7b66d18270116f8745ceb795",
+                "sha256:d14d30e7f46a0476efb0deb5b61343b1526f73ebb5ed84f23dc794bdb88f9d9f",
+                "sha256:d371e811d6b156d82aa5f9a4e08b58debf97c302a35714f6f45e35139c332e32",
+                "sha256:d3d20ea5782ba63ed13bc2b8c291a053c8d807a8fa927d941bd718468f7b950c",
+                "sha256:d3f7594930c423fd9f5d1a76bee85a2c36fd8b4b16921cae7e965f22575e9c01",
+                "sha256:dcef026f608f678c118779cd6591c8af6e9b4155c44e0d1bc0c87c036fb8c8c4",
+                "sha256:e0791ac58d91ac58f694d8d2957884df8e4e2f6687cdf367ef7eb7497f79eaa2",
+                "sha256:e385b637ac3acaae8022e7e47dfa7b83d3620e432e3ecb9a3f7f58f150e50921",
+                "sha256:e519d64089b0876c7b467274468709dadf11e41d65f63bba207e04217f47c085",
+                "sha256:e7229e60ac41a1202444497ddde70a48d33909e484f96eb0da9baf8dc68541df",
+                "sha256:ed3ad863b1b40cd1d4bd21e7498329ccaece75db5a5bf58cd3c9f130843e7102",
+                "sha256:f0ba29bafd8e7e22920567ce0d232c26d4d47c8b5cf4ed7b562b5db39fa199c5",
+                "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68",
+                "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5"
+            ],
+            "markers": "python_version > '2.7'",
+            "version": "==6.1"
+        },
         "tox": {
             "hashes": [
                 "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a",
diff --git a/README.md b/README.md
index 3395d8e3c..8b1eb5e4a 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ For bugs please [open an issue](https://github.com/paperless-ngx/paperless-ngx/i
 
 Paperless has been around a while now, and people are starting to build stuff on top of it. If you're one of those people, we can add your project to this list:
 
-- [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless-ngx. Also works with the original Paperless and Paperless-ngx.
+- [Paperless App](https://github.com/bauerj/paperless_app): An Android/iOS app for Paperless-ngx. Also works with the original Paperless and Paperless-ng.
 - [Paperless Share](https://github.com/qcasey/paperless_share). Share any files from your Android application with paperless. Very simple, but works with all of the mobile scanning apps out there that allow you to share scanned documents.
 - [Scan to Paperless](https://github.com/sbrunner/scan-to-paperless): Scan and prepare (crop, deskew, OCR, ...) your documents for Paperless.
 
diff --git a/docker-builders/Dockerfile.frontend b/docker-builders/Dockerfile.frontend
index 26f6c9e15..e552ee184 100644
--- a/docker-builders/Dockerfile.frontend
+++ b/docker-builders/Dockerfile.frontend
@@ -9,6 +9,6 @@ COPY ./src-ui /src/src-ui
 WORKDIR /src/src-ui
 RUN set -eux \
   && npm update npm -g \
-  && npm ci --no-optional
+  && npm ci --omit=optional
 RUN set -eux \
   && ./node_modules/.bin/ng build --configuration production
diff --git a/docker/wait-for-redis.py b/docker/wait-for-redis.py
index 292450352..8ceae1ba9 100755
--- a/docker/wait-for-redis.py
+++ b/docker/wait-for-redis.py
@@ -26,9 +26,11 @@ if __name__ == "__main__":
             try:
                 client.ping()
                 break
-            except Exception:
+            except Exception as e:
                 print(
-                    f"Redis ping #{attempt} failed, waiting {RETRY_SLEEP_SECONDS}s",
+                    f"Redis ping #{attempt} failed.\n"
+                    f"Error: {str(e)}.\n"
+                    f"Waiting {RETRY_SLEEP_SECONDS}s",
                     flush=True,
                 )
                 time.sleep(RETRY_SLEEP_SECONDS)
diff --git a/docs/Makefile b/docs/Makefile
index cf5dbff6a..7890f9828 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -24,6 +24,7 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html       to make standalone HTML files"
+	@echo "  livehtml   to preview changes with live reload in your browser"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"
 	@echo "  pickle     to make pickle files"
@@ -54,6 +55,9 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
+livehtml:
+	sphinx-autobuild "./" "$(BUILDDIR)" $(O)
+
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
index 3dbe0318f..87694a598 100644
--- a/docs/_static/css/custom.css
+++ b/docs/_static/css/custom.css
@@ -64,6 +64,10 @@ body {
   color: var(--color-text-body);
 }
 
+.rst-content p {
+  word-break: break-word;
+}
+
 h1, h2, h3, h4, h5, h6 {
   font-family: inherit;
 }
diff --git a/docs/_static/js/darkmode.js b/docs/_static/js/darkmode.js
index 49cf0eeec..909472587 100644
--- a/docs/_static/js/darkmode.js
+++ b/docs/_static/js/darkmode.js
@@ -1,47 +1,47 @@
-let toggleButton;
-let icon;
+let toggleButton
+let icon
 
 function load() {
-	"use strict";
+	'use strict'
 
-	toggleButton = document.createElement("button");
-	toggleButton.setAttribute("title", "Toggle dark mode");
-	toggleButton.classList.add("dark-mode-toggle");
-	icon = document.createElement("i");
-	icon.classList.add("fa", darkModeState ? "fa-sun-o" : "fa-moon-o");
-	toggleButton.appendChild(icon);
-	document.body.prepend(toggleButton);
+	toggleButton = document.createElement('button')
+	toggleButton.setAttribute('title', 'Toggle dark mode')
+	toggleButton.classList.add('dark-mode-toggle')
+	icon = document.createElement('i')
+	icon.classList.add('fa', darkModeState ? 'fa-sun-o' : 'fa-moon-o')
+	toggleButton.appendChild(icon)
+	document.body.prepend(toggleButton)
 
 	// Listen for changes in the OS settings
 	// addListener is used because older versions of Safari don't support addEventListener
 	// prefersDarkQuery set in <head>
 	if (prefersDarkQuery) {
 		prefersDarkQuery.addListener(function (evt) {
-			toggleDarkMode(evt.matches);
-		});
+			toggleDarkMode(evt.matches)
+		})
 	}
 
 	// Initial setting depending on the prefers-color-mode or localstorage
 	// darkModeState should be set in the document <head> to prevent flash
-	if (darkModeState == undefined) darkModeState = false;
-	toggleDarkMode(darkModeState);
+	if (darkModeState == undefined) darkModeState = false
+	toggleDarkMode(darkModeState)
 
 	// Toggles the "dark-mode" class on click and sets localStorage state
-	toggleButton.addEventListener("click", () => {
-		darkModeState = !darkModeState;
+	toggleButton.addEventListener('click', () => {
+		darkModeState = !darkModeState
 
-		toggleDarkMode(darkModeState);
-		localStorage.setItem("dark-mode", darkModeState);
-	});
+		toggleDarkMode(darkModeState)
+		localStorage.setItem('dark-mode', darkModeState)
+	})
 }
 
 function toggleDarkMode(state) {
-	document.documentElement.classList.toggle("dark-mode", state);
-	document.documentElement.classList.toggle("light-mode", !state);
-	icon.classList.remove("fa-sun-o");
-	icon.classList.remove("fa-moon-o");
-	icon.classList.add(state ? "fa-sun-o" : "fa-moon-o");
-	darkModeState = state;
+	document.documentElement.classList.toggle('dark-mode', state)
+	document.documentElement.classList.toggle('light-mode', !state)
+	icon.classList.remove('fa-sun-o')
+	icon.classList.remove('fa-moon-o')
+	icon.classList.add(state ? 'fa-sun-o' : 'fa-moon-o')
+	darkModeState = state
 }
 
-document.addEventListener("DOMContentLoaded", load);
+document.addEventListener('DOMContentLoaded', load)
diff --git a/docs/administration.rst b/docs/administration.rst
index f6b0ed659..dfb88ff80 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -118,10 +118,10 @@ Then you can start paperless-ngx with ``-d`` to have it run in the background.
                 image: ghcr.io/paperless-ngx/paperless-ngx:latest
 
     .. note::
-        In version 1.7.1 and onwards, the Docker image can now pinned to a release series.
+        In version 1.7.1 and onwards, the Docker image can now be pinned to a release series.
         This is often combined with automatic updaters such as Watchtower to allow safer
         unattended upgrading to new bugfix releases only.  It is still recommended to always
-        review release notes before upgrading.  To ping your install to a release series, edit
+        review release notes before upgrading.  To pin your install to a release series, edit
         the ``docker-compose.yml`` find the line that says
 
             .. code::
@@ -390,8 +390,8 @@ the naming scheme.
 
 .. warning::
 
-    Since this command moves you documents around a lot, it is advised to to
-    a backup before. The renaming logic is robust and will never overwrite
+    Since this command moves your documents, it is advised to do
+    a backup beforehand. The renaming logic is robust and will never overwrite
     or delete a file, but you can't ever be careful enough.
 
 .. code::
diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst
index 4dbb32f36..6449c478b 100644
--- a/docs/advanced_usage.rst
+++ b/docs/advanced_usage.rst
@@ -7,12 +7,12 @@ easier.
 
 .. _advanced-matching:
 
-Matching tags, correspondents and document types
-################################################
+Matching tags, correspondents, document types, and storage paths
+################################################################
 
-Paperless will compare the matching algorithms defined by every tag and
-correspondent already set in your database to see if they apply to the text in
-a document.  In other words, if you defined a tag called ``Home Utility``
+Paperless will compare the matching algorithms defined by every tag, correspondent,
+document type, and storage path in your database to see if they apply to the text
+in a document. In other words, if you define a tag called ``Home Utility``
 that had a ``match`` property of ``bc hydro`` and a ``matching_algorithm`` of
 ``literal``, Paperless will automatically tag your newly-consumed document with
 your ``Home Utility`` tag so long as the text ``bc hydro`` appears in the body
@@ -22,10 +22,10 @@ The matching logic is quite powerful. It supports searching the text of your
 document with different algorithms, and as such, some experimentation may be
 necessary to get things right.
 
-In order to have a tag, correspondent, or type assigned automatically to newly
-consumed documents, assign a match and matching algorithm using the web
-interface. These settings define when to assign correspondents, tags, and types
-to documents.
+In order to have a tag, correspondent, document type, or storage path assigned
+automatically to newly consumed documents, assign a match and matching algorithm
+using the web interface. These settings define when to assign tags, correspondents,
+document types, and storage paths to documents.
 
 The following algorithms are available:
 
@@ -37,7 +37,7 @@ The following algorithms are available:
 * **Literal:** Matches only if the match appears exactly as provided (i.e. preserve ordering) in the PDF.
 * **Regular expression:** Parses the match as a regular expression and tries to
   find a match within the document.
-* **Fuzzy match:** I dont know. Look at the source.
+* **Fuzzy match:** I don't know. Look at the source.
 * **Auto:** Tries to automatically match new documents. This does not require you
   to set a match. See the notes below.
 
@@ -47,9 +47,9 @@ defining a match text of ``"Bank of America" BofA`` using the *any* algorithm,
 will match documents that contain either "Bank of America" or "BofA", but will
 not match documents containing "Bank of South America".
 
-Then just save your tag/correspondent and run another document through the
-consumer.  Once complete, you should see the newly-created document,
-automatically tagged with the appropriate data.
+Then just save your tag, correspondent, document type, or storage path and run
+another document through the consumer.  Once complete, you should see the
+newly-created document, automatically tagged with the appropriate data.
 
 
 .. _advanced-automatic_matching:
@@ -58,9 +58,9 @@ Automatic matching
 ==================
 
 Paperless-ngx comes with a new matching algorithm called *Auto*. This matching
-algorithm tries to assign tags, correspondents, and document types to your
-documents based on how you have already assigned these on existing documents. It
-uses a neural network under the hood.
+algorithm tries to assign tags, correspondents, document types, and storage paths
+to your documents based on how you have already assigned these on existing documents.
+It uses a neural network under the hood.
 
 If, for example, all your bank statements of your account 123 at the Bank of
 America are tagged with the tag "bofa_123" and the matching algorithm of this
@@ -80,20 +80,21 @@ feature:
   that the neural network only learns from documents which you have correctly
   tagged before.
 * The matching algorithm can only work if there is a correlation between the
-  tag, correspondent, or document type and the document itself. Your bank
-  statements usually contain your bank account number and the name of the bank,
-  so this works reasonably well, However, tags such as "TODO" cannot be
-  automatically assigned.
+  tag, correspondent, document type, or storage path and the document itself.
+  Your bank statements usually contain your bank account number and the name
+  of the bank, so this works reasonably well, However, tags such as "TODO"
+  cannot be automatically assigned.
 * The matching algorithm needs a reasonable number of documents to identify when
-  to assign tags, correspondents, and types. If one out of a thousand documents
-  has the correspondent "Very obscure web shop I bought something five years
-  ago", it will probably not assign this correspondent automatically if you buy
-  something from them again. The more documents, the better.
+  to assign tags, correspondents, storage paths, and types. If one out of a
+  thousand documents has the correspondent "Very obscure web shop I bought
+  something five years ago", it will probably not assign this correspondent
+  automatically if you buy something from them again. The more documents, the better.
 * Paperless also needs a reasonable amount of negative examples to decide when
-  not to assign a certain tag, correspondent or type. This will usually be the
-  case as you start filling up paperless with documents. Example: If all your
-  documents are either from "Webshop" and "Bank", paperless will assign one of
-  these correspondents to ANY new document, if both are set to automatic matching.
+  not to assign a certain tag, correspondent, document type, or storage path. This will
+  usually be the case as you start filling up paperless with documents.
+  Example: If all your documents are either from "Webshop" and "Bank", paperless
+  will assign one of these correspondents to ANY new document, if both are set
+  to automatic matching.
 
 Hooking into the consumption process
 ####################################
@@ -268,6 +269,17 @@ If paperless detects that two documents share the same filename, paperless will
 append ``_01``, ``_02``, etc to the filename. This happens if all the placeholders in a filename
 evaluate to the same value.
 
+.. hint::
+    You can affect how empty placeholders are treated by changing the following setting to
+    `true`.
+
+    .. code::
+
+        PAPERLESS_FILENAME_FORMAT_REMOVE_NONE=True
+
+    Doing this results in all empty placeholders resolving to "" instead of "none" as stated above.
+    Spaces before empty placeholders are removed as well, empty directories are omitted.
+
 .. hint::
 
     Paperless checks the filename of a document whenever it is saved. Therefore,
@@ -290,3 +302,59 @@ evaluate to the same value.
 
     However, keep in mind that inside docker, if files get stored outside of the
     predefined volumes, they will be lost after a restart of paperless.
+
+
+Storage paths
+#############
+
+One of the best things in Paperless is that you can not only access the documents via the
+web interface, but also via the file system.
+
+When as single storage layout is not sufficient for your use case, storage paths come to
+the rescue. Storage paths allow you to configure more precisely where each document is stored
+in the file system.
+
+- Each storage path is a `PAPERLESS_FILENAME_FORMAT` and follows the rules described above
+- Each document is assigned a storage path using the matching algorithms described above, but
+  can be overwritten at any time
+
+For example, you could define the following two storage paths:
+
+1. Normal communications are put into a folder structure sorted by `year/correspondent`
+2. Communications with insurance companies are stored in a flat structure with longer file names,
+   but containing the full date of the correspondence.
+
+.. code::
+
+    By Year = {created_year}/{correspondent}/{title}
+    Insurances = Insurances/{correspondent}/{created_year}-{created_month}-{created_day} {title}
+
+
+If you then map these storage paths to the documents, you might get the following result.
+For simplicity, `By Year` defines the same structure as in the previous example above.
+
+.. code:: text
+
+   2019/                                   # By Year
+      My bank/
+        Statement January.pdf
+        Statement February.pdf
+
+    Insurances/                           # Insurances
+      Healthcare 123/
+        2022-01-01 Statement January.pdf
+        2022-02-02 Letter.pdf
+        2022-02-03 Letter.pdf
+      Dental 456/
+        2021-12-01 New Conditions.pdf
+
+
+.. hint::
+
+    Defining a storage path is optional. If no storage path is defined for a document, the global
+    `PAPERLESS_FILENAME_FORMAT` is applied.
+
+.. caution::
+
+    If you adjust the format of an existing storage path, old documents don't get relocated automatically.
+    You need to run the :ref:`document renamer <utilities-renamer>` to adjust their pathes.
diff --git a/docs/changelog.md b/docs/changelog.md
new file mode 100644
index 000000000..9ba2f9aa0
--- /dev/null
+++ b/docs/changelog.md
@@ -0,0 +1,1947 @@
+# Changelog
+
+## paperless-ngx 1.7.1
+
+### Features
+
+- (chore) Runs pyupgrade to Python 3.8+ [\@stumpylog](https://github.com/stumpylog) ([\#890](https://github.com/paperless-ngx/paperless-ngx/pull/890))
+- Dockerfile Organization \& Enhancements [\@stumpylog](https://github.com/stumpylog) ([\#888](https://github.com/paperless-ngx/paperless-ngx/pull/888))
+- mobile friendlier manage pages [\@shamoon](https://github.com/shamoon) ([\#873](https://github.com/paperless-ngx/paperless-ngx/pull/873))
+- Use semver for release process [\@stumpylog](https://github.com/stumpylog) ([\#851](https://github.com/paperless-ngx/paperless-ngx/pull/851))
+- Enable Docker Hub push [\@stumpylog](https://github.com/stumpylog) ([\#828](https://github.com/paperless-ngx/paperless-ngx/pull/828))
+- Feature barcode tiff support [\@gador](https://github.com/gador) ([\#766](https://github.com/paperless-ngx/paperless-ngx/pull/766))
+- Updates GHA workflow to rebuild intermediate images on changes [\@stumpylog](https://github.com/stumpylog) ([\#820](https://github.com/paperless-ngx/paperless-ngx/pull/820))
+- Adds simple Python to wait for Redis broker to be ready [\@stumpylog](https://github.com/stumpylog) ([\#788](https://github.com/paperless-ngx/paperless-ngx/pull/788))
+- Update GHA workflow to build all Docker images [\@stumpylog](https://github.com/stumpylog) ([\#761](https://github.com/paperless-ngx/paperless-ngx/pull/761))
+
+### Bug Fixes
+
+- Feature / fix saved view \& sort field query params [\@shamoon](https://github.com/shamoon) ([\#881](https://github.com/paperless-ngx/paperless-ngx/pull/881))
+- mobile friendlier manage pages [\@shamoon](https://github.com/shamoon) ([\#873](https://github.com/paperless-ngx/paperless-ngx/pull/873))
+- Add timeout to healthcheck [\@shamoon](https://github.com/shamoon) ([\#880](https://github.com/paperless-ngx/paperless-ngx/pull/880))
+- Always accept yyyy-mm-dd date inputs [\@shamoon](https://github.com/shamoon) ([\#864](https://github.com/paperless-ngx/paperless-ngx/pull/864))
+- Fix local Docker image building [\@stumpylog](https://github.com/stumpylog) ([\#849](https://github.com/paperless-ngx/paperless-ngx/pull/849))
+- Fix: show errors on invalid date input [\@shamoon](https://github.com/shamoon) ([\#862](https://github.com/paperless-ngx/paperless-ngx/pull/862))
+- Fix: Older dates do not display on frontend [\@shamoon](https://github.com/shamoon) ([\#852](https://github.com/paperless-ngx/paperless-ngx/pull/852))
+- Fixes IMAP UTF8 Authenication [\@stumpylog](https://github.com/stumpylog) ([\#725](https://github.com/paperless-ngx/paperless-ngx/pull/725))
+- Fix password field remains visible [\@shamoon](https://github.com/shamoon) ([\#840](https://github.com/paperless-ngx/paperless-ngx/pull/840))
+- Fixes Pillow build for armv7 [\@stumpylog](https://github.com/stumpylog) ([\#815](https://github.com/paperless-ngx/paperless-ngx/pull/815))
+- Update frontend localization source file [\@shamoon](https://github.com/shamoon) ([\#814](https://github.com/paperless-ngx/paperless-ngx/pull/814))
+- Fix install script extra OCR languages format [\@stumpylog](https://github.com/stumpylog) ([\#777](https://github.com/paperless-ngx/paperless-ngx/pull/777))
+
+### Documentation
+
+- Use semver for release process [\@stumpylog](https://github.com/stumpylog) ([\#851](https://github.com/paperless-ngx/paperless-ngx/pull/851))
+- Deployment: Consolidate tika compose files [\@qcasey](https://github.com/qcasey) ([\#866](https://github.com/paperless-ngx/paperless-ngx/pull/866))
+- Fix local Docker image building [\@stumpylog](https://github.com/stumpylog) ([\#849](https://github.com/paperless-ngx/paperless-ngx/pull/849))
+
+### Maintenance
+
+- Dockerfile Organization \& Enhancements [\@stumpylog](https://github.com/stumpylog) ([\#888](https://github.com/paperless-ngx/paperless-ngx/pull/888))
+- Add timeout to healthcheck [\@shamoon](https://github.com/shamoon) ([\#880](https://github.com/paperless-ngx/paperless-ngx/pull/880))
+- Use semver for release process [\@stumpylog](https://github.com/stumpylog) ([\#851](https://github.com/paperless-ngx/paperless-ngx/pull/851))
+- Deployment: Consolidate tika compose files [\@qcasey](https://github.com/qcasey) ([\#866](https://github.com/paperless-ngx/paperless-ngx/pull/866))
+- Fixes Pillow build for armv7 [\@stumpylog](https://github.com/stumpylog) ([\#815](https://github.com/paperless-ngx/paperless-ngx/pull/815))
+- Update frontend localization source file [\@shamoon](https://github.com/shamoon) ([\#814](https://github.com/paperless-ngx/paperless-ngx/pull/814))
+- Fix install script extra OCR languages format [\@stumpylog](https://github.com/stumpylog) ([\#777](https://github.com/paperless-ngx/paperless-ngx/pull/777))
+- Adds simple Python to wait for Redis broker to be ready [\@stumpylog](https://github.com/stumpylog) ([\#788](https://github.com/paperless-ngx/paperless-ngx/pull/788))
+
+### Dependencies
+
+<details>
+<summary>15 changes</summary>
+
+- Bump tj-actions/changed-files from 18.7 to 19 @dependabot ([\#830](https://github.com/paperless-ngx/paperless-ngx/pull/830))
+- Bump asgiref from 3.5.0 to 3.5.1 @dependabot ([\#867](https://github.com/paperless-ngx/paperless-ngx/pull/867))
+- Bump jest from 27.5.1 to 28.0.3 in /src-ui @dependabot ([\#860](https://github.com/paperless-ngx/paperless-ngx/pull/860))
+- Bump @<!---->ng-bootstrap/ng-bootstrap from 12.1.0 to 12.1.1 in /src-ui @dependabot ([\#861](https://github.com/paperless-ngx/paperless-ngx/pull/861))
+- Bump @<!---->types/node from 17.0.27 to 17.0.29 in /src-ui @dependabot ([\#833](https://github.com/paperless-ngx/paperless-ngx/pull/833))
+- Bump @<!---->ng-bootstrap/ng-bootstrap from 12.0.2 to 12.1.0 in /src-ui @dependabot ([\#834](https://github.com/paperless-ngx/paperless-ngx/pull/834))
+- Bump pytest from 7.1.1 to 7.1.2 @dependabot ([\#806](https://github.com/paperless-ngx/paperless-ngx/pull/806))
+- Bump github/codeql-action from 1 to 2 @dependabot ([\#792](https://github.com/paperless-ngx/paperless-ngx/pull/792))
+- Bump imap-tools from 0.53.0 to 0.54.0 @dependabot ([\#758](https://github.com/paperless-ngx/paperless-ngx/pull/758))
+- Bump ocrmypdf from 13.4.2 to 13.4.3 @dependabot ([\#757](https://github.com/paperless-ngx/paperless-ngx/pull/757))
+- Bump importlib-resources from 5.6.0 to 5.7.1 @dependabot ([\#756](https://github.com/paperless-ngx/paperless-ngx/pull/756))
+- Bump tox from 3.24.5 to 3.25.0 @dependabot ([\#692](https://github.com/paperless-ngx/paperless-ngx/pull/692))
+- Bump cypress from 9.5.3 to 9.6.0 in /src-ui @dependabot ([\#800](https://github.com/paperless-ngx/paperless-ngx/pull/800))
+- Bump angular \& tools to 13.3.4 or 13.3.3 [\@shamoon](https://github.com/shamoon) ([\#799](https://github.com/paperless-ngx/paperless-ngx/pull/799))
+- Bump concurrently from 7.0.0 to 7.1.0 in /src-ui @dependabot ([\#797](https://github.com/paperless-ngx/paperless-ngx/pull/797))
+</details>
+
+## paperless-ngx 1.7.0
+
+Breaking Changes
+
+- `PAPERLESS_URL` is now required when using a reverse proxy. See
+  [\#674](https://github.com/paperless-ngx/paperless-ngx/pull/674).
+
+Features
+
+- Allow setting more than one tag in mail rules
+  [\@jonasc](https://github.com/jonasc) (\#270)
+- global drag\'n\'drop [\@shamoon](https://github.com/shamoon)
+  (\#283).
+- Fix: download buttons should disable while waiting
+  [\@shamoon](https://github.com/shamoon) (\#630).
+- Update checker [\@shamoon](https://github.com/shamoon) (\#591).
+- Show prompt on password-protected pdfs
+  [\@shamoon](https://github.com/shamoon) (\#564).
+- Filtering query params aka browser navigation for filtering
+  [\@shamoon](https://github.com/shamoon) (\#540).
+- Clickable tags in dashboard widgets
+  [\@shamoon](https://github.com/shamoon) (\#515).
+- Add bottom pagination [\@shamoon](https://github.com/shamoon)
+  (\#372).
+- Feature barcode splitter [\@gador](https://github.com/gador)
+  (\#532).
+- App loading screen [\@shamoon](https://github.com/shamoon) (\#298).
+- Use progress bar for delayed buttons
+  [\@shamoon](https://github.com/shamoon) (\#415).
+- Add minimum length for documents text filter
+  [\@shamoon](https://github.com/shamoon) (\#401).
+- Added nav buttons in the document detail view
+  [\@GruberViktor](https://github.com/gruberviktor) (\#273).
+- Improve date keyboard input [\@shamoon](https://github.com/shamoon)
+  (\#253).
+- Color theming [\@shamoon](https://github.com/shamoon) (\#243).
+- Parse dates when entered without separators
+  [\@GruberViktor](https://github.com/gruberviktor) (\#250).
+
+Bug Fixes
+
+- add \"localhost\" to ALLOWED_HOSTS
+  [\@gador](https://github.com/gador) (\#700).
+- Fix: scanners table [\@qcasey](https://github.com/qcasey) (\#690).
+- Adds wait for file before consuming
+  [\@stumpylog](https://github.com/stumpylog) (\#483).
+- Fix: frontend document editing erases time data
+  [\@shamoon](https://github.com/shamoon) (\#654).
+- Increase length of SavedViewFilterRule
+  [\@stumpylog](https://github.com/stumpylog) (\#612).
+- Fixes attachment filename matching during mail fetching
+  [\@stumpylog](https://github.com/stumpylog) (\#680).
+- Add `PAPERLESS_URL` env variable & CSRF var
+  [\@shamoon](https://github.com/shamoon) (\#674).
+- Fix: download buttons should disable while waiting
+  [\@shamoon](https://github.com/shamoon) (\#630).
+- Fixes downloaded filename, add more consumer ignore settings
+  [\@stumpylog](https://github.com/stumpylog) (\#599).
+- FIX BUG: case-sensitive matching was not possible
+  [\@danielBreitlauch](https://github.com/danielbreitlauch) (\#594).
+- uses shutil.move instead of rename
+  [\@gador](https://github.com/gador) (\#617).
+- Fix npm deps 01.02.22 2 [\@shamoon](https://github.com/shamoon)
+  (\#610).
+- Fix npm dependencies 01.02.22
+  [\@shamoon](https://github.com/shamoon) (\#600).
+- fix issue 416: implement PAPERLESS_OCR_MAX_IMAGE_PIXELS
+  [\@hacker-h](https://github.com/hacker-h) (\#441).
+- fix: exclude cypress from build in Dockerfile
+  [\@FrankStrieter](https://github.com/FrankStrieter) (\#526).
+- Corrections to pass pre-commit hooks
+  [\@schnuffle](https://github.com/schnuffle) (\#454).
+- Fix 311 unable to click checkboxes in document list
+  [\@shamoon](https://github.com/shamoon) (\#313).
+- Fix imap tools bug [\@stumpylog](https://github.com/stumpylog)
+  (\#393).
+- Fix filterable dropdown buttons arent translated
+  [\@shamoon](https://github.com/shamoon) (\#366).
+- Fix 224: \"Auto-detected date is day before receipt date\"
+  [\@a17t](https://github.com/a17t) (\#246).
+- Fix minor sphinx errors [\@shamoon](https://github.com/shamoon)
+  (\#322).
+- Fix page links hidden [\@shamoon](https://github.com/shamoon)
+  (\#314).
+- Fix: Include excluded items in dropdown count
+  [\@shamoon](https://github.com/shamoon) (\#263).
+
+Translation
+
+- [\@miku323](https://github.com/miku323) contributed to Slovenian
+  translation.
+- [\@FaintGhost](https://github.com/FaintGhost) contributed to Chinese
+  Simplified translation.
+- [\@DarkoBG79](https://github.com/DarkoBG79) contributed to Serbian
+  translation.
+- [Kemal Secer](https://crowdin.com/profile/kemal.secer) contributed
+  to Turkish translation.
+- [\@Prominence](https://github.com/Prominence) contributed to
+  Belarusian translation.
+
+Documentation
+
+- Fix: scanners table [\@qcasey](https://github.com/qcasey) (\#690).
+- Add [PAPERLESS\_URL]{.title-ref} env variable & CSRF var
+  [\@shamoon](https://github.com/shamoon) (\#674).
+- Fixes downloaded filename, add more consumer ignore settings
+  [\@stumpylog](https://github.com/stumpylog) (\#599).
+- fix issue 416: implement `PAPERLESS_OCR_MAX_IMAGE_PIXELS`
+  [\@hacker-h](https://github.com/hacker-h) (\#441).
+- Fix minor sphinx errors [\@shamoon](https://github.com/shamoon)
+  (\#322).
+
+Maintenance
+
+- Add `PAPERLESS_URL` env variable & CSRF var
+  [\@shamoon](https://github.com/shamoon) (\#674).
+- Chore: Implement release-drafter action for Changelogs
+  [\@qcasey](https://github.com/qcasey) (\#669).
+- Chore: Add CODEOWNERS [\@qcasey](https://github.com/qcasey) (\#667).
+- Support docker-compose v2 in install
+  [\@stumpylog](https://github.com/stumpylog) (\#611).
+- Add Belarusian localization [\@shamoon](https://github.com/shamoon)
+  (\#588).
+- Add Turkish localization [\@shamoon](https://github.com/shamoon)
+  (\#536).
+- Add Serbian localization [\@shamoon](https://github.com/shamoon)
+  (\#504).
+- Create PULL_REQUEST_TEMPLATE.md
+  [\@shamoon](https://github.com/shamoon) (\#304).
+- Add Chinese localization [\@shamoon](https://github.com/shamoon)
+  (\#247).
+- Add Slovenian language for frontend
+  [\@shamoon](https://github.com/shamoon) (\#315).
+
+## paperless-ngx 1.6.0
+
+This is the first release of the revived paperless-ngx project 🎉. Thank
+you to everyone on the paperless-ngx team for your initiative and
+excellent teamwork!
+
+Version 1.6.0 merges several pending PRs from jonaswinkler\'s repo and
+includes new feature updates and bug fixes. Major backend and UI changes
+include:
+
+- Updated docs, scripts, CI, and containers to paperless-ngx.
+- Updated Python and Angular dependencies.
+- Dropped support for Python 3.7.
+- Dropped support for Ansible playbooks (thanks
+  [\@slankes](https://github.com/slankes) \#109). If someone would
+  like to continue supporting them, please see the [ansible
+  repo](https://github.com/paperless-ngx/paperless-ngx-ansible).
+- Python code is now required to use Black formatting (thanks
+  [\@kpj](https://github.com/kpj) \#168).
+- [\@tribut](https://github.com/tribut) added support for a custom SSO
+  logout redirect (jonaswinkler\#1258). See
+  `PAPERLESS_LOGOUT_REDIRECT_URL`.
+- [\@shamoon](https://github.com/shamoon) added a loading indicator
+  when document list is reloading (jonaswinkler\#1297).
+- [\@shamoon](https://github.com/shamoon) improved the PDF viewer on
+  mobile (\#2).
+- [\@shamoon](https://github.com/shamoon) added \'any\' / \'all\' and
+  \'not\' filtering with tags (\#10).
+- [\@shamoon](https://github.com/shamoon) added warnings for unsaved
+  changes, with smart edit buttons (\#13).
+- [\@benjaminfrank](https://github.com/benjaminfrank) enabled a
+  non-root access to port 80 via systemd (\#18).
+- [\@tribut](https://github.com/tribut) added simple \"delete to
+  trash\" functionality (\#24). See `PAPERLESS_TRASH_DIR`.
+- [\@amenk](https://github.com/amenk) fixed the search box overlay
+  menu on mobile (\#32).
+- [\@dblitt](https://github.com/dblitt) updated the login form to not
+  auto-capitalize usernames (\#36).
+- [\@evilsidekick293](https://github.com/evilsidekick293) made the
+  worker timeout configurable (\#37). See `PAPERLESS_WORKER_TIMEOUT`.
+- [\@Nicarim](https://github.com/Nicarim) fixed downloads of UTF-8
+  formatted documents in Firefox (\#56).
+- [\@mweimerskirch](https://github.com/mweimerskirch) sorted the
+  language dropdown by locale (\#78).
+- [\@mweimerskirch](https://github.com/mweimerskirch) enabled the
+  Czech (\#83) and Danish (\#84) translations.
+- [\@cschmatzler](https://github.com/cschmatzler) enabled specifying
+  the webserver port (\#124). See `PAPERLESS_PORT`.
+- [\@muellermartin](https://github.com/muellermartin) fixed an error
+  when uploading transparent PNGs (\#133).
+- [\@shamoon](https://github.com/shamoon) created a slick new logo
+  (\#165).
+- [\@tim-vogel](https://github.com/tim-vogel) fixed exports missing
+  groups (\#193).
+
+Known issues:
+
+- 1.6.0 included a malformed package-lock.json, as a result users who
+  want to build the docker image themselves need to change line 6 of
+  the `Dockerfile` to
+  `RUN npm update npm -g && npm install --legacy-peer-deps`.
+
+Thank you to the following people for their documentation updates,
+fixes, and comprehensive testing:
+
+[\@m0veax](https://github.com/m0veax),
+[\@a17t](https://github.com/a17t),
+[\@fignew](https://github.com/fignew),
+[\@muued](https://github.com/muued),
+[\@bauerj](https://github.com/bauerj),
+[\@isigmund](https://github.com/isigmund),
+[\@denilsonsa](https://github.com/denilsonsa),
+[\@mweimerskirch](https://github.com/mweimerskirch),
+[\@alexander-bauer](https://github.com/alexander-bauer),
+[\@apeltzer](https://github.com/apeltzer),
+[\@tribut](https://github.com/tribut),
+[\@yschroeder](https://github.com/yschroeder),
+[\@gador](https://github.com/gador),
+[\@sAksham-Ar](https://github.com/sAksham-Ar),
+[\@sbrunner](https://github.com/sbrunner),
+[\@philpagel](https://github.com/philpagel),
+[\@davemachado](https://github.com/davemachado),
+[\@2600box](https://github.com/2600box),
+[\@qcasey](https://github.com/qcasey),
+[\@Nicarim](https://github.com/Nicarim),
+[\@kpj](https://github.com/kpj), [\@filcuk](https://github.com/filcuk),
+[\@Timoms](https://github.com/Timoms),
+[\@mattlamb99](https://github.com/mattlamb99),
+[\@padraigkitterick](https://github.com/padraigkitterick),
+[\@ajkavanagh](https://github.com/ajkavanagh),
+[\@Tooa](https://github.com/Tooa),
+[\@Unkn0wnCat](https://github.com/Unkn0wnCat),
+[\@pewter77](https://github.com/pewter77),
+[\@stumpylog](https://github.com/stumpylog),
+[\@Toxix](https://github.com/Toxix),
+[\@azapater](https://github.com/azapater),
+[\@jschpp](https://github.com/jschpp)
+
+Another big thanks to the people who have contributed translations:
+
+- Michel Weimerskirch (michel_weimerskirch) suggested 31 translations
+  into French and Luxembourgish.
+- jo.vandeginste suggested 21 translations into Dutch.
+- Lars Sørensen (Lrss) suggested 486 translations into Danish.
+- Alex (Sky-Dragon) voted for 46 translations in German.
+- Yannic Schröder (yschroeder) suggested 14 translations into German.
+- David Morais Ferreira (DavidMoraisFerreira) voted for 10
+  translations in Portuguese and Luxembourgish.
+- David Morais Ferreira (DavidMoraisFerreira) suggested 88
+  translations into French, German, Portuguese, Portuguese, Brazilian
+  and Luxembourgish.
+- 汪泠沣 (wlfcss) suggested 13 translations into Chinese Traditional.
+- Lars Sørensen (Lrss) suggested 167 translations into Danish.
+- Philmo67 suggested 11 translations into French.
+
+## Paperless-ng
+
+### paperless-ng 1.5.0
+
+Support for Python 3.6 was dropped.
+
+- Updated python dependencies.
+- Base image of the docker image changed from Debian Buster to Debian
+  Bullseye due to its recent release.
+- The docker image now uses python 3.9.
+- Added the Luxembourgish locale. Thanks for translating!
+- [Daniel Albers](https://github.com/AlD) added support for making the
+  files and folders ignored by the paperless consume folder scanner
+  configurable. See `PAPERLESS_CONSUMER_IGNORE_PATTERNS`.
+
+### paperless-ng 1.4.5
+
+This is a maintenance release.
+
+- Updated Python and Angular dependencies.
+- Changed the algorithm that changes permissions during startup. This
+  is still fast, and will hopefully cause less issues.
+- Fixed an issue that would sometimes cause paperless to write an
+  incomplete classification model file to disk.
+- Fixed an issue with the OCRmyPDF parser that would always try to
+  extract text with PDFminer even from non-PDF files.
+
+### paperless-ng 1.4.4
+
+- Drastically decreased the startup time of the docker container. The
+  startup script adjusts file permissions of all data only if changes
+  are required.
+- Paperless mail: Added ability to specify the character set for each
+  server.
+- Document consumption: Ignore Mac OS specific files such as
+  `.DS_STORE` and `._XXXXX.pdf`.
+- Fixed an issue with the automatic matching algorithm that prevents
+  paperless from consuming new files.
+- Updated translations.
+
+### paperless-ng 1.4.3
+
+- Additions and changes
+  - Added Swedish locale.
+  - [Stéphane Brunner](https://github.com/sbrunner) added an option
+    to disable the progress bars of all management commands.
+  - [Jo Vandeginste](https://github.com/jovandeginste) added support
+    for RTF documents to the Apache TIKA parser.
+  - [Michael Shamoon](https://github.com/shamoon) added dark mode
+    for the login and logout pages.
+  - [Alexander Menk](https://github.com/amenk) added additional
+    stylesheets for printing. You can now print any page of
+    paperless and the print result will hide the page header,
+    sidebar, and action buttons.
+  - Added support for sorting when using full text search.
+- Fixes
+  - [puuu](https://github.com/puuu) fixed
+    `PAPERLESS_FORCE_SCRIPT_NAME`. You can now host paperless on sub
+    paths such as `https://localhost:8000/paperless/`.
+  - Fixed an issue with the document consumer crashing on certain
+    documents due to issues with pdfminer.six. This library is used
+    for PDF text extraction.
+
+### paperless-ng 1.4.2
+
+- Fixed an issue with `sudo` that caused paperless to not start on
+  many Raspberry Pi devices. Thank you
+  [WhiteHatTux](https://github.com/WhiteHatTux)!
+
+### paperless-ng 1.4.1
+
+- Added Polish locale.
+- Changed some parts of the Dockerfile to hopefully restore
+  functionality on certain ARM devices.
+- Updated python dependencies.
+- [Michael Shamoon](https://github.com/shamoon) added a sticky filter
+  / bulk edit bar.
+- [sbrl](https://github.com/sbrl) changed the docker-entrypoint.sh
+  script to increase compatibility with NFS shares.
+- [Chris Nagy](https://github.com/what-name) added support for
+  creating a super user by passing `PAPERLESS_ADMIN_USER` and
+  `PAPERLESS_ADMIN_PASSWORD` as environment variables to the docker
+  container.
+
+### paperless-ng 1.4.0
+
+- Docker images now use tesseract 4.1.1, which should fix a series of
+  issues with OCR.
+- The full text search now displays results using the default document
+  list. This enables selection, filtering and bulk edit on search
+  results.
+- Changes
+  - Firefox only: Highlight search query in PDF previews.
+  - New URL pattern for accessing documents by ASN directly
+    (<http://>\<paperless\>/asn/123)
+  - Added logging when executing pre\* and post-consume scripts.
+  - Better error logging during document consumption.
+  - Updated python dependencies.
+  - Automatically inserts typed text when opening \"Create new\"
+    dialogs on the document details page.
+- Fixes
+  - Fixed an issue with null characters in the document content.
+
+::: {.note}
+::: {.title}
+Note
+:::
+
+The changed to the full text searching require you to reindex your
+documents. _The docker image does this automatically, you don\'t need to
+do anything._ To do this, execute the `document_index reindex`
+management command (see `administration-index`{.interpreted-text
+role="ref"}).
+:::
+
+### paperless-ng 1.3.2
+
+- Added translation into Portuguese.
+- Changes
+  - The exporter now exports user accounts, mail accounts, mail
+    rules and saved views as well.
+- Fixes
+  - Minor layout issues with document cards and the log viewer.
+  - Fixed an issue with any/all/exact matching when characters used
+    in regular expressions were used for the match.
+
+### paperless-ng 1.3.1
+
+- Added translation into Spanish and Russian.
+- Other changes
+  - ISO-8601 date format will now always show years with 4 digits.
+  - Added the ability to search for a document with a specific ASN.
+  - The document cards now display ASN, types and dates in a more
+    organized way.
+  - Added document previews when hovering over the preview button.
+- Fixes
+  - The startup check for write permissions now works properly on
+    NFS shares.
+  - Fixed an issue with the search results score indicator.
+  - Paperless was unable to generate thumbnails for encrypted PDF
+    files and failed. Paperless will now generate a default
+    thumbnail for these files.
+  - Fixed `AUTO_LOGIN_USERNAME`: Unable to perform POST/PUT/DELETE
+    requests and unable to receive WebSocket messages.
+
+### paperless-ng 1.3.0
+
+This release contains new database migrations.
+
+- Changes
+  - The REST API is versioned from this point onwards. This will
+    allow me to make changes without breaking existing clients. See
+    the documentation about `api-versioning`{.interpreted-text
+    role="ref"} for details.
+  - Added a color picker for tag colors.
+  - Added the ability to use the filter for searching the document
+    content as well.
+  - Added translations into Italian and Romanian. Thank you!
+  - Close individual documents from the sidebar. Thanks to [Michael
+    Shamoon](https://github.com/shamoon).
+  - [BolkoSchreiber](https://github.com/BolkoSchreiber) added an
+    option to disable/enable thumbnail inversion in dark mode.
+  - [Simon Taddiken](https://github.com/skuzzle) added the ability
+    to customize the header used for remote user authentication with
+    SSO applications.
+- Bug fixes
+  - Fixed an issue with the auto matching algorithm when more than
+    256 tags were used.
+
+### paperless-ng 1.2.1
+
+- [Rodrigo Avelino](https://github.com/rodavelino) translated
+  Paperless into Portuguese (Brazil)!
+- The date input fields now respect the currently selected date
+  format.
+- Added a fancy icon when adding paperless to the home screen on iOS
+  devices. Thanks to [Joel Nordell](https://github.com/joelnordell).
+- When using regular expression matching, the regular expression is
+  now validated before saving the tag/correspondent/type.
+- Regression fix: Dates on the front end did not respect date locale
+  settings in some cases.
+
+### paperless-ng 1.2.0
+
+- Changes to the OCRmyPDF integration
+  - Added support for deskewing and automatic rotation of
+    incorrectly rotated pages. This is enabled by default, see
+    `configuration-ocr`{.interpreted-text role="ref"}.
+  - Better support for encrypted files.
+  - Better support for various other PDF files: Paperless will now
+    attempt to force OCR with safe options when OCR fails with the
+    configured options.
+  - Added an explicit option to skip cleaning with `unpaper`.
+- Download multiple selected documents as a zip archive.
+- The document list now remembers the current page.
+- Improved responsiveness when switching between saved views and the
+  document list.
+- Increased the default wait time when observing files in the
+  consumption folder with polling from 1 to 5 seconds. This will
+  decrease the likelihood of paperless consuming partially written
+  files.
+- Fixed a crash of the document archiver management command when
+  trying to process documents with unknown mime types.
+- Paperless no longer depends on `libpoppler-cpp-dev`.
+
+### paperless-ng 1.1.4
+
+- Added English (GB) locale.
+- Added ISO-8601 date display option.
+
+### paperless-ng 1.1.3
+
+- Added a docker-specific configuration option to adjust the number of
+  worker processes of the web server. See
+  `configuration-docker`{.interpreted-text role="ref"}.
+- Some more memory usage optimizations.
+- Don\'t show inbox statistics if no inbox tag is defined.
+
+### paperless-ng 1.1.2
+
+- Always show top left corner of thumbnails, even for extra wide
+  documents.
+- Added a management command for executing the sanity checker
+  directly. See `utilities-sanity-checker`{.interpreted-text
+  role="ref"}.
+- The weekly sanity check now reports messages in the log files.
+- Fixed an issue with the metadata tab not reporting anything in case
+  of missing files.
+- Reverted a change from 1.1.0 that caused huge memory usage due to
+  redis caching.
+- Some memory usage optimizations.
+
+### paperless-ng 1.1.1
+
+This release contains new database migrations.
+
+- Fixed a bug in the sanity checker that would cause it to display \"x
+  not in list\" errors instead of actual issues.
+- Fixed a bug with filename generation for archive filenames that
+  would cause the archive files of two documents to overlap.
+  - This happened when `PAPERLESS_FILENAME_FORMAT` is used and the
+    filenames of two or more documents are the same, except for the
+    file extension.
+  - Paperless will now store the archive filename in the database as
+    well instead of deriving it from the original filename, and use
+    the same logic for detecting and avoiding filename clashes
+    that\'s also used for original filenames.
+  - The migrations will repair any missing archive files. If you\'re
+    using tika, ensure that tika is running while performing the
+    migration. Docker-compose will take care of that.
+- Fixed a bug with thumbnail regeneration when TIKA integration was
+  used.
+- Added ASN as a placeholder field to the filename format.
+- The docker image now comes with built-in shortcuts for most
+  management commands. These are now the recommended way to execute
+  management commands, since these also ensure that they\'re always
+  executed as the paperless user and you\'re less likely to run into
+  permission issues. See
+  `utilities-management-commands`{.interpreted-text role="ref"}.
+
+### paperless-ng 1.1.0
+
+- Document processing status
+
+  - Paperless now shows the status of processing documents on the
+    dashboard in real time.
+  - Status notifications when
+    - New documents are detected in the consumption folder, in
+      mails, uploaded on the front end, or added with one of the
+      mobile apps.
+    - Documents are successfully added to paperless.
+    - Document consumption failed (with error messages)
+  - Configuration options to enable/disable individual
+    notifications.
+
+- Live updates to document lists and saved views when new documents
+  are added.
+
+  ::: {.hint}
+  ::: {.title}
+  Hint
+  :::
+
+  For status notifications and live updates to work, paperless now
+  requires an [ASGI](https://asgi.readthedocs.io/en/latest/)-enabled
+  web server. The docker images uses `gunicorn` and an ASGI-enabled
+  worker called [uvicorn](http://www.uvicorn.org/), and there is no
+  need to configure anything.
+
+  For bare metal installations, changes are required for the
+  notifications to work. Adapt the service
+  `paperless-webserver.service` to use the supplied `gunicorn.conf.py`
+  configuration file and adapt the reference to the ASGI application
+  as follows:
+
+  ```
+  ExecStart=/opt/paperless/.local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless.asgi:application
+  ```
+
+  Paperless will continue to work with WSGI, but you will not get any
+  status notifications.
+
+  Apache `mod_wsgi` users, see
+  `this note <faq-mod_wsgi>`{.interpreted-text role="ref"}.
+  :::
+
+- Paperless now offers suggestions for tags, correspondents and types
+  on the document detail page.
+
+- Added an interactive easy install script that automatically
+  downloads, configures and starts paperless with docker.
+
+- Official support for Python 3.9.
+
+- Other changes and fixes
+
+  - Adjusted the default parallelization settings to run more than
+    one task in parallel on systems with 4 or less cores. This
+    addresses issues with paperless not consuming any new files when
+    other tasks are running.
+  - Fixed a rare race condition that would cause paperless to
+    process incompletely written files when using the upload on the
+    dashboard.
+  - The document classifier no longer issues warnings and errors
+    when auto matching is not used at all.
+  - Better icon for document previews.
+  - Better info section in the side bar.
+  - Paperless no longer logs to the database. Instead, logs are
+    written to rotating log files. This solves many \"database is
+    locked\" issues on Raspberry Pi, especially when SQLite is used.
+  - By default, log files are written to `PAPERLESS_DATA_DIR/log/`.
+    Logging settings can be adjusted with `PAPERLESS_LOGGING_DIR`,
+    `PAPERLESS_LOGROTATE_MAX_SIZE` and
+    `PAPERLESS_LOGROTATE_MAX_BACKUPS`.
+
+### paperless-ng 1.0.0
+
+Nothing special about this release, but since there are relatively few
+bug reports coming in, I think that this is reasonably stable.
+
+- Document export
+  - The document exporter has been rewritten to support updating an
+    already existing export in place. This enables incremental
+    backups with `rsync`.
+  - The document exporter supports naming exported files according
+    to `PAPERLESS_FILENAME_FORMAT`.
+  - The document exporter locks the media directory and the database
+    during execution to ensure that the resulting export is
+    consistent.
+  - See the
+    `updated documentation <utilities-exporter>`{.interpreted-text
+    role="ref"} for more details.
+- Other changes and additions
+  - Added a language selector to the settings.
+  - Added date format options to the settings.
+  - Range selection with shift clicking is now possible in the
+    document list.
+  - Filtering correspondent, type and tag management pages by name.
+  - Focus \"Name\" field in dialogs by default.
+
+### paperless-ng 0.9.14
+
+Starting with this version, releases are getting built automatically.
+This release also comes with changes on how to install and update
+paperless.
+
+- Paperless now uses GitHub Actions to make releases and build docker
+  images.
+  - Docker images are available for amd64, armhf, and aarch64.
+  - When you pull an image from Docker Hub, Docker will
+    automatically select the correct image for you.
+- Changes to docker installations and updates
+  - The `-dockerfiles.tar.xz` release archive is gone. Instead,
+    simply grab the docker files from `/docker/compose` in the
+    repository if you wish to install paperless by pulling from the
+    hub.
+  - The docker compose files in `/docker/compose` were changed to
+    always use the `latest` version automatically. In order to do
+    further updates, simply do a `docker-compose pull`. The
+    documentation has been updated.
+  - The docker compose files were changed to restart paperless on
+    system boot only if it was running before shutdown.
+  - Documentation of the docker-compose files about what they do.
+- Changes to bare metal installations and updates
+  - The release archive is built exactly like before. However, the
+    release now comes with already compiled translation messages and
+    collected static files. Therefore, the update steps
+    `compilemessages` and `collectstatic` are now obsolete.
+- Other changes
+  - A new configuration option `PAPERLESS_IGNORE_DATES` was added by
+    [jayme-github](http://github.com/jayme-github). This can be used
+    to instruct paperless to ignore certain dates (such as your date
+    of birth) when guessing the date from the document content. This
+    was actually introduced in 0.9.12, I just forgot to mention it
+    in the changelog.
+  - The filter drop downs now display selected entries on top of all
+    other entries.
+  - The PostgreSQL client now supports setting an explicit `sslmode`
+    to force encryption of the connection to PostgreSQL.
+  - The docker images now come with `jbig2enc`, which is a lossless
+    image encoder for PDF documents and decreases the size of
+    certain PDF/A documents.
+  - When using any of the manual matching algorithms, paperless now
+    logs messages about when and why these matching algorithms
+    matched.
+  - The default settings for parallelization in paperless were
+    adjusted to always leave one CPU core free.
+  - Added an option to the frontend to choose which method to use
+    for displaying PDF documents.
+- Fixes
+  - An issue with the tika parser not picking up files from the
+    consumption directory was fixed.
+  - A couple changes to the dark mode and fixes to several other
+    layout issues.
+  - An issue with the drop downs for correspondents, tags and types
+    not properly supporting filtering with special characters was
+    fixed.
+  - Fixed an issue with filenames of downloaded files: Dates where
+    off by one day due to timezone issues.
+  - Searching will continue to work even when the index returns
+    non-existing documents. This resulted in \"Document does not
+    exist\" errors before. Instead, a warning is logged, indicating
+    the issue.
+  - An issue with the consumer crashing when invalid regular
+    expression were used was fixed.
+
+### paperless-ng 0.9.13
+
+- Fixed an issue with Paperless not starting due to the new Tika
+  integration when `USERMAP_UID` and `USERMAP_GID` was used in the
+  `docker-compose.env` file.
+
+### paperless-ng 0.9.12
+
+- Paperless localization
+  - Thanks to the combined efforts of many users, Paperless is now
+    available in English, Dutch, French and German.
+- Thanks to [Jo Vandeginste](https://github.com/jovandeginste),
+  Paperless has optional support for Office documents such as .docx,
+  .doc, .odt and more.
+  - See the `configuration<configuration-tika>`{.interpreted-text
+    role="ref"} on how to enable this feature. This feature requires
+    two additional services (one for parsing Office documents and
+    metadata extraction and another for converting Office documents
+    to PDF), and is therefore not enabled on default installations.
+  - As with all other documents, paperless converts Office documents
+    to PDF and stores both the original as well as the archived PDF.
+- Dark mode
+  - Thanks to [Michael Shamoon](https://github.com/shamoon),
+    paperless now has a dark mode. Configuration is available in the
+    settings.
+- Other changes and additions
+  - The PDF viewer now uses a local copy of some dependencies
+    instead of fetching them from the internet. Thanks to
+    [slorenz](https://github.com/sisao).
+  - Revamped search bar styling thanks to [Michael
+    Shamoon](https://github.com/shamoon).
+  - Sorting in the document list by clicking on table headers.
+  - A button was added to the document detail page that assigns a
+    new ASN to a document.
+  - Form field validation: When providing invalid input in a form
+    (such as a duplicate ASN or no name), paperless now has visual
+    indicators and clearer error messages about what\'s wrong.
+  - Paperless disables buttons with network actions (such as save
+    and delete) when a network action is active. This indicates that
+    something is happening and prevents double clicking.
+  - When using \"Save & next\", the title field is focussed
+    automatically to better support keyboard editing.
+  - E-Mail: Added filter rule parameters to allow inline attachments
+    (watch out for mails with inlined images!) and attachment
+    filename filters with wildcards.
+  - Support for remote user authentication thanks to [Michael
+    Shamoon](https://github.com/shamoon). This is useful for hiding
+    Paperless behind single sign on applications such as
+    [authelia](https://www.authelia.com/).
+  - \"Clear filters\" has been renamed to \"Reset filters\" and now
+    correctly restores the default filters on saved views. Thanks to
+    [Michael Shamoon](https://github.com/shamoon)
+- Fixes
+  - Paperless was unable to save views when \"Not assigned\" was
+    chosen in one of the filter dropdowns.
+  - Clearer error messages when pre and post consumption scripts do
+    not exist.
+  - The post consumption script is executed later in the consumption
+    process. Before the change, an ID was passed to the script
+    referring to a document that did not yet exist in the database.
+
+### paperless-ng 0.9.11
+
+- Fixed an issue with the docker image not starting at all due to a
+  configuration change of the web server.
+
+### paperless-ng 0.9.10
+
+- Bulk editing
+  - Thanks to [Michael Shamoon](https://github.com/shamoon), we\'ve
+    got a new interface for the bulk editor.
+  - There are some configuration options in the settings to alter
+    the behavior.
+- Other changes and additions
+  - Thanks to [zjean](https://github.com/zjean), paperless now
+    publishes a webmanifest, which is useful for adding the
+    application to home screens on mobile devices.
+  - The Paperless-ng logo now navigates to the dashboard.
+  - Filter for documents that don\'t have any correspondents, types
+    or tags assigned.
+  - Tags, types and correspondents are now sorted case insensitive.
+  - Lots of preparation work for localization support.
+- Fixes
+  - Added missing dependencies for Raspberry Pi builds.
+  - Fixed an issue with plain text file consumption: Thumbnail
+    generation failed due to missing fonts.
+  - An issue with the search index reporting missing documents after
+    bulk deletes was fixed.
+  - Issue with the tag selector not clearing input correctly.
+  - The consumer used to stop working when encountering an
+    incomplete classifier model file.
+
+::: {.note}
+::: {.title}
+Note
+:::
+
+The bulk delete operations did not update the search index. Therefore,
+documents that you deleted remained in the index and caused the search
+to return messages about missing documents when searching. Further bulk
+operations will properly update the index.
+
+However, this change is not retroactive: If you used the delete method
+of the bulk editor, you need to reindex your search index by
+`running the management command document_index with the argument reindex <administration-index>`{.interpreted-text
+role="ref"}.
+:::
+
+### paperless-ng 0.9.9
+
+Christmas release!
+
+- Bulk editing
+  - Paperless now supports bulk editing.
+  - The following operations are available: Add and remove
+    correspondents, tags, document types from selected documents, as
+    well as mass-deleting documents.
+  - We\'ve got a more fancy UI in the works that makes these
+    features more accessible, but that\'s not quite ready yet.
+- Searching
+  - Paperless now supports searching for similar documents (\"More
+    like this\") both from the document detail page as well as from
+    individual search results.
+  - A search score indicates how well a document matches the search
+    query, or how similar a document is to a given reference
+    document.
+- Other additions and changes
+  - Clarification in the UI that the fields \"Match\" and \"Is
+    insensitive\" are not relevant for the Auto matching algorithm.
+  - New select interface for tags, types and correspondents allows
+    filtering. This also improves tag selection. Thanks again to
+    [Michael Shamoon](https://github.com/shamoon)!
+  - Page navigation controls for the document viewer, thanks to
+    [Michael Shamoon](https://github.com/shamoon).
+  - Layout changes to the small cards document list.
+  - The dashboard now displays the username (or full name if
+    specified in the admin) on the dashboard.
+- Fixes
+  - An error that caused the document importer to crash was fixed.
+  - An issue with changes not being possible when
+    `PAPERLESS_COOKIE_PREFIX` is used was fixed.
+  - The date selection filters now allow manual entry of dates.
+- Feature Removal
+  - Most of the guesswork features have been removed. Paperless no
+    longer tries to extract correspondents and tags from file names.
+
+### paperless-ng 0.9.8
+
+This release addresses two severe issues with the previous release.
+
+- The delete buttons for document types, correspondents and tags were
+  not working.
+- The document section in the admin was causing internal server errors
+  (500).
+
+### paperless-ng 0.9.7
+
+- Front end
+  - Thanks to the hard work of [Michael
+    Shamoon](https://github.com/shamoon), paperless now comes with a
+    much more streamlined UI for filtering documents.
+  - [Michael Shamoon](https://github.com/shamoon) replaced the
+    document preview with another component. This should fix
+    compatibility with Safari browsers.
+  - Added buttons to the management pages to quickly show all
+    documents with one specific tag, correspondent, or title.
+  - Paperless now stores your saved views on the server and
+    associates them with your user account. This means that you can
+    access your views on multiple devices and have separate views
+    for different users. You will have to recreate your views.
+  - The GitHub and documentation links now open in new tabs/windows.
+    Thanks to [rYR79435](https://github.com/rYR79435).
+  - Paperless now generates default saved view names when saving
+    views with certain filter rules.
+  - Added a small version indicator to the front end.
+- Other additions and changes
+  - The new filename format field `{tag_list}` inserts a list of
+    tags into the filename, separated by comma.
+  - The `document_retagger` no longer removes inbox tags or tags
+    without matching rules.
+  - The new configuration option `PAPERLESS_COOKIE_PREFIX` allows
+    you to run multiple instances of paperless on different ports.
+    This option enables you to be logged in into multiple instances
+    by specifying different cookie names for each instance.
+- Fixes
+  - Sometimes paperless would assign dates in the future to newly
+    consumed documents.
+  - The filename format fields `{created_month}` and `{created_day}`
+    now use a leading zero for single digit values.
+  - The filename format field `{tags}` can no longer be used without
+    arguments.
+  - Paperless was not able to consume many images (especially images
+    from mobile scanners) due to missing DPI information. Paperless
+    now assumes A4 paper size for PDF generation if no DPI
+    information is present.
+  - Documents with empty titles could not be opened from the table
+    view due to the link being empty.
+  - Fixed an issue with filenames containing special characters such
+    as `:` not being accepted for upload.
+  - Fixed issues with thumbnail generation for plain text files.
+
+### paperless-ng 0.9.6
+
+This release focusses primarily on many small issues with the UI.
+
+- Front end
+  - Paperless now has proper window titles.
+  - Fixed an issue with the small cards when more than 7 tags were
+    used.
+  - Navigation of the \"Show all\" links adjusted. They navigate to
+    the saved view now, if available in the sidebar.
+  - Some indication on the document lists that a filter is active
+    was added.
+  - There\'s a new filter to filter for documents that do _not_ have
+    a certain tag.
+  - The file upload box now shows upload progress.
+  - The document edit page was reorganized.
+  - The document edit page shows various information about a
+    document.
+  - An issue with the height of the preview was fixed.
+  - Table issues with too long document titles fixed.
+- API
+  - The API now serves file names with documents.
+  - The API now serves various metadata about documents.
+  - API documentation updated.
+- Other
+  - Fixed an issue with the docker image when a non-standard
+    PostgreSQL port was used.
+  - The docker image was trying check for installed languages before
+    actually installing them.
+  - `FILENAME_FORMAT` placeholder for document types.
+  - The filename formatter is now less restrictive with file names
+    and tries to conserve the original correspondents, types and
+    titles as much as possible.
+  - The filename formatter does not include the document ID in
+    filenames anymore. It will rather append `_01`, `_02`, etc when
+    it detects duplicate filenames.
+
+::: {.note}
+::: {.title}
+Note
+:::
+
+The changes to the filename format will apply to newly added documents
+and changed documents. If you want all files to reflect these changes,
+execute the `document_renamer` management command.
+:::
+
+### paperless-ng 0.9.5
+
+This release concludes the big changes I wanted to get rolled into
+paperless. The next releases before 1.0 will focus on fixing issues,
+primarily.
+
+- OCR
+  - Paperless now uses
+    [OCRmyPDF](https://github.com/jbarlow83/OCRmyPDF) to perform OCR
+    on documents. It still uses tesseract under the hood, but the
+    PDF parser of Paperless has changed considerably and will behave
+    different for some douments.
+  - OCRmyPDF creates archived PDF/A documents with embedded text
+    that can be selected in the front end.
+  - Paperless stores archived versions of documents alongside with
+    the originals. The originals can be accessed on the document
+    edit page. If available, a dropdown menu will appear next to the
+    download button.
+  - Many of the configuration options regarding OCR have changed.
+    See `configuration-ocr`{.interpreted-text role="ref"} for
+    details.
+  - Paperless no longer guesses the language of your documents. It
+    always uses the language that you specified with
+    `PAPERLESS_OCR_LANGUAGE`. Be sure to set this to the language
+    the majority of your documents are in. Multiple languages can be
+    specified, but that requires more CPU time.
+  - The management command
+    `document_archiver <utilities-archiver>`{.interpreted-text
+    role="ref"} can be used to create archived versions for already
+    existing documents.
+- Tags from consumption folder.
+  - Thanks to [jayme-github](http://github.com/jayme-github),
+    paperless now consumes files from sub folders in the consumption
+    folder and is able to assign tags based on the sub folders a
+    document was found in. This can be configured with
+    `PAPERLESS_CONSUMER_RECURSIVE` and
+    `PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS`.
+- API
+  - The API now offers token authentication.
+  - The endpoint for uploading documents now supports specifying
+    custom titles, correspondents, tags and types. This can be used
+    by clients to override the default behavior of paperless. See
+    `api-file_uploads`{.interpreted-text role="ref"}.
+  - The document endpoint of API now serves documents in this form:
+    - correspondents, document types and tags are referenced by
+      their ID in the fields `correspondent`, `document_type` and
+      `tags`. The `*_id` versions are gone. These fields are
+      read/write.
+    - paperless does not serve nested tags, correspondents or
+      types anymore.
+- Front end
+  - Paperless does some basic caching of correspondents, tags and
+    types and will only request them from the server when necessary
+    or when entirely reloading the page.
+  - Document list fetching is about 10%-30% faster now, especially
+    when lots of tags/correspondents are present.
+  - Some minor improvements to the front end, such as document count
+    in the document list, better highlighting of the current page,
+    and improvements to the filter behavior.
+- Fixes:
+  - A bug with the generation of filenames for files with
+    unsupported types caused the exporter and document saving to
+    crash.
+  - Mail handling no longer exits entirely when encountering errors.
+    It will skip the account/rule/message on which the error
+    occured.
+  - Assigning correspondents from mail sender names failed for very
+    long names. Paperless no longer assigns correspondents in these
+    cases.
+
+### paperless-ng 0.9.4
+
+- Searching:
+  - Paperless now supports searching by tags, types and dates and
+    correspondents. In order to have this applied to your existing
+    documents, you need to perform a `document_index reindex`
+    management command (see `administration-index`{.interpreted-text
+    role="ref"}) that adds the data to the search index. You only
+    need to do this once, since the schema of the search index
+    changed. Paperless keeps the index updated after that whenever
+    something changes.
+  - Paperless now has spelling corrections (\"Did you mean\") for
+    miss-typed queries.
+  - The documentation contains
+    `information about the query syntax <basic-searching>`{.interpreted-text
+    role="ref"}.
+- Front end:
+  - Clickable tags, correspondents and types allow quick filtering
+    for related documents.
+  - Saved views are now editable.
+  - Preview documents directly in the browser.
+  - Navigation from the dashboard to saved views.
+- Fixes:
+  - A severe error when trying to use post consume scripts.
+  - An error in the consumer that cause invalid messages of missing
+    files to show up in the log.
+- The documentation now contains information about bare metal installs
+  and a section about how to setup the development environment.
+
+### paperless-ng 0.9.3
+
+- Setting `PAPERLESS_AUTO_LOGIN_USERNAME` replaces
+  `PAPERLESS_DISABLE_LOGIN`. You have to specify your username.
+- Added a simple sanity checker that checks your documents for missing
+  or orphaned files, files with wrong checksums, inaccessible files,
+  and documents with empty content.
+- It is no longer possible to encrypt your documents. For the time
+  being, paperless will continue to operate with already encrypted
+  documents.
+- Fixes:
+  - Paperless now uses inotify again, since the watchdog was causing
+    issues which I was not aware of.
+  - Issue with the automatic classifier not working with only one
+    tag.
+  - A couple issues with the search index being opened to eagerly.
+- Added lots of tests for various parts of the application.
+
+### paperless-ng 0.9.2
+
+- Major changes to the front end (colors, logo, shadows, layout of the
+  cards, better mobile support)
+- Paperless now uses mime types and libmagic detection to determine if
+  a file type is supported and which parser to use. Removes all file
+  type checks that where present in MANY different places in
+  paperless.
+- Mail consumer now correctly consumes documents even when their
+  content type was not set correctly. (i.e. PDF documents with content
+  type `application/octet-stream`)
+- Basic sorting of mail rules added
+- Much better admin for mail rule editing.
+- Docker entrypoint script awaits the database server if it is
+  configured.
+- Disabled editing of logs.
+- New setting `PAPERLESS_OCR_PAGES` limits the tesseract parser to the
+  first n pages of scanned documents.
+- Fixed a bug where tasks with too long task names would not show up
+  in the admin.
+
+### paperless-ng 0.9.1
+
+- Moved documentation of the settings to the actual documentation.
+- Updated release script to force the user to choose between SQLite
+  and PostgreSQL. This avoids confusion when upgrading from paperless.
+
+### paperless-ng 0.9.0
+
+- **Deprecated:** GnuPG.
+  `See this note on the state of GnuPG in paperless-ng. <utilities-encyption>`{.interpreted-text
+  role="ref"} This features will most likely be removed in future
+  versions.
+- **Added:** New frontend. Features:
+  - Single page application: It\'s much more responsive than the
+    django admin pages.
+  - Dashboard. Shows recently scanned documents, or todo notes, or
+    other documents at wish. Allows uploading of documents. Shows
+    basic statistics.
+  - Better document list with multiple display options.
+  - Full text search with result highlighting, auto completion and
+    scoring based on the query. It uses a document search index in
+    the background.
+  - Saveable filters.
+  - Better log viewer.
+- **Added:** Document types. Assign these to documents just as
+  correspondents. They may be used in the future to perform automatic
+  operations on documents depending on the type.
+- **Added:** Inbox tags. Define an inbox tag and it will automatically
+  be assigned to any new document scanned into the system.
+- **Added:** Automatic matching. A new matching algorithm that
+  automatically assigns tags, document types and correspondents to
+  your documents. It uses a neural network trained on your data.
+- **Added:** Archive serial numbers. Assign these to quickly find
+  documents stored in physical binders.
+- **Added:** Enabled the internal user management of django. This
+  isn\'t really a multi user solution, however, it allows more than
+  one user to access the website and set some basic permissions /
+  renew passwords.
+- **Modified \[breaking\]:** All new mail consumer with customizable
+  filters, actions and multiple account support. Replaces the old mail
+  consumer. The new mail consumer needs different configuration but
+  can be configured to act exactly like the old consumer.
+- **Modified:** Changes to the consumer:
+  - Now uses the excellent watchdog library that should make sure
+    files are discovered no matter what the platform is.
+  - The consumer now uses a task scheduler to run consumption
+    processes in parallel. This means that consuming many documents
+    should be much faster on systems with many cores.
+  - Concurrency is controlled with the new settings
+    `PAPERLESS_TASK_WORKERS` and `PAPERLESS_THREADS_PER_WORKER`. See
+    TODO for details on concurrency.
+  - The consumer no longer blocks the database for extended periods
+    of time.
+  - An issue with tesseract running multiple threads per page and
+    slowing down the consumer was fixed.
+- **Modified \[breaking\]:** REST Api changes:
+  - New filters added, other filters removed (case sensitive
+    filters, slug filters)
+  - Endpoints for thumbnails, previews and downloads replace the old
+    `/fetch/` urls. Redirects are in place.
+  - Endpoint for document uploads replaces the old `/push` url.
+    Redirects are in place.
+  - Foreign key relationships are now served as IDs, not as urls.
+- **Modified \[breaking\]:** PostgreSQL:
+  - If `PAPERLESS_DBHOST` is specified in the settings, paperless
+    uses PostgreSQL instead of SQLite. Username, database and
+    password all default to `paperless` if not specified.
+- **Modified \[breaking\]:** document_retagger management command
+  rework. See `utilities-retagger`{.interpreted-text role="ref"} for
+  details. Replaces `document_correspondents` management command.
+- **Removed \[breaking\]:** Reminders.
+- **Removed:** All customizations made to the django admin pages.
+- **Removed \[breaking\]:** The docker image no longer supports SSL.
+  If you want to expose paperless to the internet, hide paperless
+  behind a proxy server that handles SSL requests.
+- **Internal changes:** Mostly code cleanup, including:
+  - Rework of the code of the tesseract parser. This is now a lot
+    cleaner.
+  - Rework of the filename handling code. It was a mess.
+  - Fixed some issues with the document exporter not exporting all
+    documents when encountering duplicate filenames.
+  - Added a task scheduler that takes care of checking mail,
+    training the classifier, maintaining the document search index
+    and consuming documents.
+  - Updated dependencies. Now uses Pipenv all around.
+  - Updated Dockerfile and docker-compose. Now uses `supervisord` to
+    run everything paperless-related in a single container.
+- **Settings:**
+  - `PAPERLESS_FORGIVING_OCR` is now default and gone. Reason: Even
+    if `langdetect` fails to detect a language, tesseract still does
+    a very good job at ocr\'ing a document with the default
+    language. Certain language specifics such as umlauts may not get
+    picked up properly.
+  - `PAPERLESS_DEBUG` defaults to `false`.
+  - The presence of `PAPERLESS_DBHOST` now determines whether to use
+    PostgreSQL or SQLite.
+  - `PAPERLESS_OCR_THREADS` is gone and replaced with
+    `PAPERLESS_TASK_WORKERS` and `PAPERLESS_THREADS_PER_WORKER`.
+    Refer to the config example for details.
+  - `PAPERLESS_OPTIMIZE_THUMBNAILS` allows you to disable or enable
+    thumbnail optimization. This is useful on less powerful devices.
+- Many more small changes here and there. The usual stuff.
+
+## Paperless
+
+### 2.7.0
+
+- [syntonym](https://github.com/syntonym) submitted a pull request to
+  catch IMAP connection errors
+  [\#475](https://github.com/the-paperless-project/paperless/pull/475).
+- [Stéphane Brunner](https://github.com/sbrunner) added `psycopg2` to
+  the Pipfile
+  [\#489](https://github.com/the-paperless-project/paperless/pull/489).
+  He also fixed a syntax error in `docker-compose.yml.example`
+  [\#488](https://github.com/the-paperless-project/paperless/pull/488)
+  and added [DjangoQL](https://github.com/ivelum/djangoql), which
+  allows a litany of handy search functionality
+  [\#492](https://github.com/the-paperless-project/paperless/pull/492).
+- [CkuT](https://github.com/CkuT) and
+  [JOKer](https://github.com/MasterofJOKers) hacked out a simple, but
+  super-helpful optimisation to how the thumbnails are served up,
+  improving performance considerably
+  [\#481](https://github.com/the-paperless-project/paperless/pull/481).
+- [tsia](https://github.com/tsia) added a few fields to the tags REST
+  API.
+  [\#483](https://github.com/the-paperless-project/paperless/pull/483).
+- [Brian Cribbs](https://github.com/cribbstechnolog) improved the
+  documentation to help people using Paperless over NFS
+  [\#484](https://github.com/the-paperless-project/paperless/pull/484).
+- [Brendan M. Sleight](https://github.com/bmsleight) updated the
+  documentation to include a note for setting the `DEBUG` value. The
+  `paperless.conf.example` file was also updated to mirror the project
+  defaults.
+
+### 2.6.1
+
+- We now have a logo, complete with a favicon :-)
+- Removed some problematic tests.
+- Fix the docker-compose example config to include a shared consume
+  volume so that using the push API will work for users of the Docker
+  install. Thanks to [Colin Frei](https://github.com/colinfrei) for
+  fixing this in
+  [\#466](https://github.com/the-paperless-project/paperless/pull/466).
+- [khrise](https://github.com/khrise) submitted a pull request to
+  include the `added` property to the REST API
+  [\#471](https://github.com/the-paperless-project/paperless/pull/471).
+
+### 2.6.0
+
+- Allow an infinite number of logs to be deleted. Thanks to
+  [Ulli](https://github.com/Ulli2k) for noting the problem in
+  [\#433](https://github.com/the-paperless-project/paperless/issues/433).
+- Fix the `RecentCorrespondentsFilter` correspondents filter that was
+  added in 2.4 to play nice with the defaults. Thanks to
+  [tsia](https://github.com/tsia) and
+  [Sblop](https://github.com/Sblop) who pointed this out.
+  [\#423](https://github.com/the-paperless-project/paperless/issues/423).
+- Updated dependencies to include (among other things) a security
+  patch to requests.
+- Fix text in sample data for tests so that the language guesser stops
+  thinking that everything is in Catalan because we had _Lorem ipsum_
+  in there.
+- Tweaked the gunicorn sample command to use filesystem paths instead
+  of Python paths.
+  [\#441](https://github.com/the-paperless-project/paperless/pull/441)
+- Added pretty colour boxes next to the hex values in the Tags
+  section, thanks to a pull request from [Joshua
+  Taillon](https://github.com/jat255)
+  [\#442](https://github.com/the-paperless-project/paperless/pull/442).
+- Added a `.editorconfig` file to better specify coding style.
+- [Joshua Taillon](https://github.com/jat255) also added some logic to
+  tie Paperless\' date guessing logic into how it parses file names on
+  import.
+  [\#440](https://github.com/the-paperless-project/paperless/pull/440)
+
+### 2.5.0
+
+- **New dependency**: Paperless now optimises thumbnail generation
+  with [optipng](http://optipng.sourceforge.net/), so you\'ll need to
+  install that somewhere in your PATH or declare its location in
+  `PAPERLESS_OPTIPNG_BINARY`. The Docker image has already been
+  updated on the Docker Hub, so you just need to pull the latest one
+  from there if you\'re a Docker user.
+- \"Login free\" instances of Paperless were breaking whenever you
+  tried to edit objects in the admin: adding/deleting tags or
+  correspondents, or even fixing spelling. This was due to the \"user
+  hack\" we were applying to sessions that weren\'t using a login, as
+  that hack user didn\'t have a valid id. The fix was to attribute the
+  first user id in the system to this hack user.
+  [\#394](https://github.com/the-paperless-project/paperless/issues/394)
+- A problem in how we handle slug values on Tags and Correspondents
+  required a few changes to how we handle this field
+  [\#393](https://github.com/the-paperless-project/paperless/issues/393):
+  1.  Slugs are no longer editable. They\'re derived from the name of
+      the tag or correspondent at save time, so if you wanna change
+      the slug, you have to change the name, and even then you\'re
+      restricted to the rules of the `slugify()` function. The slug
+      value is still visible in the admin though.
+  2.  I\'ve added a migration to go over all existing tags &
+      correspondents and rewrite the `.slug` values to ones conforming
+      to the `slugify()` rules.
+  3.  The consumption process now uses the same rules as `.save()` in
+      determining a slug and using that to check for an existing
+      tag/correspondent.
+- An annoying bug in the date capture code was causing some bogus
+  dates to be attached to documents, which in turn busted the UI.
+  Thanks to [Andrew Peng](https://github.com/pengc99) for reporting
+  this.
+  [\#414](https://github.com/the-paperless-project/paperless/issues/414).
+- A bug in the Dockerfile meant that Tesseract language files weren\'t
+  being installed correctly. [euri10](https://github.com/euri10) was
+  quick to provide a fix:
+  [\#406](https://github.com/the-paperless-project/paperless/issues/406),
+  [\#413](https://github.com/the-paperless-project/paperless/pull/413).
+- Document consumption is now wrapped in a transaction as per an old
+  ticket
+  [\#262](https://github.com/the-paperless-project/paperless/issues/262).
+- The `get_date()` functionality of the parsers has been consolidated
+  onto the `DocumentParser` class since much of that code was
+  redundant anyway.
+
+### 2.4.0
+
+- A new set of actions are now available thanks to
+  [jonaswinkler](https://github.com/jonaswinkler)\'s very first pull
+  request! You can now do nifty things like tag documents in bulk, or
+  set correspondents in bulk.
+  [\#405](https://github.com/the-paperless-project/paperless/pull/405)
+- The import/export system is now a little smarter. By default,
+  documents are tagged as `unencrypted`, since exports are by their
+  nature unencrypted. It\'s now in the import step that we decide the
+  storage type. This allows you to export from an encrypted system and
+  import into an unencrypted one, or vice-versa.
+- The migration history has been slightly modified to accommodate
+  PostgreSQL users. Additionally, you can now tell paperless to use
+  PostgreSQL simply by declaring `PAPERLESS_DBUSER` in your
+  environment. This will attempt to connect to your Postgres database
+  without a password unless you also set `PAPERLESS_DBPASS`.
+- A bug was found in the REST API filter system that was the result of
+  an update of django-filter some time ago. This has now been patched
+  in
+  [\#412](https://github.com/the-paperless-project/paperless/issues/412).
+  Thanks to [thepill](https://github.com/thepill) for spotting it!
+
+### 2.3.0
+
+- Support for consuming plain text & markdown documents was added by
+  [Joshua Taillon](https://github.com/jat255)! This was a
+  long-requested feature, and it\'s addition is likely to be greatly
+  appreciated by the community:
+  [\#395](https://github.com/the-paperless-project/paperless/pull/395)
+  Thanks also to [David Martin](https://github.com/ddddavidmartin) for
+  his assistance on the issue.
+- [dubit0](https://github.com/dubit0) found & fixed a bug that
+  prevented management commands from running before we had an
+  operational database:
+  [\#396](https://github.com/the-paperless-project/paperless/pull/396)
+- Joshua also added a simple update to the thumbnail generation
+  process to improve performance:
+  [\#399](https://github.com/the-paperless-project/paperless/pull/399)
+- As his last bit of effort on this release, Joshua also added some
+  code to allow you to view the documents inline rather than download
+  them as an attachment.
+  [\#400](https://github.com/the-paperless-project/paperless/pull/400)
+- Finally, [ahyear](https://github.com/ahyear) found a slip in the
+  Docker documentation and patched it.
+  [\#401](https://github.com/the-paperless-project/paperless/pull/401)
+
+### 2.2.1
+
+- [Kyle Lucy](https://github.com/kmlucy) reported a bug quickly after
+  the release of 2.2.0 where we broke the `DISABLE_LOGIN` feature:
+  [\#392](https://github.com/the-paperless-project/paperless/issues/392).
+
+### 2.2.0
+
+- Thanks to [dadosch](https://github.com/dadosch), [Wolfgang
+  Mader](https://github.com/wmader), and [Tim
+  Brooks](https://github.com/brookst) this is the first version of
+  Paperless that supports Django 2.0! As a result of their hard work,
+  you can now also run Paperless on Python 3.7 as well:
+  [\#386](https://github.com/the-paperless-project/paperless/issues/386)
+  &
+  [\#390](https://github.com/the-paperless-project/paperless/pull/390).
+- [Stéphane Brunner](https://github.com/sbrunner) added a few lines of
+  code that made tagging interface a lot easier on those of us with
+  lots of different tags:
+  [\#391](https://github.com/the-paperless-project/paperless/pull/391).
+- [Kilian Koeltzsch](https://github.com/kiliankoe) noticed a bug in
+  how we capture & automatically create tags, so that\'s fixed now
+  too:
+  [\#384](https://github.com/the-paperless-project/paperless/issues/384).
+- [erikarvstedt](https://github.com/erikarvstedt) tweaked the
+  behaviour of the test suite to be better behaved for packaging
+  environments:
+  [\#383](https://github.com/the-paperless-project/paperless/pull/383).
+- [Lukasz Soluch](https://github.com/LukaszSolo) added CORS support to
+  make building a new Javascript-based front-end cleaner & easier:
+  [\#387](https://github.com/the-paperless-project/paperless/pull/387).
+
+### 2.1.0
+
+- [Enno Lohmeier](https://github.com/elohmeier) added three simple
+  features that make Paperless a lot more user (and developer)
+  friendly:
+  1.  There\'s a new search box on the front page:
+      [\#374](https://github.com/the-paperless-project/paperless/pull/374).
+  2.  The correspondents & tags pages now have a column showing the
+      number of relevant documents:
+      [\#375](https://github.com/the-paperless-project/paperless/pull/375).
+  3.  The Dockerfile has been tweaked to build faster for those of us
+      who are doing active development on Paperless using the Docker
+      environment:
+      [\#376](https://github.com/the-paperless-project/paperless/pull/376).
+- You now also have the ability to customise the interface to your
+  heart\'s content by creating a file called `overrides.css` and/or
+  `overrides.js` in the root of your media directory. Thanks to [Mark
+  McFate](https://github.com/SummittDweller) for this idea:
+  [\#371](https://github.com/the-paperless-project/paperless/issues/371)
+
+### 2.0.0
+
+This is a big release as we\'ve changed a core-functionality of
+Paperless: we no longer encrypt files with GPG by default.
+
+The reasons for this are many, but it boils down to that the encryption
+wasn\'t really all that useful, as files on-disk were still accessible
+so long as you had the key, and the key was most typically stored in the
+config file. In other words, your files are only as safe as the
+`paperless` user is. In addition to that, _the contents of the documents
+were never encrypted_, so important numbers etc. were always accessible
+simply by querying the database. Still, it was better than nothing, but
+the consensus from users appears to be that it was more an annoyance
+than anything else, so this feature is now turned off unless you
+explicitly set a passphrase in your config file.
+
+### Migrating from 1.x
+
+Encryption isn\'t gone, it\'s just off for new users. So long as you
+have `PAPERLESS_PASSPHRASE` set in your config or your environment,
+Paperless should continue to operate as it always has. If however, you
+want to drop encryption too, you only need to do two things:
+
+1.  Run
+    `./manage.py migrate && ./manage.py change_storage_type gpg unencrypted`.
+    This will go through your entire database and Decrypt All The
+    Things.
+2.  Remove `PAPERLESS_PASSPHRASE` from your `paperless.conf` file, or
+    simply stop declaring it in your environment.
+
+Special thanks to [erikarvstedt](https://github.com/erikarvstedt),
+[matthewmoto](https://github.com/matthewmoto), and
+[mcronce](https://github.com/mcronce) who did the bulk of the work on
+this big change.
+
+### 1.4.0
+
+- [Quentin Dawans](https://github.com/ovv) has refactored the document
+  consumer to allow for some command-line options. Notably, you can
+  now direct it to consume from a particular `--directory`, limit the
+  `--loop-time`, set the time between mail server checks with
+  `--mail-delta` or just run it as a one-off with `--one-shot`. See
+  [\#305](https://github.com/the-paperless-project/paperless/issues/305)
+  &
+  [\#313](https://github.com/the-paperless-project/paperless/pull/313)
+  for more information.
+- Refactor the use of travis/tox/pytest/coverage into two files:
+  `.travis.yml` and `setup.cfg`.
+- Start generating requirements.txt from a Pipfile. I\'ll probably
+  switch over to just using pipenv in the future.
+- All for a alternative FreeBSD-friendly location for
+  `paperless.conf`. Thanks to [Martin
+  Arendtsen](https://github.com/Arendtsen) who provided this
+  ([\#322](https://github.com/the-paperless-project/paperless/pull/322)).
+- Document consumption events are now logged in the Django admin
+  events log. Thanks to [CkuT](https://github.com/CkuT) for doing the
+  legwork on this one and to [Quentin Dawans](https://github.com/ovv)
+  & [David Martin](https://github.com/ddddavidmartin) for helping to
+  coordinate & work out how the feature would be developed.
+- [erikarvstedt](https://github.com/erikarvstedt) contributed a pull
+  request
+  ([\#328](https://github.com/the-paperless-project/paperless/pull/328))
+  to add `--noreload` to the default server start process. This helps
+  reduce the load imposed by the running webservice.
+- Through some discussion on
+  [\#253](https://github.com/the-paperless-project/paperless/issues/253)
+  and
+  [\#323](https://github.com/the-paperless-project/paperless/issues/323),
+  we\'ve removed a few of the hardcoded URL values to make it easier
+  for people to host Paperless on a subdirectory. Thanks to [Quentin
+  Dawans](https://github.com/ovv) and [Kyle
+  Lucy](https://github.com/kmlucy) for helping to work this out.
+- The clickable area for documents on the listing page has been
+  increased to a more predictable space thanks to a glorious hack from
+  [erikarvstedt](https://github.com/erikarvstedt) in
+  [\#344](https://github.com/the-paperless-project/paperless/pull/344).
+- [Strubbl](https://github.com/strubbl) noticed an annoying bug in the
+  bash script wrapping the Docker entrypoint and fixed it with some
+  very creating Bash skills:
+  [\#352](https://github.com/the-paperless-project/paperless/pull/352).
+- You can now use the search field to find documents by tag thanks to
+  [thinkjk](https://github.com/thinkjk)\'s _first ever issue_:
+  [\#354](https://github.com/the-paperless-project/paperless/issues/354).
+- Inotify is now being used to detect additions to the consume
+  directory thanks to some excellent work from
+  [erikarvstedt](https://github.com/erikarvstedt) on
+  [\#351](https://github.com/the-paperless-project/paperless/pull/351)
+
+### 1.3.0
+
+- You can now run Paperless without a login, though you\'ll still have
+  to create at least one user. This is thanks to a pull-request from
+  [matthewmoto](https://github.com/matthewmoto):
+  [\#295](https://github.com/the-paperless-project/paperless/pull/295).
+  Note that logins are still required by default, and that you need to
+  disable them by setting `PAPERLESS_DISABLE_LOGIN="true"` in your
+  environment or in `/etc/paperless.conf`.
+- Fix for
+  [\#303](https://github.com/the-paperless-project/paperless/issues/303)
+  where sketchily-formatted documents could cause the consumer to
+  break and insert half-records into the database breaking all sorts
+  of things. We now capture the return codes of both `convert` and
+  `unpaper` and fail-out nicely.
+- Fix for additional date types thanks to input from
+  [Isaac](https://github.com/isaacsando) and code from
+  [BastianPoe](https://github.com/BastianPoe)
+  ([\#301](https://github.com/the-paperless-project/paperless/issues/301)).
+- Fix for running migrations in the Docker container
+  ([\#299](https://github.com/the-paperless-project/paperless/issues/299)).
+  Thanks to [Georgi Todorov](https://github.com/TeraHz) for the fix
+  ([\#300](https://github.com/the-paperless-project/paperless/pull/300))
+  and to [Pit](https://github.com/pitkley) for the review.
+- Fix for Docker cases where the issuing user is not UID 1000. This
+  was a collaborative fix between [Jeffrey
+  Portman](https://github.com/ChromoX) and
+  [Pit](https://github.com/pitkley) in
+  [\#311](https://github.com/the-paperless-project/paperless/pull/311)
+  and
+  [\#312](https://github.com/the-paperless-project/paperless/pull/312)
+  to fix
+  [\#306](https://github.com/the-paperless-project/paperless/issues/306).
+- Patch the historical migrations to support MySQL\'s um,
+  _interesting_ way of handing indexes
+  ([\#308](https://github.com/the-paperless-project/paperless/issues/308)).
+  Thanks to [Simon Taddiken](https://github.com/skuzzle) for reporting
+  the problem and helping me find where to fix it.
+
+### 1.2.0
+
+- New Docker image, now based on Alpine, thanks to the efforts of
+  [addadi](https://github.com/addadi) and
+  [Pit](https://github.com/pitkley). This new image is dramatically
+  smaller than the Debian-based one, and it also has [a new home on
+  Docker Hub](https://hub.docker.com/r/danielquinn/paperless/). A
+  proper thank-you to [Pit](https://github.com/pitkley) for hosting
+  the image on his Docker account all this time, but after some
+  discussion, we decided the image needed a more _official-looking_
+  home.
+- [BastianPoe](https://github.com/BastianPoe) has added the
+  long-awaited feature to automatically skip the OCR step when the PDF
+  already contains text. This can be overridden by setting
+  `PAPERLESS_OCR_ALWAYS=YES` either in your `paperless.conf` or in the
+  environment. Note that this also means that Paperless now requires
+  `libpoppler-cpp-dev` to be installed. **Important**: You\'ll need to
+  run `pip install -r requirements.txt` after the usual `git pull` to
+  properly update.
+- [BastianPoe](https://github.com/BastianPoe) has also contributed a
+  monumental amount of work
+  ([\#291](https://github.com/the-paperless-project/paperless/pull/291))
+  to solving
+  [\#158](https://github.com/the-paperless-project/paperless/issues/158):
+  setting the document creation date based on finding a date in the
+  document text.
+
+### 1.1.0
+
+- Fix for
+  [\#283](https://github.com/the-paperless-project/paperless/issues/283),
+  a redirect bug which broke interactions with paperless-desktop.
+  Thanks to [chris-aeviator](https://github.com/chris-aeviator) for
+  reporting it.
+- Addition of an optional new financial year filter, courtesy of
+  [David Martin](https://github.com/ddddavidmartin)
+  [\#256](https://github.com/the-paperless-project/paperless/pull/256)
+- Fixed a typo in how thumbnails were named in exports
+  [\#285](https://github.com/the-paperless-project/paperless/pull/285),
+  courtesy of [Dan Panzarella](https://github.com/pzl)
+
+### 1.0.0
+
+- Upgrade to Django 1.11. **You\'ll need to run \`\`pip install -r
+  requirements.txt\`\` after the usual \`\`git pull\`\` to properly
+  update**.
+- Replace the templatetag-based hack we had for document listing in
+  favour of a slightly less ugly solution in the form of another
+  template tag with less copypasta.
+- Support for multi-word-matches for auto-tagging thanks to an
+  excellent patch from [ishirav](https://github.com/ishirav)
+  [\#277](https://github.com/the-paperless-project/paperless/pull/277).
+- Fixed a CSS bug reported by [Stefan Hagen](https://github.com/xkpd3)
+  that caused an overlapping of the text and checkboxes under some
+  resolutions
+  [\#272](https://github.com/the-paperless-project/paperless/issues/272).
+- Patched the Docker config to force the serving of static files.
+  Credit for this one goes to [dev-rke](https://github.com/dev-rke)
+  via
+  [\#248](https://github.com/the-paperless-project/paperless/issues/248).
+- Fix file permissions during Docker start up thanks to
+  [Pit](https://github.com/pitkley) on
+  [\#268](https://github.com/the-paperless-project/paperless/pull/268).
+- Date fields in the admin are now expressed as HTML5 date fields
+  thanks to [Lukas Winkler](https://github.com/Findus23)\'s issue
+  [\#278](https://github.com/the-paperless-project/paperless/issues/248)
+
+### 0.8.0
+
+- Paperless can now run in a subdirectory on a host (`/paperless`),
+  rather than always running in the root (`/`) thanks to
+  [maphy-psd](https://github.com/maphy-psd)\'s work on
+  [\#255](https://github.com/the-paperless-project/paperless/pull/255).
+
+### 0.7.0
+
+- **Potentially breaking change**: As per
+  [\#235](https://github.com/the-paperless-project/paperless/issues/235),
+  Paperless will no longer automatically delete documents attached to
+  correspondents when those correspondents are themselves deleted.
+  This was Django\'s default behaviour, but didn\'t make much sense in
+  Paperless\' case. Thanks to [Thomas
+  Brueggemann](https://github.com/thomasbrueggemann) and [David
+  Martin](https://github.com/ddddavidmartin) for their input on this
+  one.
+- Fix for
+  [\#232](https://github.com/the-paperless-project/paperless/issues/232)
+  wherein Paperless wasn\'t recognising `.tif` files properly. Thanks
+  to [ayounggun](https://github.com/ayounggun) for reporting this one
+  and to [Kusti Skytén](https://github.com/kskyten) for posting the
+  correct solution in the Github issue.
+
+### 0.6.0
+
+- Abandon the shared-secret trick we were using for the POST API in
+  favour of BasicAuth or Django session.
+- Fix the POST API so it actually works.
+  [\#236](https://github.com/the-paperless-project/paperless/issues/236)
+- **Breaking change**: We\'ve dropped the use of
+  `PAPERLESS_SHARED_SECRET` as it was being used both for the API (now
+  replaced with a normal auth) and form email polling. Now that we\'re
+  only using it for email, this variable has been renamed to
+  `PAPERLESS_EMAIL_SECRET`. The old value will still work for a while,
+  but you should change your config if you\'ve been using the email
+  polling feature. Thanks to [Joshua
+  Gilman](https://github.com/jmgilman) for all the help with this
+  feature.
+
+### 0.5.0
+
+- Support for fuzzy matching in the auto-tagger & auto-correspondent
+  systems thanks to [Jake Gysland](https://github.com/jgysland)\'s
+  patch
+  [\#220](https://github.com/the-paperless-project/paperless/pull/220).
+- Modified the Dockerfile to prepare an export directory
+  ([\#212](https://github.com/the-paperless-project/paperless/pull/212)).
+  Thanks to combined efforts from [Pit](https://github.com/pitkley)
+  and [Strubbl](https://github.com/strubbl) in working out the kinks
+  on this one.
+- Updated the import/export scripts to include support for thumbnails.
+  Big thanks to [CkuT](https://github.com/CkuT) for finding this
+  shortcoming and doing the work to get it fixed in
+  [\#224](https://github.com/the-paperless-project/paperless/pull/224).
+- All of the following changes are thanks to [David
+  Martin](https://github.com/ddddavidmartin): \* Bumped the dependency on pyocr to 0.4.7 so new users can make use
+  of Tesseract 4 if they so prefer
+  ([\#226](https://github.com/the-paperless-project/paperless/pull/226)).
+  - Fixed a number of issues with the automated mail handler
+    ([\#227](https://github.com/the-paperless-project/paperless/pull/227),
+    [\#228](https://github.com/the-paperless-project/paperless/pull/228))
+  - Amended the documentation for better handling of systemd service
+    files
+    ([\#229](https://github.com/the-paperless-project/paperless/pull/229))
+  - Amended the Django Admin configuration to have nice headers
+    ([\#230](https://github.com/the-paperless-project/paperless/pull/230))
+
+### 0.4.1
+
+- Fix for
+  [\#206](https://github.com/the-paperless-project/paperless/issues/206)
+  wherein the pluggable parser didn\'t recognise files with all-caps
+  suffixes like `.PDF`
+
+### 0.4.0
+
+- Introducing reminders. See
+  [\#199](https://github.com/the-paperless-project/paperless/issues/199)
+  for more information, but the short explanation is that you can now
+  attach simple notes & times to documents which are made available
+  via the API. Currently, the default API (basically just the Django
+  admin) doesn\'t really make use of this, but [Thomas
+  Brueggemann](https://github.com/thomasbrueggemann) over at
+  [Paperless
+  Desktop](https://github.com/thomasbrueggemann/paperless-desktop) has
+  said that he would like to make use of this feature in his project.
+
+### 0.3.6
+
+- Fix for
+  [\#200](https://github.com/the-paperless-project/paperless/issues/200)
+  (!!) where the API wasn\'t configured to allow updating the
+  correspondent or the tags for a document.
+- The `content` field is now optional, to allow for the edge case of a
+  purely graphical document.
+- You can no longer add documents via the admin. This never worked in
+  the first place, so all I\'ve done here is remove the link to the
+  broken form.
+- The consumer code has been heavily refactored to support a pluggable
+  interface. Install a paperless consumer via pip and tell paperless
+  about it with an environment variable, and you\'re good to go.
+  Proper documentation is on its way.
+
+### 0.3.5
+
+- A serious facelift for the documents listing page wherein we drop
+  the tabular layout in favour of a tiled interface.
+- Users can now configure the number of items per page.
+- Fix for
+  [\#171](https://github.com/the-paperless-project/paperless/issues/171):
+  Allow users to specify their own `SECRET_KEY` value.
+- Moved the dotenv loading to the top of settings.py
+- Fix for
+  [\#112](https://github.com/the-paperless-project/paperless/issues/112):
+  Added checks for binaries required for document consumption.
+
+### 0.3.4
+
+- Removal of django-suit due to a licensing conflict I bumped into in
+  0.3.3. Note that you _can_ use Django Suit with Paperless, but only
+  in a non-profit situation as their free license prohibits for-profit
+  use. As a result, I can\'t bundle Suit with Paperless without
+  conflicting with the GPL. Further development will be done against
+  the stock Django admin.
+- I shrunk the thumbnails a little \'cause they were too big for me,
+  even on my high-DPI monitor.
+- BasicAuth support for document and thumbnail downloads, as well as
+  the Push API thanks to \@thomasbrueggemann. See
+  [\#179](https://github.com/the-paperless-project/paperless/pull/179).
+
+### 0.3.3
+
+- Thumbnails in the UI and a Django-suit -based face-lift courtesy of
+  \@ekw!
+- Timezone, items per page, and default language are now all
+  configurable, also thanks to \@ekw.
+
+### 0.3.2
+
+- Fix for
+  [\#172](https://github.com/the-paperless-project/paperless/issues/172):
+  defaulting ALLOWED_HOSTS to `["*"]` and allowing the user to set
+  her own value via `PAPERLESS_ALLOWED_HOSTS` should the need arise.
+
+### 0.3.1
+
+- Added a default value for `CONVERT_BINARY`
+
+### 0.3.0
+
+- Updated to using django-filter 1.x
+- Added some system checks so new users aren\'t confused by
+  misconfigurations.
+- Consumer loop time is now configurable for systems with slow writes.
+  Just set `PAPERLESS_CONSUMER_LOOP_TIME` to a number of seconds. The
+  default is 10.
+- As per
+  [\#44](https://github.com/the-paperless-project/paperless/issues/44),
+  we\'ve removed support for `PAPERLESS_CONVERT`, `PAPERLESS_CONSUME`,
+  and `PAPERLESS_SECRET`. Please use `PAPERLESS_CONVERT_BINARY`,
+  `PAPERLESS_CONSUMPTION_DIR`, and `PAPERLESS_SHARED_SECRET`
+  respectively instead.
+
+### 0.2.0
+
+- [\#150](https://github.com/the-paperless-project/paperless/pull/150):
+  The media root is now a variable you can set in `paperless.conf`.
+- [\#148](https://github.com/the-paperless-project/paperless/pull/148):
+  The database location (sqlite) is now a variable you can set in
+  `paperless.conf`.
+- [\#146](https://github.com/the-paperless-project/paperless/issues/146):
+  Fixed a bug that allowed unauthorised access to the `/fetch` URL.
+- [\#131](https://github.com/the-paperless-project/paperless/issues/131):
+  Document files are now automatically removed from disk when they\'re
+  deleted in Paperless.
+- [\#121](https://github.com/the-paperless-project/paperless/issues/121):
+  Fixed a bug where Paperless wasn\'t setting document creation time
+  based on the file naming scheme.
+- [\#81](https://github.com/the-paperless-project/paperless/issues/81):
+  Added a hook to run an arbitrary script after every document is
+  consumed.
+- [\#98](https://github.com/the-paperless-project/paperless/issues/98):
+  Added optional environment variables for ImageMagick so that it
+  doesn\'t explode when handling Very Large Documents or when it\'s
+  just running on a low-memory system. Thanks to [Florian
+  Harr](https://github.com/evils) for his help on this one.
+- [\#89](https://github.com/the-paperless-project/paperless/issues/89)
+  Ported the auto-tagging code to correspondents as well. Thanks to
+  [Justin Snyman](https://github.com/stringlytyped) for the pointers
+  in the issue queue.
+- Added support for guessing the date from the file name along with
+  the correspondent, title, and tags. Thanks to [Tikitu de
+  Jager](https://github.com/tikitu) for his pull request that I took
+  forever to merge and to [Pit](https://github.com/pitkley) for his
+  efforts on the regex front.
+- [\#94](https://github.com/the-paperless-project/paperless/issues/94):
+  Restored support for changing the created date in the UI. Thanks to
+  [Martin Honermeyer](https://github.com/djmaze) and [Tim
+  White](https://github.com/timwhite) for working with me on this.
+
+### 0.1.1
+
+- Potentially **Breaking Change**: All references to \"sender\" in the
+  code have been renamed to \"correspondent\" to better reflect the
+  nature of the property (one could quite reasonably scan a document
+  before sending it to someone.)
+- [\#67](https://github.com/the-paperless-project/paperless/issues/67):
+  Rewrote the document exporter and added a new importer that allows
+  for full metadata retention without depending on the file name and
+  modification time. A big thanks to [Tikitu de
+  Jager](https://github.com/tikitu),
+  [Pit](https://github.com/pitkley), [Florian
+  Jung](https://github.com/the01), and [Christopher
+  Luu](https://github.com/nuudles) for their code snippets and
+  contributing conversation that lead to this change.
+- [\#20](https://github.com/the-paperless-project/paperless/issues/20):
+  Added _unpaper_ support to help in cleaning up the scanned image
+  before it\'s OCR\'d. Thanks to [Pit](https://github.com/pitkley) for
+  this one.
+- [\#71](https://github.com/the-paperless-project/paperless/issues/71)
+  Added (encrypted) thumbnails in anticipation of a proper UI.
+- [\#68](https://github.com/the-paperless-project/paperless/issues/68):
+  Added support for using a proper config file at
+  `/etc/paperless.conf` and modified the systemd unit files to use it.
+- Refactored the Vagrant installation process to use environment
+  variables rather than asking the user to modify `settings.py`.
+- [\#44](https://github.com/the-paperless-project/paperless/issues/44):
+  Harmonise environment variable names with constant names.
+- [\#60](https://github.com/the-paperless-project/paperless/issues/60):
+  Setup logging to actually use the Python native logging framework.
+- [\#53](https://github.com/the-paperless-project/paperless/issues/53):
+  Fixed an annoying bug that caused `.jpeg` and `.JPG` images to be
+  imported but made unavailable.
+
+### 0.1.0
+
+- Docker support! Big thanks to [Wayne
+  Werner](https://github.com/waynew), [Brian
+  Conn](https://github.com/TheConnMan), and [Tikitu de
+  Jager](https://github.com/tikitu) for this one, and especially to
+  [Pit](https://github.com/pitkley) who spearheadded this effort.
+- A simple REST API is in place, but it should be considered unstable.
+- Cleaned up the consumer to use temporary directories instead of a
+  single scratch space. (Thanks [Pit](https://github.com/pitkley))
+- Improved the efficiency of the consumer by parsing pages more
+  intelligently and introducing a threaded OCR process (thanks again
+  [Pit](https://github.com/pitkley)).
+- [\#45](https://github.com/the-paperless-project/paperless/issues/45):
+  Cleaned up the logic for tag matching. Reported by
+  [darkmatter](https://github.com/darkmatter).
+- [\#47](https://github.com/the-paperless-project/paperless/issues/47):
+  Auto-rotate landscape documents. Reported by
+  [Paul](https://github.com/polo2ro) and fixed by
+  [Pit](https://github.com/pitkley).
+- [\#48](https://github.com/the-paperless-project/paperless/issues/48):
+  Matching algorithms should do so on a word boundary
+  ([darkmatter](https://github.com/darkmatter))
+- [\#54](https://github.com/the-paperless-project/paperless/issues/54):
+  Documented the re-tagger ([zedster](https://github.com/zedster))
+- [\#57](https://github.com/the-paperless-project/paperless/issues/57):
+  Make sure file is preserved on import failure
+  ([darkmatter](https://github.com/darkmatter))
+- Added tox with pep8 checking
+
+### 0.0.6
+
+- Added support for parallel OCR (significant work from
+  [Pit](https://github.com/pitkley))
+- Sped up the language detection (significant work from
+  [Pit](https://github.com/pitkley))
+- Added simple logging
+
+### 0.0.5
+
+- Added support for image files as documents (png, jpg, gif, tiff)
+- Added a crude means of HTTP POST for document imports
+- Added IMAP mail support
+- Added a re-tagging utility
+- Documentation for the above as well as data migration
+
+### 0.0.4
+
+- Added automated tagging basted on keyword matching
+- Cleaned up the document listing page
+- Removed `User` and `Group` from the admin
+- Added `pytz` to the list of requirements
+
+### 0.0.3
+
+- Added basic tagging
+
+### 0.0.2
+
+- Added language detection
+- Added datestamps to `document_exporter`.
+- Changed `settings.TESSERACT_LANGUAGE` to `settings.OCR_LANGUAGE`.
+
+### 0.0.1
+
+- Initial release
diff --git a/docs/changelog.rst b/docs/changelog.rst
deleted file mode 100644
index 984c86075..000000000
--- a/docs/changelog.rst
+++ /dev/null
@@ -1,1787 +0,0 @@
-
-.. _paperless_changelog:
-
-*********
-Changelog
-*********
-
-paperless-ngx 1.7.0
-###################
-
-Breaking Changes
-
-* ``PAPERLESS_URL`` is now required when using a reverse proxy. See `#674`_.
-
-Features
-
-* Allow setting more than one tag in mail rules `@jonasc`_ (#270)
-* global drag'n'drop `@shamoon`_ (#283).
-* Fix: download buttons should disable while waiting `@shamoon`_ (#630).
-* Update checker `@shamoon`_ (#591).
-* Show prompt on password-protected pdfs `@shamoon`_ (#564).
-* Filtering query params aka browser navigation for filtering `@shamoon`_ (#540).
-* Clickable tags in dashboard widgets `@shamoon`_ (#515).
-* Add bottom pagination `@shamoon`_ (#372).
-* Feature barcode splitter `@gador`_ (#532).
-* App loading screen `@shamoon`_ (#298).
-* Use progress bar for delayed buttons `@shamoon`_ (#415).
-* Add minimum length for documents text filter `@shamoon`_ (#401).
-* Added nav buttons in the document detail view `@GruberViktor`_ (#273).
-* Improve date keyboard input `@shamoon`_ (#253).
-* Color theming `@shamoon`_ (#243).
-* Parse dates when entered without separators `@GruberViktor`_ (#250).
-
-Bug Fixes
-
-* add "localhost" to ALLOWED_HOSTS `@gador`_ (#700).
-* Fix: scanners table `@qcasey`_ (#690).
-* Adds wait for file before consuming `@stumpylog`_ (#483).
-* Fix: frontend document editing erases time data `@shamoon`_ (#654).
-* Increase length of SavedViewFilterRule `@stumpylog`_ (#612).
-* Fixes attachment filename matching during mail fetching `@stumpylog`_ (#680).
-* Add ``PAPERLESS_URL`` env variable & CSRF var `@shamoon`_ (#674).
-* Fix: download buttons should disable while waiting `@shamoon`_ (#630).
-* Fixes downloaded filename, add more consumer ignore settings `@stumpylog`_ (#599).
-* FIX BUG: case-sensitive matching was not possible `@danielBreitlauch`_ (#594).
-* uses shutil.move instead of rename `@gador`_ (#617).
-* Fix npm deps 01.02.22 2 `@shamoon`_ (#610).
-* Fix npm dependencies 01.02.22 `@shamoon`_ (#600).
-* fix issue 416: implement PAPERLESS_OCR_MAX_IMAGE_PIXELS `@hacker-h`_ (#441).
-* fix: exclude cypress from build in Dockerfile `@FrankStrieter`_ (#526).
-* Corrections to pass pre-commit hooks `@schnuffle`_ (#454).
-* Fix 311 unable to click checkboxes in document list `@shamoon`_ (#313).
-* Fix imap tools bug `@stumpylog`_ (#393).
-* Fix filterable dropdown buttons arent translated `@shamoon`_ (#366).
-* Fix 224: "Auto-detected date is day before receipt date" `@a17t`_ (#246).
-* Fix minor sphinx errors `@shamoon`_ (#322).
-* Fix page links hidden `@shamoon`_ (#314).
-* Fix: Include excluded items in dropdown count `@shamoon`_ (#263).
-
-Translation
-
-* `@miku323`_ contributed to Slovenian translation.
-* `@FaintGhost`_ contributed to Chinese Simplified translation.
-* `@DarkoBG79`_ contributed to Serbian translation.
-* `Kemal Secer`_ contributed to Turkish translation.
-* `@Prominence`_ contributed to Belarusian translation.
-
-Documentation
-
-* Fix: scanners table `@qcasey`_ (#690).
-* Add `PAPERLESS_URL` env variable & CSRF var `@shamoon`_ (#674).
-* Fixes downloaded filename, add more consumer ignore settings `@stumpylog`_ (#599).
-* fix issue 416: implement ``PAPERLESS_OCR_MAX_IMAGE_PIXELS`` `@hacker-h`_ (#441).
-* Fix minor sphinx errors `@shamoon`_ (#322).
-
-Maintenance
-
-* Add ``PAPERLESS_URL`` env variable & CSRF var `@shamoon`_ (#674).
-* Chore: Implement release-drafter action for Changelogs `@qcasey`_ (#669).
-* Chore: Add CODEOWNERS `@qcasey`_ (#667).
-* Support docker-compose v2 in install `@stumpylog`_ (#611).
-* Add Belarusian localization `@shamoon`_ (#588).
-* Add Turkish localization `@shamoon`_ (#536).
-* Add Serbian localization `@shamoon`_ (#504).
-* Create PULL_REQUEST_TEMPLATE.md `@shamoon`_ (#304).
-* Add Chinese localization `@shamoon`_ (#247).
-* Add Slovenian language for frontend `@shamoon`_ (#315).
-
-paperless-ngx 1.6.0
-###################
-
-This is the first release of the revived paperless-ngx project 🎉. Thank you to everyone on the paperless-ngx team for your initiative and excellent teamwork!
-
-Version 1.6.0 merges several pending PRs from jonaswinkler's repo and includes new feature updates and bug fixes. Major backend and UI changes include:
-
-* Updated docs, scripts, CI, and containers to paperless-ngx.
-* Updated Python and Angular dependencies.
-* Dropped support for Python 3.7.
-* Dropped support for Ansible playbooks (thanks `@slankes`_ #109). If someone would like to continue supporting them, please see the `ansible repo`_.
-* Python code is now required to use Black formatting (thanks `@kpj`_ #168).
-* `@tribut`_ added support for a custom SSO logout redirect (jonaswinkler#1258). See ``PAPERLESS_LOGOUT_REDIRECT_URL``.
-* `@shamoon`_ added a loading indicator when document list is reloading (jonaswinkler#1297).
-* `@shamoon`_ improved the PDF viewer on mobile (#2).
-* `@shamoon`_ added 'any' / 'all' and 'not' filtering with tags (#10).
-* `@shamoon`_ added warnings for unsaved changes, with smart edit buttons (#13).
-* `@benjaminfrank`_ enabled a non-root access to port 80 via systemd (#18).
-* `@tribut`_ added simple "delete to trash" functionality (#24). See ``PAPERLESS_TRASH_DIR``.
-* `@amenk`_ fixed the search box overlay menu on mobile (#32).
-* `@dblitt`_ updated the login form to not auto-capitalize usernames (#36).
-* `@evilsidekick293`_ made the worker timeout configurable (#37). See ``PAPERLESS_WORKER_TIMEOUT``.
-* `@Nicarim`_ fixed downloads of UTF-8 formatted documents in Firefox (#56).
-* `@mweimerskirch`_ sorted the language dropdown by locale (#78).
-* `@mweimerskirch`_ enabled the Czech (#83) and Danish (#84) translations.
-* `@cschmatzler`_ enabled specifying the webserver port (#124). See ``PAPERLESS_PORT``.
-* `@muellermartin`_ fixed an error when uploading transparent PNGs (#133).
-* `@shamoon`_ created a slick new logo (#165).
-* `@tim-vogel`_ fixed exports missing groups (#193).
-
-Known issues:
-
-* 1.6.0 included a malformed package-lock.json, as a result users who want to build the docker image themselves need to change line 6 of the ``Dockerfile`` to ``RUN npm update npm -g && npm install --legacy-peer-deps``.
-
-Thank you to the following people for their documentation updates, fixes, and comprehensive testing:
-
-`@m0veax`_, `@a17t`_, `@fignew`_, `@muued`_, `@bauerj`_, `@isigmund`_, `@denilsonsa`_, `@mweimerskirch`_, `@alexander-bauer`_, `@apeltzer`_, `@tribut`_, `@yschroeder`_, `@gador`_, `@sAksham-Ar`_, `@sbrunner`_, `@philpagel`_, `@davemachado`_, `@2600box`_, `@qcasey`_, `@Nicarim`_, `@kpj`_, `@filcuk`_, `@Timoms`_, `@mattlamb99`_, `@padraigkitterick`_, `@ajkavanagh`_, `@Tooa`_, `@Unkn0wnCat`_, `@pewter77`_, `@stumpylog`_, `@Toxix`_, `@azapater`_, `@jschpp`_
-
-Another big thanks to the people who have contributed translations:
-
-* Michel Weimerskirch (michel_weimerskirch) suggested 31 translations into French and Luxembourgish.
-* jo.vandeginste suggested 21 translations into Dutch.
-* Lars Sørensen (Lrss) suggested 486 translations into Danish.
-* Alex (Sky-Dragon) voted for 46 translations in German.
-* Yannic Schröder (yschroeder) suggested 14 translations into German.
-* David Morais Ferreira (DavidMoraisFerreira) voted for 10 translations in Portuguese and Luxembourgish.
-* David Morais Ferreira (DavidMoraisFerreira) suggested 88 translations into French, German, Portuguese, Portuguese, Brazilian and Luxembourgish.
-* 汪泠沣 (wlfcss) suggested 13 translations into Chinese Traditional.
-* Lars Sørensen (Lrss) suggested 167 translations into Danish.
-* Philmo67 suggested 11 translations into French.
-
-Paperless-ng
-############
-
-paperless-ng 1.5.0
-==================
-
-Support for Python 3.6 was dropped.
-
-* Updated python dependencies.
-* Base image of the docker image changed from Debian Buster to Debian Bullseye due to its recent release.
-* The docker image now uses python 3.9.
-* Added the Luxembourgish locale. Thanks for translating!
-* `Daniel Albers`_ added support for making the files and folders ignored by the paperless consume folder scanner configurable. See ``PAPERLESS_CONSUMER_IGNORE_PATTERNS``.
-
-paperless-ng 1.4.5
-==================
-
-This is a maintenance release.
-
-* Updated Python and Angular dependencies.
-* Changed the algorithm that changes permissions during startup. This is still fast,
-  and will hopefully cause less issues.
-* Fixed an issue that would sometimes cause paperless to write an incomplete
-  classification model file to disk.
-* Fixed an issue with the OCRmyPDF parser that would always try to extract text
-  with PDFminer even from non-PDF files.
-
-paperless-ng 1.4.4
-==================
-
-* Drastically decreased the startup time of the docker container. The startup script adjusts file permissions of all data only if changes are required.
-* Paperless mail: Added ability to specify the character set for each server.
-* Document consumption: Ignore Mac OS specific files such as ``.DS_STORE`` and ``._XXXXX.pdf``.
-* Fixed an issue with the automatic matching algorithm that prevents paperless from consuming new files.
-* Updated translations.
-
-paperless-ng 1.4.3
-==================
-
-* Additions and changes
-
-  * Added Swedish locale.
-  * `Stéphane Brunner`_ added an option to disable the progress bars of all management commands.
-  * `Jo Vandeginste`_ added support for RTF documents to the Apache TIKA parser.
-  * `Michael Shamoon`_ added dark mode for the login and logout pages.
-  * `Alexander Menk`_ added additional stylesheets for printing. You can now print any page of paperless and the print result will hide the page header, sidebar, and action buttons.
-  * Added support for sorting when using full text search.
-
-* Fixes
-
-  * `puuu`_ fixed ``PAPERLESS_FORCE_SCRIPT_NAME``. You can now host paperless on sub paths such as ``https://localhost:8000/paperless/``.
-  * Fixed an issue with the document consumer crashing on certain documents due to issues with pdfminer.six. This library is used for PDF text extraction.
-
-paperless-ng 1.4.2
-==================
-
-* Fixed an issue with ``sudo`` that caused paperless to not start on many Raspberry Pi devices. Thank you `WhiteHatTux`_!
-
-paperless-ng 1.4.1
-==================
-
-* Added Polish locale.
-
-* Changed some parts of the Dockerfile to hopefully restore functionality on certain ARM devices.
-
-* Updated python dependencies.
-
-* `Michael Shamoon`_ added a sticky filter / bulk edit bar.
-
-* `sbrl`_ changed the docker-entrypoint.sh script to increase compatibility with NFS shares.
-
-* `Chris Nagy`_ added support for creating a super user by passing ``PAPERLESS_ADMIN_USER`` and
-  ``PAPERLESS_ADMIN_PASSWORD`` as environment variables to the docker container.
-
-paperless-ng 1.4.0
-==================
-
-* Docker images now use tesseract 4.1.1, which should fix a series of issues with OCR.
-
-* The full text search now displays results using the default document list. This enables
-  selection, filtering and bulk edit on search results.
-
-* Changes
-
-  * Firefox only: Highlight search query in PDF previews.
-
-  * New URL pattern for accessing documents by ASN directly (http://<paperless>/asn/123)
-
-  * Added logging when executing pre* and post-consume scripts.
-
-  * Better error logging during document consumption.
-
-  * Updated python dependencies.
-
-  * Automatically inserts typed text when opening "Create new" dialogs on the document details page.
-
-* Fixes
-
-  * Fixed an issue with null characters in the document content.
-
-.. note::
-
-  The changed to the full text searching require you to reindex your documents.
-  *The docker image does this automatically, you don't need to do anything.*
-  To do this, execute the ``document_index reindex`` management command
-  (see :ref:`administration-index`).
-
-paperless-ng 1.3.2
-==================
-
-* Added translation into Portuguese.
-
-* Changes
-
-  * The exporter now exports user accounts, mail accounts, mail rules and saved views as well.
-
-* Fixes
-
-  * Minor layout issues with document cards and the log viewer.
-
-  * Fixed an issue with any/all/exact matching when characters used in regular expressions were used for the match.
-
-paperless-ng 1.3.1
-==================
-
-* Added translation into Spanish and Russian.
-
-* Other changes
-
-  * ISO-8601 date format will now always show years with 4 digits.
-
-  * Added the ability to search for a document with a specific ASN.
-
-  * The document cards now display ASN, types and dates in a more organized way.
-
-  * Added document previews when hovering over the preview button.
-
-* Fixes
-
-  * The startup check for write permissions now works properly on NFS shares.
-
-  * Fixed an issue with the search results score indicator.
-
-  * Paperless was unable to generate thumbnails for encrypted PDF files and failed. Paperless will now generate a default thumbnail for these files.
-
-  * Fixed ``AUTO_LOGIN_USERNAME``: Unable to perform POST/PUT/DELETE requests and unable to receive WebSocket messages.
-
-paperless-ng 1.3.0
-==================
-
-This release contains new database migrations.
-
-* Changes
-
-  * The REST API is versioned from this point onwards. This will allow me to make changes without breaking existing clients. See the documentation about :ref:`api-versioning` for details.
-
-  * Added a color picker for tag colors.
-
-  * Added the ability to use the filter for searching the document content as well.
-
-  * Added translations into Italian and Romanian. Thank you!
-
-  * Close individual documents from the sidebar. Thanks to `Michael Shamoon`_.
-
-  * `BolkoSchreiber <https://github.com/BolkoSchreiber>`_ added an option to disable/enable thumbnail inversion in dark mode.
-
-  * `Simon Taddiken <https://github.com/skuzzle>`_ added the ability to customize the header used for remote user authentication with SSO applications.
-
-* Bug fixes
-
-  * Fixed an issue with the auto matching algorithm when more than 256 tags were used.
-
-
-paperless-ng 1.2.1
-==================
-
-* `Rodrigo Avelino <https://github.com/rodavelino>`_ translated Paperless into Portuguese (Brazil)!
-
-* The date input fields now respect the currently selected date format.
-
-* Added a fancy icon when adding paperless to the home screen on iOS devices. Thanks to `Joel Nordell <https://github.com/joelnordell>`_.
-
-* When using regular expression matching, the regular expression is now validated before saving the tag/correspondent/type.
-
-* Regression fix: Dates on the front end did not respect date locale settings in some cases.
-
-paperless-ng 1.2.0
-==================
-
-* Changes to the OCRmyPDF integration
-
-  * Added support for deskewing and automatic rotation of incorrectly rotated pages. This is enabled by default, see :ref:`configuration-ocr`.
-  * Better support for encrypted files.
-  * Better support for various other PDF files: Paperless will now attempt to force OCR with safe options when OCR fails with the configured options.
-  * Added an explicit option to skip cleaning with ``unpaper``.
-
-* Download multiple selected documents as a zip archive.
-
-* The document list now remembers the current page.
-
-* Improved responsiveness when switching between saved views and the document list.
-
-* Increased the default wait time when observing files in the consumption folder
-  with polling from 1 to 5 seconds. This will decrease the likelihood of paperless
-  consuming partially written files.
-
-* Fixed a crash of the document archiver management command when trying to process documents with unknown mime types.
-
-* Paperless no longer depends on ``libpoppler-cpp-dev``.
-
-paperless-ng 1.1.4
-==================
-
-* Added English (GB) locale.
-
-* Added ISO-8601 date display option.
-
-paperless-ng 1.1.3
-==================
-
-* Added a docker-specific configuration option to adjust the number of
-  worker processes of the web server. See :ref:`configuration-docker`.
-
-* Some more memory usage optimizations.
-
-* Don't show inbox statistics if no inbox tag is defined.
-
-paperless-ng 1.1.2
-==================
-
-* Always show top left corner of thumbnails, even for extra wide documents.
-
-* Added a management command for executing the sanity checker directly.
-  See :ref:`utilities-sanity-checker`.
-
-* The weekly sanity check now reports messages in the log files.
-
-* Fixed an issue with the metadata tab not reporting anything in case of missing files.
-
-* Reverted a change from 1.1.0 that caused huge memory usage due to redis caching.
-
-* Some memory usage optimizations.
-
-paperless-ng 1.1.1
-==================
-
-This release contains new database migrations.
-
-* Fixed a bug in the sanity checker that would cause it to display "x not in list" errors instead of actual issues.
-
-* Fixed a bug with filename generation for archive filenames that would cause the archive files of two documents to overlap.
-
-  * This happened when ``PAPERLESS_FILENAME_FORMAT`` is used and the filenames of two or more documents are the same, except for the file extension.
-  * Paperless will now store the archive filename in the database as well instead of deriving it from the original filename, and use the
-    same logic for detecting and avoiding filename clashes that's also used for original filenames.
-  * The migrations will repair any missing archive files. If you're using tika, ensure that tika is running while performing the migration. Docker-compose will take care of that.
-
-* Fixed a bug with thumbnail regeneration when TIKA integration was used.
-
-* Added ASN as a placeholder field to the filename format.
-
-* The docker image now comes with built-in shortcuts for most management commands. These are now the recommended way to execute management commands, since these
-  also ensure that they're always executed as the paperless user and you're less likely to run into permission issues. See :ref:`utilities-management-commands`.
-
-paperless-ng 1.1.0
-==================
-
-* Document processing status
-
-  * Paperless now shows the status of processing documents on the dashboard in real time.
-  * Status notifications when
-
-    * New documents are detected in the consumption folder, in mails, uploaded on the front end,
-      or added with one of the mobile apps.
-    * Documents are successfully added to paperless.
-    * Document consumption failed (with error messages)
-
-  * Configuration options to enable/disable individual notifications.
-
-* Live updates to document lists and saved views when new documents are added.
-
-  .. hint::
-
-    For status notifications and live updates to work, paperless now requires an `ASGI <https://asgi.readthedocs.io/en/latest/>`_-enabled
-    web server. The docker images uses ``gunicorn`` and an ASGI-enabled worker called `uvicorn <http://www.uvicorn.org/>`_,
-    and there is no need to configure anything.
-
-    For bare metal installations, changes are required for the notifications to work. Adapt the service ``paperless-webserver.service``
-    to use the supplied ``gunicorn.conf.py`` configuration file and adapt the reference to the ASGI application as follows:
-
-    .. code::
-
-      ExecStart=/opt/paperless/.local/bin/gunicorn -c /opt/paperless/gunicorn.conf.py paperless.asgi:application
-
-    Paperless will continue to work with WSGI, but you will not get any status notifications.
-
-    Apache ``mod_wsgi`` users, see :ref:`this note <faq-mod_wsgi>`.
-
-* Paperless now offers suggestions for tags, correspondents and types on the document detail page.
-
-* Added an interactive easy install script that automatically downloads, configures and starts paperless with docker.
-
-* Official support for Python 3.9.
-
-* Other changes and fixes
-
-  * Adjusted the default parallelization settings to run more than one task in parallel on systems with 4 or less cores.
-    This addresses issues with paperless not consuming any new files when other tasks are running.
-
-  * Fixed a rare race condition that would cause paperless to process incompletely written files when using the upload on the dashboard.
-
-  * The document classifier no longer issues warnings and errors when auto matching is not used at all.
-
-  * Better icon for document previews.
-
-  * Better info section in the side bar.
-
-  * Paperless no longer logs to the database. Instead, logs are written to rotating log files. This solves many "database is locked"
-    issues on Raspberry Pi, especially when SQLite is used.
-
-  * By default, log files are written to ``PAPERLESS_DATA_DIR/log/``. Logging settings can be adjusted with
-    ``PAPERLESS_LOGGING_DIR``, ``PAPERLESS_LOGROTATE_MAX_SIZE`` and
-    ``PAPERLESS_LOGROTATE_MAX_BACKUPS``.
-
-paperless-ng 1.0.0
-==================
-
-Nothing special about this release, but since there are relatively few bug reports coming in, I think that this is reasonably stable.
-
-* Document export
-
-  * The document exporter has been rewritten to support updating an already existing export in place.
-    This enables incremental backups with ``rsync``.
-  * The document exporter supports naming exported files according to ``PAPERLESS_FILENAME_FORMAT``.
-  * The document exporter locks the media directory and the database during execution to ensure that
-    the resulting export is consistent.
-  * See the :ref:`updated documentation <utilities-exporter>` for more details.
-
-* Other changes and additions
-
-  * Added a language selector to the settings.
-  * Added date format options to the settings.
-  * Range selection with shift clicking is now possible in the document list.
-  * Filtering correspondent, type and tag management pages by name.
-  * Focus "Name" field in dialogs by default.
-
-
-paperless-ng 0.9.14
-===================
-
-Starting with this version, releases are getting built automatically. This release also comes with changes on how to install and
-update paperless.
-
-* Paperless now uses GitHub Actions to make releases and build docker images.
-
-  * Docker images are available for amd64, armhf, and aarch64.
-  * When you pull an image from Docker Hub, Docker will automatically select the correct image for you.
-
-* Changes to docker installations and updates
-
-  * The ``-dockerfiles.tar.xz`` release archive is gone. Instead, simply grab the docker files from ``/docker/compose`` in the repository
-    if you wish to install paperless by pulling from the hub.
-  * The docker compose files in ``/docker/compose`` were changed to always use the ``latest`` version automatically. In order to do further
-    updates, simply do a ``docker-compose pull``. The documentation has been updated.
-  * The docker compose files were changed to restart paperless on system boot only if it was running before shutdown.
-  * Documentation of the docker-compose files about what they do.
-
-* Changes to bare metal installations and updates
-
-  * The release archive is built exactly like before. However, the release now comes with already compiled translation messages and
-    collected static files. Therefore, the update steps ``compilemessages`` and ``collectstatic`` are now obsolete.
-
-* Other changes
-
-  * A new configuration option ``PAPERLESS_IGNORE_DATES`` was added by `jayme-github`_. This can be used to instruct paperless to ignore
-    certain dates (such as your date of birth) when guessing the date from the document content. This was actually introduced in 0.9.12,
-    I just forgot to mention it in the changelog.
-  * The filter drop downs now display selected entries on top of all other entries.
-  * The PostgreSQL client now supports setting an explicit ``sslmode`` to force encryption of the connection to PostgreSQL.
-  * The docker images now come with ``jbig2enc``, which is a lossless image encoder for PDF documents and decreases the size of certain
-    PDF/A documents.
-  * When using any of the manual matching algorithms, paperless now logs messages about when and why these matching algorithms matched.
-  * The default settings for parallelization in paperless were adjusted to always leave one CPU core free.
-  * Added an option to the frontend to choose which method to use for displaying PDF documents.
-
-* Fixes
-
-  * An issue with the tika parser not picking up files from the consumption directory was fixed.
-  * A couple changes to the dark mode and fixes to several other layout issues.
-  * An issue with the drop downs for correspondents, tags and types not properly supporting filtering with special characters was fixed.
-  * Fixed an issue with filenames of downloaded files: Dates where off by one day due to timezone issues.
-  * Searching will continue to work even when the index returns non-existing documents. This resulted in "Document does not exist" errors
-    before. Instead, a warning is logged, indicating the issue.
-  * An issue with the consumer crashing when invalid regular expression were used was fixed.
-
-paperless-ng 0.9.13
-===================
-
-* Fixed an issue with Paperless not starting due to the new Tika integration when ``USERMAP_UID`` and ``USERMAP_GID`` was used
-  in the ``docker-compose.env`` file.
-
-paperless-ng 0.9.12
-===================
-
-* Paperless localization
-
-  * Thanks to the combined efforts of many users, Paperless is now available in English, Dutch, French and German.
-
-* Thanks to `Jo Vandeginste`_, Paperless has optional support for Office documents such as .docx, .doc, .odt and more.
-
-  * See the :ref:`configuration<configuration-tika>` on how to enable this feature. This feature requires two additional services
-    (one for parsing Office documents and metadata extraction and another for converting Office documents to PDF), and is therefore
-    not enabled on default installations.
-  * As with all other documents, paperless converts Office documents to PDF and stores both the original as well as the archived PDF.
-
-* Dark mode
-
-  * Thanks to `Michael Shamoon`_, paperless now has a dark mode. Configuration is available in the settings.
-
-* Other changes and additions
-
-  * The PDF viewer now uses a local copy of some dependencies instead of fetching them from the internet. Thanks to `slorenz`_.
-  * Revamped search bar styling thanks to `Michael Shamoon`_.
-  * Sorting in the document list by clicking on table headers.
-  * A button was added to the document detail page that assigns a new ASN to a document.
-  * Form field validation: When providing invalid input in a form (such as a duplicate ASN or no name), paperless now has visual
-    indicators and clearer error messages about what's wrong.
-  * Paperless disables buttons with network actions (such as save and delete) when a network action is active. This indicates that
-    something is happening and prevents double clicking.
-  * When using "Save & next", the title field is focussed automatically to better support keyboard editing.
-  * E-Mail: Added filter rule parameters to allow inline attachments (watch out for mails with inlined images!) and attachment filename filters
-    with wildcards.
-  * Support for remote user authentication thanks to `Michael Shamoon`_. This is useful for hiding Paperless behind single sign on applications
-    such as `authelia <https://www.authelia.com/>`_.
-  * "Clear filters" has been renamed to "Reset filters" and now correctly restores the default filters on saved views. Thanks to `Michael Shamoon`_
-
-* Fixes
-
-  * Paperless was unable to save views when "Not assigned" was chosen in one of the filter dropdowns.
-  * Clearer error messages when pre and post consumption scripts do not exist.
-  * The post consumption script is executed later in the consumption process. Before the change, an ID was passed to the script referring to
-    a document that did not yet exist in the database.
-
-paperless-ng 0.9.11
-===================
-
-* Fixed an issue with the docker image not starting at all due to a configuration change of the web server.
-
-
-paperless-ng 0.9.10
-===================
-
-* Bulk editing
-
-  * Thanks to `Michael Shamoon`_, we've got a new interface for the bulk editor.
-  * There are some configuration options in the settings to alter the behavior.
-
-* Other changes and additions
-
-  * Thanks to `zjean`_, paperless now publishes a webmanifest, which is useful for adding the application to home screens on mobile devices.
-  * The Paperless-ng logo now navigates to the dashboard.
-  * Filter for documents that don't have any correspondents, types or tags assigned.
-  * Tags, types and correspondents are now sorted case insensitive.
-  * Lots of preparation work for localization support.
-
-* Fixes
-
-  * Added missing dependencies for Raspberry Pi builds.
-  * Fixed an issue with plain text file consumption: Thumbnail generation failed due to missing fonts.
-  * An issue with the search index reporting missing documents after bulk deletes was fixed.
-  * Issue with the tag selector not clearing input correctly.
-  * The consumer used to stop working when encountering an incomplete classifier model file.
-
-.. note::
-
-  The bulk delete operations did not update the search index. Therefore, documents that you deleted remained in the index and
-  caused the search to return messages about missing documents when searching. Further bulk operations will properly update
-  the index.
-
-  However, this change is not retroactive: If you used the delete method of the bulk editor, you need to reindex your search index
-  by :ref:`running the management command document_index with the argument reindex <administration-index>`.
-
-paperless-ng 0.9.9
-==================
-
-Christmas release!
-
-* Bulk editing
-
-  * Paperless now supports bulk editing.
-  * The following operations are available: Add and remove correspondents, tags, document types from selected documents, as well as mass-deleting documents.
-  * We've got a more fancy UI in the works that makes these features more accessible, but that's not quite ready yet.
-
-* Searching
-
-  * Paperless now supports searching for similar documents ("More like this") both from the document detail page as well as from individual search results.
-  * A search score indicates how well a document matches the search query, or how similar a document is to a given reference document.
-
-* Other additions and changes
-
-  * Clarification in the UI that the fields "Match" and "Is insensitive" are not relevant for the Auto matching algorithm.
-  * New select interface for tags, types and correspondents allows filtering. This also improves tag selection. Thanks again to `Michael Shamoon`_!
-  * Page navigation controls for the document viewer, thanks to `Michael Shamoon`_.
-  * Layout changes to the small cards document list.
-  * The dashboard now displays the username (or full name if specified in the admin) on the dashboard.
-
-* Fixes
-
-  * An error that caused the document importer to crash was fixed.
-  * An issue with changes not being possible when ``PAPERLESS_COOKIE_PREFIX`` is used was fixed.
-  * The date selection filters now allow manual entry of dates.
-
-* Feature Removal
-
-  * Most of the guesswork features have been removed. Paperless no longer tries to extract correspondents and tags from file names.
-
-paperless-ng 0.9.8
-==================
-
-This release addresses two severe issues with the previous release.
-
-* The delete buttons for document types, correspondents and tags were not working.
-* The document section in the admin was causing internal server errors (500).
-
-
-paperless-ng 0.9.7
-==================
-
-
-* Front end
-
-  * Thanks to the hard work of `Michael Shamoon`_, paperless now comes with a much more streamlined UI for
-    filtering documents.
-
-  * `Michael Shamoon`_ replaced the document preview with another component. This should fix compatibility with Safari browsers.
-
-  * Added buttons to the management pages to quickly show all documents with one specific tag, correspondent, or title.
-
-  * Paperless now stores your saved views on the server and associates them with your user account.
-    This means that you can access your views on multiple devices and have separate views for different users.
-    You will have to recreate your views.
-
-  * The GitHub and documentation links now open in new tabs/windows. Thanks to `rYR79435`_.
-
-  * Paperless now generates default saved view names when saving views with certain filter rules.
-
-  * Added a small version indicator to the front end.
-
-* Other additions and changes
-
-  * The new filename format field ``{tag_list}`` inserts a list of tags into the filename, separated by comma.
-  * The ``document_retagger`` no longer removes inbox tags or tags without matching rules.
-  * The new configuration option ``PAPERLESS_COOKIE_PREFIX`` allows you to run multiple instances of paperless on different ports.
-    This option enables you to be logged in into multiple instances by specifying different cookie names for each instance.
-
-* Fixes
-
-  * Sometimes paperless would assign dates in the future to newly consumed documents.
-  * The filename format fields ``{created_month}`` and ``{created_day}`` now use a leading zero for single digit values.
-  * The filename format field ``{tags}`` can no longer be used without arguments.
-  * Paperless was not able to consume many images (especially images from mobile scanners) due to missing DPI information.
-    Paperless now assumes A4 paper size for PDF generation if no DPI information is present.
-  * Documents with empty titles could not be opened from the table view due to the link being empty.
-  * Fixed an issue with filenames containing special characters such as ``:`` not being accepted for upload.
-  * Fixed issues with thumbnail generation for plain text files.
-
-
-paperless-ng 0.9.6
-==================
-
-This release focusses primarily on many small issues with the UI.
-
-* Front end
-
-  * Paperless now has proper window titles.
-  * Fixed an issue with the small cards when more than 7 tags were used.
-  * Navigation of the "Show all" links adjusted. They navigate to the saved view now, if available in the sidebar.
-  * Some indication on the document lists that a filter is active was added.
-  * There's a new filter to filter for documents that do *not* have a certain tag.
-  * The file upload box now shows upload progress.
-  * The document edit page was reorganized.
-  * The document edit page shows various information about a document.
-  * An issue with the height of the preview was fixed.
-  * Table issues with too long document titles fixed.
-
-* API
-
-  * The API now serves file names with documents.
-  * The API now serves various metadata about documents.
-  * API documentation updated.
-
-* Other
-
-  * Fixed an issue with the docker image when a non-standard PostgreSQL port was used.
-  * The docker image was trying check for installed languages before actually installing them.
-  * ``FILENAME_FORMAT`` placeholder for document types.
-  * The filename formatter is now less restrictive with file names and tries to
-    conserve the original correspondents, types and titles as much as possible.
-  * The filename formatter does not include the document ID in filenames anymore. It will
-    rather append ``_01``, ``_02``, etc when it detects duplicate filenames.
-
-.. note::
-
-  The changes to the filename format will apply to newly added documents and changed documents.
-  If you want all files to reflect these changes, execute the ``document_renamer`` management
-  command.
-
-
-paperless-ng 0.9.5
-==================
-
-This release concludes the big changes I wanted to get rolled into paperless. The next releases before 1.0 will
-focus on fixing issues, primarily.
-
-* OCR
-
-  * Paperless now uses `OCRmyPDF <https://github.com/jbarlow83/OCRmyPDF>`_ to perform OCR on documents.
-    It still uses tesseract under the hood, but the PDF parser of Paperless has changed considerably and
-    will behave different for some douments.
-  * OCRmyPDF creates archived PDF/A documents with embedded text that can be selected in the front end.
-  * Paperless stores archived versions of documents alongside with the originals. The originals can be
-    accessed on the document edit page. If available, a dropdown menu will appear next to the download button.
-  * Many of the configuration options regarding OCR have changed. See :ref:`configuration-ocr` for details.
-  * Paperless no longer guesses the language of your documents. It always uses the language that you
-    specified with ``PAPERLESS_OCR_LANGUAGE``. Be sure to set this to the language the majority of your
-    documents are in. Multiple languages can be specified, but that requires more CPU time.
-  * The management command :ref:`document_archiver <utilities-archiver>` can be used to create archived versions for already
-    existing documents.
-
-* Tags from consumption folder.
-
-  * Thanks to `jayme-github`_, paperless now consumes files from sub folders in the consumption folder and is able to assign tags
-    based on the sub folders a document was found in. This can be configured with ``PAPERLESS_CONSUMER_RECURSIVE`` and
-    ``PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS``.
-
-* API
-
-  * The API now offers token authentication.
-  * The endpoint for uploading documents now supports specifying custom titles, correspondents, tags and types.
-    This can be used by clients to override the default behavior of paperless. See :ref:`api-file_uploads`.
-  * The document endpoint of API now serves documents in this form:
-
-    * correspondents, document types and tags are referenced by their ID in the fields ``correspondent``, ``document_type`` and ``tags``. The ``*_id`` versions are gone. These fields are read/write.
-    * paperless does not serve nested tags, correspondents or types anymore.
-
-* Front end
-
-  * Paperless does some basic caching of correspondents, tags and types and will only request them from the server when necessary or when entirely reloading the page.
-  * Document list fetching is about 10%-30% faster now, especially when lots of tags/correspondents are present.
-  * Some minor improvements to the front end, such as document count in the document list, better highlighting of the current page, and improvements to the filter behavior.
-
-* Fixes:
-
-  * A bug with the generation of filenames for files with unsupported types caused the exporter and
-    document saving to crash.
-  * Mail handling no longer exits entirely when encountering errors. It will skip the account/rule/message on which the error occured.
-  * Assigning correspondents from mail sender names failed for very long names. Paperless no longer assigns correspondents in these cases.
-
-paperless-ng 0.9.4
-==================
-
-* Searching:
-
-  * Paperless now supports searching by tags, types and dates and correspondents. In order to have this applied to your
-    existing documents, you need to perform a ``document_index reindex`` management command
-    (see :ref:`administration-index`)
-    that adds the data to the search index. You only need to do this once, since the schema of the search index changed.
-    Paperless keeps the index updated after that whenever something changes.
-  * Paperless now has spelling corrections ("Did you mean") for miss-typed queries.
-  * The documentation contains :ref:`information about the query syntax <basic-searching>`.
-
-* Front end:
-
-  * Clickable tags, correspondents and types allow quick filtering for related documents.
-  * Saved views are now editable.
-  * Preview documents directly in the browser.
-  * Navigation from the dashboard to saved views.
-
-* Fixes:
-
-  * A severe error when trying to use post consume scripts.
-  * An error in the consumer that cause invalid messages of missing files to show up in the log.
-
-* The documentation now contains information about bare metal installs and a section about
-  how to setup the development environment.
-
-paperless-ng 0.9.3
-==================
-
-* Setting ``PAPERLESS_AUTO_LOGIN_USERNAME`` replaces ``PAPERLESS_DISABLE_LOGIN``.
-  You have to specify your username.
-* Added a simple sanity checker that checks your documents for missing or orphaned files,
-  files with wrong checksums, inaccessible files, and documents with empty content.
-* It is no longer possible to encrypt your documents. For the time being, paperless will
-  continue to operate with already encrypted documents.
-* Fixes:
-
-  * Paperless now uses inotify again, since the watchdog was causing issues which I was not
-    aware of.
-  * Issue with the automatic classifier not working with only one tag.
-  * A couple issues with the search index being opened to eagerly.
-
-* Added lots of tests for various parts of the application.
-
-paperless-ng 0.9.2
-==================
-
-* Major changes to the front end (colors, logo, shadows, layout of the cards,
-  better mobile support)
-
-* Paperless now uses mime types and libmagic detection to determine
-  if a file type is supported and which parser to use. Removes all
-  file type checks that where present in MANY different places in
-  paperless.
-
-* Mail consumer now correctly consumes documents even when their
-  content type was not set correctly. (i.e. PDF documents with
-  content type ``application/octet-stream``)
-
-* Basic sorting of mail rules added
-
-* Much better admin for mail rule editing.
-
-* Docker entrypoint script awaits the database server if it is
-  configured.
-
-* Disabled editing of logs.
-
-* New setting ``PAPERLESS_OCR_PAGES`` limits the tesseract parser
-  to the first n pages of scanned documents.
-
-* Fixed a bug where tasks with too long task names would not show
-  up in the admin.
-
-paperless-ng 0.9.1
-==================
-
-* Moved documentation of the settings to the actual documentation.
-* Updated release script to force the user to choose between SQLite
-  and PostgreSQL. This avoids confusion when upgrading from paperless.
-
-
-paperless-ng 0.9.0
-==================
-
-* **Deprecated:** GnuPG. :ref:`See this note on the state of GnuPG in paperless-ng. <utilities-encyption>`
-  This features will most likely be removed in future versions.
-
-* **Added:** New frontend. Features:
-
-  * Single page application: It's much more responsive than the django admin pages.
-  * Dashboard. Shows recently scanned documents, or todo notes, or other documents
-    at wish. Allows uploading of documents. Shows basic statistics.
-  * Better document list with multiple display options.
-  * Full text search with result highlighting, auto completion and scoring based
-    on the query. It uses a document search index in the background.
-  * Saveable filters.
-  * Better log viewer.
-
-* **Added:** Document types. Assign these to documents just as correspondents.
-  They may be used in the future to perform automatic operations on documents
-  depending on the type.
-* **Added:** Inbox tags. Define an inbox tag and it will automatically be
-  assigned to any new document scanned into the system.
-* **Added:** Automatic matching. A new matching algorithm that automatically
-  assigns tags, document types and correspondents to your documents. It uses
-  a neural network trained on your data.
-* **Added:** Archive serial numbers. Assign these to quickly find documents stored in
-  physical binders.
-* **Added:** Enabled the internal user management of django. This isn't really a
-  multi user solution, however, it allows more than one user to access the website
-  and set some basic permissions / renew passwords.
-
-* **Modified [breaking]:** All new mail consumer with customizable filters, actions and
-  multiple account support. Replaces the old mail consumer. The new mail consumer
-  needs different configuration but can be configured to act exactly like the old
-  consumer.
-
-
-* **Modified:** Changes to the consumer:
-
-  * Now uses the excellent watchdog library that should make sure files are
-    discovered no matter what the platform is.
-  * The consumer now uses a task scheduler to run consumption processes in parallel.
-    This means that consuming many documents should be much faster on systems with
-    many cores.
-  * Concurrency is controlled with the new settings ``PAPERLESS_TASK_WORKERS``
-    and ``PAPERLESS_THREADS_PER_WORKER``. See TODO for details on concurrency.
-  * The consumer no longer blocks the database for extended periods of time.
-  * An issue with tesseract running multiple threads per page and slowing down
-    the consumer was fixed.
-
-* **Modified [breaking]:** REST Api changes:
-
-  * New filters added, other filters removed (case sensitive filters, slug filters)
-  * Endpoints for thumbnails, previews and downloads replace the old ``/fetch/`` urls. Redirects are in place.
-  * Endpoint for document uploads replaces the old ``/push`` url. Redirects are in place.
-  * Foreign key relationships are now served as IDs, not as urls.
-
-* **Modified [breaking]:** PostgreSQL:
-
-  * If ``PAPERLESS_DBHOST`` is specified in the settings, paperless uses PostgreSQL instead of SQLite.
-    Username, database and password all default to ``paperless`` if not specified.
-
-* **Modified [breaking]:** document_retagger management command rework. See
-  :ref:`utilities-retagger` for details. Replaces ``document_correspondents``
-  management command.
-* **Removed [breaking]:** Reminders.
-* **Removed:** All customizations made to the django admin pages.
-* **Removed [breaking]:** The docker image no longer supports SSL. If you want to expose
-  paperless to the internet, hide paperless behind a proxy server that handles SSL
-  requests.
-* **Internal changes:** Mostly code cleanup, including:
-
-  * Rework of the code of the tesseract parser. This is now a lot cleaner.
-  * Rework of the filename handling code. It was a mess.
-  * Fixed some issues with the document exporter not exporting all documents when encountering duplicate filenames.
-  * Added a task scheduler that takes care of checking mail, training the classifier, maintaining the document search index
-    and consuming documents.
-  * Updated dependencies. Now uses Pipenv all around.
-  * Updated Dockerfile and docker-compose. Now uses ``supervisord`` to run everything paperless-related in a single container.
-
-* **Settings:**
-
-  * ``PAPERLESS_FORGIVING_OCR`` is now default and gone. Reason: Even if ``langdetect`` fails to detect
-    a language, tesseract still does a very good job at ocr'ing a document with the default language.
-    Certain language specifics such as umlauts may not get picked up properly.
-  * ``PAPERLESS_DEBUG`` defaults to ``false``.
-  * The presence of ``PAPERLESS_DBHOST`` now determines whether to use PostgreSQL or
-    SQLite.
-  * ``PAPERLESS_OCR_THREADS`` is gone and replaced with ``PAPERLESS_TASK_WORKERS`` and
-    ``PAPERLESS_THREADS_PER_WORKER``. Refer to the config example for details.
-  * ``PAPERLESS_OPTIMIZE_THUMBNAILS`` allows you to disable or enable thumbnail
-    optimization. This is useful on less powerful devices.
-
-* Many more small changes here and there. The usual stuff.
-
-Paperless
-#########
-
-2.7.0
-=====
-
-* `syntonym`_ submitted a pull request to catch IMAP connection errors `#475`_.
-* `Stéphane Brunner`_ added ``psycopg2`` to the Pipfile `#489`_.  He also fixed
-  a syntax error in ``docker-compose.yml.example`` `#488`_ and added `DjangoQL`_,
-  which allows a litany of handy search functionality `#492`_.
-* `CkuT`_ and `JOKer`_ hacked out a simple, but super-helpful optimisation to
-  how the thumbnails are served up, improving performance considerably `#481`_.
-* `tsia`_ added a few fields to the tags REST API. `#483`_.
-* `Brian Cribbs`_ improved the documentation to help people using Paperless
-  over NFS `#484`_.
-* `Brendan M. Sleight`_ updated the documentation to include a note for setting the
-  ``DEBUG`` value.  The ``paperless.conf.example`` file was also updated to
-  mirror the project defaults.
-
-
-2.6.1
-=====
-
-* We now have a logo, complete with a favicon :-)
-* Removed some problematic tests.
-* Fix the docker-compose example config to include a shared consume volume so
-  that using the push API will work for users of the Docker install.  Thanks to
-  `Colin Frei`_ for fixing this in `#466`_.
-* `khrise`_ submitted a pull request to include the ``added`` property to the
-  REST API `#471`_.
-
-
-2.6.0
-=====
-
-* Allow an infinite number of logs to be deleted.  Thanks to `Ulli`_ for noting
-  the problem in `#433`_.
-* Fix the ``RecentCorrespondentsFilter`` correspondents filter that was added
-  in 2.4 to play nice with the defaults.  Thanks to `tsia`_ and `Sblop`_ who
-  pointed this out. `#423`_.
-* Updated dependencies to include (among other things) a security patch to
-  requests.
-* Fix text in sample data for tests so that the language guesser stops thinking
-  that everything is in Catalan because we had *Lorem ipsum* in there.
-* Tweaked the gunicorn sample command to use filesystem paths instead of Python
-  paths. `#441`_
-* Added pretty colour boxes next to the hex values in the Tags section, thanks
-  to a pull request from `Joshua Taillon`_ `#442`_.
-* Added a ``.editorconfig`` file to better specify coding style.
-* `Joshua Taillon`_ also added some logic to tie Paperless' date guessing logic
-  into how it parses file names on import. `#440`_
-
-
-2.5.0
-=====
-
-* **New dependency**: Paperless now optimises thumbnail generation with
-  `optipng`_, so you'll need to install that somewhere in your PATH or declare
-  its location in ``PAPERLESS_OPTIPNG_BINARY``.  The Docker image has already
-  been updated on the Docker Hub, so you just need to pull the latest one from
-  there if you're a Docker user.
-
-* "Login free" instances of Paperless were breaking whenever you tried to edit
-  objects in the admin: adding/deleting tags or correspondents, or even fixing
-  spelling.  This was due to the "user hack" we were applying to sessions that
-  weren't using a login, as that hack user didn't have a valid id.  The fix was
-  to attribute the first user id in the system to this hack user.  `#394`_
-
-* A problem in how we handle slug values on Tags and Correspondents required a
-  few changes to how we handle this field `#393`_:
-
-  1. Slugs are no longer editable.  They're derived from the name of the tag or
-     correspondent at save time, so if you wanna change the slug, you have to
-     change the name, and even then you're restricted to the rules of the
-     ``slugify()`` function.  The slug value is still visible in the admin
-     though.
-  2. I've added a migration to go over all existing tags & correspondents and
-     rewrite the ``.slug`` values to ones conforming to the ``slugify()``
-     rules.
-  3. The consumption process now uses the same rules as ``.save()`` in
-     determining a slug and using that to check for an existing
-     tag/correspondent.
-
-* An annoying bug in the date capture code was causing some bogus dates to be
-  attached to documents, which in turn busted the UI.  Thanks to `Andrew Peng`_
-  for reporting this. `#414`_.
-
-* A bug in the Dockerfile meant that Tesseract language files weren't being
-  installed correctly.  `euri10`_ was quick to provide a fix: `#406`_, `#413`_.
-
-* Document consumption is now wrapped in a transaction as per an old ticket
-  `#262`_.
-
-* The ``get_date()`` functionality of the parsers has been consolidated onto
-  the ``DocumentParser`` class since much of that code was redundant anyway.
-
-
-2.4.0
-=====
-
-* A new set of actions are now available thanks to `jonaswinkler`_'s very first
-  pull request!  You can now do nifty things like tag documents in bulk, or set
-  correspondents in bulk.  `#405`_
-* The import/export system is now a little smarter.  By default, documents are
-  tagged as ``unencrypted``, since exports are by their nature unencrypted.
-  It's now in the import step that we decide the storage type.  This allows you
-  to export from an encrypted system and import into an unencrypted one, or
-  vice-versa.
-* The migration history has been slightly modified to accommodate PostgreSQL
-  users.  Additionally, you can now tell paperless to use PostgreSQL simply by
-  declaring ``PAPERLESS_DBUSER`` in your environment.  This will attempt to
-  connect to your Postgres database without a password unless you also set
-  ``PAPERLESS_DBPASS``.
-* A bug was found in the REST API filter system that was the result of an
-  update of django-filter some time ago.  This has now been patched in `#412`_.
-  Thanks to `thepill`_ for spotting it!
-
-
-2.3.0
-=====
-
-* Support for consuming plain text & markdown documents was added by
-  `Joshua Taillon`_!  This was a long-requested feature, and it's addition is
-  likely to be greatly appreciated by the community: `#395`_  Thanks also to
-  `David Martin`_ for his assistance on the issue.
-* `dubit0`_ found & fixed a bug that prevented management commands from running
-  before we had an operational database: `#396`_
-* Joshua also added a simple update to the thumbnail generation process to
-  improve performance: `#399`_
-* As his last bit of effort on this release, Joshua also added some code to
-  allow you to view the documents inline rather than download them as an
-  attachment. `#400`_
-* Finally, `ahyear`_ found a slip in the Docker documentation and patched it.
-  `#401`_
-
-
-2.2.1
-=====
-
-* `Kyle Lucy`_ reported a bug quickly after the release of 2.2.0 where we broke
-  the ``DISABLE_LOGIN`` feature: `#392`_.
-
-
-2.2.0
-=====
-
-* Thanks to `dadosch`_, `Wolfgang Mader`_, and `Tim Brooks`_ this is the first
-  version of Paperless that supports Django 2.0!  As a result of their hard
-  work, you can now also run Paperless on Python 3.7 as well: `#386`_ &
-  `#390`_.
-* `Stéphane Brunner`_ added a few lines of code that made tagging interface a
-  lot easier on those of us with lots of different tags: `#391`_.
-* `Kilian Koeltzsch`_ noticed a bug in how we capture & automatically create
-  tags, so that's fixed now too: `#384`_.
-* `erikarvstedt`_ tweaked the behaviour of the test suite to be better behaved
-  for packaging environments: `#383`_.
-* `Lukasz Soluch`_ added CORS support to make building a new Javascript-based
-  front-end cleaner & easier: `#387`_.
-
-
-2.1.0
-=====
-
-* `Enno Lohmeier`_ added three simple features that make Paperless a lot more
-  user (and developer) friendly:
-
-  1. There's a new search box on the front page: `#374`_.
-  2. The correspondents & tags pages now have a column showing the number of
-     relevant documents: `#375`_.
-  3. The Dockerfile has been tweaked to build faster for those of us who are
-     doing active development on Paperless using the Docker environment:
-     `#376`_.
-
-* You now also have the ability to customise the interface to your heart's
-  content by creating a file called ``overrides.css`` and/or ``overrides.js``
-  in the root of your media directory.  Thanks to `Mark McFate`_ for this
-  idea: `#371`_
-
-
-2.0.0
-=====
-
-This is a big release as we've changed a core-functionality of Paperless: we no
-longer encrypt files with GPG by default.
-
-The reasons for this are many, but it boils down to that the encryption wasn't
-really all that useful, as files on-disk were still accessible so long as you
-had the key, and the key was most typically stored in the config file.  In
-other words, your files are only as safe as the ``paperless`` user is.  In
-addition to that, *the contents of the documents were never encrypted*, so
-important numbers etc. were always accessible simply by querying the database.
-Still, it was better than nothing, but the consensus from users appears to be
-that it was more an annoyance than anything else, so this feature is now turned
-off unless you explicitly set a passphrase in your config file.
-
-Migrating from 1.x
-==================
-
-Encryption isn't gone, it's just off for new users.  So long as you have
-``PAPERLESS_PASSPHRASE`` set in your config or your environment, Paperless
-should continue to operate as it always has.  If however, you want to drop
-encryption too, you only need to do two things:
-
-1. Run ``./manage.py migrate && ./manage.py change_storage_type gpg unencrypted``.
-   This will go through your entire database and Decrypt  All The Things.
-2. Remove ``PAPERLESS_PASSPHRASE`` from your ``paperless.conf`` file, or simply
-   stop declaring it in your environment.
-
-Special thanks to `erikarvstedt`_, `matthewmoto`_, and `mcronce`_ who did the
-bulk of the work on this big change.
-
-1.4.0
-=====
-
-* `Quentin Dawans`_ has refactored the document consumer to allow for some
-  command-line options.  Notably, you can now direct it to consume from a
-  particular ``--directory``, limit the ``--loop-time``, set the time between
-  mail server checks with ``--mail-delta`` or just run it as a one-off with
-  ``--one-shot``.  See `#305`_ & `#313`_ for more information.
-* Refactor the use of travis/tox/pytest/coverage into two files:
-  ``.travis.yml`` and ``setup.cfg``.
-* Start generating requirements.txt from a Pipfile.  I'll probably switch over
-  to just using pipenv in the future.
-* All for a alternative FreeBSD-friendly location for ``paperless.conf``.
-  Thanks to `Martin Arendtsen`_ who provided this (`#322`_).
-* Document consumption events are now logged in the Django admin events log.
-  Thanks to `CkuT`_ for doing the legwork on this one and to `Quentin Dawans`_
-  & `David Martin`_ for helping to coordinate & work out how the feature would
-  be developed.
-* `erikarvstedt`_ contributed a pull request (`#328`_) to add ``--noreload``
-  to the default server start process.  This helps reduce the load imposed
-  by the running webservice.
-* Through some discussion on `#253`_ and `#323`_, we've removed a few of the
-  hardcoded URL values to make it easier for people to host Paperless on a
-  subdirectory.  Thanks to `Quentin Dawans`_ and `Kyle Lucy`_ for helping to
-  work this out.
-* The clickable area for documents on the listing page has been increased to a
-  more predictable space thanks to a glorious hack from `erikarvstedt`_ in
-  `#344`_.
-* `Strubbl`_ noticed an annoying bug in the bash script wrapping the Docker
-  entrypoint and fixed it with some very creating Bash skills: `#352`_.
-* You can now use the search field to find documents by tag thanks to
-  `thinkjk`_'s *first ever issue*: `#354`_.
-* Inotify is now being used to detect additions to the consume directory thanks
-  to some excellent work from `erikarvstedt`_ on `#351`_
-
-1.3.0
-=====
-
-* You can now run Paperless without a login, though you'll still have to create
-  at least one user.  This is thanks to a pull-request from `matthewmoto`_:
-  `#295`_.  Note that logins are still required by default, and that you need
-  to disable them by setting ``PAPERLESS_DISABLE_LOGIN="true"`` in your
-  environment or in ``/etc/paperless.conf``.
-* Fix for `#303`_ where sketchily-formatted documents could cause the consumer
-  to break and insert half-records into the database breaking all sorts of
-  things.  We now capture the return codes of both ``convert`` and ``unpaper``
-  and fail-out nicely.
-* Fix for additional date types thanks to input from `Isaac`_ and code from
-  `BastianPoe`_ (`#301`_).
-* Fix for running migrations in the Docker container (`#299`_).  Thanks to
-  `Georgi Todorov`_ for the fix (`#300`_) and to `Pit`_ for the review.
-* Fix for Docker cases where the issuing user is not UID 1000.  This was a
-  collaborative fix between `Jeffrey Portman`_ and `Pit`_ in `#311`_ and
-  `#312`_ to fix `#306`_.
-* Patch the historical migrations to support MySQL's um, *interesting* way of
-  handing indexes (`#308`_).  Thanks to `Simon Taddiken`_ for reporting the
-  problem and helping me find where to fix it.
-
-1.2.0
-=====
-
-* New Docker image, now based on Alpine, thanks to the efforts of `addadi`_
-  and `Pit`_.  This new image is dramatically smaller than the Debian-based
-  one, and it also has `a new home on Docker Hub`_.  A proper thank-you to
-  `Pit`_ for hosting the image on his Docker account all this time, but after
-  some discussion, we decided the image needed a more *official-looking* home.
-* `BastianPoe`_ has added the long-awaited feature to automatically skip the
-  OCR step when the PDF already contains text. This can be overridden by
-  setting ``PAPERLESS_OCR_ALWAYS=YES`` either in your ``paperless.conf`` or
-  in the environment.  Note that this also means that Paperless now requires
-  ``libpoppler-cpp-dev`` to be installed. **Important**: You'll need to run
-  ``pip install -r requirements.txt`` after the usual ``git pull`` to
-  properly update.
-* `BastianPoe`_ has also contributed a monumental amount of work (`#291`_) to
-  solving `#158`_: setting the document creation date based on finding a date
-  in the document text.
-
-1.1.0
-=====
-
-* Fix for `#283`_, a redirect bug which broke interactions with
-  paperless-desktop.  Thanks to `chris-aeviator`_ for reporting it.
-* Addition of an optional new financial year filter, courtesy of
-  `David Martin`_ `#256`_
-* Fixed a typo in how thumbnails were named in exports `#285`_, courtesy of
-  `Dan Panzarella`_
-
-1.0.0
-=====
-
-* Upgrade to Django 1.11.  **You'll need to run
-  ``pip install -r requirements.txt`` after the usual ``git pull`` to
-  properly update**.
-* Replace the templatetag-based hack we had for document listing in favour of
-  a slightly less ugly solution in the form of another template tag with less
-  copypasta.
-* Support for multi-word-matches for auto-tagging thanks to an excellent
-  patch from `ishirav`_ `#277`_.
-* Fixed a CSS bug reported by `Stefan Hagen`_ that caused an overlapping of
-  the text and checkboxes under some resolutions `#272`_.
-* Patched the Docker config to force the serving of static files.  Credit for
-  this one goes to `dev-rke`_ via `#248`_.
-* Fix file permissions during Docker start up thanks to `Pit`_ on `#268`_.
-* Date fields in the admin are now expressed as HTML5 date fields thanks to
-  `Lukas Winkler`_'s issue `#278`_
-
-0.8.0
-=====
-
-* Paperless can now run in a subdirectory on a host (``/paperless``), rather
-  than always running in the root (``/``) thanks to `maphy-psd`_'s work on
-  `#255`_.
-
-0.7.0
-=====
-
-* **Potentially breaking change**: As per `#235`_, Paperless will no longer
-  automatically delete documents attached to correspondents when those
-  correspondents are themselves deleted.  This was Django's default
-  behaviour, but didn't make much sense in Paperless' case.  Thanks to
-  `Thomas Brueggemann`_ and `David Martin`_ for their input on this one.
-* Fix for `#232`_ wherein Paperless wasn't recognising ``.tif`` files
-  properly.  Thanks to `ayounggun`_ for reporting this one and to
-  `Kusti Skytén`_ for posting the correct solution in the Github issue.
-
-0.6.0
-=====
-
-* Abandon the shared-secret trick we were using for the POST API in favour
-  of BasicAuth or Django session.
-* Fix the POST API so it actually works.  `#236`_
-* **Breaking change**: We've dropped the use of ``PAPERLESS_SHARED_SECRET``
-  as it was being used both for the API (now replaced with a normal auth)
-  and form email polling.  Now that we're only using it for email, this
-  variable has been renamed to ``PAPERLESS_EMAIL_SECRET``.  The old value
-  will still work for a while, but you should change your config if you've
-  been using the email polling feature.  Thanks to `Joshua Gilman`_ for all
-  the help with this feature.
-
-0.5.0
-=====
-
-* Support for fuzzy matching in the auto-tagger & auto-correspondent systems
-  thanks to `Jake Gysland`_'s patch `#220`_.
-* Modified the Dockerfile to prepare an export directory (`#212`_).  Thanks
-  to combined efforts from `Pit`_ and `Strubbl`_ in working out the kinks on
-  this one.
-* Updated the import/export scripts to include support for thumbnails.  Big
-  thanks to `CkuT`_ for finding this shortcoming and doing the work to get
-  it fixed in `#224`_.
-* All of the following changes are thanks to `David Martin`_:
-  * Bumped the dependency on pyocr to 0.4.7 so new users can make use of
-  Tesseract 4 if they so prefer (`#226`_).
-  * Fixed a number of issues with the automated mail handler (`#227`_, `#228`_)
-  * Amended the documentation for better handling of systemd service files (`#229`_)
-  * Amended the Django Admin configuration to have nice headers (`#230`_)
-
-0.4.1
-=====
-
-* Fix for `#206`_ wherein the pluggable parser didn't recognise files with
-  all-caps suffixes like ``.PDF``
-
-0.4.0
-=====
-
-* Introducing reminders.  See `#199`_ for more information, but the short
-  explanation is that you can now attach simple notes & times to documents
-  which are made available via the API.  Currently, the default API
-  (basically just the Django admin) doesn't really make use of this, but
-  `Thomas Brueggemann`_ over at `Paperless Desktop`_ has said that he would
-  like to make use of this feature in his project.
-
-0.3.6
-=====
-
-* Fix for `#200`_ (!!) where the API wasn't configured to allow updating the
-  correspondent or the tags for a document.
-* The ``content`` field is now optional, to allow for the edge case of a
-  purely graphical document.
-* You can no longer add documents via the admin.  This never worked in the
-  first place, so all I've done here is remove the link to the broken form.
-* The consumer code has been heavily refactored to support a pluggable
-  interface.  Install a paperless consumer via pip and tell paperless about
-  it with an environment variable, and you're good to go.  Proper
-  documentation is on its way.
-
-0.3.5
-=====
-
-* A serious facelift for the documents listing page wherein we drop the
-  tabular layout in favour of a tiled interface.
-* Users can now configure the number of items per page.
-* Fix for `#171`_: Allow users to specify their own ``SECRET_KEY`` value.
-* Moved the dotenv loading to the top of settings.py
-* Fix for `#112`_: Added checks for binaries required for document
-  consumption.
-
-0.3.4
-=====
-
-* Removal of django-suit due to a licensing conflict I bumped into in 0.3.3.
-  Note that you *can* use Django Suit with Paperless, but only in a
-  non-profit situation as their free license prohibits for-profit use.  As a
-  result, I can't bundle Suit with Paperless without conflicting with the
-  GPL.  Further development will be done against the stock Django admin.
-* I shrunk the thumbnails a little 'cause they were too big for me, even on
-  my high-DPI monitor.
-* BasicAuth support for document and thumbnail downloads, as well as the Push
-  API thanks to @thomasbrueggemann.  See `#179`_.
-
-0.3.3
-=====
-
-* Thumbnails in the UI and a Django-suit -based face-lift courtesy of @ekw!
-* Timezone, items per page, and default language are now all configurable,
-  also thanks to @ekw.
-
-0.3.2
-=====
-
-* Fix for `#172`_: defaulting ALLOWED_HOSTS to ``["*"]`` and allowing the
-  user to set her own value via ``PAPERLESS_ALLOWED_HOSTS`` should the need
-  arise.
-
-0.3.1
-=====
-
-* Added a default value for ``CONVERT_BINARY``
-
-0.3.0
-=====
-
-* Updated to using django-filter 1.x
-* Added some system checks so new users aren't confused by misconfigurations.
-* Consumer loop time is now configurable for systems with slow writes.  Just
-  set ``PAPERLESS_CONSUMER_LOOP_TIME`` to a number of seconds.  The default
-  is 10.
-* As per `#44`_, we've removed support for ``PAPERLESS_CONVERT``,
-  ``PAPERLESS_CONSUME``, and ``PAPERLESS_SECRET``.  Please use
-  ``PAPERLESS_CONVERT_BINARY``, ``PAPERLESS_CONSUMPTION_DIR``, and
-  ``PAPERLESS_SHARED_SECRET`` respectively instead.
-
-0.2.0
-=====
-
-* `#150`_: The media root is now a variable you can set in
-  ``paperless.conf``.
-* `#148`_: The database location (sqlite) is now a variable you can set in
-  ``paperless.conf``.
-* `#146`_: Fixed a bug that allowed unauthorised access to the ``/fetch``
-  URL.
-* `#131`_: Document files are now automatically removed from disk when
-  they're deleted in Paperless.
-* `#121`_: Fixed a bug where Paperless wasn't setting document creation time
-  based on the file naming scheme.
-* `#81`_: Added a hook to run an arbitrary script after every document is
-  consumed.
-* `#98`_: Added optional environment variables for ImageMagick so that it
-  doesn't explode when handling Very Large Documents or when it's just
-  running on a low-memory system.  Thanks to `Florian Harr`_ for his help on
-  this one.
-* `#89`_ Ported the auto-tagging code to correspondents as well.  Thanks to
-  `Justin Snyman`_ for the pointers in the issue queue.
-* Added support for guessing the date from the file name along with the
-  correspondent, title, and tags.  Thanks to `Tikitu de Jager`_ for his pull
-  request that I took forever to merge and to `Pit`_ for his efforts on the
-  regex front.
-* `#94`_: Restored support for changing the created date in the UI.  Thanks
-  to `Martin Honermeyer`_ and `Tim White`_ for working with me on this.
-
-0.1.1
-=====
-
-* Potentially **Breaking Change**: All references to "sender" in the code
-  have been renamed to "correspondent" to better reflect the nature of the
-  property (one could quite reasonably scan a document before sending it to
-  someone.)
-* `#67`_: Rewrote the document exporter and added a new importer that allows
-  for full metadata retention without depending on the file name and
-  modification time.  A big thanks to `Tikitu de Jager`_, `Pit`_,
-  `Florian Jung`_, and `Christopher Luu`_ for their code snippets and
-  contributing conversation that lead to this change.
-* `#20`_: Added *unpaper* support to help in cleaning up the scanned image
-  before it's OCR'd.  Thanks to `Pit`_ for this one.
-* `#71`_ Added (encrypted) thumbnails in anticipation of a proper UI.
-* `#68`_: Added support for using a proper config file at
-  ``/etc/paperless.conf`` and modified the systemd unit files to use it.
-* Refactored the Vagrant installation process to use environment variables
-  rather than asking the user to modify ``settings.py``.
-* `#44`_: Harmonise environment variable names with constant names.
-* `#60`_: Setup logging to actually use the Python native logging framework.
-* `#53`_: Fixed an annoying bug that caused ``.jpeg`` and ``.JPG`` images
-  to be imported but made unavailable.
-
-0.1.0
-=====
-
-* Docker support!  Big thanks to `Wayne Werner`_, `Brian Conn`_, and
-  `Tikitu de Jager`_ for this one, and especially to `Pit`_
-  who spearheadded this effort.
-* A simple REST API is in place, but it should be considered unstable.
-* Cleaned up the consumer to use temporary directories instead of a single
-  scratch space.  (Thanks `Pit`_)
-* Improved the efficiency of the consumer by parsing pages more intelligently
-  and introducing a threaded OCR process (thanks again `Pit`_).
-* `#45`_: Cleaned up the logic for tag matching.  Reported by `darkmatter`_.
-* `#47`_: Auto-rotate landscape documents.  Reported by `Paul`_ and fixed by
-  `Pit`_.
-* `#48`_: Matching algorithms should do so on a word boundary (`darkmatter`_)
-* `#54`_: Documented the re-tagger (`zedster`_)
-* `#57`_: Make sure file is preserved on import failure (`darkmatter`_)
-* Added tox with pep8 checking
-
-0.0.6
-=====
-
-* Added support for parallel OCR (significant work from `Pit`_)
-* Sped up the language detection (significant work from `Pit`_)
-* Added simple logging
-
-0.0.5
-=====
-
-* Added support for image files as documents (png, jpg, gif, tiff)
-* Added a crude means of HTTP POST for document imports
-* Added IMAP mail support
-* Added a re-tagging utility
-* Documentation for the above as well as data migration
-
-0.0.4
-=====
-
-* Added automated tagging basted on keyword matching
-* Cleaned up the document listing page
-* Removed ``User`` and ``Group`` from the admin
-* Added ``pytz`` to the list of requirements
-
-0.0.3
-=====
-
-* Added basic tagging
-
-0.0.2
-=====
-
-* Added language detection
-* Added datestamps to ``document_exporter``.
-* Changed ``settings.TESSERACT_LANGUAGE`` to ``settings.OCR_LANGUAGE``.
-
-0.0.1
-=====
-
-* Initial release
-
-.. _Alexander Menk: https://github.com/amenk
-.. _puuu: https://github.com/puuu
-.. _WhiteHatTux: https://github.com/WhiteHatTux
-.. _Chris Nagy: https://github.com/what-name
-.. _sbrl: https://github.com/sbrl
-.. _slorenz: https://github.com/sisao
-.. _Jo Vandeginste: https://github.com/jovandeginste
-.. _zjean: https://github.com/zjean
-.. _rYR79435: https://github.com/rYR79435
-.. _Michael Shamoon: https://github.com/shamoon
-.. _jayme-github: http://github.com/jayme-github
-.. _Brian Conn: https://github.com/TheConnMan
-.. _Christopher Luu: https://github.com/nuudles
-.. _Florian Jung: https://github.com/the01
-.. _Tikitu de Jager: https://github.com/tikitu
-.. _Paul: https://github.com/polo2ro
-.. _Pit: https://github.com/pitkley
-.. _Wayne Werner: https://github.com/waynew
-.. _darkmatter: https://github.com/darkmatter
-.. _zedster: https://github.com/zedster
-.. _Martin Honermeyer: https://github.com/djmaze
-.. _Tim White: https://github.com/timwhite
-.. _Florian Harr: https://github.com/evils
-.. _Justin Snyman: https://github.com/stringlytyped
-.. _Thomas Brueggemann: https://github.com/thomasbrueggemann
-.. _Jake Gysland: https://github.com/jgysland
-.. _Strubbl: https://github.com/strubbl
-.. _CkuT: https://github.com/CkuT
-.. _David Martin: https://github.com/ddddavidmartin
-.. _Paperless Desktop: https://github.com/thomasbrueggemann/paperless-desktop
-.. _Joshua Gilman: https://github.com/jmgilman
-.. _ayounggun: https://github.com/ayounggun
-.. _Kusti Skytén: https://github.com/kskyten
-.. _maphy-psd: https://github.com/maphy-psd
-.. _ishirav: https://github.com/ishirav
-.. _Stefan Hagen: https://github.com/xkpd3
-.. _dev-rke: https://github.com/dev-rke
-.. _Lukas Winkler: https://github.com/Findus23
-.. _chris-aeviator: https://github.com/chris-aeviator
-.. _Dan Panzarella: https://github.com/pzl
-.. _addadi: https://github.com/addadi
-.. _BastianPoe: https://github.com/BastianPoe
-.. _matthewmoto: https://github.com/matthewmoto
-.. _Isaac: https://github.com/isaacsando
-.. _Georgi Todorov: https://github.com/TeraHz
-.. _Jeffrey Portman: https://github.com/ChromoX
-.. _Simon Taddiken: https://github.com/skuzzle
-.. _Quentin Dawans: https://github.com/ovv
-.. _Martin Arendtsen: https://github.com/Arendtsen
-.. _erikarvstedt: https://github.com/erikarvstedt
-.. _Kyle Lucy: https://github.com/kmlucy
-.. _thinkjk: https://github.com/thinkjk
-.. _mcronce: https://github.com/mcronce
-.. _Enno Lohmeier: https://github.com/elohmeier
-.. _Mark McFate: https://github.com/SummittDweller
-.. _dadosch: https://github.com/dadosch
-.. _Wolfgang Mader: https://github.com/wmader
-.. _Tim Brooks: https://github.com/brookst
-.. _Stéphane Brunner: https://github.com/sbrunner
-.. _Kilian Koeltzsch: https://github.com/kiliankoe
-.. _Lukasz Soluch: https://github.com/LukaszSolo
-.. _Joshua Taillon: https://github.com/jat255
-.. _dubit0: https://github.com/dubit0
-.. _ahyear: https://github.com/ahyear
-.. _jonaswinkler: https://github.com/jonaswinkler
-.. _thepill: https://github.com/thepill
-.. _Andrew Peng: https://github.com/pengc99
-.. _euri10: https://github.com/euri10
-.. _Ulli: https://github.com/Ulli2k
-.. _tsia: https://github.com/tsia
-.. _Sblop: https://github.com/Sblop
-.. _Colin Frei: https://github.com/colinfrei
-.. _khrise: https://github.com/khrise
-.. _syntonym: https://github.com/syntonym
-.. _JOKer: https://github.com/MasterofJOKers
-.. _Brian Cribbs: https://github.com/cribbstechnolog
-.. _Brendan M. Sleight: https://github.com/bmsleight
-.. _Daniel Albers: https://github.com/AlD
-.. _@shamoon: https://github.com/shamoon
-.. _@amenk: https://github.com/amenk
-.. _@dblitt: https://github.com/dblitt
-.. _@evilsidekick293: https://github.com/evilsidekick293
-.. _@m0veax: https://github.com/m0veax
-.. _@fignew: https://github.com/fignew
-.. _@muued: https://github.com/muued
-.. _@isigmund: https://github.com/isigmund
-.. _@denilsonsa: https://github.com/denilsonsa
-.. _@sAksham-Ar: https://github.com/sAksham-Ar
-.. _@philpagel: https://github.com/philpagel
-.. _@davemachado: https://github.com/davemachado
-.. _@2600box: https://github.com/2600box
-.. _@qcasey: https://github.com/qcasey
-.. _@kpj: https://github.com/kpj
-.. _@mweimerskirch: https://github.com/mweimerskirch
-.. _@filcuk: https://github.com/filcuk
-.. _@FrankStrieter: https://github.com/FrankStrieter
-.. _@tribut: https://github.com/tribut
-.. _@yschroeder: https://github.com/yschroeder
-.. _@gador: https://github.com/gador
-.. _@Nicarim: https://github.com/Nicarim
-.. _@bauerj: https://github.com/bauerj
-.. _@a17t: https://github.com/a17t
-.. _@alexander-bauer: https://github.com/alexander-bauer
-.. _@apeltzer: https://github.com/apeltzer
-.. _@Timoms: https://github.com/Timoms
-.. _@sbrunner: https://github.com/sbrunner
-.. _@slankes: https://github.com/slankes
-.. _@mattlamb99: https://github.com/mattlamb99
-.. _@padraigkitterick: https://github.com/padraigkitterick
-.. _@ajkavanagh: https://github.com/ajkavanagh
-.. _@Tooa: https://github.com/Tooa
-.. _@Unkn0wnCat: https://github.com/Unkn0wnCat
-.. _@pewter77: https://github.com/pewter77
-.. _@cschmatzler: https://github.com/cschmatzler
-.. _@muellermartin: https://github.com/muellermartin
-.. _@stumpylog: https://github.com/stumpylog
-.. _@Toxix: https://github.com/Toxix
-.. _@benjaminfrank: https://github.com/benjaminfrank
-.. _@azapater: https://github.com/azapater
-.. _@tim-vogel: https://github.com/tim-vogel
-.. _@jschpp: https://github.com/jschpp
-.. _@schnuffle: https://github.com/schnuffle
-.. _@GruberViktor: https://github.com/gruberviktor
-.. _@hacker-h: https://github.com/hacker-h
-.. _@danielBreitlauch: https://github.com/danielbreitlauch
-.. _@miku323: https://github.com/miku323
-.. _@FaintGhost: https://github.com/FaintGhost
-.. _@DarkoBG79: https://github.com/DarkoBG79
-.. _Kemal Secer: https://crowdin.com/profile/kemal.secer
-.. _@Prominence: https://github.com/Prominence
-.. _@jonasc: https://github.com/jonasc
-
-.. _#20: https://github.com/the-paperless-project/paperless/issues/20
-.. _#44: https://github.com/the-paperless-project/paperless/issues/44
-.. _#45: https://github.com/the-paperless-project/paperless/issues/45
-.. _#47: https://github.com/the-paperless-project/paperless/issues/47
-.. _#48: https://github.com/the-paperless-project/paperless/issues/48
-.. _#53: https://github.com/the-paperless-project/paperless/issues/53
-.. _#54: https://github.com/the-paperless-project/paperless/issues/54
-.. _#57: https://github.com/the-paperless-project/paperless/issues/57
-.. _#60: https://github.com/the-paperless-project/paperless/issues/60
-.. _#67: https://github.com/the-paperless-project/paperless/issues/67
-.. _#68: https://github.com/the-paperless-project/paperless/issues/68
-.. _#71: https://github.com/the-paperless-project/paperless/issues/71
-.. _#81: https://github.com/the-paperless-project/paperless/issues/81
-.. _#89: https://github.com/the-paperless-project/paperless/issues/89
-.. _#94: https://github.com/the-paperless-project/paperless/issues/94
-.. _#98: https://github.com/the-paperless-project/paperless/issues/98
-.. _#112: https://github.com/the-paperless-project/paperless/issues/112
-.. _#121: https://github.com/the-paperless-project/paperless/issues/121
-.. _#131: https://github.com/the-paperless-project/paperless/issues/131
-.. _#146: https://github.com/the-paperless-project/paperless/issues/146
-.. _#148: https://github.com/the-paperless-project/paperless/pull/148
-.. _#150: https://github.com/the-paperless-project/paperless/pull/150
-.. _#158: https://github.com/the-paperless-project/paperless/issues/158
-.. _#171: https://github.com/the-paperless-project/paperless/issues/171
-.. _#172: https://github.com/the-paperless-project/paperless/issues/172
-.. _#179: https://github.com/the-paperless-project/paperless/pull/179
-.. _#199: https://github.com/the-paperless-project/paperless/issues/199
-.. _#200: https://github.com/the-paperless-project/paperless/issues/200
-.. _#206: https://github.com/the-paperless-project/paperless/issues/206
-.. _#212: https://github.com/the-paperless-project/paperless/pull/212
-.. _#220: https://github.com/the-paperless-project/paperless/pull/220
-.. _#224: https://github.com/the-paperless-project/paperless/pull/224
-.. _#226: https://github.com/the-paperless-project/paperless/pull/226
-.. _#227: https://github.com/the-paperless-project/paperless/pull/227
-.. _#228: https://github.com/the-paperless-project/paperless/pull/228
-.. _#229: https://github.com/the-paperless-project/paperless/pull/229
-.. _#230: https://github.com/the-paperless-project/paperless/pull/230
-.. _#232: https://github.com/the-paperless-project/paperless/issues/232
-.. _#235: https://github.com/the-paperless-project/paperless/issues/235
-.. _#236: https://github.com/the-paperless-project/paperless/issues/236
-.. _#255: https://github.com/the-paperless-project/paperless/pull/255
-.. _#268: https://github.com/the-paperless-project/paperless/pull/268
-.. _#277: https://github.com/the-paperless-project/paperless/pull/277
-.. _#272: https://github.com/the-paperless-project/paperless/issues/272
-.. _#248: https://github.com/the-paperless-project/paperless/issues/248
-.. _#278: https://github.com/the-paperless-project/paperless/issues/248
-.. _#283: https://github.com/the-paperless-project/paperless/issues/283
-.. _#256: https://github.com/the-paperless-project/paperless/pull/256
-.. _#285: https://github.com/the-paperless-project/paperless/pull/285
-.. _#291: https://github.com/the-paperless-project/paperless/pull/291
-.. _#295: https://github.com/the-paperless-project/paperless/pull/295
-.. _#299: https://github.com/the-paperless-project/paperless/issues/299
-.. _#300: https://github.com/the-paperless-project/paperless/pull/300
-.. _#301: https://github.com/the-paperless-project/paperless/issues/301
-.. _#303: https://github.com/the-paperless-project/paperless/issues/303
-.. _#305: https://github.com/the-paperless-project/paperless/issues/305
-.. _#306: https://github.com/the-paperless-project/paperless/issues/306
-.. _#308: https://github.com/the-paperless-project/paperless/issues/308
-.. _#311: https://github.com/the-paperless-project/paperless/pull/311
-.. _#312: https://github.com/the-paperless-project/paperless/pull/312
-.. _#313: https://github.com/the-paperless-project/paperless/pull/313
-.. _#322: https://github.com/the-paperless-project/paperless/pull/322
-.. _#328: https://github.com/the-paperless-project/paperless/pull/328
-.. _#253: https://github.com/the-paperless-project/paperless/issues/253
-.. _#262: https://github.com/the-paperless-project/paperless/issues/262
-.. _#323: https://github.com/the-paperless-project/paperless/issues/323
-.. _#344: https://github.com/the-paperless-project/paperless/pull/344
-.. _#351: https://github.com/the-paperless-project/paperless/pull/351
-.. _#352: https://github.com/the-paperless-project/paperless/pull/352
-.. _#354: https://github.com/the-paperless-project/paperless/issues/354
-.. _#371: https://github.com/the-paperless-project/paperless/issues/371
-.. _#374: https://github.com/the-paperless-project/paperless/pull/374
-.. _#375: https://github.com/the-paperless-project/paperless/pull/375
-.. _#376: https://github.com/the-paperless-project/paperless/pull/376
-.. _#383: https://github.com/the-paperless-project/paperless/pull/383
-.. _#384: https://github.com/the-paperless-project/paperless/issues/384
-.. _#386: https://github.com/the-paperless-project/paperless/issues/386
-.. _#387: https://github.com/the-paperless-project/paperless/pull/387
-.. _#391: https://github.com/the-paperless-project/paperless/pull/391
-.. _#390: https://github.com/the-paperless-project/paperless/pull/390
-.. _#392: https://github.com/the-paperless-project/paperless/issues/392
-.. _#393: https://github.com/the-paperless-project/paperless/issues/393
-.. _#395: https://github.com/the-paperless-project/paperless/pull/395
-.. _#394: https://github.com/the-paperless-project/paperless/issues/394
-.. _#396: https://github.com/the-paperless-project/paperless/pull/396
-.. _#399: https://github.com/the-paperless-project/paperless/pull/399
-.. _#400: https://github.com/the-paperless-project/paperless/pull/400
-.. _#401: https://github.com/the-paperless-project/paperless/pull/401
-.. _#405: https://github.com/the-paperless-project/paperless/pull/405
-.. _#406: https://github.com/the-paperless-project/paperless/issues/406
-.. _#412: https://github.com/the-paperless-project/paperless/issues/412
-.. _#413: https://github.com/the-paperless-project/paperless/pull/413
-.. _#414: https://github.com/the-paperless-project/paperless/issues/414
-.. _#423: https://github.com/the-paperless-project/paperless/issues/423
-.. _#433: https://github.com/the-paperless-project/paperless/issues/433
-.. _#440: https://github.com/the-paperless-project/paperless/pull/440
-.. _#441: https://github.com/the-paperless-project/paperless/pull/441
-.. _#442: https://github.com/the-paperless-project/paperless/pull/442
-.. _#466: https://github.com/the-paperless-project/paperless/pull/466
-.. _#471: https://github.com/the-paperless-project/paperless/pull/471
-.. _#475: https://github.com/the-paperless-project/paperless/pull/475
-.. _#481: https://github.com/the-paperless-project/paperless/pull/481
-.. _#483: https://github.com/the-paperless-project/paperless/pull/483
-.. _#484: https://github.com/the-paperless-project/paperless/pull/484
-.. _#488: https://github.com/the-paperless-project/paperless/pull/488
-.. _#489: https://github.com/the-paperless-project/paperless/pull/489
-.. _#492: https://github.com/the-paperless-project/paperless/pull/492
-.. _#674: https://github.com/paperless-ngx/paperless-ngx/pull/674
-
-.. _a new home on Docker Hub: https://hub.docker.com/r/danielquinn/paperless/
-.. _optipng: http://optipng.sourceforge.net/
-.. _DjangoQL: https://github.com/ivelum/djangoql
-.. _ansible repo: https://github.com/paperless-ngx/paperless-ngx-ansible
diff --git a/docs/conf.py b/docs/conf.py
index 0f30772ea..096ccc1af 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,13 +14,17 @@ extensions = [
     "sphinx.ext.imgmath",
     "sphinx.ext.viewcode",
     "sphinx_rtd_theme",
+    "myst_parser",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = {
+    ".rst": "restructuredtext",
+    ".md": "markdown",
+}
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 3d57236e1..b7ab978f4 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -111,6 +111,14 @@ PAPERLESS_FILENAME_FORMAT=<format>
 
     Default is none, which disables this feature.
 
+PAPERLESS_FILENAME_FORMAT_REMOVE_NONE=<bool>
+    Tells paperless to replace placeholders in `PAPERLESS_FILENAME_FORMAT` that would resolve
+    to 'none' to be omitted from the resulting filename. This also holds true for directory
+    names.
+    See :ref:`advanced-file_name_handling` for details.
+
+    Defaults to `false` which disables this feature.
+
 PAPERLESS_LOGGING_DIR=<path>
     This is where paperless will store log files.
 
@@ -416,14 +424,23 @@ PAPERLESS_OCR_IMAGE_DPI=<num>
     the produced PDF documents are A4 sized.
 
 PAPERLESS_OCR_MAX_IMAGE_PIXELS=<num>
-    Paperless will not OCR images that have more pixels than this limit.
-    This is intended to prevent decompression bombs from overloading paperless.
-    Increasing this limit is desired if you face a DecompressionBombError despite
-    the concerning file not being malicious; this could e.g. be caused by invalidly
-    recognized metadata.
-    If you have enough resources or if you are certain that your uploaded files
-    are not malicious you can increase this value to your needs.
-    The default value is 256000000, an image with more pixels than that would not be parsed.
+    Paperless will raise a warning when OCRing images which are over this limit and
+    will not OCR images which are more than twice this limit.  Note this does not
+    prevent the document from being consumed, but could result in missing text content.
+
+    If unset, will default to the value determined by
+    `Pillow <https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.MAX_IMAGE_PIXELS>`_.
+
+    .. note::
+
+        Increasing this limit could cause Paperless to consume additional resources
+        when consuming a file.  Be sure you have sufficient system resources.
+
+    .. caution::
+
+        The limit is intended to prevent malicious files from consuming system resources
+        and causing crashes and other errors.  Only increase this value if you are certain
+        your documents are not malicious and you need the text which was not OCRed
 
 PAPERLESS_OCR_USER_ARGS=<json>
     OCRmyPDF offers many more options. Use this parameter to specify any
diff --git a/docs/index.rst b/docs/index.rst
index 040d39e4f..715fef588 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -52,7 +52,7 @@ resources in the documentation:
 *   Paperless is now integrated with a
     :ref:`task processing queue <setup-task_processor>` that tells you
     at a glance when and why something is not working.
-*   The :ref:`changelog <paperless_changelog>` contains a detailed list of all changes
+*   The :doc:`changelog </changelog>` contains a detailed list of all changes
     in paperless-ngx.
 
 Contents
diff --git a/docs/requirements.txt b/docs/requirements.txt
index e69de29bb..ac4588f3f 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+myst-parser==0.17.2
diff --git a/docs/scanners.rst b/docs/scanners.rst
index cd3777ba2..27ba38e31 100644
--- a/docs/scanners.rst
+++ b/docs/scanners.rst
@@ -13,43 +13,45 @@ that works right for you based on recommendations from other Paperless users.
 Physical scanners
 =================
 
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brand   | Model          | Supports                                 | Recommended By |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-|         |                | FTP | SFTP | NFS | SMB | SMTP | API [1]_ |                |
-+=========+================+=====+======+=====+=====+======+==========+================+
-| Brother | `ADS-1700W`_   | yes |      |     | yes | yes  |          |`holzhannes`_   |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `ADS-1600W`_   | yes |      |     | yes | yes  |          |`holzhannes`_   |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `ADS-1500W`_   | yes |      |     | yes | yes  |          |`danielquinn`_  |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `ADS-1100W`_   | yes |      |     |     |      |          |`ytzelf`_       |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `ADS-2800W`_   | yes | yes  |     | yes | yes  |          |`philpagel`_    |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `MFC-J6930DW`_ | yes |      |     |     |      |          |`ayounggun`_    |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `MFC-L5850DW`_ | yes |      |     |     | yes  |          |`holzhannes`_   |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `MFC-L2750DW`_ | yes |      |     | yes | yes  |          |`muued`_        |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `MFC-J5910DW`_ | yes |      |     |     |      |          |`bmsleight`_    |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `MFC-8950DW`_  | yes |      |     | yes | yes  |          |`philpagel`_    |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Brother | `MFC-9142CDN`_ | yes |      |     | yes |      |          |`REOLDEV`_      |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Fujitsu | `ix500`_       | yes |      |     | yes |      |          |`eonist`_       |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Epson   | `ES-580W`_     | yes |      |     | yes | yes  |          |`fignew`_       |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Epson   | `WF-7710DWF`_  | yes |      |     | yes |      |          |`Skylinar`_     |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Fujitsu | `S1300i`_      | yes |      |     | yes |      |          |`jonaswinkler`_ |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
-| Doxie   | `Q2`_          |     |      |     |     |      | yes      |`Unkn0wnCat`_   |
-+---------+----------------+-----+------+-----+-----+------+----------+----------------+
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brand   | Model             | Supports                                      | Recommended By |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+|         |                   | FTP | SFTP | NFS | SMB      | SMTP | API [1]_ |                |
++=========+===================+=====+======+=====+==========+======+==========+================+
+| Brother | `ADS-1700W`_      | yes |      |     | yes      | yes  |          |`holzhannes`_   |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `ADS-1600W`_      | yes |      |     | yes      | yes  |          |`holzhannes`_   |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `ADS-1500W`_      | yes |      |     | yes      | yes  |          |`danielquinn`_  |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `ADS-1100W`_      | yes |      |     |          |      |          |`ytzelf`_       |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `ADS-2800W`_      | yes | yes  |     | yes      | yes  |          |`philpagel`_    |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `MFC-J6930DW`_    | yes |      |     |          |      |          |`ayounggun`_    |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `MFC-L5850DW`_    | yes |      |     |          | yes  |          |`holzhannes`_   |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `MFC-L2750DW`_    | yes |      |     | yes      | yes  |          |`muued`_        |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `MFC-J5910DW`_    | yes |      |     |          |      |          |`bmsleight`_    |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `MFC-8950DW`_     | yes |      |     | yes      | yes  |          |`philpagel`_    |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Brother | `MFC-9142CDN`_    | yes |      |     | yes      |      |          |`REOLDEV`_      |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Canon   | `Maxify MB 5350`_ |     |      |     | yes [2]_ | yes  |          |`eingemaischt`_ |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Fujitsu | `ix500`_          | yes |      |     | yes      |      |          |`eonist`_       |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Epson   | `ES-580W`_        | yes |      |     | yes      | yes  |          |`fignew`_       |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Epson   | `WF-7710DWF`_     | yes |      |     | yes      |      |          |`Skylinar`_     |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Fujitsu | `S1300i`_         | yes |      |     | yes      |      |          |`jonaswinkler`_ |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
+| Doxie   | `Q2`_             |     |      |     |          |      | yes      |`Unkn0wnCat`_   |
++---------+-------------------+-----+------+-----+----------+------+----------+----------------+
 
 .. _MFC-L5850DW: https://www.brother-usa.com/products/mfcl5850dw
 .. _MFC-L2750DW: https://www.brother.de/drucker/laserdrucker/mfc-l2750dw
@@ -58,6 +60,7 @@ Physical scanners
 .. _ADS-1500W: https://www.brother.ca/en/p/ads1500w
 .. _ADS-1100W: https://support.brother.com/g/b/downloadtop.aspx?c=fr&lang=fr&prod=ads1100w_eu_as_cn
 .. _ADS-2800W: https://www.brother-usa.com/products/ads2800w
+.. _Maxify MB 5350: https://www.canon.de/printers/inkjet/maxify/maxify_mb5350/specification.html
 .. _MFC-J6930DW: https://www.brother.ca/en/p/MFCJ6930DW
 .. _MFC-J5910DW: https://www.brother.co.uk/printers/inkjet-printers/mfcj5910dw
 .. _MFC-8950DW: https://www.brother-usa.com/products/mfc8950dw
@@ -81,8 +84,11 @@ Physical scanners
 .. _Unkn0wnCat: https://github.com/Unkn0wnCat
 .. _muued: https://github.com/muued
 .. _philpagel: https://github.com/philpagel
+.. _eingemaischt: https://github.com/eingemaischt
 
 .. [1] Scanners with API Integration allow to push scanned documents directly to :ref:`Paperless API <api-file_uploads>`, sometimes referred to as Webhook or Document POST.
+.. [2] Canon Multi Function Printers show strange behavior over SMB. They close and reopen the file after every page. It's recommended to tune the
+       :ref:`polling <configuration-polling>` and :ref:`inotify <configuration-inotify>` configuration values for your scanner. The scanner timeout is 3 minutes, so ``180`` is a good starting point.
 
 Mobile phone software
 =====================
@@ -105,6 +111,9 @@ You can use your phone to "scan" documents. The regular camera app will work, bu
 
 On Android, you can use these applications in combination with one of the :ref:`Paperless-ngx compatible apps <usage-mobile_upload>` to "Share" the documents produced by these scanner apps with paperless. On iOS, you can share the scanned documents via iOS-Sharing to other mail, WebDav or FTP apps.
 
+There is also an iOS Shortcut that allows you to directly upload text, PDF and image documents available here: https://www.icloud.com/shortcuts/d234abc0885040129d9d75fa45fe1154
+Please note this only works for documents downloaded to iCloud / the device, in other words not directly from a URL.
+
 .. _Office Lens: https://play.google.com/store/apps/details?id=com.microsoft.office.officelens
 .. _Genius Scan: https://play.google.com/store/apps/details?id=com.thegrizzlylabs.geniusscan.free
 .. _OCR Scanner - QuickScan: https://apps.apple.com/us/app/quickscan-scanner-text-ocr/id1513790291
diff --git a/docs/setup.rst b/docs/setup.rst
index d3290b432..90b952e4c 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -332,6 +332,12 @@ writing. Windows is not and will never be supported.
 3.  Optional. Install ``postgresql`` and configure a database, user and password for paperless. If you do not wish
     to use PostgreSQL, SQLite is available as well.
 
+    .. note::
+
+        On bare-metal installations using SQLite, ensure the
+        `JSON1 extension <https://code.djangoproject.com/wiki/JSON1Extension>`_ is enabled. This is
+        usually the case, but not always.
+
 4.  Get the release archive from `<https://github.com/paperless-ngx/paperless-ngx/releases>`_.
     If you clone the git repo as it is, you also have to compile the front end by yourself.
     Extract the archive to a place from where you wish to execute it, such as ``/opt/paperless``.
@@ -513,7 +519,7 @@ how you installed paperless.
 This setup describes how to update an existing paperless Docker installation.
 The important things to keep in mind are as follows:
 
-* Read the :ref:`changelog <paperless_changelog>` and take note of breaking changes.
+* Read the :doc:`changelog </changelog>` and take note of breaking changes.
 * You should decide if you want to stick with SQLite or want to migrate your database
   to PostgreSQL. See :ref:`setup-sqlite_to_psql` for details on how to move your data from
   SQLite to PostgreSQL. Both work fine with paperless. However, if you already have a
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 08cc916b0..3db9a069e 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -237,11 +237,12 @@ open the affected documents in paperless for editing. Paperless will continue to
 show the invalid metadata.
 
 Consumer fails with a FileNotFoundError
-############################
+#######################################
 
 You might find messages like these in your log files:
 
 .. code::
+
     [ERROR] [paperless.consumer] Error while consuming document SCN_0001.pdf: FileNotFoundError: [Errno 2] No such file or directory: '/tmp/ocrmypdf.io.yhk3zbv0/origin.pdf'
     Traceback (most recent call last):
       File "/app/paperless/src/paperless_tesseract/parsers.py", line 261, in parse
@@ -266,11 +267,12 @@ check for documents, try adjusting the :ref:`inotify configuration <configuratio
 try adjusting the :ref:`polling configuration <configuration-polling>`.
 
 Consumer fails waiting for file to remain unmodified.
-############################
+#####################################################
 
 You might find messages like these in your log files:
 
 .. code::
+
     [ERROR] [paperless.management.consumer] Timeout while waiting on file /usr/src/paperless/src/../consume/SCN_0001.pdf to remain unmodified.
 
 This indicates paperless timed out while waiting for the file to be completely written to the consume folder.
@@ -282,11 +284,12 @@ Adjusting :ref:`polling configuration <configuration-polling>` values should res
     back in, for the initial failing file to be consumed.
 
 Consumer fails reporting "OS reports file as busy still".
-############################
+#########################################################
 
 You might find messages like these in your log files:
 
 .. code::
+
     [WARNING] [paperless.management.consumer] Not consuming file /usr/src/paperless/src/../consume/SCN_0001.pdf: OS reports file as busy still
 
 This indicates paperless was unable to open the file, as the OS reported the file as still being in use.  To prevent a
diff --git a/paperless.conf.example b/paperless.conf.example
index be5071636..97e907e1f 100644
--- a/paperless.conf.example
+++ b/paperless.conf.example
@@ -23,6 +23,7 @@
 #PAPERLESS_MEDIA_ROOT=../media
 #PAPERLESS_STATICDIR=../static
 #PAPERLESS_FILENAME_FORMAT=
+#PAPERLESS_FILENAME_FORMAT_REMOVE_NONE=
 
 # Security and hosting
 
diff --git a/requirements.txt b/requirements.txt
index 07ab384c1..a9b584b60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,11 +17,11 @@ autobahn==22.4.2; python_version >= '3.7'
 automat==20.2.0
 backports.zoneinfo==0.2.1; python_version < '3.9'
 blessed==1.19.1; python_version >= '2.7'
-certifi==2021.10.8
+certifi==2022.5.18.1; python_version >= '3.6'
 cffi==1.15.0
 channels-redis==3.4.0
 channels==3.0.4
-charset-normalizer==2.0.12; python_version >= '3.5'
+charset-normalizer==2.0.12; python_full_version >= '3.5.0'
 click==8.1.3; python_version >= '3.7'
 coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 concurrent-log-handler==0.9.20
@@ -55,14 +55,14 @@ joblib==1.1.0; python_version >= '3.6'
 langdetect==1.0.9
 lxml==4.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 msgpack==1.0.3
-numpy==1.22.3; python_version >= '3.8'
+numpy==1.22.4; python_version >= '3.8'
 ocrmypdf==13.4.4
 packaging==21.3; python_version >= '3.6'
 pathvalidate==2.5.0
 pdf2image==1.16.0
 pdfminer.six==20220506
 pikepdf==5.1.3
-pillow==9.1.0
+pillow==9.1.1
 pluggy==1.0.0; python_version >= '3.6'
 portalocker==2.4.0; python_version >= '3'
 psycopg2==2.9.3
@@ -73,9 +73,9 @@ pyopenssl==22.0.0
 pyparsing==3.0.9; python_full_version >= '3.6.8'
 python-dateutil==2.8.2
 python-dotenv==0.20.0
-python-gnupg==0.4.8
+python-gnupg==0.4.9
 python-levenshtein==0.12.2
-python-magic==0.4.25
+python-magic==0.4.26
 pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 pytz==2022.1
 pyyaml==6.0
@@ -85,12 +85,12 @@ regex==2022.3.2; python_version >= '3.6'
 reportlab==3.6.9; python_version >= '3.7' and python_version < '4'
 requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
 scikit-learn==1.0.2
-scipy==1.8.0; python_version < '3.11' and python_version >= '3.8'
+scipy==1.8.1; python_version < '3.11' and python_version >= '3.8'
 service-identity==21.1.0
-setuptools==62.2.0; python_version >= '3.7'
+setuptools==62.3.2; python_version >= '3.7'
 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-sniffio==1.2.0; python_version >= '3.5'
-sqlparse==0.4.2; python_version >= '3.5'
+sniffio==1.2.0; python_full_version >= '3.5.0'
+sqlparse==0.4.2; python_full_version >= '3.5.0'
 threadpoolctl==3.1.0; python_version >= '3.6'
 tika==1.24
 tqdm==4.64.0
@@ -106,7 +106,7 @@ watchdog==2.1.8
 watchgod==0.8.2
 wcwidth==0.2.5
 websockets==10.3
-whitenoise==6.0.0
+whitenoise==6.1.0
 whoosh==2.7.4
 zipp==3.8.0; python_version < '3.9'
 zope.interface==5.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
diff --git a/src-ui/cypress.json b/src-ui/cypress.json
index bd321dcbf..3a58fab3f 100644
--- a/src-ui/cypress.json
+++ b/src-ui/cypress.json
@@ -6,4 +6,4 @@
   "pluginsFile": "cypress/plugins/index.ts",
   "fixturesFolder": "cypress/fixtures",
   "baseUrl": "http://localhost:4200"
-}
\ No newline at end of file
+}
diff --git a/src-ui/cypress/fixtures/ui_settings/settings.json b/src-ui/cypress/fixtures/ui_settings/settings.json
new file mode 100644
index 000000000..0e844b5e1
--- /dev/null
+++ b/src-ui/cypress/fixtures/ui_settings/settings.json
@@ -0,0 +1,34 @@
+{
+    "user_id": 1,
+    "username": "admin",
+    "display_name": "Admin",
+    "settings": {
+        "language": "",
+        "bulk_edit": {
+            "confirmation_dialogs": true,
+            "apply_on_close": false
+        },
+        "documentListSize": 50,
+        "dark_mode": {
+            "use_system": true,
+            "enabled": "false",
+            "thumb_inverted": "true"
+        },
+        "theme": {
+            "color": "#b198e5"
+        },
+        "document_details": {
+            "native_pdf_viewer": false
+        },
+        "date_display": {
+            "date_locale": "",
+            "date_format": "mediumDate"
+        },
+        "notifications": {
+            "consumer_new_documents": true,
+            "consumer_success": true,
+            "consumer_failed": true,
+            "consumer_suppress_on_dashboard": true
+        }
+    }
+}
diff --git a/src-ui/cypress/integration/document-detail.spec.ts b/src-ui/cypress/integration/document-detail.spec.ts
index 9ff566760..8faf2412c 100644
--- a/src-ui/cypress/integration/document-detail.spec.ts
+++ b/src-ui/cypress/integration/document-detail.spec.ts
@@ -2,6 +2,9 @@ describe('document-detail', () => {
   beforeEach(() => {
     this.modifiedDocuments = []
 
+    cy.intercept('http://localhost:8000/api/ui_settings/', {
+      fixture: 'ui_settings/settings.json',
+    })
     cy.fixture('documents/documents.json').then((documentsJson) => {
       cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => {
         let response = { ...documentsJson }
diff --git a/src-ui/cypress/integration/documents-list.spec.ts b/src-ui/cypress/integration/documents-list.spec.ts
index 5b923ed2f..169bd333b 100644
--- a/src-ui/cypress/integration/documents-list.spec.ts
+++ b/src-ui/cypress/integration/documents-list.spec.ts
@@ -3,6 +3,9 @@ describe('documents-list', () => {
     this.bulkEdits = {}
 
     // mock API methods
+    cy.intercept('http://localhost:8000/api/ui_settings/', {
+      fixture: 'ui_settings/settings.json',
+    })
     cy.fixture('documents/documents.json').then((documentsJson) => {
       // bulk edit
       cy.intercept(
diff --git a/src-ui/cypress/integration/manage.spec.ts b/src-ui/cypress/integration/manage.spec.ts
index e28556a24..ef7e12723 100644
--- a/src-ui/cypress/integration/manage.spec.ts
+++ b/src-ui/cypress/integration/manage.spec.ts
@@ -1,5 +1,8 @@
 describe('manage', () => {
   beforeEach(() => {
+    cy.intercept('http://localhost:8000/api/ui_settings/', {
+      fixture: 'ui_settings/settings.json',
+    })
     cy.intercept('http://localhost:8000/api/correspondents/*', {
       fixture: 'correspondents/correspondents.json',
     })
diff --git a/src-ui/cypress/integration/settings.spec.ts b/src-ui/cypress/integration/settings.spec.ts
index 72f9835f2..16e706b63 100644
--- a/src-ui/cypress/integration/settings.spec.ts
+++ b/src-ui/cypress/integration/settings.spec.ts
@@ -3,45 +3,53 @@ describe('settings', () => {
     this.modifiedViews = []
 
     // mock API methods
-    cy.fixture('saved_views/savedviews.json').then((savedViewsJson) => {
-      // saved views PATCH
-      cy.intercept(
-        'PATCH',
-        'http://localhost:8000/api/saved_views/*',
-        (req) => {
-          this.modifiedViews.push(req.body) // store this for later
-          req.reply({ result: 'OK' })
-        }
-      )
+    cy.intercept('http://localhost:8000/api/ui_settings/', {
+      fixture: 'ui_settings/settings.json',
+    }).then(() => {
+      cy.fixture('saved_views/savedviews.json').then((savedViewsJson) => {
+        // saved views PATCH
+        cy.intercept(
+          'PATCH',
+          'http://localhost:8000/api/saved_views/*',
+          (req) => {
+            this.modifiedViews.push(req.body) // store this for later
+            req.reply({ result: 'OK' })
+          }
+        )
 
-      cy.intercept('GET', 'http://localhost:8000/api/saved_views/*', (req) => {
-        let response = { ...savedViewsJson }
-        if (this.modifiedViews.length) {
-          response.results = response.results.map((v) => {
-            if (this.modifiedViews.find((mv) => mv.id == v.id))
-              v = this.modifiedViews.find((mv) => mv.id == v.id)
-            return v
-          })
-        }
+        cy.intercept(
+          'GET',
+          'http://localhost:8000/api/saved_views/*',
+          (req) => {
+            let response = { ...savedViewsJson }
+            if (this.modifiedViews.length) {
+              response.results = response.results.map((v) => {
+                if (this.modifiedViews.find((mv) => mv.id == v.id))
+                  v = this.modifiedViews.find((mv) => mv.id == v.id)
+                return v
+              })
+            }
 
-        req.reply(response)
-      }).as('savedViews')
-    })
-
-    cy.fixture('documents/documents.json').then((documentsJson) => {
-      cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => {
-        let response = { ...documentsJson }
-        response = response.results.find((d) => d.id == 1)
-        req.reply(response)
+            req.reply(response)
+          }
+        ).as('savedViews')
       })
-    })
 
-    cy.intercept('http://localhost:8000/api/documents/1/metadata/', {
-      fixture: 'documents/1/metadata.json',
-    })
+      cy.fixture('documents/documents.json').then((documentsJson) => {
+        cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => {
+          let response = { ...documentsJson }
+          response = response.results.find((d) => d.id == 1)
+          req.reply(response)
+        })
+      })
 
-    cy.intercept('http://localhost:8000/api/documents/1/suggestions/', {
-      fixture: 'documents/1/suggestions.json',
+      cy.intercept('http://localhost:8000/api/documents/1/metadata/', {
+        fixture: 'documents/1/metadata.json',
+      })
+
+      cy.intercept('http://localhost:8000/api/documents/1/suggestions/', {
+        fixture: 'documents/1/suggestions.json',
+      })
     })
 
     cy.viewport(1024, 1024)
diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 0c9ca23e0..f4c0d6598 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -256,21 +256,21 @@
         <source>Document added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9204248378636247318" datatype="html">
         <source>Document <x id="PH" equiv-text="status.filename"/> was added to paperless.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">74</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1931214133925051574" datatype="html">
         <source>Open document</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">75</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html</context>
@@ -281,28 +281,28 @@
         <source>Could not add <x id="PH" equiv-text="status.filename"/>: <x id="PH_1" equiv-text="status.message"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">89</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1710712016675379662" datatype="html">
         <source>New document detected</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">104</context>
         </context-group>
       </trans-unit>
       <trans-unit id="587031278561344416" datatype="html">
         <source>Document <x id="PH" equiv-text="status.filename"/> is being processed by paperless.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5749300816154614125" datatype="html">
         <source>Initiating upload...</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.ts</context>
-          <context context-type="linenumber">140</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2173456130768795374" datatype="html">
@@ -321,7 +321,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="2448391510242468907" datatype="html">
-        <source>Logged in as <x id="INTERPOLATION" equiv-text="{{displayName}}"/></source>
+        <source>Logged in as <x id="INTERPOLATION" equiv-text="{{this.settingsService.displayName}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
           <context context-type="linenumber">34</context>
@@ -335,7 +335,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">148</context>
+          <context context-type="linenumber">155</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
@@ -382,6 +382,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">54</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="472206565520537964" datatype="html">
         <source>Saved views</source>
@@ -438,7 +442,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3079652255369035" datatype="html">
@@ -448,11 +452,18 @@
           <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8835528846812581148" datatype="html">
+        <source>Storage paths</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
+          <context context-type="linenumber">141</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="4804785061014590286" datatype="html">
         <source>Logs</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">141</context>
+          <context context-type="linenumber">148</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context>
@@ -463,70 +474,70 @@
         <source>Admin</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">155</context>
+          <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit>
       <trans-unit id="314315645942131479" datatype="html">
         <source>Info</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">168</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4895326106573044490" datatype="html">
         <source>Documentation</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">168</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1534029177398918729" datatype="html">
         <source>GitHub</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">176</context>
+          <context context-type="linenumber">183</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5612903193691847840" datatype="html">
         <source>Suggest an idea</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">182</context>
+          <context context-type="linenumber">189</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4112664765954374539" datatype="html">
         <source>is available.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">191</context>
+          <context context-type="linenumber">198</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1175891574282637937" datatype="html">
         <source>Click to view.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">191</context>
+          <context context-type="linenumber">198</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5052123870893768885" datatype="html">
         <source>Checking for updates is disabled.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3601519436351639860" datatype="html">
         <source>Click for more information.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit>
       <trans-unit id="509090351011426949" datatype="html">
         <source>Update available</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">209</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5000042972069710005" datatype="html">
@@ -551,15 +562,19 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">217</context>
+          <context context-type="linenumber">234</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">255</context>
+          <context context-type="linenumber">272</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">291</context>
+          <context context-type="linenumber">308</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">344</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6371576811194810854" datatype="html">
@@ -625,6 +640,10 @@
           <context context-type="sourcefile">src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html</context>
           <context context-type="linenumber">8</context>
@@ -645,6 +664,14 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">19</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">19</context>
@@ -672,6 +699,10 @@
           <context context-type="sourcefile">src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html</context>
           <context context-type="linenumber">13</context>
@@ -687,6 +718,10 @@
           <context context-type="sourcefile">src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html</context>
           <context context-type="linenumber">14</context>
@@ -702,6 +737,10 @@
           <context context-type="sourcefile">src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html</context>
           <context context-type="linenumber">15</context>
@@ -717,6 +756,10 @@
           <context context-type="sourcefile">src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html</context>
           <context context-type="linenumber">18</context>
@@ -744,13 +787,17 @@
           <context context-type="sourcefile">src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">166</context>
+          <context context-type="linenumber">168</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context>
@@ -810,6 +857,59 @@
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6036319582202941456" datatype="html">
+        <source><x id="START_EMPHASISED_TEXT" ctype="x-em" equiv-text="&lt;em&gt;"/>Note that editing a path does not apply changes to stored files until you have run the &apos;document_renamer&apos; utility. See the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a target=&quot;_blank&quot; href=&quot;https://paperless-ngx.readthedocs.io/en/latest/administration.html#utilities-renamer&quot;&gt;"/>documentation<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.<x id="CLOSE_EMPHASISED_TEXT" ctype="x-em" equiv-text="&lt;/em&gt;"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8911059720204770105" datatype="html">
+        <source>Path</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/storage-path-list/storage-path-list.component.ts</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6625768491622252297" datatype="html">
+        <source>e.g.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1918584360573970155" datatype="html">
+        <source>or use slashes to add directories e.g.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7992597438102889079" datatype="html">
+        <source>See &lt;a target=&quot;_blank&quot; href=&quot;https://paperless-ngx.readthedocs.io/en/latest/advanced_usage.html#file-name-handling&quot;&gt;documentation&lt;/a&gt; for full list.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6898961890896270754" datatype="html">
+        <source>Create new storage path</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3754859110054016570" datatype="html">
+        <source>Edit storage path</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="9011959596901584887" datatype="html">
         <source>Color</source>
         <context-group purpose="location">
@@ -884,13 +984,13 @@
           <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
-        <note priority="1" from="description">Used for both types and correspondents</note>
+        <note priority="1" from="description">Used for both types, correspondents, storage paths</note>
       </trans-unit>
       <trans-unit id="524422427194414813" datatype="html">
         <source>Suggestions:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/input/select/select.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">30</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context>
@@ -942,17 +1042,17 @@
         </context-group>
       </trans-unit>
       <trans-unit id="5412339817978503936" datatype="html">
-        <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source>
+        <source>Hello <x id="PH" equiv-text="this.settingsService.displayName"/>, welcome to Paperless-ngx!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit id="795745990148149834" datatype="html">
         <source>Welcome to Paperless-ngx!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2946624699882754313" datatype="html">
@@ -974,15 +1074,15 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">146</context>
+          <context context-type="linenumber">152</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">44</context>
+          <context context-type="linenumber">54</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5701618810648052610" datatype="html">
@@ -1001,11 +1101,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">131</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1069523139277190436" datatype="html">
@@ -1095,7 +1195,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">179</context>
         </context-group>
         <note priority="1" from="description">this string is used to separate processing, failed and added on the file upload widget</note>
       </trans-unit>
@@ -1181,7 +1281,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">81</context>
+          <context context-type="linenumber">90</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
@@ -1195,6 +1295,14 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">46</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">65</context>
@@ -1224,7 +1332,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">77</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
@@ -1232,7 +1340,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8659635229098859487" datatype="html">
@@ -1311,11 +1419,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">30</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5066119607229701477" datatype="html">
@@ -1334,25 +1442,51 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">37</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2091353339965748767" datatype="html">
+        <source>Storage path</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">146</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5607669932062416162" datatype="html">
+        <source>Default</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6205355627445317276" datatype="html">
         <source>Content</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">84</context>
         </context-group>
       </trans-unit>
       <trans-unit id="218403386307979629" datatype="html">
         <source>Metadata</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">93</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts</context>
@@ -1363,102 +1497,102 @@
         <source>Date modified</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6392918669949841614" datatype="html">
         <source>Date added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit id="146828917013192897" datatype="html">
         <source>Media filename</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">107</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7985558498848210210" datatype="html">
         <source>Original MD5 checksum</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">111</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5888243105821763422" datatype="html">
         <source>Original file size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">113</context>
+          <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2696647325713149563" datatype="html">
         <source>Original mime type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit>
       <trans-unit id="342875990758166588" datatype="html">
         <source>Archive MD5 checksum</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6033581412811562084" datatype="html">
         <source>Archive file size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6992781481378431874" datatype="html">
         <source>Original document metadata</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2846565152091361585" datatype="html">
         <source>Archived document metadata</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">132</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8191371354890763172" datatype="html">
         <source>Enter Password</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">156</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">184</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3823219296477075982" datatype="html">
         <source>Discard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">164</context>
+          <context context-type="linenumber">166</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5129524307369213584" datatype="html">
         <source>Save &amp; next</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
-          <context context-type="linenumber">165</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9021887951960049161" datatype="html">
         <source>Confirm delete</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">423</context>
+          <context context-type="linenumber">469</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context>
@@ -1469,28 +1603,28 @@
         <source>Do you really want to delete document &quot;<x id="PH" equiv-text="this.document.title"/>&quot;?</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">424</context>
+          <context context-type="linenumber">470</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6691075929777935948" datatype="html">
         <source>The files for this document will be deleted permanently. This operation cannot be undone.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">425</context>
+          <context context-type="linenumber">471</context>
         </context-group>
       </trans-unit>
       <trans-unit id="719892092227206532" datatype="html">
         <source>Delete document</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">427</context>
+          <context context-type="linenumber">473</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1844801255494293730" datatype="html">
         <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
-          <context context-type="linenumber">443</context>
+          <context context-type="linenumber">489</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6857598786757174736" datatype="html">
@@ -1522,7 +1656,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
       <trans-unit id="184185893993764098" datatype="html">
@@ -1533,7 +1667,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">31</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2947613869920454977" datatype="html">
@@ -1544,14 +1678,25 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8816999377397522522" datatype="html">
+        <source>Filter storage paths</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
+          <context context-type="linenumber">57</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6224229575087660549" datatype="html">
         <source>Download originals</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7985804062689412812" datatype="html">
@@ -1560,25 +1705,25 @@
             )"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">97,99</context>
+          <context context-type="linenumber">103,105</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7894972847287473517" datatype="html">
         <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">171</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">177</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8639884465898458690" datatype="html">
         <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot; and &quot;<x id="PH_1" equiv-text="items[1].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">156</context>
+          <context context-type="linenumber">173</context>
         </context-group>
         <note priority="1" from="description">This is for messages like &apos;modify &quot;tag1&quot; and &quot;tag2&quot;&apos;</note>
       </trans-unit>
@@ -1586,7 +1731,7 @@
         <source><x id="PH" equiv-text="list"/> and &quot;<x id="PH_1" equiv-text="items[items.length - 1].name"/>&quot;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">164,166</context>
+          <context context-type="linenumber">181,183</context>
         </context-group>
         <note priority="1" from="description">this is for messages like &apos;modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;&apos;</note>
       </trans-unit>
@@ -1594,14 +1739,14 @@
         <source>Confirm tags assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">181</context>
+          <context context-type="linenumber">198</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6619516195038467207" datatype="html">
         <source>This operation will add the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">187</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1894412783609570695" datatype="html">
@@ -1610,14 +1755,14 @@
         )"/> to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">192,194</context>
+          <context context-type="linenumber">209,211</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7181166515756808573" datatype="html">
         <source>This operation will remove the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">217</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3819792277998068944" datatype="html">
@@ -1626,7 +1771,7 @@
         )"/> from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">205,207</context>
+          <context context-type="linenumber">222,224</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2739066218579571288" datatype="html">
@@ -1637,77 +1782,98 @@
         )"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">209,213</context>
+          <context context-type="linenumber">226,230</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2996713129519325161" datatype="html">
         <source>Confirm correspondent assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">248</context>
+          <context context-type="linenumber">265</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6900893559485781849" datatype="html">
         <source>This operation will assign the correspondent &quot;<x id="PH" equiv-text="correspondent.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">250</context>
+          <context context-type="linenumber">267</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1257522660364398440" datatype="html">
         <source>This operation will remove the correspondent from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">252</context>
+          <context context-type="linenumber">269</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5393409374423140648" datatype="html">
         <source>Confirm document type assignment</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">284</context>
+          <context context-type="linenumber">301</context>
         </context-group>
       </trans-unit>
       <trans-unit id="332180123895325027" datatype="html">
         <source>This operation will assign the document type &quot;<x id="PH" equiv-text="documentType.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">286</context>
+          <context context-type="linenumber">303</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2236642492594872779" datatype="html">
         <source>This operation will remove the document type from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">288</context>
+          <context context-type="linenumber">305</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6386555513013840736" datatype="html">
+        <source>Confirm storage path assignment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">337</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8750527458618415924" datatype="html">
+        <source>This operation will assign the storage path &quot;<x id="PH" equiv-text="storagePath.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">339</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="60728365335056946" datatype="html">
+        <source>This operation will remove the storage path from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
+          <context context-type="linenumber">341</context>
         </context-group>
       </trans-unit>
       <trans-unit id="749430623564850405" datatype="html">
         <source>Delete confirm</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">309</context>
+          <context context-type="linenumber">362</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4303174930844518780" datatype="html">
         <source>This operation will permanently delete <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">310</context>
+          <context context-type="linenumber">363</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5641451190833696892" datatype="html">
         <source>This operation cannot be undone.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">311</context>
+          <context context-type="linenumber">364</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6734339521247847366" datatype="html">
         <source>Delete document(s)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">313</context>
+          <context context-type="linenumber">366</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8076495233090006322" datatype="html">
@@ -1718,7 +1884,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">173</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2784168796433474565" datatype="html">
@@ -1729,7 +1899,11 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">178</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7585826646011739428" datatype="html">
@@ -1740,7 +1914,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">70</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
@@ -1754,6 +1928,14 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">45</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">59</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">59</context>
@@ -1774,32 +1956,74 @@
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2332107018974972998" datatype="html">
-        <source>Score:</source>
+      <trans-unit id="78870852467682010" datatype="html">
+        <source>Filter by document type</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">182</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="157572966557284263" datatype="html">
+        <source>Filter by storage path</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">187</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3727324658595204357" datatype="html">
+        <source>Created: <x id="INTERPOLATION" equiv-text="{{ document.created | customDate }}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
           <context context-type="linenumber">85</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="3727324658595204357" datatype="html">
-        <source>Created: <x id="INTERPOLATION" equiv-text="{{ document.created | customDate}}"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">43</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2030261243264601523" datatype="html">
-        <source>Added: <x id="INTERPOLATION" equiv-text="{{ document.added | customDate}}"/></source>
+        <source>Added: <x id="INTERPOLATION" equiv-text="{{ document.added | customDate }}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
+          <context context-type="linenumber">86</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">44</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4235671847487610290" datatype="html">
-        <source>Modified: <x id="INTERPOLATION" equiv-text="{{ document.modified | customDate}}"/></source>
+        <source>Modified: <x id="INTERPOLATION" equiv-text="{{ document.modified | customDate }}"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2332107018974972998" datatype="html">
+        <source>Score:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5145213156408463657" datatype="html">
@@ -1887,26 +2111,33 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">131</context>
+          <context context-type="linenumber">136</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
       <trans-unit id="231679111972850796" datatype="html">
         <source>Added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
-          <context context-type="linenumber">152</context>
+          <context context-type="linenumber">158</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">61</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2179847500064178686" datatype="html">
+        <source>Edit document</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
+          <context context-type="linenumber">177</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2155249406916744630" datatype="html">
@@ -1927,119 +2158,119 @@
         <source>Reset filters</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">60</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5195932016807797291" datatype="html">
         <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) =&gt; c.id == +rule.value)?.name"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">69,71</context>
+          <context context-type="linenumber">72,74</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8170755470576301659" datatype="html">
         <source>Without correspondent</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8705701325879965907" datatype="html">
         <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) =&gt; dt.id == +rule.value)?.name"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">78,80</context>
+          <context context-type="linenumber">81,83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4362173610367509215" datatype="html">
         <source>Without document type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">85</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8180755793012580465" datatype="html">
         <source>Tag: <x id="PH" equiv-text="this.tags.find((t) =&gt; t.id == +rule.value)?.name"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">86,88</context>
+          <context context-type="linenumber">89,91</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6494566478302448576" datatype="html">
         <source>Without any tag</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6523384805359286307" datatype="html">
         <source>Title: <x id="PH" equiv-text="rule.value"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">96</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1872523635812236432" datatype="html">
         <source>ASN: <x id="PH" equiv-text="rule.value"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">99</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3100631071441658964" datatype="html">
         <source>Title &amp; content</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1010505078885609376" datatype="html">
         <source>Advanced search</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2649431021108393503" datatype="html">
         <source>More like</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">140</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3697582909018473071" datatype="html">
         <source>equals</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">159</context>
+          <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5325481293405718739" datatype="html">
         <source>is empty</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">163</context>
+          <context context-type="linenumber">168</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6166785695326182482" datatype="html">
         <source>is not empty</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">172</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4686622206659266699" datatype="html">
         <source>greater than</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">171</context>
+          <context context-type="linenumber">176</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8014012170270529279" datatype="html">
         <source>less than</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">175</context>
+          <context context-type="linenumber">180</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7210076240260527720" datatype="html">
@@ -2148,6 +2379,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">2</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="4010735610815226758" datatype="html">
         <source>Filter by:</source>
@@ -2163,6 +2398,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="1383365546483928780" datatype="html">
         <source>Matching</source>
@@ -2178,6 +2417,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="1488347670280290838" datatype="html">
         <source>Document count</source>
@@ -2193,6 +2436,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="3193976279273491157" datatype="html">
         <source>Actions</source>
@@ -2208,6 +2455,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context>
           <context context-type="linenumber">174</context>
@@ -2227,6 +2478,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">44</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="8095412801504464756" datatype="html">
         <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source>
@@ -2242,6 +2497,10 @@
           <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
           <context context-type="linenumber">74</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="810888510148304696" datatype="html">
         <source>Automatic</source>
@@ -2505,28 +2764,56 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">167</context>
+          <context context-type="linenumber">174</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5647210819299459618" datatype="html">
-        <source>Settings saved successfully.</source>
+      <trans-unit id="3891152409365583719" datatype="html">
+        <source>Settings saved</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">233</context>
+          <context context-type="linenumber">247</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7217000812750597833" datatype="html">
+        <source>Settings were saved successfully.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">248</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="525012668859298131" datatype="html">
+        <source>Settings were saved successfully. Reload is required to apply some changes.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">252</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8491974984518503778" datatype="html">
+        <source>Reload now</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">253</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3011185103048412841" datatype="html">
+        <source>An error occurred while saving settings.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
+          <context context-type="linenumber">263</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6839066544204061364" datatype="html">
         <source>Use system language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">237</context>
+          <context context-type="linenumber">271</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7729897675462249787" datatype="html">
         <source>Use date format of display language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">244</context>
+          <context context-type="linenumber">278</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8488620293789898901" datatype="html">
@@ -2535,7 +2822,28 @@
             )"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context>
-          <context context-type="linenumber">264,266</context>
+          <context context-type="linenumber">298,300</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5101757640976222639" datatype="html">
+        <source>storage path</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/storage-path-list/storage-path-list.component.ts</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="22235115124223314" datatype="html">
+        <source>storage paths</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/storage-path-list/storage-path-list.component.ts</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1569070683025071137" datatype="html">
+        <source>Do you really want to delete the storage path &quot;<x id="PH" equiv-text="object.name"/>&quot;?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/manage/storage-path-list/storage-path-list.component.ts</context>
+          <context context-type="linenumber">46</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6402703264596649214" datatype="html">
@@ -2838,14 +3146,14 @@
         <source>Modified</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4460262093225954455" datatype="html">
         <source>Search score</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">31</context>
         </context-group>
         <note priority="1" from="description">Score is a value returned by the full text search engine and specifies how well a result matches the given query</note>
       </trans-unit>
@@ -2853,154 +3161,168 @@
         <source>English (US)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">184</context>
+          <context context-type="linenumber">140</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3098941349689899577" datatype="html">
         <source>Belarusian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">146</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2719780722934172508" datatype="html">
         <source>Czech</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">196</context>
+          <context context-type="linenumber">152</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2924289692679201020" datatype="html">
         <source>Danish</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">158</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1858110241312746425" datatype="html">
         <source>German</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">208</context>
+          <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6987083569809053351" datatype="html">
         <source>English (GB)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">214</context>
+          <context context-type="linenumber">170</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5190825892106392539" datatype="html">
         <source>Spanish</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">220</context>
+          <context context-type="linenumber">176</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7633754075223722162" datatype="html">
         <source>French</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">226</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2935232983274991580" datatype="html">
         <source>Italian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">232</context>
+          <context context-type="linenumber">188</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1334425850005897370" datatype="html">
         <source>Luxembourgish</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">238</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3071065188816255493" datatype="html">
         <source>Dutch</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">244</context>
+          <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit>
       <trans-unit id="792060551707690640" datatype="html">
         <source>Polish</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">250</context>
+          <context context-type="linenumber">206</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9184513005098760425" datatype="html">
         <source>Portuguese (Brazil)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">256</context>
+          <context context-type="linenumber">212</context>
         </context-group>
       </trans-unit>
       <trans-unit id="153799456510623899" datatype="html">
         <source>Portuguese</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">262</context>
+          <context context-type="linenumber">218</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8118856427047826368" datatype="html">
         <source>Romanian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">268</context>
+          <context context-type="linenumber">224</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7137419789978325708" datatype="html">
         <source>Russian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">274</context>
+          <context context-type="linenumber">230</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4287008301409320881" datatype="html">
         <source>Slovenian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">280</context>
+          <context context-type="linenumber">236</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8608389829607915090" datatype="html">
         <source>Serbian</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">286</context>
+          <context context-type="linenumber">242</context>
         </context-group>
       </trans-unit>
       <trans-unit id="499386805970351976" datatype="html">
         <source>Swedish</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">292</context>
+          <context context-type="linenumber">248</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5682359291233237791" datatype="html">
         <source>Turkish</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">298</context>
+          <context context-type="linenumber">254</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4689443708886954687" datatype="html">
         <source>Chinese Simplified</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">304</context>
+          <context context-type="linenumber">260</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4912706592792948707" datatype="html">
         <source>ISO 8601</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/settings.service.ts</context>
-          <context context-type="linenumber">321</context>
+          <context context-type="linenumber">277</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="313643372755303297" datatype="html">
+        <source>Successfully completed one-time migratration of settings to the database!</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">372</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5558341108007064934" datatype="html">
+        <source>Unable to migrate settings to the database, please try saving manually.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/services/settings.service.ts</context>
+          <context context-type="linenumber">373</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1519954996184640001" datatype="html">
diff --git a/src-ui/src/app/app-routing.module.ts b/src-ui/src/app/app-routing.module.ts
index 436d2fad4..3eb13177f 100644
--- a/src-ui/src/app/app-routing.module.ts
+++ b/src-ui/src/app/app-routing.module.ts
@@ -12,6 +12,7 @@ import { TagListComponent } from './components/manage/tag-list/tag-list.componen
 import { NotFoundComponent } from './components/not-found/not-found.component'
 import { DocumentAsnComponent } from './components/document-asn/document-asn.component'
 import { DirtyFormGuard } from './guards/dirty-form.guard'
+import { StoragePathListComponent } from './components/manage/storage-path-list/storage-path-list.component'
 
 const routes: Routes = [
   { path: '', redirectTo: 'dashboard', pathMatch: 'full' },
@@ -27,6 +28,7 @@ const routes: Routes = [
       { path: 'tags', component: TagListComponent },
       { path: 'documenttypes', component: DocumentTypeListComponent },
       { path: 'correspondents', component: CorrespondentListComponent },
+      { path: 'storagepaths', component: StoragePathListComponent },
       { path: 'logs', component: LogsComponent },
       {
         path: 'settings',
diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts
index f8c98fbc7..c7954e3a6 100644
--- a/src-ui/src/app/app.component.ts
+++ b/src-ui/src/app/app.component.ts
@@ -1,4 +1,5 @@
-import { SettingsService, SETTINGS_KEYS } from './services/settings.service'
+import { SettingsService } from './services/settings.service'
+import { SETTINGS_KEYS } from './data/paperless-uisettings'
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
 import { Subscription } from 'rxjs'
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index a705c83ec..7b5e16da0 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { BrowserModule } from '@angular/platform-browser'
-import { NgModule } from '@angular/core'
+import { APP_INITIALIZER, NgModule } from '@angular/core'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
 import {
@@ -87,6 +87,9 @@ import localeSr from '@angular/common/locales/sr'
 import localeSv from '@angular/common/locales/sv'
 import localeTr from '@angular/common/locales/tr'
 import localeZh from '@angular/common/locales/zh'
+import { StoragePathListComponent } from './components/manage/storage-path-list/storage-path-list.component'
+import { StoragePathEditDialogComponent } from './components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
+import { SettingsService } from './services/settings.service'
 
 registerLocaleData(localeBe)
 registerLocaleData(localeCs)
@@ -109,6 +112,12 @@ registerLocaleData(localeSv)
 registerLocaleData(localeTr)
 registerLocaleData(localeZh)
 
+function initializeApp(settings: SettingsService) {
+  return () => {
+    return settings.initializeSettings()
+  }
+}
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -118,6 +127,7 @@ registerLocaleData(localeZh)
     TagListComponent,
     DocumentTypeListComponent,
     CorrespondentListComponent,
+    StoragePathListComponent,
     LogsComponent,
     SettingsComponent,
     NotFoundComponent,
@@ -125,6 +135,7 @@ registerLocaleData(localeZh)
     ConfirmDialogComponent,
     TagEditDialogComponent,
     DocumentTypeEditDialogComponent,
+    StoragePathEditDialogComponent,
     TagComponent,
     PageHeaderComponent,
     AppFrameComponent,
@@ -174,6 +185,12 @@ registerLocaleData(localeZh)
     ColorSliderModule,
   ],
   providers: [
+    {
+      provide: APP_INITIALIZER,
+      useFactory: initializeApp,
+      deps: [SettingsService],
+      multi: true,
+    },
     DatePipe,
     CookieService,
     {
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 718e2a242..8ec2bf8aa 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -21,17 +21,17 @@
   </div>
   <ul ngbNav class="order-sm-3">
     <li ngbDropdown class="nav-item dropdown">
-      <button class="btn text-light" id="userDropdown" ngbDropdownToggle>
-        <span *ngIf="displayName" class="navbar-text small me-2 text-light d-none d-sm-inline">
-          {{displayName}}
+      <button class="btn" id="userDropdown" ngbDropdownToggle>
+        <span class="small me-2 d-none d-sm-inline">
+          {{this.settingsService.displayName}}
         </span>
         <svg width="1.3em" height="1.3em" fill="currentColor">
           <use xlink:href="assets/bootstrap-icons.svg#person-circle"/>
         </svg>
       </button>
       <div ngbDropdownMenu class="dropdown-menu-end shadow me-2" aria-labelledby="userDropdown">
-        <div *ngIf="displayName" class="d-sm-none">
-          <p class="small mb-0 px-3 text-muted" i18n>Logged in as {{displayName}}</p>
+        <div class="d-sm-none">
+          <p class="small mb-0 px-3 text-muted" i18n>Logged in as {{this.settingsService.displayName}}</p>
           <div class="dropdown-divider"></div>
         </div>
         <a ngbDropdownItem class="nav-link" routerLink="settings" (click)="closeMenu()">
@@ -134,6 +134,13 @@
               </svg>&nbsp;<ng-container i18n>Document types</ng-container>
             </a>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" routerLink="storagepaths" routerLinkActive="active" (click)="closeMenu()">
+              <svg class="sidebaricon" fill="currentColor">
+                <use xlink:href="assets/bootstrap-icons.svg#folder"/>
+              </svg>&nbsp;<ng-container i18n>Storage paths</ng-container>
+            </a>
+          </li>
           <li class="nav-item">
             <a class="nav-link" routerLink="logs" routerLinkActive="active" (click)="closeMenu()">
               <svg class="sidebaricon" fill="currentColor">
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts
index 9290c09fa..0d43f17a2 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.ts
+++ b/src-ui/src/app/components/app-frame/app-frame.component.ts
@@ -22,7 +22,7 @@ import {
   RemoteVersionService,
   AppRemoteVersion,
 } from 'src/app/services/rest/remote-version.service'
-import { QueryParamsService } from 'src/app/services/query-params.service'
+import { SettingsService } from 'src/app/services/settings.service'
 
 @Component({
   selector: 'app-app-frame',
@@ -36,10 +36,9 @@ export class AppFrameComponent {
     private openDocumentsService: OpenDocumentsService,
     private searchService: SearchService,
     public savedViewService: SavedViewService,
-    private list: DocumentListViewService,
-    private meta: Meta,
     private remoteVersionService: RemoteVersionService,
-    private queryParamsService: QueryParamsService
+    private list: DocumentListViewService,
+    public settingsService: SettingsService
   ) {
     this.remoteVersionService
       .checkForUpdates()
@@ -94,7 +93,7 @@ export class AppFrameComponent {
 
   search() {
     this.closeMenu()
-    this.queryParamsService.navigateWithFilterRules([
+    this.list.quickFilter([
       {
         rule_type: FILTER_FULLTEXT_QUERY,
         value: (this.searchField.value as string).trim(),
@@ -143,17 +142,4 @@ export class AppFrameComponent {
         }
       })
   }
-
-  get displayName() {
-    // TODO: taken from dashboard component, is this the best way to pass around username?
-    let tagFullName = this.meta.getTag('name=full_name')
-    let tagUsername = this.meta.getTag('name=username')
-    if (tagFullName && tagFullName.content) {
-      return tagFullName.content
-    } else if (tagUsername && tagUsername.content) {
-      return tagUsername.content
-    } else {
-      return null
-    }
-  }
 }
diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
index 19d907c82..92e27e370 100644
--- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
+++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html
@@ -5,7 +5,7 @@
     </div>
     <div class="modal-body">
       <p *ngIf="messageBold"><b>{{messageBold}}</b></p>
-      <p *ngIf="message">{{message}}</p>
+      <p class="mb-0" *ngIf="message" [innerHTML]="message | safeHtml"></p>
     </div>
     <div class="modal-footer">
       <button type="button" class="btn btn-outline-secondary" (click)="cancel()" [disabled]="!buttonsEnabled" i18n>
diff --git a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html
new file mode 100644
index 000000000..371fb16fa
--- /dev/null
+++ b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html
@@ -0,0 +1,24 @@
+<form [formGroup]="objectForm" (ngSubmit)="save()">
+  <div class="modal-header">
+    <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
+    </button>
+  </div>
+  <div class="modal-body">
+
+    <p *ngIf="this.dialogMode == 'edit'" i18n>
+      <em>Note that editing a path does not apply changes to stored files until you have run the 'document_renamer' utility. See the <a target="_blank" href="https://paperless-ngx.readthedocs.io/en/latest/administration.html#utilities-renamer">documentation</a>.</em>
+    </p>
+
+    <app-input-text i18n-title title="Name" formControlName="name" [error]="error?.name"></app-input-text>
+    <app-input-text i18n-title title="Path" formControlName="path" [error]="error?.path" [hint]="pathHint"></app-input-text>
+    <app-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></app-input-select>
+    <app-input-text *ngIf="patternRequired" i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></app-input-text>
+    <app-input-check *ngIf="patternRequired" i18n-title title="Case insensitive" formControlName="is_insensitive"></app-input-check>
+
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-outline-secondary" (click)="cancel()" i18n [disabled]="networkActive">Cancel</button>
+    <button type="submit" class="btn btn-primary" i18n [disabled]="networkActive">Save</button>
+  </div>
+</form>
diff --git a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.scss b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts
new file mode 100644
index 000000000..2ec0821e6
--- /dev/null
+++ b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts
@@ -0,0 +1,50 @@
+import { Component } from '@angular/core'
+import { FormControl, FormGroup } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
+import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path'
+import { StoragePathService } from 'src/app/services/rest/storage-path.service'
+import { ToastService } from 'src/app/services/toast.service'
+
+@Component({
+  selector: 'app-storage-path-edit-dialog',
+  templateUrl: './storage-path-edit-dialog.component.html',
+  styleUrls: ['./storage-path-edit-dialog.component.scss'],
+})
+export class StoragePathEditDialogComponent extends EditDialogComponent<PaperlessStoragePath> {
+  constructor(
+    service: StoragePathService,
+    activeModal: NgbActiveModal,
+    toastService: ToastService
+  ) {
+    super(service, activeModal, toastService)
+  }
+
+  get pathHint() {
+    return (
+      $localize`e.g.` +
+      ' <code>{created_year}-{title}</code> ' +
+      $localize`or use slashes to add directories e.g.` +
+      ' <code>{created_year}/{correspondent}/{title}</code>. ' +
+      $localize`See <a target="_blank" href="https://paperless-ngx.readthedocs.io/en/latest/advanced_usage.html#file-name-handling">documentation</a> for full list.`
+    )
+  }
+
+  getCreateTitle() {
+    return $localize`Create new storage path`
+  }
+
+  getEditTitle() {
+    return $localize`Edit storage path`
+  }
+
+  getForm(): FormGroup {
+    return new FormGroup({
+      name: new FormControl(''),
+      path: new FormControl(''),
+      matching_algorithm: new FormControl(1),
+      match: new FormControl(''),
+      is_insensitive: new FormControl(true),
+    })
+  }
+}
diff --git a/src-ui/src/app/components/common/input/date/date.component.html b/src-ui/src/app/components/common/input/date/date.component.html
index ca6ec0b26..e742ead9b 100644
--- a/src-ui/src/app/components/common/input/date/date.component.html
+++ b/src-ui/src/app/components/common/input/date/date.component.html
@@ -2,7 +2,7 @@
   <label class="form-label" [for]="inputId">{{title}}</label>
   <div class="input-group" [class.is-invalid]="error">
     <input class="form-control" [class.is-invalid]="error" [placeholder]="placeholder" [id]="inputId" maxlength="10"
-          (dateSelect)="onChange(value)" (change)="onChange(value)" (keypress)="onKeyPress($event)"
+          (dateSelect)="onChange(value)" (change)="onChange(value)" (keypress)="onKeyPress($event)" (paste)="onPaste($event)"
           name="dp" [(ngModel)]="value" ngbDatepicker #datePicker="ngbDatepicker" #datePickerContent="ngModel">
     <button class="btn btn-outline-secondary calendar" (click)="datePicker.toggle()" type="button">
       <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-calendar" viewBox="0 0 16 16">
diff --git a/src-ui/src/app/components/common/input/date/date.component.ts b/src-ui/src/app/components/common/input/date/date.component.ts
index a6d39321b..44e7c7513 100644
--- a/src-ui/src/app/components/common/input/date/date.component.ts
+++ b/src-ui/src/app/components/common/input/date/date.component.ts
@@ -1,6 +1,8 @@
 import { Component, forwardRef, OnInit } from '@angular/core'
 import { NG_VALUE_ACCESSOR } from '@angular/forms'
+import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'
 import { SettingsService } from 'src/app/services/settings.service'
+import { LocalizedDateParserFormatter } from 'src/app/utils/ngb-date-parser-formatter'
 import { AbstractInputComponent } from '../abstract-input'
 
 @Component({
@@ -19,7 +21,10 @@ export class DateComponent
   extends AbstractInputComponent<string>
   implements OnInit
 {
-  constructor(private settings: SettingsService) {
+  constructor(
+    private settings: SettingsService,
+    private ngbDateParserFormatter: NgbDateParserFormatter
+  ) {
     super()
   }
 
@@ -30,7 +35,20 @@ export class DateComponent
 
   placeholder: string
 
-  // prevent chars other than numbers and separators
+  onPaste(event: ClipboardEvent) {
+    const clipboardData: DataTransfer =
+      event.clipboardData || window['clipboardData']
+    if (clipboardData) {
+      event.preventDefault()
+      let pastedText = clipboardData.getData('text')
+      pastedText = pastedText.replace(/[\sa-z#!$%\^&\*;:{}=\-_`~()]+/g, '')
+      const parsedDate = this.ngbDateParserFormatter.parse(pastedText)
+      const formattedDate = this.ngbDateParserFormatter.format(parsedDate)
+      this.writeValue(formattedDate)
+      this.onChange(formattedDate)
+    }
+  }
+
   onKeyPress(event: KeyboardEvent) {
     if ('Enter' !== event.key && !/[0-9,\.\/-]+/.test(event.key)) {
       event.preventDefault()
diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html
index afb551c46..b111e1656 100644
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -9,7 +9,8 @@
         [items]="items"
         [addTag]="allowCreateNew && addItemRef"
         addTagText="Add item"
-        i18n-addTagText="Used for both types and correspondents"
+        i18n-addTagText="Used for both types, correspondents, storage paths"
+        [placeholder]="placeholder"
         bindLabel="name"
         bindValue="id"
         (change)="onChange(value)"
diff --git a/src-ui/src/app/components/common/input/select/select.component.ts b/src-ui/src/app/components/common/input/select/select.component.ts
index 98aef8d94..d1a3d6e5c 100644
--- a/src-ui/src/app/components/common/input/select/select.component.ts
+++ b/src-ui/src/app/components/common/input/select/select.component.ts
@@ -41,6 +41,9 @@ export class SelectComponent extends AbstractInputComponent<number> {
   @Input()
   suggestions: number[]
 
+  @Input()
+  placeholder: string
+
   @Output()
   createNew = new EventEmitter<string>()
 
diff --git a/src-ui/src/app/components/common/input/text/text.component.html b/src-ui/src/app/components/common/input/text/text.component.html
index 3f4136c11..41f02df64 100644
--- a/src-ui/src/app/components/common/input/text/text.component.html
+++ b/src-ui/src/app/components/common/input/text/text.component.html
@@ -1,7 +1,7 @@
 <div class="mb-3">
   <label class="form-label" [for]="inputId">{{title}}</label>
   <input #inputField type="text" class="form-control" [class.is-invalid]="error" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)">
-  <small *ngIf="hint" class="form-text text-muted">{{hint}}</small>
+  <small *ngIf="hint" class="form-text text-muted" [innerHTML]="hint | safeHtml"></small>
   <div class="invalid-feedback">
     {{error}}
   </div>
diff --git a/src-ui/src/app/components/common/tag/tag.component.scss b/src-ui/src/app/components/common/tag/tag.component.scss
index 903e9bfdb..d5d77448d 100644
--- a/src-ui/src/app/components/common/tag/tag.component.scss
+++ b/src-ui/src/app/components/common/tag/tag.component.scss
@@ -1,3 +1,6 @@
 a {
     cursor: pointer;
+    white-space: normal;
+    word-break: break-word;
+    text-align: end;
 }
diff --git a/src-ui/src/app/components/common/toasts/toasts.component.html b/src-ui/src/app/components/common/toasts/toasts.component.html
index b79208ebf..03715a440 100644
--- a/src-ui/src/app/components/common/toasts/toasts.component.html
+++ b/src-ui/src/app/components/common/toasts/toasts.component.html
@@ -4,5 +4,5 @@
   [class]="toast.classname"
   (hidden)="toastService.closeToast(toast)">
   <p>{{toast.content}}</p>
-  <p *ngIf="toast.action"><button class="btn btn-sm btn-outline-secondary" (click)="toastService.closeToast(toast); toast.action()">{{toast.actionName}}</button></p>
+  <p class="mb-0" *ngIf="toast.action"><button class="btn btn-sm btn-outline-secondary" (click)="toastService.closeToast(toast); toast.action()">{{toast.actionName}}</button></p>
 </ngb-toast>
diff --git a/src-ui/src/app/components/common/toasts/toasts.component.scss b/src-ui/src/app/components/common/toasts/toasts.component.scss
index d2aaf20b0..e6dcb7a57 100644
--- a/src-ui/src/app/components/common/toasts/toasts.component.scss
+++ b/src-ui/src/app/components/common/toasts/toasts.component.scss
@@ -8,4 +8,4 @@
 
 .toast:not(.show) {
   display: block; // this corrects an ng-bootstrap bug that prevented animations
-}
\ No newline at end of file
+}
diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts
index 640883f6f..a58140d5a 100644
--- a/src-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/src-ui/src/app/components/dashboard/dashboard.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { Meta } from '@angular/platform-browser'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
+import { SettingsService } from 'src/app/services/settings.service'
 
 @Component({
   selector: 'app-dashboard',
@@ -8,23 +9,14 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service'
   styleUrls: ['./dashboard.component.scss'],
 })
 export class DashboardComponent {
-  constructor(public savedViewService: SavedViewService, private meta: Meta) {}
-
-  get displayName() {
-    let tagFullName = this.meta.getTag('name=full_name')
-    let tagUsername = this.meta.getTag('name=username')
-    if (tagFullName && tagFullName.content) {
-      return tagFullName.content
-    } else if (tagUsername && tagUsername.content) {
-      return tagUsername.content
-    } else {
-      return null
-    }
-  }
+  constructor(
+    public savedViewService: SavedViewService,
+    public settingsService: SettingsService
+  ) {}
 
   get subtitle() {
-    if (this.displayName) {
-      return $localize`Hello ${this.displayName}, welcome to Paperless-ngx!`
+    if (this.settingsService.displayName) {
+      return $localize`Hello ${this.settingsService.displayName}, welcome to Paperless-ngx!`
     } else {
       return $localize`Welcome to Paperless-ngx!`
     }
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
index 94e0c4052..65ea4de0b 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
@@ -7,8 +7,8 @@ import { ConsumerStatusService } from 'src/app/services/consumer-status.service'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { PaperlessTag } from 'src/app/data/paperless-tag'
 import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type'
-import { QueryParamsService } from 'src/app/services/query-params.service'
 import { OpenDocumentsService } from 'src/app/services/open-documents.service'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 
 @Component({
   selector: 'app-saved-view-widget',
@@ -21,7 +21,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy {
   constructor(
     private documentService: DocumentService,
     private router: Router,
-    private queryParamsService: QueryParamsService,
+    private list: DocumentListViewService,
     private consumerStatusService: ConsumerStatusService,
     public openDocumentsService: OpenDocumentsService
   ) {}
@@ -47,7 +47,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy {
   }
 
   reload() {
-    this.loading = true
+    this.loading = this.documents.length == 0
     this.documentService
       .listFiltered(
         1,
@@ -73,7 +73,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy {
   }
 
   clickTag(tag: PaperlessTag) {
-    this.queryParamsService.navigateWithFilterRules([
+    this.list.quickFilter([
       { rule_type: FILTER_HAS_TAGS_ALL, value: tag.id.toString() },
     ])
   }
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 2225afa31..7948d82e3 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -73,6 +73,8 @@
                             (createNew)="createCorrespondent($event)" [suggestions]="suggestions?.correspondents"></app-input-select>
                         <app-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true"
                             (createNew)="createDocumentType($event)" [suggestions]="suggestions?.document_types"></app-input-select>
+                        <app-input-select [items]="storagePaths" i18n-title title="Storage path" formControlName="storage_path" [allowNull]="true"
+                            (createNew)="createStoragePath($event)" [suggestions]="suggestions?.storage_paths" i18n-placeholder placeholder="Default"></app-input-select>
                         <app-input-tags formControlName="tags" [suggestions]="suggestions?.tags"></app-input-tags>
 
                     </ng-template>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index f16876c11..2abc06193 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -18,10 +18,7 @@ import { DocumentTypeEditDialogComponent } from '../common/edit-dialog/document-
 import { PDFDocumentProxy } from 'ng2-pdf-viewer'
 import { ToastService } from 'src/app/services/toast.service'
 import { TextComponent } from '../common/input/text/text.component'
-import {
-  SettingsService,
-  SETTINGS_KEYS,
-} from 'src/app/services/settings.service'
+import { SettingsService } from 'src/app/services/settings.service'
 import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms'
 import { Observable, Subject, BehaviorSubject } from 'rxjs'
 import {
@@ -34,7 +31,11 @@ import {
 } from 'rxjs/operators'
 import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-suggestions'
 import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type'
-import { QueryParamsService } from 'src/app/services/query-params.service'
+import { normalizeDateStr } from 'src/app/utils/date'
+import { StoragePathService } from 'src/app/services/rest/storage-path.service'
+import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path'
+import { StoragePathEditDialogComponent } from '../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
+import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
 
 @Component({
   selector: 'app-document-detail',
@@ -67,6 +68,7 @@ export class DocumentDetailComponent
 
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
+  storagePaths: PaperlessStoragePath[]
 
   documentForm: FormGroup = new FormGroup({
     title: new FormControl(''),
@@ -74,6 +76,7 @@ export class DocumentDetailComponent
     created_date: new FormControl(),
     correspondent: new FormControl(),
     document_type: new FormControl(),
+    storage_path: new FormControl(),
     archive_serial_number: new FormControl(),
     tags: new FormControl([]),
   })
@@ -116,7 +119,7 @@ export class DocumentDetailComponent
     private documentTitlePipe: DocumentTitlePipe,
     private toastService: ToastService,
     private settings: SettingsService,
-    private queryParamsService: QueryParamsService
+    private storagePathService: StoragePathService
   ) {}
 
   titleKeyUp(event) {
@@ -145,11 +148,17 @@ export class DocumentDetailComponent
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.correspondents = result.results))
+
     this.documentTypeService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.documentTypes = result.results))
 
+    this.storagePathService
+      .listAll()
+      .pipe(first())
+      .subscribe((result) => (this.storagePaths = result.results))
+
     this.route.paramMap
       .pipe(
         takeUntil(this.unsubscribeNotifier),
@@ -210,6 +219,7 @@ export class DocumentDetailComponent
             created_date: doc.created_date,
             correspondent: doc.correspondent,
             document_type: doc.document_type,
+            storage_path: doc.storage_path,
             archive_serial_number: doc.archive_serial_number,
             tags: [...doc.tags],
           })
@@ -310,6 +320,27 @@ export class DocumentDetailComponent
       })
   }
 
+  createStoragePath(newName: string) {
+    var modal = this.modalService.open(StoragePathEditDialogComponent, {
+      backdrop: 'static',
+    })
+    modal.componentInstance.dialogMode = 'create'
+    if (newName) modal.componentInstance.object = { name: newName }
+    modal.componentInstance.success
+      .pipe(
+        switchMap((newStoragePath) => {
+          return this.storagePathService
+            .listAll()
+            .pipe(map((storagePaths) => ({ newStoragePath, storagePaths })))
+        })
+      )
+      .pipe(takeUntil(this.unsubscribeNotifier))
+      .subscribe(({ newStoragePath, documentTypes: storagePaths }) => {
+        this.storagePaths = storagePaths.results
+        this.documentForm.get('storage_path').setValue(newStoragePath.id)
+      })
+  }
+
   discard() {
     this.documentsService
       .get(this.documentId)
@@ -434,7 +465,7 @@ export class DocumentDetailComponent
   }
 
   moreLike() {
-    this.queryParamsService.navigateWithFilterRules([
+    this.documentListViewService.quickFilter([
       {
         rule_type: FILTER_FULLTEXT_MORELIKE,
         value: this.documentId.toString(),
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
index 631b558d0..8d9389df3 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
@@ -53,6 +53,15 @@
         [(selectionModel)]="documentTypeSelectionModel"
         (apply)="setDocumentTypes($event)">
       </app-filterable-dropdown>
+      <app-filterable-dropdown class="me-2 me-md-3" title="Storage path" icon="folder-fill" i18n-title
+        filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
+        [items]="storagePaths"
+        [editing]="true"
+        [applyOnClose]="applyOnClose"
+        (open)="openStoragePathDropdown()"
+        [(selectionModel)]="storagePathsSelectionModel"
+        (apply)="setStoragePaths($event)">
+      </app-filterable-dropdown>
     </div>
   </div>
   <div class="col-auto ms-auto mb-2 mb-xl-0 d-flex">
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
index c451f851e..b9ab00fe6 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -19,12 +19,12 @@ import {
 } from '../../common/filterable-dropdown/filterable-dropdown.component'
 import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'
 import { MatchingModel } from 'src/app/data/matching-model'
-import {
-  SettingsService,
-  SETTINGS_KEYS,
-} from 'src/app/services/settings.service'
+import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { saveAs } from 'file-saver'
+import { StoragePathService } from 'src/app/services/rest/storage-path.service'
+import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path'
+import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
 
 @Component({
   selector: 'app-bulk-editor',
@@ -35,10 +35,12 @@ export class BulkEditorComponent {
   tags: PaperlessTag[]
   correspondents: PaperlessCorrespondent[]
   documentTypes: PaperlessDocumentType[]
+  storagePaths: PaperlessStoragePath[]
 
   tagSelectionModel = new FilterableDropdownSelectionModel()
   correspondentSelectionModel = new FilterableDropdownSelectionModel()
   documentTypeSelectionModel = new FilterableDropdownSelectionModel()
+  storagePathsSelectionModel = new FilterableDropdownSelectionModel()
   awaitingDownload: boolean
 
   constructor(
@@ -50,7 +52,8 @@ export class BulkEditorComponent {
     private modalService: NgbModal,
     private openDocumentService: OpenDocumentsService,
     private settings: SettingsService,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private storagePathService: StoragePathService
   ) {}
 
   applyOnClose: boolean = this.settings.get(
@@ -70,6 +73,9 @@ export class BulkEditorComponent {
     this.documentTypeService
       .listAll()
       .subscribe((result) => (this.documentTypes = result.results))
+    this.storagePathService
+      .listAll()
+      .subscribe((result) => (this.storagePaths = result.results))
   }
 
   private executeBulkOperation(modal, method: string, args) {
@@ -147,6 +153,17 @@ export class BulkEditorComponent {
       })
   }
 
+  openStoragePathDropdown() {
+    this.documentService
+      .getSelectionData(Array.from(this.list.selected))
+      .subscribe((s) => {
+        this.applySelectionData(
+          s.selected_storage_paths,
+          this.storagePathsSelectionModel
+        )
+      })
+  }
+
   private _localizeList(items: MatchingModel[]) {
     if (items.length == 0) {
       return ''
@@ -301,6 +318,42 @@ export class BulkEditorComponent {
     }
   }
 
+  setStoragePaths(changedDocumentPaths: ChangedItems) {
+    if (
+      changedDocumentPaths.itemsToAdd.length == 0 &&
+      changedDocumentPaths.itemsToRemove.length == 0
+    )
+      return
+
+    let storagePath =
+      changedDocumentPaths.itemsToAdd.length > 0
+        ? changedDocumentPaths.itemsToAdd[0]
+        : null
+
+    if (this.showConfirmationDialogs) {
+      let modal = this.modalService.open(ConfirmDialogComponent, {
+        backdrop: 'static',
+      })
+      modal.componentInstance.title = $localize`Confirm storage path assignment`
+      if (storagePath) {
+        modal.componentInstance.message = $localize`This operation will assign the storage path "${storagePath.name}" to ${this.list.selected.size} selected document(s).`
+      } else {
+        modal.componentInstance.message = $localize`This operation will remove the storage path from ${this.list.selected.size} selected document(s).`
+      }
+      modal.componentInstance.btnClass = 'btn-warning'
+      modal.componentInstance.btnCaption = $localize`Confirm`
+      modal.componentInstance.confirmClicked.subscribe(() => {
+        this.executeBulkOperation(modal, 'set_storage_path', {
+          storage_path: storagePath ? storagePath.id : null,
+        })
+      })
+    } else {
+      this.executeBulkOperation(null, 'set_storage_path', {
+        storage_path: storagePath ? storagePath.id : null,
+      })
+    }
+  }
+
   applyDelete() {
     let modal = this.modalService.open(ConfirmDialogComponent, {
       backdrop: 'static',
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index 43e5ad2a8..1b859f39b 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -60,27 +60,40 @@
           </div>
 
           <div class="list-group list-group-horizontal border-0 card-info ms-md-auto mt-2 mt-md-0">
-            <button *ngIf="document.document_type" type="button" class="list-group-item btn btn-sm bg-light text-dark p-1 border-0 me-2" title="Filter by document type"
+            <button *ngIf="document.document_type" type="button" class="list-group-item btn btn-sm bg-light text-dark p-1 border-0 me-2" title="Filter by document type" i18n-title
              (click)="clickDocumentType.emit(document.document_type);$event.stopPropagation()">
               <svg class="metadata-icon me-2 text-muted bi bi-file-earmark" viewBox="0 0 16 16" fill="currentColor">
                 <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
               </svg>
               <small>{{(document.document_type$ | async)?.name}}</small>
             </button>
+            <button *ngIf="document.storage_path" type="button" class="list-group-item btn btn-sm bg-light text-dark p-1 border-0 me-2" title="Filter by storage path" i18n-title
+             (click)="clickStoragePath.emit(document.storage_path);$event.stopPropagation()">
+              <svg class="metadata-icon me-2 text-muted bi bi-folder" viewBox="0 0 16 16" fill="currentColor">
+                <path d="M0 2a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1v7.5a2.5 2.5 0 0 1-2.5 2.5h-9A2.5 2.5 0 0 1 1 12.5V5a1 1 0 0 1-1-1V2zm2 3v7.5A1.5 1.5 0 0 0 3.5 14h9a1.5 1.5 0 0 0 1.5-1.5V5H2zm13-3H1v2h14V2zM5 7.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5z"/>
+              </svg>
+              <small>{{(document.storage_path$ | async)?.name}}</small>
+            </button>
             <div *ngIf="document.archive_serial_number" class="list-group-item me-2 bg-light text-dark p-1 border-0">
               <svg class="metadata-icon me-2 text-muted bi bi-upc-scan" viewBox="0 0 16 16" fill="currentColor">
                 <path d="M1.5 1a.5.5 0 0 0-.5.5v3a.5.5 0 0 1-1 0v-3A1.5 1.5 0 0 1 1.5 0h3a.5.5 0 0 1 0 1h-3zM11 .5a.5.5 0 0 1 .5-.5h3A1.5 1.5 0 0 1 16 1.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 1-.5-.5zM.5 11a.5.5 0 0 1 .5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 1 0 1h-3A1.5 1.5 0 0 1 0 14.5v-3a.5.5 0 0 1 .5-.5zm15 0a.5.5 0 0 1 .5.5v3a1.5 1.5 0 0 1-1.5 1.5h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 1 .5-.5zM3 4.5a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7zm2 0a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-7zm3 0a.5.5 0 0 1 1 0v7a.5.5 0 0 1-1 0v-7z"/>
               </svg>
               <small>#{{document.archive_serial_number}}</small>
             </div>
-            <div class="list-group-item bg-light text-dark p-1 border-0" ngbTooltip="Added:&nbsp;{{document.added | customDate:'shortDate'}} Created:&nbsp;{{document.created | customDate:'shortDate'}}">
+            <ng-template #dateTooltip>
+              <div class="d-flex flex-column">
+                <span i18n>Created: {{ document.created | customDate }}</span>
+                <span i18n>Added: {{ document.added | customDate }}</span>
+                <span i18n>Modified: {{ document.modified | customDate }}</span>
+              </div>
+            </ng-template>
+            <div class="list-group-item bg-light text-dark p-1 border-0" [ngbTooltip]="dateTooltip">
               <svg class="metadata-icon me-2 text-muted bi bi-calendar-event" viewBox="0 0 16 16" fill="currentColor">
                 <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z"/>
                 <path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5zM1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4H1z"/>
               </svg>
               <small>{{document.created_date | customDate:'mediumDate'}}</small>
             </div>
-
             <div *ngIf="document.__search_hit__?.score" class="list-group-item bg-light text-dark border-0 d-flex p-0 ps-4 search-score">
               <small class="text-muted" i18n>Score:</small>
               <ngb-progressbar [type]="searchScoreClass" [value]="document.__search_hit__.score" class="search-score-bar mx-2 mt-1" [max]="1"></ngb-progressbar>
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
index 061a0e681..de6b94032 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts
@@ -8,12 +8,12 @@ import {
 } from '@angular/core'
 import { PaperlessDocument } from 'src/app/data/paperless-document'
 import { DocumentService } from 'src/app/services/rest/document.service'
-import {
-  SettingsService,
-  SETTINGS_KEYS,
-} from 'src/app/services/settings.service'
+import { SettingsService } from 'src/app/services/settings.service'
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
 import { OpenDocumentsService } from 'src/app/services/open-documents.service'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
+import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type'
+import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
 
 @Component({
   selector: 'app-document-card-large',
@@ -52,6 +52,9 @@ export class DocumentCardLargeComponent implements OnInit {
   @Output()
   clickDocumentType = new EventEmitter<number>()
 
+  @Output()
+  clickStoragePath = new EventEmitter<number>()
+
   @Output()
   clickMoreLike = new EventEmitter()
 
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 2697a9425..69c81793c 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -10,10 +10,8 @@
         </div>
       </div>
 
-      <div style="top: 0; right: 0; font-size: large" class="text-end position-absolute me-1">
-        <div *ngFor="let t of getTagsLimited$() | async">
-          <app-tag [tag]="t" (click)="clickTag.emit(t.id);$event.stopPropagation()" [clickable]="true" linkTitle="Filter by tag" i18n-linkTitle></app-tag>
-        </div>
+      <div class="tags d-flex flex-column text-end position-absolute me-1 fs-6">
+        <app-tag *ngFor="let t of getTagsLimited$() | async" [tag]="t" (click)="clickTag.emit(t.id);$event.stopPropagation()" [clickable]="true" linkTitle="Filter by tag" i18n-linkTitle></app-tag>
         <div *ngIf="moreTags">
           <span class="badge badge-secondary">+ {{moreTags}}</span>
         </div>
@@ -30,22 +28,28 @@
     </div>
     <div class="card-footer pt-0 pb-2 px-2">
       <div class="list-group list-group-flush border-0 pt-1 pb-2 card-info">
-        <button *ngIf="document.document_type" type="button" class="list-group-item list-group-item-action bg-transparent ps-0 p-1 border-0" title="Filter by document type"
+        <button *ngIf="document.document_type" type="button" class="list-group-item list-group-item-action bg-transparent ps-0 p-1 border-0" title="Filter by document type" i18n-title
          (click)="clickDocumentType.emit(document.document_type);$event.stopPropagation()">
           <svg class="metadata-icon me-2 text-muted bi bi-file-earmark" viewBox="0 0 16 16" fill="currentColor">
             <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5L14 4.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5h-2z"/>
           </svg>
           <small>{{(document.document_type$ | async)?.name}}</small>
         </button>
+        <button *ngIf="document.storage_path" type="button" class="list-group-item list-group-item-action bg-transparent ps-0 p-1 border-0" title="Filter by storage path" i18n-title
+         (click)="clickStoragePath.emit(document.storage_path);$event.stopPropagation()">
+          <svg class="metadata-icon me-2 text-muted bi bi-folder" viewBox="0 0 16 16" fill="currentColor">
+            <path d="M0 2a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1v7.5a2.5 2.5 0 0 1-2.5 2.5h-9A2.5 2.5 0 0 1 1 12.5V5a1 1 0 0 1-1-1V2zm2 3v7.5A1.5 1.5 0 0 0 3.5 14h9a1.5 1.5 0 0 0 1.5-1.5V5H2zm13-3H1v2h14V2zM5 7.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1-.5-.5z"/>
+          </svg>
+          <small>{{(document.storage_path$ | async)?.name}}</small>
+        </button>
         <div class="list-group-item bg-transparent p-0 border-0 d-flex flex-wrap-reverse justify-content-between">
           <ng-template #dateTooltip>
             <div class="d-flex flex-column">
-              <span i18n>Created: {{ document.created | customDate}}</span>
-              <span i18n>Added: {{ document.added | customDate}}</span>
-              <span i18n>Modified: {{ document.modified | customDate}}</span>
+              <span i18n>Created: {{ document.created | customDate }}</span>
+              <span i18n>Added: {{ document.added | customDate }}</span>
+              <span i18n>Modified: {{ document.modified | customDate }}</span>
             </div>
           </ng-template>
-
           <div class="ps-0 p-1" placement="top" [ngbTooltip]="dateTooltip">
             <svg class="metadata-icon me-2 text-muted bi bi-calendar-event" viewBox="0 0 16 16" fill="currentColor">
               <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5v-1z"/>
@@ -79,7 +83,7 @@
           <ng-template #previewContent>
             <object [data]="previewUrl | safeUrl" class="preview" width="100%"></object>
           </ng-template>
-          <a [href]="getDownloadUrl()" class="btn btn-sm btn-outline-secondary" title="Download" (click)="$event.stopPropagation()" i18n-title>
+          <a [href]="getDownloadUrl()" class="btn btn-sm btn-outline-secondary" title="Download" i18n-title (click)="$event.stopPropagation()">
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-download" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
               <path fill-rule="evenodd" d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
               <path fill-rule="evenodd" d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
index 4d03d0a4d..6ccbba0c2 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss
@@ -78,3 +78,11 @@
 a {
   cursor: pointer;
 }
+
+.tags {
+  top: 0;
+  right: 0;
+  max-width: 80%;
+  row-gap: .2rem;
+  line-height: 1;
+}
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
index c166b42cb..3f7fc7982 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts
@@ -9,12 +9,10 @@ import {
 import { map } from 'rxjs/operators'
 import { PaperlessDocument } from 'src/app/data/paperless-document'
 import { DocumentService } from 'src/app/services/rest/document.service'
-import {
-  SettingsService,
-  SETTINGS_KEYS,
-} from 'src/app/services/settings.service'
+import { SettingsService } from 'src/app/services/settings.service'
 import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
 import { OpenDocumentsService } from 'src/app/services/open-documents.service'
+import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
 
 @Component({
   selector: 'app-document-card-small',
@@ -49,6 +47,9 @@ export class DocumentCardSmallComponent implements OnInit {
   @Output()
   clickDocumentType = new EventEmitter<number>()
 
+  @Output()
+  clickStoragePath = new EventEmitter<number>()
+
   moreTags: number = null
 
   @ViewChild('popover') popover: NgbPopover
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index 80ccdf01b..183524703 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -93,7 +93,7 @@
         <span i18n *ngIf="list.selected.size == 0">{list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}}</span>&nbsp;<span i18n *ngIf="isFiltered">(filtered)</span>
       </ng-container>
     </p>
-    <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" [(page)]="list.currentPage" [maxSize]="5"
+    <ngb-pagination [pageSize]="list.currentPageSize" [collectionSize]="list.collectionSize" (pageChange)="setPage($event)" [page]="list.currentPage" [maxSize]="5"
     [rotate]="true" aria-label="Default pagination"></ngb-pagination>
   </div>
 </ng-template>
@@ -107,7 +107,7 @@
 <ng-template #documentListNoError>
 
   <div *ngIf="displayMode == 'largeCards'">
-    <app-document-card-large [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)" (clickMoreLike)="clickMoreLike(d.id)">
+    <app-document-card-large [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" *ngFor="let d of list.documents; trackBy: trackByDocumentId" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)" (clickStoragePath)="clickStoragePath($event)" (clickMoreLike)="clickMoreLike(d.id)">
     </app-document-card-large>
   </div>
 
@@ -138,6 +138,12 @@
         [currentSortReverse]="list.sortReverse"
         (sort)="onSort($event)"
         i18n>Document type</th>
+      <th class="d-none d-xl-table-cell"
+        sortable="storage_path__name"
+        [currentSortField]="list.sortField"
+        [currentSortReverse]="list.sortReverse"
+        (sort)="onSort($event)"
+        i18n>Storage path</th>
       <th
         sortable="created"
         [currentSortField]="list.sortField"
@@ -164,16 +170,21 @@
         </td>
         <td class="d-none d-md-table-cell">
           <ng-container *ngIf="d.correspondent">
-            <a (click)="clickCorrespondent(d.correspondent);$event.stopPropagation()" title="Filter by correspondent">{{(d.correspondent$ | async)?.name}}</a>
+            <a (click)="clickCorrespondent(d.correspondent);$event.stopPropagation()" title="Filter by correspondent" i18n-title>{{(d.correspondent$ | async)?.name}}</a>
           </ng-container>
         </td>
         <td>
-          <a (click)="openDocumentsService.openDocument(d)" title="Edit document" style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a>
-          <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ms-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t.id);$event.stopPropagation()"></app-tag>
+          <a (click)="openDocumentsService.openDocument(d)" title="Edit document" i18n-title style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a>
+          <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ms-1" clickable="true" linkTitle="Filter by tag" i18n-linkTitle (click)="clickTag(t.id);$event.stopPropagation()"></app-tag>
         </td>
         <td class="d-none d-xl-table-cell">
           <ng-container *ngIf="d.document_type">
-            <a (click)="clickDocumentType(d.document_type);$event.stopPropagation()" title="Filter by document type">{{(d.document_type$ | async)?.name}}</a>
+            <a (click)="clickDocumentType(d.document_type);$event.stopPropagation()" title="Filter by document type" i18n-title>{{(d.document_type$ | async)?.name}}</a>
+          </ng-container>
+        </td>
+        <td class="d-none d-xl-table-cell">
+          <ng-container *ngIf="d.storage_path">
+            <a (click)="clickStoragePath(d.storage_path);$event.stopPropagation()" title="Filter by storage path" i18n-title>{{(d.storage_path$ | async)?.name}}</a>
           </ng-container>
         </td>
         <td>
@@ -187,7 +198,7 @@
   </table>
 
   <div class="row row-cols-paperless-cards" *ngIf="displayMode == 'smallCards'">
-    <app-document-card-small class="p-0" [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickDocumentType)="clickDocumentType($event)"></app-document-card-small>
+    <app-document-card-small class="p-0" [selected]="list.isSelected(d)" (toggleSelected)="toggleSelected(d, $event)" [document]="d" *ngFor="let d of list.documents; trackBy: trackByDocumentId" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickStoragePath)="clickStoragePath($event)" (clickDocumentType)="clickDocumentType($event)"></app-document-card-small>
   </div>
   <div *ngIf="list.documents?.length > 15" class="mt-3">
     <ng-container *ngTemplateOutlet="pagination"></ng-container>
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index 8cf6c3848..e27f14b14 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -1,5 +1,4 @@
 import {
-  AfterViewInit,
   Component,
   OnDestroy,
   OnInit,
@@ -21,7 +20,6 @@ import {
 import { ConsumerStatusService } from 'src/app/services/consumer-status.service'
 import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 import { OpenDocumentsService } from 'src/app/services/open-documents.service'
-import { QueryParamsService } from 'src/app/services/query-params.service'
 import {
   DOCUMENT_SORT_FIELDS,
   DOCUMENT_SORT_FIELDS_FULLTEXT,
@@ -36,7 +34,7 @@ import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-vi
   templateUrl: './document-list.component.html',
   styleUrls: ['./document-list.component.scss'],
 })
-export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
+export class DocumentListComponent implements OnInit, OnDestroy {
   constructor(
     public list: DocumentListViewService,
     public savedViewService: SavedViewService,
@@ -45,7 +43,6 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
     private toastService: ToastService,
     private modalService: NgbModal,
     private consumerStatusService: ConsumerStatusService,
-    private queryParamsService: QueryParamsService,
     public openDocumentsService: OpenDocumentsService
   ) {}
 
@@ -76,8 +73,6 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
 
   set listSort(reverse: boolean) {
     this.list.sortReverse = reverse
-    this.queryParamsService.sortField = this.list.sortField
-    this.queryParamsService.sortReverse = reverse
   }
 
   get listSort(): boolean {
@@ -86,14 +81,14 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
 
   setSortField(field: string) {
     this.list.sortField = field
-    this.queryParamsService.sortField = field
-    this.queryParamsService.sortReverse = this.listSort
   }
 
   onSort(event: SortEvent) {
     this.list.setSort(event.column, event.reverse)
-    this.queryParamsService.sortField = event.column
-    this.queryParamsService.sortReverse = event.reverse
+  }
+
+  setPage(page: number) {
+    this.list.currentPage = page
   }
 
   get isBulkEditing(): boolean {
@@ -133,7 +128,6 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
         }
         this.list.activateSavedView(view)
         this.list.reload()
-        this.queryParamsService.updateFromView(view)
         this.unmodifiedFilterRules = view.filter_rules
       })
 
@@ -148,22 +142,12 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
           this.loadViewConfig(parseInt(queryParams.get('view')))
         } else {
           this.list.activateSavedView(null)
-          this.queryParamsService.parseQueryParams(queryParams)
+          this.list.loadFromQueryParams(queryParams)
           this.unmodifiedFilterRules = []
         }
       })
   }
 
-  ngAfterViewInit(): void {
-    this.filterEditor.filterRulesChange
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe({
-        next: (filterRules) => {
-          this.queryParamsService.updateFilterRules(filterRules)
-        },
-      })
-  }
-
   ngOnDestroy() {
     // unsubscribes all
     this.unsubscribeNotifier.next(this)
@@ -175,9 +159,8 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
       .getCached(viewId)
       .pipe(first())
       .subscribe((view) => {
-        this.list.loadSavedView(view)
+        this.list.activateSavedView(view)
         this.list.reload()
-        this.queryParamsService.updateFromView(view)
       })
   }
 
@@ -246,27 +229,26 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit {
 
   clickTag(tagID: number) {
     this.list.selectNone()
-    setTimeout(() => {
-      this.filterEditor.addTag(tagID)
-    })
+    this.filterEditor.addTag(tagID)
   }
 
   clickCorrespondent(correspondentID: number) {
     this.list.selectNone()
-    setTimeout(() => {
-      this.filterEditor.addCorrespondent(correspondentID)
-    })
+    this.filterEditor.addCorrespondent(correspondentID)
   }
 
   clickDocumentType(documentTypeID: number) {
     this.list.selectNone()
-    setTimeout(() => {
-      this.filterEditor.addDocumentType(documentTypeID)
-    })
+    this.filterEditor.addDocumentType(documentTypeID)
+  }
+
+  clickStoragePath(storagePathID: number) {
+    this.list.selectNone()
+    this.filterEditor.addStoragePath(storagePathID)
   }
 
   clickMoreLike(documentID: number) {
-    this.queryParamsService.navigateWithFilterRules([
+    this.list.quickFilter([
       { rule_type: FILTER_FULLTEXT_MORELIKE, value: documentID.toString() },
     ])
   }
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 40c62d779..6709cfd0e 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -1,7 +1,7 @@
-<div class="row">
+<div class="row flex-wrap">
    <div class="col mb-2 mb-xl-0">
      <div class="form-inline d-flex align-items-center">
-         <div class="input-group input-group-sm flex-fill w-auto">
+         <div class="input-group input-group-sm flex-fill w-auto flex-nowrap">
            <div ngbDropdown>
             <button class="btn btn-sm btn-outline-primary" ngbDropdownToggle>{{textFilterTargetName}}</button>
             <div class="dropdown-menu shadow" ngbDropdownMenu>
@@ -18,43 +18,54 @@
   <div class="w-100 d-xl-none"></div>
     <div class="col col-xl-auto">
       <div class="d-flex flex-wrap">
-        <app-filterable-dropdown class="flex-fill" title="Tags" icon="tag-fill" i18n-title
-          filterPlaceholder="Filter tags" i18n-filterPlaceholder
-          [items]="tags"
-          [(selectionModel)]="tagSelectionModel"
-          (selectionModelChange)="updateRules()"
-          [multiple]="true"
-          (open)="onTagsDropdownOpen()"
-          [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-filterable-dropdown class="flex-fill" title="Correspondent" icon="person-fill" i18n-title
-          filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
-          [items]="correspondents"
-          [(selectionModel)]="correspondentSelectionModel"
-          (selectionModelChange)="updateRules()"
-          (open)="onCorrespondentDropdownOpen()"
-          [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-filterable-dropdown class="flex-fill" title="Document type" icon="file-earmark-fill" i18n-title
-          filterPlaceholder="Filter document types" i18n-filterPlaceholder
-          [items]="documentTypes"
-          [(selectionModel)]="documentTypeSelectionModel"
-          (open)="onDocumentTypeDropdownOpen()"
-          (selectionModelChange)="updateRules()"
-          [allowSelectNone]="true"></app-filterable-dropdown>
-        <app-date-dropdown class="mb-2 mb-xl-0"
-          title="Created" i18n-title
-          (datesSet)="updateRules()"
-          [(dateBefore)]="dateCreatedBefore"
-          [(dateAfter)]="dateCreatedAfter"></app-date-dropdown>
-        <app-date-dropdown class="mb-2 mb-xl-0"
-          [(dateBefore)]="dateAddedBefore"
-          [(dateAfter)]="dateAddedAfter"
-          title="Added" i18n-title
-          (datesSet)="updateRules()"></app-date-dropdown>
+        <div class="d-flex flex-wrap mb-2 mb-lg-0">
+          <app-filterable-dropdown class="flex-fill" title="Tags" icon="tag-fill" i18n-title
+            filterPlaceholder="Filter tags" i18n-filterPlaceholder
+            [items]="tags"
+            [(selectionModel)]="tagSelectionModel"
+            (selectionModelChange)="updateRules()"
+            [multiple]="true"
+            (open)="onTagsDropdownOpen()"
+            [allowSelectNone]="true"></app-filterable-dropdown>
+          <app-filterable-dropdown class="flex-fill" title="Correspondent" icon="person-fill" i18n-title
+            filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
+            [items]="correspondents"
+            [(selectionModel)]="correspondentSelectionModel"
+            (selectionModelChange)="updateRules()"
+            (open)="onCorrespondentDropdownOpen()"
+            [allowSelectNone]="true"></app-filterable-dropdown>
+          <app-filterable-dropdown class="flex-fill" title="Document type" icon="file-earmark-fill" i18n-title
+            filterPlaceholder="Filter document types" i18n-filterPlaceholder
+            [items]="documentTypes"
+            [(selectionModel)]="documentTypeSelectionModel"
+            (open)="onDocumentTypeDropdownOpen()"
+            (selectionModelChange)="updateRules()"
+            [allowSelectNone]="true"></app-filterable-dropdown>
+          <app-filterable-dropdown class="me-2 flex-fill" title="Storage path" icon="folder-fill" i18n-title
+            filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
+            [items]="storagePaths"
+            [(selectionModel)]="storagePathSelectionModel"
+            (open)="onStoragePathDropdownOpen()"
+            (selectionModelChange)="updateRules()"
+            [allowSelectNone]="true"></app-filterable-dropdown>
+        </div>
+        <div class="d-flex flex-wrap">
+          <app-date-dropdown class="mb-2 mb-xl-0"
+            title="Created" i18n-title
+            (datesSet)="updateRules()"
+            [(dateBefore)]="dateCreatedBefore"
+            [(dateAfter)]="dateCreatedAfter"></app-date-dropdown>
+          <app-date-dropdown class="mb-2 mb-xl-0"
+            [(dateBefore)]="dateAddedBefore"
+            [(dateAfter)]="dateAddedAfter"
+            title="Added" i18n-title
+            (datesSet)="updateRules()"></app-date-dropdown>
+        </div>
      </div>
    </div>
    <div class="w-100 d-xl-none"></div>
-   <div class="col col-xl-auto">
-     <button class="btn btn-link btn-sm px-0 mx-0 ms-xl-n3" [disabled]="!rulesModified" (click)="resetSelected()">
+   <div class="col col-xl-auto ps-0">
+     <button class="btn btn-link btn-sm px-0" [disabled]="!rulesModified" (click)="resetSelected()">
        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-x me-1" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
          <path fill-rule="evenodd" d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
        </svg><ng-container i18n>Reset filters</ng-container>
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index a6c7247c5..421cd0693 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -33,6 +33,7 @@ import {
   FILTER_DOES_NOT_HAVE_TAG,
   FILTER_TITLE,
   FILTER_TITLE_CONTENT,
+  FILTER_STORAGE_PATH,
   FILTER_ASN_ISNULL,
   FILTER_ASN_GT,
   FILTER_ASN_LT,
@@ -41,6 +42,8 @@ import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdo
 import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'
 import { DocumentService } from 'src/app/services/rest/document.service'
 import { PaperlessDocument } from 'src/app/data/paperless-document'
+import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path'
+import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 
 const TEXT_FILTER_TARGET_TITLE = 'title'
 const TEXT_FILTER_TARGET_TITLE_CONTENT = 'title-content'
@@ -107,7 +110,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     private documentTypeService: DocumentTypeService,
     private tagService: TagService,
     private correspondentService: CorrespondentService,
-    private documentService: DocumentService
+    private documentService: DocumentService,
+    private storagePathService: StoragePathService
   ) {}
 
   @ViewChild('textFilterInput')
@@ -116,6 +120,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   tags: PaperlessTag[] = []
   correspondents: PaperlessCorrespondent[] = []
   documentTypes: PaperlessDocumentType[] = []
+  storagePaths: PaperlessStoragePath[] = []
 
   _textFilter = ''
   _moreLikeId: number
@@ -186,6 +191,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
   tagSelectionModel = new FilterableDropdownSelectionModel()
   correspondentSelectionModel = new FilterableDropdownSelectionModel()
   documentTypeSelectionModel = new FilterableDropdownSelectionModel()
+  storagePathSelectionModel = new FilterableDropdownSelectionModel()
 
   dateCreatedBefore: string
   dateCreatedAfter: string
@@ -210,6 +216,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this._filterRules = value
 
     this.documentTypeSelectionModel.clear(false)
+    this.storagePathSelectionModel.clear(false)
     this.tagSelectionModel.clear(false)
     this.correspondentSelectionModel.clear(false)
     this._textFilter = null
@@ -297,9 +304,19 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
             false
           )
           break
+        case FILTER_STORAGE_PATH:
+          this.storagePathSelectionModel.set(
+            rule.value ? +rule.value : null,
+            ToggleableItemState.Selected,
+            false
+          )
+          break
         case FILTER_ASN_ISNULL:
           this.textFilterTarget = TEXT_FILTER_TARGET_ASN
-          this.textFilterModifier = TEXT_FILTER_MODIFIER_NULL
+          this.textFilterModifier =
+            rule.value == 'true' || rule.value == '1'
+              ? TEXT_FILTER_MODIFIER_NULL
+              : TEXT_FILTER_MODIFIER_NOTNULL
           break
         case FILTER_ASN_GT:
           this.textFilterTarget = TEXT_FILTER_TARGET_ASN
@@ -418,6 +435,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
           value: documentType.id?.toString(),
         })
       })
+    this.storagePathSelectionModel.getSelectedItems().forEach((storagePath) => {
+      filterRules.push({
+        rule_type: FILTER_STORAGE_PATH,
+        value: storagePath.id?.toString(),
+      })
+    })
     if (this.dateCreatedBefore) {
       filterRules.push({
         rule_type: FILTER_CREATED_BEFORE,
@@ -500,6 +523,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this.documentTypeService
       .listAll()
       .subscribe((result) => (this.documentTypes = result.results))
+    this.storagePathService
+      .listAll()
+      .subscribe((result) => (this.storagePaths = result.results))
 
     this.textFilterDebounce = new Subject<string>()
 
@@ -542,6 +568,13 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     )
   }
 
+  addStoragePath(storagePathID: number) {
+    this.storagePathSelectionModel.set(
+      storagePathID,
+      ToggleableItemState.Selected
+    )
+  }
+
   onTagsDropdownOpen() {
     this.tagSelectionModel.apply()
   }
@@ -554,6 +587,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     this.documentTypeSelectionModel.apply()
   }
 
+  onStoragePathDropdownOpen() {
+    this.storagePathSelectionModel.apply()
+  }
+
   updateTextFilter(text) {
     this._textFilter = text
     this.documentService.searchQuery = text
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index 9eb05758c..983c36290 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -3,7 +3,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { FILTER_CORRESPONDENT } from 'src/app/data/filter-rule-type'
 import { PaperlessCorrespondent } from 'src/app/data/paperless-correspondent'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
-import { QueryParamsService } from 'src/app/services/query-params.service'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { CorrespondentEditDialogComponent } from '../../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component'
@@ -20,7 +20,7 @@ export class CorrespondentListComponent extends ManagementListComponent<Paperles
     correspondentsService: CorrespondentService,
     modalService: NgbModal,
     toastService: ToastService,
-    queryParamsService: QueryParamsService,
+    documentListViewService: DocumentListViewService,
     private datePipe: CustomDatePipe
   ) {
     super(
@@ -28,7 +28,7 @@ export class CorrespondentListComponent extends ManagementListComponent<Paperles
       modalService,
       CorrespondentEditDialogComponent,
       toastService,
-      queryParamsService,
+      documentListViewService,
       FILTER_CORRESPONDENT,
       $localize`correspondent`,
       $localize`correspondents`,
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
index 8f903e65b..ff5dee8f4 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { FILTER_DOCUMENT_TYPE } from 'src/app/data/filter-rule-type'
 import { PaperlessDocumentType } from 'src/app/data/paperless-document-type'
-import { QueryParamsService } from 'src/app/services/query-params.service'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { DocumentTypeEditDialogComponent } from '../../common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component'
@@ -18,14 +18,14 @@ export class DocumentTypeListComponent extends ManagementListComponent<Paperless
     documentTypeService: DocumentTypeService,
     modalService: NgbModal,
     toastService: ToastService,
-    queryParamsService: QueryParamsService
+    documentListViewService: DocumentListViewService
   ) {
     super(
       documentTypeService,
       modalService,
       DocumentTypeEditDialogComponent,
       toastService,
-      queryParamsService,
+      documentListViewService,
       FILTER_DOCUMENT_TYPE,
       $localize`document type`,
       $localize`document types`,
diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.ts b/src-ui/src/app/components/manage/management-list/management-list.component.ts
index 89218f80b..317cf6fee 100644
--- a/src-ui/src/app/components/manage/management-list/management-list.component.ts
+++ b/src-ui/src/app/components/manage/management-list/management-list.component.ts
@@ -18,7 +18,7 @@ import {
   SortableDirective,
   SortEvent,
 } from 'src/app/directives/sortable.directive'
-import { QueryParamsService } from 'src/app/services/query-params.service'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 import { AbstractNameFilterService } from 'src/app/services/rest/abstract-name-filter-service'
 import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
@@ -42,7 +42,7 @@ export abstract class ManagementListComponent<T extends ObjectWithId>
     private modalService: NgbModal,
     private editDialogComponent: any,
     private toastService: ToastService,
-    private queryParamsService: QueryParamsService,
+    private documentListViewService: DocumentListViewService,
     protected filterRuleType: number,
     public typeName: string,
     public typeNamePlural: string,
@@ -141,7 +141,7 @@ export abstract class ManagementListComponent<T extends ObjectWithId>
   }
 
   filterDocuments(object: ObjectWithId) {
-    this.queryParamsService.navigateWithFilterRules([
+    this.documentListViewService.quickFilter([
       { rule_type: this.filterRuleType, value: object.id.toString() },
     ])
   }
diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index 7e52db59e..002cc4eed 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -22,7 +22,7 @@
               <option *ngFor="let lang of displayLanguageOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code && currentLocale != 'en-US'"> - {{lang.englishName}}</span></option>
             </select>
 
-            <small class="form-text text-muted" i18n>You need to reload the page after applying a new language.</small>
+            <small *ngIf="displayLanguageIsDirty" class="form-text text-primary" i18n>You need to reload the page after applying a new language.</small>
 
           </div>
         </div>
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 45785c709..22ecfe9bb 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -13,11 +13,11 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import {
   LanguageOption,
   SettingsService,
-  SETTINGS_KEYS,
 } from 'src/app/services/settings.service'
-import { ToastService } from 'src/app/services/toast.service'
+import { Toast, ToastService } from 'src/app/services/toast.service'
 import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms'
-import { Observable, Subscription, BehaviorSubject } from 'rxjs'
+import { Observable, Subscription, BehaviorSubject, first } from 'rxjs'
+import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
 
 @Component({
   selector: 'app-settings',
@@ -61,6 +61,13 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent {
     )
   }
 
+  get displayLanguageIsDirty(): boolean {
+    return (
+      this.settingsForm.get('displayLanguage').value !=
+      this.store?.getValue()['displayLanguage']
+    )
+  }
+
   constructor(
     public savedViewService: SavedViewService,
     private documentListViewService: DocumentListViewService,
@@ -170,6 +177,7 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent {
   }
 
   private saveLocalSettings() {
+    const reloadRequired = this.displayLanguageIsDirty // just this one, for now
     this.settings.set(
       SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE,
       this.settingsForm.value.bulkEditApplyOnClose
@@ -227,10 +235,36 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent {
       this.settingsForm.value.notificationsConsumerSuppressOnDashboard
     )
     this.settings.setLanguage(this.settingsForm.value.displayLanguage)
-    this.store.next(this.settingsForm.value)
-    this.documentListViewService.updatePageSize()
-    this.settings.updateAppearanceSettings()
-    this.toastService.showInfo($localize`Settings saved successfully.`)
+    this.settings
+      .storeSettings()
+      .pipe(first())
+      .subscribe({
+        next: () => {
+          this.store.next(this.settingsForm.value)
+          this.documentListViewService.updatePageSize()
+          this.settings.updateAppearanceSettings()
+          let savedToast: Toast = {
+            title: $localize`Settings saved`,
+            content: $localize`Settings were saved successfully.`,
+            delay: 500000,
+          }
+          if (reloadRequired) {
+            ;(savedToast.content = $localize`Settings were saved successfully. Reload is required to apply some changes.`),
+              (savedToast.actionName = $localize`Reload now`)
+            savedToast.action = () => {
+              location.reload()
+            }
+          }
+
+          this.toastService.show(savedToast)
+        },
+        error: (error) => {
+          this.toastService.showError(
+            $localize`An error occurred while saving settings.`
+          )
+          console.log(error)
+        },
+      })
   }
 
   get displayLanguageOptions(): LanguageOption[] {
diff --git a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts b/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts
new file mode 100644
index 000000000..1d7b726a0
--- /dev/null
+++ b/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts
@@ -0,0 +1,47 @@
+import { Component } from '@angular/core'
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
+import { FILTER_STORAGE_PATH } from 'src/app/data/filter-rule-type'
+import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
+import { StoragePathService } from 'src/app/services/rest/storage-path.service'
+import { ToastService } from 'src/app/services/toast.service'
+import { StoragePathEditDialogComponent } from '../../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
+import { ManagementListComponent } from '../management-list/management-list.component'
+
+@Component({
+  selector: 'app-storage-path-list',
+  templateUrl: './../management-list/management-list.component.html',
+  styleUrls: ['./../management-list/management-list.component.scss'],
+})
+export class StoragePathListComponent extends ManagementListComponent<PaperlessStoragePath> {
+  constructor(
+    directoryService: StoragePathService,
+    modalService: NgbModal,
+    toastService: ToastService,
+    documentListViewService: DocumentListViewService
+  ) {
+    super(
+      directoryService,
+      modalService,
+      StoragePathEditDialogComponent,
+      toastService,
+      documentListViewService,
+      FILTER_STORAGE_PATH,
+      $localize`storage path`,
+      $localize`storage paths`,
+      [
+        {
+          key: 'path',
+          name: $localize`Path`,
+          valueFn: (c: PaperlessStoragePath) => {
+            return c.path
+          },
+        },
+      ]
+    )
+  }
+
+  getDeleteMessage(object: PaperlessStoragePath) {
+    return $localize`Do you really want to delete the storage path "${object.name}"?`
+  }
+}
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
index cbb47d48e..0be451ec2 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type'
 import { PaperlessTag } from 'src/app/data/paperless-tag'
-import { QueryParamsService } from 'src/app/services/query-params.service'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 import { TagService } from 'src/app/services/rest/tag.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { TagEditDialogComponent } from '../../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component'
@@ -18,14 +18,14 @@ export class TagListComponent extends ManagementListComponent<PaperlessTag> {
     tagService: TagService,
     modalService: NgbModal,
     toastService: ToastService,
-    queryParamsService: QueryParamsService
+    documentListViewService: DocumentListViewService
   ) {
     super(
       tagService,
       modalService,
       TagEditDialogComponent,
       toastService,
-      queryParamsService,
+      documentListViewService,
       FILTER_HAS_TAGS_ALL,
       $localize`tag`,
       $localize`tags`,
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index d6960ec58..35e597ab6 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -1,32 +1,38 @@
 export const FILTER_TITLE = 0
 export const FILTER_CONTENT = 1
+
 export const FILTER_ASN = 2
+export const FILTER_ASN_ISNULL = 18
+export const FILTER_ASN_GT = 23
+export const FILTER_ASN_LT = 24
+
 export const FILTER_CORRESPONDENT = 3
+
 export const FILTER_DOCUMENT_TYPE = 4
+
 export const FILTER_IS_IN_INBOX = 5
 export const FILTER_HAS_TAGS_ALL = 6
 export const FILTER_HAS_ANY_TAG = 7
+export const FILTER_DOES_NOT_HAVE_TAG = 17
 export const FILTER_HAS_TAGS_ANY = 22
+
+export const FILTER_STORAGE_PATH = 25
+
 export const FILTER_CREATED_BEFORE = 8
 export const FILTER_CREATED_AFTER = 9
 export const FILTER_CREATED_YEAR = 10
 export const FILTER_CREATED_MONTH = 11
 export const FILTER_CREATED_DAY = 12
+
 export const FILTER_ADDED_BEFORE = 13
 export const FILTER_ADDED_AFTER = 14
+
 export const FILTER_MODIFIED_BEFORE = 15
 export const FILTER_MODIFIED_AFTER = 16
 
-export const FILTER_DOES_NOT_HAVE_TAG = 17
-
-export const FILTER_ASN_ISNULL = 18
-export const FILTER_ASN_GT = 19
-export const FILTER_ASN_LT = 20
-
-export const FILTER_TITLE_CONTENT = 21
-
-export const FILTER_FULLTEXT_QUERY = 22
-export const FILTER_FULLTEXT_MORELIKE = 23
+export const FILTER_TITLE_CONTENT = 19
+export const FILTER_FULLTEXT_QUERY = 20
+export const FILTER_FULLTEXT_MORELIKE = 21
 
 export const FILTER_RULE_TYPES: FilterRuleType[] = [
   {
@@ -56,6 +62,13 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
     datatype: 'correspondent',
     multi: false,
   },
+  {
+    id: FILTER_STORAGE_PATH,
+    filtervar: 'storage_path__id',
+    isnull_filtervar: 'storage_path__isnull',
+    datatype: 'storage_path',
+    multi: false,
+  },
   {
     id: FILTER_DOCUMENT_TYPE,
     filtervar: 'document_type__id',
@@ -180,7 +193,6 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
     datatype: 'string',
     multi: false,
   },
-
   {
     id: FILTER_FULLTEXT_MORELIKE,
     filtervar: 'more_like_id',
diff --git a/src-ui/src/app/data/paperless-document-suggestions.ts b/src-ui/src/app/data/paperless-document-suggestions.ts
index 0a27df349..47d480985 100644
--- a/src-ui/src/app/data/paperless-document-suggestions.ts
+++ b/src-ui/src/app/data/paperless-document-suggestions.ts
@@ -4,4 +4,6 @@ export interface PaperlessDocumentSuggestions {
   correspondents?: number[]
 
   document_types?: number[]
+
+  storage_paths?: number[]
 }
diff --git a/src-ui/src/app/data/paperless-document.ts b/src-ui/src/app/data/paperless-document.ts
index 051fa0aaa..f5f83868c 100644
--- a/src-ui/src/app/data/paperless-document.ts
+++ b/src-ui/src/app/data/paperless-document.ts
@@ -3,6 +3,7 @@ import { ObjectWithId } from './object-with-id'
 import { PaperlessTag } from './paperless-tag'
 import { PaperlessDocumentType } from './paperless-document-type'
 import { Observable } from 'rxjs'
+import { PaperlessStoragePath } from './paperless-storage-path'
 
 export interface SearchHit {
   score?: number
@@ -20,6 +21,10 @@ export interface PaperlessDocument extends ObjectWithId {
 
   document_type?: number
 
+  storage_path$?: Observable<PaperlessStoragePath>
+
+  storage_path?: number
+
   title?: string
 
   content?: string
diff --git a/src-ui/src/app/data/paperless-storage-path.ts b/src-ui/src/app/data/paperless-storage-path.ts
new file mode 100644
index 000000000..cdd5b3e7a
--- /dev/null
+++ b/src-ui/src/app/data/paperless-storage-path.ts
@@ -0,0 +1,5 @@
+import { MatchingModel } from './matching-model'
+
+export interface PaperlessStoragePath extends MatchingModel {
+  path?: string
+}
diff --git a/src-ui/src/app/data/paperless-uisettings.ts b/src-ui/src/app/data/paperless-uisettings.ts
new file mode 100644
index 000000000..75aec2a51
--- /dev/null
+++ b/src-ui/src/app/data/paperless-uisettings.ts
@@ -0,0 +1,117 @@
+export interface PaperlessUiSettings {
+  user_id: number
+
+  username: string
+
+  display_name: string
+
+  settings: Object
+}
+
+export interface PaperlessUiSetting {
+  key: string
+  type: string
+  default: any
+}
+
+export const SETTINGS_KEYS = {
+  LANGUAGE: 'language',
+  // maintain old general-settings: for backwards compatibility
+  BULK_EDIT_CONFIRMATION_DIALOGS:
+    'general-settings:bulk-edit:confirmation-dialogs',
+  BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close',
+  DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
+  DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system',
+  DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled',
+  DARK_MODE_THUMB_INVERTED: 'general-settings:dark-mode:thumb-inverted',
+  THEME_COLOR: 'general-settings:theme:color',
+  USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer',
+  DATE_LOCALE: 'general-settings:date-display:date-locale',
+  DATE_FORMAT: 'general-settings:date-display:date-format',
+  NOTIFICATIONS_CONSUMER_NEW_DOCUMENT:
+    'general-settings:notifications:consumer-new-documents',
+  NOTIFICATIONS_CONSUMER_SUCCESS:
+    'general-settings:notifications:consumer-success',
+  NOTIFICATIONS_CONSUMER_FAILED:
+    'general-settings:notifications:consumer-failed',
+  NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD:
+    'general-settings:notifications:consumer-suppress-on-dashboard',
+}
+
+export const SETTINGS: PaperlessUiSetting[] = [
+  {
+    key: SETTINGS_KEYS.LANGUAGE,
+    type: 'string',
+    default: '',
+  },
+  {
+    key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS,
+    type: 'boolean',
+    default: true,
+  },
+  {
+    key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE,
+    type: 'boolean',
+    default: false,
+  },
+  {
+    key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE,
+    type: 'number',
+    default: 50,
+  },
+  {
+    key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM,
+    type: 'boolean',
+    default: true,
+  },
+  {
+    key: SETTINGS_KEYS.DARK_MODE_ENABLED,
+    type: 'boolean',
+    default: false,
+  },
+  {
+    key: SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED,
+    type: 'boolean',
+    default: true,
+  },
+  {
+    key: SETTINGS_KEYS.THEME_COLOR,
+    type: 'string',
+    default: '',
+  },
+  {
+    key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER,
+    type: 'boolean',
+    default: false,
+  },
+  {
+    key: SETTINGS_KEYS.DATE_LOCALE,
+    type: 'string',
+    default: '',
+  },
+  {
+    key: SETTINGS_KEYS.DATE_FORMAT,
+    type: 'string',
+    default: 'mediumDate',
+  },
+  {
+    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT,
+    type: 'boolean',
+    default: true,
+  },
+  {
+    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS,
+    type: 'boolean',
+    default: true,
+  },
+  {
+    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED,
+    type: 'boolean',
+    default: true,
+  },
+  {
+    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD,
+    type: 'boolean',
+    default: true,
+  },
+]
diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts
index bf5ab1457..46b1036cd 100644
--- a/src-ui/src/app/pipes/custom-date.pipe.ts
+++ b/src-ui/src/app/pipes/custom-date.pipe.ts
@@ -1,6 +1,8 @@
 import { DatePipe } from '@angular/common'
 import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core'
-import { SettingsService, SETTINGS_KEYS } from '../services/settings.service'
+import { SETTINGS_KEYS } from '../data/paperless-uisettings'
+import { SettingsService } from '../services/settings.service'
+import { normalizeDateStr } from '../utils/date'
 
 const FORMAT_TO_ISO_FORMAT = {
   longDate: 'y-MM-dd',
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 99349d37f..b7ec2708d 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { ActivatedRoute, Params, Router } from '@angular/router'
+import { ParamMap, Router } from '@angular/router'
 import { Observable } from 'rxjs'
 import {
   cloneFilterRules,
@@ -8,14 +8,16 @@ import {
 } from '../data/filter-rule'
 import { PaperlessDocument } from '../data/paperless-document'
 import { PaperlessSavedView } from '../data/paperless-saved-view'
+import { SETTINGS_KEYS } from '../data/paperless-uisettings'
 import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys'
+import { generateParams, parseParams } from '../utils/query-params'
 import { DocumentService, DOCUMENT_SORT_FIELDS } from './rest/document.service'
-import { SettingsService, SETTINGS_KEYS } from './settings.service'
+import { SettingsService } from './settings.service'
 
 /**
  * Captures the current state of the list view.
  */
-interface ListViewState {
+export interface ListViewState {
   /**
    * Title of the document list view. Either "Documents" (localized) or the name of a saved view.
    */
@@ -31,7 +33,7 @@ interface ListViewState {
   /**
    * Total amount of documents with the current filter rules. Used to calculate the number of pages.
    */
-  collectionSize: number
+  collectionSize?: number
 
   /**
    * Currently selected sort field.
@@ -84,6 +86,32 @@ export class DocumentListViewService {
     return this.activeListViewState.title
   }
 
+  constructor(
+    private documentService: DocumentService,
+    private settings: SettingsService,
+    private router: Router
+  ) {
+    let documentListViewConfigJson = localStorage.getItem(
+      DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG
+    )
+    if (documentListViewConfigJson) {
+      try {
+        let savedState: ListViewState = JSON.parse(documentListViewConfigJson)
+        // Remove null elements from the restored state
+        Object.keys(savedState).forEach((k) => {
+          if (savedState[k] == null) {
+            delete savedState[k]
+          }
+        })
+        //only use restored state attributes instead of defaults if they are not null
+        let newState = Object.assign(this.defaultListViewState(), savedState)
+        this.listViewStates.set(null, newState)
+      } catch (e) {
+        localStorage.removeItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
+      }
+    }
+  }
+
   private defaultListViewState(): ListViewState {
     return {
       title: null,
@@ -121,20 +149,40 @@ export class DocumentListViewService {
     if (closeCurrentView) {
       this._activeSavedViewId = null
     }
+
     this.activeListViewState.filterRules = cloneFilterRules(view.filter_rules)
     this.activeListViewState.sortField = view.sort_field
     this.activeListViewState.sortReverse = view.sort_reverse
     if (this._activeSavedViewId) {
       this.activeListViewState.title = view.name
     }
+
     this.reduceSelectionToFilter()
+
+    if (!this.router.routerState.snapshot.url.includes('/view/')) {
+      this.router.navigate([], {
+        queryParams: { view: view.id },
+      })
+    }
   }
 
-  reload(onFinish?) {
+  loadFromQueryParams(queryParams: ParamMap) {
+    const paramsEmpty: boolean = queryParams.keys.length == 0
+    let newState: ListViewState = this.listViewStates.get(null)
+    if (!paramsEmpty) newState = parseParams(queryParams)
+    if (newState == undefined) newState = this.defaultListViewState() // if nothing in local storage
+
+    this.activeListViewState.filterRules = newState.filterRules
+    this.activeListViewState.sortField = newState.sortField
+    this.activeListViewState.sortReverse = newState.sortReverse
+    this.activeListViewState.currentPage = newState.currentPage
+    this.reload(null, paramsEmpty) // update the params if there arent any
+  }
+
+  reload(onFinish?, updateQueryParams: boolean = true) {
     this.isReloading = true
     this.error = null
     let activeListViewState = this.activeListViewState
-
     this.documentService
       .listFiltered(
         activeListViewState.currentPage,
@@ -148,6 +196,14 @@ export class DocumentListViewService {
           this.isReloading = false
           activeListViewState.collectionSize = result.count
           activeListViewState.documents = result.results
+
+          if (updateQueryParams && !this._activeSavedViewId) {
+            let base = ['/documents']
+            this.router.navigate(base, {
+              queryParams: generateParams(activeListViewState),
+            })
+          }
+
           if (onFinish) {
             onFinish()
           }
@@ -190,6 +246,7 @@ export class DocumentListViewService {
     ) {
       this.activeListViewState.sortField = 'created'
     }
+    this._activeSavedViewId = null
     this.activeListViewState.filterRules = filterRules
     this.reload()
     this.reduceSelectionToFilter()
@@ -201,6 +258,7 @@ export class DocumentListViewService {
   }
 
   set sortField(field: string) {
+    this._activeSavedViewId = null
     this.activeListViewState.sortField = field
     this.reload()
     this.saveDocumentListView()
@@ -211,6 +269,7 @@ export class DocumentListViewService {
   }
 
   set sortReverse(reverse: boolean) {
+    this._activeSavedViewId = null
     this.activeListViewState.sortReverse = reverse
     this.reload()
     this.saveDocumentListView()
@@ -220,13 +279,6 @@ export class DocumentListViewService {
     return this.activeListViewState.sortReverse
   }
 
-  get sortParams(): Params {
-    return {
-      sortField: this.sortField,
-      sortReverse: this.sortReverse,
-    }
-  }
-
   get collectionSize(): number {
     return this.activeListViewState.collectionSize
   }
@@ -236,6 +288,8 @@ export class DocumentListViewService {
   }
 
   set currentPage(page: number) {
+    if (this.activeListViewState.currentPage == page) return
+    this._activeSavedViewId = null
     this.activeListViewState.currentPage = page
     this.reload()
     this.saveDocumentListView()
@@ -272,6 +326,10 @@ export class DocumentListViewService {
     }
   }
 
+  quickFilter(filterRules: FilterRule[]) {
+    this.filterRules = filterRules
+  }
+
   getLastPage(): number {
     return Math.ceil(this.collectionSize / this.currentPageSize)
   }
@@ -430,29 +488,4 @@ export class DocumentListViewService {
   documentIndexInCurrentView(documentID: number): number {
     return this.documents.map((d) => d.id).indexOf(documentID)
   }
-
-  constructor(
-    private documentService: DocumentService,
-    private settings: SettingsService
-  ) {
-    let documentListViewConfigJson = localStorage.getItem(
-      DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG
-    )
-    if (documentListViewConfigJson) {
-      try {
-        let savedState: ListViewState = JSON.parse(documentListViewConfigJson)
-        // Remove null elements from the restored state
-        Object.keys(savedState).forEach((k) => {
-          if (savedState[k] == null) {
-            delete savedState[k]
-          }
-        })
-        //only use restored state attributes instead of defaults if they are not null
-        let newState = Object.assign(this.defaultListViewState(), savedState)
-        this.listViewStates.set(null, newState)
-      } catch (e) {
-        localStorage.removeItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
-      }
-    }
-  }
 }
diff --git a/src-ui/src/app/services/query-params.service.ts b/src-ui/src/app/services/query-params.service.ts
deleted file mode 100644
index 888440aae..000000000
--- a/src-ui/src/app/services/query-params.service.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { Injectable } from '@angular/core'
-import { ParamMap, Params, Router } from '@angular/router'
-import { FilterRule } from '../data/filter-rule'
-import { FilterRuleType, FILTER_RULE_TYPES } from '../data/filter-rule-type'
-import { PaperlessSavedView } from '../data/paperless-saved-view'
-import { DocumentListViewService } from './document-list-view.service'
-
-const SORT_FIELD_PARAMETER = 'sort'
-const SORT_REVERSE_PARAMETER = 'reverse'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class QueryParamsService {
-  constructor(private router: Router, private list: DocumentListViewService) {}
-
-  private filterParams: Params = {}
-  private sortParams: Params = {}
-
-  updateFilterRules(
-    filterRules: FilterRule[],
-    updateQueryParams: boolean = true
-  ) {
-    this.filterParams = filterRulesToQueryParams(filterRules)
-    if (updateQueryParams) this.updateQueryParams()
-  }
-
-  set sortField(field: string) {
-    this.sortParams[SORT_FIELD_PARAMETER] = field
-    this.updateQueryParams()
-  }
-
-  set sortReverse(reverse: boolean) {
-    if (!reverse) this.sortParams[SORT_REVERSE_PARAMETER] = undefined
-    else this.sortParams[SORT_REVERSE_PARAMETER] = reverse
-    this.updateQueryParams()
-  }
-
-  get params(): Params {
-    return {
-      ...this.sortParams,
-      ...this.filterParams,
-    }
-  }
-
-  private updateQueryParams() {
-    // if we were on a saved view we navigate 'away' to /documents
-    let base = []
-    if (this.router.routerState.snapshot.url.includes('/view/'))
-      base = ['/documents']
-
-    this.router.navigate(base, {
-      queryParams: this.params,
-    })
-  }
-
-  public parseQueryParams(queryParams: ParamMap) {
-    let filterRules = filterRulesFromQueryParams(queryParams)
-    if (
-      filterRules.length ||
-      queryParams.has(SORT_FIELD_PARAMETER) ||
-      queryParams.has(SORT_REVERSE_PARAMETER)
-    ) {
-      this.list.filterRules = filterRules
-      this.list.sortField = queryParams.get(SORT_FIELD_PARAMETER)
-      this.list.sortReverse =
-        queryParams.has(SORT_REVERSE_PARAMETER) ||
-        (!queryParams.has(SORT_FIELD_PARAMETER) &&
-          !queryParams.has(SORT_REVERSE_PARAMETER))
-      this.list.reload()
-    } else if (
-      filterRules.length == 0 &&
-      !queryParams.has(SORT_FIELD_PARAMETER)
-    ) {
-      // this is navigating to /documents so we need to update the params from the list
-      this.updateFilterRules(this.list.filterRules, false)
-      this.sortParams[SORT_FIELD_PARAMETER] = this.list.sortField
-      this.sortParams[SORT_REVERSE_PARAMETER] = this.list.sortReverse
-      this.router.navigate([], {
-        queryParams: this.params,
-        replaceUrl: true,
-      })
-    }
-  }
-
-  updateFromView(view: PaperlessSavedView) {
-    if (!this.router.routerState.snapshot.url.includes('/view/')) {
-      // navigation for /documents?view=
-      this.router.navigate([], {
-        queryParams: { view: view.id },
-      })
-    }
-    // make sure params are up-to-date
-    this.updateFilterRules(view.filter_rules, false)
-    this.sortParams[SORT_FIELD_PARAMETER] = this.list.sortField
-    this.sortParams[SORT_REVERSE_PARAMETER] = this.list.sortReverse
-  }
-
-  navigateWithFilterRules(filterRules: FilterRule[]) {
-    this.updateFilterRules(filterRules)
-    this.router.navigate(['/documents'], {
-      queryParams: this.params,
-    })
-  }
-}
-
-export function filterRulesToQueryParams(filterRules: FilterRule[]): Object {
-  if (filterRules) {
-    let params = {}
-    for (let rule of filterRules) {
-      let ruleType = FILTER_RULE_TYPES.find((t) => t.id == rule.rule_type)
-      if (ruleType.multi) {
-        params[ruleType.filtervar] = params[ruleType.filtervar]
-          ? params[ruleType.filtervar] + ',' + rule.value
-          : rule.value
-      } else if (ruleType.isnull_filtervar && rule.value == null) {
-        params[ruleType.isnull_filtervar] = true
-      } else {
-        params[ruleType.filtervar] = rule.value
-      }
-    }
-    return params
-  } else {
-    return null
-  }
-}
-
-export function filterRulesFromQueryParams(queryParams: ParamMap) {
-  const allFilterRuleQueryParams: string[] = FILTER_RULE_TYPES.map(
-    (rt) => rt.filtervar
-  )
-    .concat(FILTER_RULE_TYPES.map((rt) => rt.isnull_filtervar))
-    .filter((rt) => rt !== undefined)
-
-  // transform query params to filter rules
-  let filterRulesFromQueryParams: FilterRule[] = []
-  allFilterRuleQueryParams
-    .filter((frqp) => queryParams.has(frqp))
-    .forEach((filterQueryParamName) => {
-      const rule_type: FilterRuleType = FILTER_RULE_TYPES.find(
-        (rt) =>
-          rt.filtervar == filterQueryParamName ||
-          rt.isnull_filtervar == filterQueryParamName
-      )
-      const isNullRuleType = rule_type.isnull_filtervar == filterQueryParamName
-      const valueURIComponent: string = queryParams.get(filterQueryParamName)
-      const filterQueryParamValues: string[] = rule_type.multi
-        ? valueURIComponent.split(',')
-        : [valueURIComponent]
-
-      filterRulesFromQueryParams = filterRulesFromQueryParams.concat(
-        // map all values to filter rules
-        filterQueryParamValues.map((val) => {
-          return {
-            rule_type: rule_type.id,
-            value: isNullRuleType ? null : val,
-          }
-        })
-      )
-    })
-
-  return filterRulesFromQueryParams
-}
diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts
index 880d119dc..8e4d8eee9 100644
--- a/src-ui/src/app/services/rest/document.service.ts
+++ b/src-ui/src/app/services/rest/document.service.ts
@@ -6,12 +6,13 @@ import { HttpClient, HttpParams } from '@angular/common/http'
 import { Observable } from 'rxjs'
 import { Results } from 'src/app/data/results'
 import { FilterRule } from 'src/app/data/filter-rule'
-import { map } from 'rxjs/operators'
+import { map, tap } from 'rxjs/operators'
 import { CorrespondentService } from './correspondent.service'
 import { DocumentTypeService } from './document-type.service'
 import { TagService } from './tag.service'
 import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-suggestions'
-import { filterRulesToQueryParams } from '../query-params.service'
+import { queryParamsFromFilterRules } from '../../utils/query-params'
+import { StoragePathService } from './storage-path.service'
 
 export const DOCUMENT_SORT_FIELDS = [
   { field: 'archive_serial_number', name: $localize`ASN` },
@@ -37,6 +38,7 @@ export interface SelectionDataItem {
 }
 
 export interface SelectionData {
+  selected_storage_paths: SelectionDataItem[]
   selected_correspondents: SelectionDataItem[]
   selected_tags: SelectionDataItem[]
   selected_document_types: SelectionDataItem[]
@@ -52,7 +54,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
     http: HttpClient,
     private correspondentService: CorrespondentService,
     private documentTypeService: DocumentTypeService,
-    private tagService: TagService
+    private tagService: TagService,
+    private storagePathService: StoragePathService
   ) {
     super(http, 'documents')
   }
@@ -67,7 +70,16 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
       doc.document_type$ = this.documentTypeService.getCached(doc.document_type)
     }
     if (doc.tags) {
-      doc.tags$ = this.tagService.getCachedMany(doc.tags)
+      doc.tags$ = this.tagService
+        .getCachedMany(doc.tags)
+        .pipe(
+          tap((tags) =>
+            tags.sort((tagA, tagB) => tagA.name.localeCompare(tagB.name))
+          )
+        )
+    }
+    if (doc.storage_path) {
+      doc.storage_path$ = this.storagePathService.getCached(doc.storage_path)
     }
     return doc
   }
@@ -85,7 +97,7 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
       pageSize,
       sortField,
       sortReverse,
-      Object.assign(extraParams, filterRulesToQueryParams(filterRules))
+      Object.assign(extraParams, queryParamsFromFilterRules(filterRules))
     ).pipe(
       map((results) => {
         results.results.forEach((doc) => this.addObservablesToDocument(doc))
diff --git a/src-ui/src/app/services/rest/storage-path.service.ts b/src-ui/src/app/services/rest/storage-path.service.ts
new file mode 100644
index 000000000..481330217
--- /dev/null
+++ b/src-ui/src/app/services/rest/storage-path.service.ts
@@ -0,0 +1,13 @@
+import { HttpClient } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path'
+import { AbstractNameFilterService } from './abstract-name-filter-service'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class StoragePathService extends AbstractNameFilterService<PaperlessStoragePath> {
+  constructor(http: HttpClient) {
+    super(http, 'storage_paths')
+  }
+}
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 1a424e4ca..14d261789 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -1,4 +1,5 @@
 import { DOCUMENT } from '@angular/common'
+import { HttpClient } from '@angular/common/http'
 import {
   Inject,
   Injectable,
@@ -9,17 +10,19 @@ import {
 } from '@angular/core'
 import { Meta } from '@angular/platform-browser'
 import { CookieService } from 'ngx-cookie-service'
+import { first, Observable, tap } from 'rxjs'
 import {
   BRIGHTNESS,
   estimateBrightnessForColor,
   hexToHsl,
 } from 'src/app/utils/color'
-
-export interface PaperlessSettings {
-  key: string
-  type: string
-  default: any
-}
+import { environment } from 'src/environments/environment'
+import {
+  PaperlessUiSettings,
+  SETTINGS,
+  SETTINGS_KEYS,
+} from '../data/paperless-uisettings'
+import { ToastService } from './toast.service'
 
 export interface LanguageOption {
   code: string
@@ -32,89 +35,42 @@ export interface LanguageOption {
   dateInputFormat?: string
 }
 
-export const SETTINGS_KEYS = {
-  BULK_EDIT_CONFIRMATION_DIALOGS:
-    'general-settings:bulk-edit:confirmation-dialogs',
-  BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close',
-  DOCUMENT_LIST_SIZE: 'general-settings:documentListSize',
-  DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system',
-  DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled',
-  DARK_MODE_THUMB_INVERTED: 'general-settings:dark-mode:thumb-inverted',
-  THEME_COLOR: 'general-settings:theme:color',
-  USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer',
-  DATE_LOCALE: 'general-settings:date-display:date-locale',
-  DATE_FORMAT: 'general-settings:date-display:date-format',
-  NOTIFICATIONS_CONSUMER_NEW_DOCUMENT:
-    'general-settings:notifications:consumer-new-documents',
-  NOTIFICATIONS_CONSUMER_SUCCESS:
-    'general-settings:notifications:consumer-success',
-  NOTIFICATIONS_CONSUMER_FAILED:
-    'general-settings:notifications:consumer-failed',
-  NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD:
-    'general-settings:notifications:consumer-suppress-on-dashboard',
-}
-
-const SETTINGS: PaperlessSettings[] = [
-  {
-    key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS,
-    type: 'boolean',
-    default: true,
-  },
-  {
-    key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE,
-    type: 'boolean',
-    default: false,
-  },
-  { key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: 'number', default: 50 },
-  { key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: 'boolean', default: true },
-  { key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: 'boolean', default: false },
-  {
-    key: SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED,
-    type: 'boolean',
-    default: true,
-  },
-  { key: SETTINGS_KEYS.THEME_COLOR, type: 'string', default: '' },
-  { key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: 'boolean', default: false },
-  { key: SETTINGS_KEYS.DATE_LOCALE, type: 'string', default: '' },
-  { key: SETTINGS_KEYS.DATE_FORMAT, type: 'string', default: 'mediumDate' },
-  {
-    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT,
-    type: 'boolean',
-    default: true,
-  },
-  {
-    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS,
-    type: 'boolean',
-    default: true,
-  },
-  {
-    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED,
-    type: 'boolean',
-    default: true,
-  },
-  {
-    key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD,
-    type: 'boolean',
-    default: true,
-  },
-]
-
 @Injectable({
   providedIn: 'root',
 })
 export class SettingsService {
   private renderer: Renderer2
+  protected baseUrl: string = environment.apiBaseUrl + 'ui_settings/'
+
+  private settings: Object = {}
+
+  public displayName: string
 
   constructor(
-    private rendererFactory: RendererFactory2,
+    rendererFactory: RendererFactory2,
     @Inject(DOCUMENT) private document,
     private cookieService: CookieService,
     private meta: Meta,
-    @Inject(LOCALE_ID) private localeId: string
+    @Inject(LOCALE_ID) private localeId: string,
+    protected http: HttpClient,
+    private toastService: ToastService
   ) {
     this.renderer = rendererFactory.createRenderer(null, null)
+  }
 
-    this.updateAppearanceSettings()
+  // this is called by the app initializer in app.module
+  public initializeSettings(): Observable<PaperlessUiSettings> {
+    return this.http.get<PaperlessUiSettings>(this.baseUrl).pipe(
+      first(),
+      tap((uisettings) => {
+        Object.assign(this.settings, uisettings.settings)
+        this.maybeMigrateSettings()
+        // to update lang cookie
+        if (this.settings['language']?.length)
+          this.setLanguage(this.settings['language'])
+        this.displayName = uisettings.display_name.trim()
+      })
+    )
   }
 
   public updateAppearanceSettings(
@@ -333,11 +289,13 @@ export class SettingsService {
   }
 
   getLanguage(): string {
-    return this.cookieService.get(this.getLanguageCookieName())
+    return this.get(SETTINGS_KEYS.LANGUAGE)
   }
 
   setLanguage(language: string) {
-    if (language) {
+    this.set(SETTINGS_KEYS.LANGUAGE, language)
+    if (language?.length) {
+      // for Django
       this.cookieService.set(this.getLanguageCookieName(), language)
     } else {
       this.cookieService.delete(this.getLanguageCookieName())
@@ -362,7 +320,16 @@ export class SettingsService {
       return null
     }
 
-    let value = localStorage.getItem(key)
+    let value = null
+    // parse key:key:key into nested object
+    const keys = key.replace('general-settings:', '').split(':')
+    let settingObj = this.settings
+    keys.forEach((keyPart, index) => {
+      keyPart = keyPart.replace(/-/g, '_')
+      if (!settingObj.hasOwnProperty(keyPart)) return
+      if (index == keys.length - 1) value = settingObj[keyPart]
+      else settingObj = settingObj[keyPart]
+    })
 
     if (value != null) {
       switch (setting.type) {
@@ -381,10 +348,57 @@ export class SettingsService {
   }
 
   set(key: string, value: any) {
-    localStorage.setItem(key, value.toString())
+    // parse key:key:key into nested object
+    let settingObj = this.settings
+    const keys = key.replace('general-settings:', '').split(':')
+    keys.forEach((keyPart, index) => {
+      keyPart = keyPart.replace(/-/g, '_')
+      if (!settingObj.hasOwnProperty(keyPart)) settingObj[keyPart] = {}
+      if (index == keys.length - 1) settingObj[keyPart] = value
+      else settingObj = settingObj[keyPart]
+    })
   }
 
-  unset(key: string) {
-    localStorage.removeItem(key)
+  storeSettings(): Observable<any> {
+    return this.http.post(this.baseUrl, { settings: this.settings })
+  }
+
+  maybeMigrateSettings() {
+    if (
+      !this.settings.hasOwnProperty('documentListSize') &&
+      localStorage.getItem(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
+    ) {
+      // lets migrate
+      const successMessage = $localize`Successfully completed one-time migratration of settings to the database!`
+      const errorMessage = $localize`Unable to migrate settings to the database, please try saving manually.`
+
+      try {
+        for (const setting in SETTINGS_KEYS) {
+          const key = SETTINGS_KEYS[setting]
+          const value = localStorage.getItem(key)
+          this.set(key, value)
+        }
+        this.set(
+          SETTINGS_KEYS.LANGUAGE,
+          this.cookieService.get(this.getLanguageCookieName())
+        )
+      } catch (error) {
+        this.toastService.showError(errorMessage)
+        console.log(error)
+      }
+
+      this.storeSettings()
+        .pipe(first())
+        .subscribe({
+          next: () => {
+            this.updateAppearanceSettings()
+            this.toastService.showInfo(successMessage)
+          },
+          error: (e) => {
+            this.toastService.showError(errorMessage)
+            console.log(e)
+          },
+        })
+    }
   }
 }
diff --git a/src-ui/src/app/utils/query-params.ts b/src-ui/src/app/utils/query-params.ts
new file mode 100644
index 000000000..6af44e8c9
--- /dev/null
+++ b/src-ui/src/app/utils/query-params.ts
@@ -0,0 +1,101 @@
+import { ParamMap, Params } from '@angular/router'
+import { FilterRule } from '../data/filter-rule'
+import { FilterRuleType, FILTER_RULE_TYPES } from '../data/filter-rule-type'
+import { ListViewState } from '../services/document-list-view.service'
+
+const SORT_FIELD_PARAMETER = 'sort'
+const SORT_REVERSE_PARAMETER = 'reverse'
+const PAGE_PARAMETER = 'page'
+
+export function generateParams(viewState: ListViewState): Params {
+  let params = queryParamsFromFilterRules(viewState.filterRules)
+  params[SORT_FIELD_PARAMETER] = viewState.sortField
+  params[SORT_REVERSE_PARAMETER] = viewState.sortReverse ? 1 : undefined
+  params[PAGE_PARAMETER] = isNaN(viewState.currentPage)
+    ? 1
+    : viewState.currentPage
+  return params
+}
+
+export function parseParams(queryParams: ParamMap): ListViewState {
+  let filterRules = filterRulesFromQueryParams(queryParams)
+  let sortField = queryParams.get(SORT_FIELD_PARAMETER)
+  let sortReverse =
+    queryParams.has(SORT_REVERSE_PARAMETER) ||
+    (!queryParams.has(SORT_FIELD_PARAMETER) &&
+      !queryParams.has(SORT_REVERSE_PARAMETER))
+  let currentPage = queryParams.has(PAGE_PARAMETER)
+    ? parseInt(queryParams.get(PAGE_PARAMETER))
+    : 1
+  return {
+    currentPage: currentPage,
+    filterRules: filterRules,
+    sortField: sortField,
+    sortReverse: sortReverse,
+  }
+}
+
+export function filterRulesFromQueryParams(
+  queryParams: ParamMap
+): FilterRule[] {
+  const allFilterRuleQueryParams: string[] = FILTER_RULE_TYPES.map(
+    (rt) => rt.filtervar
+  )
+    .concat(FILTER_RULE_TYPES.map((rt) => rt.isnull_filtervar))
+    .filter((rt) => rt !== undefined)
+
+  // transform query params to filter rules
+  let filterRulesFromQueryParams: FilterRule[] = []
+  allFilterRuleQueryParams
+    .filter((frqp) => queryParams.has(frqp))
+    .forEach((filterQueryParamName) => {
+      const rule_type: FilterRuleType = FILTER_RULE_TYPES.find(
+        (rt) =>
+          rt.filtervar == filterQueryParamName ||
+          rt.isnull_filtervar == filterQueryParamName
+      )
+      const isNullRuleType = rule_type.isnull_filtervar == filterQueryParamName
+      const valueURIComponent: string = queryParams.get(filterQueryParamName)
+      const filterQueryParamValues: string[] = rule_type.multi
+        ? valueURIComponent.split(',')
+        : [valueURIComponent]
+
+      filterRulesFromQueryParams = filterRulesFromQueryParams.concat(
+        // map all values to filter rules
+        filterQueryParamValues.map((val) => {
+          if (rule_type.datatype == 'boolean')
+            val = val.replace('1', 'true').replace('0', 'false')
+          return {
+            rule_type: rule_type.id,
+            value: isNullRuleType ? null : val,
+          }
+        })
+      )
+    })
+
+  return filterRulesFromQueryParams
+}
+
+export function queryParamsFromFilterRules(filterRules: FilterRule[]): Params {
+  if (filterRules) {
+    let params = {}
+    for (let rule of filterRules) {
+      let ruleType = FILTER_RULE_TYPES.find((t) => t.id == rule.rule_type)
+      if (ruleType.multi) {
+        params[ruleType.filtervar] = params[ruleType.filtervar]
+          ? params[ruleType.filtervar] + ',' + rule.value
+          : rule.value
+      } else if (ruleType.isnull_filtervar && rule.value == null) {
+        params[ruleType.isnull_filtervar] = 1
+      } else {
+        params[ruleType.filtervar] = rule.value
+        if (ruleType.datatype == 'boolean')
+          params[ruleType.filtervar] =
+            rule.value == 'true' || rule.value == '1' ? 1 : 0
+      }
+    }
+    return params
+  } else {
+    return null
+  }
+}
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index 5177170cd..e0934b84c 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -84,6 +84,10 @@ svg.logo {
   }
 }
 
+.text-primary {
+  color: var(--bs-primary) !important;
+}
+
 .btn-outline-primary {
   border-color: var(--bs-primary) !important;
   color: var(--bs-primary) !important;
@@ -198,16 +202,12 @@ a, a:hover, .btn-link, .btn-link:hover {
     min-height: calc(1.5em + 0.75rem + 5px);
     line-height: 1.5;
 
-    .ng-select-container {
-      height: 100%;
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-
-      .ng-value-container .ng-input {
-        top: 10px;
-      }
+    .ng-select-container .ng-value-container .ng-input {
+      top: 7px;
     }
 
+    .paperless-input-select .ng-select .ng-select-container
+
     .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-marked {
       background-color: var(--pngx-bg-darker) !important;
       color: var(--pngx-body-color-accent) !important;
@@ -218,6 +218,14 @@ a, a:hover, .btn-link, .btn-link:hover {
       background: none;
     }
   }
+
+  .input-group {
+    .ng-select-container {
+      height: 100%;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  }
 }
 
 .paperless-input-tags {
@@ -421,13 +429,17 @@ table.table {
   right: 0;
   bottom: 0;
   left: 0;
-  background-color: rgba(23, 84, 31, .8);
+  background-color: hsla(var(--pngx-primary), var(--pngx-primary-lightness), .8);
   z-index: 1055; // $zindex-modal
   pointer-events: none !important;
   user-select: none !important;
   text-align: center;
   padding-top: 25%;
 
+  h2 {
+    color: var(--pngx-primary-text-contrast)
+  }
+
   &.show {
     opacity: 1 !important;
   }
@@ -506,3 +518,7 @@ a.badge {
     background-color: var(--bs-primary);
     border-color: var(--bs-primary);
 }
+
+code {
+  color: var(--pngx-body-color-accent)
+}
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss
index 732ac47d9..bf9be6662 100644
--- a/src-ui/src/theme.scss
+++ b/src-ui/src/theme.scss
@@ -186,7 +186,8 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,<svg xmlns='htt
 
   .toast,
   .toast .toast-header,
-  .toast .btn-close {
+  .toast .btn,
+  .toast .btn-close, {
     color: var(--pngx-primary-text-contrast);
   }
 }
diff --git a/src/documents/admin.py b/src/documents/admin.py
index 37a45bb8f..3e3f1eb1c 100644
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -5,6 +5,7 @@ from .models import Document
 from .models import DocumentType
 from .models import SavedView
 from .models import SavedViewFilterRule
+from .models import StoragePath
 from .models import Tag
 
 
@@ -100,8 +101,19 @@ class SavedViewAdmin(admin.ModelAdmin):
     inlines = [RuleInline]
 
 
+class StoragePathInline(admin.TabularInline):
+    model = StoragePath
+
+
+class StoragePathAdmin(admin.ModelAdmin):
+    list_display = ("name", "path", "match", "matching_algorithm")
+    list_filter = ("path", "matching_algorithm")
+    list_editable = ("path", "match", "matching_algorithm")
+
+
 admin.site.register(Correspondent, CorrespondentAdmin)
 admin.site.register(Tag, TagAdmin)
 admin.site.register(DocumentType, DocumentTypeAdmin)
 admin.site.register(Document, DocumentAdmin)
 admin.site.register(SavedView, SavedViewAdmin)
+admin.site.register(StoragePath, StoragePathAdmin)
diff --git a/src/documents/apps.py b/src/documents/apps.py
index f4802532e..9e0dd2554 100644
--- a/src/documents/apps.py
+++ b/src/documents/apps.py
@@ -16,6 +16,7 @@ class DocumentsConfig(AppConfig):
             set_correspondent,
             set_document_type,
             set_tags,
+            set_storage_path,
             add_to_index,
         )
 
@@ -23,6 +24,7 @@ class DocumentsConfig(AppConfig):
         document_consumption_finished.connect(set_correspondent)
         document_consumption_finished.connect(set_document_type)
         document_consumption_finished.connect(set_tags)
+        document_consumption_finished.connect(set_storage_path)
         document_consumption_finished.connect(set_log_entry)
         document_consumption_finished.connect(add_to_index)
 
diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index 650138f1e..e1c45851c 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -5,6 +5,7 @@ from django_q.tasks import async_task
 from documents.models import Correspondent
 from documents.models import Document
 from documents.models import DocumentType
+from documents.models import StoragePath
 
 
 def set_correspondent(doc_ids, correspondent):
@@ -20,6 +21,24 @@ def set_correspondent(doc_ids, correspondent):
     return "OK"
 
 
+def set_storage_path(doc_ids, storage_path):
+    if storage_path:
+        storage_path = StoragePath.objects.get(id=storage_path)
+
+    qs = Document.objects.filter(
+        Q(id__in=doc_ids) & ~Q(storage_path=storage_path),
+    )
+    affected_docs = [doc.id for doc in qs]
+    qs.update(storage_path=storage_path)
+
+    async_task(
+        "documents.tasks.bulk_update_documents",
+        document_ids=affected_docs,
+    )
+
+    return "OK"
+
+
 def set_document_type(doc_ids, document_type):
     if document_type:
         document_type = DocumentType.objects.get(id=document_type)
diff --git a/src/documents/classifier.py b/src/documents/classifier.py
index 562afff52..4bae1830b 100644
--- a/src/documents/classifier.py
+++ b/src/documents/classifier.py
@@ -59,8 +59,8 @@ def load_classifier():
 
 class DocumentClassifier:
 
-    # v7 - Updated scikit-learn package version
-    FORMAT_VERSION = 7
+    # v8 - Added storage path classifier
+    FORMAT_VERSION = 8
 
     def __init__(self):
         # hash of the training data. used to prevent re-training when the
@@ -72,6 +72,7 @@ class DocumentClassifier:
         self.tags_classifier = None
         self.correspondent_classifier = None
         self.document_type_classifier = None
+        self.storage_path_classifier = None
 
     def load(self):
         with open(settings.MODEL_FILE, "rb") as f:
@@ -90,6 +91,7 @@ class DocumentClassifier:
                     self.tags_classifier = pickle.load(f)
                     self.correspondent_classifier = pickle.load(f)
                     self.document_type_classifier = pickle.load(f)
+                    self.storage_path_classifier = pickle.load(f)
                 except Exception:
                     raise ClassifierModelCorruptError()
 
@@ -107,6 +109,7 @@ class DocumentClassifier:
             pickle.dump(self.tags_classifier, f)
             pickle.dump(self.correspondent_classifier, f)
             pickle.dump(self.document_type_classifier, f)
+            pickle.dump(self.storage_path_classifier, f)
 
         if os.path.isfile(target_file):
             os.unlink(target_file)
@@ -118,6 +121,7 @@ class DocumentClassifier:
         labels_tags = list()
         labels_correspondent = list()
         labels_document_type = list()
+        labels_storage_path = list()
 
         # Step 1: Extract and preprocess training data from the database.
         logger.debug("Gathering data from database...")
@@ -153,6 +157,13 @@ class DocumentClassifier:
                 m.update(tag.to_bytes(4, "little", signed=True))
             labels_tags.append(tags)
 
+            y = -1
+            sd = doc.storage_path
+            if sd and sd.matching_algorithm == MatchingModel.MATCH_AUTO:
+                y = sd.pk
+            m.update(y.to_bytes(4, "little", signed=True))
+            labels_storage_path.append(y)
+
         if not data:
             raise ValueError("No training data available.")
 
@@ -172,14 +183,16 @@ class DocumentClassifier:
         # it usually is.
         num_correspondents = len(set(labels_correspondent) | {-1}) - 1
         num_document_types = len(set(labels_document_type) | {-1}) - 1
+        num_storage_paths = len(set(labels_storage_path) | {-1}) - 1
 
         logger.debug(
             "{} documents, {} tag(s), {} correspondent(s), "
-            "{} document type(s).".format(
+            "{} document type(s). {} storage path(es)".format(
                 len(data),
                 num_tags,
                 num_correspondents,
                 num_document_types,
+                num_storage_paths,
             ),
         )
 
@@ -242,6 +255,21 @@ class DocumentClassifier:
                 "classifier.",
             )
 
+        if num_storage_paths > 0:
+            logger.debug(
+                "Training storage paths classifier...",
+            )
+            self.storage_path_classifier = MLPClassifier(tol=0.01)
+            self.storage_path_classifier.fit(
+                data_vectorized,
+                labels_storage_path,
+            )
+        else:
+            self.storage_path_classifier = None
+            logger.debug(
+                "There are no storage paths. Not training storage path classifier.",
+            )
+
         self.data_hash = new_data_hash
 
         return True
@@ -288,3 +316,14 @@ class DocumentClassifier:
                 return []
         else:
             return []
+
+    def predict_storage_path(self, content):
+        if self.storage_path_classifier:
+            X = self.data_vectorizer.transform([preprocess_content(content)])
+            storage_path_id = self.storage_path_classifier.predict(X)
+            if storage_path_id != -1:
+                return storage_path_id
+            else:
+                return None
+        else:
+            return None
diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py
index 94d091cab..e3f13c077 100644
--- a/src/documents/file_handling.py
+++ b/src/documents/file_handling.py
@@ -128,13 +128,26 @@ def generate_unique_filename(doc, archive_filename=False):
 
 def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
     path = ""
+    filename_format = settings.FILENAME_FORMAT
 
     try:
-        if settings.PAPERLESS_FILENAME_FORMAT is not None:
-            tags = defaultdictNoStr(lambda: slugify(None), many_to_dictionary(doc.tags))
+        if doc.storage_path is not None:
+            logger.debug(
+                f"Document has storage_path {doc.storage_path.id} "
+                f"({doc.storage_path.path}) set",
+            )
+            filename_format = doc.storage_path.path
+
+        if filename_format is not None:
+            tags = defaultdictNoStr(
+                lambda: slugify(None),
+                many_to_dictionary(doc.tags),
+            )
 
             tag_list = pathvalidate.sanitize_filename(
-                ",".join(sorted(tag.name for tag in doc.tags.all())),
+                ",".join(
+                    sorted(tag.name for tag in doc.tags.all()),
+                ),
                 replacement_text="-",
             )
 
@@ -144,7 +157,7 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
                     replacement_text="-",
                 )
             else:
-                correspondent = "none"
+                correspondent = "-none-"
 
             if doc.document_type:
                 document_type = pathvalidate.sanitize_filename(
@@ -152,18 +165,18 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
                     replacement_text="-",
                 )
             else:
-                document_type = "none"
+                document_type = "-none-"
 
             if doc.archive_serial_number:
                 asn = str(doc.archive_serial_number)
             else:
-                asn = "none"
+                asn = "-none-"
 
             # Convert UTC database date to localized date
             local_added = timezone.localdate(doc.added)
             local_created = timezone.localdate(doc.created)
 
-            path = settings.PAPERLESS_FILENAME_FORMAT.format(
+            path = filename_format.format(
                 title=pathvalidate.sanitize_filename(doc.title, replacement_text="-"),
                 correspondent=correspondent,
                 document_type=document_type,
@@ -180,12 +193,17 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
                 tag_list=tag_list,
             ).strip()
 
+            if settings.FILENAME_FORMAT_REMOVE_NONE:
+                path = path.replace("-none-/", "")  # remove empty directories
+                path = path.replace(" -none-", "")  # remove when spaced, with space
+                path = path.replace("-none-", "")  # remove rest of the occurences
+
+            path = path.replace("-none-", "none")  # backward compatibility
             path = path.strip(os.sep)
 
     except (ValueError, KeyError, IndexError):
         logger.warning(
-            f"Invalid PAPERLESS_FILENAME_FORMAT: "
-            f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default",
+            f"Invalid filename_format '{filename_format}', falling back to default",
         )
 
     counter_str = f"_{counter:02}" if counter else ""
diff --git a/src/documents/filters.py b/src/documents/filters.py
index 642241044..d66849e00 100644
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -7,6 +7,7 @@ from .models import Correspondent
 from .models import Document
 from .models import DocumentType
 from .models import Log
+from .models import StoragePath
 from .models import Tag
 
 CHAR_KWARGS = ["istartswith", "iendswith", "icontains", "iexact"]
@@ -114,6 +115,9 @@ class DocumentFilterSet(FilterSet):
             "document_type": ["isnull"],
             "document_type__id": ID_KWARGS,
             "document_type__name": CHAR_KWARGS,
+            "storage_path": ["isnull"],
+            "storage_path__id": ID_KWARGS,
+            "storage_path__name": CHAR_KWARGS,
         }
 
 
@@ -121,3 +125,12 @@ class LogFilterSet(FilterSet):
     class Meta:
         model = Log
         fields = {"level": INT_KWARGS, "created": DATE_KWARGS, "group": ID_KWARGS}
+
+
+class StoragePathFilterSet(FilterSet):
+    class Meta:
+        model = StoragePath
+        fields = {
+            "name": CHAR_KWARGS,
+            "path": CHAR_KWARGS,
+        }
diff --git a/src/documents/index.py b/src/documents/index.py
index cc95f2a96..fe40dc1a8 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -46,6 +46,9 @@ def get_schema():
         created=DATETIME(sortable=True),
         modified=DATETIME(sortable=True),
         added=DATETIME(sortable=True),
+        path=TEXT(sortable=True),
+        path_id=NUMERIC(),
+        has_path=BOOLEAN(),
     )
 
 
@@ -104,6 +107,9 @@ def update_document(writer, doc):
         added=doc.added,
         asn=doc.archive_serial_number,
         modified=doc.modified,
+        path=doc.storage_path.name if doc.storage_path else None,
+        path_id=doc.storage_path.id if doc.storage_path else None,
+        has_path=doc.storage_path is not None,
     )
 
 
@@ -157,6 +163,11 @@ class DelayedQuery:
                 criterias.append(query.DateRange("added", start=isoparse(v), end=None))
             elif k == "added__date__lt":
                 criterias.append(query.DateRange("added", start=None, end=isoparse(v)))
+            elif k == "storage_path__id":
+                criterias.append(query.Term("path_id", v))
+            elif k == "storage_path__isnull":
+                criterias.append(query.Term("has_path", v == "false"))
+
         if len(criterias) > 0:
             return query.And(criterias)
         else:
diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py
index bb376c2dd..bf0f352b5 100644
--- a/src/documents/management/commands/document_archiver.py
+++ b/src/documents/management/commands/document_archiver.py
@@ -152,4 +152,4 @@ class Command(BaseCommand):
                     ),
                 )
         except KeyboardInterrupt:
-            self.stdout.write(self.style.NOTICE(("Aborting...")))
+            self.stdout.write(self.style.NOTICE("Aborting..."))
diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index 27f1fd8a9..4bddd51b8 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -18,6 +18,7 @@ from documents.models import DocumentType
 from documents.models import SavedView
 from documents.models import SavedViewFilterRule
 from documents.models import Tag
+from documents.models import UiSettings
 from documents.settings import EXPORTER_ARCHIVE_NAME
 from documents.settings import EXPORTER_FILE_NAME
 from documents.settings import EXPORTER_THUMBNAIL_NAME
@@ -112,8 +113,8 @@ class Command(BaseCommand):
                 map(lambda f: os.path.abspath(os.path.join(root, f)), files),
             )
 
-        # 2. Create manifest, containing all correspondents, types, tags and
-        # documents
+        # 2. Create manifest, containing all correspondents, types, tags,
+        # documents and ui_settings
         with transaction.atomic():
             manifest = json.loads(
                 serializers.serialize("json", Correspondent.objects.all()),
@@ -150,6 +151,10 @@ class Command(BaseCommand):
 
             manifest += json.loads(serializers.serialize("json", User.objects.all()))
 
+            manifest += json.loads(
+                serializers.serialize("json", UiSettings.objects.all()),
+            )
+
         # 3. Export files from each document
         for index, document_dict in tqdm.tqdm(
             enumerate(document_manifest),
diff --git a/src/documents/matching.py b/src/documents/matching.py
index b87fa0461..ca6251c37 100644
--- a/src/documents/matching.py
+++ b/src/documents/matching.py
@@ -4,6 +4,7 @@ import re
 from documents.models import Correspondent
 from documents.models import DocumentType
 from documents.models import MatchingModel
+from documents.models import StoragePath
 from documents.models import Tag
 
 
@@ -57,6 +58,22 @@ def match_tags(document, classifier):
     )
 
 
+def match_storage_paths(document, classifier):
+    if classifier:
+        pred_id = classifier.predict_storage_path(document.content)
+    else:
+        pred_id = None
+
+    storage_paths = StoragePath.objects.all()
+
+    return list(
+        filter(
+            lambda o: matches(o, document) or o.pk == pred_id,
+            storage_paths,
+        ),
+    )
+
+
 def matches(matching_model, document):
     search_kwargs = {}
 
diff --git a/src/documents/migrations/1012_fix_archive_files.py b/src/documents/migrations/1012_fix_archive_files.py
index ba91cf796..77e33afdd 100644
--- a/src/documents/migrations/1012_fix_archive_files.py
+++ b/src/documents/migrations/1012_fix_archive_files.py
@@ -83,7 +83,7 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
     path = ""
 
     try:
-        if settings.PAPERLESS_FILENAME_FORMAT is not None:
+        if settings.FILENAME_FORMAT is not None:
             tags = defaultdictNoStr(lambda: slugify(None), many_to_dictionary(doc.tags))
 
             tag_list = pathvalidate.sanitize_filename(
@@ -105,7 +105,7 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
             else:
                 document_type = "none"
 
-            path = settings.PAPERLESS_FILENAME_FORMAT.format(
+            path = settings.FILENAME_FORMAT.format(
                 title=pathvalidate.sanitize_filename(doc.title, replacement_text="-"),
                 correspondent=correspondent,
                 document_type=document_type,
@@ -128,7 +128,7 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False):
     except (ValueError, KeyError, IndexError):
         logger.warning(
             f"Invalid PAPERLESS_FILENAME_FORMAT: "
-            f"{settings.PAPERLESS_FILENAME_FORMAT}, falling back to default"
+            f"{settings.FILENAME_FORMAT}, falling back to default"
         )
 
     counter_str = f"_{counter:02}" if counter else ""
diff --git a/src/documents/migrations/1019_storagepath_document_storage_path.py b/src/documents/migrations/1019_storagepath_document_storage_path.py
new file mode 100644
index 000000000..ff7f38692
--- /dev/null
+++ b/src/documents/migrations/1019_storagepath_document_storage_path.py
@@ -0,0 +1,73 @@
+# Generated by Django 4.0.4 on 2022-05-02 15:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("documents", "1018_alter_savedviewfilterrule_value"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="StoragePath",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(max_length=128, unique=True, verbose_name="name"),
+                ),
+                (
+                    "match",
+                    models.CharField(blank=True, max_length=256, verbose_name="match"),
+                ),
+                (
+                    "matching_algorithm",
+                    models.PositiveIntegerField(
+                        choices=[
+                            (1, "Any word"),
+                            (2, "All words"),
+                            (3, "Exact match"),
+                            (4, "Regular expression"),
+                            (5, "Fuzzy word"),
+                            (6, "Automatic"),
+                        ],
+                        default=1,
+                        verbose_name="matching algorithm",
+                    ),
+                ),
+                (
+                    "is_insensitive",
+                    models.BooleanField(default=True, verbose_name="is insensitive"),
+                ),
+                ("path", models.CharField(max_length=512, verbose_name="path")),
+            ],
+            options={
+                "verbose_name": "storage path",
+                "verbose_name_plural": "storage paths",
+                "ordering": ("name",),
+            },
+        ),
+        migrations.AddField(
+            model_name="document",
+            name="storage_path",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="documents",
+                to="documents.storagepath",
+                verbose_name="storage path",
+            ),
+        ),
+    ]
diff --git a/src/documents/migrations/1019_uisettings.py b/src/documents/migrations/1019_uisettings.py
new file mode 100644
index 000000000..edc944a37
--- /dev/null
+++ b/src/documents/migrations/1019_uisettings.py
@@ -0,0 +1,39 @@
+# Generated by Django 4.0.4 on 2022-05-07 05:10
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("documents", "1018_alter_savedviewfilterrule_value"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UiSettings",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("settings", models.JSONField(null=True)),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="ui_settings",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]
diff --git a/src/documents/migrations/1020_merge_20220518_1839.py b/src/documents/migrations/1020_merge_20220518_1839.py
new file mode 100644
index 000000000..f455fc5a3
--- /dev/null
+++ b/src/documents/migrations/1020_merge_20220518_1839.py
@@ -0,0 +1,13 @@
+# Generated by Django 4.0.4 on 2022-05-18 18:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("documents", "1019_storagepath_document_storage_path"),
+        ("documents", "1019_uisettings"),
+    ]
+
+    operations = []
diff --git a/src/documents/models.py b/src/documents/models.py
index cc4cd0613..e85c357b9 100644
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -83,6 +83,18 @@ class DocumentType(MatchingModel):
         verbose_name_plural = _("document types")
 
 
+class StoragePath(MatchingModel):
+    path = models.CharField(
+        _("path"),
+        max_length=512,
+    )
+
+    class Meta:
+        ordering = ("name",)
+        verbose_name = _("storage path")
+        verbose_name_plural = _("storage paths")
+
+
 class Document(models.Model):
 
     STORAGE_TYPE_UNENCRYPTED = "unencrypted"
@@ -101,6 +113,15 @@ class Document(models.Model):
         verbose_name=_("correspondent"),
     )
 
+    storage_path = models.ForeignKey(
+        StoragePath,
+        blank=True,
+        null=True,
+        related_name="documents",
+        on_delete=models.SET_NULL,
+        verbose_name=_("storage path"),
+    )
+
     title = models.CharField(_("title"), max_length=128, blank=True, db_index=True)
 
     document_type = models.ForeignKey(
@@ -469,3 +490,17 @@ class FileInfo:
                 cls._mangle_property(properties, "created")
                 cls._mangle_property(properties, "title")
                 return cls(**properties)
+
+
+# Extending User Model Using a One-To-One Link
+class UiSettings(models.Model):
+
+    user = models.OneToOneField(
+        User,
+        on_delete=models.CASCADE,
+        related_name="ui_settings",
+    )
+    settings = models.JSONField(null=True)
+
+    def __str__(self):
+        return self.user.username
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index db55226e2..02b09ac5a 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -20,7 +20,9 @@ from .models import DocumentType
 from .models import MatchingModel
 from .models import SavedView
 from .models import SavedViewFilterRule
+from .models import StoragePath
 from .models import Tag
+from .models import UiSettings
 from .parsers import is_mime_type_supported
 
 
@@ -204,11 +206,17 @@ class DocumentTypeField(serializers.PrimaryKeyRelatedField):
         return DocumentType.objects.all()
 
 
+class StoragePathField(serializers.PrimaryKeyRelatedField):
+    def get_queryset(self):
+        return StoragePath.objects.all()
+
+
 class DocumentSerializer(DynamicFieldsModelSerializer):
 
     correspondent = CorrespondentField(allow_null=True)
     tags = TagsField(many=True)
     document_type = DocumentTypeField(allow_null=True)
+    storage_path = StoragePathField(allow_null=True)
 
     original_file_name = SerializerMethodField()
     archived_file_name = SerializerMethodField()
@@ -242,6 +250,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer):
             "id",
             "correspondent",
             "document_type",
+            "storage_path",
             "title",
             "content",
             "tags",
@@ -329,6 +338,7 @@ class BulkEditSerializer(DocumentListSerializer):
         choices=[
             "set_correspondent",
             "set_document_type",
+            "set_storage_path",
             "add_tag",
             "remove_tag",
             "modify_tags",
@@ -356,6 +366,8 @@ class BulkEditSerializer(DocumentListSerializer):
             return bulk_edit.set_correspondent
         elif method == "set_document_type":
             return bulk_edit.set_document_type
+        elif method == "set_storage_path":
+            return bulk_edit.set_storage_path
         elif method == "add_tag":
             return bulk_edit.add_tag
         elif method == "remove_tag":
@@ -402,6 +414,20 @@ class BulkEditSerializer(DocumentListSerializer):
         else:
             raise serializers.ValidationError("correspondent not specified")
 
+    def _validate_storage_path(self, parameters):
+        if "storage_path" in parameters:
+            storage_path_id = parameters["storage_path"]
+            if storage_path_id is None:
+                return
+            try:
+                StoragePath.objects.get(id=storage_path_id)
+            except StoragePath.DoesNotExist:
+                raise serializers.ValidationError(
+                    "Storage path does not exist",
+                )
+        else:
+            raise serializers.ValidationError("storage path not specified")
+
     def _validate_parameters_modify_tags(self, parameters):
         if "add_tags" in parameters:
             self._validate_tag_id_list(parameters["add_tags"], "add_tags")
@@ -426,6 +452,8 @@ class BulkEditSerializer(DocumentListSerializer):
             self._validate_parameters_tags(parameters)
         elif method == bulk_edit.modify_tags:
             self._validate_parameters_modify_tags(parameters)
+        elif method == bulk_edit.set_storage_path:
+            self._validate_storage_path(parameters)
 
         return attrs
 
@@ -525,3 +553,65 @@ class BulkDownloadSerializer(DocumentListSerializer):
             "bzip2": zipfile.ZIP_BZIP2,
             "lzma": zipfile.ZIP_LZMA,
         }[compression]
+
+
+class StoragePathSerializer(MatchingModelSerializer):
+    document_count = serializers.IntegerField(read_only=True)
+
+    class Meta:
+        model = StoragePath
+        fields = (
+            "id",
+            "slug",
+            "name",
+            "path",
+            "match",
+            "matching_algorithm",
+            "is_insensitive",
+            "document_count",
+        )
+
+    def validate_path(self, path):
+        try:
+            path.format(
+                title="title",
+                correspondent="correspondent",
+                document_type="document_type",
+                created="created",
+                created_year="created_year",
+                created_month="created_month",
+                created_day="created_day",
+                added="added",
+                added_year="added_year",
+                added_month="added_month",
+                added_day="added_day",
+                asn="asn",
+                tags="tags",
+                tag_list="tag_list",
+            )
+
+        except (KeyError):
+            raise serializers.ValidationError(_("Invalid variable detected."))
+
+        return path
+
+
+class UiSettingsViewSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = UiSettings
+        depth = 1
+        fields = [
+            "id",
+            "settings",
+        ]
+
+    def update(self, instance, validated_data):
+        super().update(instance, validated_data)
+        return instance
+
+    def create(self, validated_data):
+        ui_settings = UiSettings.objects.update_or_create(
+            user=validated_data.get("user"),
+            defaults={"settings": validated_data.get("settings", None)},
+        )
+        return ui_settings
diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 71f2cdc55..34710af78 100644
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -230,6 +230,76 @@ def set_tags(
         document.tags.add(*relevant_tags)
 
 
+def set_storage_path(
+    sender,
+    document=None,
+    logging_group=None,
+    classifier=None,
+    replace=False,
+    use_first=True,
+    suggest=False,
+    base_url=None,
+    color=False,
+    **kwargs,
+):
+    if document.storage_path and not replace:
+        return
+
+    potential_storage_path = matching.match_storage_paths(
+        document,
+        classifier,
+    )
+
+    potential_count = len(potential_storage_path)
+    if potential_storage_path:
+        selected = potential_storage_path[0]
+    else:
+        selected = None
+
+    if potential_count > 1:
+        if use_first:
+            logger.info(
+                f"Detected {potential_count} potential storage paths, "
+                f"so we've opted for {selected}",
+                extra={"group": logging_group},
+            )
+        else:
+            logger.info(
+                f"Detected {potential_count} potential storage paths, "
+                f"not assigning any storage directory",
+                extra={"group": logging_group},
+            )
+            return
+
+    if selected or replace:
+        if suggest:
+            if base_url:
+                print(
+                    termcolors.colorize(str(document), fg="green")
+                    if color
+                    else str(document),
+                )
+                print(f"{base_url}/documents/{document.pk}")
+            else:
+                print(
+                    (
+                        termcolors.colorize(str(document), fg="green")
+                        if color
+                        else str(document)
+                    )
+                    + f" [{document.pk}]",
+                )
+            print(f"Sugest storage directory {selected}")
+        else:
+            logger.info(
+                f"Assigning storage path {selected} to {document}",
+                extra={"group": logging_group},
+            )
+
+            document.storage_path = selected
+            document.save(update_fields=("storage_path",))
+
+
 @receiver(models.signals.post_delete, sender=Document)
 def cleanup_document_deletion(sender, instance, using, **kwargs):
     with FileLock(settings.MEDIA_LOCK):
diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 029c207c3..208f74f1d 100644
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -19,6 +19,7 @@ from documents.consumer import ConsumerError
 from documents.models import Correspondent
 from documents.models import Document
 from documents.models import DocumentType
+from documents.models import StoragePath
 from documents.models import Tag
 from documents.sanity_checker import SanityCheckFailedException
 from pdf2image import convert_from_path
@@ -53,6 +54,7 @@ def train_classifier():
         not Tag.objects.filter(matching_algorithm=Tag.MATCH_AUTO).exists()
         and not DocumentType.objects.filter(matching_algorithm=Tag.MATCH_AUTO).exists()
         and not Correspondent.objects.filter(matching_algorithm=Tag.MATCH_AUTO).exists()
+        and not StoragePath.objects.filter(matching_algorithm=Tag.MATCH_AUTO).exists()
     ):
 
         return
diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html
index 2778bce7a..fb817bfea 100644
--- a/src/documents/templates/index.html
+++ b/src/documents/templates/index.html
@@ -9,8 +9,6 @@
   <title>Paperless-ngx</title>
   <base href="{% url 'base' %}">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-	<meta name="username" content="{{username}}">
-	<meta name="full_name" content="{{full_name}}">
 	<meta name="cookie_prefix" content="{{cookie_prefix}}">
 	<meta name="robots" content="noindex,nofollow">
   	<link rel="icon" type="image/x-icon" href="favicon.ico">
diff --git a/src/documents/tests/data/model.pickle b/src/documents/tests/data/model.pickle
index e097bda06..8a0e1829c 100644
Binary files a/src/documents/tests/data/model.pickle and b/src/documents/tests/data/model.pickle differ
diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py
index d8dfcf455..24bdc3a50 100644
--- a/src/documents/tests/test_api.py
+++ b/src/documents/tests/test_api.py
@@ -26,7 +26,10 @@ from documents.models import Document
 from documents.models import DocumentType
 from documents.models import MatchingModel
 from documents.models import SavedView
+from documents.models import StoragePath
 from documents.models import Tag
+from documents.models import UiSettings
+from documents.models import StoragePath
 from documents.tests.utils import DirectoriesMixin
 from paperless import version
 from rest_framework.test import APITestCase
@@ -38,7 +41,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         super().setUp()
 
         self.user = User.objects.create_superuser(username="temp_admin")
-        self.client.force_login(user=self.user)
+        self.client.force_authenticate(user=self.user)
 
     def testDocuments(self):
 
@@ -98,6 +101,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         c = Correspondent.objects.create(name="c", pk=41)
         dt = DocumentType.objects.create(name="dt", pk=63)
         tag = Tag.objects.create(name="t", pk=85)
+        storage_path = StoragePath.objects.create(name="sp", pk=77, path="p")
         doc = Document.objects.create(
             title="WOW",
             content="the content",
@@ -105,6 +109,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
             document_type=dt,
             checksum="123",
             mime_type="application/pdf",
+            storage_path=storage_path,
         )
 
         response = self.client.get("/api/documents/", format="json")
@@ -191,7 +196,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.content, content_thumbnail)
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="")
+    @override_settings(FILENAME_FORMAT="")
     def test_download_with_archive(self):
 
         content = b"This is a test"
@@ -579,10 +584,12 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         t2 = Tag.objects.create(name="tag2")
         c = Correspondent.objects.create(name="correspondent")
         dt = DocumentType.objects.create(name="type")
+        sp = StoragePath.objects.create(name="path")
 
         d1 = Document.objects.create(checksum="1", correspondent=c, content="test")
         d2 = Document.objects.create(checksum="2", document_type=dt, content="test")
         d3 = Document.objects.create(checksum="3", content="test")
+
         d3.tags.add(t)
         d3.tags.add(t2)
         d4 = Document.objects.create(
@@ -597,6 +604,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
             content="test",
         )
         d6 = Document.objects.create(checksum="6", content="test2")
+        d7 = Document.objects.create(checksum="7", storage_path=sp, content="test")
 
         with AsyncWriter(index.open_index()) as writer:
             for doc in Document.objects.all():
@@ -607,18 +615,30 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
             self.assertEqual(r.status_code, 200)
             return [hit["id"] for hit in r.data["results"]]
 
-        self.assertCountEqual(search_query(""), [d1.id, d2.id, d3.id, d4.id, d5.id])
+        self.assertCountEqual(
+            search_query(""),
+            [d1.id, d2.id, d3.id, d4.id, d5.id, d7.id],
+        )
         self.assertCountEqual(search_query("&is_tagged=true"), [d3.id, d4.id])
-        self.assertCountEqual(search_query("&is_tagged=false"), [d1.id, d2.id, d5.id])
+        self.assertCountEqual(
+            search_query("&is_tagged=false"),
+            [d1.id, d2.id, d5.id, d7.id],
+        )
         self.assertCountEqual(search_query("&correspondent__id=" + str(c.id)), [d1.id])
         self.assertCountEqual(search_query("&document_type__id=" + str(dt.id)), [d2.id])
+        self.assertCountEqual(search_query("&storage_path__id=" + str(sp.id)), [d7.id])
+
+        self.assertCountEqual(
+            search_query("&storage_path__isnull"),
+            [d1.id, d2.id, d3.id, d4.id, d5.id],
+        )
         self.assertCountEqual(
             search_query("&correspondent__isnull"),
-            [d2.id, d3.id, d4.id, d5.id],
+            [d2.id, d3.id, d4.id, d5.id, d7.id],
         )
         self.assertCountEqual(
             search_query("&document_type__isnull"),
-            [d1.id, d3.id, d4.id, d5.id],
+            [d1.id, d3.id, d4.id, d5.id, d7.id],
         )
         self.assertCountEqual(
             search_query("&tags__id__all=" + str(t.id) + "," + str(t2.id)),
@@ -1079,35 +1099,49 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
             response.data,
-            {"correspondents": [], "tags": [], "document_types": []},
+            {
+                "correspondents": [],
+                "tags": [],
+                "document_types": [],
+                "storage_paths": [],
+            },
         )
 
     def test_get_suggestions_invalid_doc(self):
         response = self.client.get(f"/api/documents/34676/suggestions/")
         self.assertEqual(response.status_code, 404)
 
-    @mock.patch("documents.views.match_correspondents")
-    @mock.patch("documents.views.match_tags")
+    @mock.patch("documents.views.match_storage_paths")
     @mock.patch("documents.views.match_document_types")
+    @mock.patch("documents.views.match_tags")
+    @mock.patch("documents.views.match_correspondents")
     def test_get_suggestions(
         self,
-        match_document_types,
-        match_tags,
         match_correspondents,
+        match_tags,
+        match_document_types,
+        match_storage_paths,
     ):
         doc = Document.objects.create(
             title="test",
             mime_type="application/pdf",
             content="this is an invoice!",
         )
+
+        match_correspondents.return_value = [Correspondent(id=88), Correspondent(id=2)]
         match_tags.return_value = [Tag(id=56), Tag(id=123)]
         match_document_types.return_value = [DocumentType(id=23)]
-        match_correspondents.return_value = [Correspondent(id=88), Correspondent(id=2)]
+        match_storage_paths.return_value = [StoragePath(id=99), StoragePath(id=77)]
 
         response = self.client.get(f"/api/documents/{doc.pk}/suggestions/")
         self.assertEqual(
             response.data,
-            {"correspondents": [88, 2], "tags": [56, 123], "document_types": [23]},
+            {
+                "correspondents": [88, 2],
+                "tags": [56, 123],
+                "document_types": [23],
+                "storage_paths": [99, 77],
+            },
         )
 
     def test_saved_views(self):
@@ -1142,7 +1176,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
 
         self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404)
 
-        self.client.force_login(user=u1)
+        self.client.force_authenticate(user=u1)
 
         response = self.client.get("/api/saved_views/")
         self.assertEqual(response.status_code, 200)
@@ -1150,7 +1184,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
 
         self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 200)
 
-        self.client.force_login(user=u2)
+        self.client.force_authenticate(user=u2)
 
         response = self.client.get("/api/saved_views/")
         self.assertEqual(response.status_code, 200)
@@ -1324,7 +1358,7 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase):
 
         self.user = User.objects.create_superuser(username="temp_admin")
 
-        self.client.force_login(user=self.user)
+        self.client.force_authenticate(user=self.user)
         self.client.defaults["HTTP_ACCEPT"] = "application/json; version=2"
 
     def test_tag_validate_color(self):
@@ -1398,13 +1432,48 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase):
             "#000000",
         )
 
+    def test_ui_settings(self):
+        test_user = User.objects.create_superuser(username="test")
+        self.client.force_authenticate(user=test_user)
+
+        response = self.client.get("/api/ui_settings/", format="json")
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            response.data["settings"],
+            {},
+        )
+
+        settings = {
+            "settings": {
+                "dark_mode": {
+                    "enabled": True,
+                },
+            },
+        }
+
+        response = self.client.post(
+            "/api/ui_settings/",
+            json.dumps(settings),
+            content_type="application/json",
+        )
+
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.get("/api/ui_settings/", format="json")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(
+            response.data["settings"],
+            settings["settings"],
+        )
+
 
 class TestBulkEdit(DirectoriesMixin, APITestCase):
     def setUp(self):
         super().setUp()
 
         user = User.objects.create_superuser(username="temp_admin")
-        self.client.force_login(user=user)
+        self.client.force_authenticate(user=user)
 
         patcher = mock.patch("documents.bulk_edit.async_task")
         self.async_task = patcher.start()
@@ -1433,6 +1502,7 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         self.doc2.tags.add(self.t1)
         self.doc3.tags.add(self.t2)
         self.doc4.tags.add(self.t1, self.t2)
+        self.sp1 = StoragePath.objects.create(name="sp1", path="Something/{checksum}")
 
     def test_set_correspondent(self):
         self.assertEqual(Document.objects.filter(correspondent=self.c2).count(), 1)
@@ -1472,6 +1542,60 @@ class TestBulkEdit(DirectoriesMixin, APITestCase):
         args, kwargs = self.async_task.call_args
         self.assertCountEqual(kwargs["document_ids"], [self.doc2.id, self.doc3.id])
 
+    def test_set_document_storage_path(self):
+        """
+        GIVEN:
+            - 5 documents without defined storage path
+        WHEN:
+            - Bulk edit called to add storage path to 1 document
+        THEN:
+            - Single document storage path update
+        """
+        self.assertEqual(Document.objects.filter(storage_path=None).count(), 5)
+
+        bulk_edit.set_storage_path(
+            [self.doc1.id],
+            self.sp1.id,
+        )
+
+        self.assertEqual(Document.objects.filter(storage_path=None).count(), 4)
+
+        self.async_task.assert_called_once()
+        args, kwargs = self.async_task.call_args
+
+        self.assertCountEqual(kwargs["document_ids"], [self.doc1.id])
+
+    def test_unset_document_storage_path(self):
+        """
+        GIVEN:
+            - 4 documents without defined storage path
+            - 1 document with a defined storage
+        WHEN:
+            - Bulk edit called to remove storage path from 1 document
+        THEN:
+            - Single document storage path removed
+        """
+        self.assertEqual(Document.objects.filter(storage_path=None).count(), 5)
+
+        bulk_edit.set_storage_path(
+            [self.doc1.id],
+            self.sp1.id,
+        )
+
+        self.assertEqual(Document.objects.filter(storage_path=None).count(), 4)
+
+        bulk_edit.set_storage_path(
+            [self.doc1.id],
+            None,
+        )
+
+        self.assertEqual(Document.objects.filter(storage_path=None).count(), 5)
+
+        self.async_task.assert_called()
+        args, kwargs = self.async_task.call_args
+
+        self.assertCountEqual(kwargs["document_ids"], [self.doc1.id])
+
     def test_add_tag(self):
         self.assertEqual(Document.objects.filter(tags__id=self.t1.id).count(), 2)
         bulk_edit.add_tag(
@@ -1925,7 +2049,7 @@ class TestBulkDownload(DirectoriesMixin, APITestCase):
         super().setUp()
 
         user = User.objects.create_superuser(username="temp_admin")
-        self.client.force_login(user=user)
+        self.client.force_authenticate(user=user)
 
         self.doc1 = Document.objects.create(title="unrelated", checksum="A")
         self.doc2 = Document.objects.create(
@@ -2126,7 +2250,7 @@ class TestApiAuth(APITestCase):
 
     def test_api_version_with_auth(self):
         user = User.objects.create_superuser(username="test")
-        self.client.force_login(user)
+        self.client.force_authenticate(user)
         response = self.client.get("/api/")
         self.assertIn("X-Api-Version", response)
         self.assertIn("X-Version", response)
diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py
index 331618b94..052c27849 100644
--- a/src/documents/tests/test_classifier.py
+++ b/src/documents/tests/test_classifier.py
@@ -13,6 +13,7 @@ from documents.classifier import load_classifier
 from documents.models import Correspondent
 from documents.models import Document
 from documents.models import DocumentType
+from documents.models import StoragePath
 from documents.models import Tag
 from documents.tests.utils import DirectoriesMixin
 
@@ -56,6 +57,16 @@ class TestClassifier(DirectoriesMixin, TestCase):
             name="dt2",
             matching_algorithm=DocumentType.MATCH_AUTO,
         )
+        self.sp1 = StoragePath.objects.create(
+            name="sp1",
+            path="path1",
+            matching_algorithm=DocumentType.MATCH_AUTO,
+        )
+        self.sp2 = StoragePath.objects.create(
+            name="sp2",
+            path="path2",
+            matching_algorithm=DocumentType.MATCH_AUTO,
+        )
 
         self.doc1 = Document.objects.create(
             title="doc1",
@@ -64,12 +75,14 @@ class TestClassifier(DirectoriesMixin, TestCase):
             checksum="A",
             document_type=self.dt,
         )
+
         self.doc2 = Document.objects.create(
             title="doc1",
             content="this is another document, but from c2",
             correspondent=self.c2,
             checksum="B",
         )
+
         self.doc_inbox = Document.objects.create(
             title="doc235",
             content="aa",
@@ -81,6 +94,8 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.doc2.tags.add(self.t3)
         self.doc_inbox.tags.add(self.t2)
 
+        self.doc1.storage_path = self.sp1
+
     def testNoTrainingData(self):
         try:
             self.classifier.train()
@@ -177,6 +192,14 @@ class TestClassifier(DirectoriesMixin, TestCase):
         new_classifier.load()
         self.assertFalse(new_classifier.train())
 
+    # @override_settings(
+    #     MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle"),
+    # )
+    # def test_create_test_load_and_classify(self):
+    #     self.generate_test_data()
+    #     self.classifier.train()
+    #     self.classifier.save()
+
     @override_settings(
         MODEL_FILE=os.path.join(os.path.dirname(__file__), "data", "model.pickle"),
     )
@@ -263,6 +286,45 @@ class TestClassifier(DirectoriesMixin, TestCase):
         self.assertEqual(self.classifier.predict_document_type(doc1.content), dt.pk)
         self.assertIsNone(self.classifier.predict_document_type(doc2.content))
 
+    def test_one_path_predict(self):
+        sp = StoragePath.objects.create(
+            name="sp",
+            matching_algorithm=StoragePath.MATCH_AUTO,
+        )
+
+        doc1 = Document.objects.create(
+            title="doc1",
+            content="this is a document from c1",
+            checksum="A",
+            storage_path=sp,
+        )
+
+        self.classifier.train()
+        self.assertEqual(self.classifier.predict_storage_path(doc1.content), sp.pk)
+
+    def test_one_path_predict_manydocs(self):
+        sp = StoragePath.objects.create(
+            name="sp",
+            matching_algorithm=StoragePath.MATCH_AUTO,
+        )
+
+        doc1 = Document.objects.create(
+            title="doc1",
+            content="this is a document from c1",
+            checksum="A",
+            storage_path=sp,
+        )
+
+        doc2 = Document.objects.create(
+            title="doc1",
+            content="this is a document from c2",
+            checksum="B",
+        )
+
+        self.classifier.train()
+        self.assertEqual(self.classifier.predict_storage_path(doc1.content), sp.pk)
+        self.assertIsNone(self.classifier.predict_storage_path(doc2.content))
+
     def test_one_tag_predict(self):
         t1 = Tag.objects.create(name="t1", matching_algorithm=Tag.MATCH_AUTO, pk=12)
 
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index 1ff83705b..637c0d95e 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -320,7 +320,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         shutil.copy(src, dst)
         return dst
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT=None, TIME_ZONE="America/Chicago")
+    @override_settings(FILENAME_FORMAT=None, TIME_ZONE="America/Chicago")
     def testNormalOperation(self):
 
         filename = self.get_test_file()
@@ -351,7 +351,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self.assertEqual(document.created.tzinfo, zoneinfo.ZoneInfo("America/Chicago"))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT=None)
+    @override_settings(FILENAME_FORMAT=None)
     def testDeleteMacFiles(self):
         # https://github.com/jonaswinkler/paperless-ng/discussions/1037
 
@@ -518,7 +518,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
         # Database empty
         self.assertEqual(len(Document.objects.all()), 0)
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     def testFilenameHandling(self):
         filename = self.get_test_file()
 
@@ -530,7 +530,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self._assert_first_last_send_progress()
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.generate_unique_filename")
     def testFilenameHandlingUnstableFormat(self, m):
 
@@ -612,7 +612,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self._assert_first_last_send_progress(last_status="FAILED")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     @mock.patch("documents.parsers.document_consumer_declaration.send")
     def test_similar_filenames(self, m):
         shutil.copy(
@@ -660,7 +660,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 @mock.patch("documents.consumer.magic.from_file", fake_magic_from_file)
 class TestConsumerCreatedDate(DirectoriesMixin, TestCase):
     def setUp(self):
-        super(TestConsumerCreatedDate, self).setUp()
+        super().setUp()
 
         # this prevents websocket message reports during testing.
         patcher = mock.patch("documents.consumer.Consumer._send_progress")
diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.py
index 3293d188c..400c17413 100644
--- a/src/documents/tests/test_file_handling.py
+++ b/src/documents/tests/test_file_handling.py
@@ -20,12 +20,12 @@ from ..file_handling import generate_unique_filename
 from ..models import Correspondent
 from ..models import Document
 from ..models import DocumentType
-from ..models import Tag
+from ..models import StoragePath
 from .utils import DirectoriesMixin
 
 
 class TestFileHandling(DirectoriesMixin, TestCase):
-    @override_settings(PAPERLESS_FILENAME_FORMAT="")
+    @override_settings(FILENAME_FORMAT="")
     def test_generate_source_filename(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -40,7 +40,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
             f"{document.pk:07d}.pdf.gpg",
         )
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_file_renaming(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -82,7 +82,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
             True,
         )
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_file_renaming_missing_permissions(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -117,7 +117,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         os.chmod(settings.ORIGINALS_DIR + "/none", 0o777)
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_file_renaming_database_error(self):
 
         document1 = Document.objects.create(
@@ -156,7 +156,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
             )
             self.assertEqual(document.filename, "none/none.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_document_delete(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -180,7 +180,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none"), False)
 
     @override_settings(
-        PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}",
+        FILENAME_FORMAT="{correspondent}/{correspondent}",
         TRASH_DIR=tempfile.mkdtemp(),
     )
     def test_document_delete_trash(self):
@@ -218,7 +218,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         document.delete()
         self.assertEqual(os.path.isfile(settings.TRASH_DIR + "/none_01.pdf"), True)
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_document_delete_nofile(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -227,7 +227,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         document.delete()
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{correspondent}")
     def test_directory_not_empty(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -253,7 +253,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none"), True)
         self.assertTrue(os.path.isfile(important_file))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{document_type} - {title}")
+    @override_settings(FILENAME_FORMAT="{document_type} - {title}")
     def test_document_type(self):
         dt = DocumentType.objects.create(name="my_doc_type")
         d = Document.objects.create(title="the_doc", mime_type="application/pdf")
@@ -264,7 +264,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(generate_filename(d), "my_doc_type - the_doc.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{asn} - {title}")
+    @override_settings(FILENAME_FORMAT="{asn} - {title}")
     def test_asn(self):
         d1 = Document.objects.create(
             title="the_doc",
@@ -281,7 +281,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(generate_filename(d1), "652 - the_doc.pdf")
         self.assertEqual(generate_filename(d2), "none - the_doc.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}")
+    @override_settings(FILENAME_FORMAT="{tags[type]}")
     def test_tags_with_underscore(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -296,7 +296,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document), "demo.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}")
+    @override_settings(FILENAME_FORMAT="{tags[type]}")
     def test_tags_with_dash(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -311,7 +311,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document), "demo.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[type]}")
+    @override_settings(FILENAME_FORMAT="{tags[type]}")
     def test_tags_malformed(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -326,7 +326,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document), "none.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[0]}")
+    @override_settings(FILENAME_FORMAT="{tags[0]}")
     def test_tags_all(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -340,7 +340,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document), "demo.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{tags[1]}")
+    @override_settings(FILENAME_FORMAT="{tags[1]}")
     def test_tags_out_of_bounds(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -354,7 +354,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         # Ensure that filename is properly generated
         self.assertEqual(generate_filename(document), "none.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{tags}")
+    @override_settings(FILENAME_FORMAT="{tags}")
     def test_tags_without_args(self):
         document = Document()
         document.mime_type = "application/pdf"
@@ -363,7 +363,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(generate_filename(document), f"{document.pk:07}.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title} {tag_list}")
+    @override_settings(FILENAME_FORMAT="{title} {tag_list}")
     def test_tag_list(self):
         doc = Document.objects.create(title="doc1", mime_type="application/pdf")
         doc.tags.create(name="tag2")
@@ -379,7 +379,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(generate_filename(doc), "doc2.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="//etc/something/{title}")
+    @override_settings(FILENAME_FORMAT="//etc/something/{title}")
     def test_filename_relative(self):
         doc = Document.objects.create(title="doc1", mime_type="application/pdf")
         doc.filename = generate_filename(doc)
@@ -391,7 +391,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         )
 
     @override_settings(
-        PAPERLESS_FILENAME_FORMAT="{created_year}-{created_month}-{created_day}",
+        FILENAME_FORMAT="{created_year}-{created_month}-{created_day}",
     )
     def test_created_year_month_day(self):
         d1 = timezone.make_aware(datetime.datetime(2020, 3, 6, 1, 1, 1))
@@ -408,7 +408,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
 
     @override_settings(
-        PAPERLESS_FILENAME_FORMAT="{added_year}-{added_month}-{added_day}",
+        FILENAME_FORMAT="{added_year}-{added_month}-{added_day}",
     )
     def test_added_year_month_day(self):
         d1 = timezone.make_aware(datetime.datetime(232, 1, 9, 1, 1, 1))
@@ -425,7 +425,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(generate_filename(doc1), "2020-11-16.pdf")
 
     @override_settings(
-        PAPERLESS_FILENAME_FORMAT="{correspondent}/{correspondent}/{correspondent}",
+        FILENAME_FORMAT="{correspondent}/{correspondent}/{correspondent}",
     )
     def test_nested_directory_cleanup(self):
         document = Document()
@@ -453,7 +453,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR + "/none"), False)
         self.assertEqual(os.path.isdir(settings.ORIGINALS_DIR), True)
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT=None)
+    @override_settings(FILENAME_FORMAT=None)
     def test_format_none(self):
         document = Document()
         document.pk = 1
@@ -479,7 +479,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertEqual(os.path.isfile(os.path.join(tmp, "notempty", "file")), True)
         self.assertEqual(os.path.isdir(os.path.join(tmp, "notempty", "empty")), False)
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{created/[title]")
+    @override_settings(FILENAME_FORMAT="{created/[title]")
     def test_invalid_format(self):
         document = Document()
         document.pk = 1
@@ -488,7 +488,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(generate_filename(document), "0000001.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{created__year}")
+    @override_settings(FILENAME_FORMAT="{created__year}")
     def test_invalid_format_key(self):
         document = Document()
         document.pk = 1
@@ -497,7 +497,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
         self.assertEqual(generate_filename(document), "0000001.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     def test_duplicates(self):
         document = Document.objects.create(
             mime_type="application/pdf",
@@ -548,7 +548,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(document.source_path))
         self.assertEqual(document2.filename, "qwe.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     @mock.patch("documents.signals.handlers.Document.objects.filter")
     def test_no_update_without_change(self, m):
         doc = Document.objects.create(
@@ -568,7 +568,7 @@ class TestFileHandling(DirectoriesMixin, TestCase):
 
 
 class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
-    @override_settings(PAPERLESS_FILENAME_FORMAT=None)
+    @override_settings(FILENAME_FORMAT=None)
     def test_create_no_format(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
@@ -587,7 +587,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     def test_create_with_format(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
@@ -615,7 +615,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
             os.path.join(settings.ARCHIVE_DIR, "none", "my_doc.pdf"),
         )
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     def test_move_archive_gone(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
@@ -634,7 +634,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertFalse(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     def test_move_archive_exists(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
@@ -659,7 +659,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(existing_archive_file))
         self.assertEqual(doc.archive_filename, "none/my_doc_01.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     def test_move_original_only(self):
         original = os.path.join(settings.ORIGINALS_DIR, "document_01.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "document.pdf")
@@ -681,7 +681,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     def test_move_archive_only(self):
         original = os.path.join(settings.ORIGINALS_DIR, "document.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "document_01.pdf")
@@ -703,7 +703,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.os.rename")
     def test_move_archive_error(self, m):
         def fake_rename(src, dst):
@@ -734,7 +734,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     def test_move_file_gone(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
@@ -754,7 +754,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertFalse(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     @mock.patch("documents.signals.handlers.os.rename")
     def test_move_file_error(self, m):
         def fake_rename(src, dst):
@@ -785,7 +785,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc.source_path))
         self.assertTrue(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="")
+    @override_settings(FILENAME_FORMAT="")
     def test_archive_deleted(self):
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
         archive = os.path.join(settings.ARCHIVE_DIR, "0000001.pdf")
@@ -812,7 +812,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertFalse(os.path.isfile(doc.source_path))
         self.assertFalse(os.path.isfile(doc.archive_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     def test_archive_deleted2(self):
         original = os.path.join(settings.ORIGINALS_DIR, "document.png")
         original2 = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
@@ -846,7 +846,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
         self.assertTrue(os.path.isfile(doc1.archive_path))
         self.assertFalse(os.path.isfile(doc2.source_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+    @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     def test_database_error(self):
 
         original = os.path.join(settings.ORIGINALS_DIR, "0000001.pdf")
@@ -872,7 +872,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, TestCase):
 
 
 class TestFilenameGeneration(TestCase):
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     def test_invalid_characters(self):
 
         doc = Document.objects.create(
@@ -891,7 +891,7 @@ class TestFilenameGeneration(TestCase):
         )
         self.assertEqual(generate_filename(doc), "my-invalid-..-title-yay.pdf")
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{created}")
+    @override_settings(FILENAME_FORMAT="{created}")
     def test_date(self):
         doc = Document.objects.create(
             title="does not matter",
@@ -902,6 +902,140 @@ class TestFilenameGeneration(TestCase):
         )
         self.assertEqual(generate_filename(doc), "2020-05-21.pdf")
 
+    def test_dynamic_path(self):
+        """
+        GIVEN:
+            - A document with a defined storage path
+        WHEN:
+            - the filename is generated for the document
+        THEN:
+            - the generated filename uses the defined storage path for the document
+        """
+        doc = Document.objects.create(
+            title="does not matter",
+            created=timezone.make_aware(datetime.datetime(2020, 6, 25, 7, 36, 51, 153)),
+            mime_type="application/pdf",
+            pk=2,
+            checksum="2",
+            storage_path=StoragePath.objects.create(path="TestFolder/{created}"),
+        )
+        self.assertEqual(generate_filename(doc), "TestFolder/2020-06-25.pdf")
+
+    def test_dynamic_path_with_none(self):
+        """
+        GIVEN:
+            - A document with a defined storage path
+            - The defined storage path uses an undefined field for the document
+        WHEN:
+            - the filename is generated for the document
+        THEN:
+            - the generated filename uses the defined storage path for the document
+            - the generated filename includes "none" in the place undefined field
+        """
+        doc = Document.objects.create(
+            title="does not matter",
+            created=timezone.make_aware(datetime.datetime(2020, 6, 25, 7, 36, 51, 153)),
+            mime_type="application/pdf",
+            pk=2,
+            checksum="2",
+            storage_path=StoragePath.objects.create(path="{asn} - {created}"),
+        )
+        self.assertEqual(generate_filename(doc), "none - 2020-06-25.pdf")
+
+    @override_settings(
+        FILENAME_FORMAT_REMOVE_NONE=True,
+    )
+    def test_dynamic_path_remove_none(self):
+        """
+        GIVEN:
+            - A document with a defined storage path
+            - The defined storage path uses an undefined field for the document
+            - The setting for removing undefined fields is enabled
+        WHEN:
+            - the filename is generated for the document
+        THEN:
+            - the generated filename uses the defined storage path for the document
+            - the generated filename does not include "none" in the place undefined field
+        """
+        doc = Document.objects.create(
+            title="does not matter",
+            created=timezone.make_aware(datetime.datetime(2020, 6, 25, 7, 36, 51, 153)),
+            mime_type="application/pdf",
+            pk=2,
+            checksum="2",
+            storage_path=StoragePath.objects.create(path="TestFolder/{asn}/{created}"),
+        )
+        self.assertEqual(generate_filename(doc), "TestFolder/2020-06-25.pdf")
+
+    def test_multiple_doc_paths(self):
+        """
+        GIVEN:
+            - Two documents, each with different storage paths
+        WHEN:
+            - the filename is generated for the documents
+        THEN:
+            - Each document generated filename uses its storage path
+        """
+        doc_a = Document.objects.create(
+            title="does not matter",
+            created=timezone.make_aware(datetime.datetime(2020, 6, 25, 7, 36, 51, 153)),
+            mime_type="application/pdf",
+            pk=2,
+            checksum="2",
+            archive_serial_number=4,
+            storage_path=StoragePath.objects.create(
+                name="sp1",
+                path="ThisIsAFolder/{asn}/{created}",
+            ),
+        )
+        doc_b = Document.objects.create(
+            title="does not matter",
+            created=timezone.make_aware(datetime.datetime(2020, 7, 25, 7, 36, 51, 153)),
+            mime_type="application/pdf",
+            pk=5,
+            checksum="abcde",
+            storage_path=StoragePath.objects.create(
+                name="sp2",
+                path="SomeImportantNone/{created}",
+            ),
+        )
+
+        self.assertEqual(generate_filename(doc_a), "ThisIsAFolder/4/2020-06-25.pdf")
+        self.assertEqual(generate_filename(doc_b), "SomeImportantNone/2020-07-25.pdf")
+
+    def test_no_path_fallback(self):
+        """
+        GIVEN:
+            - Two documents, one with defined storage path, the other not
+        WHEN:
+            - the filename is generated for the documents
+        THEN:
+            - Document with defined path uses its format
+            - Document without defined path uses the default path
+        """
+        doc_a = Document.objects.create(
+            title="does not matter",
+            created=timezone.make_aware(datetime.datetime(2020, 6, 25, 7, 36, 51, 153)),
+            mime_type="application/pdf",
+            pk=2,
+            checksum="2",
+            archive_serial_number=4,
+        )
+        doc_b = Document.objects.create(
+            title="does not matter",
+            created=timezone.make_aware(datetime.datetime(2020, 7, 25, 7, 36, 51, 153)),
+            mime_type="application/pdf",
+            pk=5,
+            checksum="abcde",
+            storage_path=StoragePath.objects.create(
+                name="sp2",
+                path="SomeImportantNone/{created}",
+            ),
+        )
+
+        self.assertEqual(generate_filename(doc_a), "0000002.pdf")
+        self.assertEqual(generate_filename(doc_b), "SomeImportantNone/2020-07-25.pdf")
+
 
 def run():
     doc = Document.objects.create(
diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py
index 7cb2e22d7..dbfc1267b 100644
--- a/src/documents/tests/test_management.py
+++ b/src/documents/tests/test_management.py
@@ -18,7 +18,7 @@ from documents.tests.utils import DirectoriesMixin
 sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+@override_settings(FILENAME_FORMAT="{correspondent}/{title}")
 class TestArchiver(DirectoriesMixin, TestCase):
     def make_models(self):
         return Document.objects.create(
@@ -72,7 +72,7 @@ class TestArchiver(DirectoriesMixin, TestCase):
         self.assertIsNone(doc.archive_filename)
         self.assertTrue(os.path.isfile(doc.source_path))
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}")
+    @override_settings(FILENAME_FORMAT="{title}")
     def test_naming_priorities(self):
         doc1 = Document.objects.create(
             checksum="A",
@@ -109,7 +109,7 @@ class TestDecryptDocuments(TestCase):
         ORIGINALS_DIR=os.path.join(os.path.dirname(__file__), "samples", "originals"),
         THUMBNAIL_DIR=os.path.join(os.path.dirname(__file__), "samples", "thumb"),
         PASSPHRASE="test",
-        PAPERLESS_FILENAME_FORMAT=None,
+        FILENAME_FORMAT=None,
     )
     @mock.patch("documents.management.commands.decrypt_documents.input")
     def test_decrypt(self, m):
@@ -184,7 +184,7 @@ class TestMakeIndex(TestCase):
 
 
 class TestRenamer(DirectoriesMixin, TestCase):
-    @override_settings(PAPERLESS_FILENAME_FORMAT="")
+    @override_settings(FILENAME_FORMAT="")
     def test_rename(self):
         doc = Document.objects.create(title="test", mime_type="image/jpeg")
         doc.filename = generate_filename(doc)
@@ -194,7 +194,7 @@ class TestRenamer(DirectoriesMixin, TestCase):
         Path(doc.source_path).touch()
         Path(doc.archive_path).touch()
 
-        with override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}"):
+        with override_settings(FILENAME_FORMAT="{correspondent}/{title}"):
             call_command("document_renamer")
 
         doc2 = Document.objects.get(id=doc.id)
diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.py
index 74e8d8af7..c509b9339 100644
--- a/src/documents/tests/test_management_exporter.py
+++ b/src/documents/tests/test_management_exporter.py
@@ -200,7 +200,7 @@ class TestExportImport(DirectoriesMixin, TestCase):
         )
 
         with override_settings(
-            PAPERLESS_FILENAME_FORMAT="{created_year}/{correspondent}/{title}",
+            FILENAME_FORMAT="{created_year}/{correspondent}/{title}",
         ):
             self.test_exporter(use_filename_format=True)
 
@@ -309,7 +309,7 @@ class TestExportImport(DirectoriesMixin, TestCase):
 
         self.assertTrue(len(manifest), 6)
 
-    @override_settings(PAPERLESS_FILENAME_FORMAT="{title}/{correspondent}")
+    @override_settings(FILENAME_FORMAT="{title}/{correspondent}")
     def test_update_export_changed_location(self):
         shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
         shutil.copytree(
diff --git a/src/documents/tests/test_migration_archive_files.py b/src/documents/tests/test_migration_archive_files.py
index ae76f0f81..fb9b9e1e3 100644
--- a/src/documents/tests/test_migration_archive_files.py
+++ b/src/documents/tests/test_migration_archive_files.py
@@ -111,7 +111,7 @@ simple_png = os.path.join(os.path.dirname(__file__), "samples", "simple-noalpha.
 simple_png2 = os.path.join(os.path.dirname(__file__), "examples", "no-text.png")
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="")
+@override_settings(FILENAME_FORMAT="")
 class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
 
     migrate_from = "1011_auto_20210101_2340"
@@ -240,7 +240,7 @@ class TestMigrateArchiveFiles(DirectoriesMixin, TestMigrations):
         )
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+@override_settings(FILENAME_FORMAT="{correspondent}/{title}")
 class TestMigrateArchiveFilesWithFilenameFormat(TestMigrateArchiveFiles):
     def test_filenames(self):
         Document = self.apps.get_model("documents", "Document")
@@ -279,7 +279,7 @@ def fake_parse_wrapper(parser, path, mime_type, file_name):
     parser.text = "the text"
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="")
+@override_settings(FILENAME_FORMAT="")
 class TestMigrateArchiveFilesErrors(DirectoriesMixin, TestMigrations):
 
     migrate_from = "1011_auto_20210101_2340"
@@ -447,7 +447,7 @@ class TestMigrateArchiveFilesErrors(DirectoriesMixin, TestMigrations):
         self.assertIsNone(doc2.archive_filename)
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="")
+@override_settings(FILENAME_FORMAT="")
 class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):
 
     migrate_from = "1012_fix_archive_files"
@@ -505,14 +505,14 @@ class TestMigrateArchiveFilesBackwards(DirectoriesMixin, TestMigrations):
         )
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="{correspondent}/{title}")
+@override_settings(FILENAME_FORMAT="{correspondent}/{title}")
 class TestMigrateArchiveFilesBackwardsWithFilenameFormat(
     TestMigrateArchiveFilesBackwards,
 ):
     pass
 
 
-@override_settings(PAPERLESS_FILENAME_FORMAT="")
+@override_settings(FILENAME_FORMAT="")
 class TestMigrateArchiveFilesBackwardsErrors(DirectoriesMixin, TestMigrations):
 
     migrate_from = "1012_fix_archive_files"
diff --git a/src/documents/views.py b/src/documents/views.py
index 414ccf070..cdd38180b 100644
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -11,6 +11,7 @@ from unicodedata import normalize
 from urllib.parse import quote
 
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.db.models import Case
 from django.db.models import Count
 from django.db.models import IntegerField
@@ -54,14 +55,17 @@ from .classifier import load_classifier
 from .filters import CorrespondentFilterSet
 from .filters import DocumentFilterSet
 from .filters import DocumentTypeFilterSet
+from .filters import StoragePathFilterSet
 from .filters import TagFilterSet
 from .matching import match_correspondents
 from .matching import match_document_types
+from .matching import match_storage_paths
 from .matching import match_tags
 from .models import Correspondent
 from .models import Document
 from .models import DocumentType
 from .models import SavedView
+from .models import StoragePath
 from .models import Tag
 from .parsers import get_parser_class_for_mime_type
 from .serialisers import BulkDownloadSerializer
@@ -72,8 +76,10 @@ from .serialisers import DocumentSerializer
 from .serialisers import DocumentTypeSerializer
 from .serialisers import PostDocumentSerializer
 from .serialisers import SavedViewSerializer
+from .serialisers import StoragePathSerializer
 from .serialisers import TagSerializer
 from .serialisers import TagSerializerVersion1
+from .serialisers import UiSettingsViewSerializer
 
 logger = logging.getLogger("paperless.api")
 
@@ -81,12 +87,18 @@ logger = logging.getLogger("paperless.api")
 class IndexView(TemplateView):
     template_name = "index.html"
 
-    def get_language(self):
+    def get_frontend_language(self):
+        if hasattr(
+            self.request.user,
+            "ui_settings",
+        ) and self.request.user.ui_settings.settings.get("language"):
+            lang = self.request.user.ui_settings.settings.get("language")
+        else:
+            lang = get_language()
         # This is here for the following reason:
         # Django identifies languages in the form "en-us"
         # However, angular generates locales as "en-US".
         # this translates between these two forms.
-        lang = get_language()
         if "-" in lang:
             first = lang[: lang.index("-")]
             second = lang[lang.index("-") + 1 :]
@@ -99,16 +111,18 @@ class IndexView(TemplateView):
         context["cookie_prefix"] = settings.COOKIE_PREFIX
         context["username"] = self.request.user.username
         context["full_name"] = self.request.user.get_full_name()
-        context["styles_css"] = f"frontend/{self.get_language()}/styles.css"
-        context["runtime_js"] = f"frontend/{self.get_language()}/runtime.js"
-        context["polyfills_js"] = f"frontend/{self.get_language()}/polyfills.js"
-        context["main_js"] = f"frontend/{self.get_language()}/main.js"
+        context["styles_css"] = f"frontend/{self.get_frontend_language()}/styles.css"
+        context["runtime_js"] = f"frontend/{self.get_frontend_language()}/runtime.js"
+        context[
+            "polyfills_js"
+        ] = f"frontend/{self.get_frontend_language()}/polyfills.js"
+        context["main_js"] = f"frontend/{self.get_frontend_language()}/main.js"
         context[
             "webmanifest"
-        ] = f"frontend/{self.get_language()}/manifest.webmanifest"  # noqa: E501
+        ] = f"frontend/{self.get_frontend_language()}/manifest.webmanifest"  # noqa: E501
         context[
             "apple_touch_icon"
-        ] = f"frontend/{self.get_language()}/apple-touch-icon.png"  # noqa: E501
+        ] = f"frontend/{self.get_frontend_language()}/apple-touch-icon.png"  # noqa: E501
         return context
 
 
@@ -325,6 +339,7 @@ class DocumentViewSet(
                 "document_types": [
                     dt.id for dt in match_document_types(doc, classifier)
                 ],
+                "storage_paths": [dt.id for dt in match_storage_paths(doc, classifier)],
             },
         )
 
@@ -567,6 +582,12 @@ class SelectionDataView(GenericAPIView):
             ),
         )
 
+        storage_paths = StoragePath.objects.annotate(
+            document_count=Count(
+                Case(When(documents__id__in=ids, then=1), output_field=IntegerField()),
+            ),
+        )
+
         r = Response(
             {
                 "selected_correspondents": [
@@ -579,6 +600,10 @@ class SelectionDataView(GenericAPIView):
                 "selected_document_types": [
                     {"id": t.id, "document_count": t.document_count} for t in types
                 ],
+                "selected_storage_paths": [
+                    {"id": t.id, "document_count": t.document_count}
+                    for t in storage_paths
+                ],
             },
         )
 
@@ -717,3 +742,56 @@ class RemoteVersionView(GenericAPIView):
                 "feature_is_set": feature_is_set,
             },
         )
+
+
+class StoragePathViewSet(ModelViewSet):
+    model = DocumentType
+
+    queryset = StoragePath.objects.annotate(document_count=Count("documents")).order_by(
+        Lower("name"),
+    )
+
+    serializer_class = StoragePathSerializer
+    pagination_class = StandardPagination
+    permission_classes = (IsAuthenticated,)
+    filter_backends = (DjangoFilterBackend, OrderingFilter)
+    filterset_class = StoragePathFilterSet
+    ordering_fields = ("name", "path", "matching_algorithm", "match", "document_count")
+
+
+class UiSettingsView(GenericAPIView):
+
+    permission_classes = (IsAuthenticated,)
+    serializer_class = UiSettingsViewSerializer
+
+    def get(self, request, format=None):
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        user = User.objects.get(pk=request.user.id)
+        displayname = user.username
+        if user.first_name or user.last_name:
+            displayname = " ".join([user.first_name, user.last_name])
+        settings = {}
+        if hasattr(user, "ui_settings"):
+            settings = user.ui_settings.settings
+        return Response(
+            {
+                "user_id": user.id,
+                "username": user.username,
+                "display_name": displayname,
+                "settings": settings,
+            },
+        )
+
+    def post(self, request, format=None):
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        serializer.save(user=self.request.user)
+
+        return Response(
+            {
+                "success": True,
+            },
+        )
diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po
index 9ab97ee3f..5c0736edd 100644
--- a/src/locale/en_US/LC_MESSAGES/django.po
+++ b/src/locale/en_US/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: paperless-ngx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-02 11:20-0800\n"
+"POT-Creation-Date: 2022-05-19 15:24-0700\n"
 "PO-Revision-Date: 2022-02-17 04:17\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
@@ -17,373 +17,397 @@ msgstr ""
 "X-Crowdin-File: /dev/src/locale/en_US/LC_MESSAGES/django.po\n"
 "X-Crowdin-File-ID: 14\n"
 
-#: documents/apps.py:10
+#: documents/apps.py:9
 msgid "Documents"
 msgstr ""
 
-#: documents/models.py:32
+#: documents/models.py:27
 msgid "Any word"
 msgstr ""
 
-#: documents/models.py:33
+#: documents/models.py:28
 msgid "All words"
 msgstr ""
 
-#: documents/models.py:34
+#: documents/models.py:29
 msgid "Exact match"
 msgstr ""
 
-#: documents/models.py:35
+#: documents/models.py:30
 msgid "Regular expression"
 msgstr ""
 
-#: documents/models.py:36
+#: documents/models.py:31
 msgid "Fuzzy word"
 msgstr ""
 
-#: documents/models.py:37
+#: documents/models.py:32
 msgid "Automatic"
 msgstr ""
 
-#: documents/models.py:40 documents/models.py:314 paperless_mail/models.py:23
-#: paperless_mail/models.py:107
+#: documents/models.py:35 documents/models.py:343 paperless_mail/models.py:16
+#: paperless_mail/models.py:79
 msgid "name"
 msgstr ""
 
-#: documents/models.py:42
+#: documents/models.py:37
 msgid "match"
 msgstr ""
 
-#: documents/models.py:45
+#: documents/models.py:40
 msgid "matching algorithm"
 msgstr ""
 
-#: documents/models.py:48
+#: documents/models.py:45
 msgid "is insensitive"
 msgstr ""
 
-#: documents/models.py:61 documents/models.py:104
+#: documents/models.py:58 documents/models.py:113
 msgid "correspondent"
 msgstr ""
 
-#: documents/models.py:62
+#: documents/models.py:59
 msgid "correspondents"
 msgstr ""
 
-#: documents/models.py:67
+#: documents/models.py:64
 msgid "color"
 msgstr ""
 
-#: documents/models.py:70
+#: documents/models.py:67
 msgid "is inbox tag"
 msgstr ""
 
-#: documents/models.py:73
+#: documents/models.py:70
 msgid ""
 "Marks this tag as an inbox tag: All newly consumed documents will be tagged "
 "with inbox tags."
 msgstr ""
 
-#: documents/models.py:79
+#: documents/models.py:76
 msgid "tag"
 msgstr ""
 
-#: documents/models.py:80 documents/models.py:130
+#: documents/models.py:77 documents/models.py:151
 msgid "tags"
 msgstr ""
 
-#: documents/models.py:85 documents/models.py:115
+#: documents/models.py:82 documents/models.py:133
 msgid "document type"
 msgstr ""
 
-#: documents/models.py:86
+#: documents/models.py:83
 msgid "document types"
 msgstr ""
 
-#: documents/models.py:94
-msgid "Unencrypted"
+#: documents/models.py:88
+msgid "path"
+msgstr ""
+
+#: documents/models.py:94 documents/models.py:122
+msgid "storage path"
 msgstr ""
 
 #: documents/models.py:95
+msgid "storage paths"
+msgstr ""
+
+#: documents/models.py:103
+msgid "Unencrypted"
+msgstr ""
+
+#: documents/models.py:104
 msgid "Encrypted with GNU Privacy Guard"
 msgstr ""
 
-#: documents/models.py:107
+#: documents/models.py:125
 msgid "title"
 msgstr ""
 
-#: documents/models.py:119
+#: documents/models.py:137
 msgid "content"
 msgstr ""
 
-#: documents/models.py:122
+#: documents/models.py:140
 msgid ""
 "The raw, text-only data of the document. This field is primarily used for "
 "searching."
 msgstr ""
 
-#: documents/models.py:127
+#: documents/models.py:145
 msgid "mime type"
 msgstr ""
 
-#: documents/models.py:134
+#: documents/models.py:155
 msgid "checksum"
 msgstr ""
 
-#: documents/models.py:138
+#: documents/models.py:159
 msgid "The checksum of the original document."
 msgstr ""
 
-#: documents/models.py:142
+#: documents/models.py:163
 msgid "archive checksum"
 msgstr ""
 
-#: documents/models.py:147
+#: documents/models.py:168
 msgid "The checksum of the archived document."
 msgstr ""
 
-#: documents/models.py:150 documents/models.py:295
+#: documents/models.py:171 documents/models.py:324
 msgid "created"
 msgstr ""
 
-#: documents/models.py:153
+#: documents/models.py:174
 msgid "modified"
 msgstr ""
 
-#: documents/models.py:157
+#: documents/models.py:181
 msgid "storage type"
 msgstr ""
 
-#: documents/models.py:165
+#: documents/models.py:189
 msgid "added"
 msgstr ""
 
-#: documents/models.py:169
+#: documents/models.py:196
 msgid "filename"
 msgstr ""
 
-#: documents/models.py:175
+#: documents/models.py:202
 msgid "Current filename in storage"
 msgstr ""
 
-#: documents/models.py:179
+#: documents/models.py:206
 msgid "archive filename"
 msgstr ""
 
-#: documents/models.py:185
+#: documents/models.py:212
 msgid "Current archive filename in storage"
 msgstr ""
 
-#: documents/models.py:189
+#: documents/models.py:216
 msgid "archive serial number"
 msgstr ""
 
-#: documents/models.py:195
+#: documents/models.py:222
 msgid "The position of this document in your physical document archive."
 msgstr ""
 
-#: documents/models.py:201
+#: documents/models.py:228
 msgid "document"
 msgstr ""
 
-#: documents/models.py:202
+#: documents/models.py:229
 msgid "documents"
 msgstr ""
 
-#: documents/models.py:280
+#: documents/models.py:307
 msgid "debug"
 msgstr ""
 
-#: documents/models.py:281
+#: documents/models.py:308
 msgid "information"
 msgstr ""
 
-#: documents/models.py:282
+#: documents/models.py:309
 msgid "warning"
 msgstr ""
 
-#: documents/models.py:283
+#: documents/models.py:310
 msgid "error"
 msgstr ""
 
-#: documents/models.py:284
+#: documents/models.py:311
 msgid "critical"
 msgstr ""
 
-#: documents/models.py:287
+#: documents/models.py:314
 msgid "group"
 msgstr ""
 
-#: documents/models.py:289
+#: documents/models.py:316
 msgid "message"
 msgstr ""
 
-#: documents/models.py:292
+#: documents/models.py:319
 msgid "level"
 msgstr ""
 
-#: documents/models.py:299
+#: documents/models.py:328
 msgid "log"
 msgstr ""
 
-#: documents/models.py:300
+#: documents/models.py:329
 msgid "logs"
 msgstr ""
 
-#: documents/models.py:310 documents/models.py:360
+#: documents/models.py:339 documents/models.py:392
 msgid "saved view"
 msgstr ""
 
-#: documents/models.py:311
+#: documents/models.py:340
 msgid "saved views"
 msgstr ""
 
-#: documents/models.py:313
+#: documents/models.py:342
 msgid "user"
 msgstr ""
 
-#: documents/models.py:317
+#: documents/models.py:346
 msgid "show on dashboard"
 msgstr ""
 
-#: documents/models.py:320
+#: documents/models.py:349
 msgid "show in sidebar"
 msgstr ""
 
-#: documents/models.py:324
+#: documents/models.py:353
 msgid "sort field"
 msgstr ""
 
-#: documents/models.py:326
+#: documents/models.py:358
 msgid "sort reverse"
 msgstr ""
 
-#: documents/models.py:331
+#: documents/models.py:363
 msgid "title contains"
 msgstr ""
 
-#: documents/models.py:332
+#: documents/models.py:364
 msgid "content contains"
 msgstr ""
 
-#: documents/models.py:333
+#: documents/models.py:365
 msgid "ASN is"
 msgstr ""
 
-#: documents/models.py:334
+#: documents/models.py:366
 msgid "correspondent is"
 msgstr ""
 
-#: documents/models.py:335
+#: documents/models.py:367
 msgid "document type is"
 msgstr ""
 
-#: documents/models.py:336
+#: documents/models.py:368
 msgid "is in inbox"
 msgstr ""
 
-#: documents/models.py:337
+#: documents/models.py:369
 msgid "has tag"
 msgstr ""
 
-#: documents/models.py:338
+#: documents/models.py:370
 msgid "has any tag"
 msgstr ""
 
-#: documents/models.py:339
+#: documents/models.py:371
 msgid "created before"
 msgstr ""
 
-#: documents/models.py:340
+#: documents/models.py:372
 msgid "created after"
 msgstr ""
 
-#: documents/models.py:341
+#: documents/models.py:373
 msgid "created year is"
 msgstr ""
 
-#: documents/models.py:342
+#: documents/models.py:374
 msgid "created month is"
 msgstr ""
 
-#: documents/models.py:343
+#: documents/models.py:375
 msgid "created day is"
 msgstr ""
 
-#: documents/models.py:344
+#: documents/models.py:376
 msgid "added before"
 msgstr ""
 
-#: documents/models.py:345
+#: documents/models.py:377
 msgid "added after"
 msgstr ""
 
-#: documents/models.py:346
+#: documents/models.py:378
 msgid "modified before"
 msgstr ""
 
-#: documents/models.py:347
+#: documents/models.py:379
 msgid "modified after"
 msgstr ""
 
-#: documents/models.py:348
+#: documents/models.py:380
 msgid "does not have tag"
 msgstr ""
 
-#: documents/models.py:349
+#: documents/models.py:381
 msgid "does not have ASN"
 msgstr ""
 
-#: documents/models.py:350
+#: documents/models.py:382
 msgid "title or content contains"
 msgstr ""
 
-#: documents/models.py:351
+#: documents/models.py:383
 msgid "fulltext query"
 msgstr ""
 
-#: documents/models.py:352
+#: documents/models.py:384
 msgid "more like this"
 msgstr ""
 
-#: documents/models.py:353
+#: documents/models.py:385
 msgid "has tags in"
 msgstr ""
 
-#: documents/models.py:363
+#: documents/models.py:395
 msgid "rule type"
 msgstr ""
 
-#: documents/models.py:365
+#: documents/models.py:397
 msgid "value"
 msgstr ""
 
-#: documents/models.py:368
+#: documents/models.py:400
 msgid "filter rule"
 msgstr ""
 
-#: documents/models.py:369
+#: documents/models.py:401
 msgid "filter rules"
 msgstr ""
 
-#: documents/serialisers.py:64
+#: documents/serialisers.py:63
 #, python-format
 msgid "Invalid regular expression: %(error)s"
 msgstr ""
 
-#: documents/serialisers.py:185
+#: documents/serialisers.py:184
 msgid "Invalid color."
 msgstr ""
 
-#: documents/serialisers.py:459
+#: documents/serialisers.py:491
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""
 
-#: documents/templates/index.html:22
+#: documents/serialisers.py:574
+msgid "Invalid variable detected."
+msgstr ""
+
+#: documents/templates/index.html:78
 msgid "Paperless-ngx is loading..."
 msgstr ""
 
+#: documents/templates/index.html:79
+msgid "Still here?! Hmm, something might be wrong."
+msgstr ""
+
+#: documents/templates/index.html:79
+msgid "Here's a link to the docs."
+msgstr ""
+
 #: documents/templates/registration/logged_out.html:14
 msgid "Paperless-ngx signed out"
 msgstr ""
@@ -420,71 +444,91 @@ msgstr ""
 msgid "Sign in"
 msgstr ""
 
-#: paperless/settings.py:299
+#: paperless/settings.py:338
 msgid "English (US)"
 msgstr ""
 
-#: paperless/settings.py:300
+#: paperless/settings.py:339
+msgid "Belarusian"
+msgstr ""
+
+#: paperless/settings.py:340
 msgid "Czech"
 msgstr ""
 
-#: paperless/settings.py:301
+#: paperless/settings.py:341
 msgid "Danish"
 msgstr ""
 
-#: paperless/settings.py:302
+#: paperless/settings.py:342
 msgid "German"
 msgstr ""
 
-#: paperless/settings.py:303
+#: paperless/settings.py:343
 msgid "English (GB)"
 msgstr ""
 
-#: paperless/settings.py:304
+#: paperless/settings.py:344
 msgid "Spanish"
 msgstr ""
 
-#: paperless/settings.py:305
+#: paperless/settings.py:345
 msgid "French"
 msgstr ""
 
-#: paperless/settings.py:306
+#: paperless/settings.py:346
 msgid "Italian"
 msgstr ""
 
-#: paperless/settings.py:307
+#: paperless/settings.py:347
 msgid "Luxembourgish"
 msgstr ""
 
-#: paperless/settings.py:308
+#: paperless/settings.py:348
 msgid "Dutch"
 msgstr ""
 
-#: paperless/settings.py:309
+#: paperless/settings.py:349
 msgid "Polish"
 msgstr ""
 
-#: paperless/settings.py:310
+#: paperless/settings.py:350
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: paperless/settings.py:311
+#: paperless/settings.py:351
 msgid "Portuguese"
 msgstr ""
 
-#: paperless/settings.py:312
+#: paperless/settings.py:352
 msgid "Romanian"
 msgstr ""
 
-#: paperless/settings.py:313
+#: paperless/settings.py:353
 msgid "Russian"
 msgstr ""
 
-#: paperless/settings.py:314
+#: paperless/settings.py:354
+msgid "Slovenian"
+msgstr ""
+
+#: paperless/settings.py:355
+msgid "Serbian"
+msgstr ""
+
+#: paperless/settings.py:356
 msgid "Swedish"
 msgstr ""
 
-#: paperless/urls.py:139
+#: paperless/settings.py:357
+msgid "Turkish"
+msgstr ""
+
+#: paperless/settings.py:358
+msgid "Chinese Simplified"
+msgstr ""
+
+#: paperless/urls.py:153
 msgid "Paperless-ngx administration"
 msgstr ""
 
@@ -527,208 +571,210 @@ msgid ""
 "process all matching rules that you have defined."
 msgstr ""
 
-#: paperless_mail/apps.py:9
+#: paperless_mail/apps.py:8
 msgid "Paperless mail"
 msgstr ""
 
-#: paperless_mail/models.py:10
+#: paperless_mail/models.py:8
 msgid "mail account"
 msgstr ""
 
-#: paperless_mail/models.py:11
+#: paperless_mail/models.py:9
 msgid "mail accounts"
 msgstr ""
 
-#: paperless_mail/models.py:18
+#: paperless_mail/models.py:12
 msgid "No encryption"
 msgstr ""
 
-#: paperless_mail/models.py:19
+#: paperless_mail/models.py:13
 msgid "Use SSL"
 msgstr ""
 
-#: paperless_mail/models.py:20
+#: paperless_mail/models.py:14
 msgid "Use STARTTLS"
 msgstr ""
 
-#: paperless_mail/models.py:25
+#: paperless_mail/models.py:18
 msgid "IMAP server"
 msgstr ""
 
-#: paperless_mail/models.py:28
+#: paperless_mail/models.py:21
 msgid "IMAP port"
 msgstr ""
 
-#: paperless_mail/models.py:32
+#: paperless_mail/models.py:25
 msgid ""
 "This is usually 143 for unencrypted and STARTTLS connections, and 993 for "
 "SSL connections."
 msgstr ""
 
-#: paperless_mail/models.py:38
+#: paperless_mail/models.py:31
 msgid "IMAP security"
 msgstr ""
 
-#: paperless_mail/models.py:41
+#: paperless_mail/models.py:36
 msgid "username"
 msgstr ""
 
-#: paperless_mail/models.py:43
+#: paperless_mail/models.py:38
 msgid "password"
 msgstr ""
 
-#: paperless_mail/models.py:46
+#: paperless_mail/models.py:41
 msgid "character set"
 msgstr ""
 
-#: paperless_mail/models.py:50
+#: paperless_mail/models.py:45
 msgid ""
 "The character set to use when communicating with the mail server, such as "
 "'UTF-8' or 'US-ASCII'."
 msgstr ""
 
-#: paperless_mail/models.py:61
+#: paperless_mail/models.py:56
 msgid "mail rule"
 msgstr ""
 
-#: paperless_mail/models.py:62
+#: paperless_mail/models.py:57
 msgid "mail rules"
 msgstr ""
 
-#: paperless_mail/models.py:68
+#: paperless_mail/models.py:60
 msgid "Only process attachments."
 msgstr ""
 
-#: paperless_mail/models.py:71
+#: paperless_mail/models.py:61
 msgid "Process all files, including 'inline' attachments."
 msgstr ""
 
-#: paperless_mail/models.py:81
-msgid "Mark as read, don't process read mails"
-msgstr ""
-
-#: paperless_mail/models.py:82
-msgid "Flag the mail, don't process flagged mails"
-msgstr ""
-
-#: paperless_mail/models.py:83
-msgid "Move to specified folder"
-msgstr ""
-
-#: paperless_mail/models.py:84
+#: paperless_mail/models.py:64
 msgid "Delete"
 msgstr ""
 
-#: paperless_mail/models.py:91
+#: paperless_mail/models.py:65
+msgid "Move to specified folder"
+msgstr ""
+
+#: paperless_mail/models.py:66
+msgid "Mark as read, don't process read mails"
+msgstr ""
+
+#: paperless_mail/models.py:67
+msgid "Flag the mail, don't process flagged mails"
+msgstr ""
+
+#: paperless_mail/models.py:70
 msgid "Use subject as title"
 msgstr ""
 
-#: paperless_mail/models.py:92
+#: paperless_mail/models.py:71
 msgid "Use attachment filename as title"
 msgstr ""
 
-#: paperless_mail/models.py:101
+#: paperless_mail/models.py:74
 msgid "Do not assign a correspondent"
 msgstr ""
 
-#: paperless_mail/models.py:102
+#: paperless_mail/models.py:75
 msgid "Use mail address"
 msgstr ""
 
-#: paperless_mail/models.py:103
+#: paperless_mail/models.py:76
 msgid "Use name (or mail address if not available)"
 msgstr ""
 
-#: paperless_mail/models.py:104
+#: paperless_mail/models.py:77
 msgid "Use correspondent selected below"
 msgstr ""
 
-#: paperless_mail/models.py:109
+#: paperless_mail/models.py:81
 msgid "order"
 msgstr ""
 
-#: paperless_mail/models.py:115
+#: paperless_mail/models.py:87
 msgid "account"
 msgstr ""
 
-#: paperless_mail/models.py:119
+#: paperless_mail/models.py:91
 msgid "folder"
 msgstr ""
 
-#: paperless_mail/models.py:122
-msgid "Subfolders must be separated by dots."
+#: paperless_mail/models.py:95
+msgid ""
+"Subfolders must be separated by a delimiter, often a dot ('.') or slash "
+"('/'), but it varies by mail server."
 msgstr ""
 
-#: paperless_mail/models.py:126
+#: paperless_mail/models.py:101
 msgid "filter from"
 msgstr ""
 
-#: paperless_mail/models.py:129
+#: paperless_mail/models.py:107
 msgid "filter subject"
 msgstr ""
 
-#: paperless_mail/models.py:132
+#: paperless_mail/models.py:113
 msgid "filter body"
 msgstr ""
 
-#: paperless_mail/models.py:136
+#: paperless_mail/models.py:120
 msgid "filter attachment filename"
 msgstr ""
 
-#: paperless_mail/models.py:141
+#: paperless_mail/models.py:125
 msgid ""
 "Only consume documents which entirely match this filename if specified. "
 "Wildcards such as *.pdf or *invoice* are allowed. Case insensitive."
 msgstr ""
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:132
 msgid "maximum age"
 msgstr ""
 
-#: paperless_mail/models.py:148
+#: paperless_mail/models.py:134
 msgid "Specified in days."
 msgstr ""
 
-#: paperless_mail/models.py:152
+#: paperless_mail/models.py:138
 msgid "attachment type"
 msgstr ""
 
-#: paperless_mail/models.py:156
+#: paperless_mail/models.py:142
 msgid ""
 "Inline attachments include embedded images, so it's best to combine this "
 "option with a filename filter."
 msgstr ""
 
-#: paperless_mail/models.py:162
+#: paperless_mail/models.py:148
 msgid "action"
 msgstr ""
 
-#: paperless_mail/models.py:168
+#: paperless_mail/models.py:154
 msgid "action parameter"
 msgstr ""
 
-#: paperless_mail/models.py:173
+#: paperless_mail/models.py:159
 msgid ""
 "Additional parameter for the action selected above, i.e., the target folder "
 "of the move to folder action. Subfolders must be separated by dots."
 msgstr ""
 
-#: paperless_mail/models.py:181
+#: paperless_mail/models.py:167
 msgid "assign title from"
 msgstr ""
 
-#: paperless_mail/models.py:189
+#: paperless_mail/models.py:175
 msgid "assign this tag"
 msgstr ""
 
-#: paperless_mail/models.py:197
+#: paperless_mail/models.py:183
 msgid "assign this document type"
 msgstr ""
 
-#: paperless_mail/models.py:201
+#: paperless_mail/models.py:187
 msgid "assign correspondent from"
 msgstr ""
 
-#: paperless_mail/models.py:211
+#: paperless_mail/models.py:197
 msgid "assign this correspondent"
 msgstr ""
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 9b779d575..7f484ad97 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -5,6 +5,7 @@ import multiprocessing
 import os
 import re
 from typing import Final
+from typing import Optional
 from typing import Set
 from urllib.parse import urlparse
 
@@ -551,10 +552,9 @@ OCR_ROTATE_PAGES_THRESHOLD = float(
     os.getenv("PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD", 12.0),
 )
 
-OCR_MAX_IMAGE_PIXELS = os.environ.get(
-    "PAPERLESS_OCR_MAX_IMAGE_PIXELS",
-    256000000,
-)
+OCR_MAX_IMAGE_PIXELS: Optional[int] = None
+if os.environ.get("PAPERLESS_OCR_MAX_IMAGE_PIXELS") is not None:
+    OCR_MAX_IMAGE_PIXELS: int = int(os.environ.get("PAPERLESS_OCR_MAX_IMAGE_PIXELS"))
 
 OCR_USER_ARGS = os.getenv("PAPERLESS_OCR_USER_ARGS", "{}")
 
@@ -597,15 +597,22 @@ FILENAME_PARSE_TRANSFORMS = []
 for t in json.loads(os.getenv("PAPERLESS_FILENAME_PARSE_TRANSFORMS", "[]")):
     FILENAME_PARSE_TRANSFORMS.append((re.compile(t["pattern"]), t["repl"]))
 
-# TODO: this should not have a prefix.
 # Specify the filename format for out files
-PAPERLESS_FILENAME_FORMAT = os.getenv("PAPERLESS_FILENAME_FORMAT")
+FILENAME_FORMAT = os.getenv("PAPERLESS_FILENAME_FORMAT")
+
+# If this is enabled, variables in filename format will resolve to empty-string instead of 'none'.
+# Directories with 'empty names' are omitted, too.
+FILENAME_FORMAT_REMOVE_NONE = __get_boolean(
+    "PAPERLESS_FILENAME_FORMAT_REMOVE_NONE",
+    "NO",
+)
 
 THUMBNAIL_FONT_NAME = os.getenv(
     "PAPERLESS_THUMBNAIL_FONT_NAME",
     "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf",
 )
 
+# TODO: this should not have a prefix.
 # Tika settings
 PAPERLESS_TIKA_ENABLED = __get_boolean("PAPERLESS_TIKA_ENABLED", "NO")
 PAPERLESS_TIKA_ENDPOINT = os.getenv("PAPERLESS_TIKA_ENDPOINT", "http://localhost:9998")
diff --git a/src/paperless/urls.py b/src/paperless/urls.py
index 833788cce..003d79f2d 100644
--- a/src/paperless/urls.py
+++ b/src/paperless/urls.py
@@ -19,7 +19,9 @@ from documents.views import SavedViewViewSet
 from documents.views import SearchAutoCompleteView
 from documents.views import SelectionDataView
 from documents.views import StatisticsView
+from documents.views import StoragePathViewSet
 from documents.views import TagViewSet
+from documents.views import UiSettingsView
 from documents.views import UnifiedSearchViewSet
 from paperless.consumers import StatusConsumer
 from paperless.views import FaviconView
@@ -33,6 +35,7 @@ api_router.register(r"documents", UnifiedSearchViewSet)
 api_router.register(r"logs", LogViewSet, basename="logs")
 api_router.register(r"tags", TagViewSet)
 api_router.register(r"saved_views", SavedViewViewSet)
+api_router.register(r"storage_paths", StoragePathViewSet)
 
 
 urlpatterns = [
@@ -78,6 +81,11 @@ urlpatterns = [
                     RemoteVersionView.as_view(),
                     name="remoteversion",
                 ),
+                re_path(
+                    r"^ui_settings/",
+                    UiSettingsView.as_view(),
+                    name="ui_settings",
+                ),
                 path("token/", views.obtain_auth_token),
             ]
             + api_router.urls,
diff --git a/src/paperless_tesseract/parsers.py b/src/paperless_tesseract/parsers.py
index 56313c5b4..f35d3a6b4 100644
--- a/src/paperless_tesseract/parsers.py
+++ b/src/paperless_tesseract/parsers.py
@@ -8,8 +8,6 @@ from documents.parsers import make_thumbnail_from_pdf
 from documents.parsers import ParseError
 from PIL import Image
 
-Image.MAX_IMAGE_PIXELS = settings.OCR_MAX_IMAGE_PIXELS
-
 
 class NoTextFoundException(Exception):
     pass
@@ -225,6 +223,24 @@ class RasterisedDocumentParser(DocumentParser):
                     f"they will not be used. Error: {e}",
                 )
 
+        if settings.OCR_MAX_IMAGE_PIXELS is not None:
+            # Convert pixels to mega-pixels and provide to ocrmypdf
+            max_pixels_mpixels = settings.OCR_MAX_IMAGE_PIXELS / 1_000_000.0
+            if max_pixels_mpixels > 0:
+
+                self.log(
+                    "debug",
+                    f"Calculated {max_pixels_mpixels} megapixels for OCR",
+                )
+
+                ocrmypdf_args["max_image_mpixels"] = max_pixels_mpixels
+            else:
+                self.log(
+                    "warning",
+                    "There is an issue with PAPERLESS_OCR_MAX_IMAGE_PIXELS, "
+                    "this value must be at least 1 megapixel if set",
+                )
+
         return ocrmypdf_args
 
     def parse(self, document_path, mime_type, file_name=None):
diff --git a/src/paperless_text/parsers.py b/src/paperless_text/parsers.py
index 9ef5fec40..fe7e823b3 100644
--- a/src/paperless_text/parsers.py
+++ b/src/paperless_text/parsers.py
@@ -6,8 +6,6 @@ from PIL import Image
 from PIL import ImageDraw
 from PIL import ImageFont
 
-Image.MAX_IMAGE_PIXELS = settings.OCR_MAX_IMAGE_PIXELS
-
 
 class TextDocumentParser(DocumentParser):
     """
@@ -28,7 +26,7 @@ class TextDocumentParser(DocumentParser):
         font = ImageFont.truetype(
             font=settings.THUMBNAIL_FONT_NAME,
             size=20,
-            layout_engine=ImageFont.LAYOUT_BASIC,
+            layout_engine=ImageFont.Layout.BASIC,
         )
         draw.text((5, 5), read_text(), font=font, fill="black")