chore: release preparation

fix(project): duplicate project into parent project
fix(deps): update module golang.org/x/oauth2 to v0.10.0
2023-07-07 13:34:22 +02:00 · 2023-07-07 12:56:15 +02:00 · 2023-07-05 22:02:03 +00:00 · 2023-07-05 17:50:35 +02:00 · 2023-07-05 14:01:58 +00:00 · 2023-07-05 13:44:28 +00:00
252 changed files with 11373 additions and 35629 deletions
@@ -121,12 +121,23 @@ steps:
    when:
      event: [ push, tag, pull_request ]

-  - name: build
+  - name: prepare-build
    image: vikunja/golang-build:latest
    pull: always
    environment:
      GOPROXY: 'https://goproxy.kolaente.de'
    depends_on: [ mage ]
+    commands:
+      - ./mage-static do-the-swag
+    when:
+      event: [ push, tag, pull_request ]
+
+  - name: build
+    image: vikunja/golang-build:latest
+    pull: always
+    environment:
+      GOPROXY: 'https://goproxy.kolaente.de'
+    depends_on: [ prepare-build ]
    commands:
      - ./mage-static build:build
    when:
@@ -141,8 +152,8 @@ steps:
    commands:
      - export "GOROOT=$(go env GOROOT)"
      - apk --no-cache add build-base git
-      - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
-      - ./mage-static check:all
+      - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.2
+      - ./mage-static check:golangci
    when:
      event: [ push, tag, pull_request ]

@@ -219,7 +230,7 @@ steps:
      GOPROXY: 'https://goproxy.kolaente.de'
    commands:
      - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -236,7 +247,7 @@ steps:
        path: /db
    commands:
      - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -253,7 +264,7 @@ steps:
      VIKUNJA_DATABASE_DATABASE: vikunjatest
    commands:
      - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -271,7 +282,7 @@ steps:
      VIKUNJA_DATABASE_SSLMODE: disable
    commands:
      - ./mage-static test:unit
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -282,7 +293,7 @@ steps:
      GOPROXY: 'https://goproxy.kolaente.de'
    commands:
      - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -299,7 +310,7 @@ steps:
        path: /db
    commands:
      - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -316,7 +327,7 @@ steps:
      VIKUNJA_DATABASE_DATABASE: vikunjatest
    commands:
      - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -334,7 +345,7 @@ steps:
      VIKUNJA_DATABASE_SSLMODE: disable
    commands:
      - ./mage-static test:integration
-    depends_on: [ fetch-tags, mage ]
+    depends_on: [ fetch-tags, prepare-build ]
    when:
      event: [ push, tag, pull_request ]

@@ -385,6 +396,7 @@ steps:
      - export PATH=$PATH:$GOPATH/bin
      - go install github.com/magefile/mage
      - ./mage-static release:dirs
+      - ./mage-static do-the-swag
    depends_on: [ fetch-tags, mage ]

  - name: static-build-windows
@@ -506,7 +518,7 @@ steps:

  # Build os packages and push it to our bucket
  - name: build-os-packages-unstable
-    image: goreleaser/nfpm:v2.23.0
+    image: goreleaser/nfpm:v2.30.1
    pull: always
    commands:
      - apk add git go
@@ -522,7 +534,7 @@ steps:
    depends_on: [ after-build-compress ]

  - name: build-os-packages-version
-    image: goreleaser/nfpm:v2.23.0
+    image: goreleaser/nfpm:v2.30.1
    pull: always
    commands:
      - apk add git go
@@ -607,7 +619,7 @@ steps:
      - tar -xzf vikunja-theme.tar.gz

  - name: build
-    image: klakegg/hugo:0.107.0
+    image: klakegg/hugo:0.111.3
    pull: always
    commands:
      - cd docs
@@ -731,6 +743,6 @@ steps:
        - failure
 ---
 kind: signature
-hmac: 148171b051fff279f249608111b56ef0fb5a09a8944ce7aee3e3cf7cf5b6fe4a
+hmac: d47bd1cf6f3e9be2ff3eed2039e65c8b6de2b16c1e636699f66382f941277411

 ...
@@ -1,2 +1,3 @@
 github: kolaente
-custom: https://www.buymeacoffee.com/kolaente
+open_collective: vikunja
+custom: ["https://vikunja.cloud", "https://www.buymeacoffee.com/kolaente"]
@@ -27,3 +27,4 @@ vikunja-dump*
 vendor/
 os-packages/
 mage_output_file.go
+pkg/swagger/*
@@ -79,6 +79,8 @@ issues:
    - path: pkg/routes/api/v1/docs.go
      linters:
        - goheader
+        - misspell
+        - gosmopolitan
    - text: "Missed string"
      linters:
        - goheader
@@ -88,3 +90,10 @@ issues:
    - path: pkg/models/favorites\.go
      linters:
        - nilerr
+    - path: pkg/models/project\.go
+      text: "string `parent_project_id` has 3 occurrences, make it a constant"
+    - path: pkg/models/events\.go
+      linters:
+        - musttag
+    - path: pkg/models/task_collection.go
+      text: 'append result not assigned to the same slice'
@@ -7,6 +7,459 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

 All releases can be found on https://code.vikunja.io/api/releases.

+## [0.21.0] - 2023-07-07
+
+### Bug Fixes
+
+* *(CalDAV)* Naming
+* *(api)* License (#1457)
+* *(build)* Make sure the docker image can access go tools
+* *(caldav)* Do not create label if it exists by title (#1444)
+* *(caldav)* Incoming tasks do not get correct time zone (#1455)
+* *(ci)* Pipeline dependency
+* *(cli)* Rename user project command
+* *(docker)* Don't chown everything in Vikunja's default root folder
+* *(docs)* Added Keycloak OpenID example (#1521)
+* *(docs)* Clarify error codes in swagger docs
+* *(docs)* Link to usage/api
+* *(docs)* Semver link (#1470)
+* *(filter)* Don't try to get the real subscription for a saved filter project
+* *(filters)* Return all filters with all projects, not grouped under a pseudo project
+* *(filters)* Sorting tasks from filters
+* *(image)* Json type of struct property (#1469)
+* *(import)* Don't try to load a nonexistant attachment file
+* *(lint)* Disable misspell linter on redoc
+* *(migration)* Don't try to fetch task details of tasks whose projects are deleted
+* *(migration)* Enable insert from structure work recursively
+* *(migration)* Make file migration work with new structure
+* *(migration)* Remove unused is_deleted flag from Todoist api response
+* *(migration)* Remove wunderlist leftovers
+* *(migration)* Remove wunderlist leftovers
+* *(migration)* Remove wunderlist leftovers
+* *(migration)* Rename TickTick migration
+* *(migration)* Revert wrongly changed url
+* *(migration)* Use correct struct
+* *(project)* Don't allow un-archiving a project when its parent project is archived
+* *(project)* Don't check for namespaces in overdue reminders
+* *(project)* Duplicate project into parent project
+* *(project)* Recursively get all users from all parent projects
+* *(project)* Remove comments, clarifications, notifications about namespaces
+* *(project)* Remove namespaces checks
+* *(project)* Remove namespaces from creating projects
+* *(project)* Remove namespaces from getting projects
+* *(projects)* Delete project in the correct order
+* *(projects)* Don't allow making a project child of itself
+* *(projects)* Don't check if new projects are archived
+* *(projects)* Don't fail to fetch a task if there's a broken subscription record associated to it
+* *(projects)* Don't return child projects twice
+* *(projects)* Don't try to share for nonexisting namespace
+* *(projects)* Permission check now works
+* *(projects)* Properly check if a user or link share is allowed to create a new project
+* *(projects)* Recalculate project's position after dragging when position would be 0
+* *(projects)* Reset pagination limit when fetching subprojects
+* *(projects)* Return subprojects which were shared from another user
+* *(saved filters)* Don't let query parameters override saved sorting parameters
+* *(spelling)* In config sample (#1489)
+* *(task)* Don't build partial task identifier
+* *(task)* Don't try to return a project identifier if there is no project
+* *(tasks)* Don't check for namespaces in filters
+* *(tasks)* Get all tasks from parent projects
+* *(tasks)* Make sure task deleted notification actually has information about the deleted task
+* *(tasks)* Read all tests
+* *(tasks)* Return a correct task identifier if the list does not have a good one set
+* *(tasks)* Sql for overdue reminders
+* *(tasks)* Task relation test
+* *(test)* Adjust fixture bucket and list ids
+* *(test)* Adjust fixture id
+* *(test)* Fixtures
+* *(test)* Use correct filter id
+* *(tests)* Adjust parent projects
+* *(tests)* Make the tests compile again
+* *(tests)* Permission tests for parent projects
+* *(tests)* Subscription test fixtures
+* *(tests)* Task collection fixtures
+* *(tests)* Task permissions from parents
+* Accept for migrations ([8edbca3](8edbca39cf9d771645d6feb05ee94eebc6403cbf))
+* Add missing error code ([f2d943f](f2d943f5c4f1b13ef565692b893da05c6669c6d0))
+* Add missing license header ([f4e12da](f4e12dab273474c0eb27f59c00faa828bb86522c))
+* Align "ID" param for Delete and Update method of Task model ([b6d5605](b6d5605ef6b2799f939d016b1572b3d43e857d4d))
+* Align "otherTaskID" param for Delete method of TaskRelation model ([ac377a7](ac377a7a5d708ef7543d99f716ceaa1ee8502649))
+* Align namespaceID param ([7ada82e](7ada82ea926556ae39d106dc85d5a05f3c1c8cd3))
+* Align task ID param ([f76bb2b](f76bb2b4a9c8a3b53bc73d0913ba94bba350f5da))
+* Check if usernames contain spaces when creating a new user ([672fb35](672fb35bcbb47e4c0331813aa837fee28f372471))
+* Compile errors ([a21bff3](a21bff3ffb8497d6e1b6c3bb50d9a9b2469f4eb0))
+* Correctly pass unix socket to xorm ([7ad256f](7ad256f6cd3e15aeafce2bc29c28c458c3abdc0a))
+* Docs auth openID method ([4f7d69a](4f7d69a108a2836e90b3c7ffe7f05247d80bfb85))
+* Don't get favorite task projects filter multiple times ([a51bbd1](a51bbd1159fb1ada5980a5b27972ccf1404641af))
+* Don't send bad request errors to sentry ([c0c523f](c0c523f0a8c83eb164febbc508ac98142d572d7a))
+* Don't try to load subscriptions for nonexistent projects ([b519462](b5194624e021360ccdec20cb58bba57c23028c3f))
+* Fetch all tasks for all projects ([353279c](353279cbff8fd6fa6b1bb81a8726a7a5a1b6b623))
+* ILIKE helper ([dff4e01](dff4e01327907d42bf0b20a20912e5e9c69dd23e))
+* Lint ([50c922b](50c922b7d1135b8f75478b89502fe0bb4c39547f))
+* Lint ([ad06903](ad0690369f39dab3683ac5ef7664bd765fa1cb18))
+* Lint ([e17b63b](e17b63b9201889946e91e7e295f31a80055c6ae4))
+* Lint ([ef779e8](ef779e8730af169101bf1ebffb8d2522e5c6b7bc))
+* Lint ([f0dcce7](f0dcce702f03f237ecde107a7ba62f61e2c3e313))
+* Lint config ([9111db2](9111db2a16df6a4eec9e3cc2021bc6fdcace9ead))
+* Lint errors ([ebc3dd2](ebc3dd2b3e72f56880320480829aead1bf554f67))
+* Make it compile again ([d79c393](d79c393e5b4e880b8b09ce5944e8247ae07c4d58))
+* Make sure Vikunja is buildable without swagger docs present ([47e4223](47e42238ef47ad6e4e90284593aae278e77c8631))
+* Make sure projects are correctly sorted ([db3c7aa](db3c7aa8b04e828fafdf10bcfd5bde8cf19e6f10))
+* Provide a proper error message when viewing a link share with an invalid token ([aa43127](aa43127e52aeb7412b13b4aaab091442dad534db))
+* Reminder fixture ([4b00f22](4b00f224d92f0c6933f6cba14433538d64545eca))
+* Remove old saved openid provider settings from cache when starting Vikunja ([9bf535d](9bf535d06f5b9bb455979b0bf3b6f0942daa1c9e))
+* Rename after rebase ([e93a5ff](e93a5ff11fee7adac2897b3251db7abbbad4bcc5))
+* Rename incorrectly named ProjectUsers method ([7e53a21](7e53a214070ee9b48fdffffcc42de9250c323e96))
+* Rename project receiver variable ([f1cbe50](f1cbe50605b46e506c3233cc8da4b325f5727c87))
+* Spelling ([fc2cc4a](fc2cc4a1555ca7e63ff902cde62380035a60ebb8))
+* Test fixtures ([06f1d2e](06f1d2e91237195f8e720d4dd55b491b91e6547d))
+* Test import ([fb818ea](fb818ea1867f8db813ff52622695fd206c21452e))
+* Trello import tests ([61a3380](61a3380a9482312eac56f4cfd436517205f601aa))
+* Typo ([4c698dc](4c698dc7c71418239e24b1756604371dcb6a2f74))
+* Typo in email template ([2dad404](2dad4042170677af3db7be85cbe978ce6be721aa))
+* Update redoc ([8916de0](8916de03666482c2319689e950d30a6fb737f239))
+* Update xgo in dockerfile to 1.20.2 ([33f0d0f](33f0d0f85a7fdfd509bc8a4aad26df95c064468c))
+* Upgrade jwt v5 ([359d051](359d0512cc7e73cdde9d4dd145332591c6743d11))
+* Use rewrite when hosting frontend files via the api ([b56e45d](b56e45d74389d38c747887d3cb2a2b295bb549c7))
+* Users_lists name in migration ([0a3fdc0](0a3fdc0344790f059140d8e482b028ffecdb3e4b))
+* Using mysql via a socket ([0a6bbc2](0a6bbc2efd6bb4468c72cff2a70cd29350a50b75))
+
+
+### Dependencies
+
+* *(deps)* Update module github.com/imdario/mergo to v0.3.14
+* *(deps)* Update github.com/arran4/golang-ical digest to 19abf92
+* *(deps)* Update goreleaser/nfpm docker tag to v2.27.1 (#1438)
+* *(deps)* Update module github.com/swaggo/swag to v1.8.11
+* *(deps)* Update module github.com/imdario/mergo to v0.3.15 (#1443)
+* *(deps)* Update golangci-lint to 1.52.1
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.9
+* *(deps)* Update github.com/gocarina/gocsv digest to 9a18a84
+* *(deps)* Update module github.com/swaggo/swag to v1.8.12
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.20.0
+* *(deps)* Update module github.com/redis/go-redis/v9 to v9.0.3
+* *(deps)* Update goreleaser/nfpm docker tag to v2.28.0 (#1475)
+* *(deps)* Update src.techknowlogick.com/xgo digest to bff48e4 (#1474)
+* *(deps)* Update module golang.org/x/sys to v0.7.0
+* *(deps)* Update github.com/gocarina/gocsv digest to 6445c2b
+* *(deps)* Update module golang.org/x/term to v0.7.0
+* *(deps)* Update module github.com/spf13/cobra to v1.7.0
+* *(deps)* Update module golang.org/x/image to v0.7.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.7.0
+* *(deps)* Update module golang.org/x/crypto to v0.8.0
+* *(deps)* Update module github.com/prometheus/client_golang to v1.15.0
+* *(deps)* Update module github.com/lib/pq to v1.10.8
+* *(deps)* Update module github.com/go-sql-driver/mysql to v1.7.1
+* *(deps)* Update module github.com/lib/pq to v1.10.9
+* *(deps)* Update src.techknowlogick.com/xgo digest to e65295a
+* *(deps)* Update github.com/arran4/golang-ical digest to f69e132
+* *(deps)* Update module github.com/redis/go-redis/v9 to v9.0.4
+* *(deps)* Update module github.com/go-testfixtures/testfixtures/v3 to v3.9.0
+* *(deps)* Update module github.com/prometheus/client_golang to v1.15.1
+* *(deps)* Update module golang.org/x/term to v0.8.0
+* *(deps)* Update src.techknowlogick.com/xgo digest to 52d704d
+* *(deps)* Update module github.com/swaggo/swag to v1.16.1
+* *(deps)* Update module golang.org/x/sync to v0.2.0
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.21.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.8.0
+* *(deps)* Update module golang.org/x/crypto to v0.9.0
+* *(deps)* Update alpine docker tag to v3.18
+* *(deps)* Update github.com/gocarina/gocsv digest to 7f30c79
+* *(deps)* Update module github.com/magefile/mage to v1.15.0
+* *(deps)* Update github.com/gocarina/gocsv digest to 9ddd7fd
+* *(deps)* Update module github.com/coreos/go-oidc/v3 to v3.6.0
+* *(deps)* Update module github.com/stretchr/testify to v1.8.3
+* *(deps)* Update module github.com/labstack/echo-jwt/v4 to v4.2.0
+* *(deps)* Update goreleaser/nfpm docker tag to v2.29.0 (#1528)
+* *(deps)* Update module github.com/ulule/limiter/v3 to v3.11.2
+* *(deps)* Update module github.com/redis/go-redis/v9 to v9.0.5
+* *(deps)* Update module github.com/imdario/mergo to v0.3.16
+* *(deps)* Update module github.com/stretchr/testify to v1.8.4
+* *(deps)* Update module github.com/spf13/viper to v1.16.0
+* *(deps)* Update github.com/vectordotdev/go-datemath digest to 640a500 (#1532)
+* *(deps)* Update module github.com/mattn/go-sqlite3 to v1.14.17
+* *(deps)* Update klakegg/hugo docker tag to v0.110.0 (#1538)
+* *(deps)* Update golangci
+* *(deps)* Update klakegg/hugo docker tag to v0.111.0 (#1539)
+* *(deps)* Update klakegg/hugo docker tag to v0.111.3 (#1542)
+* *(deps)* Update src.techknowlogick.com/xgo digest to 494bc06
+* *(deps)* Update goreleaser/nfpm docker tag to v2.30.1 (#1540)
+* *(deps)* Update module golang.org/x/sys to v0.9.0
+* *(deps)* Update module golang.org/x/term to v0.9.0
+* *(deps)* Update module golang.org/x/image to v0.8.0
+* *(deps)* Update module golang.org/x/crypto to v0.10.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.9.0
+* *(deps)* Update module golang.org/x/sync to v0.3.0
+* *(deps)* Update github.com/gocarina/gocsv digest to 2696de6
+* *(deps)* Update module github.com/prometheus/client_golang to v1.16.0
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.22.0
+* *(deps)* Update github.com/gocarina/gocsv digest to 99d496c
+* *(deps)* Update module github.com/imdario/mergo to v1 (#1559)
+* *(deps)* Update github.com/dustinkirkland/golang-petname digest to e794b93
+* *(deps)* Update module golang.org/x/sys to v0.10.0
+* *(deps)* Update module golang.org/x/image to v0.9.0
+* *(deps)* Update module golang.org/x/term to v0.10.0
+* *(deps)* Update module golang.org/x/crypto to v0.11.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.10.0
+
+
+### Documentation
+
+* Add docs for installing with sqlite in docker (#70) ([a16fd67](a16fd67b51c02e09ef6709bee9ad2b341d80cd73))
+* Add information about our Helm Chart ([22f89c1](22f89c1ccc3a281a75db9e42702604f88eb0568b))
+* Fix menu links ([1f13b5d](1f13b5d7b4041042ea3b26ac2a850784b11ac377))
+* Remove all traces of namespaces ([3b0935d](3b0935d033c6b5060f18e955acf4a647eb10721b))
+* Remove outdated information ([327bb3b](327bb3bed99e0a4c5664251e3af15accf1a13062))
+* Update error references to list ([259cf7d](259cf7d25bbb7a289fe9569c81c6f7d3855543bf))
+* Update prometheus docs for clarity (#1458)
+* Update references to list ([8dc6c95](8dc6c95333b38eb83c8053c628d05599e79dd27e))
+
+
+### Features
+
+* *(caldav)* Sync Reminders / VALARM (#1415)
+* *(docs)* Change order of sections in nav (#1471)
+* *(docs)* Various improvements
+* *(kanban)* Return the total task count per bucket
+* *(migration)* Ignore namespace changes
+* *(migration)* Use new structure for migration
+* *(projects)* Add parent project, migrate namespaces
+* *(projects)* Check all parent projects for permissions
+* *(projects)* Check parent project when checking archived status
+* *(projects)* Cleanup namespace leftovers
+* *(projects)* Don't allow deleting or archiving the default project
+* *(projects)* Get all projects recursively
+* *(projects)* Remove namespaces
+* *(projects)* Return a favorites pseudo project when the user has favorite tasks
+* *(subscriptions)* Make sure all subscriptions are inherited properly
+* *(users)* Don't hide user email if it was the search request* Rename lists to projects ([349e6a5](349e6a59050a0beba82a7f626c2f72f6b8c88dde))
+* Add logging options to mailer settings ([9590b82](9590b82c11852666524eeab562988226574a1b1c))
+* Add relative Reminders (#1427) ([3f5252d](3f5252dc24a3dea89b2e049ccb1f9d0a59a89a88))
+* Add token example ([4417223](441722372af3349b677dc013b1863e678b0e7158))
+* Allow saving frontend settings via api ([04e2c51](04e2c51fac24a045abe1a85c8b661b6bc628686c))
+* Allow to find users with access to a project more freely ([a7231e1](a7231e197e3d86d3ef27fad89ae60863d25b5df0))
+* Check for cycles when creating or updating a project's parent ([9011894](9011894a2975d9d112dc3db453739e13261c0716))
+* Generate swagger docs at build time ([efa24ce](efa24cec44865c5a8ab42a106deeb331ad1bed91))
+* Improve relation kinds docs ([b826c13](b826c13f385b24ed1b33b8890cc5cdd5fe8b8f22))
+* Make the new inbox project the default ([0110f93](0110f933134af0460d9fed9d652148c98e94b6cd))
+* Migrate lists to projects in db identifiers ([2fba7bd](2fba7bdf02983e5cf7def09803def4cbf830f53b))
+* Remove ChildProjects project property ([edcb806](edcb806421c2181a8b85aed5b53e8da6350b9630))
+* Remove namespaces, make projects infinitely nestable (#1362) ([82beb3b](82beb3bf671ca0670b714160f0b4d9c186dfe120))
+* Rename all list files ([8f4abd2](8f4abd2fe86e7a23d80bc5ebc4fc1ae75e1b78fb))
+* Rename lists to projects ([47c2da7](47c2da7f1856e95956cdb968fa95295d3441a9f6))
+* Rename lists to projects ([96a0f5e](96a0f5e169c9e8f8d20e3fe1d9de5eecead53ac9))
+* Rename lists to projects ([fc73c84](fc73c84bf2b9a7cbd2f6cbd2a83ea9ccc3fd58fd))
+* Rename lists to projects everywhere (#1318) ([869d4a3](869d4a336cb122df894acf040e02b6b2ba786fdb))
+
+
+### Miscellaneous Tasks
+
+* *(changelog)* Fix spelling
+* *(docs)* Add info about `/buckets` sorting
+* *(docs)* Move login and register routes to auth category in api docs
+* *(docs)* Update error docs
+* *(docs)* Update list -> project
+* *(docs/translation)* Remove mention of weblate
+* *(export)* Remove unused events
+* *(project)* Fmt
+* *(projects)* use a slice again ([3e8d1b3](3e8d1b3667ccfb2960650a4506771ec3c9b3a970))
+* *(test)* Show table content when db assertion failed
+* Cleanup ([7a9611c](7a9611c2daa41ec2da135a2a4e804551e4ab8ff2))
+* Disable false-positive linter for generated docs ([076e857](076e857507a4cf59e0b0399a2e51a8d8baa03065))
+* Fix comment url ([5856f21](5856f21f31fe7b81e7ffd203f70460785955411c))
+* Fix spelling ([cd90db3](cd90db3117a7fa40175ecebd3ca37cc94a46e1ee))
+* Generate swagger docs ([55410ea](55410ea73d50f5bc124eaf411c77125024b6fefa))
+* Go mod tidy ([93056da](93056da792dafa70f91f7d114669997b3f93f7f1))
+* Go mod tidy ([e5dde31](e5dde315fb6a7163546b9f88ebafacc886744db3))
+* Remove cache options ([d83e3a0](d83e3a0a037b9a4d40ce22c8c51932eb23963ac2))
+* Remove reminderDates after frontend is migrated to reminders (#1448) ([4a4ba04](4a4ba041e0f3e9c71dd4844d5191c9cbe4e4e3b7))
+* Rename files (fix typo) ([6aadaaa](6aadaaaffc1fff4a94e35e8fa3f6eab397cbc3ce))
+
+
+## [0.20.4] - 2023-03-12
+
+### Bug Fixes
+
+* *(docker)* Allow non-unique group id
+
+### Documentation
+
+* Add link to tutorial for installing Vikunja on Synology ([4de0efe](4de0efec1dd7da95dbf936728d7e23791396a63a))
+
+
+## [0.20.3] - 2023-03-10
+
+### Bug Fixes
+
+* *(build)* Downgrade xgo to 1.19.2 so that builds work again
+* *(caldav)* Add Z suffix to dates make it clear dates are in UTC
+* *(caldav)* Use const for repeat modes
+* *(caldav)* Make sure only labels where the user has permission to use them are used
+* *(ci)* Pipeline dependency
+* *(ci)* Pin nfpm container version and binary location
+* *(ci)* Set release path to /source
+* *(ci)* Tagging logic for release docker images
+* *(ci)* Save generated .tags file to correctly tag docker releases
+* *(ci)* Sign drone config
+* *(docd)* Update Subdirectory Documentation (#1363)
+* *(docker)* Cross compilation with buildx
+* *(docker)* Re-add expose
+* *(docker)* Passing environment variables into the container
+* *(docker)* Make sure the vikunja user always exists and only modify the uid instead of recreating the user
+* *(docs)* Add docs about cli user delete
+* *(docs)* Old helm charts url (#1344)
+* *(docs)* Fix a few minor typos (#59)
+* *(docs)* Fix traefik v2 example (#65)
+* *(docs)* Clarify support for caldav reccurrence
+* *(drone)* Add type, fix pull, remove group (#1355)
+* *(dump)* Make sure null dates are properly set when restoring from a dump
+* *(export)* Ignore file size for export files
+* *(list)* Return lists for a namespace id even if that namespace is deleted
+* *(list)* When list background is removed, delete file from file system and DB (#1372)
+* *(mailer)* Forcessl config (#60)
+* *(migration)* Use Todoist v9 api to migrate tasks from them
+* *(migration)* Import TickTick data by column name instead of index (#1356)
+* *(migration)* Use the proper authorization method for Todoist's api, fix issues with importing deleted items
+* *(migration)* Remove unused todoist parameters
+* *(migration)* Todoist pagination now avoids too many loops
+* *(migration)* Don't try to add nonexistent tasks as related
+* *(migration)* Make sure trello checklists are properly imported
+* *(reminders)* Overdue tasks join condition
+* *(reminders)* Make sure an overdue reminder is sent when there is only one overdue task
+* *(reminders)* Prevent duplicate reminders when updating task details
+* *(restore)* Check if we're really dealing with a string
+* *(task)* Make sure the task's last updated timestamp is always updated when releated entities changed
+* *(task)* Correctly load tasks by id and uuid in caldav
+* *(tasks)* Don't include undone overdue tasks from archived lists or namespaces in notification mails
+* *(tasks)* Don't reset the kanban bucket when updating a task and not providing one
+* *(tasks)* Don't set a repeating task done when moving it do the done bucket
+* *(tasks)* Recalculate position of all tasks in a list or bucket when it would hit 0
+* *(tasks)* Make sure tasks are sorted by position before recalculating them
+* *(user)* Make reset the user's name to empty actually work
+* Swagger docs ([96b5e93](96b5e933796275e87f3007e31db0623688dbdb3a))
+* Restore notifications table from dump when it already had the correct format ([8c67be5](8c67be558f697ab52740c51ab453092c0f8f7c14))
+* Make sure labels are always exported as caldav (#1412) ([1afc72e](1afc72e1906c02b093bb6d9748235b93ab0eb181))
+* Lint ([491a142](491a1423788b76f236d070071cb46f5b2f5d3fd0))
+* Lint ([20a5994](20a5994b1717e7751750f14a9a164825a8e6ade6))
+* Lint ([077baba](077baba2eaff2f10b97384f07375ece7f51ec0fa))
+* Lint ([9f14466](9f14466dfa8660362a4e51b3c8c6810bf8d66a22))
+
+
+### Dependencies
+
+* *(deps)* Update module github.com/yuin/goldmark to v1.5.3 (#1317)
+* *(deps)* Update module golang.org/x/crypto to v0.2.0 (#1315)
+* *(deps)* Update module github.com/spf13/afero to v1.9.3 (#1320)
+* *(deps)* Update module golang.org/x/crypto to v0.3.0 (#1321)
+* *(deps)* Update github.com/arran4/golang-ical digest to a677353 (#1323)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.5 (#1325)
+* *(deps)* Update github.com/arran4/golang-ical digest to 1093469 (#1326)
+* *(deps)* Update module github.com/golang-jwt/jwt/v4 to v4.4.3 (#1328)
+* *(deps)* Update module github.com/go-sql-driver/mysql to v1.7.0 (#1332)
+* *(deps)* Update module golang.org/x/sys to v0.3.0 (#1333)
+* *(deps)* Update module golang.org/x/term to v0.3.0 (#1336)
+* *(deps)* Update module golang.org/x/image to v0.2.0 (#1335)
+* *(deps)* Update module golang.org/x/oauth2 to v0.2.0 (#1316)
+* *(deps)* Update module golang.org/x/oauth2 to v0.3.0 (#1337)
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.16.0 (#1338)
+* *(deps)* Update module golang.org/x/crypto to v0.4.0 (#1339)
+* *(deps)* Update module github.com/pquerna/otp to v1.4.0 (#1341)
+* *(deps)* Update module github.com/swaggo/swag to v1.8.9 (#1327)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.6 (#1342)
+* *(deps)* Update module github.com/labstack/echo/v4 to v4.10.0 (#1343)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.7 (#1348)
+* *(deps)* Update module github.com/coreos/go-oidc/v3 to v3.5.0 (#1349)
+* *(deps)* Update module golang.org/x/sys to v0.4.0 (#1351)
+* *(deps)* Update module golang.org/x/image to v0.3.0 (#1350)
+* *(deps)* Update module golang.org/x/term to v0.4.0 (#1352)
+* *(deps)* Update module golang.org/x/crypto to v0.5.0 (#1353)
+* *(deps)* Update goreleaser/nfpm docker tag to v2.23.0 (#1347)
+* *(deps)* Update module github.com/wneessen/go-mail to v0.3.8 (#1357)
+* *(deps)* Update module src.techknowlogick.com/xgo to v1.6.0+1.19.5 (#1358)
+* *(deps)* Update klakegg/hugo docker tag to v0.107.0 (#1272)
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.17.0 (#1361)
+* *(deps)* Update module src.techknowlogick.com/xgo to v1.7.0+1.19.5 (#1364)
+* *(deps)* Update module github.com/spf13/viper to v1.15.0 (#1365)
+* *(deps)* Update module github.com/labstack/echo-jwt/v4 to v4.0.1 (#1369)
+* *(deps)* Update module golang.org/x/oauth2 to v0.4.0 (#1354)
+* *(deps)* Update github.com/gocarina/gocsv digest to 763e25b (#1370)
+* *(deps)* Update goreleaser/nfpm docker tag to v2.24.0 (#1367)
+* *(deps)* Update module github.com/swaggo/swag to v1.8.10 (#1371)
+* *(deps)* Update module github.com/go-redis/redis/v8 to v9 (#1377)
+* *(deps)* Update module github.com/labstack/echo-jwt/v4 to v4.1.0
+* *(deps)* Update module github.com/ulule/limiter/v3 to v3.11.0 (#1378)
+* *(deps)* Update module github.com/redis/go-redis/v9 to v9.0.2
+* *(deps)* Update goreleaser/nfpm docker tag to v2.25.0 (#1382)
+* *(deps)* Upgrade golangci-lint to 1.51.0
+* *(deps)* Update module github.com/yuin/goldmark to v1.5.4
+* *(deps)* Update module go to 1.20
+* *(deps)* Update xgo to 1.20
+* *(deps)* Update module golang.org/x/sys to v0.5.0
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.18.0 (#1386)
+* *(deps)* Update module golang.org/x/term to v0.5.0
+* *(deps)* Update module golang.org/x/crypto to v0.6.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.5.0
+* *(deps)* Update module golang.org/x/image to v0.4.0
+* *(deps)* Update goreleaser/nfpm docker tag to v2.26.0 (#1394)
+* *(deps)* Update github.com/arran4/golang-ical digest to 07c6aad
+* *(deps)* Update module github.com/threedotslabs/watermill to v1.2.0 (#1384)
+* *(deps)* Update module golang.org/x/image to v0.5.0 (#1396)
+* *(deps)* Update golang.org/x/net to 0.7.0
+* *(deps)* Update module github.com/golang-jwt/jwt/v4 to v4.5.0 (#1399)
+* *(deps)* Update github.com/gocarina/gocsv digest to bcce7dc
+* *(deps)* Update golangci-lint to 1.51.2
+* *(deps)* Update module github.com/labstack/echo/v4 to v4.10.1
+* *(deps)* Update github.com/gocarina/gocsv digest to bee85ea
+* *(deps)* Update module github.com/labstack/echo/v4 to v4.10.2
+* *(deps)* Update module github.com/spf13/afero to v1.9.4
+* *(deps)* Update github.com/gocarina/gocsv digest to dc4ee9d
+* *(deps)* Update module github.com/stretchr/testify to v1.8.2
+* *(deps)* Update github.com/gocarina/gocsv digest to 70c27cb
+* *(deps)* Update module golang.org/x/sys to v0.6.0
+* *(deps)* Update module golang.org/x/term to v0.6.0
+* *(deps)* Update module golang.org/x/crypto to v0.7.0
+* *(deps)* Update module golang.org/x/oauth2 to v0.6.0
+* *(deps)* Update module golang.org/x/image to v0.6.0
+* *(deps)* Update github.com/kolaente/caldav-go digest to 2a4eb8b
+* *(deps)* Remove fsnotify replacement
+* *(deps)* Update github.com/vectordotdev/go-datemath digest to f3954d0
+* *(deps)* Update src.techknowlogick.com/xgo digest to 44f7e66
+* *(deps)* Update module github.com/getsentry/sentry-go to v0.19.0
+* *(deps)* Update module github.com/spf13/afero to v1.9.5
+* *(deps)* Update module github.com/ulule/limiter/v3 to v3.11.1
+* *(deps)* Update src.techknowlogick.com/xgo digest to b607086
+* *(deps)* Update module github.com/gabriel-vasile/mimetype to v1.4.2
+
+### Features
+
+* *(background)* Add Last-Modified header (#1376)
+* *(caldav)* Add support for repeating tasks
+* *(caldav)* Export Labels to CalDAV (#1409)
+* *(caldav)* Import caldav categories as Labels (#1413)
+* *(migrators)* Remove wunderlist (#1346)
+* *(release)* Use compressed binaries for package releases
+* Use docker buildx to build multiarch images ([a6e214b](a6e214b654f28836cc8b93683dbfd5999282d11c))
+* Provide logout url for openid providers (#1340) ([a79b1de](a79b1de2d0247a424f49cecaa267d30e8fa70a83))
+* Refactored Dockerfile (#1375) ([522bf7d](522bf7d2fc3cc1704f58299b6435baccc7add533))
+* Disable events log by default ([da9d25c](da9d25cf727c56acd7394b4b74e17a2959ee5242))
+  - **BREAKING**: events log level is now off unless explicitly enabled
+
+
+### Miscellaneous Tasks
+
+* *(docs)* Adjust docs about frontend docker container
+* *(docs)* Remove sponsors
+* *(task)* Add test to check if a task's reminders are duplicated
+* Remove custom gitea bug template in favor of githubs ([4fa45bf](4fa45bf9dcbaa8a41a53fc2305c4c2c1aa15691c))
+* 0.20.2 release preperations ([d19fc80](d19fc80b8be08673136d84e10187cadb293822bf))
+* Update funding links ([aa25ccd](aa25ccdc917684583a9bff4b7cb272004386f0fa))
+
+
+### Other
+
+* *(other)* Added Google & Google Workspace to OpenId examples (#1319)
+
+
 ## [0.20.2] - 2023-01-24

 ### Bug Fixes
@@ -1243,7 +1696,7 @@ All releases can be found on https://code.vikunja.io/api/releases.
 * Add option to disable totp for everyone
 * Add plausible to docs
 * Add restarting commands to all example docker compose files
-* Add seperate docker pipeline for amd64 and arm
+* Add separate docker pipeline for amd64 and arm
 * Add test mail command (#571)
 * Add todoist migrator to available migrators in info endpoint if it is enabled
 * Add unsplash image proxy for images and thumbnails
@@ -1436,7 +1889,7 @@ All releases can be found on https://code.vikunja.io/api/releases.
 * Update Renovate Configuration (#161)
 * Update src.techknowlogick.com/xgo commit hash to bb0faa3 (#279)
 * Update src.techknowlogick.com/xgo commit hash to c43d4c4 (#224)
-* Update xorm redis cacher to use the xorm logger instead of a special seperate one
+* Update xorm redis cacher to use the xorm logger instead of a special separate one
 * Update xorm to v1 (#323)

 ## [0.12] - 2020-04-04
@@ -1577,7 +2030,7 @@ All releases can be found on https://code.vikunja.io/api/releases.

 ### Added

-* Better Caldav support (#73)
+* Better CalDAV support (#73)
 * Added settings for max open/idle connections and max connection lifetime (#74)
 * /info endpoint (#85)
 * Added http endpoint to list all users on a list (#87)
@@ -1722,4 +2175,3 @@ Misc bugfixes and improvements to the build process
 ## [0.2] - 2018-10-17

 ## [0.1] - 2018-09-20
-
@@ -1,51 +1,43 @@
+# syntax=docker/dockerfile:1
+#  ┬─┐┬ ┐o┬  ┬─┐
+#  │─││ │││  │ │
+#  ┘─┘┘─┘┘┘─┘┘─┘

-##############
-# Build stage
-FROM --platform=$BUILDPLATFORM techknowlogick/xgo:go-1.19.2 AS build-env
+FROM --platform=$BUILDPLATFORM techknowlogick/xgo:go-1.20.x AS builder

-RUN \
-  go install github.com/magefile/mage@latest && \
-  mv /go/bin/mage /usr/local/go/bin
+RUN go install github.com/magefile/mage@latest && \
+    mv /go/bin/mage /usr/local/go/bin

-ARG VIKUNJA_VERSION
-
-# Setup repo
-COPY . /go/src/code.vikunja.io/api
 WORKDIR /go/src/code.vikunja.io/api
+COPY . ./

 ARG TARGETOS TARGETARCH TARGETVARIANT
-# Checkout version if set
-RUN if [ -n "${VIKUNJA_VERSION}" ]; then git checkout "${VIKUNJA_VERSION}"; fi && \
-  mage build:clean && \
-  mage release:xgo $TARGETOS/$TARGETARCH/$TARGETVARIANT

-###################
+RUN export PATH=$PATH:$GOPATH/bin && \
+	mage build:clean && \
+    mage release:xgo "${TARGETOS}/${TARGETARCH}/${TARGETVARIANT}"
+
+#  ┬─┐┬ ┐┌┐┐┌┐┐┬─┐┬─┐
+#  │┬┘│ │││││││├─ │┬┘
+#  ┘└┘┘─┘┘└┘┘└┘┴─┘┘└┘
+
 # The actual image
 # Note: I wanted to use the scratch image here, but unfortunatly the go-sqlite bindings require cgo and
 # because of this, the container would not start when I compiled the image without cgo.
-FROM alpine:3.16
+FROM alpine:3.18 AS runner
 LABEL maintainer="maintainers@vikunja.io"
+WORKDIR /app/vikunja
+ENTRYPOINT [ "/sbin/tini", "-g", "--", "/entrypoint.sh" ]
+EXPOSE 3456

-WORKDIR /app/vikunja/
-COPY --from=build-env /build/vikunja-* vikunja
 ENV VIKUNJA_SERVICE_ROOTPATH=/app/vikunja/
-
-# Dynamic permission changing stuff
 ENV PUID 1000
 ENV PGID 1000
-RUN apk --no-cache add shadow && \
-  addgroup -g ${PGID} vikunja && \
-  adduser -s /bin/sh -D -G vikunja -u ${PUID} vikunja -h /app/vikunja -H && \
-  chown vikunja -R /app/vikunja
-COPY run.sh /run.sh

-# Add time zone data
-RUN apk --no-cache add tzdata
+RUN apk --update --no-cache add tzdata tini shadow && \
+    addgroup vikunja && \
+    adduser -s /bin/sh -D -G vikunja vikunja -h /app/vikunja -H
+COPY docker/entrypoint.sh /entrypoint.sh
+RUN chmod 0755 /entrypoint.sh && mkdir files

-# Files permissions
-RUN mkdir /app/vikunja/files && \
-  chown -R vikunja /app/vikunja/files
-VOLUME /app/vikunja/files
-
-CMD ["/run.sh"]
-EXPOSE 3456
+COPY --from=builder /build/vikunja-* vikunja
@@ -2,7 +2,7 @@

 [![Build Status](https://drone.kolaente.de/api/badges/vikunja/api/status.svg)](https://drone.kolaente.de/vikunja/api)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
-[![Download](https://img.shields.io/badge/download-v0.20.2-brightgreen.svg)](https://dl.vikunja.io)
+[![Download](https://img.shields.io/badge/download-v0.21.0-brightgreen.svg)](https://dl.vikunja.io)
 [![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/api.svg)](https://hub.docker.com/r/vikunja/api/)
 [![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs)
 [![Go Report Card](https://goreportcard.com/badge/kolaente.dev/vikunja/api)](https://goreportcard.com/report/kolaente.dev/vikunja/api)
@@ -26,13 +26,7 @@ If you find any security-related issues you don't want to disclose publicly, ple

 ## Features

-* Create TODO lists with tasks
-  * Reminder for tasks
-* Namespaces: A "group" which bundles multiple lists
-* Share lists and namespaces with teams and users with granular permissions
-* Plenty of details for tasks
-
-See [the features page](https://vikunja.io/en/features/) on our website for a more exaustive list or 
+See [the features page](https://vikunja.io/features/) on our website for a more exaustive list or 
 try it on [try.vikunja.io](https://try.vikunja.io)!

 ## Docs
@@ -56,10 +50,6 @@ See [the roadmap](https://my.vikunja.cloud/share/QFyzYEmEYfSyQfTOmIRSwLUpkFjboaB

 Fork -> Push -> Pull-Request. Also see the [dev docs](https://vikunja.io/docs/development/) for more info.

-## Sponsors
-
-[![Relm](https://vikunja.io/images/sponsors/relm.png)](https://relm.us)
-
 ## License

-This project is licensed under the AGPLv3 License. See the [LICENSE](LICENSE) file for the full license text.
+This project is licensed under the AGPLv3 License. See the [LICENSE](LICENSE) file for the full license text.
@@ -3,7 +3,7 @@ service:
  # Default is a random token which will be generated at each startup of vikunja.
  # (This means all already issued tokens will be invalid once you restart vikunja)
  JWTSecret: "<jwt-secret>"
-  # The duration of the issed JWT tokens in seconds.
+  # The duration of the issued JWT tokens in seconds.
  # The default is 259200 seconds (3 Days).
  jwtttl: 259200
  # The duration of the "remember me" time in seconds. When the login request is made with 
@@ -30,7 +30,7 @@ service:
  enablecaldav: true
  # Set the motd message, available from the /info endpoint
  motd: ""
-  # Enable sharing of lists via a link
+  # Enable sharing of project via a link
  enablelinksharing: true
  # Whether to let new users registering themselves or not
  enableregistration: true
@@ -46,7 +46,7 @@ service:
  sentrydsn: ''
  # If not empty, this will enable `/test/{table}` endpoints which allow to put any content in the database.
  # Used to reset the db before frontend tests. Because this is quite a dangerous feature allowing for lots of harm,
-  # each request made to this endpoint neefs to provide an `Authorization: <token>` header with the token from below. <br/>
+  # each request made to this endpoint needs to provide an `Authorization: <token>` header with the token from below. <br/>
  # **You should never use this unless you know exactly what you're doing**
  testingtoken: ''
  # If enabled, vikunja will send an email to everyone who is either assigned to a task or created it when a task reminder
@@ -77,7 +77,7 @@ database:
  maxopenconnections: 100
  # Sets the maximum number of idle connections to the db.
  maxidleconnections: 50
-  # The maximum lifetime of a single db connection in miliseconds.
+  # The maximum lifetime of a single db connection in milliseconds.
  maxconnectionlifetime: 10000
  # Secure connection mode. Only used with postgres.
  # (see https://pkg.go.dev/github.com/lib/pq?tab=doc#hdr-Connection_String_Parameters)
@@ -91,29 +91,19 @@ database:
  # Enable SSL/TLS for mysql connections. Options: false, true, skip-verify, preferred
  tls: false

-cache:
-  # If cache is enabled or not
-  enabled: false
-  # Cache type. Possible values are "keyvalue", "memory" or "redis".
-  # When choosing "keyvalue" this setting follows the one configured in the "keyvalue" section.
-  # When choosing "redis" you will need to configure the redis connection seperately.
-  type: keyvalue
-  # When using memory this defines the maximum size an element can take
-  maxelementsize: 1000
-
 redis:
  # Whether to enable redis or not
  enabled: false
  # The host of the redis server including its port.
  host: 'localhost:6379'
-  # The password used to authenicate against the redis server
+  # The password used to authenticate against the redis server
  password: ''
  # 0 means default database
  db: 0

 cors:
  # Whether to enable or disable cors headers.
-  # Note: If you want to put the frontend and the api on seperate domains or ports, you will need to enable this.
+  # Note: If you want to put the frontend and the api on separate domains or ports, you will need to enable this.
  #       Otherwise the frontend won't be able to make requests to the api through the browser.
  enable: true
  # A list of origins which may access the api. These need to include the protocol (`http://` or `https://`) and port, if any.
@@ -165,9 +155,13 @@ log:
  # Echo has its own logging which usually is unnecessary, which is why it is disabled by default. Possible values are stdout, stderr, file or off to disable standard logging.
  echo: "off"
  # Whether or not to log events. Useful for debugging. Possible values are stdout, stderr, file or off to disable events logging.
-  events: "stdout"
+  events: "off"
  # The log level for event log messages. Possible values (case-insensitive) are ERROR, INFO, DEBUG.
  eventslevel: "info"
+  # Whether or not to log mail log messages. This will not log mail contents. Possible values are stdout, stderr, file or off to disable mail-related logging.
+  mail: "off"
+  # The log level for mail log messages. Possible values (case-insensitive) are ERROR, WARNING, INFO, DEBUG.
+  maillevel: "info"

 ratelimit:
  # whether or not to enable the rate limit
@@ -206,7 +200,7 @@ migration:
    # Note that the vikunja frontend expects this to be /migrate/todoist
    redirecturl: <frontend url>/migrate/todoist
  trello:
-    # Wheter to enable the trello migrator or not
+    # Whether to enable the trello migrator or not
    enable: false
    # The client id, required for making requests to the trello api
    # You need to register your vikunja instance at https://trello.com/app-key (log in before you visit that link) to get this
@@ -222,7 +216,7 @@ migration:
    enable: false
    # The client id, required for making requests to the microsoft graph api
    # See https://docs.microsoft.com/en-us/azure/active-directory/develop/quickstart-register-app#register-an-application
-    # for information about how to register your vikuinja instance.
+    # for information about how to register your Vikunja instance.
    clientid:
    # The client secret, also required for making requests to the microsoft graph api
    clientsecret:
@@ -238,14 +232,14 @@ avatar:
  gravatarexpiration: 3600

 backgrounds:
-  # Whether to enable backgrounds for lists at all.
+  # Whether to enable backgrounds for projects at all.
  enabled: true
  providers:
    upload:
-      # Whethere to enable uploaded list backgrounds
+      # Whether to enable uploaded project backgrounds
      enabled: true
    unsplash:
-      # Whether to enable setting backgrounds from unsplash as list backgrounds
+      # Whether to enable setting backgrounds from unsplash as project backgrounds
      enabled: false
      # You need to create an application for your installation at https://unsplash.com/oauth/applications/new
      # and set the access token below.
@@ -265,7 +259,7 @@ legal:
 # Key Value Storage settings
 # The Key Value Storage is used for different kinds of things like metrics and a few cache systems.
 keyvalue:
-  # The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured seperately.
+  # The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured separately.
  type: "memory"

 auth:
@@ -280,7 +274,7 @@ auth:
  # If the email is not public in those cases, authenticating will fail.
  # **Note 2:** The frontend expects to be redirected after authentication by the third party
  # to <frontend-url>/auth/openid/<auth key>. Please make sure to configure the redirect url with your third party
-  # auth service accordingy if you're using the default vikunja frontend.
+  # auth service accordingly if you're using the default vikunja frontend.
  # Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
  openid:
    # Enable or disable OpenID Connect authentication
@@ -296,6 +290,9 @@ auth:
      - name:
        # The auth url to send users to if they want to authenticate using OpenID Connect.
        authurl:
+        # The oidc logouturl that users will be redirected to on logout.
+        # Leave empty or delete key, if you do not want to be redirected.
+        logouturl:
        # The client ID used to authenticate Vikunja at the OpenID Connect provider.
        clientid:
        # The client secret used to authenticate Vikunja at the OpenID Connect provider.
@@ -303,7 +300,7 @@ auth:

 # Prometheus metrics endpoint
 metrics:
-  # If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja.
+  # If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja. You can query it from `/api/v1/metrics`.
  enabled: false
  # If set to a non-empty value the /metrics endpoint will require this as a username via basic auth in combination with the password below.
  username:
@@ -326,8 +323,8 @@ defaultsettings:
  overdue_tasks_reminders_enabled: true
  # When to send the overdue task reminder email.
  overdue_tasks_reminders_time: 9:00
-  # The id of the default list. Make sure users actually have access to this list when setting this value.
-  default_list_id: 0
+  # The id of the default project. Make sure users actually have access to this project when setting this value.
+  default_project_id: 0
  # Start of the week for the user. `0` is sunday, `1` is monday and so on.
  week_start: 0
  # The language of the user interface. Must be an ISO 639-1 language code. Will default to the browser language the user uses when signing up.
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+set -e
+
+if [ -n "$PUID" ] && [ "$PUID" -ne 0 ] && \
+   [ -n "$PGID" ] && [ "$PGID" -ne 0 ] ; then
+  echo "info: creating the new user vikunja with $PUID:$PGID"
+  groupmod -g "$PGID" -o vikunja
+  usermod -u "$PUID" -o vikunja
+  chown -R vikunja:vikunja ./files/
+  chown vikunja:vikunja .
+  exec su vikunja -c /app/vikunja/vikunja "$@"
+else
+  echo "info: creation of non-root user is skipped"
+  exec /app/vikunja/vikunja "$@"
+fi
@@ -28,7 +28,7 @@ markup:
 menu:
  page:
    - name: Home
-      url: https://vikunja.io/en/
+      url: https://vikunja.io/
      weight: 10
    - name: Features
      url: https://vikunja.io/features
@@ -36,6 +36,9 @@ menu:
    - name: Download
      url: https://vikunja.io/download
      weight: 30
+    - name: Blog
+      url: https://vikunja.io/blog/
+      weight: 35
    - name: Docs
      url: https://vikunja.io/docs
      weight: 40
@@ -45,6 +48,16 @@ menu:
    - name: Community
      url: https://community.vikunja.io/
      weight: 60
+    - name: Stickers
+      url: https://vikunja.cloud/stickers?utm_source=io&utm_medium=io&utm_campaign=menu
+      weight: 65
    - name: Get it Hosted
      url: https://vikunja.cloud/?utm_source=io&utm_medium=io&utm_campaign=menu
      weight: 70
+  sidebar:
+    - name: setup
+      weight: 10
+    - name: usage
+      weight: 20
+    - name: development
+      weight: 30
@@ -22,4 +22,4 @@ and [available configuration options]({{< ref "./setup/config.md">}}).

 ## Developing

-If you want to start contributing to Vikunja, take a look at [the development docs]({{< ref "./development/development.md">}}).
+If you want to start contributing to Vikunja, take a look at [the development docs]({{< ref "./development/development.md">}}).
@@ -12,10 +12,10 @@ menu:

 All cli-related functions are located in `pkg/cmd`.
 Each cli command usually calls a function in another package.
-For example, the `vikunja migrate` command calls `migration.Migrate()`. 
+For example, the `vikunja migrate` command calls `migration.Migrate()`.

 Vikunja uses the amazing [cobra](https://github.com/spf13/cobra) library for its cli.
-Please refer to its documentation for informations about how to use flags etc.
+Please refer to its documentation for information about how to use flags etc.

 To add a new cli command, add something like the following:

@@ -29,7 +29,7 @@ Then run `mage generate-docs` to generate the configuration docs from the sample

 ## Getting Configuration Values

-To retreive a configured value call the key with a getter for the type you need.
+To retrieve a configured value call the key with a getter for the type you need.
 For example:

 {{< highlight golang >}}
@@ -12,9 +12,7 @@ menu:
 Cron jobs are tasks which run on a predefined schedule.
 Vikunja uses these through a light wrapper package around the excellent [github.com/robfig/cron](https://github.com/robfig/cron) package.

-The package exposes a `cron.Schedule` method with two arguments: The first one to define the schedule when the cron task 
-should run, and the second one with the actual function to run at the schedule.
-You would then create a new function to register your the actual cron task in your package.
+The package exposes a `cron.Schedule` method with two arguments: The first one to define the schedule when the cron task should run, and the second one with the actual function to run at the schedule. You would then create a new function to register your the actual cron task in your package.

 A basic function to register a cron task looks like this:

@@ -26,8 +26,7 @@ To add a new table to the database, create the struct and [add a migration for i

 To learn more about how to configure your struct to create "good" tables, refer to [the xorm documentaion](https://xorm.io/docs/).

-In most cases you will also need to implement the `TableName() string` method on the new struct to make sure the table 
-name matches the rest of the tables - plural.
+In most cases you will also need to implement the `TableName() string` method on the new struct to make sure the table name matches the rest of the tables - plural.

 ## Adding data to test fixtures

@@ -36,5 +35,4 @@ Adding data for test fixtures can be done via `yaml` files in `pkg/models/fixtur
 The name of the yaml file should match the table name in the database.
 Adding values to it is done via array definition inside it.

-**Note**: Table and column names need to be in snake_case as that's what is used internally in the database 
-and for mapping values from the database to xorm so your structs can use it.
+**Note**: Table and column names need to be in snake_case as that's what is used internally in the database and for mapping values from the database to xorm so your structs can use it.
@@ -25,7 +25,7 @@ All migrations are stored in `pkg/migrations` and files should have the same nam
 Each migration should have a function to apply and roll it back, as well as a numeric id (the datetime)
 and a more in-depth description of what the migration actually does.

-To easily get a new id, run the following on any unix system: 
+To easily get a new id, run the following on any unix system:

 {{< highlight bash >}}
 date +%Y%m%d%H%M%S
@@ -75,4 +75,4 @@ func init() {
 }
 {{< /highlight >}}

-You should always copy the changed parts of the struct you're changing when adding migraitons.
+You should always copy the changed parts of the struct you're changing when adding migrations.
@@ -48,7 +48,7 @@ A release gets tagged from the main branch with the version name as tag name.

 Backports and point-releases should go to a `release/version` branch, based on the tag they are building on top of.

-## Conventional commits
+## Conventional Commits

 We're using [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) because they greatly simplify generating release notes.

@@ -13,14 +13,14 @@ menu:
 All custom errors are defined in `pkg/models/errors.go`.
 You should add new ones in this file.

-Custom errors usually have fields for the http return code, a [vikunja-specific error code]({{< ref "../usage/errors.md">}}) 
+Custom errors usually have fields for the http return code, a [Vikunja-specific error code]({{< ref "../usage/errors.md">}}) 
 and a human-readable error message about what went wrong.

 An error consists of multiple functions and definitions:

 {{< highlight golang >}}
 // This struct holds any information about this specific error.
-// In this case, it contains the user ID of a nonexistand user.
+// In this case, it contains the user ID of a nonexistent user.
 // This type should always be a struct, even if it has no values in it.

 // ErrUserDoesNotExist represents a "UserDoesNotExist" kind of error.
@@ -44,21 +44,21 @@ func (err ErrUserDoesNotExist) Error() string {
 	return fmt.Sprintf("User does not exist [user id: %d]", err.UserID)
 }

-// This const holds the vikunja error code used to be able to identify this error without having to 
+// This const holds the Vikunja error code used to be able to identify this error without having to 
 // rely on an error string.
 // This needs to be unique, so you should check whether the error code exists or not.
 // The general convention for error codes is as follows:
 // * Every "group" errors lives in a thousend something. For example all user issues are 1000-something, all 
-//   list errors are 3000-something and so on.
+//   project errors are 3000-something and so on.
 // * New error codes should be the current max error code + 1. Don't take free numbers to prevent old errors
-//   which are depricated and removed from being "new ones". For example, if there are error codes 1001, 1002, 1004,
+//   which are deprecated and removed from being "new ones". For example, if there are error codes 1001, 1002, 1004,
 //   a new error should be 1005 and not 1003.

 // ErrCodeUserDoesNotExist holds the unique world-error code of this error
 const ErrCodeUserDoesNotExist = 1005

 // This is the implementation which returns an http error which is then passed to the client.
-// Here you define the http status code with which one the error will be returned, the vikunja error code and 
+// Here you define the http status code with which one the error will be returned, the Vikunja error code and 
 // a human-readable error message.

 // HTTPError holds the http error description
@@ -42,7 +42,7 @@ You then get the event with all its data back in the listener, see below.
 #### Naming Convention

 Event names should roughly have the entity they're dealing with on the left and the action on the right of the name, separated by `.`.
-There's no limit to how "deep" or specifig an event name can be.
+There's no limit to how "deep" or specific an event name can be.

 The name should have the most general concept it's describing at the left, getting more specific on the right of it.

@@ -104,7 +104,7 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err
 }
 {{< /highlight >}}

-As you can see, the curent task and doer are injected into it.
+As you can see, the current task and doer are injected into it.

 ### Special Events

@@ -133,7 +133,7 @@ type Listener interface {
 The `Handle` method is executed when the event this listener listens on is dispatched. 
 * As the single parameter, it gets the payload of the event, which is the event struct when it was dispatched decoded as json object and passed as a slice of bytes.
 To use it you'll need to unmarshal it. Unfortunately there's no way to pass an already populated event object to the function because we would not know what type it has when parsing it.
-* If the handler returns an error, the listener is retried 5 times, with an exponentional back-off period in between retries.
+* If the handler returns an error, the listener is retried 5 times, with an exponential back-off period in between retries.
 If it still fails after the fifth retry, the event is nack'd and it's up to the event dispatcher to resend it.
 You can learn more about this mechanism in the [watermill documentation](https://watermill.io/docs/middlewares/#retry).

@@ -148,7 +148,7 @@ The easiest way to create a new listener for an event is with mage:
 mage dev:make-listener <listener-name> <event-name> <package>
 ```

-This will create a new listener type in the `pkg/<package>/listners.go` file and implement the `Handle` and `Name` methods.
+This will create a new listener type in the `pkg/<package>/listeners.go` file and implement the `Handle` and `Name` methods.
 It will also pre-generate some boilerplate code to unmarshal the event from the payload.

 Furthermore, it will register the listener for its event in the `RegisterListeners()` method of the same file.
@@ -157,7 +157,7 @@ This function is called at startup and has to contain all events you want to lis
 ### Listening for Events

 To listen for an event, you need to register the listener for the event it should be called for.
-This usually happens in the `RegisterListeners()` method in `pkg/<package>/listners.go` which is called at start up.
+This usually happens in the `RegisterListeners()` method in `pkg/<package>/listeners.go` which is called at start up.

 The listener will never be executed if it hasn't been registered.

@@ -179,7 +179,7 @@ func (s *IncreaseTaskCounter) Name() string {
    return "task.counter.increase"
 }

-// Hanlde is executed when the event IncreaseTaskCounter listens on is fired
+// Handle is executed when the event IncreaseTaskCounter listens on is fired
 func (s *IncreaseTaskCounter) Handle(payload message.Payload) (err error) {
    return keyvalue.IncrBy(metrics.TaskCountKey, 1)
 }
@@ -26,8 +26,8 @@ It returns the `limit` (max-length) and `offset` parameters needed for SQL-Queri
 You can feed this function directly into xorm's `Limit`-Function like so:

 {{< highlight golang >}}
-lists := []List{}
-err := x.Limit(getLimitFromPageIndex(pageIndex, itemsPerPage)).Find(&lists)
+projects := []*Project{}
+err := x.Limit(getLimitFromPageIndex(pageIndex, itemsPerPage)).Find(&projects)
 {{< /highlight >}}

 // TODO: Add a full example from start to finish, like a tutorial on how to create a new endpoint?
@@ -31,7 +31,7 @@ go install github.com/magefile/mage
 There are multiple categories of subcommands in the magefile:

 * `build`: Contains commands to build a single binary
-* `check`: Contains commands to statically check the source code 
+* `check`: Contains commands to statically check the source code
 * `release`: Contains commands to release Vikunja with everything that's required
 * `test`: Contains commands to run all kinds of tests
 * `dev`: Contains commands to run development tasks
@@ -114,7 +114,7 @@ binary to be able to use it.
 * `mage release:check` creates sha256 checksums for each binary which will be included in the zip file
 * `mage release:os-package` bundles a binary with the `sha256` checksum file, a sample `config.yml` and a copy of the license in a folder for each architecture
 * `mage release:compress` compresses all build binaries with `upx` to save space
-* `mage release:zip` paclages a zip file for the files created by `release:os-package`
+* `mage release:zip` packages a zip file for the files created by `release:os-package`

 ### Build os packages

@@ -168,7 +168,7 @@ Runs all integration tests.
 mage dev:create-migration
 {{< /highlight >}}

-Creates a new migration with the current date. 
+Creates a new migration with the current date.
 Will ask for the name of the struct you want to create a migration for.

 See also [migration docs]({{< ref "mage.md" >}}).
@@ -34,14 +34,13 @@ promauto.NewGaugeFunc(prometheus.GaugeOpts{
 })
 {{< /highlight >}}

-Then you'll need to set the metrics initial value on every startup of vikunja.
+Then you'll need to set the metrics initial value on every startup of Vikunja.
 This is done in `pkg/routes/routes.go` to avoid cyclic imports.
 If metrics are enabled, it checks if a redis connection is available and then sets the initial values.
 A convenience function is available if the metric is based on a database struct.

 Because metrics are stored in redis, you are responsible to increase or decrease these based on criteria you define.
-To do this, use `metrics.UpdateCount(value, key)` where `value` is the amount you want to cange it (you can pass
-negative values to decrease it) and `key` it the redis key used to define the metric.
+To do this, use `metrics.UpdateCount(value, key)` where `value` is the amount you want to change it (you can pass negative values to decrease it) and `key` it the redis key used to define the metric.

 ## Using it

@@ -17,12 +17,9 @@ In general, each migrator implements a migrator interface which is then called f
 The interface makes it possible to use helper methods which handle http and focus only on the implementation of the migrator itself.

 There are two ways of migrating data from another service:
-1. Through the auth-based flow where the user gives you access to their data at the third-party service through an 
-   oauth flow. You can then call the service's api on behalf of your user to get all the data.
-   The Todoist, Trello and Microsoft To-Do Migrators use this pattern.
-2. A file migration where the user uploads a file obtained from some third-party service. In your migrator, you need 
-   to parse the file and create the lists, tasks etc.
-   The Vikunja File Import uses this pattern.
+
+1. Through the auth-based flow where the user gives you access to their data at the third-party service through an oauth flow. You can then call the service's api on behalf of your user to get all the data. The Todoist, Trello and Microsoft To-Do Migrators use this pattern.
+2. A file migration where the user uploads a file obtained from some third-party service. In your migrator, you need to parse the file and create the projects, tasks etc. The Vikunja File Import uses this pattern.

 To differentiate the two, there are two different interfaces you must implement.

@@ -43,7 +40,7 @@ type Migrator interface {
 	// Name holds the name of the migration.
 	// This is used to show the name to users and to keep track of users who already migrated.
 	Name() string
-	// Migrate is the interface used to migrate a user's tasks from another platform to vikunja.
+	// Migrate is the interface used to migrate a user's tasks from another platform to Vikunja.
 	// The user object is the user who's tasks will be migrated.
 	Migrate(user *models.User) error
 	// AuthURL returns a url for clients to authenticate against.
@@ -61,7 +58,7 @@ type FileMigrator interface {
 	// Name holds the name of the migration.
 	// This is used to show the name to users and to keep track of users who already migrated.
 	Name() string
-	// Migrate is the interface used to migrate a user's tasks, list and other things from a file to vikunja.
+	// Migrate is the interface used to migrate a user's tasks, projects and other things from a file to Vikunja.
 	// The user object is the user who's tasks will be migrated.
 	Migrate(user *user.User, file io.ReaderAt, size int64) error
 }
@@ -102,35 +99,33 @@ You should also document the routes with [swagger annotations]({{< ref "swagger-

 ## Insertion helper method

-There is a method available in the `migration` package which takes a fully nested Vikunja structure and creates it with all relations. 
-This means you start by adding a namespace, then add lists inside of that namespace, then tasks in the lists and so on.
+There is a method available in the `migration` package which takes a fully nested Vikunja structure and creates it with all relations.
+This means you start by adding a project, then add projects inside that project, then tasks in the lists and so on.
+In general, it is reccommended to have one root project with all projects of the other service as child projects.

-The root structure must be present as `[]*models.NamespaceWithListsAndTasks`. It allows to represent all of Vikunja's 
-hierachie as a single data structure.
+The root structure must be present as `[]*models.ProjectWithTasksAndBuckets`. It allows to represent all of Vikunja's hierarchy as a single data structure.

 Then call the method like so:

 ```go
-fullVikunjaHierachie, err := convertWunderlistToVikunja(wContent)
+fullVikunjaHierarchy, err := convertWunderlistToVikunja(wContent)
 if err != nil {
    return
 }

-err = migration.InsertFromStructure(fullVikunjaHierachie, user)
+err = migration.InsertFromStructure(fullVikunjaHierarchy, user)
 ```

 ## Configuration

 If your migrator is an oauth-based one, you should add at least an option to enable or disable it.
-Chances are, you'll need some more options for things like client ID and secret 
-(if the other service uses oAuth as an authentication flow).
+Chances are, you'll need some more options for things like client ID and secret (if the other service uses oAuth as an authentication flow).

-The easiest way to implement an on/off switch is to check whether your migration service is enabled or not when 
-registering the routes, and then simply don't registering the routes in case it is disabled.
+The easiest way to implement an on/off switch is to check whether your migration service is enabled or not when registering the routes, and then simply don't registering the routes in case it is disabled.

 File based migrators can always be enabled.

-### Making the migrator public in `/info` 
+### Making the migrator public in `/info`

 You should make your migrator available in the `/info` endpoint so that frontends can display options to enable them or not.
 To do this, add an entry to the `AvailableMigrators` field in `pkg/routes/api/v1/info.go`.
@@ -10,7 +10,7 @@ menu:

 # Notifications

-Vikunjs provides a simple abstraction to send notifications per mail and in the database.
+Vikunja provides a simple abstraction to send notifications per mail and in the database.

 {{< table_of_contents >}}

@@ -39,7 +39,7 @@ A list of chainable functions is available to compose a mail:
 mail := NewMail(). 
    // The optional sender of the mail message.
    From("test@example.com").
-	// The optional receipient of the mail message. Uses the mail address of the notifiable if omitted.
+	// The optional recipient of the mail message. Uses the mail address of the notifiable if omitted.
    To("test@otherdomain.com").
 	// The subject of the mail to send.
    Subject("Testmail").
@@ -49,7 +49,7 @@ mail := NewMail().
    Line("This is a line of text").
 	// An action can contain a title and a url. It gets rendered as a big button in the mail.
 	// Note that you can have only one action per mail.
-	// All lines added before an action will appearr in the mail before the button, all lines 
+	// All lines added before an action will appear in the mail before the button, all lines
 	// added afterwards will appear after it.
    Action("The Action", "https://example.com").
 	// Another line of text.
@@ -60,8 +60,7 @@ If not provided, the `from` field of the mail contains the value configured in [

 ### Database notifications

-All data returned from the `ToDB()` method is serialized to json and saved into the database, along with the id of the 
-notifiable, the name of the notification and a time stamp.
+All data returned from the `ToDB()` method is serialized to json and saved into the database, along with the id of the notifiable, the name of the notification and a time stamp.
 If you don't use the database notification, the `Name()` function can return an empty string.

 ## Creating a new notification
@@ -12,10 +12,10 @@ menu:
 This checklist is a collection of all steps usually involved when releasing a new version of Vikunja.
 Not all steps are necessary for every release.

-* Website update :
+* Website update
 	* New Features: If there are new features worth mentioning the feature page should be updated.
-	* New Screenshots: If an overhaul of an existing feature happend so that it now looks different from the existing screenshot, a new one is required.
-* Generate changelogs: (with git-cliff)
+	* New Screenshots: If an overhaul of an existing feature happened so that it now looks different from the existing screenshot, a new one is required.
+* Generate changelogs (with git-cliff)
 	* Frontend
 	* API
 	* Desktop
@@ -23,11 +23,11 @@ Not all steps are necessary for every release.
 	* Frontend
 	* API
 	* Desktop
-	* Once built: Prune the cloudflare cache so that the new versions show up at dl.vikunja.io
-* Release Highlights Blogpost:
+	* Once built: Prune the cloudflare cache so that the new versions show up at [dl.vikunja.io](https://dl.vikunja.io/)
+* Release Highlights Blogpost
 	* Include a section about Vikunja in general (totally fine to copy one from the earlier blog posts)
-	* New Features & Improvements: Mention bigger features, potentially with screenshots. Things like refactoring are sometimes also worth mentioneing.
-* Publish:
+	* New Features & Improvements: Mention bigger features, potentially with screenshots. Things like refactoring are sometimes also worth mentioning.
+* Publish
 	* Reddit
 	* Twitter
 	* Mastodon
@@ -36,4 +36,3 @@ Not all steps are necessary for every release.
 	* Forum
 	* If features in the release were sponsored, send an email to relevant stakeholders
 * Update Vikunja Cloud version and other instances
-
@@ -64,7 +64,7 @@ See [integration tests]({{< ref "test.md" >}}#integration-tests) for more detail

 ### log

-Similar to `config`, this will set up the logging, based on differen logging backends.
+Similar to `config`, this will set up the logging, based on different logging backends.
 This init is called in `main.go` after the config init is done.

 ### mail
@@ -108,7 +108,7 @@ Contains all possible avatar providers a user can choose to set their avatar.

 #### background

-All list background providers are in sub-packages of this package.
+All project background providers are in sub-packages of this package.

 #### dump

@@ -126,7 +126,7 @@ See [writing a migrator]({{< ref "migration.md" >}}).
 ### red (redis)

 This package initializes a connection to a redis server.
-This inizialization is automatically done at the startup of vikunja.
+This initialization is automatically done at the startup of Vikunja.

 It also has a function (`GetRedis()`) which returns a redis client object you can then use in your package 
 to talk to redis.
@@ -138,7 +138,7 @@ In most cases, using the `keyvalue` package is a better fit.

 ### routes

-This package defines all routes which are available for vikunja clients to use.
+This package defines all routes which are available for Vikunja clients to use.
 To add a new route, see [adding a new route]({{< ref "feature.md">}}).

 #### api/v1
@@ -148,7 +148,7 @@ Every handler function which does not use the standard web handler should live h

 ### swagger

-This is where the [generated]({{< ref "mage.md#generate-swagger-definitions-from-code-comments">}} [api docs]({{< ref "../usage/api.md">}}) live. 
+This is where the [generated]({{< ref "mage.md#generate-swagger-definitions-from-code-comments">}}) [api docs]({{< ref "../usage/api.md">}}) live. 
 You usually don't need to touch this package.

 ### user
@@ -162,10 +162,9 @@ A small package, containing some helper functions:
 * `MakeRandomString`: Generates a random string of a given length.
 * `Sha256`: Calculates a sha256 hash from a given string.

-See their function definitions for instructions on how to use them. 
+See their function definitions for instructions on how to use them.

 ### version

-The single purpouse of this package is to hold the current vikunja version which gets overridden through build flags 
-each time `mage release` or `mage build` is run.
-It is a seperate package to avoid import cycles with other packages.
+The single purpose of this package is to hold the current Vikunja version which gets overridden through build flags each time `mage release` or `mage build` is run.
+It is a separate package to avoid import cycles with other packages.
@@ -19,29 +19,52 @@ The api documentation is generated using [swaggo](https://github.com/swaggo/swag
 You should always comment every field which will be exposed as a json in the api.
 These comments will show up in the documentation, it'll make it easier for developers using the api.

-As an example, this is the definition of a list with all comments:
+As an example, this is the definition of a project with all comments:

 {{< highlight golang >}}
-// List represents a list of tasks
-type List struct {
-	// The unique, numeric id of this list.
-	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id" param:"list"`
-	// The title of the list. You'll see this in the namespace overview.
-	Title string `xorm:"varchar(250)" json:"title" valid:"required,runelength(3|250)" minLength:"3" maxLength:"250"`
-	// The description of the list.
-	Description string `xorm:"varchar(1000)" json:"description" valid:"runelength(0|1000)" maxLength:"1000"`
-	OwnerID     int64  `xorm:"bigint INDEX" json:"-"`
-	NamespaceID int64  `xorm:"bigint INDEX" json:"-" param:"namespace"`
+type Project struct {
+	// The unique, numeric id of this project.
+	ID int64 `xorm:"bigint autoincr not null unique pk" json:"id" param:"project"`
+	// The title of the project. You'll see this in the overview.
+	Title string `xorm:"varchar(250) not null" json:"title" valid:"required,runelength(1|250)" minLength:"1" maxLength:"250"`
+	// The description of the project.
+	Description string `xorm:"longtext null" json:"description"`
+	// The unique project short identifier. Used to build task identifiers.
+	Identifier string `xorm:"varchar(10) null" json:"identifier" valid:"runelength(0|10)" minLength:"0" maxLength:"10"`
+	// The hex color of this project
+	HexColor string `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`

-	// The user who created this list.
-	Owner User `xorm:"-" json:"owner" valid:"-"`
-	// An array of tasks which belong to the list.
-	Tasks []*ListTask `xorm:"-" json:"tasks"`
+	OwnerID         int64    `xorm:"bigint INDEX not null" json:"-"`
+	ParentProjectID int64    `xorm:"bigint INDEX null" json:"parent_project_id"`
+	ParentProject   *Project `xorm:"-" json:"-"`

-	// A unix timestamp when this list was created. You cannot change this value.
-	Created int64 `xorm:"created" json:"created"`
-	// A unix timestamp when this list was last updated. You cannot change this value.
-	Updated int64 `xorm:"updated" json:"updated"`
+	// The user who created this project.
+	Owner *user.User `xorm:"-" json:"owner" valid:"-"`
+
+	// Whether a project is archived.
+	IsArchived bool `xorm:"not null default false" json:"is_archived" query:"is_archived"`
+
+	// The id of the file this project has set as background
+	BackgroundFileID int64 `xorm:"null" json:"-"`
+	// Holds extra information about the background set since some background providers require attribution or similar. If not null, the background can be accessed at /projects/{projectID}/background
+	BackgroundInformation interface{} `xorm:"-" json:"background_information"`
+	// Contains a very small version of the project background to use as a blurry preview until the actual background is loaded. Check out https://blurha.sh/ to learn how it works.
+	BackgroundBlurHash string `xorm:"varchar(50) null" json:"background_blur_hash"`
+
+	// True if a project is a favorite. Favorite projects show up in a separate parent project. This value depends on the user making the call to the api.
+	IsFavorite bool `xorm:"-" json:"is_favorite"`
+
+	// The subscription status for the user reading this project. You can only read this property, use the subscription endpoints to modify it.
+	// Will only returned when retrieving one project.
+	Subscription *Subscription `xorm:"-" json:"subscription,omitempty"`
+
+	// The position this project has when querying all projects. See the tasks.position property on how to use this.
+	Position float64 `xorm:"double null" json:"position"`
+
+	// A timestamp when this project was created. You cannot change this value.
+	Created time.Time `xorm:"created not null" json:"created"`
+	// A timestamp when this project was last updated. You cannot change this value.
+	Updated time.Time `xorm:"updated not null" json:"updated"`

 	web.CRUDable `xorm:"-" json:"-"`
 	web.Rights   `xorm:"-" json:"-"`
@@ -46,10 +46,10 @@ To run integration tests, use `mage test:integration`.

 ### Running tests with config

-You can run tests with all available config variables if you want, enabeling you to run tests for a lot of scenarios.
+You can run tests with all available config variables if you want, enabling you to run tests for a lot of scenarios.
 We use this in CI to run all tests with different databases.

-To use the normal config set the enviroment variable `VIKUNJA_TESTS_USE_CONFIG=1`.
+To use the normal config set the environment variable `VIKUNJA_TESTS_USE_CONFIG=1`.

 ### Showing sql queries

@@ -67,7 +67,6 @@ Beispiel: „Benutzer:in“
 | Englisches Original | Verwendung in deutscher Übersetzung |
 | ------------------- | -------------------- |
 | Bucket | Spalte |
-| Namespace | Namespace |
 | Link Share | Linkfreigabe |
 | Username | Anmeldename |

@@ -21,7 +21,7 @@ Currently, only the frontend (and by extension, the desktop app) is translatable

 ## Translation Instructions

-> These are the instructions for translating Vikunja in another language. 
+> These are the instructions for translating Vikunja in another language.
 > For information about how to add new translation strings, see below.

 For all languages these translation guidelines should be applied when translating:
@@ -44,7 +44,7 @@ Instead, translate it to reflect the original meaning in the translated string b

 All translation strings are stored in `src/i18n/lang/`.
 New strings should be added only in the `en.json` file.
-Strings in other languages will be synced through weblate and should not be added directly as a PR/commit in the frontend repo.
+Strings in other languages will be synced through [crowdin](https://crowdin.com/project/vikunja) and should not be added directly as a PR/commit in the frontend repo.

 ## Requesting a new language

@@ -56,4 +56,4 @@ For more information, please visit the [relevant PostgreSQL documentation](https

 ### SQLite

-To back up sqllite databases, it is enough to copy the [database file]({{< ref "config.md" >}}#path) to somwhere else.
+To back up sqllite databases, it is enough to copy the [database file]({{< ref "config.md" >}}#path) to somewhere else.
@@ -19,14 +19,10 @@ To completely build Vikunja from source, you need to build the api and frontend.
 The Vikunja API has no other dependencies than go itself.
 That means compiling it boils down to these steps:

-1. Make sure [Go](https://golang.org/doc/install) is properly installed on your system. You'll need at least Go `1.17`.
+1. Make sure [Go](https://golang.org/doc/install) is properly installed on your system. You'll need at least Go `1.19`.
 2. Make sure [Mage](https://magefile.org) is properly installed on your system.
 3. Clone the repo with `git clone https://code.vikunja.io/api` and switch into the directory.
-4. Run `mage build:build` in the source of this repo. This will build a binary in the root of the repo which will be able to run on your system.
-
-*Note:* Static ressources such as email templates are built into the binary.
-For these to work, you may need to run `mage build:generate` before building the vikunja binary.
-When builing entirely with `mage`, you dont need to do this, `mage build:generate` will be run automatically when running `mage build:build`.
+4. Run `mage build` in the source of this repo. This will build a binary in the root of the repo which will be able to run on your system.

 ### Build for different architectures

@@ -10,8 +10,7 @@ menu:

 # Configuration options

-You can either use a `config.yml` file in the root directory of vikunja or set almost all config option with 
-environment variables. If you have both, the value set in the config file is used.
+You can either use a `config.yml` file in the root directory of vikunja or set almost all config option with environment variables. If you have both, the value set in the config file is used.
 Right now it is not possible to configure openid authentication via environment variables.

 Variables are nested in the `config.yml`, these nested variables become `VIKUNJA_FIRST_CHILD` when configuring via
@@ -31,7 +30,7 @@ first:
 # Formats

 Vikunja supports using `toml`, `yaml`, `hcl`, `ini`, `json`, envfile, env variables and Java Properties files.
-We reccomend yaml or toml, but you're free to use whatever you want.
+We recommend yaml or toml, but you're free to use whatever you want.

 Vikunja provides a default [`config.yml`](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) file which you can use as a starting point.

@@ -56,7 +55,7 @@ If you don't provide a value in your config file, their default will be used.
 Most config variables are nested under some "higher-level" key.
 For example, the `interface` config variable is a child of the `service` key.

-The docs below aim to reflect that leveling, but please also have a lookt at [the default config](https://code.vikunja.io/api/src/branch/main/config.yml.sample) file
+The docs below aim to reflect that leveling, but please also have a look at [the default config](https://code.vikunja.io/api/src/branch/main/config.yml.sample) file
 to better grasp how the nesting looks like.

 <!-- Generated config will be injected here -->
@@ -82,7 +81,7 @@ Environment path: `VIKUNJA_SERVICE_JWTSECRET`

 ### jwtttl

-The duration of the issed JWT tokens in seconds.
+The duration of the issued JWT tokens in seconds.
 The default is 259200 seconds (3 Days).

 Default: `259200`
@@ -208,7 +207,7 @@ Environment path: `VIKUNJA_SERVICE_MOTD`

 ### enablelinksharing

-Enable sharing of lists via a link
+Enable sharing of project via a link

 Default: `true`

@@ -287,7 +286,7 @@ Environment path: `VIKUNJA_SERVICE_SENTRYDSN`

 If not empty, this will enable `/test/{table}` endpoints which allow to put any content in the database.
 Used to reset the db before frontend tests. Because this is quite a dangerous feature allowing for lots of harm,
-each request made to this endpoint neefs to provide an `Authorization: <token>` header with the token from below. <br/>
+each request made to this endpoint needs to provide an `Authorization: <token>` header with the token from below. <br/>
 **You should never use this unless you know exactly what you're doing**

 Default: `<empty>`
@@ -430,7 +429,7 @@ Environment path: `VIKUNJA_DATABASE_MAXIDLECONNECTIONS`

 ### maxconnectionlifetime

-The maximum lifetime of a single db connection in miliseconds.
+The maximum lifetime of a single db connection in milliseconds.

 Default: `10000`

@@ -495,47 +494,6 @@ Full path: `database.tls`
 Environment path: `VIKUNJA_DATABASE_TLS`


---
-
-## cache
-
-
-
-### enabled
-
-If cache is enabled or not
-
-Default: `false`
-
-Full path: `cache.enabled`
-
-Environment path: `VIKUNJA_CACHE_ENABLED`
-
-
-### type
-
-Cache type. Possible values are "keyvalue", "memory" or "redis".
-When choosing "keyvalue" this setting follows the one configured in the "keyvalue" section.
-When choosing "redis" you will need to configure the redis connection seperately.
-
-Default: `keyvalue`
-
-Full path: `cache.type`
-
-Environment path: `VIKUNJA_CACHE_TYPE`
-
-
-### maxelementsize
-
-When using memory this defines the maximum size an element can take
-
-Default: `1000`
-
-Full path: `cache.maxelementsize`
-
-Environment path: `VIKUNJA_CACHE_MAXELEMENTSIZE`
-
-
 ---

 ## redis
@@ -566,7 +524,7 @@ Environment path: `VIKUNJA_REDIS_HOST`

 ### password

-The password used to authenicate against the redis server
+The password used to authenticate against the redis server

 Default: `<empty>`

@@ -595,7 +553,7 @@ Environment path: `VIKUNJA_REDIS_DB`
 ### enable

 Whether to enable or disable cors headers.
-Note: If you want to put the frontend and the api on seperate domains or ports, you will need to enable this.
+Note: If you want to put the frontend and the api on separate domains or ports, you will need to enable this.
      Otherwise the frontend won't be able to make requests to the api through the browser.

 Default: `true`
@@ -853,7 +811,7 @@ Environment path: `VIKUNJA_LOG_ECHO`

 Whether or not to log events. Useful for debugging. Possible values are stdout, stderr, file or off to disable events logging.

-Default: `stdout`
+Default: `off`

 Full path: `log.events`

@@ -871,6 +829,28 @@ Full path: `log.eventslevel`
 Environment path: `VIKUNJA_LOG_EVENTSLEVEL`


+### mail
+
+Whether or not to log mail log messages. This will not log mail contents. Possible values are stdout, stderr, file or off to disable mail-related logging.
+
+Default: `off`
+
+Full path: `log.mail`
+
+Environment path: `VIKUNJA_LOG_MAIL`
+
+
+### maillevel
+
+The log level for mail log messages. Possible values (case-insensitive) are ERROR, WARNING, INFO, DEBUG.
+
+Default: `info`
+
+Full path: `log.maillevel`
+
+Environment path: `VIKUNJA_LOG_MAILLEVEL`
+
+
 ---

 ## ratelimit
@@ -1021,7 +1001,7 @@ Environment path: `VIKUNJA_AVATAR_GRAVATAREXPIRATION`

 ### enabled

-Whether to enable backgrounds for lists at all.
+Whether to enable backgrounds for projects at all.

 Default: `true`

@@ -1077,7 +1057,7 @@ The Key Value Storage is used for different kinds of things like metrics and a f

 ### type

-The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured seperately.
+The type of the storage backend. Can be either "memory" or "redis". If "redis" is chosen it needs to be configured separately.

 Default: `memory`

@@ -1112,7 +1092,7 @@ The provider needs to support the `openid`, `profile` and `email` scopes.<br/>
 If the email is not public in those cases, authenticating will fail.
 **Note 2:** The frontend expects to be redirected after authentication by the third party
 to <frontend-url>/auth/openid/<auth key>. Please make sure to configure the redirect url with your third party
-auth service accordingy if you're using the default vikunja frontend.
+auth service accordingly if you're using the default vikunja frontend.
 Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.

 Default: `<empty>`
@@ -1132,7 +1112,7 @@ Prometheus metrics endpoint

 ### enabled

-If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja.
+If set to true, enables a /metrics endpoint for prometheus to collect metrics about Vikunja. You can query it from `/api/v1/metrics`.

 Default: `false`

@@ -1248,15 +1228,15 @@ Full path: `defaultsettings.overdue_tasks_reminders_time`
 Environment path: `VIKUNJA_DEFAULTSETTINGS_OVERDUE_TASKS_REMINDERS_TIME`


-### default_list_id
+### default_project_id

-The id of the default list. Make sure users actually have access to this list when setting this value.
+The id of the default project. Make sure users actually have access to this project when setting this value.

 Default: `0`

-Full path: `defaultsettings.default_list_id`
+Full path: `defaultsettings.default_project_id`

-Environment path: `VIKUNJA_DEFAULTSETTINGS_DEFAULT_LIST_ID`
+Environment path: `VIKUNJA_DEFAULTSETTINGS_DEFAULT_PROJECT_ID`


 ### week_start
@@ -76,7 +76,7 @@ This defines four services, each with their own container:

 * An api service which runs the vikunja api. Most of the core logic lives here.
 * The frontend which will make vikunja actually usable for most people.
-* A database container which will store all lists, tasks, etc. We're using mariadb here, but you're free to use mysql or postgres if you want.
+* A database container which will store all projects, tasks, etc. We're using mariadb here, but you're free to use mysql or postgres if you want.
 * A proxy service which makes the frontend and api available on the same port, redirecting all requests to `/api` to the api container. 
 If you already have a proxy on your host, you may want to check out the [reverse proxy examples]() to use that.
 By default, it uses port 80 on the host.
@@ -201,7 +201,6 @@ You should see something like this:
  "max_file_size": "20MB",
  "registration_enabled": true,
  "available_migrators": [
-    "wunderlist",
    "todoist"
  ],
  "task_attachments_enabled": true
@@ -16,7 +16,7 @@ It uses an nginx container or traefik on the host to proxy backend and frontend
 For all available configuration options, see [configuration]({{< ref "config.md">}}).

 <div class="notification is-warning">
-<b>NOTE:</b> If you intend to run Vikunja with mysql and/or to use non-latin characters 
+<b>NOTE:</b> If you intend to run Vikunja with mysql and/or to use non-latin characters
 <a href="{{< ref "utf-8.md">}}">make sure your db is utf-8 compatible</a>.<br/>
 All examples on this page already reflect this and do not require additional work.
 </div>
@@ -25,8 +25,7 @@ All examples on this page already reflect this and do not require additional wor

 ## Redis

-While Vikunja has support to use redis as a caching backend, you'll probably not need it unless you're using Vikunja 
-with more than a handful of users.
+While Vikunja has support to use redis as a caching backend, you'll probably not need it unless you're using Vikunja with more than a handful of users.

 To use redis, you'll need to add this to the config examples below:

@@ -66,19 +65,45 @@ db:
 You'll also need to change the `VIKUNJA_DATABASE_TYPE` to `postgres` on the api container declaration.

 <div class="notification is-warning">
-<b>NOTE:</b> The mariadb container can sometimes take a while to initialize, especially on the first run. 
-During this time, the api container will fail to start at all. It will automatically restart every few seconds.
+<b>NOTE:</b> The mariadb container can sometimes take a while to initialize, especially on the first run. During this time, the api container will fail to start at all. It will automatically restart every few seconds.
+</div>
+
+## Sqlite
+
+Vikunja supports postgres, mysql and sqlite as a database backend. The examples on this page use mysql with a mariadb container.
+To use sqlite as a database backend, change the `api` section of the examples to this:
+
+{{< highlight yaml >}}
+api:
+  image: vikunja/api
+  environment:
+    VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
+    VIKUNJA_SERVICE_FRONTENDURL: http://<your public frontend url with slash>/
+    # Note the default path is /app/vikunja/vikunja.db This moves to a different folder so you can use a volume and store this outside of the container so state is persisted even if container destroyed.
+    VIKUNJA_DATABASE_PATH: /db/vikunja.db
+  ports:
+    - 3456:3456
+  volumes:
+    - ./files:/app/vikunja/files
+    - ./db:/db
+  restart: unless-stopped
+{{< /highlight >}}
+
+The default path Vikunja uses for sqlite is relative to the binary, which in the docker container would be `/app/vikunja/vikunja.db`. This config moves to a different folder using `VIKUNJA_DATABASE_PATH` so you can use a volume at `/db` and store this outside of the container so state is persisted even if container destroyed.
+
+You'll also need to remove or change the `VIKUNJA_DATABASE_TYPE` to `sqlite` on the api container declaration.
+
+You can also remove the db section.
+
+<div class="notification is-warning">
+<b>NOTE:</b> If you'll use your instance with more than a handful of users, we recommend using mysql or postgres.
 </div>

 ## Example without any proxy

-This example lets you host Vikunja without any reverse proxy in front of it. This is the absolute minimum configuration 
-you need to get something up and running. If you want to host Vikunja on one single port instead of two different ones 
-or need tls termination, check out one of the other examples.
+This example lets you host Vikunja without any reverse proxy in front of it. This is the absolute minimum configuration you need to get something up and running. If you want to host Vikunja on one single port instead of two different ones or need tls termination, check out one of the other examples.

-Note that you need to change the `VIKUNJA_API_URL` environment variable to the ip (the docker host you're running this on) 
-is reachable at. Because the browser you'll use to access the Vikunja frontend uses that url to make the requests, it 
-has to be able to reach that ip + port from the outside. Putting everything in a private network won't work.
+Note that you need to change the `VIKUNJA_API_URL` environment variable to the ip (the docker host you're running this on) is reachable at. Because the browser you'll use to access the Vikunja frontend uses that url to make the requests, it has to be able to reach that ip + port from the outside. Putting everything in a private network won't work.

 {{< highlight yaml >}}
 version: '3'
@@ -155,7 +180,7 @@ services:
    restart: unless-stopped
    labels:
      - "traefik.enable=true"
-      - "traefik.http.routers.vikunja-api.rule=Host(`vikunja.example.com`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)"
+      - "traefik.http.routers.vikunja-api.rule=Host(`vikunja.example.com`) && (PathPrefix(`/api/v1`) || PathPrefix(`/dav/`) || PathPrefix(`/.well-known/`))"
      - "traefik.http.routers.vikunja-api.entrypoints=https"
      - "traefik.http.routers.vikunja-api.tls.certResolver=acme"
  frontend:
@@ -235,7 +260,7 @@ services:
    image: mariadb:10
    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
    environment:
-      MYSQL_ROOT_PASSWORD: supersupersecret 
+      MYSQL_ROOT_PASSWORD: supersupersecret
      MYSQL_USER: vikunja
      MYSQL_PASSWORD: supersecret
      MYSQL_DATABASE: vikunja
@@ -343,7 +368,7 @@ services:
    image: mariadb:10
    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
    environment:
-      MYSQL_ROOT_PASSWORD: supersecret 
+      MYSQL_ROOT_PASSWORD: supersecret
      MYSQL_USER: vikunja
      MYSQL_PASSWORD: secret
      MYSQL_DATABASE: vikunja
@@ -360,7 +385,7 @@ services:
      VIKUNJA_DATABASE_DATABASE: vikunja
      VIKUNJA_SERVICE_JWTSECRET: <a super secure random secret>
      VIKUNJA_SERVICE_FRONTENDURL: https://<your public frontend url with slash>/
-    volumes: 
+    volumes:
      - ./files:/app/vikunja/files
    depends_on:
      - db
@@ -406,8 +431,8 @@ To do that, you can
 * without activating SSH as a "custom script" (go to Control Panel / Task Scheduler / Create / Scheduled Task / User-defined script)
 * without activating SSH, by using Portainer (you have to install first, check out [this tutorial](https://www.portainer.io/blog/how-to-install-portainer-on-a-synology-nas) for exmple):
  1. Go to **Dashboard / Stacks** click the button **"Add Stack"**
-  2. Give it the name Vikunja and paste the adapted docker compose file 
-  3. Deploy the Stack with the "Deploy Stack" button: 
+  2. Give it the name Vikunja and paste the adapted docker compose file
+  3. Deploy the Stack with the "Deploy Stack" button:

 ![Portainer Stack deploy](/docs/synology-proxy-2.png)

@@ -459,4 +484,3 @@ You may want to change the volumes to match the rest of your setup.
 Once deployed, you might want to change the [`PUID` and `GUID` settings]({{< ref "install-backend.md">}}#setting-user-and-group-id-of-the-user-running-vikunja) or [set the time zone]({{< ref "config.md">}}#timezone).

 After registering all your users, you might also want to [disable the user registration]({{<ref "config.md">}}#enableregistration).
-
@@ -102,7 +102,7 @@ It will automatically run all necessary database migrations.

 ## Docker

-(Note: this assumes some familarity with docker)
+(Note: this assumes some familiarity with docker)

 Usage with docker is pretty straightforward:

@@ -119,7 +119,7 @@ You can mount a local configuration like so:
 docker run -p 3456:3456 -v /path/to/config/on/host.yml:/app/vikunja/config.yml:ro vikunja/api
 {{< /highlight >}}

-Though it is recommended to use eviroment variables or `.env` files to configure Vikunja in docker.
+Though it is recommended to use environment variables or `.env` files to configure Vikunja in docker.
 See [config]({{< ref "config.md">}}) for a list of available configuration options.

 ### Files volume
@@ -129,7 +129,7 @@ You should mount the volume somewhere to the host to permanently store the files

 ### Setting user and group id of the user running vikunja

-You can set the user and group id of the user running vikunja with the `PUID` and `PGID` evironment variables.
+You can set the user and group id of the user running vikunja with the `PUID` and `PGID` environment variables.
 This follows the pattern used by [the linuxserver.io](https://docs.linuxserver.io/general/understanding-puid-and-pgid) docker images.

 This is useful to solve general permission problems when host-mounting volumes such as the volume used for task attachments.
@@ -164,7 +164,7 @@ services:
      - ./db:/var/lib/mysql
 {{< /highlight >}}

-See [full docker example]({{< ref "full-docker-example.md">}}) for more varations of this config.
+See [full docker example]({{< ref "full-docker-example.md">}}) for more variations of this config.

 ## Debian packages

@@ -24,8 +24,7 @@ You also need to configure a rewrite condition to internally redirect all reques
 By default, the frontend assumes it can reach the api at `/api/v1` relative to the frontend url.
 This means that if you make the frontend available at, say `https://vikunja.example.com`, it tries to reach the api
 at `https://vikunja.example.com/api/v1`.
-In this scenario it is not possible for the frontend and the api to live on seperate servers or even just seperate 
-ports on the same server with [the use of a reverse proxy]({{< ref "reverse-proxies.md">}}).
+In this scenario it is not possible for the frontend and the api to live on separate servers or even just separate ports on the same server with [the use of a reverse proxy]({{< ref "reverse-proxies.md">}}).

 To make configurations like this possible, the api url can be set in the `index.html` file of the frontend releases.
 Just open the file with a text editor - there are comments which will explain how to set the url.
@@ -45,12 +44,9 @@ docker run -p 80:80 vikunja/frontend

 which will run the docker image and expose port 80 on the host.

-See [full docker example]({{< ref "full-docker-example.md">}}) for more varations of this config.
+See [full docker example]({{< ref "full-docker-example.md">}}) for more variations of this config.

-### Setting user and group id of the user running vikunja
-
-You can set the user and group id of the user running vikunja with the `PUID` and `PGID` evironment variables.
-This follows the pattern used by [the linuxserver.io](https://docs.linuxserver.io/general/understanding-puid-and-pgid) docker images.
+The docker container runs as an unprivileged user and does not mount anything.

 ### API URL configuration in docker

@@ -56,3 +56,4 @@ A third-party Helm Chart is available from the k8s-at-home project [here](https:
 * [Install Vikunja in Docker for self-hosted Task Tracking](https://smarthomepursuits.com/install-vikunja-in-docker-for-self-hosted-task-tracking/)
 * [Self-Hosted To-Do List with Vikunja in Docker](https://www.youtube.com/watch?v=DqyqDWpEvKI) (Youtube)
 * [Vikunja self-hosted (step by step)](https://nguyenminhhung.com/vikunja-self-hosted-step-by-step/)
+* [How to Install Vikunja on Your Synology NAS](https://mariushosting.com/how-to-install-vikunja-on-your-synology-nas/)
@@ -8,8 +8,15 @@ menu:
    parent: "setup"
 ---

+# Hosting Vikunja with k8s
+
+We have an official Helm Chart for Vikunja.
+
+Check out [the repo](https://kolaente.dev/vikunja/helm-chart/) for more information about how to use it.
+
+## Third-party Helm Charts
+
 There are two third-party Helm-Charts which can be used to host Vikunja with k8s:

 * [Truecharts](https://truecharts.org/charts/stable/vikunja/)
 * [k8s at Home](https://github.com/k8s-at-home/charts)
-
@@ -61,8 +61,30 @@ openid:

 Google config:

-  - Navigate to https://console.cloud.google.com/apis/credentials in the target project
-  - Create a new OAuth client ID
-  - Configure an authorized redirect URI of https://vikunja.mydomain.com/auth/openid/google
+- Navigate to `https://console.cloud.google.com/apis/credentials` in the target project
+- Create a new OAuth client ID
+- Configure an authorized redirect URI of `https://vikunja.mydomain.com/auth/openid/google`

-Note that there currently seems to be no way to stop creation of new users, even when enableregistration is false in the configuration. This means that this approach works well only with an "Internal Organization" app for Google Workspace, which limits the allowed users to organizational accounts only. External / public applications will potentially allow every Google user to register.
+Note that there currently seems to be no way to stop creation of new users, even when `enableregistration` is `false` in the configuration. This means that this approach works well only with an "Internal Organization" app for Google Workspace, which limits the allowed users to organizational accounts only. External / public applications will potentially allow every Google user to register.
+
+## Keycloak 
+
+Vikunja Config:
+```yaml
+openid:
+    enabled: true
+    redirecturl: https://vikunja.mydomain.com/auth/openid/  <---- slash at the end is important
+    providers:
+      - name: Keycloak
+        authurl: https://keycloak.mydomain.com/realms/<relam-name>
+        logouturl: https://keycloak.mydomain.com/realms/<relam-name>/protocol/openid-connect/logout
+        clientid: <vikunja-id>
+        clientsecret: <vikunja secret>
+```
+Keycloak Config:
+- Navigate to the keycloak instance
+- Create a new client with the type `OpenID Connect` and a unique ID.
+- Set `Client authentication` to On
+- Set `Root Url` to `https://vikunja.mydomain.com`
+- Set `Valid redirect URIs` to `/auth/openid/keycloak`
+- Create the client the navigate to the credentials tab and copy the `Client secret`
@@ -86,15 +86,15 @@ server {
 2. Verify that the page will pull up in your browser. (Do not bother trying to log in. It won't work. Trust me.)
 3. Now, we'll work with the NPM container, so you need to identify the container name for your NPM installation. e.g. NGINX-PM
 4. From the command line, enter `sudo docker exec -it [NGINX-PM container name] /bin/bash` and navigate to the proxy hosts folder where the `.conf` files are stashed. Probably `/data/nginx/proxy_host`. (This folder is a persistent folder created in the NPM container and mounted by NPM.)
-5. Locate the `.conf` file where the server_name inside the file matches your Vikunja Proxy Host. Once found, add the following code, unchanged, just above the existing location block in that file. (They are listed by number, not name.)  
-```
+5. Locate the `.conf` file where the server_name inside the file matches your Vikunja Proxy Host. Once found, add the following code, unchanged, just above the existing location block in that file. (They are listed by number, not name.)
+```nginx
 location ~* ^/(api|dav|\.well-known)/ {
-        proxy_pass http://api:3456;
-        client_max_body_size 20M;
-    }
+		proxy_pass http://api:3456;
+		client_max_body_size 20M;
+	}
 ```
-6. After saving the edited file, return to NPM's UI browser window and refresh the page to verify your Proxy Host for Vikunja is still online. 
-7. Now, switch over to your Vikunja browswer window and hit refresh. If you configured your URL correctly in original Vikunja container, you should be all set and the browser will correctly show Vikunja. If not, you'll need to adjust the address in the top of the login subscreen to match your proxy address.
+6. After saving the edited file, return to NPM's UI browser window and refresh the page to verify your Proxy Host for Vikunja is still online.
+7. Now, switch over to your Vikunja browser window and hit refresh. If you configured your URL correctly in original Vikunja container, you should be all set and the browser will correctly show Vikunja. If not, you'll need to adjust the address in the top of the login subscreen to match your proxy address.

 ## Apache

@@ -17,15 +17,27 @@ However, you can still run it in a subdirectory but need to build the frontend y
 First, make sure you're able to build the frontend from source.
 Check [the guide about building from source]({{< ref "build-from-source.md">}}#frontend) about that.

-Then, run 
+### Dynamicly set with build command
+
+Run the build with the `VIKUNJA_FRONTEND_BASE` variable specified.

 ```
-pnpm vite build --base=/SUBPATH
-pnpm workbox copyLibraries dist/
+VIKUNJA_FRONTEND_BASE=/SUBPATH/ pnpm run build
 ```

 Where `SUBPATH` is the subdirectory you want to run Vikunja on.

+### Set via .env.local
+
+* Copy `.env.local.example` to `.env.local`
+* Uncomment `VIKUNJA_FRONTEND_BASE` and set `/subpath/` to the desired path.
+
+After saving, build Vikunja as normal.
+
+```
+pnpm run build
+```
+
 Once you have the build files you can deploy them as usual.
 Note that when deploying in docker you'll need to put the files in a web container yourself, you 
 can't use the `Dockerfile` in the repo without modifications.
@@ -11,11 +11,9 @@ menu:
 # UTF-8 Settings

 Vikunja itself is always fully capable of handling utf-8 characters.
-However, your database might be not. 
-Vikunja itself will work just fine until you want to use non-latin characters in your tasks/lists/etc.
+However, your database might be not. Vikunja itself will work just fine until you want to use non-latin characters in your tasks/projects/etc.

-On this page, you will find information about how to fully ensure non-latin characters like aüäß or emojis work 
-with your installation.
+On this page, you will find information about how to fully ensure non-latin characters like *aüäß* or emojis work with your installation.

 {{< table_of_contents >}}

@@ -57,8 +55,7 @@ Before attempting any conversion, please [back up your database]({{< ref "backup

 ### 1. Create a pre-conversion script

-Copy the following sql statements in a file called `preAlterTables.sql` and replace all occurences of `vikunja` with 
-the name of your database:
+Copy the following sql statements in a file called `preAlterTables.sql` and replace all occurrences of `vikunja` with the name of your database:

 {{< highlight sql >}}
 use information_schema;
@@ -19,7 +19,7 @@ The Vikunja api and frontend are available in two different release flavors.
 Stable releases have a fixed version number like `0.18.2` and are published at irregular intervals whenever a new version is ready.
 They receive few bugfixes and security patches.

-We use [Semantic Versioning](#) for these releases.
+We use [Semantic Versioning](https://semver.org) for these releases.

 ## Unstable

@@ -10,10 +10,10 @@ menu:

 # API Documentation

-You can find the api docs under `http://vikunja.tld/api/v1/docs` of your instance. 
+You can find the api docs under `http://vikunja.tld/api/v1/docs` of your instance.<br  />
 A public instance is available on [try.vikunja.io](https://try.vikunja.io/api/v1/docs).

-These docs are autgenerated from annotations in the code with swagger.
+These docs are autogenerated from annotations in the code with swagger.

 The specification is hosted at `http://vikunja.tld/api/v1/docs.json`.
-You can use this to embed it into other openapi compatible applications if you want.
+You can use this to embed it into other OpenAPI compatible applications if you want.
@@ -1,6 +1,6 @@
 ---
 date: "2019-05-12:00:00+01:00"
-title: "Caldav"
+title: "CalDAV"
 draft: false
 type: "doc"
 menu:
@@ -8,11 +8,11 @@ menu:
    parent: "usage"
 ---

-# Caldav
+# CalDAV

-> **Warning:** The caldav integration is in an early alpha stage and has bugs. 
+> **Warning:** The CalDAV integration is in an early alpha stage and has bugs.
 > It works well with some clients while having issues with others.
-> If you encounter issues, please [report them](https://code.vikunja.io/api/issues/new?body=[caldav]) 
+> If you encounter issues, please [report them](https://code.vikunja.io/api/issues/new?body=[caldav])

 Vikunja supports managing tasks via the [caldav VTODO](https://tools.ietf.org/html/rfc5545#section-3.6.2) extension.

@@ -24,10 +24,10 @@ All urls are located under the `/dav` subspace.

 Urls are:

-* `/principals/<username>/`: Returns urls for list discovery. *Use this url to initially make connections to new clients.*
-* `/lists/`: Used to manage lists
-* `/lists/<List ID>/`: Used to manage a single list
-* `/lists/<List ID>/<Task UID>`: Used to manage a task on a list
+* `/principals/<username>/`: Returns urls for project discovery. *Use this url to initially make connections to new clients.*
+* `/projects/`: Used to manage projects
+* `/projects/<Project ID>/`: Used to manage a single project
+* `/projects/<Project ID>/<Task UID>`: Used to manage a task on a project

 ## Supported properties

@@ -37,49 +37,50 @@ Vikunja currently supports the following properties:
 * `SUMMARY`
 * `DESCRIPTION`
 * `PRIORITY`
+* `CATEGORIES`
 * `COMPLETED`
+* `CREATED` (only Vikunja → Client)
 * `DUE`
-* `DTSTART`
 * `DURATION`
-* `ORGANIZER`
-* `RELATED-TO`
-* `CREATED`
 * `DTSTAMP`
-* `LAST-MODIFIED`
+* `DTSTART`
+* `LAST-MODIFIED` (only Vikunja → Client)
+* `RRULE` (Recurrence) (only Vikunja → Client)
+* `VALARM` (Reminders)

 Vikunja **currently does not** support these properties:

 * `ATTACH`
-* `CATEGORIES`
 * `CLASS`
 * `COMMENT`
+* `CONTACT`
 * `GEO`
 * `LOCATION`
+* `ORGANIZER` (disabled)
 * `PERCENT-COMPLETE`
-* `RESOURCES`
-* `STATUS`
-* `CONTACT`
 * `RECURRENCE-ID`
-* `URL`
-* Recurrence
+* `RELATED-TO`
+* `RESOURCES`
 * `SEQUENCE`
+* `STATUS`
+* `URL`

 ## Tested Clients

 ### Working

 * [Evolution](https://wiki.gnome.org/Apps/Evolution/)
-* [OpenTasks](https://opentasks.app/) + [DAVx⁵](https://www.davx5.com/)
+* [OpenTasks](https://opentasks.app/) & [DAVx⁵](https://www.davx5.com/)
 * [Tasks (Android)](https://tasks.org/)

 ### Not working

 * [Thunderbird (68)](https://www.thunderbird.net/)
-* iOS calDAV Sync (See [#753](https://kolaente.dev/vikunja/api/issues/753))
+* iOS CalDAV Sync (See [#753](https://kolaente.dev/vikunja/api/issues/753))

 ## Dev logs

-The whole thing is not optimized at all and probably pretty inefficent.
+The whole thing is not optimized at all and probably pretty inefficient.

 Request body and headers are logged if the debug output is enabled.

@@ -140,6 +141,4 @@ Requests from the app:::
 And then it just stops.
 ... and complains about not being able to find the home set
 ... without even requesting it...
-
-
 ```
@@ -10,7 +10,7 @@ menu:

 # Command line interface

-You can interact with Vikunja using its `cli` interface. 
+You can interact with Vikunja using its `cli` interface.<br />
 The following commands are available:

 * [dump](#dump)
@@ -31,7 +31,7 @@ All commands use the same standard [config file]({{< ref "../setup/config.md">}}
 When running Vikunja in docker, you'll need to execute all commands in the `api` container.
 Instead of running the `vikunja` binary directly, run it like this:

-```
+```sh
 docker exec <name of the vikunja api container> /app/vikunja/vikunja <subcommand>
 ```

@@ -80,12 +80,12 @@ Roll migrations back until a certain point.

 Usage:
 {{< highlight bash >}}
-$ vikunja migrate rollback [flags]    
+$ vikunja migrate rollback [flags]
 {{< /highlight >}}

 Flags:
 * `-n`, `--name` string: The id of the migration you want to roll back until.
- 
+
 ### `restore`

 Restores a previously created dump from a zip file, see `dump`.
@@ -138,9 +138,9 @@ Flags:

 #### `user delete`

-Start the user deletion process. 
+Start the user deletion process.
 If called without the `--now` flag, this command will only trigger an email to the user in order for them to confirm and start the deletion process (this is the same behavoir as if the user requested their deletion via the web interface).
-With the flag the user is deleted **immediately**. 
+With the flag the user is deleted **immediately**.

 **USE WITH CAUTION.**

@@ -194,7 +194,7 @@ This is either the semantic version (something like `0.7`) or version + git comm

 Usage:
 {{< highlight bash >}}
-$ vikunja version    
+$ vikunja version
 {{< /highlight >}}

 ### `web`
@@ -203,5 +203,5 @@ Starts Vikunja's REST api server.

 Usage:
 {{< highlight bash >}}
-$ vikunja web    
+$ vikunja web
 {{< /highlight >}}
@@ -24,24 +24,26 @@ This document describes the different errors Vikunja can return.

 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 1001 | 400 | A user with this username already exists. |
-| 1002 | 400 | A user with this email address already exists. |
-| 1004 | 400 | No username and password specified. |
-| 1005 | 404 | The user does not exist. |
-| 1006 | 400 | Could not get the user id. |
-| 1008 | 412 | No password reset token provided. |
-| 1009 | 412 | Invalid password reset token. |
-| 1010 | 412 | Invalid email confirm token. |
-| 1011 | 412 | Wrong username or password. |
-| 1012 | 412 | Email address of the user not confirmed. |
-| 1013 | 412 | New password is empty. |
-| 1014 | 412 | Old password is empty. |
-| 1015 | 412 | Totp is already enabled for this user. |
-| 1016 | 412 | Totp is not enabled for this user. |
-| 1017 | 412 | The provided Totp passcode is invalid. |
-| 1018 | 412 | The provided user avatar provider type setting is invalid. |
-| 1019 | 412 | No openid email address was provided. |
-| 1020 | 412 | This user account is disabled. |
+| 1001      | 400 | A user with this username already exists. |
+| 1002      | 400 | A user with this email address already exists. |
+| 1004      | 400 | No username and password specified. |
+| 1005      | 404 | The user does not exist. |
+| 1006      | 400 | Could not get the user id. |
+| 1008      | 412 | No password reset token provided. |
+| 1009      | 412 | Invalid password reset token. |
+| 1010      | 412 | Invalid email confirm token. |
+| 1011      | 412 | Wrong username or password. |
+| 1012      | 412 | Email address of the user not confirmed. |
+| 1013      | 412 | New password is empty. |
+| 1014      | 412 | Old password is empty. |
+| 1015      | 412 | Totp is already enabled for this user. |
+| 1016      | 412 | Totp is not enabled for this user. |
+| 1017      | 412 | The provided Totp passcode is invalid. |
+| 1018      | 412 | The provided user avatar provider type setting is invalid. |
+| 1019      | 412 | No openid email address was provided. |
+| 1020      | 412 | This user account is disabled. |
+| 1021      | 412 | This account is managed by a third-party authentication provider. |
+| 1021      | 412 | The username must not contain spaces. |

 ## Validation

@@ -50,32 +52,35 @@ This document describes the different errors Vikunja can return.
 | 2001 | 400 | ID cannot be empty or 0. |
 | 2002 | 400 | Some of the request data was invalid. The response contains an aditional array with all invalid fields. |

-## List
+## Project

-| ErrorCode | HTTP Status Code | Description                                                                                                                   |
-|-----------|------------------|-------------------------------------------------------------------------------------------------------------------------------|
-| 3001      | 404 | The list does not exist.                                                                                                      |
-| 3004      | 403 | The user needs to have read permissions on that list to perform that action.                                                  |
-| 3005      | 400 | The list title cannot be empty.                                                                                               |
-| 3006      | 404 | The list share does not exist.                                                                                                |
-| 3007      | 400 | A list with this identifier already exists.                                                                                   |
-| 3008      | 412 | The list is archived and can therefore only be accessed read only. This is also true for all tasks associated with this list. |
-| 3009      | 412 | The list cannot belong to a dynamically generated namespace like "Favorites".                                                 |
-| 3010      | 412 | The list must belong to a namespace.                                                                                          |
+| ErrorCode | HTTP Status Code | Description                                                                                                                         |
+|-----------|------------------|-------------------------------------------------------------------------------------------------------------------------------------|
+| 3001      | 404 | The project does not exist.                                                                                                         |
+| 3004      | 403 | The user needs to have read permissions on that project to perform that action.                                                     |
+| 3005      | 400 | The project title cannot be empty.                                                                                                  |
+| 3006      | 404 | The project share does not exist.                                                                                                   |
+| 3007      | 400 | A project with this identifier already exists.                                                                                      |
+| 3008      | 412 | The project is archived and can therefore only be accessed read only. This is also true for all tasks associated with this project. |
+| 3009      | 412 | The project cannot belong to a dynamically generated parent project like "Favorites".                                               |
+| 3010      | 412 | This project cannot be a child of itself.                                                                                           |
+| 3011      | 412 | This project cannot have a cyclic relationship to a parent project.                                                                 |
+| 3012      | 412 | This project cannot be deleted because a user has set it as their default project.                                                  |
+| 3013      | 412 | This project cannot be archived because a user has set it as their default project.                                                 |

 ## Task

 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 4001 | 400 | The list task text cannot be empty. |
-| 4002 | 404 | The list task does not exist. |
-| 4003 | 403 | All bulk editing tasks must belong to the same list. |
+| 4001 | 400 | The project task text cannot be empty. |
+| 4002 | 404 | The project task does not exist. |
+| 4003 | 403 | All bulk editing tasks must belong to the same project. |
 | 4004 | 403 | Need at least one task when bulk editing tasks. |
 | 4005 | 403 | The user does not have the right to see the task. |
 | 4006 | 403 | The user tried to set a parent task as the task itself. |
 | 4007 | 400 | The user tried to create a task relation with an invalid kind of relation. |
 | 4008 | 409 | The user tried to create a task relation which already exists. |
-| 4009 | 404 | The task relation does not exist. | 
+| 4009 | 404 | The task relation does not exist. |
 | 4010 | 400 | Cannot relate a task with itself. |
 | 4011 | 404 | The task attachment does not exist. |
 | 4012 | 400 | The task attachment is too large. |
@@ -88,36 +93,25 @@ This document describes the different errors Vikunja can return.
 | 4019 | 400 | Invalid task filter value. |
 | 4020 | 400 | The provided attachment does not belong to that task. |
 | 4021 | 400 | This user is already assigned to that task. |
-
-## Namespace
-
-| ErrorCode | HTTP Status Code | Description |
-|-----------|------------------|-------------|
-| 5001 | 404 | The namspace does not exist. | 
-| 5003 | 403 | The user does not have access to the specified namespace. |
-| 5006 | 400 | The namespace name cannot be empty. |
-| 5009 | 403 | The user needs to have namespace read access to perform that action. |
-| 5010 | 403 | This team does not have access to that namespace. |
-| 5011 | 409 | This user has already access to that namespace. |
-| 5012 | 412 | The namespace is archived and can therefore only be accessed read only. |
+| 4022 | 400 | The task has a relative reminder which does not specify relative to what. |

 ## Team

-| ErrorCode | HTTP Status Code | Description |
-|-----------|------------------|-------------|
-| 6001 | 400 | The team name cannot be emtpy. |
-| 6002 | 404 | The team does not exist. |
-| 6004 | 409 | The team already has access to that namespace or list. |
-| 6005 | 409 | The user is already a member of that team. |
-| 6006 | 400 | Cannot delete the last team member. |
-| 6007 | 403 | The team does not have access to the list to perform that action. |
+| ErrorCode | HTTP Status Code | Description                                                          |
+|-----------|------------------|----------------------------------------------------------------------|
+| 6001 | 400 | The team name cannot be empty.                                       |
+| 6002 | 404 | The team does not exist.                                             |
+| 6004 | 409 | The team already has access to that project.                         |
+| 6005 | 409 | The user is already a member of that team.                           |
+| 6006 | 400 | Cannot delete the last team member.                                  |
+| 6007 | 403 | The team does not have access to the project to perform that action. |

-## User List Access
+## User Project Access

 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 7002 | 409 | The user already has access to that list. |
-| 7003 | 403 | The user does not have access to that list. |
+| 7002 | 409 | The user already has access to that project. |
+| 7003 | 403 | The user does not have access to that project. |

 ## Label

@@ -131,24 +125,24 @@ This document describes the different errors Vikunja can return.

 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
-| 9001 | 403 | The right is invalid. | 
+| 9001 | 403 | The right is invalid. |

 ## Kanban

 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
 | 10001 | 404 | The bucket does not exist. |
-| 10002 | 400 | The bucket does not belong to that list. |
-| 10003 | 412 | You cannot remove the last bucket on a list. |
+| 10002 | 400 | The bucket does not belong to that project. |
+| 10003 | 412 | You cannot remove the last bucket on a project. |
 | 10004 | 412 | You cannot add the task to this bucket as it already exceeded the limit of tasks it can hold. |
-| 10005 | 412 | There can be only one done bucket per list. |
+| 10005 | 412 | There can be only one done bucket per project. |

 ## Saved Filters

 | ErrorCode | HTTP Status Code | Description |
 |-----------|------------------|-------------|
 | 11001 | 404 | The saved filter does not exist. |
-| 11002 | 412 | Saved filters are not available for link shares. | 
+| 11002 | 412 | Saved filters are not available for link shares. |

 ## Subscriptions

@@ -159,7 +153,8 @@ This document describes the different errors Vikunja can return.

 ## Link Shares

-| ErrorCode | HTTP Status Code | Description |
-|-----------|------------------|-------------|
+| ErrorCode | HTTP Status Code | Description                                                                    |
+|-----------|------------------|--------------------------------------------------------------------------------|
 | 13001 | 412 | This link share requires a password for authentication, but none was provided. |
-| 13002 | 403 | The provided link share password was invalid. |
+| 13002 | 403 | The provided link share password is invalid.                                   |
+| 13003 | 400 | The provided link share token is invalid.                                      |
@@ -10,16 +10,16 @@ menu:

 # Available task relation kinds

-| Code | Description |
-|------|-------------|
-| subtask | Task is a subtask of the other task. This is the opposite of `parenttask`. |
-| parenttask | Task is a parent task of the other task. This is the opposite of `subtask`. |
-| related | Both tasks are related to each other. How is not more specified. |
-| duplicateof | Task is a duplicate of the other task. This is the opposite of `duplicates`. |
-| duplicates | Task duplicates the other task. This is the opposite of `duplicateof`. |
-| blocking | Task is blocking the other task. This is the opposite of `blocked`. |
-| blocked | Task is blocked by the other task. This is the opposite of `blocking`. |
-| precedes | Task precedes the other task. This is the opposite of `follows`. |
-| follows | Task follows the other task. This is the opposite of `precedes`. |
-| copiedfrom | Task is copied from the other task. This is the opposite of `copiedto`. |
-| copiedto | Task is copied to the other task. This is the opposite of `copiedfrom`. |
+| Code | Description | Opposite of |
+|------|-------------|-------------|
+| `subtask` | Task is a subtask of the other task.       | `parenttask` |
+| `parenttask` | Task is a parent task of the other task. | `subtask` |
+| `related` | Both tasks are related to each other.<br  /> How is not more specified. | ⸺ |
+| `duplicateof` | Task is a duplicate of the other task. | `duplicates` |
+| `duplicates` | Task duplicates the other task. | `duplicateof` |
+| `blocking` | Task is blocking the other task. | `blocked` |
+| `blocked` | Task is blocked by the other task. | `blocking` |
+| `precedes` | Task precedes the other task. | `follows` |
+| `follows` | Task follows the other task. | `precedes` |
+| `copiedfrom` | Task is copied from the other task. | `copiedto` |
+| `copiedto` | Task is copied to the other task. | `copiedfrom` |
@@ -8,22 +8,22 @@ menu:
    parent: "usage"
 ---

-# List and namespace rights for teams and users
+# Project rights for teams and users

-Whenever you share a list or namespace with a user or team, you can specify a `rights` parameter. 
+Whenever you share a project with a user or team, you can specify a `rights` parameter.
 This parameter controls the rights that team or user is going to have (or has, if you request the current sharing status).

 Rights are being specified using integers.

 The following values are possible:

-| Right (int) | Meaning |
-|-------------|---------|
-| 0 (Default) | Read only. Anything which is shared with this right cannot be edited. |
-| 1 | Read and write. Namespaces or lists shared with this right can be read and written to by the team or user. |
-| 2 | Admin. Can do anything like read and write, but can additionally manage sharing options. |
+| Right (int) | Meaning                                                                                         |
+|-------------|-------------------------------------------------------------------------------------------------|
+| 0 (Default) | Read only. Anything which is shared with this right cannot be edited.                           |
+| 1           | Read and write. Projects shared with this right can be read and written to by the team or user. |
+| 2           | Admin. Can do anything like read and write, but can additionally manage sharing options.        |

 ## Team admins

 When adding or querying a team, every member has an additional boolean value stating if it is admin or not.
-A team admin can also add and remove team members and also change whether a user in the team is admin or not.
+A team admin can also add and remove team members and also change whether a user in the team is admin or not.
@@ -18,118 +18,128 @@ module code.vikunja.io/api

 require (
 	code.vikunja.io/web v0.0.0-20210706160506-d85def955bd3
-	gitea.com/xorm/xorm-redis-cache v0.2.0
-	github.com/ThreeDotsLabs/watermill v1.1.1
+	dario.cat/mergo v1.0.0
+	github.com/ThreeDotsLabs/watermill v1.2.0
 	github.com/adlio/trello v1.10.0
-	github.com/arran4/golang-ical v0.0.0-20221122102835-109346913e54
+	github.com/arran4/golang-ical v0.0.0-20230425234049-f69e132f2b0c
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
 	github.com/bbrks/go-blurhash v1.1.1
 	github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b
-	github.com/coreos/go-oidc/v3 v3.5.0
+	github.com/coreos/go-oidc/v3 v3.6.0
 	github.com/cweill/gotests v1.6.0
 	github.com/d4l3k/messagediff v1.2.1
 	github.com/disintegration/imaging v1.6.2
-	github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
-	github.com/gabriel-vasile/mimetype v1.4.1
-	github.com/getsentry/sentry-go v0.17.0
-	github.com/go-redis/redis/v8 v8.11.5
-	github.com/go-sql-driver/mysql v1.7.0
-	github.com/go-testfixtures/testfixtures/v3 v3.8.1
-	github.com/gocarina/gocsv v0.0.0-20221216233619-1fea7ae8d380
-	github.com/golang-jwt/jwt/v4 v4.4.3
+	github.com/dustinkirkland/golang-petname v0.0.0-20230626224747-e794b9370d49
+	github.com/gabriel-vasile/mimetype v1.4.2
+	github.com/getsentry/sentry-go v0.22.0
+	github.com/go-sql-driver/mysql v1.7.1
+	github.com/go-testfixtures/testfixtures/v3 v3.9.0
+	github.com/gocarina/gocsv v0.0.0-20230616125104-99d496ca653d
+	github.com/golang-jwt/jwt/v5 v5.0.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/google/uuid v1.3.0
+	github.com/hashicorp/go-version v1.6.0
 	github.com/iancoleman/strcase v0.2.0
-	github.com/imdario/mergo v0.3.13
 	github.com/jinzhu/copier v0.3.5
-	github.com/labstack/echo-jwt/v4 v4.0.1
-	github.com/labstack/echo/v4 v4.10.0
+	github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6
+	github.com/labstack/echo-jwt/v4 v4.2.0
+	github.com/labstack/echo/v4 v4.10.2
 	github.com/labstack/gommon v0.4.0
-	github.com/lib/pq v1.10.7
-	github.com/magefile/mage v1.14.0
-	github.com/mattn/go-sqlite3 v1.14.16
+	github.com/lib/pq v1.10.9
+	github.com/magefile/mage v1.15.0
+	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pquerna/otp v1.4.0
-	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_golang v1.16.0
+	github.com/redis/go-redis/v9 v9.0.5
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/samedi/caldav-go v3.0.0+incompatible
-	github.com/spf13/afero v1.9.3
-	github.com/spf13/cobra v1.6.1
-	github.com/spf13/viper v1.15.0
-	github.com/stretchr/testify v1.8.1
-	github.com/swaggo/swag v1.8.9
+	github.com/spf13/afero v1.9.5
+	github.com/spf13/cobra v1.7.0
+	github.com/spf13/viper v1.16.0
+	github.com/stretchr/testify v1.8.4
+	github.com/swaggo/swag v1.8.12
 	github.com/tkuchiki/go-timezone v0.2.2
-	github.com/ulule/limiter/v3 v3.10.0
-	github.com/vectordotdev/go-datemath v0.1.1-0.20211214182920-0a4ac8742b93
-	github.com/wneessen/go-mail v0.3.8
-	github.com/yuin/goldmark v1.5.3
-	golang.org/x/crypto v0.5.0
-	golang.org/x/image v0.3.0
-	golang.org/x/oauth2 v0.3.0
-	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.4.0
-	golang.org/x/term v0.4.0
+	github.com/ulule/limiter/v3 v3.11.2
+	github.com/wneessen/go-mail v0.3.9
+	github.com/yuin/goldmark v1.5.4
+	golang.org/x/crypto v0.11.0
+	golang.org/x/image v0.9.0
+	golang.org/x/oauth2 v0.10.0
+	golang.org/x/sync v0.3.0
+	golang.org/x/sys v0.10.0
+	golang.org/x/term v0.10.0
 	gopkg.in/d4l3k/messagediff.v1 v1.2.1
 	gopkg.in/yaml.v3 v3.0.1
-	src.techknowlogick.com/xgo v1.7.1-0.20230117190652-94aee174ab86
+	src.techknowlogick.com/xgo v1.7.1-0.20230606181629-494bc06f804a
 	src.techknowlogick.com/xormigrate v1.5.0
 	xorm.io/builder v0.3.12
 	xorm.io/xorm v1.3.2
 )

 require (
+	github.com/ClickHouse/ch-go v0.55.0 // indirect
+	github.com/ClickHouse/clickhouse-go/v2 v2.9.1 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
-	github.com/cenkalti/backoff/v3 v3.0.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/garyburd/redigo v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-chi/chi v4.0.2+incompatible // indirect
+	github.com/go-chi/chi/v5 v5.0.8 // indirect
+	github.com/go-faster/city v1.0.1 // indirect
+	github.com/go-faster/errors v0.6.1 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.6 // indirect
 	github.com/go-openapi/spec v0.20.4 // indirect
 	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/goccy/go-json v0.9.11 // indirect
+	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.16.5 // indirect
 	github.com/laurent22/ical-go v0.1.1-0.20181107184520-7e5d6ade8eef // indirect
-	github.com/lithammer/shortuuid/v3 v3.0.4 // indirect
+	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/onsi/ginkgo v1.16.4 // indirect
+	github.com/onsi/gomega v1.16.0 // indirect
+	github.com/paulmach/orb v0.9.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
@@ -137,21 +147,20 @@ require (
 	github.com/urfave/cli/v2 v2.3.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4 // indirect
+	go.opentelemetry.io/otel v1.15.0 // indirect
+	go.opentelemetry.io/otel/trace v1.15.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

-replace (
-	github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190524174923-9e5cd1688227+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7
-	gopkg.in/fsnotify.v1 => github.com/kolaente/fsnotify v1.4.10-0.20200411160148-1bc3c8ff4048 // See https://github.com/fsnotify/fsnotify/issues/328 and https://github.com/golang/go/issues/26904
-)
+replace github.com/samedi/caldav-go => github.com/kolaente/caldav-go v3.0.1-0.20190610114120-2a4eb8b5dcc9+incompatible // Branch: feature/dynamic-supported-components, PR: https://github.com/samedi/caldav-go/pull/6 and https://github.com/samedi/caldav-go/pull/7

-go 1.19
+go 1.20
@@ -177,6 +177,9 @@ func init() {
 // Some variables have external dependencies (like git) which may not always be available.
 func initVars() {
 	Tags = os.Getenv("TAGS")
+	if !strings.Contains(Tags, "swagger") {
+		Tags += " swagger"
+	}
 	setVersion()
 	setBinLocation()
 	setPkgVersion()
@@ -195,7 +198,11 @@ func runAndStreamOutput(cmd string, args ...string) {
 	stdout, _ := c.StdoutPipe()
 	errbuf := bytes.Buffer{}
 	c.Stderr = &errbuf
-	c.Start()
+	err := c.Start()
+	if err != nil {
+		fmt.Printf("Could not start: %s\n", err)
+		os.Exit(1)
+	}

 	reader := bufio.NewReader(stdout)
 	line, err := reader.ReadString('\n')
@@ -337,9 +344,16 @@ func Fmt() {
 	runAndStreamOutput("gofmt", args...)
 }

+const swaggerDocsFolderLocation = `./pkg/swagger/`
+
 // Generates the swagger docs from the code annotations
 func DoTheSwag() {
 	mg.Deps(initVars)
+	if _, err := os.Stat(swaggerDocsFolderLocation + "swagger.json"); err == nil {
+		fmt.Println("Swagger docs already generated, not generating. Remove the files in " + swaggerDocsFolderLocation + " and run this command again to regenerate them.")
+		return
+	}
+
 	checkAndInstallGoTool("swag", "github.com/swaggo/swag/cmd/swag")
 	runAndStreamOutput("swag", "init", "-g", "./pkg/routes/routes.go", "--parseDependency", "-d", RootPath, "-o", RootPath+"/pkg/swagger")
 }
@@ -405,7 +419,7 @@ func checkGolangCiLintInstalled() {
 	mg.Deps(initVars)
 	if err := exec.Command("golangci-lint").Run(); err != nil && strings.Contains(err.Error(), "executable file not found") {
 		fmt.Println("Please manually install golangci-lint by running")
-		fmt.Println("curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.3")
+		fmt.Println("curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.2")
 		os.Exit(1)
 	}
 }
@@ -446,12 +460,16 @@ func (Build) Clean() error {
 	if err := os.RemoveAll(BinLocation); err != nil && !os.IsNotExist(err) {
 		return err
 	}
+	if err := os.RemoveAll(swaggerDocsFolderLocation); err != nil && !os.IsNotExist(err) {
+		return err
+	}
 	return nil
 }

 // Builds a vikunja binary, ready to run
 func (Build) Build() {
 	mg.Deps(initVars)
+	mg.Deps(DoTheSwag)
 	runAndStreamOutput("go", "build", Goflags[0], "-tags", Tags, "-ldflags", "-s -w "+Ldflags, "-o", Executable)
 }

@@ -461,6 +479,7 @@ type Release mg.Namespace
 func (Release) Release(ctx context.Context) error {
 	mg.Deps(initVars)
 	mg.Deps(Release.Dirs)
+	mg.Deps(DoTheSwag)

 	// Run compiling in parallel to speed it up
 	errs, _ := errgroup.WithContext(ctx)
@@ -502,6 +521,7 @@ func (Release) Dirs() error {

 func runXgo(targets string) error {
 	mg.Deps(initVars)
+	mg.Deps(DoTheSwag)
 	checkAndInstallGoTool("xgo", "src.techknowlogick.com/xgo")

 	extraLdflags := `-linkmode external -extldflags "-static" `
@@ -31,19 +31,6 @@ import (
 // DateFormat is the caldav date format
 const DateFormat = `20060102T150405`

-// Event holds a single caldav event
-type Event struct {
-	Summary     string
-	Description string
-	UID         string
-	Alarms      []Alarm
-	Color       string
-
-	Timestamp time.Time
-	Start     time.Time
-	End       time.Time
-}
-
 // Todo holds a single VTODO
 type Todo struct {
 	// Required
@@ -58,13 +45,14 @@ type Todo struct {
 	Priority     int64 // 0-9, 1 is highest
 	RelatedToUID string
 	Color        string
-
-	Start       time.Time
-	End         time.Time
-	DueDate     time.Time
-	Duration    time.Duration
-	RepeatAfter int64
-	RepeatMode  models.TaskRepeatMode
+	Categories   []string
+	Start        time.Time
+	End          time.Time
+	DueDate      time.Time
+	Duration     time.Duration
+	RepeatAfter  int64
+	RepeatMode   models.TaskRepeatMode
+	Alarms       []Alarm

 	Created time.Time
 	Updated time.Time // last-mod
@@ -73,6 +61,8 @@ type Todo struct {
 // Alarm holds infos about an alarm from a caldav event
 type Alarm struct {
 	Time        time.Time
+	Duration    time.Duration
+	RelativeTo  models.ReminderRelation
 	Description string
 }

@@ -100,58 +90,6 @@ X-OUTLOOK-COLOR:` + color + `
 X-FUNAMBOL-COLOR:` + color
 }

-// ParseEvents parses an array of caldav events and gives them back as string
-func ParseEvents(config *Config, events []*Event) (caldavevents string) {
-	caldavevents += `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:` + config.Name + `
-PRODID:-//` + config.ProdID + `//EN` + getCaldavColor(config.Color)
-
-	for _, e := range events {
-
-		if e.UID == "" {
-			e.UID = makeCalDavTimeFromTimeStamp(e.Timestamp) + utils.Sha256(e.Summary)
-		}
-
-		formattedDescription := ""
-		if e.Description != "" {
-			re := regexp.MustCompile(`\r?\n`)
-			formattedDescription = re.ReplaceAllString(e.Description, "\\n")
-		}
-
-		caldavevents += `
-BEGIN:VEVENT
-UID:` + e.UID + `
-SUMMARY:` + e.Summary + getCaldavColor(e.Color) + `
-DESCRIPTION:` + formattedDescription + `
-DTSTAMP:` + makeCalDavTimeFromTimeStamp(e.Timestamp) + `
-DTSTART:` + makeCalDavTimeFromTimeStamp(e.Start) + `
-DTEND:` + makeCalDavTimeFromTimeStamp(e.End)
-
-		for _, a := range e.Alarms {
-			if a.Description == "" {
-				a.Description = e.Summary
-			}
-
-			caldavevents += `
-BEGIN:VALARM
-TRIGGER:` + calcAlarmDateFromReminder(e.Start, a.Time) + `
-ACTION:DISPLAY
-DESCRIPTION:` + a.Description + `
-END:VALARM`
-		}
-		caldavevents += `
-END:VEVENT`
-	}
-
-	caldavevents += `
-END:VCALENDAR` // Need a line break
-
-	return
-}
-
 func formatDuration(duration time.Duration) string {
 	seconds := duration.Seconds() - duration.Minutes()*60
 	minutes := duration.Minutes() - duration.Hours()*60
@@ -239,9 +177,14 @@ RRULE:FREQ=SECONDLY;INTERVAL=` + strconv.FormatInt(t.RepeatAfter, 10)
 			}
 		}

+		if len(t.Categories) > 0 {
+			caldavtodos += `
+CATEGORIES:` + strings.Join(t.Categories, ",")
+		}
+
 		caldavtodos += `
 LAST-MODIFIED:` + makeCalDavTimeFromTimeStamp(t.Updated)
-
+		caldavtodos += ParseAlarms(t.Alarms, t.Summary)
 		caldavtodos += `
 END:VTODO`
 	}
@@ -252,19 +195,42 @@ END:VCALENDAR` // Need a line break
 	return
 }

+func ParseAlarms(alarms []Alarm, taskDescription string) (caldavalarms string) {
+	for _, a := range alarms {
+		if a.Description == "" {
+			a.Description = taskDescription
+		}
+
+		caldavalarms += `
+BEGIN:VALARM`
+		switch a.RelativeTo {
+		case models.ReminderRelationStartDate:
+			caldavalarms += `
+TRIGGER;RELATED=START:` + makeCalDavDuration(a.Duration)
+		case models.ReminderRelationEndDate, models.ReminderRelationDueDate:
+			caldavalarms += `
+TRIGGER;RELATED=END:` + makeCalDavDuration(a.Duration)
+		default:
+			caldavalarms += `
+TRIGGER;VALUE=DATE-TIME:` + makeCalDavTimeFromTimeStamp(a.Time)
+		}
+		caldavalarms += `
+ACTION:DISPLAY
+DESCRIPTION:` + a.Description + `
+END:VALARM`
+	}
+	return caldavalarms
+}
+
 func makeCalDavTimeFromTimeStamp(ts time.Time) (caldavtime string) {
 	return ts.In(time.UTC).Format(DateFormat) + "Z"
 }

-func calcAlarmDateFromReminder(eventStart, reminder time.Time) (alarmTime string) {
-	diff := reminder.Sub(eventStart)
-	diffStr := strings.ToUpper(diff.String())
-	if diff < 0 {
-		alarmTime += `-`
-		// We append the - at the beginning of the caldav flag, that would get in the way if the minutes
-		// themselves are also containing it
-		diffStr = diffStr[1:]
+func makeCalDavDuration(duration time.Duration) (caldavtime string) {
+	if duration < 0 {
+		duration = duration.Abs()
+		caldavtime = "-"
 	}
-	alarmTime += `PT` + diffStr
+	caldavtime += "PT" + strings.ToUpper(duration.Truncate(time.Millisecond).String())
 	return
 }
@@ -26,275 +26,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func TestParseEvents(t *testing.T) {
-	type args struct {
-		config *Config
-		events []*Event
-	}
-	tests := []struct {
-		name             string
-		args             args
-		wantCaldavevents string
-	}{
-		{
-			name: "Test caldavparsing without reminders",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-					Color:  "ffffff",
-				},
-				events: []*Event{
-					{
-						Summary:     "Event #1",
-						Description: "Lorem Ipsum",
-						UID:         "randommduid",
-						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Start:       time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						End:         time.Unix(1543627824, 0).In(config.GetTimeZone()),
-						Color:       "affffe",
-					},
-					{
-						Summary:   "Event #2",
-						UID:       "randommduidd",
-						Timestamp: time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543738724, 0).In(config.GetTimeZone()),
-					},
-					{
-						Summary:   "Event #3 with empty uid",
-						UID:       "20181202T0600242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83",
-						Timestamp: time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543727000, 0).In(config.GetTimeZone()),
-					},
-				},
-			},
-			wantCaldavevents: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-X-APPLE-CALENDAR-COLOR:#ffffffFF
-X-OUTLOOK-COLOR:#ffffffFF
-X-FUNAMBOL-COLOR:#ffffffFF
-BEGIN:VEVENT
-UID:randommduid
-SUMMARY:Event #1
-X-APPLE-CALENDAR-COLOR:#affffeFF
-X-OUTLOOK-COLOR:#affffeFF
-X-FUNAMBOL-COLOR:#affffeFF
-DESCRIPTION:Lorem Ipsum
-DTSTAMP:20181201T011204Z
-DTSTART:20181201T011204Z
-DTEND:20181201T013024Z
-END:VEVENT
-BEGIN:VEVENT
-UID:randommduidd
-SUMMARY:Event #2
-DESCRIPTION:
-DTSTAMP:20181202T045844Z
-DTSTART:20181202T045844Z
-DTEND:20181202T081844Z
-END:VEVENT
-BEGIN:VEVENT
-UID:20181202T0600242aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
-SUMMARY:Event #3 with empty uid
-DESCRIPTION:
-DTSTAMP:20181202T050024Z
-DTSTART:20181202T050024Z
-DTEND:20181202T050320Z
-END:VEVENT
-END:VCALENDAR`,
-		},
-		{
-			name: "Test caldavparsing with reminders",
-			args: args{
-				config: &Config{
-					Name:   "test2",
-					ProdID: "RandomProdID which is not random",
-				},
-				events: []*Event{
-					{
-						Summary:     "Event #1",
-						Description: "Lorem Ipsum",
-						UID:         "randommduid",
-						Timestamp:   time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Start:       time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						End:         time.Unix(1543627824, 0).In(config.GetTimeZone()),
-						Alarms: []Alarm{
-							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626024, 0)},
-						},
-					},
-					{
-						Summary:   "Event #2",
-						UID:       "randommduidd",
-						Timestamp: time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726724, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543738724, 0).In(config.GetTimeZone()),
-						Alarms: []Alarm{
-							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626024, 0).In(config.GetTimeZone())},
-						},
-					},
-					{
-						Summary:   "Event #3 with empty uid",
-						Timestamp: time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543726824, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543727000, 0).In(config.GetTimeZone()),
-						Alarms: []Alarm{
-							{Time: time.Unix(1543626524, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626224, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543626024, 0).In(config.GetTimeZone())},
-							{Time: time.Unix(1543826824, 0).In(config.GetTimeZone())},
-						},
-					},
-					{
-						Summary:   "Event #4 without any",
-						Timestamp: time.Unix(1543726824, 0),
-						Start:     time.Unix(1543726824, 0),
-						End:       time.Unix(1543727000, 0),
-					},
-				},
-			},
-			wantCaldavevents: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test2
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VEVENT
-UID:randommduid
-SUMMARY:Event #1
-DESCRIPTION:Lorem Ipsum
-DTSTAMP:20181201T011204Z
-DTSTART:20181201T011204Z
-DTEND:20181201T013024Z
-BEGIN:VALARM
-TRIGGER:-PT3M20S
-ACTION:DISPLAY
-DESCRIPTION:Event #1
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT8M20S
-ACTION:DISPLAY
-DESCRIPTION:Event #1
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT11M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #1
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:randommduidd
-SUMMARY:Event #2
-DESCRIPTION:
-DTSTAMP:20181202T045844Z
-DTSTART:20181202T045844Z
-DTEND:20181202T081844Z
-BEGIN:VALARM
-TRIGGER:-PT27H50M0S
-ACTION:DISPLAY
-DESCRIPTION:Event #2
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT27H55M0S
-ACTION:DISPLAY
-DESCRIPTION:Event #2
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT27H58M20S
-ACTION:DISPLAY
-DESCRIPTION:Event #2
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:20181202T050024Z2aaef4a81d770c1e775e26bc5abebc87f1d3d7bffaa83
-SUMMARY:Event #3 with empty uid
-DESCRIPTION:
-DTSTAMP:20181202T050024Z
-DTSTART:20181202T050024Z
-DTEND:20181202T050320Z
-BEGIN:VALARM
-TRIGGER:-PT27H51M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT27H56M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT28H0M0S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-BEGIN:VALARM
-TRIGGER:PT27H46M40S
-ACTION:DISPLAY
-DESCRIPTION:Event #3 with empty uid
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:20181202T050024Zae7548ce9556df85038abe90dc674d4741a61ce74d1cf
-SUMMARY:Event #4 without any
-DESCRIPTION:
-DTSTAMP:20181202T050024Z
-DTSTART:20181202T050024Z
-DTEND:20181202T050320Z
-END:VEVENT
-END:VCALENDAR`,
-		},
-		{
-			name: "Test caldavparsing with multiline description",
-			args: args{
-				config: &Config{
-					Name:   "test",
-					ProdID: "RandomProdID which is not random",
-				},
-				events: []*Event{
-					{
-						Summary: "Event #1",
-						Description: `Lorem Ipsum
-Dolor sit amet`,
-						UID:       "randommduid",
-						Timestamp: time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						Start:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
-						End:       time.Unix(1543627824, 0).In(config.GetTimeZone()),
-					},
-				},
-			},
-			wantCaldavevents: `BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-X-PUBLISHED-TTL:PT4H
-X-WR-CALNAME:test
-PRODID:-//RandomProdID which is not random//EN
-BEGIN:VEVENT
-UID:randommduid
-SUMMARY:Event #1
-DESCRIPTION:Lorem Ipsum\nDolor sit amet
-DTSTAMP:20181201T011204Z
-DTSTART:20181201T011204Z
-DTEND:20181201T013024Z
-END:VEVENT
-END:VCALENDAR`,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotCaldavevents := ParseEvents(tt.args.config, tt.args.events)
-			assert.Equal(t, gotCaldavevents, tt.wantCaldavevents)
-		})
-	}
-}
-
 func TestParseTodos(t *testing.T) {
 	type args struct {
 		config *Config
@@ -481,13 +212,127 @@ DUE:20181201T011204Z
 RRULE:FREQ=SECONDLY;INTERVAL=435
 LAST-MODIFIED:00010101T000000Z
 END:VTODO
+END:VCALENDAR`,
+		},
+		{
+			name: "with categories",
+			args: args{
+				config: &Config{
+					Name:   "test",
+					ProdID: "RandomProdID which is not random",
+					Color:  "ffffff",
+				},
+				todos: []*Todo{
+					{
+						Summary:    "Todo #1",
+						UID:        "randommduid",
+						Timestamp:  time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						Color:      "affffe",
+						Categories: []string{"label1", "label2"},
+					},
+				},
+			},
+			wantCaldavtasks: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+X-APPLE-CALENDAR-COLOR:#ffffffFF
+X-OUTLOOK-COLOR:#ffffffFF
+X-FUNAMBOL-COLOR:#ffffffFF
+BEGIN:VTODO
+UID:randommduid
+DTSTAMP:20181201T011204Z
+SUMMARY:Todo #1
+X-APPLE-CALENDAR-COLOR:#affffeFF
+X-OUTLOOK-COLOR:#affffeFF
+X-FUNAMBOL-COLOR:#affffeFF
+CATEGORIES:label1,label2
+LAST-MODIFIED:00010101T000000Z
+END:VTODO
+END:VCALENDAR`,
+		},
+		{
+			name: "with alarm",
+			args: args{
+				config: &Config{
+					Name:   "test",
+					ProdID: "RandomProdID which is not random",
+				},
+				todos: []*Todo{
+					{
+						Summary:   "Todo #1",
+						UID:       "randommduid",
+						Timestamp: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+						Alarms: []Alarm{
+							{
+								Time: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+							},
+							{
+								Time:        time.Unix(1543626724, 0).In(config.GetTimeZone()),
+								Description: "alarm description",
+							},
+							{
+								Duration:   -2 * time.Hour,
+								RelativeTo: "due_date",
+							},
+							{
+								Duration:   1 * time.Hour,
+								RelativeTo: "start_date",
+							},
+							{
+								Duration:   time.Duration(0),
+								RelativeTo: "end_date",
+							},
+						},
+					},
+				},
+			},
+			wantCaldavtasks: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randommduid
+DTSTAMP:20181201T011204Z
+SUMMARY:Todo #1
+LAST-MODIFIED:00010101T000000Z
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011204Z
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011204Z
+ACTION:DISPLAY
+DESCRIPTION:alarm description
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:-PT2H0M0S
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=START:PT1H0M0S
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:PT0S
+ACTION:DISPLAY
+DESCRIPTION:Todo #1
+END:VALARM
+END:VTODO
 END:VCALENDAR`,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			gotCaldavtasks := ParseTodos(tt.args.config, tt.args.todos)
-			assert.Equal(t, gotCaldavtasks, tt.wantCaldavtasks)
+			assert.Equal(t, tt.wantCaldavtasks, gotCaldavtasks)
 		})
 	}
 }
@@ -17,23 +17,38 @@
 package caldav

 import (
+	"errors"
 	"strconv"
 	"strings"
 	"time"

+	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
+	"code.vikunja.io/api/pkg/utils"

 	ics "github.com/arran4/golang-ical"
 )

-func GetCaldavTodosForTasks(list *models.ListWithTasksAndBuckets, listTasks []*models.TaskWithComments) string {
+func GetCaldavTodosForTasks(project *models.ProjectWithTasksAndBuckets, projectTasks []*models.TaskWithComments) string {

 	// Make caldav todos from Vikunja todos
 	var caldavtodos []*Todo
-	for _, t := range listTasks {
+	for _, t := range projectTasks {

 		duration := t.EndDate.Sub(t.StartDate)
+		var categories []string
+		for _, label := range t.Labels {
+			categories = append(categories, label.Title)
+		}
+		var alarms []Alarm
+		for _, reminder := range t.Reminders {
+			alarms = append(alarms, Alarm{
+				Time:       reminder.Reminder,
+				Duration:   time.Duration(reminder.RelativePeriod) * time.Second,
+				RelativeTo: reminder.RelativeTo,
+			})
+		}

 		caldavtodos = append(caldavtodos, &Todo{
 			Timestamp:   t.Updated,
@@ -42,6 +57,7 @@ func GetCaldavTodosForTasks(list *models.ListWithTasksAndBuckets, listTasks []*m
 			Description: t.Description,
 			Completed:   t.DoneAt,
 			// Organizer:     &t.CreatedBy, // Disabled until we figure out how this works
+			Categories:  categories,
 			Priority:    t.Priority,
 			Start:       t.StartDate,
 			End:         t.EndDate,
@@ -51,11 +67,12 @@ func GetCaldavTodosForTasks(list *models.ListWithTasksAndBuckets, listTasks []*m
 			Duration:    duration,
 			RepeatAfter: t.RepeatAfter,
 			RepeatMode:  t.RepeatMode,
+			Alarms:      alarms,
 		})
 	}

 	caldavConfig := &Config{
-		Name:   list.Title,
+		Name:   project.Title,
 		ProdID: "Vikunja Todo App",
 	}

@@ -67,17 +84,20 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
 	if err != nil {
 		return nil, err
 	}
-
-	// We put the task details in a map to be able to handle them more easily
-	task := make(map[string]string)
-	for _, c := range parsed.Components[0].UnknownPropertiesIANAProperties() {
-		task[c.IANAToken] = c.Value
+	vTodo, ok := parsed.Components[0].(*ics.VTodo)
+	if !ok {
+		return nil, errors.New("VTODO element not found")
+	}
+	// We put the vTodo details in a map to be able to handle them more easily
+	task := make(map[string]ics.IANAProperty)
+	for _, c := range vTodo.UnknownPropertiesIANAProperties() {
+		task[c.IANAToken] = c
 	}

 	// Parse the priority
 	var priority int64
 	if _, ok := task["PRIORITY"]; ok {
-		priorityParsed, err := strconv.ParseInt(task["PRIORITY"], 10, 64)
+		priorityParsed, err := strconv.ParseInt(task["PRIORITY"].Value, 10, 64)
 		if err != nil {
 			return nil, err
 		}
@@ -86,23 +106,35 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
 	}

 	// Parse the enddate
-	duration, _ := time.ParseDuration(task["DURATION"])
+	duration, _ := time.ParseDuration(task["DURATION"].Value)

-	description := strings.ReplaceAll(task["DESCRIPTION"], "\\,", ",")
+	description := strings.ReplaceAll(task["DESCRIPTION"].Value, "\\,", ",")
 	description = strings.ReplaceAll(description, "\\n", "\n")

+	var labels []*models.Label
+	if val, ok := task["CATEGORIES"]; ok {
+		categories := strings.Split(val.Value, ",")
+		labels = make([]*models.Label, 0, len(categories))
+		for _, category := range categories {
+			labels = append(labels, &models.Label{
+				Title: category,
+			})
+		}
+	}
+
 	vTask = &models.Task{
-		UID:         task["UID"],
-		Title:       task["SUMMARY"],
+		UID:         task["UID"].Value,
+		Title:       task["SUMMARY"].Value,
 		Description: description,
 		Priority:    priority,
+		Labels:      labels,
 		DueDate:     caldavTimeToTimestamp(task["DUE"]),
 		Updated:     caldavTimeToTimestamp(task["DTSTAMP"]),
 		StartDate:   caldavTimeToTimestamp(task["DTSTART"]),
 		DoneAt:      caldavTimeToTimestamp(task["COMPLETED"]),
 	}

-	if task["STATUS"] == "COMPLETED" {
+	if task["STATUS"].Value == "COMPLETED" {
 		vTask.Done = true
 	}

@@ -110,11 +142,66 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
 		vTask.EndDate = vTask.StartDate.Add(duration)
 	}

+	for _, vAlarm := range vTodo.SubComponents() {
+		if vAlarm, ok := vAlarm.(*ics.VAlarm); ok {
+			vTask = parseVAlarm(vAlarm, vTask)
+		}
+	}
+
 	return
 }

+func parseVAlarm(vAlarm *ics.VAlarm, vTask *models.Task) *models.Task {
+	for _, property := range vAlarm.UnknownPropertiesIANAProperties() {
+		if property.IANAToken != "TRIGGER" {
+			continue
+		}
+
+		if contains(property.ICalParameters["VALUE"], "DATE-TIME") {
+			// Example: TRIGGER;VALUE=DATE-TIME:20181201T011210Z
+			vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+				Reminder: caldavTimeToTimestamp(property),
+			})
+			continue
+		}
+
+		duration := utils.ParseISO8601Duration(property.Value)
+
+		if contains(property.ICalParameters["RELATED"], "END") {
+			// Example: TRIGGER;RELATED=END:-P2D
+			if vTask.EndDate.IsZero() {
+				vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+					RelativePeriod: int64(duration.Seconds()),
+					RelativeTo:     models.ReminderRelationDueDate})
+			} else {
+				vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+					RelativePeriod: int64(duration.Seconds()),
+					RelativeTo:     models.ReminderRelationEndDate})
+			}
+			continue
+		}
+
+		// Example: TRIGGER;RELATED=START:-P2D
+		// Example: TRIGGER:-PT60M
+		vTask.Reminders = append(vTask.Reminders, &models.TaskReminder{
+			RelativePeriod: int64(duration.Seconds()),
+			RelativeTo:     models.ReminderRelationStartDate})
+	}
+	return vTask
+}
+
+func contains(array []string, str string) bool {
+	for _, value := range array {
+		if value == str {
+			return true
+		}
+	}
+	return false
+}
+
 // https://tools.ietf.org/html/rfc5545#section-3.3.5
-func caldavTimeToTimestamp(tstring string) time.Time {
+func caldavTimeToTimestamp(ianaProperty ics.IANAProperty) time.Time {
+	tstring := ianaProperty.Value
 	if tstring == "" {
 		return time.Time{}
 	}
@@ -129,7 +216,24 @@ func caldavTimeToTimestamp(tstring string) time.Time {
 		format = `20060102`
 	}

-	t, err := time.Parse(format, tstring)
+	var t time.Time
+	var err error
+	tzParameter := ianaProperty.ICalParameters["TZID"]
+	if len(tzParameter) > 0 {
+		loc, err := time.LoadLocation(tzParameter[0])
+		if err != nil {
+			log.Warningf("Error while parsing caldav timezone %s: %s", tzParameter[0], err)
+		} else {
+			t, err = time.ParseInLocation(format, tstring, loc)
+			if err != nil {
+				log.Warningf("Error while parsing caldav time %s to TimeStamp: %s at location %s", tstring, loc, err)
+			} else {
+				t = t.In(config.GetTimeZone())
+				return t
+			}
+		}
+	}
+	t, err = time.Parse(format, tstring)
 	if err != nil {
 		log.Warningf("Error while parsing caldav time %s to TimeStamp: %s", tstring, err)
 		return time.Time{}
@@ -85,6 +85,210 @@ END:VCALENDAR`,
 				Updated:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
 			},
 		},
+		{
+			name: "With categories",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011204
+SUMMARY:Todo #1
+DESCRIPTION:Lorem Ipsum
+CATEGORIES:cat1,cat2
+LAST-MODIFIED:00010101T000000
+END:VTODO
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Title:       "Todo #1",
+				UID:         "randomuid",
+				Description: "Lorem Ipsum",
+				Labels: []*models.Label{
+					{
+						Title: "cat1",
+					},
+					{
+						Title: "cat2",
+					},
+				},
+				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+			},
+		},
+		{
+			name: "With alarm (time trigger)",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011204
+SUMMARY:Todo #1
+DESCRIPTION:Lorem Ipsum
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011210Z
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Title:       "Todo #1",
+				UID:         "randomuid",
+				Description: "Lorem Ipsum",
+				Reminders: []*models.TaskReminder{
+					{
+						Reminder: time.Date(2018, 12, 1, 1, 12, 10, 0, config.GetTimeZone()),
+					},
+				},
+				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+			},
+		},
+		{
+			name: "With alarm (relative trigger)",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:test
+PRODID:-//RandomProdID which is not random//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011204
+SUMMARY:Todo #1
+DESCRIPTION:Lorem Ipsum
+DTSTART:20230228T170000Z
+DUE:20230304T150000Z
+BEGIN:VALARM
+TRIGGER:PT0S
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER;VALUE=DURATION:-PT60M
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER:-PT61M
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=START:-P1D
+ACTION:DISPLAY
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:-PT30M
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Title:       "Todo #1",
+				UID:         "randomuid",
+				Description: "Lorem Ipsum",
+				StartDate:   time.Date(2023, 2, 28, 17, 0, 0, 0, config.GetTimeZone()),
+				DueDate:     time.Date(2023, 3, 4, 15, 0, 0, 0, config.GetTimeZone()),
+				Reminders: []*models.TaskReminder{
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: 0,
+					},
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: -3600,
+					},
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: -3660,
+					},
+					{
+						RelativeTo:     models.ReminderRelationStartDate,
+						RelativePeriod: -86400,
+					},
+					{
+						RelativeTo:     models.ReminderRelationDueDate,
+						RelativePeriod: -1800,
+					},
+				},
+				Updated: time.Unix(1543626724, 0).In(config.GetTimeZone()),
+			},
+		},
+		{
+			name: "example task from tasks.org app",
+			args: args{content: `BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:+//IDN tasks.org//android-130102//EN
+BEGIN:VTODO
+DTSTAMP:20230402T074158Z
+UID:4290517349243274514
+CREATED:20230402T060451Z
+LAST-MODIFIED:20230402T074154Z
+SUMMARY:Test with tasks.org
+PRIORITY:9
+CATEGORIES:Vikunja
+X-APPLE-SORT-ORDER:697384109
+DUE;TZID=Europe/Berlin:20230402T170001
+DTSTART;TZID=Europe/Berlin:20230401T090000
+BEGIN:VALARM
+TRIGGER;RELATED=END:PT0S
+ACTION:DISPLAY
+DESCRIPTION:Default Tasks.org description
+END:VALARM
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20230402T100000Z
+ACTION:DISPLAY
+DESCRIPTION:Default Tasks.org description
+END:VALARM
+END:VTODO
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+LAST-MODIFIED:20220816T024022Z
+BEGIN:DAYLIGHT
+TZNAME:CEST
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZNAME:CET
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR`,
+			},
+			wantVTask: &models.Task{
+				Updated:  time.Date(2023, 4, 2, 7, 41, 58, 0, config.GetTimeZone()),
+				UID:      "4290517349243274514",
+				Title:    "Test with tasks.org",
+				Priority: 1,
+				Labels: []*models.Label{
+					{
+						Title: "Vikunja",
+					},
+				},
+				DueDate:   time.Date(2023, 4, 2, 15, 0, 1, 0, config.GetTimeZone()),
+				StartDate: time.Date(2023, 4, 1, 7, 0, 0, 0, config.GetTimeZone()),
+				Reminders: []*models.TaskReminder{
+					{
+						RelativeTo:     models.ReminderRelationDueDate,
+						RelativePeriod: 0,
+					},
+					{
+						Reminder: time.Date(2023, 4, 2, 10, 0, 0, 0, config.GetTimeZone()),
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -94,7 +298,108 @@ END:VCALENDAR`,
 				return
 			}
 			if diff, equal := messagediff.PrettyDiff(got, tt.wantVTask); !equal {
-				t.Errorf("ParseTaskFromVTODO() gotVTask = %v, want %v, diff = %s", got, tt.wantVTask, diff)
+				t.Errorf("ParseTaskFromVTODO()\n gotVTask = %v\n want %v\n diff = %s", got, tt.wantVTask, diff)
+			}
+		})
+	}
+}
+
+func TestGetCaldavTodosForTasks(t *testing.T) {
+	type args struct {
+		list  *models.ProjectWithTasksAndBuckets
+		tasks []*models.TaskWithComments
+	}
+	tests := []struct {
+		name       string
+		args       args
+		wantCaldav string
+	}{
+		{
+			name: "Format single Task as CalDAV",
+			args: args{
+				list: &models.ProjectWithTasksAndBuckets{
+					Project: models.Project{
+						Title: "List title",
+					},
+				},
+				tasks: []*models.TaskWithComments{
+					{
+						Task: models.Task{
+							Title:       "Task 1",
+							UID:         "randomuid",
+							Description: "Description",
+							Priority:    3,
+							Created:     time.Unix(1543626721, 0).In(config.GetTimeZone()),
+							DueDate:     time.Unix(1543626722, 0).In(config.GetTimeZone()),
+							StartDate:   time.Unix(1543626723, 0).In(config.GetTimeZone()),
+							EndDate:     time.Unix(1543626724, 0).In(config.GetTimeZone()),
+							Updated:     time.Unix(1543626725, 0).In(config.GetTimeZone()),
+							DoneAt:      time.Unix(1543626726, 0).In(config.GetTimeZone()),
+							RepeatAfter: 86400,
+							Labels: []*models.Label{
+								{
+									ID:    1,
+									Title: "label1",
+								},
+								{
+									ID:    2,
+									Title: "label2",
+								},
+							},
+							Reminders: []*models.TaskReminder{
+								{
+									Reminder: time.Unix(1543626730, 0).In(config.GetTimeZone()),
+								},
+								{
+									Reminder:       time.Unix(1543626731, 0).In(config.GetTimeZone()),
+									RelativePeriod: -3600,
+									RelativeTo:     models.ReminderRelationDueDate,
+								},
+							},
+						},
+					},
+				},
+			},
+			wantCaldav: `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:List title
+PRODID:-//Vikunja Todo App//EN
+BEGIN:VTODO
+UID:randomuid
+DTSTAMP:20181201T011205Z
+SUMMARY:Task 1
+DTSTART:20181201T011203Z
+DTEND:20181201T011204Z
+DESCRIPTION:Description
+COMPLETED:20181201T011206Z
+STATUS:COMPLETED
+DUE:20181201T011202Z
+CREATED:20181201T011201Z
+PRIORITY:3
+RRULE:FREQ=SECONDLY;INTERVAL=86400
+CATEGORIES:label1,label2
+LAST-MODIFIED:20181201T011205Z
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20181201T011210Z
+ACTION:DISPLAY
+DESCRIPTION:Task 1
+END:VALARM
+BEGIN:VALARM
+TRIGGER;RELATED=END:-PT1H0M0S
+ACTION:DISPLAY
+DESCRIPTION:Task 1
+END:VALARM
+END:VTODO
+END:VCALENDAR`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := GetCaldavTodosForTasks(tt.args.list, tt.args.tasks)
+			if diff, equal := messagediff.PrettyDiff(got, tt.wantCaldav); !equal {
+				t.Errorf("GetCaldavTodosForTasks() gotVTask = %v, want %v, diff = %s", got, tt.wantCaldav, diff)
 			}
 		})
 	}
@@ -188,10 +188,10 @@ var userCreateCmd = &cobra.Command{
 			log.Fatalf("Error creating new user: %s", err)
 		}

-		err = models.CreateNewNamespaceForUser(s, newUser)
+		err = models.CreateNewProjectForUser(s, newUser)
 		if err != nil {
 			_ = s.Rollback()
-			log.Fatalf("Error creating new namespace for user: %s", err)
+			log.Fatalf("Error creating new project for user: %s", err)
 		}

 		if err := s.Commit(); err != nil {
@@ -23,15 +23,14 @@ import (
 	"os/signal"
 	"time"

-	"code.vikunja.io/api/pkg/cron"
-
 	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/cron"
 	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/routes"
-	"code.vikunja.io/api/pkg/swagger"
 	"code.vikunja.io/api/pkg/utils"
 	"code.vikunja.io/api/pkg/version"
+
 	"github.com/labstack/echo/v4"
 	"github.com/spf13/cobra"
 )
@@ -76,9 +75,6 @@ var webCmd = &cobra.Command{
 		// Version notification
 		log.Infof("Vikunja version %s", version.Version)

-		// Additional swagger information
-		swagger.SwaggerInfo.Version = version.Version
-
 		// Start the webserver
 		e := routes.NewEcho()
 		routes.RegisterRoutes(e)
@@ -87,10 +87,6 @@ const (
 	DatabaseSslRootCert           Key = `database.sslrootcert`
 	DatabaseTLS                   Key = `database.tls`

-	CacheEnabled        Key = `cache.enabled`
-	CacheType           Key = `cache.type`
-	CacheMaxElementSize Key = `cache.maxelementsize`
-
 	MailerEnabled       Key = `mailer.enabled`
 	MailerHost          Key = `mailer.host`
 	MailerPort          Key = `mailer.port`
@@ -118,6 +114,8 @@ const (
 	LogPath          Key = `log.path`
 	LogEvents        Key = `log.events`
 	LogEventsLevel   Key = `log.eventslevel`
+	LogMail          Key = `log.mail`
+	LogMailLevel     Key = `log.maillevel`

 	RateLimitEnabled Key = `ratelimit.enabled`
 	RateLimitKind    Key = `ratelimit.kind`
@@ -164,7 +162,7 @@ const (
 	DefaultSettingsDiscoverableByName          Key = `defaultsettings.discoverable_by_name`
 	DefaultSettingsDiscoverableByEmail         Key = `defaultsettings.discoverable_by_email`
 	DefaultSettingsOverdueTaskRemindersEnabled Key = `defaultsettings.overdue_tasks_reminders_enabled`
-	DefaultSettingsDefaultListID               Key = `defaultsettings.default_list_id`
+	DefaultSettingsDefaultProjectID            Key = `defaultsettings.default_project_id`
 	DefaultSettingsWeekStart                   Key = `defaultsettings.week_start`
 	DefaultSettingsLanguage                    Key = `defaultsettings.language`
 	DefaultSettingsTimezone                    Key = `defaultsettings.timezone`
@@ -319,10 +317,6 @@ func InitDefaultConfig() {
 	DatabaseSslRootCert.setDefault("")
 	DatabaseTLS.setDefault("false")

-	// Cacher
-	CacheEnabled.setDefault(false)
-	CacheType.setDefault("memory")
-	CacheMaxElementSize.setDefault(1000)
 	// Mailer
 	MailerEnabled.setDefault(false)
 	MailerHost.setDefault("")
@@ -349,8 +343,10 @@ func InitDefaultConfig() {
 	LogHTTP.setDefault("stdout")
 	LogEcho.setDefault("off")
 	LogPath.setDefault(ServiceRootpath.GetString() + "/logs")
-	LogEvents.setDefault("stdout")
+	LogEvents.setDefault("off")
 	LogEventsLevel.setDefault("INFO")
+	LogMail.setDefault("off")
+	LogMailLevel.setDefault("INFO")
 	// Rate Limit
 	RateLimitEnabled.setDefault(false)
 	RateLimitKind.setDefault("user")
@@ -370,7 +366,7 @@ func InitDefaultConfig() {
 	MigrationMicrosoftTodoEnable.setDefault(false)
 	// Avatar
 	AvatarGravaterExpiration.setDefault(3600)
-	// List Backgrounds
+	// Project Backgrounds
 	BackgroundsEnabled.setDefault(true)
 	BackgroundsUploadEnabled.setDefault(true)
 	BackgroundsUnsplashEnabled.setDefault(false)
@@ -421,10 +417,6 @@ func InitConfig() {
 		log.Println("No config file found, using default or config from environment variables.")
 	}

-	if CacheType.GetString() == "keyvalue" {
-		CacheType.Set(KeyvalueType.GetString())
-	}
-
 	if RateLimitStore.GetString() == "keyvalue" {
 		RateLimitStore.Set(KeyvalueType.GetString())
 	}
@@ -17,7 +17,6 @@
 package db

 import (
-	"encoding/gob"
 	"fmt"
 	"net/url"
 	"os"
@@ -27,9 +26,7 @@ import (

 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
-	xrc "gitea.com/xorm/xorm-redis-cache"
 	"xorm.io/xorm"
-	"xorm.io/xorm/caches"
 	"xorm.io/xorm/names"
 	"xorm.io/xorm/schemas"

@@ -85,38 +82,23 @@ func CreateDBEngine() (engine *xorm.Engine, err error) {
 	logger := log.NewXormLogger("")
 	engine.SetLogger(logger)

-	// Cache
-	// We have to initialize the cache here to avoid import cycles
-	if config.CacheEnabled.GetBool() {
-		switch config.CacheType.GetString() {
-		case "memory":
-			cacher := caches.NewLRUCacher(caches.NewMemoryStore(), config.CacheMaxElementSize.GetInt())
-			engine.SetDefaultCacher(cacher)
-		case "redis":
-			cacher := xrc.NewRedisCacher(config.RedisHost.GetString(), config.RedisPassword.GetString(), xrc.DEFAULT_EXPIRATION, engine.Logger())
-			engine.SetDefaultCacher(cacher)
-		default:
-			log.Info("Did not find a valid cache type. Caching disabled. Please refer to the docs for poosible cache types.")
-		}
-	}
-
 	x = engine
 	return
 }

-// RegisterTableStructsForCache registers tables in gob encoding for redis cache
-func RegisterTableStructsForCache(val interface{}) {
-	gob.Register(val)
-}
-
 func initMysqlEngine() (engine *xorm.Engine, err error) {
 	// We're using utf8mb here instead of just utf8 because we want to use non-BMP characters.
 	// See https://stackoverflow.com/a/30074553/10924593 for more info.
+	host := fmt.Sprintf("tcp(%s)", config.DatabaseHost.GetString())
+	if config.DatabaseHost.GetString()[0] == '/' { // looks like a unix socket
+		host = fmt.Sprintf("unix(%s)", config.DatabaseHost.GetString())
+	}
+
 	connStr := fmt.Sprintf(
-		"%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&tls=%s",
+		"%s:%s@%s/%s?charset=utf8mb4&parseTime=true&tls=%s",
 		config.DatabaseUser.GetString(),
 		config.DatabasePassword.GetString(),
-		config.DatabaseHost.GetString(),
+		host,
 		config.DatabaseDatabase.GetString(),
 		config.DatabaseTLS.GetString())
 	engine, err = xorm.NewEngine("mysql", connStr)
@@ -1,6 +1,6 @@
 - id: 1
  title: testbucket1
-  list_id: 1
+  project_id: 1
  created_by_id: 1
  limit: 9999999 # This bucket has a limit we will never exceed in the tests to make sure the logic allows for buckets with limits
  position: 1
@@ -8,7 +8,7 @@
  updated: 2020-04-18 21:13:52
 - id: 2
  title: testbucket2
-  list_id: 1
+  project_id: 1
  created_by_id: 1
  limit: 3
  position: 2
@@ -16,15 +16,15 @@
  updated: 2020-04-18 21:13:52
 - id: 3
  title: testbucket3
-  list_id: 1
+  project_id: 1
  created_by_id: 1
  is_done_bucket: 1
  position: 3
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 4
-  title: testbucket4 - other list
-  list_id: 2
+  title: testbucket4 - other project
+  project_id: 2
  created_by_id: 1
  is_done_bucket: 1
  created: 2020-04-18 21:13:52
@@ -32,189 +32,207 @@
 # The following are not or only partly owned by user 1
 - id: 5
  title: testbucket5
-  list_id: 20
+  project_id: 20
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 6
  title: testbucket6
-  list_id: 6
+  project_id: 6
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 7
  title: testbucket7
-  list_id: 7
+  project_id: 7
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 8
  title: testbucket8
-  list_id: 8
+  project_id: 8
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 9
  title: testbucket9
-  list_id: 9
+  project_id: 9
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 10
  title: testbucket10
-  list_id: 10
+  project_id: 10
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 11
  title: testbucket11
-  list_id: 11
+  project_id: 11
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 12
  title: testbucket13
-  list_id: 12
+  project_id: 12
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 13
  title: testbucket13
-  list_id: 13
+  project_id: 13
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 14
  title: testbucket14
-  list_id: 14
+  project_id: 14
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 15
  title: testbucket15
-  list_id: 15
+  project_id: 15
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 16
  title: testbucket16
-  list_id: 16
+  project_id: 16
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 17
  title: testbucket17
-  list_id: 17
+  project_id: 17
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 18
  title: testbucket18
-  list_id: 5
+  project_id: 5
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 19
  title: testbucket19
-  list_id: 21
+  project_id: 21
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 20
  title: testbucket20
-  list_id: 22
+  project_id: 22
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 21
  title: testbucket21
-  list_id: 3
+  project_id: 3
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 # Duplicate buckets to make deletion of one of them possible
 - id: 22
  title: testbucket22
-  list_id: 6
+  project_id: 6
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 23
  title: testbucket23
-  list_id: 7
+  project_id: 7
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 24
  title: testbucket24
-  list_id: 8
+  project_id: 8
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 25
  title: testbucket25
-  list_id: 9
+  project_id: 9
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 26
  title: testbucket26
-  list_id: 10
+  project_id: 10
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 27
  title: testbucket27
-  list_id: 11
+  project_id: 11
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 28
  title: testbucket28
-  list_id: 12
+  project_id: 12
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 29
  title: testbucket29
-  list_id: 13
+  project_id: 13
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 30
  title: testbucket30
-  list_id: 14
+  project_id: 14
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 31
  title: testbucket31
-  list_id: 15
+  project_id: 15
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 32
  title: testbucket32
-  list_id: 16
+  project_id: 16
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 33
  title: testbucket33
-  list_id: 17
+  project_id: 17
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
-# This bucket is the last one in its list
+# This bucket is the last one in its project
 - id: 34
  title: testbucket34
-  list_id: 18
+  project_id: 18
  created_by_id: 1
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
 - id: 35
  title: testbucket35
-  list_id: 23
+  project_id: 23
  created_by_id: -2
  created: 2020-04-18 21:13:52
  updated: 2020-04-18 21:13:52
+- id: 36
+  title: testbucket36
+  project_id: 33
+  created_by_id: 6
+  created: 2020-04-18 21:13:52
+  updated: 2020-04-18 21:13:52
+- id: 37
+  title: testbucket37
+  project_id: 34
+  created_by_id: 6
+  created: 2020-04-18 21:13:52
+  updated: 2020-04-18 21:13:52
+- id: 38
+  title: testbucket36
+  project_id: 36
+  created_by_id: 15
+  created: 2020-04-18 21:13:52
+  updated: 2020-04-18 21:13:52
@@ -10,9 +10,6 @@
 - entity_id: 34
  user_id: 13 # owner
  kind: 1
- entity_id: 34
-  user_id: 1
-  kind: 1
 - entity_id: 23
  user_id: 12 # owner
  kind: 2
@@ -14,3 +14,7 @@
  task_id: 36
  label_id: 4
  created: 2018-12-01 15:13:12
+- id: 5
+  task_id: 40
+  label_id: 4
+  created: 2018-12-01 15:13:12
@@ -1,6 +1,6 @@
 - id: 1
  hash: test
-  list_id: 1
+  project_id: 1
  right: 0
  sharing_type: 1
  shared_by_id: 1
@@ -8,7 +8,7 @@
  updated: 2018-12-02 15:13:12
 - id: 2
  hash: test2
-  list_id: 2
+  project_id: 2
  right: 1
  sharing_type: 1
  shared_by_id: 1
@@ -16,7 +16,7 @@
  updated: 2018-12-02 15:13:12
 - id: 3
  hash: test3
-  list_id: 3
+  project_id: 3
  right: 2
  sharing_type: 1
  shared_by_id: 1
@@ -24,7 +24,7 @@
  updated: 2018-12-02 15:13:12
 - id: 4
  hash: testWithPassword
-  list_id: 1
+  project_id: 1
  right: 0
  password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
  sharing_type: 2
@@ -4,7 +4,6 @@
  description: Lorem Ipsum
  identifier: test1
  owner_id: 1
-  namespace_id: 1
  position: 3
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -14,7 +13,6 @@
  description: Lorem Ipsum
  identifier: test2
  owner_id: 3
-  namespace_id: 1
  position: 2
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -24,7 +22,6 @@
  description: Lorem Ipsum
  identifier: test3
  owner_id: 3
-  namespace_id: 2
  position: 1
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -34,7 +31,6 @@
  description: Lorem Ipsum
  identifier: test4
  owner_id: 3
-  namespace_id: 3
  position: 4
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -44,7 +40,6 @@
  description: Lorem Ipsum
  identifier: test5
  owner_id: 5
-  namespace_id: 5
  position: 5
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -54,7 +49,6 @@
  description: Lorem Ipsum
  identifier: test6
  owner_id: 6
-  namespace_id: 6
  position: 6
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -64,7 +58,6 @@
  description: Lorem Ipsum
  identifier: test7
  owner_id: 6
-  namespace_id: 6
  position: 7
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -74,7 +67,6 @@
  description: Lorem Ipsum
  identifier: test8
  owner_id: 6
-  namespace_id: 6
  position: 8
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -84,7 +76,6 @@
  description: Lorem Ipsum
  identifier: test9
  owner_id: 6
-  namespace_id: 6
  position: 9
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -94,7 +85,6 @@
  description: Lorem Ipsum
  identifier: test10
  owner_id: 6
-  namespace_id: 6
  position: 10
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -104,7 +94,6 @@
  description: Lorem Ipsum
  identifier: test11
  owner_id: 6
-  namespace_id: 6
  position: 11
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -114,8 +103,8 @@
  description: Lorem Ipsum
  identifier: test12
  owner_id: 6
-  namespace_id: 7
  position: 12
+  parent_project_id: 27
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -124,8 +113,8 @@
  description: Lorem Ipsum
  identifier: test13
  owner_id: 6
-  namespace_id: 8
  position: 13
+  parent_project_id: 28
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -134,8 +123,8 @@
  description: Lorem Ipsum
  identifier: test14
  owner_id: 6
-  namespace_id: 9
  position: 14
+  parent_project_id: 29
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -144,8 +133,8 @@
  description: Lorem Ipsum
  identifier: test15
  owner_id: 6
-  namespace_id: 10
  position: 15
+  parent_project_id: 32
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -154,8 +143,8 @@
  description: Lorem Ipsum
  identifier: test16
  owner_id: 6
-  namespace_id: 11
  position: 16
+  parent_project_id: 33
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -164,19 +153,18 @@
  description: Lorem Ipsum
  identifier: test17
  owner_id: 6
-  namespace_id: 12
  position: 17
+  parent_project_id: 34
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
-# This list is owned by user 7, and several other users have access to it via different methods.
-# It is used to test the listUsers method.
+# This project is owned by user 7, and several other users have access to it via different methods.
+# It is used to test the projectUsers method.
 -
  id: 18
  title: Test18
  description: Lorem Ipsum
  identifier: test18
  owner_id: 7
-  namespace_id: 13
  position: 18
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -186,29 +174,28 @@
  description: Lorem Ipsum
  identifier: test19
  owner_id: 7
-  namespace_id: 14
  position: 19
+  parent_project_id: 29
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
-# User 1 does not have access to this list
+# User 1 does not have access to this project
 -
  id: 20
  title: Test20
  description: Lorem Ipsum
  identifier: test20
  owner_id: 13
-  namespace_id: 15
  position: 20
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
  id: 21
-  title: Test21 archived through namespace
+  title: Test21 archived through parent list
  description: Lorem Ipsum
  identifier: test21
  owner_id: 1
-  namespace_id: 16
  position: 21
+  parent_project_id: 22
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -217,7 +204,6 @@
  description: Lorem Ipsum
  identifier: test22
  owner_id: 1
-  namespace_id: 1
  is_archived: 1
  position: 22
  updated: 2018-12-02 15:13:12
@@ -228,7 +214,6 @@
  description: Lorem Ipsum
  identifier: test23
  owner_id: 12
-  namespace_id: 17
  position: 23
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -238,7 +223,95 @@
  description: Lorem Ipsum
  identifier: test6
  owner_id: 6
-  namespace_id: 6
  position: 7
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
+-
+  id: 25
+  title: Test25
+  owner_id: 6
+  parent_project_id: 12
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 26
+  title: Test26
+  owner_id: 6
+  parent_project_id: 25
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 27
+  title: Test27
+  owner_id: 6
+  position: 2700
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 28
+  title: Test28
+  owner_id: 6
+  position: 2800
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 29
+  title: Test29
+  owner_id: 6
+  position: 2900
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 30
+  title: Test30
+  owner_id: 6
+  position: 3000
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 31
+  title: Test31
+  owner_id: 6
+  position: 3100
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 32
+  title: Test32
+  owner_id: 6
+  position: 3200
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 33
+  title: Test33
+  owner_id: 6
+  position: 3300
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 34
+  title: Test34
+  owner_id: 6
+  position: 3400
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 35
+  title: Test35 with background
+  description: Lorem Ipsum
+  identifier: test6
+  owner_id: 6
+  background_file_id: 1
+  position: 8
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+-
+  id: 36
+  title: Project 36 for Caldav tests
+  description: Lorem Ipsum
+  identifier: test36
+  owner_id: 15
+  position: 1
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
@@ -3,28 +3,18 @@
  entity_id: 2
  user_id: 1
  created: 2021-02-01 15:13:12
- id: 2
-  entity_type: 1 # Namespace
-  entity_id: 6
-  user_id: 6
-  created: 2021-02-01 15:13:12
 - id: 3
-  entity_type: 2 # List
-  entity_id: 12 # belongs to namespace 7
+  entity_type: 2 # project
+  entity_id: 12 # belongs to parent project 7
  user_id: 6
  created: 2021-02-01 15:13:12
 - id: 4
  entity_type: 3 # Task
-  entity_id: 22 # belongs to list 13 which belongs to namespace 8
-  user_id: 6
-  created: 2021-02-01 15:13:12
- id: 5
-  entity_type: 1 # Namespace
-  entity_id: 8
+  entity_id: 22 # belongs to project 13
  user_id: 6
  created: 2021-02-01 15:13:12
 - id: 6
-  entity_type: 2 # List
+  entity_type: 2 # project
  entity_id: 13
  user_id: 6
  created: 2021-02-01 15:13:12
@@ -33,3 +23,8 @@
  entity_id: 26
  user_id: 6
  created: 2021-02-01 15:13:12
+- id: 8
+  entity_type: 2 # Project
+  entity_id: 32
+  user_id: 6
+  created: 2021-02-01 15:13:12
@@ -6,7 +6,13 @@
  task_id: 27
  reminder: 2018-12-01 01:13:44
  created: 2018-12-01 01:12:04
+  relative_to: 'start_date'
+  relative_period: -3600
 - id: 3
  task_id: 2
  reminder: 2018-12-01 01:13:44
  created: 2018-12-01 01:12:04
+- id: 4
+  task_id: 40
+  reminder: 2023-03-04 15:00:00
+  created: 2018-12-01 01:12:04
@@ -3,7 +3,7 @@
  description: 'Lorem Ipsum'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 1
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -13,7 +13,7 @@
  title: 'task #2 done'
  done: true
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 2
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -23,7 +23,7 @@
  title: 'task #3 high prio'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 3
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -33,7 +33,7 @@
  title: 'task #4 low prio'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 4
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -43,7 +43,7 @@
  title: 'task #5 higher due date'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 5
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -53,7 +53,7 @@
  title: 'task #6 lower due date'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 6
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -63,7 +63,7 @@
  title: 'task #7 with start date'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 7
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -73,7 +73,7 @@
  title: 'task #8 with end date'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 8
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -83,7 +83,7 @@
  title: 'task #9 with start and end date'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 9
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -94,7 +94,7 @@
  title: 'task #10 basic'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 10
  bucket_id: 1
  created: 2018-12-01 01:12:04
@@ -103,7 +103,7 @@
  title: 'task #11 basic'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 11
  bucket_id: 1
  created: 2018-12-01 01:12:04
@@ -112,25 +112,25 @@
  title: 'task #12 basic'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 12
  bucket_id: 1
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
 - id: 13
-  title: 'task #13 basic other list'
+  title: 'task #13 basic other project'
  done: false
  created_by_id: 1
-  list_id: 2
+  project_id: 2
  index: 1
  bucket_id: 4
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
 - id: 14
-  title: 'task #14 basic other list'
+  title: 'task #14 basic other project'
  done: false
  created_by_id: 5
-  list_id: 5
+  project_id: 5
  index: 1
  bucket_id: 18
  created: 2018-12-01 01:12:04
@@ -139,7 +139,7 @@
  title: 'task #15'
  done: false
  created_by_id: 6
-  list_id: 6
+  project_id: 6
  index: 1
  bucket_id: 6
  created: 2018-12-01 01:12:04
@@ -148,7 +148,7 @@
  title: 'task #16'
  done: false
  created_by_id: 6
-  list_id: 7
+  project_id: 7
  index: 1
  bucket_id: 7
  created: 2018-12-01 01:12:04
@@ -157,7 +157,7 @@
  title: 'task #17'
  done: false
  created_by_id: 6
-  list_id: 8
+  project_id: 8
  index: 1
  bucket_id: 8
  created: 2018-12-01 01:12:04
@@ -166,7 +166,7 @@
  title: 'task #18'
  done: false
  created_by_id: 6
-  list_id: 9
+  project_id: 9
  index: 1
  bucket_id: 9
  created: 2018-12-01 01:12:04
@@ -175,7 +175,7 @@
  title: 'task #19'
  done: false
  created_by_id: 6
-  list_id: 10
+  project_id: 10
  index: 1
  bucket_id: 10
  created: 2018-12-01 01:12:04
@@ -184,7 +184,7 @@
  title: 'task #20'
  done: false
  created_by_id: 6
-  list_id: 11
+  project_id: 11
  index: 1
  bucket_id: 11
  created: 2018-12-01 01:12:04
@@ -193,7 +193,7 @@
  title: 'task #21'
  done: false
  created_by_id: 6
-  list_id: 12
+  project_id: 32
  index: 1
  bucket_id: 12
  created: 2018-12-01 01:12:04
@@ -202,25 +202,25 @@
  title: 'task #22'
  done: false
  created_by_id: 6
-  list_id: 13
+  project_id: 33
  index: 1
-  bucket_id: 13
+  bucket_id: 36
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
 - id: 23
  title: 'task #23'
  done: false
  created_by_id: 6
-  list_id: 14
+  project_id: 34
  index: 1
-  bucket_id: 14
+  bucket_id: 37
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
 - id: 24
  title: 'task #24'
  done: false
  created_by_id: 6
-  list_id: 15
+  project_id: 15
  index: 1
  bucket_id: 15
  created: 2018-12-01 01:12:04
@@ -229,7 +229,7 @@
  title: 'task #25'
  done: false
  created_by_id: 6
-  list_id: 16
+  project_id: 16
  index: 1
  bucket_id: 16
  created: 2018-12-01 01:12:04
@@ -238,26 +238,27 @@
  title: 'task #26'
  done: false
  created_by_id: 6
-  list_id: 17
+  project_id: 17
  index: 1
  bucket_id: 17
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
 - id: 27
-  title: 'task #27 with reminders'
+  title: 'task #27 with reminders and start_date'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 12
  bucket_id: 1
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
+  start_date: 2018-11-30 22:25:24
 - id: 28
  title: 'task #28 with repeat after'
  done: false
  created_by_id: 1
  repeat_after: 3600
-  list_id: 1
+  project_id: 1
  index: 13
  bucket_id: 1
  created: 2018-12-01 01:12:04
@@ -266,7 +267,7 @@
  title: 'task #29 with parent task (1)'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 14
  bucket_id: 1
  created: 2018-12-01 01:12:04
@@ -275,7 +276,7 @@
  title: 'task #30 with assignees'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 15
  bucket_id: 1
  created: 2018-12-01 01:12:04
@@ -284,7 +285,7 @@
  title: 'task #31 with color'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 16
  hex_color: f0f0f0
  bucket_id: 1
@@ -294,7 +295,7 @@
  title: 'task #32'
  done: false
  created_by_id: 1
-  list_id: 3
+  project_id: 3
  index: 1
  bucket_id: 21
  created: 2018-12-01 01:12:04
@@ -303,7 +304,7 @@
  title: 'task #33 with percent done'
  done: false
  created_by_id: 1
-  list_id: 1
+  project_id: 1
  index: 17
  percent_done: 0.5
  bucket_id: 1
@@ -314,7 +315,7 @@
  title: 'task #34'
  done: false
  created_by_id: 13
-  list_id: 20
+  project_id: 20
  index: 20
  bucket_id: 5
  created: 2018-12-01 01:12:04
@@ -323,7 +324,7 @@
  title: 'task #35'
  done: false
  created_by_id: 1
-  list_id: 21
+  project_id: 21
  index: 1
  bucket_id: 19
  created: 2018-12-01 01:12:04
@@ -332,7 +333,7 @@
  title: 'task #36'
  done: false
  created_by_id: 1
-  list_id: 22
+  project_id: 22
  index: 1
  bucket_id: 20
  created: 2018-12-01 01:12:04
@@ -342,7 +343,7 @@
  title: 'task #37'
  done: false
  created_by_id: -2
-  list_id: 2
+  project_id: 2
  index: 2
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
@@ -350,8 +351,28 @@
  title: 'task #37 done with due date'
  done: true
  created_by_id: 1
-  list_id: 22
+  project_id: 22
  index: 2
  created: 2018-12-01 01:12:04
  updated: 2018-12-01 01:12:04
  due_date: 2018-10-30 22:25:24
+- id: 39
+  title: 'task #39'
+  created_by_id: 1
+  project_id: 25
+  created: 2018-12-01 01:12:04
+  updated: 2018-12-01 01:12:04
+- id: 40
+  uid: 'uid-caldav-test'
+  title: 'Title Caldav Test'
+  description: 'Description Caldav Test'
+  priority: 3
+  done: false
+  created_by_id: 15
+  project_id: 36
+  index: 39
+  due_date: 2023-03-01 15:00:00
+  created: 2018-12-01 01:12:04
+  updated: 2018-12-01 01:12:04
+  bucket_id: 1
+  position: 39
@@ -1,54 +0,0 @@
- id: 1
-  team_id: 1
-  list_id: 3
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-# This team has read only access on list 6
- id: 2
-  team_id: 2
-  list_id: 6
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-# This team has write access on list 7
- id: 3
-  team_id: 3
-  list_id: 7
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-# This team has admin access on list 8
- id: 4
-  team_id: 4
-  list_id: 8
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-# Readonly acces on list 19
- id: 5
-  team_id: 8
-  list_id: 19
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-# Write acces on list 19
- id: 6
-  team_id: 9
-  list_id: 19
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-# Admin acces on list 19
- id: 7
-  team_id: 10
-  list_id: 19
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 8
-  team_id: 1
-  list_id: 21
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
@@ -1,52 +0,0 @@
- id: 1
-  team_id: 1
-  namespace_id: 3
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 2
-  team_id: 2
-  namespace_id: 3
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 3
-  team_id: 5
-  namespace_id: 7
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 4
-  team_id: 6
-  namespace_id: 8
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 5
-  team_id: 7
-  namespace_id: 9
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 6
-  team_id: 11
-  namespace_id: 14
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 7
-  team_id: 12
-  namespace_id: 14
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 8
-  team_id: 13
-  namespace_id: 14
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
@@ -0,0 +1,96 @@
+- id: 1
+  team_id: 1
+  project_id: 3
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+# This team has read only access on project 6
+- id: 2
+  team_id: 2
+  project_id: 6
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+# This team has write access on project 7
+- id: 3
+  team_id: 3
+  project_id: 7
+  right: 1
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+# This team has admin access on project 8
+- id: 4
+  team_id: 4
+  project_id: 8
+  right: 2
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+# Readonly acces on project 19
+- id: 5
+  team_id: 8
+  project_id: 19
+  right: 2
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+# Write acces on project 19
+- id: 6
+  team_id: 9
+  project_id: 19
+  right: 1
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+# Admin acces on project 19
+- id: 7
+  team_id: 10
+  project_id: 19
+  right: 2
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 8
+  team_id: 1
+  project_id: 21
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 9
+  team_id: 1
+  project_id: 28
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 10
+  team_id: 11
+  project_id: 29
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 11
+  team_id: 12
+  project_id: 29
+  right: 1
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 12
+  team_id: 13
+  project_id: 29
+  right: 2
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 13
+  team_id: 1
+  project_id: 32
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 14
+  team_id: 1
+  project_id: 33
+  right: 1
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 15
+  team_id: 1
+  project_id: 34
+  right: 2
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
@@ -3,22 +3,13 @@
  description: Lorem Ipsum
  created_by_id: 1
 - id: 2
-  name: testteam2_read_only_on_list6
+  name: testteam2_read_only_on_project6
  created_by_id: 1
 - id: 3
-  name: testteam3_write_on_list7
+  name: testteam3_write_on_project7
  created_by_id: 1
 - id: 4
-  name: testteam4_admin_on_list8
-  created_by_id: 1
- id: 5
-  name: testteam2_read_only_on_namespace7
-  created_by_id: 1
- id: 6
-  name: testteam3_write_on_namespace8
-  created_by_id: 1
- id: 7
-  name: testteam4_admin_on_namespace9
+  name: testteam4_admin_on_project8
  created_by_id: 1
 - id: 8
  name: testteam8
@@ -12,6 +12,7 @@
  password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
  email: 'user2@example.com'
  issuer: local
+  default_project_id: 4
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -20,6 +21,7 @@
  password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
  email: 'user3@example.com'
  issuer: local
+  default_project_id: 4
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 -
@@ -40,7 +42,7 @@
  issuer: local
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
-# This use is used to create a whole bunch of lists which are then shared directly with a user
+# This use is used to create a whole bunch of projects which are then shared directly with a user
 - id: 6
  username: 'user6'
  password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
@@ -109,3 +111,10 @@
  subject: '12345'
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
+- id: 15
+  username: 'user15'
+  password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234
+  email: 'user15@example.com'
+  issuer: local
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
@@ -1,48 +0,0 @@
- id: 1
-  user_id: 1
-  list_id: 3
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 2
-  user_id: 2
-  list_id: 3
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 3
-  user_id: 1
-  list_id: 9
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 4
-  user_id: 1
-  list_id: 10
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 5
-  user_id: 1
-  list_id: 11
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 6
-  user_id: 4
-  list_id: 19
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 7
-  user_id: 5
-  list_id: 19
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 8
-  user_id: 6
-  list_id: 19
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
@@ -1,52 +0,0 @@
- id: 1
-  user_id: 1
-  namespace_id: 3
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 2
-  user_id: 2
-  namespace_id: 3
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 3
-  user_id: 1
-  namespace_id: 10
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 4
-  user_id: 1
-  namespace_id: 11
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
-
- id: 5
-  user_id: 1
-  namespace_id: 12
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 6
-  user_id: 11
-  namespace_id: 14
-  right: 0
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 7
-  user_id: 12
-  namespace_id: 14
-  right: 1
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
- id: 8
-  user_id: 13
-  namespace_id: 14
-  right: 2
-  updated: 2018-12-02 15:13:12
-  created: 2018-12-01 15:13:12
@@ -1,90 +1,102 @@
 - id: 1
-  title: testnamespace
-  description: Lorem Ipsum
-  owner_id: 1
+  user_id: 1
+  project_id: 3
+  right: 0
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 2
-  title: testnamespace2
-  description: Lorem Ipsum
-  owner_id: 2
+  user_id: 2
+  project_id: 3
+  right: 0
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 3
-  title: testnamespace3
-  description: Lorem Ipsum
-  owner_id: 3
+  user_id: 1
+  project_id: 9
+  right: 0
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 4
+  user_id: 1
+  project_id: 10
+  right: 1
+  updated: 2018-12-02 15:13:12
+  created: 2018-12-01 15:13:12
+- id: 5
+  user_id: 1
+  project_id: 11
+  right: 2
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 6
-  title: testnamespace6
-  description: Lorem Ipsum
-  owner_id: 6
+  user_id: 4
+  project_id: 19
+  right: 0
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 7
-  title: testnamespace7
-  description: Lorem Ipsum
-  owner_id: 6
+  user_id: 5
+  project_id: 19
+  right: 1
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 8
-  title: testnamespace8
-  description: Lorem Ipsum
-  owner_id: 6
+  user_id: 6
+  project_id: 19
+  right: 2
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 9
-  title: testnamespace9
-  description: Lorem Ipsum
-  owner_id: 6
+  user_id: 1
+  project_id: 27
+  right: 0
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 10
-  title: testnamespace10
-  description: Lorem Ipsum
-  owner_id: 6
+  user_id: 11
+  project_id: 29
+  right: 0
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 11
-  title: testnamespace11
-  description: Lorem Ipsum
-  owner_id: 6
+  user_id: 12
+  project_id: 29
+  right: 1
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 12
-  title: testnamespace12
-  description: Lorem Ipsum
-  owner_id: 6
+  user_id: 13
+  project_id: 29
+  right: 2
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 13
-  title: testnamespace13
-  description: Lorem Ipsum
-  owner_id: 7
+  user_id: 1
+  project_id: 30
+  right: 1
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 14
-  title: testnamespace14
-  description: Lorem Ipsum
-  owner_id: 7
+  user_id: 1
+  project_id: 31
+  right: 2
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 15
-  title: testnamespace15
-  description: Lorem Ipsum
-  owner_id: 13
+  user_id: 1
+  project_id: 28
+  right: 1
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 16
-  title: Archived testnamespace16
-  owner_id: 1
-  is_archived: 1
+  user_id: 1
+  project_id: 29
+  right: 2
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
 - id: 17
-  title: testnamespace17
-  description: Lorem Ipsum
-  owner_id: 12
+  user_id: 15
+  project_id: 26
+  right: 0
  updated: 2018-12-02 15:13:12
  created: 2018-12-01 15:13:12
@@ -22,7 +22,7 @@ import (
 )

 // ILIKE returns an ILIKE query on postgres and a LIKE query on all other platforms.
-// Postgres' is case sensitive by default.
+// Postgres' is case-sensitive by default.
 // To work around this, we're using ILIKE as opposed to normal LIKE statements.
 // ILIKE is preferred over LOWER(text) LIKE for performance reasons.
 // See https://stackoverflow.com/q/7005302/10924593
@@ -17,6 +17,7 @@
 package db

 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"testing"
@@ -25,6 +26,7 @@ import (
 	"code.vikunja.io/api/pkg/log"

 	"github.com/stretchr/testify/assert"
+	"xorm.io/builder"
 	"xorm.io/xorm"
 	"xorm.io/xorm/names"
 )
@@ -92,7 +94,16 @@ func AssertExists(t *testing.T, table string, values map[string]interface{}, cus
 		exists, err = x.Table(table).Where(values).Get(&v)
 	}
 	assert.NoError(t, err, fmt.Sprintf("Failed to assert entries exist in db, error was: %s", err))
-	assert.True(t, exists, fmt.Sprintf("Entries %v do not exist in table %s", values, table))
+	if !exists {
+
+		all := []map[string]interface{}{}
+		err = x.Table(table).Find(&all)
+		assert.NoError(t, err, fmt.Sprintf("Failed to assert entries exist in db, error was: %s", err))
+		pretty, err := json.MarshalIndent(all, "", "    ")
+		assert.NoError(t, err, fmt.Sprintf("Failed to assert entries exist in db, error was: %s", err))
+
+		t.Errorf(fmt.Sprintf("Entries %v do not exist in table %s\n\nFound entries instead: %v", values, table, string(pretty)))
+	}
 }

 // AssertMissing checks and asserts the nonexiste nce of certain entries in the db
@@ -102,3 +113,10 @@ func AssertMissing(t *testing.T, table string, values map[string]interface{}) {
 	assert.NoError(t, err, fmt.Sprintf("Failed to assert entries don't exist in db, error was: %s", err))
 	assert.False(t, exists, fmt.Sprintf("Entries %v exist in table %s", values, table))
 }
+
+// AssertCount checks if a number of entries exists in the database
+func AssertCount(t *testing.T, table string, where builder.Cond, count int64) {
+	dbCount, err := x.Table(table).Where(where).Count()
+	assert.NoError(t, err, fmt.Sprintf("Failed to assert count in db, error was: %s", err))
+	assert.Equal(t, count, dbCount, fmt.Sprintf("Found %d entries instead of expected %d in table %s", dbCount, count, table))
+}
@@ -17,7 +17,6 @@
 package files

 import (
-	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
 	"xorm.io/xorm"
@@ -33,11 +32,6 @@ func SetEngine() (err error) {
 		return
 	}

-	// Cache
-	if config.CacheEnabled.GetBool() && config.CacheType.GetString() == "redis" {
-		db.RegisterTableStructsForCache(GetTables())
-	}
-
 	return nil
 }

@@ -140,7 +140,7 @@ func (f *File) Delete() (err error) {
 		var perr *os.PathError
 		if errors.As(err, &perr) {
 			// Don't fail when removing the file failed
-			log.Errorf("Error deleting file %d: %w", err)
+			log.Errorf("Error deleting file %d: %w", f.ID, err)
 			return s.Commit()
 		}

@@ -27,9 +27,8 @@ import (
 	"code.vikunja.io/api/pkg/mail"
 	"code.vikunja.io/api/pkg/migration"
 	"code.vikunja.io/api/pkg/models"
+	"code.vikunja.io/api/pkg/modules/auth/openid"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
-	migrator "code.vikunja.io/api/pkg/modules/migration"
-	"code.vikunja.io/api/pkg/notifications"
 	"code.vikunja.io/api/pkg/red"
 	"code.vikunja.io/api/pkg/user"
 )
@@ -55,22 +54,10 @@ func InitEngines() {
 	if err != nil {
 		log.Fatal(err.Error())
 	}
-	err = user.InitDB()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
 	err = files.SetEngine()
 	if err != nil {
 		log.Fatal(err.Error())
 	}
-	err = migrator.InitDB()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	err = notifications.InitDB()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
 }

 // FullInit initializes all kinds of things in the right order
@@ -98,6 +85,7 @@ func FullInit() {
 	user.RegisterDeletionNotificationCron()
 	models.RegisterUserDeletionCron()
 	models.RegisterOldExportCleanupCron()
+	openid.CleanupSavedOpenIDProviders()

 	// Start processing events
 	go func() {
@@ -17,7 +17,6 @@
 package integrations

 import (
-	"net/url"
 	"testing"

 	"code.vikunja.io/api/pkg/models"
@@ -26,46 +25,34 @@ import (
 )

 // This tests the following behaviour:
-// 1. A namespace should not be editable if it is archived.
-//   1. With the exception being to un-archive it.
-// 2. A list which belongs to an archived namespace cannot be edited.
-// 3. An archived list should not be editable.
+// 2. A project which belongs to an archived project cannot be edited.
+// 3. An archived project should not be editable.
 //   1. Except for un-archiving it.
-// 4. It is not possible to un-archive a list individually if its namespace is archived.
-// 5. Creating new lists on an archived namespace should not work.
-// 6. Creating new tasks on an archived list should not work.
-// 7. Creating new tasks on a list who's namespace is archived should not work.
-// 8. Editing tasks on an archived list should not work.
-// 9. Editing tasks on a list who's namespace is archived should not work.
-// 10. Archived namespaces should not appear in the list with all namespaces.
-// 11. Archived lists should not appear in the list with all lists.
-// 12. Lists who's namespace is archived should not appear in the list with all lists.
+// 4. It is not possible to un-archive a project individually if its parent project is archived.
+// 5. Creating new child projects in an archived project should not work.
+// 6. Creating new tasks on an archived project should not work.
+// 7. Creating new tasks on a project whose parent project is archived should not work.
+// 8. Editing tasks on an archived project should not work.
+// 9. Editing tasks on a project whose parent project is archived should not work.
+// 11. Archived projects should not appear in the list with all projects.
+// 12. Projects whose parent project is archived should not appear in the project with all projects.
 //
 // All of this is tested through integration tests because it's not yet clear if this will be implemented directly
 // or with some kind of middleware.
 //
-// Maybe the inheritance of lists from namespaces could be solved with some kind of is_archived_inherited flag -
-// that way I'd only need to implement the checking on a list level and update the flag for all lists once the
-// namespace is archived. The archived flag would then be used to not accedentially unarchive lists which were
-// already individually archived when the namespace was archived.
-// Should still test it all though.
+// Maybe the inheritance of projects from parents could be solved with some kind of is_archived_inherited flag -
+// that way I'd only need to implement the checking on a project level and update the flag for all projects once the
+// project is archived. The archived flag would then be used to not accedentially unarchive projects which were
+// already individually archived when the parent project was archived.
 //
-// Namespace 16 is archived
-// List 21 belongs to namespace 16
-// List 22 is archived individually
+// Project 21 belongs to project 16
+// Project 22 is archived individually

 func TestArchived(t *testing.T) {
-	testListHandler := webHandlerTest{
+	testProjectHandler := webHandlerTest{
 		user: &testuser1,
 		strFunc: func() handler.CObject {
-			return &models.List{}
-		},
-		t: t,
-	}
-	testNamespaceHandler := webHandlerTest{
-		user: &testuser1,
-		strFunc: func() handler.CObject {
-			return &models.Namespace{}
+			return &models.Project{}
 		},
 		t: t,
 	}
@@ -105,134 +92,103 @@ func TestArchived(t *testing.T) {
 		t: t,
 	}

-	t.Run("namespace", func(t *testing.T) {
+	taskTests := func(taskID string, errCode int, t *testing.T) {
+		t.Run("task", func(t *testing.T) {
+			t.Run("edit task", func(t *testing.T) {
+				_, err := testTaskHandler.testUpdateWithUser(nil, map[string]string{"projecttask": taskID}, `{"title":"TestIpsum"}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("delete", func(t *testing.T) {
+				_, err := testTaskHandler.testDeleteWithUser(nil, map[string]string{"projecttask": taskID})
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("add new labels", func(t *testing.T) {
+				_, err := testLabelHandler.testCreateWithUser(nil, map[string]string{"projecttask": taskID}, `{"label_id":1}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("remove lables", func(t *testing.T) {
+				_, err := testLabelHandler.testDeleteWithUser(nil, map[string]string{"projecttask": taskID, "label": "4"})
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("add assignees", func(t *testing.T) {
+				_, err := testAssigneeHandler.testCreateWithUser(nil, map[string]string{"projecttask": taskID}, `{"user_id":3}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("remove assignees", func(t *testing.T) {
+				_, err := testAssigneeHandler.testDeleteWithUser(nil, map[string]string{"projecttask": taskID, "user": "2"})
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("add relation", func(t *testing.T) {
+				_, err := testRelationHandler.testCreateWithUser(nil, map[string]string{"task": taskID}, `{"other_task_id":1,"relation_kind":"related"}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("remove relation", func(t *testing.T) {
+				_, err := testRelationHandler.testDeleteWithUser(nil, map[string]string{"task": taskID}, `{"other_task_id":2,"relation_kind":"related"}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("add comment", func(t *testing.T) {
+				_, err := testCommentHandler.testCreateWithUser(nil, map[string]string{"task": taskID}, `{"comment":"Lorem"}`)
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+			t.Run("remove comment", func(t *testing.T) {
+				var commentID = "15"
+				if taskID == "36" {
+					commentID = "16"
+				}
+				_, err := testCommentHandler.testDeleteWithUser(nil, map[string]string{"task": taskID, "commentid": commentID})
+				assert.Error(t, err)
+				assertHandlerErrorCode(t, err, errCode)
+			})
+		})
+	}
+
+	// The project belongs to an archived parent project
+	t.Run("archived parent project", func(t *testing.T) {
 		t.Run("not editable", func(t *testing.T) {
-			_, err := testNamespaceHandler.testUpdateWithUser(nil, map[string]string{"namespace": "16"}, `{"title":"TestIpsum","is_archived":true}`)
+			_, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "21"}, `{"title":"TestIpsum","is_archived":true}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectIsArchived)
+		})
+		t.Run("no new tasks", func(t *testing.T) {
+			_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"project": "21"}, `{"title":"Lorem"}`)
+			assert.Error(t, err)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectIsArchived)
+		})
+		t.Run("not unarchivable", func(t *testing.T) {
+			_, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "21"}, `{"title":"LoremIpsum","is_archived":false}`)
+			assert.Error(t, err)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectIsArchived)
+		})
+
+		taskTests("35", models.ErrCodeProjectIsArchived, t)
+	})
+	// The project itself is archived
+	t.Run("archived individually", func(t *testing.T) {
+		t.Run("not editable", func(t *testing.T) {
+			_, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "22"}, `{"title":"TestIpsum","is_archived":true}`)
+			assert.Error(t, err)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectIsArchived)
+		})
+		t.Run("no new tasks", func(t *testing.T) {
+			_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"project": "22"}, `{"title":"Lorem"}`)
+			assert.Error(t, err)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectIsArchived)
 		})
 		t.Run("unarchivable", func(t *testing.T) {
-			rec, err := testNamespaceHandler.testUpdateWithUser(nil, map[string]string{"namespace": "16"}, `{"title":"TestIpsum","is_archived":false}`)
+			rec, err := testProjectHandler.testUpdateWithUser(nil, map[string]string{"project": "22"}, `{"title":"LoremIpsum","is_archived":false}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"is_archived":false`)
 		})
-		t.Run("no new lists", func(t *testing.T) {
-			_, err := testListHandler.testCreateWithUser(nil, map[string]string{"namespace": "16"}, `{"title":"Lorem"}`)
-			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
-		})
-		t.Run("should not appear in the list", func(t *testing.T) {
-			rec, err := testNamespaceHandler.testReadAllWithUser(nil, nil)
-			assert.NoError(t, err)
-			assert.NotContains(t, rec.Body.String(), `"title":"Archived testnamespace16"`)
-		})
-		t.Run("should appear in the list if explicitly requested", func(t *testing.T) {
-			rec, err := testNamespaceHandler.testReadAllWithUser(url.Values{"is_archived": []string{"true"}}, nil)
-			assert.NoError(t, err)
-			assert.Contains(t, rec.Body.String(), `"title":"Archived testnamespace16"`)
-		})
-	})

-	t.Run("list", func(t *testing.T) {
-
-		taskTests := func(taskID string, errCode int, t *testing.T) {
-			t.Run("task", func(t *testing.T) {
-				t.Run("edit task", func(t *testing.T) {
-					_, err := testTaskHandler.testUpdateWithUser(nil, map[string]string{"listtask": taskID}, `{"title":"TestIpsum"}`)
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("delete", func(t *testing.T) {
-					_, err := testTaskHandler.testDeleteWithUser(nil, map[string]string{"listtask": taskID})
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("add new labels", func(t *testing.T) {
-					_, err := testLabelHandler.testCreateWithUser(nil, map[string]string{"listtask": taskID}, `{"label_id":1}`)
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("remove lables", func(t *testing.T) {
-					_, err := testLabelHandler.testDeleteWithUser(nil, map[string]string{"listtask": taskID, "label": "4"})
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("add assignees", func(t *testing.T) {
-					_, err := testAssigneeHandler.testCreateWithUser(nil, map[string]string{"listtask": taskID}, `{"user_id":3}`)
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("remove assignees", func(t *testing.T) {
-					_, err := testAssigneeHandler.testDeleteWithUser(nil, map[string]string{"listtask": taskID, "user": "2"})
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("add relation", func(t *testing.T) {
-					_, err := testRelationHandler.testCreateWithUser(nil, map[string]string{"task": taskID}, `{"other_task_id":1,"relation_kind":"related"}`)
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("remove relation", func(t *testing.T) {
-					_, err := testRelationHandler.testDeleteWithUser(nil, map[string]string{"task": taskID}, `{"other_task_id":2,"relation_kind":"related"}`)
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("add comment", func(t *testing.T) {
-					_, err := testCommentHandler.testCreateWithUser(nil, map[string]string{"task": taskID}, `{"comment":"Lorem"}`)
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-				t.Run("remove comment", func(t *testing.T) {
-					var commentID = "15"
-					if taskID == "36" {
-						commentID = "16"
-					}
-					_, err := testCommentHandler.testDeleteWithUser(nil, map[string]string{"task": taskID, "commentid": commentID})
-					assert.Error(t, err)
-					assertHandlerErrorCode(t, err, errCode)
-				})
-			})
-		}
-
-		// The list belongs to an archived namespace
-		t.Run("archived namespace", func(t *testing.T) {
-			t.Run("not editable", func(t *testing.T) {
-				_, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "21"}, `{"title":"TestIpsum","is_archived":true}`)
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
-			})
-			t.Run("no new tasks", func(t *testing.T) {
-				_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"list": "21"}, `{"title":"Lorem"}`)
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
-			})
-			t.Run("not unarchivable", func(t *testing.T) {
-				_, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "21"}, `{"title":"LoremIpsum","is_archived":false}`)
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeNamespaceIsArchived)
-			})
-
-			taskTests("35", models.ErrCodeNamespaceIsArchived, t)
-		})
-		// The list itself is archived
-		t.Run("archived individually", func(t *testing.T) {
-			t.Run("not editable", func(t *testing.T) {
-				_, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "22"}, `{"title":"TestIpsum","is_archived":true}`)
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListIsArchived)
-			})
-			t.Run("no new tasks", func(t *testing.T) {
-				_, err := testTaskHandler.testCreateWithUser(nil, map[string]string{"list": "22"}, `{"title":"Lorem"}`)
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListIsArchived)
-			})
-			t.Run("unarchivable", func(t *testing.T) {
-				rec, err := testListHandler.testUpdateWithUser(nil, map[string]string{"list": "22"}, `{"title":"LoremIpsum","is_archived":false,"namespace_id":1}`)
-				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"is_archived":false`)
-			})
-
-			taskTests("36", models.ErrCodeListIsArchived, t)
-		})
+		taskTests("36", models.ErrCodeProjectIsArchived, t)
 	})
 }
@@ -0,0 +1,77 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public Licensee as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public Licensee for more details.
+//
+// You should have received a copy of the GNU Affero General Public Licensee
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package integrations
+
+import (
+	"net/http"
+	"testing"
+
+	"code.vikunja.io/api/pkg/routes/caldav"
+	"github.com/stretchr/testify/assert"
+)
+
+const vtodo = `BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:PUBLISH
+X-PUBLISHED-TTL:PT4H
+X-WR-CALNAME:List 36 for Caldav tests
+PRODID:-//Vikunja Todo App//EN
+BEGIN:VTODO
+UID:uid
+DTSTAMP:20230301T073337Z
+SUMMARY:Caldav Task 1
+CATEGORIES:tag1,tag2,tag3
+CREATED:20230301T073337Z
+LAST-MODIFIED:20230301T073337Z
+BEGIN:VALARM
+TRIGGER;VALUE=DATE-TIME:20230304T150000Z
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+END:VCALENDAR`
+
+func TestCaldav(t *testing.T) {
+	t.Run("Delivers VTODO for project", func(t *testing.T) {
+		rec, err := newCaldavTestRequestWithUser(t, http.MethodGet, caldav.ProjectHandler, &testuser15, ``, nil, map[string]string{"project": "36"})
+		assert.NoError(t, err)
+		assert.Contains(t, rec.Body.String(), "BEGIN:VCALENDAR")
+		assert.Contains(t, rec.Body.String(), "PRODID:-//Vikunja Todo App//EN")
+		assert.Contains(t, rec.Body.String(), "X-WR-CALNAME:Project 36 for Caldav tests")
+		assert.Contains(t, rec.Body.String(), "BEGIN:VTODO")
+		assert.Contains(t, rec.Body.String(), "END:VTODO")
+		assert.Contains(t, rec.Body.String(), "END:VCALENDAR")
+	})
+	t.Run("Import VTODO", func(t *testing.T) {
+		rec, err := newCaldavTestRequestWithUser(t, http.MethodPut, caldav.TaskHandler, &testuser15, vtodo, nil, map[string]string{"project": "36", "task": "uid"})
+		assert.NoError(t, err)
+		assert.Equal(t, 201, rec.Result().StatusCode)
+	})
+	t.Run("Export VTODO", func(t *testing.T) {
+		rec, err := newCaldavTestRequestWithUser(t, http.MethodGet, caldav.TaskHandler, &testuser15, ``, nil, map[string]string{"project": "36", "task": "uid-caldav-test"})
+		assert.NoError(t, err)
+		assert.Contains(t, rec.Body.String(), "BEGIN:VCALENDAR")
+		assert.Contains(t, rec.Body.String(), "SUMMARY:Title Caldav Test")
+		assert.Contains(t, rec.Body.String(), "DESCRIPTION:Description Caldav Test")
+		assert.Contains(t, rec.Body.String(), "DUE:20230301T150000Z")
+		assert.Contains(t, rec.Body.String(), "PRIORITY:3")
+		assert.Contains(t, rec.Body.String(), "CATEGORIES:Label #4")
+		assert.Contains(t, rec.Body.String(), "BEGIN:VALARM")
+		assert.Contains(t, rec.Body.String(), "TRIGGER;VALUE=DATE-TIME:20230304T150000Z")
+		assert.Contains(t, rec.Body.String(), "ACTION:DISPLAY")
+		assert.Contains(t, rec.Body.String(), "END:VALARM")
+	})
+}
@@ -33,10 +33,11 @@ import (
 	"code.vikunja.io/api/pkg/modules/auth"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	"code.vikunja.io/api/pkg/routes"
+	"code.vikunja.io/api/pkg/routes/caldav"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
 	"code.vikunja.io/web/handler"
-	"github.com/golang-jwt/jwt/v4"
+	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
 )
@@ -49,30 +50,11 @@ var (
 		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
 		Email:    "user1@example.com",
 	}
-	testuser2 = user.User{
-		ID:       2,
-		Username: "user2",
+	testuser15 = user.User{
+		ID:       15,
+		Username: "user15",
 		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user2@example.com",
-	}
-	testuser3 = user.User{
-		ID:       3,
-		Username: "user3",
-		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user3@example.com",
-	}
-	testuser4 = user.User{
-		ID:       4,
-		Username: "user4",
-		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user4@example.com",
-	}
-	testuser5 = user.User{
-		ID:       4,
-		Username: "user5",
-		Password: "$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.",
-		Email:    "user5@example.com",
-		Status:   user.StatusDisabled,
+		Email:    "user15@example.com",
 	}
 )

@@ -170,6 +152,19 @@ func newTestRequestWithLinkShare(t *testing.T, method string, handler echo.Handl
 	return
 }

+func newCaldavTestRequestWithUser(t *testing.T, method string, handler echo.HandlerFunc, user *user.User, payload string, queryParams url.Values, urlParams map[string]string) (rec *httptest.ResponseRecorder, err error) {
+	rec, c := testRequestSetup(t, method, payload, queryParams, urlParams)
+	c.Request().Header.Set(echo.HeaderContentType, echo.MIMETextPlain)
+
+	result, _ := caldav.BasicAuth(user.Username, "1234", c)
+	if !result {
+		t.Error("BasicAuth for caldav failed")
+		t.FailNow()
+	}
+	err = handler(c)
+	return
+}
+
 func assertHandlerErrorCode(t *testing.T, err error, expectedErrorCode int) {
 	if err == nil {
 		t.Error("Error is nil")
@@ -39,7 +39,7 @@ func TestBucket(t *testing.T) {
 		linkShare: &models.LinkSharing{
 			ID:          2,
 			Hash:        "test2",
-			ListID:      2,
+			ProjectID:   2,
 			Right:       models.RightWrite,
 			SharingType: models.SharingTypeWithoutPassword,
 			SharedByID:  1,
@@ -51,17 +51,17 @@ func TestBucket(t *testing.T) {
 	}
 	t.Run("ReadAll", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testReadAllWithUser(nil, map[string]string{"list": "1"})
+			rec, err := testHandler.testReadAllWithUser(nil, map[string]string{"project": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `testbucket1`)
 			assert.Contains(t, rec.Body.String(), `testbucket2`)
 			assert.Contains(t, rec.Body.String(), `testbucket3`)
-			assert.NotContains(t, rec.Body.String(), `testbucket4`) // Different List
+			assert.NotContains(t, rec.Body.String(), `testbucket4`) // Different Project
 		})
 	})
 	t.Run("Update", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			// Check the list was loaded successfully afterwards, see testReadOneWithUser
+			// Check the project was loaded successfully afterwards, see testReadOneWithUser
 			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "1"}, `{"title":"TestLoremIpsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
@@ -115,33 +115,33 @@ func TestBucket(t *testing.T) {
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "12"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
 				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "13"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
 				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "14"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "15"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
 				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "16"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
 				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"bucket": "17"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
@@ -150,7 +150,7 @@ func TestBucket(t *testing.T) {
 	})
 	t.Run("Delete", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "1", "bucket": "1"})
+			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "1", "bucket": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 		})
@@ -162,70 +162,70 @@ func TestBucket(t *testing.T) {
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "20", "bucket": "5"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "20", "bucket": "5"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "6", "bucket": "6"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "6", "bucket": "6"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "7", "bucket": "7"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "7", "bucket": "7"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "8", "bucket": "8"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "8", "bucket": "8"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "9", "bucket": "9"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "9", "bucket": "9"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "10", "bucket": "10"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "10", "bucket": "10"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "11", "bucket": "11"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "11", "bucket": "11"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "12", "bucket": "12"})
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "12", "bucket": "12"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "13", "bucket": "13"})
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "13", "bucket": "13"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "14", "bucket": "14"})
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "14", "bucket": "14"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "15", "bucket": "15"})
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "15", "bucket": "15"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "16", "bucket": "16"})
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "16", "bucket": "16"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "17", "bucket": "17"})
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "17", "bucket": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
@@ -233,92 +233,92 @@ func TestBucket(t *testing.T) {
 	})
 	t.Run("Create", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9999"}, `{"title":"Lorem Ipsum"}`)
+			_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9999"}, `{"title":"Lorem Ipsum"}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "6"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "6"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "7"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "7"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "8"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "8"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "12"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "12"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "13"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "13"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "14"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "14"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "15"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "15"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "16"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "16"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "17"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "17"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
 		t.Run("Link Share", func(t *testing.T) {
-			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			db.AssertExists(t, "buckets", map[string]interface{}{
-				"list_id":       2,
+				"project_id":    2,
 				"created_by_id": -2,
 				"title":         "Lorem Ipsum",
 			}, false)
@@ -31,14 +31,14 @@ func TestLinkSharingAuth(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Contains(t, rec.Body.String(), `"token":"`)
-		assert.Contains(t, rec.Body.String(), `"list_id":1`)
+		assert.Contains(t, rec.Body.String(), `"project_id":1`)
 	})
 	t.Run("Without Password, Password Provided", func(t *testing.T) {
 		rec, err := newTestRequest(t, http.MethodPost, apiv1.AuthenticateLinkShare, `{"password":"somethingsomething"}`, nil, map[string]string{"share": "test"})
 		assert.NoError(t, err)
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Contains(t, rec.Body.String(), `"token":"`)
-		assert.Contains(t, rec.Body.String(), `"list_id":1`)
+		assert.Contains(t, rec.Body.String(), `"project_id":1`)
 	})
 	t.Run("With Password, No Password Provided", func(t *testing.T) {
 		_, err := newTestRequest(t, http.MethodPost, apiv1.AuthenticateLinkShare, ``, nil, map[string]string{"share": "testWithPassword"})
@@ -50,7 +50,7 @@ func TestLinkSharingAuth(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, http.StatusOK, rec.Code)
 		assert.Contains(t, rec.Body.String(), `"token":"`)
-		assert.Contains(t, rec.Body.String(), `"list_id":1`)
+		assert.Contains(t, rec.Body.String(), `"project_id":1`)
 	})
 	t.Run("With Wrong Password", func(t *testing.T) {
 		_, err := newTestRequest(t, http.MethodPost, apiv1.AuthenticateLinkShare, `{"password":"someWrongPassword"}`, nil, map[string]string{"share": "testWithPassword"})
@@ -31,7 +31,7 @@ func TestLinkSharing(t *testing.T) {
 	linkshareRead := &models.LinkSharing{
 		ID:          1,
 		Hash:        "test1",
-		ListID:      1,
+		ProjectID:   1,
 		Right:       models.RightRead,
 		SharingType: models.SharingTypeWithoutPassword,
 		SharedByID:  1,
@@ -40,7 +40,7 @@ func TestLinkSharing(t *testing.T) {
 	linkShareWrite := &models.LinkSharing{
 		ID:          2,
 		Hash:        "test2",
-		ListID:      2,
+		ProjectID:   2,
 		Right:       models.RightWrite,
 		SharingType: models.SharingTypeWithoutPassword,
 		SharedByID:  1,
@@ -49,7 +49,7 @@ func TestLinkSharing(t *testing.T) {
 	linkShareAdmin := &models.LinkSharing{
 		ID:          3,
 		Hash:        "test3",
-		ListID:      3,
+		ProjectID:   3,
 		Right:       models.RightAdmin,
 		SharingType: models.SharingTypeWithoutPassword,
 		SharedByID:  1,
@@ -65,102 +65,102 @@ func TestLinkSharing(t *testing.T) {
 		}
 		t.Run("Forbidden", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":0}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"right":0}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("write", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":1}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"right":1}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"right":2}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"right":2}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 		})
 		t.Run("Read only access", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":0}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"right":0}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("write", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":1}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"right":1}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"right":2}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"right":2}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 		})
 		t.Run("Write access", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":0}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"right":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("write", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":1}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"right":1}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"right":2}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"right":2}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 		})
 		t.Run("Admin access", func(t *testing.T) {
 			t.Run("read only", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":0}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"right":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("write", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":1}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"right":1}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 			t.Run("admin", func(t *testing.T) {
-				req, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"right":2}`)
+				req, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"right":2}`)
 				assert.NoError(t, err)
 				assert.Contains(t, req.Body.String(), `"hash":`)
 			})
 		})
 	})

-	t.Run("Lists", func(t *testing.T) {
-		testHandlerListReadOnly := webHandlerTest{
+	t.Run("Projects", func(t *testing.T) {
+		testHandlerProjectReadOnly := webHandlerTest{
 			linkShare: linkshareRead,
 			strFunc: func() handler.CObject {
-				return &models.List{}
+				return &models.Project{}
 			},
 			t: t,
 		}
-		testHandlerListWrite := webHandlerTest{
+		testHandlerProjectWrite := webHandlerTest{
 			linkShare: linkShareWrite,
 			strFunc: func() handler.CObject {
-				return &models.List{}
+				return &models.Project{}
 			},
 			t: t,
 		}
-		testHandlerListAdmin := webHandlerTest{
+		testHandlerProjectAdmin := webHandlerTest{
 			linkShare: linkShareAdmin,
 			strFunc: func() handler.CObject {
-				return &models.List{}
+				return &models.Project{}
 			},
 			t: t,
 		}

 		t.Run("ReadAll", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandlerListReadOnly.testReadAllWithLinkShare(nil, nil)
+				rec, err := testHandlerProjectReadOnly.testReadAllWithLinkShare(nil, nil)
 				assert.NoError(t, err)
-				// Should only return the shared list, nothing else
+				// Should only return the shared project, nothing else
 				assert.Contains(t, rec.Body.String(), `Test1`)
 				assert.NotContains(t, rec.Body.String(), `Test2`)
 				assert.NotContains(t, rec.Body.String(), `Test3`)
@@ -168,9 +168,9 @@ func TestLinkSharing(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `Test5`)
 			})
 			t.Run("Search", func(t *testing.T) {
-				rec, err := testHandlerListReadOnly.testReadAllWithLinkShare(url.Values{"s": []string{"est1"}}, nil)
+				rec, err := testHandlerProjectReadOnly.testReadAllWithLinkShare(url.Values{"s": []string{"est1"}}, nil)
 				assert.NoError(t, err)
-				// Should only return the shared list, nothing else
+				// Should only return the shared project, nothing else
 				assert.Contains(t, rec.Body.String(), `Test1`)
 				assert.NotContains(t, rec.Body.String(), `Test2`)
 				assert.NotContains(t, rec.Body.String(), `Test3`)
@@ -180,35 +180,35 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("ReadOne", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "1"})
+				rec, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "1"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test1"`)
 				assert.NotContains(t, rec.Body.String(), `"title":"Test2"`)
 			})
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "9999999"})
+				_, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "9999999"})
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Forbidden", func(t *testing.T) {
-					// List 2, not shared with this token
-					_, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "2"})
+					// Project 2, not shared with this token
+					_, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "2"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `You don't have the right to see this`)
 				})
 				t.Run("Shared readonly", func(t *testing.T) {
-					rec, err := testHandlerListReadOnly.testReadOneWithLinkShare(nil, map[string]string{"list": "1"})
+					rec, err := testHandlerProjectReadOnly.testReadOneWithLinkShare(nil, map[string]string{"project": "1"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"Test1"`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					rec, err := testHandlerListWrite.testReadOneWithLinkShare(nil, map[string]string{"list": "2"})
+					rec, err := testHandlerProjectWrite.testReadOneWithLinkShare(nil, map[string]string{"project": "2"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"Test2"`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					rec, err := testHandlerListAdmin.testReadOneWithLinkShare(nil, map[string]string{"list": "3"})
+					rec, err := testHandlerProjectAdmin.testReadOneWithLinkShare(nil, map[string]string{"project": "3"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"Test3"`)
 				})
@@ -216,28 +216,28 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Update", func(t *testing.T) {
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "9999999"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandlerProjectReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "9999999"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Forbidden", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"TestLoremIpsum"}`)
+					_, err := testHandlerProjectReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"TestLoremIpsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared readonly", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"title":"TestLoremIpsum"}`)
+					_, err := testHandlerProjectReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "1"}, `{"title":"TestLoremIpsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					rec, err := testHandlerListWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"TestLoremIpsum","namespace_id":1}`)
+					rec, err := testHandlerProjectWrite.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"TestLoremIpsum","namespace_id":1}`)
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					rec, err := testHandlerListAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"title":"TestLoremIpsum","namespace_id":2}`)
+					rec, err := testHandlerProjectAdmin.testUpdateWithLinkShare(nil, map[string]string{"project": "3"}, `{"title":"TestLoremIpsum","namespace_id":2}`)
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 				})
@@ -245,54 +245,54 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Delete", func(t *testing.T) {
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "9999999"})
+				_, err := testHandlerProjectReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "9999999"})
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+				assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Forbidden", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+					_, err := testHandlerProjectReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared readonly", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+					_, err := testHandlerProjectReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					_, err := testHandlerListWrite.testDeleteWithLinkShare(nil, map[string]string{"list": "2"})
+					_, err := testHandlerProjectWrite.testDeleteWithLinkShare(nil, map[string]string{"project": "2"})
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					rec, err := testHandlerListAdmin.testDeleteWithLinkShare(nil, map[string]string{"list": "3"})
+					rec, err := testHandlerProjectAdmin.testDeleteWithLinkShare(nil, map[string]string{"project": "3"})
 					assert.NoError(t, err)
 					assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 				})
 			})
 		})

-		// Creating a list should always be forbidden, since users need access to a namespace to create a list
+		// Creating a project should always be forbidden
 		t.Run("Create", func(t *testing.T) {
 			t.Run("Nonexisting", func(t *testing.T) {
-				_, err := testHandlerListReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "999999"}, `{"title":"Lorem"}`)
+				_, err := testHandlerProjectReadOnly.testCreateWithLinkShare(nil, nil, `{"title":"Lorem"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Rights check", func(t *testing.T) {
 				t.Run("Shared readonly", func(t *testing.T) {
-					_, err := testHandlerListReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
+					_, err := testHandlerProjectReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared write", func(t *testing.T) {
-					_, err := testHandlerListWrite.testCreateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
+					_, err := testHandlerProjectWrite.testCreateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
 				t.Run("Shared admin", func(t *testing.T) {
-					_, err := testHandlerListAdmin.testCreateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
+					_, err := testHandlerProjectAdmin.testCreateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
 					assert.Error(t, err)
 					assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 				})
@@ -301,74 +301,74 @@ func TestLinkSharing(t *testing.T) {

 		t.Run("Right Management", func(t *testing.T) {
 			t.Run("Users", func(t *testing.T) {
-				testHandlerListUserReadOnly := webHandlerTest{
+				testHandlerProjectUserReadOnly := webHandlerTest{
 					linkShare: linkshareRead,
 					strFunc: func() handler.CObject {
-						return &models.ListUser{}
+						return &models.ProjectUser{}
 					},
 					t: t,
 				}
-				testHandlerListUserWrite := webHandlerTest{
+				testHandlerProjectUserWrite := webHandlerTest{
 					linkShare: linkShareWrite,
 					strFunc: func() handler.CObject {
-						return &models.ListUser{}
+						return &models.ProjectUser{}
 					},
 					t: t,
 				}
-				testHandlerListUserAdmin := webHandlerTest{
+				testHandlerProjectUserAdmin := webHandlerTest{
 					linkShare: linkShareAdmin,
 					strFunc: func() handler.CObject {
-						return &models.ListUser{}
+						return &models.ProjectUser{}
 					},
 					t: t,
 				}
 				t.Run("ReadAll", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						rec, err := testHandlerListUserReadOnly.testReadAllWithLinkShare(nil, map[string]string{"list": "1"})
+						rec, err := testHandlerProjectUserReadOnly.testReadAllWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						rec, err := testHandlerListUserWrite.testReadAllWithLinkShare(nil, map[string]string{"list": "2"})
+						rec, err := testHandlerProjectUserWrite.testReadAllWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						rec, err := testHandlerListUserAdmin.testReadAllWithLinkShare(nil, map[string]string{"list": "3"})
+						rec, err := testHandlerProjectUserAdmin.testReadAllWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `"username":"user1"`)
 					})
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "1"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserWrite.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"user_id":"user1"}`)
+						_, err := testHandlerProjectUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"project": "3"}, `{"user_id":"user1"}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -376,91 +376,91 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Delete", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListUserReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+						_, err := testHandlerProjectUserReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListUserWrite.testDeleteWithLinkShare(nil, map[string]string{"list": "2"})
+						_, err := testHandlerProjectUserWrite.testDeleteWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListUserAdmin.testDeleteWithLinkShare(nil, map[string]string{"list": "3"})
+						_, err := testHandlerProjectUserAdmin.testDeleteWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 			})
 			t.Run("Teams", func(t *testing.T) {
-				testHandlerListTeamReadOnly := webHandlerTest{
+				testHandlerProjectTeamReadOnly := webHandlerTest{
 					linkShare: linkshareRead,
 					strFunc: func() handler.CObject {
-						return &models.TeamList{}
+						return &models.TeamProject{}
 					},
 					t: t,
 				}
-				testHandlerListTeamWrite := webHandlerTest{
+				testHandlerProjectTeamWrite := webHandlerTest{
 					linkShare: linkShareWrite,
 					strFunc: func() handler.CObject {
-						return &models.TeamList{}
+						return &models.TeamProject{}
 					},
 					t: t,
 				}
-				testHandlerListTeamAdmin := webHandlerTest{
+				testHandlerProjectTeamAdmin := webHandlerTest{
 					linkShare: linkShareAdmin,
 					strFunc: func() handler.CObject {
-						return &models.TeamList{}
+						return &models.TeamProject{}
 					},
 					t: t,
 				}
 				t.Run("ReadAll", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						rec, err := testHandlerListTeamReadOnly.testReadAllWithLinkShare(nil, map[string]string{"list": "1"})
+						rec, err := testHandlerProjectTeamReadOnly.testReadAllWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						rec, err := testHandlerListTeamWrite.testReadAllWithLinkShare(nil, map[string]string{"list": "2"})
+						rec, err := testHandlerProjectTeamWrite.testReadAllWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `[]`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						rec, err := testHandlerListTeamAdmin.testReadAllWithLinkShare(nil, map[string]string{"list": "3"})
+						rec, err := testHandlerProjectTeamAdmin.testReadAllWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.NoError(t, err)
 						assert.Contains(t, rec.Body.String(), `"name":"testteam1"`)
 					})
 				})
 				t.Run("Create", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 				})
 				t.Run("Update", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"list": "1"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"project": "1"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"list": "2"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"project": "2"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"list": "3"}, `{"team_id":1}`)
+						_, err := testHandlerProjectTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"project": "3"}, `{"team_id":1}`)
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -468,17 +468,17 @@ func TestLinkSharing(t *testing.T) {
 				})
 				t.Run("Delete", func(t *testing.T) {
 					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerListTeamReadOnly.testDeleteWithLinkShare(nil, map[string]string{"list": "1"})
+						_, err := testHandlerProjectTeamReadOnly.testDeleteWithLinkShare(nil, map[string]string{"project": "1"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerListTeamWrite.testDeleteWithLinkShare(nil, map[string]string{"list": "2"})
+						_, err := testHandlerProjectTeamWrite.testDeleteWithLinkShare(nil, map[string]string{"project": "2"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
 					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerListTeamAdmin.testDeleteWithLinkShare(nil, map[string]string{"list": "3"})
+						_, err := testHandlerProjectTeamAdmin.testDeleteWithLinkShare(nil, map[string]string{"project": "3"})
 						assert.Error(t, err)
 						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 					})
@@ -586,34 +586,34 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Create", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerTaskReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandlerTaskReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerTaskWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerTaskAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
 		t.Run("Update", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerTaskReadOnly.testUpdateWithLinkShare(nil, map[string]string{"listtask": "1"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandlerTaskReadOnly.testUpdateWithLinkShare(nil, map[string]string{"projecttask": "1"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerTaskWrite.testUpdateWithLinkShare(nil, map[string]string{"listtask": "13"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskWrite.testUpdateWithLinkShare(nil, map[string]string{"projecttask": "13"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerTaskAdmin.testUpdateWithLinkShare(nil, map[string]string{"listtask": "32"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandlerTaskAdmin.testUpdateWithLinkShare(nil, map[string]string{"projecttask": "32"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
@@ -621,17 +621,17 @@ func TestLinkSharing(t *testing.T) {
 		})
 		t.Run("Delete", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerTaskReadOnly.testDeleteWithLinkShare(nil, map[string]string{"listtask": "1"})
+				_, err := testHandlerTaskReadOnly.testDeleteWithLinkShare(nil, map[string]string{"projecttask": "1"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerTaskWrite.testDeleteWithLinkShare(nil, map[string]string{"listtask": "13"})
+				rec, err := testHandlerTaskWrite.testDeleteWithLinkShare(nil, map[string]string{"projecttask": "13"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerTaskAdmin.testDeleteWithLinkShare(nil, map[string]string{"listtask": "32"})
+				rec, err := testHandlerTaskAdmin.testDeleteWithLinkShare(nil, map[string]string{"projecttask": "32"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
@@ -738,34 +738,34 @@ func TestLinkSharing(t *testing.T) {
 		}
 		t.Run("ReadAll", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				rec, err := testHandlerLinkShareReadOnly.testReadAllWithLinkShare(nil, map[string]string{"list": "1"})
+				rec, err := testHandlerLinkShareReadOnly.testReadAllWithLinkShare(nil, map[string]string{"project": "1"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hash":"test"`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				rec, err := testHandlerLinkShareWrite.testReadAllWithLinkShare(nil, map[string]string{"list": "2"})
+				rec, err := testHandlerLinkShareWrite.testReadAllWithLinkShare(nil, map[string]string{"project": "2"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hash":"test2"`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				rec, err := testHandlerLinkShareAdmin.testReadAllWithLinkShare(nil, map[string]string{"list": "3"})
+				rec, err := testHandlerLinkShareAdmin.testReadAllWithLinkShare(nil, map[string]string{"project": "3"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hash":"test3"`)
 			})
 		})
 		t.Run("Create", func(t *testing.T) {
 			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerLinkShareReadOnly.testCreateWithLinkShare(nil, map[string]string{"list": "1"}, `{}`)
+				_, err := testHandlerLinkShareReadOnly.testCreateWithLinkShare(nil, map[string]string{"project": "1"}, `{}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared write", func(t *testing.T) {
-				_, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{}`)
+				_, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared admin", func(t *testing.T) {
-				_, err := testHandlerLinkShareAdmin.testCreateWithLinkShare(nil, map[string]string{"list": "3"}, `{}`)
+				_, err := testHandlerLinkShareAdmin.testCreateWithLinkShare(nil, map[string]string{"project": "3"}, `{}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
@@ -806,284 +806,4 @@ func TestLinkSharing(t *testing.T) {
 			})
 		})
 	})
-
-	t.Run("Namespace", func(t *testing.T) {
-		testHandlerNamespaceReadOnly := webHandlerTest{
-			linkShare: linkshareRead,
-			strFunc: func() handler.CObject {
-				return &models.Namespace{}
-			},
-			t: t,
-		}
-		testHandlerNamespaceWrite := webHandlerTest{
-			linkShare: linkShareWrite,
-			strFunc: func() handler.CObject {
-				return &models.Namespace{}
-			},
-			t: t,
-		}
-		testHandlerNamespaceAdmin := webHandlerTest{
-			linkShare: linkShareAdmin,
-			strFunc: func() handler.CObject {
-				return &models.Namespace{}
-			},
-			t: t,
-		}
-		t.Run("ReadAll", func(t *testing.T) {
-			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerNamespaceReadOnly.testReadAllWithLinkShare(nil, map[string]string{"namespace": "1"})
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
-			})
-			t.Run("Shared write", func(t *testing.T) {
-				_, err := testHandlerNamespaceWrite.testReadAllWithLinkShare(nil, map[string]string{"namespace": "2"})
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
-			})
-			t.Run("Shared admin", func(t *testing.T) {
-				_, err := testHandlerNamespaceAdmin.testReadAllWithLinkShare(nil, map[string]string{"namespace": "3"})
-				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
-			})
-		})
-		t.Run("Create", func(t *testing.T) {
-			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerNamespaceReadOnly.testCreateWithLinkShare(nil, nil, `{"title":"LoremIpsum"}`)
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-			t.Run("Shared write", func(t *testing.T) {
-				_, err := testHandlerNamespaceWrite.testCreateWithLinkShare(nil, nil, `{"title":"LoremIpsum"}`)
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-			t.Run("Shared admin", func(t *testing.T) {
-				_, err := testHandlerNamespaceAdmin.testCreateWithLinkShare(nil, nil, `{"title":"LoremIpsum"}`)
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-		})
-		t.Run("Update", func(t *testing.T) {
-			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerNamespaceReadOnly.testUpdateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"title":"LoremIpsum"}`)
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-			t.Run("Shared write", func(t *testing.T) {
-				_, err := testHandlerNamespaceWrite.testUpdateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"title":"LoremIpsum"}`)
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-			t.Run("Shared admin", func(t *testing.T) {
-				_, err := testHandlerNamespaceAdmin.testUpdateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"title":"LoremIpsum"}`)
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-
-		})
-		t.Run("Delete", func(t *testing.T) {
-			t.Run("Shared readonly", func(t *testing.T) {
-				_, err := testHandlerNamespaceReadOnly.testDeleteWithLinkShare(nil, map[string]string{"namespace": "1"})
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-			t.Run("Shared write", func(t *testing.T) {
-				_, err := testHandlerNamespaceWrite.testDeleteWithLinkShare(nil, map[string]string{"namespace": "2"})
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-			t.Run("Shared admin", func(t *testing.T) {
-				_, err := testHandlerNamespaceAdmin.testDeleteWithLinkShare(nil, map[string]string{"namespace": "3"})
-				assert.Error(t, err)
-				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-			})
-		})
-
-		t.Run("Right Management", func(t *testing.T) {
-			t.Run("Users", func(t *testing.T) {
-				testHandlerNamespaceUserReadOnly := webHandlerTest{
-					linkShare: linkshareRead,
-					strFunc: func() handler.CObject {
-						return &models.NamespaceUser{}
-					},
-					t: t,
-				}
-				testHandlerNamespaceUserWrite := webHandlerTest{
-					linkShare: linkShareWrite,
-					strFunc: func() handler.CObject {
-						return &models.NamespaceUser{}
-					},
-					t: t,
-				}
-				testHandlerNamespaceUserAdmin := webHandlerTest{
-					linkShare: linkShareAdmin,
-					strFunc: func() handler.CObject {
-						return &models.NamespaceUser{}
-					},
-					t: t,
-				}
-				t.Run("ReadAll", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserReadOnly.testReadAllWithLinkShare(nil, map[string]string{"namespace": "1"})
-						assert.Error(t, err)
-						assertHandlerErrorCode(t, err, models.ErrCodeNeedToHaveNamespaceReadAccess)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserWrite.testReadAllWithLinkShare(nil, map[string]string{"namespace": "2"})
-						assert.Error(t, err)
-						assertHandlerErrorCode(t, err, models.ErrCodeNeedToHaveNamespaceReadAccess)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserAdmin.testReadAllWithLinkShare(nil, map[string]string{"namespace": "3"})
-						assert.Error(t, err)
-						assertHandlerErrorCode(t, err, models.ErrCodeNeedToHaveNamespaceReadAccess)
-					})
-				})
-				t.Run("Create", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserReadOnly.testCreateWithLinkShare(nil, nil, `{"user_id":"user1"}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserWrite.testCreateWithLinkShare(nil, nil, `{"user_id":"user1"}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserAdmin.testCreateWithLinkShare(nil, nil, `{"user_id":"user1"}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-				})
-				t.Run("Update", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserReadOnly.testUpdateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"user_id":"user1"}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserWrite.testUpdateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"user_id":"user1"}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserAdmin.testUpdateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"user_id":"user1"}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-
-				})
-				t.Run("Delete", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserReadOnly.testDeleteWithLinkShare(nil, map[string]string{"namespace": "1"})
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserWrite.testDeleteWithLinkShare(nil, map[string]string{"namespace": "2"})
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceUserAdmin.testDeleteWithLinkShare(nil, map[string]string{"namespace": "3"})
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-				})
-			})
-			t.Run("Teams", func(t *testing.T) {
-				testHandlerNamespaceTeamReadOnly := webHandlerTest{
-					linkShare: linkshareRead,
-					strFunc: func() handler.CObject {
-						return &models.TeamNamespace{}
-					},
-					t: t,
-				}
-				testHandlerNamespaceTeamWrite := webHandlerTest{
-					linkShare: linkShareWrite,
-					strFunc: func() handler.CObject {
-						return &models.TeamNamespace{}
-					},
-					t: t,
-				}
-				testHandlerNamespaceTeamAdmin := webHandlerTest{
-					linkShare: linkShareAdmin,
-					strFunc: func() handler.CObject {
-						return &models.TeamNamespace{}
-					},
-					t: t,
-				}
-				t.Run("ReadAll", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamReadOnly.testReadAllWithLinkShare(nil, map[string]string{"namespace": "1"})
-						assert.Error(t, err)
-						assertHandlerErrorCode(t, err, models.ErrCodeNeedToHaveNamespaceReadAccess)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamWrite.testReadAllWithLinkShare(nil, map[string]string{"namespace": "2"})
-						assert.Error(t, err)
-						assertHandlerErrorCode(t, err, models.ErrCodeNeedToHaveNamespaceReadAccess)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamAdmin.testReadAllWithLinkShare(nil, map[string]string{"namespace": "3"})
-						assert.Error(t, err)
-						assertHandlerErrorCode(t, err, models.ErrCodeNeedToHaveNamespaceReadAccess)
-					})
-				})
-				t.Run("Create", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamReadOnly.testCreateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"team_id":1}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamWrite.testCreateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"team_id":1}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamAdmin.testCreateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"team_id":1}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-				})
-				t.Run("Update", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamReadOnly.testUpdateWithLinkShare(nil, map[string]string{"namespace": "1"}, `{"team_id":1}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamWrite.testUpdateWithLinkShare(nil, map[string]string{"namespace": "2"}, `{"team_id":1}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamAdmin.testUpdateWithLinkShare(nil, map[string]string{"namespace": "3"}, `{"team_id":1}`)
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-
-				})
-				t.Run("Delete", func(t *testing.T) {
-					t.Run("Shared readonly", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamReadOnly.testDeleteWithLinkShare(nil, map[string]string{"namespace": "1"})
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared write", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamWrite.testDeleteWithLinkShare(nil, map[string]string{"namespace": "2"})
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-					t.Run("Shared admin", func(t *testing.T) {
-						_, err := testHandlerNamespaceTeamAdmin.testDeleteWithLinkShare(nil, map[string]string{"namespace": "3"})
-						assert.Error(t, err)
-						assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
-					})
-				})
-			})
-		})
-	})
 }
@@ -26,11 +26,11 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func TestList(t *testing.T) {
+func TestProject(t *testing.T) {
 	testHandler := webHandlerTest{
 		user: &testuser1,
 		strFunc: func() handler.CObject {
-			return &models.List{}
+			return &models.Project{}
 		},
 		t: t,
 	}
@@ -40,10 +40,9 @@ func TestList(t *testing.T) {
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `Test1`)
 			assert.NotContains(t, rec.Body.String(), `Test2"`)
-			assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_list
-			assert.Contains(t, rec.Body.String(), `Test4`) // Shared via namespace
+			assert.Contains(t, rec.Body.String(), `Test3`)  // Shared directly via users_project
+			assert.Contains(t, rec.Body.String(), `Test12`) // Shared via parent project
 			assert.NotContains(t, rec.Body.String(), `Test5`)
-			assert.NotContains(t, rec.Body.String(), `Test21`) // Archived through namespace
 			assert.NotContains(t, rec.Body.String(), `Test22`) // Archived directly
 		})
 		t.Run("Search", func(t *testing.T) {
@@ -55,113 +54,113 @@ func TestList(t *testing.T) {
 			assert.NotContains(t, rec.Body.String(), `Test4`)
 			assert.NotContains(t, rec.Body.String(), `Test5`)
 		})
-		t.Run("Normal with archived lists", func(t *testing.T) {
+		t.Run("Normal with archived projects", func(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"is_archived": []string{"true"}}, nil)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `Test1`)
 			assert.NotContains(t, rec.Body.String(), `Test2"`)
-			assert.Contains(t, rec.Body.String(), `Test3`) // Shared directly via users_list
-			assert.Contains(t, rec.Body.String(), `Test4`) // Shared via namespace
+			assert.Contains(t, rec.Body.String(), `Test3`)  // Shared directly via users_project
+			assert.Contains(t, rec.Body.String(), `Test12`) // Shared via parent project
 			assert.NotContains(t, rec.Body.String(), `Test5`)
-			assert.Contains(t, rec.Body.String(), `Test21`) // Archived through namespace
+			assert.Contains(t, rec.Body.String(), `Test21`) // Archived through project
 			assert.Contains(t, rec.Body.String(), `Test22`) // Archived directly
 		})
 	})
 	t.Run("ReadOne", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "1"})
+			rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Test1"`)
 			assert.NotContains(t, rec.Body.String(), `"title":"Test2"`)
 			assert.Contains(t, rec.Body.String(), `"owner":{"id":1,"name":"","username":"user1",`)
 			assert.NotContains(t, rec.Body.String(), `"owner":{"id":2,"name":"","username":"user2",`)
 			assert.NotContains(t, rec.Body.String(), `"tasks":`)
-			assert.Equal(t, "2", rec.Result().Header.Get("x-max-right")) // User 1 is owner so they should have admin rights.
+			assert.Equal(t, "2", rec.Result().Header.Get("x-max-right")) // User 1 is owner, so they should have admin rights.
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "9999"})
+			_, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "9999"})
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "20"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "20"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `You don't have the right to see this`)
 				assert.Empty(t, rec.Result().Header.Get("x-max-rights"))
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "6"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "6"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test6"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "7"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "7"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test7"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "8"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "8"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test8"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "9"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "9"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test9"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "10"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "10"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test10"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "11"})
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "11"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test11"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "12"})
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "12"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test12"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "13"})
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "13"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test13"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "14"})
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "14"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test14"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "15"})
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "15"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test15"`)
 				assert.Equal(t, "0", rec.Result().Header.Get("x-max-right"))
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "16"})
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "16"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test16"`)
 				assert.Equal(t, "1", rec.Result().Header.Get("x-max-right"))
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"list": "17"})
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testReadOneWithUser(nil, map[string]string{"project": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Test17"`)
 				assert.Equal(t, "2", rec.Result().Header.Get("x-max-right"))
@@ -170,101 +169,101 @@ func TestList(t *testing.T) {
 	})
 	t.Run("Update", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			// Check the list was loaded successfully afterwards, see testReadOneWithUser
-			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":"TestLoremIpsum","namespace_id":1}`)
+			// Check the project was loaded successfully afterwards, see testReadOneWithUser
+			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":"TestLoremIpsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			// The description should not be updated but returned correctly
 			assert.Contains(t, rec.Body.String(), `description":"Lorem Ipsum`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "9999"}, `{"title":"TestLoremIpsum"}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "9999"}, `{"title":"TestLoremIpsum"}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Normal with updating the description", func(t *testing.T) {
-			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":"TestLoremIpsum","description":"Lorem Ipsum dolor sit amet","namespace_id":1}`)
+			rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":"TestLoremIpsum","description":"Lorem Ipsum dolor sit amet"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			assert.Contains(t, rec.Body.String(), `"description":"Lorem Ipsum dolor sit amet`)
 		})
 		t.Run("Empty title", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":""}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":""}`)
 			assert.Error(t, err)
 			assert.Contains(t, err.(*echo.HTTPError).Message.(models.ValidationHTTPError).InvalidFields, "title: non zero value required")
 		})
 		t.Run("Title too long", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea taki"}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea taki"}`)
 			assert.Error(t, err)
 			assert.Contains(t, err.(*echo.HTTPError).Message.(models.ValidationHTTPError).InvalidFields[0], "does not validate as runelength(1|250)")
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "20"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "20"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "6"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "6"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "7"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "7"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "8"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "8"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "9"}, `{"title":"TestLoremIpsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "9"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "10"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "10"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "11"}, `{"title":"TestLoremIpsum","namespace_id":6}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "11"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "12"}, `{"title":"TestLoremIpsum"}`)
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "12"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "13"}, `{"title":"TestLoremIpsum","namespace_id":8}`)
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "13"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "14"}, `{"title":"TestLoremIpsum","namespace_id":9}`)
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "14"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "15"}, `{"title":"TestLoremIpsum"}`)
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "15"}, `{"title":"TestLoremIpsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "16"}, `{"title":"TestLoremIpsum","namespace_id":11}`)
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "16"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"list": "17"}, `{"title":"TestLoremIpsum","namespace_id":12}`)
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"project": "17"}, `{"title":"TestLoremIpsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"TestLoremIpsum"`)
 			})
@@ -272,82 +271,82 @@ func TestList(t *testing.T) {
 	})
 	t.Run("Delete", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "1"})
+			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "999"})
+			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "999"})
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "20"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "20"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "6"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "6"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "7"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "7"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "8"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "8"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "9"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "9"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "10"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "10"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "11"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "11"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "12"})
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "12"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "13"})
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "13"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "14"})
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "14"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "15"})
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "15"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "16"})
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "16"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"list": "17"})
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"project": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"message":"Successfully deleted."`)
 			})
@@ -355,8 +354,8 @@ func TestList(t *testing.T) {
 	})
 	t.Run("Create", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			// Check the list was loaded successfully after update, see testReadOneWithUser
-			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem"}`)
+			// Check the project was loaded successfully after update, see testReadOneWithUser
+			rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem"`)
 			assert.Contains(t, rec.Body.String(), `"description":""`)
@@ -364,52 +363,50 @@ func TestList(t *testing.T) {
 			assert.NotContains(t, rec.Body.String(), `"tasks":`)
 		})
 		t.Run("Normal with description", func(t *testing.T) {
-			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem","description":"Lorem Ipsum"}`)
+			rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","description":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem"`)
 			assert.Contains(t, rec.Body.String(), `"description":"Lorem Ipsum"`)
 			assert.Contains(t, rec.Body.String(), `"owner":{"id":1`)
 			assert.NotContains(t, rec.Body.String(), `"tasks":`)
 		})
-		t.Run("Nonexisting Namespace", func(t *testing.T) {
-			_, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "999999"}, `{"title":"Lorem"}`)
+		t.Run("Nonexisting parent project", func(t *testing.T) {
+			_, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":99999}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeNamespaceDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Empty title", func(t *testing.T) {
-			_, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "1"}, `{"title":""}`)
+			_, err := testHandler.testCreateWithUser(nil, nil, `{"title":""}`)
 			assert.Error(t, err)
 			assert.Contains(t, err.(*echo.HTTPError).Message.(models.ValidationHTTPError).InvalidFields, "title: non zero value required")
 		})
 		t.Run("Title too long", func(t *testing.T) {
-			_, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "1"}, `{"title":"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea taki"}`)
+			_, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea taki"}`)
 			assert.Error(t, err)
 			assert.Contains(t, err.(*echo.HTTPError).Message.(models.ValidationHTTPError).InvalidFields[0], "does not validate as runelength(1|250)")
 		})
 		t.Run("Rights check", func(t *testing.T) {
-
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "15"}, `{"title":"Lorem"}`)
+				_, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":20}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-
-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "7"}, `{"title":"Lorem"}`)
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":32}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "8"}, `{"title":"Lorem"}`)
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":33}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem"`)
 				assert.Contains(t, rec.Body.String(), `"description":""`)
 				assert.Contains(t, rec.Body.String(), `"owner":{"id":1`)
 				assert.NotContains(t, rec.Body.String(), `"tasks":`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "9"}, `{"title":"Lorem"}`)
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":34}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem"`)
 				assert.Contains(t, rec.Body.String(), `"description":""`)
@@ -417,21 +414,21 @@ func TestList(t *testing.T) {
 				assert.NotContains(t, rec.Body.String(), `"tasks":`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "10"}, `{"title":"Lorem"}`)
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":9}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "11"}, `{"title":"Lorem"}`)
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, nil, `{"title":"Lorem","parent_project_id":10}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem"`)
 				assert.Contains(t, rec.Body.String(), `"description":""`)
 				assert.Contains(t, rec.Body.String(), `"owner":{"id":1`)
 				assert.NotContains(t, rec.Body.String(), `"tasks":`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "12"}, `{"title":"Lorem"}`)
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"namespace": "12"}, `{"title":"Lorem","parent_project_id":11}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem"`)
 				assert.Contains(t, rec.Body.String(), `"description":""`)
@@ -33,23 +33,23 @@ func TestTaskCollection(t *testing.T) {
 		},
 		t: t,
 	}
-	t.Run("ReadAll on list", func(t *testing.T) {
+	t.Run("ReadAll on project", func(t *testing.T) {

-		urlParams := map[string]string{"list": "1"}
+		urlParams := map[string]string{"project": "1"}

 		t.Run("Normal", func(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(nil, urlParams)
 			assert.NoError(t, err)
 			// Not using assert.Equal to avoid having the tests break every time we add new fixtures
 			assert.Contains(t, rec.Body.String(), `task #1`)
-			assert.Contains(t, rec.Body.String(), `task #2`)
-			assert.Contains(t, rec.Body.String(), `task #3`)
-			assert.Contains(t, rec.Body.String(), `task #4`)
-			assert.Contains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.Contains(t, rec.Body.String(), `task #7`)
-			assert.Contains(t, rec.Body.String(), `task #8`)
-			assert.Contains(t, rec.Body.String(), `task #9`)
+			assert.Contains(t, rec.Body.String(), `task #2 `)
+			assert.Contains(t, rec.Body.String(), `task #3 `)
+			assert.Contains(t, rec.Body.String(), `task #4 `)
+			assert.Contains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.Contains(t, rec.Body.String(), `task #7 `)
+			assert.Contains(t, rec.Body.String(), `task #8 `)
+			assert.Contains(t, rec.Body.String(), `task #9 `)
 			assert.Contains(t, rec.Body.String(), `task #10`)
 			assert.Contains(t, rec.Body.String(), `task #11`)
 			assert.Contains(t, rec.Body.String(), `task #12`)
@@ -75,14 +75,14 @@ func TestTaskCollection(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"s": []string{"task #6"}}, urlParams)
 			assert.NoError(t, err)
 			assert.NotContains(t, rec.Body.String(), `task #1`)
-			assert.NotContains(t, rec.Body.String(), `task #2`)
-			assert.NotContains(t, rec.Body.String(), `task #3`)
-			assert.NotContains(t, rec.Body.String(), `task #4`)
-			assert.NotContains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.NotContains(t, rec.Body.String(), `task #7`)
-			assert.NotContains(t, rec.Body.String(), `task #8`)
-			assert.NotContains(t, rec.Body.String(), `task #9`)
+			assert.NotContains(t, rec.Body.String(), `task #2 `)
+			assert.NotContains(t, rec.Body.String(), `task #3 `)
+			assert.NotContains(t, rec.Body.String(), `task #4 `)
+			assert.NotContains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.NotContains(t, rec.Body.String(), `task #7 `)
+			assert.NotContains(t, rec.Body.String(), `task #8 `)
+			assert.NotContains(t, rec.Body.String(), `task #9 `)
 			assert.NotContains(t, rec.Body.String(), `task #10`)
 			assert.NotContains(t, rec.Body.String(), `task #11`)
 			assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -93,14 +93,14 @@ func TestTaskCollection(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"s": []string{"tASk #6"}}, urlParams)
 			assert.NoError(t, err)
 			assert.NotContains(t, rec.Body.String(), `task #1`)
-			assert.NotContains(t, rec.Body.String(), `task #2`)
-			assert.NotContains(t, rec.Body.String(), `task #3`)
-			assert.NotContains(t, rec.Body.String(), `task #4`)
-			assert.NotContains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.NotContains(t, rec.Body.String(), `task #7`)
-			assert.NotContains(t, rec.Body.String(), `task #8`)
-			assert.NotContains(t, rec.Body.String(), `task #9`)
+			assert.NotContains(t, rec.Body.String(), `task #2 `)
+			assert.NotContains(t, rec.Body.String(), `task #3 `)
+			assert.NotContains(t, rec.Body.String(), `task #4 `)
+			assert.NotContains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.NotContains(t, rec.Body.String(), `task #7 `)
+			assert.NotContains(t, rec.Body.String(), `task #8 `)
+			assert.NotContains(t, rec.Body.String(), `task #9 `)
 			assert.NotContains(t, rec.Body.String(), `task #10`)
 			assert.NotContains(t, rec.Body.String(), `task #11`)
 			assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -113,49 +113,49 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("by priority", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			t.Run("by priority desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
 			})
 			t.Run("by priority asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			// should equal duedate asc
 			t.Run("by due_date", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by duedate desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
 			})
 			// Due date without unix suffix
 			t.Run("by duedate asc without  suffix", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by due_date without suffix", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by duedate desc without  suffix", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"desc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
 			})
 			t.Run("by duedate asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"asc"}}, urlParams)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("invalid sort parameter", func(t *testing.T) {
 				_, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"loremipsum"}}, urlParams)
@@ -171,10 +171,10 @@ func TestTaskCollection(t *testing.T) {
 				// Invalid parameter should not sort at all
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort": []string{"loremipsum"}}, urlParams)
 				assert.NoError(t, err)
-				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1`)
-				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
-				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
-				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
+				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
 			})
 		})
 		t.Run("Filter", func(t *testing.T) {
@@ -190,14 +190,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.Contains(t, rec.Body.String(), `task #5`)
-					assert.Contains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.Contains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.Contains(t, rec.Body.String(), `task #5 `)
+					assert.Contains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.Contains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -215,14 +215,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.NotContains(t, rec.Body.String(), `task #5`)
-					assert.NotContains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.NotContains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.NotContains(t, rec.Body.String(), `task #5 `)
+					assert.NotContains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.NotContains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -255,14 +255,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.Contains(t, rec.Body.String(), `task #5`)
-					assert.Contains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.NotContains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.Contains(t, rec.Body.String(), `task #5 `)
+					assert.Contains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.NotContains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -287,18 +287,18 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("date range", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(
 					nil,
-					map[string]string{"list": "-2"}, // Actually a saved filter - contains the same filter arguments as the start and end date filter from above
+					map[string]string{"project": "-2"}, // Actually a saved filter - contains the same filter arguments as the start and end date filter from above
 				)
 				assert.NoError(t, err)
 				assert.NotContains(t, rec.Body.String(), `task #1`)
-				assert.NotContains(t, rec.Body.String(), `task #2`)
-				assert.NotContains(t, rec.Body.String(), `task #3`)
-				assert.NotContains(t, rec.Body.String(), `task #4`)
-				assert.Contains(t, rec.Body.String(), `task #5`)
-				assert.Contains(t, rec.Body.String(), `task #6`)
-				assert.Contains(t, rec.Body.String(), `task #7`)
-				assert.Contains(t, rec.Body.String(), `task #8`)
-				assert.Contains(t, rec.Body.String(), `task #9`)
+				assert.NotContains(t, rec.Body.String(), `task #2 `)
+				assert.NotContains(t, rec.Body.String(), `task #3 `)
+				assert.NotContains(t, rec.Body.String(), `task #4 `)
+				assert.Contains(t, rec.Body.String(), `task #5 `)
+				assert.Contains(t, rec.Body.String(), `task #6 `)
+				assert.Contains(t, rec.Body.String(), `task #7 `)
+				assert.Contains(t, rec.Body.String(), `task #8 `)
+				assert.Contains(t, rec.Body.String(), `task #9 `)
 				assert.NotContains(t, rec.Body.String(), `task #10`)
 				assert.NotContains(t, rec.Body.String(), `task #11`)
 				assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -314,14 +314,14 @@ func TestTaskCollection(t *testing.T) {
 			assert.NoError(t, err)
 			// Not using assert.Equal to avoid having the tests break every time we add new fixtures
 			assert.Contains(t, rec.Body.String(), `task #1`)
-			assert.Contains(t, rec.Body.String(), `task #2`)
-			assert.Contains(t, rec.Body.String(), `task #3`)
-			assert.Contains(t, rec.Body.String(), `task #4`)
-			assert.Contains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.Contains(t, rec.Body.String(), `task #7`)
-			assert.Contains(t, rec.Body.String(), `task #8`)
-			assert.Contains(t, rec.Body.String(), `task #9`)
+			assert.Contains(t, rec.Body.String(), `task #2 `)
+			assert.Contains(t, rec.Body.String(), `task #3 `)
+			assert.Contains(t, rec.Body.String(), `task #4 `)
+			assert.Contains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.Contains(t, rec.Body.String(), `task #7 `)
+			assert.Contains(t, rec.Body.String(), `task #8 `)
+			assert.Contains(t, rec.Body.String(), `task #9 `)
 			assert.Contains(t, rec.Body.String(), `task #10`)
 			assert.Contains(t, rec.Body.String(), `task #11`)
 			assert.Contains(t, rec.Body.String(), `task #12`)
@@ -341,20 +341,20 @@ func TestTaskCollection(t *testing.T) {
 			assert.Contains(t, rec.Body.String(), `task #24`) // Shared via namespace user readonly
 			assert.Contains(t, rec.Body.String(), `task #25`) // Shared via namespace user write
 			assert.Contains(t, rec.Body.String(), `task #26`) // Shared via namespace user admin
-			// TODO: Add some cases where the user has access to the list, somhow shared
+			// TODO: Add some cases where the user has access to the project, somhow shared
 		})
 		t.Run("Search", func(t *testing.T) {
 			rec, err := testHandler.testReadAllWithUser(url.Values{"s": []string{"task #6"}}, nil)
 			assert.NoError(t, err)
 			assert.NotContains(t, rec.Body.String(), `task #1`)
-			assert.NotContains(t, rec.Body.String(), `task #2`)
-			assert.NotContains(t, rec.Body.String(), `task #3`)
-			assert.NotContains(t, rec.Body.String(), `task #4`)
-			assert.NotContains(t, rec.Body.String(), `task #5`)
-			assert.Contains(t, rec.Body.String(), `task #6`)
-			assert.NotContains(t, rec.Body.String(), `task #7`)
-			assert.NotContains(t, rec.Body.String(), `task #8`)
-			assert.NotContains(t, rec.Body.String(), `task #9`)
+			assert.NotContains(t, rec.Body.String(), `task #2 `)
+			assert.NotContains(t, rec.Body.String(), `task #3 `)
+			assert.NotContains(t, rec.Body.String(), `task #4 `)
+			assert.NotContains(t, rec.Body.String(), `task #5 `)
+			assert.Contains(t, rec.Body.String(), `task #6 `)
+			assert.NotContains(t, rec.Body.String(), `task #7 `)
+			assert.NotContains(t, rec.Body.String(), `task #8 `)
+			assert.NotContains(t, rec.Body.String(), `task #9 `)
 			assert.NotContains(t, rec.Body.String(), `task #10`)
 			assert.NotContains(t, rec.Body.String(), `task #11`)
 			assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -366,42 +366,42 @@ func TestTaskCollection(t *testing.T) {
 			t.Run("by priority", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":35,"title":"task #35","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":21,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":[{"id":2,"name":"","username":"user2","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}],"labels":[{"id":4,"title":"Label #4 - visible via other task","description":"","hex_color":"","created_by":{"id":2,"name":"","username":"user2","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"},"created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}],"hex_color":"","percent_done":0,"identifier":"test21-1","index":1,"related_tasks":{"related":[{"id":1,"title":"task #1","description":"Lorem Ipsum","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"","index":1,"related_tasks":null,"attachments":null,"cover_image_attachment_id":0,"is_favorite":true,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":2,"kanban_position":0,"created_by":null},{"id":1,"title":"task #1","description":"Lorem Ipsum","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"","index":1,"related_tasks":null,"attachments":null,"cover_image_attachment_id":0,"is_favorite":true,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":2,"kanban_position":0,"created_by":null}]},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":19,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			t.Run("by priority desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"desc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.Contains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-3","index":3,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":4,"title":"task #4 low prio","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":1`)
 			})
 			t.Run("by priority asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}, "order_by": []string{"asc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":35,"title":"task #35","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":21,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":[{"id":2,"name":"","username":"user2","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}],"labels":[{"id":4,"title":"Label #4 - visible via other task","description":"","hex_color":"","created_by":{"id":2,"name":"","username":"user2","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"},"created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}],"hex_color":"","percent_done":0,"identifier":"test21-1","index":1,"related_tasks":{"related":[{"id":1,"title":"task #1","description":"Lorem Ipsum","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"","index":1,"related_tasks":null,"attachments":null,"cover_image_attachment_id":0,"is_favorite":true,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":2,"kanban_position":0,"created_by":null},{"id":1,"title":"task #1","description":"Lorem Ipsum","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"","index":1,"related_tasks":null,"attachments":null,"cover_image_attachment_id":0,"is_favorite":true,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":1,"position":2,"kanban_position":0,"created_by":null}]},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":19,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
 			})
 			// should equal duedate asc
 			t.Run("by due_date", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("by duedate desc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"desc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
+				assert.Contains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":6,"title":"task #6 lower due date`)
 			})
 			t.Run("by duedate asc", func(t *testing.T) {
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"due_date"}, "order_by": []string{"asc"}}, nil)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminder_dates":null,"list_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
+				assert.Contains(t, rec.Body.String(), `[{"id":6,"title":"task #6 lower due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-11-30T22:25:24Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-6","index":6,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":3,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"2018-12-01T03:58:44Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0,"identifier":"test1-5","index":5,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":2,"position":0,"kanban_position":0,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}`)
 			})
 			t.Run("invalid parameter", func(t *testing.T) {
 				// Invalid parameter should not sort at all
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort": []string{"loremipsum"}}, nil)
 				assert.NoError(t, err)
-				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1`)
-				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
-				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
-				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminder_dates":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"repeat_after":0,"repeat_mode":0,"priority":1`)
+				assert.NotContains(t, rec.Body.String(), `{"id":4,"title":"task #4 low prio","description":"","done":false,"due_date":0,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":1,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":3,"title":"task #3 high prio","description":"","done":false,"due_date":0,"repeat_after":0,"repeat_mode":0,"priority":100,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
+				assert.NotContains(t, rec.Body.String(), `[{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":6,"title":"task #6 lower due date"`)
+				assert.NotContains(t, rec.Body.String(), `{"id":6,"title":"task #6 lower due date","description":"","done":false,"due_date":1543616724,"reminders":null,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"hex_color":"","created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}},{"id":5,"title":"task #5 higher due date","description":"","done":false,"due_date":1543636724,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":0,"end_date":0,"assignees":null,"labels":null,"created":1543626724,"updated":1543626724,"created_by":{"id":0,"name":"","username":"","email":"","created":0,"updated":0}}]`)
 			})
 		})
 		t.Run("Filter", func(t *testing.T) {
@@ -417,14 +417,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.Contains(t, rec.Body.String(), `task #5`)
-					assert.Contains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.Contains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.Contains(t, rec.Body.String(), `task #5 `)
+					assert.Contains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.Contains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -442,14 +442,14 @@ func TestTaskCollection(t *testing.T) {
 					)
 					assert.NoError(t, err)
 					assert.NotContains(t, rec.Body.String(), `task #1`)
-					assert.NotContains(t, rec.Body.String(), `task #2`)
-					assert.NotContains(t, rec.Body.String(), `task #3`)
-					assert.NotContains(t, rec.Body.String(), `task #4`)
-					assert.NotContains(t, rec.Body.String(), `task #5`)
-					assert.NotContains(t, rec.Body.String(), `task #6`)
-					assert.Contains(t, rec.Body.String(), `task #7`)
-					assert.NotContains(t, rec.Body.String(), `task #8`)
-					assert.Contains(t, rec.Body.String(), `task #9`)
+					assert.NotContains(t, rec.Body.String(), `task #2 `)
+					assert.NotContains(t, rec.Body.String(), `task #3 `)
+					assert.NotContains(t, rec.Body.String(), `task #4 `)
+					assert.NotContains(t, rec.Body.String(), `task #5 `)
+					assert.NotContains(t, rec.Body.String(), `task #6 `)
+					assert.Contains(t, rec.Body.String(), `task #7 `)
+					assert.NotContains(t, rec.Body.String(), `task #8 `)
+					assert.Contains(t, rec.Body.String(), `task #9 `)
 					assert.NotContains(t, rec.Body.String(), `task #10`)
 					assert.NotContains(t, rec.Body.String(), `task #11`)
 					assert.NotContains(t, rec.Body.String(), `task #12`)
@@ -39,7 +39,7 @@ func TestTaskComments(t *testing.T) {
 		linkShare: &models.LinkSharing{
 			ID:          2,
 			Hash:        "test2",
-			ListID:      2,
+			ProjectID:   2,
 			Right:       models.RightWrite,
 			SharingType: models.SharingTypeWithoutPassword,
 			SharedByID:  1,
@@ -101,33 +101,33 @@ func TestTaskComments(t *testing.T) {
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"task": "21", "commentid": "9"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"task": "22", "commentid": "10"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"task": "23", "commentid": "11"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"task": "24", "commentid": "12"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"task": "25", "commentid": "13"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
 				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"task": "26", "commentid": "14"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
@@ -184,33 +184,33 @@ func TestTaskComments(t *testing.T) {
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
 				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"task": "21", "commentid": "9"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
 				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"task": "22", "commentid": "10"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
 				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"task": "23", "commentid": "11"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
 				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"task": "24", "commentid": "12"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
 				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"task": "25", "commentid": "13"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
 				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"task": "26", "commentid": "14"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
@@ -267,33 +267,33 @@ func TestTaskComments(t *testing.T) {
 				assert.Contains(t, rec.Body.String(), `"comment":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
 				_, err := testHandler.testCreateWithUser(nil, map[string]string{"task": "21"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
 				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"task": "22"}, `{"comment":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"comment":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
 				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"task": "23"}, `{"comment":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"comment":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
 				_, err := testHandler.testCreateWithUser(nil, map[string]string{"task": "24"}, `{"comment":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
 				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"task": "25"}, `{"comment":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"comment":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
 				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"task": "26"}, `{"comment":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"comment":"Lorem Ipsum"`)
@@ -39,7 +39,7 @@ func TestTask(t *testing.T) {
 		linkShare: &models.LinkSharing{
 			ID:          2,
 			Hash:        "test2",
-			ListID:      2,
+			ProjectID:   2,
 			Right:       models.RightWrite,
 			SharingType: models.SharingTypeWithoutPassword,
 			SharedByID:  1,
@@ -54,157 +54,159 @@ func TestTask(t *testing.T) {
 	t.Run("Update", func(t *testing.T) {
 		t.Run("Update task items", func(t *testing.T) {
 			t.Run("Title", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 				assert.NotContains(t, rec.Body.String(), `"title":"task #1"`)
 			})
 			t.Run("Description", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"description":"Dolor sit amet"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"description":"Dolor sit amet"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"description":"Dolor sit amet"`)
 				assert.NotContains(t, rec.Body.String(), `"description":"Lorem Ipsum"`)
 			})
 			t.Run("Description to empty", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"description":""}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"description":""}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"description":""`)
 				assert.NotContains(t, rec.Body.String(), `"description":"Lorem Ipsum"`)
 			})
 			t.Run("Done", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"done":true}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"done":true}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"done":true`)
 				assert.NotContains(t, rec.Body.String(), `"done":false`)
 			})
 			t.Run("Undone", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "2"}, `{"done":false}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "2"}, `{"done":false}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"done":false`)
 				assert.NotContains(t, rec.Body.String(), `"done":true`)
 			})
 			t.Run("Due date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"due_date": "2020-02-10T10:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"due_date": "2020-02-10T10:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"due_date":"2020-02-10T10:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"due_date":0`)
 			})
 			t.Run("Due date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "5"}, `{"due_date": null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "5"}, `{"due_date": null}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"due_date":"0001-01-01T00:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"due_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Reminders", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"reminder_dates": ["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"reminders": [{"reminder": "2020-02-10T10:00:00Z"},{"reminder": "2020-02-11T10:00:00Z"}]}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"reminder_dates":["2020-02-10T10:00:00Z","2020-02-11T10:00:00Z"]`)
-				assert.NotContains(t, rec.Body.String(), `"reminder_dates": null`)
+				assert.Contains(t, rec.Body.String(), `"reminders":[`)
+				assert.Contains(t, rec.Body.String(), `{"reminder":"2020-02-10T10:00:00Z"`)
+				assert.Contains(t, rec.Body.String(), `{"reminder":"2020-02-11T10:00:00Z"`)
+				assert.NotContains(t, rec.Body.String(), `"reminders":null`)
 			})
 			t.Run("Reminders unset to empty array", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminder_dates": []}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "27"}, `{"reminders": []}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"reminder_dates":null`)
-				assert.NotContains(t, rec.Body.String(), `"reminder_dates":[1543626724,1543626824]`)
+				assert.Contains(t, rec.Body.String(), `"reminders":null`)
+				assert.NotContains(t, rec.Body.String(), `{"Reminder":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Reminders unset to null", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "27"}, `{"reminder_dates": null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "27"}, `{"reminders": null}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"reminder_dates":null`)
-				assert.NotContains(t, rec.Body.String(), `"reminder_dates":[1543626724,1543626824]`)
+				assert.Contains(t, rec.Body.String(), `"reminders":null`)
+				assert.NotContains(t, rec.Body.String(), `{"Reminder":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Repeat after", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"repeat_after":3600}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"repeat_after":3600}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"repeat_after":3600`)
 				assert.NotContains(t, rec.Body.String(), `"repeat_after":0`)
 			})
 			t.Run("Repeat after unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "28"}, `{"repeat_after":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "28"}, `{"repeat_after":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"repeat_after":0`)
 				assert.NotContains(t, rec.Body.String(), `"repeat_after":3600`)
 			})
 			t.Run("Repeat after update done", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "28"}, `{"done":true}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "28"}, `{"done":true}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"done":false`)
 				assert.NotContains(t, rec.Body.String(), `"done":true`)
 			})
 			t.Run("Assignees", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"assignees":[{"id":1}]}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"assignees":[{"id":1}]}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"assignees":[{"id":1`)
 				assert.NotContains(t, rec.Body.String(), `"assignees":[]`)
 			})
 			t.Run("Removing Assignees empty array", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "30"}, `{"assignees":[]}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "30"}, `{"assignees":[]}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"assignees":null`)
 				assert.NotContains(t, rec.Body.String(), `"assignees":[{"id":1`)
 			})
 			t.Run("Removing Assignees null", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "30"}, `{"assignees":null}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "30"}, `{"assignees":null}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"assignees":null`)
 				assert.NotContains(t, rec.Body.String(), `"assignees":[{"id":1`)
 			})
 			t.Run("Priority", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"priority":100}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"priority":100}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"priority":100`)
 				assert.NotContains(t, rec.Body.String(), `"priority":0`)
 			})
 			t.Run("Priority to 0", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "3"}, `{"priority":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "3"}, `{"priority":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"priority":0`)
 				assert.NotContains(t, rec.Body.String(), `"priority":100`)
 			})
 			t.Run("Start date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"start_date":"2020-02-10T10:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"start_date":"2020-02-10T10:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"start_date":"2020-02-10T10:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"start_date":0`)
 			})
 			t.Run("Start date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "7"}, `{"start_date":"0001-01-01T00:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "7"}, `{"start_date":"0001-01-01T00:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"start_date":"0001-01-01T00:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"start_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("End date", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"end_date":"2020-02-10T12:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"end_date":"2020-02-10T12:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"end_date":"2020-02-10T12:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"end_date":""`)
 			})
 			t.Run("End date unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "8"}, `{"end_date":"0001-01-01T00:00:00Z"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "8"}, `{"end_date":"0001-01-01T00:00:00Z"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"end_date":"0001-01-01T00:00:00Z"`)
 				assert.NotContains(t, rec.Body.String(), `"end_date":"2020-02-10T10:00:00Z"`)
 			})
 			t.Run("Color", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"hex_color":"f0f0f0"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"hex_color":"f0f0f0"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hex_color":"f0f0f0"`)
 				assert.NotContains(t, rec.Body.String(), `"hex_color":""`)
 			})
 			t.Run("Color unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "31"}, `{"hex_color":""}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "31"}, `{"hex_color":""}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"hex_color":""`)
 				assert.NotContains(t, rec.Body.String(), `"hex_color":"f0f0f0"`)
 			})
 			t.Run("Percent Done", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"percent_done":0.1}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"percent_done":0.1}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"percent_done":0.1`)
 				assert.NotContains(t, rec.Body.String(), `"percent_done":0,`)
 			})
 			t.Run("Percent Done unset", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "33"}, `{"percent_done":0}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "33"}, `{"percent_done":0}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"percent_done":0,`)
 				assert.NotContains(t, rec.Body.String(), `"percent_done":0.1`)
@@ -212,112 +214,112 @@ func TestTask(t *testing.T) {
 		})

 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "99999"}, `{"title":"Lorem Ipsum"}`)
+			_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "99999"}, `{"title":"Lorem Ipsum"}`)
 			assert.Error(t, err)
 			assertHandlerErrorCode(t, err, models.ErrCodeTaskDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "14"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "14"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "15"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "15"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "16"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "16"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "17"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "17"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "18"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "18"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "19"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "19"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "20"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "20"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "21"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "21"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "22"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "22"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "23"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "23"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "24"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "24"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "25"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "25"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "26"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "26"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
-		t.Run("Move to other list", func(t *testing.T) {
+		t.Run("Move to other project", func(t *testing.T) {
 			t.Run("normal", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":7}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"project_id":7}`)
 				assert.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"list_id":7`)
-				assert.NotContains(t, rec.Body.String(), `"list_id":1`)
+				assert.Contains(t, rec.Body.String(), `"project_id":7`)
+				assert.NotContains(t, rec.Body.String(), `"project_id":1`)
 			})
 			t.Run("Forbidden", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":20}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"project_id":20}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
 			})
 			t.Run("Read Only", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"list_id":6}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"project_id":6}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrorCodeGenericForbidden)
 			})
 		})
 		t.Run("Bucket", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":3}`)
+				rec, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"bucket_id":3}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"bucket_id":3`)
 				assert.NotContains(t, rec.Body.String(), `"bucket_id":1`)
 			})
-			t.Run("Different List", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":4}`)
+			t.Run("Different Project", func(t *testing.T) {
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"bucket_id":4}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToList)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToProject)
 			})
 			t.Run("Nonexisting Bucket", func(t *testing.T) {
-				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"listtask": "1"}, `{"bucket_id":9999}`)
+				_, err := testHandler.testUpdateWithUser(nil, map[string]string{"projecttask": "1"}, `{"bucket_id":9999}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
 			})
@@ -325,81 +327,81 @@ func TestTask(t *testing.T) {
 	})
 	t.Run("Delete", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "1"})
+			rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "1"})
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "99999"})
+			_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "99999"})
 			assert.Error(t, err)
 			assertHandlerErrorCode(t, err, models.ErrCodeTaskDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "14"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "14"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "15"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "15"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "16"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "16"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "17"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "17"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "18"})
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "18"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "19"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "19"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "20"})
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "20"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "21"})
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "21"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "22"})
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "22"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "23"})
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "23"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "24"})
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "24"})
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "25"})
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "25"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"listtask": "26"})
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testDeleteWithUser(nil, map[string]string{"projecttask": "26"})
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `Successfully deleted.`)
 			})
@@ -407,110 +409,110 @@ func TestTask(t *testing.T) {
 	})
 	t.Run("Create", func(t *testing.T) {
 		t.Run("Normal", func(t *testing.T) {
-			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 		})
 		t.Run("Nonexisting", func(t *testing.T) {
-			_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9999"}, `{"title":"Lorem Ipsum"}`)
+			_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9999"}, `{"title":"Lorem Ipsum"}`)
 			assert.Error(t, err)
-			assertHandlerErrorCode(t, err, models.ErrCodeListDoesNotExist)
+			assertHandlerErrorCode(t, err, models.ErrCodeProjectDoesNotExist)
 		})
 		t.Run("Rights check", func(t *testing.T) {
 			t.Run("Forbidden", func(t *testing.T) {
 				// Owned by user13
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "20"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "20"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "6"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "6"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via Team write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "7"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "7"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via Team admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "8"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "8"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

 			t.Run("Shared Via User readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "9"}, `{"title":"Lorem Ipsum"}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "9"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
 			t.Run("Shared Via User write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "10"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "10"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 			t.Run("Shared Via User admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "11"}, `{"title":"Lorem Ipsum"}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "11"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceTeam readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "12"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "12"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceTeam write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "13"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "13"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceTeam admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "14"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project Team admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "14"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})

-			t.Run("Shared Via NamespaceUser readonly", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "15"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User readonly", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "15"}, `{"title":"Lorem Ipsum"}`)
 				assert.Error(t, err)
 				assert.Contains(t, err.(*echo.HTTPError).Message, `Forbidden`)
 			})
-			t.Run("Shared Via NamespaceUser write", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "16"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User write", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "16"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
-			t.Run("Shared Via NamespaceUser admin", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "17"}, `{"title":"Lorem Ipsum"}`)
+			t.Run("Shared Via Parent Project User admin", func(t *testing.T) {
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "17"}, `{"title":"Lorem Ipsum"}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			})
 		})
 		t.Run("Bucket", func(t *testing.T) {
 			t.Run("Normal", func(t *testing.T) {
-				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum","bucket_id":3}`)
+				rec, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum","bucket_id":3}`)
 				assert.NoError(t, err)
 				assert.Contains(t, rec.Body.String(), `"bucket_id":3`)
 				assert.NotContains(t, rec.Body.String(), `"bucket_id":1`)
 			})
-			t.Run("Different List", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum","bucket_id":4}`)
+			t.Run("Different Project", func(t *testing.T) {
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum","bucket_id":4}`)
 				assert.Error(t, err)
-				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToList)
+				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotBelongToProject)
 			})
 			t.Run("Nonexisting Bucket", func(t *testing.T) {
-				_, err := testHandler.testCreateWithUser(nil, map[string]string{"list": "1"}, `{"title":"Lorem Ipsum","bucket_id":9999}`)
+				_, err := testHandler.testCreateWithUser(nil, map[string]string{"project": "1"}, `{"title":"Lorem Ipsum","bucket_id":9999}`)
 				assert.Error(t, err)
 				assertHandlerErrorCode(t, err, models.ErrCodeBucketDoesNotExist)
 			})
 		})
 		t.Run("Link Share", func(t *testing.T) {
-			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"list": "2"}, `{"title":"Lorem Ipsum"}`)
+			rec, err := testHandlerLinkShareWrite.testCreateWithLinkShare(nil, map[string]string{"project": "2"}, `{"title":"Lorem Ipsum"}`)
 			assert.NoError(t, err)
 			assert.Contains(t, rec.Body.String(), `"title":"Lorem Ipsum"`)
 			db.AssertExists(t, "tasks", map[string]interface{}{
-				"list_id":       2,
+				"project_id":    2,
 				"title":         "Lorem Ipsum",
 				"created_by_id": -2,
 			}, false)
@@ -24,7 +24,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func TestUserList(t *testing.T) {
+func TestUserProject(t *testing.T) {
 	t.Run("Normal test", func(t *testing.T) {
 		rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserList, &testuser1, "", nil, nil)
 		assert.NoError(t, err)
@@ -0,0 +1,87 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public Licensee as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public Licensee for more details.
+//
+// You should have received a copy of the GNU Affero General Public Licensee
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package log
+
+import (
+	"strings"
+	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"github.com/op/go-logging"
+	"xorm.io/xorm/log"
+)
+
+type MailLogger struct {
+	logger *logging.Logger
+	level  log.LogLevel
+}
+
+const mailFormat = `%{color}%{time:` + time.RFC3339Nano + `}: %{level}` + "\t" + `▶ [MAIL] %{id:03x}%{color:reset} %{message}`
+const mailLogModule = `vikunja_mail`
+
+func NewMailLogger() *MailLogger {
+	lvl := strings.ToUpper(config.LogMailLevel.GetString())
+	level, err := logging.LogLevel(lvl)
+	if err != nil {
+		Criticalf("Error setting database log level: %s", err.Error())
+	}
+
+	mailLogger := &MailLogger{
+		logger: logging.MustGetLogger(mailLogModule),
+	}
+
+	logBackend := logging.NewLogBackend(GetLogWriter("mail"), "", 0)
+	backend := logging.NewBackendFormatter(logBackend, logging.MustStringFormatter(mailFormat+"\n"))
+
+	backendLeveled := logging.AddModuleLevel(backend)
+	backendLeveled.SetLevel(level, mailLogModule)
+
+	mailLogger.logger.SetBackend(backendLeveled)
+
+	switch level {
+	case logging.CRITICAL:
+	case logging.ERROR:
+		mailLogger.level = log.LOG_ERR
+	case logging.WARNING:
+		mailLogger.level = log.LOG_WARNING
+	case logging.NOTICE:
+	case logging.INFO:
+		mailLogger.level = log.LOG_INFO
+	case logging.DEBUG:
+		mailLogger.level = log.LOG_DEBUG
+	default:
+		mailLogger.level = log.LOG_OFF
+	}
+
+	return mailLogger
+}
+
+func (m *MailLogger) Errorf(format string, v ...interface{}) {
+	m.logger.Errorf(format, v...)
+}
+
+func (m *MailLogger) Warnf(format string, v ...interface{}) {
+	m.logger.Warningf(format, v...)
+}
+
+func (m *MailLogger) Infof(format string, v ...interface{}) {
+	m.logger.Infof(format, v...)
+}
+
+func (m *MailLogger) Debugf(format string, v ...interface{}) {
+	m.logger.Debugf(format, v...)
+}
@@ -23,6 +23,6 @@ import (
 // NoopBackend doesn't log anything. Used in cases where we want to disable logging completely.
 type NoopBackend struct{}

-func (n *NoopBackend) Log(level logging.Level, i int, record *logging.Record) error {
+func (n *NoopBackend) Log(_ logging.Level, _ int, _ *logging.Record) error {
 	return nil
 }
@@ -91,6 +91,6 @@ func (w *WatermillLogger) Trace(msg string, fields watermill.LogFields) {
 	w.logger.Debugf("%s, %s", msg, concatFields(fields))
 }

-func (w *WatermillLogger) With(fields watermill.LogFields) watermill.LoggerAdapter {
+func (w *WatermillLogger) With(_ watermill.LogFields) watermill.LoggerAdapter {
 	return w
 }
@@ -56,6 +56,8 @@ func getClient() (*mail.Client, error) {
 			ServerName:         config.MailerHost.GetString(),
 		}),
 		mail.WithTimeout((config.MailerQueueTimeout.GetDuration() + 3) * time.Second), // 3s more for us to close before mail server timeout
+		mail.WithLogger(log.NewMailLogger()),
+		mail.WithDebugLog(),
 	}

 	if config.MailerForceSSL.GetBool() {
@@ -28,15 +28,12 @@ import (
 )

 const (
-	// ListCountKey is the name of the key in which we save the list count
-	ListCountKey = `listcount`
+	// ProjectCountKey is the name of the key in which we save the project count
+	ProjectCountKey = `projectcount`

 	// UserCountKey is the name of the key we use to store total users in redis
 	UserCountKey = `usercount`

-	// NamespaceCountKey is the name of the key we use to store the amount of total namespaces in redis
-	NamespaceCountKey = `namespacecount`
-
 	// TaskCountKey is the name of the key we use to store the amount of total tasks in redis
 	TaskCountKey = `taskcount`

@@ -65,16 +62,16 @@ func InitMetrics() {

 	GetRegistry()

-	// Register total list count metric
+	// Register total project count metric
 	err := registry.Register(promauto.NewGaugeFunc(prometheus.GaugeOpts{
-		Name: "vikunja_list_count",
-		Help: "The number of lists on this instance",
+		Name: "vikunja_project_count",
+		Help: "The number of projects on this instance",
 	}, func() float64 {
-		count, _ := GetCount(ListCountKey)
+		count, _ := GetCount(ProjectCountKey)
 		return float64(count)
 	}))
 	if err != nil {
-		log.Criticalf("Could not register metrics for %s: %s", ListCountKey, err)
+		log.Criticalf("Could not register metrics for %s: %s", ProjectCountKey, err)
 	}

 	// Register total user count metric
@@ -89,18 +86,6 @@ func InitMetrics() {
 		log.Criticalf("Could not register metrics for %s: %s", UserCountKey, err)
 	}

-	// Register total Namespaces count metric
-	err = registry.Register(promauto.NewGaugeFunc(prometheus.GaugeOpts{
-		Name: "vikunja_namespace_count",
-		Help: "The total number of namespaces on this instance",
-	}, func() float64 {
-		count, _ := GetCount(NamespaceCountKey)
-		return float64(count)
-	}))
-	if err != nil {
-		log.Criticalf("Could not register metrics for %s: %s", NamespaceCountKey, err)
-	}
-
 	// Register total Tasks count metric
 	err = registry.Register(promauto.NewGaugeFunc(prometheus.GaugeOpts{
 		Name: "vikunja_task_count",
@@ -147,7 +132,7 @@ func GetCount(key string) (count int64, err error) {
 	return
 }

-// SetCount sets the list count to a given value
+// SetCount sets the project count to a given value
 func SetCount(count int64, key string) error {
 	return keyvalue.Put(key, count)
 }
@@ -0,0 +1,432 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public Licensee as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public Licensee for more details.
+//
+// You should have received a copy of the GNU Affero General Public Licensee
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
+)
+
+const sqliteRename20221113170740 = `
+-- buckets
+create table buckets_dg_tmp
+(
+    id             INTEGER  not null
+        primary key autoincrement,
+    title          TEXT     not null,
+    project_id     INTEGER  not null,
+    "limit"        INTEGER default 0,
+    is_done_bucket INTEGER,
+    position       REAL,
+    created        DATETIME not null,
+    updated        DATETIME not null,
+    created_by_id  INTEGER  not null
+);
+
+insert into buckets_dg_tmp(id, title, project_id, "limit", is_done_bucket, position, created, updated, created_by_id)
+select id,
+       title,
+       list_id,
+       "limit",
+       is_done_bucket,
+       position,
+       created,
+       updated,
+       created_by_id
+from buckets;
+
+drop table buckets;
+
+alter table buckets_dg_tmp
+    rename to buckets;
+
+create unique index UQE_buckets_id
+    on buckets (id);
+
+-- link shares
+create table link_shares_dg_tmp
+(
+    id           INTEGER           not null
+        primary key autoincrement,
+    hash         TEXT              not null,
+    name         TEXT,
+    project_id   INTEGER           not null,
+    "right"      INTEGER default 0 not null,
+    sharing_type INTEGER default 0 not null,
+    password     TEXT,
+    shared_by_id INTEGER           not null,
+    created      DATETIME          not null,
+    updated      DATETIME          not null
+);
+
+insert into link_shares_dg_tmp(id, hash, name, project_id, "right", sharing_type, password, shared_by_id, created,
+                               updated)
+select id,
+       hash,
+       name,
+       list_id,
+       "right",
+       sharing_type,
+       password,
+       shared_by_id,
+       created,
+       updated
+from link_shares;
+
+drop table link_shares;
+
+alter table link_shares_dg_tmp
+    rename to link_shares;
+
+create index IDX_link_shares_right
+    on link_shares ("right");
+
+create index IDX_link_shares_shared_by_id
+    on link_shares (shared_by_id);
+
+create index IDX_link_shares_sharing_type
+    on link_shares (sharing_type);
+
+create unique index UQE_link_shares_hash
+    on link_shares (hash);
+
+create unique index UQE_link_shares_id
+    on link_shares (id);
+
+-- tasks
+create table tasks_dg_tmp
+(
+    id                        INTEGER           not null
+        primary key autoincrement,
+    title                     TEXT              not null,
+    description               TEXT,
+    done                      INTEGER,
+    done_at                   DATETIME,
+    due_date                  DATETIME,
+    project_id                INTEGER           not null,
+    repeat_after              INTEGER,
+    repeat_mode               INTEGER default 0 not null,
+    priority                  INTEGER,
+    start_date                DATETIME,
+    end_date                  DATETIME,
+    hex_color                 TEXT,
+    percent_done              REAL,
+    "index"                   INTEGER default 0 not null,
+    uid                       TEXT,
+    cover_image_attachment_id INTEGER default 0,
+    created                   DATETIME          not null,
+    updated                   DATETIME          not null,
+    bucket_id                 INTEGER,
+    position                  REAL,
+    kanban_position           REAL,
+    created_by_id             INTEGER           not null
+);
+
+insert into tasks_dg_tmp(id, title, description, done, done_at, due_date, project_id, repeat_after, repeat_mode,
+                         priority, start_date, end_date, hex_color, percent_done, "index", uid,
+                         cover_image_attachment_id, created, updated, bucket_id, position, kanban_position,
+                         created_by_id)
+select id,
+       title,
+       description,
+       done,
+       done_at,
+       due_date,
+       list_id,
+       repeat_after,
+       repeat_mode,
+       priority,
+       start_date,
+       end_date,
+       hex_color,
+       percent_done,
+       "index",
+       uid,
+       cover_image_attachment_id,
+       created,
+       updated,
+       bucket_id,
+       position,
+       kanban_position,
+       created_by_id
+from tasks;
+
+drop table tasks;
+
+alter table tasks_dg_tmp
+    rename to tasks;
+
+create index IDX_tasks_done
+    on tasks (done);
+
+create index IDX_tasks_done_at
+    on tasks (done_at);
+
+create index IDX_tasks_due_date
+    on tasks (due_date);
+
+create index IDX_tasks_end_date
+    on tasks (end_date);
+
+create index IDX_tasks_list_id
+    on tasks (project_id);
+
+create index IDX_tasks_repeat_after
+    on tasks (repeat_after);
+
+create index IDX_tasks_start_date
+    on tasks (start_date);
+
+create unique index UQE_tasks_id
+    on tasks (id);
+
+--- team_lists
+create table team_lists_dg_tmp
+(
+    id         INTEGER           not null
+        primary key autoincrement,
+    team_id    INTEGER           not null,
+    project_id INTEGER           not null,
+    "right"    INTEGER default 0 not null,
+    created    DATETIME          not null,
+    updated    DATETIME          not null
+);
+
+insert into team_lists_dg_tmp(id, team_id, project_id, "right", created, updated)
+select id, team_id, list_id, "right", created, updated
+from team_lists;
+
+drop table team_lists;
+
+alter table team_lists_dg_tmp
+    rename to team_lists;
+
+create index IDX_team_lists_list_id
+    on team_lists (project_id);
+
+create index IDX_team_lists_right
+    on team_lists ("right");
+
+create index IDX_team_lists_team_id
+    on team_lists (team_id);
+
+create unique index UQE_team_lists_id
+    on team_lists (id);
+
+--- users
+create table users_dg_tmp
+(
+    id                              INTEGER                 not null
+        primary key autoincrement,
+    name                            TEXT,
+    username                        TEXT                    not null,
+    password                        TEXT,
+    email                           TEXT,
+    status                          INTEGER default 0,
+    avatar_provider                 TEXT,
+    avatar_file_id                  INTEGER,
+    issuer                          TEXT,
+    subject                         TEXT,
+    email_reminders_enabled         INTEGER default 1,
+    discoverable_by_name            INTEGER default 0,
+    discoverable_by_email           INTEGER default 0,
+    overdue_tasks_reminders_enabled INTEGER default 1,
+    overdue_tasks_reminders_time    TEXT    default '09:00' not null,
+    default_project_id              INTEGER,
+    week_start                      INTEGER,
+    language                        TEXT,
+    timezone                        TEXT,
+    deletion_scheduled_at           DATETIME,
+    deletion_last_reminder_sent     DATETIME,
+    export_file_id                  INTEGER,
+    created                         DATETIME                not null,
+    updated                         DATETIME                not null
+);
+
+insert into users_dg_tmp(id, name, username, password, email, status, avatar_provider, avatar_file_id, issuer, subject,
+                         email_reminders_enabled, discoverable_by_name, discoverable_by_email,
+                         overdue_tasks_reminders_enabled, overdue_tasks_reminders_time, default_project_id, week_start,
+                         language, timezone, deletion_scheduled_at, deletion_last_reminder_sent, export_file_id,
+                         created, updated)
+select id,
+       name,
+       username,
+       password,
+       email,
+       status,
+       avatar_provider,
+       avatar_file_id,
+       issuer,
+       subject,
+       email_reminders_enabled,
+       discoverable_by_name,
+       discoverable_by_email,
+       overdue_tasks_reminders_enabled,
+       overdue_tasks_reminders_time,
+       default_list_id,
+       week_start,
+       language,
+       timezone,
+       deletion_scheduled_at,
+       deletion_last_reminder_sent,
+       export_file_id,
+       created,
+       updated
+from users;
+
+drop table users;
+
+alter table users_dg_tmp
+    rename to users;
+
+create index IDX_users_default_list_id
+    on users (default_project_id);
+
+create index IDX_users_discoverable_by_email
+    on users (discoverable_by_email);
+
+create index IDX_users_discoverable_by_name
+    on users (discoverable_by_name);
+
+create index IDX_users_overdue_tasks_reminders_enabled
+    on users (overdue_tasks_reminders_enabled);
+
+create unique index UQE_users_id
+    on users (id);
+
+create unique index UQE_users_username
+    on users (username);
+
+--- users_list
+create table users_lists_dg_tmp
+(
+    id         INTEGER           not null
+        primary key autoincrement,
+    user_id    INTEGER           not null,
+    project_id INTEGER           not null,
+    "right"    INTEGER default 0 not null,
+    created    DATETIME          not null,
+    updated    DATETIME          not null
+);
+
+insert into users_lists_dg_tmp(id, user_id, project_id, "right", created, updated)
+select id, user_id, list_id, "right", created, updated
+from users_lists;
+
+drop table users_lists;
+
+alter table users_lists_dg_tmp
+    rename to users_lists;
+
+create index IDX_users_lists_list_id
+    on users_lists (project_id);
+
+create index IDX_users_lists_right
+    on users_lists ("right");
+
+create index IDX_users_lists_user_id
+    on users_lists (user_id);
+
+create unique index UQE_users_lists_id
+    on users_lists (id);
+`
+
+type colToRename struct {
+	table   string
+	oldName string
+	newName string
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20221113170740",
+		Description: "Rename lists to projects",
+		Migrate: func(tx *xorm.Engine) error {
+			// SQLite does not support renaming columns. Instead, we'll need to run manual sql.
+			if tx.Dialect().URI().DBType == schemas.SQLITE {
+				_, err := tx.Exec(sqliteRename20221113170740)
+				if err != nil {
+					return err
+				}
+			} else {
+
+				colsToRename := []*colToRename{
+					{
+						table:   "buckets",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "link_shares",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "tasks",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "team_lists",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+					{
+						table:   "users",
+						oldName: "default_list_id",
+						newName: "default_project_id",
+					},
+					{
+						table:   "users_lists",
+						oldName: "list_id",
+						newName: "project_id",
+					},
+				}
+
+				for _, col := range colsToRename {
+					if tx.Dialect().URI().DBType == schemas.POSTGRES || tx.Dialect().URI().DBType == schemas.MYSQL {
+						_, err := tx.Exec("ALTER TABLE `" + col.table + "` RENAME COLUMN `" + col.oldName + "` TO `" + col.newName + "`")
+						if err != nil {
+							return err
+						}
+					}
+				}
+			}
+
+			err := renameTable(tx, "lists", "projects")
+			if err != nil {
+				return err
+			}
+
+			err = renameTable(tx, "team_lists", "team_projects")
+			if err != nil {
+				return err
+			}
+
+			err = renameTable(tx, "users_lists", "users_projects")
+			if err != nil {
+				return err
+			}
+
+			return nil
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}
@@ -0,0 +1,310 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-2021 Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public Licensee as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public Licensee for more details.
+//
+// You should have received a copy of the GNU Affero General Public Licensee
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"time"
+
+	"code.vikunja.io/api/pkg/log"
+
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
+)
+
+type projects20221228112131 struct {
+	// This is the one new property
+	ParentProjectID int64 `xorm:"bigint INDEX null" json:"parent_project_id"`
+
+	// Those only exist to make the migration independent of future changes
+	ID          int64     `xorm:"bigint autoincr not null unique pk" json:"id" param:"project"`
+	Title       string    `xorm:"varchar(250) not null" json:"title" valid:"required,runelength(1|250)" minLength:"1" maxLength:"250"`
+	Description string    `xorm:"longtext null" json:"description"`
+	HexColor    string    `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`
+	OwnerID     int64     `xorm:"bigint INDEX not null" json:"-"`
+	IsArchived  bool      `xorm:"not null default false" json:"is_archived" query:"is_archived"`
+	Created     time.Time `xorm:"created not null" json:"created"`
+	Updated     time.Time `xorm:"updated not null" json:"updated"`
+	NamespaceID int64     `xorm:"bigint INDEX not null" json:"namespace_id" param:"namespace"`
+}
+
+func (projects20221228112131) TableName() string {
+	return "projects"
+}
+
+type namespace20221228112131 struct {
+	ID          int64     `xorm:"bigint autoincr not null unique pk" json:"id" param:"namespace"`
+	Title       string    `xorm:"varchar(250) not null" json:"title" valid:"required,runelength(1|250)" minLength:"1" maxLength:"250"`
+	Description string    `xorm:"longtext null" json:"description"`
+	OwnerID     int64     `xorm:"bigint not null INDEX" json:"-"`
+	HexColor    string    `xorm:"varchar(6) null" json:"hex_color" valid:"runelength(0|6)" maxLength:"6"`
+	IsArchived  bool      `xorm:"not null default false" json:"is_archived" query:"is_archived"`
+	Created     time.Time `xorm:"created not null" json:"created"`
+	Updated     time.Time `xorm:"updated not null" json:"updated"`
+}
+
+func (namespace20221228112131) TableName() string {
+	return "namespaces"
+}
+
+type teamNamespace20221228112131 struct {
+	ID          int64     `xorm:"bigint autoincr not null unique pk" json:"id"`
+	TeamID      int64     `xorm:"bigint not null INDEX" json:"team_id" param:"team"`
+	NamespaceID int64     `xorm:"bigint not null INDEX" json:"-" param:"namespace"`
+	Right       int       `xorm:"bigint INDEX not null default 0" json:"right" valid:"length(0|2)" maximum:"2" default:"0"`
+	Created     time.Time `xorm:"created not null" json:"created"`
+	Updated     time.Time `xorm:"updated not null" json:"updated"`
+}
+
+func (teamNamespace20221228112131) TableName() string {
+	return "team_namespaces"
+}
+
+type teamProject20221228112131 struct {
+	ID        int64     `xorm:"bigint autoincr not null unique pk" json:"id"`
+	TeamID    int64     `xorm:"bigint not null INDEX" json:"team_id" param:"team"`
+	ProjectID int64     `xorm:"bigint not null INDEX" json:"-" param:"project"`
+	Right     int       `xorm:"bigint INDEX not null default 0" json:"right" valid:"length(0|2)" maximum:"2" default:"0"`
+	Created   time.Time `xorm:"created not null" json:"created"`
+	Updated   time.Time `xorm:"updated not null" json:"updated"`
+}
+
+func (teamProject20221228112131) TableName() string {
+	return "team_projects"
+}
+
+type namespaceUser20221228112131 struct {
+	ID          int64     `xorm:"bigint autoincr not null unique pk" json:"id" param:"namespace"`
+	UserID      int64     `xorm:"bigint not null INDEX" json:"-"`
+	NamespaceID int64     `xorm:"bigint not null INDEX" json:"-" param:"namespace"`
+	Right       int       `xorm:"bigint INDEX not null default 0" json:"right" valid:"length(0|2)" maximum:"2" default:"0"`
+	Created     time.Time `xorm:"created not null" json:"created"`
+	Updated     time.Time `xorm:"updated not null" json:"updated"`
+}
+
+func (namespaceUser20221228112131) TableName() string {
+	return "users_namespaces"
+}
+
+type projectUser20221228112131 struct {
+	ID        int64     `xorm:"bigint autoincr not null unique pk" json:"id" param:"namespace"`
+	UserID    int64     `xorm:"bigint not null INDEX" json:"-"`
+	ProjectID int64     `xorm:"bigint not null INDEX" json:"-" param:"project"`
+	Right     int       `xorm:"bigint INDEX not null default 0" json:"right" valid:"length(0|2)" maximum:"2" default:"0"`
+	Created   time.Time `xorm:"created not null" json:"created"`
+	Updated   time.Time `xorm:"updated not null" json:"updated"`
+}
+
+func (projectUser20221228112131) TableName() string {
+	return "users_projects"
+}
+
+const sqliteRemoveNamespaceColumn20221228112131 = `
+create table projects_dg_tmp
+
+(
+    id                   INTEGER           not null
+        primary key autoincrement,
+    title                TEXT              not null,
+    description          TEXT,
+    identifier           TEXT,
+    hex_color            TEXT,
+    owner_id             INTEGER           not null,
+    is_archived          INTEGER default 0 not null,
+    background_file_id   INTEGER,
+    background_blur_hash TEXT,
+    position             REAL,
+    created              DATETIME          not null,
+    updated              DATETIME          not null,
+    parent_project_id    INTEGER
+);
+
+insert into projects_dg_tmp(id, title, description, identifier, hex_color, owner_id, is_archived, background_file_id,
+                            background_blur_hash, position, created, updated, parent_project_id)
+select id,
+       title,
+       description,
+       identifier,
+       hex_color,
+       owner_id,
+       is_archived,
+       background_file_id,
+       background_blur_hash,
+       position,
+       created,
+       updated,
+       parent_project_id
+from projects;
+
+drop table projects;
+
+alter table projects_dg_tmp
+    rename to projects;
+
+create index IDX_lists_owner_id
+    on projects (owner_id);
+
+create index IDX_projects_parent_project_id
+    on projects (parent_project_id);
+
+create unique index UQE_lists_id
+    on projects (id);
+`
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20221228112131",
+		Description: "make projects nestable",
+		Migrate: func(tx *xorm.Engine) error {
+			err := tx.Sync2(projects20221228112131{})
+			if err != nil {
+				return err
+			}
+
+			allNamespaces := []*namespace20221228112131{}
+			err = tx.Find(&allNamespaces)
+			if err != nil {
+				return err
+			}
+
+			// namespace id is the key
+			namespacesToProjects := make(map[int64]*projects20221228112131)
+
+			for _, n := range allNamespaces {
+				p := &projects20221228112131{
+					Title:       n.Title,
+					Description: n.Description,
+					OwnerID:     n.OwnerID,
+					HexColor:    n.HexColor,
+					IsArchived:  n.IsArchived,
+					Created:     n.Created,
+					Updated:     n.Updated,
+				}
+
+				_, err = tx.Insert(p)
+				if err != nil {
+					return err
+				}
+				namespacesToProjects[n.ID] = p
+			}
+
+			err = setParentProject(tx, namespacesToProjects)
+			if err != nil {
+				return err
+			}
+
+			err = setTeamNamespacesShare(tx, namespacesToProjects)
+			if err != nil {
+				return err
+			}
+
+			err = setUserNamespacesShare(tx, namespacesToProjects)
+			if err != nil {
+				return err
+			}
+
+			return removeNamespaceLeftovers(tx)
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}
+
+func setParentProject(tx *xorm.Engine, namespacesToProjects map[int64]*projects20221228112131) error {
+	for namespaceID, project := range namespacesToProjects {
+		_, err := tx.Where("namespace_id = ?", namespaceID).
+			Update(&projects20221228112131{
+				ParentProjectID: project.ID,
+			})
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func setTeamNamespacesShare(tx *xorm.Engine, namespacesToProjects map[int64]*projects20221228112131) error {
+	teamNamespaces := []*teamNamespace20221228112131{}
+	err := tx.Find(&teamNamespaces)
+	if err != nil {
+		return err
+	}
+
+	for _, tn := range teamNamespaces {
+		if _, exists := namespacesToProjects[tn.NamespaceID]; !exists {
+			log.Warningf("Namespace %d does not exist but is shared with team %d - this is probably caused by an old share which was not properly deleted.", tn.NamespaceID, tn.TeamID)
+			continue
+		}
+
+		_, err = tx.Insert(&teamProject20221228112131{
+			TeamID:    tn.TeamID,
+			Right:     tn.Right,
+			Created:   tn.Created,
+			Updated:   tn.Updated,
+			ProjectID: namespacesToProjects[tn.NamespaceID].ID,
+		})
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func setUserNamespacesShare(tx *xorm.Engine, namespacesToProjects map[int64]*projects20221228112131) error {
+	userNamespace := []*namespaceUser20221228112131{}
+	err := tx.Find(&userNamespace)
+	if err != nil {
+		return err
+	}
+
+	for _, un := range userNamespace {
+		if _, exists := namespacesToProjects[un.NamespaceID]; !exists {
+			log.Warningf("Namespace %d does not exist but is shared with user %d - this is probably caused by an old share which was not properly deleted.", un.NamespaceID, un.UserID)
+			continue
+		}
+
+		_, err = tx.Insert(&projectUser20221228112131{
+			UserID:    un.UserID,
+			Right:     un.Right,
+			Created:   un.Created,
+			Updated:   un.Updated,
+			ProjectID: namespacesToProjects[un.NamespaceID].ID,
+		})
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func removeNamespaceLeftovers(tx *xorm.Engine) error {
+	err := tx.DropTables("namespaces", "team_namespaces", "users_namespaces")
+	if err != nil {
+		return err
+	}
+
+	if tx.Dialect().URI().DBType == schemas.SQLITE {
+		_, err := tx.Exec(sqliteRemoveNamespaceColumn20221228112131)
+		return err
+	}
+
+	return dropTableColum(tx, "projects", "namespace_id")
+}
--- a/Show More
+++ b/Show More