Merge pull request #97 from lennart-k/feature/sharing

Fix issues with group collections
2025-12-13 19:22:26 +00:00 · 2025-07-18 14:14:23 +02:00
212 changed files with 6574 additions and 5932 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,20 @@
+name: Rust CI
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose --workspace
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -1,57 +0,0 @@
-name: "CICD"
-on: [push, pull_request]
-permissions:
-  contents: read
-  pull-requests: write
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - run: rustup update
-      - name: Checkout sources
-        uses: actions/checkout@v4
-      - run: cargo check
-
-  test:
-    name: Test Suite
-    runs-on: ubuntu-latest
-    steps:
-      - run: rustup update
-      - name: Checkout sources
-        uses: actions/checkout@v4
-      - run: cargo test --all-features --verbose --workspace
-
-  coverage:
-    name: Test Coverage
-    runs-on: ubuntu-latest
-    steps:
-      - run: rustup update
-      - name: Install tarpaulin
-        run: cargo install cargo-tarpaulin
-
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Run tarpaulin
-        run: cargo tarpaulin --workspace --all-features --exclude xml_derive --coveralls ${{ secrets.COVERALLS_REPO_TOKEN }}
-
-  lints:
-    name: Lints
-    runs-on: ubuntu-latest
-    steps:
-      - run: rustup update
-      - run: rustup component add rustfmt clippy
-
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Run cargo fmt
-        run: cargo fmt --all -- --check
-
-      - name: Run cargo clippy
-        run: cargo clippy -- -D warnings
--- a/.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json
+++ b/.sqlx/query-46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "46ae176a06e314492f661c28436d6370883052c854da43475d7ced60cf8326e3"
-}
--- a/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
+++ b/.sqlx/query-5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "5132ee8198f155242aa332a10019c48ec334884bcf7841c8aa03fd5eb11351d9"
+}
--- a/.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json
+++ b/.sqlx/query-60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "INSERT INTO calendars (principal, id, displayname, description, \"order\", color, subscription_url, timezone_id, push_topic, comp_event, comp_todo, comp_journal)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 12
-    },
-    "nullable": []
-  },
-  "hash": "60b940ff493e7c0fcb2ffe8ae97172c6444525ffeec21b194bd7443d11d06113"
-}
--- a/.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json
+++ b/.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json
@@ -39,39 +39,44 @@
        "type_info": "Text"
      },
      {
-        "name": "timezone_id",
+        "name": "timezone",
        "ordinal": 7,
        "type_info": "Text"
      },
      {
-        "name": "deleted_at",
+        "name": "timezone_id",
        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "deleted_at",
+        "ordinal": 9,
        "type_info": "Datetime"
      },
      {
        "name": "subscription_url",
-        "ordinal": 9,
-        "type_info": "Text"
-      },
-      {
-        "name": "push_topic",
        "ordinal": 10,
        "type_info": "Text"
      },
      {
-        "name": "comp_event",
+        "name": "push_topic",
        "ordinal": 11,
-        "type_info": "Bool"
+        "type_info": "Text"
      },
      {
-        "name": "comp_todo",
+        "name": "comp_event",
        "ordinal": 12,
        "type_info": "Bool"
      },
      {
-        "name": "comp_journal",
+        "name": "comp_todo",
        "ordinal": 13,
        "type_info": "Bool"
+      },
+      {
+        "name": "comp_journal",
+        "ordinal": 14,
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -88,6 +93,7 @@
      true,
      true,
      true,
+      true,
      false,
      false,
      false,
--- a/.sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json
+++ b/.sqlx/query-cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "SELECT principal, id, displayname, \"order\", description, color, timezone_id, deleted_at, synctoken, subscription_url, push_topic, comp_event, comp_todo, comp_journal\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
+  "query": "SELECT *\n                FROM calendars\n                WHERE principal = ? AND deleted_at IS NOT NULL",
  "describe": {
    "columns": [
      {
@@ -14,14 +14,14 @@
        "type_info": "Text"
      },
      {
-        "name": "displayname",
+        "name": "synctoken",
        "ordinal": 2,
-        "type_info": "Text"
+        "type_info": "Integer"
      },
      {
-        "name": "order",
+        "name": "displayname",
        "ordinal": 3,
-        "type_info": "Integer"
+        "type_info": "Text"
      },
      {
        "name": "description",
@@ -29,49 +29,54 @@
        "type_info": "Text"
      },
      {
-        "name": "color",
+        "name": "order",
        "ordinal": 5,
-        "type_info": "Text"
+        "type_info": "Integer"
      },
      {
-        "name": "timezone_id",
+        "name": "color",
        "ordinal": 6,
        "type_info": "Text"
      },
      {
-        "name": "deleted_at",
+        "name": "timezone",
        "ordinal": 7,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "synctoken",
-        "ordinal": 8,
-        "type_info": "Integer"
-      },
-      {
-        "name": "subscription_url",
-        "ordinal": 9,
        "type_info": "Text"
      },
      {
-        "name": "push_topic",
+        "name": "timezone_id",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "deleted_at",
+        "ordinal": 9,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "subscription_url",
        "ordinal": 10,
        "type_info": "Text"
      },
      {
-        "name": "comp_event",
+        "name": "push_topic",
        "ordinal": 11,
-        "type_info": "Bool"
+        "type_info": "Text"
      },
      {
-        "name": "comp_todo",
+        "name": "comp_event",
        "ordinal": 12,
        "type_info": "Bool"
      },
      {
-        "name": "comp_journal",
+        "name": "comp_todo",
        "ordinal": 13,
        "type_info": "Bool"
+      },
+      {
+        "name": "comp_journal",
+        "ordinal": 14,
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -80,13 +85,14 @@
    "nullable": [
      false,
      false,
+      false,
+      true,
      true,
      false,
      true,
      true,
      true,
      true,
-      false,
      true,
      false,
      false,
@@ -94,5 +100,5 @@
      false
    ]
  },
-  "hash": "27ac68a4eea40c1cac663cad034028cf6c373354b29e3a5290c18f58101913cd"
+  "hash": "cce62f7829bd688cd8c7928b587bc31f0e50865c214b1df113350bea2c254237"
 }
--- a/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
+++ b/.sqlx/query-cedfb82b38fdd0c7681b9873b1008abee4a2f4ca16abad1b837f256d0bf416b1.json
@@ -39,39 +39,44 @@
        "type_info": "Text"
      },
      {
-        "name": "timezone_id",
+        "name": "timezone",
        "ordinal": 7,
        "type_info": "Text"
      },
      {
-        "name": "deleted_at",
+        "name": "timezone_id",
        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "deleted_at",
+        "ordinal": 9,
        "type_info": "Datetime"
      },
      {
        "name": "subscription_url",
-        "ordinal": 9,
-        "type_info": "Text"
-      },
-      {
-        "name": "push_topic",
        "ordinal": 10,
        "type_info": "Text"
      },
      {
-        "name": "comp_event",
+        "name": "push_topic",
        "ordinal": 11,
-        "type_info": "Bool"
+        "type_info": "Text"
      },
      {
-        "name": "comp_todo",
+        "name": "comp_event",
        "ordinal": 12,
        "type_info": "Bool"
      },
      {
-        "name": "comp_journal",
+        "name": "comp_todo",
        "ordinal": 13,
        "type_info": "Bool"
+      },
+      {
+        "name": "comp_journal",
+        "ordinal": 14,
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -88,6 +93,7 @@
      true,
      true,
      true,
+      true,
      false,
      false,
      false,
--- a/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
+++ b/.sqlx/query-d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, \"order\" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?, comp_event = ?, comp_todo = ?, comp_journal = ?\n                WHERE (principal, id) = (?, ?)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 14
+    },
+    "nullable": []
+  },
+  "hash": "d65c9c40606e59dd816a51b9b9ac60fd2ff81aaa358fcc038134e9a68ba45ad7"
+}
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,10 +2,9 @@
 members = ["crates/*"]

 [workspace.package]
-version = "0.9.13"
+version = "0.4.13"
 edition = "2024"
 description = "A CalDAV server"
-documentation = "https://lennart-k.github.io/rustical/"
 repository = "https://github.com/lennart-k/rustical"
 license = "AGPL-3.0-or-later"

@@ -17,7 +16,7 @@ description.workspace = true
 repository.workspace = true
 license.workspace = true
 resolver = "2"
-publish = true
+publish = false

 [features]
 debug = ["opentelemetry"]
@@ -35,7 +34,7 @@ opentelemetry = [
 debug = 0

 [workspace.dependencies]
-matchit = "0.9"
+matchit = "0.8"
 uuid = { version = "1.11", features = ["v4", "fast-rng"] }
 async-trait = "0.1"
 axum = "0.8"
@@ -48,7 +47,8 @@ pbkdf2 = { version = "0.12", features = ["simple"] }
 rand_core = { version = "0.9", features = ["std"] }
 chrono = { version = "0.4", features = ["serde"] }
 regex = "1.10"
-rstest = "0.26"
+lazy_static = "1.5"
+rstest = "0.25"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
@@ -61,7 +61,7 @@ tokio = { version = "1", features = [
 url = "2.5"
 base64 = "0.22"
 thiserror = "2.0"
-quick-xml = { version = "0.38" }
+quick-xml = { version = "0.37" }
 rust-embed = "8.5"
 tower-sessions = "0.14"
 futures-core = "0.3.31"
@@ -95,12 +95,8 @@ strum = "0.27"
 strum_macros = "0.27"
 serde_json = { version = "1.0", features = ["raw_value"] }
 sqlx-sqlite = { version = "0.8", features = ["bundled"] }
-ical = { git = "https://github.com/lennart-k/ical-rs", features = [
-  "generator",
-  "serde",
-  "chrono-tz",
-] }
-toml = "0.9"
+ical = { version = "0.11", features = ["generator", "serde"] }
+toml = "0.8"
 tower = "0.5"
 tower-http = { version = "0.6", features = [
  "trace",
@@ -130,7 +126,7 @@ syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.5"
-darling = "0.21"
+darling = "0.20"
 reqwest = { version = "0.12", features = [
  "rustls-tls",
  "charset",
@@ -138,8 +134,7 @@ reqwest = { version = "0.12", features = [
 ], default-features = false }
 openidconnect = "4.0"
 clap = { version = "4.5", features = ["derive", "env"] }
-matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "e18e65d7" }
-vtimezones-rs = "0.2"
+matchit-serde = { git = "https://github.com/lennart-k/matchit-serde", rev = "f0591d13" }
 ece = { version = "2.3", default-features = false, features = [
  "backend-openssl",
 ] }
@@ -163,15 +158,15 @@ async-trait = { workspace = true }
 uuid.workspace = true
 axum.workspace = true

-opentelemetry = { version = "0.31", optional = true }
-opentelemetry-otlp = { version = "0.31", optional = true, features = [
+opentelemetry = { version = "0.30", optional = true }
+opentelemetry-otlp = { version = "0.30", optional = true, features = [
  "grpc-tonic",
 ] }
-opentelemetry_sdk = { version = "0.31", features = [
+opentelemetry_sdk = { version = "0.30", features = [
  "rt-tokio",
 ], optional = true }
-opentelemetry-semantic-conventions = { version = "0.31", optional = true }
-tracing-opentelemetry = { version = "0.32", optional = true }
+opentelemetry-semantic-conventions = { version = "0.30", optional = true }
+tracing-opentelemetry = { version = "0.31", optional = true }
 tracing-subscriber = { version = "0.3", features = [
  "env-filter",
  "fmt",
--- a/5
+++ b/5
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.90-alpine AS chef
+FROM --platform=$BUILDPLATFORM rust:1.88-alpine AS chef

 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -45,7 +45,4 @@ CMD ["/usr/local/bin/rustical"]
 ENV RUSTICAL_DATA_STORE__SQLITE__DB_URL=/var/lib/rustical/db.sqlite3

 LABEL org.opencontainers.image.authors="Lennart K github.com/lennart-k"
-LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 EXPOSE 4000
-
-HEALTHCHECK --interval=30s --timeout=30s --start-period=3s --retries=3 CMD ["/usr/local/bin/rustical", "health"]
--- a/3
+++ b/3
@@ -12,6 +12,3 @@ docs:

 docs-dev:
  mkdocs serve
-
-coverage:
-  cargo tarpaulin --workspace --exclude xml_derive
--- a/README.md
+++ b/README.md
@@ -4,23 +4,21 @@ a CalDAV/CardDAV server

 > [!WARNING]
  RustiCal is under **active development**!
-  While I've been successfully using RustiCal productively for some months now and there seems to be a growing user base,
+  While I've been successfully using RustiCal productively for a few weeks now,
  you'd still be one of the first testers so expect bugs and rough edges.
-  If you still want to use it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)
+  If you still want to play around with it in its current state, absolutely feel free to do so and to open up an issue if something is not working. :)

 ## Features

 - easy to backup, everything saved in one SQLite database
  - also export feature in the frontend
- Import your existing calendars in the frontend
- **[WebDAV Push](https://github.com/bitfireAT/webdav-push/)** support, so near-instant synchronisation to DAVx5
+- [WebDAV Push](https://github.com/bitfireAT/webdav-push/) support, so near-instant synchronisation to DAVx5
 - lightweight (the container image contains only one binary)
 - adequately fast (I'd love to say blazingly fast™ :fire: but I don't have any benchmarks)
 - deleted calendars are recoverable
 - Nextcloud login flow (In DAVx5 you can login through the Nextcloud flow and automatically generate an app token)
 - Apple configuration profiles (skip copy-pasting passwords and instead generate the configuration in the frontend)
- **OpenID Connect** support (with option to disable password login)
- Group-based **sharing**
+- OpenID Connect support (with option to disable password login)

 ## Getting Started

--- a/about.toml
+++ b/about.toml
@@ -7,7 +7,6 @@ accepted = [
  "CDLA-Permissive-2.0",
  "Zlib",
  "AGPL-3.0",
-  "GPL-3.0",
  "MPL-2.0",
 ]
 workarounds = ["ring", "chrono", "rustls"]
--- a/compose.oidc.yml
+++ b/compose.oidc.yml
@@ -1,22 +0,0 @@
-services:
-  rustical:
-    image: ghcr.io/lennart-k/rustical:latest
-    restart: unless-stopped
-    environment:
-      RUSTICAL_FRONTEND__ALLOW_PASSWORD_LOGIN: "false"
-      RUSTICAL_OIDC__NAME: "Authelia"
-      RUSTICAL_OIDC__ISSUER: "https://auth.example.com"
-      RUSTICAL_OIDC__CLIENT_ID: "{{ rustical_oidc_client_id }}"
-      RUSTICAL_OIDC__CLIENT_SECRET: "{{ rustical_oidc_client_secret }}"
-      RUSTICAL_OIDC__CLAIM_USERID: "preferred_username"
-      RUSTICAL_OIDC__SCOPES: '["openid", "profile", "groups"]'
-      RUSTICAL_OIDC__REQUIRE_GROUP: "app:rustical" # optional
-      RUSTICAL_OIDC__ALLOW_SIGN_UP: "true"
-    volumes:
-      - data:/var/lib/rustical
-    # Here you probably want to you expose instead
-    ports:
-      - 4000:4000
-
-volumes:
-  data:
--- a/crates/caldav/Cargo.toml
+++ b/crates/caldav/Cargo.toml
@@ -11,7 +11,6 @@ publish = false
 rustical_store_sqlite = { workspace = true, features = ["test"] }
 rstest.workspace = true
 async-std.workspace = true
-serde_json.workspace = true

 [dependencies]
 axum.workspace = true
@@ -43,4 +42,3 @@ headers.workspace = true
 tower-http.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
-vtimezones-rs.workspace = true
--- a/crates/caldav/src/calendar/methods/get.rs
+++ b/crates/caldav/src/calendar/methods/get.rs
@@ -8,7 +8,7 @@ use http::{HeaderValue, Method, StatusCode, header};
 use ical::generator::{Emitter, IcalCalendarBuilder};
 use ical::property::Property;
 use percent_encoding::{CONTROLS, utf8_percent_encode};
-use rustical_ical::{CalendarObjectComponent, EventObject};
+use rustical_ical::{CalendarObjectComponent, EventObject, JournalObject, TodoObject};
 use rustical_store::{CalendarStore, SubscriptionStore, auth::Principal};
 use std::collections::HashMap;
 use std::str::FromStr;
@@ -32,67 +32,58 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
        return Err(crate::Error::Unauthorized);
    }

-    let mut vtimezones = HashMap::new();
+    let calendar = cal_store
+        .get_calendar(&principal, &calendar_id, true)
+        .await?;
+
+    let mut timezones = HashMap::new();
    let objects = cal_store.get_objects(&principal, &calendar_id).await?;

    let mut ical_calendar_builder = IcalCalendarBuilder::version("4.0")
        .gregorian()
        .prodid("RustiCal");
-    if let Some(displayname) = calendar.meta.displayname {
+    if calendar.displayname.is_some() {
        ical_calendar_builder = ical_calendar_builder.set(Property {
            name: "X-WR-CALNAME".to_owned(),
-            value: Some(displayname),
+            value: calendar.displayname,
            params: None,
        });
    }
-    if let Some(description) = calendar.meta.description {
+    if calendar.description.is_some() {
        ical_calendar_builder = ical_calendar_builder.set(Property {
            name: "X-WR-CALDESC".to_owned(),
-            value: Some(description),
+            value: calendar.description,
            params: None,
        });
    }
-    if let Some(timezone_id) = calendar.timezone_id {
+    if calendar.timezone_id.is_some() {
        ical_calendar_builder = ical_calendar_builder.set(Property {
            name: "X-WR-TIMEZONE".to_owned(),
-            value: Some(timezone_id),
+            value: calendar.timezone_id,
            params: None,
        });
    }
+    let mut ical_calendar = ical_calendar_builder.build();

    for object in &objects {
-        vtimezones.extend(object.get_vtimezones());
        match object.get_data() {
-            CalendarObjectComponent::Event(EventObject { event, .. }, overrides) => {
-                ical_calendar_builder = ical_calendar_builder.add_event(event.clone());
-                for ev_override in overrides {
-                    ical_calendar_builder =
-                        ical_calendar_builder.add_event(ev_override.event.clone());
-                }
+            CalendarObjectComponent::Event(EventObject {
+                event,
+                timezones: object_timezones,
+                ..
+            }) => {
+                timezones.extend(object_timezones);
+                ical_calendar.events.push(event.clone());
            }
-            CalendarObjectComponent::Todo(todo, overrides) => {
-                ical_calendar_builder = ical_calendar_builder.add_todo(todo.clone());
-                for ev_override in overrides {
-                    ical_calendar_builder = ical_calendar_builder.add_todo(ev_override.clone());
-                }
+            CalendarObjectComponent::Todo(TodoObject { todo, .. }) => {
+                ical_calendar.todos.push(todo.clone());
            }
-            CalendarObjectComponent::Journal(journal, overrides) => {
-                ical_calendar_builder = ical_calendar_builder.add_journal(journal.clone());
-                for ev_override in overrides {
-                    ical_calendar_builder = ical_calendar_builder.add_journal(ev_override.clone());
-                }
+            CalendarObjectComponent::Journal(JournalObject { journal, .. }) => {
+                ical_calendar.journals.push(journal.clone());
            }
        }
    }

-    for vtimezone in vtimezones.into_values() {
-        ical_calendar_builder = ical_calendar_builder.add_tz(vtimezone.to_owned());
-    }
-
-    let ical_calendar = ical_calendar_builder
-        .build()
-        .map_err(|parser_error| Error::IcalError(parser_error.into()))?;
-
    let mut resp = Response::builder().status(StatusCode::OK);
    let hdrs = resp.headers_mut().unwrap();
    hdrs.typed_insert(ContentType::from_str("text/calendar").unwrap());
--- a/crates/caldav/src/calendar/methods/import.rs
+++ b/crates/caldav/src/calendar/methods/import.rs
@@ -1,110 +0,0 @@
-use crate::Error;
-use crate::calendar::CalendarResourceService;
-use axum::{
-    extract::{Path, State},
-    response::{IntoResponse, Response},
-};
-use http::StatusCode;
-use ical::{
-    generator::Emitter,
-    parser::{Component, ComponentMut},
-};
-use rustical_dav::header::Overwrite;
-use rustical_ical::{CalendarObject, CalendarObjectType};
-use rustical_store::{
-    Calendar, CalendarMetadata, CalendarStore, SubscriptionStore, auth::Principal,
-};
-use std::io::BufReader;
-use tracing::instrument;
-
-#[instrument(skip(resource_service))]
-pub async fn route_import<C: CalendarStore, S: SubscriptionStore>(
-    Path((principal, cal_id)): Path<(String, String)>,
-    user: Principal,
-    State(resource_service): State<CalendarResourceService<C, S>>,
-    Overwrite(overwrite): Overwrite,
-    body: String,
-) -> Result<Response, Error> {
-    if !user.is_principal(&principal) {
-        return Err(Error::Unauthorized);
-    }
-
-    let mut parser = ical::IcalParser::new(BufReader::new(body.as_bytes()));
-    let mut cal = parser
-        .next()
-        .expect("input must contain calendar")
-        .unwrap()
-        .mutable();
-    if parser.next().is_some() {
-        return Err(rustical_ical::Error::InvalidData(
-            "multiple calendars, only one allowed".to_owned(),
-        )
-        .into());
-    }
-
-    // Extract calendar metadata
-    let displayname = cal
-        .get_property("X-WR-CALNAME")
-        .and_then(|prop| prop.value.clone());
-    let description = cal
-        .get_property("X-WR-CALDESC")
-        .and_then(|prop| prop.value.clone());
-    let timezone_id = cal
-        .get_property("X-WR-TIMEZONE")
-        .and_then(|prop| prop.value.clone());
-    // These properties should not appear in the expanded calendar objects
-    cal.remove_property("X-WR-CALNAME");
-    cal.remove_property("X-WR-CALDESC");
-    cal.remove_property("X-WR-TIMEZONE");
-    let cal = cal.verify().unwrap();
-    // Make sure timezone is valid
-    if let Some(timezone_id) = timezone_id.as_ref() {
-        assert!(
-            vtimezones_rs::VTIMEZONES.contains_key(timezone_id),
-            "Invalid calendar timezone id"
-        );
-    }
-
-    // Extract necessary component types
-    let mut cal_components = vec![];
-    if !cal.events.is_empty() {
-        cal_components.push(CalendarObjectType::Event);
-    }
-    if !cal.journals.is_empty() {
-        cal_components.push(CalendarObjectType::Journal);
-    }
-    if !cal.todos.is_empty() {
-        cal_components.push(CalendarObjectType::Todo);
-    }
-
-    let expanded_cals = cal.expand_calendar();
-    // Janky way to convert between IcalCalendar and CalendarObject
-    let objects = expanded_cals
-        .into_iter()
-        .map(|cal| cal.generate())
-        .map(CalendarObject::from_ics)
-        .collect::<Result<Vec<_>, _>>()?;
-    let new_cal = Calendar {
-        principal,
-        id: cal_id,
-        meta: CalendarMetadata {
-            displayname,
-            order: 0,
-            description,
-            color: None,
-        },
-        timezone_id,
-        deleted_at: None,
-        synctoken: 0,
-        subscription_url: None,
-        push_topic: uuid::Uuid::new_v4().to_string(),
-        components: cal_components,
-    };
-
-    let cal_store = resource_service.cal_store;
-    cal_store
-        .import_calendar(new_cal, objects, overwrite)
-        .await?;
-
-    Ok(StatusCode::OK.into_response())
-}
--- a/crates/caldav/src/calendar/methods/mkcalendar.rs
+++ b/crates/caldav/src/calendar/methods/mkcalendar.rs
@@ -4,11 +4,10 @@ use crate::calendar::prop::SupportedCalendarComponentSet;
 use axum::extract::{Path, State};
 use axum::response::{IntoResponse, Response};
 use http::{Method, StatusCode};
-use ical::IcalParser;
 use rustical_dav::xml::HrefElement;
 use rustical_ical::CalendarObjectType;
 use rustical_store::auth::Principal;
-use rustical_store::{Calendar, CalendarMetadata, CalendarStore, SubscriptionStore};
+use rustical_store::{Calendar, CalendarStore, SubscriptionStore};
 use rustical_xml::{Unparsed, XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;

@@ -46,7 +45,7 @@ pub struct PropElement {
 }

 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = "mkcalendar")]
+#[xml(root = b"mkcalendar")]
 #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
 struct MkcalendarRequest {
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -54,7 +53,7 @@ struct MkcalendarRequest {
 }

 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = "mkcol")]
+#[xml(root = b"mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -79,55 +78,31 @@ pub async fn route_mkcalendar<C: CalendarStore, S: SubscriptionStore>(
        _ => unreachable!("We never call with another method"),
    };

-    if request.displayname.as_deref() == Some("") {
-        request.displayname = None;
+    if let Some("") = request.displayname.as_deref() {
+        request.displayname = None
    }

-    let timezone_id = if let Some(tzid) = request.calendar_timezone_id {
-        Some(tzid)
-    } else if let Some(tz) = request.calendar_timezone {
-        // TODO: Proper error (calendar-timezone precondition)
-        let calendar = IcalParser::new(tz.as_bytes())
-            .next()
-            .ok_or_else(|| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?
-            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
-
-        let timezone = calendar.timezones.first().ok_or_else(|| {
-            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
-        })?;
-        let timezone: chrono_tz::Tz = timezone
-            .try_into()
-            .map_err(|_| rustical_dav::Error::BadRequest("No timezone data provided".to_owned()))?;
-
-        Some(timezone.name().to_owned())
-    } else {
-        None
-    };
-
    let calendar = Calendar {
-        id: cal_id.clone(),
-        principal: principal.clone(),
-        meta: CalendarMetadata {
-            order: request.calendar_order.unwrap_or(0),
-            displayname: request.displayname,
-            color: request.calendar_color,
-            description: request.calendar_description,
-        },
-        timezone_id,
+        id: cal_id.to_owned(),
+        principal: principal.to_owned(),
+        order: request.calendar_order.unwrap_or(0),
+        displayname: request.displayname,
+        timezone: request.calendar_timezone,
+        timezone_id: request.calendar_timezone_id,
+        color: request.calendar_color,
+        description: request.calendar_description,
        deleted_at: None,
        synctoken: 0,
        subscription_url: request.source.map(|href| href.href),
        push_topic: uuid::Uuid::new_v4().to_string(),
-        components: request.supported_calendar_component_set.map_or_else(
-            || {
-                vec![
-                    CalendarObjectType::Event,
-                    CalendarObjectType::Todo,
-                    CalendarObjectType::Journal,
-                ]
-            },
-            Into::into,
-        ),
+        components: request
+            .supported_calendar_component_set
+            .map(Into::into)
+            .unwrap_or(vec![
+                CalendarObjectType::Event,
+                CalendarObjectType::Todo,
+                CalendarObjectType::Journal,
+            ]),
    };

    cal_store.insert_calendar(calendar).await?;
--- a/crates/caldav/src/calendar/methods/mod.rs
+++ b/crates/caldav/src/calendar/methods/mod.rs
@@ -1,5 +1,4 @@
 pub mod get;
-pub mod import;
 pub mod mkcalendar;
 pub mod post;
 pub mod report;
--- a/crates/caldav/src/calendar/methods/post.rs
+++ b/crates/caldav/src/calendar/methods/post.rs
@@ -49,12 +49,12 @@ pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
    };

    let subscription = Subscription {
-        id: sub_id.clone(),
+        id: sub_id.to_owned(),
        push_resource: request
            .subscription
            .web_push_subscription
            .push_resource
-            .clone(),
+            .to_owned(),
        topic: calendar_resource.cal.push_topic,
        expiration: expires.naive_local(),
        public_key: request
--- a/crates/caldav/src/calendar/methods/report/calendar_multiget.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_multiget.rs
@@ -4,10 +4,10 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_xml::XmlDeserialize;

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // <!ELEMENT calendar-query ((DAV:allprop | DAV:propname | DAV:prop)?, href+)>
-pub struct CalendarMultigetRequest {
+pub(crate) struct CalendarMultigetRequest {
    #[xml(ty = "untagged")]
    pub(crate) prop: PropfindType<CalendarObjectPropWrapperName>,
    #[xml(flatten)]
@@ -27,18 +27,20 @@ pub async fn get_objects_calendar_multiget<C: CalendarStore>(

    for href in &cal_query.href {
        if let Some(filename) = href.strip_prefix(path) {
-            let filename = filename.trim_start_matches('/');
+            let filename = filename.trim_start_matches("/");
            if let Some(object_id) = filename.strip_suffix(".ics") {
                match store.get_object(principal, cal_id, object_id, false).await {
                    Ok(object) => result.push(object),
                    Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()),
                    Err(err) => return Err(err.into()),
-                }
+                };
            } else {
                not_found.push(href.to_owned());
+                continue;
            }
        } else {
            not_found.push(href.to_owned());
+            continue;
        }
    }

--- a/crates/caldav/src/calendar/methods/report/calendar_query/elements.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/elements.rs
@@ -1,62 +1,57 @@
-use crate::calendar_object::CalendarObjectPropWrapperName;
+use crate::{Error, calendar_object::CalendarObjectPropWrapperName};
 use rustical_dav::xml::PropfindType;
 use rustical_ical::{CalendarObject, UtcDateTime};
-use rustical_store::calendar_store::CalendarQuery;
+use rustical_store::{CalendarStore, calendar_store::CalendarQuery};
 use rustical_xml::XmlDeserialize;
+use std::ops::Deref;

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-pub struct TimeRangeElement {
+pub(crate) struct TimeRangeElement {
    #[xml(ty = "attr")]
    pub(crate) start: Option<UtcDateTime>,
    #[xml(ty = "attr")]
    pub(crate) end: Option<UtcDateTime>,
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.3
-pub struct ParamFilterElement {
+struct ParamFilterElement {
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) is_not_defined: Option<()>,
+    is_not_defined: Option<()>,
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) text_match: Option<TextMatchElement>,
+    text_match: Option<TextMatchElement>,

    #[xml(ty = "attr")]
-    pub(crate) name: String,
+    name: String,
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-pub struct TextMatchElement {
+struct TextMatchElement {
    #[xml(ty = "attr")]
-    pub(crate) collation: String,
+    collation: String,
    #[xml(ty = "attr")]
-    // "yes" or "no", default: "no"
-    pub(crate) negate_condition: Option<String>,
+    negate_collation: String,
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
-// https://www.rfc-editor.org/rfc/rfc4791#section-9.7.2
-pub struct PropFilterElement {
+pub(crate) struct PropFilterElement {
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) is_not_defined: Option<()>,
+    is_not_defined: Option<()>,
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) time_range: Option<TimeRangeElement>,
+    time_range: Option<TimeRangeElement>,
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
-    pub(crate) text_match: Option<TextMatchElement>,
+    text_match: Option<TextMatchElement>,
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
-    pub(crate) param_filter: Vec<ParamFilterElement>,
-
-    #[xml(ty = "attr")]
-    pub(crate) name: String,
+    param_filter: Vec<ParamFilterElement>,
 }

 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // https://datatracker.ietf.org/doc/html/rfc4791#section-9.7.1
-pub struct CompFilterElement {
+pub(crate) struct CompFilterElement {
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
    pub(crate) is_not_defined: Option<()>,
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
@@ -66,7 +61,7 @@ pub struct CompFilterElement {
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
    pub(crate) comp_filter: Vec<CompFilterElement>,

-    #[xml(ty = "attr")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", ty = "attr")]
    pub(crate) name: String,
 }

@@ -76,11 +71,11 @@ impl CompFilterElement {
        let comp_vcal = self.name == "VCALENDAR";
        match (self.is_not_defined, comp_vcal) {
            // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) |
+            (Some(()), true) => return false,
            // Client is asking for something different than a vcalendar
            (None, false) => return false,
            _ => {}
-        }
+        };

        if self.time_range.is_some() {
            // <time-range> should be applied on VEVENT/VTODO but not on VCALENDAR
@@ -106,26 +101,28 @@ impl CompFilterElement {
        let comp_name_matches = self.name == cal_object.get_component_name();
        match (self.is_not_defined, comp_name_matches) {
            // Client wants VCALENDAR to not exist but we are a VCALENDAR
-            (Some(()), true) |
+            (Some(()), true) => return false,
            // Client is asking for something different than a vcalendar
            (None, false) => return false,
            _ => {}
-        }
+        };

        // TODO: Implement prop-filter (and comp-filter?) at some point

        if let Some(time_range) = &self.time_range {
-            if let Some(start) = &time_range.start
-                && let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None)
-                && **start > last_occurence.utc()
-            {
-                return false;
+            if let Some(start) = &time_range.start {
+                if let Some(last_occurence) = cal_object.get_last_occurence().unwrap_or(None) {
+                    if start.deref() > &last_occurence.utc() {
+                        return false;
+                    }
+                };
            }
-            if let Some(end) = &time_range.end
-                && let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None)
-                && **end < first_occurence.utc()
-            {
-                return false;
+            if let Some(end) = &time_range.end {
+                if let Some(first_occurence) = cal_object.get_first_occurence().unwrap_or(None) {
+                    if end.deref() < &first_occurence.utc() {
+                        return false;
+                    }
+                };
            }
        }
        true
@@ -135,7 +132,7 @@ impl CompFilterElement {
 #[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 // https://datatracker.ietf.org/doc/html/rfc4791#section-9.7
-pub struct FilterElement {
+pub(crate) struct FilterElement {
    // This comp-filter matches on VCALENDAR
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
    pub(crate) comp_filter: CompFilterElement,
@@ -150,21 +147,21 @@ impl FilterElement {
 impl From<&FilterElement> for CalendarQuery {
    fn from(value: &FilterElement) -> Self {
        let comp_filter_vcalendar = &value.comp_filter;
-        for comp_filter in &comp_filter_vcalendar.comp_filter {
+        for comp_filter in comp_filter_vcalendar.comp_filter.iter() {
            // A calendar object cannot contain both VEVENT and VTODO, so we only have to handle
            // whatever we get first
-            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO")
-                && let Some(time_range) = &comp_filter.time_range
-            {
-                let start = time_range.start.as_ref().map(|start| start.date_naive());
-                let end = time_range.end.as_ref().map(|end| end.date_naive());
-                return Self {
-                    time_start: start,
-                    time_end: end,
-                };
+            if matches!(comp_filter.name.as_str(), "VEVENT" | "VTODO") {
+                if let Some(time_range) = &comp_filter.time_range {
+                    let start = time_range.start.as_ref().map(|start| start.date_naive());
+                    let end = time_range.end.as_ref().map(|end| end.date_naive());
+                    return CalendarQuery {
+                        time_start: start,
+                        time_end: end,
+                    };
+                }
            }
        }
-        Self::default()
+        Default::default()
    }
 }

@@ -184,6 +181,25 @@ pub struct CalendarQueryRequest {

 impl From<&CalendarQueryRequest> for CalendarQuery {
    fn from(value: &CalendarQueryRequest) -> Self {
-        value.filter.as_ref().map(Self::from).unwrap_or_default()
+        value
+            .filter
+            .as_ref()
+            .map(CalendarQuery::from)
+            .unwrap_or_default()
    }
 }
+
+pub async fn get_objects_calendar_query<C: CalendarStore>(
+    cal_query: &CalendarQueryRequest,
+    principal: &str,
+    cal_id: &str,
+    store: &C,
+) -> Result<Vec<CalendarObject>, Error> {
+    let mut objects = store
+        .calendar_query(principal, cal_id, cal_query.into())
+        .await?;
+    if let Some(filter) = &cal_query.filter {
+        objects.retain(|object| filter.matches(object));
+    }
+    Ok(objects)
+}
--- a/crates/caldav/src/calendar/methods/report/calendar_query/mod.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query/mod.rs
@@ -1,120 +0,0 @@
-use crate::Error;
-use rustical_ical::CalendarObject;
-use rustical_store::CalendarStore;
-
-mod elements;
-pub use elements::*;
-
-pub async fn get_objects_calendar_query<C: CalendarStore>(
-    cal_query: &CalendarQueryRequest,
-    principal: &str,
-    cal_id: &str,
-    store: &C,
-) -> Result<Vec<CalendarObject>, Error> {
-    let mut objects = store
-        .calendar_query(principal, cal_id, cal_query.into())
-        .await?;
-    if let Some(filter) = &cal_query.filter {
-        objects.retain(|object| filter.matches(object));
-    }
-    Ok(objects)
-}
-
-#[cfg(test)]
-mod tests {
-    use rustical_dav::xml::PropElement;
-    use rustical_xml::XmlDocument;
-
-    use crate::{
-        calendar::methods::report::{
-            ReportRequest,
-            calendar_query::{
-                CalendarQueryRequest, CompFilterElement, FilterElement, ParamFilterElement,
-                PropFilterElement, TextMatchElement,
-            },
-        },
-        calendar_object::{CalendarData, CalendarObjectPropName, CalendarObjectPropWrapperName},
-    };
-
-    #[test]
-    fn calendar_query_7_8_7() {
-        const INPUT: &str = r#"
-            <?xml version="1.0" encoding="utf-8" ?>
-            <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-                <D:prop xmlns:D="DAV:">
-                    <D:getetag/>
-                    <C:calendar-data/>
-                </D:prop>
-                <C:filter>
-                <C:comp-filter name="VCALENDAR">
-                    <C:comp-filter name="VEVENT">
-                        <C:prop-filter name="ATTENDEE">
-                            <C:text-match collation="i;ascii-casemap">mailto:lisa@example.com</C:text-match>
-                            <C:param-filter name="PARTSTAT">
-                                <C:text-match collation="i;ascii-casemap">NEEDS-ACTION</C:text-match>
-                            </C:param-filter>
-                        </C:prop-filter>
-                    </C:comp-filter>
-                </C:comp-filter>
-                </C:filter>
-            </C:calendar-query>
-        "#;
-
-        let report = ReportRequest::parse_str(INPUT).unwrap();
-        let calendar_query: CalendarQueryRequest =
-            if let ReportRequest::CalendarQuery(query) = report {
-                query
-            } else {
-                panic!()
-            };
-        assert_eq!(
-            calendar_query,
-            CalendarQueryRequest {
-                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
-                    vec![
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::Getetag,
-                        ),
-                        CalendarObjectPropWrapperName::CalendarObject(
-                            CalendarObjectPropName::CalendarData(CalendarData::default())
-                        ),
-                    ],
-                    vec![]
-                )),
-                filter: Some(FilterElement {
-                    comp_filter: CompFilterElement {
-                        is_not_defined: None,
-                        time_range: None,
-                        prop_filter: vec![],
-                        comp_filter: vec![CompFilterElement {
-                            prop_filter: vec![PropFilterElement {
-                                name: "ATTENDEE".to_owned(),
-                                text_match: Some(TextMatchElement {
-                                    collation: "i;ascii-casemap".to_owned(),
-                                    negate_condition: None
-                                }),
-                                is_not_defined: None,
-                                param_filter: vec![ParamFilterElement {
-                                    is_not_defined: None,
-                                    name: "PARTSTAT".to_owned(),
-                                    text_match: Some(TextMatchElement {
-                                        collation: "i;ascii-casemap".to_owned(),
-                                        negate_condition: None
-                                    }),
-                                }],
-                                time_range: None
-                            }],
-                            comp_filter: vec![],
-                            is_not_defined: None,
-                            name: "VEVENT".to_owned(),
-                            time_range: None
-                        }],
-                        name: "VCALENDAR".to_owned()
-                    }
-                }),
-                timezone: None,
-                timezone_id: None
-            }
-        );
-    }
-}
--- a/crates/caldav/src/calendar/methods/report/mod.rs
+++ b/crates/caldav/src/calendar/methods/report/mod.rs
@@ -41,11 +41,11 @@ pub(crate) enum ReportRequest {
 }

 impl ReportRequest {
-    const fn props(&self) -> &PropfindType<CalendarObjectPropWrapperName> {
+    fn props(&self) -> &PropfindType<CalendarObjectPropWrapperName> {
        match &self {
-            Self::CalendarMultiget(CalendarMultigetRequest { prop, .. })
-            | Self::CalendarQuery(CalendarQueryRequest { prop, .. })
-            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            ReportRequest::CalendarMultiget(CalendarMultigetRequest { prop, .. }) => prop,
+            ReportRequest::CalendarQuery(CalendarQueryRequest { prop, .. }) => prop,
+            ReportRequest::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
        }
    }
 }
@@ -184,7 +184,7 @@ mod tests {
                    "/caldav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                ]
            })
-        );
+        )
    }

    #[test]
@@ -241,7 +241,7 @@ mod tests {
                timezone: None,
                timezone_id: None,
            })
-        );
+        )
    }

    #[test]
@@ -269,6 +269,6 @@ mod tests {
                    "/caldav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                ]
            })
-        );
+        )
    }
 }
--- a/crates/caldav/src/calendar/mod.rs
+++ b/crates/caldav/src/calendar/mod.rs
@@ -4,6 +4,3 @@ pub mod resource;
 mod service;

 pub use service::CalendarResourceService;
-
-#[cfg(test)]
-pub mod tests;
--- a/crates/caldav/src/calendar/prop.rs
+++ b/crates/caldav/src/calendar/prop.rs
@@ -3,13 +3,13 @@ use rustical_ical::CalendarObjectType;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;

-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq, From, Into)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, From, Into)]
 pub struct SupportedCalendarComponent {
    #[xml(ty = "attr")]
    pub name: CalendarObjectType,
 }

-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, PartialEq)]
 pub struct SupportedCalendarComponentSet {
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", flatten)]
    pub comp: Vec<SupportedCalendarComponent>,
@@ -36,7 +36,7 @@ impl From<SupportedCalendarComponentSet> for Vec<CalendarObjectType> {
    }
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub struct CalendarData {
    #[xml(ty = "attr")]
    content_type: String,
@@ -53,13 +53,13 @@ impl Default for CalendarData {
    }
 }

-#[derive(Debug, Clone, XmlSerialize, Default, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, Default, PartialEq)]
 pub struct SupportedCalendarData {
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
    calendar_data: CalendarData,
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
 pub enum ReportMethod {
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
    CalendarQuery,
--- a/crates/caldav/src/calendar/resource.rs
+++ b/crates/caldav/src/calendar/resource.rs
@@ -3,7 +3,6 @@ use crate::Error;
 use crate::calendar::prop::ReportMethod;
 use chrono::{DateTime, Utc};
 use derive_more::derive::{From, Into};
-use ical::IcalParser;
 use rustical_dav::extensions::{
    CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
 };
@@ -16,9 +15,9 @@ use rustical_store::Calendar;
 use rustical_store::auth::Principal;
 use rustical_xml::{EnumVariants, PropName};
 use rustical_xml::{XmlDeserialize, XmlSerialize};
-use serde::Deserialize;
+use std::str::FromStr;

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropName")]
 pub enum CalendarProp {
    // CalDAV (RFC 4791)
@@ -35,7 +34,7 @@ pub enum CalendarProp {
    CalendarTimezoneId(Option<String>),
    #[xml(ns = "rustical_dav::namespace::NS_ICAL")]
    CalendarOrder(Option<i64>),
-    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
+    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
    SupportedCalendarComponentSet(SupportedCalendarComponentSet),
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV", skip_deserializing)]
    SupportedCalendarData(SupportedCalendarData),
@@ -54,7 +53,7 @@ pub enum CalendarProp {
    MaxDateTime(String),
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarPropWrapperName", untagged)]
 pub enum CalendarPropWrapper {
    Calendar(CalendarProp),
@@ -63,7 +62,7 @@ pub enum CalendarPropWrapper {
    Common(CommonPropertiesProp),
 }

-#[derive(Clone, Debug, From, Into, Deserialize)]
+#[derive(Clone, Debug, From, Into)]
 pub struct CalendarResource {
    pub cal: Calendar,
    pub read_only: bool,
@@ -71,7 +70,7 @@ pub struct CalendarResource {

 impl ResourceName for CalendarResource {
    fn get_name(&self) -> String {
-        self.cal.id.clone()
+        self.cal.id.to_owned()
    }
 }

@@ -89,7 +88,7 @@ impl SyncTokenExtension for CalendarResource {

 impl DavPushExtension for CalendarResource {
    fn get_topic(&self) -> String {
-        self.cal.push_topic.clone()
+        self.cal.push_topic.to_owned()
    }
 }

@@ -128,17 +127,13 @@ impl Resource for CalendarResource {
        Ok(match prop {
            CalendarPropWrapperName::Calendar(prop) => CalendarPropWrapper::Calendar(match prop {
                CalendarPropName::CalendarColor => {
-                    CalendarProp::CalendarColor(self.cal.meta.color.clone())
+                    CalendarProp::CalendarColor(self.cal.color.clone())
                }
                CalendarPropName::CalendarDescription => {
-                    CalendarProp::CalendarDescription(self.cal.meta.description.clone())
+                    CalendarProp::CalendarDescription(self.cal.description.clone())
                }
                CalendarPropName::CalendarTimezone => {
-                    CalendarProp::CalendarTimezone(self.cal.timezone_id.as_ref().and_then(|tzid| {
-                        vtimezones_rs::VTIMEZONES
-                            .get(tzid)
-                            .map(|tz| (*tz).to_string())
-                    }))
+                    CalendarProp::CalendarTimezone(self.cal.timezone.clone())
                }
                // chrono_tz uses the IANA database
                CalendarPropName::TimezoneServiceSet => CalendarProp::TimezoneServiceSet(
@@ -148,7 +143,7 @@ impl Resource for CalendarResource {
                    CalendarProp::CalendarTimezoneId(self.cal.timezone_id.clone())
                }
                CalendarPropName::CalendarOrder => {
-                    CalendarProp::CalendarOrder(Some(self.cal.meta.order))
+                    CalendarProp::CalendarOrder(Some(self.cal.order))
                }
                CalendarPropName::SupportedCalendarComponentSet => {
                    CalendarProp::SupportedCalendarComponentSet(self.cal.components.clone().into())
@@ -156,13 +151,13 @@ impl Resource for CalendarResource {
                CalendarPropName::SupportedCalendarData => {
                    CalendarProp::SupportedCalendarData(SupportedCalendarData::default())
                }
-                CalendarPropName::MaxResourceSize => CalendarProp::MaxResourceSize(10_000_000),
+                CalendarPropName::MaxResourceSize => CalendarProp::MaxResourceSize(10000000),
                CalendarPropName::SupportedReportSet => {
                    CalendarProp::SupportedReportSet(SupportedReportSet::all())
                }
-                CalendarPropName::Source => {
-                    CalendarProp::Source(self.cal.subscription_url.clone().map(HrefElement::from))
-                }
+                CalendarPropName::Source => CalendarProp::Source(
+                    self.cal.subscription_url.to_owned().map(HrefElement::from),
+                ),
                CalendarPropName::MinDateTime => {
                    CalendarProp::MinDateTime(CalDateTime::from(DateTime::<Utc>::MIN_UTC).format())
                }
@@ -189,66 +184,45 @@ impl Resource for CalendarResource {
        match prop {
            CalendarPropWrapper::Calendar(prop) => match prop {
                CalendarProp::CalendarColor(color) => {
-                    self.cal.meta.color = color;
+                    self.cal.color = color;
                    Ok(())
                }
                CalendarProp::CalendarDescription(description) => {
-                    self.cal.meta.description = description;
+                    self.cal.description = description;
                    Ok(())
                }
                CalendarProp::CalendarTimezone(timezone) => {
-                    if let Some(tz) = timezone {
-                        // TODO: Proper error (calendar-timezone precondition)
-                        let calendar = IcalParser::new(tz.as_bytes())
-                            .next()
-                            .ok_or_else(|| {
-                                rustical_dav::Error::BadRequest(
-                                    "No timezone data provided".to_owned(),
-                                )
-                            })?
-                            .map_err(|_| {
-                                rustical_dav::Error::BadRequest(
-                                    "No timezone data provided".to_owned(),
-                                )
-                            })?;
-
-                        let timezone = calendar.timezones.first().ok_or_else(|| {
-                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
-                        })?;
-                        let timezone: chrono_tz::Tz = timezone.try_into().map_err(|_| {
-                            rustical_dav::Error::BadRequest("No timezone data provided".to_owned())
-                        })?;
-
-                        self.cal.timezone_id = Some(timezone.name().to_owned());
-                    }
+                    // TODO: Ensure that timezone-id is also updated
+                    self.cal.timezone = timezone;
                    Ok(())
                }
+                CalendarProp::TimezoneServiceSet(_) => Err(rustical_dav::Error::PropReadOnly),
                CalendarProp::CalendarTimezoneId(timezone_id) => {
-                    if let Some(tzid) = &timezone_id
-                        && !vtimezones_rs::VTIMEZONES.contains_key(tzid)
-                    {
-                        return Err(rustical_dav::Error::BadRequest(format!(
-                            "Invalid timezone-id: {tzid}"
-                        )));
+                    if let Some(tzid) = &timezone_id {
+                        // Validate timezone id
+                        chrono_tz::Tz::from_str(tzid).map_err(|_| {
+                            rustical_dav::Error::BadRequest(format!("Invalid timezone-id: {tzid}"))
+                        })?;
+                        // TODO: Ensure that timezone is also updated (For now hope that clients play nice)
                    }
                    self.cal.timezone_id = timezone_id;
                    Ok(())
                }
                CalendarProp::CalendarOrder(order) => {
-                    self.cal.meta.order = order.unwrap_or_default();
+                    self.cal.order = order.unwrap_or_default();
                    Ok(())
                }
                CalendarProp::SupportedCalendarComponentSet(comp_set) => {
                    self.cal.components = comp_set.into();
                    Ok(())
                }
-                CalendarProp::TimezoneServiceSet(_)
-                | CalendarProp::SupportedCalendarData(_)
-                | CalendarProp::MaxResourceSize(_)
-                | CalendarProp::SupportedReportSet(_)
-                | CalendarProp::Source(_)
-                | CalendarProp::MinDateTime(_)
-                | CalendarProp::MaxDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
+                CalendarProp::SupportedCalendarData(_) => Err(rustical_dav::Error::PropReadOnly),
+                CalendarProp::MaxResourceSize(_) => Err(rustical_dav::Error::PropReadOnly),
+                CalendarProp::SupportedReportSet(_) => Err(rustical_dav::Error::PropReadOnly),
+                // Converting between a calendar subscription calendar and a normal one would be weird
+                CalendarProp::Source(_) => Err(rustical_dav::Error::PropReadOnly),
+                CalendarProp::MinDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
+                CalendarProp::MaxDateTime(_) => Err(rustical_dav::Error::PropReadOnly),
            },
            CalendarPropWrapper::SyncToken(prop) => SyncTokenExtension::set_prop(self, prop),
            CalendarPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop),
@@ -263,31 +237,36 @@ impl Resource for CalendarResource {
        match prop {
            CalendarPropWrapperName::Calendar(prop) => match prop {
                CalendarPropName::CalendarColor => {
-                    self.cal.meta.color = None;
+                    self.cal.color = None;
                    Ok(())
                }
                CalendarPropName::CalendarDescription => {
-                    self.cal.meta.description = None;
+                    self.cal.description = None;
                    Ok(())
                }
-                CalendarPropName::CalendarTimezone | CalendarPropName::CalendarTimezoneId => {
+                CalendarPropName::CalendarTimezone => {
+                    self.cal.timezone = None;
+                    Ok(())
+                }
+                CalendarPropName::TimezoneServiceSet => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::CalendarTimezoneId => {
                    self.cal.timezone_id = None;
                    Ok(())
                }
                CalendarPropName::CalendarOrder => {
-                    self.cal.meta.order = 0;
+                    self.cal.order = 0;
                    Ok(())
                }
                CalendarPropName::SupportedCalendarComponentSet => {
                    Err(rustical_dav::Error::PropReadOnly)
                }
-                CalendarPropName::TimezoneServiceSet
-                | CalendarPropName::SupportedCalendarData
-                | CalendarPropName::MaxResourceSize
-                | CalendarPropName::SupportedReportSet
-                | CalendarPropName::Source
-                | CalendarPropName::MinDateTime
-                | CalendarPropName::MaxDateTime => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::SupportedCalendarData => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::MaxResourceSize => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::SupportedReportSet => Err(rustical_dav::Error::PropReadOnly),
+                // Converting a calendar subscription calendar into a normal one would be weird
+                CalendarPropName::Source => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::MinDateTime => Err(rustical_dav::Error::PropReadOnly),
+                CalendarPropName::MaxDateTime => Err(rustical_dav::Error::PropReadOnly),
            },
            CalendarPropWrapperName::SyncToken(prop) => SyncTokenExtension::remove_prop(self, prop),
            CalendarPropWrapperName::DavPush(prop) => DavPushExtension::remove_prop(self, prop),
@@ -298,10 +277,10 @@ impl Resource for CalendarResource {
    }

    fn get_displayname(&self) -> Option<&str> {
-        self.cal.meta.displayname.as_deref()
+        self.cal.displayname.as_deref()
    }
    fn set_displayname(&mut self, name: Option<String>) -> Result<(), rustical_dav::Error> {
-        self.cal.meta.displayname = name;
+        self.cal.displayname = name;
        Ok(())
    }

@@ -326,15 +305,3 @@ impl Resource for CalendarResource {
        ))
    }
 }
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_tzdb_version() {
-        // Ensure that both chrono_tz and vzic_rs use the same tzdb version
-        assert_eq!(
-            chrono_tz::IANA_TZDB_VERSION,
-            vtimezones_rs::IANA_TZDB_VERSION
-        );
-    }
-}
--- a/crates/caldav/src/calendar/service.rs
+++ b/crates/caldav/src/calendar/service.rs
@@ -1,5 +1,4 @@
 use crate::calendar::methods::get::route_get;
-use crate::calendar::methods::import::route_import;
 use crate::calendar::methods::mkcalendar::route_mkcalendar;
 use crate::calendar::methods::post::route_post;
 use crate::calendar::methods::report::route_report_calendar;
@@ -35,7 +34,7 @@ impl<C: CalendarStore, S: SubscriptionStore> Clone for CalendarResourceService<C
 }

 impl<C: CalendarStore, S: SubscriptionStore> CalendarResourceService<C, S> {
-    pub const fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
+    pub fn new(cal_store: Arc<C>, sub_store: Arc<S>) -> Self {
        Self {
            cal_store,
            sub_store,
@@ -52,7 +51,7 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
    type Principal = Principal;
    type PrincipalUri = CalDavPrincipalUri;

-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, webdav-push";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy, webdav-push";

    async fn get_resource(
        &self,
@@ -139,13 +138,6 @@ impl<C: CalendarStore, S: SubscriptionStore> AxumMethods for CalendarResourceSer
        })
    }

-    fn import() -> Option<rustical_dav::resource::MethodFunction<Self>> {
-        Some(|state, req| {
-            let mut service = Handler::with_state(route_import::<C, S>, state);
-            Box::pin(Service::call(&mut service, req))
-        })
-    }
-
    fn mkcalendar() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>>
    {
        Some(|state, req| {
--- a/crates/caldav/src/calendar/test_files/propfind.outputs
+++ b/crates/caldav/src/calendar/test_files/propfind.outputs
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
-    <href>/caldav/principal/user/calendar/</href>
-    <propstat>
-        <prop>
-            <calendar-color xmlns="http://apple.com/ns/ical/"/>
-            <calendar-description xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <calendar-timezone xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <timezone-service-set xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <calendar-timezone-id xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <calendar-order xmlns="http://apple.com/ns/ical/"/>
-            <supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <supported-calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <max-resource-size xmlns="DAV:"/>
-            <supported-report-set xmlns="DAV:"/>
-            <source xmlns="http://calendarserver.org/ns/"/>
-            <min-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <max-date-time xmlns="urn:ietf:params:xml:ns:caldav"/>
-            <sync-token xmlns="DAV:"/>
-            <getctag xmlns="http://calendarserver.org/ns/"/>
-            <transports xmlns="https://bitfire.at/webdav-push"/>
-            <topic xmlns="https://bitfire.at/webdav-push"/>
-            <supported-triggers xmlns="https://bitfire.at/webdav-push"/>
-            <resourcetype xmlns="DAV:"/>
-            <displayname xmlns="DAV:"/>
-            <current-user-principal xmlns="DAV:"/>
-            <current-user-privilege-set xmlns="DAV:"/>
-            <owner xmlns="DAV:"/>
-        </prop>
-        <status>HTTP/1.1 200 OK</status>
-    </propstat>
-</response>
-
-
-<?xml version="1.0" encoding="utf-8"?>
-<response xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CARD="urn:ietf:params:xml:ns:carddav" xmlns:CS="http://calendarserver.org/ns/" xmlns:PUSH="https://bitfire.at/webdav-push">
-    <href>/caldav/principal/user/calendar/</href>
-    <propstat>
-        <prop>
-            <CAL:calendar-timezone>BEGIN:VCALENDAR
-PRODID:-//github.com/lennart-k/vzic-rs//RustiCal Calendar server//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-LAST-MODIFIED:20250723T190331Z
-X-LIC-LOCATION:Europe/Berlin
-X-PROLEPTIC-TZNAME:LMT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+005328
-TZOFFSETTO:+0100
-DTSTART:18930401T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19160430T230000
-RDATE:19400401T020000
-RDATE:19430329T020000
-RDATE:19460414T020000
-RDATE:19470406T030000
-RDATE:19480418T020000
-RDATE:19490410T020000
-RDATE:19800406T020000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19161001T010000
-RDATE:19421102T030000
-RDATE:19431004T030000
-RDATE:19441002T030000
-RDATE:19451118T030000
-RDATE:19461007T030000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19170416T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=3MO;UNTIL=19180415T010000Z
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19170917T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=3MO;UNTIL=19180916T010000Z
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-DTSTART:19440403T020000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1MO;UNTIL=19450402T010000Z
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEMT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-DTSTART:19450524T020000
-RDATE:19470511T030000
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-TZNAME:CEST
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-DTSTART:19450924T030000
-RDATE:19470629T030000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0100
-DTSTART:19460101T000000
-RDATE:19800101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19471005T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19491002T010000Z
-END:STANDARD
-BEGIN:STANDARD
-TZNAME:CET
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-DTSTART:19800928T030000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T010000Z
-END:STANDARD
-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
-</CAL:calendar-timezone>
-            <CAL:timezone-service-set>
-                <href>https://www.iana.org/time-zones</href>
-            </CAL:timezone-service-set>
-            <CAL:calendar-timezone-id>Europe/Berlin</CAL:calendar-timezone-id>
-            <calendar-order xmlns="http://apple.com/ns/ical/">0</calendar-order>
-            <CAL:supported-calendar-component-set>
-                <CAL:comp name="VEVENT"/>
-                <CAL:comp name="VTODO"/>
-            </CAL:supported-calendar-component-set>
-            <CAL:supported-calendar-data>
-                <CAL:calendar-data content-type="text/calendar" version="2.0"/>
-            </CAL:supported-calendar-data>
-            <max-resource-size>10000000</max-resource-size>
-            <supported-report-set>
-                <supported-report>
-                    <report>
-                        <CAL:calendar-query/>
-                    </report>
-                </supported-report>
-                <supported-report>
-                    <report>
-                        <CAL:calendar-multiget/>
-                    </report>
-                </supported-report>
-                <supported-report>
-                    <report>
-                        <sync-collection/>
-                    </report>
-                </supported-report>
-            </supported-report-set>
-            <CAL:min-date-time>-2621430101T000000Z</CAL:min-date-time>
-            <CAL:max-date-time>+2621421231T235959Z</CAL:max-date-time>
-            <sync-token>github.com/lennart-k/rustical/ns/12</sync-token>
-            <CS:getctag>github.com/lennart-k/rustical/ns/12</CS:getctag>
-            <PUSH:transports>
-                <PUSH:web-push/>
-            </PUSH:transports>
-            <PUSH:topic>b28b41e9-8801-4fc5-ae29-8efb5fadeb36</PUSH:topic>
-            <PUSH:supported-triggers>
-                <PUSH:content-update>
-                    <depth>1</depth>
-                </PUSH:content-update>
-                <PUSH:property-update>
-                    <depth>1</depth>
-                </PUSH:property-update>
-            </PUSH:supported-triggers>
-            <resourcetype>
-                <collection/>
-                <CAL:calendar/>
-            </resourcetype>
-            <displayname>Calendar</displayname>
-            <current-user-principal>
-                <href>/caldav/principal/user/</href>
-            </current-user-principal>
-            <current-user-privilege-set>
-                <privilege>
-                    <read/>
-                </privilege>
-                <privilege>
-                    <read-acl/>
-                </privilege>
-                <privilege>
-                    <read-current-user-privilege-set/>
-                </privilege>
-            </current-user-privilege-set>
-            <owner>
-                <href>/caldav/principal/user/</href>
-            </owner>
-        </prop>
-        <status>HTTP/1.1 200 OK</status>
-    </propstat>
-</response>
--- a/crates/caldav/src/calendar/test_files/propfind.principals.json
+++ b/crates/caldav/src/calendar/test_files/propfind.principals.json
@@ -1,11 +0,0 @@
-[
-  {
-    "id": "user",
-    "displayname": null,
-    "principal_type": "individual",
-    "password": null,
-    "memberships": [
-      "group"
-    ]
-  }
-]
--- a/crates/caldav/src/calendar/test_files/propfind.requests
+++ b/crates/caldav/src/calendar/test_files/propfind.requests
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<propfind xmlns="DAV:"><propname/></propfind>
-
-
-<?xml version="1.0" encoding="UTF-8"?>
-<propfind xmlns="DAV:"><allprop/></propfind>
--- a/crates/caldav/src/calendar/test_files/propfind.resources.json
+++ b/crates/caldav/src/calendar/test_files/propfind.resources.json
@@ -1,42 +0,0 @@
-[
-  {
-    "cal": {
-      "principal": "user",
-      "id": "calendar",
-      "displayname": "Calendar",
-      "order": 0,
-      "description": null,
-      "color": null,
-      "timezone_id": "Europe/Berlin",
-      "deleted_at": null,
-      "synctoken": 12,
-      "subscription_url": null,
-      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
-      "components": [
-        "VEVENT",
-        "VTODO"
-      ]
-    },
-    "read_only": true
-  },
-  {
-    "cal": {
-      "principal": "user",
-      "id": "calendar",
-      "displayname": "Calendar",
-      "order": 0,
-      "description": null,
-      "color": null,
-      "timezone_id": "Europe/Berlin",
-      "deleted_at": null,
-      "synctoken": 12,
-      "subscription_url": null,
-      "push_topic": "b28b41e9-8801-4fc5-ae29-8efb5fadeb36",
-      "components": [
-        "VEVENT",
-        "VTODO"
-      ]
-    },
-    "read_only": true
-  }
-]
--- a/crates/caldav/src/calendar/tests.rs
+++ b/crates/caldav/src/calendar/tests.rs
@@ -1,47 +0,0 @@
-use crate::{CalDavPrincipalUri, calendar::resource::CalendarResource};
-use rustical_dav::resource::Resource;
-use rustical_store::auth::Principal;
-use rustical_xml::XmlSerializeRoot;
-use serde_json::from_str;
-
-#[tokio::test]
-async fn test_propfind() {
-    let requests: Vec<_> = include_str!("./test_files/propfind.requests")
-        .trim()
-        .split("\n\n")
-        .collect();
-    let principals: Vec<Principal> =
-        from_str(include_str!("./test_files/propfind.principals.json")).unwrap();
-    let resources: Vec<CalendarResource> =
-        from_str(include_str!("./test_files/propfind.resources.json")).unwrap();
-    let outputs: Vec<_> = include_str!("./test_files/propfind.outputs")
-        .trim()
-        .split("\n\n")
-        .collect();
-
-    for principal in principals {
-        for ((request, resource), &expected_output) in requests.iter().zip(&resources).zip(&outputs)
-        {
-            let propfind = CalendarResource::parse_propfind(request).unwrap();
-
-            let response = resource
-                .propfind(
-                    &format!("/caldav/principal/{}/{}", principal.id, resource.cal.id),
-                    &propfind.prop,
-                    propfind.include.as_ref(),
-                    &CalDavPrincipalUri("/caldav"),
-                    &principal,
-                )
-                .unwrap();
-            let expected_output = expected_output.trim();
-            let output = response
-                .serialize_to_string()
-                .unwrap()
-                .trim()
-                .replace("\r\n", "\n");
-            println!("{output}");
-            println!("{}, {} \n\n\n", output.len(), expected_output.len());
-            assert_eq!(output, expected_output);
-        }
-    }
-}
--- a/crates/caldav/src/calendar_object/methods.rs
+++ b/crates/caldav/src/calendar_object/methods.rs
@@ -11,7 +11,7 @@ use rustical_ical::CalendarObject;
 use rustical_store::CalendarStore;
 use rustical_store::auth::Principal;
 use std::str::FromStr;
-use tracing::{debug, error, instrument};
+use tracing::instrument;

 #[instrument(skip(cal_store))]
 pub async fn get_event<C: CalendarStore>(
@@ -78,18 +78,12 @@ pub async fn put_event<C: CalendarStore>(
        true
    };

-    let Ok(object) = CalendarObject::from_ics(body.clone()) else {
-        debug!("invalid calendar data:\n{body}");
-        return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
+    let object = match CalendarObject::from_ics(object_id, body) {
+        Ok(obj) => obj,
+        Err(_) => {
+            return Err(Error::PreconditionFailed(Precondition::ValidCalendarData));
+        }
    };
-    if object.get_id() != object_id {
-        error!(
-            "Calendar object UID and file name not matching: UID={}, filename={}",
-            object.get_id(),
-            object_id
-        );
-        return Err(Error::PreconditionFailed(Precondition::MatchingUid));
-    }
    cal_store
        .put_object(principal, calendar_id, object, overwrite)
        .await?;
--- a/crates/caldav/src/calendar_object/prop.rs
+++ b/crates/caldav/src/calendar_object/prop.rs
@@ -2,7 +2,7 @@ use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_ical::UtcDateTime;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropName")]
 pub enum CalendarObjectProp {
    // WebDAV (RFC 2518)
@@ -17,7 +17,7 @@ pub enum CalendarObjectProp {
    CalendarData(String),
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "CalendarObjectPropWrapperName", untagged)]
 pub enum CalendarObjectPropWrapper {
    CalendarObject(CalendarObjectProp),
@@ -25,7 +25,7 @@ pub enum CalendarObjectPropWrapper {
 }

 #[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct ExpandElement {
+pub(crate) struct ExpandElement {
    #[xml(ty = "attr")]
    pub(crate) start: UtcDateTime,
    #[xml(ty = "attr")]
--- a/crates/caldav/src/calendar_object/resource.rs
+++ b/crates/caldav/src/calendar_object/resource.rs
@@ -1,7 +1,4 @@
-use super::prop::{
-    CalendarData, CalendarObjectProp, CalendarObjectPropName, CalendarObjectPropWrapper,
-    CalendarObjectPropWrapperName,
-};
+use super::prop::*;
 use crate::Error;
 use derive_more::derive::{From, Into};
 use rustical_dav::{
--- a/crates/caldav/src/calendar_object/service.rs
+++ b/crates/caldav/src/calendar_object/service.rs
@@ -35,7 +35,7 @@ impl<C: CalendarStore> Clone for CalendarObjectResourceService<C> {
 }

 impl<C: CalendarStore> CalendarObjectResourceService<C> {
-    pub const fn new(cal_store: Arc<C>) -> Self {
+    pub fn new(cal_store: Arc<C>) -> Self {
        Self { cal_store }
    }
 }
@@ -106,8 +106,9 @@ where
    D: Deserializer<'de>,
 {
    let name: String = Deserialize::deserialize(deserializer)?;
-    name.strip_suffix(".ics").map_or_else(
-        || Err(serde::de::Error::custom("Missing .ics extension")),
-        |object_id| Ok(object_id.to_owned()),
-    )
+    if let Some(object_id) = name.strip_suffix(".ics") {
+        Ok(object_id.to_owned())
+    } else {
+        Err(serde::de::Error::custom("Missing .ics extension"))
+    }
 }
--- a/crates/caldav/src/error.rs
+++ b/crates/caldav/src/error.rs
@@ -12,8 +12,6 @@ pub enum Precondition {
    #[error("valid-calendar-data")]
    #[xml(ns = "rustical_dav::namespace::NS_CALDAV")]
    ValidCalendarData,
-    #[error("matching-uid")]
-    MatchingUid,
 }

 impl IntoResponse for Precondition {
@@ -62,35 +60,29 @@ pub enum Error {
 }

 impl Error {
-    #[must_use]
    pub fn status_code(&self) -> StatusCode {
        match self {
-            Self::StoreError(err) => match err {
+            Error::StoreError(err) => match err {
                rustical_store::Error::NotFound => StatusCode::NOT_FOUND,
                rustical_store::Error::AlreadyExists => StatusCode::CONFLICT,
                rustical_store::Error::ReadOnly => StatusCode::FORBIDDEN,
                _ => StatusCode::INTERNAL_SERVER_ERROR,
            },
-            Self::DavError(err) => StatusCode::try_from(err.status_code().as_u16())
+            Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            Error::DavError(err) => StatusCode::try_from(err.status_code().as_u16())
                .expect("Just converting between versions"),
-            Self::Unauthorized => StatusCode::UNAUTHORIZED,
-            Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
-            Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
-            Self::NotFound => StatusCode::NOT_FOUND,
-            Self::IcalError(err) => err.status_code(),
-            Self::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
+            Error::Unauthorized => StatusCode::UNAUTHORIZED,
+            Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
+            Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
+            Error::NotFound => StatusCode::NOT_FOUND,
+            Error::IcalError(err) => err.status_code(),
+            Error::PreconditionFailed(_err) => StatusCode::PRECONDITION_FAILED,
        }
    }
 }

 impl IntoResponse for Error {
    fn into_response(self) -> axum::response::Response {
-        if matches!(
-            self.status_code(),
-            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
-        ) {
-            error!("{self}");
-        }
        (self.status_code(), self.to_string()).into_response()
    }
 }
--- a/crates/caldav/src/lib.rs
+++ b/crates/caldav/src/lib.rs
@@ -1,5 +1,3 @@
-#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 use axum::{Extension, Router};
 use derive_more::Constructor;
 use principal::PrincipalResourceService;
@@ -39,8 +37,8 @@ pub fn caldav_router<AP: AuthenticationProvider, C: CalendarStore, S: Subscripti
        prefix,
        RootResourceService::<_, Principal, CalDavPrincipalUri>::new(PrincipalResourceService {
            auth_provider: auth_provider.clone(),
-            sub_store: subscription_store,
-            cal_store: store,
+            sub_store: subscription_store.clone(),
+            cal_store: store.clone(),
            simplified_home_set,
        })
        .axum_router()
--- a/crates/caldav/src/principal/mod.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -24,7 +24,7 @@ pub struct PrincipalResource {

 impl ResourceName for PrincipalResource {
    fn get_name(&self) -> String {
-        self.principal.id.clone()
+        self.principal.id.to_owned()
    }
 }

@@ -41,6 +41,11 @@ impl Resource for PrincipalResource {
        Resourcetype(&[
            ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "collection"),
            ResourcetypeInner(Some(rustical_dav::namespace::NS_DAV), "principal"),
+            // https://github.com/apple/ccs-calendarserver/blob/13c706b985fb728b9aab42dc0fef85aae21921c3/doc/Extensions/caldav-proxy.txt
+            // ResourcetypeInner(
+            //     Some(rustical_dav::namespace::NS_CALENDARSERVER),
+            //     "calendar-proxy-write",
+            // ),
        ])
    }

@@ -56,7 +61,7 @@ impl Resource for PrincipalResource {
            PrincipalPropWrapperName::Principal(prop) => {
                PrincipalPropWrapper::Principal(match prop {
                    PrincipalPropName::CalendarUserType => {
-                        PrincipalProp::CalendarUserType(self.principal.principal_type.clone())
+                        PrincipalProp::CalendarUserType(self.principal.principal_type.to_owned())
                    }
                    PrincipalPropName::PrincipalUrl => {
                        PrincipalProp::PrincipalUrl(principal_url.into())
@@ -121,7 +126,7 @@ impl Resource for PrincipalResource {
    }

    fn get_user_privileges(&self, user: &Principal) -> Result<UserPrivilegeSet, Self::Error> {
-        Ok(UserPrivilegeSet::owner_only(
+        Ok(UserPrivilegeSet::owner_read(
            user.is_principal(&self.principal.id),
        ))
    }
--- a/crates/caldav/src/principal/prop.rs
+++ b/crates/caldav/src/principal/prop.rs
@@ -6,7 +6,7 @@ use rustical_store::auth::PrincipalType;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
    // Scheduling Extensions to CalDAV (RFC 6638)
@@ -16,13 +16,13 @@ pub enum PrincipalProp {
    CalendarUserAddressSet(HrefElement),

    // WebDAV Access Control (RFC 3744)
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "principal-URL")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"principal-URL")]
    PrincipalUrl(HrefElement),
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    GroupMembership(GroupMembership),
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
    AlternateUriSet,
    // #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    // PrincipalCollectionSet(HrefElement),
@@ -34,17 +34,17 @@ pub enum PrincipalProp {
    CalendarHomeSet(CalendarHomeSet),
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
 pub struct CalendarHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
    Principal(PrincipalProp),
    Common(CommonPropertiesProp),
 }

-#[derive(XmlSerialize, PartialEq, Eq, Clone, VariantArray)]
+#[derive(XmlSerialize, PartialEq, Clone, VariantArray)]
 pub enum ReportMethod {
    // We don't actually support principal-match
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
--- a/crates/caldav/src/principal/service.rs
+++ b/crates/caldav/src/principal/service.rs
@@ -46,7 +46,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
    type Principal = Principal;
    type PrincipalUri = CalDavPrincipalUri;

-    const DAV_HEADER: &str = "1, 3, access-control, calendar-access";
+    const DAV_HEADER: &str = "1, 3, access-control, calendar-access, calendar-proxy";

    async fn get_resource(
        &self,
--- a/crates/caldav/src/principal/tests.rs
+++ b/crates/caldav/src/principal/tests.rs
@@ -1,19 +1,14 @@
 use std::sync::Arc;

-use crate::{
-    CalDavPrincipalUri,
-    principal::{PrincipalResource, PrincipalResourceService},
-};
+use crate::principal::PrincipalResourceService;
 use rstest::rstest;
-use rustical_dav::resource::{Resource, ResourceService};
-use rustical_store::auth::{Principal, PrincipalType::Individual};
+use rustical_dav::resource::ResourceService;
 use rustical_store_sqlite::{
    SqliteStore,
    calendar_store::SqliteCalendarStore,
    principal_store::SqlitePrincipalStore,
    tests::{get_test_calendar_store, get_test_principal_store, get_test_subscription_store},
 };
-use rustical_xml::XmlSerializeRoot;

 #[rstest]
 #[tokio::test]
@@ -35,15 +30,6 @@ async fn test_principal_resource(
        simplified_home_set: false,
    };

-    // We don't have any calendars here
-    assert!(
-        service
-            .get_members(&("user".to_owned(),))
-            .await
-            .unwrap()
-            .is_empty()
-    );
-
    assert!(matches!(
        service
            .get_resource(&("invalid-user".to_owned(),), true)
@@ -58,35 +44,4 @@ async fn test_principal_resource(
 }

 #[tokio::test]
-async fn test_propfind() {
-    let propfind = PrincipalResource::parse_propfind(
-        r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
-    )
-    .unwrap();
-
-    let principal = Principal {
-        id: "user".to_string(),
-        displayname: None,
-        principal_type: Individual,
-        password: None,
-        memberships: vec!["group".to_string()],
-    };
-
-    let resource = PrincipalResource {
-        principal: principal.clone(),
-        members: vec![],
-        simplified_home_set: false,
-    };
-
-    let response = resource
-        .propfind(
-            &format!("/caldav/principal/{}", principal.id),
-            &propfind.prop,
-            propfind.include.as_ref(),
-            &CalDavPrincipalUri("/caldav"),
-            &principal,
-        )
-        .unwrap();
-
-    let _output = response.serialize_to_string().unwrap();
-}
+async fn test_propfind() {}
--- a/crates/carddav/src/address_object/prop.rs
+++ b/crates/carddav/src/address_object/prop.rs
@@ -1,7 +1,7 @@
 use rustical_dav::extensions::CommonPropertiesProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressObjectPropName")]
 pub enum AddressObjectProp {
    // WebDAV (RFC 2518)
@@ -15,7 +15,7 @@ pub enum AddressObjectProp {
    AddressData(String),
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressObjectPropWrapperName", untagged)]
 pub enum AddressObjectPropWrapper {
    AddressObject(AddressObjectProp),
--- a/crates/carddav/src/address_object/service.rs
+++ b/crates/carddav/src/address_object/service.rs
@@ -98,8 +98,9 @@ where
    D: Deserializer<'de>,
 {
    let name: String = Deserialize::deserialize(deserializer)?;
-    name.strip_suffix(".vcf").map_or_else(
-        || Err(serde::de::Error::custom("Missing .vcf extension")),
-        |object_id| Ok(object_id.to_owned()),
-    )
+    if let Some(object_id) = name.strip_suffix(".vcf") {
+        Ok(object_id.to_owned())
+    } else {
+        Err(serde::de::Error::custom("Missing .vcf extension"))
+    }
 }
--- a/crates/carddav/src/addressbook/methods/import.rs
+++ b/crates/carddav/src/addressbook/methods/import.rs
@@ -1,67 +0,0 @@
-use std::io::BufReader;
-
-use crate::Error;
-use crate::addressbook::AddressbookResourceService;
-use axum::{
-    extract::{Path, State},
-    response::{IntoResponse, Response},
-};
-use http::StatusCode;
-use ical::{
-    parser::{Component, ComponentMut, vcard},
-    property::Property,
-};
-use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Principal};
-use tracing::instrument;
-
-#[instrument(skip(resource_service))]
-pub async fn route_import<AS: AddressbookStore, S: SubscriptionStore>(
-    Path((principal, addressbook_id)): Path<(String, String)>,
-    user: Principal,
-    State(resource_service): State<AddressbookResourceService<AS, S>>,
-    body: String,
-) -> Result<Response, Error> {
-    if !user.is_principal(&principal) {
-        return Err(Error::Unauthorized);
-    }
-
-    let parser = vcard::VcardParser::new(BufReader::new(body.as_bytes()));
-
-    let mut objects = vec![];
-    for res in parser {
-        let mut card = res.unwrap();
-        let uid = card.get_uid();
-        if uid.is_none() {
-            let mut card_mut = card.mutable();
-            card_mut.set_property(Property {
-                name: "UID".to_owned(),
-                value: Some(uuid::Uuid::new_v4().to_string()),
-                params: None,
-            });
-            card = card_mut.verify().unwrap();
-        }
-
-        objects.push(card.try_into().unwrap());
-    }
-
-    if objects.is_empty() {
-        return Ok((StatusCode::BAD_REQUEST, "empty addressbook data").into_response());
-    }
-
-    let addressbook = Addressbook {
-        principal,
-        id: addressbook_id,
-        displayname: None,
-        description: None,
-        deleted_at: None,
-        synctoken: 0,
-        push_topic: uuid::Uuid::new_v4().to_string(),
-    };
-
-    let addr_store = resource_service.addr_store;
-    addr_store
-        .import_addressbook(addressbook, objects, false)
-        .await?;
-
-    Ok(StatusCode::OK.into_response())
-}
--- a/crates/carddav/src/addressbook/methods/mkcol.rs
+++ b/crates/carddav/src/addressbook/methods/mkcol.rs
@@ -8,7 +8,7 @@ use rustical_store::{Addressbook, AddressbookStore, SubscriptionStore, auth::Pri
 use rustical_xml::{XmlDeserialize, XmlDocument, XmlRootTag};
 use tracing::instrument;

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct Resourcetype {
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
    addressbook: Option<()>,
@@ -16,25 +16,25 @@ pub struct Resourcetype {
    collection: Option<()>,
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct MkcolAddressbookProp {
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    resourcetype: Option<Resourcetype>,
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    displayname: Option<String>,
-    #[xml(rename = "addressbook-description")]
+    #[xml(rename = b"addressbook-description")]
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
    description: Option<String>,
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct PropElement<T: XmlDeserialize> {
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    prop: T,
 }

 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
-#[xml(root = "mkcol")]
+#[xml(root = b"mkcol")]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 struct MkcolRequest {
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
@@ -53,13 +53,13 @@ pub async fn route_mkcol<AS: AddressbookStore, S: SubscriptionStore>(
    }

    let mut request = MkcolRequest::parse_str(&body)?.set.prop;
-    if request.displayname.as_deref() == Some("") {
-        request.displayname = None;
+    if let Some("") = request.displayname.as_deref() {
+        request.displayname = None
    }

    let addressbook = Addressbook {
-        id: addressbook_id.clone(),
-        principal: principal.clone(),
+        id: addressbook_id.to_owned(),
+        principal: principal.to_owned(),
        displayname: request.displayname,
        description: request.description,
        deleted_at: None,
@@ -127,6 +127,6 @@ mod tests {
                    }
                }
            }
-        );
+        )
    }
 }
--- a/crates/carddav/src/addressbook/methods/mod.rs
+++ b/crates/carddav/src/addressbook/methods/mod.rs
@@ -1,5 +1,5 @@
 pub mod get;
-pub mod import;
 pub mod mkcol;
 pub mod post;
+pub mod put;
 pub mod report;
--- a/crates/carddav/src/addressbook/methods/post.rs
+++ b/crates/carddav/src/addressbook/methods/post.rs
@@ -45,12 +45,12 @@ pub async fn route_post<AS: AddressbookStore, S: SubscriptionStore>(
    };

    let subscription = Subscription {
-        id: sub_id.clone(),
+        id: sub_id.to_owned(),
        push_resource: request
            .subscription
            .web_push_subscription
            .push_resource
-            .clone(),
+            .to_owned(),
        topic: addressbook_resource.0.push_topic,
        expiration: expires.naive_local(),
        public_key: request
--- a/crates/carddav/src/addressbook/methods/put.rs
+++ b/crates/carddav/src/addressbook/methods/put.rs
@@ -0,0 +1,47 @@
+use crate::Error;
+use crate::addressbook::AddressbookResourceService;
+use axum::response::IntoResponse;
+use axum::{
+    extract::{Path, State},
+    response::Response,
+};
+use http::StatusCode;
+use ical::VcardParser;
+use rustical_ical::AddressObject;
+use rustical_store::Addressbook;
+use rustical_store::{AddressbookStore, SubscriptionStore, auth::Principal};
+use tracing::instrument;
+
+#[instrument(skip(addr_store))]
+pub async fn route_put<AS: AddressbookStore, S: SubscriptionStore>(
+    Path((principal, addressbook_id)): Path<(String, String)>,
+    State(AddressbookResourceService { addr_store, .. }): State<AddressbookResourceService<AS, S>>,
+    user: Principal,
+    body: String,
+) -> Result<Response, Error> {
+    if !user.is_principal(&principal) {
+        return Err(Error::Unauthorized);
+    }
+
+    let mut objects = vec![];
+    for object in VcardParser::new(body.as_bytes()) {
+        let object = object.map_err(rustical_ical::Error::from)?;
+        objects.push(AddressObject::try_from(object)?);
+    }
+
+    let addressbook = Addressbook {
+        id: addressbook_id.clone(),
+        principal: principal.clone(),
+        displayname: None,
+        description: None,
+        deleted_at: None,
+        synctoken: Default::default(),
+        push_topic: uuid::Uuid::new_v4().to_string(),
+    };
+
+    addr_store
+        .import_addressbook(principal.clone(), addressbook, objects)
+        .await?;
+
+    Ok(StatusCode::CREATED.into_response())
+}
--- a/crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs
+++ b/crates/carddav/src/addressbook/methods/report/addressbook_multiget.rs
@@ -13,7 +13,7 @@ use rustical_ical::AddressObject;
 use rustical_store::{AddressbookStore, auth::Principal};
 use rustical_xml::XmlDeserialize;

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[allow(dead_code)]
 #[xml(ns = "rustical_dav::namespace::NS_DAV")]
 pub struct AddressbookMultigetRequest {
@@ -35,7 +35,7 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(

    for href in &addressbook_multiget.href {
        if let Some(filename) = href.strip_prefix(path) {
-            let filename = filename.trim_start_matches('/');
+            let filename = filename.trim_start_matches("/");
            if let Some(object_id) = filename.strip_suffix(".vcf") {
                match store
                    .get_object(principal, addressbook_id, object_id, false)
@@ -44,12 +44,14 @@ pub async fn get_objects_addressbook_multiget<AS: AddressbookStore>(
                    Ok(object) => result.push(object),
                    Err(rustical_store::Error::NotFound) => not_found.push(href.to_owned()),
                    Err(err) => return Err(err.into()),
-                }
+                };
            } else {
                not_found.push(href.to_owned());
+                continue;
            }
        } else {
            not_found.push(href.to_owned());
+            continue;
        }
    }

--- a/crates/carddav/src/addressbook/methods/report/mod.rs
+++ b/crates/carddav/src/addressbook/methods/report/mod.rs
@@ -26,10 +26,10 @@ pub(crate) enum ReportRequest {
 }

 impl ReportRequest {
-    const fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
+    fn props(&self) -> &PropfindType<AddressObjectPropWrapperName> {
        match self {
-            Self::AddressbookMultiget(AddressbookMultigetRequest { prop, .. })
-            | Self::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
+            ReportRequest::AddressbookMultiget(AddressbookMultigetRequest { prop, .. }) => prop,
+            ReportRequest::SyncCollection(SyncCollectionRequest { prop, .. }) => prop,
        }
    }
 }
@@ -101,7 +101,7 @@ mod tests {
        assert_eq!(
            report_request,
            ReportRequest::SyncCollection(SyncCollectionRequest {
-                sync_token: String::new(),
+                sync_token: "".to_owned(),
                sync_level: SyncLevel::One,
                prop: rustical_dav::xml::PropfindType::Prop(PropElement(
                    vec![AddressObjectPropWrapperName::AddressObject(
@@ -111,7 +111,7 @@ mod tests {
                )),
                limit: None
            })
-        );
+        )
    }

    #[test]
@@ -142,6 +142,6 @@ mod tests {
                    "/carddav/user/user/6f787542-5256-401a-8db97003260da/ae7a998fdfd1d84a20391168962c62b".to_owned()
                ]
            })
-        );
+        )
    }
 }
--- a/crates/carddav/src/addressbook/prop.rs
+++ b/crates/carddav/src/addressbook/prop.rs
@@ -6,7 +6,7 @@ use rustical_dav_push::DavPushExtensionProp;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};
 use strum_macros::VariantArray;

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressbookPropName")]
 pub enum AddressbookProp {
    // CardDAV (RFC 6352)
@@ -20,7 +20,7 @@ pub enum AddressbookProp {
    MaxResourceSize(i64),
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "AddressbookPropWrapperName", untagged)]
 pub enum AddressbookPropWrapper {
    Addressbook(AddressbookProp),
@@ -29,7 +29,7 @@ pub enum AddressbookPropWrapper {
    Common(CommonPropertiesProp),
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub struct AddressDataType {
    #[xml(ty = "attr")]
    pub content_type: &'static str,
@@ -37,7 +37,7 @@ pub struct AddressDataType {
    pub version: &'static str,
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub struct SupportedAddressData {
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV", flatten)]
    address_data_type: &'static [AddressDataType],
@@ -60,7 +60,7 @@ impl Default for SupportedAddressData {
    }
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq, VariantArray)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq, VariantArray)]
 pub enum ReportMethod {
    #[xml(ns = "rustical_dav::namespace::NS_CARDDAV")]
    AddressbookMultiget,
--- a/crates/carddav/src/addressbook/resource.rs
+++ b/crates/carddav/src/addressbook/resource.rs
@@ -17,7 +17,7 @@ pub struct AddressbookResource(pub(crate) Addressbook);

 impl ResourceName for AddressbookResource {
    fn get_name(&self) -> String {
-        self.0.id.clone()
+        self.0.id.to_owned()
    }
 }

@@ -29,7 +29,7 @@ impl SyncTokenExtension for AddressbookResource {

 impl DavPushExtension for AddressbookResource {
    fn get_topic(&self) -> String {
-        self.0.push_topic.clone()
+        self.0.push_topic.to_owned()
    }
 }

@@ -59,13 +59,13 @@ impl Resource for AddressbookResource {
            AddressbookPropWrapperName::Addressbook(prop) => {
                AddressbookPropWrapper::Addressbook(match prop {
                    AddressbookPropName::MaxResourceSize => {
-                        AddressbookProp::MaxResourceSize(10_000_000)
+                        AddressbookProp::MaxResourceSize(10000000)
                    }
                    AddressbookPropName::SupportedReportSet => {
                        AddressbookProp::SupportedReportSet(SupportedReportSet::all())
                    }
                    AddressbookPropName::AddressbookDescription => {
-                        AddressbookProp::AddressbookDescription(self.0.description.clone())
+                        AddressbookProp::AddressbookDescription(self.0.description.to_owned())
                    }
                    AddressbookPropName::SupportedAddressData => {
                        AddressbookProp::SupportedAddressData(SupportedAddressData::default())
@@ -92,11 +92,9 @@ impl Resource for AddressbookResource {
                    self.0.description = description;
                    Ok(())
                }
-                AddressbookProp::MaxResourceSize(_)
-                | AddressbookProp::SupportedReportSet(_)
-                | AddressbookProp::SupportedAddressData(_) => {
-                    Err(rustical_dav::Error::PropReadOnly)
-                }
+                AddressbookProp::MaxResourceSize(_) => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookProp::SupportedReportSet(_) => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookProp::SupportedAddressData(_) => Err(rustical_dav::Error::PropReadOnly),
            },
            AddressbookPropWrapper::SyncToken(prop) => SyncTokenExtension::set_prop(self, prop),
            AddressbookPropWrapper::DavPush(prop) => DavPushExtension::set_prop(self, prop),
@@ -114,11 +112,9 @@ impl Resource for AddressbookResource {
                    self.0.description = None;
                    Ok(())
                }
-                AddressbookPropName::MaxResourceSize
-                | AddressbookPropName::SupportedReportSet
-                | AddressbookPropName::SupportedAddressData => {
-                    Err(rustical_dav::Error::PropReadOnly)
-                }
+                AddressbookPropName::MaxResourceSize => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookPropName::SupportedReportSet => Err(rustical_dav::Error::PropReadOnly),
+                AddressbookPropName::SupportedAddressData => Err(rustical_dav::Error::PropReadOnly),
            },
            AddressbookPropWrapperName::SyncToken(prop) => {
                SyncTokenExtension::remove_prop(self, prop)
--- a/crates/carddav/src/addressbook/service.rs
+++ b/crates/carddav/src/addressbook/service.rs
@@ -3,8 +3,8 @@ use super::methods::report::route_report_addressbook;
 use crate::address_object::AddressObjectResourceService;
 use crate::address_object::resource::AddressObjectResource;
 use crate::addressbook::methods::get::route_get;
-use crate::addressbook::methods::import::route_import;
 use crate::addressbook::methods::post::route_post;
+use crate::addressbook::methods::put::route_put;
 use crate::addressbook::resource::AddressbookResource;
 use crate::{CardDavPrincipalUri, Error};
 use async_trait::async_trait;
@@ -26,7 +26,7 @@ pub struct AddressbookResourceService<AS: AddressbookStore, S: SubscriptionStore
 }

 impl<A: AddressbookStore, S: SubscriptionStore> AddressbookResourceService<A, S> {
-    pub const fn new(addr_store: Arc<A>, sub_store: Arc<S>) -> Self {
+    pub fn new(addr_store: Arc<A>, sub_store: Arc<S>) -> Self {
        Self {
            addr_store,
            sub_store,
@@ -139,9 +139,9 @@ impl<AS: AddressbookStore, S: SubscriptionStore> AxumMethods for AddressbookReso
        })
    }

-    fn import() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
+    fn put() -> Option<fn(Self, Request) -> BoxFuture<'static, Result<Response, Infallible>>> {
        Some(|state, req| {
-            let mut service = Handler::with_state(route_import::<AS, S>, state);
+            let mut service = Handler::with_state(route_put::<AS, S>, state);
            Box::pin(Service::call(&mut service, req))
        })
    }
--- a/crates/carddav/src/error.rs
+++ b/crates/carddav/src/error.rs
@@ -30,20 +30,20 @@ pub enum Error {
 }

 impl Error {
-    #[must_use]
-    pub const fn status_code(&self) -> StatusCode {
+    pub fn status_code(&self) -> StatusCode {
        match self {
-            Self::StoreError(err) => match err {
+            Error::StoreError(err) => match err {
                rustical_store::Error::NotFound => StatusCode::NOT_FOUND,
                rustical_store::Error::AlreadyExists => StatusCode::CONFLICT,
                rustical_store::Error::ReadOnly => StatusCode::FORBIDDEN,
                _ => StatusCode::INTERNAL_SERVER_ERROR,
            },
-            Self::DavError(err) => err.status_code(),
-            Self::Unauthorized => StatusCode::UNAUTHORIZED,
-            Self::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
-            Self::ChronoParseError(_) | Self::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
-            Self::NotFound => StatusCode::NOT_FOUND,
+            Error::ChronoParseError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            Error::DavError(err) => err.status_code(),
+            Error::Unauthorized => StatusCode::UNAUTHORIZED,
+            Error::XmlDecodeError(_) => StatusCode::BAD_REQUEST,
+            Error::NotImplemented => StatusCode::INTERNAL_SERVER_ERROR,
+            Error::NotFound => StatusCode::NOT_FOUND,
            Self::IcalError(err) => err.status_code(),
        }
    }
--- a/crates/carddav/src/lib.rs
+++ b/crates/carddav/src/lib.rs
@@ -1,5 +1,3 @@
-#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-#![allow(clippy::missing_errors_doc, clippy::missing_panics_doc)]
 use axum::response::Redirect;
 use axum::routing::any;
 use axum::{Extension, Router};
@@ -38,15 +36,20 @@ pub fn carddav_router<AP: AuthenticationProvider, A: AddressbookStore, S: Subscr
    store: Arc<A>,
    subscription_store: Arc<S>,
 ) -> Router {
-    let principal_service =
-        PrincipalResourceService::new(store, auth_provider.clone(), subscription_store);
+    let principal_service = PrincipalResourceService::new(
+        store.clone(),
+        auth_provider.clone(),
+        subscription_store.clone(),
+    );
    Router::new()
        .nest(
            prefix,
-            RootResourceService::<_, Principal, CardDavPrincipalUri>::new(principal_service)
-                .axum_router()
-                .layer(AuthenticationLayer::new(auth_provider))
-                .layer(Extension(CardDavPrincipalUri(prefix))),
+            RootResourceService::<_, Principal, CardDavPrincipalUri>::new(
+                principal_service.clone(),
+            )
+            .axum_router()
+            .layer(AuthenticationLayer::new(auth_provider))
+            .layer(Extension(CardDavPrincipalUri(prefix))),
        )
        .route(
            "/.well-known/carddav",
--- a/crates/carddav/src/principal/mod.rs
+++ b/crates/carddav/src/principal/mod.rs
@@ -20,7 +20,7 @@ pub struct PrincipalResource {

 impl ResourceName for PrincipalResource {
    fn get_name(&self) -> String {
-        self.principal.id.clone()
+        self.principal.id.to_owned()
    }
 }

--- a/crates/carddav/src/principal/prop.rs
+++ b/crates/carddav/src/principal/prop.rs
@@ -4,18 +4,18 @@ use rustical_dav::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropName")]
 pub enum PrincipalProp {
    // WebDAV Access Control (RFC 3744)
-    #[xml(rename = "principal-URL")]
+    #[xml(rename = b"principal-URL")]
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    PrincipalUrl(HrefElement),
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    GroupMembership(GroupMembership),
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    GroupMemberSet(GroupMemberSet),
-    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = "alternate-URI-set")]
+    #[xml(ns = "rustical_dav::namespace::NS_DAV", rename = b"alternate-URI-set")]
    AlternateUriSet,
    #[xml(ns = "rustical_dav::namespace::NS_DAV")]
    PrincipalCollectionSet(HrefElement),
@@ -27,10 +27,10 @@ pub enum PrincipalProp {
    PrincipalAddress(Option<HrefElement>),
 }

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
 pub struct AddressbookHomeSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, EnumVariants, PropName)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, EnumVariants, PropName)]
 #[xml(unit_variants_ident = "PrincipalPropWrapperName", untagged)]
 pub enum PrincipalPropWrapper {
    Principal(PrincipalProp),
--- a/crates/carddav/src/principal/service.rs
+++ b/crates/carddav/src/principal/service.rs
@@ -34,7 +34,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Clon
 impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore>
    PrincipalResourceService<A, AP, S>
 {
-    pub const fn new(addr_store: Arc<A>, auth_provider: Arc<AP>, sub_store: Arc<S>) -> Self {
+    pub fn new(addr_store: Arc<A>, auth_provider: Arc<AP>, sub_store: Arc<S>) -> Self {
        Self {
            addr_store,
            auth_provider,
--- a/crates/dav/src/error.rs
+++ b/crates/dav/src/error.rs
@@ -1,4 +1,3 @@
-use axum::body::Body;
 use http::StatusCode;
 use rustical_xml::XmlError;
 use thiserror::Error;
@@ -35,9 +34,9 @@ pub enum Error {
 }

 impl Error {
-    #[must_use]
-    pub const fn status_code(&self) -> StatusCode {
+    pub fn status_code(&self) -> StatusCode {
        match self {
+            Self::InternalError => StatusCode::INTERNAL_SERVER_ERROR,
            Self::NotFound => StatusCode::NOT_FOUND,
            Self::BadRequest(_) => StatusCode::BAD_REQUEST,
            Self::Unauthorized => StatusCode::UNAUTHORIZED,
@@ -50,9 +49,9 @@ impl Error {
                | XmlError::InvalidValue(_) => StatusCode::UNPROCESSABLE_ENTITY,
                _ => StatusCode::BAD_REQUEST,
            },
-            Self::PropReadOnly => StatusCode::CONFLICT,
-            Self::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
-            Self::InternalError | Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            Error::PropReadOnly => StatusCode::CONFLICT,
+            Error::PreconditionFailed => StatusCode::PRECONDITION_FAILED,
+            Self::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
            Self::Forbidden => StatusCode::FORBIDDEN,
        }
    }
@@ -60,15 +59,10 @@ impl Error {

 impl axum::response::IntoResponse for Error {
    fn into_response(self) -> axum::response::Response {
-        if matches!(
-            self.status_code(),
-            StatusCode::INTERNAL_SERVER_ERROR | StatusCode::PRECONDITION_FAILED
-        ) {
-            error!("{self}");
-        }
+        use axum::body::Body;

        let mut resp = axum::response::Response::builder().status(self.status_code());
-        if matches!(&self, &Self::Unauthorized) {
+        if matches!(&self, &Error::Unauthorized) {
            resp.headers_mut()
                .expect("This must always work")
                .insert("WWW-Authenticate", "Basic".parse().unwrap());
--- a/crates/dav/src/extensions/common.rs
+++ b/crates/dav/src/extensions/common.rs
@@ -6,7 +6,7 @@ use crate::{
 };
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "CommonPropertiesPropName")]
 pub enum CommonPropertiesProp {
    // WebDAV (RFC 2518)
@@ -39,9 +39,9 @@ pub trait CommonPropertiesExtension: Resource {
            CommonPropertiesPropName::Resourcetype => {
                CommonPropertiesProp::Resourcetype(self.get_resourcetype())
            }
-            CommonPropertiesPropName::Displayname => CommonPropertiesProp::Displayname(
-                self.get_displayname().map(std::string::ToString::to_string),
-            ),
+            CommonPropertiesPropName::Displayname => {
+                CommonPropertiesProp::Displayname(self.get_displayname().map(|s| s.to_string()))
+            }
            CommonPropertiesPropName::CurrentUserPrincipal => {
                CommonPropertiesProp::CurrentUserPrincipal(
                    principal_uri.principal_uri(principal.get_id()).into(),
--- a/crates/dav/src/extensions/synctoken.rs
+++ b/crates/dav/src/extensions/synctoken.rs
@@ -1,6 +1,6 @@
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "SyncTokenExtensionPropName")]
 pub enum SyncTokenExtensionProp {
    // Collection Synchronization (RFC 6578)
--- a/crates/dav/src/header/depth.rs
+++ b/crates/dav/src/header/depth.rs
@@ -19,7 +19,7 @@ impl IntoResponse for InvalidDepthHeader {
    }
 }

-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum Depth {
    Zero,
    One,
@@ -29,9 +29,9 @@ pub enum Depth {
 impl ValueSerialize for Depth {
    fn serialize(&self) -> String {
        match self {
-            Self::Zero => "0",
-            Self::One => "1",
-            Self::Infinity => "infinity",
+            Depth::Zero => "0",
+            Depth::One => "1",
+            Depth::Infinity => "infinity",
        }
        .to_owned()
    }
@@ -55,9 +55,9 @@ impl TryFrom<&[u8]> for Depth {

    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
        match value {
-            b"0" => Ok(Self::Zero),
-            b"1" => Ok(Self::One),
-            b"Infinity" | b"infinity" => Ok(Self::Infinity),
+            b"0" => Ok(Depth::Zero),
+            b"1" => Ok(Depth::One),
+            b"Infinity" | b"infinity" => Ok(Depth::Infinity),
            _ => Err(InvalidDepthHeader),
        }
    }
@@ -85,11 +85,10 @@ impl<S: Send + Sync> FromRequestParts<S> for Depth {
        parts: &mut axum::http::request::Parts,
        _state: &S,
    ) -> Result<Self, Self::Rejection> {
-        parts
-            .headers
-            .get("Depth")
-            .map_or(Ok(Self::Zero), |depth_header| {
-                depth_header.as_bytes().try_into()
-            })
+        if let Some(depth_header) = parts.headers.get("Depth") {
+            depth_header.as_bytes().try_into()
+        } else {
+            Ok(Self::Zero)
+        }
    }
 }
--- a/crates/dav/src/header/overwrite.rs
+++ b/crates/dav/src/header/overwrite.rs
@@ -14,12 +14,16 @@ impl IntoResponse for InvalidOverwriteHeader {
    }
 }

-#[derive(Debug, PartialEq, Eq)]
-pub struct Overwrite(pub bool);
+#[derive(Debug, PartialEq, Default)]
+pub enum Overwrite {
+    #[default]
+    T,
+    F,
+}

-impl Default for Overwrite {
-    fn default() -> Self {
-        Self(true)
+impl Overwrite {
+    pub fn is_true(&self) -> bool {
+        matches!(self, Self::T)
    }
 }

@@ -30,10 +34,11 @@ impl<S: Send + Sync> FromRequestParts<S> for Overwrite {
        parts: &mut axum::http::request::Parts,
        _state: &S,
    ) -> Result<Self, Self::Rejection> {
-        parts.headers.get("Overwrite").map_or_else(
-            || Ok(Self::default()),
-            |overwrite_header| overwrite_header.as_bytes().try_into(),
-        )
+        if let Some(overwrite_header) = parts.headers.get("Overwrite") {
+            overwrite_header.as_bytes().try_into()
+        } else {
+            Ok(Self::default())
+        }
    }
 }

@@ -42,48 +47,9 @@ impl TryFrom<&[u8]> for Overwrite {

    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
        match value {
-            b"T" => Ok(Self(true)),
-            b"F" => Ok(Self(false)),
+            b"T" => Ok(Overwrite::T),
+            b"F" => Ok(Overwrite::F),
            _ => Err(InvalidOverwriteHeader),
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use axum::{extract::FromRequestParts, response::IntoResponse};
-    use http::Request;
-
-    use crate::header::Overwrite;
-
-    #[tokio::test]
-    async fn test_overwrite_default() {
-        let request = Request::put("asd").body(()).unwrap();
-        let (mut parts, ()) = request.into_parts();
-        let overwrite = Overwrite::from_request_parts(&mut parts, &())
-            .await
-            .unwrap();
-        assert_eq!(
-            Overwrite(true),
-            overwrite,
-            "By default we want to overwrite!"
-        );
-    }
-
-    #[test]
-    fn test_overwrite() {
-        assert_eq!(
-            Overwrite(true),
-            Overwrite::try_from(b"T".as_slice()).unwrap()
-        );
-        assert_eq!(
-            Overwrite(false),
-            Overwrite::try_from(b"F".as_slice()).unwrap()
-        );
-        if let Err(err) = Overwrite::try_from(b"aslkdjlad".as_slice()) {
-            let _ = err.into_response();
-        } else {
-            unreachable!("should return error")
-        }
-    }
-}
--- a/crates/dav/src/lib.rs
+++ b/crates/dav/src/lib.rs
@@ -1,5 +1,3 @@
-#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-#![allow(clippy::missing_errors_doc)]
 pub mod error;
 pub mod extensions;
 pub mod header;
--- a/crates/dav/src/privileges.rs
+++ b/crates/dav/src/privileges.rs
@@ -1,10 +1,9 @@
-use itertools::Itertools;
 use quick_xml::name::Namespace;
 use rustical_xml::{XmlDeserialize, XmlSerialize};
 use std::collections::{HashMap, HashSet};

 // https://datatracker.ietf.org/doc/html/rfc3744
-#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq, PartialOrd, Ord)]
+#[derive(Debug, Clone, XmlSerialize, XmlDeserialize, Eq, Hash, PartialEq)]
 pub enum UserPrivilege {
    Read,
    Write,
@@ -20,18 +19,18 @@ impl XmlSerialize for UserPrivilegeSet {
    fn serialize(
        &self,
        ns: Option<Namespace>,
-        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &str>,
+        tag: Option<&[u8]>,
+        namespaces: &HashMap<Namespace, &[u8]>,
        writer: &mut quick_xml::Writer<&mut Vec<u8>>,
    ) -> std::io::Result<()> {
        #[derive(XmlSerialize)]
        pub struct FakeUserPrivilegeSet {
-            #[xml(rename = "privilege", flatten)]
+            #[xml(rename = b"privilege", flatten)]
            privileges: Vec<UserPrivilege>,
        }

        FakeUserPrivilegeSet {
-            privileges: self.privileges.iter().cloned().sorted().collect(),
+            privileges: self.privileges.iter().cloned().collect(),
        }
        .serialize(ns, tag, namespaces, writer)
    }
@@ -41,13 +40,12 @@ impl XmlSerialize for UserPrivilegeSet {
    }
 }

-#[derive(Debug, Clone, Default, PartialEq, Eq)]
+#[derive(Debug, Clone, Default, PartialEq)]
 pub struct UserPrivilegeSet {
    privileges: HashSet<UserPrivilege>,
 }

 impl UserPrivilegeSet {
-    #[must_use]
    pub fn has(&self, privilege: &UserPrivilege) -> bool {
        if (privilege == &UserPrivilege::WriteProperties
            || privilege == &UserPrivilege::WriteContent)
@@ -58,14 +56,12 @@ impl UserPrivilegeSet {
        self.privileges.contains(privilege) || self.privileges.contains(&UserPrivilege::All)
    }

-    #[must_use]
    pub fn all() -> Self {
        Self {
            privileges: HashSet::from([UserPrivilege::All]),
        }
    }

-    #[must_use]
    pub fn owner_only(is_owner: bool) -> Self {
        if is_owner {
            Self::all()
@@ -74,7 +70,6 @@ impl UserPrivilegeSet {
        }
    }

-    #[must_use]
    pub fn owner_read(is_owner: bool) -> Self {
        if is_owner {
            Self::read_only()
@@ -83,7 +78,6 @@ impl UserPrivilegeSet {
        }
    }

-    #[must_use]
    pub fn owner_write_properties(is_owner: bool) -> Self {
        // Content is read-only but we can write properties
        if is_owner {
@@ -93,7 +87,6 @@ impl UserPrivilegeSet {
        }
    }

-    #[must_use]
    pub fn read_only() -> Self {
        Self {
            privileges: HashSet::from([
@@ -104,7 +97,6 @@ impl UserPrivilegeSet {
        }
    }

-    #[must_use]
    pub fn write_properties() -> Self {
        Self {
            privileges: HashSet::from([
--- a/crates/dav/src/resource/axum_methods.rs
+++ b/crates/dav/src/resource/axum_methods.rs
@@ -9,49 +9,36 @@ pub type MethodFunction<State> =

 pub trait AxumMethods: Sized + Send + Sync + 'static {
    #[inline]
-    #[must_use]
    fn report() -> Option<MethodFunction<Self>> {
        None
    }

    #[inline]
-    #[must_use]
    fn get() -> Option<MethodFunction<Self>> {
        None
    }

    #[inline]
-    #[must_use]
    fn post() -> Option<MethodFunction<Self>> {
        None
    }

    #[inline]
-    #[must_use]
    fn mkcol() -> Option<MethodFunction<Self>> {
        None
    }

    #[inline]
-    #[must_use]
    fn mkcalendar() -> Option<MethodFunction<Self>> {
        None
    }

    #[inline]
-    #[must_use]
    fn put() -> Option<MethodFunction<Self>> {
        None
    }

    #[inline]
-    #[must_use]
-    fn import() -> Option<MethodFunction<Self>> {
-        None
-    }
-
-    #[inline]
-    #[must_use]
    fn allow_header() -> Allow {
        let mut allow = vec![
            Method::from_str("PROPFIND").unwrap(),
@@ -80,9 +67,6 @@ pub trait AxumMethods: Sized + Send + Sync + 'static {
        if Self::put().is_some() {
            allow.push(Method::PUT);
        }
-        if Self::import().is_some() {
-            allow.push(Method::from_str("IMPORT").unwrap());
-        }

        allow.into_iter().collect()
    }
--- a/crates/dav/src/resource/axum_service.rs
+++ b/crates/dav/src/resource/axum_service.rs
@@ -23,7 +23,7 @@ pub struct AxumService<RS: ResourceService + AxumMethods> {
 }

 impl<RS: ResourceService + AxumMethods> AxumService<RS> {
-    pub const fn new(resource_service: RS) -> Self {
+    pub fn new(resource_service: RS) -> Self {
        Self { resource_service }
    }
 }
@@ -97,13 +97,8 @@ where
                    return svc(self.resource_service.clone(), req);
                }
            }
-            "IMPORT" => {
-                if let Some(svc) = RS::import() {
-                    return svc(self.resource_service.clone(), req);
-                }
-            }
            _ => {}
-        }
+        };
        Box::pin(async move {
            Ok(Response::builder()
                .status(StatusCode::METHOD_NOT_ALLOWED)
--- a/crates/dav/src/resource/methods/copy.rs
+++ b/crates/dav/src/resource/methods/copy.rs
@@ -12,12 +12,12 @@ use serde::Deserialize;
 use tracing::instrument;

 #[instrument(skip(path, resource_service,))]
-pub async fn axum_route_copy<R: ResourceService>(
+pub(crate) async fn axum_route_copy<R: ResourceService>(
    Path(path): Path<R::PathComponents>,
    State(resource_service): State<R>,
    depth: Option<Depth>,
    principal: R::Principal,
-    Overwrite(overwrite): Overwrite,
+    overwrite: Overwrite,
    matched_path: MatchedPath,
    header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub async fn axum_route_copy<R: ResourceService>(
            .map_err(|_| crate::Error::Forbidden)?;

        if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite)
+            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
            .await?
        {
            // Overwritten
--- a/crates/dav/src/resource/methods/delete.rs
+++ b/crates/dav/src/resource/methods/delete.rs
@@ -7,7 +7,7 @@ use axum_extra::TypedHeader;
 use headers::{IfMatch, IfNoneMatch};
 use http::HeaderMap;

-pub async fn axum_route_delete<R: ResourceService>(
+pub(crate) async fn axum_route_delete<R: ResourceService>(
    Path(path): Path<R::PathComponents>,
    State(resource_service): State<R>,
    principal: R::Principal,
@@ -24,7 +24,8 @@ pub async fn axum_route_delete<R: ResourceService>(
    }
    let no_trash = header_map
        .get("X-No-Trashbin")
-        .is_some_and(|val| matches!(val.to_str(), Ok("1")));
+        .map(|val| matches!(val.to_str(), Ok("1")))
+        .unwrap_or(false);
    route_delete(
        &path,
        &principal,
@@ -59,11 +60,11 @@ pub async fn route_delete<R: ResourceService>(
            return Err(crate::Error::PreconditionFailed.into());
        }
    }
-    if let Some(if_none_match) = if_none_match
-        && resource.satisfies_if_none_match(&if_none_match)
-    {
-        // Precondition failed
-        return Err(crate::Error::PreconditionFailed.into());
+    if let Some(if_none_match) = if_none_match {
+        if resource.satisfies_if_none_match(&if_none_match) {
+            // Precondition failed
+            return Err(crate::Error::PreconditionFailed.into());
+        }
    }
    resource_service
        .delete_resource(path_components, !no_trash)
--- a/crates/dav/src/resource/methods/mod.rs
+++ b/crates/dav/src/resource/methods/mod.rs
@@ -4,8 +4,8 @@ mod mv;
 mod propfind;
 mod proppatch;

-pub use copy::axum_route_copy;
-pub use delete::axum_route_delete;
-pub use mv::axum_route_move;
-pub use propfind::axum_route_propfind;
-pub use proppatch::axum_route_proppatch;
+pub(crate) use copy::axum_route_copy;
+pub(crate) use delete::axum_route_delete;
+pub(crate) use mv::axum_route_move;
+pub(crate) use propfind::axum_route_propfind;
+pub(crate) use proppatch::axum_route_proppatch;
--- a/crates/dav/src/resource/methods/mv.rs
+++ b/crates/dav/src/resource/methods/mv.rs
@@ -12,12 +12,12 @@ use serde::Deserialize;
 use tracing::instrument;

 #[instrument(skip(path, resource_service,))]
-pub async fn axum_route_move<R: ResourceService>(
+pub(crate) async fn axum_route_move<R: ResourceService>(
    Path(path): Path<R::PathComponents>,
    State(resource_service): State<R>,
    depth: Option<Depth>,
    principal: R::Principal,
-    Overwrite(overwrite): Overwrite,
+    overwrite: Overwrite,
    matched_path: MatchedPath,
    header_map: HeaderMap,
 ) -> Result<Response, R::Error> {
@@ -39,7 +39,7 @@ pub async fn axum_route_move<R: ResourceService>(
            .map_err(|_| crate::Error::Forbidden)?;

        if resource_service
-            .copy_resource(&path, &dest_path, &principal, overwrite)
+            .copy_resource(&path, &dest_path, &principal, overwrite.is_true())
            .await?
        {
            // Overwritten
--- a/crates/dav/src/resource/methods/propfind.rs
+++ b/crates/dav/src/resource/methods/propfind.rs
@@ -6,7 +6,11 @@ use crate::resource::Resource;
 use crate::resource::ResourceName;
 use crate::resource::ResourceService;
 use crate::xml::MultistatusElement;
+use crate::xml::PropfindElement;
+use crate::xml::PropfindType;
 use axum::extract::{Extension, OriginalUri, Path, State};
+use rustical_xml::PropName;
+use rustical_xml::XmlDocument;
 use tracing::instrument;

 type RSMultistatus<R> = MultistatusElement<
@@ -15,7 +19,7 @@ type RSMultistatus<R> = MultistatusElement<
 >;

 #[instrument(skip(path, resource_service, puri))]
-pub async fn axum_route_propfind<R: ResourceService>(
+pub(crate) async fn axum_route_propfind<R: ResourceService>(
    Path(path): Path<R::PathComponents>,
    State(resource_service): State<R>,
    depth: Depth,
@@ -36,7 +40,7 @@ pub async fn axum_route_propfind<R: ResourceService>(
    .await
 }

-pub async fn route_propfind<R: ResourceService>(
+pub(crate) async fn route_propfind<R: ResourceService>(
    path_components: &R::PathComponents,
    path: &str,
    body: &str,
@@ -54,8 +58,24 @@ pub async fn route_propfind<R: ResourceService>(
    }

    // A request body is optional. If empty we MUST return all props
-    let propfind_self = R::Resource::parse_propfind(body).map_err(Error::XmlError)?;
-    let propfind_member = R::MemberType::parse_propfind(body).map_err(Error::XmlError)?;
+    let propfind_self: PropfindElement<<<R::Resource as Resource>::Prop as PropName>::Names> =
+        if !body.is_empty() {
+            PropfindElement::parse_str(body).map_err(Error::XmlError)?
+        } else {
+            PropfindElement {
+                prop: PropfindType::Allprop,
+                include: None,
+            }
+        };
+    let propfind_member: PropfindElement<<<R::MemberType as Resource>::Prop as PropName>::Names> =
+        if !body.is_empty() {
+            PropfindElement::parse_str(body).map_err(Error::XmlError)?
+        } else {
+            PropfindElement {
+                prop: PropfindType::Allprop,
+                include: None,
+            }
+        };

    let mut member_responses = Vec::new();
    if depth != &Depth::Zero {
--- a/crates/dav/src/resource/methods/proppatch.rs
+++ b/crates/dav/src/resource/methods/proppatch.rs
@@ -26,21 +26,21 @@ enum SetPropertyPropWrapper<T: XmlDeserialize> {
 // We are <prop>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyPropWrapperWrapper<T: XmlDeserialize>(
-    #[xml(ty = "untagged", flatten)] Vec<SetPropertyPropWrapper<T>>,
+    #[xml(ty = "untagged")] SetPropertyPropWrapper<T>,
 );

 // We are <set>
 #[derive(XmlDeserialize, Clone, Debug)]
 struct SetPropertyElement<T: XmlDeserialize> {
    #[xml(ns = "crate::namespace::NS_DAV")]
-    prop: SetPropertyPropWrapperWrapper<T>,
+    prop: T,
 }

 #[derive(XmlDeserialize, Clone, Debug)]
 struct TagName(#[xml(ty = "tag_name")] String);

 #[derive(XmlDeserialize, Clone, Debug)]
-struct PropertyElement(#[xml(ty = "untagged", flatten)] Vec<TagName>);
+struct PropertyElement(#[xml(ty = "untagged")] TagName);

 #[derive(XmlDeserialize, Clone, Debug)]
 struct RemovePropertyElement {
@@ -57,11 +57,11 @@ enum Operation<T: XmlDeserialize> {
 }

 #[derive(XmlDeserialize, XmlRootTag, Clone, Debug)]
-#[xml(root = "propertyupdate")]
+#[xml(root = b"propertyupdate")]
 #[xml(ns = "crate::namespace::NS_DAV")]
 struct PropertyupdateElement<T: XmlDeserialize>(#[xml(ty = "untagged", flatten)] Vec<Operation<T>>);

-pub async fn axum_route_proppatch<R: ResourceService>(
+pub(crate) async fn axum_route_proppatch<R: ResourceService>(
    Path(path): Path<R::PathComponents>,
    State(resource_service): State<R>,
    principal: R::Principal,
@@ -71,7 +71,7 @@ pub async fn axum_route_proppatch<R: ResourceService>(
    route_proppatch(&path, uri.path(), &body, &principal, &resource_service).await
 }

-pub async fn route_proppatch<R: ResourceService>(
+pub(crate) async fn route_proppatch<R: ResourceService>(
    path_components: &R::PathComponents,
    path: &str,
    body: &str,
@@ -81,8 +81,9 @@ pub async fn route_proppatch<R: ResourceService>(
    let href = path.to_owned();

    // Extract operations
-    let PropertyupdateElement::<<R::Resource as Resource>::Prop>(operations) =
-        XmlDocument::parse_str(body).map_err(Error::XmlError)?;
+    let PropertyupdateElement::<SetPropertyPropWrapperWrapper<<R::Resource as Resource>::Prop>>(
+        operations,
+    ) = XmlDocument::parse_str(body).map_err(Error::XmlError)?;

    let mut resource = resource_service
        .get_resource(path_components, false)
@@ -96,66 +97,62 @@ pub async fn route_proppatch<R: ResourceService>(
    let mut props_conflict = Vec::new();
    let mut props_not_found = Vec::new();

-    for operation in operations {
+    for operation in operations.into_iter() {
        match operation {
            Operation::Set(SetPropertyElement {
-                prop: SetPropertyPropWrapperWrapper(properties),
+                prop: SetPropertyPropWrapperWrapper(property),
            }) => {
-                for property in properties {
-                    match property {
-                        SetPropertyPropWrapper::Valid(prop) => {
-                            let propname: <<R::Resource as Resource>::Prop as PropName>::Names =
-                                prop.clone().into();
-                            let (ns, propname): (Option<Namespace>, &str) = propname.into();
-                            match resource.set_prop(prop) {
-                                Ok(()) => props_ok
-                                    .push((ns.map(NamespaceOwned::from), propname.to_owned())),
-                                Err(Error::PropReadOnly) => props_conflict
-                                    .push((ns.map(NamespaceOwned::from), propname.to_owned())),
-                                Err(err) => return Err(err.into()),
+                match property {
+                    SetPropertyPropWrapper::Valid(prop) => {
+                        let propname: <<R::Resource as Resource>::Prop as PropName>::Names =
+                            prop.clone().into();
+                        let (ns, propname): (Option<Namespace>, &str) = propname.into();
+                        match resource.set_prop(prop) {
+                            Ok(()) => {
+                                props_ok.push((ns.map(NamespaceOwned::from), propname.to_owned()))
                            }
-                        }
-                        SetPropertyPropWrapper::Invalid(invalid) => {
-                            let propname = invalid.tag_name();
+                            Err(Error::PropReadOnly) => props_conflict
+                                .push((ns.map(NamespaceOwned::from), propname.to_owned())),
+                            Err(err) => return Err(err.into()),
+                        };
+                    }
+                    SetPropertyPropWrapper::Invalid(invalid) => {
+                        let propname = invalid.tag_name();

-                            if let Some(full_propname) = <R::Resource as Resource>::list_props()
-                                .into_iter()
-                                .find_map(|(ns, tag)| {
-                                    if tag == propname.as_str() {
-                                        Some((ns.map(NamespaceOwned::from), tag.to_owned()))
-                                    } else {
-                                        None
-                                    }
-                                })
-                            {
-                                // This happens in following cases:
-                                // - read-only properties with #[serde(skip_deserializing)]
-                                // - internal properties
-                                props_conflict.push(full_propname);
-                            } else {
-                                props_not_found.push((None, propname));
-                            }
+                        if let Some(full_propname) = <R::Resource as Resource>::list_props()
+                            .into_iter()
+                            .find_map(|(ns, tag)| {
+                                if tag == propname.as_str() {
+                                    Some((ns.map(NamespaceOwned::from), tag.to_owned()))
+                                } else {
+                                    None
+                                }
+                            })
+                        {
+                            // This happens in following cases:
+                            // - read-only properties with #[serde(skip_deserializing)]
+                            // - internal properties
+                            props_conflict.push(full_propname)
+                        } else {
+                            props_not_found.push((None, propname));
                        }
                    }
                }
            }
            Operation::Remove(remove_el) => {
-                for tagname in remove_el.prop.0 {
-                    let propname = tagname.0;
-                    match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname)
-                    {
-                        Ok(prop) => match resource.remove_prop(&prop) {
-                            Ok(()) => props_ok.push((None, propname)),
-                            Err(Error::PropReadOnly) => props_conflict.push({
-                                let (ns, tag) = prop.into();
-                                (ns.map(NamespaceOwned::from), tag.to_owned())
-                            }),
-                            Err(err) => return Err(err.into()),
-                        },
-                        // I guess removing a nonexisting property should be successful :)
-                        Err(_) => props_ok.push((None, propname)),
-                    }
-                }
+                let propname = remove_el.prop.0.0;
+                match <<R::Resource as Resource>::Prop as PropName>::Names::from_str(&propname) {
+                    Ok(prop) => match resource.remove_prop(&prop) {
+                        Ok(()) => props_ok.push((None, propname)),
+                        Err(Error::PropReadOnly) => props_conflict.push({
+                            let (ns, tag) = prop.into();
+                            (ns.map(NamespaceOwned::from), tag.to_owned())
+                        }),
+                        Err(err) => return Err(err.into()),
+                    },
+                    // I guess removing a nonexisting property should be successful :)
+                    Err(_) => props_ok.push((None, propname)),
+                };
            }
        }
    }
--- a/crates/dav/src/resource/mod.rs
+++ b/crates/dav/src/resource/mod.rs
@@ -1,16 +1,15 @@
 use crate::Principal;
 use crate::privileges::UserPrivilegeSet;
 use crate::xml::multistatus::{PropTagWrapper, PropstatElement, PropstatWrapper};
-use crate::xml::{PropElement, PropfindElement, PropfindType, Resourcetype};
+use crate::xml::{PropElement, PropfindType, Resourcetype};
 use crate::xml::{TagList, multistatus::ResponseElement};
 use headers::{ETag, IfMatch, IfNoneMatch};
 use http::StatusCode;
 use itertools::Itertools;
 use quick_xml::name::Namespace;
 pub use resource_service::ResourceService;
-use rustical_xml::{
-    EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlDocument, XmlSerialize,
-};
+use rustical_xml::{EnumVariants, NamespaceOwned, PropName, XmlDeserialize, XmlSerialize};
+use std::collections::HashSet;
 use std::str::FromStr;

 mod axum_methods;
@@ -42,7 +41,6 @@ pub trait Resource: Clone + Send + 'static {

    fn get_resourcetype(&self) -> Resourcetype;

-    #[must_use]
    fn list_props() -> Vec<(Option<Namespace<'static>>, &'static str)> {
        Self::Prop::variant_names()
    }
@@ -76,27 +74,27 @@ pub trait Resource: Clone + Send + 'static {
    }

    fn satisfies_if_match(&self, if_match: &IfMatch) -> bool {
-        self.get_etag().map_or_else(
-            || if_match.is_any(),
-            |etag| {
-                ETag::from_str(&etag).map_or_else(
-                    |_| if_match.is_any(),
-                    |etag| if_match.precondition_passes(&etag),
-                )
-            },
-        )
+        if let Some(etag) = self.get_etag() {
+            if let Ok(etag) = ETag::from_str(&etag) {
+                if_match.precondition_passes(&etag)
+            } else {
+                if_match.is_any()
+            }
+        } else {
+            if_match.is_any()
+        }
    }

    fn satisfies_if_none_match(&self, if_none_match: &IfNoneMatch) -> bool {
-        self.get_etag().map_or_else(
-            || if_none_match != &IfNoneMatch::any(),
-            |etag| {
-                ETag::from_str(&etag).map_or_else(
-                    |_| if_none_match != &IfNoneMatch::any(),
-                    |etag| if_none_match.precondition_passes(&etag),
-                )
-            },
-        )
+        if let Some(etag) = self.get_etag() {
+            if let Ok(etag) = ETag::from_str(&etag) {
+                if_none_match.precondition_passes(&etag)
+            } else {
+                if_none_match != &IfNoneMatch::any()
+            }
+        } else {
+            if_none_match != &IfNoneMatch::any()
+        }
    }

    fn get_user_privileges(
@@ -104,19 +102,6 @@ pub trait Resource: Clone + Send + 'static {
        principal: &Self::Principal,
    ) -> Result<UserPrivilegeSet, Self::Error>;

-    fn parse_propfind(
-        body: &str,
-    ) -> Result<PropfindElement<<Self::Prop as PropName>::Names>, rustical_xml::XmlError> {
-        if body.is_empty() {
-            Ok(PropfindElement {
-                prop: PropfindType::Allprop,
-                include: None,
-            })
-        } else {
-            PropfindElement::parse_str(body)
-        }
-    }
-
    fn propfind(
        &self,
        path: &str,
@@ -131,7 +116,7 @@ pub trait Resource: Clone + Send + 'static {
            path.push('/');
        }

-        let (mut props, mut invalid_props): (Vec<<Self::Prop as PropName>::Names>, Vec<_>) =
+        let (mut props, mut invalid_props): (HashSet<<Self::Prop as PropName>::Names>, Vec<_>) =
            match prop {
                PropfindType::Propname => {
                    let props = Self::list_props()
@@ -140,7 +125,7 @@ pub trait Resource: Clone + Send + 'static {
                        .collect_vec();

                    return Ok(ResponseElement {
-                        href: path.clone(),
+                        href: path.to_owned(),
                        propstat: vec![PropstatWrapper::TagList(PropstatElement {
                            prop: TagList::from(props),
                            status: StatusCode::OK,
@@ -156,7 +141,7 @@ pub trait Resource: Clone + Send + 'static {
                    vec![],
                ),
                PropfindType::Prop(PropElement(valid_tags, invalid_tags)) => (
-                    valid_tags.iter().unique().cloned().collect(),
+                    valid_tags.iter().cloned().collect(),
                    invalid_tags.to_owned(),
                ),
            };
@@ -182,7 +167,7 @@ pub trait Resource: Clone + Send + 'static {
            }));
        }
        Ok(ResponseElement {
-            href: path.clone(),
+            href: path.to_owned(),
            propstat: propstats,
            ..Default::default()
        })
--- a/crates/dav/src/resource/resource_service.rs
+++ b/crates/dav/src/resource/resource_service.rs
@@ -76,7 +76,10 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
        Err(crate::Error::Forbidden.into())
    }

-    fn axum_service(self) -> AxumService<Self> {
+    fn axum_service(self) -> AxumService<Self>
+    where
+        Self: AxumMethods,
+    {
        AxumService::new(self)
    }

--- a/crates/dav/src/resources/mod.rs
+++ b/crates/dav/src/resources/mod.rs
@@ -1,72 +1,3 @@
 pub mod root;

 pub use root::{RootResource, RootResourceService};
-
-#[cfg(test)]
-pub mod test {
-    use crate::{
-        Error, Principal,
-        extensions::{CommonPropertiesExtension, CommonPropertiesProp},
-        namespace::NS_DAV,
-        privileges::UserPrivilegeSet,
-        resource::{PrincipalUri, Resource},
-        xml::{Resourcetype, ResourcetypeInner},
-    };
-
-    #[derive(Debug, Clone)]
-    pub struct TestPrincipal(pub String);
-
-    impl Principal for TestPrincipal {
-        fn get_id(&self) -> &str {
-            &self.0
-        }
-    }
-
-    impl Resource for TestPrincipal {
-        type Prop = CommonPropertiesProp;
-        type Error = Error;
-        type Principal = Self;
-
-        fn is_collection(&self) -> bool {
-            true
-        }
-
-        fn get_resourcetype(&self) -> crate::xml::Resourcetype {
-            Resourcetype(&[ResourcetypeInner(Some(NS_DAV), "collection")])
-        }
-
-        fn get_prop(
-            &self,
-            principal_uri: &impl crate::resource::PrincipalUri,
-            principal: &Self::Principal,
-            prop: &<Self::Prop as rustical_xml::PropName>::Names,
-        ) -> Result<Self::Prop, Self::Error> {
-            <Self as CommonPropertiesExtension>::get_prop(self, principal_uri, principal, prop)
-        }
-
-        fn get_displayname(&self) -> Option<&str> {
-            Some(&self.0)
-        }
-
-        fn get_user_privileges(
-            &self,
-            principal: &Self::Principal,
-        ) -> Result<UserPrivilegeSet, Self::Error> {
-            Ok(UserPrivilegeSet::owner_only(
-                principal.get_id() == self.get_id(),
-            ))
-        }
-    }
-
-    #[derive(Debug, Clone)]
-    pub struct TestPrincipalUri;
-
-    impl PrincipalUri for TestPrincipalUri {
-        fn principal_collection(&self) -> String {
-            "/".to_owned()
-        }
-        fn principal_uri(&self, principal: &str) -> String {
-            format!("/{principal}/")
-        }
-    }
-}
--- a/crates/dav/src/resources/root.rs
+++ b/crates/dav/src/resources/root.rs
@@ -63,7 +63,7 @@ pub struct RootResourceService<PRS: ResourceService + Clone, P: Principal, PURI:
 impl<PRS: ResourceService + Clone, P: Principal, PURI: PrincipalUri>
    RootResourceService<PRS, P, PURI>
 {
-    pub const fn new(principal_resource_service: PRS) -> Self {
+    pub fn new(principal_resource_service: PRS) -> Self {
        Self(principal_resource_service, PhantomData, PhantomData)
    }
 }
@@ -88,7 +88,7 @@ where

    async fn get_resource(
        &self,
-        (): &(),
+        _: &(),
        _show_deleted: bool,
    ) -> Result<Self::Resource, Self::Error> {
        Ok(RootResource::<PRS::Resource, P>::default())
@@ -105,33 +105,3 @@ impl<PRS: ResourceService<Principal = P> + Clone, P: Principal, PURI: PrincipalU
    for RootResourceService<PRS, P, PURI>
 {
 }
-
-#[cfg(test)]
-mod test {
-    use crate::{
-        resource::Resource,
-        resources::{
-            RootResource,
-            test::{TestPrincipal, TestPrincipalUri},
-        },
-    };
-
-    #[test]
-    fn test_root_resource() {
-        let resource = RootResource::<TestPrincipal, TestPrincipal>::default();
-        let propfind = RootResource::<TestPrincipal, TestPrincipal>::parse_propfind(
-            r#"<?xml version="1.0" encoding="UTF-8"?><propfind xmlns="DAV:"><allprop/></propfind>"#,
-        )
-        .unwrap();
-
-        let _response = resource
-            .propfind(
-                "/",
-                &propfind.prop,
-                propfind.include.as_ref(),
-                &TestPrincipalUri,
-                &TestPrincipal("user".to_owned()),
-            )
-            .unwrap();
-    }
-}
--- a/crates/dav/src/xml/error.rs
+++ b/crates/dav/src/xml/error.rs
@@ -1,12 +1,12 @@
 use rustical_xml::{XmlRootTag, XmlSerialize};

 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = "error")]
+#[xml(ns = "crate::namespace::NS_DAV", root = b"error")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = "PUSH"
+    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_DAVPUSH = b"PUSH"
 ))]
 pub struct ErrorElement<'t, T: XmlSerialize>(#[xml(ty = "untagged")] pub &'t T);
--- a/crates/dav/src/xml/group.rs
+++ b/crates/dav/src/xml/group.rs
@@ -1,8 +1,8 @@
 use crate::xml::HrefElement;
 use rustical_xml::{XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
 pub struct GroupMembership(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone)]
 pub struct GroupMemberSet(#[xml(ty = "untagged", flatten)] pub Vec<HrefElement>);
--- a/crates/dav/src/xml/href.rs
+++ b/crates/dav/src/xml/href.rs
@@ -1,15 +1,14 @@
 use derive_more::From;
 use rustical_xml::{XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, Debug, Clone, From, PartialEq, Eq)]
+#[derive(XmlDeserialize, XmlSerialize, Debug, Clone, From, PartialEq)]
 pub struct HrefElement {
    #[xml(ns = "crate::namespace::NS_DAV")]
    pub href: String,
 }

 impl HrefElement {
-    #[must_use]
-    pub const fn new(href: String) -> Self {
+    pub fn new(href: String) -> Self {
        Self { href }
    }
 }
--- a/crates/dav/src/xml/multistatus.rs
+++ b/crates/dav/src/xml/multistatus.rs
@@ -19,15 +19,14 @@ pub struct PropstatElement<PropType: XmlSerialize> {
    pub status: StatusCode,
 }

-#[allow(clippy::trivially_copy_pass_by_ref)]
 fn xml_serialize_status(
    status: &StatusCode,
    ns: Option<Namespace>,
-    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &str>,
+    tag: Option<&[u8]>,
+    namespaces: &HashMap<Namespace, &[u8]>,
    writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
-    XmlSerialize::serialize(&format!("HTTP/1.1 {status}"), ns, tag, namespaces, writer)
+    XmlSerialize::serialize(&format!("HTTP/1.1 {}", status), ns, tag, namespaces, writer)
 }

 #[derive(XmlSerialize)]
@@ -40,15 +39,8 @@ pub enum PropstatWrapper<T: XmlSerialize> {
 // RFC 2518
 // <!ELEMENT response (href, ((href*, status)|(propstat+)),
 // responsedescription?) >
-#[derive(XmlSerialize, XmlRootTag)]
-#[xml(ns = "crate::namespace::NS_DAV", root = "response")]
-#[xml(ns_prefix(
-    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = "PUSH"
-))]
+#[derive(XmlSerialize)]
+#[xml(ns = "crate::namespace::NS_DAV")]
 pub struct ResponseElement<PropstatType: XmlSerialize> {
    pub href: String,
    #[xml(serialize_with = "xml_serialize_optional_status")]
@@ -57,16 +49,15 @@ pub struct ResponseElement<PropstatType: XmlSerialize> {
    pub propstat: Vec<PropstatWrapper<PropstatType>>,
 }

-#[allow(clippy::trivially_copy_pass_by_ref, clippy::ref_option)]
 fn xml_serialize_optional_status(
    val: &Option<StatusCode>,
    ns: Option<Namespace>,
-    tag: Option<&str>,
-    namespaces: &HashMap<Namespace, &str>,
+    tag: Option<&[u8]>,
+    namespaces: &HashMap<Namespace, &[u8]>,
    writer: &mut quick_xml::Writer<&mut Vec<u8>>,
 ) -> std::io::Result<()> {
    XmlSerialize::serialize(
-        &val.map(|status| format!("HTTP/1.1 {status}")),
+        &val.map(|status| format!("HTTP/1.1 {}", status)),
        ns,
        tag,
        namespaces,
@@ -88,18 +79,18 @@ impl<PT: XmlSerialize> Default for ResponseElement<PT> {
 // <!ELEMENT multistatus (response+, responsedescription?) >
 // Extended by sync-token as specified in RFC 6578
 #[derive(XmlSerialize, XmlRootTag)]
-#[xml(root = "multistatus", ns = "crate::namespace::NS_DAV")]
+#[xml(root = b"multistatus", ns = "crate::namespace::NS_DAV")]
 #[xml(ns_prefix(
-    crate::namespace::NS_DAV = "",
-    crate::namespace::NS_CARDDAV = "CARD",
-    crate::namespace::NS_CALDAV = "CAL",
-    crate::namespace::NS_CALENDARSERVER = "CS",
-    crate::namespace::NS_DAVPUSH = "PUSH"
+    crate::namespace::NS_DAV = b"",
+    crate::namespace::NS_CARDDAV = b"CARD",
+    crate::namespace::NS_CALDAV = b"CAL",
+    crate::namespace::NS_CALENDARSERVER = b"CS",
+    crate::namespace::NS_DAVPUSH = b"PUSH"
 ))]
 pub struct MultistatusElement<PropType: XmlSerialize, MemberPropType: XmlSerialize> {
-    #[xml(rename = "response", flatten)]
+    #[xml(rename = b"response", flatten)]
    pub responses: Vec<ResponseElement<PropType>>,
-    #[xml(rename = "response", flatten)]
+    #[xml(rename = b"response", flatten)]
    pub member_responses: Vec<ResponseElement<MemberPropType>>,
    pub sync_token: Option<String>,
 }
--- a/crates/dav/src/xml/propfind.rs
+++ b/crates/dav/src/xml/propfind.rs
@@ -6,8 +6,8 @@ use rustical_xml::XmlDeserialize;
 use rustical_xml::XmlError;
 use rustical_xml::XmlRootTag;

-#[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq, Eq)]
-#[xml(root = "propfind", ns = "crate::namespace::NS_DAV")]
+#[derive(Debug, Clone, XmlDeserialize, XmlRootTag, PartialEq)]
+#[xml(root = b"propfind", ns = "crate::namespace::NS_DAV")]
 pub struct PropfindElement<PN: XmlDeserialize> {
    #[xml(ty = "untagged")]
    pub prop: PropfindType<PN>,
@@ -15,7 +15,7 @@ pub struct PropfindElement<PN: XmlDeserialize> {
    pub include: Option<PropElement<PN>>,
 }

-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct PropElement<PN: XmlDeserialize>(
    // valid
    pub Vec<PN>,
@@ -66,9 +66,6 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
                Event::Text(_) | Event::CData(_) => {
                    return Err(XmlError::UnsupportedEvent("Not expecting text here"));
                }
-                Event::GeneralRef(_) => {
-                    return Err(::rustical_xml::XmlError::UnsupportedEvent("GeneralRef"));
-                }
                Event::Decl(_) | Event::Comment(_) | Event::DocType(_) | Event::PI(_) => { /* ignore */
                }
                Event::End(_end) => {
@@ -82,7 +79,7 @@ impl<PN: XmlDeserialize> XmlDeserialize for PropElement<PN> {
    }
 }

-#[derive(Debug, Clone, XmlDeserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlDeserialize, PartialEq)]
 pub enum PropfindType<PN: XmlDeserialize> {
    #[xml(ns = "crate::namespace::NS_DAV")]
    Propname,
--- a/crates/dav/src/xml/report_set.rs
+++ b/crates/dav/src/xml/report_set.rs
@@ -2,7 +2,7 @@ use rustical_xml::XmlSerialize;
 use strum::VariantArray;

 // RFC 3253 section-3.1.5
-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub struct SupportedReportSet<T: XmlSerialize + 'static> {
    #[xml(flatten)]
    #[xml(ns = "crate::namespace::NS_DAV")]
@@ -10,7 +10,6 @@ pub struct SupportedReportSet<T: XmlSerialize + 'static> {
 }

 impl<T: XmlSerialize + Clone + 'static> SupportedReportSet<T> {
-    #[must_use]
    pub fn new(methods: Vec<T>) -> Self {
        Self {
            supported_report: methods
@@ -28,7 +27,7 @@ impl<T: XmlSerialize + Clone + 'static> SupportedReportSet<T> {
    }
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub struct ReportWrapper<T: XmlSerialize> {
    #[xml(ns = "crate::namespace::NS_DAV")]
    report: T,
--- a/crates/dav/src/xml/resourcetype.rs
+++ b/crates/dav/src/xml/resourcetype.rs
@@ -1,9 +1,9 @@
 use rustical_xml::XmlSerialize;

-#[derive(Debug, Clone, PartialEq, Eq, XmlSerialize)]
+#[derive(Debug, Clone, PartialEq, XmlSerialize)]
 pub struct Resourcetype(#[xml(flatten, ty = "untagged")] pub &'static [ResourcetypeInner]);

-#[derive(Debug, Clone, PartialEq, Eq, XmlSerialize)]
+#[derive(Debug, Clone, PartialEq, XmlSerialize)]
 pub struct ResourcetypeInner(
    #[xml(ty = "namespace")] pub Option<quick_xml::name::Namespace<'static>>,
    #[xml(ty = "tag_name")] pub &'static str,
@@ -16,7 +16,7 @@ mod tests {
    use super::{Resourcetype, ResourcetypeInner};

    #[derive(XmlSerialize, XmlRootTag)]
-    #[xml(root = "document")]
+    #[xml(root = b"document")]
    struct Document {
        resourcetype: Resourcetype,
    }
@@ -40,6 +40,6 @@ mod tests {
        <calendar-color xmlns="http://calendarserver.org/ns/"/>
    </resourcetype>
 </document>"#
-        );
+        )
    }
 }
--- a/crates/dav/src/xml/sync_collection.rs
+++ b/crates/dav/src/xml/sync_collection.rs
@@ -2,7 +2,7 @@ use rustical_xml::{ValueDeserialize, ValueSerialize, XmlDeserialize, XmlRootTag}

 use super::PropfindType;

-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq)]
 pub enum SyncLevel {
    One,
    Infinity,
@@ -25,15 +25,15 @@ impl ValueDeserialize for SyncLevel {
 impl ValueSerialize for SyncLevel {
    fn serialize(&self) -> String {
        match self {
-            Self::One => "1",
-            Self::Infinity => "Infinity",
+            SyncLevel::One => "1",
+            SyncLevel::Infinity => "Infinity",
        }
        .to_owned()
    }
 }

 // https://datatracker.ietf.org/doc/html/rfc5323#section-5.17
-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct LimitElement {
    #[xml(ns = "crate::namespace::NS_DAV")]
    pub nresults: NresultsElement,
@@ -53,14 +53,14 @@ impl From<LimitElement> for u64 {
    }
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct NresultsElement(#[xml(ty = "text")] u64);

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq, XmlRootTag)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq, XmlRootTag)]
 // <!ELEMENT sync-collection (sync-token, sync-level, limit?, prop)>
 //    <!-- DAV:limit defined in RFC 5323, Section 5.17 -->
 //    <!-- DAV:prop defined in RFC 4918, Section 14.18 -->
-#[xml(ns = "crate::namespace::NS_DAV", root = "sync-collection")]
+#[xml(ns = "crate::namespace::NS_DAV", root = b"sync-collection")]
 pub struct SyncCollectionRequest<PN: XmlDeserialize> {
    #[xml(ns = "crate::namespace::NS_DAV")]
    pub sync_token: String,
@@ -106,11 +106,11 @@ mod tests {
        assert_eq!(
            request,
            SyncCollectionRequest {
-                sync_token: String::new(),
+                sync_token: "".to_owned(),
                sync_level: SyncLevel::One,
                prop: PropfindType::Prop(PropElement(vec![TestPropName::Getetag], vec![])),
                limit: Some(100.into())
            }
-        );
+        )
    }
 }
--- a/crates/dav/src/xml/tag_list.rs
+++ b/crates/dav/src/xml/tag_list.rs
@@ -6,31 +6,39 @@ use quick_xml::{
 use rustical_xml::{NamespaceOwned, XmlSerialize};
 use std::collections::HashMap;

-#[derive(Clone, Debug, PartialEq, Eq, From)]
+#[derive(Clone, Debug, PartialEq, From)]
 pub struct TagList(Vec<(Option<NamespaceOwned>, String)>);

 impl XmlSerialize for TagList {
    fn serialize(
        &self,
        ns: Option<Namespace>,
-        tag: Option<&str>,
-        namespaces: &HashMap<Namespace, &str>,
+        tag: Option<&[u8]>,
+        namespaces: &HashMap<Namespace, &[u8]>,
        writer: &mut quick_xml::Writer<&mut Vec<u8>>,
    ) -> std::io::Result<()> {
-        let prefix = ns.and_then(|ns| namespaces.get(&ns)).map(|prefix| {
-            if prefix.is_empty() {
-                String::new()
-            } else {
-                format!("{prefix}:")
-            }
-        });
+        let prefix = ns
+            .map(|ns| namespaces.get(&ns))
+            .unwrap_or(None)
+            .map(|prefix| {
+                if !prefix.is_empty() {
+                    [*prefix, b":"].concat()
+                } else {
+                    Vec::new()
+                }
+            });
        let has_prefix = prefix.is_some();
        let tagname = tag.map(|tag| [&prefix.unwrap_or_default(), tag].concat());
+        let qname = tagname
+            .as_ref()
+            .map(|tagname| ::quick_xml::name::QName(tagname));

-        if let Some(tagname) = tagname.as_ref() {
-            let mut bytes_start = BytesStart::new(tagname);
-            if !has_prefix && let Some(ns) = &ns {
-                bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
+        if let Some(qname) = &qname {
+            let mut bytes_start = BytesStart::from(qname.to_owned());
+            if !has_prefix {
+                if let Some(ns) = &ns {
+                    bytes_start.push_attribute((b"xmlns".as_ref(), ns.as_ref()));
+                }
            }
            writer.write_event(Event::Start(bytes_start))?;
        }
@@ -43,8 +51,8 @@ impl XmlSerialize for TagList {
            el.write_empty()?;
        }

-        if let Some(tagname) = tagname.as_ref() {
-            writer.write_event(Event::End(BytesEnd::new(tagname)))?;
+        if let Some(qname) = &qname {
+            writer.write_event(Event::End(BytesEnd::from(qname.to_owned())))?;
        }
        Ok(())
    }
--- a/crates/dav_push/Cargo.toml
+++ b/crates/dav_push/Cargo.toml
@@ -24,6 +24,7 @@ rustical_dav.workspace = true
 rustical_store.workspace = true
 http.workspace = true
 base64.workspace = true
+rand.workspace = true
 ece.workspace = true
 axum.workspace = true
 openssl.workspace = true
--- a/crates/dav_push/src/extension.rs
+++ b/crates/dav_push/src/extension.rs
@@ -2,7 +2,7 @@ use crate::{ContentUpdate, PropertyUpdate, SupportedTriggers, Transports, Trigge
 use rustical_dav::header::Depth;
 use rustical_xml::{EnumVariants, PropName, XmlDeserialize, XmlSerialize};

-#[derive(XmlDeserialize, XmlSerialize, PartialEq, Eq, Clone, PropName, EnumVariants)]
+#[derive(XmlDeserialize, XmlSerialize, PartialEq, Clone, PropName, EnumVariants)]
 #[xml(unit_variants_ident = "DavPushExtensionPropName")]
 pub enum DavPushExtensionProp {
    // WebDav Push
@@ -32,7 +32,7 @@ pub trait DavPushExtension {
    ) -> Result<DavPushExtensionProp, rustical_dav::Error> {
        Ok(match &prop {
            DavPushExtensionPropName::Transports => {
-                DavPushExtensionProp::Transports(Transports::default())
+                DavPushExtensionProp::Transports(Default::default())
            }
            DavPushExtensionPropName::Topic => DavPushExtensionProp::Topic(self.get_topic()),
            DavPushExtensionPropName::SupportedTriggers => {
--- a/crates/dav_push/src/lib.rs
+++ b/crates/dav_push/src/lib.rs
@@ -1,5 +1,3 @@
-#![warn(clippy::all, clippy::pedantic, clippy::nursery)]
-#![allow(clippy::missing_errors_doc)]
 mod extension;
 mod prop;
 pub mod register;
@@ -27,10 +25,10 @@ pub struct ContentUpdate {
 }

 #[derive(XmlSerialize, XmlRootTag, Debug)]
-#[xml(root = "push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
+#[xml(root = b"push-message", ns = "rustical_dav::namespace::NS_DAVPUSH")]
 #[xml(ns_prefix(
-    rustical_dav::namespace::NS_DAVPUSH = "",
-    rustical_dav::namespace::NS_DAV = "D",
+    rustical_dav::namespace::NS_DAVPUSH = b"",
+    rustical_dav::namespace::NS_DAV = b"D",
 ))]
 struct PushMessage {
    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
@@ -70,7 +68,6 @@ impl<S: SubscriptionStore> DavPushController<S> {
        }
    }

-    #[allow(clippy::cognitive_complexity)]
    async fn send_message(&self, message: CollectionOperation) {
        let subscriptions = match self.sub_store.get_subscriptions(&message.topic).await {
            Ok(subs) => subs,
@@ -127,7 +124,7 @@ impl<S: SubscriptionStore> DavPushController<S> {
                        subsciption.id, subsciption.topic
                    );
                    self.try_delete_subscription(&subsciption.id).await;
-                }
+                };
            }

            if let Err(err) = self.send_payload(&payload, &subsciption).await {
@@ -186,7 +183,6 @@ impl<S: SubscriptionStore> DavPushController<S> {
            header::CONTENT_TYPE,
            HeaderValue::from_static("application/octet-stream"),
        );
-        hdrs.insert("TTL", HeaderValue::from(60));
        client.execute(request).await?;

        Ok(())
@@ -209,7 +205,7 @@ enum NotifierError {

 impl NotifierError {
    // Decide whether the error should cause the subscription to be removed
-    pub const fn is_permament_error(&self) -> bool {
+    pub fn is_permament_error(&self) -> bool {
        match self {
            Self::InvalidPublicKeyType(_)
            | Self::InvalidEndpointUrl(_)
--- a/crates/dav_push/src/prop.rs
+++ b/crates/dav_push/src/prop.rs
@@ -1,13 +1,13 @@
 use rustical_dav::header::Depth;
 use rustical_xml::{Unparsed, XmlDeserialize, XmlSerialize};

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub enum Transport {
    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
    WebPush,
 }

-#[derive(Debug, Clone, XmlSerialize, PartialEq, Eq)]
+#[derive(Debug, Clone, XmlSerialize, PartialEq)]
 pub struct Transports {
    #[xml(flatten, ty = "untagged")]
    #[xml(ns = "crate::namespace::NS_DAVPUSH")]
@@ -22,10 +22,10 @@ impl Default for Transports {
    }
 }

-#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Clone)]
+#[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone)]
 pub struct SupportedTriggers(#[xml(flatten, ty = "untagged")] pub Vec<Trigger>);

-#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Debug, Clone)]
+#[derive(XmlSerialize, XmlDeserialize, PartialEq, Debug, Clone)]
 pub enum Trigger {
    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
    ContentUpdate(ContentUpdate),
@@ -33,14 +33,14 @@ pub enum Trigger {
    PropertyUpdate(PropertyUpdate),
 }

-#[derive(XmlSerialize, XmlDeserialize, PartialEq, Eq, Clone, Debug)]
+#[derive(XmlSerialize, XmlDeserialize, PartialEq, Clone, Debug)]
 pub struct ContentUpdate(
-    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );

-#[derive(XmlSerialize, PartialEq, Eq, Clone, Debug)]
+#[derive(XmlSerialize, PartialEq, Clone, Debug)]
 pub struct PropertyUpdate(
-    #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+    #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
 );

 impl XmlDeserialize for PropertyUpdate {
@@ -51,8 +51,8 @@ impl XmlDeserialize for PropertyUpdate {
    ) -> Result<Self, rustical_xml::XmlError> {
        #[derive(XmlDeserialize, PartialEq, Clone, Debug)]
        struct FakePropertyUpdate(
-            #[xml(rename = "depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
-            #[xml(rename = "prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
+            #[xml(rename = b"depth", ns = "rustical_dav::namespace::NS_DAV")] pub Depth,
+            #[xml(rename = b"prop", ns = "rustical_dav::namespace::NS_DAV")] pub Unparsed,
        );
        let FakePropertyUpdate(depth, _) = FakePropertyUpdate::deserialize(reader, start, empty)?;
        Ok(Self(depth))
--- a/crates/dav_push/src/register.rs
+++ b/crates/dav_push/src/register.rs
@@ -1,7 +1,7 @@
 use crate::Trigger;
 use rustical_xml::{XmlDeserialize, XmlRootTag, XmlSerialize};

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 #[xml(ns = "crate::namespace::NS_DAVPUSH")]
 pub struct WebPushSubscription {
    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
@@ -15,25 +15,25 @@ pub struct WebPushSubscription {
    pub auth_secret: String,
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct SubscriptionPublicKey {
-    #[xml(ty = "attr", rename = "type")]
+    #[xml(ty = "attr", rename = b"type")]
    pub ty: String,
    #[xml(ty = "text")]
    pub key: String,
 }

-#[derive(XmlDeserialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, Clone, Debug, PartialEq)]
 pub struct SubscriptionElement {
    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
    pub web_push_subscription: WebPushSubscription,
 }

-#[derive(XmlDeserialize, XmlSerialize, Clone, Debug, PartialEq, Eq)]
+#[derive(XmlDeserialize, XmlSerialize, Clone, Debug, PartialEq)]
 pub struct TriggerElement(#[xml(ty = "untagged", flatten)] Vec<Trigger>);

-#[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq, Eq)]
-#[xml(root = "push-register")]
+#[derive(XmlDeserialize, XmlRootTag, Clone, Debug, PartialEq)]
+#[xml(root = b"push-register")]
 #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
 pub struct PushRegister {
    #[xml(ns = "rustical_dav::namespace::NS_DAVPUSH")]
@@ -100,6 +100,6 @@ mod tests {
                    Trigger::PropertyUpdate(PropertyUpdate(Depth::Zero)),
                ]))
            }
-        );
+        )
    }
 }
--- a/crates/frontend/js-components/deno.json
+++ b/crates/frontend/js-components/deno.json
@@ -11,8 +11,9 @@
    ]
  },
  "imports": {
-    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.5",
-    "lit": "npm:lit@^3.3.1",
-    "vite": "npm:vite@^7.1.7"
+    "@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.4",
+    "lit": "npm:lit@^3.2.1",
+    "vite": "npm:vite@^6.1.1",
+    "webdav": "npm:webdav@^5.8.0"
  }
 }
--- a/crates/frontend/js-components/deno.lock
+++ b/crates/frontend/js-components/deno.lock
@@ -1,276 +1,205 @@
 {
-  "version": "5",
+  "version": "4",
  "specifiers": {
-    "npm:@deno/vite-plugin@^1.0.5": "1.0.5_vite@7.1.7__picomatch@4.0.3",
-    "npm:lit@^3.3.1": "3.3.1",
-    "npm:vite@*": "7.1.7_picomatch@4.0.3",
-    "npm:vite@^7.1.7": "7.1.7_picomatch@4.0.3"
+    "npm:@deno/vite-plugin@^1.0.4": "1.0.4_vite@6.3.5__picomatch@4.0.2",
+    "npm:lit@^3.2.1": "3.3.0",
+    "npm:vite@*": "6.3.5_picomatch@4.0.2",
+    "npm:vite@^6.1.1": "6.3.5_picomatch@4.0.2",
+    "npm:webdav@^5.8.0": "5.8.0"
  },
  "npm": {
-    "@deno/vite-plugin@1.0.5_vite@7.1.7__picomatch@4.0.3": {
-      "integrity": "sha512-tLja5n4dyMhcze1NzvSs2iiriBymfBlDCZIrjMTxb9O2ru0gvmV6mn5oBD2teNw5Sd92cj3YJzKwsAs8tMJXlg==",
+    "@buttercup/fetch@0.2.1": {
+      "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==",
+      "dependencies": [
+        "node-fetch"
+      ]
+    },
+    "@deno/vite-plugin@1.0.4_vite@6.3.5__picomatch@4.0.2": {
+      "integrity": "sha512-xg8YT8Wn2sGXSnJgiGTpBGX1Dov0c6fd1rAp8VsfrCUtyBRRWzwVMAnd3fQ4yq8h7LSVvJUxEFN4U421k/DQLA==",
      "dependencies": [
        "vite"
      ]
    },
-    "@esbuild/aix-ppc64@0.25.10": {
-      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
-      "os": ["aix"],
-      "cpu": ["ppc64"]
+    "@esbuild/aix-ppc64@0.25.5": {
+      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA=="
    },
-    "@esbuild/android-arm64@0.25.10": {
-      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
-      "os": ["android"],
-      "cpu": ["arm64"]
+    "@esbuild/android-arm64@0.25.5": {
+      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg=="
    },
-    "@esbuild/android-arm@0.25.10": {
-      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
-      "os": ["android"],
-      "cpu": ["arm"]
+    "@esbuild/android-arm@0.25.5": {
+      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA=="
    },
-    "@esbuild/android-x64@0.25.10": {
-      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
-      "os": ["android"],
-      "cpu": ["x64"]
+    "@esbuild/android-x64@0.25.5": {
+      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw=="
    },
-    "@esbuild/darwin-arm64@0.25.10": {
-      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
-      "os": ["darwin"],
-      "cpu": ["arm64"]
+    "@esbuild/darwin-arm64@0.25.5": {
+      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ=="
    },
-    "@esbuild/darwin-x64@0.25.10": {
-      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
-      "os": ["darwin"],
-      "cpu": ["x64"]
+    "@esbuild/darwin-x64@0.25.5": {
+      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ=="
    },
-    "@esbuild/freebsd-arm64@0.25.10": {
-      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
-      "os": ["freebsd"],
-      "cpu": ["arm64"]
+    "@esbuild/freebsd-arm64@0.25.5": {
+      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw=="
    },
-    "@esbuild/freebsd-x64@0.25.10": {
-      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
-      "os": ["freebsd"],
-      "cpu": ["x64"]
+    "@esbuild/freebsd-x64@0.25.5": {
+      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw=="
    },
-    "@esbuild/linux-arm64@0.25.10": {
-      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
-      "os": ["linux"],
-      "cpu": ["arm64"]
+    "@esbuild/linux-arm64@0.25.5": {
+      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg=="
    },
-    "@esbuild/linux-arm@0.25.10": {
-      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
-      "os": ["linux"],
-      "cpu": ["arm"]
+    "@esbuild/linux-arm@0.25.5": {
+      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw=="
    },
-    "@esbuild/linux-ia32@0.25.10": {
-      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
-      "os": ["linux"],
-      "cpu": ["ia32"]
+    "@esbuild/linux-ia32@0.25.5": {
+      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA=="
    },
-    "@esbuild/linux-loong64@0.25.10": {
-      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
-      "os": ["linux"],
-      "cpu": ["loong64"]
+    "@esbuild/linux-loong64@0.25.5": {
+      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg=="
    },
-    "@esbuild/linux-mips64el@0.25.10": {
-      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
-      "os": ["linux"],
-      "cpu": ["mips64el"]
+    "@esbuild/linux-mips64el@0.25.5": {
+      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg=="
    },
-    "@esbuild/linux-ppc64@0.25.10": {
-      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
-      "os": ["linux"],
-      "cpu": ["ppc64"]
+    "@esbuild/linux-ppc64@0.25.5": {
+      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ=="
    },
-    "@esbuild/linux-riscv64@0.25.10": {
-      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
-      "os": ["linux"],
-      "cpu": ["riscv64"]
+    "@esbuild/linux-riscv64@0.25.5": {
+      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA=="
    },
-    "@esbuild/linux-s390x@0.25.10": {
-      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
-      "os": ["linux"],
-      "cpu": ["s390x"]
+    "@esbuild/linux-s390x@0.25.5": {
+      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ=="
    },
-    "@esbuild/linux-x64@0.25.10": {
-      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
-      "os": ["linux"],
-      "cpu": ["x64"]
+    "@esbuild/linux-x64@0.25.5": {
+      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw=="
    },
-    "@esbuild/netbsd-arm64@0.25.10": {
-      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
-      "os": ["netbsd"],
-      "cpu": ["arm64"]
+    "@esbuild/netbsd-arm64@0.25.5": {
+      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw=="
    },
-    "@esbuild/netbsd-x64@0.25.10": {
-      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
-      "os": ["netbsd"],
-      "cpu": ["x64"]
+    "@esbuild/netbsd-x64@0.25.5": {
+      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ=="
    },
-    "@esbuild/openbsd-arm64@0.25.10": {
-      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
-      "os": ["openbsd"],
-      "cpu": ["arm64"]
+    "@esbuild/openbsd-arm64@0.25.5": {
+      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw=="
    },
-    "@esbuild/openbsd-x64@0.25.10": {
-      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
-      "os": ["openbsd"],
-      "cpu": ["x64"]
+    "@esbuild/openbsd-x64@0.25.5": {
+      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg=="
    },
-    "@esbuild/openharmony-arm64@0.25.10": {
-      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
-      "os": ["openharmony"],
-      "cpu": ["arm64"]
+    "@esbuild/sunos-x64@0.25.5": {
+      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA=="
    },
-    "@esbuild/sunos-x64@0.25.10": {
-      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
-      "os": ["sunos"],
-      "cpu": ["x64"]
+    "@esbuild/win32-arm64@0.25.5": {
+      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw=="
    },
-    "@esbuild/win32-arm64@0.25.10": {
-      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
-      "os": ["win32"],
-      "cpu": ["arm64"]
+    "@esbuild/win32-ia32@0.25.5": {
+      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ=="
    },
-    "@esbuild/win32-ia32@0.25.10": {
-      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
-      "os": ["win32"],
-      "cpu": ["ia32"]
+    "@esbuild/win32-x64@0.25.5": {
+      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g=="
    },
-    "@esbuild/win32-x64@0.25.10": {
-      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
-      "os": ["win32"],
-      "cpu": ["x64"]
+    "@lit-labs/ssr-dom-shim@1.3.0": {
+      "integrity": "sha512-nQIWonJ6eFAvUUrSlwyHDm/aE8PBDu5kRpL0vHMg6K8fK3Diq1xdPjTnsJSwxABhaZ+5eBi1btQB5ShUTKo4nQ=="
    },
-    "@lit-labs/ssr-dom-shim@1.4.0": {
-      "integrity": "sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw=="
-    },
-    "@lit/reactive-element@2.1.1": {
-      "integrity": "sha512-N+dm5PAYdQ8e6UlywyyrgI2t++wFGXfHx+dSJ1oBrg6FAxUj40jId++EaRm80MKX5JnlH1sBsyZ5h0bcZKemCg==",
+    "@lit/reactive-element@2.1.0": {
+      "integrity": "sha512-L2qyoZSQClcBmq0qajBVbhYEcG6iK0XfLn66ifLe/RfC0/ihpc+pl0Wdn8bJ8o+hj38cG0fGXRgSS20MuXn7qA==",
      "dependencies": [
        "@lit-labs/ssr-dom-shim"
      ]
    },
-    "@rollup/rollup-android-arm-eabi@4.52.2": {
-      "integrity": "sha512-o3pcKzJgSGt4d74lSZ+OCnHwkKBeAbFDmbEm5gg70eA8VkyCuC/zV9TwBnmw6VjDlRdF4Pshfb+WE9E6XY1PoQ==",
-      "os": ["android"],
-      "cpu": ["arm"]
+    "@rollup/rollup-android-arm-eabi@4.43.0": {
+      "integrity": "sha512-Krjy9awJl6rKbruhQDgivNbD1WuLb8xAclM4IR4cN5pHGAs2oIMMQJEiC3IC/9TZJ+QZkmZhlMO/6MBGxPidpw=="
    },
-    "@rollup/rollup-android-arm64@4.52.2": {
-      "integrity": "sha512-cqFSWO5tX2vhC9hJTK8WAiPIm4Q8q/cU8j2HQA0L3E1uXvBYbOZMhE2oFL8n2pKB5sOCHY6bBuHaRwG7TkfJyw==",
-      "os": ["android"],
-      "cpu": ["arm64"]
+    "@rollup/rollup-android-arm64@4.43.0": {
+      "integrity": "sha512-ss4YJwRt5I63454Rpj+mXCXicakdFmKnUNxr1dLK+5rv5FJgAxnN7s31a5VchRYxCFWdmnDWKd0wbAdTr0J5EA=="
    },
-    "@rollup/rollup-darwin-arm64@4.52.2": {
-      "integrity": "sha512-vngduywkkv8Fkh3wIZf5nFPXzWsNsVu1kvtLETWxTFf/5opZmflgVSeLgdHR56RQh71xhPhWoOkEBvbehwTlVA==",
-      "os": ["darwin"],
-      "cpu": ["arm64"]
+    "@rollup/rollup-darwin-arm64@4.43.0": {
+      "integrity": "sha512-eKoL8ykZ7zz8MjgBenEF2OoTNFAPFz1/lyJ5UmmFSz5jW+7XbH1+MAgCVHy72aG59rbuQLcJeiMrP8qP5d/N0A=="
    },
-    "@rollup/rollup-darwin-x64@4.52.2": {
-      "integrity": "sha512-h11KikYrUCYTrDj6h939hhMNlqU2fo/X4NB0OZcys3fya49o1hmFaczAiJWVAFgrM1NCP6RrO7lQKeVYSKBPSQ==",
-      "os": ["darwin"],
-      "cpu": ["x64"]
+    "@rollup/rollup-darwin-x64@4.43.0": {
+      "integrity": "sha512-SYwXJgaBYW33Wi/q4ubN+ldWC4DzQY62S4Ll2dgfr/dbPoF50dlQwEaEHSKrQdSjC6oIe1WgzosoaNoHCdNuMg=="
    },
-    "@rollup/rollup-freebsd-arm64@4.52.2": {
-      "integrity": "sha512-/eg4CI61ZUkLXxMHyVlmlGrSQZ34xqWlZNW43IAU4RmdzWEx0mQJ2mN/Cx4IHLVZFL6UBGAh+/GXhgvGb+nVxw==",
-      "os": ["freebsd"],
-      "cpu": ["arm64"]
+    "@rollup/rollup-freebsd-arm64@4.43.0": {
+      "integrity": "sha512-SV+U5sSo0yujrjzBF7/YidieK2iF6E7MdF6EbYxNz94lA+R0wKl3SiixGyG/9Klab6uNBIqsN7j4Y/Fya7wAjQ=="
    },
-    "@rollup/rollup-freebsd-x64@4.52.2": {
-      "integrity": "sha512-QOWgFH5X9+p+S1NAfOqc0z8qEpJIoUHf7OWjNUGOeW18Mx22lAUOiA9b6r2/vpzLdfxi/f+VWsYjUOMCcYh0Ng==",
-      "os": ["freebsd"],
-      "cpu": ["x64"]
+    "@rollup/rollup-freebsd-x64@4.43.0": {
+      "integrity": "sha512-J7uCsiV13L/VOeHJBo5SjasKiGxJ0g+nQTrBkAsmQBIdil3KhPnSE9GnRon4ejX1XDdsmK/l30IYLiAaQEO0Cg=="
    },
-    "@rollup/rollup-linux-arm-gnueabihf@4.52.2": {
-      "integrity": "sha512-kDWSPafToDd8LcBYd1t5jw7bD5Ojcu12S3uT372e5HKPzQt532vW+rGFFOaiR0opxePyUkHrwz8iWYEyH1IIQA==",
-      "os": ["linux"],
-      "cpu": ["arm"]
+    "@rollup/rollup-linux-arm-gnueabihf@4.43.0": {
+      "integrity": "sha512-gTJ/JnnjCMc15uwB10TTATBEhK9meBIY+gXP4s0sHD1zHOaIh4Dmy1X9wup18IiY9tTNk5gJc4yx9ctj/fjrIw=="
    },
-    "@rollup/rollup-linux-arm-musleabihf@4.52.2": {
-      "integrity": "sha512-gKm7Mk9wCv6/rkzwCiUC4KnevYhlf8ztBrDRT9g/u//1fZLapSRc+eDZj2Eu2wpJ+0RzUKgtNijnVIB4ZxyL+w==",
-      "os": ["linux"],
-      "cpu": ["arm"]
+    "@rollup/rollup-linux-arm-musleabihf@4.43.0": {
+      "integrity": "sha512-ZJ3gZynL1LDSIvRfz0qXtTNs56n5DI2Mq+WACWZ7yGHFUEirHBRt7fyIk0NsCKhmRhn7WAcjgSkSVVxKlPNFFw=="
    },
-    "@rollup/rollup-linux-arm64-gnu@4.52.2": {
-      "integrity": "sha512-66lA8vnj5mB/rtDNwPgrrKUOtCLVQypkyDa2gMfOefXK6rcZAxKLO9Fy3GkW8VkPnENv9hBkNOFfGLf6rNKGUg==",
-      "os": ["linux"],
-      "cpu": ["arm64"]
+    "@rollup/rollup-linux-arm64-gnu@4.43.0": {
+      "integrity": "sha512-8FnkipasmOOSSlfucGYEu58U8cxEdhziKjPD2FIa0ONVMxvl/hmONtX/7y4vGjdUhjcTHlKlDhw3H9t98fPvyA=="
    },
-    "@rollup/rollup-linux-arm64-musl@4.52.2": {
-      "integrity": "sha512-s+OPucLNdJHvuZHuIz2WwncJ+SfWHFEmlC5nKMUgAelUeBUnlB4wt7rXWiyG4Zn07uY2Dd+SGyVa9oyLkVGOjA==",
-      "os": ["linux"],
-      "cpu": ["arm64"]
+    "@rollup/rollup-linux-arm64-musl@4.43.0": {
+      "integrity": "sha512-KPPyAdlcIZ6S9C3S2cndXDkV0Bb1OSMsX0Eelr2Bay4EsF9yi9u9uzc9RniK3mcUGCLhWY9oLr6er80P5DE6XA=="
    },
-    "@rollup/rollup-linux-loong64-gnu@4.52.2": {
-      "integrity": "sha512-8wTRM3+gVMDLLDdaT6tKmOE3lJyRy9NpJUS/ZRWmLCmOPIJhVyXwjBo+XbrrwtV33Em1/eCTd5TuGJm4+DmYjw==",
-      "os": ["linux"],
-      "cpu": ["loong64"]
+    "@rollup/rollup-linux-loongarch64-gnu@4.43.0": {
+      "integrity": "sha512-HPGDIH0/ZzAZjvtlXj6g+KDQ9ZMHfSP553za7o2Odegb/BEfwJcR0Sw0RLNpQ9nC6Gy8s+3mSS9xjZ0n3rhcYg=="
    },
-    "@rollup/rollup-linux-ppc64-gnu@4.52.2": {
-      "integrity": "sha512-6yqEfgJ1anIeuP2P/zhtfBlDpXUb80t8DpbYwXQ3bQd95JMvUaqiX+fKqYqUwZXqdJDd8xdilNtsHM2N0cFm6A==",
-      "os": ["linux"],
-      "cpu": ["ppc64"]
+    "@rollup/rollup-linux-powerpc64le-gnu@4.43.0": {
+      "integrity": "sha512-gEmwbOws4U4GLAJDhhtSPWPXUzDfMRedT3hFMyRAvM9Mrnj+dJIFIeL7otsv2WF3D7GrV0GIewW0y28dOYWkmw=="
    },
-    "@rollup/rollup-linux-riscv64-gnu@4.52.2": {
-      "integrity": "sha512-sshYUiYVSEI2B6dp4jMncwxbrUqRdNApF2c3bhtLAU0qA8Lrri0p0NauOsTWh3yCCCDyBOjESHMExonp7Nzc0w==",
-      "os": ["linux"],
-      "cpu": ["riscv64"]
+    "@rollup/rollup-linux-riscv64-gnu@4.43.0": {
+      "integrity": "sha512-XXKvo2e+wFtXZF/9xoWohHg+MuRnvO29TI5Hqe9xwN5uN8NKUYy7tXUG3EZAlfchufNCTHNGjEx7uN78KsBo0g=="
    },
-    "@rollup/rollup-linux-riscv64-musl@4.52.2": {
-      "integrity": "sha512-duBLgd+3pqC4MMwBrKkFxaZerUxZcYApQVC5SdbF5/e/589GwVvlRUnyqMFbM8iUSb1BaoX/3fRL7hB9m2Pj8Q==",
-      "os": ["linux"],
-      "cpu": ["riscv64"]
+    "@rollup/rollup-linux-riscv64-musl@4.43.0": {
+      "integrity": "sha512-ruf3hPWhjw6uDFsOAzmbNIvlXFXlBQ4nk57Sec8E8rUxs/AI4HD6xmiiasOOx/3QxS2f5eQMKTAwk7KHwpzr/Q=="
    },
-    "@rollup/rollup-linux-s390x-gnu@4.52.2": {
-      "integrity": "sha512-tzhYJJidDUVGMgVyE+PmxENPHlvvqm1KILjjZhB8/xHYqAGeizh3GBGf9u6WdJpZrz1aCpIIHG0LgJgH9rVjHQ==",
-      "os": ["linux"],
-      "cpu": ["s390x"]
+    "@rollup/rollup-linux-s390x-gnu@4.43.0": {
+      "integrity": "sha512-QmNIAqDiEMEvFV15rsSnjoSmO0+eJLoKRD9EAa9rrYNwO/XRCtOGM3A5A0X+wmG+XRrw9Fxdsw+LnyYiZWWcVw=="
    },
-    "@rollup/rollup-linux-x64-gnu@4.52.2": {
-      "integrity": "sha512-opH8GSUuVcCSSyHHcl5hELrmnk4waZoVpgn/4FDao9iyE4WpQhyWJ5ryl5M3ocp4qkRuHfyXnGqg8M9oKCEKRA==",
-      "os": ["linux"],
-      "cpu": ["x64"]
+    "@rollup/rollup-linux-x64-gnu@4.43.0": {
+      "integrity": "sha512-jAHr/S0iiBtFyzjhOkAics/2SrXE092qyqEg96e90L3t9Op8OTzS6+IX0Fy5wCt2+KqeHAkti+eitV0wvblEoQ=="
    },
-    "@rollup/rollup-linux-x64-musl@4.52.2": {
-      "integrity": "sha512-LSeBHnGli1pPKVJ79ZVJgeZWWZXkEe/5o8kcn23M8eMKCUANejchJbF/JqzM4RRjOJfNRhKJk8FuqL1GKjF5oQ==",
-      "os": ["linux"],
-      "cpu": ["x64"]
+    "@rollup/rollup-linux-x64-musl@4.43.0": {
+      "integrity": "sha512-3yATWgdeXyuHtBhrLt98w+5fKurdqvs8B53LaoKD7P7H7FKOONLsBVMNl9ghPQZQuYcceV5CDyPfyfGpMWD9mQ=="
    },
-    "@rollup/rollup-openharmony-arm64@4.52.2": {
-      "integrity": "sha512-uPj7MQ6/s+/GOpolavm6BPo+6CbhbKYyZHUDvZ/SmJM7pfDBgdGisFX3bY/CBDMg2ZO4utfhlApkSfZ92yXw7Q==",
-      "os": ["openharmony"],
-      "cpu": ["arm64"]
+    "@rollup/rollup-win32-arm64-msvc@4.43.0": {
+      "integrity": "sha512-wVzXp2qDSCOpcBCT5WRWLmpJRIzv23valvcTwMHEobkjippNf+C3ys/+wf07poPkeNix0paTNemB2XrHr2TnGw=="
    },
-    "@rollup/rollup-win32-arm64-msvc@4.52.2": {
-      "integrity": "sha512-Z9MUCrSgIaUeeHAiNkm3cQyst2UhzjPraR3gYYfOjAuZI7tcFRTOD+4cHLPoS/3qinchth+V56vtqz1Tv+6KPA==",
-      "os": ["win32"],
-      "cpu": ["arm64"]
+    "@rollup/rollup-win32-ia32-msvc@4.43.0": {
+      "integrity": "sha512-fYCTEyzf8d+7diCw8b+asvWDCLMjsCEA8alvtAutqJOJp/wL5hs1rWSqJ1vkjgW0L2NB4bsYJrpKkiIPRR9dvw=="
    },
-    "@rollup/rollup-win32-ia32-msvc@4.52.2": {
-      "integrity": "sha512-+GnYBmpjldD3XQd+HMejo+0gJGwYIOfFeoBQv32xF/RUIvccUz20/V6Otdv+57NE70D5pa8W/jVGDoGq0oON4A==",
-      "os": ["win32"],
-      "cpu": ["ia32"]
+    "@rollup/rollup-win32-x64-msvc@4.43.0": {
+      "integrity": "sha512-SnGhLiE5rlK0ofq8kzuDkM0g7FN1s5VYY+YSMTibP7CqShxCQvqtNxTARS4xX4PFJfHjG0ZQYX9iGzI3FQh5Aw=="
    },
-    "@rollup/rollup-win32-x64-gnu@4.52.2": {
-      "integrity": "sha512-ApXFKluSB6kDQkAqZOKXBjiaqdF1BlKi+/eqnYe9Ee7U2K3pUDKsIyr8EYm/QDHTJIM+4X+lI0gJc3TTRhd+dA==",
-      "os": ["win32"],
-      "cpu": ["x64"]
-    },
-    "@rollup/rollup-win32-x64-msvc@4.52.2": {
-      "integrity": "sha512-ARz+Bs8kY6FtitYM96PqPEVvPXqEZmPZsSkXvyX19YzDqkCaIlhCieLLMI5hxO9SRZ2XtCtm8wxhy0iJ2jxNfw==",
-      "os": ["win32"],
-      "cpu": ["x64"]
-    },
-    "@types/estree@1.0.8": {
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="
+    "@types/estree@1.0.7": {
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="
    },
    "@types/trusted-types@2.0.7": {
      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
    },
-    "esbuild@0.25.10": {
-      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
-      "optionalDependencies": [
+    "balanced-match@1.0.2": {
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "base-64@1.0.0": {
+      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
+    },
+    "brace-expansion@2.0.2": {
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dependencies": [
+        "balanced-match"
+      ]
+    },
+    "byte-length@1.0.2": {
+      "integrity": "sha512-ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q=="
+    },
+    "charenc@0.0.2": {
+      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
+    },
+    "crypt@0.0.2": {
+      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
+    },
+    "data-uri-to-buffer@4.0.1": {
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="
+    },
+    "entities@6.0.1": {
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="
+    },
+    "esbuild@0.25.5": {
+      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
+      "dependencies": [
        "@esbuild/aix-ppc64",
        "@esbuild/android-arm",
        "@esbuild/android-arm64",
@@ -292,75 +221,128 @@
        "@esbuild/netbsd-x64",
        "@esbuild/openbsd-arm64",
        "@esbuild/openbsd-x64",
-        "@esbuild/openharmony-arm64",
        "@esbuild/sunos-x64",
        "@esbuild/win32-arm64",
        "@esbuild/win32-ia32",
        "@esbuild/win32-x64"
-      ],
-      "scripts": true,
-      "bin": true
+      ]
    },
-    "fdir@6.5.0_picomatch@4.0.3": {
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+    "fast-xml-parser@4.5.3": {
+      "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+      "dependencies": [
+        "strnum"
+      ]
+    },
+    "fdir@6.4.6_picomatch@4.0.2": {
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
      "dependencies": [
-        "picomatch"
-      ],
-      "optionalPeers": [
        "picomatch"
      ]
    },
-    "fsevents@2.3.3": {
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "os": ["darwin"],
-      "scripts": true
+    "fetch-blob@3.2.0": {
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "dependencies": [
+        "node-domexception",
+        "web-streams-polyfill"
+      ]
    },
-    "lit-element@4.2.1": {
-      "integrity": "sha512-WGAWRGzirAgyphK2urmYOV72tlvnxw7YfyLDgQ+OZnM9vQQBQnumQ7jUJe6unEzwGU3ahFOjuz1iz1jjrpCPuw==",
+    "formdata-polyfill@4.0.10": {
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dependencies": [
+        "fetch-blob"
+      ]
+    },
+    "fsevents@2.3.3": {
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="
+    },
+    "hot-patcher@2.0.1": {
+      "integrity": "sha512-ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q=="
+    },
+    "is-buffer@1.1.6": {
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "layerr@3.0.0": {
+      "integrity": "sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA=="
+    },
+    "lit-element@4.2.0": {
+      "integrity": "sha512-MGrXJVAI5x+Bfth/pU9Kst1iWID6GHDLEzFEnyULB/sFiRLgkd8NPK/PeeXxktA3T6EIIaq8U3KcbTU5XFcP2Q==",
      "dependencies": [
        "@lit-labs/ssr-dom-shim",
        "@lit/reactive-element",
        "lit-html"
      ]
    },
-    "lit-html@3.3.1": {
-      "integrity": "sha512-S9hbyDu/vs1qNrithiNyeyv64c9yqiW9l+DBgI18fL+MTvOtWoFR0FWiyq1TxaYef5wNlpEmzlXoBlZEO+WjoA==",
+    "lit-html@3.3.0": {
+      "integrity": "sha512-RHoswrFAxY2d8Cf2mm4OZ1DgzCoBKUKSPvA1fhtSELxUERq2aQQ2h05pO9j81gS1o7RIRJ+CePLogfyahwmynw==",
      "dependencies": [
        "@types/trusted-types"
      ]
    },
-    "lit@3.3.1": {
-      "integrity": "sha512-Ksr/8L3PTapbdXJCk+EJVB78jDodUMaP54gD24W186zGRARvwrsPfS60wae/SSCTCNZVPd1chXqio1qHQmu4NA==",
+    "lit@3.3.0": {
+      "integrity": "sha512-DGVsqsOIHBww2DqnuZzW7QsuCdahp50ojuDaBPC7jUDRpYoH0z7kHBBYZewRzer75FwtrkmkKk7iOAwSaWdBmw==",
      "dependencies": [
        "@lit/reactive-element",
        "lit-element",
        "lit-html"
      ]
    },
+    "md5@2.3.0": {
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+      "dependencies": [
+        "charenc",
+        "crypt",
+        "is-buffer"
+      ]
+    },
+    "minimatch@9.0.5": {
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dependencies": [
+        "brace-expansion"
+      ]
+    },
    "nanoid@3.3.11": {
-      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-      "bin": true
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="
+    },
+    "nested-property@4.0.0": {
+      "integrity": "sha512-yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA=="
+    },
+    "node-domexception@1.0.0": {
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
+    },
+    "node-fetch@3.3.2": {
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "dependencies": [
+        "data-uri-to-buffer",
+        "fetch-blob",
+        "formdata-polyfill"
+      ]
+    },
+    "path-posix@1.0.0": {
+      "integrity": "sha512-1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA=="
    },
    "picocolors@1.1.1": {
      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
    },
-    "picomatch@4.0.3": {
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="
+    "picomatch@4.0.2": {
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="
    },
-    "postcss@8.5.6": {
-      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+    "postcss@8.5.5": {
+      "integrity": "sha512-d/jtm+rdNT8tpXuHY5MMtcbJFBkhXE6593XVR9UoGCH8jSFGci7jGvMGH5RYd5PBJW+00NZQt6gf7CbagJCrhg==",
      "dependencies": [
        "nanoid",
        "picocolors",
        "source-map-js"
      ]
    },
-    "rollup@4.52.2": {
-      "integrity": "sha512-I25/2QgoROE1vYV+NQ1En9T9UFB9Cmfm2CJ83zZOlaDpvz29wGQSZXWKw7MiNXau7wYgB/T9fVIdIuEQ+KbiiA==",
+    "querystringify@2.2.0": {
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
+    "requires-port@1.0.0": {
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+    },
+    "rollup@4.43.0": {
+      "integrity": "sha512-wdN2Kd3Twh8MAEOEJZsuxuLKCsBEo4PVNLK6tQWAn10VhsVewQLzcucMgLolRlhFybGxfclbPeEYBaP6RvUFGg==",
      "dependencies": [
-        "@types/estree"
-      ],
-      "optionalDependencies": [
        "@rollup/rollup-android-arm-eabi",
        "@rollup/rollup-android-arm64",
        "@rollup/rollup-darwin-arm64",
@@ -371,53 +353,84 @@
        "@rollup/rollup-linux-arm-musleabihf",
        "@rollup/rollup-linux-arm64-gnu",
        "@rollup/rollup-linux-arm64-musl",
-        "@rollup/rollup-linux-loong64-gnu",
-        "@rollup/rollup-linux-ppc64-gnu",
+        "@rollup/rollup-linux-loongarch64-gnu",
+        "@rollup/rollup-linux-powerpc64le-gnu",
        "@rollup/rollup-linux-riscv64-gnu",
        "@rollup/rollup-linux-riscv64-musl",
        "@rollup/rollup-linux-s390x-gnu",
        "@rollup/rollup-linux-x64-gnu",
        "@rollup/rollup-linux-x64-musl",
-        "@rollup/rollup-openharmony-arm64",
        "@rollup/rollup-win32-arm64-msvc",
        "@rollup/rollup-win32-ia32-msvc",
-        "@rollup/rollup-win32-x64-gnu",
        "@rollup/rollup-win32-x64-msvc",
+        "@types/estree",
        "fsevents"
-      ],
-      "bin": true
+      ]
    },
    "source-map-js@1.2.1": {
      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
    },
-    "tinyglobby@0.2.15_picomatch@4.0.3": {
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+    "strnum@1.1.2": {
+      "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA=="
+    },
+    "tinyglobby@0.2.14_picomatch@4.0.2": {
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
      "dependencies": [
        "fdir",
        "picomatch"
      ]
    },
-    "vite@7.1.7_picomatch@4.0.3": {
-      "integrity": "sha512-VbA8ScMvAISJNJVbRDTJdCwqQoAareR/wutevKanhR2/1EkoXVZVkkORaYm/tNVCjP/UDTKtcw3bAkwOUdedmA==",
+    "url-join@5.0.0": {
+      "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA=="
+    },
+    "url-parse@1.5.10": {
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dependencies": [
+        "querystringify",
+        "requires-port"
+      ]
+    },
+    "vite@6.3.5_picomatch@4.0.2": {
+      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
      "dependencies": [
        "esbuild",
        "fdir",
+        "fsevents",
        "picomatch",
        "postcss",
        "rollup",
        "tinyglobby"
-      ],
-      "optionalDependencies": [
-        "fsevents"
-      ],
-      "bin": true
+      ]
+    },
+    "web-streams-polyfill@3.3.3": {
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="
+    },
+    "webdav@5.8.0": {
+      "integrity": "sha512-iuFG7NamJ41Oshg4930iQgfIpRrUiatPWIekeznYgEf2EOraTRcDPTjy7gIOMtkdpKTaqPk1E68NO5PAGtJahA==",
+      "dependencies": [
+        "@buttercup/fetch",
+        "base-64",
+        "byte-length",
+        "entities",
+        "fast-xml-parser",
+        "hot-patcher",
+        "layerr",
+        "md5",
+        "minimatch",
+        "nested-property",
+        "node-fetch",
+        "path-posix",
+        "url-join",
+        "url-parse"
+      ]
    }
  },
  "workspace": {
    "dependencies": [
-      "npm:@deno/vite-plugin@^1.0.5",
-      "npm:lit@^3.3.1",
-      "npm:vite@^7.1.7"
+      "npm:@deno/vite-plugin@^1.0.4",
+      "npm:lit@^3.2.1",
+      "npm:vite@^6.1.1",
+      "npm:webdav@^5.8.0"
    ]
  }
 }
--- a/crates/frontend/js-components/lib/create-addressbook-form.ts
+++ b/crates/frontend/js-components/lib/create-addressbook-form.ts
@@ -1,6 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { createClient } from "webdav";
 import { escapeXml } from ".";

@customElement("create-addressbook-form")
@@ -14,12 +15,14 @@ export class CreateAddressbookForm extends LitElement {
    return this
  }

+  client = createClient("/carddav")
+
  @property()
  user: string = ''
  @property()
  principal: string = ''
  @property()
-  addr_id: string = self.crypto.randomUUID()
+  addr_id: string = ''
  @property()
  displayname: string = ''
  @property()
@@ -46,7 +49,7 @@ export class CreateAddressbookForm extends LitElement {
          <br>
          <label>
            id
-            <input type="text" name="id" value=${this.addr_id} @change=${e => this.addr_id = e.target.value} />
+            <input type="text" name="id" @change=${e => this.addr_id = e.target.value} />
          </label>
          <br>
          <label>
@@ -77,12 +80,8 @@ export class CreateAddressbookForm extends LitElement {
      alert("Empty displayname")
      return
    }
-    let response = await fetch(`/carddav/principal/${this.principal || this.user}/${this.addr_id}`, {
-      method: 'MKCOL',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.addr_id}`, {
+      data: `
      <mkcol xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">
        <set>
          <prop>
@@ -92,14 +91,7 @@ export class CreateAddressbookForm extends LitElement {
        </set>
      </mkcol>
      `
-
    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
-
    window.location.reload()
    return null
  }
--- a/crates/frontend/js-components/lib/create-calendar-form.ts
+++ b/crates/frontend/js-components/lib/create-calendar-form.ts
@@ -1,6 +1,7 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators.js";
 import { Ref, createRef, ref } from 'lit/directives/ref.js';
+import { createClient } from "webdav";
 import { escapeXml } from ".";

@customElement("create-calendar-form")
@@ -13,19 +14,19 @@ export class CreateCalendarForm extends LitElement {
    return this
  }

+  client = createClient("/caldav")
+
  @property()
  user: string = ''
  @property()
  principal: string = ''
  @property()
-  cal_id: string = self.crypto.randomUUID()
+  cal_id: string = ''
  @property()
  displayname: string = ''
  @property()
  description: string = ''
  @property()
-  timezone_id: string = ''
-  @property()
  color: string = ''
  @property()
  isSubscription: boolean = false
@@ -37,6 +38,7 @@ export class CreateCalendarForm extends LitElement {
  dialog: Ref<HTMLDialogElement> = createRef()
  form: Ref<HTMLFormElement> = createRef()

+
  override render() {
    return html`
      <button @click=${() => this.dialog.value.showModal()}>Create calendar</button>
@@ -55,7 +57,7 @@ export class CreateCalendarForm extends LitElement {
          <br>
          <label>
            id
-            <input type="text" name="id" value=${this.cal_id} @change=${e => this.cal_id = e.target.value} />
+            <input type="text" name="id" @change=${e => this.cal_id = e.target.value} />
          </label>
          <br>
          <label>
@@ -63,11 +65,6 @@ export class CreateCalendarForm extends LitElement {
            <input type="text" name="displayname" value=${this.displayname} @change=${e => this.displayname = e.target.value} />
          </label>
          <br>
-          <label>
-            Timezone (optional)
-            <input type="text" name="timezone" .value=${this.timezone_id} @change=${e => this.timezone_id = e.target.value} />
-          </label>
-          <br>
          <label>
            Description
            <input type="text" name="description" @change=${e => this.description = e.target.value} />
@@ -122,18 +119,12 @@ export class CreateCalendarForm extends LitElement {
      alert("No calendar components selected")
      return
    }
-
-    let response = await fetch(`/caldav/principal/${this.principal || this.user}/${this.cal_id}`, {
-      method: 'MKCOL',
-      headers: {
-        'Content-Type': 'application/xml'
-      },
-      body: `
+    await this.client.createDirectory(`/principal/${this.principal || this.user}/${this.cal_id}`, {
+      data: `
      <mkcol xmlns="DAV:" xmlns:CAL="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:ICAL="http://apple.com/ns/ical/">
        <set>
          <prop>
            <displayname>${escapeXml(this.displayname)}</displayname>
-            ${this.timezone_id ? `<CAL:calendar-timezone-id>${escapeXml(this.timezone_id)}</CAL:calendar-timezone-id>` : ''}
            ${this.description ? `<CAL:calendar-description>${escapeXml(this.description)}</CAL:calendar-description>` : ''}
            ${this.color ? `<ICAL:calendar-color>${escapeXml(this.color)}</ICAL:calendar-color>` : ''}
            ${(this.isSubscription && this.subscriptionUrl) ? `<CS:source><href>${escapeXml(this.subscriptionUrl)}</href></CS:source>` : ''}
@@ -145,11 +136,6 @@ export class CreateCalendarForm extends LitElement {
      </mkcol>
      `
    })
-
-    if (response.status >= 400) {
-      alert(`Error ${response.status}: ${await response.text()}`)
-      return null
-    }
    window.location.reload()
    return null
  }
--- a/crates/frontend/js-components/lib/delete-button.ts
+++ b/crates/frontend/js-components/lib/delete-button.ts
@@ -17,7 +17,7 @@ export class DeleteButton extends LitElement {
  }

  protected render() {
-    let text = this.trash ? 'Trash' : 'Delete'
+    let text = this.trash ? 'Move to trash' : 'Delete'
    return html`<button class="delete" @click=${e => this._onClick(e)}>${text}</button>`
  }

--- a/Show More
+++ b/Show More